Added Translation Strings.

[gosa.git] / locale / zh / LC_MESSAGES / messages.po

diff --git a/locale/zh/LC_MESSAGES/messages.po b/locale/zh/LC_MESSAGES/messages.po
index 7880635059ba2722bb08359add27cabd1c142b61..efed1d7e057cad6e3fa1690bb118035fe82db1b1 100644 (file)
--- a/locale/zh/LC_MESSAGES/messages.po
+++ b/locale/zh/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-18 15:14+0200\n"
-"PO-Revision-Date: 2007-06-03 12:27+0800\n"
+"POT-Creation-Date: 2007-11-02 09:42+0100\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"
 "MIME-Version: 1.0\n"
@@ -20,109 +20,118 @@ msgstr ""
 msgid "My account"
 msgstr "我的账号"
 
-#: contrib/gosa.conf:34
+#: contrib/gosa.conf:45
 msgid "Administration"
 msgstr "系统管理"
 
-#: contrib/gosa.conf:62
+#: contrib/gosa.conf:89
 msgid "Addons"
 msgstr "插件"
 
-#: contrib/gosa.conf:87 contrib/gosa.conf:102 contrib/gosa.conf:106
-#: contrib/gosa.conf:115 contrib/gosa.conf:121 contrib/gosa.conf:126
-#: contrib/gosa.conf:132 contrib/gosa.conf:141 contrib/gosa.conf:155
-#: contrib/gosa.conf:165 contrib/gosa.conf:170 contrib/gosa.conf:192
-#: contrib/gosa.conf:197 contrib/gosa.conf:202 contrib/gosa.conf:206
-#: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
+#: contrib/gosa.conf:120 contrib/gosa.conf:144 contrib/gosa.conf:148
+#: contrib/gosa.conf:157 contrib/gosa.conf:163 contrib/gosa.conf:168
+#: contrib/gosa.conf:175 contrib/gosa.conf:180 contrib/gosa.conf:190
+#: contrib/gosa.conf:220 contrib/gosa.conf:236 contrib/gosa.conf:242
+#: contrib/gosa.conf:265 contrib/gosa.conf:271 contrib/gosa.conf:277
+#: contrib/gosa.conf:281 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/scalix/generic.tpl:4
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
-#: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/admin/fai/faiVariable.tpl:4
+#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/addons/gotomasses/goto_task.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
+#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
-#: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/fai/faiHookEntry.tpl:5
-#: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/groups/mail.tpl:7
-#: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
+#: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
+#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/dhcp_group.tpl:2
+#: plugins/admin/systems/glpi.tpl:6 plugins/admin/systems/glpiPrinter.tpl:6
 #: plugins/admin/systems/servdnseditzone.tpl:1
+#: plugins/admin/systems/dhcp_subnet.tpl:2
+#: plugins/admin/systems/dhcp_pool.tpl:2 plugins/admin/systems/dhcp_host.tpl:2
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:2
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/dhcp_service.tpl:1
+#: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/admin/mimetypes/generic.tpl:4 plugins/admin/ogroups/termgroup.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 #: setup/setup_feedback.tpl:48
 msgid "Generic"
-msgstr "通用配置"
+msgstr "总体设置"
 
-#: contrib/gosa.conf:88
+#: contrib/gosa.conf:121
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:89 contrib/gosa.conf:107
+#: contrib/gosa.conf:122 contrib/gosa.conf:149
 #: plugins/personal/environment/class_environment.inc:7
 #: plugins/admin/groups/class_divListGroup.inc:131
-#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/users/class_divListUsers.inc:144
+#: plugins/admin/ogroups/tabs_ogroups.inc:135
 msgid "Environment"
 msgstr "环境设置"
 
-#: contrib/gosa.conf:90 contrib/gosa.conf:109
+#: contrib/gosa.conf:123 contrib/gosa.conf:151
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/ogroups/tabs_ogroups.inc:77
-#: plugins/admin/ogroups/tabs_ogroups.inc:178
-#: plugins/admin/ogroups/paste_mail.tpl:4
+#: plugins/admin/users/class_divListUsers.inc:146
+#: plugins/admin/ogroups/tabs_ogroups.inc:79
+#: plugins/admin/ogroups/tabs_ogroups.inc:211
 #: plugins/admin/ogroups/class_divListOGroup.inc:124
+#: plugins/admin/ogroups/paste_mail.tpl:4
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "邮件"
 
-#: contrib/gosa.conf:91 plugins/personal/samba/class_sambaAccount.inc:24
+#: contrib/gosa.conf:124 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_divListGroup.inc:125
-#: plugins/admin/users/class_divListUsers.inc:149
+#: plugins/admin/users/class_divListUsers.inc:152
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:92 plugins/personal/netatalk/class_netatalk.inc:36
-#: plugins/admin/users/class_divListUsers.inc:151
+#: contrib/gosa.conf:126 contrib/gosa.conf:129
+#: plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_divListUsers.inc:154
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: contrib/gosa.conf:93 plugins/personal/connectivity/main.inc:143
+#: contrib/gosa.conf:132 plugins/personal/connectivity/main.inc:143
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "互联"
 
-#: contrib/gosa.conf:94 plugins/personal/generic/generic.tpl:271
+#: contrib/gosa.conf:133 plugins/personal/generic/generic.tpl:271
 #: plugins/personal/generic/generic.tpl:402
-#: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
+#: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:147
+#: plugins/admin/users/class_divListUsers.inc:150
 #: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "传真"
 
-#: contrib/gosa.conf:95 plugins/personal/generic/generic.tpl:254
+#: contrib/gosa.conf:134 plugins/personal/generic/generic.tpl:254
 #: plugins/personal/generic/generic.tpl:392
-#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_divListGroup.inc:129
-#: plugins/admin/users/class_divListUsers.inc:145
+#: plugins/admin/users/class_divListUsers.inc:148
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:869
+#: plugins/admin/systems/class_systemManagement.inc:879
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
@@ -130,60 +139,57 @@ msgstr "传真"
 msgid "Phone"
 msgstr "电话"
 
-#: contrib/gosa.conf:97 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:136 plugins/personal/scalix/class_scalixAccount.inc:16
+msgid "Scalix"
+msgstr "Scalix"
+
+#: contrib/gosa.conf:139 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf:108
+#: contrib/gosa.conf:150
 #: plugins/admin/applications/class_applicationManagement.inc:25
+#: plugins/admin/mimetypes/generic.tpl:89
+#: plugins/admin/mimetypes/generic.tpl:130
 msgid "Applications"
 msgstr "应用程序"
 
-#: contrib/gosa.conf:110
+#: contrib/gosa.conf:152
 msgid "ACL"
 msgstr "ACL"
 
-#: contrib/gosa.conf:111 contrib/gosa.conf:117 contrib/gosa.conf:122
-#: contrib/gosa.conf:128 contrib/gosa.conf:137 contrib/gosa.conf:151
-#: contrib/gosa.conf:161 contrib/gosa.conf:166 contrib/gosa.conf:171
-#: contrib/gosa.conf:193 contrib/gosa.conf:198
+#: contrib/gosa.conf:153 contrib/gosa.conf:159 contrib/gosa.conf:164
+#: contrib/gosa.conf:170 contrib/gosa.conf:186 contrib/gosa.conf:216
+#: contrib/gosa.conf:232 contrib/gosa.conf:238 contrib/gosa.conf:244
+#: contrib/gosa.conf:267 contrib/gosa.conf:273
 msgid "References"
-msgstr "å\8f\82è\80\83"
+msgstr "å¼\95ç\94¨"
 
-#: contrib/gosa.conf:116 plugins/admin/applications/generic.tpl:73
-#: plugins/admin/systems/class_servRepository.inc:282
+#: contrib/gosa.conf:158 plugins/admin/applications/generic.tpl:73
+#: plugins/admin/systems/class_servRepository.inc:283
 #: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:35
 #: plugins/gofon/conference/generic.tpl:100
 msgid "Options"
 msgstr "选项"
 
-#: contrib/gosa.conf:127 plugins/gofon/phoneaccount/class_phoneAccount.inc:870
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:865
 msgid "Parameter"
 msgstr "参数"
 
-#: contrib/gosa.conf:133 contrib/gosa.conf:142 contrib/gosa.conf:156
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: contrib/gosa.conf:181 contrib/gosa.conf:191 contrib/gosa.conf:221
+#: plugins/admin/ogroups/tabs_ogroups.inc:108
 msgid "Startup"
 msgstr "启动"
 
-#: contrib/gosa.conf:134 contrib/gosa.conf:157
-#: plugins/admin/ogroups/tabs_ogroups.inc:104
+#: contrib/gosa.conf:182 contrib/gosa.conf:222
+#: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr "设备"
 
-#: contrib/gosa.conf:135 contrib/gosa.conf:158
-#: plugins/personal/environment/environment.tpl:171
-#: plugins/admin/systems/class_systemManagement.inc:878
-#: plugins/admin/ogroups/class_ogroupManagement.inc:371
-#: plugins/generic/references/class_reference.inc:52
-msgid "Printer"
-msgstr "打印机"
-
-#: contrib/gosa.conf:136 contrib/gosa.conf:150 contrib/gosa.conf:159
+#: contrib/gosa.conf:183 contrib/gosa.conf:213 contrib/gosa.conf:224
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
-#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/admin/systems/glpiPrinter.tpl:104
@@ -193,40 +199,61 @@ msgstr "打印机"
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/gofon/macro/headpage.tpl:20
-#: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
+#: plugins/gofon/conference/headpage.tpl:20 setup/setup_ldap.tpl:121
 #: ihtml/themes/default/MultiSelectWindow.tpl:27
-#: ihtml/themes/default/MultiSelectWindow.tpl:66 setup/setup_ldap.tpl:120
+#: ihtml/themes/default/MultiSelectWindow.tpl:66
 msgid "Information"
 msgstr "提示信息"
 
-#: contrib/gosa.conf:143
+#: contrib/gosa.conf:185 contrib/gosa.conf:215 contrib/gosa.conf:231
+#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:266
+#: contrib/gosa.conf:272
+msgid "Inventory"
+msgstr "清单"
+
+#: contrib/gosa.conf:192
 msgid "Databases"
 msgstr "数据库"
 
-#: contrib/gosa.conf:144 plugins/admin/systems/servkolab.tpl:33
+#: contrib/gosa.conf:193 plugins/admin/systems/servkolab.tpl:33
 msgid "Services"
 msgstr "服务"
 
-#: contrib/gosa.conf:146
+#: contrib/gosa.conf:195
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
 msgid "Kolab"
 msgstr "Kolab"
 
-#: contrib/gosa.conf:148 plugins/admin/fai/faiPackage.tpl:29
+#: contrib/gosa.conf:197 plugins/admin/fai/faiPackage.tpl:29
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 msgid "Repository"
 msgstr "仓库"
 
-#: contrib/gosa.conf:149 contrib/gosa.conf:160
+#: contrib/gosa.conf:199 contrib/gosa.conf:201 contrib/gosa.conf:227
+#: contrib/gosa.conf:229
 msgid "FAI summary"
 msgstr "自动化安装说明"
 
-#: contrib/gosa.conf:219
+#: contrib/gosa.conf:204 contrib/gosa.conf:206
+msgid "DNS"
+msgstr ""
+
+#: contrib/gosa.conf:209 contrib/gosa.conf:211
+msgid "DHCP"
+msgstr ""
+
+#: contrib/gosa.conf:223 plugins/personal/environment/environment.tpl:204
+#: plugins/admin/systems/class_systemManagement.inc:888
+#: plugins/admin/ogroups/class_ogroupManagement.inc:371
+#: plugins/generic/references/class_reference.inc:52
+msgid "Printer"
+msgstr "打印机"
+
+#: contrib/gosa.conf:294
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:231 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:306 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -236,12 +263,13 @@ msgstr "OGo"
 msgid "Export"
 msgstr "导出"
 
-#: contrib/gosa.conf:232
+#: contrib/gosa.conf:307
 msgid "Excel Export"
 msgstr "导出为 Excel"
 
-#: contrib/gosa.conf:233 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:308 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
+#: plugins/addons/gotomasses/goto_task.tpl:129
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -251,197 +279,279 @@ msgstr "导出为 Excel"
 msgid "Import"
 msgstr "导入"
 
-#: contrib/gosa.conf:234
+#: contrib/gosa.conf:309
 msgid "CSV Import"
 msgstr "CSV 导入"
 
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:314 contrib/gosa.conf:344
 msgid "Partitions"
 msgstr "分区"
 
-#: contrib/gosa.conf:242 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:318 contrib/gosa.conf:348
+#: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 #: plugins/admin/applications/generic.tpl:99
 msgid "Script"
 msgstr "脚本"
 
-#: contrib/gosa.conf:246 plugins/admin/fai/class_faiSummaryTab.inc:40
+#: contrib/gosa.conf:322 contrib/gosa.conf:352
+#: plugins/admin/fai/class_faiSummaryTab.inc:40
+#: plugins/admin/fai/class_divListFai.inc:179
 msgid "Hooks"
 msgstr "钩子"
 
-#: contrib/gosa.conf:250 plugins/admin/fai/class_faiSummaryTab.inc:41
+#: contrib/gosa.conf:326 contrib/gosa.conf:356
+#: plugins/admin/fai/class_faiSummaryTab.inc:41
+#: plugins/admin/fai/class_divListFai.inc:178
 msgid "Variables"
 msgstr "变量"
 
-#: contrib/gosa.conf:254 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:330 contrib/gosa.conf:360
+#: plugins/admin/fai/class_faiSummaryTab.inc:42
+#: plugins/admin/fai/class_divListFai.inc:181
 msgid "Templates"
 msgstr "模板"
 
-#: contrib/gosa.conf:258 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:334 contrib/gosa.conf:364
+#: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr "Profiles"
 
-#: contrib/gosa.conf:259 plugins/admin/ogroups/tabs_ogroups.inc:109
+#: contrib/gosa.conf:335 contrib/gosa.conf:365
+#: plugins/admin/ogroups/tabs_ogroups.inc:112
 msgid "Summary"
 msgstr "总结"
 
-#: contrib/gosa.conf:263
+#: contrib/gosa.conf:339 contrib/gosa.conf:369
 msgid "Packages"
 msgstr "软件包"
 
-#: contrib/gosa.conf:424 plugins/admin/ogroups/class_phonequeue.inc:262
-#: setup/class_setupStep_Language.inc:48
-msgid "German"
-msgstr "德语"
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:25
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/scalix/class_scalixAccount.inc:17
+#: plugins/personal/environment/class_environment.inc:8
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/gotomasses/class_gotomasses.inc:7
+#: plugins/addons/gotomasses/class_goto_task.inc:7
+#: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:29
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+msgid "This does something"
+msgstr "This does something"
 
-#: contrib/gosa.conf:425 setup/class_setupStep_Language.inc:52
-msgid "Russian"
-msgstr "俄语"
+#: plugins/personal/nagios/class_nagiosAccount.inc:100
+msgid "This account has no nagios extensions."
+msgstr "这个账户尚未包含 nagios 扩展。 "
 
-#: contrib/gosa.conf:426
-msgid "Spanish"
-msgstr "西班牙语"
+#: plugins/personal/nagios/class_nagiosAccount.inc:109
+msgid "Remove nagios account"
+msgstr "删除 nagios 账户"
 
-#: contrib/gosa.conf:427 setup/class_setupStep_Language.inc:49
-msgid "French"
-msgstr "法语"
+#: plugins/personal/nagios/class_nagiosAccount.inc:110
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
+msgstr "该账号已经启用 nagios 功能。您可以点击下面按钮禁用。"
 
-#: contrib/gosa.conf:428
-msgid "Dutch"
-msgstr "荷兰语"
+#: plugins/personal/nagios/class_nagiosAccount.inc:112
+msgid "Create nagios account"
+msgstr "创建 nagios 账户"
 
-#: contrib/gosa.conf:429 setup/class_setupStep_Language.inc:50
-msgid "English"
-msgstr "英语"
+#: plugins/personal/nagios/class_nagiosAccount.inc:112
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
+msgstr "这个账户 nagios 功能已禁用。您可以点击下面的按钮来启用。"
 
-#: contrib/gosa.conf:430
-msgid "Italian"
-msgstr "意大利语"
+#: plugins/personal/nagios/class_nagiosAccount.inc:155
+msgid "Saving nagios account failed"
+msgstr "删除 nagios 账户失败"
 
-#: contrib/gosa.conf:431
-msgid "Polish"
-msgstr "波兰语"
+#: plugins/personal/nagios/class_nagiosAccount.inc:175
+msgid "The required field 'NagiosAlias' is not set."
+msgstr "必须的字段 'NagiosAlias' 没有设置。"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:178
+msgid "The required field 'NagiosMail' is not set."
+msgstr "需要的字段 'NagiosMail' 没有设置。"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:182
+#: plugins/personal/nagios/class_nagiosAccount.inc:186
+msgid "Please enter a valid email address in 'NagiosMail' field."
+msgstr "请在 'NagiosMail' 字段输入一个有效的邮件地址。"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:234
+msgid "Removing nagios account failed"
+msgstr "删除 nagios 账号失败"
 
 #: plugins/personal/nagios/main.inc:105 plugins/personal/mail/main.inc:105
 #: plugins/personal/posix/main.inc:111 plugins/personal/samba/main.inc:105
-#: plugins/personal/environment/main.inc:105
+#: plugins/personal/scalix/main.inc:105
 #: plugins/personal/environment/hotplugDialogNew.tpl:53
+#: plugins/personal/environment/main.inc:105
 #: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/personal/generic/main.inc:159
 #: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/generic/main.inc:162
 #: plugins/personal/connectivity/main.inc:119
 #: plugins/gofax/blocklists/generic.tpl:85
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/class_faiManagement.inc:585
+#: plugins/admin/fai/class_faiManagement.inc:619
 #: 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/class_dhcpService.inc:94
 #: plugins/admin/systems/servnfs.tpl:120
+#: plugins/admin/systems/class_dhcpGroup.inc:55
+#: plugins/admin/systems/class_dhcpSubnet.inc:89
+#: plugins/admin/systems/class_dhcpPool.inc:70
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/class_dhcpHost.inc:82
 #: plugins/admin/systems/goSpamServer.tpl:101
 #: plugins/admin/systems/goVirusServer.tpl:144
-#: plugins/admin/systems/servdnseditzone.tpl:119
+#: plugins/admin/systems/servdnseditzone.tpl:128
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/goSpamServerRule.tpl:22
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/class_systemManagement.inc:597
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
+#: plugins/admin/systems/class_systemManagement.inc:600
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:88
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:233
 #: include/sieve/templates/edit_frame_base.tpl:39
 #: include/sieve/templates/management.tpl:24
-#: include/class_MultiSelectWindow.inc:78
+#: include/class_MultiSelectWindow.inc:79
 #: ihtml/themes/default/copyPasteDialog.tpl:15
 msgid "Save"
 msgstr "保存"
 
-#: plugins/personal/nagios/main.inc:107
-#: plugins/personal/mail/mail_locals.tpl:77 plugins/personal/mail/main.inc:107
+#: plugins/personal/nagios/main.inc:107 plugins/personal/mail/main.inc:107
+#: plugins/personal/mail/mail_locals.tpl:77
 #: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
 #: plugins/personal/posix/main.inc:113 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/sambaLogonHours.tpl:92
-#: plugins/personal/samba/main.inc:107
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/environment/main.inc:107
+#: plugins/personal/samba/main.inc:107 plugins/personal/scalix/main.inc:107
 #: plugins/personal/environment/hotplugDialog.tpl:64
-#: plugins/personal/environment/selectPrinterDialog.tpl:61
+#: plugins/personal/environment/selectPrinterDialog.tpl:66
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:54
+#: plugins/personal/environment/main.inc:107
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
-#: plugins/personal/generic/main.inc:161
 #: plugins/personal/generic/generic_certs.tpl:78
+#: plugins/personal/generic/main.inc:164
 #: plugins/personal/connectivity/main.inc:121
 #: plugins/gofax/blocklists/generic.tpl:87
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
-#: plugins/addons/godfs/class_dfsManagment.inc:249
-#: plugins/admin/fai/class_faiManagement.inc:587
-#: plugins/admin/fai/class_faiManagement.inc:592
-#: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/addons/addressbook/remove.tpl:16
+#: plugins/addons/gotomasses/goto_task.tpl:200
+#: plugins/addons/gotomasses/remove.tpl:19
+#: plugins/admin/fai/class_faiManagement.inc:621
+#: plugins/admin/fai/class_faiManagement.inc:626
+#: plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
 #: plugins/admin/fai/faiNewBranch.tpl:22
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:57
+#: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiHookEntry.tpl:71
 #: plugins/admin/fai/remove_branch.tpl:16
 #: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/groups/remove.tpl:16
 #: plugins/admin/groups/class_groupManagement.inc:345
-#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/remove.tpl:16
 #: plugins/admin/groups/group_objects.tpl:57
+#: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/application_options.tpl:13
-#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
-#: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:649
-#: plugins/admin/users/template.tpl:50
+#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:690
+#: plugins/admin/users/template.tpl:50 plugins/admin/users/remove.tpl:16
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:299
+#: plugins/admin/systems/remove_dhcp.tpl:16
+#: plugins/admin/systems/class_dhcpService.inc:95
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
 #: plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/class_dhcpGroup.inc:56
+#: plugins/admin/systems/class_dhcpSubnet.inc:90
 #: plugins/admin/systems/remove_ppd.tpl:14
 #: plugins/admin/systems/SelectDeviceType.tpl:45
+#: plugins/admin/systems/class_dhcpPool.inc:71
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/class_dhcpHost.inc:83
 #: plugins/admin/systems/goSpamServer.tpl:103
 #: plugins/admin/systems/goVirusServer.tpl:146
-#: plugins/admin/systems/servdnseditzone.tpl:120
+#: plugins/admin/systems/servdnseditzone.tpl:129
 #: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/glpi_devices.tpl:761
 #: plugins/admin/systems/servRepositorySetup.tpl:43
 #: plugins/admin/systems/glpi_edit_os.tpl:29
 #: plugins/admin/systems/goSpamServerRule.tpl:24
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
-#: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/printerPPDDialog.tpl:23
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/dhcpNewSection.tpl:17
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/class_systemManagement.inc:599
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
-#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/remove.tpl:16
+#: plugins/admin/systems/class_systemManagement.inc:602
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:18
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
-#: plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/gencd.tpl:11
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/password.tpl:30
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:68
-#: plugins/admin/ogroups/remove.tpl:16
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:89
+#: plugins/admin/systems/gencd.tpl:11
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:411
+#: plugins/admin/mimetypes/remove.tpl:16 plugins/admin/mimetypes/remove.tpl:20
 #: plugins/admin/ogroups/ogroup_objects.tpl:56
+#: plugins/admin/ogroups/remove.tpl:16
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:269
 #: plugins/gofon/macro/remove.tpl:15 plugins/gofon/phoneaccount/main.inc:107
@@ -453,20 +563,19 @@ msgstr "保存"
 #: include/sieve/templates/import_script.tpl:14
 #: include/sieve/templates/element_comment.tpl:10
 #: include/sieve/templates/management.tpl:26
-#: include/sieve/templates/select_test_type.tpl:13
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/copyPasteDialog.tpl:16 setup/setup_ldap.tpl:17
+#: include/sieve/templates/select_test_type.tpl:13 setup/setup_ldap.tpl:17
 #: setup/setup_migrate.tpl:133 setup/setup_migrate.tpl:184
 #: setup/setup_migrate.tpl:248 setup/setup_migrate.tpl:308
-#: setup/setup_migrate.tpl:361
+#: setup/setup_migrate.tpl:361 ihtml/themes/default/copyPasteDialog.tpl:16
+#: ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
 msgstr "取消"
 
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:121 plugins/personal/netatalk/main.inc:111
-#: plugins/personal/samba/main.inc:115
+#: plugins/personal/samba/main.inc:115 plugins/personal/scalix/main.inc:115
 #: plugins/personal/environment/main.inc:115
-#: plugins/personal/generic/main.inc:181
+#: plugins/personal/generic/main.inc:183
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
@@ -475,25 +584,26 @@ msgstr "点击下面的“编辑”按钮修改该对话框内的信息"
 
 #: plugins/personal/nagios/main.inc:116 plugins/personal/mail/main.inc:116
 #: plugins/personal/posix/main.inc:123 plugins/personal/netatalk/main.inc:112
-#: plugins/personal/samba/main.inc:116
+#: plugins/personal/samba/main.inc:116 plugins/personal/scalix/main.inc:117
+#: plugins/personal/environment/environment.tpl:171
 #: plugins/personal/environment/main.inc:116
-#: plugins/personal/environment/environment.tpl:138
-#: plugins/personal/generic/main.inc:173
+#: plugins/personal/generic/main.inc:175
 #: plugins/personal/connectivity/main.inc:130
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
-#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/fai/faiVariable.tpl:45
+#: plugins/gofax/faxaccount/main.inc:97
+#: plugins/addons/gotomasses/class_gotomasses.inc:219
+#: plugins/addons/logview/contents.tpl:62
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/systems/glpiPrinter.tpl:73
-#: plugins/admin/systems/glpiPrinter.tpl:82 plugins/admin/systems/glpi.tpl:48
+#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/systems/glpi.tpl:48
 #: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
-#: plugins/admin/systems/servdns.tpl:7
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+#: plugins/admin/systems/glpiPrinter.tpl:73
+#: plugins/admin/systems/glpiPrinter.tpl:82
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
 #: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/servdnseditzone.tpl:31
+#: plugins/admin/systems/servdnseditzone.tpl:40
 #: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:186
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
 #: plugins/admin/systems/printer.tpl:52
 #: plugins/gofon/phoneaccount/main.inc:113
 #: include/sieve/templates/element_comment.tpl:8
@@ -504,94 +614,6 @@ msgstr "编辑"
 msgid "Nagios settings"
 msgstr "Nagios 设置"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:19
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:8
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_pptpAccount.inc:27
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/faxreports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/godfs/class_dfsManagment.inc:11
-#: plugins/addons/mailqueue/class_mailqueue.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_exportxls.inc:8
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:7
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:29
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/fonreports/class_fonreport.inc:7
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#, fuzzy
-msgid "This does something"
-msgstr "******"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:100
-msgid "This account has no nagios extensions."
-msgstr "这个账户尚未包含 nagios 扩展。 "
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:109
-msgid "Remove nagios account"
-msgstr "删除 nagios 账户"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:110
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
-msgstr "该账号已经启用 nagios 功能。您可以点击下面按钮禁用。"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:112
-msgid "Create nagios account"
-msgstr "创建 nagios 账户"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:112
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
-msgstr "这个账户 nagios 功能已禁用。您可以点击下面的按钮来启用。"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:155
-msgid "Saving nagios account failed"
-msgstr "删除 nagios 账户失败"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:175
-msgid "The required field 'NagiosAlias' is not set."
-msgstr "必须的字段 'NagiosAlias' 没有设置。"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:178
-msgid "The required field 'NagiosMail' is not set."
-msgstr "需要的字段 'NagiosMail' 没有设置。"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:182
-#: plugins/personal/nagios/class_nagiosAccount.inc:186
-msgid "Please enter a valid email address in 'NagiosMail' field."
-msgstr "请在 'NagiosMail' 字段输入一个有效的邮件地址。"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:234
-msgid "Removing nagios account failed"
-msgstr "删除 nagios 账号失败"
-
 #: plugins/personal/nagios/nagios.tpl:4
 msgid "Nagios Account"
 msgstr "Nagios 账号"
@@ -601,8 +623,8 @@ msgid "Alias"
 msgstr "别名"
 
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
-#: setup/setup_feedback.tpl:32
+#: plugins/admin/systems/servdnseditzone.tpl:60 setup/setup_feedback.tpl:32
+#: html/getxls.php:174
 msgid "Mail address"
 msgstr "邮件地址"
 
@@ -670,246 +692,212 @@ msgstr "触发所有服务命令"
 msgid "trigger all host commands"
 msgstr "触发所有主机命令"
 
-#: plugins/personal/mail/mail_locals.tpl:7
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
-msgstr "é\80\89æ\8b©å\9c°å\9d\80æ·»å\8a "
+#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
+#: setup/setup_config2.tpl:179
+msgid "Mail settings"
+msgstr "é\82®ä»¶é\80\89项"
 
-#: plugins/personal/mail/mail_locals.tpl:25
-#: plugins/personal/posix/posix_groups.tpl:21
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/personal/environment/hotplugDialog.tpl:24
-#: plugins/personal/environment/selectPrinterDialog.tpl:24
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/addons/godfs/contents.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:31
-#: plugins/admin/fai/faiPackageEntry.tpl:32
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/servRepository.tpl:38
-#: plugins/admin/systems/glpiSelectUser.tpl:27
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
-#: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/gofon/macro/headpage.tpl:29
-#: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:38
-#: ihtml/themes/default/MultiSelectWindow.tpl:75
-msgid "Filters"
-msgstr "过滤器"
-
-#: plugins/personal/mail/mail_locals.tpl:35
-msgid "Select department"
-msgstr "选择类别"
-
-#: plugins/personal/mail/mail_locals.tpl:38
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/personal/environment/selectPrinterDialog.tpl:34
-#: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:80
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/mail_locals.tpl:33
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:41
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
-msgid "Choose the department the search will be based on"
-msgstr "选择一个部门来做查询"
-
-#: plugins/personal/mail/mail_locals.tpl:52
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:45
-msgid "Regular expression for matching addresses"
-msgstr "匹配地址的正则表达式"
+#: plugins/personal/mail/copypaste.tpl:7 plugins/personal/mail/generic.tpl:7
+#: plugins/admin/groups/mail.tpl:10 plugins/admin/groups/paste_mail.tpl:8
+#: plugins/admin/ogroups/mail.tpl:10
+msgid "Primary address"
+msgstr "主要地址"
 
-#: plugins/personal/mail/mail_locals.tpl:60
-#: plugins/admin/groups/mail_locals.tpl:52
-msgid "Display addresses of user"
-msgstr "显示用户地址"
+#: plugins/personal/mail/copypaste.tpl:13
+#: plugins/personal/mail/generic.tpl:199
+msgid "Forward messages to"
+msgstr "转发邮件到"
 
-#: plugins/personal/mail/mail_locals.tpl:64
-#: plugins/admin/groups/mail_locals.tpl:55
-msgid "User name of which addresses are shown"
-msgstr "æ\98¾ç¤ºå±\9eäº\8e该å\9c°å\9d\80ç\9a\84ç\94¨æ\88·"
+#: plugins/personal/mail/copypaste.tpl:25 plugins/personal/mail/generic.tpl:49
+#: plugins/admin/groups/mail.tpl:62 plugins/admin/groups/paste_mail.tpl:23
+msgid "Alternative addresses"
+msgstr "æ\9b¿ä»£å\9c°å\9d\80"
 
-#: plugins/personal/mail/mail_locals.tpl:75
-#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:208
 #: plugins/personal/mail/copypaste.tpl:43
-#: plugins/personal/mail/copypaste.tpl:61
-#: plugins/personal/posix/generic.tpl:73
-#: plugins/personal/posix/generic.tpl:102
+#: plugins/personal/mail/copypaste.tpl:61 plugins/personal/mail/generic.tpl:57
+#: plugins/personal/mail/generic.tpl:208
+#: plugins/personal/mail/mail_locals.tpl:75
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/generic.tpl:73
+#: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:334
 #: plugins/personal/samba/samba3_workstations.tpl:39
+#: plugins/personal/scalix/generic.tpl:82
 #: plugins/personal/environment/hotplugDialog.tpl:63
-#: plugins/personal/environment/selectPrinterDialog.tpl:60
-#: plugins/personal/environment/environment.tpl:119
-#: plugins/personal/environment/environment.tpl:136
-#: plugins/personal/environment/environment.tpl:180
+#: plugins/personal/environment/selectPrinterDialog.tpl:65
+#: plugins/personal/environment/environment.tpl:152
+#: plugins/personal/environment/environment.tpl:169
+#: plugins/personal/environment/environment.tpl:213
 #: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/personal/connectivity/kolab.tpl:33
 #: plugins/personal/connectivity/class_kolabAccount.inc:237
 #: plugins/gofax/blocklists/generic.tpl:68
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
-#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
+#: plugins/gofax/faxaccount/lists.tpl:13
+#: plugins/addons/gotomasses/goto_task.tpl:112
+#: plugins/addons/gotomasses/goto_task.tpl:187
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:43 plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
-#: plugins/admin/groups/class_groupMail.inc:568
+#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:72
+#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:42
+#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:43
+#: plugins/admin/groups/mail.tpl:69 plugins/admin/groups/mail.tpl:113
+#: plugins/admin/groups/class_groupMail.inc:578
+#: plugins/admin/groups/application.tpl:27
+#: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:108 plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41
-#: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/systems/dhcp_network.tpl:67
+#: plugins/admin/systems/glpi.tpl:100 plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
-#: plugins/admin/systems/glpi.tpl:100 plugins/admin/systems/terminal.tpl:99
 #: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/workstation.tpl:78
-#: plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/workstationStartup.tpl:105
-#: plugins/admin/systems/workstationStartup.tpl:128
-#: plugins/admin/systems/workstationStartup.tpl:147
+#: plugins/admin/systems/workstationStartup.tpl:122
+#: plugins/admin/systems/workstationStartup.tpl:145
+#: plugins/admin/systems/workstationStartup.tpl:164
+#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/servdns.tpl:26
+#: plugins/admin/systems/workstation.tpl:90
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/class_termDNS.inc:479
-#: plugins/admin/systems/class_termDNS.inc:499
+#: plugins/admin/systems/class_termDNS.inc:723
+#: plugins/admin/systems/class_termDNS.inc:743
 #: plugins/admin/systems/goSpamServer.tpl:36
 #: plugins/admin/systems/goSpamServer.tpl:88
-#: plugins/admin/systems/servdnseditzone.tpl:106
+#: plugins/admin/systems/servdnseditzone.tpl:115
 #: plugins/admin/systems/servRepositorySetup.tpl:36
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
 #: plugins/admin/systems/glpi_edit_os.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:394
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:446
+#: plugins/admin/systems/class_servDNSeditZone.inc:575
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/class_servDNSeditZone.inc:493
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/dhcp_advanced.tpl:22
+#: plugins/admin/systems/dhcp_advanced.tpl:35
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:67
+#: plugins/admin/mimetypes/generic.tpl:86
+#: plugins/admin/mimetypes/generic.tpl:92
+#: plugins/admin/mimetypes/generic.tpl:134
 #: plugins/admin/ogroups/termgroup.tpl:23
-#: plugins/admin/ogroups/phonequeue.tpl:28
 #: plugins/admin/ogroups/ogroup_objects.tpl:54
 #: plugins/admin/ogroups/generic.tpl:43
-#: plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/admin/ogroups/phonequeue.tpl:28
 #: plugins/gofon/phoneaccount/paste_generic.tpl:18
+#: plugins/gofon/phoneaccount/generic.tpl:13
 msgid "Add"
 msgstr "添加"
 
-#: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
-#: plugins/admin/groups/mail.tpl:10 plugins/admin/groups/paste_mail.tpl:8
-#: plugins/admin/ogroups/mail.tpl:10
-msgid "Primary address"
-msgstr "主要地址"
-
-#: plugins/personal/mail/generic.tpl:11
-#: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:870
-#: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroupManagement.inc:367
-#: plugins/generic/references/class_reference.inc:44
-msgid "Server"
-msgstr "服务器"
-
-#: plugins/personal/mail/generic.tpl:14
-msgid "Specify the mail server where the user will be hosted on"
-msgstr "描述该用户账号所要创建于的邮件服务器"
-
-#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
-msgid "Quota usage"
-msgstr "使用 Quota"
-
-#: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:164
-#: plugins/admin/systems/class_printGeneric.inc:502
-msgid "not defined"
-msgstr "未定义"
-
-#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
-msgid "Quota size"
-msgstr "Quota 大小"
-
-#: plugins/personal/mail/generic.tpl:49 plugins/personal/mail/copypaste.tpl:25
-#: plugins/admin/groups/mail.tpl:44 plugins/admin/groups/paste_mail.tpl:23
-msgid "Alternative addresses"
-msgstr "替代地址"
-
-#: plugins/personal/mail/generic.tpl:51 plugins/personal/mail/copypaste.tpl:55
-#: plugins/admin/groups/mail.tpl:45 plugins/admin/groups/paste_mail.tpl:24
-#: plugins/admin/systems/phonesettings.tpl:170
-#: plugins/admin/systems/phonesettings.tpl:185
-msgid "List of alternative mail addresses"
-msgstr "替代邮件地址列表"
+#: plugins/personal/mail/copypaste.tpl:44
+#: plugins/personal/mail/generic.tpl:210
+#: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:114
+#: plugins/admin/groups/paste_mail.tpl:42
+msgid "Add local"
+msgstr "添加本地"
 
-#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:212
 #: plugins/personal/mail/copypaste.tpl:45
-#: plugins/personal/mail/copypaste.tpl:62
+#: plugins/personal/mail/copypaste.tpl:62 plugins/personal/mail/generic.tpl:59
+#: plugins/personal/mail/generic.tpl:212
+#: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/samba/samba3.tpl:336
-#: plugins/personal/environment/class_environment.inc:648
-#: plugins/personal/environment/environment.tpl:137
-#: plugins/personal/environment/environment.tpl:165
-#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/scalix/generic.tpl:84
+#: plugins/personal/environment/class_environment.inc:672
+#: plugins/personal/environment/environment.tpl:170
+#: plugins/personal/environment/environment.tpl:198
+#: plugins/personal/environment/environment.tpl:214
 #: plugins/personal/connectivity/kolab.tpl:35
 #: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
-#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
+#: plugins/addons/gotomasses/remove.tpl:15
+#: plugins/addons/gotomasses/remove.tpl:17
 #: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/groups/mail.tpl:52
-#: plugins/admin/groups/mail.tpl:97 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/groups/mail.tpl:70
+#: plugins/admin/groups/mail.tpl:115 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/generic.tpl:110 plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
-#: plugins/admin/systems/terminal.tpl:101
+#: plugins/admin/systems/dhcp_network.tpl:68
+#: plugins/admin/systems/remove_dhcp.tpl:14
 #: plugins/admin/systems/glpi_edit_type.tpl:10
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
-#: plugins/admin/systems/workstation.tpl:80
-#: plugins/admin/systems/workstationStartup.tpl:106
-#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/workstationStartup.tpl:123
+#: plugins/admin/systems/workstationStartup.tpl:146
+#: plugins/admin/systems/terminal.tpl:111
+#: plugins/admin/systems/workstation.tpl:92
 #: plugins/admin/systems/terminalStartup.tpl:62
 #: plugins/admin/systems/remove_ppd.tpl:12
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_termDNS.inc:493
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:164
+#: plugins/admin/systems/class_termDNS.inc:737
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
 #: plugins/admin/systems/glpi_edit_os.tpl:10
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
 #: plugins/admin/systems/printer.tpl:78 plugins/admin/systems/printer.tpl:96
-#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/class_servDNSeditZone.inc:334
+#: plugins/admin/systems/class_servDNSeditZone.inc:569
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/class_servDNSeditZone.inc:293
-#: plugins/admin/systems/class_servDNSeditZone.inc:487
 #: plugins/admin/systems/phonesettings.tpl:177
 #: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/ogroups/termgroup.tpl:25
-#: plugins/admin/ogroups/phonequeue.tpl:29 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/ogroups/generic.tpl:44 plugins/gofon/macro/remove.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/dhcp_advanced.tpl:23
+#: plugins/admin/systems/dhcp_advanced.tpl:36
+#: plugins/admin/mimetypes/remove.tpl:14 plugins/admin/mimetypes/remove.tpl:18
+#: plugins/admin/ogroups/termgroup.tpl:25 plugins/admin/ogroups/remove.tpl:14
+#: plugins/admin/ogroups/generic.tpl:44
+#: plugins/admin/ogroups/phonequeue.tpl:29 plugins/gofon/macro/remove.tpl:13
 #: plugins/gofon/phoneaccount/paste_generic.tpl:19
+#: plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/conference/remove.tpl:14
 #: include/sieve/templates/remove_script.tpl:14
 msgid "Delete"
 msgstr "删除"
 
+#: plugins/personal/mail/copypaste.tpl:55 plugins/personal/mail/generic.tpl:51
+#: plugins/admin/groups/mail.tpl:63 plugins/admin/groups/paste_mail.tpl:24
+#: plugins/admin/systems/phonesettings.tpl:170
+#: plugins/admin/systems/phonesettings.tpl:185
+msgid "List of alternative mail addresses"
+msgstr "替代邮件地址列表"
+
+#: plugins/personal/mail/generic.tpl:11
+#: plugins/addons/gotomasses/class_target_list.inc:171
+#: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_systemManagement.inc:880
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/generic/references/class_reference.inc:44
+msgid "Server"
+msgstr "服务器"
+
+#: plugins/personal/mail/generic.tpl:14
+msgid "Specify the mail server where the user will be hosted on"
+msgstr "描述该用户账号所要创建于的邮件服务器"
+
+#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
+msgid "Quota usage"
+msgstr "使用 Quota"
+
+#: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
+#: plugins/admin/systems/class_terminalInfo.inc:169
+msgid "not defined"
+msgstr "未定义"
+
+#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
+msgid "Quota size"
+msgstr "Quota 大小"
+
 #: plugins/personal/mail/generic.tpl:67 plugins/personal/mail/generic.tpl:107
 msgid "Mail options"
 msgstr "邮件选项"
@@ -923,9 +911,8 @@ msgid "disables all Mail options!"
 msgstr "禁用所有邮件选项！"
 
 #: plugins/personal/mail/generic.tpl:99
-#, fuzzy
 msgid "Sieve Management"
-msgstr "管理"
+msgstr "Sieve 管理"
 
 #: plugins/personal/mail/generic.tpl:112
 msgid "Select if you want to forward mails without getting own copies of them"
@@ -973,10 +960,11 @@ msgid "Reject mails bigger than"
 msgstr "拒绝邮件大小超过"
 
 #: plugins/personal/mail/generic.tpl:176
+#: plugins/personal/scalix/generic.tpl:51
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/personal/connectivity/pureftpd.tpl:44
 #: plugins/personal/connectivity/class_proxyAccount.inc:90
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:222
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:223
 msgid "MB"
 msgstr "MB"
 
@@ -988,18 +976,6 @@ msgstr "MB"
 msgid "Vacation message"
 msgstr "假期信息"
 
-#: plugins/personal/mail/generic.tpl:199
-#: plugins/personal/mail/copypaste.tpl:13
-msgid "Forward messages to"
-msgstr "转发邮件到"
-
-#: plugins/personal/mail/generic.tpl:210
-#: plugins/personal/mail/copypaste.tpl:44
-#: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
-#: plugins/admin/groups/paste_mail.tpl:42
-msgid "Add local"
-msgstr "添加本地"
-
 #: plugins/personal/mail/generic.tpl:220
 msgid "Advanced mail options"
 msgstr "高级邮件选项"
@@ -1012,17 +988,8 @@ msgstr "选择如果用户只能发送和接收本域内邮件"
 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:95
-msgid "Mail settings"
-msgstr "邮件选项"
-
-#: plugins/personal/mail/main.inc:125
-msgid "User mail settings"
-msgstr "用户邮件选项"
-
 #: plugins/personal/mail/class_mailAccount.inc:88
-#: plugins/admin/groups/class_groupMail.inc:78
+#: plugins/admin/groups/class_groupMail.inc:80
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "在您的 gosa.conf 中，没有邮件方法 '%s'。"
@@ -1037,7 +1004,7 @@ msgstr "这个账号没有邮件扩展。"
 
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
-#: plugins/admin/groups/class_groupMail.inc:333
+#: plugins/admin/groups/class_groupMail.inc:343
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 msgid "Remove mail account"
 msgstr "删除邮件账号"
@@ -1049,20 +1016,20 @@ msgid ""
 msgstr "这个账号不能被删除因为还有代理人配置。先删除这些代理人。"
 
 #: plugins/personal/mail/class_mailAccount.inc:300
-#: plugins/admin/groups/class_groupMail.inc:334
+#: plugins/admin/groups/class_groupMail.inc:344
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr "这个账户邮件功能已启用。您可以点击下面的按钮禁用。"
 
 #: plugins/personal/mail/class_mailAccount.inc:303
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:346
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 msgid "Create mail account"
 msgstr "创建邮件账号"
 
 #: plugins/personal/mail/class_mailAccount.inc:303
-#: plugins/admin/groups/class_groupMail.inc:337
+#: plugins/admin/groups/class_groupMail.inc:347
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -1074,20 +1041,23 @@ msgid ""
 msgstr "您正在尝试向转发列表添加一条无效邮件地址。"
 
 #: plugins/personal/mail/class_mailAccount.inc:359
-#: plugins/admin/groups/class_groupMail.inc:411
+#: plugins/admin/groups/class_groupMail.inc:421
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr "添加您自己的一个邮件地址到转发地址没有任何意义。"
 
 #: plugins/personal/mail/class_mailAccount.inc:397
 #: plugins/personal/mail/class_mailAccount.inc:402
-#: plugins/admin/groups/class_groupMail.inc:439
+#: plugins/personal/scalix/class_scalixAccount.inc:158
+#: plugins/personal/scalix/class_scalixAccount.inc:163
+#: plugins/admin/groups/class_groupMail.inc:449
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr "您正在添加一个无效的邮件地址到替代地址列表。"
 
 #: plugins/personal/mail/class_mailAccount.inc:412
-#: plugins/admin/groups/class_groupMail.inc:444
+#: plugins/personal/scalix/class_scalixAccount.inc:173
+#: plugins/admin/groups/class_groupMail.inc:454
 msgid "The address you're trying to add is already used by user"
 msgstr "您正在添加的地址已经被用户使用"
 
@@ -1097,7 +1067,7 @@ msgstr "您正在添加的地址已经被用户使用"
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/samba/class_sambaAccount.inc:429
 #: plugins/personal/samba/class_sambaAccount.inc:447
-#: plugins/personal/generic/class_user.inc:249
+#: plugins/personal/generic/class_user.inc:251
 msgid "January"
 msgstr "一月"
 
@@ -1107,7 +1077,7 @@ msgstr "一月"
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/samba/class_sambaAccount.inc:429
 #: plugins/personal/samba/class_sambaAccount.inc:447
-#: plugins/personal/generic/class_user.inc:249
+#: plugins/personal/generic/class_user.inc:251
 msgid "February"
 msgstr "二月"
 
@@ -1117,7 +1087,7 @@ msgstr "二月"
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/samba/class_sambaAccount.inc:429
 #: plugins/personal/samba/class_sambaAccount.inc:447
-#: plugins/personal/generic/class_user.inc:249
+#: plugins/personal/generic/class_user.inc:251
 msgid "March"
 msgstr "三月"
 
@@ -1127,7 +1097,7 @@ msgstr "三月"
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/samba/class_sambaAccount.inc:429
 #: plugins/personal/samba/class_sambaAccount.inc:447
-#: plugins/personal/generic/class_user.inc:249
+#: plugins/personal/generic/class_user.inc:251
 msgid "April"
 msgstr "四月"
 
@@ -1137,7 +1107,7 @@ msgstr "四月"
 #: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/samba/class_sambaAccount.inc:430
 #: plugins/personal/samba/class_sambaAccount.inc:448
-#: plugins/personal/generic/class_user.inc:250
+#: plugins/personal/generic/class_user.inc:252
 msgid "May"
 msgstr "五月"
 
@@ -1147,7 +1117,7 @@ msgstr "五月"
 #: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/samba/class_sambaAccount.inc:430
 #: plugins/personal/samba/class_sambaAccount.inc:448
-#: plugins/personal/generic/class_user.inc:250
+#: plugins/personal/generic/class_user.inc:252
 msgid "June"
 msgstr "六月"
 
@@ -1157,7 +1127,7 @@ msgstr "六月"
 #: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/samba/class_sambaAccount.inc:430
 #: plugins/personal/samba/class_sambaAccount.inc:448
-#: plugins/personal/generic/class_user.inc:250
+#: plugins/personal/generic/class_user.inc:252
 msgid "July"
 msgstr "七月"
 
@@ -1167,7 +1137,7 @@ msgstr "七月"
 #: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/samba/class_sambaAccount.inc:430
 #: plugins/personal/samba/class_sambaAccount.inc:448
-#: plugins/personal/generic/class_user.inc:250
+#: plugins/personal/generic/class_user.inc:252
 msgid "August"
 msgstr "八月"
 
@@ -1177,7 +1147,7 @@ msgstr "八月"
 #: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/samba/class_sambaAccount.inc:430
 #: plugins/personal/samba/class_sambaAccount.inc:448
-#: plugins/personal/generic/class_user.inc:250
+#: plugins/personal/generic/class_user.inc:252
 msgid "September"
 msgstr "九月"
 
@@ -1187,7 +1157,7 @@ msgstr "九月"
 #: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/samba/class_sambaAccount.inc:431
 #: plugins/personal/samba/class_sambaAccount.inc:449
-#: plugins/personal/generic/class_user.inc:251
+#: plugins/personal/generic/class_user.inc:253
 msgid "October"
 msgstr "十月"
 
@@ -1197,7 +1167,7 @@ msgstr "十月"
 #: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/samba/class_sambaAccount.inc:431
 #: plugins/personal/samba/class_sambaAccount.inc:449
-#: plugins/personal/generic/class_user.inc:251
+#: plugins/personal/generic/class_user.inc:253
 msgid "November"
 msgstr "十一月"
 
@@ -1207,7 +1177,7 @@ msgstr "十一月"
 #: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/samba/class_sambaAccount.inc:431
 #: plugins/personal/samba/class_sambaAccount.inc:449
-#: plugins/personal/generic/class_user.inc:251
+#: plugins/personal/generic/class_user.inc:253
 msgid "December"
 msgstr "十二月"
 
@@ -1219,119 +1189,196 @@ msgstr "删除邮件账号失败"
 msgid "Saving mail account failed"
 msgstr "保存邮件账号失败"
 
-#: plugins/personal/mail/class_mailAccount.inc:940
+#: plugins/personal/mail/class_mailAccount.inc:941
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr "没有指定有效的邮件服务器，请通过系统设置添加一个。"
 
-#: plugins/personal/mail/class_mailAccount.inc:945
-#: plugins/admin/groups/class_groupMail.inc:856
+#: plugins/personal/mail/class_mailAccount.inc:946
+#: plugins/admin/groups/class_groupMail.inc:903
 msgid "The required field 'Primary address' is not set."
 msgstr "要求的字段“主要地址”没有设置。"
 
-#: plugins/personal/mail/class_mailAccount.inc:949
-#: plugins/personal/mail/class_mailAccount.inc:953
-#: plugins/addons/addressbook/class_addressbook.inc:598
+#: plugins/personal/mail/class_mailAccount.inc:950
+#: plugins/personal/mail/class_mailAccount.inc:954
+#: plugins/addons/addressbook/class_addressbook.inc:607
 #: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr "请在“主邮件地址”中输入一个有效的邮件地址。"
 
-#: plugins/personal/mail/class_mailAccount.inc:959
-#: plugins/admin/groups/class_groupMail.inc:865
+#: plugins/personal/mail/class_mailAccount.inc:960
+#: plugins/admin/groups/class_groupMail.inc:912
 #: plugins/admin/ogroups/class_mailogroup.inc:85
 msgid "The primary address you've entered is already in use."
 msgstr "您输入的主要地址已经在使用了。"
 
-#: plugins/personal/mail/class_mailAccount.inc:965
-#: plugins/admin/groups/class_groupMail.inc:871
+#: plugins/personal/mail/class_mailAccount.inc:966
+#: plugins/admin/groups/class_groupMail.inc:918
 msgid "Value in 'Quota size' is not valid."
 msgstr "'Quota 大小' 的值无效。"
 
-#: plugins/personal/mail/class_mailAccount.inc:974
-#: plugins/admin/groups/class_groupMail.inc:880
+#: plugins/personal/mail/class_mailAccount.inc:975
+#: plugins/admin/groups/class_groupMail.inc:927
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "请指定一个将要被退回的邮件大小。"
 
-#: plugins/personal/mail/class_mailAccount.inc:984
-#: plugins/admin/groups/class_groupMail.inc:888
+#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/admin/groups/class_groupMail.inc:935
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "为了退信，您需要设定最大的邮件大小。"
 
-#: plugins/personal/mail/class_mailAccount.inc:988
+#: plugins/personal/mail/class_mailAccount.inc:989
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr "您定义了 Spam 设置，但是没有指定目录。"
 
-#: plugins/personal/mail/class_mailAccount.inc:992
+#: plugins/personal/mail/class_mailAccount.inc:993
 msgid "Time interval to show vacation message is not valid."
 msgstr "显示假期信息的时间间隔无效。"
 
-#: plugins/personal/mail/class_mailAccount.inc:1146
+#: plugins/personal/mail/class_mailAccount.inc:1147
 msgid "Waiting for kolab to remove mail properties."
 msgstr "等待 kolab 来删除邮件属性。"
 
-#: plugins/personal/mail/class_mailAccount.inc:1148
+#: plugins/personal/mail/class_mailAccount.inc:1149
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
 msgstr "请先删除邮件账号，以允许 kolab 调用自己的删除方法。"
 
-#: plugins/personal/password/changed.tpl:3
-msgid ""
-"You've successfully changed your password. Remember to change all programms "
-"configured to use it as well."
-msgstr "您已经成功更改口令。还要记住更改相关程序设定。"
-
-#: plugins/personal/password/changed.tpl:9
-#: plugins/personal/generic/main.inc:170
-#: plugins/gofax/faxreports/detail.tpl:67
-#: plugins/addons/mailqueue/header.tpl:5
-#: plugins/addons/ldapmanager/contentexportxls.tpl:69
-#: plugins/addons/ldapmanager/contentimport.tpl:44
-#: plugins/addons/ldapmanager/contentcsv.tpl:114
-#: plugins/addons/ldapmanager/contentexport.tpl:66
-#: plugins/admin/fai/faiNewBranch.tpl:52
-#: plugins/admin/departments/dep_iframe.tpl:19
-#: plugins/admin/systems/class_systemManagement.inc:243
-#: include/functions.inc:1535 ihtml/themes/altlinux/setup_useradmin.tpl:40
-#: ihtml/themes/altlinux/setup_step2.tpl:12
-#: ihtml/themes/altlinux/setup_step3.tpl:17
-#: ihtml/themes/altlinux/setup_step4.tpl:114
-#: ihtml/themes/altlinux/setup_finish.tpl:30
-#: ihtml/themes/default/setup_finish.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:40
-#: ihtml/themes/default/setup_step2.tpl:12
-#: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114 setup/class_setup.inc:275
-#: setup/class_setup.inc:277
-msgid "Back"
-msgstr "返回"
+#: plugins/personal/mail/main.inc:125
+msgid "User mail settings"
+msgstr "用户邮件选项"
 
-#: plugins/personal/password/class_password.inc:5
-#: plugins/personal/generic/paste_generic.tpl:20
-#: plugins/admin/systems/class_divListSystem.inc:178
-#: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
-#: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30 setup/setup_migrate.tpl:223
-msgid "Password"
-msgstr "口令"
+#: plugins/personal/mail/mail_locals.tpl:7
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr "选择地址添加"
 
-#: plugins/personal/password/nochange.tpl:2
-msgid "Password change not allowed"
-msgstr "不允许修改口令"
+#: plugins/personal/mail/mail_locals.tpl:25
+#: plugins/personal/posix/posix_groups.tpl:21
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/personal/environment/hotplugDialog.tpl:24
+#: plugins/personal/environment/selectPrinterDialog.tpl:24
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/fai/faiProfileEntry.tpl:31
+#: plugins/admin/fai/faiPackageEntry.tpl:32
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
+#: plugins/admin/systems/servRepository.tpl:38
+#: plugins/admin/systems/glpiSelectUser.tpl:27
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/glpiAttachmentPool.tpl:27
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/conference/headpage.tpl:29
+#: ihtml/themes/default/MultiSelectWindow.tpl:38
+#: ihtml/themes/default/MultiSelectWindow.tpl:75
+msgid "Filters"
+msgstr "过滤器"
 
-#: plugins/personal/password/nochange.tpl:6
-msgid "You are not allowed to change your password at this time"
-msgstr "现在您无权修改您的口令"
+#: plugins/personal/mail/mail_locals.tpl:35
+msgid "Select department"
+msgstr "选择类别"
 
-#: plugins/personal/password/password.tpl:2
-msgid ""
-"To change your personal password use the fields below. The changes take "
-"effect immediately. Please memorize the new password, because you wouldn't "
-"be able to login without it."
+#: plugins/personal/mail/mail_locals.tpl:38
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/personal/environment/selectPrinterDialog.tpl:34
+#: plugins/gofax/faxaccount/locals.tpl:29
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/mail_locals.tpl:33
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:41
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
+msgid "Choose the department the search will be based on"
+msgstr "选择一个部门来做查询"
+
+#: plugins/personal/mail/mail_locals.tpl:52
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:45
+msgid "Regular expression for matching addresses"
+msgstr "匹配地址的正则表达式"
+
+#: plugins/personal/mail/mail_locals.tpl:60
+#: plugins/admin/groups/mail_locals.tpl:52
+msgid "Display addresses of user"
+msgstr "显示用户地址"
+
+#: plugins/personal/mail/mail_locals.tpl:64
+#: plugins/admin/groups/mail_locals.tpl:55
+msgid "User name of which addresses are shown"
+msgstr "显示属于该地址的用户"
+
+#: plugins/personal/password/class_password.inc:24
+#: plugins/personal/generic/paste_generic.tpl:20
+#: plugins/admin/systems/class_divListSystem.inc:184
+#: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
+#: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
+#: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: setup/setup_migrate.tpl:223 ihtml/themes/default/password.tpl:38
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+msgid "Password"
+msgstr "口令"
+
+#: plugins/personal/password/class_password.inc:72
+msgid "You need to specify your current password in order to proceed."
+msgstr "您需要输入当前口令才能继续。"
+
+#: plugins/personal/password/class_password.inc:74
+#: plugins/personal/generic/main.inc:84
+#: 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."
+msgstr "您输入的“新口令”和“重复新口令”不匹配。"
+
+#: plugins/personal/password/class_password.inc:76
+#: plugins/personal/generic/main.inc:89
+#: plugins/admin/users/class_userManagement.inc:289 html/password.php:189
+msgid "The password you've entered as 'New password' is empty."
+msgstr "输入的“新口令”为空。"
+
+#: plugins/personal/password/class_password.inc:78 html/password.php:197
+msgid "The password used as new and current are too similar."
+msgstr "输入的新口令和当前口令非常相似。"
+
+#: plugins/personal/password/class_password.inc:80 html/password.php:202
+msgid "The password used as new is to short."
+msgstr "输入的新口令太短了。"
+
+#: plugins/personal/password/class_password.inc:82 html/password.php:243
+msgid "External password changer reported a problem: "
+msgstr "外部口令更改程序报告错误："
+
+#: plugins/personal/password/class_password.inc:95
+msgid ""
+"The password you've entered as your current password doesn't match the real "
+"one."
+msgstr "您输入的当前口令不正确。"
+
+#: plugins/personal/password/class_password.inc:102 html/password.php:222
+msgid "You have no permissions to change your password."
+msgstr "您无权修改您的口令。"
+
+#: plugins/personal/password/nochange.tpl:2
+msgid "Password change not allowed"
+msgstr "不允许修改口令"
+
+#: plugins/personal/password/nochange.tpl:6
+msgid "You are not allowed to change your password at this time"
+msgstr "现在您无权修改您的口令"
+
+#: plugins/personal/password/password.tpl:2
+msgid ""
+"To change your personal password use the fields below. The changes take "
+"effect immediately. Please memorize the new password, because you wouldn't "
+"be able to login without it."
 msgstr ""
 "用下面的表格更改个人口令。口令更改即时生效。请记住新口令，忘记口令将无法登"
 "录。"
@@ -1343,12 +1390,14 @@ msgid ""
 msgstr "修改口令将影响邮件，代理，samba，unix等的登录。"
 
 #: plugins/personal/password/password.tpl:11
+#: ihtml/themes/default/password.tpl:76 ihtml/themes/default/password.tpl:77
 msgid "Current password"
 msgstr "当前口令"
 
 #: plugins/personal/password/password.tpl:16
 #: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
-#: plugins/admin/systems/password.tpl:14
+#: plugins/admin/systems/password.tpl:14 ihtml/themes/default/password.tpl:80
+#: ihtml/themes/default/password.tpl:81 ihtml/themes/default/password.tpl:84
 msgid "New password"
 msgstr "新口令"
 
@@ -1368,108 +1417,32 @@ msgstr "设置口令"
 msgid "Clear fields"
 msgstr "清除字段"
 
-#: plugins/personal/password/main.inc:37
-msgid ""
-"The password you've entered as your current password doesn't match the real "
-"one."
-msgstr "您输入的当前口令不正确。"
-
-#: plugins/personal/password/main.inc:40
-msgid "You need to specify your current password in order to proceed."
-msgstr "您需要输入当前口令才能继续。"
-
-#: plugins/personal/password/main.inc:45 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:243
+#: plugins/personal/password/changed.tpl:3
 msgid ""
-"The passwords you've entered as 'New password' and 'Repeated new password' "
-"do not match."
-msgstr "您输入的“新口令”和“重复新口令”不匹配。"
-
-#: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:248
-msgid "The password you've entered as 'New password' is empty."
-msgstr "输入的“新口令”为空。"
-
-#: plugins/personal/password/main.inc:56
-msgid "The password used as new and current are too similar."
-msgstr "输入的新口令和当前口令非常相似。"
-
-#: plugins/personal/password/main.inc:61
-msgid "The password used as new is to short."
-msgstr "输入的新口令太短了。"
-
-#: plugins/personal/password/main.inc:68
-msgid "You have no permissions to change your password."
-msgstr "您无权修改您的口令。"
-
-#: plugins/personal/password/main.inc:86
-msgid "External password changer reported a problem: "
-msgstr "外部口令更改程序报告错误："
-
-#: plugins/personal/password/main.inc:117
-#: plugins/admin/users/class_divListUsers.inc:190
-msgid "Change password"
-msgstr "修改口令"
-
-#: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/paste_generic.tpl:8
-#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:698
-msgid "Home directory"
-msgstr "用户主目录"
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr "主要用户组"
-
-#: plugins/personal/posix/generic.tpl:29
-#: plugins/gofax/faxreports/contents.tpl:32
-#: plugins/gofax/faxreports/detail.tpl:45
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:38
-#: plugins/gofon/fonreports/contents.tpl:35
-msgid "Status"
-msgstr "状态"
-
-#: plugins/personal/posix/generic.tpl:39
-#: plugins/personal/posix/paste_generic.tpl:23
-msgid "Force UID/GID"
-msgstr "指定 UID/GID"
-
-#: plugins/personal/posix/generic.tpl:43
-#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/generic.tpl:52
-#: plugins/personal/posix/paste_generic.tpl:37
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/generic.tpl:64
-#: plugins/personal/posix/paste_generic.tpl:49
-msgid "Group membership"
-msgstr "组成员身份"
-
-#: plugins/personal/posix/generic.tpl:66
-#: plugins/personal/posix/paste_generic.tpl:56
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr "（警告：NFS不支持超过 16 个组！）"
-
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr "账户"
+"You've successfully changed your password. Remember to change all programms "
+"configured to use it as well."
+msgstr "您已经成功更改口令。还要记住更改相关程序设定。"
 
-#: plugins/personal/posix/generic.tpl:91
-msgid "System trust"
-msgstr "信赖的系统"
+#: plugins/personal/password/changed.tpl:9
+#: plugins/personal/generic/main.inc:172
+#: plugins/gofax/faxreports/detail.tpl:67
+#: plugins/addons/mailqueue/header.tpl:5
+#: plugins/addons/ldapmanager/contentexportxls.tpl:69
+#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentcsv.tpl:114
+#: plugins/addons/ldapmanager/contentexport.tpl:66
+#: plugins/admin/fai/faiNewBranch.tpl:51
+#: plugins/admin/groups/class_groupApplication.inc:719
+#: plugins/admin/departments/dep_iframe.tpl:19
+#: plugins/admin/systems/class_systemManagement.inc:246
+#: include/functions.inc:1609 setup/class_setup.inc:261
+#: setup/class_setup.inc:263
+msgid "Back"
+msgstr "返回"
 
-#: plugins/personal/posix/generic.tpl:92
-msgid "Trust mode"
-msgstr "信赖模式"
+#: plugins/personal/password/main.inc:46 setup/setup_config1.tpl:124
+msgid "Password settings"
+msgstr "口令设置"
 
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
@@ -1479,41 +1452,45 @@ msgstr "选择要添加的组"
 msgid "Display groups of department"
 msgstr "显示部门的组"
 
-#: plugins/personal/posix/posix_groups.tpl:46
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:54
-#: plugins/admin/groups/class_divListGroup.inc:62
-#: plugins/admin/users/class_divListUsers.inc:63
-#: plugins/admin/applications/class_divListApplication.inc:48
-#: plugins/admin/departments/class_divListDepartment.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:71
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-#: plugins/admin/ogroups/class_divListOGroup.inc:69
-#: plugins/gofon/macro/class_divListMacros.inc:51
-#: plugins/gofon/conference/class_divListConferences.inc:52
-msgid "Ignore subtrees"
-msgstr "忽略子树"
-
-#: plugins/personal/posix/posix_groups.tpl:53
+#: plugins/personal/posix/posix_groups.tpl:44
 msgid "Display groups matching"
 msgstr "显示匹配的组"
 
-#: plugins/personal/posix/posix_groups.tpl:57
+#: plugins/personal/posix/posix_groups.tpl:48
+#: plugins/addons/gotomasses/class_target_list.inc:57
 #: plugins/admin/groups/class_divListGroup.inc:65
 #: plugins/admin/departments/class_divListDepartment.inc:49
 #: plugins/admin/ogroups/class_divListOGroup.inc:72
 msgid "Regular expression for matching group names"
 msgstr "用于匹配组名的正则表达式"
 
-#: plugins/personal/posix/posix_groups.tpl:64
+#: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr "显示用户组"
 
-#: plugins/personal/posix/posix_groups.tpl:68
+#: plugins/personal/posix/posix_groups.tpl:59
 #: plugins/admin/groups/class_divListGroup.inc:66
 msgid "User name of which groups are shown"
 msgstr "显示属于该组的用户名"
 
+#: plugins/personal/posix/posix_groups.tpl:68
+#: plugins/personal/environment/selectPrinterDialog.tpl:42
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:54
+#: plugins/addons/gotomasses/class_target_list.inc:54
+#: plugins/admin/groups/class_divListGroup.inc:62
+#: plugins/admin/users/class_divListUsers.inc:63
+#: plugins/admin/applications/class_divListApplication.inc:48
+#: plugins/admin/departments/class_divListDepartment.inc:46
+#: plugins/admin/systems/class_divListSystem.inc:71
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:60
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+#: plugins/gofon/macro/class_divListMacros.inc:51
+#: plugins/gofon/conference/class_divListConferences.inc:52
+msgid "Search in subtrees"
+msgstr "在子树中查找"
+
 #: plugins/personal/posix/posix_shadow.tpl:5
 msgid "User must change password on first login"
 msgstr "用户必须在第一次登录修改口令"
@@ -1527,6 +1504,38 @@ msgstr "口令过期截止日"
 msgid "Posix settings"
 msgstr "Posix 设置"
 
+#: plugins/personal/posix/paste_generic.tpl:8
+#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:698
+msgid "Home directory"
+msgstr "用户主目录"
+
+#: plugins/personal/posix/paste_generic.tpl:23
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr "指定 UID/GID"
+
+#: plugins/personal/posix/paste_generic.tpl:28
+#: plugins/personal/posix/generic.tpl:43 html/getxls.php:230
+msgid "UID"
+msgstr "UID"
+
+#: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr "GID"
+
+#: plugins/personal/posix/paste_generic.tpl:49
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr "组成员身份"
+
+#: plugins/personal/posix/paste_generic.tpl:56
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr "（警告：NFS不支持超过 16 个组！）"
+
 #: plugins/personal/posix/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr "选择要添加的系统"
@@ -1540,22 +1549,46 @@ msgstr "显示部门的系统"
 msgid "Display systems matching"
 msgstr "显示匹配的系统"
 
-#: plugins/personal/posix/main.inc:132
-msgid "Unix settings"
-msgstr "Unix 设置"
-
-#: plugins/personal/posix/class_posixAccount.inc:16
-#: plugins/generic/references/class_reference.inc:22
-msgid "UNIX"
-msgstr "UNIX"
-
-#: plugins/personal/posix/class_posixAccount.inc:125
-msgid "expired"
-msgstr "过期"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:127
-msgid "grace time active"
-msgstr "时间限制激活"
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr "主要用户组"
+
+#: plugins/personal/posix/generic.tpl:29
+#: plugins/gofax/faxreports/detail.tpl:45
+#: plugins/gofax/faxreports/contents.tpl:32
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:38
+#: plugins/gofon/fonreports/contents.tpl:35
+msgid "Status"
+msgstr "状态"
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr "账户"
+
+#: plugins/personal/posix/generic.tpl:91
+msgid "System trust"
+msgstr "信赖的系统"
+
+#: plugins/personal/posix/generic.tpl:92
+msgid "Trust mode"
+msgstr "信赖模式"
+
+#: plugins/personal/posix/class_posixAccount.inc:16
+#: plugins/generic/references/class_reference.inc:22
+msgid "UNIX"
+msgstr "UNIX"
+
+#: plugins/personal/posix/class_posixAccount.inc:125
+msgid "expired"
+msgstr "过期"
+
+#: plugins/personal/posix/class_posixAccount.inc:127
+msgid "grace time active"
+msgstr "时间限制激活"
 
 #: plugins/personal/posix/class_posixAccount.inc:130
 msgid "active, password not changable"
@@ -1570,7 +1603,7 @@ msgid "active"
 msgstr "活动"
 
 #: plugins/personal/posix/class_posixAccount.inc:145
-#: plugins/personal/posix/class_posixAccount.inc:993
+#: plugins/personal/posix/class_posixAccount.inc:1005
 msgid "Group of user"
 msgstr "用户组"
 
@@ -1580,8 +1613,10 @@ msgstr "未配置"
 
 #: plugins/personal/posix/class_posixAccount.inc:200
 #: plugins/admin/systems/class_workstationService.inc:177
-#: plugins/admin/systems/class_workstationStartup.inc:829
+#: plugins/admin/systems/class_workstationStartup.inc:876
 #: plugins/admin/systems/class_terminalService.inc:190
+#: plugins/admin/systems/class_dhcpAdvanced.inc:78
+#: plugins/admin/systems/class_dhcpAdvanced.inc:87
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:248
 msgid "automatic"
 msgstr "自动"
@@ -1616,7 +1651,7 @@ msgstr "创建 posix 账户"
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
-msgstr "这个账户已经启用 posix 功能。要启用请点击下面按钮。"
+msgstr "这个账户已经禁用 posix 功能。要启用请点击下面按钮。"
 
 #: plugins/personal/posix/class_posixAccount.inc:438
 #, php-format
@@ -1638,110 +1673,102 @@ msgstr "口令过期 %s 天后，禁用账号"
 msgid "Warn user %s days before password expiery"
 msgstr "在口令过期 %s 天之前警告用户"
 
-#: plugins/personal/posix/class_posixAccount.inc:559
+#: plugins/personal/posix/class_posixAccount.inc:558
 #: plugins/personal/samba/class_sambaAccount.inc:491
-#: plugins/admin/systems/class_terminalGeneric.inc:99
-#: ihtml/themes/altlinux/setup_step4.tpl:91
-#: ihtml/themes/default/setup_step4.tpl:91 setup/setup_config2.tpl:103
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: setup/setup_config2.tpl:187
 msgid "disabled"
 msgstr "禁用"
 
-#: plugins/personal/posix/class_posixAccount.inc:559
+#: plugins/personal/posix/class_posixAccount.inc:558
 msgid "full access"
 msgstr "完全访问权限"
 
-#: plugins/personal/posix/class_posixAccount.inc:560
+#: plugins/personal/posix/class_posixAccount.inc:559
 msgid "allow access to these hosts"
 msgstr "允许访问这些主机"
 
-#: plugins/personal/posix/class_posixAccount.inc:606
+#: plugins/personal/posix/class_posixAccount.inc:605
 msgid "Removing UNIX account failed"
 msgstr "删除 UNIX 账户失败"
 
-#: plugins/personal/posix/class_posixAccount.inc:755
+#: plugins/personal/posix/class_posixAccount.inc:757
 msgid "Failed: overriding lock"
 msgstr "失败：覆盖缩"
 
-#: plugins/personal/posix/class_posixAccount.inc:844
+#: plugins/personal/posix/class_posixAccount.inc:846
 msgid "Saving UNIX account failed"
 msgstr "保存 UNIX 账户失败"
 
-#: plugins/personal/posix/class_posixAccount.inc:907
+#: plugins/personal/posix/class_posixAccount.inc:919
 msgid "The required field 'Home directory' is not set."
 msgstr "需要的字段“用户主目录”没有设置。"
 
-#: plugins/personal/posix/class_posixAccount.inc:910
+#: plugins/personal/posix/class_posixAccount.inc:922
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr "请在“用户主目录”输入一个有效的地址。"
 
-#: plugins/personal/posix/class_posixAccount.inc:918
+#: plugins/personal/posix/class_posixAccount.inc:930
 msgid "Value specified as 'UID' is not valid."
 msgstr "'UID' 赋值无效。"
 
-#: plugins/personal/posix/class_posixAccount.inc:921
+#: plugins/personal/posix/class_posixAccount.inc:933
 msgid "Value specified as 'UID' is too small."
 msgstr "'UID' 赋值太小。"
 
-#: plugins/personal/posix/class_posixAccount.inc:925
-#: plugins/admin/groups/class_groupGeneric.inc:807
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:814
 msgid "Value specified as 'GID' is not valid."
 msgstr "'GID' 赋值无效。"
 
-#: plugins/personal/posix/class_posixAccount.inc:928
-#: plugins/admin/groups/class_groupGeneric.inc:810
+#: plugins/personal/posix/class_posixAccount.inc:940
+#: plugins/admin/groups/class_groupGeneric.inc:817
 msgid "Value specified as 'GID' is too small."
 msgstr "'UID' 赋值太小。"
 
-#: plugins/personal/posix/class_posixAccount.inc:936
+#: plugins/personal/posix/class_posixAccount.inc:948
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "'shadowMin' 赋值无效。"
 
-#: plugins/personal/posix/class_posixAccount.inc:941
+#: plugins/personal/posix/class_posixAccount.inc:953
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "'shadowMax' 赋值无效。"
 
-#: plugins/personal/posix/class_posixAccount.inc:946
+#: plugins/personal/posix/class_posixAccount.inc:958
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "'shadowWarning' 赋值无效。"
 
-#: plugins/personal/posix/class_posixAccount.inc:949
+#: plugins/personal/posix/class_posixAccount.inc:961
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "不提供 'shadowMax' 的 'shadowWarning' 没有意义。"
 
-#: plugins/personal/posix/class_posixAccount.inc:952
+#: plugins/personal/posix/class_posixAccount.inc:964
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr "提供的 'shadowWarning' 应该小于'shadowMax'。"
 
-#: plugins/personal/posix/class_posixAccount.inc:955
+#: plugins/personal/posix/class_posixAccount.inc:967
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr "提供的 'shadowWarning' 应该大于'shadowMin'。"
 
-#: plugins/personal/posix/class_posixAccount.inc:960
+#: plugins/personal/posix/class_posixAccount.inc:972
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "'shadowInactive' 赋值无效。"
 
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:975
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "不提供 'shadowMax' 的 'shadowInactive' 没有意义。"
 
-#: plugins/personal/posix/class_posixAccount.inc:968
+#: plugins/personal/posix/class_posixAccount.inc:980
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr "提供的 'shadowMin' 应该小于'shadowMax'。"
 
-#: plugins/personal/posix/class_posixAccount.inc:1116
+#: plugins/personal/posix/class_posixAccount.inc:1128
 msgid "Too many users, can't allocate a free ID!"
 msgstr "太多用户，无法分配一个可用的 ID！"
 
-#: plugins/personal/netatalk/main.inc:104
-#: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:24
-#: setup/class_setupStep_Finish.inc:37
-msgid "Finish"
-msgstr "完成"
-
-#: plugins/personal/netatalk/main.inc:121
-msgid "Netatalk settings"
-msgstr "Netatalk 设置"
+#: plugins/personal/posix/main.inc:132
+msgid "Unix settings"
+msgstr "Unix 设置"
 
 #: plugins/personal/netatalk/class_netatalk.inc:37
 msgid "Manage netatalk account"
@@ -1793,61 +1820,40 @@ msgstr "共享"
 msgid "Path"
 msgstr "路径"
 
-#: plugins/personal/samba/samba2.tpl:13
-msgid "Samba home"
-msgstr "Samba 主目录"
-
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
-msgid "Script path"
-msgstr "脚本路径"
-
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:699
-msgid "Profile path"
-msgstr "Profile path"
-
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
-msgid "Access options"
-msgstr "访问选项"
-
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
-msgid "Allow user to change password from client"
-msgstr "允许用户从客户端修改口令"
-
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:263
-msgid "Login from windows client requires no password"
-msgstr "从 Windows 客户端登录不需要口令"
+#: plugins/personal/netatalk/main.inc:104 setup/class_setupStep_Finish.inc:37
+#: ihtml/themes/default/copyPasteDialog.tpl:24
+msgid "Finish"
+msgstr "完成"
 
-#: plugins/personal/samba/samba2.tpl:60
-msgid "Temporary disable samba account"
-msgstr "临时禁用 samba 账号"
+#: plugins/personal/netatalk/main.inc:121
+msgid "Netatalk settings"
+msgstr "Netatalk 设置"
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:62
+#: plugins/personal/samba/class_sambaLogonHours.inc:64
 msgid "Sunday"
 msgstr "星期日"
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:63
+#: plugins/personal/samba/class_sambaLogonHours.inc:65
 msgid "Monday"
 msgstr "星期一"
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:64
+#: plugins/personal/samba/class_sambaLogonHours.inc:66
 msgid "Tuesday"
 msgstr "星期二"
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:65
+#: plugins/personal/samba/class_sambaLogonHours.inc:67
 msgid "Wednesday"
 msgstr "星期三"
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:66
+#: plugins/personal/samba/class_sambaLogonHours.inc:68
 msgid "Thursday"
 msgstr "星期四"
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:67
+#: plugins/personal/samba/class_sambaLogonHours.inc:69
 msgid "Friday"
 msgstr "星期五"
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:68
+#: plugins/personal/samba/class_sambaLogonHours.inc:70
 msgid "Saturday"
 msgstr "星期六"
 
@@ -1856,12 +1862,15 @@ msgid "Specify the hours this user is allowed to log in"
 msgstr "指定用户允许登录几个小时"
 
 #: plugins/personal/samba/sambaLogonHours.tpl:27
+#: plugins/addons/gotomasses/class_goto_task.inc:323
+#: plugins/addons/gotomasses/goto_task.tpl:151
 msgid "Hour"
 msgstr "小时"
 
 #: plugins/personal/samba/sambaLogonHours.tpl:90
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/addons/gotomasses/goto_task.tpl:198
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: plugins/admin/fai/faiScriptEntry.tpl:68
@@ -1874,6 +1883,7 @@ msgstr "小时"
 #: plugins/admin/groups/application_options.tpl:11
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:408
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:266
 #: include/sieve/templates/create_script.tpl:13 setup/setup_ldap.tpl:16
 #: setup/setup_migrate.tpl:131 setup/setup_migrate.tpl:182
@@ -1882,7 +1892,38 @@ msgstr "小时"
 msgid "Apply"
 msgstr "应用"
 
+#: plugins/personal/samba/samba2.tpl:13
+msgid "Samba home"
+msgstr "Samba 主目录"
+
+#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+msgid "Script path"
+msgstr "脚本路径"
+
+#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
+#: plugins/personal/samba/samba3.tpl:104
+#: plugins/personal/samba/class_sambaAccount.inc:699
+msgid "Profile path"
+msgstr "Profile path"
+
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
+msgid "Access options"
+msgstr "访问选项"
+
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
+msgid "Allow user to change password from client"
+msgstr "允许用户从客户端修改口令"
+
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:263
+msgid "Login from windows client requires no password"
+msgstr "从 Windows 客户端登录不需要口令"
+
+#: plugins/personal/samba/samba2.tpl:60
+msgid "Temporary disable samba account"
+msgstr "临时禁用 samba 账号"
+
 #: plugins/personal/samba/samba3.tpl:23
+#: plugins/admin/systems/dhcp_network.tpl:52
 msgid "Domain"
 msgstr "域"
 
@@ -1948,7 +1989,7 @@ msgstr "杂项"
 
 #: plugins/personal/samba/samba3.tpl:222
 msgid "Shadowing"
-msgstr ""
+msgstr "Shadowing"
 
 #: plugins/personal/samba/samba3.tpl:231
 msgid "On broken or timed out"
@@ -1986,10 +2027,6 @@ msgstr "编辑设置..."
 msgid "Allow connection from these workstations only"
 msgstr "只允许从这些工作站建立连接"
 
-#: plugins/personal/samba/main.inc:124 setup/setup_config2.tpl:2
-msgid "Samba settings"
-msgstr "Samba 设置"
-
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "选择要添加的工作站"
@@ -1998,6 +2035,10 @@ msgstr "选择要添加的工作站"
 msgid "Display workstations of department"
 msgstr "显示部门的工作站"
 
+#: plugins/personal/samba/main.inc:124 setup/setup_config2.tpl:2
+msgid "Samba settings"
+msgstr "Samba 设置"
+
 #: plugins/personal/samba/class_sambaAccount.inc:209
 msgid "This account has no samba extensions."
 msgstr "这个账号没有 samba 扩展。"
@@ -2082,25 +2123,144 @@ msgid ""
 "than eight."
 msgstr "Windows 用户管理员只允许八个客户。您指定的超过八个。"
 
-#: plugins/personal/samba/class_sambaAccount.inc:924
+#: plugins/personal/samba/class_sambaAccount.inc:939
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
 msgstr "警告：这个账号分配了一个未定义的 samba SID。这个问题不能被 GOsa 解决。"
 
-#: plugins/personal/samba/class_sambaAccount.inc:948
+#: plugins/personal/samba/class_sambaAccount.inc:963
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr "警告: 无法识别用户主要组──无法转换到一个 samba 组。"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1067
 msgid "Saving Samba account failed"
 msgstr "保存 Samba 账号失败"
 
-#: plugins/personal/environment/main.inc:125
-msgid "User environment settings"
-msgstr "用户环境设置"
+#: plugins/personal/scalix/generic.tpl:7
+msgid "Scalix mailnode"
+msgstr "Scalix mailnode"
+
+#: plugins/personal/scalix/generic.tpl:11
+msgid "Scalix mailbox class"
+msgstr "Scalix 邮箱类别"
+
+#: plugins/personal/scalix/generic.tpl:14
+#, fuzzy
+msgid ""
+"Limited users can not make use of the group calendar functionality in Scalix"
+msgstr "限制级用户不能使用 Scalix 的组日历功能"
+
+#: plugins/personal/scalix/generic.tpl:20
+msgid "Scalix server language"
+msgstr "Scalix 服务器语言"
+
+#: plugins/personal/scalix/generic.tpl:23
+msgid "Message catalog language for client."
+msgstr "客户的消息分类语言。"
+
+#: plugins/personal/scalix/generic.tpl:36
+msgid "Select for admin capability."
+msgstr "选择管理员功能。"
+
+#: plugins/personal/scalix/generic.tpl:36
+msgid "Scalix Administrator"
+msgstr "Scalix 管理员"
+
+#: plugins/personal/scalix/generic.tpl:39
+msgid "Select for mailbox admin capability."
+msgstr "选择邮箱管理能力。"
+
+#: plugins/personal/scalix/generic.tpl:39
+msgid "Scalix Mailbox Administrator"
+msgstr "Scalix 邮箱管理员"
+
+#: plugins/personal/scalix/generic.tpl:42
+msgid "Hide user entry from addressbook."
+msgstr "从地址簿隐藏用户条目。"
+
+#: plugins/personal/scalix/generic.tpl:42
+msgid "Hide this user entry in Scalix"
+msgstr "在 Scalix 中隐藏该用户条目"
+
+#: plugins/personal/scalix/generic.tpl:50
+msgid "Limit mailbox size"
+msgstr "限制邮箱大小"
+
+#: plugins/personal/scalix/generic.tpl:56
+msgid "As sanction on mailbox quota overuse, stop user from sending mail."
+msgstr "因为邮箱的 sanction 的 quota 超出配额，停止发送邮件。"
+
+#: plugins/personal/scalix/generic.tpl:56
+msgid "Limit Outbound Mail"
+msgstr "限制出栈邮件"
+
+#: plugins/personal/scalix/generic.tpl:59
+msgid "As sanction on mailbox quota overuse, stop user from receiving mail."
+msgstr "因为邮箱的 sanction 的 quota 超出配额，停止接收邮件。"
+
+#: plugins/personal/scalix/generic.tpl:59
+msgid "Limit Inbound Mail"
+msgstr "限制入栈邮件"
+
+#: plugins/personal/scalix/generic.tpl:62
+msgid "As sanction on mailbox quota overuse, notify the user by eMail."
+msgstr "因为邮箱的 sanction 的 quota 超出配额，邮件通知用户。"
+
+#: plugins/personal/scalix/generic.tpl:62
+msgid "Notify User"
+msgstr "通知用户"
+
+#: plugins/personal/scalix/generic.tpl:74
+#: plugins/admin/groups/acl_definition.inc:452
+msgid "Scalix email addresses"
+msgstr "Scalix 邮件地址"
+
+#: plugins/personal/scalix/generic.tpl:76
+msgid "List of scalix email addresses"
+msgstr "Scalix 邮件地址列表"
+
+#: plugins/personal/scalix/main.inc:128
+msgid "Scalix settings"
+msgstr "Scalix 选项"
+
+#: plugins/personal/scalix/class_scalixAccount.inc:120
+msgid "This account has no scalix extensions."
+msgstr "这个账号没有 scalix 扩展。"
+
+#: plugins/personal/scalix/class_scalixAccount.inc:129
+msgid "Remove scalix account"
+msgstr "删除 scalix 账户"
+
+#: plugins/personal/scalix/class_scalixAccount.inc:130
+msgid ""
+"This account has scalix synchronization enabled. You can disable it by "
+"clicking below."
+msgstr "这个账户已经启用 scalix 同步功能。要禁用请点击下面按钮。"
+
+#: plugins/personal/scalix/class_scalixAccount.inc:132
+msgid "Create scalix account"
+msgstr "创建 scalix 账户"
+
+#: plugins/personal/scalix/class_scalixAccount.inc:132
+msgid ""
+"This account has scalix synchronization disabled. You can enable it by "
+"clicking below."
+msgstr "这个账户已经禁用 scalix 同步功能。要启用请点击下面按钮。"
+
+#: plugins/personal/scalix/class_scalixAccount.inc:346
+msgid "There is no scalix mailnode specified."
+msgstr "没有定义 scalix mailnode。"
+
+#: plugins/personal/scalix/class_scalixAccount.inc:349
+msgid "scalixScalixObject must be set!"
+msgstr "scalixScalixObject 必须设置!"
+
+#: plugins/personal/scalix/class_scalixAccount.inc:365
+msgid "Value in 'Limit Mailbox size' is not valid."
+msgstr "'限制邮箱大小' 的值无效。"
 
 #: plugins/personal/environment/class_hotplugDialog.inc:122
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
@@ -2110,27 +2270,27 @@ msgstr "请提供一个有效名称。只允许 0-9 a-Z。"
 msgid "Invalid character in description. Please specify a valid description."
 msgstr "描述中发现无效字符。请给出一个有效的描述。"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:131
+#: plugins/personal/environment/class_hotplugDialog.inc:130
 msgid "Please specify a valid iSerial."
 msgstr "请输入一个有效的 iSerial。"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:135
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 msgid "Please specify a valid vendor ID. (2 byte hex like '0xFFFF')"
 msgstr "请指定一个有效的供应商 ID。（两字节十六进制，如 '0xFFFF'）"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:138
+#: plugins/personal/environment/class_hotplugDialog.inc:136
 msgid "Please specify a valid product ID. (2 byte hex like '0xFFFF')"
 msgstr "请指定一个有效的产品 ID。（两字节十六进制，如 '0xFFFF'）"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:143
+#: plugins/personal/environment/class_hotplugDialog.inc:141
 msgid "An Entry with this name already exists."
 msgstr "同名的条目已经存在。"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:148
+#: plugins/personal/environment/class_hotplugDialog.inc:146
 msgid "Please select an entry or press cancel."
 msgstr "请选择一个条目或者按取消。"
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:64
+#: plugins/personal/environment/class_selectPrinterDialog.inc:72
 #: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
 msgid "Please select a printer or press cancel."
 msgstr "请选择一个打印机或者取消。"
@@ -2165,11 +2325,11 @@ msgstr "显示匹配的用户"
 msgid "Regular expression for        matching hotplugs"
 msgstr "用于匹配热插拔的正则表达式"
 
-#: plugins/personal/environment/class_environment.inc:182
+#: plugins/personal/environment/class_environment.inc:194
 msgid "auto"
 msgstr "自动"
 
-#: plugins/personal/environment/class_environment.inc:204
+#: plugins/personal/environment/class_environment.inc:216
 #: plugins/admin/systems/class_workstationService.inc:83
 #: plugins/admin/systems/class_terminalService.inc:91
 #, php-format
@@ -2178,101 +2338,103 @@ msgid ""
 "check the permission of the file '%s'."
 msgstr "您已经定义的一个外部钩子解决方案无法访问，请检查文件 '%s' 的权限。"
 
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:344
+#: plugins/personal/environment/class_environment.inc:228
+#: plugins/personal/environment/class_environment.inc:475
+#: plugins/personal/environment/class_environment.inc:824
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:402
+msgid "None"
+msgstr "无"
+
+#: plugins/personal/environment/class_environment.inc:323
+#: plugins/personal/environment/class_environment.inc:367
 msgid "Remove environment extension"
 msgstr "删除环境变量扩展"
 
-#: plugins/personal/environment/class_environment.inc:301
-#: plugins/personal/environment/class_environment.inc:345
+#: plugins/personal/environment/class_environment.inc:324
+#: plugins/personal/environment/class_environment.inc:368
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr "环境变量扩展已经启用。您可以点击下面按钮禁用。"
 
-#: plugins/personal/environment/class_environment.inc:310
-#: plugins/personal/environment/class_environment.inc:315
-#: plugins/personal/environment/class_environment.inc:350
-#: plugins/personal/environment/class_environment.inc:355
+#: plugins/personal/environment/class_environment.inc:333
+#: plugins/personal/environment/class_environment.inc:338
+#: plugins/personal/environment/class_environment.inc:373
+#: plugins/personal/environment/class_environment.inc:378
 msgid "Add environment extension"
 msgstr "添加环境变量扩展"
 
-#: plugins/personal/environment/class_environment.inc:311
-#: plugins/personal/environment/class_environment.inc:351
+#: plugins/personal/environment/class_environment.inc:334
+#: plugins/personal/environment/class_environment.inc:374
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr "环境变量扩展已禁用。您可以点击下面按钮重新启用。"
 
-#: plugins/personal/environment/class_environment.inc:316
-#: plugins/personal/environment/class_environment.inc:356
+#: plugins/personal/environment/class_environment.inc:339
+#: plugins/personal/environment/class_environment.inc:379
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr "环境变量扩展已禁用。在启用这个功能前，您必须设置一个 posix 账号。"
 
-#: plugins/personal/environment/class_environment.inc:467
-#: plugins/personal/environment/class_environment.inc:800
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:401
-msgid "None"
-msgstr "无"
-
-#: plugins/personal/environment/class_environment.inc:551
-#: plugins/personal/environment/class_environment.inc:564
-#: plugins/admin/systems/class_workstationStartup.inc:642
+#: plugins/personal/environment/class_environment.inc:575
+#: plugins/personal/environment/class_environment.inc:588
+#: plugins/admin/systems/class_workstationStartup.inc:673
 #: plugins/admin/systems/class_terminalStartup.inc:204
 msgid "You must specify a valid mount point."
 msgstr "您必须提供一个有效的挂载点。"
 
-#: plugins/personal/environment/class_environment.inc:553
+#: plugins/personal/environment/class_environment.inc:577
 msgid "Spaces are not allowed in the mount path!"
 msgstr "挂载路径不允许有空格！"
 
-#: plugins/personal/environment/class_environment.inc:634
-#: plugins/personal/environment/class_environment.inc:635
-#: plugins/personal/environment/class_environment.inc:643
-#: plugins/personal/environment/class_environment.inc:644
+#: plugins/personal/environment/class_environment.inc:658
+#: plugins/personal/environment/class_environment.inc:659
+#: plugins/personal/environment/class_environment.inc:667
+#: plugins/personal/environment/class_environment.inc:668
 msgid "Reset password hash"
 msgstr "重置口令"
 
-#: plugins/personal/environment/class_environment.inc:649
+#: plugins/personal/environment/class_environment.inc:673
 msgid "Delete share entry"
 msgstr "删除共享条目"
 
-#: plugins/personal/environment/class_environment.inc:803
+#: plugins/personal/environment/class_environment.inc:827
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr "选择的 kiosk profile '%s' 不存在，设置当前 profile 为 'none'。"
 
-#: plugins/personal/environment/class_environment.inc:849
+#: plugins/personal/environment/class_environment.inc:873
 msgid "Removing environment information failed"
 msgstr "删除环境变量信息失败"
 
-#: plugins/personal/environment/class_environment.inc:901
+#: plugins/personal/environment/class_environment.inc:925
 msgid "Please set a valid profile quota size."
 msgstr "请输入一个有效的 profile quota 大小。"
 
-#: plugins/personal/environment/class_environment.inc:908
+#: plugins/personal/environment/class_environment.inc:932
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr "为了启用环境功能，您需要设置一个有效的 posix 扩展。"
 
-#: plugins/personal/environment/class_environment.inc:946
+#: plugins/personal/environment/class_environment.inc:970
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr "无法保存新的 kiosk profiles，可能是目录的权限不对"
 
-#: plugins/personal/environment/class_environment.inc:1099
+#: plugins/personal/environment/class_environment.inc:1123
 msgid "Adding environment information failed"
 msgstr "添加环境信息失败"
 
-#: plugins/personal/environment/class_environment.inc:1112
+#: plugins/personal/environment/class_environment.inc:1136
 msgid "group share"
 msgstr "组共享"
 
-#: plugins/personal/environment/class_environment.inc:1144
+#: plugins/personal/environment/class_environment.inc:1168
+#: plugins/admin/groups/acl_definition.inc:445
 msgid "Administrator"
 msgstr "管理员"
 
-#: plugins/personal/environment/class_environment.inc:1149
+#: plugins/personal/environment/class_environment.inc:1173
 msgid "Default printer"
 msgstr "缺省打印机"
 
@@ -2286,11 +2448,28 @@ msgstr "添加打印设备"
 msgid "Select printer to add"
 msgstr "选择要添加的打印机"
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:43
+#: plugins/personal/environment/selectPrinterDialog.tpl:42
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:54
+#: plugins/addons/gotomasses/class_target_list.inc:54
+#: plugins/admin/groups/class_divListGroup.inc:62
+#: plugins/admin/users/class_divListUsers.inc:63
+#: plugins/admin/applications/class_divListApplication.inc:48
+#: plugins/admin/departments/class_divListDepartment.inc:46
+#: plugins/admin/systems/class_divListSystem.inc:71
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:60
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+#: plugins/gofon/macro/class_divListMacros.inc:51
+#: plugins/gofon/conference/class_divListConferences.inc:52
+msgid "Select to search within subtrees"
+msgstr "选择在子树中查询"
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:48
 msgid "Display printers matching"
 msgstr "显示匹配的打印机"
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:48
+#: plugins/personal/environment/selectPrinterDialog.tpl:53
 msgid "Regular expression for matching printer names"
 msgstr "匹配打印机名的正则表达式"
 
@@ -2299,8 +2478,8 @@ msgid "The environment extension is currently disabled."
 msgstr "环境变量扩展当前被禁用。"
 
 #: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:103
-#: plugins/personal/environment/environment.tpl:148
+#: plugins/personal/environment/environment.tpl:136
+#: plugins/personal/environment/environment.tpl:181
 msgid "Environment managment settings"
 msgstr "环境变量管理设置"
 
@@ -2328,107 +2507,111 @@ msgstr "Profil quota"
 msgid "Cache profile localy"
 msgstr "本地缓存 profile"
 
-#: plugins/personal/environment/environment.tpl:63
+#: plugins/personal/environment/environment.tpl:66
+#: plugins/personal/environment/environment.tpl:101
 msgid "Kiosk profile settings"
 msgstr "Kiosk profile 设置"
 
-#: plugins/personal/environment/environment.tpl:66
+#: plugins/personal/environment/environment.tpl:69
+#: plugins/personal/environment/environment.tpl:104
 msgid "Kiosk profile"
 msgstr "Kiosk profile"
 
-#: plugins/personal/environment/environment.tpl:72
+#: plugins/personal/environment/environment.tpl:75
+#: plugins/personal/environment/environment.tpl:108
 msgid "Manage"
 msgstr "管理"
 
-#: plugins/personal/environment/environment.tpl:82
+#: plugins/personal/environment/environment.tpl:85
+#: plugins/personal/environment/environment.tpl:115
 msgid "Resolution changeable during session"
-msgstr "会话间允许修改分辨率"
+msgstr "会话期间分辨率可调"
 
-#: plugins/personal/environment/environment.tpl:87
+#: plugins/personal/environment/environment.tpl:90
+#: plugins/personal/environment/environment.tpl:120
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "分辨率"
 
-#: plugins/personal/environment/environment.tpl:106
-#: plugins/admin/systems/workstationStartup.tpl:133
+#: plugins/personal/environment/environment.tpl:139
+#: plugins/admin/systems/workstationStartup.tpl:150
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/servservice.tpl:11
 msgid "Shares"
 msgstr "共享"
 
-#: plugins/personal/environment/environment.tpl:111
+#: plugins/personal/environment/environment.tpl:144
 msgid "User used to connect to the share"
 msgstr "用户习惯连接这个共享"
 
-#: plugins/personal/environment/environment.tpl:112
+#: plugins/personal/environment/environment.tpl:145
 msgid "Select a share"
 msgstr "选择一个共享"
 
-#: plugins/personal/environment/environment.tpl:118
+#: plugins/personal/environment/environment.tpl:151
 msgid "Mount path"
 msgstr "挂载路径"
 
-#: plugins/personal/environment/environment.tpl:120
+#: plugins/personal/environment/environment.tpl:153
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
 #: plugins/personal/connectivity/class_kolabAccount.inc:240
-#: plugins/admin/fai/faiPackage.tpl:72
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:274
-#: plugins/admin/groups/class_groupMail.inc:572
+#: plugins/addons/gotomasses/class_gotomasses.inc:221
+#: plugins/admin/fai/faiPackage.tpl:73
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
+#: plugins/admin/groups/class_groupMail.inc:582
 #: plugins/admin/applications/class_applicationParameters.inc:108
 #: plugins/admin/systems/glpiPrinter.tpl:122
-#: plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/workstationStartup.tpl:148
+#: plugins/admin/systems/workstationStartup.tpl:165
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/goSpamServer.tpl:37
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:447
 #: plugins/admin/systems/printer.tpl:53
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:395
-#: ihtml/themes/altlinux/islocked.tpl:13
 msgid "Remove"
 msgstr "删除"
 
-#: plugins/personal/environment/environment.tpl:126
+#: plugins/personal/environment/environment.tpl:159
 msgid "Logon scripts"
 msgstr "登录脚本"
 
-#: plugins/personal/environment/environment.tpl:127
+#: plugins/personal/environment/environment.tpl:160
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
 msgstr "登录脚本管理"
 
-#: plugins/personal/environment/environment.tpl:151
+#: plugins/personal/environment/environment.tpl:184
 msgid "Hotplug devices"
 msgstr "热插拔设备"
 
-#: plugins/personal/environment/environment.tpl:152
+#: plugins/personal/environment/environment.tpl:185
 msgid "Hotplug device settings"
 msgstr "热插拔设备设置"
 
-#: plugins/personal/environment/environment.tpl:163
+#: plugins/personal/environment/environment.tpl:196
 #: plugins/admin/groups/class_divListGroup.inc:93
 #: plugins/gofon/macro/class_divListMacros.inc:74
 msgid "New"
 msgstr "新"
 
-#: plugins/personal/environment/environment.tpl:164
+#: plugins/personal/environment/environment.tpl:197
 msgid "Existing"
 msgstr "现存"
 
-#: plugins/personal/environment/environment.tpl:172
+#: plugins/personal/environment/environment.tpl:205
 msgid "Printer settings"
 msgstr "打印机设置"
 
-#: plugins/personal/environment/environment.tpl:182
+#: plugins/personal/environment/environment.tpl:215
 msgid "Toggle admin"
 msgstr "切换管理员"
 
-#: plugins/personal/environment/environment.tpl:184
-#: plugins/personal/environment/environment.tpl:186
+#: plugins/personal/environment/environment.tpl:217
+#: plugins/personal/environment/environment.tpl:219
 msgid "Toggle default"
 msgstr "切换缺省"
 
@@ -2450,38 +2633,41 @@ msgstr "登录脚本设置"
 
 #: plugins/personal/environment/logonManagement.tpl:10
 #: include/sieve/templates/create_script.tpl:8
-#, fuzzy
 msgid "Script name"
 msgstr "脚本名称"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/addons/gotomasses/class_goto_task.inc:325
+#: plugins/addons/gotomasses/goto_task.tpl:12
 #: plugins/admin/fai/faiPartitionTable.tpl:19
+#: plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
-#: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
-#: plugins/admin/fai/faiHookEntry.tpl:17
-#: plugins/admin/fai/faiTemplateEntry.tpl:11
+#: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
 #: plugins/admin/systems/server.tpl:10 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/systems/phone.tpl:30 plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:41
-#: plugins/gofon/conference/generic.tpl:64
+#: plugins/admin/systems/ArpNewDevice.tpl:17
+#: plugins/admin/mimetypes/paste_generic.tpl:21
+#: plugins/admin/mimetypes/generic.tpl:30 plugins/admin/ogroups/generic.tpl:13
+#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:64
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
 msgstr "描述"
 
 #: plugins/personal/environment/logonManagement.tpl:24
+#: plugins/admin/fai/class_faiScript.inc:297
 #: plugins/admin/fai/faiScriptEntry.tpl:34
 msgid "Priority"
 msgstr "优先级"
@@ -2491,7 +2677,6 @@ msgid "Logon script flags"
 msgstr "登录脚本标志"
 
 #: plugins/personal/environment/logonManagement.tpl:38
-#, fuzzy
 msgid "Last script"
 msgstr "最后脚本"
 
@@ -2503,24 +2688,30 @@ msgstr "可以被用户替换的脚本"
 msgid "Logon script"
 msgstr "登录脚本"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:70
-#: plugins/personal/environment/class_kioskManagementDialog.inc:89
+#: plugins/personal/environment/class_kioskManagementDialog.inc:79
+#, fuzzy, php-format
+msgid ""
+"Can't remove kiosk profile, it is still in use by the following objects '%s'."
+msgstr "您不能删除 kioks profile，它仍被这些对象 '%s' 使用。"
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:87
+#: plugins/personal/environment/class_kioskManagementDialog.inc:106
 #, php-format
 msgid "Can't delete '%s'. Error was: permission denied."
 msgstr "无法删除 '%s'。错误：没有权限。"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:73
-#: plugins/personal/environment/class_kioskManagementDialog.inc:92
-#, php-format
-msgid "Can't delete '%s'. Errow was: file doesn't exist."
+#: plugins/personal/environment/class_kioskManagementDialog.inc:90
+#: plugins/personal/environment/class_kioskManagementDialog.inc:109
+#, fuzzy, php-format
+msgid "Can't delete '%s'. Error was: file doesn't exist."
 msgstr "无法删除 '%s'。错误：文件不存在。"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:134
+#: plugins/personal/environment/class_kioskManagementDialog.inc:151
 msgid ""
 "There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
 msgstr "您的 gosa.conf 文件中没有定义 KIOSKPATH。无法管理 kiosk profiles！"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:140
+#: plugins/personal/environment/class_kioskManagementDialog.inc:157
 #, php-format
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr "无法访问 kiosk 路径 '%s'。请检查权限。"
@@ -2583,202 +2774,84 @@ msgstr "浏览"
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:79 setup/setup_migrate.tpl:79
+#: include/class_MultiSelectWindow.inc:80 setup/setup_migrate.tpl:79
 msgid "Close"
 msgstr "关闭"
 
-#: plugins/personal/generic/class_user.inc:260
-msgid "female"
-msgstr "女"
-
-#: plugins/personal/generic/class_user.inc:260
-msgid "male"
-msgstr "男"
-
-#: plugins/personal/generic/class_user.inc:277
-msgid "This account has no valid GOsa extensions."
-msgstr "该账户没有有效的 Gosa 扩展。"
-
-#: plugins/personal/generic/class_user.inc:331
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr "指定的文件没有通过 HTTP POST 上传！退出。"
-
-#: plugins/personal/generic/class_user.inc:427
-msgid "Please enter a valid serial number"
-msgstr "请输入一个有效的系列号"
+#: plugins/personal/environment/main.inc:125
+msgid "User environment settings"
+msgstr "用户环境设置"
 
-#: plugins/personal/generic/class_user.inc:467
+#: plugins/personal/generic/password.tpl:2
 msgid ""
-"(Some types of certificates are currently not supported and may be displayed "
-"as 'invalid'.)"
-msgstr "（目前有的种类的证书不支持，可能显示为“无效”）"
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+"您已经修改了口令在 LDAP 数据库中存储的方法。因此您需要再输入您的口令。GOsa 将"
+"会按照您选择的方法重新编码。"
 
-#: plugins/personal/generic/class_user.inc:477
-#, php-format
-msgid "Certificate is valid from %s to %s and is currently %s."
-msgstr "证书从 %s 到 %s 是有效的，当前为 %s。"
+#: plugins/personal/generic/generic_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
+#: plugins/personal/generic/paste_generic.tpl:37
+#: plugins/personal/generic/generic.tpl:19
+#: plugins/personal/generic/generic.tpl:32
+msgid "Personal picture"
+msgstr "个人图片"
 
-#: plugins/personal/generic/class_user.inc:480
-msgid "valid"
-msgstr "有效"
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:52
+msgid "Remove picture"
+msgstr "删除图片"
 
-#: plugins/personal/generic/class_user.inc:481
-msgid "invalid"
-msgstr "无效"
+#: plugins/personal/generic/paste_generic.tpl:1
+msgid "User settings"
+msgstr "用户设置"
 
-#: plugins/personal/generic/class_user.inc:485
-msgid "No certificate installed"
-msgstr "未安装证书"
-
-#: plugins/personal/generic/class_user.inc:568
-msgid "Removing generic user account failed"
-msgstr "删除一般用户账号失败"
-
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:936
-msgid "Kerberos database communication failed"
-msgstr "Kerberos 数据库通讯失败"
-
-#: plugins/personal/generic/class_user.inc:614
-#: plugins/personal/generic/class_user.inc:953
-msgid "Can't remove user from kerberos database."
-msgstr "无法从 kerberos 数据库删除用户"
-
-#: plugins/personal/generic/class_user.inc:889
-msgid "Saving generic user account failed"
-msgstr "保存一般用户账号失败"
-
-#: plugins/personal/generic/class_user.inc:964
-msgid "Can't add user to kerberos database."
-msgstr "无法添加用户到 kerberos 数据库"
-
-#: plugins/personal/generic/class_user.inc:1021
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr "您无权在 'Base' 下创建一个用户。"
-
-#: plugins/personal/generic/class_user.inc:1026
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr "您无权从原 'Base' 移动一个用户。"
-
-#: plugins/personal/generic/class_user.inc:1032
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
-msgid "The required field 'Name' is not set."
-msgstr "需要的“姓名”字段没有设置"
-
-#: plugins/personal/generic/class_user.inc:1041
-msgid "There's already a person with this 'Login' in the database."
-msgstr "数据库中已经有同样登录名的用户。"
-
-#: plugins/personal/generic/class_user.inc:1047
-#: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
-msgid "The required field 'Given name' is not set."
-msgstr "需要的“教名”字段没有设置"
-
-#: plugins/personal/generic/class_user.inc:1050
-msgid "The required field 'Login' is not set."
-msgstr "需要的“登录名”字段没有设置"
-
-#: plugins/personal/generic/class_user.inc:1055
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr "数据库中已经有同样“姓名/教名”组合的用户。"
-
-#: plugins/personal/generic/class_user.inc:1062
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr "登录名包含无效字符。只允许小写字母，数字和短线。"
-
-#: plugins/personal/generic/class_user.inc:1065
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr "“主页”字段包含无效 URL 定义"
-
-#: plugins/personal/generic/class_user.inc:1068
-#: plugins/personal/generic/class_user.inc:1093
-#: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/addons/addressbook/class_addressbook.inc:593
-#: plugins/admin/departments/class_departmentGeneric.inc:243
-msgid "The field 'Name' contains invalid characters."
-msgstr "“姓名”字段包含无效字符。"
-
-#: plugins/personal/generic/class_user.inc:1071
-#: plugins/personal/generic/class_user.inc:1090
-#: plugins/addons/addressbook/class_addressbook.inc:568
-#: plugins/addons/addressbook/class_addressbook.inc:590
-msgid "The field 'Given name' contains invalid characters."
-msgstr "“教名”字段包含无效字符。"
+#: plugins/personal/generic/paste_generic.tpl:7
+#: plugins/personal/generic/generic.tpl:43
+#: plugins/addons/addressbook/address_edit.tpl:30
+#: plugins/admin/users/template.tpl:23
+msgid "Last name"
+msgstr "姓"
 
-#: plugins/personal/generic/class_user.inc:1076
-#: plugins/addons/addressbook/class_addressbook.inc:573
-#: plugins/addons/addressbook/class_addressbook.inc:576
-#: plugins/admin/departments/class_departmentGeneric.inc:246
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr "“电话”字段包含无效电话号码。"
+#: plugins/personal/generic/paste_generic.tpl:11
+#: plugins/personal/generic/generic.tpl:55
+#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/admin/users/template.tpl:27
+msgid "First name"
+msgstr "名"
 
-#: plugins/personal/generic/class_user.inc:1079
-#: plugins/addons/addressbook/class_addressbook.inc:579
-#: plugins/admin/departments/class_departmentGeneric.inc:249
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr "“传真”字段包含一个无效电话号码"
+#: plugins/personal/generic/paste_generic.tpl:15
+#: plugins/personal/generic/generic.tpl:59 plugins/admin/users/template.tpl:32
+msgid "Login"
+msgstr "登录名"
 
-#: plugins/personal/generic/class_user.inc:1082
-#: plugins/addons/addressbook/class_addressbook.inc:582
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr "“手机”字段包含无效手机号码。"
+#: plugins/personal/generic/paste_generic.tpl:23
+msgid "Clear password"
+msgstr "清除口令"
 
-#: plugins/personal/generic/class_user.inc:1085
-#: plugins/addons/addressbook/class_addressbook.inc:585
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr "“传呼”字段包含无效电话号码。"
+#: plugins/personal/generic/paste_generic.tpl:24
+msgid "Set new password"
+msgstr "设置新密码"
 
-#: plugins/personal/generic/class_user.inc:1212
-msgid "Could not open specified certificate!"
-msgstr "无法打开指定证书！"
+#: plugins/personal/generic/paste_generic.tpl:47
+msgid "User picture"
+msgstr "用户图片"
 
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "个人信息"
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
-#: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
-#: plugins/personal/generic/paste_generic.tpl:37
-msgid "Personal picture"
-msgstr "个人图片"
-
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
 msgstr "更换图片"
 
-#: plugins/personal/generic/generic.tpl:43
-#: plugins/personal/generic/paste_generic.tpl:7
-#: plugins/addons/addressbook/address_edit.tpl:30
-#: plugins/admin/users/template.tpl:23
-msgid "Last name"
-msgstr "姓"
-
 #: plugins/personal/generic/generic.tpl:48
 msgid "Template name"
 msgstr "模板名称"
 
-#: plugins/personal/generic/generic.tpl:55
-#: plugins/personal/generic/paste_generic.tpl:11
-#: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/admin/users/template.tpl:27
-msgid "First name"
-msgstr "名"
-
-#: plugins/personal/generic/generic.tpl:59
-#: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/admin/users/template.tpl:32
-msgid "Login"
-msgstr "登录名"
-
 #: plugins/personal/generic/generic.tpl:67
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
@@ -2794,7 +2867,6 @@ msgid "Date of birth"
 msgstr "生日"
 
 #: plugins/personal/generic/generic.tpl:100
-#: ihtml/themes/altlinux/sizelimit.tpl:14
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "设置"
@@ -2809,33 +2881,34 @@ msgid "Preferred langage"
 msgstr "首选语种"
 
 #: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:79
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/fai/class_divListFai.inc:143
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/addons/gotomasses/class_target_list.inc:124
+#: plugins/admin/fai/class_divListFai.inc:153
 #: plugins/admin/groups/class_divListGroup.inc:96
 #: plugins/admin/groups/generic.tpl:21
 #: plugins/admin/users/class_divListUsers.inc:99
-#: plugins/admin/applications/generic.tpl:32
 #: plugins/admin/applications/class_divListApplication.inc:93
-#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/applications/generic.tpl:32
 #: plugins/admin/departments/class_divListDepartment.inc:72
-#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
-#: plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/systems/server.tpl:14 plugins/admin/systems/terminal.tpl:17
 #: plugins/admin/systems/class_divListSystem.inc:106
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/servservice.tpl:61 plugins/admin/systems/phone.tpl:13
 #: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/class_baseSelectDialog.inc:44
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:111
+#: plugins/admin/mimetypes/generic.tpl:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:102
-#: plugins/gofon/macro/generic.tpl:20
+#: plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/class_divListMacros.inc:76
-#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/macro/generic.tpl:20
 #: plugins/gofon/conference/class_divListConferences.inc:77
-#: setup/setup_ldap.tpl:55
+#: plugins/gofon/conference/generic.tpl:33 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr "位置"
 
@@ -2852,17 +2925,18 @@ msgstr "将用户放到所选择子树中"
 #: plugins/admin/applications/generic.tpl:41
 #: plugins/admin/departments/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:36
-#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/terminal.tpl:25
 #: plugins/admin/systems/server.tpl:21 plugins/admin/systems/server.tpl:23
+#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/terminal.tpl:25
 #: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/workstation.tpl:31 plugins/admin/systems/phone.tpl:19
-#: plugins/admin/systems/phone.tpl:21 plugins/admin/systems/component.tpl:19
-#: plugins/admin/systems/component.tpl:21 plugins/admin/systems/printer.tpl:26
+#: plugins/admin/systems/workstation.tpl:31
+#: plugins/admin/systems/component.tpl:19
+#: plugins/admin/systems/component.tpl:21 plugins/admin/systems/phone.tpl:19
+#: plugins/admin/systems/phone.tpl:21 plugins/admin/systems/printer.tpl:26
 #: plugins/admin/systems/printer.tpl:28
 #: plugins/admin/systems/wingeneric.tpl:18
-#: plugins/admin/ogroups/generic.tpl:27 plugins/admin/ogroups/generic.tpl:29
-#: plugins/gofon/macro/generic.tpl:27 plugins/gofon/macro/generic.tpl:29
-#: plugins/gofon/conference/generic.tpl:39
+#: plugins/admin/mimetypes/generic.tpl:43 plugins/admin/ogroups/generic.tpl:27
+#: plugins/admin/ogroups/generic.tpl:29 plugins/gofon/macro/generic.tpl:27
+#: plugins/gofon/macro/generic.tpl:29 plugins/gofon/conference/generic.tpl:39
 #: plugins/gofon/conference/generic.tpl:41
 msgid "Select a base"
 msgstr "选择一个位置"
@@ -2914,8 +2988,8 @@ msgstr "编辑属性"
 msgid "Organizational information"
 msgstr "组织信息"
 
-#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
-#: setup/setup_feedback.tpl:16
+#: plugins/personal/generic/generic.tpl:213 setup/setup_feedback.tpl:16
+#: html/getxls.php:236
 msgid "Organization"
 msgstr "组织/公司"
 
@@ -2925,6 +2999,7 @@ msgstr "组织/公司"
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/users/class_divListUsers.inc:50
 #: plugins/admin/applications/class_divListApplication.inc:44
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:366
 #: plugins/gofon/macro/class_divListMacros.inc:46
 #: plugins/generic/references/class_reference.inc:38
@@ -2949,14 +3024,13 @@ msgid "Room No."
 msgstr "房间号"
 
 #: plugins/personal/generic/generic.tpl:261
-#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
+#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "手机"
 
 #: plugins/personal/generic/generic.tpl:287
-#: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:47
 #: plugins/admin/departments/generic.tpl:55
 #: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
@@ -2979,7 +3053,7 @@ msgstr "单元描述"
 
 #: plugins/personal/generic/generic.tpl:321
 msgid "Subject area"
-msgstr ""
+msgstr "主题区域"
 
 #: plugins/personal/generic/generic.tpl:329
 msgid "Functional title"
@@ -2991,7 +3065,7 @@ msgstr "角色"
 
 #: plugins/personal/generic/generic.tpl:348
 msgid "Person locality"
-msgstr ""
+msgstr "个人处所"
 
 #: plugins/personal/generic/generic.tpl:356
 msgid "Unit"
@@ -3023,44 +3097,6 @@ msgstr "最后传递"
 msgid "Public visible"
 msgstr "公开"
 
-#: plugins/personal/generic/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
-msgstr ""
-"您已经修改了口令在 LDAP 数据库中存储的方法。因此您需要再输入您的口令。GOsa 将"
-"会按照您选择的方法重新编码。"
-
-#: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:52
-msgid "Remove picture"
-msgstr "删除图片"
-
-#: plugins/personal/generic/paste_generic.tpl:1
-msgid "User settings"
-msgstr "用户设置"
-
-#: plugins/personal/generic/paste_generic.tpl:23
-msgid "Clear password"
-msgstr "清除口令"
-
-#: plugins/personal/generic/paste_generic.tpl:24
-msgid "Set new password"
-msgstr "设置新密码"
-
-#: plugins/personal/generic/paste_generic.tpl:47
-msgid "User picture"
-msgstr "用户图片"
-
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "您无权修改您的口令！"
-
-#: plugins/personal/generic/main.inc:191
-msgid "Generic user information"
-msgstr "用户一般信息"
-
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "标准证书"
@@ -3077,93 +3113,192 @@ msgstr "PKCS12 证书"
 msgid "Certificate serial number"
 msgstr "证书系列号"
 
-#: plugins/personal/connectivity/intranet.tpl:3
-msgid "Intranet account"
-msgstr "å\86\85è\81\94ç½\91è´¦å\8f·"
+#: plugins/personal/generic/class_user.inc:262
+msgid "female"
+msgstr "女"
 
-#: plugins/personal/connectivity/proxy.tpl:10
-msgid "Proxy account"
-msgstr "代ç\90\86è´¦å\8f·"
+#: plugins/personal/generic/class_user.inc:262
+msgid "male"
+msgstr "ç\94·"
 
-#: plugins/personal/connectivity/proxy.tpl:18
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr "è¿\87滤ä¸\8dæ\83³è¦\81ç\9a\84å\86\85容ï¼\88å¦\82ï¼\9aè\89²æ\83\85æ\88\96æ\9a´å\8a\9bç\9b¸å\85³ï¼\89"
+#: plugins/personal/generic/class_user.inc:278
+msgid "This account has no valid GOsa extensions."
+msgstr "该账æ\88·æ²¡æ\9c\89æ\9c\89æ\95\88ç\9a\84 Gosa æ\89©å±\95ã\80\82"
 
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Limit proxy access to working time"
-msgstr "限制代理访问仅在工作时间"
+#: plugins/personal/generic/class_user.inc:332
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr "指定的文件没有通过 HTTP POST 上传！退出。"
 
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
-msgstr "通过 quota 限制代理使用"
+#: plugins/personal/generic/class_user.inc:428
+msgid "Please enter a valid serial number"
+msgstr "请输入一个有效的系列号"
 
-#: plugins/personal/connectivity/proxy.tpl:86
-msgid "per"
-msgstr "每"
+#: plugins/personal/generic/class_user.inc:468
+msgid ""
+"(Some types of certificates are currently not supported and may be displayed "
+"as 'invalid'.)"
+msgstr "（目前有的种类的证书不支持，可能显示为“无效”）"
 
-#: plugins/personal/connectivity/pptp.tpl:3
-msgid "PPTP account"
-msgstr "PPTP 账号"
+#: plugins/personal/generic/class_user.inc:478
+#, php-format
+msgid "Certificate is valid from %s to %s and is currently %s."
+msgstr "证书从 %s 到 %s 是有效的，当前为 %s。"
 
-#: plugins/personal/connectivity/pureftpd.tpl:4
-msgid "FTP account"
-msgstr "FTP 账号"
+#: plugins/personal/generic/class_user.inc:481
+msgid "valid"
+msgstr "有效"
 
-#: plugins/personal/connectivity/pureftpd.tpl:15
-#: plugins/admin/systems/glpi_devices.tpl:596
-msgid "Bandwidth"
-msgstr "带宽"
+#: plugins/personal/generic/class_user.inc:482
+msgid "invalid"
+msgstr "无效"
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Upload bandwidth"
-msgstr "上传带宽"
+#: plugins/personal/generic/class_user.inc:486
+msgid "No certificate installed"
+msgstr "未安装证书"
 
-#: plugins/personal/connectivity/pureftpd.tpl:20
-#: plugins/personal/connectivity/pureftpd.tpl:24
-msgid "kb/s"
-msgstr "kb/s"
+#: plugins/personal/generic/class_user.inc:569
+msgid "Removing generic user account failed"
+msgstr "删除一般用户账号失败"
 
-#: plugins/personal/connectivity/pureftpd.tpl:23
-msgid "Download bandwidth"
-msgstr "下载带宽"
+#: plugins/personal/generic/class_user.inc:601
+#: plugins/personal/generic/class_user.inc:943
+msgid "Kerberos database communication failed"
+msgstr "Kerberos 数据库通讯失败"
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Quota"
-msgstr "Quota"
+#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:960
+msgid "Can't remove user from kerberos database."
+msgstr "无法从 kerberos 数据库删除用户"
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Files"
-msgstr "文件"
+#: plugins/personal/generic/class_user.inc:896
+msgid "Saving generic user account failed"
+msgstr "保存一般用户账号失败"
 
-#: plugins/personal/connectivity/pureftpd.tpl:43
-#: plugins/addons/mailqueue/contents.tpl:54
-#: plugins/admin/systems/glpi_devices.tpl:293
-#: plugins/admin/systems/glpi_devices.tpl:420
-#: plugins/admin/systems/glpi_devices.tpl:485
-#: include/sieve/templates/element_size.tpl:4
-#: include/sieve/class_sieveManagement.inc:605
-msgid "Size"
-msgstr "大小"
+#: plugins/personal/generic/class_user.inc:971
+msgid "Can't add user to kerberos database."
+msgstr "无法添加用户到 kerberos 数据库"
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Ratio"
-msgstr "æ¯\94ç\8e\87"
+#: plugins/personal/generic/class_user.inc:1028
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr "æ\82¨æ\97 æ\9d\83å\9c¨ 'Base' ä¸\8bå\88\9b建ä¸\80个ç\94¨æ\88·ã\80\82"
 
-#: plugins/personal/connectivity/pureftpd.tpl:58
-msgid "Uploaded / downloaded files"
-msgstr "上传/下载文件"
+#: plugins/personal/generic/class_user.inc:1033
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr "您无权从原 'Base' 移动一个用户。"
 
-#: plugins/personal/connectivity/pureftpd.tpl:71
-msgid "Check to disable FTP Access"
-msgstr "检查禁用 FTP 访问"
+#: plugins/personal/generic/class_user.inc:1039
+#: plugins/addons/addressbook/class_addressbook.inc:564
+#: plugins/admin/users/class_userManagement.inc:582
+msgid "The required field 'Name' is not set."
+msgstr "需要的“姓名”字段没有设置"
 
-#: plugins/personal/connectivity/pureftpd.tpl:71
-msgid "Temporary disable FTP access"
-msgstr "临时禁用 FTP 访问"
+#: plugins/personal/generic/class_user.inc:1048
+msgid "There's already a person with this 'Login' in the database."
+msgstr "数据库中已经有同样登录名的用户。"
 
-#: plugins/personal/connectivity/phpgw.tpl:3
-msgid "PHPGroupware account"
-msgstr "PHPGroupware 账号"
+#: plugins/personal/generic/class_user.inc:1054
+#: plugins/addons/addressbook/class_addressbook.inc:568
+#: plugins/admin/users/class_userManagement.inc:585
+msgid "The required field 'Given name' is not set."
+msgstr "需要的“教名”字段没有设置"
+
+#: plugins/personal/generic/class_user.inc:1057
+msgid "The required field 'Login' is not set."
+msgstr "需要的“登录名”字段没有设置"
+
+#: plugins/personal/generic/class_user.inc:1062
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr "数据库中已经有同样“姓名/教名”组合的用户。"
+
+#: plugins/personal/generic/class_user.inc:1069
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr "登录名包含无效字符。只允许小写字母，数字和短线。"
+
+#: plugins/personal/generic/class_user.inc:1072
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr "“主页”字段包含无效 URL 定义"
+
+#: plugins/personal/generic/class_user.inc:1075
+#: plugins/personal/generic/class_user.inc:1100
+#: plugins/addons/addressbook/class_addressbook.inc:574
+#: plugins/addons/addressbook/class_addressbook.inc:602
+#: plugins/admin/departments/class_departmentGeneric.inc:243
+msgid "The field 'Name' contains invalid characters."
+msgstr "“姓名”字段包含无效字符。"
+
+#: plugins/personal/generic/class_user.inc:1078
+#: plugins/personal/generic/class_user.inc:1097
+#: plugins/addons/addressbook/class_addressbook.inc:577
+#: plugins/addons/addressbook/class_addressbook.inc:599
+msgid "The field 'Given name' contains invalid characters."
+msgstr "“教名”字段包含无效字符。"
+
+#: plugins/personal/generic/class_user.inc:1083
+#: plugins/addons/addressbook/class_addressbook.inc:582
+#: plugins/addons/addressbook/class_addressbook.inc:585
+#: plugins/admin/departments/class_departmentGeneric.inc:246
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr "“电话”字段包含无效电话号码。"
+
+#: plugins/personal/generic/class_user.inc:1086
+#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/admin/departments/class_departmentGeneric.inc:249
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr "“传真”字段包含一个无效电话号码"
+
+#: plugins/personal/generic/class_user.inc:1089
+#: plugins/addons/addressbook/class_addressbook.inc:591
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr "“手机”字段包含无效手机号码。"
+
+#: plugins/personal/generic/class_user.inc:1092
+#: plugins/addons/addressbook/class_addressbook.inc:594
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr "“传呼”字段包含无效电话号码。"
+
+#: plugins/personal/generic/class_user.inc:1219
+msgid "Could not open specified certificate!"
+msgstr "无法打开指定证书！"
+
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "您无权修改您的口令！"
+
+#: plugins/personal/generic/main.inc:193
+msgid "Generic user information"
+msgstr "用户一般信息"
+
+#: plugins/personal/connectivity/proxy.tpl:10
+msgid "Proxy account"
+msgstr "代理账号"
+
+#: plugins/personal/connectivity/proxy.tpl:18
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
+msgstr "过滤不想要的内容（如：色情或暴力相关）"
+
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Limit proxy access to working time"
+msgstr "限制代理访问仅在工作时间"
+
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
+msgstr "通过 quota 限制代理使用"
+
+#: plugins/personal/connectivity/proxy.tpl:86
+msgid "per"
+msgstr "每"
+
+#: plugins/personal/connectivity/pptp.tpl:3
+msgid "PPTP account"
+msgstr "PPTP 账号"
+
+#: plugins/personal/connectivity/intranet.tpl:3
+msgid "Intranet account"
+msgstr "内联网账号"
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
@@ -3177,6 +3312,10 @@ msgstr "删除 webDAV 账号失败 "
 msgid "Saving webDAV account failed"
 msgstr "保存 webDAV 账号失败"
 
+#: plugins/personal/connectivity/phpgw.tpl:3
+msgid "PHPGroupware account"
+msgstr "PHPGroupware 账号"
+
 #: plugins/personal/connectivity/kolab.tpl:3
 #: plugins/personal/connectivity/kolab.tpl:19
 msgid "Kolab account"
@@ -3224,6 +3363,66 @@ msgstr "天"
 msgid "Invitation policy"
 msgstr "邀请策略"
 
+#: plugins/personal/connectivity/pureftpd.tpl:4
+msgid "FTP account"
+msgstr "FTP 账号"
+
+#: plugins/personal/connectivity/pureftpd.tpl:15
+#: plugins/admin/systems/glpi_devices.tpl:596
+msgid "Bandwidth"
+msgstr "带宽"
+
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Upload bandwidth"
+msgstr "上传带宽"
+
+#: plugins/personal/connectivity/pureftpd.tpl:20
+#: plugins/personal/connectivity/pureftpd.tpl:24
+msgid "kb/s"
+msgstr "kb/s"
+
+#: plugins/personal/connectivity/pureftpd.tpl:23
+msgid "Download bandwidth"
+msgstr "下载带宽"
+
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Quota"
+msgstr "Quota"
+
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Files"
+msgstr "文件"
+
+#: plugins/personal/connectivity/pureftpd.tpl:43
+#: plugins/addons/mailqueue/contents.tpl:54
+#: plugins/admin/systems/glpi_devices.tpl:293
+#: plugins/admin/systems/glpi_devices.tpl:420
+#: plugins/admin/systems/glpi_devices.tpl:485
+#: include/sieve/templates/element_size.tpl:4
+#: include/sieve/class_sieveManagement.inc:605
+msgid "Size"
+msgstr "大小"
+
+#: plugins/personal/connectivity/pureftpd.tpl:54
+msgid "Ratio"
+msgstr "比率"
+
+#: plugins/personal/connectivity/pureftpd.tpl:58
+msgid "Uploaded / downloaded files"
+msgstr "上传/下载文件"
+
+#: plugins/personal/connectivity/pureftpd.tpl:71
+msgid "Check to disable FTP Access"
+msgstr "检查禁用 FTP 访问"
+
+#: plugins/personal/connectivity/pureftpd.tpl:71
+msgid "Temporary disable FTP access"
+msgstr "临时禁用 FTP 访问"
+
+#: plugins/personal/connectivity/glpi.tpl:1
+msgid "GLPI account"
+msgstr "GLPI 账号"
+
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr "Open-Xchange 账号"
@@ -3258,10 +3457,6 @@ msgstr "用户信息"
 msgid "User Timezone"
 msgstr "用户时区"
 
-#: plugins/personal/connectivity/glpi.tpl:1
-msgid "GLPI account"
-msgstr "GLPI 账号"
-
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -3321,7 +3516,7 @@ msgid "Template user"
 msgstr "模板用户"
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:108
+#: plugins/admin/systems/class_workstationGeneric.inc:125
 #: plugins/admin/systems/class_servGeneric.inc:48
 #: plugins/admin/ogroups/class_termgroup.inc:48
 msgid "Locked"
@@ -3331,10 +3526,6 @@ msgstr "锁定"
 msgid "Teams"
 msgstr "团队"
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "WebDAV 账号"
-
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
 msgid "PPTP"
 msgstr "PPTP"
@@ -3364,14 +3555,12 @@ msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
 #: plugins/personal/connectivity/class_phpgwAccount.inc:81
-#, fuzzy
 msgid "Removing PHPGroupware account failed"
-msgstr "删除 PHPgw 账号失败"
+msgstr "删除 PHPGroupware 账号失败"
 
 #: plugins/personal/connectivity/class_phpgwAccount.inc:126
-#, fuzzy
 msgid "Saving PHPGroupware account failed"
-msgstr "保存 PHPgw 账号失败"
+msgstr "保存 PHPGroupware  账号失败"
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
 msgid "PHPscheduleit account"
@@ -3438,7 +3627,7 @@ msgstr "没有针对您邀请策略的地址为 '%s' 的用户！"
 #: plugins/personal/connectivity/class_kolabAccount.inc:393
 #, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
-msgstr "ä¿\9då­\98 dn 为 '%s' ç\9a\84 user/kolab è´¦å\8f·ä¸ºç©º。"
+msgstr "以 dn '%s' ä¿\9då­\98 user/kolab è´¦å\8f·å¤±è´¥。"
 
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
@@ -3516,6 +3705,10 @@ msgstr "保存 oxchange 账号失败"
 msgid "Creating oxchange addressbook tree failed"
 msgstr "创建 oxchange 地址簿树失败"
 
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "WebDAV 账号"
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr "Opengroupware 账号"
@@ -3556,50 +3749,6 @@ msgstr "保存 PHPscheduleit 账号失败"
 msgid "This account has no connectivity extensions."
 msgstr "这个账号没有互联扩展。"
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "列表名称"
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "黑名单名称"
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "选择子树来放置黑名单"
-
-#: plugins/gofax/blocklists/generic.tpl:37
-#: plugins/admin/fai/class_faiSummaryTab.inc:334
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:200
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:47
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:136
-msgid "Type"
-msgstr "类型"
-
-#: plugins/gofax/blocklists/generic.tpl:39
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr "选择过滤打入电话还是打出电话"
-
-#: plugins/gofax/blocklists/generic.tpl:48
-msgid "Descriptive text for this blocklist"
-msgstr "此黑名带描述文字"
-
-#: plugins/gofax/blocklists/generic.tpl:61
-msgid "Blocked numbers"
-msgstr "封锁号码"
-
-#: plugins/gofax/blocklists/generic.tpl:77
-msgid "Numbers can also contain wild cards."
-msgstr "数字也可以包含通配符。"
-
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
 msgstr "传真黑名单"
@@ -3674,14 +3823,16 @@ msgstr "黑名单名称"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:47
 #: plugins/addons/addressbook/contents.tpl:42
+#: plugins/addons/gotomasses/class_goto_task.inc:214
 #: plugins/admin/fai/class_divListFai.inc:60
 #: plugins/admin/groups/class_divListGroup.inc:51
 #: plugins/admin/users/class_divListUsers.inc:52
 #: plugins/admin/applications/class_divListApplication.inc:45
 #: plugins/admin/departments/class_divListDepartment.inc:42
 #: plugins/admin/systems/class_divListSystem.inc:58
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:183
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:198
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:184
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:199
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:57
 #: plugins/admin/ogroups/class_divListOGroup.inc:54
 #: plugins/gofon/macro/class_divListMacros.inc:48
 #: plugins/gofon/conference/class_divListConferences.inc:49
@@ -3704,20 +3855,6 @@ msgstr "选择查看接收黑名单"
 msgid "Show receive blocklists"
 msgstr "显示接收黑名单"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:54
-#: plugins/admin/groups/class_divListGroup.inc:62
-#: plugins/admin/users/class_divListUsers.inc:63
-#: plugins/admin/applications/class_divListApplication.inc:48
-#: plugins/admin/departments/class_divListDepartment.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:71
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-#: plugins/admin/ogroups/class_divListOGroup.inc:69
-#: plugins/gofon/macro/class_divListMacros.inc:51
-#: plugins/gofon/conference/class_divListConferences.inc:52
-msgid "Select to search within subtrees"
-msgstr "选择在子树中查询"
-
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:57
 msgid "Regular expression for matching list names"
 msgstr "匹配列表名称的正则表达式"
@@ -3731,14 +3868,15 @@ msgid "New Blocklist"
 msgstr "新建黑名单"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:81
-#: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/fai/class_divListFai.inc:144
+#: plugins/addons/gotomasses/class_target_list.inc:126
+#: plugins/admin/fai/class_divListFai.inc:154
 #: plugins/admin/groups/class_divListGroup.inc:98
 #: plugins/admin/users/class_divListUsers.inc:101
 #: plugins/admin/applications/class_divListApplication.inc:95
 #: plugins/admin/departments/class_divListDepartment.inc:74
 #: plugins/admin/systems/class_divListSystem.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
 #: plugins/admin/ogroups/class_divListOGroup.inc:104
 #: plugins/gofon/macro/class_divListMacros.inc:78
 #: plugins/gofon/conference/class_divListConferences.inc:79
@@ -3746,42 +3884,44 @@ msgid "Submit department"
 msgstr "提交部门"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:81
-#: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/fai/class_divListFai.inc:144
+#: plugins/addons/gotomasses/class_target_list.inc:126
+#: plugins/admin/fai/class_divListFai.inc:154
 #: plugins/admin/groups/class_divListGroup.inc:98
 #: plugins/admin/users/class_divListUsers.inc:101
 #: plugins/admin/applications/class_divListApplication.inc:95
 #: plugins/admin/departments/class_divListDepartment.inc:74
 #: plugins/admin/systems/class_divListSystem.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_glpiSelectUser.inc:161
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
 #: plugins/admin/ogroups/class_divListOGroup.inc:104
 #: plugins/gofon/macro/class_divListMacros.inc:78
 #: plugins/gofon/conference/class_divListConferences.inc:79
-#: include/class_MultiSelectWindow.inc:211
+#: include/class_MultiSelectWindow.inc:212
 msgid "Submit"
 msgstr "提交"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/fai/class_faiScript.inc:244
-#: plugins/admin/fai/class_faiScript.inc:247
-#: plugins/admin/fai/class_faiTemplate.inc:240
-#: plugins/admin/fai/class_faiTemplate.inc:243
-#: plugins/admin/fai/class_faiHook.inc:266
-#: plugins/admin/fai/class_faiHook.inc:269
-#: plugins/admin/fai/class_divListFai.inc:213
-#: plugins/admin/fai/class_divListFai.inc:218
+#: plugins/admin/fai/class_faiScript.inc:307
+#: plugins/admin/fai/class_faiScript.inc:310
+#: plugins/admin/fai/class_faiTemplate.inc:256
+#: plugins/admin/fai/class_faiTemplate.inc:259
+#: plugins/admin/fai/class_faiHook.inc:282
+#: plugins/admin/fai/class_faiHook.inc:285
+#: 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:184
+#: 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
-#: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
-#: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
+#: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
+#: plugins/admin/systems/glpiPrinter.tpl:25
+#: plugins/admin/systems/class_divListSystem.inc:147
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:167
 #: plugins/admin/ogroups/class_divListOGroup.inc:142
 #: plugins/gofon/macro/class_divListMacros.inc:93
 #: plugins/gofon/conference/class_divListConferences.inc:94
@@ -3789,22 +3929,23 @@ msgid "edit"
 msgstr "编辑"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:203
 msgid "Edit user"
 msgstr "编辑用户"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/fai/class_faiScript.inc:248
-#: plugins/admin/fai/class_faiTemplate.inc:244
-#: plugins/admin/fai/class_faiHook.inc:270
-#: plugins/admin/fai/class_divListFai.inc:220
+#: plugins/admin/fai/class_faiScript.inc:311
+#: plugins/admin/fai/class_faiTemplate.inc:260
+#: plugins/admin/fai/class_faiHook.inc:286
+#: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/admin/groups/class_divListGroup.inc:161
-#: plugins/admin/users/class_divListUsers.inc:195
+#: 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:145
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:132
+#: plugins/admin/systems/class_divListSystem.inc:149
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:135
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:170
 #: plugins/admin/ogroups/class_divListOGroup.inc:146
 #: plugins/gofon/macro/class_divListMacros.inc:95
 #: plugins/gofon/conference/class_divListConferences.inc:96
@@ -3813,27 +3954,94 @@ msgid "delete"
 msgstr "删除"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:219
 msgid "Delete user"
 msgstr "删除用户"
 
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
+#, fuzzy
+msgid "Number of listed blocklists"
+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:299
+#: plugins/admin/applications/class_divListApplication.inc:196
+#: plugins/admin/departments/class_divListDepartment.inc:128
+#: plugins/admin/systems/class_divListSystem.inc:226
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:201
+#: plugins/admin/ogroups/class_divListOGroup.inc:184
+#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/conference/class_divListConferences.inc:167
+#, fuzzy
+msgid "Number of listed departments"
+msgstr "部门名称"
+
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "列表名称"
+
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "黑名单名称"
+
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "选择子树来放置黑名单"
+
+#: plugins/gofax/blocklists/generic.tpl:37
+#: plugins/addons/gotomasses/class_gotomasses.inc:211
+#: plugins/admin/fai/class_faiSummaryTab.inc:334
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:205
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:195
+msgid "Type"
+msgstr "类型"
+
+#: plugins/gofax/blocklists/generic.tpl:39
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "选择过滤打入电话还是打出电话"
+
+#: plugins/gofax/blocklists/generic.tpl:48
+msgid "Descriptive text for this blocklist"
+msgstr "此黑名带描述文字"
+
+#: plugins/gofax/blocklists/generic.tpl:61
+msgid "Blocked numbers"
+msgstr "封锁号码"
+
+#: plugins/gofax/blocklists/generic.tpl:77
+msgid "Numbers can also contain wild cards."
+msgstr "数字也可以包含通配符。"
+
 #: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2
+#: plugins/addons/gotomasses/remove.tpl:2 plugins/admin/fai/remove.tpl:2
 #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/systems/remove_dhcp.tpl:2
 #: plugins/admin/systems/remove_ppd.tpl:2
 #: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: include/sieve/templates/remove_script.tpl:2 html/index.php:49
-#: html/index.php:349 html/index.php:355 ihtml/themes/altlinux/conflict.tpl:6
-#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 setup/class_setupStep_Migrate.inc:211
-#: setup/class_setupStep_Migrate.inc:260 setup/class_setupStep_Migrate.inc:384
-#: setup/class_setupStep_Migrate.inc:460 setup/class_setupStep_Migrate.inc:595
-#: setup/class_setupStep_Migrate.inc:725 setup/setup_checks.tpl:32
-#: setup/setup_checks.tpl:93
+#: plugins/admin/mimetypes/remove.tpl:2 plugins/admin/ogroups/termgroup.tpl:2
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: plugins/gofon/conference/remove.tpl:2
+#: include/sieve/templates/remove_script.tpl:2
+#: setup/class_setupStep_Migrate.inc:211 setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStep_Migrate.inc:385 setup/class_setupStep_Migrate.inc:461
+#: setup/class_setupStep_Migrate.inc:596 setup/class_setupStep_Migrate.inc:726
+#: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93 html/password.php:274
+#: html/index.php:55 html/index.php:346 html/index.php:352
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
 msgid "Warning"
 msgstr "警告"
 
@@ -3847,9 +4055,11 @@ msgstr "请再次检查您是否要这么做，因为 GOsa 将没有办法将您
 
 #: plugins/gofax/blocklists/remove.tpl:10
 #: plugins/addons/addressbook/remove.tpl:10
+#: plugins/addons/gotomasses/remove.tpl:10
 #: plugins/admin/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
 #: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/admin/ogroups/remove.tpl:10
+#: plugins/gofon/macro/remove.tpl:9
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
 
@@ -3857,11 +4067,15 @@ msgstr "所以，如果您确定，请按“删除”继续，否则按“取消
 msgid "Blocklist management"
 msgstr "黑名单管理"
 
-#: plugins/gofax/faxaccount/generic.tpl:12
 #: plugins/gofax/faxaccount/paste_generic.tpl:13
+#: plugins/gofax/faxaccount/generic.tpl:12
 msgid "Fax number for GOfax to trigger on"
 msgstr "要打开的 GOfax 的传真号码"
 
+#: plugins/gofax/faxaccount/paste_generic.tpl:18
+msgid "Alternate fax numbers will not be copied"
+msgstr "不拷贝到替代传真号码"
+
 #: plugins/gofax/faxaccount/generic.tpl:16
 #: plugins/admin/ogroups/phonequeue.tpl:48 html/getxls.php:65
 #: html/getxls.php:224
@@ -3916,10 +4130,6 @@ msgstr "输入传真黑名单"
 msgid "Blocklists for outgoing fax"
 msgstr "外发传真黑名单"
 
-#: plugins/gofax/faxaccount/paste_generic.tpl:18
-msgid "Alternate fax numbers will not be copied"
-msgstr "不拷贝到替代传真号码"
-
 #: plugins/gofax/faxaccount/locals.tpl:6
 msgid "Select numbers to add"
 msgstr "选择要添加的数字"
@@ -3967,151 +4177,72 @@ msgstr "传真设置"
 msgid "FAX"
 msgstr "传真"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:152
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
 msgid "This account has no fax extensions."
 msgstr "这个账号没有传真扩展。"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:161
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
 msgid "Remove fax account"
 msgstr "删除传真账号"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:163
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
 msgstr "这个账户传真功能已启用。您可以点击下面的按钮禁用。"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:164
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
 msgid "Create fax account"
 msgstr "创建传真账号"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:166
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
 msgstr "这个账户传真功能已禁用。您可以点击下面的按钮来启用。"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:233
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:234
 msgid "You're trying to add an invalid phone number."
 msgstr "您正在添加一个无效的电话号码。"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:446
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:528
-#: plugins/admin/groups/class_groupApplication.inc:640
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:142
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:447
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:529
+#: plugins/admin/groups/class_groupApplication.inc:657
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:146
 msgid "back"
 msgstr "返回"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:632
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:634
 msgid "Removing FAX account failed"
 msgstr "删除传真账号失败"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:647
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:649
 msgid "The required field 'Fax' is not set."
 msgstr "需要的字段“传真”没有设置"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr "请在“传真”处填入一个有效的电话号码。"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:661
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr "选择了邮件传递，但是没有定义地址。"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:661
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:663
 msgid "The mail address you've entered is invalid."
 msgstr "您输入的邮件地址无效。"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:667
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:669
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
 msgstr ""
-"发送传真道打印机，只有在提供一个有效的打印机才能够实现。请修改您的选择。"
+"发送传真到打印机，只有在提供一个有效的打印机才能够实现。请修改您的选择。"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:750
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:752
 msgid "Saving FAX account failed"
 msgstr "保存传真账号失败"
 
-#: plugins/gofax/faxreports/contents.tpl:2
-#: plugins/addons/logview/contents.tpl:2
-#: plugins/gofon/fonreports/contents.tpl:2
-msgid "Filter"
-msgstr "过滤器"
-
-#: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/mailqueue/contents.tpl:11
-#: plugins/addons/logview/contents.tpl:47
-#: plugins/gofon/fonreports/contents.tpl:6
-msgid "Search for"
-msgstr "查询"
-
-#: plugins/gofax/faxreports/contents.tpl:7
-#: plugins/gofon/fonreports/contents.tpl:7
-msgid "Enter user name to search for"
-msgstr "输入要查询的用户名"
-
-#: plugins/gofax/faxreports/contents.tpl:8
-#: plugins/gofax/faxreports/contents.tpl:16
-#: plugins/gofon/fonreports/contents.tpl:8
-#: plugins/gofon/fonreports/contents.tpl:16
-msgid "in"
-msgstr "于"
-
-#: plugins/gofax/faxreports/contents.tpl:9
-#: plugins/gofon/fonreports/contents.tpl:9
-msgid "Select subtree to base search on"
-msgstr "选择查询基于的子树"
-
-#: plugins/gofax/faxreports/contents.tpl:12
-#: plugins/gofon/fonreports/contents.tpl:12
-msgid "during"
-msgstr "在"
-
-#: plugins/gofax/faxreports/contents.tpl:21
-#: plugins/addons/mailqueue/contents.tpl:10
-#: plugins/addons/mailqueue/contents.tpl:26
-#: plugins/addons/logview/contents.tpl:67
-#: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
-#: setup/setup_ldap.tpl:13
-msgid "Search"
-msgstr "查找"
-
-#: plugins/gofax/faxreports/contents.tpl:30
-#: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:846
-#: plugins/admin/ogroups/class_ogroupManagement.inc:363
-msgid "User"
-msgstr "用户"
-
-#: plugins/gofax/faxreports/contents.tpl:31
-#: plugins/addons/logview/contents.tpl:84
-#: plugins/gofon/fonreports/contents.tpl:30
-msgid "Date"
-msgstr "日期"
-
-#: plugins/gofax/faxreports/contents.tpl:33
-#: plugins/addons/mailqueue/contents.tpl:56
-msgid "Sender"
-msgstr "发送者"
-
-#: plugins/gofax/faxreports/contents.tpl:34
-msgid "Receiver"
-msgstr "接收者"
-
-#: plugins/gofax/faxreports/contents.tpl:35
-#: plugins/gofax/faxreports/detail.tpl:57
-msgid "# pages"
-msgstr "# 页"
-
-#: plugins/gofax/faxreports/contents.tpl:50
-#: plugins/addons/logview/contents.tpl:97
-#: plugins/gofon/fonreports/contents.tpl:51
-msgid "Search returned no results..."
-msgstr "查无结果..."
-
 #: plugins/gofax/faxreports/detail.tpl:5
 msgid "FAX preview - please wait"
 msgstr "传真预览 ── 请等待"
@@ -4124,6 +4255,14 @@ msgstr "点击传真下载"
 msgid "FAX ID"
 msgstr "传真 ID"
 
+#: plugins/gofax/faxreports/detail.tpl:21
+#: plugins/gofax/faxreports/contents.tpl:30
+#: plugins/admin/fai/faiTemplateEntry.tpl:94
+#: plugins/admin/systems/class_printGeneric.inc:871
+#: plugins/admin/ogroups/class_ogroupManagement.inc:363
+msgid "User"
+msgstr "用户"
+
 #: plugins/gofax/faxreports/detail.tpl:25
 msgid "Date / Time"
 msgstr "日期 / 时间"
@@ -4152,9 +4291,10 @@ msgstr "状态信息"
 msgid "Transfer time"
 msgstr "传送时间"
 
-#: plugins/gofax/faxreports/main.inc:18
-msgid "FAX reports"
-msgstr "传真记录"
+#: plugins/gofax/faxreports/detail.tpl:57
+#: plugins/gofax/faxreports/contents.tpl:35
+msgid "# pages"
+msgstr "# 页"
 
 #: plugins/gofax/faxreports/class_faxreport.inc:6
 msgid "FAX Reports"
@@ -4199,128 +4339,88 @@ msgstr "您无权获取关于此传真 id 的信息！"
 msgid "Y-M-D"
 msgstr "Y-M-D"
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:522
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/class_faiSummaryTab.inc:329
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/paste_fai_object.tpl:1
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/goSpamServerRule.tpl:6
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:196
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-#: setup/setup_feedback.tpl:24 setup/setup_migrate.tpl:207
-msgid "Name"
-msgstr "名称"
-
-#: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:66
-#: plugins/addons/addressbook/address_info.tpl:29
-msgid "Private"
-msgstr "私人电话"
+#: plugins/gofax/faxreports/contents.tpl:2
+#: plugins/addons/logview/contents.tpl:2
+#: plugins/gofon/fonreports/contents.tpl:2
+msgid "Filter"
+msgstr "过滤器"
 
-#: plugins/addons/addressbook/contents.tpl:15
-msgid "Contact"
-msgstr "联系"
+#: plugins/gofax/faxreports/contents.tpl:6
+#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/mailqueue/contents.tpl:11
+#: plugins/addons/logview/contents.tpl:47
+#: plugins/gofon/fonreports/contents.tpl:6
+msgid "Search for"
+msgstr "查询"
 
-#: plugins/addons/addressbook/contents.tpl:37
-msgid ""
-"The telephone list plugin provides list and search facilities for the people "
-"in your site. You may want to specify the asterisk [*] like in 'Go*us' to "
-"find 'Gonicus'. Use the filters below to narrow down your search."
-msgstr ""
-"电话列表插件提供了针对您站点用户的列表和查询功能。您可以用通配符[*]，"
-"如“Go*us”拉来查询“Gonicus”。使用下面的过滤器来过滤查询结果。"
+#: plugins/gofax/faxreports/contents.tpl:7
+#: plugins/gofon/fonreports/contents.tpl:7
+msgid "Enter user name to search for"
+msgstr "输入要查询的用户名"
 
-#: plugins/addons/addressbook/contents.tpl:47
-msgid "Add entry"
-msgstr "添加记录"
+#: plugins/gofax/faxreports/contents.tpl:8
+#: plugins/gofax/faxreports/contents.tpl:16
+#: plugins/gofon/fonreports/contents.tpl:8
+#: plugins/gofon/fonreports/contents.tpl:16
+msgid "in"
+msgstr "于"
 
-#: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:722
-msgid "Edit entry"
-msgstr "编辑记录"
+#: plugins/gofax/faxreports/contents.tpl:9
+#: plugins/gofon/fonreports/contents.tpl:9
+msgid "Select subtree to base search on"
+msgstr "选择查询基于的子树"
 
-#: plugins/addons/addressbook/contents.tpl:52
-msgid "Remove entry"
-msgstr "删除记录"
+#: plugins/gofax/faxreports/contents.tpl:12
+#: plugins/gofon/fonreports/contents.tpl:12
+msgid "during"
+msgstr "在"
 
-#: plugins/addons/addressbook/contents.tpl:68
-msgid "Select to see regular users"
-msgstr "选择查看普通用户"
+#: plugins/gofax/faxreports/contents.tpl:21
+#: plugins/addons/mailqueue/contents.tpl:10
+#: plugins/addons/mailqueue/contents.tpl:26
+#: plugins/addons/logview/contents.tpl:67
+#: plugins/gofon/fonreports/contents.tpl:21 setup/setup_ldap.tpl:13
+#: ihtml/themes/default/help.tpl:21
+msgid "Search"
+msgstr "查找"
 
-#: plugins/addons/addressbook/contents.tpl:68
-msgid "Show organizational entries"
-msgstr "显示组织记录"
+#: plugins/gofax/faxreports/contents.tpl:31
+#: plugins/addons/logview/contents.tpl:84
+#: plugins/gofon/fonreports/contents.tpl:30
+msgid "Date"
+msgstr "日期"
 
-#: plugins/addons/addressbook/contents.tpl:69
-msgid "Select to see users in addressbook"
-msgstr "选择查看地址簿中用户"
-
-#: plugins/addons/addressbook/contents.tpl:69
-msgid "Show addressbook entries"
-msgstr "显示地址簿记录"
-
-#: plugins/addons/addressbook/contents.tpl:77
-msgid "Display results for department"
-msgstr "显示部门的结果"
+#: plugins/gofax/faxreports/contents.tpl:33
+#: plugins/addons/mailqueue/contents.tpl:56
+msgid "Sender"
+msgstr "发送者"
 
-#: plugins/addons/addressbook/contents.tpl:90
-msgid "Match object"
-msgstr "匹配对象"
+#: plugins/gofax/faxreports/contents.tpl:34
+msgid "Receiver"
+msgstr "接收者"
 
-#: plugins/addons/addressbook/contents.tpl:93
-msgid "Choose the object that will be searched in"
-msgstr "选择要在其中查询的对象"
+#: plugins/gofax/faxreports/contents.tpl:50
+#: plugins/addons/logview/contents.tpl:97
+#: plugins/gofon/fonreports/contents.tpl:51
+msgid "Search returned no results..."
+msgstr "查无结果..."
 
-#: plugins/addons/addressbook/contents.tpl:105
-msgid "Search string"
-msgstr "查找字符串"
+#: plugins/gofax/faxreports/main.inc:18
+msgid "FAX reports"
+msgstr "传真记录"
 
 #: plugins/addons/addressbook/dial.tpl:3
 msgid "Dial connection..."
 msgstr "拨号中..."
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:369
-#: plugins/addons/addressbook/class_addressbook.inc:376
-#: plugins/addons/addressbook/class_addressbook.inc:380
-#: plugins/addons/addressbook/class_addressbook.inc:462
+#: plugins/addons/addressbook/class_addressbook.inc:378
+#: plugins/addons/addressbook/class_addressbook.inc:385
+#: plugins/addons/addressbook/class_addressbook.inc:389
+#: plugins/addons/addressbook/class_addressbook.inc:471
 msgid "Dial"
 msgstr "拨号"
 
-#: plugins/addons/addressbook/remove.tpl:6
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-"这个条目包含所有的地址簿数据，请再次检查您是否要这么做，因为 GOsa 没有办法将"
-"您的数据找回。"
-
 #: plugins/addons/addressbook/address_edit.tpl:7
 msgid "Choose the department to store entry in"
 msgstr "选择放置条目的部门"
@@ -4336,6 +4436,12 @@ msgstr "个人"
 msgid "Initials"
 msgstr "中间名"
 
+#: plugins/addons/addressbook/address_edit.tpl:66
+#: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_info.tpl:29
+msgid "Private"
+msgstr "私人电话"
+
 #: plugins/addons/addressbook/address_edit.tpl:105
 #: plugins/addons/addressbook/address_info.tpl:43
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:46
@@ -4363,6 +4469,114 @@ msgstr "城市"
 msgid "Country"
 msgstr "国家"
 
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:531
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/gotomasses/class_goto_task.inc:213
+#: plugins/addons/gotomasses/goto_task.tpl:103
+#: plugins/admin/fai/class_faiScript.inc:296
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/class_faiSummaryTab.inc:329
+#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/paste_fai_object.tpl:1
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/systems/dhcp_group.tpl:6 plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/goSpamServerRule.tpl:6
+#: plugins/admin/systems/dhcp_pool.tpl:6 plugins/admin/systems/dhcp_host.tpl:8
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:10
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:197
+#: plugins/gofon/macro/parameter.tpl:5 setup/setup_feedback.tpl:24
+#: setup/setup_migrate.tpl:207 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "名称"
+
+#: plugins/addons/addressbook/contents.tpl:15
+msgid "Contact"
+msgstr "联系"
+
+#: plugins/addons/addressbook/contents.tpl:37
+msgid ""
+"The telephone list plugin provides list and search facilities for the people "
+"in your site. You may want to specify the asterisk [*] like in 'Go*us' to "
+"find 'Gonicus'. Use the filters below to narrow down your search."
+msgstr ""
+"电话列表插件提供了针对您站点用户的列表和查询功能。您可以用通配符[*]，"
+"如“Go*us”拉来查询“Gonicus”。使用下面的过滤器来过滤查询结果。"
+
+#: plugins/addons/addressbook/contents.tpl:47
+msgid "Add entry"
+msgstr "添加记录"
+
+#: plugins/addons/addressbook/contents.tpl:50
+#: plugins/admin/groups/class_groupApplication.inc:740
+msgid "Edit entry"
+msgstr "编辑记录"
+
+#: plugins/addons/addressbook/contents.tpl:52
+msgid "Remove entry"
+msgstr "删除记录"
+
+#: plugins/addons/addressbook/contents.tpl:68
+msgid "Select to see regular users"
+msgstr "选择查看普通用户"
+
+#: plugins/addons/addressbook/contents.tpl:68
+msgid "Show organizational entries"
+msgstr "显示组织记录"
+
+#: plugins/addons/addressbook/contents.tpl:69
+msgid "Select to see users in addressbook"
+msgstr "选择查看地址簿中用户"
+
+#: plugins/addons/addressbook/contents.tpl:69
+msgid "Show addressbook entries"
+msgstr "显示地址簿记录"
+
+#: plugins/addons/addressbook/contents.tpl:77
+msgid "Display results for department"
+msgstr "显示部门的结果"
+
+#: plugins/addons/addressbook/contents.tpl:90
+msgid "Match object"
+msgstr "匹配对象"
+
+#: plugins/addons/addressbook/contents.tpl:93
+msgid "Choose the object that will be searched in"
+msgstr "选择要在其中查询的对象"
+
+#: plugins/addons/addressbook/contents.tpl:105
+msgid "Search string"
+msgstr "查找字符串"
+
+#: plugins/addons/addressbook/remove.tpl:6
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+"这个条目包含所有的地址簿数据，请再次检查您是否要这么做，因为 GOsa 没有办法将"
+"您的数据找回。"
+
 #: plugins/addons/addressbook/main.inc:37
 msgid "Address book"
 msgstr "地址簿"
@@ -4397,34 +4611,34 @@ msgstr "您无权删除这个条目！"
 msgid "You're about to delete the entry %s."
 msgstr "您将要删除条目 %s。"
 
-#: plugins/addons/addressbook/class_addressbook.inc:386
+#: plugins/addons/addressbook/class_addressbook.inc:395
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "保存 %s 的内容为 vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:390
+#: plugins/addons/addressbook/class_addressbook.inc:399
 #, php-format
 msgid "Send mail to %s"
 msgstr "发送邮件到 %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:474
+#: plugins/addons/addressbook/class_addressbook.inc:483
 msgid "global addressbook"
 msgstr "全局地址簿"
 
-#: plugins/addons/addressbook/class_addressbook.inc:477
+#: plugins/addons/addressbook/class_addressbook.inc:486
 msgid "user database"
 msgstr "用户数据库"
 
-#: plugins/addons/addressbook/class_addressbook.inc:481
+#: plugins/addons/addressbook/class_addressbook.inc:490
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "联系方式保存到 '%s'"
 
-#: plugins/addons/addressbook/class_addressbook.inc:483
+#: plugins/addons/addressbook/class_addressbook.inc:492
 msgid "Creating new entry in"
 msgstr "创建新条目到"
 
-#: plugins/addons/addressbook/class_addressbook.inc:522
+#: plugins/addons/addressbook/class_addressbook.inc:531
 #: plugins/addons/mailqueue/class_mailqueue.inc:305
 #: plugins/addons/mailqueue/class_mailqueue.inc:370
 #: plugins/addons/logview/class_logview.inc:99
@@ -4432,270 +4646,354 @@ msgstr "创建新条目到"
 msgid "All"
 msgstr "全部"
 
-#: plugins/addons/addressbook/class_addressbook.inc:522 html/getxls.php:65
+#: plugins/addons/addressbook/class_addressbook.inc:531 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr "名"
 
-#: plugins/addons/addressbook/class_addressbook.inc:523
+#: plugins/addons/addressbook/class_addressbook.inc:532
 msgid "Work phone"
 msgstr "工作电话"
 
-#: plugins/addons/addressbook/class_addressbook.inc:523
+#: plugins/addons/addressbook/class_addressbook.inc:532
 msgid "Cell phone"
 msgstr "移动电话"
 
-#: plugins/addons/addressbook/class_addressbook.inc:524 html/getxls.php:174
+#: plugins/addons/addressbook/class_addressbook.inc:533 html/getxls.php:174
 msgid "Home phone"
 msgstr "住宅电话"
 
-#: plugins/addons/addressbook/class_addressbook.inc:524 html/getxls.php:80
-#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
-#: html/getxls.php:299 setup/setup_migrate.tpl:215
+#: plugins/addons/addressbook/class_addressbook.inc:533
+#: setup/setup_migrate.tpl:215 html/getxls.php:80 html/getxls.php:108
+#: html/getxls.php:123 html/getxls.php:282 html/getxls.php:299
 msgid "User ID"
 msgstr "用户 ID"
 
-#: plugins/addons/addressbook/class_addressbook.inc:606
+#: plugins/addons/addressbook/class_addressbook.inc:615
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr "无法为您的条目创建一个唯一 DN。请填写更多字段。"
 
-#: plugins/addons/addressbook/class_addressbook.inc:614
+#: plugins/addons/addressbook/class_addressbook.inc:623
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr "您无权创建或者更改一个全局电话簿条目。"
 
-#: plugins/addons/addressbook/class_addressbook.inc:659
+#: plugins/addons/addressbook/class_addressbook.inc:668
 msgid "Saving addressbook entry failed"
 msgstr "保存地址簿条目失败"
 
-#: plugins/addons/godfs/contents.tpl:8
-msgid "DFS Shares"
-msgstr "DFS 共享"
+#: plugins/addons/gotomasses/class_gotomasses.inc:6
+#: plugins/addons/gotomasses/main.inc:42
+#, fuzzy
+msgid "System deployment"
+msgstr "系统 / 部门"
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:72
+#: plugins/addons/gotomasses/class_gotomasses.inc:104
+#, fuzzy
+msgid "You are not allowed to remove a task."
+msgstr "您无权删除这个应用程序！"
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:85
+#: plugins/addons/gotomasses/class_gotomasses.inc:108
+#, fuzzy, php-format
+msgid "Your are about to delete the following tasks: %s"
+msgstr "您将要删除条目 %s。"
 
-#: plugins/addons/godfs/contents.tpl:26
+#: plugins/addons/gotomasses/class_gotomasses.inc:181
+#, fuzzy
+msgid "List of system deployment tasks"
+msgstr "系统列表"
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:185
+#, fuzzy
 msgid ""
-"This menu allows you to create, delete and edit selected dfs shares. Having "
-"a large numbers of dfs shares, you might prefer the range selectors on top "
-"of the dfs share list."
+"This menu allows you to add, remove and change the properties of system "
+"deployment tasks."
 msgstr ""
-"这个菜单允许您创建，删除和修改所选的 dfs 共享。对于一个长列表，您可以通过列表"
-"上面的范围选择来调整。"
-
-#: plugins/addons/godfs/contents.tpl:40
-msgid "Display dfs shares matching"
-msgstr "显示匹配的 dfs 共享"
+"这个菜单允许您添加，删除和修改所选系统的属性。您只能添加已经启动过一次的系"
+"统。"
 
-#: plugins/addons/godfs/contents.tpl:44
-msgid "Regular expression for matching dfs share names"
-msgstr "匹配 dns 共享名的正则表达式"
+#: plugins/addons/gotomasses/class_gotomasses.inc:208
+#, fuzzy
+msgid "Target"
+msgstr "真"
 
-#: plugins/addons/godfs/generic.tpl:4
-msgid "DFS Properties"
-msgstr "DFS 属性"
+#: plugins/addons/gotomasses/class_gotomasses.inc:209
+#: plugins/addons/gotomasses/goto_task.tpl:142
+#, fuzzy
+msgid "Schedule"
+msgstr "计划更新"
 
-#: plugins/addons/godfs/generic.tpl:8
-msgid "Name of dfs Share"
-msgstr "dfs 共享名称"
+#: plugins/addons/gotomasses/class_gotomasses.inc:213
+#: plugins/addons/gotomasses/class_goto_task.inc:325
+#: plugins/addons/gotomasses/goto_task.tpl:58
+#: plugins/admin/fai/class_faiScript.inc:301
+#: plugins/admin/systems/server.tpl:51 plugins/admin/systems/terminal.tpl:128
+#: plugins/admin/systems/workstation.tpl:109
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:159
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/ogroups/termgroup.tpl:75
+msgid "Action"
+msgstr "行动"
 
-#: plugins/addons/godfs/generic.tpl:16
-msgid "Fileserver"
-msgstr "文件服务器"
+#: plugins/addons/gotomasses/class_gotomasses.inc:266
+#: include/class_pluglist.inc:130 include/class_pluglist.inc:131
+#: include/class_pluglist.inc:241
+msgid "Unknown"
+msgstr "未知"
 
-#: plugins/addons/godfs/generic.tpl:20
-msgid "Share on Fileserver"
-msgstr "文件服务器的共享"
+#: plugins/addons/gotomasses/class_gotomasses.inc:277
+#, fuzzy, php-format
+msgid "Can't locate or read gotomasses storage file '%s'."
+msgstr "无法创建文件 '%s'。"
 
-#: plugins/addons/godfs/generic.tpl:30
-msgid "DFS Location"
-msgstr "DFS 位置"
+#: plugins/addons/gotomasses/class_gotomasses.inc:284
+#: plugins/addons/gotomasses/class_gotomasses.inc:395
+#, fuzzy, php-format
+msgid "Can't read gotomasses storage file '%s'."
+msgstr "无法创建文件 '%s'。"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:10
-msgid "DFS Managment"
-msgstr "DFS 管理"
+#: plugins/addons/gotomasses/class_gotomasses.inc:320
+msgid "Entry broken, skipped."
+msgstr ""
 
-#: plugins/addons/godfs/class_dfsManagment.inc:151
-msgid "Removing DFS share failed"
-msgstr "删除 DFS 共享失败"
+#: plugins/addons/gotomasses/class_gotomasses.inc:388
+#, fuzzy, php-format
+msgid "Can't locate or write gotomasses storage file '%s'."
+msgstr "无法创建文件 '%s'。"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:170
-msgid "No DFS entries found"
-msgstr "没有发现 DFS 条目"
+#: plugins/addons/gotomasses/class_gotomasses.inc:447
+#: plugins/admin/systems/class_workstationGeneric.inc:268
+#: plugins/admin/systems/class_terminalGeneric.inc:285
+#: plugins/admin/systems/class_servGeneric.inc:170
+#: plugins/admin/ogroups/class_termgroup.inc:263
+msgid "Reboot"
+msgstr "重启"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/addons/gotomasses/class_gotomasses.inc:448
 #, fuzzy
-msgid "Go up one dfs share"
-msgstr "å\90\91ä¸\8aä¸\80个 dfs å\85±äº«"
+msgid "Localboot"
+msgstr "强å\88¶æ\9c¬å\9c°å\90¯å\8a¨"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/fai/class_faiProfile.inc:305
-#: plugins/admin/systems/class_glpiSelectUser.inc:157
-#: plugins/admin/systems/class_servDNSeditZone.inc:290
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/phonequeue.tpl:21
-#: include/sieve/templates/object_container.tpl:8
-#: include/sieve/templates/object_container_clear.tpl:8
-#: include/class_MultiSelectWindow.inc:196
-#: include/class_MultiSelectWindow.inc:198
-msgid "Up"
-msgstr "上"
+#: plugins/addons/gotomasses/class_gotomasses.inc:449
+#, fuzzy
+msgid "Halt system"
+msgstr "删除系统"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-msgid "Go to dfs root"
-msgstr "跳转到 dfs 根"
+#: plugins/addons/gotomasses/class_gotomasses.inc:450
+#, fuzzy
+msgid "Initial installation"
+msgstr "安装"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/systems/class_glpiSelectUser.inc:155
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: include/class_MultiSelectWindow.inc:188
-#: include/class_MultiSelectWindow.inc:190
-msgid "Root"
-msgstr "根"
+#: plugins/addons/gotomasses/class_gotomasses.inc:451
+#: plugins/admin/applications/generic.tpl:63
+#: plugins/admin/mimetypes/generic.tpl:63
+msgid "Update"
+msgstr "更新"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:215
+#: plugins/addons/gotomasses/class_gotomasses.inc:452
 #, fuzzy
-msgid "Create new dfs share"
-msgstr "创建新的 dfs 共享"
+msgid "(Re)Install"
+msgstr "重新安装"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:97
-#: plugins/addons/godfs/class_dfsgeneric.inc:99
-msgid "Dfs share already exists."
-msgstr "Dfs 共享已经存在。"
+#: plugins/addons/gotomasses/class_gotomasses.inc:453
+#, fuzzy
+msgid "Rescan"
+msgstr "俄语"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:112
-msgid "Required Field \"Name of dfs Share\" is not set."
-msgstr "需要的字段“dfs 共享名”没有设置。"
+#: plugins/addons/gotomasses/class_gotomasses.inc:454
+#, fuzzy
+msgid "Wake"
+msgstr "唤醒"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:115
-msgid "Required Field \"Description\" is not set."
-msgstr "需要的字段“描述”没有设置。"
+#: plugins/addons/gotomasses/class_gotomasses.inc:455
+#, fuzzy
+msgid "Memory check"
+msgstr "内存测试"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:118
-msgid "Required Field \"Fileserver\" is not set."
-msgstr "需要的字段“文件服务器”没有设置。"
+#: plugins/addons/gotomasses/class_goto_task.inc:6
+#, fuzzy
+msgid "System mass deployment"
+msgstr "系统管理"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:121
-msgid "Required Field \"Share on fileserver\" is not set."
-msgstr "需要的字段“文件服务器的共享”没有设置。"
+#: plugins/addons/gotomasses/class_goto_task.inc:72
+#, fuzzy
+msgid "Keep current"
+msgstr "当前"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:124
-msgid "Required Field \"Location\" is not set."
-msgstr "需要的字段“位置”没有设置。"
+#: plugins/addons/gotomasses/class_goto_task.inc:211
+#: plugins/addons/gotomasses/goto_task.tpl:174
+#, fuzzy
+msgid "Target systems"
+msgstr "删除系统"
 
-#: plugins/addons/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
-msgid "Distributed File System Administration"
-msgstr "分布式文件系统管理"
+#: plugins/addons/gotomasses/class_goto_task.inc:212
+#, fuzzy
+msgid "IP"
+msgstr "P"
 
-#: plugins/addons/mailqueue/contents.tpl:12
-msgid "Please enter a search string here."
-msgstr "请在这里输入一个查询字符串。"
+#: plugins/addons/gotomasses/class_goto_task.inc:322
+#: plugins/addons/gotomasses/class_target_list.inc:175
+#: plugins/admin/ogroups/class_divListOGroup.inc:167
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "对象组"
 
-#: plugins/addons/mailqueue/contents.tpl:14
-msgid "Select a server"
-msgstr "选择一个服务器"
+#: plugins/addons/gotomasses/class_goto_task.inc:322
+#: plugins/addons/gotomasses/goto_task.tpl:147
+#, fuzzy
+msgid "Minute"
+msgstr "打印机"
 
-#: plugins/addons/mailqueue/contents.tpl:17
-msgid "with status"
-msgstr "具有状态"
+#: plugins/addons/gotomasses/class_goto_task.inc:323
+#: plugins/addons/gotomasses/goto_task.tpl:155
+#, fuzzy
+msgid "Day"
+msgstr "天"
 
-#: plugins/addons/mailqueue/contents.tpl:21
-msgid "within the last"
-msgstr "在最近的"
+#: plugins/addons/gotomasses/class_goto_task.inc:324
+#: plugins/addons/gotomasses/goto_task.tpl:159
+#, fuzzy
+msgid "Month"
+msgstr "月"
 
-#: plugins/addons/mailqueue/contents.tpl:29
-msgid "Remove all messages"
-msgstr "删除所有邮件"
+#: plugins/addons/gotomasses/class_goto_task.inc:324
+#: plugins/addons/gotomasses/goto_task.tpl:163
+#, fuzzy
+msgid "Week day"
+msgstr "星期三"
 
-#: plugins/addons/mailqueue/contents.tpl:30
-msgid "Remove all messages from selected servers queue"
-msgstr "从所选服务器队列中删除所有邮件"
+#: plugins/addons/gotomasses/class_goto_task.inc:329
+#, fuzzy, php-format
+msgid "The given value for attribute '%s' is invalid."
+msgstr "提供的网络地址 '%s' 无效。"
 
-#: plugins/addons/mailqueue/contents.tpl:31
-msgid "Hold all messages"
-msgstr "挂起所有邮件"
+#: plugins/addons/gotomasses/class_goto_task.inc:333
+#: plugins/addons/gotomasses/class_goto_task.inc:336
+#, fuzzy, php-format
+msgid "You must specify at least one target"
+msgstr "您必须提供一个有效的挂载点。"
 
-#: plugins/addons/mailqueue/contents.tpl:32
-msgid "Hold all messages in selected servers queue"
-msgstr "从所选服务器队列中挂起所有邮件"
+#: plugins/addons/gotomasses/goto_task.tpl:20
+#, fuzzy
+msgid "Object group membership"
+msgstr "组成员身份"
 
-#: plugins/addons/mailqueue/contents.tpl:33
-msgid "Release all messages"
-msgstr "解除所有邮件"
+#: plugins/addons/gotomasses/goto_task.tpl:32
+#, fuzzy
+msgid "Configure DNS"
+msgstr "配置"
 
-#: plugins/addons/mailqueue/contents.tpl:34
-msgid "Release all messages in selected servers queue"
-msgstr "从所选服务器队列中解除所有邮件"
+#: plugins/addons/gotomasses/goto_task.tpl:43
+#, fuzzy
+msgid "Configure DHCP"
+msgstr "配置"
 
-#: plugins/addons/mailqueue/contents.tpl:35
-msgid "Requeue all messages"
-msgstr "所有邮件重入队列"
+#: plugins/addons/gotomasses/goto_task.tpl:79
+#: plugins/admin/systems/class_systemManagement.inc:33
+msgid "Systems"
+msgstr "系统设置"
 
-#: plugins/addons/mailqueue/contents.tpl:36
-msgid "Requeue all messages in selected servers queue"
-msgstr "所选服务器队列所有邮件重入队列"
+#: plugins/addons/gotomasses/goto_task.tpl:97
+#: plugins/admin/systems/glpi_devices.tpl:589
+msgid "MAC address"
+msgstr "MAC 地址"
 
-#: plugins/addons/mailqueue/contents.tpl:46
-msgid "Search returned no results"
-msgstr "查无结果"
+#: plugins/addons/gotomasses/goto_task.tpl:109
+#, fuzzy
+msgid "IP address"
+msgstr "IP 地址"
 
-#: plugins/addons/mailqueue/contents.tpl:52
-msgid "ID"
-msgstr "ID"
+#: plugins/addons/gotomasses/goto_task.tpl:119
+#, fuzzy
+msgid "CSV import from file"
+msgstr "CSV 导入"
 
-#: plugins/addons/mailqueue/contents.tpl:55
-msgid "Arrival"
-msgstr "到达"
+#: plugins/addons/gotomasses/goto_task.tpl:188
+#, fuzzy
+msgid "Add from list"
+msgstr "从列表中选择"
 
-#: plugins/addons/mailqueue/contents.tpl:57
-msgid "Recipient"
-msgstr "收件人"
+#: plugins/addons/gotomasses/goto_task.tpl:196
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:405
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
+#: setup/class_setupStep_Migrate.inc:217 setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStep_Migrate.inc:324 setup/class_setupStep_Migrate.inc:392
+#: setup/class_setupStep_Migrate.inc:468 setup/class_setupStep_Migrate.inc:539
+#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:722
+#: setup/class_setupStep_Migrate.inc:854
+#: setup/class_setupStep_Migrate.inc:1623 setup/setup_checks.tpl:27
+#: setup/setup_checks.tpl:87
+msgid "Ok"
+msgstr "好"
 
-#: plugins/addons/mailqueue/contents.tpl:58 setup/setup_checks.tpl:30
-#: setup/setup_checks.tpl:91
-msgid "Error"
-msgstr "错误"
+#: plugins/addons/gotomasses/remove.tpl:6 plugins/admin/users/remove.tpl:6
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
+msgstr ""
+"这包含该用户所有账号数据，系统访问规则，imap 设置等等。请再次检查您是否要这么"
+"做，因为 GOsa 没有办法将您的数据找回。"
 
-#: plugins/addons/mailqueue/contents.tpl:76
-#: plugins/addons/mailqueue/class_mailqueue.inc:373
-#: include/sieve/class_sieveManagement.inc:647
-msgid "Active"
-msgstr "活动"
+#: plugins/addons/gotomasses/class_target_list.inc:34
+msgid "Select the target objects for your scheduled action."
+msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:93
-msgid "Delete this message"
-msgstr "删除这条信息"
+#: plugins/addons/gotomasses/class_target_list.inc:35
+#: plugins/addons/gotomasses/class_target_list.inc:36
+#, fuzzy
+msgid "Available targets"
+msgstr "可用的测试类型"
 
-#: plugins/addons/mailqueue/contents.tpl:97
-msgid "unhold"
-msgstr "释放"
+#: plugins/addons/gotomasses/class_target_list.inc:45
+#: plugins/generic/references/contents.tpl:11
+msgid "Object name"
+msgstr "对象名称"
 
-#: plugins/addons/mailqueue/contents.tpl:97
-msgid "Release message"
-msgstr "解除挂起的邮件"
+#: plugins/addons/gotomasses/class_target_list.inc:48
+#, fuzzy
+msgid "Select to see object groups"
+msgstr "选择查看 GOsa 组"
 
-#: plugins/addons/mailqueue/contents.tpl:101
-msgid "hold"
-msgstr "挂起"
+#: plugins/addons/gotomasses/class_target_list.inc:48
+#, fuzzy
+msgid "Show object groups"
+msgstr "选择一个对象组"
 
-#: plugins/addons/mailqueue/contents.tpl:101
-msgid "Hold message"
-msgstr "挂起邮件"
+#: plugins/addons/gotomasses/class_target_list.inc:49
+#: plugins/admin/groups/group_objects.tpl:30
+#: plugins/admin/systems/class_divListSystem.inc:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
+msgstr "选择显示服务器"
 
-#: plugins/addons/mailqueue/contents.tpl:105
-msgid "requeue"
-msgstr "重入队列"
+#: plugins/addons/gotomasses/class_target_list.inc:49
+#: plugins/admin/systems/class_divListSystem.inc:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "显示服务器"
 
-#: plugins/addons/mailqueue/contents.tpl:105
-msgid "Requeue this message"
-msgstr "将此邮件重入队列"
+#: plugins/addons/gotomasses/class_target_list.inc:50
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Select to see workstations"
+msgstr "选择查看工作站"
 
-#: plugins/addons/mailqueue/contents.tpl:108
-msgid "header"
-msgstr "邮件头"
+#: plugins/addons/gotomasses/class_target_list.inc:50
+#: plugins/admin/systems/class_divListSystem.inc:63
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "显示工作站"
 
-#: plugins/addons/mailqueue/contents.tpl:108
-msgid "Display header from this message"
-msgstr "显示此邮件邮件头"
+#: plugins/addons/gotomasses/class_target_list.inc:173
+#: plugins/admin/systems/class_systemManagement.inc:875
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/ogroups/class_ogroupManagement.inc:369
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "工作站"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
 #: plugins/addons/mailqueue/main.inc:38
@@ -4752,14 +5050,121 @@ msgstr "挂起"
 msgid "Un hold"
 msgstr "解除挂起"
 
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/addons/mailqueue/contents.tpl:76
+#: plugins/admin/users/class_divListUsers.inc:187
+#: include/sieve/class_sieveManagement.inc:647
+msgid "Active"
+msgstr "活动"
+
 #: plugins/addons/mailqueue/class_mailqueue.inc:374
 msgid "Not active"
 msgstr "不活动"
 
-#: plugins/addons/ldapmanager/main.inc:40
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-msgid "LDAP manager"
-msgstr "LDAP 管理"
+#: plugins/addons/mailqueue/contents.tpl:12
+msgid "Please enter a search string here."
+msgstr "请在这里输入一个查询字符串。"
+
+#: plugins/addons/mailqueue/contents.tpl:14
+msgid "Select a server"
+msgstr "选择一个服务器"
+
+#: plugins/addons/mailqueue/contents.tpl:17
+msgid "with status"
+msgstr "具有状态"
+
+#: plugins/addons/mailqueue/contents.tpl:21
+msgid "within the last"
+msgstr "在最近的"
+
+#: plugins/addons/mailqueue/contents.tpl:29
+msgid "Remove all messages"
+msgstr "删除所有邮件"
+
+#: plugins/addons/mailqueue/contents.tpl:30
+msgid "Remove all messages from selected servers queue"
+msgstr "从所选服务器队列中删除所有邮件"
+
+#: plugins/addons/mailqueue/contents.tpl:31
+msgid "Hold all messages"
+msgstr "挂起所有邮件"
+
+#: plugins/addons/mailqueue/contents.tpl:32
+msgid "Hold all messages in selected servers queue"
+msgstr "从所选服务器队列中挂起所有邮件"
+
+#: plugins/addons/mailqueue/contents.tpl:33
+msgid "Release all messages"
+msgstr "解除所有邮件"
+
+#: plugins/addons/mailqueue/contents.tpl:34
+msgid "Release all messages in selected servers queue"
+msgstr "从所选服务器队列中解除所有邮件"
+
+#: plugins/addons/mailqueue/contents.tpl:35
+msgid "Requeue all messages"
+msgstr "所有邮件重入队列"
+
+#: plugins/addons/mailqueue/contents.tpl:36
+msgid "Requeue all messages in selected servers queue"
+msgstr "所选服务器队列所有邮件重入队列"
+
+#: plugins/addons/mailqueue/contents.tpl:46
+msgid "Search returned no results"
+msgstr "查无结果"
+
+#: plugins/addons/mailqueue/contents.tpl:52
+msgid "ID"
+msgstr "ID"
+
+#: plugins/addons/mailqueue/contents.tpl:55
+msgid "Arrival"
+msgstr "到达"
+
+#: plugins/addons/mailqueue/contents.tpl:57
+msgid "Recipient"
+msgstr "收件人"
+
+#: plugins/addons/mailqueue/contents.tpl:58 setup/setup_checks.tpl:30
+#: setup/setup_checks.tpl:91
+msgid "Error"
+msgstr "错误"
+
+#: plugins/addons/mailqueue/contents.tpl:93
+msgid "Delete this message"
+msgstr "删除这条信息"
+
+#: plugins/addons/mailqueue/contents.tpl:97
+msgid "unhold"
+msgstr "释放"
+
+#: plugins/addons/mailqueue/contents.tpl:97
+msgid "Release message"
+msgstr "解除挂起的邮件"
+
+#: plugins/addons/mailqueue/contents.tpl:101
+msgid "hold"
+msgstr "挂起"
+
+#: plugins/addons/mailqueue/contents.tpl:101
+msgid "Hold message"
+msgstr "挂起邮件"
+
+#: plugins/addons/mailqueue/contents.tpl:105
+msgid "requeue"
+msgstr "重入队列"
+
+#: plugins/addons/mailqueue/contents.tpl:105
+msgid "Requeue this message"
+msgstr "将此邮件重入队列"
+
+#: plugins/addons/mailqueue/contents.tpl:108
+msgid "header"
+msgstr "邮件头"
+
+#: plugins/addons/mailqueue/contents.tpl:108
+msgid "Display header from this message"
+msgstr "显示此邮件邮件头"
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:3
 msgid ""
@@ -4962,14 +5367,15 @@ msgstr "点击这里保存整个 LDAP 数据库到一个文件"
 msgid "Click here to save the LDAP Export "
 msgstr "点击这里保存 LDAP 导出"
 
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+#: plugins/addons/ldapmanager/main.inc:40
+msgid "LDAP manager"
+msgstr "LDAP 管理"
+
 #: plugins/addons/ldapmanager/class_export.inc:6
 msgid "CSV import"
 msgstr "CSV 导入"
 
-#: plugins/addons/logview/main.inc:33
-msgid "System log view"
-msgstr "系统日志显示"
-
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr "系统日志"
@@ -5057,40 +5463,31 @@ msgstr "主机名"
 msgid "Message"
 msgstr "信息"
 
-#: plugins/admin/fai/faiVariable.tpl:32
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/faiHook.tpl:34
-#: plugins/admin/fai/class_faiProfileEntry.inc:170
-msgid "Objects"
-msgstr "对象"
+#: plugins/addons/logview/main.inc:33
+msgid "System log view"
+msgstr "系统日志显示"
 
-#: plugins/admin/fai/faiVariable.tpl:34
-msgid "List of assigned variables"
-msgstr "已分配变量列表"
+#: plugins/admin/fai/class_faiScript.inc:282
+#: plugins/admin/fai/class_faiScript.inc:284
+#, fuzzy
+msgid "Sort direction"
+msgstr "节"
 
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
-msgstr "选择一个要删除或修改的变量"
-
-#: plugins/admin/fai/main.inc:44 plugins/admin/fai/main.inc:46
-msgid "Fully Automatic Installation"
-msgstr "全自动安装 (FAI)"
-
-#: plugins/admin/fai/class_faiScript.inc:257
-#: plugins/admin/fai/class_faiTemplate.inc:256
+#: plugins/admin/fai/class_faiScript.inc:299
+#: plugins/admin/fai/class_faiScript.inc:320
+#: plugins/admin/fai/class_faiTemplate.inc:272
 #: plugins/admin/fai/class_faiScriptEntry.inc:84
-#: plugins/admin/fai/class_faiHook.inc:279
+#: plugins/admin/fai/class_faiHook.inc:295
 #: plugins/admin/fai/class_faiHookEntry.inc:79
 #: plugins/admin/applications/generic.tpl:103
 msgid "Download"
 msgstr "下载"
 
-#: plugins/admin/fai/class_faiScript.inc:319
+#: plugins/admin/fai/class_faiScript.inc:384
 msgid "Removing FAI script base failed"
 msgstr "删除 FAI script base 失败"
 
-#: plugins/admin/fai/class_faiScript.inc:355
+#: plugins/admin/fai/class_faiScript.inc:432
 #: plugins/admin/fai/class_faiProfile.inc:396
 #, php-format
 msgid ""
@@ -5098,15 +5495,15 @@ msgid ""
 "given name."
 msgstr "无法插入一个 脚本 '%s' 于 '%s' 中。已经存在一个同名的脚本。"
 
-#: plugins/admin/fai/class_faiScript.inc:388
+#: plugins/admin/fai/class_faiScript.inc:465
 msgid "Creating FAI script base failed"
 msgstr "创建 FAI script base 失败"
 
-#: plugins/admin/fai/class_faiScript.inc:472
+#: plugins/admin/fai/class_faiScript.inc:549
 msgid "Removing FAI script failed"
 msgstr "删除 FAI 脚本失败"
 
-#: plugins/admin/fai/class_faiScript.inc:491
+#: plugins/admin/fai/class_faiScript.inc:568
 msgid "Saving FAI script failed"
 msgstr "保存 FAI 脚本失败"
 
@@ -5118,26 +5515,26 @@ msgstr "保存 FAI 脚本失败"
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr "移动树失败。目标树是源树的子树。"
 
-#: plugins/admin/fai/class_faiTemplate.inc:352
+#: plugins/admin/fai/class_faiTemplate.inc:370
 #, php-format
 msgid ""
 "Can't insert a fai template named '%s' in '%s' there is already a template "
 "with the given name."
 msgstr "无法插入一个 fai 模板 '%s' 于 '%s' 中。已经存在一个同名的模板。"
 
-#: plugins/admin/fai/class_faiTemplate.inc:385
+#: plugins/admin/fai/class_faiTemplate.inc:403
 msgid "Saving FAI template base failed"
 msgstr "保存 FAI template base 失败"
 
-#: plugins/admin/fai/class_faiTemplate.inc:463
+#: plugins/admin/fai/class_faiTemplate.inc:481
 msgid "Removing FAI template entry failed"
 msgstr "删除 FAI template entry 失败"
 
-#: plugins/admin/fai/class_faiTemplate.inc:468
+#: plugins/admin/fai/class_faiTemplate.inc:486
 msgid "Modifying FAI template entry failed"
 msgstr "修改 FAI 模板条目失败"
 
-#: plugins/admin/fai/class_faiTemplate.inc:481
+#: plugins/admin/fai/class_faiTemplate.inc:499
 msgid "Creating FAI template entry failed"
 msgstr "创建 FAI template 条目失败"
 
@@ -5156,50 +5553,42 @@ msgstr "您将要删除在 '%s' 的 FAI 类所有信息。"
 
 #: plugins/admin/fai/class_faiManagement.inc:179
 #: plugins/admin/fai/class_faiManagement.inc:225
-#: plugins/admin/systems/class_systemManagement.inc:407
-#: plugins/admin/systems/class_systemManagement.inc:467
+#: plugins/admin/systems/class_systemManagement.inc:410
+#: plugins/admin/systems/class_systemManagement.inc:470
 msgid "You are not allowed to delete this component!"
 msgstr "您无权删除这个组件！"
 
-#: plugins/admin/fai/class_faiManagement.inc:278
+#: plugins/admin/fai/class_faiManagement.inc:284
 #, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr "您将要删除一个 fai 分支 / freeze  '%s'。"
 
-#: plugins/admin/fai/class_faiManagement.inc:281
+#: plugins/admin/fai/class_faiManagement.inc:287
 msgid "You are not allowed to delete this release!"
 msgstr "您无权删除这个发行版！"
 
-#: plugins/admin/fai/class_faiManagement.inc:339
+#: plugins/admin/fai/class_faiManagement.inc:353
 msgid "Specified branch name is invalid."
 msgstr "指定的 branch 名称无效。"
 
-#: plugins/admin/fai/class_faiManagement.inc:341
+#: plugins/admin/fai/class_faiManagement.inc:355
 msgid "Specified freeze name is invalid."
 msgstr "指定的 freeze 名称无效。"
 
-#: plugins/admin/fai/class_faiManagement.inc:348
+#: plugins/admin/fai/class_faiManagement.inc:362
 #: plugins/admin/systems/class_servRepository.inc:240
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:346
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:347
 msgid "This name is already in use."
 msgstr "该名称已经被使用。"
 
-#: plugins/admin/fai/class_faiManagement.inc:427
-#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:452
+#: plugins/admin/fai/class_faiManagement.inc:625
 #: plugins/admin/users/template.tpl:48
 #: plugins/admin/departments/class_departmentGeneric.inc:431
 #: plugins/admin/departments/class_departmentGeneric.inc:523
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: include/sieve/templates/add_element.tpl:11
-#: include/sieve/templates/select_test_type.tpl:11
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18 setup/class_setup.inc:280
+#: include/sieve/templates/select_test_type.tpl:11 setup/class_setup.inc:266
 msgid "Continue"
 msgstr "继续"
 
@@ -5207,12 +5596,12 @@ msgstr "继续"
 msgid "Please enter your search string here"
 msgstr "请在这里输入您的查询字符串"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:43
+#: plugins/admin/fai/class_faiPackageEntry.inc:44
 msgid ""
 "This list displays all assigned package names for this repository settings."
 msgstr "对于该仓库的设置，这个列表显示所有已分配的软件包名称。"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:119
+#: plugins/admin/fai/class_faiPackageEntry.inc:123
 #, php-format
 msgid ""
 "Your specified search string '%s' returned too many results. Only the first "
@@ -5221,51 +5610,48 @@ msgstr "您提供的查询字符串 '%s' 返回太多结果。为减少内存占
 
 #: plugins/admin/fai/branch_selector.tpl:3
 #: plugins/admin/applications/release_select.tpl:3
+#: plugins/admin/mimetypes/release_select.tpl:3
 msgid "Branches"
 msgstr "分支"
 
 #: plugins/admin/fai/branch_selector.tpl:9
 #: plugins/admin/applications/release_select.tpl:9
+#: plugins/admin/mimetypes/release_select.tpl:9
 msgid "Current release"
 msgstr "当前版本"
 
-#: plugins/admin/fai/branch_selector.tpl:21
+#: plugins/admin/fai/branch_selector.tpl:22
+#: plugins/admin/fai/branch_selector.tpl:28
 msgid "Create new branch"
 msgstr "创建新分支"
 
-#: plugins/admin/fai/branch_selector.tpl:25
+#: plugins/admin/fai/branch_selector.tpl:26
+msgid "Branch"
+msgstr "分支"
+
+#: plugins/admin/fai/branch_selector.tpl:30
+msgid "Freeze"
+msgstr "冻结"
+
+#: plugins/admin/fai/branch_selector.tpl:33
 msgid "Create new locked branch"
 msgstr "创建新锁定分支"
 
-#: plugins/admin/fai/branch_selector.tpl:30
+#: plugins/admin/fai/branch_selector.tpl:39
 msgid "Delete current release"
 msgstr "删除当前版本"
 
-#: plugins/admin/fai/faiSummary.tpl:4
-msgid "FAI object tree"
-msgstr "自动化安装（FAI）对象树"
-
-#: plugins/admin/fai/faiSummary.tpl:9
-msgid "Reload class and release configuration from parent object."
-msgstr "从父类重新加载类和发行版配置。"
-
-#: plugins/admin/fai/remove.tpl:7
-msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-"这包含“所有”对象信息。请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据"
-"找回。"
+#: plugins/admin/fai/main.inc:44 plugins/admin/fai/main.inc:46
+msgid "Fully Automatic Installation"
+msgstr "全自动安装 (FAI)"
 
-#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"最好在执行这个操作之前，保存当前 LDAP 树中的内容到一个文件。所以，如果您已经"
-"这么做了，按“删除”继续或者按“取消”退出。"
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/class_faiProfileEntry.inc:171
+#: plugins/admin/fai/faiHook.tpl:34
+msgid "Objects"
+msgstr "对象"
 
 #: plugins/admin/fai/faiPartitionTable.tpl:34
 msgid "Discs"
@@ -5331,16 +5717,19 @@ msgid "Package"
 msgstr "软件包"
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:39
+#: plugins/admin/fai/class_divListFai.inc:177
 msgid "Scripts"
 msgstr "脚本"
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
 #: plugins/admin/fai/class_faiProfile.inc:299
+#: plugins/admin/fai/class_divListFai.inc:175
 #: plugins/admin/fai/class_faiProfileEntry.inc:139
 msgid "Partition table"
 msgstr "分区表"
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:44
+#: plugins/admin/fai/class_divListFai.inc:176
 msgid "Package list"
 msgstr "软件包列表"
 
@@ -5366,17 +5755,17 @@ msgid "FS options"
 msgstr "文件系统选项"
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:331
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:204
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:209
 msgid "Mount options"
 msgstr "挂载选项"
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:332
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:203
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:208
 msgid "Size in MB"
 msgstr "单位 MB"
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:333
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:202
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:207
 msgid "Mount point"
 msgstr "挂载点"
 
@@ -5391,16 +5780,28 @@ msgid "Selected file is empty."
 msgstr "选择的文件为空。"
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:128
-#: plugins/admin/fai/class_faiVariableEntry.inc:97
-#: plugins/admin/fai/class_faiHookEntry.inc:142
-#: plugins/admin/fai/class_faiTemplateEntry.inc:187
+msgid "There is already a script with the given name."
+msgstr "已经存在相同名称的脚本。"
+
+#: plugins/admin/fai/class_faiScriptEntry.inc:132
+#: plugins/admin/fai/class_faiVariableEntry.inc:101
+#: plugins/admin/fai/class_faiHookEntry.inc:146
+#: plugins/admin/fai/class_faiTemplateEntry.inc:191
 msgid "Please enter a name."
 msgstr "请输入一个名称。"
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:132
+#: plugins/admin/fai/class_faiScriptEntry.inc:136
 msgid "Please enter a script."
 msgstr "请输入一个脚本。"
 
+#: plugins/admin/fai/faiVariable.tpl:34
+msgid "List of assigned variables"
+msgstr "已分配变量列表"
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr "选择一个要删除或修改的变量"
+
 #: plugins/admin/fai/faiScriptEntry.tpl:29
 #: plugins/admin/groups/class_divListGroup.inc:50
 #: plugins/admin/users/class_divListUsers.inc:51
@@ -5431,19 +5832,19 @@ msgstr "导入脚本"
 msgid "No repository server found that provide this release '%s'."
 msgstr "未发现仓库服务器提供这个版本 '%s'。"
 
-#: plugins/admin/fai/class_faiPackage.inc:343
+#: plugins/admin/fai/class_faiPackage.inc:344
 msgid "Removing FAI package base failed"
 msgstr "删除 FAI package base 失败"
 
-#: plugins/admin/fai/class_faiPackage.inc:372
+#: plugins/admin/fai/class_faiPackage.inc:373
 msgid "Please select a least one Package."
 msgstr "请选择至少一个软件包。"
 
-#: plugins/admin/fai/class_faiPackage.inc:376
+#: plugins/admin/fai/class_faiPackage.inc:377
 msgid "Please choose a valid combination for your repository setup."
 msgstr "请为您仓库的设置选择一个有效的组合。"
 
-#: plugins/admin/fai/class_faiPackage.inc:389
+#: plugins/admin/fai/class_faiPackage.inc:390
 #, php-format
 msgid ""
 "Can't insert a fai package list named '%s' in '%s' there is already a "
@@ -5451,37 +5852,38 @@ msgid ""
 msgstr ""
 "无法插入一个名为 '%s' 新 fai 软件包列表在 '%s' 中。已经存在一个同名的了。"
 
-#: plugins/admin/fai/class_faiPackage.inc:411
+#: plugins/admin/fai/class_faiPackage.inc:412
 msgid "package is configured"
 msgstr "软件包已配置"
 
-#: plugins/admin/fai/class_faiPackage.inc:417
+#: plugins/admin/fai/class_faiPackage.inc:418
 msgid "Package marked for removal"
 msgstr "软件包标记为删除"
 
-#: plugins/admin/fai/class_faiPackage.inc:443
+#: plugins/admin/fai/class_faiPackage.inc:444
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr "软件包文件 '%s' 不存在。"
 
-#: plugins/admin/fai/class_faiPackage.inc:507
+#: plugins/admin/fai/class_faiPackage.inc:508
 msgid "Saving FAI package base failed"
 msgstr "保存 FAI package base 失败"
 
-#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/class_faiPackage.inc:554
 msgid "Saving FAI package entry failed"
 msgstr "保存 FAI package entry 失败"
 
 #: plugins/admin/fai/faiPackage.tpl:33
-#: plugins/admin/systems/workstationStartup.tpl:47
-#: plugins/admin/systems/workstationStartup.tpl:77
-#: plugins/admin/systems/class_servRepository.inc:280
+#: plugins/admin/systems/workstationStartup.tpl:46
+#: plugins/admin/systems/workstationStartup.tpl:82
+#: plugins/admin/systems/class_servRepository.inc:281
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 msgid "Release"
 msgstr "发行"
 
 #: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/systems/class_printerPPDDialog.inc:408
+#: plugins/admin/systems/class_printerPPDDialog.inc:402
+#: plugins/admin/systems/dhcpNewSection.tpl:9
 msgid "Section"
 msgstr "节"
 
@@ -5497,40 +5899,40 @@ msgstr "使用软件包"
 msgid "Choosen packages"
 msgstr "选择的软件包"
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:74 include/functions.inc:677
 msgid "Configure"
 msgstr "配置"
 
-#: plugins/admin/fai/faiPackage.tpl:74
+#: plugins/admin/fai/faiPackage.tpl:75
 msgid "Toggle remove flag"
 msgstr "切换删除标记"
 
-#: plugins/admin/fai/class_faiHook.inc:346
+#: plugins/admin/fai/class_faiHook.inc:364
 msgid "Removing FAI hook base failed"
 msgstr "删除 FAI hook base 失败"
 
-#: plugins/admin/fai/class_faiHook.inc:382
+#: plugins/admin/fai/class_faiHook.inc:400
 #, php-format
 msgid ""
 "Can't insert a fai hook named '%s' in '%s' there is already a hook with the "
 "given name."
 msgstr "无法插入一个 fai 钩子 '%s' 于 '%s' 中。已经存在一个同名的钩子。"
 
-#: plugins/admin/fai/class_faiHook.inc:415
+#: plugins/admin/fai/class_faiHook.inc:433
 msgid "Saving FAI hook base failed"
 msgstr "保存 FAI hook base 失败"
 
-#: plugins/admin/fai/class_faiHook.inc:505
+#: plugins/admin/fai/class_faiHook.inc:523
 msgid "Removing FAI hook failed"
 msgstr "删除 FAI 钩子失败"
 
-#: plugins/admin/fai/class_faiHook.inc:511
-#: plugins/admin/fai/class_faiHook.inc:521
+#: plugins/admin/fai/class_faiHook.inc:529
+#: plugins/admin/fai/class_faiHook.inc:539
 msgid "Saving FAI hook failed"
 msgstr "保存 FAI 钩子失败"
 
 #: plugins/admin/fai/class_faiProfile.inc:291
-#: plugins/admin/fai/class_faiProfileEntry.inc:167
+#: plugins/admin/fai/class_faiProfileEntry.inc:168
 msgid "This list displays all assigned class names for this profile."
 msgstr "这个列表显示该 profile 所有分配的类名。"
 
@@ -5562,8 +5964,20 @@ msgstr "软件包集合"
 msgid "Remove class from profile"
 msgstr "从 profile 中删除分类"
 
+#: plugins/admin/fai/class_faiProfile.inc:305
+#: plugins/admin/systems/class_glpiSelectUser.inc:158
+#: plugins/admin/systems/class_servDNSeditZone.inc:331
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/ogroups/phonequeue.tpl:21
+#: include/sieve/templates/object_container.tpl:8
+#: include/sieve/templates/object_container_clear.tpl:8
+#: include/class_MultiSelectWindow.inc:197
+#: include/class_MultiSelectWindow.inc:199
+msgid "Up"
+msgstr "上"
+
 #: plugins/admin/fai/class_faiProfile.inc:306
-#: plugins/admin/systems/class_servDNSeditZone.inc:291
+#: plugins/admin/systems/class_servDNSeditZone.inc:332
 #: plugins/admin/ogroups/phonequeue.tpl:22
 #: include/sieve/templates/object_container.tpl:12
 #: include/sieve/templates/object_container_clear.tpl:12
@@ -5583,7 +5997,8 @@ msgid "Please enter a valid name."
 msgstr "请输入一个有效名称。"
 
 #: plugins/admin/fai/class_faiProfile.inc:420
-msgid "There is already a profile with this class name defined."
+#, fuzzy
+msgid "There is already a FAI object with this class name defined."
 msgstr "已经有一个 profile 使用了这个类名。"
 
 #: plugins/admin/fai/class_faiProfile.inc:459
@@ -5598,65 +6013,70 @@ msgstr "自动化安装（FAI）类"
 msgid "Enter FAI object name"
 msgstr "输入 FAI 对象名称"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
 msgid "primary"
 msgstr "主要"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
 msgid "logical"
 msgstr "逻辑"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:201
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:206
 msgid "FS type"
 msgstr "文件系统类型"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:205
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:210
 msgid "FS option"
 msgstr "文件系统选项"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:206
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:211
 msgid "Preserve"
 msgstr "保留"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:362
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:359
+#, fuzzy
+msgid "Please specify a valid disk name"
+msgstr "请输入一个有效的用户名！"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:372
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr "请输入分区 %s 的一个唯一挂载点"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:367
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:377
 #, php-format
 msgid "Please enter a valid mount point for partition %s."
 msgstr "请输入分区 %s 的一个有效挂载点"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:372
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr "文件系统类型 'swap' 已经使用过了，修改分区 %s 的文件系统类型。"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr "请用 'swap' 作为挂载点，如果 'swap' 作为文件系统类型。"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
 #, php-format
 msgid "Please enter a valid partition size for partition %s."
 msgstr "请为分区 %s 输入一个有效的分区大小。"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:394
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:402
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:404
 #, php-format
 msgid "Please enter a valid range for partition %s."
 msgstr "请为分区 %s 输入一个有效范围。"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:399
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:409
 #, php-format
 msgid "Please enter a range for partition size for partition %s."
 msgstr "请为分区 %s 输入分区大小范围。"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:424
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
@@ -5674,11 +6094,15 @@ msgstr "分区条目"
 msgid "Add partition"
 msgstr "添加分区"
 
-#: plugins/admin/fai/faiScript.tpl:36
+#: plugins/admin/fai/faiScript.tpl:35
 msgid "List of scripts"
 msgstr "脚本列表"
 
 #: plugins/admin/fai/class_faiVariableEntry.inc:93
+msgid "There is already a variable with the given name."
+msgstr "已经存在相同名称的变量。"
+
+#: plugins/admin/fai/class_faiVariableEntry.inc:97
 msgid "Please specify a value for the attribute 'content'."
 msgstr "请为属性“内容”给定一个值。"
 
@@ -5709,12 +6133,12 @@ msgstr ""
 msgid "Please enter a name for the branch"
 msgstr "请为该分支输入一个名称"
 
-#: plugins/admin/fai/faiNewBranch.tpl:35
+#: plugins/admin/fai/faiNewBranch.tpl:34
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr "处理请求的操作"
 
-#: plugins/admin/fai/faiNewBranch.tpl:36
+#: plugins/admin/fai/faiNewBranch.tpl:35
 msgid ""
 "As soon as the copy operation has finished, you can scroll down to end of "
 "the page and press the 'Continue' button to continue with the fai management "
@@ -5722,18 +6146,18 @@ msgid ""
 msgstr ""
 "一旦拷贝完成，您可以滚动页面到最下端，按“继续”按钮继续 fai 管理对话框。"
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
+#: plugins/admin/fai/faiNewBranch.tpl:41
 #: plugins/admin/departments/dep_iframe.tpl:8
 msgid ""
 "Your browser doesn't support iframes, please use this link to perform the "
 "requested operation."
 msgstr "您的浏览器不支持 iframe，请使用这个链接来执行请求的操作。"
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
+#: plugins/admin/fai/faiNewBranch.tpl:43
 msgid "Perform requested operation."
 msgstr "执行请求的操作。"
 
-#: plugins/admin/fai/faiNewBranch.tpl:44
+#: plugins/admin/fai/faiNewBranch.tpl:43
 msgid "Initiate operation"
 msgstr "初始操作"
 
@@ -5836,107 +6260,163 @@ msgstr "显示 FAI 分区"
 msgid "Show partitions"
 msgstr "显示分区"
 
-#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/fai/class_divListFai.inc:127
 msgid "New profile"
 msgstr "新配置"
 
-#: plugins/admin/fai/class_divListFai.inc:117
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:224
+#: plugins/admin/fai/class_divListFai.inc:127
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 msgid "P"
 msgstr "P"
 
-#: plugins/admin/fai/class_divListFai.inc:122
+#: plugins/admin/fai/class_divListFai.inc:132
 msgid "New partition table"
 msgstr "新分区表"
 
-#: plugins/admin/fai/class_divListFai.inc:122
+#: plugins/admin/fai/class_divListFai.inc:132
 msgid "PT"
 msgstr "PT"
 
-#: plugins/admin/fai/class_divListFai.inc:125
+#: plugins/admin/fai/class_divListFai.inc:135
 msgid "New scripts"
 msgstr "新脚本"
 
-#: plugins/admin/fai/class_divListFai.inc:125
+#: plugins/admin/fai/class_divListFai.inc:135
 msgid "S"
 msgstr "S"
 
-#: plugins/admin/fai/class_divListFai.inc:128
+#: plugins/admin/fai/class_divListFai.inc:138
 msgid "New hooks"
 msgstr "新钩子"
 
-#: plugins/admin/fai/class_divListFai.inc:128
+#: plugins/admin/fai/class_divListFai.inc:138
 msgid "H"
 msgstr "H"
 
-#: plugins/admin/fai/class_divListFai.inc:131
+#: plugins/admin/fai/class_divListFai.inc:141
 msgid "New variables"
 msgstr "新变量"
 
-#: plugins/admin/fai/class_divListFai.inc:131
+#: plugins/admin/fai/class_divListFai.inc:141
 msgid "V"
 msgstr "V"
 
-#: plugins/admin/fai/class_divListFai.inc:134
+#: plugins/admin/fai/class_divListFai.inc:144
 msgid "New templates"
 msgstr "新模板"
 
-#: plugins/admin/fai/class_divListFai.inc:134
+#: plugins/admin/fai/class_divListFai.inc:144
 msgid "T"
 msgstr "T"
 
-#: plugins/admin/fai/class_divListFai.inc:137
+#: plugins/admin/fai/class_divListFai.inc:147
 msgid "New package list"
 msgstr "新软件包列表"
 
-#: plugins/admin/fai/class_divListFai.inc:137
+#: plugins/admin/fai/class_divListFai.inc:147
 msgid "PK"
 msgstr "PK"
 
-#: plugins/admin/fai/class_divListFai.inc:206
+#: plugins/admin/fai/class_divListFai.inc:180
+#, fuzzy
+msgid "Profile"
+msgstr "Profiles"
+
+#: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:178
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 msgid "cut"
 msgstr "剪切"
 
-#: plugins/admin/fai/class_divListFai.inc:206
+#: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:178
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 msgid "Cut this entry"
 msgstr "剪切条目"
 
-#: plugins/admin/fai/class_divListFai.inc:209
+#: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:180
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 msgid "copy"
 msgstr "复制"
 
-#: plugins/admin/fai/class_divListFai.inc:209
+#: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:180
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 msgid "Copy this entry"
 msgstr "拷贝条目"
 
-#: plugins/admin/fai/class_divListFai.inc:214
-#: plugins/admin/fai/class_divListFai.inc:219
+#: plugins/admin/fai/class_divListFai.inc:231
+#: plugins/admin/fai/class_divListFai.inc:236
 msgid "Edit class"
 msgstr "编辑分类"
 
-#: plugins/admin/fai/class_divListFai.inc:221
+#: plugins/admin/fai/class_divListFai.inc:238
 msgid "Delete class"
 msgstr "删除分类"
 
-#: plugins/admin/fai/faiHook.tpl:36
-msgid "List of hook scripts"
-msgstr "钩子脚本列表"
+#: plugins/admin/fai/class_divListFai.inc:262
+msgid "Number of listed profiles"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:263
+msgid "Number of listed partitions"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:264
+#, fuzzy
+msgid "Number of listed scripts"
+msgstr "sieve 脚本列表"
+
+#: plugins/admin/fai/class_divListFai.inc:265
+msgid "Number of listed hooks"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:266
+#, fuzzy
+msgid "Number of listed variables"
+msgstr "已分配变量列表"
+
+#: plugins/admin/fai/class_divListFai.inc:267
+#, fuzzy
+msgid "Number of listed templates"
+msgstr "要创建子树的名称"
+
+#: plugins/admin/fai/class_divListFai.inc:268
+#, fuzzy
+msgid "Number of listed packages"
+msgstr "使用软件包"
+
+#: plugins/admin/fai/remove.tpl:7
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+"这包含“所有”对象信息。请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据"
+"找回。"
+
+#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
+#: plugins/admin/systems/remove_dhcp.tpl:10
+#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"最好在执行这个操作之前，保存当前 LDAP 树中的内容到一个文件。所以，如果您已经"
+"这么做了，按“删除”继续或者按“取消”退出。"
 
 #: plugins/admin/fai/class_faiPartitionTable.inc:271
 #: plugins/admin/fai/class_faiPartitionTable.inc:277
@@ -5980,6 +6460,10 @@ msgid "Saving FAI partition table entry failed"
 msgstr "保存 FAI 分区表条目失败"
 
 #: plugins/admin/fai/class_faiHookEntry.inc:138
+msgid "There is already a hook with the given name."
+msgstr "已经存在一个有相同名称的 hook。"
+
+#: plugins/admin/fai/class_faiHookEntry.inc:142
 msgid "Please enter a value for script."
 msgstr "请为脚本输入一个值。"
 
@@ -5987,7 +6471,7 @@ msgstr "请为脚本输入一个值。"
 msgid "Package bundle"
 msgstr "软件包集合"
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:169
+#: plugins/admin/fai/class_faiProfileEntry.inc:170
 #: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
 msgid "Class name"
 msgstr "类名"
@@ -6009,23 +6493,23 @@ msgstr "选择一个已存在的 FAI 任务"
 msgid "Debconf information for package '%s'"
 msgstr "软件包'%s' 的 Debconf 信息"
 
-#: plugins/admin/fai/class_faiVariable.inc:280
+#: plugins/admin/fai/class_faiVariable.inc:282
 #, php-format
 msgid ""
 "Can't insert a fai variable named '%s' in '%s' there is already a variable "
 "with the given name."
 msgstr "无法插入一个 fai 变量 '%s' 于 '%s' 中。已经存在一个同名的变量。"
 
-#: plugins/admin/fai/class_faiVariable.inc:313
+#: plugins/admin/fai/class_faiVariable.inc:315
 msgid "Saving FAI variable base failed"
 msgstr "保存 FAI 变量基准失败"
 
-#: plugins/admin/fai/class_faiVariable.inc:379
+#: plugins/admin/fai/class_faiVariable.inc:381
 msgid "Removing FAI variable failed"
 msgstr "删除 FAI 变量失败"
 
-#: plugins/admin/fai/class_faiVariable.inc:386
-#: plugins/admin/fai/class_faiVariable.inc:398
+#: plugins/admin/fai/class_faiVariable.inc:388
+#: plugins/admin/fai/class_faiVariable.inc:400
 msgid "Saving FAI variable failed"
 msgstr "保存 FAI 变量失败"
 
@@ -6105,8 +6589,8 @@ msgstr "选择分类名"
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 #: plugins/admin/systems/glpiDeviceManagement.tpl:51
-#: plugins/admin/systems/class_glpiSelectUser.inc:108
-#: plugins/admin/systems/class_glpiSelectUser.inc:135
+#: plugins/admin/systems/class_glpiSelectUser.inc:109
+#: plugins/admin/systems/class_glpiSelectUser.inc:136
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
@@ -6136,35 +6620,47 @@ msgid "exists in database (size: %s bytes)"
 msgstr "存在于数据库 （大小： %s 字节）"
 
 #: plugins/admin/fai/class_faiTemplateEntry.inc:179
+msgid "There is already a template with the given name."
+msgstr "已经存在相同名称的模板。"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:183
 msgid "Please specify a value for attribute 'file'."
 msgstr "请为属性“文件”指定一个值"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:183
+#: plugins/admin/fai/class_faiTemplateEntry.inc:187
 msgid "Please specify a value for attribute 'path'."
 msgstr "请为属性“路径”给定一个值"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:191
+#: plugins/admin/fai/class_faiTemplateEntry.inc:195
 msgid "Please enter a user."
 msgstr "请输入一个用户。"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:194
+#: plugins/admin/fai/class_faiTemplateEntry.inc:198
 msgid "Please enter a valid user. Only a-z/0-9 are allowed."
 msgstr "请输入一个有效用户名。只允许 a-z/0-9。"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:198
+#: plugins/admin/fai/class_faiTemplateEntry.inc:202
 msgid "Please enter a group."
 msgstr "请输入一个组。"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:201
+#: plugins/admin/fai/class_faiTemplateEntry.inc:205
 msgid "Please enter a valid group. Only a-z/0-9 are allowed."
 msgstr "请输入一个有效组名。只允许 a-z/0-9。"
 
+#: plugins/admin/fai/faiSummary.tpl:4
+msgid "FAI object tree"
+msgstr "自动化安装（FAI）对象树"
+
+#: plugins/admin/fai/faiSummary.tpl:9
+msgid "Reload class and release configuration from parent object."
+msgstr "从父类重新加载类和发行版配置。"
+
 #: plugins/admin/fai/faiTemplateEntry.tpl:21
 msgid "Template attributes"
 msgstr "模板属性"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:29
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:30 include/php_setup.inc:136
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:30 include/php_setup.inc:195
 msgid "File"
 msgstr "文件"
 
@@ -6190,8 +6686,10 @@ msgstr "所有者"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:841
-#: plugins/admin/systems/class_printGeneric.inc:843
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:30
+#: plugins/admin/systems/class_servDHCP.inc:38
+#: plugins/admin/systems/class_printGeneric.inc:866
+#: plugins/admin/systems/class_printGeneric.inc:868
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -6202,7 +6700,8 @@ msgid "Access"
 msgstr "访问"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
-#: plugins/admin/systems/class_servDNS.inc:164
+#: plugins/admin/systems/class_servDHCP.inc:35
+#: plugins/admin/systems/class_servDNS.inc:251
 msgid "Class"
 msgstr "类"
 
@@ -6216,8 +6715,8 @@ msgstr "写"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:128 plugins/admin/systems/server.tpl:61
-#: plugins/admin/systems/workstation.tpl:107
+#: plugins/admin/systems/server.tpl:61 plugins/admin/systems/terminal.tpl:138
+#: plugins/admin/systems/workstation.tpl:119
 #: plugins/admin/ogroups/termgroup.tpl:85
 msgid "Execute"
 msgstr "执行"
@@ -6242,25 +6741,55 @@ msgstr "其他"
 msgid "sticky"
 msgstr "置顶"
 
-#: plugins/admin/groups/application.tpl:3
-msgid "Release focus"
-msgstr ""
+#: plugins/admin/fai/faiHook.tpl:36
+msgid "List of hook scripts"
+msgstr "钩子脚本列表"
 
-#: plugins/admin/groups/application.tpl:5
-msgid "Select release name"
-msgstr "选择发行名称"
+#: plugins/admin/groups/acl_definition.inc:442
+msgid "Scalix Mail node"
+msgstr "Scalix 邮件节点"
 
-#: plugins/admin/groups/application.tpl:16
-msgid "Used applications"
-msgstr "使用的应用程序"
+#: plugins/admin/groups/acl_definition.inc:443
+msgid "Mailbox class"
+msgstr "邮箱类别"
 
-#: plugins/admin/groups/application.tpl:19
-msgid "Add category"
-msgstr "æ·»å\8a å\88\86ç±»"
+#: plugins/admin/groups/acl_definition.inc:444
+msgid "Server language"
+msgstr "æ\9c\8då\8a¡å\99¨è¯­è¨\80"
 
-#: plugins/admin/groups/application.tpl:24
-msgid "Available applications"
-msgstr "可用的应用程序"
+#: plugins/admin/groups/acl_definition.inc:446
+msgid "Mailbox administrator"
+msgstr "邮箱管理员"
+
+#: plugins/admin/groups/acl_definition.inc:447
+msgid "Hide user entry in Scalix"
+msgstr "在 Scalix 中隐藏用户条目"
+
+#: plugins/admin/groups/acl_definition.inc:448
+msgid "Mailbox size limitations"
+msgstr "邮箱大小限制"
+
+#: plugins/admin/groups/acl_definition.inc:449
+msgid "Limit outbound"
+msgstr "限制出栈"
+
+#: plugins/admin/groups/acl_definition.inc:450
+msgid "Limit inbound"
+msgstr "限制入栈"
+
+#: plugins/admin/groups/acl_definition.inc:451
+msgid "Notify user"
+msgstr "通知用户"
+
+#: plugins/admin/groups/acl_definition.inc:453
+#, fuzzy
+msgid "Create/edit new task"
+msgstr "创建新用户"
+
+#: plugins/admin/groups/acl_definition.inc:453
+#, fuzzy
+msgid "Remove tasks"
+msgstr "删除选项"
 
 #: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
 msgid "Primary mail address for this shared folder"
@@ -6270,41 +6799,39 @@ msgstr "此共享目录的主要邮件地址"
 msgid "Select mail server to place user on"
 msgstr "选择放置用户的邮件服务器"
 
-#: plugins/admin/groups/mail.tpl:63
+#: plugins/admin/groups/mail.tpl:43
+#, fuzzy
+msgid "Folder type"
+msgstr "目录"
+
+#: plugins/admin/groups/mail.tpl:53 setup/setup_ldap.tpl:65
+msgid "Reload"
+msgstr "重新加载"
+
+#: plugins/admin/groups/mail.tpl:81
 msgid "IMAP shared folders"
 msgstr "IMAP 共享目录"
 
-#: plugins/admin/groups/mail.tpl:67
+#: plugins/admin/groups/mail.tpl:85
 msgid "Default permission"
 msgstr "缺省权限"
 
-#: plugins/admin/groups/mail.tpl:76
+#: plugins/admin/groups/mail.tpl:94
 msgid "Member permission"
 msgstr "成员权限"
 
-#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
+#: plugins/admin/groups/mail.tpl:106 plugins/admin/groups/paste_mail.tpl:34
 msgid "Forward messages to non group members"
 msgstr "转发邮件到非组成员"
 
-#: plugins/admin/groups/remove.tpl:6
-msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
-msgstr ""
-"这可能是一个主要的用户组。请再次检查您是否要这么做，因为 GOsa 没有办法将您的"
-"数据找回。"
-
-#: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
-msgid "Group administration"
-msgstr "组管理"
-
 #: plugins/admin/groups/class_groupManagement.inc:25 html/getxls.php:97
 #: html/getxls.php:99 html/getxls.php:244
 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/mimetypes/class_mimetypeManagement.inc:168
 #: plugins/admin/ogroups/class_ogroupManagement.inc:137
 msgid "You are not allowed to execute this method!"
 msgstr "您无权执行这个方法！"
@@ -6376,24 +6903,29 @@ msgstr "没有发现为 '%s' 配置的 RIDBASE"
 msgid "Saving group failed"
 msgstr "保存组失败"
 
-#: plugins/admin/groups/class_groupGeneric.inc:756
+#: plugins/admin/groups/class_groupGeneric.inc:757
 #: plugins/admin/ogroups/class_ogroup.inc:612
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr "您无权在此 'Base' 下创建一个组"
 
-#: plugins/admin/groups/class_groupGeneric.inc:766
+#: plugins/admin/groups/class_groupGeneric.inc:762
+#, fuzzy
+msgid "You have no permissions to move a group from the original 'Base'."
+msgstr "您无权从原 'Base' 移动一个用户。"
+
+#: plugins/admin/groups/class_groupGeneric.inc:773
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr "字段 'Name' 包含无效字符。只允许小写字母，数字和短线。"
 
-#: plugins/admin/groups/class_groupGeneric.inc:777
-#: plugins/admin/groups/class_groupGeneric.inc:791
+#: plugins/admin/groups/class_groupGeneric.inc:784
 #: plugins/admin/groups/class_groupGeneric.inc:798
+#: plugins/admin/groups/class_groupGeneric.inc:805
 msgid "Value specified as 'Name' is already used."
 msgstr "指定为“名称”的值已经在使用了。"
 
-#: plugins/admin/groups/class_groupGeneric.inc:852
+#: plugins/admin/groups/class_groupGeneric.inc:859
 msgid "Too many groups, can't allocate a free ID!"
 msgstr "太多用户组，无法分配可用 ID！"
 
@@ -6460,12 +6992,13 @@ msgid "Create new group"
 msgstr "创建新组"
 
 #: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:139
+#: plugins/admin/users/class_divListUsers.inc:142
 msgid "Posix"
 msgstr "Posix"
 
 #: plugins/admin/groups/class_divListGroup.inc:127
 #: plugins/admin/applications/class_divListApplication.inc:119
+#: plugins/admin/ogroups/tabs_ogroups.inc:119
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
@@ -6475,6 +7008,7 @@ msgstr "应用程序"
 #: plugins/admin/groups/class_divListGroup.inc:157
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:167
 #: plugins/admin/ogroups/class_divListOGroup.inc:142
 #: plugins/gofon/conference/class_divListConferences.inc:94
 msgid "Edit this entry"
@@ -6483,174 +7017,199 @@ msgstr "编辑这条记录"
 #: plugins/admin/groups/class_divListGroup.inc:161
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:170
 #: plugins/admin/ogroups/class_divListOGroup.inc:146
 #: plugins/gofon/conference/class_divListConferences.inc:96
 #: plugins/gofon/conference/class_divListConferences.inc:98
 msgid "Delete this entry"
 msgstr "删除这个条目"
 
-#: plugins/admin/groups/acl.tpl:4
-#: plugins/admin/departments/class_departmentGeneric.inc:503
-#: include/class_ldap.inc:463
-msgid "Object"
-msgstr "对象"
-
-#: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
-msgstr "选择"
-
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
-msgstr "该 acl 只对用户自身条目起作用。"
+#: plugins/admin/groups/class_divListGroup.inc:212
+#, fuzzy
+msgid "Number of listed groups"
+msgstr "组名称"
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
-msgstr "目录管理员"
+#: plugins/admin/groups/remove.tpl:6
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
+msgstr ""
+"这可能是一个主要的用户组。请再次检查您是否要这么做，因为 GOsa 没有办法将您的"
+"数据找回。"
 
-#: plugins/admin/groups/mail_admins.tpl:24
-msgid "Select a specific department"
-msgstr "选择一个特定的部门"
+#: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
+msgid "Group administration"
+msgstr "组管理"
 
-#: plugins/admin/groups/class_groupMail.inc:287
+#: plugins/admin/groups/class_groupMail.inc:297
 msgid "read"
 msgstr "读"
 
-#: plugins/admin/groups/class_groupMail.inc:288
+#: plugins/admin/groups/class_groupMail.inc:298
 msgid "post"
 msgstr "贴"
 
-#: plugins/admin/groups/class_groupMail.inc:289
+#: plugins/admin/groups/class_groupMail.inc:299
 msgid "external post"
 msgstr "外部粘贴"
 
-#: plugins/admin/groups/class_groupMail.inc:290
+#: plugins/admin/groups/class_groupMail.inc:300
 msgid "append"
 msgstr "附加"
 
-#: plugins/admin/groups/class_groupMail.inc:291
+#: plugins/admin/groups/class_groupMail.inc:301
 msgid "write"
 msgstr "写"
 
-#: plugins/admin/groups/class_groupMail.inc:292
-#, fuzzy
+#: plugins/admin/groups/class_groupMail.inc:302
 msgid "admin"
 msgstr "管理员"
 
-#: plugins/admin/groups/class_groupMail.inc:293
-#: plugins/admin/users/class_userManagement.inc:475
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:388
+#: plugins/admin/groups/class_groupMail.inc:303
+#: plugins/admin/users/class_userManagement.inc:516
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:389
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
 msgid "none"
 msgstr "无"
 
-#: plugins/admin/groups/class_groupMail.inc:325
+#: plugins/admin/groups/class_groupMail.inc:335
 msgid "This 'dn' has no valid mail extensions."
 msgstr "这个 'dn' 没有有效邮件扩展。"
 
-#: plugins/admin/groups/class_groupMail.inc:349
+#: plugins/admin/groups/class_groupMail.inc:359
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr "当条目从 LDAP 中删除后，从邮件服务器数据库中删除共享目录"
 
-#: plugins/admin/groups/class_groupMail.inc:350
+#: plugins/admin/groups/class_groupMail.inc:360
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr "在保存完毕该账号后，删除共享目录和其中所有内容"
 
-#: plugins/admin/groups/class_groupMail.inc:405
+#: plugins/admin/groups/class_groupMail.inc:415
 msgid "You're trying to add an invalid email address "
 msgstr "您正在添加一个无效邮件地址"
 
-#: plugins/admin/groups/class_groupMail.inc:406
-msgid "to the list of forwarders."
-msgstr ""
+#: plugins/admin/groups/class_groupMail.inc:613
+#: plugins/admin/groups/class_groupMail.inc:619
+#, fuzzy
+msgid "Unspecified"
+msgstr "未定义"
 
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "Removing group mail settings failed"
-msgstr "删除组邮件设置失败"
+#: plugins/admin/groups/class_groupMail.inc:613
+#, fuzzy
+msgid "Mails"
+msgstr "邮件"
 
-#: plugins/admin/groups/class_groupMail.inc:830
-msgid "Saving group mail settings failed"
-msgstr "保存组邮件设置失败"
+#: plugins/admin/groups/class_groupMail.inc:614
+#, fuzzy
+msgid "Tasks"
+msgstr "任务"
 
-#: plugins/admin/groups/class_groupMail.inc:859
-msgid "Please enter a valid email addres in 'Primary address' field."
-msgstr "请在“主要地址”栏输入一个有效邮件地址。"
+#: plugins/admin/groups/class_groupMail.inc:614
+#, fuzzy
+msgid "Journals"
+msgstr "小时"
 
-#: plugins/admin/groups/class_groupMail.inc:892
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
-msgstr "请选择一个有效的权限设置。缺省权限不能为空。"
+#: plugins/admin/groups/class_groupMail.inc:615
+msgid "Calendar"
+msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:896
-msgid "Please select a valid mail server."
-msgstr "请选择一个有效的邮件服务器。"
+#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+msgid "Contacts"
+msgstr "联系"
 
-#: plugins/admin/groups/generic.tpl:7 plugins/admin/groups/paste_generic.tpl:5
-#: plugins/admin/ogroups/generic.tpl:7
-#: plugins/admin/ogroups/paste_generic.tpl:4
-msgid "Group name"
-msgstr "组名"
+#: plugins/admin/groups/class_groupMail.inc:616
+#, fuzzy
+msgid "Notes"
+msgstr "否"
 
-#: plugins/admin/groups/generic.tpl:9 plugins/admin/groups/paste_generic.tpl:8
-msgid "Posix name of the group"
-msgstr "组的 posix 名称"
+#: plugins/admin/groups/class_groupMail.inc:619
+#, fuzzy
+msgid "Inbox"
+msgstr "索引"
 
-#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
-msgid "Descriptive text for this group"
-msgstr "组的描述文字"
+#: plugins/admin/groups/class_groupMail.inc:620
+#, fuzzy
+msgid "Drafts"
+msgstr "日期"
 
-#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
-msgid "Choose subtree to place group in"
-msgstr "选择来放置组的子树"
+#: plugins/admin/groups/class_groupMail.inc:620
+msgid "Sent items"
+msgstr ""
 
-#: plugins/admin/groups/generic.tpl:41
-#: plugins/admin/groups/paste_generic.tpl:13
-msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr "一般 ID 是自动创建的，要手工设置请选择"
+#: plugins/admin/groups/class_groupMail.inc:621
+msgid "Junk mail"
+msgstr ""
 
-#: plugins/admin/groups/generic.tpl:41
-#: plugins/admin/groups/paste_generic.tpl:15
-msgid "Force GID"
-msgstr "强制 GID"
+#: plugins/admin/groups/class_groupMail.inc:623
+#: include/sieve/class_sieveElement_If.inc:27
+#: include/sieve/class_sieveElement_If.inc:33
+msgid "Default"
+msgstr "缺省"
 
-#: plugins/admin/groups/generic.tpl:43
-#: plugins/admin/groups/paste_generic.tpl:18
-msgid "Forced ID number"
-msgstr "强制 ID 编号"
+#: plugins/admin/groups/class_groupMail.inc:675
+msgid "Removing group mail settings failed"
+msgstr "删除组邮件设置失败"
 
-#: plugins/admin/groups/generic.tpl:50
-msgid "Select to create a samba conform group"
-msgstr "选择创建一个 samba 确认组"
+#: plugins/admin/groups/class_groupMail.inc:877
+msgid "Saving group mail settings failed"
+msgstr "保存组邮件设置失败"
 
-#: plugins/admin/groups/generic.tpl:55
-msgid "in domain"
-msgstr "于域"
+#: plugins/admin/groups/class_groupMail.inc:906
+msgid "Please enter a valid email addres in 'Primary address' field."
+msgstr "请在“主要地址”栏输入一个有效邮件地址。"
 
-#: plugins/admin/groups/generic.tpl:72
-msgid "Members are in a phone pickup group"
-msgstr "成员属于电话应答组"
+#: plugins/admin/groups/class_groupMail.inc:939
+msgid ""
+"Please choose valid permission settings. Default permission can't be emtpy."
+msgstr "请选择一个有效的权限设置。缺省权限不能为空。"
 
-#: plugins/admin/groups/generic.tpl:85
-msgid "Members are in a nagios group"
-msgstr "成员属于 nagios 组"
+#: plugins/admin/groups/class_groupMail.inc:943
+msgid "Please select a valid mail server."
+msgstr "请选择一个有效的邮件服务器。"
 
-#: plugins/admin/groups/generic.tpl:101
-msgid "Group members"
-msgstr "组成员"
+#: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:503
+#: include/class_ldap.inc:466
+msgid "Object"
+msgstr "对象"
+
+#: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr "选择"
+
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
+msgstr "该 acl 只对用户自身条目起作用。"
+
+#: plugins/admin/groups/application.tpl:3
+msgid "Release focus"
+msgstr "释放焦点"
+
+#: plugins/admin/groups/application.tpl:5
+msgid "Select release name"
+msgstr "选择发行名称"
+
+#: plugins/admin/groups/application.tpl:16
+msgid "Used applications"
+msgstr "使用的应用程序"
+
+#: plugins/admin/groups/application.tpl:19
+msgid "Add category"
+msgstr "添加分类"
+
+#: plugins/admin/groups/application.tpl:24
+msgid "Available applications"
+msgstr "可用的应用程序"
 
 #: plugins/admin/groups/group_objects.tpl:6
 msgid "Select users to add"
 msgstr "选择要添加的用户"
 
-#: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/systems/class_divListSystem.inc:61
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
-msgstr "选择显示服务器"
-
 #: plugins/admin/groups/group_objects.tpl:30
 msgid "Search within subtree"
 msgstr "在子树中查找"
@@ -6668,26 +7227,87 @@ msgstr "匹配用户名的正则表达式"
 msgid "Group settings"
 msgstr "组设置"
 
+#: plugins/admin/groups/paste_generic.tpl:5 plugins/admin/groups/generic.tpl:7
+#: plugins/admin/ogroups/paste_generic.tpl:4
+#: plugins/admin/ogroups/generic.tpl:7
+msgid "Group name"
+msgstr "组名"
+
+#: plugins/admin/groups/paste_generic.tpl:8 plugins/admin/groups/generic.tpl:9
+msgid "Posix name of the group"
+msgstr "组的 posix 名称"
+
+#: plugins/admin/groups/paste_generic.tpl:13
+#: plugins/admin/groups/generic.tpl:41
+msgid "Normally IDs are autogenerated, select to specify manually"
+msgstr "一般 ID 是自动创建的，要手工设置请选择"
+
+#: plugins/admin/groups/paste_generic.tpl:15
+#: plugins/admin/groups/generic.tpl:41
+msgid "Force GID"
+msgstr "强制 GID"
+
+#: plugins/admin/groups/paste_generic.tpl:18
+#: plugins/admin/groups/generic.tpl:43
+msgid "Forced ID number"
+msgstr "强制 ID 编号"
+
 #: plugins/admin/groups/class_groupAcl.inc:52
 msgid "You have no permissions to view and edit ACLs."
 msgstr "您无权查看和编辑 ACL。"
 
 #: plugins/admin/groups/class_groupAcl.inc:63
 msgid "This 'dn' is no acl container."
-msgstr "这个 'dn' 不包含 acl。"
+msgstr "这个 'dn' 不是一个 acl 容器。"
 
-#: plugins/admin/groups/class_groupAcl.inc:104
+#: plugins/admin/groups/class_groupAcl.inc:105
 msgid "Removing ACL information failed"
 msgstr "删除 ACL 信息失败"
 
-#: plugins/admin/groups/class_groupAcl.inc:207
+#: plugins/admin/groups/class_groupAcl.inc:208
 msgid "Saving ACL information failed"
 msgstr "保存 ACL 信息失败"
 
-#: plugins/admin/groups/class_groupAcl.inc:217
+#: plugins/admin/groups/class_groupAcl.inc:218
 msgid "All fields are writeable"
 msgstr "所有字段均可写"
 
+#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
+msgid "Descriptive text for this group"
+msgstr "组的描述文字"
+
+#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
+msgid "Choose subtree to place group in"
+msgstr "选择来放置组的子树"
+
+#: plugins/admin/groups/generic.tpl:50
+msgid "Select to create a samba conform group"
+msgstr "选择创建一个 samba 确认组"
+
+#: plugins/admin/groups/generic.tpl:55
+msgid "in domain"
+msgstr "于域"
+
+#: plugins/admin/groups/generic.tpl:72
+msgid "Members are in a phone pickup group"
+msgstr "成员属于电话应答组"
+
+#: plugins/admin/groups/generic.tpl:85
+msgid "Members are in a nagios group"
+msgstr "成员属于 nagios 组"
+
+#: plugins/admin/groups/generic.tpl:101
+msgid "Group members"
+msgstr "组成员"
+
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
+msgstr "目录管理员"
+
+#: plugins/admin/groups/mail_admins.tpl:24
+msgid "Select a specific department"
+msgstr "选择一个特定的部门"
+
 #: plugins/admin/groups/application_options.tpl:2
 msgid "Application options"
 msgstr "应用程序选项"
@@ -6732,72 +7352,72 @@ msgstr "分类名包含无效字符。"
 msgid "The specified category already exists."
 msgstr "指定的分类已经存在。"
 
-#: plugins/admin/groups/class_groupApplication.inc:525
+#: plugins/admin/groups/class_groupApplication.inc:542
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr "选择的应用程序名称不唯一。请检查您的 LDAP。"
 
-#: plugins/admin/groups/class_groupApplication.inc:561
+#: plugins/admin/groups/class_groupApplication.inc:578
 msgid "The selected application has no options."
 msgstr "选择的应用程序没有选项。"
 
-#: plugins/admin/groups/class_groupApplication.inc:646
+#: plugins/admin/groups/class_groupApplication.inc:663
 #: plugins/admin/departments/class_divListDepartment.inc:118
 msgid "department"
 msgstr "部门"
 
-#: plugins/admin/groups/class_groupApplication.inc:654
+#: plugins/admin/groups/class_groupApplication.inc:671
 msgid "application"
 msgstr "应用程序"
 
-#: plugins/admin/groups/class_groupApplication.inc:685
-#: plugins/admin/groups/class_groupApplication.inc:721
+#: plugins/admin/groups/class_groupApplication.inc:702
+#: plugins/admin/groups/class_groupApplication.inc:739
 msgid "Delete entry"
 msgstr "删除条目"
 
-#: plugins/admin/groups/class_groupApplication.inc:689
-#: plugins/admin/groups/class_groupApplication.inc:719
+#: plugins/admin/groups/class_groupApplication.inc:706
+#: plugins/admin/groups/class_groupApplication.inc:737
 #: include/sieve/templates/object_container.tpl:9
 #: include/sieve/templates/object_container_clear.tpl:9
 msgid "Move up"
 msgstr "向上移动"
 
-#: plugins/admin/groups/class_groupApplication.inc:690
-#: plugins/admin/groups/class_groupApplication.inc:720
+#: plugins/admin/groups/class_groupApplication.inc:707
+#: plugins/admin/groups/class_groupApplication.inc:738
 #: include/sieve/templates/object_container.tpl:13
 #: include/sieve/templates/object_container_clear.tpl:13
 msgid "Move down"
 msgstr "向下移动"
 
-#: plugins/admin/groups/class_groupApplication.inc:717
+#: plugins/admin/groups/class_groupApplication.inc:735
 msgid "Insert seperator"
 msgstr "插入分隔符"
 
-#: plugins/admin/groups/class_groupApplication.inc:745
+#: plugins/admin/groups/class_groupApplication.inc:763
 msgid "This application is no longer available."
 msgstr "此应用程序不再可用。"
 
-#: plugins/admin/groups/class_groupApplication.inc:748
+#: plugins/admin/groups/class_groupApplication.inc:766
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr "在任何名为 %s 的发行版中不存在此应用程序。"
 
-#: plugins/admin/groups/class_groupApplication.inc:752
+#: plugins/admin/groups/class_groupApplication.inc:770
 msgid "Check parameter"
 msgstr "检查参数"
 
-#: plugins/admin/groups/class_groupApplication.inc:754
+#: plugins/admin/groups/class_groupApplication.inc:772
 msgid "This application has changed parameters."
 msgstr "这个应用程序包含修改的参数。"
 
-#: plugins/admin/groups/class_groupApplication.inc:846
+#: plugins/admin/groups/class_groupApplication.inc:865
 msgid "Removing application information failed"
 msgstr "删除应用程序信息失败"
 
-#: plugins/admin/groups/class_groupApplication.inc:891
+#: plugins/admin/groups/class_groupApplication.inc:914
 msgid "Saving application information failed"
 msgstr "保存应用程序信息失败"
 
-#: plugins/admin/groups/class_groupApplication.inc:934
+#: plugins/admin/groups/class_groupApplication.inc:957
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
@@ -6805,15 +7425,6 @@ msgid ""
 msgstr ""
 "无法解析发行版名称 '%s'，设置发行版名称为 '%s'。可能是基于的对象被修改了。"
 
-#: plugins/admin/users/remove.tpl:6
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
-msgstr ""
-"这包含该用户所有账号数据，系统访问规则，imap 设置等等。请再次检查您是否要这么"
-"做，因为 GOsa 没有办法将您的数据找回。"
-
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -6822,28 +7433,36 @@ msgid ""
 msgstr "用下面的字段修改用口令。修改即时生效。请记住新密码，否则无法登录。"
 
 #: plugins/admin/users/class_userManagement.inc:28
-#: plugins/admin/systems/class_glpiSelectUser.inc:107
+#: plugins/admin/systems/class_glpiSelectUser.inc:108
 #: plugins/admin/systems/printer.tpl:72 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 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 "使用所选名称的用户已经在树中被使用了。"
 
@@ -6861,7 +7480,7 @@ msgstr ""
 "板选择。"
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:863
+#: plugins/admin/systems/class_systemManagement.inc:873
 msgid "Template"
 msgstr "模板"
 
@@ -6885,10 +7504,8 @@ msgstr ""
 "的范围选择来调整。"
 
 #: plugins/admin/users/class_divListUsers.inc:50
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: ihtml/themes/default/password.tpl:67 ihtml/themes/default/password.tpl:69
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "用户名"
 
@@ -6952,110 +7569,66 @@ msgstr "创建新模板"
 msgid "New template"
 msgstr "新模板"
 
-#: plugins/admin/users/class_divListUsers.inc:137
+#: plugins/admin/users/class_divListUsers.inc:140
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_divListUsers.inc:138
+#: plugins/admin/users/class_divListUsers.inc:141
 msgid "Edit generic properties"
-msgstr "编辑通用属性"
+msgstr "编辑一般属性"
 
-#: plugins/admin/users/class_divListUsers.inc:140
+#: plugins/admin/users/class_divListUsers.inc:143
 msgid "Edit UNIX properties"
 msgstr "编辑 UNIX 属性"
 
-#: plugins/admin/users/class_divListUsers.inc:142
+#: plugins/admin/users/class_divListUsers.inc:145
 msgid "Edit environment properties"
 msgstr "编辑环境属性"
 
-#: plugins/admin/users/class_divListUsers.inc:144
+#: plugins/admin/users/class_divListUsers.inc:147
 msgid "Edit mail properties"
 msgstr "编辑邮件属性"
 
-#: plugins/admin/users/class_divListUsers.inc:146
+#: plugins/admin/users/class_divListUsers.inc:149
 msgid "Edit phone properties"
 msgstr "编辑电话属性"
 
-#: plugins/admin/users/class_divListUsers.inc:148
+#: plugins/admin/users/class_divListUsers.inc:151
 msgid "Edit fax properies"
 msgstr "编辑传真属性"
 
-#: plugins/admin/users/class_divListUsers.inc:150
+#: plugins/admin/users/class_divListUsers.inc:153
 msgid "Edit samba properties"
 msgstr "编辑 samba 属性"
 
-#: plugins/admin/users/class_divListUsers.inc:152
+#: plugins/admin/users/class_divListUsers.inc:155
 msgid "Edit netatalk properties"
 msgstr "编辑 netatalk 属性"
 
-#: plugins/admin/users/class_divListUsers.inc:153
+#: plugins/admin/users/class_divListUsers.inc:156
 msgid "Create user from template"
 msgstr "从模板创建用户"
 
-#: plugins/admin/users/class_divListUsers.inc:154
+#: plugins/admin/users/class_divListUsers.inc:157
 msgid "Create user with this template"
 msgstr "创建使用该模板的用户"
 
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:184
+#, fuzzy
+msgid "Deactivated"
+msgstr "活动"
+
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "password"
 msgstr "口令"
 
-#: plugins/admin/applications/generic.tpl:7
-#: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_divListApplication.inc:44
-#: plugins/admin/applications/class_applicationGeneric.inc:468
-msgid "Application name"
-msgstr "应用程序名称"
-
-#: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
-msgid "Display name"
-msgstr "显示名称"
-
-#: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:473
-msgid "Application name to be displayed (i.e. below icons)"
-msgstr "要显示的应用程序名称（在图标下）"
-
-#: plugins/admin/applications/generic.tpl:19
-msgid "Path and/or binary name of application"
-msgstr "应用程序的路径和/或二进制名称"
-
-#: plugins/admin/applications/generic.tpl:34
-msgid "Choose subtree to place application in"
-msgstr "选择放置应用程序的子树"
-
-#: plugins/admin/applications/generic.tpl:55
-msgid "Icon"
-msgstr "图标"
-
-#: plugins/admin/applications/generic.tpl:63
-msgid "Update"
-msgstr "更新"
-
-#: plugins/admin/applications/generic.tpl:63
-msgid "Reload picture from LDAP"
-msgstr "从 LDAP 重新加载图片"
-
-#: plugins/admin/applications/generic.tpl:77
-msgid "Only executable for members"
-msgstr "只允许成员执行"
-
-#: plugins/admin/applications/generic.tpl:79
-msgid "Replace user configuration on startup"
-msgstr "替换启动时用户配置"
-
-#: plugins/admin/applications/generic.tpl:83
-msgid "Place icon on members desktop"
-msgstr "在成员桌面放置图标"
-
-#: plugins/admin/applications/generic.tpl:86
-msgid "Place entry in members startmenu"
-msgstr "替换成员启动菜单条目"
+#: plugins/admin/users/class_divListUsers.inc:208
+msgid "Change password"
+msgstr "修改口令"
 
-#: plugins/admin/applications/generic.tpl:89
-msgid "Place entry in members launch bar"
-msgstr "在成员的启动条放置条目"
+#: plugins/admin/users/class_divListUsers.inc:298
+msgid "Number of listed users"
+msgstr ""
 
 #: plugins/admin/applications/class_divListApplication.inc:29
 msgid "List of Applications"
@@ -7074,7 +7647,15 @@ msgstr ""
 "这个菜单允许您添加，编辑和删除所选的应用程序。对于一个长列表，您可以通过选择"
 "框上面的范围选择来调整。"
 
-#: plugins/admin/applications/class_divListApplication.inc:89
+#: plugins/admin/applications/class_divListApplication.inc:44
+#: plugins/admin/applications/generic.tpl:7
+#: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationGeneric.inc:468
+msgid "Application name"
+msgstr "应用程序名称"
+
+#: plugins/admin/applications/class_divListApplication.inc:89
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:105
 #: plugins/admin/ogroups/class_divListOGroup.inc:99
 msgid "new"
 msgstr "新"
@@ -7083,6 +7664,11 @@ msgstr "新"
 msgid "Create new application"
 msgstr "创建新应用程序"
 
+#: plugins/admin/applications/class_divListApplication.inc:195
+#, fuzzy
+msgid "Number of listed applications"
+msgstr "嵌入应用程序"
+
 #: plugins/admin/applications/class_applicationParameters.inc:51
 msgid "Remove options"
 msgstr "删除选项"
@@ -7126,7 +7712,56 @@ msgstr "值 '%s' 定义为选项名称无效。"
 msgid "Saving applications parameters failed"
 msgstr "保存应用程序参数失败"
 
-#: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
+#: plugins/admin/applications/generic.tpl:11
+#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+msgid "Display name"
+msgstr "显示名称"
+
+#: plugins/admin/applications/generic.tpl:13
+#: plugins/admin/applications/class_applicationGeneric.inc:473
+msgid "Application name to be displayed (i.e. below icons)"
+msgstr "要显示的应用程序名称（在图标下）"
+
+#: plugins/admin/applications/generic.tpl:19
+msgid "Path and/or binary name of application"
+msgstr "应用程序的路径和/或二进制名称"
+
+#: plugins/admin/applications/generic.tpl:34
+#: plugins/admin/mimetypes/generic.tpl:40
+msgid "Choose subtree to place application in"
+msgstr "选择放置应用程序的子树"
+
+#: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/mimetypes/generic.tpl:54
+msgid "Icon"
+msgstr "图标"
+
+#: plugins/admin/applications/generic.tpl:63
+msgid "Reload picture from LDAP"
+msgstr "从 LDAP 重新加载图片"
+
+#: plugins/admin/applications/generic.tpl:77
+msgid "Only executable for members"
+msgstr "只允许成员执行"
+
+#: plugins/admin/applications/generic.tpl:79
+msgid "Replace user configuration on startup"
+msgstr "替换启动时用户配置"
+
+#: plugins/admin/applications/generic.tpl:83
+msgid "Place icon on members desktop"
+msgstr "在成员桌面放置图标"
+
+#: plugins/admin/applications/generic.tpl:86
+msgid "Place entry in members startmenu"
+msgstr "替换成员启动菜单条目"
+
+#: plugins/admin/applications/generic.tpl:89
+msgid "Place entry in members launch bar"
+msgstr "在成员的启动条放置条目"
+
+#: plugins/admin/applications/remove.tpl:6
+#: plugins/admin/mimetypes/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
 "to do this since there is no way for GOsa to get your data back."
@@ -7174,6 +7809,10 @@ msgid "You have no permissions to create a application on this 'Base'."
 msgstr "您无权在此 'Base' 下创建一个应用程序"
 
 #: plugins/admin/applications/class_applicationGeneric.inc:362
+#: plugins/admin/systems/class_dhcpGroup.inc:88
+#: plugins/admin/systems/class_dhcpPool.inc:104
+#: plugins/admin/systems/class_dhcpHost.inc:132
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:143
 msgid "Required field 'Name' is not filled."
 msgstr "需要的字段“名称”没有填写。"
 
@@ -7188,7 +7827,7 @@ msgstr "需要的字段“执行”没有填写。"
 #: plugins/admin/applications/class_applicationGeneric.inc:385
 #: plugins/admin/applications/class_applicationGeneric.inc:393
 msgid "There's already an application with this 'Name'."
-msgstr "已经由一个同名的应用程序。"
+msgstr "已经有一个同名的应用程序。"
 
 #: plugins/admin/applications/class_applicationGeneric.inc:439
 msgid "Saving application failed"
@@ -7208,6 +7847,36 @@ msgstr "您将要删除应用程序 '%s'。"
 msgid "You are not allowed to delete this application!"
 msgstr "您无权删除这个应用程序！"
 
+#: plugins/admin/departments/class_divListDepartment.inc:27
+#: plugins/admin/departments/class_divListDepartment.inc:28
+msgid "List of departments"
+msgstr "部门列表"
+
+#: plugins/admin/departments/class_divListDepartment.inc:33
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on   top "
+"of the department list."
+msgstr ""
+"这个菜单允许您创建，删除和修改所选的部门。对于一个长列表，您可以通过列表上面"
+"的范围选择来调整。"
+
+#: plugins/admin/departments/class_divListDepartment.inc:41
+msgid "Department name"
+msgstr "部门名称"
+
+#: plugins/admin/departments/class_divListDepartment.inc:70
+msgid "Create new department"
+msgstr "创建新部门"
+
+#: plugins/admin/departments/dep_iframe.tpl:3
+msgid ""
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
+msgstr ""
+"一旦移动操作完成，您可以滚动页面到最下端，按“继续”按钮继续部门管理对话框。"
+
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "部门名称"
@@ -7262,36 +7931,6 @@ msgstr "管理设置"
 msgid "Tag department as an independent administrative unit"
 msgstr "将部门标记为独立的管理单元"
 
-#: plugins/admin/departments/class_divListDepartment.inc:27
-#: plugins/admin/departments/class_divListDepartment.inc:28
-msgid "List of departments"
-msgstr "部门列表"
-
-#: plugins/admin/departments/class_divListDepartment.inc:33
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on   top "
-"of the department list."
-msgstr ""
-"这个菜单允许您创建，删除和修改所选的部门。对于一个长列表，您可以通过列表上面"
-"的范围选择来调整。"
-
-#: plugins/admin/departments/class_divListDepartment.inc:41
-msgid "Department name"
-msgstr "部门名称"
-
-#: plugins/admin/departments/class_divListDepartment.inc:70
-msgid "Create new department"
-msgstr "创建新部门"
-
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-"一旦移动操作完成，您可以滚动页面到最下端，按“继续”按钮继续部门管理对话框。"
-
 #: plugins/admin/departments/remove.tpl:6
 #: plugins/gofon/conference/remove.tpl:6
 msgid ""
@@ -7353,7 +7992,7 @@ msgid "FAILED to copy %s, aborting operation"
 msgstr "拷贝 %s 失败，退出操作"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/systems/class_glpiSelectUser.inc:107
+#: plugins/admin/systems/class_glpiSelectUser.inc:108
 #: plugins/admin/ogroups/class_divListOGroup.inc:52
 msgid "Departments"
 msgstr "部门"
@@ -7369,61 +8008,17 @@ msgstr "您将要删除 '%s' 下的整个 LDAP 子树。"
 msgid "You have no permission to remove this department."
 msgstr "您无权删除这个部门。"
 
-#: plugins/admin/departments/class_departmentManagement.inc:333
-msgid ".."
-msgstr ".."
-
-#: plugins/admin/systems/network.tpl:1
-msgid "Network\tsettings"
-msgstr "网络\t设置"
-
-#: plugins/admin/systems/network.tpl:9
-msgid "IP-address"
-msgstr "IP 地址"
-
-#: plugins/admin/systems/network.tpl:13
-msgid "MAC-address"
-msgstr "MAC 地址"
-
-#: plugins/admin/systems/network.tpl:19
-msgid "Autodetect"
-msgstr "自动检测"
-
-#: plugins/admin/systems/network.tpl:42
-msgid "Enable DNS for this device"
-msgstr "启用该设备 DNS"
-
-#: plugins/admin/systems/network.tpl:43
-#: plugins/admin/systems/servdnseditzone.tpl:67
-#: plugins/gofon/phoneaccount/generic.tpl:76
-msgid "Refresh"
-msgstr "刷新"
-
-#: plugins/admin/systems/network.tpl:51
-msgid "Zone"
-msgstr "Zone"
-
-#: plugins/admin/systems/network.tpl:59
-#: plugins/admin/systems/servdnseditzone.tpl:85
-#: plugins/admin/systems/class_servDNS.inc:163
-msgid "TTL"
-msgstr "TTL"
-
-#: plugins/admin/systems/network.tpl:64
-msgid "Dns records"
-msgstr "Dns 记录"
-
 #: plugins/admin/systems/class_terminalInfo.inc:49
-#: plugins/admin/systems/class_terminalInfo.inc:194
+#: plugins/admin/systems/class_terminalInfo.inc:199
 msgid "present"
 msgstr "可用的"
 
 #: plugins/admin/systems/class_terminalInfo.inc:62
 #: plugins/admin/systems/class_workstationService.inc:247
-#: plugins/admin/systems/class_workstationStartup.inc:514
+#: plugins/admin/systems/class_workstationStartup.inc:545
 #: plugins/admin/systems/class_terminalService.inc:255
 #: plugins/admin/systems/class_terminalStartup.inc:168
-#: plugins/admin/systems/class_terminalGeneric.inc:236
+#: plugins/admin/systems/class_terminalGeneric.inc:251
 msgid "This 'dn' has no terminal features."
 msgstr "这个 'dn' 没有终端功能。"
 
@@ -7432,7 +8027,7 @@ msgid "There is no php snmp module installed, can't gather any informations."
 msgstr "尚未安装 php snmp 模块，不能获取任何信息。"
 
 #: plugins/admin/systems/class_terminalInfo.inc:75
-#: plugins/admin/systems/class_terminalInfo.inc:169
+#: plugins/admin/systems/class_terminalInfo.inc:174
 msgid "unknown status"
 msgstr "未知状态"
 
@@ -7440,128 +8035,254 @@ msgstr "未知状态"
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr "这是一个虚拟终端，没有属性可以显示。"
 
-#: plugins/admin/systems/class_terminalInfo.inc:102
+#: plugins/admin/systems/class_terminalInfo.inc:101
 msgid "online"
 msgstr "在线"
 
-#: plugins/admin/systems/class_terminalInfo.inc:158
+#: plugins/admin/systems/class_terminalInfo.inc:163
 msgid "running"
 msgstr "运行"
 
-#: plugins/admin/systems/class_terminalInfo.inc:161
+#: plugins/admin/systems/class_terminalInfo.inc:166
 msgid "not running"
 msgstr "没有运行"
 
-#: plugins/admin/systems/class_terminalInfo.inc:186
+#: plugins/admin/systems/class_terminalInfo.inc:191
 msgid "offline"
 msgstr "离线"
 
-#: plugins/admin/systems/glpiPrinter.tpl:9
-msgid "Printer type"
-msgstr "打印机类型"
+#: plugins/admin/systems/dhcp_network.tpl:5
+#, fuzzy
+msgid "Network configuration"
+msgstr "下载配置"
 
-#: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-msgid "Manufacturer"
-msgstr "生产商"
+#: plugins/admin/systems/dhcp_network.tpl:8
+#, fuzzy
+msgid "Router"
+msgstr "计算机"
 
-#: plugins/admin/systems/glpiPrinter.tpl:31
-msgid "Supported interfaces"
-msgstr "支持的界面"
+#: plugins/admin/systems/dhcp_network.tpl:11
+msgid "Enter name or IP address of router to be used in this section"
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
-msgstr "串行"
+#: plugins/admin/systems/dhcp_network.tpl:15
+#: plugins/admin/systems/class_dhcpNetwork.inc:204
+#: plugins/admin/systems/class_dhcpSubnet.inc:152
+#: plugins/admin/systems/servdnseditzone.tpl:19
+#: plugins/admin/systems/dhcp_subnet.tpl:12
+msgid "Netmask"
+msgstr "子网掩码"
 
-#: plugins/admin/systems/glpiPrinter.tpl:46
-msgid "Parallel"
-msgstr "并行"
+#: plugins/admin/systems/dhcp_network.tpl:21
+#: plugins/admin/systems/class_dhcpNetwork.inc:204
+msgid "Broadcast"
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
-msgstr "USB"
+#: plugins/admin/systems/dhcp_network.tpl:29
+#, fuzzy
+msgid "Bootup"
+msgstr "布尔值"
 
-#: plugins/admin/systems/glpiPrinter.tpl:66 plugins/admin/systems/glpi.tpl:40
-msgid "Contacts"
-msgstr "联系"
+#: plugins/admin/systems/dhcp_network.tpl:32
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr "文件名"
 
-#: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-msgid "Technical responsible"
-msgstr "技术联系人"
+#: plugins/admin/systems/dhcp_network.tpl:35
+msgid ""
+"Enter name of file that will be loaded via tftp after client has started"
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
-msgid "Contact person"
-msgstr "联系人"
+#: plugins/admin/systems/dhcp_network.tpl:39
+#, fuzzy
+msgid "Next server"
+msgstr "新服务器"
 
-#: plugins/admin/systems/glpiPrinter.tpl:88 plugins/admin/systems/glpi.tpl:95
-msgid "Attachments"
-msgstr "附加"
+#: plugins/admin/systems/dhcp_network.tpl:42
+msgid "Enter name of server to retrieve bootimages from"
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:114
-msgid "Installed cartridges"
-msgstr "安装的硒鼓"
+#: plugins/admin/systems/dhcp_network.tpl:49
+#, fuzzy
+msgid "Domain Name Service"
+msgstr "时间服务"
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-msgid "System type"
-msgstr "系统类型"
+#: plugins/admin/systems/dhcp_network.tpl:55
+#, fuzzy
+msgid "Name of domain"
+msgstr "部门名称"
 
-#: plugins/admin/systems/glpi.tpl:19
-msgid "Operating system"
-msgstr "操作系统"
+#: plugins/admin/systems/dhcp_network.tpl:61
+#, fuzzy
+msgid "DNS server"
+msgstr "NTP 服务器"
 
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#: include/sieve/templates/object_container.tpl:23
-#: include/sieve/templates/element_comment.tpl:4
-#: include/sieve/class_sieveManagement.inc:507
-#: include/sieve/class_sieveManagement.inc:727
-msgid "Comment"
-msgstr "注释"
+#: plugins/admin/systems/dhcp_network.tpl:62
+msgid "List of DNS servers to be propagated"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:78
-msgid "Installed devices"
-msgstr "安装设备"
+#: plugins/admin/systems/dhcp_network.tpl:66
+msgid "DNS server do be added"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:90
-msgid "Trading"
+#: plugins/admin/systems/dhcp_network.tpl:67
+msgid "Click here add the selected server to the list"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:91
-msgid "Software"
-msgstr "软件"
+#: plugins/admin/systems/dhcp_network.tpl:68
+msgid "Click here remove the selected servers from the list"
+msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:92
-msgid "Contracts"
+#: plugins/admin/systems/dhcp_network.tpl:73
+#, fuzzy
+msgid "Domain Name Service options"
+msgstr "域管理员"
+
+#: plugins/admin/systems/dhcp_network.tpl:74
+msgid "Assign hostnames found via reverse mapping"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:76
+msgid "Assign hostnames from host declarations"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:1
+msgid "Network\tsettings"
+msgstr "网络\t设置"
+
+#: plugins/admin/systems/network.tpl:9
+msgid "IP-address"
+msgstr "IP 地址"
+
+#: plugins/admin/systems/network.tpl:13
+msgid "MAC-address"
+msgstr "MAC 地址"
+
+#: plugins/admin/systems/network.tpl:17
+msgid "Autodetect"
+msgstr "自动检测"
+
+#: plugins/admin/systems/network.tpl:33 plugins/admin/systems/network.tpl:41
+#, fuzzy
+msgid "Enable DHCP for this device"
+msgstr "启用该设备 DNS"
+
+#: plugins/admin/systems/network.tpl:41 plugins/admin/systems/network.tpl:120
+#, fuzzy
+msgid "not configured"
+msgstr "未配置"
+
+#: plugins/admin/systems/network.tpl:50
+#, fuzzy
+msgid "Parent node"
+msgstr "父服务器"
+
+#: plugins/admin/systems/network.tpl:55
+#, fuzzy
+msgid "Edit settings"
+msgstr "编辑设置..."
+
+#: plugins/admin/systems/network.tpl:88 plugins/admin/systems/network.tpl:120
+msgid "Enable DNS for this device"
+msgstr "启用该设备 DNS"
+
+#: plugins/admin/systems/network.tpl:98
+msgid "Zone"
+msgstr "Zone"
+
+#: plugins/admin/systems/network.tpl:106
+#: plugins/admin/systems/servdnseditzone.tpl:94
+#: plugins/admin/systems/class_servDNS.inc:250
+msgid "TTL"
+msgstr "TTL"
+
+#: plugins/admin/systems/network.tpl:111
+msgid "Dns records"
+msgstr "Dns 记录"
+
+#: plugins/admin/systems/dhcp_group.tpl:10
+#, fuzzy
+msgid "Name of group"
+msgstr "组名称"
+
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+msgid "System type"
+msgstr "系统类型"
+
+#: plugins/admin/systems/glpi.tpl:19
+msgid "Operating system"
+msgstr "操作系统"
+
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
+msgstr "生产商"
+
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+msgid "Contact person"
+msgstr "联系人"
+
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
+msgstr "技术联系人"
+
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+#: include/sieve/templates/object_container.tpl:23
+#: include/sieve/templates/element_comment.tpl:4
+#: include/sieve/class_sieveManagement.inc:507
+#: include/sieve/class_sieveManagement.inc:727
+msgid "Comment"
+msgstr "注释"
+
+#: plugins/admin/systems/glpi.tpl:78
+msgid "Installed devices"
+msgstr "安装设备"
+
+#: plugins/admin/systems/glpi.tpl:90
+msgid "Trading"
+msgstr "交易"
+
+#: plugins/admin/systems/glpi.tpl:91
+msgid "Software"
+msgstr "软件"
+
+#: plugins/admin/systems/glpi.tpl:92
+msgid "Contracts"
 msgstr "联系"
 
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+msgid "Attachments"
+msgstr "附加"
+
 #: plugins/admin/systems/info.tpl:1
 msgid "System information"
 msgstr "系统信息"
@@ -7660,104 +8381,102 @@ msgstr "声音服务"
 msgid "GUI"
 msgstr "GUI"
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "系统管理"
+#: plugins/admin/systems/remove_dhcp.tpl:6
+#, fuzzy
+msgid ""
+"This includes 'all' DHCP subsections that are located within this section. "
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"这包含“所有”对象信息。请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据"
+"找回。"
 
-#: plugins/admin/systems/terminal.tpl:8
-msgid "Terminal template"
-msgstr "终端模板"
+#: plugins/admin/systems/class_servSsh.inc:25
+#, fuzzy
+msgid "SSH systems keys"
+msgstr "系统设置"
 
-#: plugins/admin/systems/terminal.tpl:10
-msgid "Terminal name"
-msgstr "终端名称"
+#: plugins/admin/systems/class_servSsh.inc:26
+msgid "This plugin store ssh public keys for systems"
+msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
-#: plugins/admin/systems/workstation.tpl:25 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/wingeneric.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "选择放置终端的子树"
+#: plugins/admin/systems/class_servSsh.inc:88
+#, fuzzy
+msgid "Remove SSH keys"
+msgstr "删除记录"
 
-#: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
-#: plugins/admin/systems/workstation.tpl:39
-#: plugins/admin/systems/phonesettings.tpl:21
-#: plugins/admin/ogroups/termgroup.tpl:38
-msgid "Mode"
-msgstr "模式"
+#: plugins/admin/systems/class_servSsh.inc:89
+#, fuzzy
+msgid ""
+"This server has SSH features enabled. You can disable them by clicking below."
+msgstr "该账号已经启用 DNS 功能。您可以点击下面按钮禁用。"
 
-#: plugins/admin/systems/terminal.tpl:36 plugins/admin/systems/server.tpl:34
-#: plugins/admin/systems/workstation.tpl:41
-#: plugins/admin/ogroups/termgroup.tpl:40
-msgid "Select terminal mode"
-msgstr "选择终端类型"
+#: plugins/admin/systems/class_servSsh.inc:91
+msgid "Add SSH keys"
+msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:42
-#: plugins/admin/systems/workstation.tpl:47
-#: plugins/admin/ogroups/termgroup.tpl:47
-msgid "Syslog server"
-msgstr "日志服务器"
+#: plugins/admin/systems/class_servSsh.inc:92
+#, fuzzy
+msgid ""
+"This server has SSH features disabled. You can enable them by clicking below."
+msgstr "该账号已经禁用 DNS 功能。您可以点击下面按钮启用。"
 
-#: plugins/admin/systems/terminal.tpl:44
-#: plugins/admin/systems/workstation.tpl:49
-#: plugins/admin/ogroups/termgroup.tpl:49
-msgid "Choose server to use for logging"
-msgstr "限制记录日志的服务器"
+#: plugins/admin/systems/class_servSsh.inc:129
+#, fuzzy
+msgid "Removing SSH key failed"
+msgstr "保存 Samba 账号失败"
 
-#: plugins/admin/systems/terminal.tpl:59
-msgid "Root server"
-msgstr "根服务器"
+#: plugins/admin/systems/class_servSsh.inc:150
+#, fuzzy
+msgid "Value specified as 'SSH Key' is not valid."
+msgstr "提供的“大小”值无效。"
 
-#: plugins/admin/systems/terminal.tpl:61
-msgid "Select NFS root filesystem to use"
-msgstr "选择要用的 NFS 根文件系统。"
+#: plugins/admin/systems/class_servSsh.inc:176
+#, fuzzy
+msgid "Saving SSH key failed"
+msgstr "保存 Samba 账号失败"
 
-#: plugins/admin/systems/terminal.tpl:67
-msgid "Swap server"
-msgstr "交换服务器"
+#: plugins/admin/systems/class_dhcpService.inc:140
+#, fuzzy
+msgid "Default lease time needs to be numeric."
+msgstr "Sieve 端口应为数字。"
 
-#: plugins/admin/systems/terminal.tpl:69
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "选择放置交换文件的 NFS 文件系统"
+#: plugins/admin/systems/class_dhcpService.inc:143
+#, fuzzy
+msgid "Maximum lease time needs to be numeric."
+msgstr "Sieve 端口应为数字。"
 
-#: plugins/admin/systems/terminal.tpl:86
-#: plugins/admin/systems/workstation.tpl:65
-msgid "Inherit time server attributes"
-msgstr "继承时间服务器属性"
+#: plugins/admin/systems/class_dhcpService.inc:146
+msgid "Default lease time needs to smaller than the maximum lease time."
+msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:90
-#: plugins/admin/systems/workstation.tpl:69
-#: plugins/admin/ogroups/termgroup.tpl:14
-msgid "NTP server"
-msgstr "NTP 服务器"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "系统管理"
 
-#: plugins/admin/systems/terminal.tpl:92
-#: plugins/admin/systems/workstation.tpl:71
-#: plugins/admin/ogroups/termgroup.tpl:16
-msgid "Choose server to use for synchronizing time"
-msgstr "选择要用于同步时间的服务器"
+#: plugins/admin/systems/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr "打印机类型"
 
-#: plugins/admin/systems/terminal.tpl:118 plugins/admin/systems/server.tpl:51
-#: plugins/admin/systems/workstation.tpl:97
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:158
-#: plugins/admin/systems/class_baseSelectDialog.inc:45
-#: plugins/admin/ogroups/termgroup.tpl:75
-msgid "Action"
-msgstr "行动"
+#: plugins/admin/systems/glpiPrinter.tpl:31
+msgid "Supported interfaces"
+msgstr "支持的界面"
 
-#: plugins/admin/systems/terminal.tpl:122
-#: plugins/admin/systems/workstation.tpl:101
-#: plugins/admin/ogroups/termgroup.tpl:79
-msgid "Select action to execute for this terminal"
-msgstr "选择这个终端要执行的动作"
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr "串行"
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
-msgstr "服务器名称"
+#: plugins/admin/systems/glpiPrinter.tpl:46
+msgid "Parallel"
+msgstr "并行"
 
-#: plugins/admin/systems/server.tpl:55
-msgid "Select action to execute for this server"
-msgstr "选择为这台服务器要执行的动作"
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
+msgstr "USB"
+
+#: plugins/admin/systems/glpiPrinter.tpl:114
+msgid "Installed cartridges"
+msgstr "安装的硒鼓"
 
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 msgid "Manage System-types"
@@ -7819,7 +8538,7 @@ msgstr "Windows RDP"
 #: plugins/admin/systems/class_workstationService.inc:141
 #: plugins/admin/systems/class_terminalService.inc:160
 msgid "ICA client"
-msgstr ""
+msgstr "ICA client"
 
 #: plugins/admin/systems/class_workstationService.inc:196
 #: plugins/admin/systems/class_workstationService.inc:199
@@ -7835,10 +8554,10 @@ msgstr ""
 #: plugins/admin/systems/class_workstationService.inc:228
 #: plugins/admin/systems/class_workstationService.inc:229
 #: plugins/admin/systems/class_workstationService.inc:230
-#: plugins/admin/systems/class_workstationStartup.inc:320
-#: plugins/admin/systems/class_workstationStartup.inc:324
-#: plugins/admin/systems/class_workstationStartup.inc:828
-#: plugins/admin/systems/class_workstationGeneric.inc:123
+#: plugins/admin/systems/class_workstationStartup.inc:347
+#: plugins/admin/systems/class_workstationStartup.inc:351
+#: plugins/admin/systems/class_workstationStartup.inc:872
+#: plugins/admin/systems/class_workstationGeneric.inc:140
 #: plugins/admin/systems/class_terminalService.inc:68
 #: plugins/admin/systems/class_terminalService.inc:96
 #: plugins/admin/systems/class_terminalService.inc:102
@@ -7856,8 +8575,8 @@ msgstr ""
 #: plugins/admin/systems/class_terminalStartup.inc:119
 #: plugins/admin/systems/class_terminalStartup.inc:139
 #: plugins/admin/systems/class_terminalStartup.inc:142
-#: plugins/admin/systems/class_terminalGeneric.inc:116
-#: plugins/admin/systems/class_terminalGeneric.inc:287
+#: plugins/admin/systems/class_terminalGeneric.inc:131
+#: plugins/admin/systems/class_terminalGeneric.inc:303
 msgid "inherited"
 msgstr "继承"
 
@@ -7948,16 +8667,16 @@ msgstr "选择鼠标端口"
 
 #: plugins/admin/systems/workstationService.tpl:66
 #: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
 #: plugins/gofon/phoneaccount/paste_generic.tpl:27
+#: plugins/gofon/phoneaccount/generic.tpl:24
 msgid "Telephone hardware"
 msgstr "电话硬件"
 
 #: plugins/admin/systems/workstationService.tpl:69
 #: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
 #: plugins/gofon/phoneaccount/generic.tpl:26
 #: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
 msgid "Telephone"
 msgstr "电话"
 
@@ -8032,7 +8751,7 @@ msgstr "选择在终端启动 SANE 扫描服务"
 msgid "Provide scan services"
 msgstr "提供扫描服务"
 
-#: plugins/admin/systems/class_workstationStartup.inc:345
+#: plugins/admin/systems/class_workstationStartup.inc:372
 #: plugins/admin/systems/class_terminalStartup.inc:88
 #, php-format
 msgid ""
@@ -8040,34 +8759,34 @@ msgid ""
 "exist."
 msgstr "命令 '%s'，作为插件 '%s' 的 KERNELS hook 好像并不存在。"
 
-#: plugins/admin/systems/class_workstationStartup.inc:449
+#: plugins/admin/systems/class_workstationStartup.inc:481
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr "您的配置中有软件包不能通过当前服务器/发行版设置解析。"
 
-#: plugins/admin/systems/class_workstationStartup.inc:494
+#: plugins/admin/systems/class_workstationStartup.inc:526
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr "请选择一个“自动化安装（FAI）服务器”或者删除“自动化安装（FAI）类”。"
 
-#: plugins/admin/systems/class_workstationStartup.inc:554
+#: plugins/admin/systems/class_workstationStartup.inc:585
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
 msgstr "在您的选择中已经有一个 profile 包含分区表设置。"
 
-#: plugins/admin/systems/class_workstationStartup.inc:748
+#: plugins/admin/systems/class_workstationStartup.inc:779
 msgid "Not available in current setup"
 msgstr "当前安装不可用"
 
-#: plugins/admin/systems/class_workstationStartup.inc:900
+#: plugins/admin/systems/class_workstationStartup.inc:953
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
 "Server was reset to 'auto'."
 msgstr "无法解析一个或多个给出的 FAIcless [%s]，于 FAI 服务器 '%s'。"
 
-#: plugins/admin/systems/class_workstationStartup.inc:913
+#: plugins/admin/systems/class_workstationStartup.inc:966
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -8077,17 +8796,17 @@ msgstr ""
 "依旧无法解析提供的 FAIclass [%s]，请检查您的 FAI 配置，可能一些类被删除或者更"
 "名了。服务器被重置为“自动”。"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1084
+#: plugins/admin/systems/class_workstationStartup.inc:1137
 msgid "Saving workstation startup settings failed"
 msgstr "保存工作站启动设置失败"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1134
+#: plugins/admin/systems/class_workstationStartup.inc:1187
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr "无法执行指定的 REPOSITOR_HOOK '%s'，请检查您的 gosa.conf。"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1136
+#: plugins/admin/systems/class_workstationStartup.inc:1189
 #: plugins/admin/systems/class_servRepositorySetup.inc:184
 #, php-format
 msgid ""
@@ -8101,6 +8820,7 @@ msgid "Can't open '%s', ppd settings resetted."
 msgstr "无法打开 '%s'，ppd 设置被重置。"
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:82
+#: plugins/admin/systems/class_printGeneric.inc:505
 msgid "Can't get ppd informations."
 msgstr "无法获取 ppd 信息。"
 
@@ -8122,7 +8842,7 @@ msgid "Can't select PPD file '%s', the file is not readable"
 msgstr "无法选择 PPD 文件 '%s'，文件无法读取"
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:198
-#: plugins/admin/systems/class_printerPPDDialog.inc:270
+#: plugins/admin/systems/class_printerPPDDialog.inc:269
 #, php-format
 msgid "Can't create folder '%s' for the uploaded ppd file."
 msgstr "无法为上传的 ppd 文件创建目录 '%s'。"
@@ -8138,78 +8858,90 @@ msgid "Can't add new ppd file, the source file '%s' is not accessible."
 msgstr "无法添加新 ppd 文件，源文件 '%s' 无法访问。"
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:248
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"The given ppd file '%s' seams to be invalid, can't get any modell or vendor "
+"The given ppd file '%s' seams to be invalid, can't get any model or vendor "
 "informations."
 msgstr "给出的 ppd 文件 '%s' 好像不存在，无法获得任何型号或者供应商信息。 "
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:262
-#, php-format
-msgid "There is already a ppd file for this kind of printer."
-msgstr "这种打印机类型已经有一个 ppd 文件。"
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:283
+#: plugins/admin/systems/class_printerPPDDialog.inc:276
 #, php-format
 msgid "Can't save file '%s'."
 msgstr "无法保存文件 '%s'。"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:287
+#: plugins/admin/systems/class_printerPPDDialog.inc:280
 msgid "Uploaded ppd file is empty, can't create new ppd file."
 msgstr "上传的 ppd 文件为空，无法创建一个新 ppd 文件。"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:461
-#: plugins/admin/systems/class_printerPPDDialog.inc:464
+#: plugins/admin/systems/class_printerPPDDialog.inc:455
+#: plugins/admin/systems/class_printerPPDDialog.inc:458
 #: include/sieve/class_sieveElement_If.inc:915
 #: include/sieve/class_sieveManagement.inc:609
 msgid "True"
 msgstr "真"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:462
-#: plugins/admin/systems/class_printerPPDDialog.inc:465
+#: plugins/admin/systems/class_printerPPDDialog.inc:456
+#: plugins/admin/systems/class_printerPPDDialog.inc:459
 #: include/sieve/class_sieveElement_If.inc:915
 #: include/sieve/class_sieveManagement.inc:610
 msgid "False"
 msgstr "假"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:470
+#: plugins/admin/systems/class_printerPPDDialog.inc:464
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr "不支持的 ppd 类型 '%s' 为 '%s' 使用。"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:487
+#: plugins/admin/systems/class_printerPPDDialog.inc:481
 #, php-format
 msgid "Removing old ppd file '%s' failed."
 msgstr "删除旧的 ppd 文件 '%s' 失败。"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:490
+#: plugins/admin/systems/class_printerPPDDialog.inc:484
 #, php-format
 msgid "Removing old ppd file '%s' failed. File is not accessible."
 msgstr "删除旧 ppd 文件 '%s' 失败。文件不可访问。"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:493
+#: plugins/admin/systems/class_printerPPDDialog.inc:487
 #, php-format
 msgid ""
 "Removing old ppd file '%s' failed. File does not exists or is not accessible."
 msgstr "删除旧的 ppd 文件 '%s' 失败。文件不存在或者不可访问。"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:501
+#: plugins/admin/systems/class_printerPPDDialog.inc:500
 msgid ""
 "Please select a valid ppd file or use 'Cancel' to go back to printer "
 "configuration."
 msgstr "请选择一个有效的 ppd 文件或者点击“取消”来返回打印机配置。"
 
-#: plugins/admin/systems/workstation.tpl:8
-msgid "Workstation template"
-msgstr "工作站模板"
-
-#: plugins/admin/systems/workstation.tpl:10
-msgid "Workstation name"
-msgstr "工作站名称"
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+msgid "Server name"
+msgstr "服务器名称"
 
-#: plugins/admin/systems/servdns.tpl:1
-msgid "Zones"
-msgstr "域"
+#: plugins/admin/systems/server.tpl:17 plugins/admin/systems/terminal.tpl:19
+#: plugins/admin/systems/workstation.tpl:25
+#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/wingeneric.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "选择放置终端的子树"
+
+#: plugins/admin/systems/server.tpl:32 plugins/admin/systems/terminal.tpl:40
+#: plugins/admin/systems/workstation.tpl:45
+#: plugins/admin/systems/phonesettings.tpl:21
+#: plugins/admin/ogroups/termgroup.tpl:38
+msgid "Mode"
+msgstr "模式"
+
+#: plugins/admin/systems/server.tpl:34 plugins/admin/systems/terminal.tpl:42
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:40
+msgid "Select terminal mode"
+msgstr "选择终端类型"
+
+#: plugins/admin/systems/server.tpl:55
+msgid "Select action to execute for this server"
+msgstr "选择为这台服务器要执行的动作"
 
 #: plugins/admin/systems/workstationStartup.tpl:4
 #: plugins/admin/systems/terminalStartup.tpl:1
@@ -8221,48 +8953,48 @@ msgstr "启动参数"
 msgid "Boot kernel"
 msgstr "启动内核"
 
-#: plugins/admin/systems/workstationStartup.tpl:17
+#: plugins/admin/systems/workstationStartup.tpl:16
 #: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
 msgstr "定制选项"
 
-#: plugins/admin/systems/workstationStartup.tpl:19
+#: plugins/admin/systems/workstationStartup.tpl:18
 #: plugins/admin/systems/terminalStartup.tpl:19
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
 "during bootup"
 msgstr "输入任意将在启动过程中作为附加行传递给内核的参数"
 
-#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/workstationStartup.tpl:21
 #: plugins/admin/systems/terminalStartup.tpl:22
 msgid "LDAP server"
 msgstr "LDAP 服务器"
 
-#: plugins/admin/systems/workstationStartup.tpl:43
-#: plugins/admin/systems/workstationStartup.tpl:73
+#: plugins/admin/systems/workstationStartup.tpl:42
+#: plugins/admin/systems/workstationStartup.tpl:78
 msgid "FAI server"
 msgstr "自动化安装服务器"
 
-#: plugins/admin/systems/workstationStartup.tpl:65
-#: plugins/admin/systems/workstationStartup.tpl:97
+#: plugins/admin/systems/workstationStartup.tpl:70
+#: plugins/admin/systems/workstationStartup.tpl:114
 msgid "Assigned FAI classes"
 msgstr "分配的 FAI 类"
 
-#: plugins/admin/systems/workstationStartup.tpl:87
+#: plugins/admin/systems/workstationStartup.tpl:98
 msgid "set"
 msgstr "设置"
 
-#: plugins/admin/systems/workstationStartup.tpl:119
+#: plugins/admin/systems/workstationStartup.tpl:136
 #: plugins/admin/systems/terminalStartup.tpl:53
 msgid "Kernel modules (format: name parameters)"
 msgstr "内核模块（格式： 名称 参数）"
 
-#: plugins/admin/systems/workstationStartup.tpl:121
+#: plugins/admin/systems/workstationStartup.tpl:138
 #: plugins/admin/systems/terminalStartup.tpl:55
 msgid "Add additional modules to load on startup"
 msgstr "添加在启动中要加载的模块"
 
-#: plugins/admin/systems/workstationStartup.tpl:146
+#: plugins/admin/systems/workstationStartup.tpl:163
 #: plugins/admin/systems/terminalStartup.tpl:79
 msgid "Mountpoint"
 msgstr "挂载点"
@@ -8346,145 +9078,233 @@ msgstr "N/A"
 msgid "since"
 msgstr "自从"
 
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr "终端模板"
+
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+msgstr "终端名称"
+
+#: plugins/admin/systems/terminal.tpl:34
+#: plugins/admin/systems/workstation.tpl:39
+#, fuzzy
+msgid "Inherit all"
+msgstr "中间名"
+
+#: plugins/admin/systems/terminal.tpl:48
+#: plugins/admin/systems/workstation.tpl:53
+#: plugins/admin/ogroups/termgroup.tpl:47
+msgid "Syslog server"
+msgstr "日志服务器"
+
+#: plugins/admin/systems/terminal.tpl:50
+#: plugins/admin/systems/workstation.tpl:55
+#: plugins/admin/ogroups/termgroup.tpl:49
+msgid "Choose server to use for logging"
+msgstr "限制记录日志的服务器"
+
+#: plugins/admin/systems/terminal.tpl:65
+msgid "Root server"
+msgstr "根服务器"
+
+#: plugins/admin/systems/terminal.tpl:67
+msgid "Select NFS root filesystem to use"
+msgstr "选择要用的 NFS 根文件系统。"
+
+#: plugins/admin/systems/terminal.tpl:73
+msgid "Swap server"
+msgstr "交换服务器"
+
+#: plugins/admin/systems/terminal.tpl:75
+msgid "Choose NFS filesystem to place swap files on"
+msgstr "选择放置交换文件的 NFS 文件系统"
+
+#: plugins/admin/systems/terminal.tpl:93 plugins/admin/systems/terminal.tpl:95
+#: plugins/admin/systems/workstation.tpl:74
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Inherit time server attributes"
+msgstr "继承时间服务器属性"
+
+#: plugins/admin/systems/terminal.tpl:100
+#: plugins/admin/systems/workstation.tpl:81
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
+msgstr "NTP 服务器"
+
+#: plugins/admin/systems/terminal.tpl:102
+#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/ogroups/termgroup.tpl:16
+msgid "Choose server to use for synchronizing time"
+msgstr "选择要用于同步时间的服务器"
+
+#: plugins/admin/systems/terminal.tpl:132
+#: plugins/admin/systems/workstation.tpl:113
+#: plugins/admin/ogroups/termgroup.tpl:79
+msgid "Select action to execute for this terminal"
+msgstr "选择这个终端要执行的动作"
+
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
 msgstr "选择要添加的对象"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:107
+#: plugins/admin/systems/servdhcp.tpl:5
+msgid ""
+"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
+"abort."
+msgstr ""
+
+#: plugins/admin/systems/servdhcp.tpl:14
+#, fuzzy
+msgid "Take over DHCP configuration from"
+msgstr "创建您的配置文件"
+
+#: plugins/admin/systems/servdhcp.tpl:18 plugins/admin/systems/servdns.tpl:18
+msgid "Take over"
+msgstr ""
+
+#: plugins/admin/systems/servdhcp.tpl:24
+#, fuzzy
+msgid "DHCP sections"
+msgstr "LDAP 检查"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:124
 #: plugins/admin/systems/class_servGeneric.inc:47
 #: plugins/admin/ogroups/class_termgroup.inc:47
 msgid "Activated"
 msgstr "活动"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:146
+#: plugins/admin/systems/class_workstationGeneric.inc:163
 #: plugins/admin/systems/class_servGeneric.inc:81
 #: plugins/admin/ogroups/class_termgroup.inc:212
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "在您的 gosa.conf 中没有找到 ACTIONCMD 的定义"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:150
-#: plugins/admin/systems/class_terminalGeneric.inc:177
-#: plugins/admin/systems/class_terminalGeneric.inc:189
-#: plugins/admin/systems/class_terminalGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:167
+#: plugins/admin/systems/class_terminalGeneric.inc:192
+#: plugins/admin/systems/class_terminalGeneric.inc:204
+#: plugins/admin/systems/class_terminalGeneric.inc:216
 #: plugins/admin/systems/class_servGeneric.inc:86
 #: plugins/admin/ogroups/class_termgroup.inc:216
 #, php-format
 msgid "Execution of '%s' failed!"
 msgstr "执行 '%s' 失败！"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:192
+#: plugins/admin/systems/class_workstationGeneric.inc:209
 msgid "This 'dn' has no workstation features."
 msgstr "这个 'dn' 没有工作站功能。"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:251
-#: plugins/admin/systems/class_terminalGeneric.inc:269
+#: plugins/admin/systems/class_workstationGeneric.inc:268
+#: plugins/admin/systems/class_terminalGeneric.inc:284
 #: plugins/admin/systems/class_servGeneric.inc:170
 #: plugins/admin/ogroups/class_termgroup.inc:262
 msgid "Switch off"
 msgstr "关闭"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:251
-#: plugins/admin/systems/class_terminalGeneric.inc:270
-#: plugins/admin/systems/class_servGeneric.inc:170
-#: plugins/admin/ogroups/class_termgroup.inc:263
-msgid "Reboot"
-msgstr "重启"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:252
+#: plugins/admin/systems/class_workstationGeneric.inc:269
 #: plugins/admin/systems/class_servGeneric.inc:171
 #: plugins/admin/ogroups/class_termgroup.inc:264
 msgid "Instant update"
 msgstr "立即更新"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:253
-#: plugins/admin/systems/class_workstationGeneric.inc:262
+#: plugins/admin/systems/class_workstationGeneric.inc:270
+#: plugins/admin/systems/class_workstationGeneric.inc:279
 #: plugins/admin/systems/class_servGeneric.inc:172
 #: plugins/admin/systems/class_servGeneric.inc:181
 #: plugins/admin/ogroups/class_termgroup.inc:265
 msgid "Scheduled update"
 msgstr "计划更新"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:254
-#: plugins/admin/systems/class_workstationGeneric.inc:261
+#: plugins/admin/systems/class_workstationGeneric.inc:271
+#: plugins/admin/systems/class_workstationGeneric.inc:278
 #: plugins/admin/systems/class_servGeneric.inc:173
 #: plugins/admin/systems/class_servGeneric.inc:180
 #: plugins/admin/ogroups/class_termgroup.inc:266
 msgid "Reinstall"
 msgstr "重新安装"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:255
+#: plugins/admin/systems/class_workstationGeneric.inc:272
 #: plugins/admin/systems/class_servGeneric.inc:174
 #: plugins/admin/ogroups/class_termgroup.inc:267
 msgid "Rescan hardware"
 msgstr "重新扫描硬件"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:256
-#: plugins/admin/systems/class_workstationGeneric.inc:263
-#: plugins/admin/systems/class_terminalGeneric.inc:271
-#: plugins/admin/systems/class_terminalGeneric.inc:275
+#: plugins/admin/systems/class_workstationGeneric.inc:273
+#: plugins/admin/systems/class_workstationGeneric.inc:280
+#: plugins/admin/systems/class_terminalGeneric.inc:286
+#: plugins/admin/systems/class_terminalGeneric.inc:290
 #: plugins/admin/systems/class_servGeneric.inc:175
 #: plugins/admin/systems/class_servGeneric.inc:182
 #: plugins/admin/ogroups/class_termgroup.inc:49
 msgid "Memory test"
 msgstr "内存测试"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:257
-#: plugins/admin/systems/class_workstationGeneric.inc:264
+#: plugins/admin/systems/class_workstationGeneric.inc:274
+#: plugins/admin/systems/class_workstationGeneric.inc:281
 #: plugins/admin/systems/class_servGeneric.inc:176
 #: plugins/admin/systems/class_servGeneric.inc:183
 msgid "Force localboot"
 msgstr "强制本地启动"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:258
-#: plugins/admin/systems/class_workstationGeneric.inc:265
-#: plugins/admin/systems/class_terminalGeneric.inc:272
-#: plugins/admin/systems/class_terminalGeneric.inc:276
+#: plugins/admin/systems/class_workstationGeneric.inc:275
+#: plugins/admin/systems/class_workstationGeneric.inc:282
+#: plugins/admin/systems/class_terminalGeneric.inc:287
+#: plugins/admin/systems/class_terminalGeneric.inc:291
 #: plugins/admin/systems/class_servGeneric.inc:177
 #: plugins/admin/systems/class_servGeneric.inc:184
 #: plugins/admin/ogroups/class_termgroup.inc:50
 msgid "System analysis"
 msgstr "系统分析"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:260
-#: plugins/admin/systems/class_terminalGeneric.inc:274
+#: plugins/admin/systems/class_workstationGeneric.inc:277
+#: plugins/admin/systems/class_terminalGeneric.inc:289
 #: plugins/admin/systems/class_servGeneric.inc:179
 msgid "Wake up"
 msgstr "唤醒"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:296
+#: plugins/admin/systems/class_workstationGeneric.inc:325
 msgid "Removing workstation failed"
 msgstr "删除工作站失败"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:349
+#: plugins/admin/systems/class_workstationGeneric.inc:382
 #: plugins/admin/ogroups/class_termgroup.inc:115
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr "您无权在此 'Base' 下创建一个工作站"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:353
+#: plugins/admin/systems/class_workstationGeneric.inc:386
 msgid "The required field 'Workstation name' is not set."
 msgstr "需要的字段“工作站名称”没有设置。"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:371
-#: plugins/admin/systems/class_componentGeneric.inc:166
-#: plugins/admin/systems/class_winGeneric.inc:177
-#: plugins/admin/systems/class_terminalGeneric.inc:409
-#: plugins/admin/systems/class_servGeneric.inc:256
-#: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/systems/class_phoneGeneric.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:391
+#: plugins/admin/systems/class_componentGeneric.inc:153
+#: plugins/admin/systems/class_terminalGeneric.inc:427
+#: plugins/admin/systems/class_servGeneric.inc:250
+#: plugins/admin/systems/class_phoneGeneric.inc:308
+#, fuzzy
+msgid "Please specify a valid name for this object."
+msgstr "请为这个 mime type 指定一个有效名称。"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:409
+#: plugins/admin/systems/class_componentGeneric.inc:182
+#: plugins/admin/systems/class_winGeneric.inc:188
+#: plugins/admin/systems/class_terminalGeneric.inc:448
+#: plugins/admin/systems/class_servGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:677
+#: plugins/admin/systems/class_phoneGeneric.inc:330
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr "在您选择的部门中已经存在条目 '%s'"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:382
-#: plugins/admin/systems/class_terminalGeneric.inc:419
+#: plugins/admin/systems/class_workstationGeneric.inc:420
+#: plugins/admin/systems/class_terminalGeneric.inc:458
 msgid ""
 "There must be at least one NTP server selected, or the inherit mode "
 "activated."
 msgstr "必须由至少选择一个 NTP 服务器，或者激活继承模式。"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:454
-#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/systems/class_workstationGeneric.inc:492
+#: plugins/admin/systems/class_workstationGeneric.inc:516
 #: plugins/admin/ogroups/class_termgroup.inc:334
 msgid "Saving workstation failed"
 msgstr "保存工作站失败"
@@ -8506,11 +9326,6 @@ msgstr ""
 msgid "System / Department"
 msgstr "系统 / 部门"
 
-#: plugins/admin/systems/class_divListSystem.inc:61
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "显示服务器"
-
 #: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Select to see Linux terminals"
 msgstr "选择显示 Linux 终端"
@@ -8524,11 +9339,6 @@ msgstr "显示终端"
 msgid "Select to see Linux workstations"
 msgstr "选择显示 Linux 工作站"
 
-#: plugins/admin/systems/class_divListSystem.inc:63
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "显示工作站"
-
 #: plugins/admin/systems/class_divListSystem.inc:64
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr "选择显示基于 Microsoft Windows 工作站"
@@ -8562,16 +9372,12 @@ msgstr "选择显示网络设备"
 msgid "Show network devices"
 msgstr "显示网络设备"
 
-#: plugins/admin/systems/class_divListSystem.inc:75
-msgid "Display systems of user"
-msgstr "显示用户系统"
-
 #: plugins/admin/systems/class_divListSystem.inc:95
 msgid "New Terminal template"
 msgstr "新终端模板"
 
 #: plugins/admin/systems/class_divListSystem.inc:95
-#: plugins/admin/systems/class_systemManagement.inc:876
+#: plugins/admin/systems/class_systemManagement.inc:886
 msgid "New Terminal"
 msgstr "新终端"
 
@@ -8580,7 +9386,7 @@ msgid "New Workstation template"
 msgstr "新工作站模板"
 
 #: plugins/admin/systems/class_divListSystem.inc:97
-#: plugins/admin/systems/class_systemManagement.inc:877
+#: plugins/admin/systems/class_systemManagement.inc:887
 msgid "New Workstation"
 msgstr "新工作站"
 
@@ -8644,26 +9450,113 @@ msgstr "传真服务器"
 msgid "Ldap Server"
 msgstr "LDAP 服务器"
 
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:147
 msgid "Edit system"
 msgstr "编辑系统"
 
-#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_divListSystem.inc:149
 msgid "Delete system"
 msgstr "删除系统"
 
-#: plugins/admin/systems/class_divListSystem.inc:178
-msgid "Set root       password"
+#: plugins/admin/systems/class_divListSystem.inc:184
+#, fuzzy
+msgid "Set root password"
 msgstr "设置 root 口令"
 
-#: plugins/admin/systems/class_divListSystem.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:190
 msgid "Create CD"
 msgstr "创建 CD"
 
-#: plugins/admin/systems/class_divListSystem.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:190
 msgid "Create FAI CD"
 msgstr "创建 FAI CD"
 
+#: plugins/admin/systems/class_divListSystem.inc:218
+#, fuzzy
+msgid "Number of listed servers"
+msgstr "选择显示服务器"
+
+#: plugins/admin/systems/class_divListSystem.inc:219
+#, fuzzy
+msgid "Number of listed workstations"
+msgstr "选择查看工作站"
+
+#: plugins/admin/systems/class_divListSystem.inc:220
+#, fuzzy
+msgid "Number of listed terminals"
+msgstr "选择查看终端"
+
+#: plugins/admin/systems/class_divListSystem.inc:221
+#, fuzzy
+msgid "Number of listed phones"
+msgstr "选择查看电话"
+
+#: plugins/admin/systems/class_divListSystem.inc:222
+#, fuzzy
+msgid "Number of listed printers"
+msgstr "选择查看打印机"
+
+#: plugins/admin/systems/class_divListSystem.inc:223
+#, fuzzy
+msgid "Number of listed network components"
+msgstr "其他网络组件"
+
+#: plugins/admin/systems/class_divListSystem.inc:224
+#, fuzzy
+msgid "Number of listed new devices"
+msgstr "选择显示网络设备"
+
+#: plugins/admin/systems/class_divListSystem.inc:225
+#, fuzzy
+msgid "Number of listed windows workstations"
+msgstr "显示 Windows 工作站"
+
+#: plugins/admin/systems/class_servDB.inc:142
+#: plugins/admin/systems/class_servDB.inc:151
+#: plugins/admin/systems/class_servDB.inc:168
+#: plugins/admin/systems/class_servDB.inc:178
+#: plugins/admin/systems/class_servDB.inc:183
+#: plugins/admin/systems/class_servDB.inc:189
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "属性 '%s' 为空或者包含无效字符。"
+
+#: plugins/admin/systems/class_servDB.inc:158
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr "Imap 连接字符串格式应该为 '%s' 。"
+
+#: plugins/admin/systems/class_servDB.inc:162
+msgid "The sieve port needs to be numeric."
+msgstr "Sieve 端口应为数字。"
+
+#: plugins/admin/systems/class_servDB.inc:173
+#, php-format
+msgid "The specified kerberos password is empty."
+msgstr "提供的 kerberos 口令为空。"
+
+#: plugins/admin/systems/class_servDB.inc:215
+#: plugins/admin/systems/class_servDB.inc:337
+#, php-format
+msgid ""
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
+msgstr "您不能删除 asterisk 数据库扩展，它仍被这些对象 '%s' 使用。"
+
+#: plugins/admin/systems/class_servDB.inc:224
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr "Imap 名字字符串应该为一个主机名或者 IP 地址。"
+
+#: plugins/admin/systems/class_servDB.inc:278
+msgid "Saving server db settings failed"
+msgstr "保存服务器数据库设置失败"
+
+#: plugins/admin/systems/class_servDB.inc:294
+#, fuzzy, php-format
+msgid "Updating gofon home server failed for '%s'."
+msgstr "更新 DNS 服务失败"
+
 #: plugins/admin/systems/class_goVirusServer.inc:46
 #: plugins/admin/systems/class_goVirusServer.inc:244
 msgid "Anti virus"
@@ -8692,12 +9585,12 @@ msgstr "这个服务器禁用了反病毒功能。您可以点击下面按钮启
 #: plugins/admin/systems/class_goVirusServer.inc:151
 #, php-format
 msgid "Removing of server services/anti virus with dn '%s' failed."
-msgstr "删除 dn 为 '%s' 服务器服务/反病毒失败。"
+msgstr "删除 dn 为 '%s' 的 服务器服务/反病毒 失败。"
 
 #: plugins/admin/systems/class_goVirusServer.inc:196
 #, php-format
 msgid "Saving of server services/anti virus with dn '%s' failed."
-msgstr "ä¿\9då­\98 dn 为 '%s' 服务器服务/反病毒失败。"
+msgstr "以 dn '%s' ä¿\9då­\98 服务器服务/反病毒失败。"
 
 #: plugins/admin/systems/class_goVirusServer.inc:204
 msgid "Maximum directory recursions"
@@ -8744,74 +9637,28 @@ msgstr "命令 '%s'，作为插件 '%s' 的 ACTION_HOOK 好像并不存在。"
 msgid "Set status flag for server services/anti virus with dn '%s' failed."
 msgstr "设置 dn 为 '%s' 服务器服务/反病毒 的状态标记失败。"
 
-#: plugins/admin/systems/gencd_frame.tpl:2
-msgid "Your browser does not supprt iframes."
-msgstr "您的浏览器不支持 iframes。"
-
-#: plugins/admin/systems/class_servDB.inc:138
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:164
-#: plugins/admin/systems/class_servDB.inc:174
-#: plugins/admin/systems/class_servDB.inc:179
-#: plugins/admin/systems/class_servDB.inc:185
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "属性 '%s' 为空或者包含无效字符。"
-
-#: plugins/admin/systems/class_servDB.inc:154
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr "Imap 连接字符串格式应该为 '%s' 。"
-
-#: plugins/admin/systems/class_servDB.inc:158
-msgid "The sieve port needs to be numeric."
-msgstr "Sieve 端口应为数字。"
-
-#: plugins/admin/systems/class_servDB.inc:169
-#, php-format
-msgid "The specified kerberos password is empty."
-msgstr "提供的 kerberos 口令为空。"
-
-#: plugins/admin/systems/class_servDB.inc:211
-#: plugins/admin/systems/class_servDB.inc:309
-#, php-format
+#: plugins/admin/systems/servdns.tpl:5
 msgid ""
-"You can't remove the asterisk database extension, it is still in use by "
-"these objects '%s'."
-msgstr "您不能删除 asterisk 数据库扩展，它仍被这些对象 '%s' 使用。"
-
-#: plugins/admin/systems/class_servDB.inc:220
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr "Imap 名字字符串应该为一个主机名或者 IP 地址。"
-
-#: plugins/admin/systems/class_servDB.inc:274
-msgid "Saving server db settings failed"
-msgstr "保存服务器数据库设置失败"
-
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
-msgstr "编辑共享"
-
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr "NFS 设置"
+"DNS take over will take place when saving this entry. Choose 'Cancel' to "
+"abort."
+msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:33
-msgid "Volume"
-msgstr "卷"
+#: plugins/admin/systems/servdns.tpl:14
+#, fuzzy
+msgid "Take over DNS configuration from"
+msgstr "创建您的配置文件"
 
-#: plugins/admin/systems/servnfs.tpl:54
-msgid "Auto-mount share on Apple systems"
-msgstr "è\87ªå\8a¨æ\8c\82è½½å\85±äº«å\88°è\8b¹æ\9e\9cç³»ç»\9f"
+#: plugins/admin/systems/servdns.tpl:24
+msgid "Zones"
+msgstr "å\9f\9f"
 
-#: plugins/admin/systems/servnfs.tpl:94
-msgid "Codepage"
-msgstr "代码页"
+#: plugins/admin/systems/workstation.tpl:8
+msgid "Workstation template"
+msgstr "工作站模板"
 
-#: plugins/admin/systems/servnfs.tpl:104
-msgid "Option"
-msgstr "选项"
+#: plugins/admin/systems/workstation.tpl:10
+msgid "Workstation name"
+msgstr "工作站名称"
 
 #: plugins/admin/systems/class_servNfs.inc:41
 #, php-format
@@ -8851,97 +9698,29 @@ msgstr "路径包含无效字符。"
 msgid "Option contains invalid characters."
 msgstr "选项包含无效字符。"
 
-#: plugins/admin/systems/servkolab.tpl:9
-msgid "Postfix mydomain"
-msgstr "Postfix 'mydomain'"
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
+msgstr "编辑共享"
 
-#: plugins/admin/systems/servkolab.tpl:16
-msgid "Postfix mydestination"
-msgstr "Postfix mydestination"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr "NFS 设置"
 
-#: plugins/admin/systems/servkolab.tpl:23
-msgid "Cyrus admins"
-msgstr "Cyrus 管理员"
+#: plugins/admin/systems/servnfs.tpl:33
+msgid "Volume"
+msgstr "卷"
 
-#: plugins/admin/systems/servkolab.tpl:40
-msgid "POP3 service"
-msgstr "POP3 服务"
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
+msgstr "自动挂载共享到苹果系统"
 
-#: plugins/admin/systems/servkolab.tpl:48
-msgid "POP3/SSL service"
-msgstr "POP3/SSL 服务器"
+#: plugins/admin/systems/servnfs.tpl:94
+msgid "Codepage"
+msgstr "代码页"
 
-#: plugins/admin/systems/servkolab.tpl:56
-msgid "IMAP service"
-msgstr "IMAP 服务"
-
-#: plugins/admin/systems/servkolab.tpl:64
-msgid "IMAP/SSL service"
-msgstr "IMAP/SSL 服务"
-
-#: plugins/admin/systems/servkolab.tpl:72
-msgid "Sieve service"
-msgstr "Sieve 服务"
-
-#: plugins/admin/systems/servkolab.tpl:80
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "FTP FreeBusy 服务 （过时的，不能和 Kolab2 FreeBusy 互操作）"
-
-#: plugins/admin/systems/servkolab.tpl:88
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "HTTP FreeBusy 服务（旧）"
-
-#: plugins/admin/systems/servkolab.tpl:96
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Amavis 邮件扫描 (病毒/垃圾邮件)"
-
-#: plugins/admin/systems/servkolab.tpl:107
-msgid "Quota settings"
-msgstr "Quota 设置"
-
-#: plugins/admin/systems/servkolab.tpl:123
-msgid "Free/Busy settings"
-msgstr "Free/Busy 设置"
-
-#: plugins/admin/systems/servkolab.tpl:128
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr "允许不登录下载 Free/Busy 信息"
-
-#: plugins/admin/systems/servkolab.tpl:143
-msgid "SMTP privileged networks"
-msgstr "SMTP 授权网络"
-
-#: plugins/admin/systems/servkolab.tpl:148
-msgid "Hosts/networks allowed to relay"
-msgstr "允许中继的主机/网络"
-
-#: plugins/admin/systems/servkolab.tpl:151
-msgid "Enter multiple values, seperated with"
-msgstr "输入多个值，分隔符为"
-
-#: plugins/admin/systems/servkolab.tpl:164
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhost"
-
-#: plugins/admin/systems/servkolab.tpl:170
-msgid "Enable MX lookup for relayhost"
-msgstr "启用中继主机的 MX 查找"
-
-#: plugins/admin/systems/servkolab.tpl:175
-msgid "Host used to relay mails"
-msgstr "中继邮件使用的主机"
-
-#: plugins/admin/systems/servkolab.tpl:189
-msgid "Accept Internet Mail"
-msgstr "允许 Internet  邮件"
-
-#: plugins/admin/systems/servkolab.tpl:195
-msgid "Accept mail from other domains over non-authenticated SMTP"
-msgstr "允许从其他未认证 SMTP 发送邮件"
-
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "电话名称"
+#: plugins/admin/systems/servnfs.tpl:104
+msgid "Option"
+msgstr "选项"
 
 #: plugins/admin/systems/class_servKolab.inc:90
 #, php-format
@@ -9009,6 +9788,69 @@ msgstr "没有设置 SMTP 授权网络。"
 msgid "Saving server to kolab object failed"
 msgstr "保存服务器到 kolab 对象失败"
 
+#: plugins/admin/systems/class_dhcpNetwork.inc:42
+msgid "The name of the DNS server your're going to add is not valid!"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpNetwork.inc:211
+#, php-format
+msgid "Error in definition of '%s'!"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpGroup.inc:91
+#, fuzzy
+msgid "Field 'Name' contains illegal characters."
+msgstr "“姓名”字段包含无效字符。"
+
+#: plugins/admin/systems/class_dhcpGroup.inc:99
+#: plugins/admin/systems/class_dhcpHost.inc:140
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:161
+#, fuzzy
+msgid "The name for this host section is already used!"
+msgstr "重命名失败，系统类型名称已经被使用。"
+
+#: plugins/admin/systems/gencd_frame.tpl:2
+msgid "Your browser does not supprt iframes."
+msgstr "您的浏览器不支持 iframes。"
+
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:26
+#: plugins/admin/systems/class_servDHCP.inc:34
+#: plugins/admin/systems/class_servDHCP.inc:312
+#: plugins/admin/systems/class_servDHCP.inc:604
+#, fuzzy
+msgid "Global options"
+msgstr "邮件选项"
+
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:28
+#: plugins/admin/systems/class_servDHCP.inc:36
+#, fuzzy
+msgid "Subclass"
+msgstr "类"
+
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:29
+#: plugins/admin/systems/class_servDHCP.inc:37
+#, fuzzy
+msgid "Host"
+msgstr "贴"
+
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:31
+#: plugins/admin/systems/class_servDHCP.inc:39
+#, fuzzy
+msgid "Pool"
+msgstr "布尔值"
+
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:32
+#: plugins/admin/systems/class_servDHCP.inc:40
+#, fuzzy
+msgid "Subnet"
+msgstr "提交"
+
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:33
+#: plugins/admin/systems/class_servDHCP.inc:42
+#, fuzzy
+msgid "Shared network"
+msgstr "SMTP 授权网络"
+
 #: plugins/admin/systems/terminalService.tpl:146
 msgid "Remote desktop"
 msgstr "远程桌面"
@@ -9061,35 +9903,80 @@ msgstr "选择放置 spool 文件的 NFS 文件系统"
 msgid "Select scanner driver to use"
 msgstr "选择要用的扫描器驱动"
 
+#: plugins/admin/systems/class_dhcpSubnet.inc:134
+#, fuzzy
+msgid "Required field 'Network address' is not filled."
+msgstr "需要的字段“名称”没有填写。"
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:137
+#, fuzzy
+msgid "Required field 'Netmask' is not filled."
+msgstr "需要的字段“名称”没有填写。"
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:145
+#: plugins/admin/systems/class_dhcpPool.inc:112
+#, fuzzy
+msgid "The name for this section is already used!"
+msgstr "重命名失败，系统类型名称已经被使用。"
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:152
+#: plugins/admin/systems/servdnseditzone.tpl:13
+#: plugins/admin/systems/dhcp_subnet.tpl:8
+msgid "Network address"
+msgstr "网络地址"
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:152
+#: plugins/admin/systems/dhcp_pool.tpl:11
+#, fuzzy
+msgid "Range"
+msgstr "管理"
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:154
+#, fuzzy, php-format
+msgid "The field '%s' contains an invalid IP address"
+msgstr "IP 地址字段包含无效地址。"
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:161
+#: plugins/admin/systems/class_dhcpPool.inc:127
+#, fuzzy
+msgid "Field 'Range' contains invalid IP range."
+msgstr "“姓名”字段包含无效字符。"
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:167
+#: plugins/admin/systems/class_dhcpPool.inc:141
+#, fuzzy
+msgid "'Range' is not inside the configured network."
+msgstr "发现 %s 组在定义的树 '%s' 之外。"
+
 #: plugins/admin/systems/class_componentGeneric.inc:49
 #: plugins/admin/systems/class_winGeneric.inc:74
 msgid "This 'dn' has no network features."
 msgstr "这个 'dn' 没有网络功能。"
 
-#: plugins/admin/systems/class_componentGeneric.inc:102
+#: plugins/admin/systems/class_componentGeneric.inc:110
 msgid "Removing generic component failed"
 msgstr "删除通用组件失败"
 
-#: plugins/admin/systems/class_componentGeneric.inc:140
+#: plugins/admin/systems/class_componentGeneric.inc:148
 msgid "The required field 'Component name' is not set."
 msgstr "需要的字段“组件名称”没有设置。"
 
-#: plugins/admin/systems/class_componentGeneric.inc:145
-#: plugins/admin/systems/class_phoneGeneric.inc:284
+#: plugins/admin/systems/class_componentGeneric.inc:158
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 msgid "The required field IP address is empty."
 msgstr "需要的 IP 地址字段为空。"
 
-#: plugins/admin/systems/class_componentGeneric.inc:148
-#: plugins/admin/systems/class_phoneGeneric.inc:287
+#: plugins/admin/systems/class_componentGeneric.inc:161
+#: plugins/admin/systems/class_phoneGeneric.inc:295
 msgid "The field IP address contains an invalid address."
 msgstr "IP 地址字段包含无效地址。"
 
-#: plugins/admin/systems/class_componentGeneric.inc:156
-#: plugins/admin/systems/class_winGeneric.inc:167
+#: plugins/admin/systems/class_componentGeneric.inc:169
+#: plugins/admin/systems/class_winGeneric.inc:175
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr "您无权在这个 'Base' 下创建一个组件。"
 
-#: plugins/admin/systems/class_componentGeneric.inc:225
+#: plugins/admin/systems/class_componentGeneric.inc:241
 msgid "Saving generic component failed"
 msgstr "保存通用组件失败"
 
@@ -9161,17 +10048,17 @@ msgid ""
 "'%s'."
 msgstr "您不能删除这个硒鼓类型，它仍然在被这个打印机 '%s' 使用。"
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:157
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:158
 msgid "Cartridges"
 msgstr "硒鼓"
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:205
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:220
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:206
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:221
 msgid "New monitor"
 msgstr "新监视器"
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:205
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:220
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:206
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:221
 msgid "M"
 msgstr "M"
 
@@ -9226,6 +10113,16 @@ msgstr "这个设备禁用了 inventory 信息。您可以点击下面按钮启
 msgid "Can't remove glpi account, while mysql extension is missing."
 msgstr "无法删除 glpi 账号，因为没有找到 mysql 扩展。"
 
+#: plugins/admin/systems/class_dhcpPool.inc:119
+#, fuzzy
+msgid "Required field 'Range' is not filled."
+msgstr "需要的字段“名称”没有填写。"
+
+#: plugins/admin/systems/class_dhcpPool.inc:123
+#, fuzzy
+msgid "Field 'Range' contains invalid IP addresses."
+msgstr "“姓名”字段包含无效字符。"
+
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 msgid "Manage manufacturers"
 msgstr "管理生产商"
@@ -9234,76 +10131,111 @@ msgstr "管理生产商"
 msgid "Attachment"
 msgstr "附件"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-msgid "Filename"
-msgstr "文件名"
-
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:54
 msgid "Mime-type"
 msgstr "Mime-type"
 
-#: plugins/admin/systems/class_termDNS.inc:138
+#: plugins/admin/systems/class_termDNS.inc:191
 #, php-format
 msgid ""
 "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
 msgstr "无法执行指定的 AUTO_NETWORK_HOOK '%s'，请检查您的 gosa.conf。"
 
-#: plugins/admin/systems/class_termDNS.inc:224
+#: plugins/admin/systems/class_termDNS.inc:327
 msgid "Not matching"
 msgstr "不匹配"
 
-#: plugins/admin/systems/class_termDNS.inc:309
+#: plugins/admin/systems/class_termDNS.inc:436
 msgid "The required field 'IP-address' is not set."
 msgstr "需要的字段“IP 地址”没有设置"
 
-#: plugins/admin/systems/class_termDNS.inc:316
+#: plugins/admin/systems/class_termDNS.inc:443
 msgid "Wrong IP format in field IP-address."
 msgstr "字段“IP 地址”格式错误"
 
-#: plugins/admin/systems/class_termDNS.inc:322
+#: plugins/admin/systems/class_termDNS.inc:449
 msgid "The required field 'MAC-address' is not set."
 msgstr "需要的字段“MAC 地址”没有设置。"
 
-#: plugins/admin/systems/class_termDNS.inc:328
+#: plugins/admin/systems/class_termDNS.inc:455
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
 msgstr "提供的 MAC 地址无效。必须是由 ':' 分隔的六个两字节片断组成。"
 
-#: plugins/admin/systems/class_termDNS.inc:341
+#: plugins/admin/systems/class_termDNS.inc:468
 #, php-format
 msgid ""
 "The specified IP address '%s' is not matching the selected reverse zone "
 "entry '%s'."
 msgstr "提供的 IP 地址 '%s' 和所选的反向解析域条目 '%s' 不匹配。"
 
-#: plugins/admin/systems/class_termDNS.inc:356
+#: plugins/admin/systems/class_termDNS.inc:483
 #, php-format
 msgid "Found duplicate value for record type '%s'."
 msgstr "发现记录类型 '%s' 有重复。"
 
-#: plugins/admin/systems/class_termDNS.inc:364
+#: plugins/admin/systems/class_termDNS.inc:491
 #, php-format
 msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr "对于唯一记录类型 '%s' 发现了一个以上的条目。"
 
-#: plugins/admin/systems/class_termDNS.inc:375
+#: plugins/admin/systems/class_termDNS.inc:502
 #, php-format
 msgid ""
 "The device IP '%s' is added as 'A Record', this will be done automatically, "
 "please remove the record."
 msgstr "设备 IP '%s' 将自动作为'A'记录添加，请删除这条记录。"
 
-#: plugins/admin/systems/class_termDNS.inc:382
-#: plugins/admin/systems/class_servDNSeditZone.inc:416
+#: plugins/admin/systems/class_termDNS.inc:509
+#: plugins/admin/systems/class_servDNSeditZone.inc:445
 #, php-format
 msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr "只允许小写字母，请检查您的 '%ss'。"
 
-#: plugins/admin/systems/class_termDNS.inc:467
+#: plugins/admin/systems/class_termDNS.inc:578
+#, fuzzy
+msgid "Removing dhcp entry for this object failed."
+msgstr "从 kolab 对象删除服务器失败"
+
+#: plugins/admin/systems/class_termDNS.inc:602
+#: plugins/admin/systems/class_termDNS.inc:621
+#, fuzzy
+msgid "Tried to add new dhcp entry failed."
+msgstr "添加新元素失败。"
+
+#: plugins/admin/systems/class_termDNS.inc:624
+#, fuzzy
+msgid "Removing old dhcp entry failed."
+msgstr "删除 kolab 主机条目失败"
+
+#: plugins/admin/systems/class_termDNS.inc:640
+#, fuzzy
+msgid "Modifying dhcp entry failed."
+msgstr "修改 FAI 模板条目失败"
+
+#: plugins/admin/systems/class_termDNS.inc:707
 msgid "Saving terminal to DNS object failed"
 msgstr "保存"
 
+#: plugins/admin/systems/class_dhcpHost.inc:62
+#, fuzzy
+msgid "Ethernet"
+msgstr "内联网"
+
+#: plugins/admin/systems/class_dhcpHost.inc:63
+msgid "FDDI"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpHost.inc:64
+msgid "Token Ring"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpHost.inc:149
+#, fuzzy
+msgid "The hardware address specified by you is not valid!"
+msgstr "提供的“Ratio”值无效。"
+
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:113
 msgid "Can't delete this entry, it is still in use."
 msgstr "无法删除条目，仍在使用。"
@@ -9345,7 +10277,6 @@ msgid "Enable use of DDC"
 msgstr "启用 DDC 的使用"
 
 #: plugins/admin/systems/goSpamServer.tpl:69
-#, fuzzy
 msgid "Enable use of Pyzor"
 msgstr "启用 Pyzer 的使用"
 
@@ -9384,9 +10315,9 @@ msgid ""
 "Be careful editing this release, it is still used by these workstations [%s]."
 msgstr "请小心编辑此发行版，它仍然被这些工作站使用 [%s]。"
 
-#: plugins/admin/systems/class_servRepository.inc:281
-#: plugins/admin/systems/class_servRepository.inc:300
-#: plugins/admin/systems/class_servRepository.inc:304
+#: plugins/admin/systems/class_servRepository.inc:282
+#: plugins/admin/systems/class_servRepository.inc:301
+#: plugins/admin/systems/class_servRepository.inc:305
 #: plugins/admin/systems/servRepositorySetup.tpl:33
 msgid "Sections"
 msgstr "节"
@@ -9455,89 +10386,95 @@ msgstr "最大递归"
 msgid "Zone name"
 msgstr "域名称"
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
-msgid "Network address"
-msgstr "网络地址"
-
-#: plugins/admin/systems/servdnseditzone.tpl:24
+#: plugins/admin/systems/servdnseditzone.tpl:33
 msgid "Zone records"
 msgstr "域记录"
 
-#: plugins/admin/systems/servdnseditzone.tpl:27
+#: plugins/admin/systems/servdnseditzone.tpl:36
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr "无法编辑因为域现在不能保存。"
 
-#: plugins/admin/systems/servdnseditzone.tpl:39
+#: plugins/admin/systems/servdnseditzone.tpl:48
 msgid "SOA record"
 msgstr "SOA 记录"
 
-#: plugins/admin/systems/servdnseditzone.tpl:45
+#: plugins/admin/systems/servdnseditzone.tpl:54
 msgid "Primary dns server for this zone"
 msgstr "这个域的主要 dns 服务器"
 
-#: plugins/admin/systems/servdnseditzone.tpl:57
+#: plugins/admin/systems/servdnseditzone.tpl:66
 msgid "Serial number (automatically incremented)"
 msgstr "系列号（自增）"
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/systems/servdnseditzone.tpl:76
+#: plugins/gofon/phoneaccount/generic.tpl:76
+msgid "Refresh"
+msgstr "刷新"
+
+#: plugins/admin/systems/servdnseditzone.tpl:82
 #: plugins/admin/ogroups/phonequeue.tpl:67
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
 msgstr "重试"
 
-#: plugins/admin/systems/servdnseditzone.tpl:79
+#: plugins/admin/systems/servdnseditzone.tpl:88
 msgid "Expire"
 msgstr "过期"
 
-#: plugins/admin/systems/servdnseditzone.tpl:100
+#: plugins/admin/systems/servdnseditzone.tpl:109
 msgid "MxRecords"
 msgstr "Mx记录"
 
-#: plugins/admin/systems/servdnseditzone.tpl:112
+#: plugins/admin/systems/servdnseditzone.tpl:121
 msgid "Global zone records"
 msgstr "全局域记录"
 
-#: plugins/admin/systems/class_winGeneric.inc:129
+#: plugins/admin/systems/class_winGeneric.inc:137
 msgid "Removing Samba workstation failed"
 msgstr "删除 Samba 工作站失败"
 
-#: plugins/admin/systems/class_winGeneric.inc:228
+#: plugins/admin/systems/class_winGeneric.inc:239
 msgid "Saving Samba workstation failed"
 msgstr "保存 Samba 工作站失败"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:135
+#: plugins/admin/systems/class_glpiSelectUser.inc:136
 msgid "use"
 msgstr "使用"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:155
+#: plugins/admin/systems/class_glpiSelectUser.inc:156
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: include/class_MultiSelectWindow.inc:188
+#: include/class_MultiSelectWindow.inc:189
 msgid "Go to root department"
 msgstr "转到根部门"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:157
+#: plugins/admin/systems/class_glpiSelectUser.inc:156
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: include/class_MultiSelectWindow.inc:189
+#: include/class_MultiSelectWindow.inc:191
+msgid "Root"
+msgstr "根"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:158
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: include/class_MultiSelectWindow.inc:196
+#: include/class_MultiSelectWindow.inc:197
 msgid "Go up one department"
 msgstr "向上跳转一个部门"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:159
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: include/class_MultiSelectWindow.inc:204
+#: include/class_MultiSelectWindow.inc:205
 msgid "Go to users department"
 msgstr "转到用户部门"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:159
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: include/class_MultiSelectWindow.inc:204
-#: include/class_MultiSelectWindow.inc:206
+#: include/class_MultiSelectWindow.inc:205
+#: include/class_MultiSelectWindow.inc:207
 msgid "Home"
-msgstr ""
+msgstr "主页"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_glpiSelectUser.inc:161
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
-#: include/class_MultiSelectWindow.inc:211
+#: include/class_MultiSelectWindow.inc:212
 msgid "Reload list"
 msgstr "重新加载列表"
 
@@ -9554,6 +10491,10 @@ msgstr "缺省"
 msgid "Saving terminal service information failed"
 msgstr "保存终端服务信息失败"
 
+#: plugins/admin/systems/class_terminalStartup.inc:406
+msgid "Saving terminal startup settings failed"
+msgstr "保存终端启动设置失败"
+
 #: plugins/admin/systems/glpi_devices.tpl:2
 msgid "Add/Edit monitor"
 msgstr "添加/修改 显示器"
@@ -9587,7 +10528,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:113 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:146 setup/class_setupStep_Config3.inc:82
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -9604,7 +10545,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:113 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:146 setup/class_setupStep_Config3.inc:82
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -9700,10 +10641,6 @@ msgstr "添加/修改 声卡"
 msgid "Add/Edit network interface"
 msgstr "添加/修改 网卡"
 
-#: plugins/admin/systems/glpi_devices.tpl:589
-msgid "MAC address"
-msgstr "MAC 地址"
-
 #: plugins/admin/systems/glpi_devices.tpl:607
 msgid "Add/Edit processor"
 msgstr "添加/修改 处理器"
@@ -9732,9 +10669,9 @@ msgstr "添加/修改 机箱"
 msgid "format"
 msgstr "格式"
 
-#: plugins/admin/systems/class_terminalStartup.inc:406
-msgid "Saving terminal startup settings failed"
-msgstr "保存终端启动设置失败"
+#: plugins/admin/systems/dhcp_subnet.tpl:20
+msgid "Range for dynamic address assignment"
+msgstr ""
 
 #: plugins/admin/systems/class_servService.inc:103
 #, php-format
@@ -9755,20 +10692,19 @@ msgstr "保存服务器服务对象失败"
 
 #: plugins/admin/systems/class_servService.inc:426
 msgid "Creating mount container failed"
-msgstr "创建 Mount-Containers 失败"
+msgstr "创建 mount 容器失败"
 
 #: plugins/admin/systems/class_servService.inc:440
 msgid "Removing mount container failed"
-msgstr "删除 mount container 失败"
+msgstr "删除 mount 容器失败"
 
 #: plugins/admin/systems/class_servService.inc:452
 msgid "Saving mount container failed"
-msgstr "保存 mount container 失败"
+msgstr "保存 mount 容器失败"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
-#, fuzzy
 msgid "Parent server"
-msgstr "Parent 服务器"
+msgstr "父服务器"
 
 #: plugins/admin/systems/servservice.tpl:37
 msgid "Time Service"
@@ -9806,76 +10742,56 @@ msgstr "邮件服务器"
 msgid "Manage OS-types"
 msgstr "管理操作系统类型"
 
-#: plugins/admin/systems/goSpamServerRule.tpl:14
-msgid "Rule"
-msgstr "规则"
-
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
-msgstr "这种打印机的可用硒鼓列表"
-
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
-msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
+#: plugins/admin/systems/class_dhcpAdvanced.inc:53
+msgid "Can't delete automatic statements. Please use the fields above."
 msgstr ""
-"这个对话框用于创建新的硒鼓类型，以及选择一到多个打印机类型。硒鼓类型和所选的"
-"打印机类型相关。每一个选择的硒鼓类型将有一个新的硒鼓被创建，这允许您为一个以"
-"上的打印机选择同一种硒鼓。"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
-msgid "Display cartridge types matching"
-msgstr "显示匹配的硒鼓类型"
+#: plugins/admin/systems/class_dhcpAdvanced.inc:66
+msgid "Can't delete automatic options. Please use the fields above."
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
-msgid "Regular expression for matching cartridge types"
-msgstr "匹配硒鼓类型的正则表达式"
+#: plugins/admin/systems/goSpamServerRule.tpl:14
+msgid "Rule"
+msgstr "规则"
 
-#: plugins/admin/systems/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"最好在执行这个操作之前，保存当前 MySQL 数据库中的内容到一个文件。所以，如果您"
-"已经这么做了，按“删除”继续或者按“取消”退出。"
+#: plugins/admin/systems/dhcp_pool.tpl:8
+#, fuzzy
+msgid "Name of pool"
+msgstr "黑名单名称"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:100
+#: plugins/admin/systems/class_terminalGeneric.inc:115
 msgid "text"
 msgstr "文字"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:101
+#: plugins/admin/systems/class_terminalGeneric.inc:116
 msgid "graphic"
 msgstr "图形"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:173
+#: plugins/admin/systems/class_terminalGeneric.inc:188
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "没有在您的 gosa.conf 中找到 WAKECMD 定义"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:185
+#: plugins/admin/systems/class_terminalGeneric.inc:200
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr "没有在您的 gosa.conf 中找到 REBOOTCMD 定义"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:197
+#: plugins/admin/systems/class_terminalGeneric.inc:212
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr "没有在您的 gosa.conf 中找到 HALTCMD 定义"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:324
+#: plugins/admin/systems/class_terminalGeneric.inc:352
 msgid "Removing terminal failed"
 msgstr "删除终端失败"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:384
+#: plugins/admin/systems/class_terminalGeneric.inc:418
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr "您无权在此 'Base' 下创建一个终端"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:388
+#: plugins/admin/systems/class_terminalGeneric.inc:422
 msgid "The required field 'Terminal name' is not set."
 msgstr "需要的字段“终端名称”没有设置。"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_terminalGeneric.inc:542
 msgid "Saving terminal failed"
 msgstr "保存终端失败"
 
@@ -9900,434 +10816,566 @@ msgid ""
 "You can't delete this device, it is still in use by these system(s) '%s'"
 msgstr "您不能删除这个设备，它仍然被这些系统使用 '%s'"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:182
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:183
 msgid "devices"
 msgstr "设备"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:222
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:223
 msgid "New mainbord"
 msgstr "新主板"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:224
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 msgid "New processor"
 msgstr "新处理器"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:226
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "New case"
 msgstr "新机箱"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:226
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "C"
 msgstr "C"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:228
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "New network interface"
 msgstr "新建网络接口"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:228
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "NI"
 msgstr "NI"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:230
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
 msgid "New ram"
 msgstr "新内存"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:230
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
 msgid "R"
 msgstr "R"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:232
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
 msgid "New hard disk"
 msgstr "新硬盘"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:232
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
 msgid "HDD"
 msgstr "HDD"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:234
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
 msgid "New drive"
 msgstr "新驱动器"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:234
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
 msgid "D"
 msgstr "D"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:236
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
 msgid "New controller"
 msgstr "新控制器"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:236
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
 msgid "CS"
 msgstr "CS"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:238
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
 msgid "New graphics card"
 msgstr "新显卡"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:238
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
 msgid "GC"
 msgstr "GC"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:240
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
 msgid "New sound card"
 msgstr "新声卡"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:240
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
 msgid "SC"
 msgstr "SC"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:242
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
 msgid "New power supply"
 msgstr "新电源"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:242
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
 msgid "PS"
 msgstr "PS"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:244
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
 msgid "New misc device"
 msgstr "新建其他设备"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:244
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
 msgid "OC"
 msgstr "OC"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:342
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:343
 msgid "You have to specify a valid name for this device."
 msgstr "您必须为这个设备提供一个有效的名称。"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:362
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:365
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:363
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
 msgid "This device name is already in use."
 msgstr "这个设备名已经被使用。"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:401
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:402
 msgid "Other"
 msgstr "其他"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:1
-msgid "Printer driver"
-msgstr "æ\89\93å\8d°æ\9cºé©±å\8a¨"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
+msgstr "è¿\99ç§\8dæ\89\93å\8d°æ\9cºç\9a\84å\8f¯ç\94¨ç¡\92é¼\93å\88\97表"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-msgid "Select"
-msgstr "选择"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
+msgid ""
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
+msgstr ""
+"这个对话框用于创建新的硒鼓类型，以及选择一到多个打印机类型。硒鼓类型和所选的"
+"打印机类型相关。每一个选择的硒鼓类型将有一个新的硒鼓被创建，这允许您为一个以"
+"上的打印机选择同一种硒鼓。"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-msgid "New driver"
-msgstr "新驱动"
-
-#: plugins/admin/systems/printer.tpl:6
-msgid "General"
-msgstr "普通"
-
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
-msgstr "打印机名称"
-
-#: plugins/admin/systems/printer.tpl:36
-msgid "Details"
-msgstr "详细"
-
-#: plugins/admin/systems/printer.tpl:39
-msgid "Printer location"
-msgstr "打印机位置"
-
-#: plugins/admin/systems/printer.tpl:43
-msgid "Printer URL"
-msgstr "打印机 URL"
-
-#: plugins/admin/systems/printer.tpl:63
-msgid "Permissions"
-msgstr "允许"
-
-#: plugins/admin/systems/printer.tpl:70
-msgid "Users which are allowed to use this printer"
-msgstr "允许使用该打印机的用户"
-
-#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:93
-msgid "Add user"
-msgstr "添加用户"
-
-#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:94
-msgid "Add group"
-msgstr "添加组"
-
-#: plugins/admin/systems/printer.tpl:88
-msgid "Users which are allowed to administrate this printer"
-msgstr "允许管理该打印机的用户"
-
-#: plugins/admin/systems/printer.tpl:90
-msgid "Admins"
-msgstr "管理员"
-
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr "Kerberos kadmin 访问"
-
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
-msgstr "Kerberos Realm"
-
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
-msgstr "管理员"
-
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
-msgstr "传真数据库"
-
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
-msgstr "传真数据库用户名"
-
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
-msgstr "Asterisk 管理"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+msgid "Display cartridge types matching"
+msgstr "显示匹配的硒鼓类型"
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
-msgstr "Asterisk DB 用户"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+msgid "Regular expression for matching cartridge types"
+msgstr "匹配硒鼓类型的正则表达式"
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
-msgstr "国内拨号前缀"
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+msgid "Printer driver"
+msgstr "打印机驱动"
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
-msgstr "内部拨号前缀"
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+msgid "Select"
+msgstr "选择"
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
-msgstr "IMAP 管理员访问"
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+msgid "New driver"
+msgstr "新驱动"
 
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
-msgstr "服务器标识"
+#: plugins/admin/systems/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"最好在执行这个操作之前，保存当前 MySQL 数据库中的内容到一个文件。所以，如果您"
+"已经这么做了，按“删除”继续或者按“取消”退出。"
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
-msgstr "连接 URL"
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "电话名称"
 
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
-msgstr "Sieve 端口"
+#: plugins/admin/systems/dhcp_host.tpl:11
+#, fuzzy
+msgid "Name of host"
+msgstr "黑名单名称"
 
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
-msgstr "日志数据库"
+#: plugins/admin/systems/dhcp_host.tpl:15
+#, fuzzy
+msgid "Fixed address"
+msgstr "邮件地址"
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
-msgstr "Logging DB 用户"
+#: plugins/admin/systems/dhcp_host.tpl:19
+msgid "Use hostname or IP-address to assign fixed address"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:119
-msgid "Glpi database"
-msgstr "Glpi 数据库"
+#: plugins/admin/systems/dhcp_host.tpl:27
+msgid "Hardware type"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:133
-msgid "Database"
-msgstr "数据库"
+#: plugins/admin/systems/dhcp_host.tpl:35
+#, fuzzy
+msgid "Hardware address"
+msgstr "主要地址"
 
 #: plugins/admin/systems/class_servGeneric.inc:73
 msgid "This 'dn' has no server features."
 msgstr "这个 'dn' 没有服务器功能。"
 
-#: plugins/admin/systems/class_servGeneric.inc:202
+#: plugins/admin/systems/class_servGeneric.inc:209
 msgid "Removing server failed"
 msgstr "删除服务器错误"
 
-#: plugins/admin/systems/class_servGeneric.inc:238
+#: plugins/admin/systems/class_servGeneric.inc:245
 msgid "The required field 'Server name' is not set."
 msgstr "需要的字段“服务器名称”没有定义。"
 
-#: plugins/admin/systems/class_servGeneric.inc:245
+#: plugins/admin/systems/class_servGeneric.inc:257
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr "您无权在此 'Base' 下创建一个服务器。"
 
-#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_servGeneric.inc:327
 msgid "Saving server failed"
 msgstr "保存服务器失败"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
-msgstr "参考"
+#: plugins/admin/systems/dhcpNewSection.tpl:2
+#, fuzzy
+msgid "Create new DHCP section"
+msgstr "创建新应用程序"
+
+#: plugins/admin/systems/dhcpNewSection.tpl:6
+#, fuzzy
+msgid "Please choose one of the following DHCP section types."
+msgstr "请使用下面的一个方法来选择新 FAI 分类的名称。"
+
+#: plugins/admin/systems/dhcpNewSection.tpl:10
+#, fuzzy
+msgid "Choose section type to create"
+msgstr "选择鼠标类型"
+
+#: plugins/admin/systems/dhcpNewSection.tpl:15
+#: plugins/admin/systems/chooser.tpl:16 setup/class_setupStep_Migrate.inc:860
+msgid "Create"
+msgstr "创建"
+
+#: plugins/admin/systems/class_servDHCP.inc:33
+#, fuzzy
+msgid "Logging"
+msgstr "登录名"
+
+#: plugins/admin/systems/class_servDHCP.inc:41
+#, fuzzy
+msgid "Failover peer"
+msgstr "文件模板"
+
+#: plugins/admin/systems/class_servDHCP.inc:123
+#, fuzzy, php-format
+msgid "You are going to migrate the DHCP setup from server '%s'."
+msgstr "您将要拷贝条目 '%s'。"
+
+#: plugins/admin/systems/class_servDHCP.inc:124
+#: plugins/admin/systems/class_servDNS.inc:124
+msgid ""
+"The migration will be started when you save this system. To cancel this "
+"action, use the cancel button below."
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:240
+#, fuzzy
+msgid "You're not allowed to remove DHCP sections!"
+msgstr "您无权删除这个应用程序！"
+
+#: plugins/admin/systems/class_servDHCP.inc:274
+#, fuzzy, php-format
+msgid "You're about to delete the DHCP section '%s'."
+msgstr "您将要删除应用程序 '%s'。"
 
-#: plugins/admin/systems/class_servDHCP.inc:31
+#: plugins/admin/systems/class_servDHCP.inc:298
 msgid "Remove DHCP service"
 msgstr "删除 DHCP 服务"
 
-#: plugins/admin/systems/class_servDHCP.inc:32
+#: plugins/admin/systems/class_servDHCP.inc:299
 msgid ""
 "This server has DHCP features enabled. You can disable them by clicking "
 "below."
 msgstr "该服务器已经启用 DHCP 功能。您可以点击下面按钮禁用。"
 
-#: plugins/admin/systems/class_servDHCP.inc:34
+#: plugins/admin/systems/class_servDHCP.inc:317
 msgid "Add DHCP service"
 msgstr "添加 DHCP 服务"
 
-#: plugins/admin/systems/class_servDHCP.inc:35
+#: plugins/admin/systems/class_servDHCP.inc:318
 msgid ""
 "This server has DHCP features disabled. You can enable them by clicking "
 "below."
 msgstr "该服务器已经禁用 DHCP 功能。您可以点击下面按钮启用。"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:77
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+#: plugins/admin/systems/class_servDHCP.inc:338
+#: plugins/admin/systems/class_servDHCP.inc:341
+msgid "Insert new DHCP section"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:339
+#: plugins/admin/systems/class_servDHCP.inc:342
+#: plugins/admin/systems/class_servDHCP.inc:343
+#, fuzzy
+msgid "Edit DHCP section"
+msgstr "LDAP 检查"
+
+#: plugins/admin/systems/class_servDHCP.inc:340
+#: plugins/admin/systems/class_servDHCP.inc:344
+#, fuzzy
+msgid "Remove DHCP section"
+msgstr "删除 DHCP 服务"
+
+#: plugins/admin/systems/class_servDHCP.inc:392
+#: plugins/admin/systems/class_servDHCP.inc:407
+#, fuzzy
+msgid "Removing DHCP entries failed"
+msgstr "删除 DNS 记录失败"
+
+#: plugins/admin/systems/class_servDHCP.inc:460
+#, fuzzy
+msgid "Can't remove DHCP object!"
+msgstr "删除对象"
+
+#: plugins/admin/systems/class_servDHCP.inc:534
+#: plugins/admin/systems/class_servDHCP.inc:540
+#, fuzzy
+msgid "Can't save DHCP object!"
+msgstr "无法保存空测试。"
+
+#: plugins/admin/systems/class_servDHCP.inc:565
+#, fuzzy
+msgid "Saving DHCP service failed"
+msgstr "保存服务器失败"
+
+#: plugins/admin/systems/class_servDHCP.inc:681
+#, fuzzy
+msgid ""
+"DHCP configuration set is unknown. Please contact your system administrator."
+msgstr "账户锁定。请联系管理员。"
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
+msgstr "参考"
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:12
+#, fuzzy
+msgid "Name for shared network"
+msgstr "dfs 共享名称"
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:16
+#: plugins/admin/systems/servdb.tpl:74
+msgid "Server identifier"
+msgstr "服务器标识"
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:19
+msgid "Propagated server identifier for this shared network"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:31
+msgid "Select if this server is authoritative for this shared network"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:31
+msgid "Authoritative server"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:46
+#, fuzzy
+msgid "Leases"
+msgstr "发行"
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:49
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:147
+#, fuzzy
+msgid "Default lease time"
+msgstr "选择发行名称"
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+#, fuzzy
+msgid "seconds"
+msgstr "(秒)"
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:56
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:148
+msgid "Max. lease time"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
+#, fuzzy
+msgid "Maximum lease time"
+msgstr "最大文件大小"
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:63
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:149
+msgid "Min. lease time"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+#, fuzzy
+msgid "Minimum lease time"
+msgstr "最大文件大小"
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:74
+#, fuzzy
+msgid "Access control"
+msgstr "访问选项"
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:79
+msgid "Select if unknown clients should get dynamic IP addresses"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:79
+#, fuzzy
+msgid "Allow unknown clients"
+msgstr "! 未知 id"
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:85
+msgid "Select if bootp clients should get dynamic IP addresses"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:85
+msgid "Allow bootp clients"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:91
+#, fuzzy
+msgid "Select if clients are allowed to boot using this DHCP server"
+msgstr "允许使用该打印机的用户"
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:91
+msgid "Allow booting"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:105
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:11
 msgid "New entry"
 msgstr "新条目"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:172
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:219
 #, php-format
 msgid ""
 "Can't rename '%s' to '%s' there is already an entry with the same name in "
 "our zone editing dialog."
 msgstr "无法将 '%s' 重命名为 %s'，因为在域编辑对话框中已经有相同名称存在。"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:205
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:252
 #, php-format
 msgid "Entry name '%s' contains invalid characters."
 msgstr "条目名称 '%s' 包含无效字符。"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:214
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:261
 #, php-format
 msgid "Can not rename '%s' to '%s',the destination name already exists."
 msgstr "无法将 '%s' 重命名为 '%s'，目标名称已经存在。"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:220
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:267
 #, php-format
 msgid "Can not create '%s',the destination name already exists."
 msgstr "无法创建 '%s'，目标名称已经存在。"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:229
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:276
 #, php-format
 msgid "The name '%s' is used more than once."
 msgstr "名称 '%s' 被使用超过了一次。"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:237
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:284
 #, php-format
 msgid "The host name '%s' should be written in lowercase."
 msgstr "主机名 '%s' 应该用小写字母。"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:254
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:301
 #, php-format
 msgid "The record type '%s' is a unique type and can't be defined twice."
 msgstr "记录类型 '%s' 是一个唯一类型，不能定义两次。"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:261
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:308
 #, php-format
 msgid "There is an empty '%s' for host '%s'."
 msgstr "有一个空的 '%s'，为主机 '%s'。"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:269
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:316
 #, php-format
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr "在 '%s' 当中有重复条目 '%s'。"
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "系统设置"
-
-#: plugins/admin/systems/class_systemManagement.inc:220
+#: plugins/admin/systems/class_systemManagement.inc:223
 msgid "You can't edit this object type yet!"
 msgstr "您尚无法编辑这个对象类型！"
 
-#: plugins/admin/systems/class_systemManagement.inc:292
+#: plugins/admin/systems/class_systemManagement.inc:295
 msgid "Creating the image failed. Please see the report below."
 msgstr "创建图片错误。请检查下面的报告。"
 
-#: plugins/admin/systems/class_systemManagement.inc:299
+#: plugins/admin/systems/class_systemManagement.inc:302
 #, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr "命令 '%s'，用于创建 ISO 好像并不存在。"
 
-#: plugins/admin/systems/class_systemManagement.inc:330
+#: plugins/admin/systems/class_systemManagement.inc:333
 msgid "Passwords entered as new and repeated do not match!"
 msgstr "输入的新口令和重复口令不匹配！"
 
-#: plugins/admin/systems/class_systemManagement.inc:347
+#: plugins/admin/systems/class_systemManagement.inc:350
 msgid "You are not allowed to set this systems password!"
 msgstr "您无权修改系统口令！"
 
-#: plugins/admin/systems/class_systemManagement.inc:401
+#: plugins/admin/systems/class_systemManagement.inc:404
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr "您将要删除关于组件 '%s' 的所有信息。"
 
-#: plugins/admin/systems/class_systemManagement.inc:500
-#, php-format
+#: plugins/admin/systems/class_systemManagement.inc:503
+#, fuzzy, php-format
 msgid ""
-"Can't set gotoMode to status 'avtice', the current object couldn't be "
+"Can't set gotoMode to status 'active', the current object couldn't be "
 "identified."
 msgstr "无法设置状态 gotoMode 为 '活动', 当前对象无法识别。"
 
-#: plugins/admin/systems/class_systemManagement.inc:737
+#: plugins/admin/systems/class_systemManagement.inc:740
 msgid "New terminal"
 msgstr "新终端"
 
-#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_systemManagement.inc:742
 msgid "New workstation"
 msgstr "新工作站"
 
-#: plugins/admin/systems/class_systemManagement.inc:741
+#: plugins/admin/systems/class_systemManagement.inc:744
+#, fuzzy
+msgid "Unknown device"
+msgstr "未知"
+
+#: plugins/admin/systems/class_systemManagement.inc:746
 msgid "New Device"
 msgstr "新设备"
 
-#: plugins/admin/systems/class_systemManagement.inc:762
+#: plugins/admin/systems/class_systemManagement.inc:767
 msgid "Terminal template for"
 msgstr "终端模板"
 
-#: plugins/admin/systems/class_systemManagement.inc:774
+#: plugins/admin/systems/class_systemManagement.inc:779
 msgid "Workstation template for"
 msgstr "工作站模板"
 
-#: plugins/admin/systems/class_systemManagement.inc:862
+#: plugins/admin/systems/class_systemManagement.inc:872
 msgid "New System from incoming"
 msgstr "新识别的系统"
 
-#: plugins/admin/systems/class_systemManagement.inc:864
+#: plugins/admin/systems/class_systemManagement.inc:874
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 msgid "Terminal"
 msgstr "终端"
 
-#: plugins/admin/systems/class_systemManagement.inc:865
-#: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "工作站"
-
-#: plugins/admin/systems/class_systemManagement.inc:866
+#: plugins/admin/systems/class_systemManagement.inc:876
 msgid "Workstation is installing"
 msgstr "工作站正在安装"
 
-#: plugins/admin/systems/class_systemManagement.inc:867
+#: plugins/admin/systems/class_systemManagement.inc:877
 msgid "Workstation is waiting for action"
 msgstr "等待的工作站"
 
-#: plugins/admin/systems/class_systemManagement.inc:868
+#: plugins/admin/systems/class_systemManagement.inc:878
 msgid "Workstation installation failed"
 msgstr "工作站安装失败"
 
-#: plugins/admin/systems/class_systemManagement.inc:871
+#: plugins/admin/systems/class_systemManagement.inc:881
 msgid "Server is installing"
 msgstr "服务器正在安装"
 
-#: plugins/admin/systems/class_systemManagement.inc:872
+#: plugins/admin/systems/class_systemManagement.inc:882
 msgid "Server is waiting for action"
 msgstr "等待的服务器"
 
-#: plugins/admin/systems/class_systemManagement.inc:873
+#: plugins/admin/systems/class_systemManagement.inc:883
 msgid "Server installation failed"
 msgstr "服务器安装失败"
 
-#: plugins/admin/systems/class_systemManagement.inc:874
+#: plugins/admin/systems/class_systemManagement.inc:884
 msgid "Winstation"
 msgstr "Windows 工作站"
 
-#: plugins/admin/systems/class_systemManagement.inc:875
+#: plugins/admin/systems/class_systemManagement.inc:885
 msgid "Network Device"
 msgstr "网络设备"
 
@@ -10337,13 +11385,7 @@ msgid ""
 "single list."
 msgstr "此对话框允许您修改这个 DNS 区域中所有内容。"
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
-msgid ""
-"Be careful editing record types with this dialog. All changes will be saved "
-"immediately when using the save button."
-msgstr "小心使用这个对话框修改记录类型。当按下保存键时，所有修改马上被保存。"
-
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:8
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:5
 msgid ""
 "This dialog can't be used until the currently edited zone was saved or the "
 "zone entry exists in the ldap database."
@@ -10351,7 +11393,7 @@ msgstr ""
 "这个对话框不能使用，除非当前编辑的域被保存或者域中条目已经存在于 ldap 数据库"
 "中。"
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:11
 msgid "Create a new DNS zone entry"
 msgstr "创建一个新 DNS zone 条目"
 
@@ -10370,127 +11412,230 @@ msgstr "网站"
 msgid "Phone number"
 msgstr "电话号码"
 
-#: plugins/admin/systems/class_servDNS.inc:70
+#: plugins/admin/systems/class_servDNS.inc:122
+#, fuzzy, php-format
+msgid "You are going to migrate the DNS setup from server '%s'."
+msgstr "您将要拷贝条目 '%s'。"
+
+#: plugins/admin/systems/class_servDNS.inc:149
 #: plugins/admin/systems/class_inventory.inc:32
 msgid "Remove DNS service"
 msgstr "删除 DNS 服务"
 
-#: plugins/admin/systems/class_servDNS.inc:71
+#: plugins/admin/systems/class_servDNS.inc:150
 #: plugins/admin/systems/class_inventory.inc:33
 msgid ""
 "This server has DNS features enabled. You can disable them by clicking below."
 msgstr "该账号已经启用 DNS 功能。您可以点击下面按钮禁用。"
 
-#: plugins/admin/systems/class_servDNS.inc:73
+#: plugins/admin/systems/class_servDNS.inc:152
 #: plugins/admin/systems/class_inventory.inc:35
 msgid "Add DNS service"
 msgstr "添加 DNS 服务"
 
-#: plugins/admin/systems/class_servDNS.inc:74
+#: plugins/admin/systems/class_servDNS.inc:153
 #: plugins/admin/systems/class_inventory.inc:36
 msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr "该账号已经禁用 DNS 功能。您可以点击下面按钮启用。"
 
-#: plugins/admin/systems/class_servDNS.inc:162
+#: plugins/admin/systems/class_servDNS.inc:249
 msgid "Reverse zone"
 msgstr "反向解析域"
 
-#: plugins/admin/systems/class_servDNS.inc:229
+#: plugins/admin/systems/class_servDNS.inc:316
 #, php-format
 msgid ""
 "Can't delete the selected zone, because it is still in use by these entry/"
 "entries '%s'"
 msgstr "不能删除所选的域，因为它仍然被这些条目使用 '%s'"
 
-#: plugins/admin/systems/class_servDNS.inc:297
+#: plugins/admin/systems/class_servDNS.inc:430
 msgid "Updating DNS service failed"
 msgstr "更新 DNS 服务失败"
 
-#: plugins/admin/systems/class_servDNS.inc:306
+#: plugins/admin/systems/class_servDNS.inc:441
 msgid "Removing DNS entries failed"
 msgstr "删除 DNS 记录失败"
 
-#: plugins/admin/systems/class_servDNS.inc:327
+#: plugins/admin/systems/class_servDNS.inc:464
+#: plugins/admin/systems/class_servDNS.inc:473
 msgid "Saving DNS entries failed"
 msgstr "保存 DNS 记录失败"
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
-msgstr ""
-"用下面的字段来修改终端 root 口令。这项修改将在下次重启之后起作用。请记住新口"
-"令，否则您无法登录。"
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
+msgstr "普通"
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr "如果要口令从缺省条目继承，此项空白"
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "打印机名称"
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
-msgstr "修改口令仅影响到鉴权。"
+#: plugins/admin/systems/printer.tpl:36
+msgid "Details"
+msgstr "详细"
 
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes 'all' system and setup informations. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-"这包含所有系统和设置信息。请再次检查您是否要这么做，因为 GOsa 没有办法将您的"
-"数据找回。"
+#: plugins/admin/systems/printer.tpl:39
+msgid "Printer location"
+msgstr "打印机位置"
+
+#: plugins/admin/systems/printer.tpl:43
+msgid "Printer URL"
+msgstr "打印机 URL"
+
+#: plugins/admin/systems/printer.tpl:63
+msgid "Permissions"
+msgstr "允许"
+
+#: plugins/admin/systems/printer.tpl:70
+msgid "Users which are allowed to use this printer"
+msgstr "允许使用该打印机的用户"
+
+#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:93
+msgid "Add user"
+msgstr "添加用户"
+
+#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:94
+msgid "Add group"
+msgstr "添加组"
+
+#: plugins/admin/systems/printer.tpl:88
+msgid "Users which are allowed to administrate this printer"
+msgstr "允许管理该打印机的用户"
+
+#: plugins/admin/systems/printer.tpl:90
+msgid "Admins"
+msgstr "管理员"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:366
+#: plugins/admin/systems/class_servDNSeditZone.inc:411
 #, php-format
 msgid "Please choose a valid zone name."
 msgstr "请选择一个有效的时区。"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:370
+#: plugins/admin/systems/class_servDNSeditZone.inc:415
 #, php-format
 msgid "Please choose a valid reverse zone name."
 msgstr "请选择一个有效的反向解析域名称。"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:374
-msgid "Primary dns server must end with '.' to be a valid entry."
-msgstr "要成为一个有效记录，主 dns 服务器必须以 '.' 结束。"
-
-#: plugins/admin/systems/class_servDNSeditZone.inc:378
-msgid "Your specified mail address must end with '.' to be a valid record."
-msgstr "您定义的一个有效的邮件地址记录必须以 '.' 结束。"
-
-#: plugins/admin/systems/class_servDNSeditZone.inc:382
-#: plugins/admin/systems/class_servDNSeditZone.inc:386
-msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
-msgstr ""
-"您提供的邮件地址中的 '@' 被替换为 '.' 以便 GOsa 创建一个有效的 SOA 记录。"
-
-#: plugins/admin/systems/class_servDNSeditZone.inc:390
+#: plugins/admin/systems/class_servDNSeditZone.inc:419
 msgid "Only lowercase strings are allowed as zone name."
 msgstr "只有小写字符串被允许作为域名。"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:394
+#: plugins/admin/systems/class_servDNSeditZone.inc:423
 msgid "Please specify a numeric value for serial number."
 msgstr "请给出一个数字型数值作为系列号。"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:398
+#: plugins/admin/systems/class_servDNSeditZone.inc:427
 msgid "Please specify a numeric value for refresh."
 msgstr "请为刷新提供一个数值。"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:402
+#: plugins/admin/systems/class_servDNSeditZone.inc:431
 msgid "Please specify a numeric value for ttl."
 msgstr "请为 ttl 提供一个数值。"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:406
+#: plugins/admin/systems/class_servDNSeditZone.inc:435
 msgid "Please specify a numeric value for expire."
 msgstr "请为过期时间提供一个数值。"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:410
+#: plugins/admin/systems/class_servDNSeditZone.inc:439
 msgid "Please specify a numeric value for retry."
 msgstr "请为重试提供一个数值。"
 
+#: plugins/admin/systems/class_servDNSeditZone.inc:454
+msgid ""
+"The given network address is not a valid, please specify a valid IP address."
+msgstr "给定的网络地址无效，请输入一个有效的上IP 地址。"
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:461
+#, php-format
+msgid ""
+"The specified network address is not matching with the specified zone class, "
+"try it this way x.0.0.0"
+msgstr "提供的网络地址和 zone 分类不匹配，尝试用这种格式 x.0.0.0"
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:467
+#, php-format
+msgid ""
+"The specified network address is not matching with the specified zone class, "
+"try it this way x.x.0.0"
+msgstr "提供的网络地址和 zone 分类不匹配，尝试用这种格式 x.x.0.0"
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:473
+#, php-format
+msgid ""
+"The specified network address is not matching with the specified zone class, "
+"try it this way x.x.x.0"
+msgstr "提供的网络地址和 zone 分类不匹配，尝试用这种格式 x.x.x.0"
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:477
+#, php-format
+msgid "The given network class '%s' is not valid."
+msgstr "提供的网络地址 '%s' 无效。"
+
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr "Kerberos kadmin 访问"
+
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr "Kerberos Realm"
+
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+msgid "Admin user"
+msgstr "管理员"
+
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
+msgstr "传真数据库"
+
+#: plugins/admin/systems/servdb.tpl:30
+msgid "FAX DB user"
+msgstr "传真数据库用户名"
+
+#: plugins/admin/systems/servdb.tpl:42
+msgid "Asterisk management"
+msgstr "Asterisk 管理"
+
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
+msgstr "Asterisk DB 用户"
+
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
+msgstr "国内拨号前缀"
+
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
+msgstr "内部拨号前缀"
+
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
+msgstr "IMAP 管理员访问"
+
+#: plugins/admin/systems/servdb.tpl:78
+msgid "Connect URL"
+msgstr "连接 URL"
+
+#: plugins/admin/systems/servdb.tpl:91
+msgid "Sieve port"
+msgstr "Sieve 端口"
+
+#: plugins/admin/systems/servdb.tpl:100
+msgid "Logging database"
+msgstr "日志数据库"
+
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+msgid "Logging DB user"
+msgstr "Logging DB 用户"
+
+#: plugins/admin/systems/servdb.tpl:119
+msgid "Glpi database"
+msgstr "Glpi 数据库"
+
+#: plugins/admin/systems/servdb.tpl:133
+msgid "Database"
+msgstr "数据库"
+
 #: plugins/admin/systems/class_printGeneric.inc:105
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
@@ -10506,8 +11651,9 @@ msgid "Add printer extension"
 msgstr "添加打印机扩展"
 
 #: plugins/admin/systems/class_printGeneric.inc:252
+#, fuzzy
 msgid ""
-"Could not intialize printer tab, parameter parent was missing while "
+"Could not initialize printer tab, parameter parent was missing while "
 "construction."
 msgstr "在构建时缺少 parent 参数，无法初始化打印机页面。"
 
@@ -10566,9 +11712,10 @@ msgstr "终端已经关闭打印机扩展。您可以点击下面按钮启用。
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "您当前选择的 PPD 文件 '%s' 不存在。"
 
-#: plugins/admin/systems/class_printGeneric.inc:505
-msgid "can't get ppd informations."
-msgstr "无法获取 ppd 信息。"
+#: plugins/admin/systems/class_printGeneric.inc:502
+#, fuzzy
+msgid "Not defined"
+msgstr "未定义"
 
 #: plugins/admin/systems/class_printGeneric.inc:518
 #, php-format
@@ -10580,88 +11727,186 @@ msgstr "该打印机属于终端 %s。您不能重命名该打印机。"
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr "该打印机属于工作站%s。您不能重命名该打印机。"
 
-#: plugins/admin/systems/class_printGeneric.inc:578
+#: plugins/admin/systems/class_printGeneric.inc:587
 msgid "Removing printer failed"
 msgstr "删除打印机失败"
 
-#: plugins/admin/systems/class_printGeneric.inc:642
+#: plugins/admin/systems/class_printGeneric.inc:643
+#, fuzzy
+msgid "The required field 'Printer name' is not set."
+msgstr "需要的字段“电话名称”没有设置。"
+
+#: plugins/admin/systems/class_printGeneric.inc:648
+#, fuzzy
+msgid "Invalid character in printer name."
+msgstr "分类名包含无效字符。"
+
+#: plugins/admin/systems/class_printGeneric.inc:656
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr "您无权在此 'Base' 下创建一个打印机。"
 
-#: plugins/admin/systems/class_printGeneric.inc:821
+#: plugins/admin/systems/class_printGeneric.inc:846
 msgid "Saving printer failed"
 msgstr "保存打印机失败"
 
-#: plugins/admin/systems/class_printGeneric.inc:866
+#: plugins/admin/systems/class_printGeneric.inc:891
 #, php-format
 msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
 msgstr "错误的打印机类型，当添加 '%s' 到 '%s' 打印机列表时，"
 
-#: plugins/admin/systems/class_printGeneric.inc:888
+#: plugins/admin/systems/class_printGeneric.inc:913
 #, php-format
 msgid "Can't add '%s' to the list of members, it is already used."
 msgstr "无法添加 '%s' 到成员列表，已经被使用。"
 
-#: plugins/admin/systems/class_printGeneric.inc:896
+#: plugins/admin/systems/class_printGeneric.inc:921
 #, php-format
 msgid "Can't add '%s' to list of members, it is not reachable."
 msgstr "无法添加 '%s' 到成员列表，无法访问。"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:23
-msgid "Choose a base"
-msgstr "选择一个 base"
+#: plugins/admin/systems/servkolab.tpl:9
+msgid "Postfix mydomain"
+msgstr "Postfix 'mydomain'"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:34
-msgid ""
-"Step in the prefered tree and click save to use the current subtree as base. "
-"Or click the image at the end of each entry."
-msgstr ""
-"进入选择的树并点击保存来以当前的子树作为基准。或者点击每个条目后面的图像。"
+#: plugins/admin/systems/servkolab.tpl:16
+msgid "Postfix mydestination"
+msgstr "Postfix mydestination"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:51
-msgid "Filter entries with this syntax"
-msgstr "用这个语法过滤条目"
+#: plugins/admin/systems/servkolab.tpl:23
+msgid "Cyrus admins"
+msgstr "Cyrus 管理员"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:117
-#, php-format
-msgid "Select this base"
-msgstr "选择这个 base"
+#: plugins/admin/systems/servkolab.tpl:40
+msgid "POP3 service"
+msgstr "POP3 服务"
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Advanced phone settings"
-msgstr "高级电话设置"
+#: plugins/admin/systems/servkolab.tpl:48
+msgid "POP3/SSL service"
+msgstr "POP3/SSL 服务器"
 
-#: plugins/admin/systems/phonesettings.tpl:6
-msgid "Phone type"
-msgstr "电话类型"
+#: plugins/admin/systems/servkolab.tpl:56
+msgid "IMAP service"
+msgstr "IMAP 服务"
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
-msgid "Choose a phone type"
-msgstr "选择一个电话类型"
+#: plugins/admin/systems/servkolab.tpl:64
+msgid "IMAP/SSL service"
+msgstr "IMAP/SSL 服务"
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
-msgstr "刷新"
+#: plugins/admin/systems/servkolab.tpl:72
+msgid "Sieve service"
+msgstr "Sieve 服务"
 
-#: plugins/admin/systems/phonesettings.tpl:32
-msgid "DTMF mode"
-msgstr "DTMF 模式"
+#: plugins/admin/systems/servkolab.tpl:80
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr "FTP FreeBusy 服务 （过时的，不能和 Kolab2 FreeBusy 互操作）"
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
-msgid "Default IP"
-msgstr "缺省 IP"
+#: plugins/admin/systems/servkolab.tpl:88
+msgid "HTTP FreeBusy service (legacy)"
+msgstr "HTTP FreeBusy 服务（旧）"
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
-msgstr "响应超时"
+#: plugins/admin/systems/servkolab.tpl:96
+msgid "Amavis email scanning (virus/spam)"
+msgstr "Amavis 邮件扫描 (病毒/垃圾邮件)"
+
+#: plugins/admin/systems/servkolab.tpl:107
+msgid "Quota settings"
+msgstr "Quota 设置"
+
+#: plugins/admin/systems/servkolab.tpl:123
+msgid "Free/Busy settings"
+msgstr "Free/Busy 设置"
+
+#: plugins/admin/systems/servkolab.tpl:128
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr "允许不登录下载 Free/Busy 信息"
+
+#: plugins/admin/systems/servkolab.tpl:143
+msgid "SMTP privileged networks"
+msgstr "SMTP 授权网络"
+
+#: plugins/admin/systems/servkolab.tpl:148
+msgid "Hosts/networks allowed to relay"
+msgstr "允许中继的主机/网络"
+
+#: plugins/admin/systems/servkolab.tpl:151
+msgid "Enter multiple values, seperated with"
+msgstr "输入多个值，分隔符为"
+
+#: plugins/admin/systems/servkolab.tpl:164
+msgid "SMTP smarthost/relayhost"
+msgstr "SMTP smarthost/relayhost"
+
+#: plugins/admin/systems/servkolab.tpl:170
+msgid "Enable MX lookup for relayhost"
+msgstr "启用中继主机的 MX 查找"
+
+#: plugins/admin/systems/servkolab.tpl:175
+msgid "Host used to relay mails"
+msgstr "中继邮件使用的主机"
+
+#: plugins/admin/systems/servkolab.tpl:189
+msgid "Accept Internet Mail"
+msgstr "允许 Internet  邮件"
+
+#: plugins/admin/systems/servkolab.tpl:195
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr "允许从其他未认证 SMTP 发送邮件"
+
+#: plugins/admin/systems/class_baseSelectDialog.inc:23
+msgid "Choose a base"
+msgstr "选择一个 base"
+
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
+msgstr ""
+"进入选择的树并点击保存来以当前的子树作为基准。或者点击每个条目后面的图像。"
+
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
+msgid "Filter entries with this syntax"
+msgstr "用这个语法过滤条目"
+
+#: plugins/admin/systems/class_baseSelectDialog.inc:117
+#, php-format
+msgid "Select this base"
+msgstr "选择这个 base"
+
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Advanced phone settings"
+msgstr "高级电话设置"
+
+#: plugins/admin/systems/phonesettings.tpl:6
+msgid "Phone type"
+msgstr "电话类型"
+
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
+msgid "Choose a phone type"
+msgstr "选择一个电话类型"
+
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
+msgstr "刷新"
+
+#: plugins/admin/systems/phonesettings.tpl:32
+msgid "DTMF mode"
+msgstr "DTMF 模式"
+
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
+msgid "Default IP"
+msgstr "缺省 IP"
+
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
+msgstr "响应超时"
 
 #: plugins/admin/systems/phonesettings.tpl:75
 msgid "Modus"
@@ -10677,11 +11922,11 @@ msgstr "秘密"
 
 #: plugins/admin/systems/phonesettings.tpl:124
 msgid "GoFonInkeys"
-msgstr ""
+msgstr "GoFonInkeys"
 
 #: plugins/admin/systems/phonesettings.tpl:132
 msgid "GoFonOutKeys"
-msgstr ""
+msgstr "GoFonOutKeys"
 
 #: plugins/admin/systems/phonesettings.tpl:145
 msgid "Account code"
@@ -10689,7 +11934,7 @@ msgstr "账号号码"
 
 #: plugins/admin/systems/phonesettings.tpl:153
 msgid "Trunk lines"
-msgstr ""
+msgstr "主线"
 
 #: plugins/admin/systems/phonesettings.tpl:168
 msgid "Hosts that are allowed to connect"
@@ -10734,7 +11979,7 @@ msgstr "缺少目录 '%s/glpi/' 来保存 glpi 上传。"
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:133
 msgid "There is already a file with the same name uploaded."
-msgstr "已经由同名文件上传。"
+msgstr "已经有同名文件上传。"
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:137
 #, php-format
@@ -10753,31 +11998,102 @@ msgstr "文件无法读取，可能是文件缺失。"
 msgid "Currently no file uploaded."
 msgstr "目前没有文件上传。"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:197
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:198
 msgid "Mime"
 msgstr "Mime"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:200
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 msgid "This table displays all available attachments."
 msgstr "这个表显示所有可用的附件。"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:217
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:218
 #: include/sieve/class_sieveElement_If.inc:447
 msgid "empty"
 msgstr "空"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:254
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:255
 msgid "Create new attachment"
 msgstr "创建新附件"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:255
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:256
 msgid "New Attachment"
 msgstr "新附件"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:350
 msgid "Please specify a valid name for this attachment."
 msgstr "请为这个附件指定一个有效名称。"
 
+#: plugins/admin/systems/remove.tpl:6
+msgid ""
+"This includes 'all' system and setup informations. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+"这包含所有系统和设置信息。请再次检查您是否要这么做，因为 GOsa 没有办法将您的"
+"数据找回。"
+
+#: plugins/admin/systems/dhcp_service.tpl:6
+#, fuzzy
+msgid "Authoritative service"
+msgstr "打印服务"
+
+#: plugins/admin/systems/dhcp_service.tpl:8
+msgid "Dynamic DNS update"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_service.tpl:9
+msgid "Dynamic DNS update style"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_service.tpl:18
+msgid "Default lease time (s)"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_service.tpl:20
+msgid "Enter default lease time in seconds."
+msgstr ""
+
+#: plugins/admin/systems/dhcp_service.tpl:24
+#, fuzzy
+msgid "Maximum lease time (s)"
+msgstr "最大文件大小"
+
+#: plugins/admin/systems/dhcp_service.tpl:26
+msgid "Enter maximum lease time in seconds."
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr "附件列表"
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
+msgstr "此对话框允许您附加额外的对象（如手册，说明书等）到您正编辑的计算机。"
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
+msgstr "显示匹配的附件"
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
+msgstr "匹配附件名称的正则表达式"
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:131
+msgid "Please enter a value for 'release'."
+msgstr "请为“发行版”输入一个值。"
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:135
+msgid "Please specify a valid value for 'url'."
+msgstr "请为“URL”提供一个有效的值。"
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:182
+#, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
+msgstr "无法执行指定的 REPOSITOR_HOOK '%s'，请检查您的 gosa.conf。"
+
 #: plugins/admin/systems/chooser.tpl:1
 msgid "Choose the kind of system component you want to create"
 msgstr "选择要创建系统组件类型"
@@ -10819,58 +12135,42 @@ msgstr "网络打印机"
 msgid "Other network component"
 msgstr "其他网络组件"
 
-#: plugins/admin/systems/chooser.tpl:16 setup/class_setupStep_Migrate.inc:859
-msgid "Create"
-msgstr "创建"
-
-#: plugins/admin/systems/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
-msgstr "附件列表"
-
-#: plugins/admin/systems/glpiAttachmentPool.tpl:23
+#: plugins/admin/systems/password.tpl:2
 msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
-msgstr "此对话框允许您附加额外的对象（如手册，说明书等）到您正编辑的计算机。"
-
-#: plugins/admin/systems/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
-msgstr "显示匹配的附件"
-
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
-msgstr "匹配附件名称的正则表达式"
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
+msgstr ""
+"用下面的字段来修改终端 root 口令。这项修改将在下次重启之后起作用。请记住新口"
+"令，否则您无法登录。"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:131
-msgid "Please enter a value for 'release'."
-msgstr "请为“发行版”输入一个值。"
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
+msgstr "如果要口令从缺省条目继承，此项空白"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:135
-msgid "Please specify a valid value for 'url'."
-msgstr "请为“URL”提供一个有效的值。"
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
+msgstr "修改口令仅影响到鉴权。"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:182
-#, php-format
-msgid ""
-"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
-msgstr "无法执行指定的 REPOSITOR_HOOK '%s'，请检查您的 gosa.conf。"
+#: plugins/admin/systems/dhcp_advanced.tpl:8
+#, fuzzy
+msgid "Hide advanced settings"
+msgstr "高级电话设置"
 
-#: plugins/admin/systems/gencd.tpl:2
-msgid "CD-Install-Image generation"
-msgstr "创建 CD 安装镜像"
+#: plugins/admin/systems/dhcp_advanced.tpl:15
+#, fuzzy
+msgid "DHCP statements"
+msgstr "部门"
 
-#: plugins/admin/systems/gencd.tpl:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-"这个选项使您能够为选择的工作站创建 FAI 安装光盘镜像。这个过程可能需要 10 分"
-"钟，所以请在按下“创建 ISO 镜像”后耐心等待。"
+#: plugins/admin/systems/dhcp_advanced.tpl:28
+#, fuzzy
+msgid "DHCP options"
+msgstr "文件系统选项"
 
-#: plugins/admin/systems/gencd.tpl:9
-msgid "Create ISO-Image"
-msgstr "创建 ISO 镜像"
+#: plugins/admin/systems/dhcp_advanced.tpl:43
+#, fuzzy
+msgid "Show advanced settings"
+msgstr "电话设置"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:103
 msgid "This 'dn' has no phone features."
@@ -10891,33 +12191,34 @@ msgid "dynamic"
 msgstr "动态"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "Networksettings"
+#, fuzzy
+msgid "Network settings"
 msgstr "网络设置"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:240
-#, php-format
+#: plugins/admin/systems/class_phoneGeneric.inc:248
+#, fuzzy, php-format
 msgid ""
-"Can't delete because there are user which are depending on this phone. One "
+"Can't delete because there are users which are depending on this phone. One "
 "of them is user '%s'."
 msgstr "无法删除，因为仍然有用户在依赖这个电话。其中一个用户是 '%s'。"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:247
+#: plugins/admin/systems/class_phoneGeneric.inc:255
 msgid "Removing phone failed"
 msgstr "删除电话失败"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:292
+#: plugins/admin/systems/class_phoneGeneric.inc:300
 msgid "The required field 'Phone name' is not set."
 msgstr "需要的字段“电话名称”没有设置。"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:295
+#: plugins/admin/systems/class_phoneGeneric.inc:303
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr "'0' 作为保留 '电话名' 不能使用。"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:302
+#: plugins/admin/systems/class_phoneGeneric.inc:315
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "您无权在此 'Base' 下创建一个电话"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:398
+#: plugins/admin/systems/class_phoneGeneric.inc:416
 msgid "Saving phone failed"
 msgstr "保存电话失败"
 
@@ -10985,12 +12286,12 @@ msgstr "给出的值不是一个有效的 '可信网络'。"
 #: plugins/admin/systems/class_goSpamServer.inc:269
 #, php-format
 msgid "Removing of server services/spamassassin with dn '%s' failed."
-msgstr "删除 dn 为 '%s' 服务器服务/spamassassin 失败。"
+msgstr "删除 dn 为 '%s' 的 服务器服务/spamassassin 失败。"
 
 #: plugins/admin/systems/class_goSpamServer.inc:317
 #, php-format
 msgid "Saving of server services/spamassassin with dn '%s' failed."
-msgstr "ä¿\9då­\98 dn 为 '%s' 服务器服务/spamassassin 失败。"
+msgstr "以 dn '%s' ä¿\9då­\98 服务器服务/spamassassin 失败。"
 
 #: plugins/admin/systems/class_goSpamServer.inc:326
 msgid "Required score must be a numeric value."
@@ -11026,169 +12327,246 @@ msgstr "选择的供应商 '%s' 不再我们的 ppds 列表中。"
 msgid "Printer ppd selection."
 msgstr "打印机 ppd 选择。"
 
-#: plugins/admin/ogroups/termgroup.tpl:2
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:152
+#, fuzzy, php-format
+msgid "The value specified as '%s' is not numeric!"
+msgstr "给出的数据 '%s' 包含无效字符！"
+
+#: plugins/admin/systems/gencd.tpl:2
+msgid "CD-Install-Image generation"
+msgstr "创建 CD 安装镜像"
+
+#: plugins/admin/systems/gencd.tpl:5
 msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
+"This option enables you to generate FAI install CD images for the selected "
+"workstation. The procedure may take about 10 minutes to complete, so please "
+"be patient after pressing the 'Create ISO-Image' button."
 msgstr ""
-"您这里选择的动作会影响这个对象组内所有系统。而且，所有这里可以修改的值都可以"
-"被分配到该对象组的对象继承。"
+"这个选项使您能够为选择的工作站创建 FAI 安装光盘镜像。这个过程可能需要 10 分"
+"钟，所以请在按下“创建 ISO 镜像”后耐心等待。"
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
-msgstr "邮件传递列表"
+#: plugins/admin/systems/gencd.tpl:9
+msgid "Create ISO-Image"
+msgstr "创建 ISO 镜像"
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
-msgstr "此分配列表的主要邮件地址"
+#: plugins/admin/systems/ArpNewDevice.tpl:1
+msgid "Integrating unknown devices"
+msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:63
-#: plugins/admin/ogroups/tabs_ogroups.inc:168
-msgid "Phone queue"
-msgstr "电话队列"
+#: plugins/admin/systems/ArpNewDevice.tpl:3
+msgid ""
+"The current device has been detected by the ARP monitor used by GOsa. You "
+"can integrate this device into your running DHCP/DNS infrastructure by "
+"submitting this form. The device entry will disapear from the list of the "
+"systems and move to the DNS/DHCP configuration."
+msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:89
-msgid "System"
-msgstr "系统"
+#: plugins/admin/systems/ArpNewDevice.tpl:9
+#, fuzzy
+msgid "DNS name"
+msgstr "名称"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:147
-msgid "Terminals"
-msgstr "终端"
+#: plugins/admin/systems/class_ArpNewDevice.inc:47
+#, fuzzy
+msgid "Please specify a valid dns name."
+msgstr "请输入一个有效的用户名！"
 
-#: plugins/admin/ogroups/phonequeue.tpl:2
+#: plugins/admin/systems/class_ArpNewDevice.inc:69
 msgid ""
-"Only users with the same asterisk home server will be included to this queue."
-msgstr "只有有着相同 asterisk 主服务器的用户才会被包含在这个队列中。"
+"Could not remove arp-alert device after writing dns and dhcp configuration."
+msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:5
-msgid "Queue Settings"
-msgstr "队列设置"
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:463
+#, php-format
+msgid "Saving of mime type/generic with dn '%s' failed."
+msgstr "以 dn '%s' 保存 mime type/generic 失败。"
 
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-#: plugins/gofon/phoneaccount/paste_generic.tpl:2
-#: plugins/gofon/phoneaccount/paste_generic.tpl:6
-msgid "Phone numbers"
-msgstr "电话号码"
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:473
+#, php-format
+msgid "Removing of mime type/generic with dn '%s' failed."
+msgstr "删除 dn 为 '%s' 的 mime type/generic 失败。"
 
-#: plugins/admin/ogroups/phonequeue.tpl:12
-#: plugins/admin/ogroups/phonequeue.tpl:109
-msgid "Generic queue Settings"
-msgstr "通用队列设置"
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:485
+#, php-format
+msgid "Removing mime type from objectgroup '%s' failed"
+msgstr "从对象组 '%s' 删除 mime type 失败"
 
-#: plugins/admin/ogroups/phonequeue.tpl:38
-#: plugins/gofon/phoneaccount/generic.tpl:32
-#: plugins/gofon/conference/generic.tpl:46
-msgid "Home server"
-msgstr "主服务器"
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:495
+msgid "Please specify a valid name for this mime type."
+msgstr "请为这个 mime type 指定一个有效名称。"
 
-#: plugins/admin/ogroups/phonequeue.tpl:59
-msgid "Timeout"
-msgstr "è¿\87æ\9c\9f"
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:498
+msgid "Please specify at least one file pattern."
+msgstr "请ç»\99å\87ºè\87³å°\91ä¸\80个æ\96\87件模æ\9d¿ã\80\82"
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
-msgid "Strategy"
-msgstr "策略"
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:511
+msgid "There's already a mime type with this 'Name'."
+msgstr "已经存在一个同名的 mime type。"
 
-#: plugins/admin/ogroups/phonequeue.tpl:87
-msgid "Max queue length"
-msgstr "最大队列长度"
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:519
+msgid "There's already an mime with this 'Name'."
+msgstr "已经存在一个同名的 mime。"
 
-#: plugins/admin/ogroups/phonequeue.tpl:95
-msgid "Announce frequency"
-msgstr "公告频率"
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
+msgid "Mime types"
+msgstr "Mime types"
 
-#: plugins/admin/ogroups/phonequeue.tpl:99
-msgid "(in seconds)"
-msgstr "(秒)"
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
+msgid "Manage mime types"
+msgstr "管理 mime types"
 
-#: plugins/admin/ogroups/phonequeue.tpl:107
-msgid "Queue sound setup"
-msgstr "队列声音设置"
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:307
+#, php-format
+msgid "You're about to delete the following entry %s"
+msgstr "您将要删除条目 %s。"
 
-#: plugins/admin/ogroups/phonequeue.tpl:112
-msgid "Use music on hold instead of ringing"
-msgstr "播放音乐保持锁定而非播放"
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:309
+#, php-format
+msgid "You're about to delete the following entries %s"
+msgstr "您将要删除条目 %s。"
 
-#: plugins/admin/ogroups/phonequeue.tpl:121
-msgid "Music on hold"
-msgstr "暂停的音乐"
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
+#, php-format
+msgid "You're about to delete the mime type '%s'."
+msgstr "您将要删除 mime type '%s'。"
 
-#: plugins/admin/ogroups/phonequeue.tpl:129
-msgid "Welcome sound file"
-msgstr "欢迎声音文件"
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:350
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:380
+msgid "You are not allowed to delete this mime type!"
+msgstr "您无权删除该 mime type！"
 
-#: plugins/admin/ogroups/phonequeue.tpl:137
-msgid "Announce message"
-msgstr "公告信息"
+#: plugins/admin/mimetypes/paste_generic.tpl:13
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
+#: plugins/admin/mimetypes/generic.tpl:12
+msgid "Mime type"
+msgstr "Mime type"
 
-#: plugins/admin/ogroups/phonequeue.tpl:145
-msgid "Sound file for 'You are next ...'"
-msgstr "声音文件“您是下一个...”"
+#: plugins/admin/mimetypes/paste_generic.tpl:16
+#: plugins/admin/mimetypes/generic.tpl:15
+msgid "Please enter a name for the mime type here"
+msgstr "请为这个 mime type 输入一个名称。"
 
-#: plugins/admin/ogroups/phonequeue.tpl:153
-msgid "'There are ...'"
-msgstr "'这里有 ...'"
+#: plugins/admin/mimetypes/paste_generic.tpl:24
+msgid "Please specify a description for this mime type here"
+msgstr "请为这个 mime type 指定一个描述。"
 
-#: plugins/admin/ogroups/phonequeue.tpl:161
-msgid "'... calls waiting'"
-msgstr "'... 电话在等待'"
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:35
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:36
+msgid "List of defined mime types"
+msgstr "定义的 mime type 列表"
 
-#: plugins/admin/ogroups/phonequeue.tpl:169
-msgid "'Thank you' message"
-msgstr "'谢谢您' 消息"
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:37
+msgid ""
+"This menu allows you to add, edit and remove selected mime types. You may "
+"want to use the range selector on top of the mime type listbox, when working "
+"with a large number of mime types."
+msgstr ""
+"这个菜单允许您添加，编辑和删除所选的 mime type。对于一个长列表，您可以通过"
+"mime type 列表框上面的范围选择来调整。"
 
-#: plugins/admin/ogroups/phonequeue.tpl:177
-msgid "'minutes' sound file"
-msgstr "'分钟' 声音文件"
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:56
+msgid "Mime type name"
+msgstr "Mime type 名称"
 
-#: plugins/admin/ogroups/phonequeue.tpl:185
-msgid "'seconds' sound file"
-msgstr "'秒' 声音文件"
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:63
+msgid "Display mime types matching"
+msgstr "显示匹配的 mime type"
 
-#: plugins/admin/ogroups/phonequeue.tpl:193
-msgid "Hold sound file"
-msgstr "暂停声音文件"
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:106
+msgid "Create new mime type"
+msgstr "创建新的 mime type"
 
-#: plugins/admin/ogroups/phonequeue.tpl:201
-msgid "Less Than sound file"
-msgstr "声音文件“小于...”"
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#, fuzzy
+msgid "Number of listed mimetypes"
+msgstr "定义的 mime type 列表"
 
-#: plugins/admin/ogroups/phonequeue.tpl:217
-msgid "Phone attributes "
-msgstr "电话属性"
+#: plugins/admin/mimetypes/generic.tpl:20
+msgid "Mime group"
+msgstr "Mime group"
 
-#: plugins/admin/ogroups/phonequeue.tpl:225
-msgid "Announce holdtime"
-msgstr "公告期限"
+#: plugins/admin/mimetypes/generic.tpl:23
+msgid "Categorize this mime type"
+msgstr "为这个 mime type 分类"
 
-#: plugins/admin/ogroups/phonequeue.tpl:231
-msgid "Allow the called user to transfer his call"
-msgstr "允许被叫用户转移呼叫"
+#: plugins/admin/mimetypes/generic.tpl:33
+msgid "Please specify a description"
+msgstr "请提供一个描述"
 
-#: plugins/admin/ogroups/phonequeue.tpl:237
-msgid "Allows calling user to transfer call"
-msgstr "允许拨叫用户转移呼叫"
+#: plugins/admin/mimetypes/generic.tpl:55
+msgid "Mime icon"
+msgstr "Mime 图标"
 
-#: plugins/admin/ogroups/phonequeue.tpl:247
-msgid "Allow the called to hangup by pressing *"
-msgstr "允许被叫用户按 * 键挂起"
+#: plugins/admin/mimetypes/generic.tpl:64
+msgid "Update mime type icon"
+msgstr "更新 mime 类型图标"
 
-#: plugins/admin/ogroups/phonequeue.tpl:253
-msgid "Allows calling to hangup by pressing *"
-msgstr "å\85\81许æ\8b¨å\8f«ç\94¨æ\88·æ\8c\89 * é\94®æ\8c\82èµ·"
+#: plugins/admin/mimetypes/generic.tpl:77
+msgid "Left click"
+msgstr "å·¦é\94®å\8d\95å\87»"
 
-#: plugins/admin/ogroups/phonequeue.tpl:259
-msgid "Ring instead of playing background music"
-msgstr "æ\8c¯é\93\83è\80\8cé\9d\9eæ\92­æ\94¾è\83\8cæ\99¯é\9f³ä¹\90"
+#: plugins/admin/mimetypes/generic.tpl:82
+msgid "File patterns"
+msgstr "æ\96\87件模æ\9d¿"
 
-#: plugins/admin/ogroups/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据找回。"
+#: plugins/admin/mimetypes/generic.tpl:85
+msgid "Please specify a new file pattern"
+msgstr "请输入一个新的文件模板。"
+
+#: plugins/admin/mimetypes/generic.tpl:86
+msgid "Add a new file pattern"
+msgstr "添加一个文件模板"
+
+#: plugins/admin/mimetypes/generic.tpl:91
+#: plugins/admin/mimetypes/generic.tpl:133
+msgid "Enter an application name here"
+msgstr "输入一个应用程序名称"
+
+#: plugins/admin/mimetypes/generic.tpl:92
+#: plugins/admin/mimetypes/generic.tpl:135
+msgid "Add application"
+msgstr "添加应用程序"
+
+#: plugins/admin/mimetypes/generic.tpl:102
+msgid "Embedding"
+msgstr "嵌入"
+
+#: plugins/admin/mimetypes/generic.tpl:113
+msgid "Show file in embedded viewer"
+msgstr "以嵌入浏览器显示文件"
+
+#: plugins/admin/mimetypes/generic.tpl:118
+msgid "Show file in external viewer"
+msgstr "用外部浏览器显示文件"
+
+#: plugins/admin/mimetypes/generic.tpl:123
+msgid "Ask whether to save to local disk"
+msgstr "询问是否保存到本地硬盘"
+
+#: plugins/admin/mimetypes/main.inc:42 plugins/admin/mimetypes/main.inc:44
+msgid "Mimetype management"
+msgstr "邮件 mime type"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:65
+#: plugins/admin/ogroups/tabs_ogroups.inc:201
+msgid "Phone queue"
+msgstr "电话队列"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:91
+msgid "System"
+msgstr "系统"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:180
+msgid "Terminals"
+msgstr "终端"
+
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr "邮件传递列表"
+
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
+msgstr "此分配列表的主要邮件地址"
 
 #: plugins/admin/ogroups/class_termgroup.inc:120
 msgid "There must be at least one NTP server selected."
@@ -11199,6 +12577,15 @@ msgstr "必须至少选择一个 NTP 服务器。"
 msgid "Setting action state (FAIstate) failed for object '%s', value was '%s'."
 msgstr "为对象 '%s' 设置动作状态(FAIstate) 失败，值为 '%s'。"
 
+#: plugins/admin/ogroups/termgroup.tpl:2
+msgid ""
+"Actions you choose here influence all systems in this object group. "
+"Additionally, all values editable here can be inherited by the clients "
+"assigned to this object group."
+msgstr ""
+"您这里选择的动作会影响这个对象组内所有系统。而且，所有这里可以修改的值都可以"
+"被分配到该对象组的对象继承。"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr "选择查看部门"
@@ -11231,10 +12618,6 @@ msgstr "选择查看应用程序"
 msgid "Show applications"
 msgstr "显示应用程序"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Select to see workstations"
-msgstr "选择查看工作站"
-
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to see terminals"
 msgstr "选择查看终端"
@@ -11255,23 +12638,17 @@ msgstr "选择查看电话"
 msgid "Display objects of department"
 msgstr "选择查看部门对象"
 
+#: plugins/admin/ogroups/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据找回。"
+
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
 msgid "Object groups"
 msgstr "对象组"
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr "组名称"
-
-#: plugins/admin/ogroups/generic.tpl:37
-msgid "Member objects"
-msgstr "成员对象"
-
-#: plugins/admin/ogroups/paste_mail.tpl:7
-msgid "Please enter a mail address"
-msgstr "请输入一个邮件地址"
-
 #: plugins/admin/ogroups/class_ogroupManagement.inc:187
 #, php-format
 msgid "You're about to delete the object group '%s'."
@@ -11380,10 +12757,10 @@ msgstr "显示包含电话的组"
 msgid "Create new object group"
 msgstr "创建新对象组"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:160
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "对象组"
+#: plugins/admin/ogroups/class_divListOGroup.inc:183
+#, fuzzy
+msgid "Number of listed object groups"
+msgstr "对象组名称"
 
 #: plugins/admin/ogroups/class_ogroup.inc:149
 msgid "This 'dn' is no object group."
@@ -11453,6 +12830,14 @@ msgstr "保存对象组失败"
 msgid "Removing object group failed"
 msgstr "删除对象组失败"
 
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr "组名称"
+
+#: plugins/admin/ogroups/generic.tpl:37
+msgid "Member objects"
+msgstr "成员对象"
+
 #: plugins/admin/ogroups/class_phonequeue.inc:92
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:98
 #, php-format
@@ -11474,12 +12859,10 @@ msgid "round robin"
 msgstr "round robin"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:124
-#, fuzzy
 msgid "least recently called"
-msgstr "最近最少的电话"
+msgstr "最少的近期电话"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:125
-#, fuzzy
 msgid "fewest completed calls"
 msgstr "最少完成的电话"
 
@@ -11492,7 +12875,7 @@ msgid "round robin with memory"
 msgstr "内存 round robin"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:148
-#: plugins/gofon/macro/class_gofonMacro.inc:172
+#: plugins/gofon/macro/class_gofonMacro.inc:175
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:265
 msgid ""
 "Can't save any changes to asterisk database, there is currently no mysql "
@@ -11500,7 +12883,7 @@ msgid ""
 msgstr "无法保存修改到 asterisk 数据库，当前 php 没有安装 mysql 扩展。"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:159
-#: plugins/gofon/macro/class_gofonMacro.inc:182
+#: plugins/gofon/macro/class_gofonMacro.inc:185
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:276
 #, php-format
 msgid ""
@@ -11510,7 +12893,7 @@ msgstr ""
 "MySQL 主服务器 '%s' 无法被用户 '%s' 访问到，通过 GOsa 日志来查看 mysql 错误。"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:166
-#: plugins/gofon/macro/class_gofonMacro.inc:189
+#: plugins/gofon/macro/class_gofonMacro.inc:192
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:283
 #, php-format
 msgid "Can't select database '%s' on home server '%s'."
@@ -11557,7 +12940,7 @@ msgid ""
 msgstr "必须有至少一个带有 asterisk 数据库的服务器来创建一个电话队列。"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1116
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1123
 msgid "Please select a valid goFonHomeServer."
 msgstr "请选择一个有效的 goFonHomeServer。"
 
@@ -11583,8 +12966,8 @@ msgstr "必须至少定义一个队列数字"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:299
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:860
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:357
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -11623,8 +13006,8 @@ msgstr "Mysql 查询失败。"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1378
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1380
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1389
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1391
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:565
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
 #, php-format
@@ -11657,34 +13040,162 @@ msgstr "保存邮件对象组设置失败"
 msgid "Removing mail objectgroup settings failed"
 msgstr "删除邮件对象组设置失败"
 
-#: plugins/gofon/fonreports/main.inc:21
-msgid "Phone reports"
-msgstr "电话记录"
+#: plugins/admin/ogroups/phonequeue.tpl:2
+msgid ""
+"Only users with the same asterisk home server will be included to this queue."
+msgstr "只有有着相同 asterisk 主服务器的用户才会被包含在这个队列中。"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "电话记录"
+#: plugins/admin/ogroups/phonequeue.tpl:5
+msgid "Queue Settings"
+msgstr "队列设置"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:157
-#: plugins/gofon/fonreports/class_fonreport.inc:167
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr "不能连接电话数据库，无法显示报告！"
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/gofon/phoneaccount/paste_generic.tpl:2
+#: plugins/gofon/phoneaccount/paste_generic.tpl:6
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "电话号码"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:171
-msgid "Can't select phone database for report generation!"
-msgstr "无法为生成报告查询电话数据库！"
+#: plugins/admin/ogroups/phonequeue.tpl:12
+#: plugins/admin/ogroups/phonequeue.tpl:109
+msgid "Generic queue Settings"
+msgstr "通用队列设置"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:189
-msgid "Query for phone database failed!"
-msgstr "查询电话数据库失败！"
+#: plugins/admin/ogroups/phonequeue.tpl:38
+#: plugins/gofon/phoneaccount/generic.tpl:32
+#: plugins/gofon/conference/generic.tpl:46
+msgid "Home server"
+msgstr "主服务器"
 
-#: plugins/gofon/fonreports/contents.tpl:31
-msgid "Source"
-msgstr "源"
+#: plugins/admin/ogroups/phonequeue.tpl:59
+msgid "Timeout"
+msgstr "过期"
 
-#: plugins/gofon/fonreports/contents.tpl:32
-msgid "Destination"
-msgstr "目标"
+#: plugins/admin/ogroups/phonequeue.tpl:75
+msgid "Strategy"
+msgstr "策略"
+
+#: plugins/admin/ogroups/phonequeue.tpl:87
+msgid "Max queue length"
+msgstr "最大队列长度"
+
+#: plugins/admin/ogroups/phonequeue.tpl:95
+msgid "Announce frequency"
+msgstr "公告频率"
+
+#: plugins/admin/ogroups/phonequeue.tpl:99
+msgid "(in seconds)"
+msgstr "(秒)"
+
+#: plugins/admin/ogroups/phonequeue.tpl:107
+msgid "Queue sound setup"
+msgstr "队列声音设置"
+
+#: plugins/admin/ogroups/phonequeue.tpl:112
+msgid "Use music on hold instead of ringing"
+msgstr "播放音乐保持锁定而非播放"
+
+#: plugins/admin/ogroups/phonequeue.tpl:121
+msgid "Music on hold"
+msgstr "暂停的音乐"
+
+#: plugins/admin/ogroups/phonequeue.tpl:129
+msgid "Welcome sound file"
+msgstr "欢迎声音文件"
+
+#: plugins/admin/ogroups/phonequeue.tpl:137
+msgid "Announce message"
+msgstr "公告信息"
+
+#: plugins/admin/ogroups/phonequeue.tpl:145
+msgid "Sound file for 'You are next ...'"
+msgstr "声音文件“您是下一个...”"
+
+#: plugins/admin/ogroups/phonequeue.tpl:153
+msgid "'There are ...'"
+msgstr "'这里有 ...'"
+
+#: plugins/admin/ogroups/phonequeue.tpl:161
+msgid "'... calls waiting'"
+msgstr "'... 电话在等待'"
+
+#: plugins/admin/ogroups/phonequeue.tpl:169
+msgid "'Thank you' message"
+msgstr "'谢谢您' 消息"
+
+#: plugins/admin/ogroups/phonequeue.tpl:177
+msgid "'minutes' sound file"
+msgstr "'分钟' 声音文件"
+
+#: plugins/admin/ogroups/phonequeue.tpl:185
+msgid "'seconds' sound file"
+msgstr "'秒' 声音文件"
+
+#: plugins/admin/ogroups/phonequeue.tpl:193
+msgid "Hold sound file"
+msgstr "暂停声音文件"
+
+#: plugins/admin/ogroups/phonequeue.tpl:201
+msgid "Less Than sound file"
+msgstr "声音文件“小于...”"
+
+#: plugins/admin/ogroups/phonequeue.tpl:217
+msgid "Phone attributes "
+msgstr "电话属性"
+
+#: plugins/admin/ogroups/phonequeue.tpl:225
+msgid "Announce holdtime"
+msgstr "公告期限"
+
+#: plugins/admin/ogroups/phonequeue.tpl:231
+msgid "Allow the called user to transfer his call"
+msgstr "允许被叫用户转移呼叫"
+
+#: plugins/admin/ogroups/phonequeue.tpl:237
+msgid "Allows calling user to transfer call"
+msgstr "允许拨叫用户转移呼叫"
+
+#: plugins/admin/ogroups/phonequeue.tpl:247
+msgid "Allow the called to hangup by pressing *"
+msgstr "允许被叫用户按 * 键挂起"
+
+#: plugins/admin/ogroups/phonequeue.tpl:253
+msgid "Allows calling to hangup by pressing *"
+msgstr "允许拨叫用户按 * 键挂起"
+
+#: plugins/admin/ogroups/phonequeue.tpl:259
+msgid "Ring instead of playing background music"
+msgstr "振铃而非播放背景音乐"
+
+#: plugins/admin/ogroups/paste_mail.tpl:7
+msgid "Please enter a mail address"
+msgstr "请输入一个邮件地址"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "电话记录"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:157
+#: plugins/gofon/fonreports/class_fonreport.inc:167
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr "不能连接电话数据库，无法显示报告！"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:171
+msgid "Can't select phone database for report generation!"
+msgstr "无法为生成报告查询电话数据库！"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:189
+msgid "Query for phone database failed!"
+msgstr "查询电话数据库失败！"
+
+#: plugins/gofon/fonreports/contents.tpl:31
+msgid "Source"
+msgstr "源"
+
+#: plugins/gofon/fonreports/contents.tpl:32
+msgid "Destination"
+msgstr "目标"
 
 #: plugins/gofon/fonreports/contents.tpl:33
 msgid "Channel"
@@ -11694,14 +13205,18 @@ msgstr "频道"
 msgid "Duration"
 msgstr "持续时间"
 
-#: plugins/gofon/macro/headpage.tpl:6
+#: plugins/gofon/fonreports/main.inc:21
+msgid "Phone reports"
+msgstr "电话记录"
+
 #: plugins/gofon/macro/class_divListMacros.inc:31
 #: plugins/gofon/macro/class_divListMacros.inc:32
+#: plugins/gofon/macro/headpage.tpl:6
 msgid "List of macros"
 msgstr "宏列表"
 
-#: plugins/gofon/macro/headpage.tpl:24
 #: plugins/gofon/macro/class_divListMacros.inc:36
+#: plugins/gofon/macro/headpage.tpl:24
 msgid ""
 "This menu allows you to add, edit and remove selected macros. You may want "
 "to use the range selector on top of the macro listbox, when working with a "
@@ -11710,35 +13225,6 @@ msgstr ""
 "这个菜单允许您添加，编辑和删除所选的宏。对于一个长列表，您可以通过选择框上面"
 "的范围选择来调整。"
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr "显示匹配的宏"
-
-#: plugins/gofon/macro/headpage.tpl:41
-#: plugins/gofon/macro/class_divListMacros.inc:54
-msgid "Regular expression for matching macro names"
-msgstr "匹配宏名的正则表达式"
-
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
-msgstr "宏名称"
-
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
-msgstr "要显示的宏名称"
-
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
-msgstr "选择放置宏的子树"
-
-#: plugins/gofon/macro/generic.tpl:48
-msgid "Visible for user"
-msgstr "用户可见"
-
-#: plugins/gofon/macro/generic.tpl:57
-msgid "Macro text"
-msgstr "宏文本"
-
 #: plugins/gofon/macro/class_divListMacros.inc:46
 msgid "macro name"
 msgstr "宏名称"
@@ -11747,6 +13233,11 @@ msgstr "宏名称"
 msgid "Visible"
 msgstr "可见"
 
+#: plugins/gofon/macro/class_divListMacros.inc:54
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
+msgstr "匹配宏名的正则表达式"
+
 #: plugins/gofon/macro/class_divListMacros.inc:74
 msgid "Create new phone macro"
 msgstr "创建新电话宏"
@@ -11771,6 +13262,11 @@ msgstr "可见"
 msgid "invisible"
 msgstr "不可见"
 
+#: plugins/gofon/macro/class_divListMacros.inc:138
+#, fuzzy
+msgid "Number of listed macros"
+msgstr "组名称"
+
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 msgid "Phone macros"
 msgstr "电话宏"
@@ -11785,112 +13281,113 @@ msgstr "您将要删除宏 '%s'。"
 msgid "You are not allowed to delete this macro!"
 msgstr "您无权删除这个宏！"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
-#: setup/class_setupStep_Migrate.inc:217 setup/class_setupStep_Migrate.inc:266
-#: setup/class_setupStep_Migrate.inc:324 setup/class_setupStep_Migrate.inc:391
-#: setup/class_setupStep_Migrate.inc:467 setup/class_setupStep_Migrate.inc:538
-#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:721
-#: setup/class_setupStep_Migrate.inc:853
-#: setup/class_setupStep_Migrate.inc:1614 setup/setup_checks.tpl:27
-#: setup/setup_checks.tpl:87
-msgid "Ok"
-msgstr "好"
-
-#: plugins/gofon/macro/class_gofonMacro.inc:219
+#: plugins/gofon/macro/class_gofonMacro.inc:222
 #, php-format
 msgid "Removing macro from '%s' failed. Check GOsa log for mysql error."
 msgstr "从 '%s' 删除宏失败。通过 GOsa 日志来查看 mysql 错误。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:287
+#: plugins/gofon/macro/class_gofonMacro.inc:290
 #, php-format
 msgid "More than one '(' is currently not supported. Line : '%s'."
 msgstr "当前不支持一个以上的 '('。行: '%s'。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:290
+#: plugins/gofon/macro/class_gofonMacro.inc:293
 #, php-format
 msgid "More than one ')' is currently not supported. Line : '%s'."
 msgstr "当前不支持一个以上的 ')'。行: '%s'。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:294
+#: plugins/gofon/macro/class_gofonMacro.inc:297
 #, php-format
 msgid "There is no application given in line : '%s'."
 msgstr "没有给出应用程序，在行: '%s'。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:298
+#: plugins/gofon/macro/class_gofonMacro.inc:301
 #, php-format
 msgid "There is no extension type given in line : '%s'."
 msgstr "没有给出扩展类型，在行: '%s'。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:327
+#: plugins/gofon/macro/class_gofonMacro.inc:330
 #, php-format
 msgid "Insert of new macro failed for server '%s'."
 msgstr "为服务器 '%s' 插入新宏失败。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:362
+#: plugins/gofon/macro/class_gofonMacro.inc:365
 msgid ""
 "There must be at least one server with an asterisk database to save this "
 "phone macro."
 msgstr "必须有至少一个带有 asterisk 数据库的服务器来保存电话宏。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:376
+#: plugins/gofon/macro/class_gofonMacro.inc:379
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "给出的 cn '%s' 已经存在。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:382
+#: plugins/gofon/macro/class_gofonMacro.inc:385
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr "为保存这个宏，您必须提供“显示名称”"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:386
+#: plugins/gofon/macro/class_gofonMacro.inc:389
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr "提供的 cn 可能太长，为创建一个 Makro 条目，最多 20 个字符。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:392
+#: plugins/gofon/macro/class_gofonMacro.inc:395
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr "权限不足，无法在 goFonMacro 中修改属性 '%s'。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:403
+#: plugins/gofon/macro/class_gofonMacro.inc:406
 msgid ""
 "This macro is still in use. It is necessary to mark this macro as visible "
 "for users."
 msgstr "该宏仍在使用。有必要将这个宏标记为用户可见。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:411
+#: plugins/gofon/macro/class_gofonMacro.inc:414
 msgid "Makro length must be lower than 100 lines"
 msgstr "Macro 长度必须少于 100 行"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:429
+#: plugins/gofon/macro/class_gofonMacro.inc:432
 msgid ""
 "This macro is still in use. To delete this Macro ensure that nobody has "
 "selected it."
 msgstr "该宏仍在使用。要删除这个宏先确认没有人使用它。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:442
+#: plugins/gofon/macro/class_gofonMacro.inc:445
 msgid ""
 "Could not remove the macro entry from asterisk databases. Please check your "
 "asterisk database configurations."
 msgstr "无法从 asterisk 数据库中删除该宏记录。请检查您的 asterisk 数据库配置。"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:448
+#: plugins/gofon/macro/class_gofonMacro.inc:451
 msgid "Removing phone macro failed"
 msgstr "删除电话宏失败"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:457
+#: plugins/gofon/macro/class_gofonMacro.inc:460
 msgid "Removing phone macro reverences failed"
 msgstr "删除电话宏引用失败"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:491
+#: plugins/gofon/macro/class_gofonMacro.inc:494
 msgid "Saving phone macro failed"
 msgstr "保存电话宏失败"
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
-msgstr "å\8f\82æ\95°"
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
+msgstr "å®\8få\90\8d称"
 
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
-msgstr "类型"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr "要显示的宏名称"
+
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
+msgstr "选择放置宏的子树"
+
+#: plugins/gofon/macro/generic.tpl:48
+msgid "Visible for user"
+msgstr "用户可见"
+
+#: plugins/gofon/macro/generic.tpl:57
+msgid "Macro text"
+msgstr "宏文本"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:190
 msgid "This 'dn' is no phone macro."
@@ -11919,7 +13416,7 @@ msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr "权限不足，不能在 goFonMacro 中修改属性 '%s'。"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1148
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1157
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "参数 %s 包含无效字符。'!,#' 用做分隔符"
@@ -11940,28 +13437,21 @@ msgstr "宏的参数数目修改了，您必须更新每一个使用宏 '%s' 的
 msgid "Saving phone macro parameters failed"
 msgstr "保存电话宏参数失败"
 
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
+msgstr "显示匹配的宏"
+
 #: plugins/gofon/macro/main.inc:43 plugins/gofon/macro/main.inc:47
 msgid "Phone macro management"
 msgstr "电话宏管理"
 
-#: plugins/gofon/phoneaccount/generic.tpl:35
-msgid "Select the accounts home server"
-msgstr "选择账号的主服务器"
-
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/paste_generic.tpl:32
-msgid "Voicemail PIN"
-msgstr "语音邮件 PIN"
-
-#: plugins/gofon/phoneaccount/generic.tpl:50
-#: plugins/gofon/phoneaccount/paste_generic.tpl:40
-msgid "Phone PIN"
-msgstr "电话 PIN"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr "参数"
 
-#: plugins/gofon/phoneaccount/generic.tpl:68
-#: plugins/gofon/phoneaccount/generic.tpl:69
-msgid "Phone macro"
-msgstr "电话宏"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
+msgstr "类型"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:103
 #, php-format
@@ -11974,21 +13464,6 @@ msgstr ""
 "指定的 goFonHomeServer '%s' 在 GOsa 服务器配置中不存在。保存这个账号将在服务"
 "器 '%s' 上创建一个新条目。选择“取消”如果您不想创建一个新条目并忽略旧账号。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:112
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1262
-#, php-format
-msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
-msgstr ""
-"MySQL 服务器'%s' 无法被用户 '%s' 访问，通过 GOsa 日志来查看 mysql 错误。"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1273
-#, php-format
-msgid "Can't select database %s on %s."
-msgstr "无法选择数据库 %s 在 %s 上。"
-
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:155
 msgid "no macro"
 msgstr "没有宏"
@@ -11997,13 +13472,13 @@ msgstr "没有宏"
 msgid "undefined"
 msgstr "未定义"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:307
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:302
 msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
 msgstr "因为当前没有 mysql 扩展，无法保存修改到 asterisk 数据库。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:427
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:422
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s'. Abort saving entries to "
@@ -12012,8 +13487,8 @@ msgstr ""
 "MySQL 服务器 '%s' 无法被用户 '%s' 访问。取消保存将保持数据库的完整性，通过 "
 "GOsa 日志来查看 mysql 错误。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:435
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:462
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:430
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:457
 #, php-format
 msgid ""
 "Can't select database %s on %s. Abort saving entries to keep the database "
@@ -12022,7 +13497,7 @@ msgstr ""
 "无法查询数据库 '%s' 于 '%s'。取消保存将保持数据库的完整性，通过 GOsa 日志来查"
 "看 mysql 错误。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:454
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:449
 #, php-format
 msgid ""
 "The old MySQL home server '%s' isn't reachable as user '%s'. Abort saving "
@@ -12031,92 +13506,105 @@ msgstr ""
 "老的 MySQL 主服务器 '%s' 无法被用户 '%s' 访问。取消保存将保持数据库的完整性，"
 "通过 GOsa 日志来查看 mysql 错误。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:768
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:763
 msgid "Error while performing query:"
 msgstr "执行查询时错误:"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:825
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:956
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:951
 msgid "This account has no phone extensions."
 msgstr "这个账号没有电话扩展。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:851
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:846
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr "您选择的宏不能继续使用，请选择另外一个。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:966
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:961
 msgid "Remove phone account"
 msgstr "删除电话账号"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:967
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:962
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr "这个账户电话功能已启用。您可以点击下面的按钮禁用。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:970
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:973
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:965
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:968
 msgid "Create phone account"
 msgstr "创建电话账号"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:971
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:966
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr "这个账户电话功能已禁用。您可以点击下面的按钮来启用。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:974
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:969
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr "这个账户的电话功能被禁用。您可以点击下面按钮来启用。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:987
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:982
 msgid "Please enter a valid phone number!"
 msgstr "无法输入一个有效的电话号码！"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1026
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
 msgid "Choose your private phone"
 msgstr "选择您私人电话"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1112
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1119
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr "必须有至少一个带有 asterisk 数据库的服务器来创建一个电话账号。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1120
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1127
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1123
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1130
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr "输入的语音邮件 PIN 包含无效字符，只允许数字。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1128
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1135
 msgid "Phone PIN must be at least one character long."
 msgstr "电话 PIN 必须至少一个字符。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1131
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1138
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr "输入的电话 PIN 包含无效字符，只允许字母数字。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1141
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1150
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "您需要提供至少一个电话号码！"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1223
 msgid "Saving phone account failed"
 msgstr "保存电话账号失败"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1304
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1273
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+"MySQL 服务器'%s' 无法被用户 '%s' 访问，通过 GOsa 日志来查看 mysql 错误。"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1284
+#, php-format
+msgid "Can't select database %s on %s."
+msgstr "无法选择数据库 %s 在 %s 上。"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1315
 #: include/sieve/templates/object_container.tpl:30
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/class_sieveManagement.inc:514
@@ -12124,22 +13612,22 @@ msgstr "保存电话账号失败"
 msgid "Stop"
 msgstr "停止"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1320
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
 msgstr "无法删除电话账号，PHP 配置中没有 mysql 扩展。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1342
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1353
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "删除用户 '%s'，从电话队列 '%s'。"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1349
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1360
 msgid "Removing phone account failed"
 msgstr "删除电话账号失败"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1426
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1437
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -12151,14 +13639,33 @@ msgstr "之前选择的 asterisk 主服务器 (%s) 不存在了。删除终止
 msgid "Phone settings"
 msgstr "电话设置"
 
-#: plugins/gofon/conference/headpage.tpl:6
-#: plugins/gofon/conference/class_divListConferences.inc:31
-#: plugins/gofon/conference/class_divListConferences.inc:32
-msgid "List of conference rooms"
+#: plugins/gofon/phoneaccount/paste_generic.tpl:32
+#: plugins/gofon/phoneaccount/generic.tpl:42
+msgid "Voicemail PIN"
+msgstr "语音邮件 PIN"
+
+#: plugins/gofon/phoneaccount/paste_generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:50
+msgid "Phone PIN"
+msgstr "电话 PIN"
+
+#: plugins/gofon/phoneaccount/generic.tpl:35
+msgid "Select the accounts home server"
+msgstr "选择账号的主服务器"
+
+#: plugins/gofon/phoneaccount/generic.tpl:68
+#: plugins/gofon/phoneaccount/generic.tpl:69
+msgid "Phone macro"
+msgstr "电话宏"
+
+#: plugins/gofon/conference/class_divListConferences.inc:31
+#: plugins/gofon/conference/class_divListConferences.inc:32
+#: plugins/gofon/conference/headpage.tpl:6
+msgid "List of conference rooms"
 msgstr "会议室列表"
 
-#: plugins/gofon/conference/headpage.tpl:24
 #: plugins/gofon/conference/class_divListConferences.inc:36
+#: plugins/gofon/conference/headpage.tpl:24
 msgid ""
 "This menu allows you to create, delete and edit selected phone conferences. "
 "Having a large number of phone conferences, you might prefer the range "
@@ -12167,9 +13674,43 @@ msgstr ""
 "这个菜单允许您创建，删除和修改所选的电话会议。对于一个长列表，您可以通过列表"
 "上面的范围选择来调整。"
 
-#: plugins/gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
-msgstr "用于匹配用户名的正则表达式"
+#: plugins/gofon/conference/class_divListConferences.inc:46
+msgid "Name - Number"
+msgstr "名称 - 数字"
+
+#: plugins/gofon/conference/class_divListConferences.inc:48
+#: plugins/gofon/conference/generic.tpl:120
+msgid "PIN"
+msgstr "PIN"
+
+#: plugins/gofon/conference/class_divListConferences.inc:55
+msgid "Regular expression for matching conference names"
+msgstr "匹配会议名称的正则表达式"
+
+#: plugins/gofon/conference/class_divListConferences.inc:75
+msgid "Create new conference"
+msgstr "创建新会议"
+
+#: plugins/gofon/conference/class_divListConferences.inc:75
+msgid "New conference"
+msgstr "新建会议"
+
+#: plugins/gofon/conference/class_divListConferences.inc:138
+msgid "Conference"
+msgstr "会议"
+
+#: plugins/gofon/conference/class_divListConferences.inc:166
+#, fuzzy
+msgid "Number of listed conferences"
+msgstr "会议记录"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+msgid "Phone conferences"
+msgstr "电话会议"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr "管理"
 
 #: plugins/gofon/conference/generic.tpl:13
 msgid "Conference name"
@@ -12192,11 +13733,6 @@ msgstr "生存期（天）"
 msgid "Preset PIN"
 msgstr "预置 PIN"
 
-#: plugins/gofon/conference/generic.tpl:120
-#: plugins/gofon/conference/class_divListConferences.inc:48
-msgid "PIN"
-msgstr "PIN"
-
 #: plugins/gofon/conference/generic.tpl:126
 msgid "Record conference"
 msgstr "会议记录"
@@ -12219,35 +13755,7 @@ msgstr "通知用户加入或者离开会议"
 
 #: plugins/gofon/conference/generic.tpl:169
 msgid "Count users"
-msgstr ""
-
-#: plugins/gofon/conference/class_divListConferences.inc:46
-msgid "Name - Number"
-msgstr "名称 - 数字"
-
-#: plugins/gofon/conference/class_divListConferences.inc:55
-msgid "Regular expression for matching conference names"
-msgstr "匹配会议名称的正则表达式"
-
-#: plugins/gofon/conference/class_divListConferences.inc:75
-msgid "Create new conference"
-msgstr "创建新会议"
-
-#: plugins/gofon/conference/class_divListConferences.inc:75
-msgid "New conference"
-msgstr "新建会议"
-
-#: plugins/gofon/conference/class_divListConferences.inc:138
-msgid "Conference"
-msgstr "会议"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Phone conferences"
-msgstr "电话会议"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr "管理"
+msgstr "用户计数"
 
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:230
 #, php-format
@@ -12314,6 +13822,10 @@ msgstr "无法在原来的主服务器中删除旧条目。请查看 gosa 日志
 msgid "Saving phone conference failed"
 msgstr "保存电话会议失败"
 
+#: plugins/gofon/conference/headpage.tpl:36
+msgid "Regular expression for        matching user names"
+msgstr "用于匹配用户名的正则表达式"
+
 #: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 msgid "Conference management"
 msgstr "会议管理"
@@ -12322,10 +13834,6 @@ msgstr "会议管理"
 msgid "Thin Client"
 msgstr "瘦客户机"
 
-#: plugins/generic/references/contents.tpl:11
-msgid "Object name"
-msgstr "对象名称"
-
 #: plugins/generic/references/contents.tpl:11
 msgid "Contents"
 msgstr "内容"
@@ -12359,14 +13867,13 @@ msgid "Welcome %s!"
 msgstr "欢迎 %s!"
 
 #: include/sieve/templates/remove_script.tpl:10
-#, fuzzy
 msgid ""
 "Best thing to do before performing this action would be to save the current "
 "script in a file. So - if you've done so - press 'Delete' to continue or "
 "'Cancel' to abort."
 msgstr ""
-"最好在执行这个操作之前，保存当前 LDAP 树中的内容到一个文件。所以，如果您已经"
-"这么做了，按“删除”继续或者按“取消”退出。"
+"最好在执行这个操作之前，保存当前脚本到一个文件。所以，如果您已经这么做了，"
+"按“删除”继续或者按“取消”退出。"
 
 #: include/sieve/templates/element_size.tpl:11
 #: include/sieve/templates/element_anyof.tpl:5
@@ -12375,7 +13882,6 @@ msgstr ""
 #: include/sieve/templates/element_header.tpl:109
 #: include/sieve/templates/element_envelope.tpl:108
 #: include/sieve/templates/element_allof.tpl:5
-#, fuzzy
 msgid "Not"
 msgstr "否"
 
@@ -12390,7 +13896,7 @@ msgstr "否"
 #: include/sieve/templates/element_allof.tpl:5
 #: include/sieve/templates/element_allof.tpl:7
 msgid "Inverse match"
-msgstr ""
+msgstr "反向匹配"
 
 #: include/sieve/templates/element_size.tpl:13
 #: include/sieve/templates/element_exists.tpl:12
@@ -12399,56 +13905,50 @@ msgstr ""
 #: include/sieve/templates/element_envelope.tpl:110
 #: include/sieve/templates/element_allof.tpl:7
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #: include/sieve/templates/element_size.tpl:16
-#, fuzzy
 msgid "Select match type"
-msgstr "选择模板"
+msgstr "选择模板类型"
 
 #: include/sieve/templates/element_size.tpl:20
-#, fuzzy
 msgid "Select value unit"
-msgstr "选择类别"
+msgstr "选择取值单位"
 
 #: include/sieve/templates/element_require.tpl:12
 #: include/sieve/templates/object_container.tpl:29
 #: include/sieve/class_sieveManagement.inc:513
 #: include/sieve/class_sieveManagement.inc:733
-#, fuzzy
 msgid "Require"
-msgstr "需要的分数"
+msgstr "需要的"
 
 #: include/sieve/templates/element_reject.tpl:14
-#, fuzzy
 msgid "Reject mail"
-msgstr "拒绝邮件大小超过"
+msgstr "拒信"
 
 #: include/sieve/templates/element_reject.tpl:17
 msgid "This is a multiline text element"
-msgstr ""
+msgstr "这是一个多行文本元素"
 
 #: include/sieve/templates/element_reject.tpl:19
-#, fuzzy
 msgid "This is stored as single string"
-msgstr "******"
+msgstr "保存为一个字符串"
 
 #: include/sieve/templates/element_anyof.tpl:10
 #: include/sieve/class_sieveManagement.inc:608
 msgid "Any of"
-msgstr ""
+msgstr "任何的"
 
 #: include/sieve/templates/create_script.tpl:2
 msgid ""
 "Please enter the name for the new script below. Script names must consist of "
 "lower case characters only."
-msgstr ""
+msgstr "请在下面输入新脚本的名称。脚本名称必须只包含小写字母。"
 
 #: include/sieve/templates/element_exists.tpl:8
 #: include/sieve/class_sieveManagement.inc:606
-#, fuzzy
 msgid "Exists"
-msgstr "现存"
+msgstr "存在"
 
 #: include/sieve/templates/element_keep.tpl:4
 #: include/sieve/templates/object_container.tpl:22
@@ -12458,26 +13958,24 @@ msgstr "现存"
 #: include/sieve/class_sieveManagement.inc:726
 #: include/sieve/class_sieveManagement.inc:729
 msgid "Keep"
-msgstr ""
+msgstr "保持"
 
 #: include/sieve/templates/element_keep.tpl:9
-#, fuzzy
 msgid "Keep message"
-msgstr "解除挂起的邮件"
+msgstr "保存邮件"
 
 #: include/sieve/templates/element_address.tpl:18
 #: include/sieve/templates/element_header.tpl:19
 #: include/sieve/templates/element_envelope.tpl:19
 #: include/sieve/templates/element_vacation.tpl:16
 msgid "Normal view"
-msgstr ""
+msgstr "正常视图"
 
 #: include/sieve/templates/element_address.tpl:25
 #: include/sieve/templates/element_header.tpl:26
 #: include/sieve/templates/element_envelope.tpl:26
-#, fuzzy
 msgid "Match type"
-msgstr "认证类型"
+msgstr "匹配类型"
 
 #: include/sieve/templates/element_address.tpl:28
 #: include/sieve/templates/element_address.tpl:51
@@ -12496,136 +13994,124 @@ msgstr "认证类型"
 #: include/sieve/templates/element_envelope.tpl:113
 #: include/sieve/templates/element_envelope.tpl:118
 #: include/sieve/templates/element_boolean.tpl:5
-#, fuzzy
 msgid "Boolean value"
-msgstr "缺省值"
+msgstr "布尔值"
 
 #: include/sieve/templates/element_address.tpl:36
 #: include/sieve/templates/element_header.tpl:37
 #: include/sieve/templates/element_envelope.tpl:37
-#, fuzzy
 msgid "Invert test"
-msgstr "å\86\85å­\98测试"
+msgstr "å\8f\8då\90\91测试"
 
 #: include/sieve/templates/element_address.tpl:48
 msgid "Part of address that should be used"
-msgstr ""
+msgstr "要被使用的部分地址"
 
 #: include/sieve/templates/element_address.tpl:58
 #: include/sieve/templates/element_header.tpl:49
 #: include/sieve/templates/element_envelope.tpl:49
-#, fuzzy
 msgid "Comparator"
-msgstr "计算机"
+msgstr "比较器"
 
 #: include/sieve/templates/element_address.tpl:69
 #: include/sieve/templates/element_envelope.tpl:60
 msgid "Operator"
-msgstr ""
+msgstr "操作符"
 
 #: include/sieve/templates/element_address.tpl:85
 #: include/sieve/templates/element_header.tpl:77
 #: include/sieve/templates/element_envelope.tpl:76
 msgid "Address fields to include"
-msgstr ""
+msgstr "要加入的地址字段"
 
 #: include/sieve/templates/element_address.tpl:89
 #: include/sieve/templates/element_header.tpl:81
 #: include/sieve/templates/element_envelope.tpl:80
 msgid "Values to match for"
-msgstr ""
+msgstr "要匹配的值"
 
 #: include/sieve/templates/element_address.tpl:138
 #: include/sieve/templates/element_header.tpl:131
 #: include/sieve/templates/element_envelope.tpl:130
 #: include/sieve/templates/element_vacation.tpl:47
 msgid "Expert view"
-msgstr ""
+msgstr "高级视图"
 
 #: include/sieve/templates/element_header.tpl:16
 #: include/sieve/templates/element_header.tpl:106
 #: include/sieve/class_sieveManagement.inc:603
-#, fuzzy
 msgid "Header"
-msgstr "邮件头"
+msgstr "头"
 
 #: include/sieve/templates/element_header.tpl:60
 msgid "operator"
-msgstr ""
+msgstr "操作符"
 
 #: include/sieve/templates/element_else.tpl:4
 #: include/sieve/templates/object_container.tpl:33
 #: include/sieve/class_sieveElement_If.inc:840
 #: include/sieve/class_sieveManagement.inc:575
 #: include/sieve/class_sieveManagement.inc:771
-#, fuzzy
 msgid "Else"
-msgstr "假"
+msgstr "Else"
 
 #: include/sieve/templates/element_if.tpl:4
 #: include/sieve/class_sieveElement_If.inc:834
-#, fuzzy
 msgid "Condition"
-msgstr "连接"
+msgstr "条件"
 
 #: include/sieve/templates/object_container.tpl:8
 msgid "Move object up one position"
-msgstr ""
+msgstr "向上移动一次"
 
 #: include/sieve/templates/object_container.tpl:12
 msgid "Move object down one position"
-msgstr ""
+msgstr "向下移动一次"
 
 #: include/sieve/templates/object_container.tpl:16
 #: include/sieve/templates/object_test_container.tpl:10
-#, fuzzy
 msgid "Remove object"
-msgstr "成员对象"
+msgstr "删除对象"
 
 #: include/sieve/templates/object_container.tpl:17
 #: include/sieve/templates/object_container_clear.tpl:17
-#, fuzzy
 msgid "Remove element"
-msgstr "删除记录"
+msgstr "删除元素"
 
 #: include/sieve/templates/object_container.tpl:21
 msgid "choose element"
-msgstr ""
+msgstr "选择元素"
 
 #: include/sieve/templates/object_container.tpl:24
-#, fuzzy
 msgid "Fileinto"
-msgstr "文件"
+msgstr "Fileinto"
 
 #: include/sieve/templates/object_container.tpl:26
 #: include/sieve/templates/element_discard.tpl:4
 #: include/sieve/class_sieveManagement.inc:510
 #: include/sieve/class_sieveManagement.inc:730
-#, fuzzy
 msgid "Discard"
-msgstr "Discs"
+msgstr "丢弃"
 
 #: include/sieve/templates/object_container.tpl:27
 #: include/sieve/templates/element_redirect.tpl:13
 #: include/sieve/class_sieveManagement.inc:511
 #: include/sieve/class_sieveManagement.inc:731
-#, fuzzy
 msgid "Redirect"
-msgstr "直接"
+msgstr "重定向"
 
 #: include/sieve/templates/object_container.tpl:28
 #: include/sieve/class_sieveManagement.inc:512
 #: include/sieve/class_sieveManagement.inc:732
-#, fuzzy
 msgid "Reject"
-msgstr "选择"
+msgstr "取消"
 
 #: include/sieve/templates/object_container.tpl:32
 #: include/sieve/class_sieveElement_If.inc:836
 #: include/sieve/class_sieveManagement.inc:516
 #: include/sieve/class_sieveManagement.inc:736
 msgid "If"
-msgstr ""
+msgstr "If"
 
 #: include/sieve/templates/object_container.tpl:34
 #: include/sieve/templates/element_elsif.tpl:4
@@ -12634,484 +14120,427 @@ msgstr ""
 #: include/sieve/class_sieveManagement.inc:773
 #: include/sieve/class_sieveManagement.inc:778
 msgid "Else If"
-msgstr ""
+msgstr "Else If"
 
 #: include/sieve/templates/object_container.tpl:38
 #: include/sieve/templates/object_container.tpl:42
-#, fuzzy
 msgid "Add new"
-msgstr "æ·»å\8a ç\94¨æ\88·"
+msgstr "æ\96°å¢\9e"
 
 #: include/sieve/templates/object_container.tpl:38
 #: include/sieve/templates/object_container.tpl:40
 msgid "Add a new object above this one."
-msgstr ""
+msgstr "在其上添加一个新对象。"
 
 #: include/sieve/templates/object_container.tpl:40
 msgid "Add element above"
-msgstr ""
+msgstr "在上面添加元素"
 
 #: include/sieve/templates/object_container.tpl:42
 #: include/sieve/templates/object_container.tpl:44
 msgid "Add a new object below this one."
-msgstr ""
+msgstr "在其下添加一个新对象。"
 
 #: include/sieve/templates/object_container.tpl:44
 msgid "Add element below"
-msgstr ""
+msgstr "在下面添加元素"
 
 #: include/sieve/templates/element_redirect.tpl:18
 msgid "Redirect mail to following recipients"
-msgstr ""
+msgstr "转发邮件到下列收件人"
 
 #: include/sieve/templates/element_fileinto.tpl:4
-#, fuzzy
 msgid "Move mail into folder"
-msgstr "到目录"
+msgstr "移动邮件到目录"
 
 #: include/sieve/templates/element_fileinto.tpl:8
-#, fuzzy
 msgid "Select from list"
-msgstr "选择模板"
+msgstr "从列表中选择"
 
 #: include/sieve/templates/element_fileinto.tpl:10
-#, fuzzy
 msgid "Manual selection"
-msgstr "邮件选项"
+msgstr "手动选择"
 
 #: include/sieve/templates/element_fileinto.tpl:18
-#, fuzzy
 msgid "Folder"
-msgstr "到目录"
+msgstr "目录"
 
 #: include/sieve/templates/element_discard.tpl:9
-#, fuzzy
 msgid "Discard message"
-msgstr "挂起邮件"
+msgstr "丢弃邮件"
 
 #: include/sieve/templates/element_envelope.tpl:16
 #: include/sieve/templates/element_envelope.tpl:105
 #: include/sieve/class_sieveManagement.inc:604
 msgid "Envelope"
-msgstr ""
+msgstr "信封"
 
 #: include/sieve/templates/element_boolean.tpl:8
-#, fuzzy
 msgid "update"
 msgstr "更新"
 
 #: include/sieve/templates/edit_frame_base.tpl:12
 msgid "View structured"
-msgstr ""
+msgstr "查看结构"
 
 #: include/sieve/templates/edit_frame_base.tpl:14
 msgid "View source"
-msgstr ""
+msgstr "查看代码"
 
 #: include/sieve/templates/import_script.tpl:1
-#, fuzzy
 msgid "Import sieve script"
-msgstr "导入脚本"
+msgstr "导入 sieve 脚本"
 
 #: include/sieve/templates/import_script.tpl:2
 msgid ""
 "Please select the sieve script you want to import. Use the import button to "
 "import the script or the cancel button to abort."
-msgstr ""
+msgstr "请选择要导入的 sieve 脚本。用导入按钮来导入脚本，或者取消按钮退出。"
 
 #: include/sieve/templates/import_script.tpl:5
-#, fuzzy
 msgid "Script to import"
-msgstr "è\84\9aæ\9c¬è·¯å¾\84"
+msgstr "è¦\81导å\85¥ç\9a\84è\84\9aæ\9c¬"
 
 #: include/sieve/templates/element_stop.tpl:9
 msgid "Stop execution here"
-msgstr ""
+msgstr "停止执行"
 
 #: include/sieve/templates/add_element.tpl:1
 msgid "Add a new element"
-msgstr ""
+msgstr "添加一个新元素"
 
 #: include/sieve/templates/add_element.tpl:2
 msgid "Please select the type of element you want to add"
-msgstr ""
+msgstr "请选择你要添加的元素类型"
 
 #: include/sieve/templates/add_element.tpl:13 setup/setup_migrate.tpl:197
-#, fuzzy
 msgid "Abort"
-msgstr "端口"
+msgstr "放弃"
 
 #: include/sieve/templates/element_allof.tpl:10
 #: include/sieve/class_sieveManagement.inc:607
-#, fuzzy
 msgid "All of"
-msgstr "全部"
+msgstr "所有"
 
 #: include/sieve/templates/object_test_container.tpl:6
-#, fuzzy
 msgid "Add object"
-msgstr "自动化安装（FAI）对象树"
+msgstr "添加对象"
 
 #: include/sieve/templates/management.tpl:1
-#, fuzzy
 msgid "List of sieve scripts"
-msgstr "脚本列表"
+msgstr "sieve 脚本列表"
 
 #: include/sieve/templates/management.tpl:5
 msgid ""
 "Connection to the sieve server could not be established, the "
 "authentification attribute is empty."
-msgstr ""
+msgstr "无法建立到 sieve 服务器的连接，认证属性为空。"
 
 #: include/sieve/templates/management.tpl:6
 msgid ""
 "Please verfiy that the attributes uid and mail are not empty and try again."
-msgstr ""
+msgstr "请确认 uid 和 mail 属性不为空，然后重试。"
 
 #: include/sieve/templates/management.tpl:12
 msgid "Connection to the sieve server could not be established."
-msgstr ""
+msgstr "无法连接到 sieve 服务器。"
 
 #: include/sieve/templates/management.tpl:15
 msgid "Possibly the sieve account has not been created yet."
-msgstr ""
+msgstr "可能尚未建立 sieve 账号。"
 
 #: include/sieve/templates/management.tpl:19
-#, fuzzy
 msgid ""
 "Be careful. All your changes will be saved directly to sieve, if you use the "
 "save button below."
-msgstr "小心使用这个对话框修改记录类型。当按下保存键时，所有修改马上被保存。"
+msgstr "小心，当按下保存键时，所有修改马上被保存到 sieve。"
 
 #: include/sieve/templates/management.tpl:22
-#, fuzzy
 msgid "Create new script"
-msgstr "创建新用户"
+msgstr "创建新脚本"
 
 #: include/sieve/templates/element_vacation.tpl:13
-#, fuzzy
 msgid "Vacation Message"
 msgstr "假期信息"
 
 #: include/sieve/templates/element_vacation.tpl:21
-#, fuzzy
 msgid "Release interval"
-msgstr "时间间隔"
+msgstr "发行间隔"
 
 #: include/sieve/templates/element_vacation.tpl:30
-#, fuzzy
 msgid "Alternative sender addresses"
-msgstr "替代地址"
+msgstr "发送者替代地址"
 
 #: include/sieve/templates/object_container_clear.tpl:8
 msgid "Move this object up one position"
-msgstr ""
+msgstr "向上移动一次这个对象"
 
 #: include/sieve/templates/object_container_clear.tpl:12
 msgid "Move this object down one position"
-msgstr ""
+msgstr "向下移动一次这个对象"
 
 #: include/sieve/templates/object_container_clear.tpl:16
-#, fuzzy
 msgid "Remove this object"
-msgstr "删除电话账号"
+msgstr "删除这个对象"
 
 #: include/sieve/templates/select_test_type.tpl:1
-#, fuzzy
 msgid "Select the type of test you want to add"
-msgstr "选择要添加的系统"
+msgstr "选择您要添加的测试类型"
 
 #: include/sieve/templates/select_test_type.tpl:3
-#, fuzzy
 msgid "Available test types"
-msgstr "å\8f\98é\87\8få±\9eæ\80§"
+msgstr "å\8f¯ç\94¨ç\9a\84æµ\8bè¯\95ç±»å\9e\8b"
 
 #: include/sieve/class_sieveElement_If.inc:27
-#, fuzzy
 msgid "Complete address"
-msgstr "邮件地址"
-
-#: include/sieve/class_sieveElement_If.inc:27
-#: include/sieve/class_sieveElement_If.inc:33
-#, fuzzy
-msgid "Default"
-msgstr "缺省"
+msgstr "完整地址"
 
 #: include/sieve/class_sieveElement_If.inc:28
-#, fuzzy
 msgid "Domain part"
-msgstr "域"
+msgstr "域部分"
 
 #: include/sieve/class_sieveElement_If.inc:29
 msgid "Local part"
-msgstr ""
+msgstr "Local part"
 
 #: include/sieve/class_sieveElement_If.inc:33
 msgid "Case insensitive"
-msgstr ""
+msgstr "大小写不敏感"
 
 #: include/sieve/class_sieveElement_If.inc:34
 msgid "Case sensitive"
-msgstr ""
+msgstr "大小写敏感"
 
 #: include/sieve/class_sieveElement_If.inc:35
 msgid "Numeric"
-msgstr ""
+msgstr "数字型"
 
 #: include/sieve/class_sieveElement_If.inc:39
 msgid "is"
-msgstr ""
+msgstr "是"
 
 #: include/sieve/class_sieveElement_If.inc:40
-#, fuzzy
 msgid "regex"
-msgstr "重置"
+msgstr "regex"
 
 #: include/sieve/class_sieveElement_If.inc:41
-#, fuzzy
 msgid "contains"
-msgstr "å\8a¨ä½\9c"
+msgstr "å\8c\85å\90«"
 
 #: include/sieve/class_sieveElement_If.inc:42
-#, fuzzy
 msgid "matches"
-msgstr "缓存"
+msgstr "匹配"
 
 #: include/sieve/class_sieveElement_If.inc:43
-#, fuzzy
 msgid "count"
-msgstr "è´¦æ\88·"
+msgstr "计æ\95°"
 
 #: include/sieve/class_sieveElement_If.inc:44
-#, fuzzy
 msgid "value is"
-msgstr "有效"
+msgstr "值为"
 
 #: include/sieve/class_sieveElement_If.inc:48
 msgid "less than"
-msgstr ""
+msgstr "小于"
 
 #: include/sieve/class_sieveElement_If.inc:49
 msgid "less or equal"
-msgstr ""
+msgstr "小于等"
 
 #: include/sieve/class_sieveElement_If.inc:50
-#, fuzzy
 msgid "equals"
-msgstr "详细"
+msgstr "等于"
 
 #: include/sieve/class_sieveElement_If.inc:51
 msgid "greater or equal"
-msgstr ""
+msgstr "大于等于"
 
 #: include/sieve/class_sieveElement_If.inc:52
 #: include/sieve/class_sieveElement_If.inc:726
 #: include/sieve/class_sieveElement_If.inc:1059
-#, fuzzy
 msgid "greater than"
-msgstr "å\88\9b建é\80\89项"
+msgstr "大äº\8e"
 
 #: include/sieve/class_sieveElement_If.inc:53
-#, fuzzy
 msgid "not equal"
-msgstr "没有示例"
+msgstr "不等于"
 
 #: include/sieve/class_sieveElement_If.inc:102
-#, fuzzy
 msgid "Can't save empty tests."
-msgstr "无法保存文件 '%s'。"
+msgstr "无法保存空测试。"
 
 #: include/sieve/class_sieveElement_If.inc:446
-#, fuzzy
 msgid "emtpy"
 msgstr "空"
 
 #: include/sieve/class_sieveElement_If.inc:493
 msgid "Nothing specified right now"
-msgstr ""
+msgstr "当前未定义"
 
 #: include/sieve/class_sieveElement_If.inc:595
 msgid "Invalid type of address part."
-msgstr ""
+msgstr "地址部分无效的类型"
 
 #: include/sieve/class_sieveElement_If.inc:605
 msgid "Invalid match type given."
-msgstr ""
+msgstr "提供无效匹配类型"
 
 #: include/sieve/class_sieveElement_If.inc:621
 msgid "Invalid operator given."
-msgstr ""
+msgstr "提供无效运算符"
 
 #: include/sieve/class_sieveElement_If.inc:638
-#, fuzzy
 msgid "Please specify a valid operator."
-msgstr "请输入一个有效的 iSerial。"
+msgstr "请输入一个有效的操作符。"
 
 #: include/sieve/class_sieveElement_If.inc:654
 msgid ""
 "Invalid character found in address attribute. Quotes are not allowed here."
-msgstr ""
+msgstr "地址属性中发现无效字符。这里不允许引号。"
 
 #: include/sieve/class_sieveElement_If.inc:669
-#, fuzzy
 msgid ""
 "Invalid character found in value attribute. Quotes are not allowed here."
-msgstr "åº\94ç\94¨ç¨\8båº\8få\90\8d称中å\8c\85å\90«æ\97 æ\95\88ç\9a\84å­\97符ã\80\82å\8fªå\85\81许 a-z 0-9。"
+msgstr "å\9c¨å\8f\96å\80¼ä¸­å\8f\91ç\8e°æ\97 æ\95\88å­\97符ã\80\82è¿\99é\87\8cä¸\8då\85\81许å\87ºç\8e°å¼\95å\8f·。"
 
 #: include/sieve/class_sieveElement_If.inc:727
 #: include/sieve/class_sieveElement_If.inc:1060
 msgid "lower than"
-msgstr ""
+msgstr "小于"
 
 #: include/sieve/class_sieveElement_If.inc:729
 #: include/sieve/class_sieveElement_If.inc:1062
 msgid "Megabyte"
-msgstr ""
+msgstr "MB"
 
 #: include/sieve/class_sieveElement_If.inc:730
 #: include/sieve/class_sieveElement_If.inc:1063
 msgid "Kilobyte"
-msgstr ""
+msgstr "KB"
 
 #: include/sieve/class_sieveElement_If.inc:731
 #: include/sieve/class_sieveElement_If.inc:1064
-#, fuzzy
 msgid "Bytes"
-msgstr "是"
+msgstr "字节"
 
 #: include/sieve/class_sieveElement_If.inc:745
-#, fuzzy
 msgid "Please select a valid match type in the list box below."
-msgstr "请选择一个有效的邮件服务器。"
+msgstr "请在嫌慢的列表框中选择一个有效匹配类型。"
 
 #: include/sieve/class_sieveElement_If.inc:759
-#, fuzzy
 msgid "Only numeric values are allowed here."
-msgstr "数字字段只允许填数字。"
+msgstr "这里只允许填数字。"
 
 #: include/sieve/class_sieveElement_If.inc:769
-#, fuzzy
 msgid "No valid unit selected"
-msgstr "æ\97 æ\9c\89æ\95\88è¯\81书å\8a è½½"
+msgstr "没æ\9c\89é\80\89æ\8b©æ\9c\89æ\95\88å\8d\95å\85\83"
 
 #: include/sieve/class_sieveElement_If.inc:876
-#, fuzzy
 msgid "Empty"
 msgstr "空"
 
 #: include/sieve/class_sieveElement_If.inc:1134
 #: include/sieve/class_sieveElement_If.inc:1164
-#, fuzzy
 msgid "Click here to add a new test"
-msgstr "点击这里ç\99»å½\95"
+msgstr "点击这里æ·»å\8a ä¸\80个æ\96°æµ\8bè¯\95"
 
 #: include/sieve/class_sieveElement_If.inc:1176
 msgid "Unhandled switch type"
-msgstr ""
+msgstr "未处理的 switch 类型"
 
 #: include/sieve/class_My_Tree.inc:245
 msgid "Can't remove last element."
-msgstr ""
+msgstr "无法删除最后元素。"
 
 #: include/sieve/class_My_Tree.inc:658
 msgid "Require must be the first command in the script."
-msgstr ""
+msgstr "请求必须是脚本的第一个命令。"
 
 #: include/sieve/class_sieveElement_Redirect.inc:24
 #: setup/class_setupStep_Feedback.inc:179
-#, fuzzy
 msgid "Please specify a valid email address."
-msgstr "请输入一个有效的 iSerial。"
+msgstr "请输入一个有效的邮件地址。"
 
 #: include/sieve/class_sieveElement_Redirect.inc:35
-#, fuzzy
 msgid "Place a mail address here"
-msgstr "请输入一个邮件地址"
+msgstr "请在这里输入一个邮件地址"
 
 #: include/sieve/class_sieveElement_Comment.inc:21
 msgid "Your comment here"
-msgstr ""
+msgstr "这里是您的评述"
 
 #: include/sieve/class_sieveManagement.inc:120
 #: include/sieve/class_sieveManagement.inc:247
-#, fuzzy
 msgid "Parse failed"
-msgstr "失败"
+msgstr "解析失败"
 
 #: include/sieve/class_sieveManagement.inc:124
 #: include/sieve/class_sieveManagement.inc:251
-#, fuzzy
 msgid "Parse successful"
-msgstr "导入成功"
+msgstr "解析成功"
 
 #: include/sieve/class_sieveManagement.inc:161
 #, php-format
 msgid ""
 "The specified mail server '%s' does not exist within the GOsa configuration."
-msgstr ""
+msgstr "指定的邮件服务器 '%s' 在 GOsa 配置中不存在。"
 
 #: include/sieve/class_sieveManagement.inc:206
-#, fuzzy
 msgid "You should specify a name for your new script."
-msgstr "请为您的共享提供一个名称。"
+msgstr "请为您的新脚本提供一个名称。"
 
 #: include/sieve/class_sieveManagement.inc:211
-#, fuzzy
 msgid "Only lower case names are allowed."
-msgstr "只有小写字符串被允许作为域名。"
+msgstr "只允许小写字符的名称。"
 
 #: include/sieve/class_sieveManagement.inc:217
-#, fuzzy
 msgid "Only alphabetical characters are allowed in script names."
-msgstr "数字字段只允许填数字。"
+msgstr "脚本名称只允许使用字母。"
 
 #: include/sieve/class_sieveManagement.inc:223
-#, fuzzy
 msgid "The specified name is already in use."
 msgstr "选择的名称已经被使用。"
 
 #: include/sieve/class_sieveManagement.inc:309
 #: include/sieve/class_sieveManagement.inc:355
 #: include/sieve/class_sieveManagement.inc:685
-#: include/sieve/class_sieveManagement.inc:1045
+#: include/sieve/class_sieveManagement.inc:1054
 #: include/class_mail-methods-cyrus.inc:264
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr "无法登录到 SIEVE 服务器。服务器返回 '%s'。"
+msgstr "无法登录到 SIEVE 服务器。服务器报告说 '%s'。"
 
 #: include/sieve/class_sieveManagement.inc:317
-#, fuzzy, php-format
+#, php-format
 msgid "Can't activate sieve script on server. Server says '%s'."
-msgstr "无法激活 GOsa sieve 脚本。服务器返回 '%s'。"
+msgstr "无法在服务器激活 sieve 脚本。服务器报告说 '%s'。"
 
 #: include/sieve/class_sieveManagement.inc:360
-#, fuzzy, php-format
+#, php-format
 msgid "Can't remove sieve script from server. Server says '%s'."
-msgstr "无法获取 sieve 脚本。服务器返回 '%s'。"
+msgstr "无法从服务器删除 sieve 脚本。服务器报告说 '%s'。"
 
 #: include/sieve/class_sieveManagement.inc:372
 #, php-format
 msgid "You are going to remove the sieve script '%s' from your mail server."
-msgstr ""
+msgstr "您将要从您的邮件服务器中删除 sieve 脚本 '%s'。"
 
 #: include/sieve/class_sieveManagement.inc:408
-#, fuzzy
 msgid "Edited"
-msgstr "编辑"
+msgstr "已编辑"
 
 #: include/sieve/class_sieveManagement.inc:415
 #, php-format
 msgid "Please fix all errors before saving. Last error was: %s"
-msgstr ""
+msgstr "请在保存前修正所有错误。最后的错误是: %s"
 
 #: include/sieve/class_sieveManagement.inc:442
-#, fuzzy
 msgid "Specified file seems to be empty."
-msgstr "输入文件为空。"
+msgstr "输入文件好像空文件。"
 
 #: include/sieve/class_sieveManagement.inc:444
 msgid "Upload failed. The temporary file can't be accessed."
-msgstr ""
+msgstr "上传失败。临时文件无法访问。"
 
 #: include/sieve/class_sieveManagement.inc:446 html/get_attachment.php:69
 #, php-format
@@ -13120,64 +14549,57 @@ msgstr "无法打开文件 '%s'。"
 
 #: include/sieve/class_sieveManagement.inc:508
 #: include/sieve/class_sieveManagement.inc:728
-#, fuzzy
 msgid "File into"
-msgstr "文件"
+msgstr "File into"
 
 #: include/sieve/class_sieveManagement.inc:532
 msgid "Failed to add new element."
-msgstr ""
+msgstr "添加新元素失败。"
 
 #: include/sieve/class_sieveManagement.inc:648
 msgid "This script is marked as active"
-msgstr ""
+msgstr "这个脚本被标记为活动"
 
 #: include/sieve/class_sieveManagement.inc:653
-#, fuzzy
 msgid "Script length"
-msgstr "脚本路径"
+msgstr "脚本长度"
 
 #: include/sieve/class_sieveManagement.inc:657
-#, fuzzy
 msgid "Remove script"
-msgstr "导å\85¥脚本"
+msgstr "å\88 é\99¤脚本"
 
 #: include/sieve/class_sieveManagement.inc:666
-#, fuzzy
 msgid "Activate script"
-msgstr "æ\9c\80å\90\8e脚本"
+msgstr "æ¿\80æ´»脚本"
 
 #: include/sieve/class_sieveManagement.inc:670
-#, fuzzy
 msgid "Edit script"
-msgstr "最后脚本"
+msgstr "编辑脚本"
 
 #: include/sieve/class_sieveManagement.inc:785
 #, php-format
 msgid "Can't add the specified element at the given position."
-msgstr ""
+msgstr "无法在给定位置添加指定元素。"
 
-#: include/sieve/class_sieveManagement.inc:1060
-#, fuzzy
+#: include/sieve/class_sieveManagement.inc:1069
 msgid "Failed to save sieve script"
-msgstr "定制过滤脚本"
+msgstr "保存 sieve 脚本失败"
 
 #: include/sieve/class_sieveElement_Vacation.inc:148
 msgid "Alternative sender address must be a valid email addresses."
-msgstr ""
+msgstr "替代发件者地址必须是一个有效的邮件地址。"
 
 #: include/sieve/class_sieveElement_Reject.inc:21
 msgid "Invalid character found, quotes are not allowed in a reject message."
-msgstr ""
+msgstr "发现无效字符。拒信中不允许使用引号。"
 
 #: include/sieve/class_sieveElement_Reject.inc:37
 msgid "Your reject text here"
-msgstr ""
+msgstr "你的拒绝文字"
 
 #: include/sieve/class_sieveElement_Require.inc:73
-#, fuzzy
 msgid "Please specify at least one valid requirement."
-msgstr "请输入一个有效的用户名！"
+msgstr "请给出至少一个有效的需求！"
 
 #: include/class_mail-methods-cyrus.inc:40
 msgid "Warning: Account has an invalid mailserver string!"
@@ -13194,12 +14616,12 @@ msgstr ""
 #: include/class_mail-methods-cyrus.inc:151
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr "无法创建 IMAP 邮箱。服务器返回 '%s'。"
+msgstr "无法创建 IMAP 邮箱。服务器报告说 '%s'。"
 
 #: include/class_mail-methods-cyrus.inc:170
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
-msgstr "无法写 IMAP quota。服务器返回 '%s'。"
+msgstr "无法写 IMAP quota。服务器报告说 '%s'。"
 
 #: include/class_mail-methods-cyrus.inc:196
 msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
@@ -13212,159 +14634,330 @@ msgstr "警告： imap_getacl 不可用。无法获取 imap 权限！"
 #: include/class_mail-methods-cyrus.inc:236
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
-msgstr "无法删除 IMAP 邮箱。服务器返回 '%s'。"
+msgstr "无法删除 IMAP 邮箱。服务器报告说 '%s'。"
 
 #: include/class_mail-methods-cyrus.inc:277
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
-msgstr "无法获取 sieve 脚本。服务器返回 '%s'。"
+msgstr "无法获取 sieve 脚本。服务器报告说 '%s'。"
 
 #: include/class_mail-methods-cyrus.inc:348
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
-msgstr "无法发送 sieve 脚本。服务器返回 '%s'。"
+msgstr "无法发送 sieve 脚本。服务器报告说 '%s'。"
 
 #: include/class_mail-methods-cyrus.inc:352
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
-msgstr "无法激活 GOsa sieve 脚本。服务器返回 '%s'。"
+msgstr "无法激活 GOsa sieve 脚本。服务器报告说 '%s'。"
 
 #: include/class_debconfTemplate.inc:260
 msgid "This package has no debconf options."
 msgstr "这个软件包没有 debconf 选项。"
 
-#: include/class_plugin.inc:404
+#: include/class_plugin.inc:412
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr "命令 '%s'，作为插件 '%s' 的 CHECK hook 好像并不存在。"
 
-#: include/class_plugin.inc:555
+#: include/class_plugin.inc:564
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr "命令 '%s'，作为插件 '%s' 的 POSTCREATE 好像并不存在。"
 
-#: include/class_plugin.inc:589 include/class_password-methods.inc:183
+#: include/class_plugin.inc:599 include/class_password-methods.inc:205
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr "命令 '%s'，作为插件 '%s' 的 POSTMODIFY 好像并不存在。"
 
-#: include/class_plugin.inc:623
+#: include/class_plugin.inc:639
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr "命令 '%s'，作为插件 '%s' 的 POSTREMOVE 好像并不存在。"
 
-#: include/class_plugin.inc:931
+#: include/class_plugin.inc:947
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "对象 '%s' 已经做标记"
 
-#: include/class_plugin.inc:938
+#: include/class_plugin.inc:954
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "添加标识（%s）到对象 '%s'"
 
-#: include/class_plugin.inc:952 include/class_plugin.inc:981
+#: include/class_plugin.inc:968 include/class_plugin.inc:997
 msgid "Handle object tagging failed"
 msgstr "处理对象标记失败"
 
-#: include/class_plugin.inc:968
+#: include/class_plugin.inc:984
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "从对象 '%s' 删除标记"
 
-#: include/class_password-methods.inc:167
+#: include/class_password-methods.inc:189
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
-msgstr "设置口令失败。LDAP 服务器返回 '%s'。"
+msgstr "设置口令失败。LDAP 服务器报告说 '%s'。"
 
-#: include/class_password-methods.inc:204
-#, fuzzy, php-format
+#: include/class_password-methods.inc:226
+#, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
-msgstr "在 gosa.conf 中 SMBHASH 的设置不正确！无法修改 Samba 口令。"
+msgstr "在 %s 中的 SMBHASH 的设置不正确！无法修改 Samba 口令。"
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr "无法使用 sha 来加密，缺少函数 sha1 / mhash / crypt"
+
+#: include/class_password-methods-kerberos.inc:44
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+"警告: 无法设置 kerberos 口令。您的 PHP 版本不支持 kerberos，口令没有被修改。"
+
+#: include/class_password-methods-kerberos.inc:53
+msgid "Kerberos database communication failed!"
+msgstr "Kerberos 数据库通讯失败!"
+
+#: include/class_password-methods-kerberos.inc:60
+msgid "Changing password in kerberos database failed!"
+msgstr "修改 kerberos 数据库中的口令失败！"
+
+#: include/functions_helpviewer.inc:43
+#, php-format
+msgid "XML error in guide.xml: %s at line %d"
+msgstr "XML 出错于 guide.xml: %s ，行 %d"
+
+#: include/functions_helpviewer.inc:84
+msgid "No help available for this plugin."
+msgstr "此插件没有可用帮助信息。"
+
+#: include/functions_helpviewer.inc:93 html/helpviewer.php:192
+msgid "previous"
+msgstr "上一个"
+
+#: include/functions_helpviewer.inc:97 html/helpviewer.php:196
+msgid "next"
+msgstr "下一个"
+
+#: include/functions_helpviewer.inc:385
+#, php-format
+msgid "%s results for your search with the keyword %s"
+msgstr "%s 结果当您查找关键字 %s"
 
-#: include/functions.inc:305
+#: include/functions_helpviewer.inc:459
+#, php-format
+msgid "%s%% hit rate in file %s"
+msgstr "%s%% 点击率于文件 %s"
+
+#: include/class_ppdManager.inc:14
+#, php-format
+msgid "PPD manager : The specified path '%s' doesn't exists."
+msgstr "PPD 管理员：给出的路径 '%s' 不存在。"
+
+#: include/class_ppdManager.inc:145
+#, php-format
+msgid "Specified ppd file '%s' can't be opened for reading."
+msgstr "给出的 ppd 文件 '%s' 无法打开读取。"
+
+#: include/class_ppdManager.inc:147
+#, php-format
+msgid "The required tmp file file '%s' can't be opened for writing."
+msgstr "请求的 tmp 文件 '%s' 无法以写方式打开。"
+
+#: include/class_ppdManager.inc:171 include/class_ppdManager.inc:308
+#, php-format
+msgid ""
+"Parsing PPD file %s failed - line too long. Trailing characters have been "
+"ignored"
+msgstr "解析 PPD 文件 %s 失败──行太长。截断的字符被忽略。"
+
+#: include/class_ppdManager.inc:179
+msgid "Nested groups are not supported!"
+msgstr "不支持嵌套组！"
+
+#: include/class_ppdManager.inc:183
+msgid "Group name not unique!"
+msgstr "组名不唯一！"
+
+#: include/class_ppdManager.inc:189 include/class_ppdManager.inc:219
+msgid "Symbol values are not supported yet!"
+msgstr "尚不支持符号值！"
+
+#: include/class_ppdManager.inc:213
+msgid "Nested options are not supported!"
+msgstr "不支持嵌套选项！"
+
+#: include/class_ppdManager.inc:238
+msgid "PickMany is not supported yet!"
+msgstr "尚不支持 PickMany！"
+
+#: include/class_ppdManager.inc:329
+#, php-format
+msgid "Parsing PPD file %s failed - no information found."
+msgstr "解析 PPD 文件 %s 失败──未找到信息。"
+
+#: include/class_MultiSelectWindow.inc:461
+msgid ""
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
+msgstr "错误: 请求的子树有一个不一致的 DN 编码，检查您的 LDAP！"
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr "无法打开特定文件，检查是否可以访问或者是否存在。"
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr "无法读取特定证书或者提供了一个空字符串"
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr "无法加载证书，可能是不支持的格式（用 PEM/DER）。"
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
+msgstr "要输出证书信息，格式必须是 PEM"
+
+#: include/class_certificate.inc:192
+msgid "Can't create/open File"
+msgstr "无法创建/打开文件"
+
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
+msgstr "无有效证书加载"
+
+#: include/php_setup.inc:107
+msgid "Generating this page caused the PHP interpreter to raise some errors!"
+msgstr "生成这个页面导致 PHP 解析器发生一些错误！"
+
+#: include/php_setup.inc:112
+msgid "Send bug report to the GOsa Team"
+msgstr "发送 bug 反馈到 GOsa 项目组"
+
+#: include/php_setup.inc:112
+msgid "Send bugreport"
+msgstr "发送 bug 报告"
+
+#: include/php_setup.inc:117 html/main.php:385
+msgid "Toggle information"
+msgstr "切换信息"
+
+#: include/php_setup.inc:127
+msgid "PHP error"
+msgstr "PHP 错误"
+
+#: include/php_setup.inc:146
+msgid "class"
+msgstr "类"
+
+#: include/php_setup.inc:152
+msgid "function"
+msgstr "功能"
+
+#: include/php_setup.inc:157
+msgid "static"
+msgstr "静态"
+
+#: include/php_setup.inc:161
+msgid "method"
+msgstr "方法"
+
+#: include/php_setup.inc:194
+msgid "Trace"
+msgstr "跟踪"
+
+#: include/php_setup.inc:195
+msgid "Line"
+msgstr "行"
+
+#: include/php_setup.inc:196
+msgid "Arguments"
+msgstr "参数"
+
+#: include/functions.inc:291
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "致命错误：连接 LDAP 错误。服务器返回 '%s'。"
 
-#: include/functions.inc:322
+#: include/functions.inc:308
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr "用户登录失败。LDAP 服务器返回 '%s'。"
 
-#: include/functions.inc:343
+#: include/functions.inc:340
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
 
-#: include/functions.inc:475
+#: include/functions.inc:478
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr "添加锁时发生错误。参数没有正确设置，请检查源！"
 
-#: include/functions.inc:485
-#, fuzzy, php-format
+#: include/functions.inc:488
+#, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
 "entry in %s! LDAP server says '%s'."
 msgstr ""
-"无法设置 LDAP 数据库的锁定信息。请检查 gosa.conf 中的 'config' 条目！LDAP 服"
-"å\8a¡å\99¨è¿\94å\9b\9e '%s'。"
+"无法在 LDAP 数据库中设置锁定信息。请检查 %s 中的 'config' 条目！LDAP 服务器报"
+"å\91\8a说 '%s'。"
 
-#: include/functions.inc:500
+#: include/functions.inc:503
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
-msgstr "添加锁失败。 LDAP 服务器返回 '%s'。"
+msgstr "添加锁失败。 LDAP 服务器报告说 '%s'。"
 
-#: include/functions.inc:526
+#: include/functions.inc:529
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
-msgstr "删除锁失败。 LDAP 服务器返回 '%s'。"
+msgstr "删除锁失败。 LDAP 服务器报告说 '%s'。"
 
-#: include/functions.inc:556
+#: include/functions.inc:559
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr "从 LDAP 获取锁失败。参数没有正确设置，请检查源！"
 
-#: include/functions.inc:566
-#, fuzzy, php-format
+#: include/functions.inc:569
+#, php-format
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in %s!"
-msgstr "无法获得 LDAP 数据库的锁信息。检查 gosa.conf 中的 'config' 条目！"
+msgstr "无法获得 LDAP 数据库的锁信息。检查 %s 中的 'config' 条目！"
 
-#: include/functions.inc:574
+#: include/functions.inc:577
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
 msgstr "发现要锁定的对象由多个锁。这虽然不可能──清除多个引用。"
 
-#: include/functions.inc:660
+#: include/functions.inc:663
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "超过了 %d 个条目的大小限制！"
 
-#: include/functions.inc:662
+#: include/functions.inc:665
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "设置新的大小限制为 %s 并且如果限制依然超出还显示这条信息。"
 
-#: include/functions.inc:679
+#: include/functions.inc:682
 msgid "incomplete"
 msgstr "不完整"
 
-#: include/functions.inc:1122 include/functions.inc:1316
+#: include/functions.inc:1149 include/functions.inc:1390
 msgid "LDAP error:"
 msgstr "LDAP 错误:"
 
-#: include/functions.inc:1123
+#: include/functions.inc:1150
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
@@ -13372,30 +14965,25 @@ msgstr ""
 "LDAP 服务器发生错误，意味着您最后的修改可能丢失。请检查您 LDAP 安装可能的错误"
 "再重试。"
 
-#: include/functions.inc:1131
+#: include/functions.inc:1158
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr "请检查您的输入并修正错误。按“OK”关闭此对话框。"
 
-#: include/functions.inc:1140
-#, fuzzy
-msgid "An error occurred while processing your request"
-msgstr "处理您的请求时发生一个错误"
-
-#: include/functions.inc:1144
+#: include/functions.inc:1218
 msgid "OK"
 msgstr "好"
 
-#: include/functions.inc:1205
+#: include/functions.inc:1279
 msgid "Continue anyway"
 msgstr "仍然继续"
 
-#: include/functions.inc:1207
+#: include/functions.inc:1281
 msgid "Edit anyway"
 msgstr "仍然编辑"
 
-#: include/functions.inc:1209
+#: include/functions.inc:1283
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -13403,144 +14991,268 @@ msgid ""
 msgstr ""
 "您将要修改的 LDAP 条目 '%s' 看起来正在被 '%s' 使用。请联系这个人再继续。"
 
-#: include/functions.inc:1498
+#: include/functions.inc:1572
 msgid "Entries per page"
 msgstr "每页条目数"
 
-#: include/functions.inc:1526
+#: include/functions.inc:1600
 msgid "Apply filter"
 msgstr "应用过滤器"
 
-#: include/functions.inc:1800
+#: include/functions.inc:1874
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1843
+#: include/functions.inc:1917
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa 开发版（版本 %s）"
 
-#: include/functions.inc:2245 include/functions.inc:2249
-#, fuzzy
+#: include/functions.inc:2319 include/functions.inc:2323
 msgid "Warning - base_hook is not available. Using default base."
 msgstr "警告： base_hook不可用。使用缺省 base。"
 
-#: include/functions.inc:2255
+#: include/functions.inc:2329
 msgid "Warning - no base_hook defined. Using default base."
 msgstr "警告──没有定义  base_hook。使用缺省 base。"
 
-#: include/functions.inc:2280 setup/class_setupStep_Schema.inc:95
+#: include/functions.inc:2354 setup/class_setupStep_Schema.inc:95
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr "不能从服务器得到 schema 信息。无法对 schema 检查！"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2380
 msgid "Used to store account specific informations."
-msgstr ""
+msgstr "用于存储账号相关信息。"
 
-#: include/functions.inc:2313
+#: include/functions.inc:2387
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
-msgstr ""
+msgstr "用于锁定当前编辑条目以避免同时多次更改。"
 
-#: include/functions.inc:2356
-#, fuzzy, php-format
+#: include/functions.inc:2430
+#, php-format
 msgid "The required objectClass '%s' is not present in your schema setup"
-msgstr "需要的对象类 '%s' 在 LDAP 安装中不存在"
+msgstr "必须的对象类 '%s' 在您的 schema 设置中不存在"
 
-#: include/functions.inc:2358
-#, fuzzy, php-format
+#: include/functions.inc:2432
+#, php-format
 msgid "The optional objectClass '%s' is not present in your schema setup"
-msgstr "需要的对象类 '%s' 在 LDAP 安装中不存在"
+msgstr "可选的对象类 '%s' 在您的 schema 设置中不存在"
 
-#: include/functions.inc:2364
-#, fuzzy, php-format
+#: include/functions.inc:2438
+#, php-format
 msgid "The required objectclass '%s' does not have version %s"
-msgstr "必须的对象类 '%s' 不包含发行版 %s"
+msgstr "必须的对象类 '%s' 没有版本 %s"
 
-#: include/functions.inc:2366
-#, fuzzy, php-format
+#: include/functions.inc:2440
+#, php-format
 msgid "The optional objectclass '%s' does not have version %s"
-msgstr "å¿\85é¡»ç\9a\84对象类 '%s' ä¸\8då\8c\85å\90«å\8f\91è¡\8cç\89\88 %s"
+msgstr "å\8f¯é\80\89ç\9a\84对象类 '%s' 没æ\9c\89ç\89\88æ\9c¬ %s"
 
-#: include/functions.inc:2370
-#, fuzzy, php-format
+#: include/functions.inc:2444
+#, php-format
 msgid "Class(es) available"
-msgstr "文件可用。"
+msgstr "可用的类"
 
-#: include/functions.inc:2393
+#: include/functions.inc:2467
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
+"你在 'ldap 设置' 步骤已经启用了 rfc2307bis 选项，但是您的 schema 配置不支持这"
+"个选项。"
 
-#: include/functions.inc:2394
+#: include/functions.inc:2468
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
-msgstr ""
+msgstr "为了使用 rfc2307bis 标准的组，对象类 'posixGroup' 必须是 AUXILIARY"
 
-#: include/functions.inc:2398
+#: include/functions.inc:2472
 msgid ""
 "You have disabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema   configuration do not support this option."
 msgstr ""
+"您已经在 'ldap setup' 步骤中禁用 rfc2307bis 选项，但是您的 schema 配置不支持"
+"这个选项。"
 
-#: include/functions.inc:2399
+#: include/functions.inc:2473
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
-msgstr ""
+msgstr "对象类 'posixGroup' 必须是 STRUCTURAL"
 
-#: include/class_ldap.inc:196
-#, php-format
-msgid ""
-"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+#: include/functions.inc:2569
+msgid "German"
+msgstr "德语"
+
+#: include/functions.inc:2570
+msgid "French"
+msgstr "法语"
+
+#: include/functions.inc:2571
+msgid "Italian"
+msgstr "意大利语"
+
+#: include/functions.inc:2572
+msgid "Spanish"
+msgstr "西班牙语"
+
+#: include/functions.inc:2573
+msgid "English"
+msgstr "英语"
+
+#: include/functions.inc:2574
+msgid "Dutch"
+msgstr "荷兰语"
+
+#: include/functions.inc:2575
+msgid "Polish"
+msgstr "波兰语"
+
+#: include/functions.inc:2576
+msgid "Swedish"
+msgstr ""
+
+#: include/functions.inc:2577
+msgid "Chinese"
+msgstr "中文"
+
+#: include/functions.inc:2578
+#, fuzzy
+msgid "Russian"
+msgstr "俄语"
+
+#: include/functions_dns.inc:169
+#, php-format
+msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
+msgstr "无法找到 dns 域 '%s' 的反向解析。停止解析这个域。"
+
+#: include/functions_dns.inc:174
+#, php-format
+msgid ""
+"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
+"zone."
+msgstr "找到 %s 域的一个以上的反向解析域。退出域解析。"
+
+#: include/functions_dns.inc:618
+#, php-format
+msgid ""
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
+msgstr "未定义的域名 '%s'。域名必须看起来像这样 'server/zone.com'。"
+
+#: include/class_tabs.inc:204
+#, php-format
+msgid "Delete process has been canceled by plugin '%s': %s"
+msgstr "删除进程被插件 '%s' 取消: %s"
+
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr "无法使用 ssha 来加密。（缺少函数 mhash / sha1）"
+
+#: include/class_pluglist.inc:116
+#, php-format
+msgid ""
+"Your %s information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
+msgstr "您的 %s 的信息被部分修改。请用贡献的脚本 fix_config.sh 转换它。"
+
+#: include/class_pluglist.inc:138 ihtml/themes/default/framework.tpl:15
+#: ihtml/themes/default/framework.tpl:17 ihtml/themes/default/framework.tpl:29
+#: ihtml/themes/default/framework.tpl:33
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr "您正在编辑一个数据项。您确认要丢弃当前的修改么？"
+
+#: include/class_CopyPasteHandler.inc:161
+#, php-format
+msgid "You are going to copy the entry '%s'."
+msgstr "您将要拷贝条目 '%s'。"
+
+#: include/class_CopyPasteHandler.inc:225
+msgid "Paste"
+msgstr "粘贴"
+
+#: include/class_CopyPasteHandler.inc:227
+msgid "Can't paste"
+msgstr "无法粘贴"
+
+#: include/class_config.inc:71
+#, php-format
+msgid "XML error in %s: %s at line %d"
+msgstr "XML 出错于 %s: %s ，行 %d"
+
+#: include/class_config.inc:191 html/index.php:204
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr "无法绑定 LDAP。请联系系统管理员。"
+
+#: include/class_config.inc:508
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr "您的配置文件缺少 SID 和/或 RIDBASE！"
+
+#: include/class_timezones.inc:53
+#, php-format
+msgid ""
+"The timezone setting '%s' in your gosa.conf is not valid. Can not calculate "
+"correct timezone offset."
+msgstr ""
+
+#: include/class_timezones.inc:83
+#, fuzzy, php-format
+msgid "The timezone setting \""
+msgstr "电话设置"
+
+#: include/class_ldap.inc:199
+#, php-format
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
 "for performance breakdowns."
 msgstr "LDAP 服务器反应慢（上次查询花费 %.2f 秒）。可能是性能故障。"
 
-#: include/class_ldap.inc:230
+#: include/class_ldap.inc:233
 #, php-format
 msgid ""
 "The ldapserver is answering very slow (%.2f), this may be responsible for "
 "performance breakdowns."
 msgstr "LDAP 服务器反应非常慢（%.2f）。可能是性能故障。"
 
-#: include/class_ldap.inc:456
+#: include/class_ldap.inc:459
 #, php-format
 msgid "Creating copy of %s"
 msgstr "创建 %s 的拷贝"
 
-#: include/class_ldap.inc:459
+#: include/class_ldap.inc:462
 msgid "Processing"
 msgstr "处理"
 
-#: include/class_ldap.inc:499
+#: include/class_ldap.inc:502
 msgid "Error while fetching source dn - aborted!"
 msgstr "当获取源 dn 时错误──退出！"
 
-#: include/class_ldap.inc:562 include/class_ldap.inc:579
+#: include/class_ldap.inc:565 include/class_ldap.inc:582
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "未知 FAIstate %s"
 
-#: include/class_ldap.inc:739
+#: include/class_ldap.inc:742
 #, php-format
 msgid ""
 "Autocreation of subtree failed. No objectClass found for attribute '%s'."
-msgstr ""
+msgstr "自动创建子树失败。没有找到属性 '%s' 的 objectClass。"
 
-#: include/class_ldap.inc:787 include/class_ldap.inc:877
+#: include/class_ldap.inc:790 include/class_ldap.inc:880
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr "类型 '%s' 的自动创建当前不支持。请报告给 GOsa 项目。"
 
-#: include/class_ldap.inc:795
-#, fuzzy, php-format
+#: include/class_ldap.inc:798
+#, php-format
 msgid "Creating subtree '%s' failed."
-msgstr "创建 FAI script base 失败"
+msgstr "创建子树 '%s' 失败。"
 
-#: include/class_ldap.inc:816
+#: include/class_ldap.inc:819
 #, php-format
 msgid ""
 "The referral url '%s' is missing the ldap base. It should look like this "
@@ -13548,767 +15260,729 @@ msgid ""
 msgstr ""
 "参照的 url '%s' 缺少 LDAP base。看起来应该像这样 'ldap://server:port/base'。"
 
-#: include/class_ldap.inc:946
+#: include/class_ldap.inc:949
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "当操作 '%s' 使用 LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:948
+#: include/class_ldap.inc:951
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "当操作  LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:1144
+#: include/class_ldap.inc:1147
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr "这不是一条有效的 DN: '%s'。导入数据应该以 'dn:...' 开始于行 %s"
 
-#: include/class_ldap.inc:1157
+#: include/class_ldap.inc:1160
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "在 LDAP 数据库中，已经存在 dn: '%s' （从行 %s）。"
 
-#: include/class_ldap.inc:1173
+#: include/class_ldap.inc:1176
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr "导入 dn: '%s' 时错误，请从行 %s 开始检查您的 LDIF！"
 
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr "无法使用 sha 来加密，缺少函数 sha1 / mhash / crypt"
-
-#: include/class_password-methods-kerberos.inc:44
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"警告: 无法设置 kerberos 口令。您的 PHP 版本不支持 kerberos，口令没有被修改。"
+#: setup/class_setupStep_Ldap.inc:53
+msgid "LDAP setup"
+msgstr "LDAP 设置"
 
-#: include/class_password-methods-kerberos.inc:53
-msgid "Kerberos database communication failed!"
-msgstr "Kerberos 数据库通讯失败!"
+#: setup/class_setupStep_Ldap.inc:54
+msgid "LDAP connection setup"
+msgstr "LDAP 连接设置"
 
-#: include/class_password-methods-kerberos.inc:60
-msgid "Changing password in kerberos database failed!"
-msgstr "修改 kerberos 数据库中的口令失败！"
+#: setup/class_setupStep_Ldap.inc:55
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"GOsa."
+msgstr "这个对话框为 GOsa 执行 LDAP 连接的基本配置."
 
-#: include/functions_helpviewer.inc:43
+#: setup/class_setupStep_Ldap.inc:105
 #, php-format
-msgid "XML error in guide.xml: %s at line %d"
-msgstr "XML 出错于 guide.xml: %s ，行 %d"
+msgid "Anonymous bind failed on server '%s'."
+msgstr "匿名绑定服务器 '%s' 失败。"
 
-#: include/functions_helpviewer.inc:84
-msgid "No help available for this plugin."
-msgstr "此插件没有可用帮助信息。"
+#: setup/class_setupStep_Ldap.inc:107
+#, php-format
+msgid "Bind as user '%s' failed on server '%s'."
+msgstr "以用户 '%s' 绑定服务器 '%s' 失败。"
 
-#: include/functions_helpviewer.inc:93 html/helpviewer.php:192
-msgid "previous"
-msgstr "上一个"
+#: setup/class_setupStep_Ldap.inc:112
+#, php-format
+msgid "Anonymous bind on server '%s' succeeded."
+msgstr "成功匿名绑定服务器 '%s'。"
 
-#: include/functions_helpviewer.inc:97 html/helpviewer.php:196
-msgid "next"
-msgstr "下一个"
+#: setup/class_setupStep_Ldap.inc:113
+msgid "Please specify user and password."
+msgstr "请输入用户和口令！"
 
-#: include/functions_helpviewer.inc:385
+#: setup/class_setupStep_Ldap.inc:115
 #, php-format
-msgid "%s results for your search with the keyword %s"
-msgstr "%s 结果当您查找关键字 %s"
+msgid "Bind as user '%s' on server '%s' succeeded."
+msgstr "以用户 '%s' 绑定服务器 '%s' 成功。"
 
-#: include/functions_helpviewer.inc:459
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr "%s%% 点击率于文件 %s"
+#: setup/class_setupStep_Finish.inc:38
+msgid "Write configuration file"
+msgstr "写配置文件"
 
-#: include/class_ppdManager.inc:13
-#, php-format
-msgid "PPD manager : The specified path '%s' doesn't exists."
-msgstr "PPD 管理员：给出的路径 '%s' 不存在。"
+#: setup/class_setupStep_Finish.inc:39
+msgid "Finish - write the configuration file"
+msgstr "完成写配置文件"
 
-#: include/class_ppdManager.inc:144
-#, php-format
-msgid "Specified ppd file '%s' can't be opened for reading."
-msgstr "给出的 ppd 文件 '%s' 无法打开读取。"
+#: setup/class_setupStep_Finish.inc:100
+msgid ""
+"Your configuration file is currently world readable. Please updated the file "
+"permissions!"
+msgstr "您当前的配置文件全局可读。请更改这个文件的权限！"
 
-#: include/class_ppdManager.inc:146
-#, php-format
-msgid "The required tmp file file '%s' can't be opened for writing."
-msgstr "请求的 tmp 文件 '%s' 无法以写方式打开。"
+#: setup/class_setupStep_Finish.inc:102
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "配置文件当前不可读或者不存在。"
 
-#: include/class_ppdManager.inc:170 include/class_ppdManager.inc:297
+#: setup/class_setupStep_Finish.inc:111
 #, php-format
 msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr "解析 PPD 文件 %s 失败──行太长。截断的字符被忽略。"
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't. You may want to execute these commands to achieve this "
+"requirement:"
+msgstr ""
+"下载并将文件保存在 %s 中，确认 Web 服务器运行的账号能够读取 %s，其他用户则无"
+"权访问。您可以执行如下命令来实现："
 
-#: include/class_ppdManager.inc:178
-msgid "Nested groups are not supported!"
-msgstr "不支持嵌套组！"
+#: setup/class_setupStep_License.inc:56 setup/class_setupStep_License.inc:57
+msgid "License"
+msgstr "License"
 
-#: include/class_ppdManager.inc:182
-msgid "Group name not unique!"
-msgstr "组名不唯一！"
+#: setup/class_setupStep_License.inc:58
+msgid "Terms and conditions for usage"
+msgstr "使用的术语和条件"
 
-#: include/class_ppdManager.inc:188 include/class_ppdManager.inc:218
-msgid "Symbol values are not supported yet!"
-msgstr "尚不支持符号值！"
+#: setup/class_setupStep_Language.inc:40 setup/class_setupStep_Language.inc:41
+msgid "Language setup"
+msgstr "语言设置"
 
-#: include/class_ppdManager.inc:212
-msgid "Nested options are not supported!"
-msgstr "不支持嵌套选项！"
+#: setup/class_setupStep_Language.inc:42
+msgid "This step allows you to select your preferred language."
+msgstr "这一步允许您选择喜好语言。"
 
-#: include/class_ppdManager.inc:237
-msgid "PickMany is not supported yet!"
-msgstr "尚不支持 PickMany！"
+#: setup/class_setupStep_Language.inc:47
+msgid "Automatic"
+msgstr "自动"
 
-#: include/class_ppdManager.inc:318
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr "解析 PPD 文件 %s 失败──未找到信息。"
+#: setup/class_setupStep_Feedback.inc:91
+msgid "UNIX accounts/groups"
+msgstr "UNIX 账号/组"
 
-#: include/class_MultiSelectWindow.inc:456
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
-msgstr "错误: 请求的子树有一个不一致的 DN 编码，检查您的 LDAP！"
+#: setup/class_setupStep_Feedback.inc:93
+msgid "Samba management"
+msgstr "Samba 管理"
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
-msgstr "无法打开特定文件，检查是否可以访问或者是否存在。"
+#: setup/class_setupStep_Feedback.inc:95
+msgid "Mailsystem management"
+msgstr "邮件系统管理"
 
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
-msgstr "无法读取特定证书或者提供了一个空字符串"
+#: setup/class_setupStep_Feedback.inc:97
+msgid "FAX system administration"
+msgstr "FAX 系统管理"
 
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
-msgstr "无法加载证书，可能是不支持的格式（用 PEM/DER）。"
+#: setup/class_setupStep_Feedback.inc:99
+msgid "Asterisk administration"
+msgstr "Asterisk 管理"
 
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
-msgstr "要输出证书信息，格式必须是 PEM"
+#: setup/class_setupStep_Feedback.inc:101
+msgid "System inventory"
+msgstr "系统清单"
 
-#: include/class_certificate.inc:192
-msgid "Can't create/open File"
-msgstr "无法创建/打开文件"
+#: setup/class_setupStep_Feedback.inc:103
+msgid "System / Config management"
+msgstr "系统/配置管理"
 
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
-msgstr "无有效证书加载"
+#: setup/class_setupStep_Feedback.inc:111
+#: setup/class_setupStep_Feedback.inc:113
+msgid "Notification and feedback"
+msgstr "通知和反馈"
 
-#: include/php_setup.inc:71
-msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr "生成这个页面导致 PHP 解析器发生一些错误！"
+#: setup/class_setupStep_Feedback.inc:112
+msgid "Get notifications or send feedback"
+msgstr "获取通知或者发送反馈"
 
-#: include/php_setup.inc:71 html/main.php:389
-msgid "Toggle information"
-msgstr "切换信息"
+#: setup/class_setupStep_Feedback.inc:140
+#, php-format
+msgid ""
+"Could not connect to feedback server (%s). There is possibly no connection "
+"to the internet."
+msgstr "无法连接到反馈服务器 (%s)。可能不存在到 internet 的连接。"
 
-#: include/php_setup.inc:76
-msgid "PHP error"
-msgstr "PHP 错误"
-
-#: include/php_setup.inc:87
-msgid "class"
-msgstr "类"
-
-#: include/php_setup.inc:93
-msgid "function"
-msgstr "功能"
-
-#: include/php_setup.inc:98
-msgid "static"
-msgstr "静态"
+#: setup/class_setupStep_Feedback.inc:147
+msgid ""
+"Error while sending your feedback. The service is possible temporary "
+"unavailable"
+msgstr "发送您的反馈失败。可能服务暂时不可用"
 
-#: include/php_setup.inc:102
-msgid "method"
-msgstr "方法"
+#: setup/class_setupStep_Feedback.inc:149
+msgid "Feedback sucessfully send"
+msgstr "反馈成功发出"
 
-#: include/php_setup.inc:135
-msgid "Trace"
-msgstr "跟踪"
+#: setup/class_setupStep_Feedback.inc:183
+msgid ""
+"You should have enabled at least one option, to subscribe or send your "
+"feedback."
+msgstr "您应该启用至少一个选项，来订阅或发送您的反馈。"
 
-#: include/php_setup.inc:136
-msgid "Line"
-msgstr "行"
+#: setup/class_setup.inc:196
+msgid "Completed"
+msgstr "完成"
 
-#: include/php_setup.inc:137
-msgid "Arguments"
-msgstr "å\8f\82æ\95°"
+#: setup/setup_finish.tpl:3
+msgid "Create your configuration file"
+msgstr "å\88\9b建æ\82¨ç\9a\84é\85\8dç½®æ\96\87件"
 
-#: include/class_tabs.inc:198
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "删除进程被插件 '%s' 取消: %s"
+#: setup/setup_finish.tpl:13
+msgid "Download configuration"
+msgstr "下载配置"
 
-#: include/functions_dns.inc:169
-#, php-format
-msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
-msgstr "无法找到 dns 域 '%s' 的反向解析。停止解析这个域。"
+#: setup/setup_finish.tpl:18
+msgid "Status: "
+msgstr "状态: "
 
-#: include/functions_dns.inc:174
-#, php-format
-msgid ""
-"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
-"zone."
-msgstr "找到 %s 域的一个以上的反向解析域。退出域解析。"
+#: setup/setup_ldap.tpl:7
+msgid "Please choose the LDAP user to be used by GOsa"
+msgstr "请选择 GOsa 要用到的的 LDAP 用户。"
 
-#: include/functions_dns.inc:610
-#, php-format
-msgid ""
-"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
-msgstr "未定义的域名 '%s'。域名必须看起来像这样 'server/zone.com'。"
+#: setup/setup_ldap.tpl:25
+msgid "LDAP connection"
+msgstr "LDAP 连接"
 
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
-msgstr "无法使用 ssha 来加密。（缺少函数 mhash / sha1）"
+#: setup/setup_ldap.tpl:29
+msgid "Location name"
+msgstr "位置名称"
 
-#: include/class_pluglist.inc:116
-#, fuzzy, php-format
-msgid ""
-"Your %s information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
-msgstr ""
-"您的 gosa.conf 配置文件被部分修改。请用贡献的脚本 fix_config.sh 转换它。"
+#: setup/setup_ldap.tpl:37
+msgid "Connection URL"
+msgstr "连接 URL"
 
-#: include/class_pluglist.inc:130 include/class_pluglist.inc:131
-#: include/class_pluglist.inc:241
-msgid "Unknown"
-msgstr "未知"
+#: setup/setup_ldap.tpl:45
+msgid "TLS connection"
+msgstr "TLS 连接"
 
-#: include/class_pluglist.inc:138 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:15 ihtml/themes/default/framework.tpl:17
-#: ihtml/themes/default/framework.tpl:29 ihtml/themes/default/framework.tpl:33
-msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
-msgstr "您正在编辑一个数据项。您确认要丢弃当前的修改么？"
+#: setup/setup_ldap.tpl:69
+msgid "Authentication"
+msgstr "鉴权"
 
-#: include/class_CopyPasteHandler.inc:161
-#, php-format
-msgid "You are going to copy the entry '%s'."
-msgstr "您将要拷贝条目 '%s'。"
+#: setup/setup_ldap.tpl:73
+msgid "Admin DN"
+msgstr "管理员 DN"
 
-#: include/class_CopyPasteHandler.inc:225
-msgid "Paste"
-msgstr "粘贴"
+#: setup/setup_ldap.tpl:78
+msgid "Select user"
+msgstr "选择用户"
 
-#: include/class_CopyPasteHandler.inc:227
-msgid "Can't paste"
-msgstr "无法粘贴"
+#: setup/setup_ldap.tpl:86
+msgid "Automatically append LDAP base to admin DN"
+msgstr "自动添加 LDAP base 到 admin DN"
 
-#: include/class_config.inc:71
-#, fuzzy, php-format
-msgid "XML error in %s: %s at line %d"
-msgstr "XML 出错于 gosa.conf: %s ，行 %d"
+#: setup/setup_ldap.tpl:93
+msgid "Admin password"
+msgstr "管理员口令"
 
-#: include/class_config.inc:208 html/index.php:207
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr "无法绑定 LDAP。请联系系统管理员。"
+#: setup/setup_ldap.tpl:101
+msgid "Schema based settings"
+msgstr "Samba 设置"
 
-#: include/class_config.inc:510
-msgid "SID and/or RIDBASE missing in your configuration!"
-msgstr "您的配置文件缺少 SID 和/或 RIDBASE！"
+#: setup/setup_ldap.tpl:105
+msgid "Use rfc2307bis compliant groups"
+msgstr "使用符合 rfc2307bis 的组"
 
-#: html/getvcard.php:36
-msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr "é\94\99误: è¦\81导å\87ºå\88°ä¸\80个 vcardï¼\8cgetcvard.php é\9c\80è¦\81ä¸\80个å\8f\82æ\95°ï¼\81"
+#: setup/setup_ldap.tpl:117
+msgid "Current status"
+msgstr "å½\93å\89\8dç\8a¶æ\80\81"
 
-#: html/helpviewer.php:67
-msgid "Help browser"
-msgstr "帮助浏览器"
+#: setup/class_setupStep_Config1.inc:73 setup/class_setupStep_Config1.inc:74
+msgid "GOsa settings 1/3"
+msgstr "GOsa 设置 1/3"
 
-#: html/helpviewer.php:118
-msgid "There is no helpfile specified for this class"
-msgstr "此类没有帮助文件"
+#: setup/class_setupStep_Config1.inc:75
+msgid "GOsa generic settings"
+msgstr "GOsa 总体设置"
 
-#: html/helpviewer.php:265
+#: setup/class_setupStep_Config1.inc:117
 #, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
-msgstr "帮助目录 '%s' 不能访问，无法读取任何帮助文件。"
-
-#: html/getxls.php:65
-msgid "Birthday"
-msgstr "生日"
+msgid "The specified value for '%s' must be a numeric value"
+msgstr "指定 '%s' 的值必须是数字类型"
 
-#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
-#: html/getxls.php:236
-msgid "Surname"
-msgstr "姓"
+#: setup/class_setupStep_Config1.inc:117 setup/setup_config1.tpl:85
+msgid "GID / UID min id"
+msgstr "GID / UID min id"
 
-#: html/getxls.php:74
+#: setup/class_setupStep_Config1.inc:121 setup/class_setupStep_Config1.inc:125
 #, php-format
-msgid "User list of %s on %s"
-msgstr "%s 用户列表于 %s"
+msgid "Don't add a trailing comma to '%s'."
+msgstr "不要添加一个结尾的逗号到 '%s'。"
 
-#: html/getxls.php:94 html/getxls.php:227
-msgid "Members"
-msgstr "成员"
+#: setup/class_setupStep_Config1.inc:121
+msgid "People storage ou"
+msgstr "People storage ou"
 
-#: html/getxls.php:104 html/getxls.php:295
-#, php-format
-msgid "Groups of %s on %s"
-msgstr "%s 的用户组于 %s 上"
+#: setup/class_setupStep_Config1.inc:125
+msgid "Group storage ou"
+msgstr "Group storage ou"
 
-#: html/getxls.php:124 html/getxls.php:246
-msgid "Computers"
-msgstr "计算机"
+#: setup/class_setupStep_Config1.inc:129
+msgid "Uid base must be numeric"
+msgstr "Uid 必须是数字"
 
-#: html/getxls.php:133 html/getxls.php:174 html/getxls.php:336
-#: html/getxls.php:356
-msgid "Common name"
-msgstr "常用名"
+#: setup/class_setupStep_Config1.inc:133
+msgid "The given password minimum length is not numeric."
+msgstr "给出的口令最小长度不是数字。"
 
-#: html/getxls.php:149 html/getxls.php:151 html/getxls.php:158
-#: html/getxls.php:179 html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
-msgstr "服务器"
+#: setup/class_setupStep_Config1.inc:136
+msgid "The given password differ value is not numeric."
+msgstr "给出的口令差异值不是数字。"
 
-#: html/getxls.php:156 html/getxls.php:314
-#, php-format
-msgid "Servers of %s on %s"
-msgstr "%s服务器于%s"
+#: setup/class_setupStep_Config2.inc:83 setup/class_setupStep_Config2.inc:84
+msgid "GOsa settings 2/3"
+msgstr "GOsa 设置 2/3"
 
-#: html/getxls.php:174
-msgid "Home postal address"
-msgstr "住宅地址"
+#: setup/class_setupStep_Config2.inc:85
+msgid "Customize special parameters"
+msgstr "定制特殊参数"
 
-#: html/getxls.php:174
-msgid "Mobile phone"
-msgstr "移动电话"
+#: setup/setup_license.tpl:8
+msgid "I accept this license"
+msgstr ""
 
-#: html/getxls.php:174 html/getxls.php:236
-msgid "Postal address"
-msgstr "地址"
+#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
+msgid "LDAP inspection"
+msgstr "LDAP 检查"
 
-#: html/getxls.php:174
-msgid "Function"
-msgstr "å\8a\9fè\83½"
+#: setup/class_setupStep_Migrate.inc:107
+msgid "Analyze your current LDAP for GOsa compatibility"
+msgstr "å\88\86æ\9e\90æ\82¨å½\93å\89\8d LDAP ä¸\8e GOsa ç\9a\84å\85¼å®¹æ\80§"
 
-#: html/getxls.php:177 html/getxls.php:247
-msgid "Adressbook"
-msgstr "地址簿"
+#: setup/class_setupStep_Migrate.inc:113
+msgid "Checking for root object"
+msgstr "检查根对象"
 
-#: html/getxls.php:184 html/getxls.php:349
-#, php-format
-msgid "Adressbook of %s on %s"
-msgstr "%s 的地址簿，于 %s"
+#: setup/class_setupStep_Migrate.inc:119
+msgid "Checking permissions on LDAP database"
+msgstr "检查 LDAP 数据库权限"
 
-#: html/getxls.php:190
-msgid "Common Name"
-msgstr "常用名"
+#: setup/class_setupStep_Migrate.inc:125
+msgid "Checking for invisible deparmtments"
+msgstr "检查不可见部门"
 
-#: html/getxls.php:224
-msgid "Day of birth"
-msgstr "生日"
+#: setup/class_setupStep_Migrate.inc:131
+msgid "Checking for invisible users"
+msgstr "检查不可见用户"
 
-#: html/getxls.php:236
-msgid "Email address"
-msgstr "邮件地址"
+#: setup/class_setupStep_Migrate.inc:137
+msgid "Checking for super administrator"
+msgstr "检查超级用户"
 
-#: html/getxls.php:236
-msgid "Organizational unit"
-msgstr "组织/公司部门"
+#: setup/class_setupStep_Migrate.inc:143
+msgid "Checking for users outside the people tree"
+msgstr "检查用户树之外的用户"
 
-#: html/getxls.php:236
-msgid "Postal Code"
-msgstr "邮编"
+#: setup/class_setupStep_Migrate.inc:149
+msgid "Checking for groups outside the groups tree"
+msgstr "检查组子树外的组"
 
-#: html/getxls.php:236
-msgid "Surename"
-msgstr "姓"
+#: setup/class_setupStep_Migrate.inc:155
+msgid "Checking for windows workstations outside the winstation tree"
+msgstr "检查 winstation 树外的 Windows 工作站"
 
-#: html/getxls.php:236
-msgid "Title"
-msgstr "称谓"
+#: setup/class_setupStep_Migrate.inc:161
+msgid "Checking for duplicate uid numbers"
+msgstr "检查重复的 uid 数字"
 
-#: html/getxls.php:239
-msgid "Full"
-msgstr "全部"
+#: setup/class_setupStep_Migrate.inc:167
+msgid "Checking for duplicate gid numbers"
+msgstr "检查重复的 gid 数字"
 
-#: html/getxls.php:276
-#, php-format
-msgid "User List of %s on %s"
-msgstr "%s 用户列表于 %s"
+#: setup/class_setupStep_Migrate.inc:190 setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStep_Migrate.inc:301 setup/class_setupStep_Migrate.inc:362
+#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:504
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:718
+#: setup/class_setupStep_Migrate.inc:808
+msgid "LDAP query failed"
+msgstr "LDAP 查询失败。"
 
-#: html/getxls.php:330
-#, php-format
-msgid "Computers of %s on %s"
-msgstr "%s计算机于%s"
+#: setup/class_setupStep_Migrate.inc:191 setup/class_setupStep_Migrate.inc:240
+#: setup/class_setupStep_Migrate.inc:302 setup/class_setupStep_Migrate.inc:363
+#: setup/class_setupStep_Migrate.inc:431 setup/class_setupStep_Migrate.inc:505
+#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:719
+#: setup/class_setupStep_Migrate.inc:809
+msgid "Possibly the 'root object' is missing."
+msgstr "可能 '根对象' 缺失。"
 
-#: html/index.php:49 html/index.php:349
-msgid "Session will not be encrypted."
-msgstr "会话不会被加密。"
+#: setup/class_setupStep_Migrate.inc:213
+#, php-format
+msgid "Found %s duplicate values for attribute 'uidNumber'."
+msgstr "发现 %s 个有 'uidNumber' 属性重复的。"
 
-#: html/index.php:49 html/index.php:349
-msgid "Enter SSL session"
-msgstr "进入 SSL 会话"
+#: setup/class_setupStep_Migrate.inc:262
+#, php-format
+msgid "Found %s duplicate values for attribute 'gidNumber'."
+msgstr "发现 %s 个有 'gidNumber' 属性重复的。"
 
-#: html/index.php:117
-#, fuzzy, php-format
-msgid "GOsa configuration %s/%s is not readable. Aborted."
-msgstr "GOsa 配置 %s/gosa.conf 不可读取。退出。"
+#: setup/class_setupStep_Migrate.inc:317 setup/class_setupStep_Migrate.inc:518
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:858
+#: setup/class_setupStep_Migrate.inc:1600
+#: setup/class_setupStep_Migrate.inc:1613
+msgid "Failed"
+msgstr "失败"
 
-#: html/index.php:138
+#: setup/class_setupStep_Migrate.inc:319
 #, php-format
-msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr "目录 '%s' 作为编译目录无法访问！"
-
-#: html/index.php:222
 msgid ""
-"GOsa cannot retrieve information about the installed schema files. Please "
-"make sure, that this is possible."
-msgstr "GOsa 无法获取安装的 schema 文件信息。请确认。"
+"Found %s winstations outside the predefined winstation department ou '%s'."
+msgstr "发现 %s winstation 位于预定义的 winstation 部门 ou '%s' 之外。"
 
-#: html/index.php:238
-msgid ""
-"Your ldap setup contains old schema definitions. Please re-run the setup."
-msgstr "您 LDAP 的设置包含老的 schema 定义。请重新执行安装。"
+#: setup/class_setupStep_Migrate.inc:320 setup/class_setupStep_Migrate.inc:599
+#: setup/class_setupStep_Migrate.inc:728
+msgid "Migrate"
+msgstr "迁移"
 
-#: html/index.php:257 ihtml/themes/altlinux/setup_useradmin.tpl:6
-#: ihtml/themes/default/setup_useradmin.tpl:6
-msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
-msgstr "您的 GOsa 缺少一个管理员账号，您不能进行任何管理操作！"
+#: setup/class_setupStep_Migrate.inc:387
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
+msgstr "发现 %s 组在定义的树 '%s' 之外。"
 
-#: html/index.php:265
-msgid "Please specify a valid username!"
-msgstr "请输入一个有效的用户名！"
+#: setup/class_setupStep_Migrate.inc:388 setup/class_setupStep_Migrate.inc:464
+msgid "Move"
+msgstr "移动"
 
-#: html/index.php:267
-msgid "Please specify your password!"
-msgstr "请输入您的口令！"
+#: setup/class_setupStep_Migrate.inc:463
+#, php-format
+msgid "Found %s user(s) outside the configured tree '%s'."
+msgstr "发现 %s 用户在定义的树 '%s' 之外。"
 
-#: html/index.php:274
-msgid "Please check the username/password combination."
-msgstr "请检查用户名/口令。"
+#: setup/class_setupStep_Migrate.inc:520 setup/class_setupStep_Migrate.inc:533
+#, php-format
+msgid ""
+"The specified user '%s' does not have full access to your ldap database."
+msgstr "指定用户 '%s' 在您的 LDAP 数据库中没有完全权限。"
 
-#: html/index.php:303
-msgid "Account locked. Please contact your system administrator."
-msgstr "账户锁定。请联系管理员。"
+#: setup/class_setupStep_Migrate.inc:597
+#, php-format
+msgid "Found %s user(s) that will not be visible in GOsa."
+msgstr "发现 %s 用户在 GOsa 中不可见。"
 
-#: html/index.php:355
+#: setup/class_setupStep_Migrate.inc:647 setup/class_setupStep_Migrate.inc:779
+#, php-format
 msgid ""
-"Your browser has cookies disabled. Please enable cookies and reload this "
-"page before logging in!"
-msgstr "您的浏览器已经禁用 cookies。请启用 cookies 并在登录前重新加载本页面！"
+"Failed to migrate the department '%s' into GOsa, error message is as follows "
+"'%s'."
+msgstr "迁移部门 '%s' 到 GOsa 失败，错误信息如下 '%s'。"
 
-#: html/getkiosk.php:25
+#: setup/class_setupStep_Migrate.inc:727
 #, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
-msgstr "无法打开文件 '%s'，可能是文件不存在。"
+msgid "Found %s department(s) that will not be visible in GOsa."
+msgstr "发现 %s 部门在 GOsa 中不可见。"
 
-#: html/getkiosk.php:30
+#: setup/class_setupStep_Migrate.inc:859
+msgid "There is no GOsa administrator account inside your LDAP."
+msgstr "在您的 LDAP 中没有 GOsa 管理员账号。"
+
+#: setup/class_setupStep_Migrate.inc:922
+msgid "Appending user to group administrational group:"
+msgstr "添加用户到管理员组："
+
+#: setup/class_setupStep_Migrate.inc:923
+msgid "Before"
+msgstr "之前"
+
+#: setup/class_setupStep_Migrate.inc:926
+msgid "After"
+msgstr "之后"
+
+#: setup/class_setupStep_Migrate.inc:933 setup/class_setupStep_Migrate.inc:967
 #, php-format
-msgid "Can't read file '%s', check permissions."
-msgstr "无法读取文件'%s'，检查权限。"
+msgid "Adding acls for user '%s' failed, ldap says '%s'."
+msgstr "为用户 '%s' 添加 acl 失败，LDAP 服务器报告说 '%s'。"
 
-#: html/getfax.php:53
-msgid "Could not connect to database server!"
-msgstr "无法连接到数据库!"
+#: setup/class_setupStep_Migrate.inc:958
+msgid "Creating new administrational group:"
+msgstr "创建新的管理组："
 
-#: html/getfax.php:55
-msgid "Could not select database!"
-msgstr "æ\97 æ³\95é\80\89æ\8b©æ\95°æ\8d®åº\93ï¼\81"
+#: setup/class_setupStep_Migrate.inc:994
+msgid "Specified passwords are empty or not equal."
+msgstr "æ\8f\90ä¾\9bç\9a\84å\8f£ä»¤ä¸ºç©ºæ\88\96è\80\85ä¸\8då\8c¹é\85\8dã\80\82"
 
-#: html/getfax.php:60 html/getfax.php:68
-msgid "Database query failed!"
-msgstr "数据库查询失败！"
+#: setup/class_setupStep_Migrate.inc:999
+msgid "Please specify a valid uid."
+msgstr "请输入一个有效的 uid。"
 
-#: html/main.php:165
+#: setup/class_setupStep_Migrate.inc:1041
+#, php-format
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
-msgstr "致命错误：全局注册已打开。GOsa 将拒绝登录直到被管理修正。"
+"Could not add administrative user, there is already an object with the same "
+"dn '%s' in your ldap database."
+msgstr "无法添加管理员，在您的 LDAP 数据库中已经有相同 dn '%s' 的记录。"
 
-#: html/main.php:221
-msgid "Warning: memory is getting low - please increase the memory_limit!"
-msgstr "警告: 内存过少──请提高 memory_limit 设置！"
+#: setup/class_setupStep_Migrate.inc:1079
+#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1175
+msgid "Couldn't move users to specified department."
+msgstr "无法移动用户到指定的部门。"
 
-#: html/main.php:350
-#, php-format
-msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
-msgstr "警告： 没有发现针对插件 '%s' 的任何插件定义！"
+#: setup/class_setupStep_Migrate.inc:1089
+msgid "Winstation will be moved from"
+msgstr "工作站将要移动，从"
 
-#: html/main.php:365
-msgid "Your password is about to expire, please change your password"
-msgstr "您的口令就要过期，请修改您的口令"
+#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1137
+#: setup/class_setupStep_Migrate.inc:1185
+msgid "to"
+msgstr "至"
 
-#: html/main.php:389
-msgid ""
-"Generating this page caused the W3C          conformance checker to raise "
-"some errors!"
-msgstr "这个页面的创建导致 W3C 标准检测程序发现了些错误！"
+#: setup/class_setupStep_Migrate.inc:1100
+#: setup/class_setupStep_Migrate.inc:1148
+msgid "Updating following references too"
+msgstr "还要更新如下参照"
 
-#: html/get_attachment.php:47
-msgid ""
-"Can't connect to glpi database, there is no mysl extension available in your "
-"php setup."
-msgstr "无法连接到 glpi 数据库，PHP 没有安装 mysql 扩展。"
+#: setup/class_setupStep_Migrate.inc:1137
+msgid "Group will be moved from"
+msgstr "组将要移动，从"
 
-#: html/get_attachment.php:55
-msgid ""
-"Can't connect to specified database, please check your glpi configuration."
-msgstr "无法连接到指定数据库，请检查您 glpi 设置。"
+#: setup/class_setupStep_Migrate.inc:1185
+msgid "User will be moved from"
+msgstr "用户将要移动，从"
 
-#: html/get_attachment.php:64
-msgid "Can't get specified attachment file, there is no entry with this id."
-msgstr "无法获取指定的附件文件，没有和该 id 匹配的条目。"
+#: setup/class_setupStep_Migrate.inc:1195
+msgid "The following references will be updated"
+msgstr "下列参照将被更新"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: setup/class_setupStep_Migrate.inc:1601
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"大小限制选项会让 LDAP 操作更快，以免使 LDAP 服务器过载。最简单让大数据库处理"
-"不发成长时间超时的办法是，将查询缩小到更少并且使用过滤器。"
+"The LDAP root object is missing. It is required to use your LDAP service."
+msgstr "LDAP 根对象缺失。它是使用 LDAP 服务必须的。"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "请选择响应这个会话的方法"
+#: setup/class_setupStep_Migrate.inc:1602
+#: setup/class_setupStep_Migrate.inc:1615
+msgid "Try to create root object"
+msgstr "尝试创建根对象"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "忽略错误并显示 LDAP 服务器返回的所有条目"
+#: setup/class_setupStep_Migrate.inc:1614
+msgid "Root object couldn't be created, you should try it on your own."
+msgstr "根对象无法创建，您自己应该尝试一下。"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr "忽略错误并显示在定义限制长度内的所有条目，并让我使用过滤器。"
+#: setup/class_setupStep_Migrate.inc:1904
+#, php-format
+msgid "Failed to copy '%s' to '%s'. LDAP says '%s'."
+msgstr "拷贝 '%s' 到 '%s' 失败。LDAP 报告说 '%s'。"
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your username and password to log in"
-msgstr "请用您的用户名和口令登录"
+#: setup/class_setupStep_Migrate.inc:1907
+msgid "Something went wrong while copying dns."
+msgstr "拷贝 dns 时出错。"
 
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
-msgid "Directory"
-msgstr "目录"
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
+msgid "GOsa settings 3/3"
+msgstr "GOsa 设置 3/3"
 
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr "登录"
+#: setup/class_setupStep_Config3.inc:75
+msgid "Tweak some GOsa core behaviour"
+msgstr "调整一些 GOsa 核心行为"
 
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
-msgstr "点击这里登录"
+#: setup/class_setupStep_Config3.inc:186
+msgid "Session lifetime must be a numeric value."
+msgstr "会话生存期必须是数字。"
 
-#: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
-msgid "Session conflict detected"
-msgstr "æ£\80æµ\8bé\81\93ä¼\9aè¯\9då\86²çª\81"
+#: setup/class_setupStep_Config3.inc:190
+msgid "Maximal ldap query time must be a numeric value. "
+msgstr "æ\9c\80é\95¿ ldap æ\9f¥è¯¢æ\97¶é\97´å¿\85é¡»æ\98¯æ\95°å­\97ã\80\82"
 
-#: ihtml/themes/altlinux/conflict.tpl:6
-msgid ""
-"Probably there's another active instance of your session. Multiple window "
-"operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the 'Logout' button will close this session."
-msgstr ""
-"可能已经存在另外一个您的活动的会话。多窗口操作在技术上不可能并且和严重依赖您"
-"使用浏览器。使用不同的浏览器（如 IE 和 Mozilla）是可能的。按“退出”按钮关闭此"
-"会话。"
+#: setup/setup_language.tpl:3
+msgid "Please select the preferred language"
+msgstr "请选择首选语种"
 
-#: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: setup/setup_language.tpl:5
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
+"At this point, you can select the site wide default language. Choosing "
+"'automatic' will use the language requested by the browser. This setting can "
+"be overriden per user."
 msgstr ""
-"忽略这条信息将会修改/破坏您当前编辑的数据，所以请关闭多个窗口并重新登录。"
+"现在，您可以选择站点缺省语言。选择自动将根据浏览器自动选择。每个用户可以有自"
+"己的设置。"
 
-#: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
-msgid "Logout"
-msgstr "退出"
+#: setup/setup_language.tpl:9
+msgid "Please your preferred language here"
+msgstr "在此选择您的首选语种"
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
-#: ihtml/themes/default/setup_introduction.tpl:1
-msgid "Welcome to the GOsa setup!"
-msgstr "欢迎进入 Gosa 安装程序！"
+#: setup/setup_feedback.tpl:8
+msgid "Subscribe to the gosa-announce mailinglist"
+msgstr "订阅 gosa-announce 邮件列表"
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:4
+#: setup/setup_feedback.tpl:11
 msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic informations for your LDAP "
-"connectivity, we're going to check your LDAP setup."
+"When checking this option, GOsa will try to connect http://oss.gonicus.de in "
+"order to subscribe you to the gosa-announce mailing list. You've to confirm "
+"this by mail."
 msgstr ""
-"看起来您是第一次访问 GOsa ── 没有发现配置文件。安装程序将通过三个主要步骤帮助"
-"您创建一个可用配置文件： 首先我们将检查 PHP 安装，查看依赖的模块是否安装了，"
-"然后我们检查需要的成讯，然后在您提供 LDAP 连接需要的基本信息后，我们将检查您 "
-"LDAP 的设置。"
+"当选择这个选项，GOsa 将要连接到 http://oss.gonicus.de，以便将你加入到 gosa-"
+"announce 邮件列表。您必须邮件确认。"
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr "您已经有了一个管理员账号和组。"
+#: setup/setup_feedback.tpl:43
+msgid "Send feedback to the GOsa project team"
+msgstr "发送反馈到 GOsa 项目组"
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: setup/setup_feedback.tpl:46
 msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
+"When checking this option, GOsa will try to connect http://oss.gonicus.de in "
+"order to submit your form anonymously."
 msgstr ""
-"要具有管理 GOsa 的全部权限，您需要创建一个特殊的组，并包含管理员账号。安装程"
-"序可以帮助您实现。输入想用的用户名和口令以创建缺失的记录。"
+"当选择这个选项，GOsa 将要连接到 http://oss.gonicus.de，以便匿名提交您的表单。"
 
-#: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:19
-msgid "Main"
-msgstr "首页"
+#: setup/setup_feedback.tpl:52
+msgid "Did the setup procedure help you to get started?"
+msgstr "安装过程是否帮助您顺利开始使用？"
 
-#: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:24
-msgid "Help"
-msgstr "帮助"
+#: setup/setup_feedback.tpl:62
+msgid "If not, what problems did you encounter"
+msgstr "如果没有，您遇到了什么问题"
 
-#: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:30 ihtml/themes/default/framework.tpl:34
-msgid "Sign out"
-msgstr "退出"
+#: setup/setup_feedback.tpl:70
+msgid "Is this the first time you use GOsa?"
+msgstr "这是您第一次使用 GOsa？"
 
-#: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:43
-msgid "Signed in:"
-msgstr "登录:"
+#: setup/setup_feedback.tpl:76
+msgid "I use it since"
+msgstr "我使用它，自从"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "检测到锁定冲突"
+#: setup/setup_feedback.tpl:77
+msgid "Select the year since when you are using GOsa"
+msgstr "选择从哪一年您开始使用 GOsa"
 
-#: ihtml/themes/altlinux/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the 'Remove' button."
-msgstr ""
-"如果锁检查失败，明显的是另外的人在进行编辑操作时关闭了浏览器。您可以通过按“删"
-"除”按钮删除锁文件。"
+#: setup/setup_feedback.tpl:84
+msgid "What operating system / distribution do you use?"
+msgstr "您使用什么操作系统/发行版？"
 
-#: ihtml/themes/altlinux/setup_step2.tpl:1
-#: ihtml/themes/altlinux/setup_step3.tpl:1
-#: ihtml/themes/altlinux/setup_step4.tpl:1
-#: ihtml/themes/default/setup_step2.tpl:1
-#: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
-msgid "Setup continued..."
-msgstr "安装继续..."
+#: setup/setup_feedback.tpl:92
+msgid "What web server do you use?"
+msgstr "您使用什么 web 服务器？"
 
-#: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
-msgid ""
-"Step two looks for a set of helper programms and checks if they have the "
-"correct minimum version."
-msgstr "第二步查找一系列帮助程序并检查他们的版本是否达到最低要求。"
+#: setup/setup_feedback.tpl:100
+msgid "What PHP version do you use?"
+msgstr "您使用什么版本的 PHP？"
 
-#: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4
-msgid ""
-"Now we're going include your LDAP server and create an initial "
-"configuration. After you've entered the server URI below, a quick check is "
-"performed if required LDAP schemas are in place. Samba versions are "
-"autodetected by the installed objectclasses. Details on how your LDAP tree "
-"is organized will be asked later on."
-msgstr ""
-"现在我们要包含您的 LDAP 服务器并创建一个初始配置。当您在下面输入 URI，将会执"
-"行一个针对需要的 LDAP schema 的快速检查。Samba 版本会根据安装的对象类自动判"
-"断。关于您的 LDAP 树的组织将在稍后被问到。"
+#: setup/setup_feedback.tpl:108
+msgid "LDAP"
+msgstr "LDAP"
 
-#: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10
-msgid ""
-"Please enter the server URI to allow the setup to connect your LDAP server "
-"(Example: ldap://your.server:389)."
-msgstr ""
-"请输入服务器 URI 来允许安装程序连接 LDAP 服务器 （如： ldap://your."
-"server:389）。"
+#: setup/setup_feedback.tpl:112
+msgid "What kind of LDAP server(s) do you use?"
+msgstr "您使用什么类型的 LDAP 服务器？"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:2
-#: ihtml/themes/default/setup_step4.tpl:2
-msgid ""
-"The following fields allow the basic configuration of GOsa's behaviour and "
-"affect various properties in your main configuration."
-msgstr "如下字段允许对 GOsa 的行为进行基本配置，并会影响主配置中各种参数。"
+#: setup/setup_feedback.tpl:118
+msgid "How many objects are in your LDAP?"
+msgstr "您的 LDAP 中有多少个对象？"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:7
-#: ihtml/themes/default/setup_step4.tpl:7
-msgid "Enter a description for the location you're configuring here"
-msgstr "为这里您配置的位置输入一个描述"
+#: setup/setup_feedback.tpl:125
+msgid "Features"
+msgstr "功能"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:11
-#: ihtml/themes/default/setup_step4.tpl:11 setup/setup_ldap.tpl:29
-msgid "Location name"
-msgstr "位置名称"
+#: setup/setup_feedback.tpl:128
+msgid "What features of GOsa do you use?"
+msgstr "您在使用 GOsa 什么功能？"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:18
-#: ihtml/themes/default/setup_step4.tpl:18
-msgid ""
-"GOsa always acts as admin and manages access rights internally. This is a "
-"workaround till OpenLDAP's in directory ACI's are fully implemented. For "
-"this to work, we need the admin DN and the corresponding password."
-msgstr ""
-"GOsa 总是作为 LDAP 管理员，并且管理内部权限。这是一个临时方案直到 OpenLDAP 目"
-"录 ACI 被完全实现。为了让其实现，我们需要管理员 DN 和正确的口令。"
+#: setup/setup_feedback.tpl:138
+msgid "What features do you want to see in future versions of GOsa?"
+msgstr "您希望 GOsa 未来版本具有什么功能？"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:23
-#: ihtml/themes/default/setup_step4.tpl:23 setup/setup_ldap.tpl:73
-msgid "Admin DN"
-msgstr "管理员 DN"
+#: setup/setup_feedback.tpl:145
+msgid "Send feedback"
+msgstr "发送反馈"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27 setup/setup_ldap.tpl:92
-msgid "Admin password"
-msgstr "管理员口令"
+#: setup/class_setupStep_Welcome.inc:38
+msgid "Welcome"
+msgstr "欢迎"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:34
-#: ihtml/themes/default/setup_step4.tpl:34 setup/setup_config1.tpl:211
-msgid ""
-"Some basic LDAP parameters are tunable and affect the locations where GOsa "
-"saves people and groups, including the way accounts get created. Check the "
-"values below if the fit your needs."
-msgstr ""
-"有的基本的 LDAP 参数是可调的，并影响位置Gosa 保存用户和组的地方。包括账号创建"
-"的方式。点击下面的值如果它们不符合您的需要。"
+#: setup/class_setupStep_Welcome.inc:39
+msgid "The welcome message"
+msgstr "欢迎信息"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:39
-#: ihtml/themes/default/setup_step4.tpl:39
-msgid "Base "
-msgstr "Base "
+#: setup/class_setupStep_Welcome.inc:40
+msgid "Welcome to GOsa setup wizard"
+msgstr "欢迎进入 Gosa 安装向导"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:43
-#: ihtml/themes/default/setup_step4.tpl:43
-#: setup/class_setupStep_Config1.inc:121
-msgid "People storage ou"
-msgstr ""
+#: setup/setup_config1.tpl:2
+msgid "Look and feel"
+msgstr "界面风格"
+
+#: setup/setup_config1.tpl:6
+msgid "Theme"
+msgstr "主题"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:47
-#: ihtml/themes/default/setup_step4.tpl:47
-msgid "People dn attribute"
-msgstr "People dn attribute"
+#: setup/setup_config1.tpl:15
+msgid "People and group storage"
+msgstr "用户和组存储"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:55
-#: ihtml/themes/default/setup_step4.tpl:55
-#: setup/class_setupStep_Config1.inc:125
-msgid "Group storage ou"
-msgstr ""
+#: setup/setup_config1.tpl:18
+msgid "People DN attribute"
+msgstr "用户 DN 属性"
+
+#: setup/setup_config1.tpl:29
+msgid "People storage subtree"
+msgstr "用户存储子树"
+
+#: setup/setup_config1.tpl:38
+msgid "Group storage subtree"
+msgstr "组存储子树"
+
+#: setup/setup_config1.tpl:47
+msgid "Include personal title in user DN"
+msgstr "在 用户 DN 中包含个人称谓"
+
+#: setup/setup_config1.tpl:58
+msgid "Relaxed naming policies"
+msgstr "松弛的命名规则"
+
+#: setup/setup_config1.tpl:69
+msgid "Automatic uids"
+msgstr "自动 uid"
+
+#: setup/setup_config1.tpl:101
+msgid "Number base for people/groups"
+msgstr "用户/组的起始数字"
+
+#: setup/setup_config1.tpl:109
+msgid "Hook for number base"
+msgstr "Hook for number base"
+
+#: setup/setup_config1.tpl:128
+msgid "Password encryption algorithm"
+msgstr "口令加密算法"
+
+#: setup/setup_config1.tpl:139
+msgid "Password restrictions"
+msgstr "口令约束"
+
+#: setup/setup_config1.tpl:146 setup/setup_config1.tpl:150
+msgid "Password minimum length"
+msgstr "口令最小长度"
+
+#: setup/setup_config1.tpl:157 setup/setup_config1.tpl:161
+msgid "Different characters from old password"
+msgstr "和旧口令有不同字符"
+
+#: setup/setup_config1.tpl:170
+msgid "Password change hook"
+msgstr "口令修改钩子"
+
+#: setup/setup_config1.tpl:186
+msgid "Use SASL for kerberos"
+msgstr "为 kerberos 使用 SASL"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:59
-#: ihtml/themes/default/setup_step4.tpl:59
-msgid "ID base for users/groups"
-msgstr "用户/组起始 ID"
+#: setup/setup_config1.tpl:197
+msgid "Use account expiration"
+msgstr "用户账号过期"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:67
-#: ihtml/themes/default/setup_step4.tpl:67 setup/setup_config1.tpl:209
+#: setup/setup_config1.tpl:209
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
 "adjustable via user templates, but you can specify a default method to be "
@@ -14317,1786 +15991,1620 @@ msgstr ""
 "GOsa 支持好几种口令加密算法。通常可以通过用户模板调整算法，但是在这里您可以定"
 "义一个缺省方法。"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:72
-#: ihtml/themes/default/setup_step4.tpl:72
-msgid "Encryption algorithm"
-msgstr "加密算法"
+#: setup/setup_config1.tpl:210
+msgid ""
+"GOsa always acts as admin and manages access rights internally. This is a "
+"workaround till OpenLDAP's in directory ACI's are    fully implemented. For "
+"this to work, we need the admin DN and the corresponding password."
+msgstr ""
+"GOsa 总是以管理员身份进行内部访问控制管理。这是一个临时方案直到 OpenLDAP 目"
+"录 ACI 被完全实现。为了让其实现，我们需要管理员 DN 和相关口令。"
+
+#: setup/setup_config1.tpl:211
+msgid ""
+"Some basic LDAP parameters are tunable and affect the locations where GOsa "
+"saves people and groups, including the way accounts get created. Check the "
+"values below if the fit your needs."
+msgstr ""
+"有的基本的 LDAP 参数是可调的，并影响位置Gosa 保存用户和组的地方。包括账号创建"
+"的方式。点击下面的值如果它们不符合您的需要。"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:83
-#: ihtml/themes/default/setup_step4.tpl:83
+#: setup/setup_config1.tpl:212
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
-"interfaces to users mailboxes and general handling for quotas. You can "
+"interfaces to users mailboxes and general handling    for quotas. You can "
 "choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 "GOsa 通过模组支持几种邮件方法。这些方法提供用户邮箱的界面以及管理用户空间。您"
 "可以选择选择 dummy 插件以保持您的邮件设置不被更改。"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:88
-#: ihtml/themes/default/setup_step4.tpl:88 setup/setup_config2.tpl:99
-msgid "Mail method"
-msgstr "邮件方法"
-
-#: ihtml/themes/altlinux/setup_step4.tpl:99
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting. "
-"(But it  could be a security risk)  "
-msgstr ""
-"GOsa 可能导致 PHP 解析错误，尤其在 Beta 版本。有时候打开错误报告将会非常有"
-"用。（但是可能造成安全风险）"
-
-#: ihtml/themes/altlinux/setup_step4.tpl:103
-#: ihtml/themes/default/setup_step4.tpl:104
-msgid "Display PHP errors"
-msgstr "显示 PHP 错误"
+#: setup/setup_config2.tpl:6
+msgid "Samba hash generator"
+msgstr "Samba 口令生成器"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:106
-#: ihtml/themes/default/setup_step4.tpl:107
-msgid "true"
-msgstr "真"
+#: setup/setup_config2.tpl:15
+msgid "Samba SID"
+msgstr "Samba SID"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:107
-#: ihtml/themes/default/setup_step4.tpl:108
-msgid "false"
-msgstr "假"
+#: setup/setup_config2.tpl:31
+msgid "RID base"
+msgstr "RID base"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:115
-#: ihtml/themes/default/setup_step4.tpl:115
-msgid "Check"
-msgstr "检查"
+#: setup/setup_config2.tpl:46
+msgid "Workstation container"
+msgstr "工作站容器"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
-msgid "Setup finished"
-msgstr "安装完毕"
+#: setup/setup_config2.tpl:61
+msgid "Samba SID mapping"
+msgstr "Samba SID 映射"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3
-msgid ""
-"Basically the setup is finished. You can check the result of the schema "
-"check here and download the autogenerated gosa.conf below."
-msgstr ""
-"基本上该安装结束了。您可以检查这里的 schema 检查结果，然后从下面下载自动创建"
-"的 gosa.conf 配置文件。"
+#: setup/setup_config2.tpl:71
+#, fuzzy
+msgid "Timezone"
+msgstr "用户时区"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:7
-#: ihtml/themes/default/setup_finish.tpl:7
-msgid "Schema Configuration"
-msgstr "Schema 配置"
+#: setup/setup_config2.tpl:74
+#, fuzzy
+msgid "Please choose your preferred timezone here"
+msgstr "在此选择您的首选语种"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:12
-#: ihtml/themes/default/setup_finish.tpl:12
-msgid "Configuration File"
-msgstr "配置文件"
+#: setup/setup_config2.tpl:95
+msgid "Additional GOsa settings"
+msgstr "附加 GOsa 设置"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:14
-#: ihtml/themes/default/setup_finish.tpl:14
-msgid ""
-"GOsa setup has collected all data needed to create an initial configuration "
-"file. Save the the link below as your gosa.conf and place that file in /etc/"
-"gosa. Change it as needed."
-msgstr ""
-"GOsa 安装已经收集了所有创建配置文件所需要的数据。将下面的 gosa.conf 文件下载"
-"保存在 GOsa 配置目录中。如果需要可以手动修改配置文件。"
+#: setup/setup_config2.tpl:99
+msgid "Enable Copy & Paste"
+msgstr "启用拷贝和粘贴"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:17
-#: ihtml/themes/default/setup_finish.tpl:17 setup/setup_finish.tpl:13
-msgid "Download configuration"
-msgstr "下载配置"
+#: setup/setup_config2.tpl:111
+#, fuzzy
+msgid "Enable DNS extension"
+msgstr "启用该设备 DNS"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:20
-#: ihtml/themes/default/setup_finish.tpl:20
+#: setup/setup_config2.tpl:123
 #, fuzzy
-msgid ""
-"After placing the file under /etc/gosa, place make sure that the webserver "
-"user is able to read gosa.conf, while other users shouldn't. You may want to "
-"execute these commands to achieve this requirement:"
-msgstr ""
-"将文件保存在 GOsa 配置文件目录中，确认 Web 服务器运行的账号能够读取 gosa."
-"conf，其他用户则无权访问。您可以执行如下命令来实现："
+msgid "Enable DHCP extension"
+msgstr "LDAP 检查"
 
-#: ihtml/themes/default/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr ""
-"如果锁检查失败，明显的是另外的人在进行编辑操作时关闭了浏览器。您可以通过按“仍"
-"然编辑”按钮来接管这个锁文件。"
+#: setup/setup_config2.tpl:135
+#, fuzzy
+msgid "Enable mime type management"
+msgstr "邮件 mime type"
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
-msgstr "GOsa 帮助浏览器"
+#: setup/setup_config2.tpl:147
+msgid "Enable FAI release management"
+msgstr "启用 FAI 发布管理"
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr "索引"
+#: setup/setup_config2.tpl:159
+msgid "Enable user netatalk plugin"
+msgstr "启用 user netatalk 插件"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:1
-msgid "Copy &amp; paste wizard"
-msgstr "æ\8b·è´\9då\92\8cç²\98è´´ç²¾ç\81µ"
+#: setup/setup_config2.tpl:170
+msgid "Government mode"
+msgstr "æ\94¿åº\9c模å¼\8f"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:2
-msgid "Object to be pasted"
-msgstr "要粘贴的对象"
+#: setup/setup_config2.tpl:183
+msgid "Mail method"
+msgstr "邮件方法"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:6
-msgid ""
-"Some values need to be unique in the complete directory while some "
-"combinations make no sense. GOsa shows the relevant attributes. Please "
-"maintain the values below to fullfill the policies."
-msgstr ""
-"有的变量需要在整个目录中保持唯一，而有的组合没有意义。GOsa 显示有关属性。请按"
-"照这个原则维护其取值。"
+#: setup/setup_config2.tpl:197
+msgid "Vacation templates"
+msgstr "假期模板"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:22
-msgid "Operation complete"
-msgstr "操作完成"
+#: setup/setup_config2.tpl:213
+msgid "Use Cyrus UNIX style"
+msgstr "使用 Cyrus Unix 风格"
 
-#: ihtml/themes/default/conflict.tpl:6
-msgid ""
-"Probably there's another active instance of your session. Multiple window "
-"operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the 'Logout'button will close this session."
-msgstr ""
-"可能已经存在另外一个您的活动的会话。多窗口操作在技术上不可能并且和严重依赖您"
-"使用浏览器。使用不同的浏览器（如 IE 和 Mozilla）是可能的。按“退出”按钮关闭此"
-"会话。"
+#: setup/setup_config3.tpl:2
+msgid "GOsa core settings"
+msgstr "GOsa 核心设置"
 
-#: ihtml/themes/default/setup_introduction.tpl:4
-msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic information for your LDAP "
-"connectivity, we're going to check your LDAP setup."
-msgstr ""
-"看起来您是第一次访问 GOsa ── 没有发现配置文件。安装程序将通过三个主要步骤帮助"
-"您创建一个可用配置文件： 首先我们将检查 PHP 安装，查看依赖的模块是否安装了，"
-"然后我们检查需要的成讯，然后在您提供 LDAP 连接需要的基本信息后，我们将检查您 "
-"LDAP 的设置。"
+#: setup/setup_config3.tpl:6
+msgid "Disable primary group filter"
+msgstr "禁用主要组过滤器"
 
-#: ihtml/themes/default/setup_introduction.tpl:17
-msgid ""
-"You can also use the new and more-advanced way of inspecting your PHP-"
-"installation. It will give you information about the exact function that "
-"could not be found (functions that could be found are not mentioned). This "
-"is useful if you know what you're doing."
-msgstr ""
-"您也可以使用新的和更高级的方法来检测 PHP 安装。它将给出关于哪些函数没有被发现"
-"的信息（发现的函数将不被提及）。如果您知道您在做什么的话，这非常有帮助。"
+#: setup/setup_config3.tpl:18
+#, fuzzy
+msgid "Display summary in listings"
+msgstr "显示匹配的宏"
 
-#: ihtml/themes/default/setup_introduction.tpl:19
-msgid "Toggle Show/Hide"
-msgstr "切换显示/隐藏"
+#: setup/setup_config3.tpl:30
+msgid "Honour administrative units"
+msgstr "Honour administrative units"
 
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
-msgstr "您的 GOsa 会话已经过期！"
+#: setup/setup_config3.tpl:42
+msgid "Smarty compile directory"
+msgstr "Smarty 编译目录"
 
-#: ihtml/themes/default/logout.tpl:7
-msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
+#: setup/setup_config3.tpl:51
+msgid "SNMP community"
 msgstr ""
-"上一次操作 GOsa 界面是在很长时间之前。出于安全上的考虑，已经关闭了连接。要继"
-"续执行管理任务，请重新登录。"
-
-#: ihtml/themes/default/logout.tpl:10
-msgid "Sign in again"
-msgstr "重新登录"
 
-#: ihtml/themes/default/accountexpired.tpl:15
-msgid "Your Password has expired !! Choose a new Password"
-msgstr "您的口令已经过期 !! 选择一个新口令"
+#: setup/setup_config3.tpl:60
+msgid "Path for PPD storage"
+msgstr "PPD 存储路径"
 
-#: ihtml/themes/default/accountexpired.tpl:23
-#: ihtml/themes/default/accountexpired.tpl:27
-msgid "Old Password"
-msgstr "旧口令"
+#: setup/setup_config3.tpl:76
+msgid "Path for kiosk profile storage"
+msgstr "Kiosk profile 存储路径"
 
-#: ihtml/themes/default/accountexpired.tpl:32
-#: ihtml/themes/default/accountexpired.tpl:36
-msgid "New Password"
-msgstr "新口令"
+#: setup/setup_config3.tpl:94
+#, fuzzy
+msgid "Enable system deployment"
+msgstr "邮件系统管理"
 
-#: ihtml/themes/default/accountexpired.tpl:41
-#: ihtml/themes/default/accountexpired.tpl:45
-msgid "Verify Password"
-msgstr "口令确认"
+#: setup/setup_config3.tpl:113
+msgid "Network resolv hook"
+msgstr "Network 解析钩子"
 
-#: ihtml/themes/default/accountexpired.tpl:51
-msgid "Change Password"
-msgstr "修改口令"
+#: setup/setup_config3.tpl:131
+msgid "Mail queue script"
+msgstr "邮件队列脚本"
 
-#: ihtml/themes/default/accountexpired.tpl:52
-msgid "Click here to Change your password"
-msgstr "点击这里来修改您的口令"
+#: setup/setup_config3.tpl:149
+msgid "Notification script"
+msgstr "通知脚本"
 
-#: ihtml/themes/default/setup_step4.tpl:100
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
-msgstr ""
-"GOsa 可能导致 PHP 解析错误，尤其在 Beta 版本。有时候打开错误报告将会非常有"
-"用。"
+#: setup/setup_config3.tpl:165
+msgid "Login and session"
+msgstr "登录和会话"
 
-#: setup/class_setup.inc:210
+#: setup/setup_config3.tpl:168
 #, fuzzy
-msgid "Completed"
-msgstr "不完整"
+msgid "Allow login with users mail address"
+msgstr "允许登录到终端服务器"
 
-#: setup/class_setupStep_Ldap.inc:53
-#, fuzzy
-msgid "LDAP setup"
-msgstr "LDAP 服务器"
+#: setup/setup_config3.tpl:179
+msgid "Enforce register_globals to be deactivated"
+msgstr "强制 register_globals 为不活动"
 
-#: setup/class_setupStep_Ldap.inc:54
-#, fuzzy
-msgid "LDAP connection setup"
-msgstr "断开"
+#: setup/setup_config3.tpl:191
+msgid "Enforce encrypted connections"
+msgstr "强制加密连接"
 
-#: setup/class_setupStep_Ldap.inc:55
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"GOsa."
-msgstr ""
+#: setup/setup_config3.tpl:203
+msgid "Warn if session is not encrypted"
+msgstr "如果会话不加密警告"
 
-#: setup/class_setupStep_Ldap.inc:99
-#, fuzzy, php-format
-msgid "Anonymous bind failed on server '%s'."
-msgstr "为服务器 '%s' 插入新宏失败。"
+#: setup/setup_config3.tpl:215
+msgid "Session lifetime"
+msgstr "会话生存期"
 
-#: setup/class_setupStep_Ldap.inc:101
-#, fuzzy, php-format
-msgid "Bind as user '%s' failed on server '%s'."
-msgstr "为服务器 '%s' 插入新宏失败。"
-
-#: setup/class_setupStep_Ldap.inc:106
-#, php-format
-msgid "Anonymous bind on server '%s' succeeded."
-msgstr ""
+#: setup/setup_config3.tpl:223
+msgid "Debugging"
+msgstr "Debugging"
 
-#: setup/class_setupStep_Ldap.inc:107
-#, fuzzy
-msgid "Please specify user and password."
-msgstr "请输入您的口令！"
+#: setup/setup_config3.tpl:227
+msgid "Show PHP errors"
+msgstr "显示 PHP 错误"
 
-#: setup/class_setupStep_Ldap.inc:109
-#, fuzzy, php-format
-msgid "Bind as user '%s' on server '%s' succeeded."
-msgstr "无法在主服务器 '%s' 上选择数据库 '%s'。"
+#: setup/setup_config3.tpl:239
+msgid "Maximum LDAP query time"
+msgstr "最大 LDAP 查询时间"
 
-#: setup/class_setupStep_Finish.inc:38
-#, fuzzy
-msgid "Write configuration file"
-msgstr "配置文件"
+#: setup/setup_config3.tpl:257
+msgid "Log LDAP statistics"
+msgstr "Log LDAP 状态"
 
-#: setup/class_setupStep_Finish.inc:39
-#, fuzzy
-msgid "Finish - write the configuration file"
-msgstr "需要 XML 功能来解析配置文件。"
+#: setup/setup_config3.tpl:269
+msgid "Debug level"
+msgstr "Debug 级别"
 
-#: setup/class_setupStep_Finish.inc:100
-msgid ""
-"Your configuration file is currently world readable. Please updated the file "
-"permissions!"
-msgstr ""
+#: setup/setup_config3.tpl:274 setup/setup_config3.tpl:277
+msgid "Disabled"
+msgstr "禁用"
 
-#: setup/class_setupStep_Finish.inc:102
-#, fuzzy
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "GOsa 配置 %s/gosa.conf 不可读取。退出。"
+#: setup/setup_config3.tpl:275 setup/setup_config3.tpl:278
+msgid "Enabled"
+msgstr "启用"
 
-#: setup/class_setupStep_Finish.inc:111
-#, fuzzy, php-format
+#: setup/setup_migrate.tpl:5
 msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't. You may want to execute these commands to achieve this "
-"requirement:"
+"During the LDAP inspection, we're going to check for several common pitfalls "
+"that may occur when migration to GOsa base LDAP administration. You may want "
+"to fix the problems below, in order to provide smooth services."
 msgstr ""
-"将文件保存在 GOsa 配置文件目录中，确认 Web 服务器运行的账号能够读取 gosa."
-"conf，其他用户则无权访问。您可以执行如下命令来实现："
-
-#: setup/class_setupStep_License.inc:53 setup/class_setupStep_License.inc:54
-#, fuzzy
-msgid "License"
-msgstr "行"
+"在 LDAP 检查中，我们将检查当迁移至基于 GOsa 的 LDAP 管理时遇到的几个常见陷"
+"阱。为了提供平滑的服务，您可能想要修正下面的问题。to fix the problems below, "
+"in order to provide smooth services."
 
-#: setup/class_setupStep_License.inc:55
-msgid "Terms and conditions for usage"
-msgstr ""
+#: setup/setup_migrate.tpl:33
+msgid "Check again"
+msgstr "再次检查"
 
-#: setup/setup_ldap.tpl:7
-msgid "Please choose the LDAP user to be used by GOsa"
-msgstr ""
+#: setup/setup_migrate.tpl:37
+msgid "Move windows workstations into a valid windows workstation department"
+msgstr "移动 Windows 工作站到一个有效 Windows 工作站部门"
 
-#: setup/setup_ldap.tpl:25
-#, fuzzy
-msgid "LDAP connection"
-msgstr "断开"
+#: setup/setup_migrate.tpl:39
+msgid ""
+"This dialog allows you to move the displayed windows workstations into a "
+"valid department"
+msgstr "这个对话框允许您移动显示的 Windows 工作站到一个有效的部门"
 
-#: setup/setup_ldap.tpl:37
-#, fuzzy
-msgid "Connection URL"
-msgstr "连接 URL"
+#: setup/setup_migrate.tpl:41
+msgid ""
+"Be careful with this tool, there may be references pointing to this "
+"workstations that can't be migrated."
+msgstr "小心使用这个工具，可能有引用指向这些工作站无法迁移。"
 
-#: setup/setup_ldap.tpl:45
-#, fuzzy
-msgid "TLS connection"
-msgstr "连接"
+#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:120
+#: setup/setup_migrate.tpl:171 setup/setup_migrate.tpl:294
+#: setup/setup_migrate.tpl:347
+msgid "Select all"
+msgstr "选择所有"
 
-#: setup/setup_ldap.tpl:65
-#, fuzzy
-msgid "Reload"
-msgstr "读"
+#: setup/setup_migrate.tpl:67
+msgid "Move selected windows workstations into the following GOsa department"
+msgstr "移动选择的 Windows 工作站到如下的 GOsa 部门"
 
-#: setup/setup_ldap.tpl:69
-#, fuzzy
-msgid "Authentication"
-msgstr "Nagios 鉴权"
+#: setup/setup_migrate.tpl:72
+msgid "Move selected workstations"
+msgstr "移动所选工作站"
 
-#: setup/setup_ldap.tpl:77
-#, fuzzy
-msgid "Select user"
-msgstr "删除用户"
+#: setup/setup_migrate.tpl:73
+msgid "What will be done here"
+msgstr "这里将要完成的"
 
-#: setup/setup_ldap.tpl:85
-msgid "Automatically append LDAP base to admin DN"
-msgstr ""
+#: setup/setup_migrate.tpl:85
+msgid "Move groups into configured group tree"
+msgstr "移动组到配置的组树"
 
-#: setup/setup_ldap.tpl:100
-#, fuzzy
-msgid "Schema based settings"
-msgstr "Samba 设置"
+#: setup/setup_migrate.tpl:88
+msgid ""
+"This dialog allows moving a couple of groups to the configured group tree. "
+"Doing this may straighten your LDAP service."
+msgstr "这个对话框允许移动部分组到配置的组子树。这么做可以整理您的 LDAP 服务。"
 
-#: setup/setup_ldap.tpl:104
-msgid "Use rfc2307bis compliant groups"
+#: setup/setup_migrate.tpl:91
+msgid ""
+"Be careful with this option! There may be references pointing to these "
+"groups. The GOsa setup can't migrate references, so you may want to cancel "
+"the migration in this case in this case."
 msgstr ""
+"小心这个选项！可能有引用指向这些组。GOsa 安装程序不能迁移引用，这种情况下您可"
+"能想要取消迁移。"
 
-#: setup/setup_ldap.tpl:116
-#, fuzzy
-msgid "Current status"
-msgstr "当前版本"
-
-#: setup/class_setupStep_Language.inc:40 setup/class_setupStep_Language.inc:41
-#, fuzzy
-msgid "Language setup"
-msgstr "语言"
+#: setup/setup_migrate.tpl:94
+msgid "Move selected groups into this group tree"
+msgstr "移动选择的组到这个子树"
 
-#: setup/class_setupStep_Language.inc:42
-msgid "This step allows you to select your preferred language."
-msgstr ""
+#: setup/setup_migrate.tpl:123 setup/setup_migrate.tpl:175
+#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
+msgid "Hide changes"
+msgstr "隐藏修改"
 
-#: setup/class_setupStep_Language.inc:47
-#, fuzzy
-msgid "Automatic"
-msgstr "自动"
+#: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
+#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
+msgid "Show changes"
+msgstr "显示修改"
 
-#: setup/class_setupStep_Language.inc:51
-#, fuzzy
-msgid "Chinese"
-msgstr "芯片组"
+#: setup/setup_migrate.tpl:138
+msgid "Move users into configured user tree"
+msgstr "移动用户到已配置用户树"
 
-#: setup/class_setupStep_Feedback.inc:91
-msgid "UNIX accounts/groups"
+#: setup/setup_migrate.tpl:140
+msgid ""
+"This dialog allows moving a couple of users to the configured user tree. "
+"Doing this may straighten your LDAP service."
 msgstr ""
+"这个对话框允许移动部分用户到配置的用户子树。这么做可以整理您的 LDAP 服务。"
 
-#: setup/class_setupStep_Feedback.inc:93
-#, fuzzy
-msgid "Samba management"
-msgstr "系统管理"
-
-#: setup/class_setupStep_Feedback.inc:95
-#, fuzzy
-msgid "Mailsystem management"
-msgstr "系统管理"
-
-#: setup/class_setupStep_Feedback.inc:97
-#, fuzzy
-msgid "FAX system administration"
-msgstr "用户管理"
+#: setup/setup_migrate.tpl:143
+msgid ""
+"Be careful with this option! There may be references pointing to these "
+"users. The GOsa setup can't migrate references, so you may want to cancel "
+"the migration in this case."
+msgstr ""
+"小心这个选项！可能有引用指向这些用户。GOsa 安装程序不能迁移引用，这种情况下您"
+"可能想要取消迁移。"
 
-#: setup/class_setupStep_Feedback.inc:99
-#, fuzzy
-msgid "Asterisk administration"
-msgstr "用户管理"
+#: setup/setup_migrate.tpl:146
+msgid "Move selected users into this people tree"
+msgstr "移动用户到用户子树"
 
-#: setup/class_setupStep_Feedback.inc:101
-#, fuzzy
-msgid "System inventory"
-msgstr "删除 inventory"
+#: setup/setup_migrate.tpl:196
+msgid "Next"
+msgstr "下一个"
 
-#: setup/class_setupStep_Feedback.inc:103
-#, fuzzy
-msgid "System / Config management"
-msgstr "系统管理"
+#: setup/setup_migrate.tpl:199
+msgid "Create a new GOsa administrator account"
+msgstr "创建一个新的 GOsa 管理员账号"
 
-#: setup/class_setupStep_Feedback.inc:111
-#: setup/class_setupStep_Feedback.inc:113
-msgid "Notification and feedback"
-msgstr ""
+#: setup/setup_migrate.tpl:202
+msgid ""
+"This dialog will automatically add a new super administrator to your LDAP "
+"tree."
+msgstr "这个对话框将要自动添加一个新的超级管理员到您的 LDAP 树。"
 
-#: setup/class_setupStep_Feedback.inc:112
-#, fuzzy
-msgid "Get notifications or send feedback"
-msgstr "主机通知命令"
+#: setup/setup_migrate.tpl:231
+msgid "Password (again)"
+msgstr "口令(重复)"
 
-#: setup/class_setupStep_Feedback.inc:140
-#, php-format
+#: setup/setup_migrate.tpl:259
 msgid ""
-"Could not connect to feedback server (%s). There is possibly no connection "
-"to the internet."
+"The listed departments are currenlty invisble in the GOsa user interface. If "
+"you want to change this for a couple of entries, select them and use the "
+"migrate button below."
 msgstr ""
+"列出的部门当前在 GOsa 用户界面中不可见。如果您想让部分条目可见，选择条目并点"
+"击其下的“迁移”按钮。"
 
-#: setup/class_setupStep_Feedback.inc:147
+#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
 msgid ""
-"Error while sending your feedback. The service is possible temporary "
-"unavailable"
+"If you want to know what will be done when migrating the selected entries, "
+"use the 'Show changes' button to see the LDIF."
 msgstr ""
+"如果您想要知道迁移选择条目到底做了些什么，使用“显示更改”按钮来显示 LDIF。"
 
-#: setup/class_setupStep_Feedback.inc:149
-msgid "Feedback sucessfully send"
-msgstr ""
+#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
+msgid "Current"
+msgstr "当前"
 
-#: setup/class_setupStep_Feedback.inc:183
+#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
+msgid "After migration"
+msgstr "迁移后"
+
+#: setup/setup_migrate.tpl:314
 msgid ""
-"You should have enabled at least one option, to subscribe or send your "
-"feedback."
+"The listed users are currenlty invisble in the GOsa user interface. If you "
+"want to change this for a couple of users, just select them and use the "
+"'Migrate' button below."
 msgstr ""
+"列出的用户当前在 GOsa 用户界面中不可见。如果您想让部分用户可见，选择用户并点"
+"击其下的“迁移”按钮。"
 
 #: setup/setup_frame.tpl:11
-#, fuzzy
 msgid "GOsa setup wizard"
-msgstr "GOsa 帮å\8a©æµ\8fè§\88å\99¨"
+msgstr "GOsa å®\89è£\85å\90\91导"
 
 #: setup/setup_frame.tpl:18
-#, fuzzy
 msgid "Installation"
-msgstr "Windows 工作站"
+msgstr "安装"
 
 #: setup/setup_frame.tpl:18
-#, fuzzy
 msgid "Steps"
-msgstr "停止"
+msgstr "步骤"
 
-#: setup/setup_finish.tpl:3
-#, fuzzy
-msgid "Create your configuration file"
-msgstr "配置文件"
+#: setup/class_setupStep_Schema.inc:40 setup/class_setupStep_Schema.inc:41
+msgid "LDAP schema check"
+msgstr "LDAP schema 检查"
 
-#: setup/setup_finish.tpl:18
-#, fuzzy
-msgid "Status: "
-msgstr "状态"
+#: setup/class_setupStep_Schema.inc:42
+msgid "Perform test on your current LDAP schema"
+msgstr "在您当前的 LDAP schema 上执行测试"
 
-#: setup/class_setupStep_Config1.inc:73 setup/class_setupStep_Config1.inc:74
-#, fuzzy
-msgid "GOsa settings 1/3"
-msgstr "邮件选项"
+#: setup/class_setupStep_Checks.inc:38 setup/class_setupStep_Checks.inc:39
+msgid "Installation check"
+msgstr "安装检查"
 
-#: setup/class_setupStep_Config1.inc:75
-#, fuzzy
-msgid "GOsa generic settings"
-msgstr "用户设置"
-
-#: setup/class_setupStep_Config1.inc:117
-#, fuzzy, php-format
-msgid "The specified value for '%s' must be a numeric value"
-msgstr "指定 '%s' 的值必须是数字类型。"
+#: setup/class_setupStep_Checks.inc:40
+msgid "Basic checks for PHP version and required extensions."
+msgstr "基本的 PHP 版本和所需扩展的检查。"
 
-#: setup/class_setupStep_Config1.inc:117 setup/setup_config1.tpl:85
-msgid "GID / UID min id"
-msgstr ""
+#: setup/class_setupStep_Checks.inc:64
+msgid "Checking PHP version"
+msgstr "检查 PHP 版本"
 
-#: setup/class_setupStep_Config1.inc:121 setup/class_setupStep_Config1.inc:125
+#: setup/class_setupStep_Checks.inc:65
 #, php-format
-msgid "Don't add a trailing comma to '%s'."
-msgstr ""
+msgid "PHP must be of version %s / %s or above."
+msgstr "PHP 必须是版本 %s / %s 或以上。"
 
-#: setup/class_setupStep_Config1.inc:129
-#, fuzzy
-msgid "Uid base must be numeric"
-msgstr "超时必须填数字"
+#: setup/class_setupStep_Checks.inc:66
+msgid ""
+"GOsa requires functionality that is not available (or buggy) in older PHP "
+"versions. Please update to a supported version."
+msgstr "GOsa 需要旧的 PHP 版本不提供或者有 Bug 的功能。请更新到支持的版本。"
 
-#: setup/class_setupStep_Config1.inc:133
-#, fuzzy
-msgid "The given password minimum length is not numeric."
-msgstr "Sieve 端口应为数字。"
+#: setup/class_setupStep_Checks.inc:72
+msgid "Checking for LDAP support"
+msgstr "检查 LDAP 支持"
 
-#: setup/class_setupStep_Config1.inc:136
-#, fuzzy
-msgid "The given password differ value is not numeric."
-msgstr "Sieve 端口应为数字。"
+#: setup/class_setupStep_Checks.inc:73
+msgid "This is the main extension used by GOsa and therefore really required."
+msgstr "这是 GOsa 用到的主要模块，因此是必须的。"
 
-#: setup/class_setupStep_Config2.inc:74 setup/class_setupStep_Config2.inc:75
-#, fuzzy
-msgid "GOsa settings 2/3"
-msgstr "邮件选项"
+#: setup/class_setupStep_Checks.inc:74
+msgid ""
+"The ldap extension (php4-ldap/php5-ldap) is required to communicate with "
+"your LDAP server."
+msgstr "该 ldap 扩展 (php4-ldap/php5-ldap) 需要和您的 LDAP 服务器通讯。"
 
-#: setup/class_setupStep_Config2.inc:76
-#, fuzzy
-msgid "Customize special parameters"
-msgstr "检查参数"
+#: setup/class_setupStep_Checks.inc:80
+msgid "Checking for gettext support"
+msgstr "检查 getteext 支持"
 
-#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
-#, fuzzy
-msgid "LDAP inspection"
-msgstr "PHP 安装检查"
+#: setup/class_setupStep_Checks.inc:81
+msgid "Gettext support is required for internationalization."
+msgstr "国际化需要 gettext 支持。"
 
-#: setup/class_setupStep_Migrate.inc:107
-msgid "Analyze your current LDAP for GOsa compatibility"
-msgstr ""
+#: setup/class_setupStep_Checks.inc:82 setup/class_setupStep_Checks.inc:90
+msgid "Please make sure that the extension is activated."
+msgstr "请确认这个插件是激活的。"
 
-#: setup/class_setupStep_Migrate.inc:113
-#, fuzzy
-msgid "Checking for root object"
+#: setup/class_setupStep_Checks.inc:88
+msgid "Checking for iconv support"
 msgstr "检查 iconv 支持"
 
-#: setup/class_setupStep_Migrate.inc:119
-msgid "Checking permissions on LDAP database"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:125
-#, fuzzy
-msgid "Checking for invisible deparmtments"
-msgstr "检查 iconv 支持"
+#: setup/class_setupStep_Checks.inc:89
+msgid ""
+"This module is used by GOsa to convert samba munged dial informations and is "
+"therefore required. "
+msgstr "GOsa 用这个模块来转换 samba 拨号信息，因此需要。"
 
-#: setup/class_setupStep_Migrate.inc:131
-#, fuzzy
-msgid "Checking for invisible users"
-msgstr "检查 iconv 支持"
+#: setup/class_setupStep_Checks.inc:96
+msgid "Checking for mhash support"
+msgstr "检查 mhash 支持"
 
-#: setup/class_setupStep_Migrate.inc:137
-#, fuzzy
-msgid "Checking for super administrator"
-msgstr "检查一些附加程序"
+#: setup/class_setupStep_Checks.inc:97
+msgid "You'll need this module to make use of SSHA encryption"
+msgstr "您将需要这个模块来进行 SSHA 加密"
 
-#: setup/class_setupStep_Migrate.inc:143
-#, fuzzy
-msgid "Checking for users outside the people tree"
-msgstr "检查 cups 模块"
+#: setup/class_setupStep_Checks.inc:98
+msgid ""
+"The mhash module for PHP 4/5 is not available.Please install php4-mhash/php5-"
+"mhash."
+msgstr "没有 PHP 4/5 的 mhash 模块。请安装 php4-mhash/php5-mhash。"
 
-#: setup/class_setupStep_Migrate.inc:149
-#, fuzzy
-msgid "Checking for groups outside the groups tree"
-msgstr "检查 cups 模块"
+#: setup/class_setupStep_Checks.inc:104
+msgid "Checking for IMAP support"
+msgstr "检查 IMAP 支持"
 
-#: setup/class_setupStep_Migrate.inc:155
-msgid "Checking for windows workstations outside the winstation tree"
+#: setup/class_setupStep_Checks.inc:105
+msgid ""
+"The IMAP module is needed to communicate with the IMAP server. GOsa "
+"retrieves status information, creates and deletes mail users, etc."
 msgstr ""
+"IMAP 模块用于和 IMAP 服务器通讯。GOsa 获取状态信息，创建和删除邮件账户，等"
+"等。"
 
-#: setup/class_setupStep_Migrate.inc:161
-#, fuzzy
-msgid "Checking for duplicate uid numbers"
-msgstr "检查 ldap 模块"
-
-#: setup/class_setupStep_Migrate.inc:167
-#, fuzzy
-msgid "Checking for duplicate gid numbers"
-msgstr "检查 ldap 模块"
+#: setup/class_setupStep_Checks.inc:106
+msgid ""
+"This module is used to communicate with your mail server. Please install "
+"php4-imap/php5-imap."
+msgstr "这个模块用于和您的邮件服务器通讯。请安装 php4-imap/php5-imap。"
 
-#: setup/class_setupStep_Migrate.inc:190 setup/class_setupStep_Migrate.inc:239
-#: setup/class_setupStep_Migrate.inc:301 setup/class_setupStep_Migrate.inc:362
-#: setup/class_setupStep_Migrate.inc:429 setup/class_setupStep_Migrate.inc:503
-#: setup/class_setupStep_Migrate.inc:587 setup/class_setupStep_Migrate.inc:717
-#: setup/class_setupStep_Migrate.inc:807
-#, fuzzy
-msgid "LDAP query failed"
-msgstr "Mysql 查询失败。"
+#: setup/class_setupStep_Checks.inc:112
+msgid "Checking for getacl in IMAP implementation"
+msgstr "检查 IMAP 实现中的 getacl"
 
-#: setup/class_setupStep_Migrate.inc:191 setup/class_setupStep_Migrate.inc:240
-#: setup/class_setupStep_Migrate.inc:302 setup/class_setupStep_Migrate.inc:363
-#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:504
-#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:718
-#: setup/class_setupStep_Migrate.inc:808
-msgid "Possibly the 'root object' is missing."
+#: setup/class_setupStep_Checks.inc:113
+msgid ""
+"The getacl support is needed to handle shared folder permissions. Old IMAP "
+"extensions are not capable of reading acl's. You need a recent PHP version "
+"to use this feature."
 msgstr ""
+"共享目录需要 getacl 支持。旧的 IMAP 模块不能访问 acl。要使用该功能，您需要一"
+"个新版本的 PHP。"
 
-#: setup/class_setupStep_Migrate.inc:213
-#, fuzzy, php-format
-msgid "Found %s duplicate values for attribute 'uidNumber'."
-msgstr "发现记录类型 '%s' 有重复。"
-
-#: setup/class_setupStep_Migrate.inc:262
-#, fuzzy, php-format
-msgid "Found %s duplicate values for attribute 'gidNumber'."
-msgstr "发现记录类型 '%s' 有重复。"
+#: setup/class_setupStep_Checks.inc:120
+msgid "Checking for MySQL support"
+msgstr "检查 MySQL 支持"
 
-#: setup/class_setupStep_Migrate.inc:317 setup/class_setupStep_Migrate.inc:517
-#: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:857
-#: setup/class_setupStep_Migrate.inc:1591
-#: setup/class_setupStep_Migrate.inc:1604
-msgid "Failed"
-msgstr "失败"
+#: setup/class_setupStep_Checks.inc:121
+msgid ""
+"MySQL support is needed to communicate with several supported databases."
+msgstr "需要 MySQL 来和多个支持数据库通讯。"
 
-#: setup/class_setupStep_Migrate.inc:319
-#, php-format
+#: setup/class_setupStep_Checks.inc:122
 msgid ""
-"Found %s winstations outside the predefined winstation department ou '%s'."
+"This module is required to communicate with database servers (GOfax, "
+"asterisk, GLPI, etc.). Please install php4-mysql/php5-mysql"
 msgstr ""
+"这个模块用于和数据库服务器通讯 (GOfax, asterisk, GLPI, 等.)。请安装 php4-"
+"mysql/php5-mysql"
 
-#: setup/class_setupStep_Migrate.inc:320 setup/class_setupStep_Migrate.inc:598
-#: setup/class_setupStep_Migrate.inc:727
-#, fuzzy
-msgid "Migrate"
-msgstr "创建"
+#: setup/class_setupStep_Checks.inc:128
+msgid "Checking for kadm5 support"
+msgstr "检查 kadm5 支持"
 
-#: setup/class_setupStep_Migrate.inc:386
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
+#: setup/class_setupStep_Checks.inc:129
+msgid ""
+"Managing users in kerberos requires the kadm5 module which is downloadable "
+"via PEAR network."
+msgstr "在 kerberos 中管理用户需要 kadm5 模块，可以通过 PEAR 网络下载。"
 
-#: setup/class_setupStep_Migrate.inc:387 setup/class_setupStep_Migrate.inc:463
-#, fuzzy
-msgid "Move"
-msgstr "模式"
+#: setup/class_setupStep_Checks.inc:130
+msgid ""
+"This module is required to manage user in kerberos, it is downloadable via "
+"PEAR network"
+msgstr "需要这个模块用于在 kerberos 中管理用户，可以通过 PEAR 网络下载。"
 
-#: setup/class_setupStep_Migrate.inc:462
-#, php-format
-msgid "Found %s user(s) outside the configured tree '%s'."
-msgstr ""
+#: setup/class_setupStep_Checks.inc:136
+msgid "Checking for SNMP support"
+msgstr "检查 SNMP 支持"
 
-#: setup/class_setupStep_Migrate.inc:519 setup/class_setupStep_Migrate.inc:532
-#, php-format
+#: setup/class_setupStep_Checks.inc:137
 msgid ""
-"The specified user '%s' does not have full access to your ldap database."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:596
-#, php-format
-msgid "Found %s user(s) that will not be visible in GOsa."
-msgstr ""
+"The simple network management protocol is needed to get status information "
+"from clients."
+msgstr "简单网络管理协议 (SNMP) 需要来从客户端获取状态信息。"
 
-#: setup/class_setupStep_Migrate.inc:646 setup/class_setupStep_Migrate.inc:778
-#, php-format
+#: setup/class_setupStep_Checks.inc:138
 msgid ""
-"Failed to migrate the department '%s' into GOsa, error message is as follows "
-"'%s'."
-msgstr ""
+"This module is required for client monitoring. Please install php4-snmp/php5-"
+"snmp."
+msgstr "这个模块用于客户端监视。请安装 php4-snmp/php5-snmp。"
 
-#: setup/class_setupStep_Migrate.inc:726
-#, php-format
-msgid "Found %s department(s) that will not be visible in GOsa."
-msgstr ""
+#: setup/class_setupStep_Checks.inc:144
+msgid "Checking for CUPS support"
+msgstr "检查 CUPS 支持"
 
-#: setup/class_setupStep_Migrate.inc:858
-msgid "There is no GOsa administrator account inside your LDAP."
+#: setup/class_setupStep_Checks.inc:145
+msgid ""
+"In order to read available printers via the IPP protocol instead of printcap "
+"files, you've to install the CUPS module."
 msgstr ""
+"为了从 IPP 协议而非 printcap 文件中读取可用打印机，您必须安装 CUPS 模块。"
 
-#: setup/class_setupStep_Migrate.inc:918
-msgid "Appending user to group administrational group:"
-msgstr ""
+#: setup/class_setupStep_Checks.inc:154
+msgid "Checking for fping utility"
+msgstr "检查 fping 工具"
 
-#: setup/class_setupStep_Migrate.inc:919
-#, fuzzy
-msgid "Before"
-msgstr "刷新"
+#: setup/class_setupStep_Checks.inc:155
+msgid ""
+"The fping utility is used if you've got a thin client based terminal "
+"environment."
+msgstr "工具 fping 只有在您部署了基于瘦客户机的终端环境下才使用。"
 
-#: setup/class_setupStep_Migrate.inc:922
-#, fuzzy
-msgid "After"
-msgstr "å\85¶ä»\96"
+#: setup/class_setupStep_Checks.inc:156
+msgid ""
+"The fping utility is only used in thin client based terminal environment."
+msgstr "å·¥å\85· fping å\8fªç\94¨äº\8eé\83¨ç½²äº\86å\9fºäº\8eç\98¦å®¢æ\88·æ\9cºç\9a\84ç»\88端ç\8e¯å¢\83ã\80\82"
 
-#: setup/class_setupStep_Migrate.inc:929 setup/class_setupStep_Migrate.inc:958
-#, fuzzy, php-format
-msgid "Adding acls for user '%s' failed, ldap says '%s'."
-msgstr "添加锁失败。 LDAP 服务器返回 '%s'。"
+#: setup/class_setupStep_Checks.inc:171
+msgid "SAMBA password hash generation"
+msgstr "SAMBA 口令生成"
 
-#: setup/class_setupStep_Migrate.inc:949
-#, fuzzy
-msgid "Creating new administrational group:"
-msgstr "创建新条目到"
+#: setup/class_setupStep_Checks.inc:172
+msgid ""
+"In order to use SAMBA 2/3 passwords, you've to install additional packages "
+"to generate password hashes."
+msgstr "为了使用 SAMBA 2/3 口令, 您必须安装一些额外的软件包来创建口令。"
 
-#: setup/class_setupStep_Migrate.inc:985
-msgid "Specified passwords are empty or not equal."
+#: setup/class_setupStep_Checks.inc:173
+msgid ""
+"In order to use SAMBA 2/3 you've to install additional perl libraries. Take "
+"a look at mkntpasswd."
 msgstr ""
+"为了使用 SAMBA 2/3, 您必须安装一些额外的 perl 库文件。看一下 mkntpasswd。"
 
-#: setup/class_setupStep_Migrate.inc:990
-#, fuzzy
-msgid "Please specify a valid uid."
-msgstr "请输入一个有效的 iSerial。"
-
-#: setup/class_setupStep_Migrate.inc:1032
-#, fuzzy, php-format
-msgid ""
-"Could not add administrative user, there is already an object with the same "
-"dn '%s' in your ldap database."
-msgstr "无法将 '%s' 重命名为 %s'，因为在域编辑对话框中已经有相同名称存在。"
-
-#: setup/class_setupStep_Migrate.inc:1070
-#: setup/class_setupStep_Migrate.inc:1118
-#: setup/class_setupStep_Migrate.inc:1166
-#, fuzzy
-msgid "Couldn't move users to specified department."
-msgstr "无法打开指定证书！"
+#: setup/class_setupStep_Checks.inc:183 setup/class_setupStep_Checks.inc:202
+#: setup/class_setupStep_Checks.inc:218 setup/class_setupStep_Checks.inc:234
+#: setup/class_setupStep_Checks.inc:251
+msgid "Off"
+msgstr "关"
 
-#: setup/class_setupStep_Migrate.inc:1080
-msgid "Winstation will be moved from"
+#: setup/class_setupStep_Checks.inc:184
+msgid ""
+"register_globals is a PHP mechanism to register all global variables to be "
+"accessible from scripts without changing the scope. This may be a security "
+"risk."
 msgstr ""
+"register_globals 是 PHP 的一个将注册所有全局变量，以便不必修改范围就可以从脚"
+"本中访问的机制。这可能存在安全风险。"
 
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1128
-#: setup/class_setupStep_Migrate.inc:1176
-#, fuzzy
-msgid "to"
-msgstr "自动"
+#: setup/class_setupStep_Checks.inc:185
+msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
+msgstr "检查 register_globals 是否设置为 'Off'"
 
-#: setup/class_setupStep_Migrate.inc:1091
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "Updating following references too"
-msgstr ""
+#: setup/class_setupStep_Checks.inc:193
+msgid "PHP uses this value for the garbage collector to delete old sessions."
+msgstr "PHP 使用这个值作为垃圾收集，来删除旧的会话。"
 
-#: setup/class_setupStep_Migrate.inc:1128
-msgid "Group will be moved from"
-msgstr ""
+#: setup/class_setupStep_Checks.inc:194
+msgid ""
+"Setting this value to one day will prevent loosing session and cookies "
+"before they really timeout."
+msgstr "设置这个值为一天，将会防止在真正超时之前丢失会话和 cookie。"
 
-#: setup/class_setupStep_Migrate.inc:1176
-msgid "User will be moved from"
+#: setup/class_setupStep_Checks.inc:195
+msgid ""
+"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
+"higher."
 msgstr ""
+"在您的 php.ini 中查找 'session.gc_maxlifetime'，并设置它为 86400 或更高。"
 
-#: setup/class_setupStep_Migrate.inc:1186
-msgid "The following references will be updated"
+#: setup/class_setupStep_Checks.inc:203
+msgid ""
+"In Order to use GOsa without any trouble, the session.auto_register option "
+"in your php.ini should be set to 'Off'."
 msgstr ""
+"为了在使用 GOsa 中不遇到麻烦，您的 php.ini 中 session.auto_register 选项必须"
+"设置为 'Off'。"
+
+#: setup/class_setupStep_Checks.inc:204
+msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
+msgstr "您的 php.ini 中查找 session.auto_register 是否为 'Off'。"
 
-#: setup/class_setupStep_Migrate.inc:1592
+#: setup/class_setupStep_Checks.inc:211
 msgid ""
-"The LDAP root object is missing. It is required to use your LDAP service."
-msgstr ""
+"GOsa needs at least 32MB of memory. Setting it below this limit may cause "
+"errors that are not reproducable! Increase it for larger setups."
+msgstr "GOsa 需要至少 32MB 内存，太少会导致无法预料的错误！将其设置为更大。"
 
-#: setup/class_setupStep_Migrate.inc:1593
-#: setup/class_setupStep_Migrate.inc:1606
-msgid "Try to create root object"
-msgstr ""
+#: setup/class_setupStep_Checks.inc:212
+msgid ""
+"Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
+msgstr "在您的 php.ini 中查找 'memory_limit'，并设置它为 '32M' 或更高。"
 
-#: setup/class_setupStep_Migrate.inc:1605
-msgid "Root object couldn't be created, you should try it on your own."
-msgstr ""
+#: setup/class_setupStep_Checks.inc:219
+msgid ""
+"This option influences the PHP output handling. Turn this Option off, to "
+"increase performance."
+msgstr "这个选项影响 PHP 输出处理。关闭这个选项，可以提高性能。"
 
-#: setup/class_setupStep_Migrate.inc:1895
-#, php-format
-msgid "Failed to copy '%s' to '%s'. LDAP says '%s'."
-msgstr ""
+#: setup/class_setupStep_Checks.inc:220
+msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
+msgstr "在您的 php.ini 中查找 'implicit_flush'，并设置它为关闭。"
 
-#: setup/class_setupStep_Migrate.inc:1898
-msgid "Something went wrong while copying dns."
-msgstr ""
+#: setup/class_setupStep_Checks.inc:227
+msgid "The Execution time should be at least 30 seconds."
+msgstr "执行时间应该至少 30 秒。"
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
-#, fuzzy
-msgid "GOsa settings 3/3"
-msgstr "邮件选项"
+#: setup/class_setupStep_Checks.inc:228
+msgid ""
+"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+msgstr "在您的 php.ini 中查找 'max_execution_time'，并设置它为 '30' 或更高。"
 
-#: setup/class_setupStep_Config3.inc:69
-msgid "Tweak some GOsa core behaviour"
+#: setup/class_setupStep_Checks.inc:235
+msgid ""
+"Increase the server security by setting expose_php to 'off'. PHP won't send "
+"any information about the server you are running in this case."
 msgstr ""
+"将 expose_php 设置为“off”可以增强服务器安全性。PHP 将不会发送任何有关正运行着"
+"的服务器的信息。"
 
-#: setup/class_setupStep_Config3.inc:171
-#, fuzzy
-msgid "Session lifetime must be a numeric value."
-msgstr "需要的分值必须是数字。"
-
-#: setup/class_setupStep_Config3.inc:175
-#, fuzzy
-msgid "Maximal ldap query time must be a numeric value. "
-msgstr "需要的分值必须是数字。"
+#: setup/class_setupStep_Checks.inc:236
+msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
+msgstr "在您的 php.ini 中查找 'expose_php'，并设置它为关闭。"
 
-#: setup/setup_language.tpl:3
-#, fuzzy
-msgid "Please select the preferred language"
-msgstr "请选择一个打印机或者取消。"
+#: setup/class_setupStep_Checks.inc:242
+msgid "On"
+msgstr "开"
 
-#: setup/setup_language.tpl:5
+#: setup/class_setupStep_Checks.inc:243
 msgid ""
-"At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
+"Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
+"escape all quotes in strings in this case."
 msgstr ""
+"将 magic_quotes_gpc 设置为 'on' 会增加服务器安全性。这种情况下 PHP 会将字符串"
+"中所有引号编码。"
 
-#: setup/setup_language.tpl:9
-#, fuzzy
-msgid "Please your preferred language here"
-msgstr "首选语种"
+#: setup/class_setupStep_Checks.inc:244
+msgid "Search for 'magic_quotes_gpc' in your php.ini and set it to 'On'."
+msgstr "在您的 php.ini 中查找 'magic_quotes_gpc'，并设置它为开启。"
 
-#: setup/setup_feedback.tpl:8
-msgid "Subscribe to the gosa-announce mailinglist"
-msgstr ""
+#: setup/class_setupStep_Checks.inc:252
+msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
+msgstr "将 magic_quotes_gpc 设置为 'off' 会提高服务器性能。"
 
-#: setup/setup_feedback.tpl:11
+#: setup/class_setupStep_Checks.inc:253
 msgid ""
-"When checking this option, GOsa will try to connect http://oss.gonicus.de in "
-"order to subscribe you to the gosa-announce mailing list. You've to confirm "
-"this by mail."
-msgstr ""
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+msgstr "在您的 php.ini 中查找 'zend.ze1_compatibility_mode'，并设置它为关闭。"
 
-#: setup/setup_feedback.tpl:43
-msgid "Send feedback to the GOsa project team"
-msgstr ""
+#: setup/class_setupStep_Checks.inc:264
+msgid "Configuration writeable"
+msgstr "配置文件可写"
 
-#: setup/setup_feedback.tpl:46
+#: setup/class_setupStep_Checks.inc:265
+msgid "The configuration file can't be written"
+msgstr "配置信息不可写"
+
+#: setup/class_setupStep_Checks.inc:266
+#, php-format
 msgid ""
-"When checking this option, GOsa will try to connect http://oss.gonicus.de in "
-"order to submit your form anonymously."
+"GOsa reads its configuration from a file located in (%s/%s). The setup can "
+"write the configuration directly if it is writeable."
 msgstr ""
+"GOsa 从位于 (%s/%s) 的文件中读取配置。如果可写，安装程序可以直接修改配置。"
 
-#: setup/setup_feedback.tpl:52
-msgid "Did the setup procedure help you to get started?"
+#: setup/setup_welcome.tpl:4
+msgid ""
+"This seems to be the first time you start GOsa - we didn't find any "
+"configuration right now. This simple wizard intends to help you while "
+"setting it up."
 msgstr ""
+"看起来这是您第一次启动 GOsa - 我们现在没有发现任何配置。这个简单的安装向导将"
+"协助您完成安装。"
 
-#: setup/setup_feedback.tpl:62
-msgid "If not, what problems did you encounter"
-msgstr ""
+#: setup/setup_welcome.tpl:8
+msgid "What will the wizard do for you?"
+msgstr "安装向导有什么可以为您效劳的？"
 
-#: setup/setup_feedback.tpl:70
-msgid "Is this the first time you use GOsa?"
-msgstr ""
+#: setup/setup_welcome.tpl:11
+msgid "Create a basic, single site configuration"
+msgstr "创建一个基本的，单站点配置"
 
-#: setup/setup_feedback.tpl:76
-msgid "I use it since"
-msgstr ""
+#: setup/setup_welcome.tpl:12
+msgid "Tries to find problems within your PHP and LDAP setup"
+msgstr "尝试查找在您的 PHP 和 LDAP 安装中存在的问题"
 
-#: setup/setup_feedback.tpl:77
-msgid "Select the year since when you are using GOsa"
-msgstr ""
+#: setup/setup_welcome.tpl:13
+msgid "Let you choose from a set of basic and advanced configuration switches"
+msgstr "允许你在一系列基本和高级配置选项中选择"
 
-#: setup/setup_feedback.tpl:84
-msgid "What operating system / distribution do you use?"
-msgstr ""
+#: setup/setup_welcome.tpl:14
+msgid "Guided migration of existing LDAP trees"
+msgstr "已存在 LDAP 树迁移向导"
 
-#: setup/setup_feedback.tpl:92
-msgid "What web server do you use?"
-msgstr ""
+#: setup/setup_welcome.tpl:17
+msgid "What will the wizard NOT do for you?"
+msgstr "有什么向导不能为您做的？"
 
-#: setup/setup_feedback.tpl:100
-msgid "What PHP version do you use?"
-msgstr ""
+#: setup/setup_welcome.tpl:20
+msgid "Find every possible configuration error"
+msgstr "查找任何可能的配置错误"
 
-#: setup/setup_feedback.tpl:108
-msgid "LDAP"
-msgstr ""
+#: setup/setup_welcome.tpl:21
+msgid "Migrate every possible LDAP setup - create backup dumps!"
+msgstr "迁移任何可能的 LDAP 设置 - 创建备份导出！"
 
-#: setup/setup_feedback.tpl:112
-msgid "What kind of LDAP server(s) do you use?"
-msgstr ""
+#: setup/setup_welcome.tpl:25
+msgid "To continue..."
+msgstr "继续..."
 
-#: setup/setup_feedback.tpl:118
-msgid "How many objects are in your LDAP?"
+#: setup/setup_welcome.tpl:28
+msgid ""
+"For security reasons you need to authenticate for the installation by "
+"creating the file '/tmp/gosa.auth', containing the current session ID on the "
+"servers local filesystem. This can be done by executing the following "
+"command:"
 msgstr ""
+"为安全计，您可以通过创建 '/tmp/gosa.auth' 文件来为安装鉴权，在服务器本地文件"
+"系统中包含当前的 session ID。这可以通过执行下面的命令实现："
 
-#: setup/setup_feedback.tpl:125
-#, fuzzy
-msgid "Features"
-msgstr "功能"
+#: setup/setup_welcome.tpl:34
+msgid "Click the 'Continue' button when you've finished."
+msgstr "当您结束时，点击 '继续' 按钮。"
 
-#: setup/setup_feedback.tpl:128
-msgid "What features of GOsa do you use?"
-msgstr ""
+#: setup/setup_checks.tpl:9
+msgid "PHP module and extension checks"
+msgstr "PHP 模块和扩展检查"
 
-#: setup/setup_feedback.tpl:138
-msgid "What features do you want to see in future versions of GOsa?"
-msgstr ""
+#: setup/setup_checks.tpl:41 setup/setup_checks.tpl:103
+msgid "GOsa will NOT run without fixing this."
+msgstr "不修正这个 GOsa 无法允许。"
 
-#: setup/setup_feedback.tpl:145
-msgid "Send feedback"
-msgstr ""
+#: setup/setup_checks.tpl:45 setup/setup_checks.tpl:107
+msgid "GOsa will run without fixing this."
+msgstr "不修正这个 GOsa 也将允许。"
 
-#: setup/class_setupStep_Welcome.inc:38
-#, fuzzy
-msgid "Welcome"
-msgstr "欢迎 %s!"
+#: setup/setup_checks.tpl:67
+msgid "PHP setup configuration"
+msgstr "PHP 安装配置"
 
-#: setup/class_setupStep_Welcome.inc:39
-#, fuzzy
-msgid "The welcome message"
-msgstr "解除挂起的邮件"
+#: setup/setup_checks.tpl:67
+msgid "show information"
+msgstr "显示信息"
 
-#: setup/class_setupStep_Welcome.inc:40
-#, fuzzy
-msgid "Welcome to GOsa setup wizard"
-msgstr "欢迎进入 Gosa 安装程序！"
+#: setup/setup_schema.tpl:3
+msgid "Schema specific settings"
+msgstr "Schema 相关设定"
 
-#: setup/setup_config1.tpl:2
-msgid "Look and feel"
-msgstr ""
+#: setup/setup_schema.tpl:7
+msgid "Enable schema validation when logging in"
+msgstr "登录时启用 schema 检查"
 
-#: setup/setup_config1.tpl:6
-#, fuzzy
-msgid "Theme"
-msgstr "模板"
+#: setup/setup_schema.tpl:16
+msgid "Check status"
+msgstr "检查状态"
 
-#: setup/setup_config1.tpl:15
-#, fuzzy
-msgid "People and group storage"
-msgstr "People dn attribute"
+#: setup/setup_schema.tpl:20
+msgid "Schema check succeeded"
+msgstr "Schema 检查成功"
 
-#: setup/setup_config1.tpl:18
-#, fuzzy
-msgid "People DN attribute"
-msgstr "People dn attribute"
-
-#: setup/setup_config1.tpl:29
-msgid "People storage subtree"
-msgstr ""
-
-#: setup/setup_config1.tpl:38
-#, fuzzy
-msgid "Group storage subtree"
-msgstr "忽略子树"
-
-#: setup/setup_config1.tpl:47
-msgid "Include personal title in user DN"
-msgstr ""
-
-#: setup/setup_config1.tpl:58
-msgid "Relaxed naming policies"
-msgstr ""
-
-#: setup/setup_config1.tpl:69
-#, fuzzy
-msgid "Automatic uids"
-msgstr "自动"
-
-#: setup/setup_config1.tpl:101
-#, fuzzy
-msgid "Number base for people/groups"
-msgstr "用户/组起始 ID"
-
-#: setup/setup_config1.tpl:109
-msgid "Hook for number base"
-msgstr ""
-
-#: setup/setup_config1.tpl:124
-#, fuzzy
-msgid "Password settings"
-msgstr "用户设置"
-
-#: setup/setup_config1.tpl:128
-#, fuzzy
-msgid "Password encryption algorithm"
-msgstr "加密算法"
-
-#: setup/setup_config1.tpl:139
-#, fuzzy
-msgid "Password restrictions"
-msgstr "口令过期截止日"
-
-#: setup/setup_config1.tpl:146 setup/setup_config1.tpl:150
-msgid "Password minimum length"
-msgstr ""
-
-#: setup/setup_config1.tpl:157 setup/setup_config1.tpl:161
-msgid "Different characters from old password"
-msgstr ""
-
-#: setup/setup_config1.tpl:170
-#, fuzzy
-msgid "Password change hook"
-msgstr "不允许修改口令"
-
-#: setup/setup_config1.tpl:186
-msgid "Use SASL for kerberos"
-msgstr ""
+#: setup/setup_schema.tpl:23
+msgid "Schema check failed"
+msgstr "Schema 检查失败"
 
-#: setup/setup_config1.tpl:197
-#, fuzzy
-msgid "Use account expiration"
-msgstr "账号过期于"
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
+msgstr "错误: 要导出到一个 vcard，getcvard.php 需要一个参数！"
 
-#: setup/setup_config1.tpl:210
-#, fuzzy
-msgid ""
-"GOsa always acts as admin and manages access rights internally. This is a "
-"workaround till OpenLDAP's in directory ACI's are    fully implemented. For "
-"this to work, we need the admin DN and the corresponding password."
-msgstr ""
-"GOsa 总是作为 LDAP 管理员，并且管理内部权限。这是一个临时方案直到 OpenLDAP 目"
-"录 ACI 被完全实现。为了让其实现，我们需要管理员 DN 和正确的口令。"
+#: html/setup.php:78 html/password.php:71 html/index.php:141
+#, php-format
+msgid "Directory '%s' specified as compile directory is not accessible!"
+msgstr "目录 '%s' 作为编译目录无法访问！"
 
-#: setup/setup_config1.tpl:212
-#, fuzzy
-msgid ""
-"GOsa has modular support for several mail methods. These methods provide "
-"interfaces to users mailboxes and general handling    for quotas. You can "
-"choose the dummy plugin to leave all your mail settings untouched."
-msgstr ""
-"GOsa 通过模组支持几种邮件方法。这些方法提供用户邮箱的界面以及管理用户空间。您"
-"可以选择选择 dummy 插件以保持您的邮件设置不被更改。"
+#: html/password.php:51 html/index.php:120
+#, php-format
+msgid "GOsa configuration %s/%s is not readable. Aborted."
+msgstr "GOsa 配置 %s/%s 不可读取。放弃。"
 
-#: setup/setup_config2.tpl:6
-msgid "Samba hash generator"
-msgstr ""
+#: html/password.php:152
+msgid "Error: Password method not available!"
+msgstr "错误： 口令格式没有设置！"
 
-#: setup/setup_config2.tpl:15
-#, fuzzy
-msgid "Samba SID"
-msgstr "Samba"
+#: html/password.php:208 html/index.php:262
+msgid "Please specify a valid username!"
+msgstr "请输入一个有效的用户名！"
 
-#: setup/setup_config2.tpl:31
-#, fuzzy
-msgid "RID base"
-msgstr "数据库"
+#: html/password.php:210 html/index.php:264
+msgid "Please specify your password!"
+msgstr "请输入您的口令！"
 
-#: setup/setup_config2.tpl:46
-#, fuzzy
-msgid "Workstation container"
-msgstr "工作站名称"
+#: html/password.php:216 html/index.php:271
+msgid "Please check the username/password combination."
+msgstr "请检查用户名/口令。"
 
-#: setup/setup_config2.tpl:61
-msgid "Samba SID mapping"
-msgstr ""
+#: html/password.php:274 html/index.php:55 html/index.php:346
+msgid "Session will not be encrypted."
+msgstr "会话不会被加密。"
 
-#: setup/setup_config2.tpl:70
-#, fuzzy
-msgid "Additional GOsa settings"
-msgstr "应用程序设置"
+#: html/password.php:274 html/index.php:55 html/index.php:346
+msgid "Enter SSL session"
+msgstr "进入 SSL 会话"
 
-#: setup/setup_config2.tpl:74
-msgid "Enable Copy & Paste"
-msgstr ""
+#: html/getxls.php:65
+msgid "Birthday"
+msgstr "生日"
 
-#: setup/setup_config2.tpl:86
-#, fuzzy
-msgid "Government mode"
-msgstr "部门名称"
+#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
+#: html/getxls.php:236
+msgid "Surname"
+msgstr "姓"
 
-#: setup/setup_config2.tpl:113
-#, fuzzy
-msgid "Vacation templates"
-msgstr "工作站模板"
+#: html/getxls.php:74
+#, php-format
+msgid "User list of %s on %s"
+msgstr "%s 用户列表于 %s"
 
-#: setup/setup_config2.tpl:129
-msgid "Use Cyrus UNIX style"
-msgstr ""
+#: html/getxls.php:94 html/getxls.php:227
+msgid "Members"
+msgstr "成员"
 
-#: setup/setup_config3.tpl:2
-#, fuzzy
-msgid "GOsa core settings"
-msgstr "用户设置"
+#: html/getxls.php:104 html/getxls.php:295
+#, php-format
+msgid "Groups of %s on %s"
+msgstr "%s 的用户组于 %s 上"
 
-#: setup/setup_config3.tpl:6
-#, fuzzy
-msgid "Disable primary group filter"
-msgstr "显示用户组"
+#: html/getxls.php:124 html/getxls.php:246
+msgid "Computers"
+msgstr "计算机"
 
-#: setup/setup_config3.tpl:18
-#, fuzzy
-msgid "Honour administrative units"
-msgstr "组管理"
+#: html/getxls.php:133 html/getxls.php:174 html/getxls.php:336
+#: html/getxls.php:356
+msgid "Common name"
+msgstr "常用名"
 
-#: setup/setup_config3.tpl:30
-#, fuzzy
-msgid "Smarty compile directory"
-msgstr "用户主目录"
+#: html/getxls.php:149 html/getxls.php:151 html/getxls.php:158
+#: html/getxls.php:179 html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr "服务器"
 
-#: setup/setup_config3.tpl:39
-#, fuzzy
-msgid "Path for PPD storage"
-msgstr "口令存储"
+#: html/getxls.php:156 html/getxls.php:314
+#, php-format
+msgid "Servers of %s on %s"
+msgstr "%s服务器于%s"
 
-#: setup/setup_config3.tpl:55
-#, fuzzy
-msgid "Path for kiosk profile storage"
-msgstr "Kiosk profile 设置"
+#: html/getxls.php:174
+msgid "Home postal address"
+msgstr "住宅地址"
 
-#: setup/setup_config3.tpl:74
-#, fuzzy
-msgid "Network resolv hook"
-msgstr "网络地址"
+#: html/getxls.php:174
+msgid "Mobile phone"
+msgstr "移动电话"
 
-#: setup/setup_config3.tpl:92
-#, fuzzy
-msgid "Mail queue script"
-msgstr "邮件队列"
+#: html/getxls.php:174 html/getxls.php:236
+msgid "Postal address"
+msgstr "地址"
 
-#: setup/setup_config3.tpl:110
-#, fuzzy
-msgid "Notification script"
-msgstr "主机通知周期"
+#: html/getxls.php:174
+msgid "Function"
+msgstr "功能"
 
-#: setup/setup_config3.tpl:126
-msgid "Login and session"
-msgstr ""
+#: html/getxls.php:177 html/getxls.php:247
+msgid "Adressbook"
+msgstr "地址簿"
 
-#: setup/setup_config3.tpl:129
-msgid "Enforce register_globals to be deactivated"
-msgstr ""
+#: html/getxls.php:184 html/getxls.php:349
+#, php-format
+msgid "Adressbook of %s on %s"
+msgstr "%s 的地址簿，于 %s"
 
-#: setup/setup_config3.tpl:141
-#, fuzzy
-msgid "Enforce encrypted connections"
-msgstr "封锁加密归档"
+#: html/getxls.php:190
+msgid "Common Name"
+msgstr "常用名"
 
-#: setup/setup_config3.tpl:153
-#, fuzzy
-msgid "Warn if session is not encrypted"
-msgstr "会话不会被加密。"
+#: html/getxls.php:224
+msgid "Day of birth"
+msgstr "生日"
 
-#: setup/setup_config3.tpl:165
-#, fuzzy
-msgid "Session lifetime"
-msgstr "检测道会话冲突"
+#: html/getxls.php:236
+msgid "Email address"
+msgstr "邮件地址"
 
-#: setup/setup_config3.tpl:173
-#, fuzzy
-msgid "Debugging"
-msgstr "启用 debug"
+#: html/getxls.php:236
+msgid "Organizational unit"
+msgstr "组织/公司部门"
 
-#: setup/setup_config3.tpl:177
-#, fuzzy
-msgid "Show PHP errors"
-msgstr "PHP 错误"
+#: html/getxls.php:236
+msgid "Postal Code"
+msgstr "邮编"
 
-#: setup/setup_config3.tpl:189
-#, fuzzy
-msgid "Maximum LDAP query time"
-msgstr "最大文件大小"
+#: html/getxls.php:236
+msgid "Surename"
+msgstr "姓"
 
-#: setup/setup_config3.tpl:207
-msgid "Log LDAP statistics"
-msgstr ""
+#: html/getxls.php:236
+msgid "Title"
+msgstr "称谓"
 
-#: setup/setup_config3.tpl:219
-#, fuzzy
-msgid "Debug level"
-msgstr "日志级别"
+#: html/getxls.php:239
+msgid "Full"
+msgstr "全部"
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
-#, fuzzy
-msgid "Disabled"
-msgstr "禁用"
+#: html/getxls.php:276
+#, php-format
+msgid "User List of %s on %s"
+msgstr "%s 用户列表于 %s"
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
-#, fuzzy
-msgid "Enabled"
-msgstr "禁用"
+#: html/getxls.php:330
+#, php-format
+msgid "Computers of %s on %s"
+msgstr "%s计算机于%s"
 
-#: setup/setup_migrate.tpl:5
+#: html/index.php:219
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to GOsa base LDAP administration. You may want "
-"to fix the problems below, in order to provide smooth services."
-msgstr ""
-
-#: setup/setup_migrate.tpl:33
-#, fuzzy
-msgid "Check again"
-msgstr "检查"
-
-#: setup/setup_migrate.tpl:37
-msgid "Move windows workstations into a valid windows workstation department"
-msgstr ""
+"GOsa cannot retrieve information about the installed schema files. Please "
+"make sure, that this is possible."
+msgstr "GOsa 无法获取安装的 schema 文件信息。请确认。"
 
-#: setup/setup_migrate.tpl:39
+#: html/index.php:235
 msgid ""
-"This dialog allows you to move the displayed windows workstations into a "
-"valid department"
-msgstr ""
+"Your ldap setup contains old schema definitions. Please re-run the setup."
+msgstr "您 LDAP 的设置包含老的 schema 定义。请重新执行安装。"
 
-#: setup/setup_migrate.tpl:41
+#: html/index.php:254
 msgid ""
-"Be careful with this tool, there may be references pointing to this "
-"workstations that can't be migrated."
-msgstr ""
-
-#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:120
-#: setup/setup_migrate.tpl:171 setup/setup_migrate.tpl:294
-#: setup/setup_migrate.tpl:347
-#, fuzzy
-msgid "Select all"
-msgstr "选择"
-
-#: setup/setup_migrate.tpl:67
-msgid "Move selected windows workstations into the following GOsa department"
-msgstr ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr "您的 GOsa 缺少一个管理员账号，您不能进行任何管理操作！"
 
-#: setup/setup_migrate.tpl:72
-#, fuzzy
-msgid "Move selected workstations"
-msgstr "选择查看工作站"
+#: html/index.php:300
+msgid "Account locked. Please contact your system administrator."
+msgstr "账户锁定。请联系管理员。"
 
-#: setup/setup_migrate.tpl:73
-msgid "What will be done here"
-msgstr ""
+#: html/index.php:352
+msgid ""
+"Your browser has cookies disabled. Please enable cookies and reload this "
+"page before logging in!"
+msgstr "您的浏览器已经禁用 cookies。请启用 cookies 并在登录前重新加载本页面！"
 
-#: setup/setup_migrate.tpl:85
-msgid "Move groups into configured group tree"
-msgstr ""
+#: html/helpviewer.php:67
+msgid "Help browser"
+msgstr "帮助浏览器"
 
-#: setup/setup_migrate.tpl:88
-msgid ""
-"This dialog allows moving a couple of groups to the configured group tree. "
-"Doing this may straighten your LDAP service."
-msgstr ""
+#: html/helpviewer.php:118
+msgid "There is no helpfile specified for this class"
+msgstr "此类没有帮助文件"
 
-#: setup/setup_migrate.tpl:91
-msgid ""
-"Be careful with this option! There may be references pointing to these "
-"groups. The GOsa setup can't migrate references, so you may want to cancel "
-"the migration in this case in this case."
-msgstr ""
+#: html/helpviewer.php:265
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr "帮助目录 '%s' 不能访问，无法读取任何帮助文件。"
 
-#: setup/setup_migrate.tpl:94
-msgid "Move selected groups into this group tree"
-msgstr ""
+#: html/getfax.php:53
+msgid "Could not connect to database server!"
+msgstr "无法连接到数据库!"
 
-#: setup/setup_migrate.tpl:123 setup/setup_migrate.tpl:175
-#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
-msgid "Hide changes"
-msgstr ""
+#: html/getfax.php:55
+msgid "Could not select database!"
+msgstr "无法选择数据库！"
 
-#: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
-#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
-#, fuzzy
-msgid "Show changes"
-msgstr "显示软件包"
+#: html/getfax.php:60 html/getfax.php:68
+msgid "Database query failed!"
+msgstr "数据库查询失败！"
 
-#: setup/setup_migrate.tpl:138
-msgid "Move users into configured user tree"
-msgstr ""
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr "无法打开文件 '%s'，可能是文件不存在。"
 
-#: setup/setup_migrate.tpl:140
-msgid ""
-"This dialog allows moving a couple of users to the configured user tree. "
-"Doing this may straighten your LDAP service."
-msgstr ""
+#: html/getkiosk.php:30
+#, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr "无法读取文件'%s'，检查权限。"
 
-#: setup/setup_migrate.tpl:143
+#: html/main.php:157
 msgid ""
-"Be careful with this option! There may be references pointing to these "
-"users. The GOsa setup can't migrate references, so you may want to cancel "
-"the migration in this case."
-msgstr ""
+"FATAL: Register globals is on. GOsa will refuse to login unless this is "
+"fixed by an administrator."
+msgstr "致命错误：全局注册已打开。GOsa 将拒绝登录直到被管理修正。"
 
-#: setup/setup_migrate.tpl:146
-#, fuzzy
-msgid "Move selected users into this people tree"
-msgstr "创建使用该模板的用户"
+#: html/main.php:213
+msgid "Warning: memory is getting low - please increase the memory_limit!"
+msgstr "警告: 内存过少──请提高 memory_limit 设置！"
 
-#: setup/setup_migrate.tpl:196
-#, fuzzy
-msgid "Next"
-msgstr "下一个"
+#: html/main.php:335
+#, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
+msgstr "警告： 没有发现针对插件 '%s' 的任何插件定义！"
 
-#: setup/setup_migrate.tpl:199
-#, fuzzy
-msgid "Create a new GOsa administrator account"
-msgstr "创建 netatalk 账号"
+#: html/main.php:350
+msgid "Your password is about to expire, please change your password"
+msgstr "您的口令就要过期，请修改您的口令"
 
-#: setup/setup_migrate.tpl:202
+#: html/main.php:385
 msgid ""
-"This dialog will automatically add a new super administrator to your LDAP "
-"tree."
-msgstr ""
-
-#: setup/setup_migrate.tpl:231
-#, fuzzy
-msgid "Password (again)"
-msgstr "口令存储"
+"Generating this page caused the W3C          conformance checker to raise "
+"some errors!"
+msgstr "这个页面的创建导致 W3C 标准检测程序发现了些错误！"
 
-#: setup/setup_migrate.tpl:259
+#: html/get_attachment.php:47
 msgid ""
-"The listed departments are currenlty invisble in the GOsa user interface. If "
-"you want to change this for a couple of entries, select them and use the "
-"migrate button below."
-msgstr ""
+"Can't connect to glpi database, there is no mysl extension available in your "
+"php setup."
+msgstr "无法连接到 glpi 数据库，PHP 没有安装 mysql 扩展。"
 
-#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
+#: html/get_attachment.php:55
 msgid ""
-"If you want to know what will be done when migrating the selected entries, "
-"use the 'Show changes' button to see the LDIF."
-msgstr ""
+"Can't connect to specified database, please check your glpi configuration."
+msgstr "无法连接到指定数据库，请检查您 glpi 设置。"
 
-#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
-#, fuzzy
-msgid "Current"
-msgstr "当前版本"
+#: html/get_attachment.php:64
+msgid "Can't get specified attachment file, there is no entry with this id."
+msgstr "无法获取指定的附件文件，没有和该 id 匹配的条目。"
 
-#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
-#, fuzzy
-msgid "After migration"
-msgstr "用户管理"
+#: ihtml/themes/default/conflict.tpl:2
+msgid "Session conflict detected"
+msgstr "检测到会话冲突"
 
-#: setup/setup_migrate.tpl:314
+#: ihtml/themes/default/conflict.tpl:6
 msgid ""
-"The listed users are currenlty invisble in the GOsa user interface. If you "
-"want to change this for a couple of users, just select them and use the "
-"'Migrate' button below."
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:40 setup/class_setupStep_Schema.inc:41
-msgid "LDAP schema check"
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:42
-msgid "Perform test on your current LDAP schema"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:38 setup/class_setupStep_Checks.inc:39
-msgid "Installation check"
+"Probably there's another active instance of your session. Multiple window "
+"operation is technical not possible and heavily depends on the browser "
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
+"possible. Pressing the 'Logout'button will close this session."
 msgstr ""
+"可能已经存在另外一个您的活动的会话。多窗口操作在技术上不可能并且和严重依赖您"
+"使用浏览器。使用不同的浏览器（如 IE 和 Mozilla）是可能的。按“退出”按钮关闭此"
+"会话。"
 
-#: setup/class_setupStep_Checks.inc:40
-msgid "Basic checks for PHP version and required extensions."
+#: ihtml/themes/default/conflict.tpl:10
+msgid ""
+"Ignoring this message will change/destroy the data you're currently editing, "
+"so please close multiple windows and log in again."
 msgstr ""
+"忽略这条信息将会修改/破坏您当前编辑的数据，所以请关闭多个窗口并重新登录。"
 
-#: setup/class_setupStep_Checks.inc:64
-#, fuzzy
-msgid "Checking PHP version"
-msgstr "检查 PHP 版本 (>=4.1.0)"
+#: ihtml/themes/default/conflict.tpl:14
+msgid "Logout"
+msgstr "退出"
 
-#: setup/class_setupStep_Checks.inc:65
-#, php-format
-msgid "PHP must be of version %s / %s or above."
-msgstr ""
+#: ihtml/themes/default/password.tpl:6
+msgid "Change your password"
+msgstr "修改您的口令"
 
-#: setup/class_setupStep_Checks.inc:66
-msgid ""
-"GOsa requires functionality that is not available (or buggy) in older PHP "
-"versions. Please update to a supported version."
-msgstr ""
+#: ihtml/themes/default/password.tpl:33
+msgid "Success"
+msgstr "成功"
 
-#: setup/class_setupStep_Checks.inc:72
-#, fuzzy
-msgid "Checking for LDAP support"
-msgstr "检查 iconv 支持"
+#: ihtml/themes/default/password.tpl:33
+msgid "Your password has been changed successfully."
+msgstr "您的口令已成功修改。"
 
-#: setup/class_setupStep_Checks.inc:73
-#, fuzzy
-msgid "This is the main extension used by GOsa and therefore really required."
-msgstr "这是 GOsa 用到的主要模块，因此是必须的。"
+#: ihtml/themes/default/password.tpl:39
+msgid "Password change"
+msgstr "修改口令"
 
-#: setup/class_setupStep_Checks.inc:74
+#: ihtml/themes/default/password.tpl:51
 msgid ""
-"The ldap extension (php4-ldap/php5-ldap) is required to communicate with "
-"your LDAP server."
+"This dialog provides a simple way to change your password. Enter the current "
+"password and the new password (twice) in the fields below and press the "
+"'Change' button."
 msgstr ""
+"这个对话框为您提供一个修改的口令的简单方法。在下面的对话框中输入当前口令以及"
+"新口令（两次），然后按“修改”按钮。"
 
-#: setup/class_setupStep_Checks.inc:80
-msgid "Checking for gettext support"
-msgstr "检查 getteext 支持"
+#: ihtml/themes/default/password.tpl:58 ihtml/themes/default/password.tpl:60
+#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
+msgid "Directory"
+msgstr "目录"
 
-#: setup/class_setupStep_Checks.inc:81
-#, fuzzy
-msgid "Gettext support is required for internationalization."
-msgstr "对于 GOsa 国际化需要 gettext 支持。"
+#: ihtml/themes/default/password.tpl:84
+msgid "again"
+msgstr "再次"
 
-#: setup/class_setupStep_Checks.inc:82 setup/class_setupStep_Checks.inc:90
-msgid "Please make sure that the extension is activated."
-msgstr ""
+#: ihtml/themes/default/password.tpl:85
+msgid "New password repeated"
+msgstr "重复新口令"
 
-#: setup/class_setupStep_Checks.inc:88
-msgid "Checking for iconv support"
-msgstr "检查 iconv 支持"
+#: ihtml/themes/default/password.tpl:92
+msgid "Change"
+msgstr "修改"
 
-#: setup/class_setupStep_Checks.inc:89
-#, fuzzy
-msgid ""
-"This module is used by GOsa to convert samba munged dial informations and is "
-"therefore required. "
-msgstr "GOsa 用这个模块来转换 samba 扩展信息，因此需要。"
+#: ihtml/themes/default/password.tpl:93
+msgid "Click here to change your password"
+msgstr "点击这里来修改您的口令"
 
-#: setup/class_setupStep_Checks.inc:96
-#, fuzzy
-msgid "Checking for mhash support"
-msgstr "检查 iconv 支持"
+#: ihtml/themes/default/copyPasteDialog.tpl:1
+msgid "Copy &amp; paste wizard"
+msgstr "拷贝和粘贴精灵"
 
-#: setup/class_setupStep_Checks.inc:97
-msgid "You'll need this module to make use of SSHA encryption"
-msgstr ""
+#: ihtml/themes/default/copyPasteDialog.tpl:2
+msgid "Object to be pasted"
+msgstr "要粘贴的对象"
 
-#: setup/class_setupStep_Checks.inc:98
+#: ihtml/themes/default/copyPasteDialog.tpl:6
 msgid ""
-"The mhash module for PHP 4/5 is not available.Please install php4-mhash/php5-"
-"mhash."
+"Some values need to be unique in the complete directory while some "
+"combinations make no sense. GOsa shows the relevant attributes. Please "
+"maintain the values below to fullfill the policies."
 msgstr ""
+"有的变量需要在整个目录中保持唯一，而有的组合没有意义。GOsa 显示有关属性。请按"
+"照这个原则维护其取值。"
 
-#: setup/class_setupStep_Checks.inc:104
-#, fuzzy
-msgid "Checking for IMAP support"
-msgstr "检查 iconv 支持"
+#: ihtml/themes/default/copyPasteDialog.tpl:22
+msgid "Operation complete"
+msgstr "操作完成"
 
-#: setup/class_setupStep_Checks.inc:105
-#, fuzzy
-msgid ""
-"The IMAP module is needed to communicate with the IMAP server. GOsa "
-"retrieves status information, creates and deletes mail users, etc."
-msgstr "IMAP 模块用于和 IMAP 服务器通讯。它获取状态信息，创建和删除邮件账户。"
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr "GOsa 帮助浏览器"
 
-#: setup/class_setupStep_Checks.inc:106
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr "索引"
+
+#: ihtml/themes/default/login.tpl:15
+msgid "Please use your username and password to log in"
+msgstr "请用您的用户名和口令登录"
+
+#: ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr "登录"
+
+#: ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr "点击这里登录"
+
+#: ihtml/themes/default/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr "您的 GOsa 会话已经过期！"
+
+#: ihtml/themes/default/logout.tpl:7
 msgid ""
-"This module is used to communicate with your mail server. Please install "
-"php4-imap/php5-imap."
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
 msgstr ""
+"上一次操作 GOsa 界面是在很长时间之前。出于安全上的考虑，已经关闭了连接。要继"
+"续执行管理任务，请重新登录。"
 
-#: setup/class_setupStep_Checks.inc:112
-#, fuzzy
-msgid "Checking for getacl in IMAP implementation"
-msgstr "检查 imap 中的 getacl"
+#: ihtml/themes/default/logout.tpl:10
+msgid "Sign in again"
+msgstr "重新登录"
 
-#: setup/class_setupStep_Checks.inc:113
-#, fuzzy
+#: ihtml/themes/default/sizelimit.tpl:3
 msgid ""
-"The getacl support is needed to handle shared folder permissions. Old IMAP "
-"extensions are not capable of reading acl's. You need a recent PHP version "
-"to use this feature."
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
 msgstr ""
-"å\85±äº«ç\9b®å½\95é\9c\80è¦\81 getacl æ\94¯æ\8c\81ã\80\82 æ \87å\87\86ç\9a\84 IMAP 模å\9d\97ä¸\8dè\83½è®¿é\97® aclã\80\82é\9c\80è¦\81è¿\99个å\8a\9fè\83½ï¼\8cæ\82¨é\9c\80è¦\81"
-"ä¸\80个æ\9c\80æ\96°ç\89\88æ\9c¬ç\9a\84 PHP。"
+"大å°\8fé\99\90å\88¶é\80\89项ä¼\9a让 LDAP æ\93\8dä½\9cæ\9b´å¿«ï¼\8c以å\85\8d使 LDAP æ\9c\8då\8a¡å\99¨è¿\87è½½ã\80\82æ\9c\80ç®\80å\8d\95让大æ\95°æ\8d®åº\93å¤\84ç\90\86"
+"ä¸\8då\8f\91æ\88\90é\95¿æ\97¶é\97´è¶\85æ\97¶ç\9a\84å\8a\9eæ³\95æ\98¯ï¼\8cå°\86æ\9f¥è¯¢ç¼©å°\8få\88°æ\9b´å°\91并ä¸\94使ç\94¨è¿\87滤å\99¨。"
 
-#: setup/class_setupStep_Checks.inc:120
-#, fuzzy
-msgid "Checking for MySQL support"
-msgstr "检查 iconv 支持"
+#: ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "请选择响应这个会话的方法"
 
-#: setup/class_setupStep_Checks.inc:121
-#, fuzzy
-msgid ""
-"MySQL support is needed to communicate with several supported databases."
-msgstr "需要 MySQL 支持来从数据库中读取 GOfax 报告。"
+#: ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr "忽略错误并显示 LDAP 服务器返回的所有条目"
 
-#: setup/class_setupStep_Checks.inc:122
+#: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
-"This module is required to communicate with database servers (GOfax, "
-"asterisk, GLPI, etc.). Please install php4-mysql/php5-mysql"
-msgstr ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr "忽略错误并显示在定义限制长度内的所有条目，并让我使用过滤器。"
 
-#: setup/class_setupStep_Checks.inc:128
-#, fuzzy
-msgid "Checking for kadm5 support"
-msgstr "检查 iconv 支持"
+#: ihtml/themes/default/accountexpired.tpl:15
+msgid "Your Password has expired !! Choose a new Password"
+msgstr "您的口令已经过期 !! 选择一个新口令"
 
-#: setup/class_setupStep_Checks.inc:129
-msgid ""
-"Managing users in kerberos requires the kadm5 module which is downloadable "
-"via PEAR network."
-msgstr "在 kerberos 中管理用户需要 kadm5 模块，可以通过 PEAR 网络下载。"
+#: ihtml/themes/default/accountexpired.tpl:23
+#: ihtml/themes/default/accountexpired.tpl:27
+msgid "Old Password"
+msgstr "旧口令"
 
-#: setup/class_setupStep_Checks.inc:130
-#, fuzzy
-msgid ""
-"This module is required to manage user in kerberos, it is downloadable via "
-"PEAR network"
-msgstr "在 kerberos 中管理用户需要 kadm5 模块，可以通过 PEAR 网络下载。"
+#: ihtml/themes/default/accountexpired.tpl:32
+#: ihtml/themes/default/accountexpired.tpl:36
+msgid "New Password"
+msgstr "新口令"
 
-#: setup/class_setupStep_Checks.inc:136
-#, fuzzy
-msgid "Checking for SNMP support"
-msgstr "检查 iconv 支持"
+#: ihtml/themes/default/accountexpired.tpl:41
+#: ihtml/themes/default/accountexpired.tpl:45
+msgid "Verify Password"
+msgstr "口令确认"
 
-#: setup/class_setupStep_Checks.inc:137
-#, fuzzy
-msgid ""
-"The simple network management protocol is needed to get status information "
-"from clients."
-msgstr "简单网络管理协议 (SNMP) 需要来做客户端监视。"
+#: ihtml/themes/default/accountexpired.tpl:51
+msgid "Change Password"
+msgstr "修改口令"
 
-#: setup/class_setupStep_Checks.inc:138
-msgid ""
-"This module is required for client monitoring. Please install php4-snmp/php5-"
-"snmp."
-msgstr ""
+#: ihtml/themes/default/accountexpired.tpl:52
+msgid "Click here to Change your password"
+msgstr "点击这里来修改您的口令"
 
-#: setup/class_setupStep_Checks.inc:144
-#, fuzzy
-msgid "Checking for CUPS support"
-msgstr "检查 iconv 支持"
+#: ihtml/themes/default/framework.tpl:19
+msgid "Main"
+msgstr "首页"
 
-#: setup/class_setupStep_Checks.inc:145
-#, fuzzy
+#: ihtml/themes/default/framework.tpl:24
+msgid "Help"
+msgstr "帮助"
+
+#: ihtml/themes/default/framework.tpl:30 ihtml/themes/default/framework.tpl:34
+msgid "Sign out"
+msgstr "退出"
+
+#: ihtml/themes/default/framework.tpl:43
+msgid "Signed in:"
+msgstr "登录:"
+
+#: ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "检测到锁定冲突"
+
+#: ihtml/themes/default/islocked.tpl:9
 msgid ""
-"In order to read available printers via the IPP protocol instead of printcap "
-"files, you've to install the CUPS module."
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the 'Edit anyway' button."
 msgstr ""
-"为了从 IPP 协议而非 printcap 文件中读取可用打印机，您必须安装 CUPS 模块。"
+"如果锁检查失败，明显的是另外的人在进行编辑操作时关闭了浏览器。您可以通过按“仍"
+"然编辑”按钮来接管这个锁文件。"
 
-#: setup/class_setupStep_Checks.inc:154
-msgid "Checking for fping utility"
-msgstr "检查 fping 工具"
+#~ msgid ""
+#~ "Be careful editing record types with this dialog. All changes will be "
+#~ "saved immediately when using the save button."
+#~ msgstr ""
+#~ "小心使用这个对话框修改记录类型。当按下保存键时，所有修改马上被保存。"
 
-#: setup/class_setupStep_Checks.inc:155
-#, fuzzy
-msgid ""
-"The fping utility is used if you've got a thin client based terminal "
-"environment."
-msgstr "工具 fping 只有在您部署了基于瘦客户机的终端环境下被使用。"
+#~ msgid "There is already a ppd file for this kind of printer."
+#~ msgstr "这种打印机类型已经有一个 ppd 文件。"
 
-#: setup/class_setupStep_Checks.inc:156
-#, fuzzy
-msgid ""
-"The fping utility is only used in thin client based terminal environment."
-msgstr "工具 fping 只有在您部署了基于瘦客户机的终端环境下被使用。"
+#~ msgid ".."
+#~ msgstr ".."
 
-#: setup/class_setupStep_Checks.inc:171
-msgid "SAMBA password hash generation"
-msgstr ""
+#~ msgid "can't get ppd informations."
+#~ msgstr "无法获取 ppd 信息。"
 
-#: setup/class_setupStep_Checks.inc:172
 #, fuzzy
-msgid ""
-"In order to use SAMBA 2/3 passwords, you've to install additional packages "
-"to generate password hashes."
-msgstr "为了使用 SAMBA 2/3, 您必须安装一些额外的软件包来创建口令。"
+#~ msgid "Add PTR"
+#~ msgstr "添加"
 
-#: setup/class_setupStep_Checks.inc:173
 #, fuzzy
-msgid ""
-"In order to use SAMBA 2/3 you've to install additional perl libraries. Take "
-"a look at mkntpasswd."
-msgstr "为了使用 SAMBA 2/3, 您必须安装一些额外的软件包来创建口令。"
+#~ msgid "Add PTR record"
+#~ msgstr "SOA 记录"
 
-#: setup/class_setupStep_Checks.inc:183 setup/class_setupStep_Checks.inc:202
-#: setup/class_setupStep_Checks.inc:218 setup/class_setupStep_Checks.inc:234
-#: setup/class_setupStep_Checks.inc:251
-msgid "Off"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "This includes 'all' DHCP subsections that are located within this server. "
+#~ "Please double check if your really want to do this."
+#~ msgstr ""
+#~ "这包含“所有”对象信息。请再次检查您是否要这么做，因为 GOsa 没有办法将您的数"
+#~ "据找回。"
 
-#: setup/class_setupStep_Checks.inc:184
 #, fuzzy
-msgid ""
-"register_globals is a PHP mechanism to register all global variables to be "
-"accessible from scripts without changing the scope. This may be a security "
-"risk."
-msgstr ""
-"register_globals 是 PHP 的一个不必修改范围就可以从脚本中访问所有全局变量的机"
-"制。这可能存在安全风险。GOsa 在两种情况下都可以运行。"
+#~ msgid "Following objects will be taken over"
+#~ msgstr "下列参照将被更新"
 
-#: setup/class_setupStep_Checks.inc:185
 #, fuzzy
-msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr "检查 register_globals 是否设置为 'off'"
+#~ msgid "Removing SSH account failed"
+#~ msgstr "删除 Samba 账号失败"
 
-#: setup/class_setupStep_Checks.inc:193
-msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr ""
+#, fuzzy
+#~ msgid "Reomve"
+#~ msgstr "删除"
 
-#: setup/class_setupStep_Checks.inc:194
 #, fuzzy
-msgid ""
-"Setting this value to one day will prevent loosing session and cookies "
-"before they really timeout."
-msgstr ""
-"PHP 用这个值来进行垃圾回收，删除旧的会话。设置这个值为一天，将会防止在真正超"
-"时之前的会话和 cookie 丢失。"
+#~ msgid "SSH account"
+#~ msgstr "我的账号"
 
-#: setup/class_setupStep_Checks.inc:195
-msgid ""
-"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
-"higher."
-msgstr ""
+#~ msgid "DFS Shares"
+#~ msgstr "DFS 共享"
 
-#: setup/class_setupStep_Checks.inc:203
-#, fuzzy
-msgid ""
-"In Order to use GOsa without any trouble, the session.auto_register option "
-"in your php.ini should be set to 'Off'."
-msgstr ""
-"为了在是使用 GOsa 中不遇到麻烦，您的 php.ini 中 session.auto_register 选项必"
-"须设置为 'Off'。"
+#~ msgid ""
+#~ "This menu allows you to create, delete and edit selected dfs shares. "
+#~ "Having a large numbers of dfs shares, you might prefer the range "
+#~ "selectors on top of the dfs share list."
+#~ msgstr ""
+#~ "这个菜单允许您创建，删除和修改所选的 dfs 共享。对于一个长列表，您可以通过"
+#~ "列表上面的范围选择来调整。"
 
-#: setup/class_setupStep_Checks.inc:204
-#, fuzzy
-msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr ""
-"为了在是使用 GOsa 中不遇到麻烦，您的 php.ini 中 session.auto_register 选项必"
-"须设置为 'Off'。"
+#~ msgid "Display dfs shares matching"
+#~ msgstr "显示匹配的 dfs 共享"
 
-#: setup/class_setupStep_Checks.inc:211
-#, fuzzy
-msgid ""
-"GOsa needs at least 32MB of memory. Setting it below this limit may cause "
-"errors that are not reproducable! Increase it for larger setups."
-msgstr "GOsa 需要至少 16MB 内存，太少会导致无法预料的错误！将其设置为更大。"
+#~ msgid "Regular expression for matching dfs share names"
+#~ msgstr "匹配 dns 共享名的正则表达式"
 
-#: setup/class_setupStep_Checks.inc:212
-msgid ""
-"Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
-msgstr ""
+#~ msgid "DFS Properties"
+#~ msgstr "DFS 属性"
 
-#: setup/class_setupStep_Checks.inc:219
-#, fuzzy
-msgid ""
-"This option influences the PHP output handling. Turn this Option off, to "
-"increase performance."
-msgstr "这个选项影响输出处理。关闭这个选项，可以提高性能。"
+#~ msgid "Fileserver"
+#~ msgstr "文件服务器"
 
-#: setup/class_setupStep_Checks.inc:220
-msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
-msgstr ""
+#~ msgid "Share on Fileserver"
+#~ msgstr "文件服务器的共享"
 
-#: setup/class_setupStep_Checks.inc:227
-#, fuzzy
-msgid "The Execution time should be at least 30 seconds."
-msgstr "执行时间应该至少 30 秒，因为一些动作可能会花很多时间。"
+#~ msgid "DFS Location"
+#~ msgstr "DFS 位置"
 
-#: setup/class_setupStep_Checks.inc:228
-msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
-msgstr ""
+#~ msgid "DFS Managment"
+#~ msgstr "DFS 管理"
 
-#: setup/class_setupStep_Checks.inc:235
-#, fuzzy
-msgid ""
-"Increase the server security by setting expose_php to 'off'. PHP won't send "
-"any information about the server you are running in this case."
-msgstr ""
-"将 expose_php 设置为“off”可以增强服务器安全性。PHP 将不会发送任何有关正运行着"
-"的服务器的信息。"
+#~ msgid "Removing DFS share failed"
+#~ msgstr "删除 DFS 共享失败"
 
-#: setup/class_setupStep_Checks.inc:236
-msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
-msgstr ""
+#~ msgid "No DFS entries found"
+#~ msgstr "没有发现 DFS 条目"
 
-#: setup/class_setupStep_Checks.inc:242
-#, fuzzy
-msgid "On"
-msgstr "打开"
+#~ msgid "Go up one dfs share"
+#~ msgstr "转到上一个 dfs 共享"
 
-#: setup/class_setupStep_Checks.inc:243
-msgid ""
-"Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
-"escape all quotes in strings in this case."
-msgstr ""
-"将 magic_quotes_gpc 设置为 'on' 会增加服务器安全性。这种情况下 PHP 会将字符串"
-"中所有引号编码。"
+#~ msgid "Go to dfs root"
+#~ msgstr "跳转到 dfs 根"
 
-#: setup/class_setupStep_Checks.inc:244
-msgid "Search for 'magic_quotes_gpc' in your php.ini and set it to 'On'."
-msgstr ""
+#~ msgid "Create new dfs share"
+#~ msgstr "创建新的 dfs 共享"
 
-#: setup/class_setupStep_Checks.inc:252
-#, fuzzy
-msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr ""
-"将 magic_quotes_gpc 设置为 'on' 会增加服务器安全性。这种情况下 PHP 会将字符串"
-"中所有引号编码。"
+#~ msgid "Dfs share already exists."
+#~ msgstr "Dfs 共享已经存在。"
 
-#: setup/class_setupStep_Checks.inc:253
-msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
-msgstr ""
+#~ msgid "Required Field \"Name of dfs Share\" is not set."
+#~ msgstr "需要的字段“dfs 共享名”没有设置。"
+
+#~ msgid "Required Field \"Description\" is not set."
+#~ msgstr "需要的字段“描述”没有设置。"
+
+#~ msgid "Required Field \"Fileserver\" is not set."
+#~ msgstr "需要的字段“文件服务器”没有设置。"
+
+#~ msgid "Required Field \"Share on fileserver\" is not set."
+#~ msgstr "需要的字段“文件服务器的共享”没有设置。"
+
+#~ msgid "Required Field \"Location\" is not set."
+#~ msgstr "需要的字段“位置”没有设置。"
+
+#~ msgid "Distributed File System Administration"
+#~ msgstr "分布式文件系统管理"
 
-#: setup/class_setupStep_Checks.inc:264
 #, fuzzy
-msgid "Configuration writeable"
-msgstr "配置文件"
+#~ msgid "The configured timezone '%s' seems not to valid."
+#~ msgstr "提供的网络地址 '%s' 无效。"
 
-#: setup/class_setupStep_Checks.inc:265
 #, fuzzy
-msgid "The configuration file can't be written"
-msgstr "查看配置信息"
+#~ msgid "Inheritance"
+#~ msgstr "中间名"
 
-#: setup/class_setupStep_Checks.inc:266
-#, php-format
-msgid ""
-"GOsa reads its configuration from a file located in (%s/%s). The setup can "
-"write the configuration directly if it is writeable."
-msgstr ""
+#~ msgid "User scalixsettings"
+#~ msgstr "用户 scalix 设置"
 
-#: setup/setup_welcome.tpl:4
-msgid ""
-"This seems to be the first time you start GOsa - we didn't find any "
-"configuration right now. This simple wizard intends to help you while "
-"setting it up."
-msgstr ""
+#~ msgid "Welcome to the GOsa setup!"
+#~ msgstr "欢迎进入 Gosa 安装程序！"
 
-#: setup/setup_welcome.tpl:8
-msgid "What will the wizard do for you?"
-msgstr ""
+#~ msgid ""
+#~ "It looks like you're calling GOsa for the first time - no configuration "
+#~ "was found. This setup like script will try to aid you in creating a "
+#~ "working configuration by performing three major steps: first we'll check "
+#~ "the PHP installation for required modules, than we're going to check for "
+#~ "optional/needed programms and after you've provided basic informations "
+#~ "for your LDAP connectivity, we're going to check your LDAP setup."
+#~ msgstr ""
+#~ "看起来您是第一次访问 GOsa ── 没有发现配置文件。安装程序将通过三个主要步骤"
+#~ "帮助您创建一个可用配置文件： 首先我们将检查 PHP 安装，查看依赖的模块是否安"
+#~ "装了，然后我们检查需要的成讯，然后在您提供 LDAP 连接需要的基本信息后，我们"
+#~ "将检查您 LDAP 的设置。"
 
-#: setup/setup_welcome.tpl:11
-msgid "Create a basic, single site configuration"
-msgstr ""
+#~ msgid "Setup finished"
+#~ msgstr "安装完毕"
 
-#: setup/setup_welcome.tpl:12
-msgid "Tries to find problems within your PHP and LDAP setup"
-msgstr ""
+#~ msgid ""
+#~ "Basically the setup is finished. You can check the result of the schema "
+#~ "check here and download the autogenerated gosa.conf below."
+#~ msgstr ""
+#~ "基本上该安装结束了。您可以检查这里的 schema 检查结果，然后从下面下载自动创"
+#~ "建的 gosa.conf 配置文件。"
 
-#: setup/setup_welcome.tpl:13
-msgid "Let you choose from a set of basic and advanced configuration switches"
-msgstr ""
+#~ msgid "Schema Configuration"
+#~ msgstr "Schema 配置"
 
-#: setup/setup_welcome.tpl:14
-msgid "Guided migration of existing LDAP trees"
-msgstr ""
+#~ msgid "Configuration File"
+#~ msgstr "配置文件"
 
-#: setup/setup_welcome.tpl:17
-msgid "What will the wizard NOT do for you?"
-msgstr ""
+#~ msgid ""
+#~ "GOsa setup has collected all data needed to create an initial "
+#~ "configuration file. Save the the link below as your gosa.conf and place "
+#~ "that file in /etc/gosa. Change it as needed."
+#~ msgstr ""
+#~ "GOsa 安装已经收集了所有创建配置文件所需要的数据。将下面的 gosa.conf 文件下"
+#~ "载保存在 GOsa 配置目录中。如果需要可以手动修改配置文件。"
 
-#: setup/setup_welcome.tpl:20
-msgid "Find every possible configuration error"
-msgstr ""
+#~ msgid ""
+#~ "After placing the file under /etc/gosa, place make sure that the "
+#~ "webserver user is able to read gosa.conf, while other users shouldn't. "
+#~ "You may want to execute these commands to achieve this requirement:"
+#~ msgstr ""
+#~ "将文件保存在 GOsa 配置文件目录中，确认 Web 服务器运行的账号能够读取 gosa."
+#~ "conf，其他用户则无权访问。您可以执行如下命令来实现："
 
-#: setup/setup_welcome.tpl:21
-msgid "Migrate every possible LDAP setup - create backup dumps!"
-msgstr ""
+#~ msgid "Setup continued..."
+#~ msgstr "安装继续..."
 
-#: setup/setup_welcome.tpl:25
-#, fuzzy
-msgid "To continue..."
-msgstr "安装继续..."
+#~ msgid ""
+#~ "Step two looks for a set of helper programms and checks if they have the "
+#~ "correct minimum version."
+#~ msgstr "第二步查找一系列帮助程序并检查他们的版本是否达到最低要求。"
 
-#: setup/setup_welcome.tpl:28
-msgid ""
-"For security reasons you need to authenticate for the installation by "
-"creating the file '/tmp/gosa.auth', containing the current session ID on the "
-"servers local filesystem. This can be done by executing the following "
-"command:"
-msgstr ""
+#~ msgid ""
+#~ "If this lock detection is false, the other person has obviously closed "
+#~ "the webbrowser during the edit operation. You may delete the lockfile in "
+#~ "this case by pressing the 'Remove' button."
+#~ msgstr ""
+#~ "如果锁检查失败，明显的是另外的人在进行编辑操作时关闭了浏览器。您可以通过"
+#~ "按“删除”按钮删除锁文件。"
 
-#: setup/setup_welcome.tpl:34
-msgid "Click the 'Continue' button when you've finished."
-msgstr ""
+#~ msgid "You already have an Administrative Account and a Group."
+#~ msgstr "您已经有了一个管理员账号和组。"
 
-#: setup/setup_checks.tpl:9
-msgid "PHP module and extension checks"
-msgstr ""
+#~ msgid ""
+#~ "To provide full administrative access to GOsa, you need to create a "
+#~ "special group which contains the administrative user. The setup program "
+#~ "can assist you with this task. Enter the desired username and the "
+#~ "password below to create the missing entries."
+#~ msgstr ""
+#~ "要具有管理 GOsa 的全部权限，您需要创建一个特殊的组，并包含管理员账号。安装"
+#~ "程序可以帮助您实现。输入想用的用户名和口令以创建缺失的记录。"
 
-#: setup/setup_checks.tpl:41 setup/setup_checks.tpl:103
-msgid "GOsa will NOT run without fixing this."
-msgstr ""
+#~ msgid ""
+#~ "The following fields allow the basic configuration of GOsa's behaviour "
+#~ "and affect various properties in your main configuration."
+#~ msgstr "如下字段允许对 GOsa 的行为进行基本配置，并会影响主配置中各种参数。"
 
-#: setup/setup_checks.tpl:45 setup/setup_checks.tpl:107
-msgid "GOsa will run without fixing this."
-msgstr ""
+#~ msgid "Enter a description for the location you're configuring here"
+#~ msgstr "为这里您配置的位置输入一个描述"
 
-#: setup/setup_checks.tpl:67
-#, fuzzy
-msgid "PHP setup configuration"
-msgstr "PHP 安装检查"
+#~ msgid ""
+#~ "GOsa always acts as admin and manages access rights internally. This is a "
+#~ "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
+#~ "this to work, we need the admin DN and the corresponding password."
+#~ msgstr ""
+#~ "GOsa 总是作为 LDAP 管理员，并且管理内部权限。这是一个临时方案直到 "
+#~ "OpenLDAP 目录 ACI 被完全实现。为了让其实现，我们需要管理员 DN 和正确的口"
+#~ "令。"
 
-#: setup/setup_checks.tpl:67
-#, fuzzy
-msgid "show information"
-msgstr "个人信息"
+#~ msgid "Base "
+#~ msgstr "Base "
 
-#: setup/setup_schema.tpl:3
-#, fuzzy
-msgid "Schema specific settings"
-msgstr "Samba 设置"
+#~ msgid "People dn attribute"
+#~ msgstr "People dn attribute"
 
-#: setup/setup_schema.tpl:7
-msgid "Enable schema validation when logging in"
-msgstr ""
+#~ msgid "ID base for users/groups"
+#~ msgstr "用户/组起始 ID"
 
-#: setup/setup_schema.tpl:16
-#, fuzzy
-msgid "Check status"
-msgstr "具有状态"
+#~ msgid "Encryption algorithm"
+#~ msgstr "加密算法"
 
-#: setup/setup_schema.tpl:20
-msgid "Schema check succeeded"
-msgstr ""
+#~ msgid ""
+#~ "GOsa has modular support for several mail methods. These methods provide "
+#~ "interfaces to users mailboxes and general handling for quotas. You can "
+#~ "choose the dummy plugin to leave all your mail settings untouched."
+#~ msgstr ""
+#~ "GOsa 通过模组支持几种邮件方法。这些方法提供用户邮箱的界面以及管理用户空"
+#~ "间。您可以选择选择 dummy 插件以保持您的邮件设置不被更改。"
 
-#: setup/setup_schema.tpl:23
-#, fuzzy
-msgid "Schema check failed"
-msgstr "保存电话失败"
+#~ msgid ""
+#~ "GOsa may cause PHP interpreter errors, particularly in case of Beta "
+#~ "versions. In some cases it would be helpful to enable the error "
+#~ "reporting. (But it  could be a security risk)  "
+#~ msgstr ""
+#~ "GOsa 可能导致 PHP 解析错误，尤其在 Beta 版本。有时候打开错误报告将会非常有"
+#~ "用。（但是可能造成安全风险）"
+
+#~ msgid "Display PHP errors"
+#~ msgstr "显示 PHP 错误"
+
+#~ msgid "true"
+#~ msgstr "真"
+
+#~ msgid "false"
+#~ msgstr "假"
+
+#~ msgid "Check"
+#~ msgstr "检查"
+
+#~ msgid ""
+#~ "Probably there's another active instance of your session. Multiple window "
+#~ "operation is technical not possible and heavily depends on the browser "
+#~ "you're using. Usage of different browsers at a time (i.e. IE and Mozilla) "
+#~ "is possible. Pressing the 'Logout' button will close this session."
+#~ msgstr ""
+#~ "可能已经存在另外一个您的活动的会话。多窗口操作在技术上不可能并且和严重依赖"
+#~ "您使用浏览器。使用不同的浏览器（如 IE 和 Mozilla）是可能的。按“退出”按钮关"
+#~ "闭此会话。"
+
+#~ msgid ""
+#~ "Now we're going include your LDAP server and create an initial "
+#~ "configuration. After you've entered the server URI below, a quick check "
+#~ "is performed if required LDAP schemas are in place. Samba versions are "
+#~ "autodetected by the installed objectclasses. Details on how your LDAP "
+#~ "tree is organized will be asked later on."
+#~ msgstr ""
+#~ "现在我们要包含您的 LDAP 服务器并创建一个初始配置。当您在下面输入 URI，将会"
+#~ "执行一个针对需要的 LDAP schema 的快速检查。Samba 版本会根据安装的对象类自"
+#~ "动判断。关于您的 LDAP 树的组织将在稍后被问到。"
+
+#~ msgid ""
+#~ "Please enter the server URI to allow the setup to connect your LDAP "
+#~ "server (Example: ldap://your.server:389)."
+#~ msgstr ""
+#~ "请输入服务器 URI 来允许安装程序连接 LDAP 服务器 （如： ldap://your."
+#~ "server:389）。"
+
+#~ msgid "Display systems of user"
+#~ msgstr "显示用户系统"
+
+#~ msgid "An error occurred while processing your request"
+#~ msgstr "处理您的请求时发生一个错误"
+
+#~ msgid "Ignore subtrees"
+#~ msgstr "忽略子树"
+
+#~ msgid "Mime type generic"
+#~ msgstr "Mime type generic"
+
+#~ msgid "Left click action"
+#~ msgstr "左键单击事件"
+
+#~ msgid "Primary dns server must end with '.' to be a valid entry."
+#~ msgstr "要成为一个有效记录，主 dns 服务器必须以 '.' 结束。"
+
+#~ msgid "Your specified mail address must end with '.' to be a valid record."
+#~ msgstr "您定义的一个有效的邮件地址记录必须以 '.' 结束。"
+
+#~ msgid ""
+#~ "Your mail address contains '@' replace this with '.' to enable GOsa to "
+#~ "create a valid SOA record."
+#~ msgstr ""
+#~ "您提供的邮件地址中的 '@' 被替换为 '.' 以便 GOsa 创建一个有效的 SOA 记录。"
+
+#~ msgid ""
+#~ "It looks like you're calling GOsa for the first time - no configuration "
+#~ "was found. This setup like script will try to aid you in creating a "
+#~ "working configuration by performing three major steps: first we'll check "
+#~ "the PHP installation for required modules, than we're going to check for "
+#~ "optional/needed programms and after you've provided basic information for "
+#~ "your LDAP connectivity, we're going to check your LDAP setup."
+#~ msgstr ""
+#~ "看起来您是第一次访问 GOsa ── 没有发现配置文件。安装程序将通过三个主要步骤"
+#~ "帮助您创建一个可用配置文件： 首先我们将检查 PHP 安装，查看依赖的模块是否安"
+#~ "装了，然后我们检查需要的成讯，然后在您提供 LDAP 连接需要的基本信息后，我们"
+#~ "将检查您 LDAP 的设置。"
+
+#~ msgid ""
+#~ "You can also use the new and more-advanced way of inspecting your PHP-"
+#~ "installation. It will give you information about the exact function that "
+#~ "could not be found (functions that could be found are not mentioned). "
+#~ "This is useful if you know what you're doing."
+#~ msgstr ""
+#~ "您也可以使用新的和更高级的方法来检测 PHP 安装。它将给出关于哪些函数没有被"
+#~ "发现的信息（发现的函数将不被提及）。如果您知道您在做什么的话，这非常有帮"
+#~ "助。"
+
+#~ msgid "Toggle Show/Hide"
+#~ msgstr "切换显示/隐藏"
+
+#~ msgid ""
+#~ "GOsa may cause PHP interpreter errors, particularly in case of Beta "
+#~ "versions. In some cases it would be helpful to enable the error reporting."
+#~ msgstr ""
+#~ "GOsa 可能导致 PHP 解析错误，尤其在 Beta 版本。有时候打开错误报告将会非常有"
+#~ "用。"
 
 #~ msgid "{LOCATIONNAME}"
 #~ msgstr "{LOCATIONNAME}"
@@ -16105,19 +17613,16 @@ msgstr "保存电话失败"
 #~ "Directory '%s' specified as smarty compile directory is not accessible, "
 #~ "please check existence and rights of this directory!"
 #~ msgstr ""
-#~ "目录 '%s' 指定为 smarty 编译目录并不存在，请检查该目录是否存在以及权限！"
-
-#~ msgid "Display macros  matching"
-#~ msgstr "显示匹配的宏"
+#~ "目录 '%s' 作为 smarty 编译目录无法访问，请检查该目录是否存在以及权限！"
 
 #~ msgid ""
 #~ "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
 #~ "setup"
-#~ msgstr "可选的对象类 '%s'（插件 '%s' 需要的）在 LDAP 安装中不存在"
+#~ msgstr "可选对象类 '%s' 为插件 '%s' 所必须，在您的 LDAP 设置中不存在"
 
 #~ msgid ""
 #~ "Optional objectclass '%s' required by plugin '%s' does not have version %s"
-#~ msgstr "可选的对象类 '%s'（插件 '%s' 需要的）不存在版本 %s"
+#~ msgstr "可选对象类 '%s' 为插件 '%s' 所必须，没有版本 %s"
 
 #~ msgid "Support for '%s' enabled"
 #~ msgstr "启用 '%s' 的支持"
@@ -16197,7 +17702,7 @@ msgstr "保存电话失败"
 #~ msgstr "PHP session.gc_maxlifetime (>= 86400 秒)。"
 
 #~ msgid "Checking for XML functions"
-#~ msgstr "æ£\80æ\9f¥ XML å\8a\9fè\83½"
+#~ msgstr "æ£\80æ\9f¥ XML å\87½æ\95°"
 
 #~ msgid "Checking for mhash module"
 #~ msgstr "检查 mhash 模块"
@@ -16230,7 +17735,7 @@ msgstr "保存电话失败"
 #~ msgid ""
 #~ "The function %s is used by GOsa. There is no information if it's optional "
 #~ "or required yet."
-#~ msgstr "GOsa 要使用函数 %s。是可选还是必须未知。"
+#~ msgstr "这个功能 %s 为 GOsa 使用。没有可选或者必须的信息。"
 
 #~ msgid "Checking for GraphicsMagick (>=1.1.2)"
 #~ msgstr "检查 GraphicsMagick (>=1.1.2)"
@@ -16311,9 +17816,9 @@ msgstr "保存电话失败"
 #~ "GOsa 读取。"
 
 #~ msgid "Can't log into LDAP server. Reason was: %s."
-#~ msgstr "无法登录到 LDAP 服务器。原因是： %s。"
+#~ msgstr "无法登录到 LDAP 服务器。原因是: '%s'。"
 
 #~ msgid ""
 #~ "User and/or group could not be created, please check your configuration "
 #~ "twice !"
-#~ msgstr "用户和/或组无法创建，请再次检查您的配置！"
+#~ msgstr "用户和/或组无法创建，请再次检查您的配置!"