diff --git a/lam/locale/zh_CN/LC_MESSAGES/messages.mo b/lam/locale/zh_CN/LC_MESSAGES/messages.mo
index 26f86f0a..b8e1e09c 100644
Binary files a/lam/locale/zh_CN/LC_MESSAGES/messages.mo and b/lam/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/lam/locale/zh_CN/LC_MESSAGES/messages.po b/lam/locale/zh_CN/LC_MESSAGES/messages.po
index fcb2c271..3c46565f 100644
--- a/lam/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/lam/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: LAM 1.3\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de\n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2009-12-09 09:10+0800\n"
-"Last-Translator: Alan Needham <needham@sina.com>\n"
+"PO-Revision-Date: 2010-03-08 11:26+0800\n"
+"Last-Translator: Needham <needham@sina.com>\n"
 "Language-Team: Chinese(Simplified) <needham@sina.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../lib/modules/posixAccount.inc:385
+#: ../lib/modules/posixAccount.inc:377
 msgid "$user and $group will be replaced with user name and primary group name."
 msgstr "$usert和$group会被用户名或主要组名替代 "
 
@@ -60,11 +60,16 @@ msgstr "找到 %s 个组"
 msgid "%s host(s) found"
 msgstr "找到 %s 个主机"
 
-#: ../lib/lists.inc:103
+#: ../lib/lists.inc:106
 #, php-format
 msgid "%s object(s) found"
 msgstr "找到 %s 个对象"
 
+#: ../lib/types/ppolicyType.inc:125
+#, php-format
+msgid "%s policy(ies) found"
+msgstr "找到 %s 个策略"
+
 #: ../lib/types/user.inc:135
 #, php-format
 msgid "%s user(s) found"
@@ -90,7 +95,7 @@ msgstr "(本条目没有新的可用属性)"
 msgid "(no new binary attributes available for this entry)"
 msgstr "(本条目没有新的可用binary属性)"
 
-#: ../lib/modules/posixAccount.inc:233
+#: ../lib/modules/posixAccount.inc:236
 msgid "/home/smiller"
 msgstr "/home/smiller"
 
@@ -114,7 +119,7 @@ msgstr "123-124-1234"
 msgid "12345"
 msgstr "12345"
 
-#: ../lib/modules/dhcp_settings.inc:140
+#: ../lib/modules/dhcp_settings.inc:141
 msgid ""
 "<b>B-Node (0x01): Broadcast.</b><br/>The client tries to find other workstations via broadcasting\n"
 "(works only inside the same collision domain, viz. the same subnet).<br/><br/>\n"
@@ -144,7 +149,7 @@ msgstr ""
 "\n"
 "缺省情况下,小型网络中节点被配置成H-节点模式,大型网络使用点到点模式."
 
-#: ../templates/massBuildAccounts.php:117
+#: ../templates/massBuildAccounts.php:114
 msgid "A required column is missing in your CSV file."
 msgstr "您的CSV文件中缺少一个必要的列."
 
@@ -152,11 +157,11 @@ msgstr "您的CSV文件中缺少一个必要的列."
 msgid "A user may define who is allowed to act on behalf of herself. This property is checked when using the Kolab smtp daemon (Postfix) to send emails."
 msgstr "使用者可以同意由某人来代表自己，在 Kolab smtp 服务器(Postfix)发送电子邮件时会检查这个属性."
 
-#: ../lib/modules/sambaSamAccount.inc:562
+#: ../lib/modules/sambaSamAccount.inc:543
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "阿布达比, 马斯凯特, 巴库"
 
-#: ../templates/config/confmain.php:290
+#: ../templates/config/confmain.php:317
 #: ../help/help.inc:102
 msgid "Access level"
 msgstr "访问级别"
@@ -165,22 +170,22 @@ msgstr "访问级别"
 msgid "Account"
 msgstr "帐号"
 
-#: ../templates/massBuildAccounts.php:172
-#: ../lib/modules/dhcp_settings.inc:302
-#: ../lib/modules/dhcp_settings.inc:304
-#: ../lib/modules/dhcp_settings.inc:306
-#: ../lib/modules/dhcp_settings.inc:308
-#: ../lib/modules/dhcp_settings.inc:310
+#: ../templates/massBuildAccounts.php:169
+#: ../lib/modules/dhcp_settings.inc:303
+#: ../lib/modules/dhcp_settings.inc:305
+#: ../lib/modules/dhcp_settings.inc:307
+#: ../lib/modules/dhcp_settings.inc:309
 #: ../lib/modules/dhcp_settings.inc:311
-#: ../lib/modules/dhcp_settings.inc:313
-#: ../lib/modules/dhcp_settings.inc:315
-#: ../lib/modules/dhcp_settings.inc:321
+#: ../lib/modules/dhcp_settings.inc:312
+#: ../lib/modules/dhcp_settings.inc:314
+#: ../lib/modules/dhcp_settings.inc:316
 #: ../lib/modules/dhcp_settings.inc:322
 #: ../lib/modules/dhcp_settings.inc:323
+#: ../lib/modules/dhcp_settings.inc:324
 #: ../lib/modules/nisMailAlias.inc:106
 #: ../lib/modules/nisMailAlias.inc:108
-#: ../lib/modules/account.inc:136
-#: ../lib/modules/ddns.inc:145
+#: ../lib/modules/account.inc:117
+#: ../lib/modules/ddns.inc:147
 #: ../lib/modules/inetOrgPerson.inc:72
 #: ../lib/modules/inetOrgPerson.inc:74
 #: ../lib/modules/inetOrgPerson.inc:76
@@ -200,24 +205,26 @@ msgstr "帐号"
 #: ../lib/modules/inetOrgPerson.inc:102
 #: ../lib/modules/inetOrgPerson.inc:105
 #: ../lib/modules/ieee802device.inc:89
-#: ../lib/modules/sambaGroupMapping.inc:438
+#: ../lib/modules/ipHost.inc:107
+#: ../lib/modules/ipHost.inc:108
 #: ../lib/modules/sambaGroupMapping.inc:439
-#: ../lib/modules/posixGroup.inc:472
-#: ../lib/modules/posixGroup.inc:476
+#: ../lib/modules/sambaGroupMapping.inc:440
+#: ../lib/modules/posixGroup.inc:473
 #: ../lib/modules/posixGroup.inc:477
-#: ../lib/modules/posixAccount.inc:66
-#: ../lib/modules/posixAccount.inc:71
-#: ../lib/modules/posixAccount.inc:73
-#: ../lib/modules/posixAccount.inc:81
-#: ../lib/modules/posixAccount.inc:82
-#: ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/posixGroup.inc:478
+#: ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:76
 #: ../lib/modules/posixAccount.inc:84
 #: ../lib/modules/posixAccount.inc:85
 #: ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:87
 #: ../lib/modules/posixAccount.inc:88
 #: ../lib/modules/posixAccount.inc:89
-#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:91
 #: ../lib/modules/posixAccount.inc:92
+#: ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/posixAccount.inc:95
 #: ../lib/modules/kolabUser.inc:236
 #: ../lib/modules/kolabUser.inc:238
 #: ../lib/modules/kolabUser.inc:240
@@ -225,18 +232,18 @@ msgstr "帐号"
 #: ../lib/modules/kolabUser.inc:244
 #: ../lib/modules/kolabUser.inc:246
 #: ../lib/modules/kolabUser.inc:248
-#: ../lib/modules/asteriskAccount.inc:146
-#: ../lib/modules/asteriskAccount.inc:149
-#: ../lib/modules/asteriskAccount.inc:152
+#: ../lib/modules/asteriskAccount.inc:155
+#: ../lib/modules/asteriskAccount.inc:158
+#: ../lib/modules/asteriskAccount.inc:161
 #: ../lib/modules/nisObject.inc:114
 #: ../lib/modules/nisObject.inc:116
-#: ../lib/modules/eduPerson.inc:200
-#: ../lib/modules/eduPerson.inc:202
-#: ../lib/modules/eduPerson.inc:204
-#: ../lib/modules/eduPerson.inc:206
-#: ../lib/modules/eduPerson.inc:207
-#: ../lib/modules/eduPerson.inc:208
-#: ../lib/modules/eduPerson.inc:209
+#: ../lib/modules/eduPerson.inc:211
+#: ../lib/modules/eduPerson.inc:213
+#: ../lib/modules/eduPerson.inc:215
+#: ../lib/modules/eduPerson.inc:217
+#: ../lib/modules/eduPerson.inc:218
+#: ../lib/modules/eduPerson.inc:219
+#: ../lib/modules/eduPerson.inc:220
 #: ../lib/modules/inetLocalMailRecipient.inc:125
 #: ../lib/modules/inetLocalMailRecipient.inc:127
 #: ../lib/modules/inetLocalMailRecipient.inc:129
@@ -255,25 +262,23 @@ msgstr "帐号"
 #: ../lib/modules/sambaSamAccount.inc:101
 #: ../lib/modules/sambaSamAccount.inc:102
 #: ../lib/modules/sambaSamAccount.inc:103
-#: ../lib/modules/sambaSamAccount.inc:104
 #: ../lib/modules/sambaSamAccount.inc:105
-#: ../lib/modules/sambaSamAccount.inc:107
-#: ../lib/modules/sambaSamAccount.inc:108
-#: ../lib/modules/quota.inc:47
+#: ../lib/modules/sambaSamAccount.inc:106
 #: ../lib/modules/quota.inc:49
 #: ../lib/modules/quota.inc:51
 #: ../lib/modules/quota.inc:53
 #: ../lib/modules/quota.inc:55
 #: ../lib/modules/quota.inc:57
-#: ../lib/modules/quota.inc:58
+#: ../lib/modules/quota.inc:59
+#: ../lib/modules/quota.inc:60
 #: ../lib/modules/shadowAccount.inc:58
 #: ../lib/modules/shadowAccount.inc:60
 #: ../lib/modules/shadowAccount.inc:62
 #: ../lib/modules/shadowAccount.inc:64
 #: ../lib/modules/shadowAccount.inc:66
 #: ../lib/modules/shadowAccount.inc:67
-#: ../lib/modules/phpGroupwareUser.inc:124
-#: ../lib/modules/phpGroupwareUser.inc:125
+#: ../lib/modules/phpGroupwareUser.inc:135
+#: ../lib/modules/phpGroupwareUser.inc:136
 #: ../lib/modules/sambaDomain.inc:189
 #: ../lib/modules/sambaDomain.inc:191
 #: ../lib/modules/sambaDomain.inc:193
@@ -285,87 +290,88 @@ msgstr "帐号"
 msgid "Account %s:"
 msgstr "帐号 %s:"
 
-#: ../lib/modules/asteriskExtension.inc:68
-#: ../lib/modules/asteriskExtension.inc:95
-#: ../lib/modules/asteriskExtension.inc:155
-#: ../lib/modules/asteriskExtension.inc:200
-#: ../lib/modules/asteriskExtension.inc:424
-#: ../lib/modules/asteriskAccount.inc:76
-#: ../lib/modules/asteriskAccount.inc:91
-#: ../lib/modules/asteriskAccount.inc:117
-#: ../lib/modules/asteriskAccount.inc:177
-#: ../lib/modules/asteriskAccount.inc:271
+#: ../lib/modules/asteriskExtension.inc:82
+#: ../lib/modules/asteriskExtension.inc:113
+#: ../lib/modules/asteriskExtension.inc:173
+#: ../lib/modules/asteriskExtension.inc:218
+#: ../lib/modules/asteriskExtension.inc:457
+#: ../lib/modules/asteriskAccount.inc:85
+#: ../lib/modules/asteriskAccount.inc:100
+#: ../lib/modules/asteriskAccount.inc:126
+#: ../lib/modules/asteriskAccount.inc:186
+#: ../lib/modules/asteriskAccount.inc:272
 msgid "Account context"
 msgstr "帐号上下文"
 
-#: ../templates/masscreate.php:87
+#: ../templates/masscreate.php:110
 msgid "Account creation via file upload"
 msgstr "通过上传文件建立帐号"
 
-#: ../lib/modules/posixAccount.inc:392
+#: ../lib/modules/posixAccount.inc:384
 msgid "Account deactivated"
 msgstr "帐号已停用"
 
-#: ../templates/lists/changePassword.php:129
+#: ../templates/lists/changePassword.php:124
 msgid "Account details"
 msgstr "帐号详细信息"
 
-#: ../lib/modules/sambaSamAccount.inc:324
-#: ../lib/modules/sambaSamAccount.inc:453
-#: ../lib/modules/sambaSamAccount.inc:1164
-#: ../lib/modules/sambaSamAccount.inc:1411
-#: ../lib/modules/sambaSamAccount.inc:1595
-#: ../lib/modules/shadowAccount.inc:120
-#: ../lib/modules/shadowAccount.inc:185
-#: ../lib/modules/shadowAccount.inc:217
-#: ../lib/modules/shadowAccount.inc:312
-#: ../lib/modules/shadowAccount.inc:364
+#: ../lib/modules/sambaSamAccount.inc:319
+#: ../lib/modules/sambaSamAccount.inc:434
+#: ../lib/modules/sambaSamAccount.inc:1136
+#: ../lib/modules/sambaSamAccount.inc:1380
+#: ../lib/modules/sambaSamAccount.inc:1564
+#: ../lib/modules/shadowAccount.inc:124
+#: ../lib/modules/shadowAccount.inc:189
+#: ../lib/modules/shadowAccount.inc:225
+#: ../lib/modules/shadowAccount.inc:332
+#: ../lib/modules/shadowAccount.inc:391
 #: ../lib/modules/phpGroupwareUser.inc:82
-#: ../lib/modules/phpGroupwareUser.inc:111
-#: ../lib/modules/phpGroupwareUser.inc:142
-#: ../lib/modules/phpGroupwareUser.inc:226
-#: ../lib/modules/phpGroupwareUser.inc:371
+#: ../lib/modules/phpGroupwareUser.inc:122
+#: ../lib/modules/phpGroupwareUser.inc:153
+#: ../lib/modules/phpGroupwareUser.inc:237
+#: ../lib/modules/phpGroupwareUser.inc:342
 msgid "Account expiration date"
 msgstr "帐号过期日期"
 
-#: ../lib/modules/shadowAccount.inc:391
+#: ../lib/modules/shadowAccount.inc:418
 msgid "Account inactive"
 msgstr "帐号停用(inactive)"
 
-#: ../lib/modules/sambaSamAccount.inc:264
-#: ../lib/modules/sambaSamAccount.inc:270
-#: ../lib/modules/sambaSamAccount.inc:431
-#: ../lib/modules/sambaSamAccount.inc:1102
-#: ../lib/modules/sambaSamAccount.inc:1583
+#: ../lib/modules/sambaSamAccount.inc:259
+#: ../lib/modules/sambaSamAccount.inc:265
+#: ../lib/modules/sambaSamAccount.inc:426
+#: ../lib/modules/sambaSamAccount.inc:1096
+#: ../lib/modules/sambaSamAccount.inc:1552
 msgid "Account is deactivated"
 msgstr "帐号已经停用"
 
-#: ../lib/modules/sambaSamAccount.inc:267
-#: ../lib/modules/sambaSamAccount.inc:1110
+#: ../lib/modules/sambaSamAccount.inc:262
+#: ../lib/modules/sambaSamAccount.inc:1104
 msgid "Account is locked"
 msgstr "帐号锁定"
 
-#: ../templates/delete.php:95
+#: ../templates/delete.php:90
 msgid "Account name:"
 msgstr "帐号名"
 
 #: ../lib/modules/phpGroupwareUser.inc:78
-#: ../lib/modules/phpGroupwareUser.inc:104
-#: ../lib/modules/phpGroupwareUser.inc:149
-#: ../lib/modules/phpGroupwareUser.inc:366
+#: ../lib/modules/phpGroupwareUser.inc:115
+#: ../lib/modules/phpGroupwareUser.inc:160
+#: ../lib/modules/phpGroupwareUser.inc:337
 msgid "Account status"
 msgstr "帐号状态"
 
-#: ../templates/pdfedit/pdfdelete.php:87
-#: ../lib/modules/groupOfNames.inc:225
+#: ../templates/pdfedit/pdfdelete.php:85
+#: ../templates/masscreate.php:130
+#: ../lib/modules/groupOfNames.inc:229
 #: ../lib/modules/aliasEntry.inc:141
 msgid "Account type"
 msgstr "帐号类型"
 
-#: ../templates/config/conftypes.php:150
-#: ../templates/config/confmain.php:169
-#: ../templates/config/confmodules.php:135
-#: ../templates/config/moduleSettings.php:134
+#: ../templates/config/conftypes.php:156
+#: ../templates/config/confmain.php:174
+#: ../templates/config/confmodules.php:141
+#: ../templates/config/moduleSettings.php:140
 msgid "Account types"
 msgstr "帐号类型"
 
@@ -377,12 +383,12 @@ msgstr "帐号类型和模块"
 msgid "Account types define which sorts of LDAP entries (e.g. users and groups) should be managed. The account modules define which properties (e.g. Unix and Samba) can be edited."
 msgstr "LDAP条目类型中的帐号类型定义必须是可管理的（比如user和group),帐号模块定义中的属性（例如 UNIX 和SAMBA）必须是可编辑的。"
 
-#: ../lib/modules.inc:1395
+#: ../lib/modules.inc:1428
 msgid "Account was created successfully."
 msgstr "新增帐号成功"
 
-#: ../templates/lists/changePassword.php:412
-#: ../lib/modules.inc:1398
+#: ../templates/lists/changePassword.php:399
+#: ../lib/modules.inc:1431
 msgid "Account was modified successfully."
 msgstr "帐号修改成功"
 
@@ -390,40 +396,40 @@ msgstr "帐号修改成功"
 msgid "Action type"
 msgstr "动作类型"
 
-#: ../lib/modules/ddns.inc:81
-#: ../lib/modules/ddns.inc:333
+#: ../lib/modules/ddns.inc:83
+#: ../lib/modules/ddns.inc:338
 msgid "Activate DynDNS"
 msgstr "活动的动态DNS"
 
-#: ../templates/config/confmain.php:233
+#: ../templates/config/confmain.php:238
 msgid "Activate TLS"
 msgstr "激活TLS"
 
-#: ../lib/modules/sambaSamAccount.inc:331
+#: ../lib/modules/sambaSamAccount.inc:326
 msgid "Activate this checkbox to allow this user to use the terminal service."
 msgstr "激活这个选项允许用户使用终端服务。"
 
-#: ../lib/modules/sambaSamAccount.inc:352
+#: ../lib/modules/sambaSamAccount.inc:347
 msgid "Activate this checkbox to connect drives from the client machine."
 msgstr "激活这个选项将从客户机上连接驱动器。"
 
-#: ../lib/modules/sambaSamAccount.inc:355
+#: ../lib/modules/sambaSamAccount.inc:350
 msgid "Activate this checkbox to connect printers from the client machine."
 msgstr "激活这个选项将从客户机上连接打印机。"
 
-#: ../lib/modules/sambaSamAccount.inc:340
+#: ../lib/modules/sambaSamAccount.inc:335
 msgid "Activate this checkbox to inherit the initial program and working directory from the client machine."
 msgstr "激活这个选项将从客户机上继承初始化程序和工作目录。"
 
-#: ../lib/modules/sambaSamAccount.inc:358
+#: ../lib/modules/sambaSamAccount.inc:353
 msgid "Activate this checkbox to set the client's printer as default printer."
 msgstr "激活这个选项将会设置客户打印机为缺省打印机。"
 
-#: ../lib/modules/posixAccount.inc:364
+#: ../lib/modules/posixAccount.inc:356
 msgid "Activating this checkbox will remove the user's home directory."
 msgstr "激活这个选项将会删除用户的主目录."
 
-#: ../templates/config/conftypes.php:224
+#: ../templates/config/conftypes.php:230
 msgid "Active account types"
 msgstr "激活帐号类型"
 
@@ -432,62 +438,67 @@ msgstr "激活帐号类型"
 #: ../templates/tree/add_oclass_form.php:144
 #: ../templates/tree/add_attr_form.php:130
 #: ../templates/tree/add_attr_form.php:162
-#: ../templates/pdfedit/pdfpage.php:574
-#: ../templates/pdfedit/pdfpage.php:591
-#: ../templates/pdfedit/pdfpage.php:619
-#: ../templates/pdfedit/pdfpage.php:660
-#: ../templates/config/conftypes.php:212
-#: ../templates/config/confmodules.php:264
+#: ../templates/pdfedit/pdfpage.php:563
+#: ../templates/pdfedit/pdfpage.php:580
+#: ../templates/pdfedit/pdfpage.php:608
+#: ../templates/pdfedit/pdfpage.php:649
+#: ../templates/config/conftypes.php:218
+#: ../templates/config/confmodules.php:270
 #: ../lib/modules/nisnetgroup.inc:247
 #: ../lib/modules/nisMailAlias.inc:155
 #: ../lib/modules/ieee802device.inc:111
+#: ../lib/modules/ipHost.inc:138
 #: ../lib/modules/groupOfNames.inc:168
-#: ../lib/modules/groupOfNames.inc:310
+#: ../lib/modules/groupOfNames.inc:302
 #: ../lib/modules/kolabUser.inc:340
 #: ../lib/modules/kolabUser.inc:357
 #: ../lib/modules/kolabUser.inc:383
-#: ../lib/modules/kolabUser.inc:861
-#: ../lib/modules/kolabUser.inc:901
-#: ../lib/modules/eduPerson.inc:282
-#: ../lib/modules/eduPerson.inc:307
-#: ../lib/modules/eduPerson.inc:333
-#: ../lib/modules/eduPerson.inc:379
+#: ../lib/modules/kolabUser.inc:863
+#: ../lib/modules/kolabUser.inc:903
+#: ../lib/modules/eduPerson.inc:290
+#: ../lib/modules/eduPerson.inc:315
+#: ../lib/modules/eduPerson.inc:341
+#: ../lib/modules/eduPerson.inc:387
 #: ../lib/modules/ldapPublicKey.inc:105
 #: ../lib/modules/inetLocalMailRecipient.inc:167
 msgid "Add"
 msgstr "增加"
 
-#: ../lib/modules/asteriskAccount.inc:183
+#: ../lib/modules/asteriskAccount.inc:192
 msgid "Add Asterisk account"
 msgstr "增加 Asterisk 帐号"
 
-#: ../lib/modules/eduPerson.inc:387
+#: ../lib/modules/eduPerson.inc:402
 msgid "Add EDU person extension"
 msgstr "增加EDU用户扩展"
 
+#: ../lib/modules/ipHost.inc:181
+msgid "Add IP address extension"
+msgstr "增加IP地址扩展"
+
 #: ../lib/modules/kolabUser.inc:401
 msgid "Add Kolab extension"
 msgstr "增加 Kolab 扩展"
 
-#: ../lib/modules/sambaGroupMapping.inc:279
-#: ../lib/modules/sambaSamAccount.inc:1288
-msgid "Add Samba 3 account"
-msgstr "增加Samba3帐号"
+#: ../lib/modules/sambaGroupMapping.inc:280
+#: ../lib/modules/sambaSamAccount.inc:1267
+msgid "Add Samba 3 extension"
+msgstr "增加 Samba 3 扩展"
 
-#: ../lib/modules/shadowAccount.inc:322
-msgid "Add Shadow account"
-msgstr "增加 Shadow 帐号"
+#: ../lib/modules/shadowAccount.inc:349
+msgid "Add Shadow account extension"
+msgstr "增加 Shadow 帐号扩展"
 
-#: ../lib/modules/groupOfNames.inc:342
+#: ../lib/modules/groupOfNames.inc:338
 msgid "Add entries of this type:"
 msgstr "增加类型条目"
 
-#: ../lib/modules/ddns.inc:338
+#: ../lib/modules/ddns.inc:343
 msgid "Add fix IP addresses to DNS"
 msgstr "为DNS增加一个固定的IP地址"
 
-#: ../templates/selfService/adminMain.php:545
-#: ../help/help.inc:181
+#: ../templates/selfService/adminMain.php:553
+#: ../help/help.inc:183
 msgid "Add input field"
 msgstr "增加输入栏目"
 
@@ -503,15 +514,15 @@ msgstr "新增属性"
 msgid "Add new binary attribute"
 msgstr "新增binary属性."
 
-#: ../templates/selfService/adminMain.php:530
-#: ../help/help.inc:179
+#: ../templates/selfService/adminMain.php:538
+#: ../help/help.inc:181
 msgid "Add new group"
 msgstr "新增组"
 
-#: ../lib/modules/inetOrgPerson.inc:652
-#: ../lib/modules/inetOrgPerson.inc:1185
-#: ../lib/modules/inetOrgPerson.inc:1228
-#: ../lib/modules/inetOrgPerson.inc:1727
+#: ../lib/modules/inetOrgPerson.inc:631
+#: ../lib/modules/inetOrgPerson.inc:1164
+#: ../lib/modules/inetOrgPerson.inc:1207
+#: ../lib/modules/inetOrgPerson.inc:1744
 msgid "Add photo"
 msgstr "新增照片"
 
@@ -519,14 +530,14 @@ msgstr "新增照片"
 #: ../lib/modules/phpGroupwareGroup.inc:83
 #: ../lib/modules/phpGroupwareGroup.inc:106
 #: ../lib/modules/phpGroupwareUser.inc:74
-#: ../lib/modules/phpGroupwareUser.inc:97
-#: ../lib/modules/phpGroupwareUser.inc:183
+#: ../lib/modules/phpGroupwareUser.inc:108
+#: ../lib/modules/phpGroupwareUser.inc:194
 msgid "Add phpGroupWare extension"
 msgstr "增加 phpGroupWare 扩展"
 
-#: ../templates/selfService/profManage.php:141
-#: ../templates/config/profmanage.php:172
-#: ../help/help.inc:119
+#: ../templates/selfService/profManage.php:149
+#: ../templates/config/profmanage.php:178
+#: ../help/help.inc:121
 msgid "Add profile"
 msgstr "增加配置文件"
 
@@ -534,38 +545,38 @@ msgstr "增加配置文件"
 msgid "Adding attribute failed!"
 msgstr "增加属性失败！"
 
-#: ../lib/modules/range.inc:96
+#: ../lib/modules/range.inc:98
 msgid "Adding the range failed because errors occured."
 msgstr "因为发生了错误致使增加范围失败"
 
-#: ../templates/selfService/adminMain.php:448
-#: ../help/help.inc:185
+#: ../templates/selfService/adminMain.php:456
+#: ../help/help.inc:187
 msgid "Additional CSS links"
 msgstr "附加的CSS连接"
 
-#: ../lib/modules/posixAccount.inc:225
-#: ../lib/modules/posixAccount.inc:355
-#: ../lib/modules/posixAccount.inc:400
-#: ../lib/modules/posixAccount.inc:956
-#: ../lib/modules/posixAccount.inc:1041
-#: ../lib/modules/posixAccount.inc:1086
-#: ../lib/modules/posixAccount.inc:1172
+#: ../lib/modules/posixAccount.inc:228
+#: ../lib/modules/posixAccount.inc:347
+#: ../lib/modules/posixAccount.inc:392
+#: ../lib/modules/posixAccount.inc:966
+#: ../lib/modules/posixAccount.inc:1051
+#: ../lib/modules/posixAccount.inc:1096
+#: ../lib/modules/posixAccount.inc:1182
 msgid "Additional groups"
 msgstr "附加组"
 
-#: ../templates/massDoUpload.php:106
+#: ../templates/massDoUpload.php:102
 msgid "Additional tasks for module:"
 msgstr "模块的附加任务："
 
-#: ../help/help.inc:180
+#: ../help/help.inc:182
 msgid "Adds a new group element to the list of self service options. Use this to structure the input fields."
 msgstr "为自助服务选项列表新增组元素.利用它建立输入栏目."
 
-#: ../help/help.inc:182
+#: ../help/help.inc:184
 msgid "Adds a new self service option to the selected group element."
 msgstr "为选定的组元素增加新的自助服务选项."
 
-#: ../lib/modules/range.inc:86
+#: ../lib/modules/range.inc:88
 msgid "Adds input fields for a new IP range."
 msgstr "为新IP范围增加输入域"
 
@@ -576,19 +587,19 @@ msgstr "管理者"
 
 #: ../lib/modules/nisnetgroup.inc:107
 #: ../lib/modules/groupOfNames.inc:93
-#: ../lib/modules/posixGroup.inc:371
+#: ../lib/modules/posixGroup.inc:372
 msgid "Administrators group"
 msgstr "管理员组"
 
 #: ../lib/modules/eduPerson.inc:90
 #: ../lib/modules/eduPerson.inc:94
-#: ../lib/modules/eduPerson.inc:150
-#: ../lib/modules/eduPerson.inc:274
-#: ../lib/modules/eduPerson.inc:635
+#: ../lib/modules/eduPerson.inc:161
+#: ../lib/modules/eduPerson.inc:282
+#: ../lib/modules/eduPerson.inc:679
 msgid "Affiliations"
 msgstr "联系"
 
-#: ../lib/modules/sambaSamAccount.inc:549
+#: ../lib/modules/sambaSamAccount.inc:530
 msgid "Alaska"
 msgstr "阿拉斯加"
 
@@ -608,7 +619,7 @@ msgstr "别名条目"
 #: ../lib/modules/nisMailAlias.inc:67
 #: ../lib/modules/nisMailAlias.inc:82
 #: ../lib/modules/nisMailAlias.inc:139
-#: ../lib/modules/nisMailAlias.inc:277
+#: ../lib/modules/nisMailAlias.inc:278
 #: ../lib/types/mailAlias.inc:91
 msgid "Alias name"
 msgstr "别名"
@@ -619,60 +630,67 @@ msgstr "别名"
 #: ../lib/modules/aliasEntry.inc:62
 #: ../lib/modules/aliasEntry.inc:92
 #: ../lib/modules/aliasEntry.inc:109
-#: ../lib/modules/aliasEntry.inc:167
-#: ../lib/modules/aliasEntry.inc:242
+#: ../lib/modules/aliasEntry.inc:161
+#: ../lib/modules/aliasEntry.inc:237
 #: ../lib/types/alias.inc:92
 msgid "Aliased entry"
 msgstr "已有别名条目"
 
-#: ../templates/schema/schema.php:231
+#: ../templates/schema/schema.php:224
 #: ../lib/types/alias.inc:53
 msgid "Aliases"
 msgstr "别名"
 
-#: ../lib/lists.inc:652
+#: ../lib/lists.inc:579
 #, php-format
 msgid "All accounts (%s)"
 msgstr "所有帐号 %s:"
 
-#: ../templates/selfService/selfServiceMain.php:284
-#: ../templates/initsuff.php:160
+#: ../templates/selfService/selfServiceMain.php:282
+#: ../templates/initsuff.php:157
 msgid "All changes were successful."
 msgstr "修改成功."
 
-#: ../help/help.inc:192
+#: ../help/help.inc:194
 msgid "All following lines form the mail body."
 msgstr "邮件主体的所有行"
 
-#: ../lib/lists.inc:651
+#: ../lib/lists.inc:578
 #, php-format
 msgid "All selected accounts (%s)"
 msgstr "所有选中的帐号(%s)"
 
 #: ../lib/modules/sambaDomain.inc:110
 #: ../lib/modules/sambaDomain.inc:299
-#: ../lib/modules/sambaDomain.inc:669
+#: ../lib/modules/sambaDomain.inc:670
 msgid "Allow machine password changes"
 msgstr "允许改变主机密码"
 
-#: ../lib/modules/sambaSamAccount.inc:330
-#: ../lib/modules/sambaSamAccount.inc:1454
-#: ../lib/modules/sambaSamAccount.inc:1836
+#: ../lib/modules/ppolicy.inc:124
+#: ../lib/modules/ppolicy.inc:288
+#: ../lib/modules/ppolicy.inc:501
+#: ../lib/types/ppolicyType.inc:90
+msgid "Allow password change"
+msgstr "允许改变密码"
+
+#: ../lib/modules/sambaSamAccount.inc:325
+#: ../lib/modules/sambaSamAccount.inc:1423
+#: ../lib/modules/sambaSamAccount.inc:1792
 msgid "Allow terminal server login"
 msgstr "允许终端服务登录"
 
-#: ../templates/config/mainmanage.php:193
+#: ../templates/config/mainmanage.php:199
 #: ../lib/types/user.inc:95
-#: ../help/help.inc:141
+#: ../help/help.inc:143
 msgid "Allowed hosts"
 msgstr "允许的主机"
 
-#: ../lib/modules/sambaSamAccount.inc:1311
-#: ../lib/modules/sambaSamAccount.inc:1312
+#: ../lib/modules/sambaSamAccount.inc:1290
+#: ../lib/modules/sambaSamAccount.inc:1291
 msgid "Allowed workstations"
 msgstr "允许的工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:564
+#: ../lib/modules/sambaSamAccount.inc:545
 msgid "Almaty, Dhaka, Colombo"
 msgstr "阿尔迈迪，达卡，科伦坡"
 
@@ -690,23 +708,23 @@ msgid "An attribute (%s) was modified and is highlighted below."
 msgstr "下面高亮的属性(%s)已经被修改."
 
 #: ../lib/modules/kolabUser.inc:322
-#: ../lib/modules/kolabUser.inc:780
-#: ../lib/modules/kolabUser.inc:882
+#: ../lib/modules/kolabUser.inc:781
+#: ../lib/modules/kolabUser.inc:884
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../lib/modules/asteriskExtension.inc:80
-#: ../lib/modules/asteriskExtension.inc:103
-#: ../lib/modules/asteriskExtension.inc:142
-#: ../lib/modules/asteriskExtension.inc:212
-#: ../lib/modules/asteriskExtension.inc:430
+#: ../lib/modules/asteriskExtension.inc:94
+#: ../lib/modules/asteriskExtension.inc:121
+#: ../lib/modules/asteriskExtension.inc:160
+#: ../lib/modules/asteriskExtension.inc:230
+#: ../lib/modules/asteriskExtension.inc:463
 msgid "Application"
 msgstr "应用"
 
-#: ../lib/modules/asteriskExtension.inc:64
-#: ../lib/modules/asteriskExtension.inc:149
-#: ../lib/modules/asteriskExtension.inc:216
-#: ../lib/modules/asteriskExtension.inc:427
+#: ../lib/modules/asteriskExtension.inc:78
+#: ../lib/modules/asteriskExtension.inc:167
+#: ../lib/modules/asteriskExtension.inc:234
+#: ../lib/modules/asteriskExtension.inc:460
 msgid "Application data"
 msgstr "应用数据"
 
@@ -714,11 +732,11 @@ msgstr "应用数据"
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "确认永久删除这个对象?"
 
-#: ../lib/modules/asteriskAccount.inc:55
+#: ../lib/modules/asteriskAccount.inc:64
 msgid "Asterisk"
 msgstr "Asterisk"
 
-#: ../lib/modules/asteriskExtension.inc:49
+#: ../lib/modules/asteriskExtension.inc:63
 msgid "Asterisk extension"
 msgstr "Asterisk 扩展"
 
@@ -730,11 +748,11 @@ msgstr "Asterisk 扩展"
 msgid "Asterisk extensions entries"
 msgstr "Asterisk 扩展条目"
 
-#: ../lib/modules/sambaSamAccount.inc:554
+#: ../lib/modules/sambaSamAccount.inc:535
 msgid "Atlantic time (Canada), Caracas"
 msgstr "大西洋时间(加拿大),卡拉卡斯"
 
-#: ../lib/modules/ddns.inc:385
+#: ../lib/modules/ddns.inc:390
 msgid "Attention: The DHCP service needs to be restarted after changes in DDNS."
 msgstr "注意:如果DDNS发生改变,DHCP服务需要重启."
 
@@ -742,16 +760,27 @@ msgstr "注意:如果DDNS发生改变,DHCP服务需要重启."
 msgid "Attribute"
 msgstr "属性"
 
-#: ../templates/schema/schema.php:74
-#: ../templates/schema/schema.php:75
+#: ../templates/schema/schema.php:67
+#: ../templates/schema/schema.php:68
 msgid "Attribute types"
 msgstr "属性类型"
 
-#: ../lib/modules/sambaSamAccount.inc:570
+#: ../lib/modules/sambaSamAccount.inc:551
 msgid "Auckland, Fiji, Kamchatka"
 msgstr "奥克兰,斐济,堪察加"
 
-#: ../templates/config/conftypes.php:205
+#: ../lib/modules/eduPerson.inc:127
+#: ../lib/modules/eduPerson.inc:133
+#: ../lib/modules/sambaSamAccount.inc:143
+#: ../lib/modules/sambaSamAccount.inc:373
+#: ../lib/modules/shadowAccount.inc:99
+#: ../lib/modules/shadowAccount.inc:193
+#: ../lib/modules/phpGroupwareUser.inc:86
+#: ../lib/modules/phpGroupwareUser.inc:93
+msgid "Automatically add this extension"
+msgstr "自动增加这个扩展项"
+
+#: ../templates/config/conftypes.php:211
 #: ../lib/modules/customScripts.inc:54
 msgid "Available account types"
 msgstr "有效的帐号类型"
@@ -762,24 +791,24 @@ msgid "Available actions"
 msgstr "可选动作"
 
 #: ../lib/modules/nisnetgroup.inc:364
-#: ../lib/modules/posixAccount.inc:1053
+#: ../lib/modules/posixAccount.inc:1063
 msgid "Available groups"
 msgstr "可选组"
 
-#: ../templates/config/confmodules.php:273
+#: ../templates/config/confmodules.php:279
 msgid "Available modules"
 msgstr "可选模块"
 
-#: ../lib/modules/posixGroup.inc:252
-#: ../lib/modules/asteriskExtension.inc:278
+#: ../lib/modules/posixGroup.inc:253
+#: ../lib/modules/asteriskExtension.inc:311
 msgid "Available users"
 msgstr "可选用户"
 
-#: ../lib/modules/sambaSamAccount.inc:1317
+#: ../lib/modules/sambaSamAccount.inc:1296
 msgid "Available workstations"
 msgstr "可选工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:557
+#: ../lib/modules/sambaSamAccount.inc:538
 msgid "Azores, Cape Verde Islands"
 msgstr "亚速尔,维德角岛"
 
@@ -787,14 +816,15 @@ msgstr "亚速尔,维德角岛"
 msgid "B-Node (0x01)"
 msgstr "B-节点 (0x01)"
 
+#: ../templates/massBuildAccounts.php:212
 #: ../templates/tree/update_confirm.php:255
 #: ../lib/modules/nisnetgroup.inc:370
-#: ../lib/modules/inetOrgPerson.inc:1229
-#: ../lib/modules/groupOfNames.inc:352
-#: ../lib/modules/posixGroup.inc:258
-#: ../lib/modules/asteriskExtension.inc:285
-#: ../lib/modules/posixAccount.inc:1059
-#: ../lib/modules/sambaSamAccount.inc:1321
+#: ../lib/modules/inetOrgPerson.inc:1208
+#: ../lib/modules/groupOfNames.inc:348
+#: ../lib/modules/posixGroup.inc:259
+#: ../lib/modules/asteriskExtension.inc:318
+#: ../lib/modules/posixAccount.inc:1069
+#: ../lib/modules/sambaSamAccount.inc:1300
 msgid "Back"
 msgstr "返回"
 
@@ -804,11 +834,11 @@ msgstr "返回到DHCP列表"
 
 #: ../templates/logout.php:78
 #: ../templates/selfService/adminMain.php:140
-#: ../templates/selfService/adminLogin.php:150
+#: ../templates/selfService/adminLogin.php:157
 #: ../templates/config/index.php:115
-#: ../templates/config/conflogin.php:154
+#: ../templates/config/conflogin.php:161
 #: ../templates/config/confsave.php:88
-#: ../templates/config/mainlogin.php:147
+#: ../templates/config/mainlogin.php:154
 msgid "Back to Login"
 msgstr "返回到登录界面"
 
@@ -816,14 +846,14 @@ msgstr "返回到登录界面"
 msgid "Back to NIS object list"
 msgstr "返回到 NIS 对象列表"
 
+#: ../templates/ou_edit.php:123
 #: ../templates/ou_edit.php:127
-#: ../templates/ou_edit.php:131
 msgid "Back to OU-Editor"
 msgstr "返回到OU编辑器"
 
-#: ../templates/pdfedit/pdfpage.php:106
-#: ../templates/pdfedit/pdfdelete.php:67
-#: ../templates/pdfedit/pdfdelete.php:75
+#: ../templates/pdfedit/pdfpage.php:101
+#: ../templates/pdfedit/pdfdelete.php:65
+#: ../templates/pdfedit/pdfdelete.php:73
 msgid "Back to PDF Editor"
 msgstr "返回到PDF编辑器"
 
@@ -844,7 +874,7 @@ msgstr "返回到域列表"
 msgid "Back to extensions list"
 msgstr "返回到扩展列表"
 
-#: ../templates/lists/userlink.php:66
+#: ../templates/lists/userlink.php:63
 #: ../lib/types/group.inc:45
 #: ../lib/types/netgroup.inc:44
 #: ../lib/types/gon.inc:44
@@ -855,23 +885,27 @@ msgstr "返回到组列表"
 msgid "Back to host list"
 msgstr "返回到主机列表"
 
-#: ../templates/delete.php:241
+#: ../templates/delete.php:232
 msgid "Back to list"
 msgstr "返回列表"
 
-#: ../templates/config/mainmanage.php:144
-#: ../templates/config/mainmanage.php:377
+#: ../templates/config/mainmanage.php:150
+#: ../templates/config/mainmanage.php:382
 msgid "Back to login"
 msgstr "返回到登录界面"
 
-#: ../templates/profedit/profilepage.php:127
-#: ../templates/profedit/profiledelete.php:67
-#: ../templates/profedit/profiledelete.php:75
+#: ../lib/types/ppolicyType.inc:30
+msgid "Back to policy list"
+msgstr "返回到策略列表"
+
+#: ../templates/profedit/profilepage.php:123
+#: ../templates/profedit/profiledelete.php:65
+#: ../templates/profedit/profiledelete.php:73
 msgid "Back to profile editor"
 msgstr "返回到配置文件编辑器"
 
-#: ../templates/selfService/profManage.php:259
-#: ../templates/config/profmanage.php:359
+#: ../templates/selfService/profManage.php:267
+#: ../templates/config/profmanage.php:365
 msgid "Back to profile login"
 msgstr "返回到配置文件登录"
 
@@ -879,11 +913,11 @@ msgstr "返回到配置文件登录"
 msgid "Back to user list"
 msgstr "返回到用户列表"
 
-#: ../lib/modules/sambaSamAccount.inc:561
+#: ../lib/modules/sambaSamAccount.inc:542
 msgid "Baghdad, Riyadh, Moscow"
 msgstr "巴格达,利雅得,莫斯科"
 
-#: ../lib/modules/sambaSamAccount.inc:565
+#: ../lib/modules/sambaSamAccount.inc:546
 msgid "Bangkok, Hanoi, Jakarta"
 msgstr "曼谷,河内,安卡拉"
 
@@ -895,52 +929,52 @@ msgstr "Base (只有基本DN)"
 msgid "Base DN"
 msgstr "基本DN"
 
-#: ../templates/config/confmodules.php:200
-#: ../help/help.inc:133
+#: ../templates/config/confmodules.php:206
+#: ../help/help.inc:135
 msgid "Base module"
 msgstr "基本模块"
 
-#: ../templates/pdfedit/pdfpage.php:407
+#: ../templates/pdfedit/pdfpage.php:396
 msgid "Beginning"
 msgstr "开始"
 
-#: ../lib/modules/sambaSamAccount.inc:566
+#: ../lib/modules/sambaSamAccount.inc:547
 msgid "Beijing, Perth, Singapore"
 msgstr "北京,佩斯,新加坡"
 
-#: ../templates/tree/edit.php:176
-#: ../templates/tree/edit.php:305
+#: ../templates/tree/edit.php:179
+#: ../templates/tree/edit.php:308
 msgid "Binary value"
 msgstr "二进制值"
 
-#: ../lib/modules/quota.inc:48
+#: ../lib/modules/quota.inc:50
 msgid "Block hard quota"
 msgstr "块数硬性限额"
 
-#: ../lib/modules/quota.inc:48
-#: ../lib/modules/quota.inc:49
+#: ../lib/modules/quota.inc:50
+#: ../lib/modules/quota.inc:51
 msgid "Block hard quota contains invalid characters. Only natural numbers are allowed."
 msgstr "块数硬性限额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:54
+#: ../lib/modules/quota.inc:56
 msgid "Block quota"
 msgstr "块数限额"
 
-#: ../lib/modules/quota.inc:46
+#: ../lib/modules/quota.inc:48
 msgid "Block soft quota"
 msgstr "块数软性限额"
 
-#: ../lib/modules/quota.inc:46
-#: ../lib/modules/quota.inc:47
+#: ../lib/modules/quota.inc:48
+#: ../lib/modules/quota.inc:49
 msgid "Block soft quota contains invalid characters. Only natural numbers are allowed."
 msgstr "块数软性限额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:54
-#: ../lib/modules/quota.inc:55
+#: ../lib/modules/quota.inc:56
+#: ../lib/modules/quota.inc:57
 msgid "Block soft quota must be smaller than block hard quota."
 msgstr "块数软性限额必须小于硬性限额."
 
-#: ../lib/modules/sambaSamAccount.inc:555
+#: ../lib/modules/sambaSamAccount.inc:536
 msgid "Brazil, Buenos Aires"
 msgstr "巴西,布宜诺斯艾利斯"
 
@@ -952,202 +986,196 @@ msgstr "内置组"
 #: ../lib/modules/inetOrgPerson.inc:153
 #: ../lib/modules/inetOrgPerson.inc:271
 #: ../lib/modules/inetOrgPerson.inc:350
-#: ../lib/modules/inetOrgPerson.inc:664
-#: ../lib/modules/inetOrgPerson.inc:1126
-#: ../lib/modules/inetOrgPerson.inc:1259
-#: ../lib/modules/inetOrgPerson.inc:1696
+#: ../lib/modules/inetOrgPerson.inc:643
+#: ../lib/modules/inetOrgPerson.inc:1105
+#: ../lib/modules/inetOrgPerson.inc:1238
+#: ../lib/modules/inetOrgPerson.inc:1713
 msgid "Business category"
 msgstr "商业种类"
 
-#: ../lib/modules/inetOrgPerson.inc:665
+#: ../lib/modules/inetOrgPerson.inc:644
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "商业种类(比如:行政部门,IT服务部门,管理部门,...)"
 
-#: ../templates/masscreate.php:142
+#: ../templates/masscreate.php:219
 msgid "CSV file:"
 msgstr "CSV 文件:"
 
-#: ../templates/config/confmain.php:269
+#: ../templates/config/confmain.php:274
 #: ../help/help.inc:100
 msgid "Cache timeout"
 msgstr "缓存超时"
 
-#: ../templates/config/confmain.php:536
+#: ../templates/config/confmain.php:563
 msgid "Cache timeout is invalid!"
 msgstr "缓存超时非法"
 
-#: ../lib/modules/asteriskAccount.inc:68
-#: ../lib/modules/asteriskAccount.inc:110
-#: ../lib/modules/asteriskAccount.inc:166
-#: ../lib/modules/asteriskAccount.inc:270
+#: ../lib/modules/asteriskAccount.inc:77
+#: ../lib/modules/asteriskAccount.inc:119
+#: ../lib/modules/asteriskAccount.inc:175
+#: ../lib/modules/asteriskAccount.inc:271
 msgid "Caller ID"
 msgstr "拨号 ID号"
 
-#: ../lib/modules/sambaGroupMapping.inc:367
-#: ../lib/modules/posixAccount.inc:401
-#: ../lib/modules/sambaSamAccount.inc:285
-#: ../lib/modules/sambaSamAccount.inc:288
-#: ../lib/modules/sambaSamAccount.inc:291
-#: ../lib/modules/sambaSamAccount.inc:297
-#: ../lib/modules/shadowAccount.inc:170
+#: ../lib/modules/sambaGroupMapping.inc:368
+#: ../lib/modules/posixAccount.inc:393
+#: ../lib/modules/sambaSamAccount.inc:280
+#: ../lib/modules/sambaSamAccount.inc:283
+#: ../lib/modules/sambaSamAccount.inc:286
+#: ../lib/modules/sambaSamAccount.inc:292
 #: ../lib/modules/shadowAccount.inc:174
 #: ../lib/modules/shadowAccount.inc:178
 #: ../lib/modules/shadowAccount.inc:182
+#: ../lib/modules/shadowAccount.inc:186
 msgid "Can be left empty."
 msgstr "可以置空"
 
 #: ../templates/tree/delete_form.php:119
 #: ../templates/tree/delete_form.php:168
 #: ../templates/tree/update_confirm.php:241
-#: ../templates/selfService/adminMain.php:298
-#: ../templates/pdfedit/pdfpage.php:708
-#: ../templates/pdfedit/pdfdelete.php:97
-#: ../templates/delete.php:117
+#: ../templates/selfService/adminMain.php:306
+#: ../templates/pdfedit/pdfpage.php:697
+#: ../templates/pdfedit/pdfdelete.php:95
+#: ../templates/delete.php:112
 #: ../templates/ou_edit.php:108
-#: ../templates/profedit/profilepage.php:261
-#: ../templates/profedit/profiledelete.php:86
-#: ../templates/config/conftypes.php:193
-#: ../templates/config/confmain.php:212
-#: ../templates/config/confmodules.php:178
-#: ../templates/config/moduleSettings.php:177
-#: ../templates/initsuff.php:193
-#: ../lib/modules.inc:1261
+#: ../templates/profedit/profilepage.php:257
+#: ../templates/profedit/profiledelete.php:84
+#: ../templates/config/conftypes.php:199
+#: ../templates/config/confmain.php:217
+#: ../templates/config/confmodules.php:184
+#: ../templates/config/moduleSettings.php:183
+#: ../templates/initsuff.php:187
+#: ../lib/modules.inc:1291
 #: ../lib/modules/nisnetgroup.inc:467
-#: ../lib/modules/groupOfNames.inc:231
-#: ../lib/modules/groupOfNames.inc:258
-#: ../lib/modules/groupOfNames.inc:311
+#: ../lib/modules/groupOfNames.inc:235
+#: ../lib/modules/groupOfNames.inc:256
+#: ../lib/modules/groupOfNames.inc:303
 #: ../lib/modules/kolabUser.inc:570
-#: ../lib/modules/sambaSamAccount.inc:1386
-#: ../lib/modules/sambaSamAccount.inc:1434
-#: ../lib/modules/sambaSamAccount.inc:1557
-#: ../lib/modules/shadowAccount.inc:376
-#: ../lib/modules/phpGroupwareUser.inc:249
+#: ../lib/modules/sambaSamAccount.inc:1365
+#: ../lib/modules/sambaSamAccount.inc:1403
+#: ../lib/modules/sambaSamAccount.inc:1526
+#: ../lib/modules/shadowAccount.inc:403
+#: ../lib/modules/phpGroupwareUser.inc:260
 #: ../lib/modules/aliasEntry.inc:147
-#: ../lib/modules/aliasEntry.inc:173
-#: ../lib/lists.inc:662
-#: ../lib/lists.inc:893
+#: ../lib/modules/aliasEntry.inc:167
+#: ../lib/lists.inc:589
+#: ../lib/lists.inc:805
 msgid "Cancel"
 msgstr "取消"
 
-#: ../templates/selfService/selfServiceLogin.php:113
-#: ../templates/selfService/selfServiceLogin.php:117
-#: ../templates/selfService/selfServiceMain.php:157
-#: ../templates/login.php:442
-#: ../templates/login.php:505
-#: ../templates/login.php:512
+#: ../templates/selfService/selfServiceLogin.php:118
+#: ../templates/selfService/selfServiceLogin.php:122
+#: ../templates/selfService/selfServiceMain.php:163
+#: ../templates/login.php:401
+#: ../templates/login.php:459
+#: ../templates/login.php:464
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "无法连接指定的LDAP服务器,请再试一次."
 
-#: ../lib/config.inc:415
-#: ../lib/config.inc:1119
+#: ../lib/config.inc:419
+#: ../lib/config.inc:1146
 msgid "Cannot open config file!"
 msgstr "无法打开配置文件!"
 
-#: ../templates/selfService/adminMain.php:395
+#: ../templates/selfService/adminMain.php:403
 msgid "Captions and labels"
 msgstr "标题和标签"
 
 #: ../lib/modules/inetOrgPerson.inc:152
 #: ../lib/modules/inetOrgPerson.inc:265
 #: ../lib/modules/inetOrgPerson.inc:462
-#: ../lib/modules/inetOrgPerson.inc:676
-#: ../lib/modules/inetOrgPerson.inc:1108
-#: ../lib/modules/inetOrgPerson.inc:1261
-#: ../lib/modules/inetOrgPerson.inc:1680
+#: ../lib/modules/inetOrgPerson.inc:655
+#: ../lib/modules/inetOrgPerson.inc:1087
+#: ../lib/modules/inetOrgPerson.inc:1240
+#: ../lib/modules/inetOrgPerson.inc:1697
 msgid "Car license"
 msgstr "汽车执照"
 
-#: ../lib/modules/sambaSamAccount.inc:559
+#: ../lib/modules/sambaSamAccount.inc:540
 msgid "Central Europe Time, Paris, Berlin"
 msgstr "欧洲中央时间,巴黎,柏林"
 
-#: ../lib/modules/sambaSamAccount.inc:552
+#: ../lib/modules/sambaSamAccount.inc:533
 msgid "Central Time (US & Canada), Mexico City"
 msgstr "中央时间(美国和加拿大),墨西哥市 "
 
-#: ../templates/selfService/adminMain.php:473
-#: ../templates/pdfedit/pdfpage.php:454
-#: ../templates/pdfedit/pdfpage.php:460
+#: ../templates/selfService/adminMain.php:481
+#: ../templates/pdfedit/pdfpage.php:443
+#: ../templates/pdfedit/pdfpage.php:449
 #: ../lib/modules/groupOfNames.inc:157
 #: ../lib/modules/groupOfNames.inc:174
-#: ../lib/modules/asteriskExtension.inc:222
-#: ../lib/modules/sambaSamAccount.inc:1133
-#: ../lib/modules/sambaSamAccount.inc:1150
-#: ../lib/modules/sambaSamAccount.inc:1167
-#: ../lib/modules/sambaSamAccount.inc:1430
-#: ../lib/modules/shadowAccount.inc:315
-#: ../lib/modules/shadowAccount.inc:372
-#: ../lib/modules/phpGroupwareUser.inc:145
-#: ../lib/modules/phpGroupwareUser.inc:245
+#: ../lib/modules/asteriskExtension.inc:240
+#: ../lib/modules/sambaSamAccount.inc:1139
+#: ../lib/modules/sambaSamAccount.inc:1399
+#: ../lib/modules/shadowAccount.inc:335
+#: ../lib/modules/shadowAccount.inc:399
+#: ../lib/modules/phpGroupwareUser.inc:156
+#: ../lib/modules/phpGroupwareUser.inc:256
 #: ../lib/modules/aliasEntry.inc:100
 msgid "Change"
 msgstr "更改"
 
-#: ../lib/modules/posixGroup.inc:204
+#: ../lib/modules/posixGroup.inc:205
 msgid "Change GID number of users and hosts"
 msgstr "更改用户和主机的GID号"
 
-#: ../templates/config/profmanage.php:324
-#: ../help/help.inc:127
+#: ../templates/config/profmanage.php:330
+#: ../help/help.inc:129
 msgid "Change default profile"
 msgstr "更改缺省的配置文件"
 
-#: ../lib/lists.inc:879
+#: ../lib/lists.inc:791
 msgid "Change list settings"
 msgstr "改变列表设置"
 
-#: ../templates/config/mainmanage.php:332
-#: ../help/help.inc:129
+#: ../templates/config/mainmanage.php:337
+#: ../help/help.inc:131
 msgid "Change master password"
 msgstr "更改管理员密码"
 
-#: ../templates/lists/changePassword.php:122
-#: ../templates/lists/changePassword.php:192
-#: ../templates/lists/changePassword.php:219
-#: ../lib/types/user.inc:243
+#: ../templates/lists/changePassword.php:117
+#: ../templates/lists/changePassword.php:187
+#: ../templates/lists/changePassword.php:214
+#: ../lib/types/user.inc:247
 #: ../help/help.inc:98
 msgid "Change password"
 msgstr "更改密码"
 
-#: ../templates/config/confmain.php:299
-#: ../templates/config/confmain.php:302
+#: ../templates/config/confmain.php:326
+#: ../templates/config/confmain.php:329
 msgid "Change passwords"
 msgstr "更改密码 "
 
-#: ../templates/login.php:382
+#: ../templates/login.php:340
 msgid "Change profile"
 msgstr "改变配置文件"
 
-#: ../lib/lists.inc:716
-#: ../lib/lists.inc:717
+#: ../lib/lists.inc:642
+#: ../lib/lists.inc:643
 msgid "Change settings"
 msgstr "修改设置"
 
-#: ../lib/lists.inc:691
-msgid "Change suffix"
-msgstr "更改后缀"
-
-#: ../lib/modules/posixAccount.inc:862
+#: ../lib/modules/posixAccount.inc:872
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "值已改变,因为只能使用ASCII字符."
 
-#: ../templates/tests/index.php:59
+#: ../templates/tests/index.php:51
 msgid "Check if quotas and homedirectories can be managed."
 msgstr "请检查是否可能管理限额和主目录"
 
-#: ../templates/tests/index.php:62
+#: ../templates/tests/index.php:54
 msgid "Check if the LDAP schema fits the requirements of the selected account modules."
 msgstr "检查LDAP的架构是否符合选中的帐号模块需求"
 
-#: ../templates/tests/lamdaemonTest.php:98
+#: ../templates/tests/lamdaemonTest.php:90
 msgid "Check quotas"
 msgstr "检查限额"
 
-#: ../templates/masscreate.php:133
+#: ../templates/masscreate.php:210
 msgid "Check your input carefully. LAM will only do some basic checks on the upload data."
 msgstr "请仔细检查输入,上传前程序仅做基本检查."
 
-#: ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/posixAccount.inc:96
 msgid "Choose a server for the home directory!"
 msgstr "请选择主目录所在服务器!"
 
@@ -1160,21 +1188,25 @@ msgstr "选择一个模板"
 msgid "Click here if you are not directed to the next page."
 msgstr "如果没有自动跳转到下一页请点此处."
 
-#: ../lib/modules/sambaSamAccount.inc:357
-#: ../lib/modules/sambaSamAccount.inc:1520
-#: ../lib/modules/sambaSamAccount.inc:1864
+#: ../lib/types/user.inc:218
+msgid "Click to switch between thumbnail and original size."
+msgstr "点击在缩略图与原来的大小间切换"
+
+#: ../lib/modules/sambaSamAccount.inc:352
+#: ../lib/modules/sambaSamAccount.inc:1489
+#: ../lib/modules/sambaSamAccount.inc:1820
 msgid "Client printer is default"
 msgstr "缺省为客户打印机"
 
-#: ../templates/schema/schema.php:204
+#: ../templates/schema/schema.php:197
 msgid "Collective"
 msgstr "集合(Collective)"
 
-#: ../templates/masscreate.php:152
+#: ../templates/masscreate.php:230
 msgid "Columns:"
 msgstr "列:"
 
-#: ../lib/modules/sambaSamAccount.inc:297
+#: ../lib/modules/sambaSamAccount.inc:292
 msgid "Comma separated list of Samba workstations the user is allowed to login. Empty means every workstation."
 msgstr "用户可以登录的Samba工作站,用逗号分隔,空值表示所有工作站."
 
@@ -1187,28 +1219,28 @@ msgid "Commit"
 msgstr "提交"
 
 #: ../lib/modules/inetOrgPerson.inc:97
-#: ../lib/modules/inetOrgPerson.inc:481
-#: ../lib/modules/inetOrgPerson.inc:640
-#: ../lib/modules/inetOrgPerson.inc:956
-#: ../lib/modules/inetOrgPerson.inc:1257
-#: ../lib/modules/asteriskExtension.inc:88
-#: ../lib/modules/asteriskExtension.inc:135
-#: ../lib/modules/asteriskExtension.inc:196
-#: ../lib/modules/asteriskExtension.inc:442
-#: ../lib/modules/posixAccount.inc:91
-#: ../lib/modules/posixAccount.inc:206
-#: ../lib/modules/posixAccount.inc:404
-#: ../lib/modules/posixAccount.inc:426
-#: ../lib/modules/posixAccount.inc:934
-#: ../lib/modules/posixAccount.inc:1167
+#: ../lib/modules/inetOrgPerson.inc:619
+#: ../lib/modules/inetOrgPerson.inc:935
+#: ../lib/modules/inetOrgPerson.inc:1236
+#: ../lib/modules/inetOrgPerson.inc:1290
+#: ../lib/modules/asteriskExtension.inc:102
+#: ../lib/modules/asteriskExtension.inc:153
+#: ../lib/modules/asteriskExtension.inc:214
+#: ../lib/modules/asteriskExtension.inc:475
+#: ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:209
+#: ../lib/modules/posixAccount.inc:396
+#: ../lib/modules/posixAccount.inc:418
+#: ../lib/modules/posixAccount.inc:944
+#: ../lib/modules/posixAccount.inc:1177
 msgid "Common name"
 msgstr "全名"
 
-#: ../lib/modules/asteriskExtension.inc:89
+#: ../lib/modules/asteriskExtension.inc:103
 msgid "Common name of the Asterisk extension."
 msgstr "Asterisk 扩展的一般命名"
 
-#: ../templates/serverInfo.php:104
+#: ../templates/serverInfo.php:100
 msgid "Config suffix"
 msgstr "配置后缀"
 
@@ -1216,24 +1248,24 @@ msgstr "配置后缀"
 msgid "Configuration overview"
 msgstr "配置总览"
 
-#: ../templates/config/confmodules.php:356
+#: ../templates/config/confmodules.php:362
 msgid "Conflicting module:"
 msgstr "冲突的模块:"
 
-#: ../lib/modules/sambaSamAccount.inc:351
-#: ../lib/modules/sambaSamAccount.inc:1510
-#: ../lib/modules/sambaSamAccount.inc:1854
+#: ../lib/modules/sambaSamAccount.inc:346
+#: ../lib/modules/sambaSamAccount.inc:1479
+#: ../lib/modules/sambaSamAccount.inc:1810
 msgid "Connect client drives"
 msgstr "连接客户驱动器"
 
-#: ../lib/modules/sambaSamAccount.inc:354
-#: ../lib/modules/sambaSamAccount.inc:1515
-#: ../lib/modules/sambaSamAccount.inc:1859
+#: ../lib/modules/sambaSamAccount.inc:349
+#: ../lib/modules/sambaSamAccount.inc:1484
+#: ../lib/modules/sambaSamAccount.inc:1815
 msgid "Connect client printers"
 msgstr "连接客户打印机"
 
-#: ../lib/modules/sambaSamAccount.inc:1495
-#: ../lib/modules/sambaSamAccount.inc:1847
+#: ../lib/modules/sambaSamAccount.inc:1464
+#: ../lib/modules/sambaSamAccount.inc:1803
 msgid "Connection time limit"
 msgstr "连接时间限制"
 
@@ -1250,12 +1282,12 @@ msgstr "容器的DN"
 msgid "Could not perform ldap_modify operation."
 msgstr "无法执行ldap_modify命令"
 
-#: ../templates/selfService/profManage.php:89
-#: ../templates/config/profmanage.php:103
+#: ../templates/selfService/profManage.php:97
+#: ../templates/config/profmanage.php:109
 msgid "Could not rename file!"
 msgstr "不能更改文件名"
 
-#: ../templates/pdfedit/pdfpage.php:103
+#: ../templates/pdfedit/pdfpage.php:98
 msgid "Could not save PDF profile, access denied."
 msgstr "无法保存PDF文件,存取拒绝."
 
@@ -1263,7 +1295,7 @@ msgstr "无法保存PDF文件,存取拒绝."
 #: ../lib/modules/kolabUser.inc:159
 #: ../lib/modules/kolabUser.inc:188
 #: ../lib/modules/kolabUser.inc:282
-#: ../lib/modules/kolabUser.inc:756
+#: ../lib/modules/kolabUser.inc:757
 msgid "Country"
 msgstr "国家"
 
@@ -1274,9 +1306,9 @@ msgstr "国家名称非法!"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:107
 #: ../templates/tree/templates/creation/custom.php:234
-#: ../templates/pdfedit/pdfmain.php:131
-#: ../templates/profedit/profilemain.php:127
-#: ../templates/initsuff.php:192
+#: ../templates/pdfedit/pdfmain.php:126
+#: ../templates/profedit/profilemain.php:117
+#: ../templates/initsuff.php:186
 msgid "Create"
 msgstr "建立"
 
@@ -1285,18 +1317,18 @@ msgstr "建立"
 msgid "Create Object"
 msgstr "对立对象"
 
-#: ../lib/modules.inc:1414
-#: ../lib/lists.inc:465
-#: ../lib/lists.inc:629
-#: ../help/help.inc:160
+#: ../lib/modules.inc:1442
+#: ../lib/lists.inc:405
+#: ../lib/lists.inc:556
+#: ../help/help.inc:162
 msgid "Create PDF file"
 msgstr "建立PDF文件"
 
-#: ../templates/pdfedit/pdfmain.php:122
+#: ../templates/pdfedit/pdfmain.php:117
 msgid "Create a new PDF structure"
 msgstr "建立新的PDF架构"
 
-#: ../templates/profedit/profilemain.php:116
+#: ../templates/profedit/profilemain.php:106
 msgid "Create a new profile"
 msgstr "建立新的配置文件"
 
@@ -1335,17 +1367,21 @@ msgstr "建立另外一个组"
 msgid "Create another host"
 msgstr "建立另外一个主机"
 
+#: ../lib/types/ppolicyType.inc:29
+msgid "Create another policy"
+msgstr "建立另外一个策略"
+
 #: ../lib/types/user.inc:43
 msgid "Create another user"
 msgstr "建立另外一个用户"
 
-#: ../lib/lists.inc:646
+#: ../lib/lists.inc:573
 msgid "Create for"
 msgstr "建立"
 
-#: ../lib/modules/posixAccount.inc:238
-#: ../lib/modules/posixAccount.inc:974
-#: ../lib/modules/posixAccount.inc:1103
+#: ../lib/modules/posixAccount.inc:241
+#: ../lib/modules/posixAccount.inc:984
+#: ../lib/modules/posixAccount.inc:1113
 msgid "Create home directory"
 msgstr "建立主目录"
 
@@ -1361,8 +1397,8 @@ msgstr "建立主目录"
 msgid "Create new entry"
 msgstr "新建条目"
 
-#: ../templates/selfService/profManage.php:72
-#: ../templates/config/profmanage.php:88
+#: ../templates/selfService/profManage.php:80
+#: ../templates/config/profmanage.php:94
 msgid "Created new profile."
 msgstr "新增配置文件"
 
@@ -1390,7 +1426,7 @@ msgstr "自定义脚本"
 msgid "DDNS"
 msgstr "DDNS"
 
-#: ../lib/modules/ddns.inc:355
+#: ../lib/modules/ddns.inc:360
 msgid "DDNS ist not activated. You can activate it in the DHCP settings (DDNS)."
 msgstr "DDNS没有激活.可以DHCP设置中激活(DDNS)"
 
@@ -1402,7 +1438,7 @@ msgstr "DHCP"
 msgid "DHCP administration"
 msgstr "DHCP管理者"
 
-#: ../lib/modules/dhcp_settings.inc:102
+#: ../lib/modules/dhcp_settings.inc:101
 #: ../lib/types/dhcp.inc:126
 msgid "DHCP settings"
 msgstr "DHCP 设置"
@@ -1414,33 +1450,33 @@ msgstr "DHCP 设置"
 #: ../templates/tree/add_oclass_form.php:124
 #: ../templates/tree/add_attr_form.php:73
 #: ../templates/tree/edit.php:92
-#: ../templates/delete.php:96
-#: ../lib/modules.inc:1499
-#: ../lib/modules.inc:1958
+#: ../templates/delete.php:91
+#: ../lib/modules.inc:1526
+#: ../lib/modules.inc:1993
 msgid "DN"
 msgstr "DN"
 
-#: ../templates/masscreate.php:155
+#: ../templates/masscreate.php:233
 msgid "DN settings"
 msgstr "DN 设置"
 
-#: ../templates/masscreate.php:159
-#: ../help/help.inc:154
+#: ../templates/masscreate.php:237
+#: ../help/help.inc:156
 msgid "DN suffix"
 msgstr "DN 后缀"
 
-#: ../lib/modules/dhcp_settings.inc:201
-#: ../lib/modules/dhcp_settings.inc:255
-#: ../lib/modules/dhcp_settings.inc:548
-#: ../lib/modules/dhcp_settings.inc:650
+#: ../lib/modules/dhcp_settings.inc:202
+#: ../lib/modules/dhcp_settings.inc:256
+#: ../lib/modules/dhcp_settings.inc:569
+#: ../lib/modules/dhcp_settings.inc:671
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/modules/dhcp_settings.inc:130
+#: ../lib/modules/dhcp_settings.inc:131
 msgid "DNS (Domain Name System)"
 msgstr "DNS(域名解析系统)"
 
-#: ../lib/modules/asteriskExtension.inc:85
+#: ../lib/modules/asteriskExtension.inc:99
 msgid "DNs of the extension owners"
 msgstr "扩展属主的DN名"
 
@@ -1453,33 +1489,37 @@ msgstr "DSML输出 %s"
 msgid "Data field for RDN is empty!"
 msgstr "RDN数据文件是空的"
 
-#: ../lib/modules/sambaSamAccount.inc:277
-msgid "Date after the user is able to change his password. Format: DD-MM-YYYY"
-msgstr "在这个日期后,用户才可以修改密码,格式:DD-MM-YYYY"
+#: ../lib/modules/sambaSamAccount.inc:272
+msgid "Date after the user is able to change his password."
+msgstr "多少天后用户才能修改密码。"
 
-#: ../lib/modules/sambaSamAccount.inc:279
-msgid "Date after the user must change his password. Format: DD-MM-YYYY"
-msgstr "在这个日期之前,用户必须修改密码,格式:DD-MM-YYYY"
+#: ../lib/modules/sambaSamAccount.inc:274
+msgid "Date after the user must change his password."
+msgstr "多少天后用户必须修改密码"
 
-#: ../lib/modules/shadowAccount.inc:170
+#: ../lib/modules/shadowAccount.inc:174
 msgid "Days before password is to expire that user is warned of pending password expiration. If set value must be >0."
 msgstr "在密码过期前提醒用户的天数,若设其值,必大于0."
 
-#: ../lib/modules/dhcp_settings.inc:133
-#: ../lib/modules/dhcp_settings.inc:206
-#: ../lib/modules/dhcp_settings.inc:261
-#: ../lib/modules/dhcp_settings.inc:554
-#: ../lib/modules/dhcp_settings.inc:651
+#: ../templates/config/mainmanage.php:262
+msgid "Debug"
+msgstr "调试"
+
+#: ../lib/modules/dhcp_settings.inc:134
+#: ../lib/modules/dhcp_settings.inc:207
+#: ../lib/modules/dhcp_settings.inc:262
+#: ../lib/modules/dhcp_settings.inc:575
+#: ../lib/modules/dhcp_settings.inc:672
 msgid "Default gateway"
 msgstr "缺省网关"
 
-#: ../templates/config/confmain.php:327
+#: ../templates/config/confmain.php:354
 #: ../help/help.inc:94
 msgid "Default language"
 msgstr "缺省语言"
 
-#: ../templates/masscreate.php:167
-#: ../templates/masscreate.php:327
+#: ../templates/masscreate.php:245
+#: ../templates/masscreate.php:408
 msgid "Default value"
 msgstr "缺省值"
 
@@ -1492,8 +1532,8 @@ msgstr "定义工作站是否更改密码."
 #: ../lib/modules/kolabUser.inc:147
 #: ../lib/modules/kolabUser.inc:207
 #: ../lib/modules/kolabUser.inc:386
-#: ../lib/modules/kolabUser.inc:794
-#: ../lib/modules/kolabUser.inc:864
+#: ../lib/modules/kolabUser.inc:795
+#: ../lib/modules/kolabUser.inc:866
 msgid "Delegates"
 msgstr "代理(Delegates)"
 
@@ -1503,18 +1543,18 @@ msgstr "代理(Delegates)格式错误"
 
 #: ../templates/tree/delete_form.php:159
 #: ../templates/tree/edit.php:115
-#: ../templates/pdfedit/pdfdelete.php:96
-#: ../templates/pdfedit/pdfmain.php:165
-#: ../templates/delete.php:116
+#: ../templates/pdfedit/pdfdelete.php:94
+#: ../templates/pdfedit/pdfmain.php:160
+#: ../templates/delete.php:111
 #: ../templates/ou_edit.php:107
-#: ../templates/profedit/profilemain.php:158
+#: ../templates/profedit/profilemain.php:148
 #: ../lib/modules/nisnetgroup.inc:225
-#: ../lib/modules/kolabUser.inc:855
-#: ../lib/modules/eduPerson.inc:266
-#: ../lib/modules/eduPerson.inc:291
-#: ../lib/modules/eduPerson.inc:317
-#: ../lib/modules/eduPerson.inc:363
-#: ../lib/lists.inc:461
+#: ../lib/modules/kolabUser.inc:857
+#: ../lib/modules/eduPerson.inc:274
+#: ../lib/modules/eduPerson.inc:299
+#: ../lib/modules/eduPerson.inc:325
+#: ../lib/modules/eduPerson.inc:371
+#: ../lib/lists.inc:401
 #: ../lib/tree.inc:1176
 msgid "Delete"
 msgstr "删除"
@@ -1536,10 +1576,6 @@ msgstr "删除Kolab帐号"
 msgid "Delete NIS object(s)"
 msgstr "删除 NIS 对象"
 
-#: ../templates/pdfedit/pdfdelete.php:53
-msgid "Delete PDF structure"
-msgstr "删除PDF结构"
-
 #: ../lib/types/mailAlias.inc:120
 #: ../lib/types/alias.inc:120
 msgid "Delete alias(es)"
@@ -1564,7 +1600,7 @@ msgstr "删除扩展"
 msgid "Delete group(s)"
 msgstr "删除组"
 
-#: ../lib/modules/posixAccount.inc:1013
+#: ../lib/modules/posixAccount.inc:1023
 msgid "Delete home directory"
 msgstr "删除主目录"
 
@@ -1572,35 +1608,38 @@ msgstr "删除主目录"
 msgid "Delete host(s)"
 msgstr "删除主机"
 
-#: ../lib/lists.inc:106
+#: ../lib/lists.inc:109
 msgid "Delete object"
 msgstr "删除对象"
 
-#: ../templates/pdfedit/pdfdelete.php:74
-#: ../templates/profedit/profiledelete.php:74
+#: ../templates/pdfedit/pdfdelete.php:72
+#: ../templates/profedit/profiledelete.php:72
 msgid "Delete operation canceled."
 msgstr "取消删除动作"
 
-#: ../templates/ou_edit.php:188
-#: ../help/help.inc:200
+#: ../templates/ou_edit.php:178
+#: ../help/help.inc:202
 msgid "Delete organizational unit"
 msgstr "删除组织单元"
 
-#: ../lib/modules/inetOrgPerson.inc:1188
+#: ../lib/modules/inetOrgPerson.inc:1167
 msgid "Delete photo"
 msgstr "删除照片"
 
-#: ../templates/selfService/profManage.php:225
-#: ../templates/profedit/profiledelete.php:56
-#: ../templates/config/profmanage.php:252
-#: ../help/help.inc:123
+#: ../lib/types/ppolicyType.inc:128
+msgid "Delete policy(ies)"
+msgstr "删除策略"
+
+#: ../templates/selfService/profManage.php:233
+#: ../templates/config/profmanage.php:258
+#: ../help/help.inc:125
 msgid "Delete profile"
 msgstr "删除配置文件"
 
-#: ../lib/modules/range.inc:82
-#: ../lib/modules/range.inc:97
-#: ../lib/modules/range.inc:426
-#: ../lib/modules/range.inc:427
+#: ../lib/modules/range.inc:84
+#: ../lib/modules/range.inc:99
+#: ../lib/modules/range.inc:428
+#: ../lib/modules/range.inc:429
 msgid "Delete range"
 msgstr "删除范围"
 
@@ -1608,12 +1647,12 @@ msgstr "删除范围"
 msgid "Delete user(s)"
 msgstr "删除用户"
 
-#: ../templates/delete.php:229
+#: ../templates/delete.php:220
 #, php-format
 msgid "Deleted DN: %s"
 msgstr "删除的DN: %s"
 
-#: ../templates/pdfedit/pdfdelete.php:65
+#: ../templates/pdfedit/pdfdelete.php:63
 msgid "Deleted PDF structure:"
 msgstr "删除的PDF结构:"
 
@@ -1621,11 +1660,11 @@ msgstr "删除的PDF结构:"
 msgid "Deleted account"
 msgstr "已删除的帐号"
 
-#: ../templates/profedit/profiledelete.php:66
+#: ../templates/profedit/profiledelete.php:64
 msgid "Deleted profile:"
 msgstr "已删除的配置文件:"
 
-#: ../lib/modules/range.inc:83
+#: ../lib/modules/range.inc:85
 msgid "Deletes an IP range."
 msgstr "删除一个IP范围"
 
@@ -1636,7 +1675,7 @@ msgstr "删除一个IP范围"
 msgid "Deleting %s"
 msgstr "正在删除%s"
 
-#: ../templates/delete.php:139
+#: ../templates/delete.php:130
 msgid "Deleting. Please stand by ..."
 msgstr "正在删除,请稍等..."
 
@@ -1644,76 +1683,75 @@ msgstr "正在删除,请稍等..."
 #: ../lib/modules/inetOrgPerson.inc:165
 #: ../lib/modules/inetOrgPerson.inc:275
 #: ../lib/modules/inetOrgPerson.inc:438
-#: ../lib/modules/inetOrgPerson.inc:684
-#: ../lib/modules/inetOrgPerson.inc:1135
-#: ../lib/modules/inetOrgPerson.inc:1267
-#: ../lib/modules/inetOrgPerson.inc:1737
+#: ../lib/modules/inetOrgPerson.inc:663
+#: ../lib/modules/inetOrgPerson.inc:1114
+#: ../lib/modules/inetOrgPerson.inc:1246
+#: ../lib/modules/inetOrgPerson.inc:1754
 msgid "Department(s)"
 msgstr "部门"
 
-#: ../templates/schema/schema.php:94
-#: ../templates/schema/schema.php:148
-#: ../templates/schema/schema.php:351
+#: ../templates/schema/schema.php:87
+#: ../templates/schema/schema.php:141
+#: ../templates/schema/schema.php:344
 #: ../templates/tree/add_value_form.php:186
 #: ../lib/modules/nisnetgroup.inc:72
 #: ../lib/modules/nisnetgroup.inc:180
-#: ../lib/modules/nisnetgroup.inc:564
-#: ../lib/modules/dhcp_settings.inc:160
-#: ../lib/modules/dhcp_settings.inc:288
-#: ../lib/modules/dhcp_settings.inc:594
-#: ../lib/modules/dhcp_settings.inc:656
+#: ../lib/modules/nisnetgroup.inc:565
+#: ../lib/modules/dhcp_settings.inc:161
+#: ../lib/modules/dhcp_settings.inc:289
+#: ../lib/modules/dhcp_settings.inc:615
+#: ../lib/modules/dhcp_settings.inc:677
 #: ../lib/modules/account.inc:88
 #: ../lib/modules/account.inc:98
-#: ../lib/modules/account.inc:122
-#: ../lib/modules/account.inc:226
-#: ../lib/modules/account.inc:240
+#: ../lib/modules/account.inc:106
+#: ../lib/modules/account.inc:208
+#: ../lib/modules/account.inc:222
 #: ../lib/modules/inetOrgPerson.inc:215
 #: ../lib/modules/inetOrgPerson.inc:318
-#: ../lib/modules/inetOrgPerson.inc:584
-#: ../lib/modules/inetOrgPerson.inc:965
-#: ../lib/modules/inetOrgPerson.inc:1241
+#: ../lib/modules/inetOrgPerson.inc:563
+#: ../lib/modules/inetOrgPerson.inc:944
+#: ../lib/modules/inetOrgPerson.inc:1220
 #: ../lib/modules/groupOfNames.inc:64
 #: ../lib/modules/groupOfNames.inc:91
 #: ../lib/modules/groupOfNames.inc:143
-#: ../lib/modules/groupOfNames.inc:443
-#: ../lib/modules/sambaGroupMapping.inc:389
-#: ../lib/modules/posixGroup.inc:177
-#: ../lib/modules/posixGroup.inc:382
-#: ../lib/modules/posixGroup.inc:448
-#: ../lib/modules/posixAccount.inc:311
-#: ../lib/modules/posixAccount.inc:422
+#: ../lib/modules/groupOfNames.inc:440
+#: ../lib/modules/sambaGroupMapping.inc:390
+#: ../lib/modules/posixGroup.inc:178
+#: ../lib/modules/posixGroup.inc:383
+#: ../lib/modules/posixGroup.inc:449
+#: ../lib/modules/posixAccount.inc:414
 #: ../lib/modules/nisObject.inc:66
 #: ../lib/modules/nisObject.inc:96
 #: ../lib/modules/nisObject.inc:147
-#: ../lib/modules/nisObject.inc:221
+#: ../lib/modules/nisObject.inc:222
 #: ../lib/types/netgroup.inc:92
 #: ../lib/types/user.inc:101
 #: ../lib/types/nisObjectType.inc:80
 msgid "Description"
 msgstr "描述"
 
-#: ../lib/modules/sambaSamAccount.inc:375
-#: ../lib/modules/sambaSamAccount.inc:576
+#: ../lib/modules/sambaSamAccount.inc:367
+#: ../lib/modules/sambaSamAccount.inc:557
 msgid "Disable LM hashes"
 msgstr "屏蔽LM哈希方法"
 
-#: ../lib/modules/ddns.inc:87
-#: ../lib/modules/ddns.inc:343
+#: ../lib/modules/ddns.inc:89
+#: ../lib/modules/ddns.inc:348
 msgid "Disable client updates"
 msgstr "禁止客户端更新"
 
-#: ../lib/modules/ddns.inc:88
+#: ../lib/modules/ddns.inc:90
 msgid "Disables the client to update DNS entries."
 msgstr "禁止客户端更新DNS条目."
 
 #: ../lib/modules/sambaDomain.inc:106
 #: ../lib/modules/sambaDomain.inc:288
-#: ../lib/modules/sambaDomain.inc:664
+#: ../lib/modules/sambaDomain.inc:665
 msgid "Disconnect users outside logon hours"
 msgstr "切断连接前用户登录小时数"
 
-#: ../lib/modules/sambaSamAccount.inc:1500
-#: ../lib/modules/sambaSamAccount.inc:1848
+#: ../lib/modules/sambaSamAccount.inc:1469
+#: ../lib/modules/sambaSamAccount.inc:1804
 msgid "Disconnection time limit"
 msgstr "断开连接时间限制"
 
@@ -1721,18 +1759,18 @@ msgstr "断开连接时间限制"
 msgid "Disconnects users if they are logged in outside logon hours."
 msgstr "如果用户登录限制时间到则断开连接."
 
-#: ../lib/modules/sambaGroupMapping.inc:235
-#: ../lib/modules/sambaGroupMapping.inc:354
-#: ../lib/modules/sambaGroupMapping.inc:387
+#: ../lib/modules/sambaGroupMapping.inc:236
+#: ../lib/modules/sambaGroupMapping.inc:355
+#: ../lib/modules/sambaGroupMapping.inc:388
 #: ../lib/modules/sambaSamAccount.inc:96
-#: ../lib/modules/sambaSamAccount.inc:237
-#: ../lib/modules/sambaSamAccount.inc:395
-#: ../lib/modules/sambaSamAccount.inc:1087
-#: ../lib/modules/sambaSamAccount.inc:1805
+#: ../lib/modules/sambaSamAccount.inc:232
+#: ../lib/modules/sambaSamAccount.inc:390
+#: ../lib/modules/sambaSamAccount.inc:1081
+#: ../lib/modules/sambaSamAccount.inc:1761
 msgid "Display name"
 msgstr "显示名"
 
-#: ../lib/modules.inc:458
+#: ../lib/modules.inc:463
 msgid "Displayed account numbers start at \"0\". Add 2 to get the row in your spreadsheet."
 msgstr "显示的帐号数以\"0\"开始,加2才是您的电子表格的行数."
 
@@ -1740,11 +1778,11 @@ msgstr "显示的帐号数以\"0\"开始,加2才是您的电子表格的行数."
 msgid "Do you really want to delete this OU?"
 msgstr "确认删除这个OU?"
 
-#: ../templates/pdfedit/pdfdelete.php:82
+#: ../templates/pdfedit/pdfdelete.php:80
 msgid "Do you really want to delete this PDF structure?"
 msgstr "确认删除这个PDF结构?"
 
-#: ../templates/profedit/profiledelete.php:81
+#: ../templates/profedit/profiledelete.php:79
 msgid "Do you really want to delete this profile?"
 msgstr "确认删除这个配置文件?"
 
@@ -1752,7 +1790,7 @@ msgstr "确认删除这个配置文件?"
 msgid "Do you really want to mark this account for deletion?"
 msgstr "确认将此帐号打上删除标记?"
 
-#: ../templates/delete.php:90
+#: ../templates/delete.php:85
 msgid "Do you really want to remove the following accounts?"
 msgstr "确认删除下列帐号?"
 
@@ -1761,18 +1799,18 @@ msgid "Do you want to make these changes?"
 msgstr "确认如下更改?"
 
 #: ../lib/modules/nisnetgroup.inc:205
-#: ../lib/modules/nisnetgroup.inc:574
+#: ../lib/modules/nisnetgroup.inc:575
 #: ../lib/modules/sambaGroupMapping.inc:69
-#: ../lib/modules/sambaGroupMapping.inc:272
-#: ../lib/modules/sambaGroupMapping.inc:366
-#: ../lib/modules/sambaGroupMapping.inc:409
-#: ../lib/modules/sambaSamAccount.inc:315
-#: ../lib/modules/sambaSamAccount.inc:388
-#: ../lib/modules/sambaSamAccount.inc:526
-#: ../lib/modules/sambaSamAccount.inc:1258
-#: ../lib/modules/sambaSamAccount.inc:1663
-#: ../lib/modules/sambaSamAccount.inc:1695
-#: ../lib/modules/sambaSamAccount.inc:1823
+#: ../lib/modules/sambaGroupMapping.inc:273
+#: ../lib/modules/sambaGroupMapping.inc:367
+#: ../lib/modules/sambaGroupMapping.inc:410
+#: ../lib/modules/sambaSamAccount.inc:310
+#: ../lib/modules/sambaSamAccount.inc:383
+#: ../lib/modules/sambaSamAccount.inc:507
+#: ../lib/modules/sambaSamAccount.inc:1230
+#: ../lib/modules/sambaSamAccount.inc:1622
+#: ../lib/modules/sambaSamAccount.inc:1654
+#: ../lib/modules/sambaSamAccount.inc:1779
 msgid "Domain"
 msgstr "域"
 
@@ -1780,17 +1818,17 @@ msgstr "域"
 #: ../lib/modules/sambaDomain.inc:144
 #: ../lib/modules/sambaDomain.inc:231
 #: ../lib/modules/sambaDomain.inc:237
-#: ../lib/modules/sambaDomain.inc:636
+#: ../lib/modules/sambaDomain.inc:637
 #: ../lib/types/smbDomain.inc:91
 msgid "Domain SID"
 msgstr "域SID"
 
-#: ../lib/modules/sambaGroupMapping.inc:333
+#: ../lib/modules/sambaGroupMapping.inc:334
 msgid "Domain administrators"
 msgstr "域管理员"
 
 #: ../lib/modules/sambaGroupMapping.inc:56
-#: ../lib/modules/sambaGroupMapping.inc:339
+#: ../lib/modules/sambaGroupMapping.inc:340
 #: ../lib/modules/sambaSamAccount.inc:69
 msgid "Domain admins"
 msgstr "域管理员"
@@ -1802,7 +1840,7 @@ msgstr "域认证管理员"
 
 #: ../lib/modules/sambaGroupMapping.inc:59
 #: ../lib/modules/sambaSamAccount.inc:70
-#: ../lib/modules/sambaSamAccount.inc:792
+#: ../lib/modules/sambaSamAccount.inc:795
 msgid "Domain computers"
 msgstr "域内计算机"
 
@@ -1817,7 +1855,7 @@ msgid "Domain enterprise admins"
 msgstr "域企业管理员"
 
 #: ../lib/modules/sambaGroupMapping.inc:68
-#: ../lib/modules/sambaGroupMapping.inc:260
+#: ../lib/modules/sambaGroupMapping.inc:261
 msgid "Domain group"
 msgstr "域内组"
 
@@ -1827,16 +1865,16 @@ msgid "Domain guests"
 msgstr "域内来宾"
 
 #: ../lib/modules/nisnetgroup.inc:137
-#: ../lib/modules/dhcp_settings.inc:118
-#: ../lib/modules/dhcp_settings.inc:186
-#: ../lib/modules/dhcp_settings.inc:237
-#: ../lib/modules/dhcp_settings.inc:530
-#: ../lib/modules/dhcp_settings.inc:647
+#: ../lib/modules/dhcp_settings.inc:119
+#: ../lib/modules/dhcp_settings.inc:187
+#: ../lib/modules/dhcp_settings.inc:238
+#: ../lib/modules/dhcp_settings.inc:551
+#: ../lib/modules/dhcp_settings.inc:668
 #: ../lib/modules/sambaDomain.inc:70
 #: ../lib/modules/sambaDomain.inc:137
 #: ../lib/modules/sambaDomain.inc:218
 #: ../lib/modules/sambaDomain.inc:224
-#: ../lib/modules/sambaDomain.inc:633
+#: ../lib/modules/sambaDomain.inc:634
 #: ../lib/types/smbDomain.inc:92
 msgid "Domain name"
 msgstr "域名"
@@ -1859,22 +1897,22 @@ msgstr "域架构管理员"
 
 #: ../lib/modules/sambaGroupMapping.inc:57
 #: ../lib/modules/sambaSamAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:2155
+#: ../lib/modules/sambaSamAccount.inc:2086
 msgid "Domain users"
 msgstr "域内用户"
 
-#: ../templates/main_header.php:60
-msgid "Donate"
-msgstr "捐赠"
-
-#: ../templates/pdfedit/pdfpage.php:421
+#: ../templates/pdfedit/pdfpage.php:410
 msgid "Down"
 msgstr "向下"
 
-#: ../templates/masscreate.php:283
+#: ../templates/masscreate.php:364
 msgid "Download sample CSV file"
 msgstr "下载CSV示例文件"
 
+#: ../templates/serverInfo.php:108
+msgid "Dynamic subtrees"
+msgstr "动态子树"
+
 #: ../lib/types/user.inc:100
 msgid "E-Mail"
 msgstr "电子邮件"
@@ -1905,27 +1943,27 @@ msgstr "电子邮件别名列表格式非法!"
 
 #: ../lib/modules/kolabUser.inc:201
 #: ../lib/modules/kolabUser.inc:360
-#: ../lib/modules/kolabUser.inc:790
+#: ../lib/modules/kolabUser.inc:791
 msgid "EMail aliases"
 msgstr "电子邮件别名"
 
-#: ../lib/modules/sambaSamAccount.inc:568
+#: ../lib/modules/sambaSamAccount.inc:549
 msgid "East Australian Standard, Guam"
 msgstr "澳东标准时间,关岛"
 
-#: ../lib/modules/sambaSamAccount.inc:560
+#: ../lib/modules/sambaSamAccount.inc:541
 msgid "Eastern Europe Time, South Africa"
 msgstr "东欧时间,南非"
 
-#: ../lib/modules/sambaSamAccount.inc:553
+#: ../lib/modules/sambaSamAccount.inc:534
 msgid "Eastern Time (US & Canada), Bogota"
 msgstr "美国东部时间(美国和加拿大),波哥大"
 
-#: ../templates/pdfedit/pdfmain.php:162
-#: ../templates/profedit/profilemain.php:155
-#: ../lib/modules/sambaSamAccount.inc:1266
-#: ../lib/modules/sambaSamAccount.inc:1272
-#: ../lib/lists.inc:456
+#: ../templates/pdfedit/pdfmain.php:157
+#: ../templates/profedit/profilemain.php:145
+#: ../lib/modules/sambaSamAccount.inc:1238
+#: ../lib/modules/sambaSamAccount.inc:1244
+#: ../lib/lists.inc:396
 msgid "Edit"
 msgstr "编辑"
 
@@ -1934,11 +1972,11 @@ msgstr "编辑"
 msgid "Edit general settings"
 msgstr "编辑通用设置"
 
-#: ../lib/modules/posixAccount.inc:957
+#: ../lib/modules/posixAccount.inc:967
 msgid "Edit groups"
 msgstr "编辑组"
 
-#: ../lib/modules/posixGroup.inc:183
+#: ../lib/modules/posixGroup.inc:184
 msgid "Edit members"
 msgstr "编辑成员"
 
@@ -1954,7 +1992,7 @@ msgstr "编辑服务器配置文件"
 msgid "Edit subgroups"
 msgstr "编辑分组"
 
-#: ../lib/modules/sambaSamAccount.inc:1216
+#: ../lib/modules/sambaSamAccount.inc:1188
 msgid "Edit workstations"
 msgstr "编辑工作站"
 
@@ -1962,27 +2000,31 @@ msgstr "编辑工作站"
 #: ../lib/modules/inetOrgPerson.inc:183
 #: ../lib/modules/inetOrgPerson.inc:268
 #: ../lib/modules/inetOrgPerson.inc:334
-#: ../lib/modules/inetOrgPerson.inc:600
-#: ../lib/modules/inetOrgPerson.inc:1117
-#: ../lib/modules/inetOrgPerson.inc:1246
+#: ../lib/modules/inetOrgPerson.inc:579
+#: ../lib/modules/inetOrgPerson.inc:1096
+#: ../lib/modules/inetOrgPerson.inc:1225
 msgid "Employee type"
 msgstr "雇员类型"
 
-#: ../lib/modules/inetOrgPerson.inc:601
+#: ../lib/modules/inetOrgPerson.inc:580
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇员类型: 承包商,雇员,实习生,临时工,外部员工,..."
 
-#: ../templates/lists/changePassword.php:257
-#: ../templates/lists/changePassword.php:263
-#: ../templates/login.php:423
+#: ../templates/lists/changePassword.php:244
+#: ../templates/lists/changePassword.php:250
+#: ../templates/login.php:382
 msgid "Empty password submitted. Please try again."
 msgstr "提交了空密码,请重试."
 
+#: ../lib/modules/ppolicy.inc:89
+msgid "Enables quality checking (e.g. password length) of passwords. If set to \"force\" then you need to disable password hashing in your LAM server profile to change passwords with LAM."
+msgstr "打开密码质量（比如密码长度）检查。如果设置为“强制”，则必须在LAM的服务器配置中关闭密码哈希，才能用LAM更改密码。"
+
 #: ../templates/tree/download_binary_attr.php:71
 msgid "Encountered an error while performing search."
 msgstr "检索时发生错误."
 
-#: ../lib/modules/sambaSamAccount.inc:546
+#: ../lib/modules/sambaSamAccount.inc:527
 msgid "Eniwetok, Kwajalein"
 msgstr "埃尼威托克,瓜加林"
 
@@ -1992,9 +2034,9 @@ msgstr "输入想增加的值:"
 
 #: ../lib/modules/eduPerson.inc:103
 #: ../lib/modules/eduPerson.inc:107
-#: ../lib/modules/eduPerson.inc:163
-#: ../lib/modules/eduPerson.inc:325
-#: ../lib/modules/eduPerson.inc:639
+#: ../lib/modules/eduPerson.inc:174
+#: ../lib/modules/eduPerson.inc:333
+#: ../lib/modules/eduPerson.inc:683
 msgid "Entitlements"
 msgstr "授权"
 
@@ -2012,24 +2054,24 @@ msgstr "条目 %s 及其子树删除成功"
 msgid "Entry %s deleted successfully."
 msgstr "条目%s删除成功"
 
-#: ../templates/schema/schema.php:171
+#: ../templates/schema/schema.php:164
 msgid "Equality"
 msgstr "相等"
 
-#: ../templates/config/mainmanage.php:256
+#: ../templates/config/mainmanage.php:262
 msgid "Error"
 msgstr "错误"
 
-#: ../templates/delete.php:234
+#: ../templates/delete.php:225
 #, php-format
 msgid "Error while deleting DN: %s"
 msgstr "删除DN: %s时发生错误"
 
-#: ../help/help.inc:134
+#: ../help/help.inc:136
 msgid "Every account type needs exactly one base module. This module provides a structural object class."
 msgstr "每个帐号类型都需要一个基本模块,这个模块提供一个结构化对象类"
 
-#: ../lib/modules/dhcp_settings.inc:525
+#: ../lib/modules/dhcp_settings.inc:546
 #: ../lib/modules/customScripts.inc:60
 #: ../lib/modules/customScripts.inc:72
 #: ../help/help.inc:73
@@ -2040,8 +2082,8 @@ msgstr "每个帐号类型都需要一个基本模块,这个模块提供一个
 msgid "Example"
 msgstr "示例"
 
-#: ../templates/masscreate.php:166
-#: ../templates/masscreate.php:323
+#: ../templates/masscreate.php:244
+#: ../templates/masscreate.php:404
 msgid "Example value"
 msgstr "示例值"
 
@@ -2049,14 +2091,22 @@ msgstr "示例值"
 msgid "Examples"
 msgstr "示例"
 
-#: ../templates/config/confmain.php:409
+#: ../templates/config/confmain.php:436
 msgid "Execute"
 msgstr "运行"
 
-#: ../templates/tests/lamdaemonTest.php:307
+#: ../templates/tests/lamdaemonTest.php:294
 msgid "Execute lamdaemon"
 msgstr "运行 lamdaemon"
 
+#: ../lib/modules/ppolicy.inc:108
+#: ../lib/modules/ppolicy.inc:153
+#: ../lib/modules/ppolicy.inc:197
+#: ../lib/modules/ppolicy.inc:485
+#: ../lib/types/ppolicyType.inc:86
+msgid "Expire warning"
+msgstr "密码过期告警"
+
 #: ../templates/tree/export_form.php:88
 #: ../templates/tree/export_form.php:96
 #: ../templates/tree/edit.php:119
@@ -2067,19 +2117,19 @@ msgstr "导出"
 msgid "Export format"
 msgstr "导出格式"
 
-#: ../lib/modules/asteriskExtension.inc:72
-#: ../lib/modules/asteriskExtension.inc:121
-#: ../lib/modules/asteriskExtension.inc:204
-#: ../lib/modules/asteriskExtension.inc:436
+#: ../lib/modules/asteriskExtension.inc:86
+#: ../lib/modules/asteriskExtension.inc:139
+#: ../lib/modules/asteriskExtension.inc:222
+#: ../lib/modules/asteriskExtension.inc:469
 #: ../lib/types/asteriskExt.inc:91
 msgid "Extension name"
 msgstr "扩展名"
 
-#: ../lib/modules/asteriskExtension.inc:84
-#: ../lib/modules/asteriskExtension.inc:162
-#: ../lib/modules/asteriskExtension.inc:221
-#: ../lib/modules/asteriskExtension.inc:268
-#: ../lib/modules/asteriskExtension.inc:439
+#: ../lib/modules/asteriskExtension.inc:98
+#: ../lib/modules/asteriskExtension.inc:180
+#: ../lib/modules/asteriskExtension.inc:239
+#: ../lib/modules/asteriskExtension.inc:301
+#: ../lib/modules/asteriskExtension.inc:472
 msgid "Extension owners"
 msgstr "扩展属主"
 
@@ -2087,7 +2137,7 @@ msgstr "扩展属主"
 msgid "Failed to add the attribute."
 msgstr "新增属性值失败!"
 
-#: ../templates/initsuff.php:154
+#: ../templates/initsuff.php:151
 msgid "Failed to create entry!"
 msgstr "新增条目失败!"
 
@@ -2098,27 +2148,35 @@ msgstr "新增条目失败!"
 msgid "Failed to delete entry %s"
 msgstr "删除 %s 条目失败!"
 
+#: ../lib/modules/ppolicy.inc:104
+#: ../lib/modules/ppolicy.inc:152
+#: ../lib/modules/ppolicy.inc:270
+#: ../lib/modules/ppolicy.inc:484
+#: ../lib/types/ppolicyType.inc:85
+msgid "Failure count interval"
+msgstr "失败记录间隔"
+
 #: ../lib/modules/inetOrgPerson.inc:83
 #: ../lib/modules/inetOrgPerson.inc:150
 #: ../lib/modules/inetOrgPerson.inc:255
 #: ../lib/modules/inetOrgPerson.inc:414
-#: ../lib/modules/inetOrgPerson.inc:632
-#: ../lib/modules/inetOrgPerson.inc:633
-#: ../lib/modules/inetOrgPerson.inc:1078
-#: ../lib/modules/inetOrgPerson.inc:1255
-#: ../lib/modules/inetOrgPerson.inc:1616
+#: ../lib/modules/inetOrgPerson.inc:611
+#: ../lib/modules/inetOrgPerson.inc:612
+#: ../lib/modules/inetOrgPerson.inc:1057
+#: ../lib/modules/inetOrgPerson.inc:1234
+#: ../lib/modules/inetOrgPerson.inc:1633
 msgid "Fax number"
 msgstr "传真号"
 
-#: ../templates/config/mainmanage.php:323
+#: ../templates/config/mainmanage.php:328
 msgid "File"
 msgstr "文件"
 
-#: ../lib/modules/sambaSamAccount.inc:291
+#: ../lib/modules/sambaSamAccount.inc:286
 msgid "File name and path relative to netlogon-share which should be executed on logon. $user and $group are replaced with user and group name."
 msgstr "用户登录时自动运行的文件名和网络登录共享相对路径,$user和$group会被用户名和组名替换"
 
-#: ../templates/masscreate.php:129
+#: ../templates/masscreate.php:206
 #: ../lib/tools/fileUpload.inc:44
 msgid "File upload"
 msgstr "文件上传"
@@ -2129,18 +2187,18 @@ msgstr "文件上传失败!"
 
 #: ../lib/modules/nisnetgroup.inc:89
 #: ../lib/modules/nisnetgroup.inc:448
-#: ../lib/lists.inc:382
-#: ../help/help.inc:145
+#: ../lib/lists.inc:329
+#: ../help/help.inc:147
 msgid "Filter"
 msgstr "过滤器"
 
 #: ../lib/modules/inetOrgPerson.inc:73
 #: ../lib/modules/inetOrgPerson.inc:148
 #: ../lib/modules/inetOrgPerson.inc:303
-#: ../lib/modules/inetOrgPerson.inc:592
-#: ../lib/modules/inetOrgPerson.inc:941
-#: ../lib/modules/inetOrgPerson.inc:1244
-#: ../lib/modules/inetOrgPerson.inc:1568
+#: ../lib/modules/inetOrgPerson.inc:571
+#: ../lib/modules/inetOrgPerson.inc:920
+#: ../lib/modules/inetOrgPerson.inc:1223
+#: ../lib/modules/inetOrgPerson.inc:1585
 #: ../lib/types/user.inc:96
 msgid "First name"
 msgstr "名字"
@@ -2150,11 +2208,11 @@ msgstr "名字"
 msgid "First name contains invalid characters!"
 msgstr "名字包含非法字符"
 
-#: ../lib/modules/inetOrgPerson.inc:593
+#: ../lib/modules/inetOrgPerson.inc:572
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "用户名字只允许字母,-和空格"
 
-#: ../lib/modules/ddns.inc:84
+#: ../lib/modules/ddns.inc:86
 msgid "Fix IP addresses"
 msgstr "固定IP地址"
 
@@ -2162,8 +2220,8 @@ msgstr "固定IP地址"
 msgid "Fixed IP"
 msgstr "固定IP"
 
-#: ../templates/config/confmain.php:441
-#: ../templates/config/confmain.php:444
+#: ../templates/config/confmain.php:468
+#: ../templates/config/confmain.php:471
 msgid "Fixed list"
 msgstr "固定列表"
 
@@ -2175,7 +2233,7 @@ msgstr "自动处理邀请."
 msgid "For the upload please specify the entries in the format \"(HOST,USER,DOMAIN)\". Multiple entries are separated by semicolon."
 msgstr "上传请使用\"(主机,用户,域)\"格式来编写条目.多条目请用分号隔开."
 
-#: ../help/help.inc:190
+#: ../help/help.inc:192
 msgid "Format"
 msgstr "格式"
 
@@ -2184,8 +2242,8 @@ msgstr "格式"
 #: ../lib/modules/kolabUser.inc:167
 #: ../lib/modules/kolabUser.inc:213
 #: ../lib/modules/kolabUser.inc:305
-#: ../lib/modules/kolabUser.inc:768
-#: ../lib/modules/kolabUser.inc:820
+#: ../lib/modules/kolabUser.inc:769
+#: ../lib/modules/kolabUser.inc:821
 msgid "Free/Busy interval"
 msgstr "空闲/忙碌 间隔"
 
@@ -2194,11 +2252,11 @@ msgstr "空闲/忙碌 间隔"
 msgid "Free/Busy interval must be a number!"
 msgstr "空闲/忙碌间隔必须是一个数字!"
 
-#: ../lib/modules/sambaSamAccount.inc:1339
+#: ../lib/modules/sambaSamAccount.inc:1318
 msgid "Friday"
 msgstr "星期五"
 
-#: ../templates/lists/changePassword.php:148
+#: ../templates/lists/changePassword.php:143
 msgid "Full name"
 msgstr "全名"
 
@@ -2206,52 +2264,52 @@ msgstr "全名"
 msgid "GB-12345"
 msgstr "GB-12345"
 
-#: ../lib/modules/sambaGroupMapping.inc:385
-#: ../lib/modules/posixGroup.inc:172
-#: ../lib/modules/posixGroup.inc:336
-#: ../lib/modules/posixGroup.inc:378
-#: ../lib/modules/posixGroup.inc:398
-#: ../lib/modules/posixGroup.inc:446
-#: ../lib/modules/posixGroup.inc:465
-#: ../lib/modules/posixAccount.inc:87
-#: ../lib/modules/posixAccount.inc:1169
+#: ../lib/modules/sambaGroupMapping.inc:386
+#: ../lib/modules/posixGroup.inc:173
+#: ../lib/modules/posixGroup.inc:337
+#: ../lib/modules/posixGroup.inc:379
+#: ../lib/modules/posixGroup.inc:399
+#: ../lib/modules/posixGroup.inc:447
+#: ../lib/modules/posixGroup.inc:466
+#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:1179
 #: ../lib/types/group.inc:93
 #: ../lib/types/user.inc:93
 #: ../lib/types/host.inc:96
 msgid "GID number"
 msgstr "GID编号"
 
-#: ../lib/modules/posixGroup.inc:465
+#: ../lib/modules/posixGroup.inc:466
 msgid "GID number has changed. Please select checkbox to change GID number of users and hosts."
 msgstr "GID的编号已经更改,请点击选择框来改变用户GID号"
 
-#: ../lib/modules/posixAccount.inc:87
+#: ../lib/modules/posixAccount.inc:90
 #, php-format
 msgid "GID number has changed. To keep file ownership you have to run the following command as root: 'find / -gid %s -uid %s -exec chgrp %s {} \\;'"
 msgstr "GID已经更改,要保持文件属性一,你必须以root身份运行以下命令: 'find / -gid %s -uid %s -exec chgrp %s {} \\;'"
 
-#: ../lib/modules/posixGroup.inc:472
+#: ../lib/modules/posixGroup.inc:473
 msgid "GID number has to be a numeric value!"
 msgstr "GID号必须使用数字"
 
-#: ../lib/modules/posixAccount.inc:267
-#: ../lib/modules/posixAccount.inc:299
-#: ../lib/modules/posixAccount.inc:376
-#: ../lib/modules/posixAccount.inc:414
-#: ../lib/modules/posixAccount.inc:946
-#: ../lib/modules/posixAccount.inc:1170
+#: ../lib/modules/posixAccount.inc:270
+#: ../lib/modules/posixAccount.inc:302
+#: ../lib/modules/posixAccount.inc:368
+#: ../lib/modules/posixAccount.inc:406
+#: ../lib/modules/posixAccount.inc:956
+#: ../lib/modules/posixAccount.inc:1180
 msgid "Gecos"
 msgstr "备注(Gecos)"
 
-#: ../templates/config/conftypes.php:140
-#: ../templates/config/confmain.php:159
-#: ../templates/config/confmodules.php:125
-#: ../templates/config/moduleSettings.php:124
+#: ../templates/config/conftypes.php:146
+#: ../templates/config/confmain.php:164
+#: ../templates/config/confmodules.php:131
+#: ../templates/config/moduleSettings.php:130
 msgid "General settings"
 msgstr "通用设置"
 
-#: ../templates/lists/changePassword.php:179
-#: ../help/help.inc:187
+#: ../templates/lists/changePassword.php:174
+#: ../help/help.inc:189
 msgid "Generate random password"
 msgstr "生成随机密码"
 
@@ -2259,33 +2317,41 @@ msgstr "生成随机密码"
 msgid "Germany"
 msgstr "德国"
 
-#: ../templates/schema/schema.php:133
-#: ../templates/schema/schema.php:270
-#: ../templates/schema/schema.php:301
-#: ../templates/schema/schema.php:326
+#: ../templates/schema/schema.php:126
+#: ../templates/schema/schema.php:263
+#: ../templates/schema/schema.php:294
+#: ../templates/schema/schema.php:319
 msgid "Go"
 msgstr "开始"
 
-#: ../lib/modules/quota.inc:115
-#: ../lib/modules/quota.inc:387
+#: ../lib/modules/ppolicy.inc:92
+#: ../lib/modules/ppolicy.inc:149
+#: ../lib/modules/ppolicy.inc:206
+#: ../lib/modules/ppolicy.inc:481
+#: ../lib/types/ppolicyType.inc:82
+msgid "Grace authentication limit"
+msgstr "缓期认证限制"
+
+#: ../lib/modules/quota.inc:117
+#: ../lib/modules/quota.inc:389
 msgid "Grace block period"
 msgstr "块限制宽限周期"
 
-#: ../lib/modules/quota.inc:116
+#: ../lib/modules/quota.inc:118
 msgid "Grace block period. Most filesystems use a fixed maximum value of 7 days."
 msgstr "块限制宽限周期,大部分文件系统都使用最大值7天."
 
-#: ../lib/modules/quota.inc:138
+#: ../lib/modules/quota.inc:140
 msgid "Grace inode (files) period. Most filesystems use a fixed maximum value of 7 days."
 msgstr "节点限制的宽限期,大部分文件系统都使用最大值7天."
 
-#: ../lib/modules/quota.inc:137
-#: ../lib/modules/quota.inc:391
+#: ../lib/modules/quota.inc:139
+#: ../lib/modules/quota.inc:393
 msgid "Grace inode period"
 msgstr "节点限制宽限期"
 
-#: ../templates/selfService/adminMain.php:560
-#: ../templates/config/confmain.php:414
+#: ../templates/selfService/adminMain.php:568
+#: ../templates/config/confmain.php:441
 msgid "Group"
 msgstr "组"
 
@@ -2294,12 +2360,12 @@ msgid "Group accounts (e.g. Unix and Samba)"
 msgstr "组帐号(比如unix和samba)"
 
 #: ../lib/modules/nisnetgroup.inc:105
-#: ../lib/modules/posixGroup.inc:369
+#: ../lib/modules/posixGroup.inc:370
 #: ../lib/types/group.inc:96
 msgid "Group description"
 msgstr "组说明"
 
-#: ../lib/modules/posixGroup.inc:383
+#: ../lib/modules/posixGroup.inc:384
 msgid "Group description. If left empty group name will be used."
 msgstr "组说明,若空则会使用组名来替代."
 
@@ -2309,12 +2375,12 @@ msgstr "组说明,若空则会使用组名来替代."
 msgid "Group member DNs"
 msgstr "组成员DN"
 
-#: ../lib/modules/posixGroup.inc:182
-#: ../lib/modules/posixGroup.inc:240
-#: ../lib/modules/posixGroup.inc:342
-#: ../lib/modules/posixGroup.inc:386
-#: ../lib/modules/posixGroup.inc:390
-#: ../lib/modules/posixGroup.inc:447
+#: ../lib/modules/posixGroup.inc:183
+#: ../lib/modules/posixGroup.inc:241
+#: ../lib/modules/posixGroup.inc:343
+#: ../lib/modules/posixGroup.inc:387
+#: ../lib/modules/posixGroup.inc:391
+#: ../lib/modules/posixGroup.inc:448
 #: ../lib/types/group.inc:94
 msgid "Group members"
 msgstr "组成员"
@@ -2323,17 +2389,17 @@ msgstr "组成员"
 #: ../lib/modules/nisnetgroup.inc:97
 #: ../lib/modules/nisnetgroup.inc:134
 #: ../lib/modules/nisnetgroup.inc:176
-#: ../lib/modules/nisnetgroup.inc:562
+#: ../lib/modules/nisnetgroup.inc:563
 #: ../lib/modules/groupOfNames.inc:60
 #: ../lib/modules/groupOfNames.inc:84
-#: ../lib/modules/groupOfNames.inc:439
-#: ../lib/modules/posixGroup.inc:167
-#: ../lib/modules/posixGroup.inc:357
-#: ../lib/modules/posixGroup.inc:406
-#: ../lib/modules/posixGroup.inc:445
-#: ../lib/modules/posixGroup.inc:473
+#: ../lib/modules/groupOfNames.inc:436
+#: ../lib/modules/posixGroup.inc:168
+#: ../lib/modules/posixGroup.inc:358
+#: ../lib/modules/posixGroup.inc:407
+#: ../lib/modules/posixGroup.inc:446
 #: ../lib/modules/posixGroup.inc:474
 #: ../lib/modules/posixGroup.inc:475
+#: ../lib/modules/posixGroup.inc:476
 #: ../lib/types/group.inc:92
 #: ../lib/types/netgroup.inc:91
 #: ../lib/types/gon.inc:91
@@ -2341,16 +2407,16 @@ msgid "Group name"
 msgstr "组名"
 
 #: ../lib/modules/nisnetgroup.inc:134
-#: ../lib/modules/posixGroup.inc:475
 #: ../lib/modules/posixGroup.inc:476
+#: ../lib/modules/posixGroup.inc:477
 msgid "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !"
 msgstr "组名包含非法字符,可用字符为: a-z, A-Z, 0-9,及 -或_ !"
 
-#: ../lib/modules/posixGroup.inc:474
+#: ../lib/modules/posixGroup.inc:475
 msgid "Group name in use. Selected next free group name."
 msgstr "组名已被使用,请选择可用的组名."
 
-#: ../lib/modules/posixGroup.inc:407
+#: ../lib/modules/posixGroup.inc:408
 msgid "Group name of the group which should be created. Valid characters are: a-z, A-Z, 0-9 and .-_ . If group name is already used group name will be expanded with a number. The next free number will be used."
 msgstr "将要建立的组名,可用字符为:a-z,A-Z,0-9,.-_ .如果该组名存在,会在组名末尾增加下一个可以使用的数字。"
 
@@ -2367,16 +2433,16 @@ msgstr "帐号的组名"
 msgid "Group of unique names"
 msgstr "组的唯一名"
 
-#: ../lib/modules/posixGroup.inc:348
-#: ../lib/modules/posixGroup.inc:394
+#: ../lib/modules/posixGroup.inc:349
+#: ../lib/modules/posixGroup.inc:395
 msgid "Group password"
 msgstr "组密码"
 
-#: ../lib/modules/sambaGroupMapping.inc:266
+#: ../lib/modules/sambaGroupMapping.inc:267
 msgid "Group type"
 msgstr "组类型"
 
-#: ../lib/modules/posixGroup.inc:296
+#: ../lib/modules/posixGroup.inc:297
 #: ../lib/types/group.inc:54
 msgid "Groups"
 msgstr "组"
@@ -2385,46 +2451,46 @@ msgstr "组"
 msgid "H-Node (0x08)"
 msgstr "H-节点 (0x08)"
 
-#: ../lib/modules/quota.inc:580
+#: ../lib/modules/quota.inc:582
 msgid "Hard block"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:109
-#: ../lib/modules/quota.inc:110
-#: ../lib/modules/quota.inc:386
-#: ../lib/modules/quota.inc:471
+#: ../lib/modules/quota.inc:111
+#: ../lib/modules/quota.inc:112
+#: ../lib/modules/quota.inc:388
+#: ../lib/modules/quota.inc:473
 msgid "Hard block limit"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:582
+#: ../lib/modules/quota.inc:584
 msgid "Hard inode"
 msgstr "节点的硬性限制"
 
-#: ../lib/modules/quota.inc:132
+#: ../lib/modules/quota.inc:134
 msgid "Hard inode (files) limit"
 msgstr "节点的硬性限制"
 
-#: ../lib/modules/quota.inc:131
-#: ../lib/modules/quota.inc:390
-#: ../lib/modules/quota.inc:473
+#: ../lib/modules/quota.inc:133
+#: ../lib/modules/quota.inc:392
+#: ../lib/modules/quota.inc:475
 msgid "Hard inode limit"
 msgstr "节点硬性限制"
 
-#: ../lib/modules/sambaSamAccount.inc:548
+#: ../lib/modules/sambaSamAccount.inc:529
 msgid "Hawaii"
 msgstr "夏威夷"
 
-#: ../templates/pdfedit/pdfpage.php:397
-#: ../templates/pdfedit/pdfpage.php:565
-#: ../templates/pdfedit/pdfpage.php:579
+#: ../templates/pdfedit/pdfpage.php:386
+#: ../templates/pdfedit/pdfpage.php:554
+#: ../templates/pdfedit/pdfpage.php:568
 msgid "Headline"
 msgstr "标题"
 
-#: ../lib/modules.inc:897
+#: ../lib/modules.inc:925
 msgid "Help"
 msgstr "帮助"
 
-#: ../templates/masscreate.php:150
+#: ../templates/masscreate.php:228
 msgid "Here is a list of possible columns. The red columns must be included in the CSV file and filled with data for all accounts."
 msgstr "这是可能的列的列表,红色的列必须包含在CSV文件中,在帐号中属于必填项目."
 
@@ -2432,15 +2498,15 @@ msgstr "这是可能的列的列表,红色的列必须包含在CSV文件中,在
 msgid "Here you can browse LDAP object classes and attributes."
 msgstr "这是你可浏览的LDAP对象类和属性."
 
-#: ../lib/modules/sambaSamAccount.inc:370
+#: ../lib/modules/sambaSamAccount.inc:365
 msgid "Here you can change the settings for the terminal server access."
 msgstr "这里可以改变终端服务访问的设置。"
 
-#: ../templates/masscreate.php:92
+#: ../templates/masscreate.php:114
 msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr "您可以上传CSV文件来建立多个帐号"
 
-#: ../lib/modules/dhcp_settings.inc:161
+#: ../lib/modules/dhcp_settings.inc:162
 msgid "Here you can enter a description for this DHCP entry."
 msgstr "可以输入此DHCP条目的描述"
 
@@ -2453,19 +2519,19 @@ msgstr "在这输入组的描述."
 msgid "Here you can enter a filter value. Only entries which contain the filter text will be shown."
 msgstr "这里您可以输入过滤条件,只显示符合过滤条件的条目."
 
-#: ../lib/modules/posixAccount.inc:356
+#: ../lib/modules/posixAccount.inc:348
 msgid "Here you can enter a list of additional group memberships. The group names are separated by commas."
 msgstr "您可以在此输入附加的组成员,组名以逗号分隔."
 
-#: ../lib/modules/inetOrgPerson.inc:685
+#: ../lib/modules/inetOrgPerson.inc:664
 msgid "Here you can enter the user's department(s). Multiple entries are separated by semicolons."
 msgstr "这里可以输入用户的部门.多个条目以分号隔开."
 
-#: ../help/help.inc:146
-msgid "Here you can input small filter expressions (e.g. 'value' or 'v*'). LAM will filter case-insensitive."
-msgstr "在此输入简单的过滤语法(例如'value'或'v*'),系统在过滤时不分大小写."
+#: ../help/help.inc:148
+msgid "Here you can input simple filter expressions (e.g. 'value' or 'v*'). The filter is case-sensitive."
+msgstr "在此输入简单的过滤语法(例如'value'或'v*'),系统在过滤时区分大小写."
 
-#: ../help/help.inc:159
+#: ../help/help.inc:161
 msgid "Here you can load an account profile to set default settings for your account. The \"default\" profile is automatically loaded for new accounts."
 msgstr "您可以指定一个帐号配置文件做为缺省的配置文件,缺省的配置文件会自动做为新帐号的配置文件."
 
@@ -2473,11 +2539,11 @@ msgstr "您可以指定一个帐号配置文件做为缺省的配置文件,缺
 msgid "Here you can manage your account profiles."
 msgstr "您可以管理您的帐号配置文件."
 
-#: ../help/help.inc:161
+#: ../help/help.inc:163
 msgid "Here you can select a PDF structure and export the account to a PDF file."
 msgstr "您可以选择一个PDF结构,您可以在此選擇一個PDF架構,然後將帳號滙出成PDF檔."
 
-#: ../help/help.inc:140
+#: ../help/help.inc:142
 msgid "Here you can select where LAM should save its log messages. System logging will go to Syslog on Unix systems and event log on Windows. You can also select an extra file."
 msgstr "您在此选择系统日志的存入位置,系统日志记录可以记录在UNIX 系统或WINDOWS 日志系统,您也可以选择文件"
 
@@ -2485,7 +2551,11 @@ msgstr "您在此选择系统日志的存入位置,系统日志记录可以记
 msgid "Here you can select which plugins you want to use for account management."
 msgstr "在此您可以选择一些选择帐号管理的插件"
 
-#: ../help/help.inc:186
+#: ../help/help.inc:120
+msgid "Here you can set a limit for LDAP searches. This will restrict the number of results for LDAP searches. Please use this if LAM's LDAP queries produce too much load."
+msgstr "设置LDAP查询结果条目数量的限制。如果服务器查询负载较重，可以使用这个设置来限制LDAP查询返回结果的条目数量。"
+
+#: ../help/help.inc:188
 msgid "Here you can specify additional CSS links to change the layout of the self service pages. This is useful to adapt them to your corporate design. Please enter one link per line."
 msgstr "这里可以指定附加的CSS链接来改变自助服务页的布局.这样做有利于采用公司的统一设计.每行添加一个CSS连接."
 
@@ -2493,7 +2563,7 @@ msgstr "这里可以指定附加的CSS链接来改变自助服务页的布局.
 msgid "Here you can specify if the account is active or inactive."
 msgstr "这里可以指定用户的激活状态."
 
-#: ../help/help.inc:144
+#: ../help/help.inc:146
 msgid "Here you can specify minimum requirements for passwords. The character classes are: lowercase, uppercase, numeric and symbols."
 msgstr "在此指定用户密码的最小需求.字符类别包括:小写,大写,数字和标点符号."
 
@@ -2505,11 +2575,11 @@ msgstr "这里可以指定一个包含在NIS网络组中的分组.此分组中
 msgid "Here you can specify the minimum number of characters for a user password."
 msgstr "在此指定用户密码的最小长度."
 
-#: ../templates/lists/changePassword.php:199
+#: ../templates/lists/changePassword.php:194
 msgid "Here you can specify the new password yourself."
 msgstr "这里可以设置自己的新密码。"
 
-#: ../lib/modules/sambaSamAccount.inc:361
+#: ../lib/modules/sambaSamAccount.inc:356
 msgid "Here you can specify the shadowing mode."
 msgstr "这里可以指定遮蔽(shadow)模型。"
 
@@ -2518,9 +2588,9 @@ msgid "Here you can test if certain LAM features work on your installation."
 msgstr "测试您安装的系统功能是否正确."
 
 #: ../lib/modules/inetOrgPerson.inc:211
-#: ../lib/modules/inetOrgPerson.inc:688
-#: ../lib/modules/sambaSamAccount.inc:378
-#: ../lib/modules/sambaSamAccount.inc:587
+#: ../lib/modules/inetOrgPerson.inc:667
+#: ../lib/modules/sambaSamAccount.inc:370
+#: ../lib/modules/sambaSamAccount.inc:568
 msgid "Hidden options"
 msgstr "隐藏的选项"
 
@@ -2528,7 +2598,7 @@ msgstr "隐藏的选项"
 msgid "Hide internal attributes"
 msgstr "隐藏内部属性"
 
-#: ../templates/masscreate.php:135
+#: ../templates/masscreate.php:212
 msgid "Hint: Format all cells as text in your spreadsheet program and turn off auto correction."
 msgstr "提示:将电子表格的格式设定为文字,然后关闭自动更正功能"
 
@@ -2536,58 +2606,58 @@ msgstr "提示:将电子表格的格式设定为文字,然后关闭自动更正
 msgid "Hint: To delete an attribute, empty the text field and click save."
 msgstr "提示:要删除一个属性,先清空文本区然后保存."
 
-#: ../lib/modules/posixAccount.inc:401
+#: ../lib/modules/posixAccount.inc:393
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr "按住CTRL键可以多选组."
 
-#: ../lib/modules/posixAccount.inc:64
 #: ../lib/modules/posixAccount.inc:65
-#: ../lib/modules/posixAccount.inc:67
-#: ../lib/modules/posixAccount.inc:93
-#: ../lib/modules/posixAccount.inc:231
+#: ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/posixAccount.inc:96
+#: ../lib/modules/posixAccount.inc:234
+#: ../lib/modules/posixAccount.inc:351
+#: ../lib/modules/posixAccount.inc:355
 #: ../lib/modules/posixAccount.inc:359
-#: ../lib/modules/posixAccount.inc:363
-#: ../lib/modules/posixAccount.inc:367
-#: ../lib/modules/posixAccount.inc:384
-#: ../lib/modules/posixAccount.inc:792
-#: ../lib/modules/posixAccount.inc:960
-#: ../lib/modules/posixAccount.inc:1092
-#: ../lib/modules/posixAccount.inc:1173
-#: ../lib/modules/sambaSamAccount.inc:333
-#: ../lib/modules/sambaSamAccount.inc:1459
-#: ../lib/modules/sambaSamAccount.inc:1837
+#: ../lib/modules/posixAccount.inc:376
+#: ../lib/modules/posixAccount.inc:800
+#: ../lib/modules/posixAccount.inc:970
+#: ../lib/modules/posixAccount.inc:1102
+#: ../lib/modules/posixAccount.inc:1183
+#: ../lib/modules/sambaSamAccount.inc:328
+#: ../lib/modules/sambaSamAccount.inc:1428
+#: ../lib/modules/sambaSamAccount.inc:1793
 #: ../lib/types/user.inc:98
 msgid "Home directory"
 msgstr "个人目录"
 
-#: ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixAccount.inc:68
 #, php-format
 msgid "Home directory changed. To keep home directory you have to run the following command as root: 'mv %s %s'"
 msgstr "使用者目录已经改变,要操持一致需要在系统以ROOT用户运行如下命令:'mv %s %s'"
 
-#: ../lib/modules/posixAccount.inc:1113
+#: ../lib/modules/posixAccount.inc:1123
 msgid "Home directory server"
 msgstr "主目录服务器"
 
-#: ../lib/modules/sambaSamAccount.inc:281
-#: ../lib/modules/sambaSamAccount.inc:476
-#: ../lib/modules/sambaSamAccount.inc:591
-#: ../lib/modules/sambaSamAccount.inc:1179
-#: ../lib/modules/sambaSamAccount.inc:1470
-#: ../lib/modules/sambaSamAccount.inc:1619
-#: ../lib/modules/sambaSamAccount.inc:1811
-#: ../lib/modules/sambaSamAccount.inc:1838
+#: ../lib/modules/sambaSamAccount.inc:276
+#: ../lib/modules/sambaSamAccount.inc:457
+#: ../lib/modules/sambaSamAccount.inc:572
+#: ../lib/modules/sambaSamAccount.inc:1151
+#: ../lib/modules/sambaSamAccount.inc:1439
+#: ../lib/modules/sambaSamAccount.inc:1578
+#: ../lib/modules/sambaSamAccount.inc:1767
+#: ../lib/modules/sambaSamAccount.inc:1794
 msgid "Home drive"
 msgstr "个人驱动器"
 
 #: ../lib/modules/sambaSamAccount.inc:81
 #: ../lib/modules/sambaSamAccount.inc:82
-#: ../lib/modules/sambaSamAccount.inc:284
-#: ../lib/modules/sambaSamAccount.inc:484
-#: ../lib/modules/sambaSamAccount.inc:594
-#: ../lib/modules/sambaSamAccount.inc:1189
-#: ../lib/modules/sambaSamAccount.inc:1627
-#: ../lib/modules/sambaSamAccount.inc:1808
+#: ../lib/modules/sambaSamAccount.inc:279
+#: ../lib/modules/sambaSamAccount.inc:465
+#: ../lib/modules/sambaSamAccount.inc:575
+#: ../lib/modules/sambaSamAccount.inc:1161
+#: ../lib/modules/sambaSamAccount.inc:1586
+#: ../lib/modules/sambaSamAccount.inc:1764
 msgid "Home path"
 msgstr "个人目录路径"
 
@@ -2600,25 +2670,25 @@ msgstr "个人目录路径无效"
 #: ../lib/modules/inetOrgPerson.inc:152
 #: ../lib/modules/inetOrgPerson.inc:248
 #: ../lib/modules/inetOrgPerson.inc:398
-#: ../lib/modules/inetOrgPerson.inc:656
-#: ../lib/modules/inetOrgPerson.inc:1060
-#: ../lib/modules/inetOrgPerson.inc:1253
-#: ../lib/modules/inetOrgPerson.inc:1600
+#: ../lib/modules/inetOrgPerson.inc:635
+#: ../lib/modules/inetOrgPerson.inc:1039
+#: ../lib/modules/inetOrgPerson.inc:1232
+#: ../lib/modules/inetOrgPerson.inc:1617
 msgid "Home telephone number"
 msgstr "宅电"
 
-#: ../lib/modules/posixAccount.inc:64
-#: ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:65
+#: ../lib/modules/posixAccount.inc:67
 msgid "Homedirectory contains invalid characters."
 msgstr "个人目录包含非法字符"
 
 #: ../lib/modules/nisnetgroup.inc:203
-#: ../lib/modules/nisnetgroup.inc:572
-#: ../lib/modules/asteriskAccount.inc:72
-#: ../lib/modules/asteriskAccount.inc:87
-#: ../lib/modules/asteriskAccount.inc:124
-#: ../lib/modules/asteriskAccount.inc:170
-#: ../lib/modules/asteriskAccount.inc:272
+#: ../lib/modules/nisnetgroup.inc:573
+#: ../lib/modules/asteriskAccount.inc:81
+#: ../lib/modules/asteriskAccount.inc:96
+#: ../lib/modules/asteriskAccount.inc:133
+#: ../lib/modules/asteriskAccount.inc:179
+#: ../lib/modules/asteriskAccount.inc:273
 msgid "Host"
 msgstr "主机"
 
@@ -2631,168 +2701,181 @@ msgid "Host description"
 msgstr "主机描述"
 
 #: ../lib/modules/account.inc:89
+#: ../lib/modules/posixAccount.inc:407
 #: ../lib/modules/posixAccount.inc:415
-#: ../lib/modules/posixAccount.inc:423
 msgid "Host description. If left empty host name will be used."
 msgstr "主机描述.如果留空会使用主机名."
 
-#: ../lib/modules/account.inc:108
-msgid "Host list"
-msgstr "主机列表"
-
 #: ../lib/modules/nisnetgroup.inc:136
 #: ../lib/modules/nisnetgroup.inc:453
 #: ../lib/modules/account.inc:84
-#: ../lib/modules/posixAccount.inc:77
-#: ../lib/modules/posixAccount.inc:78
 #: ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:278
-#: ../lib/modules/posixAccount.inc:410
+#: ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/posixAccount.inc:281
+#: ../lib/modules/posixAccount.inc:402
 #: ../lib/types/host.inc:91
 #: ../lib/types/host.inc:92
 msgid "Host name"
 msgstr "主机名"
 
-#: ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:87
 msgid "Host name already exists!"
 msgstr "主机名已经存在!"
 
 #: ../lib/modules/nisnetgroup.inc:136
-#: ../lib/modules/posixAccount.inc:78
-#: ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:85
 msgid "Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !"
 msgstr "主机名包含非法字符,合法字符包括 a-z, A-Z, 0-9 和 .-_"
 
-#: ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:83
 msgid "Host name in use. Selected next free host name."
 msgstr "主机名已被使用, 请选择其它的主机名."
 
-#: ../lib/modules/sambaSamAccount.inc:1055
+#: ../lib/modules/sambaSamAccount.inc:1049
 msgid "Host name must end with $!"
 msgstr "主机名必须使用$结尾!"
 
 #: ../lib/modules/account.inc:85
-#: ../lib/modules/posixAccount.inc:411
+#: ../lib/modules/posixAccount.inc:403
 msgid "Host name of the host which should be created. Valid characters are: a-z,A-Z,0-9, .-_$. Host names are always ending with $. If last character is not $ it will be added. If host name is already used host name will be expanded with a number. The next free number will be used."
 msgstr "将要建立的主机名.合法字符为:a-z,A-Z,0-9,_$..主机名总是以$结尾.如果最后一个字符不是$,会自动填加.如果主机名已经存在,会在主机名后自动增加下一个可用的数字."
 
-#: ../lib/modules/posixAccount.inc:59
 #: ../lib/modules/posixAccount.inc:60
-#: ../lib/modules/posixAccount.inc:62
-#: ../lib/modules/posixAccount.inc:167
+#: ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:170
 #: ../lib/types/host.inc:53
 msgid "Hosts"
 msgstr "主机"
 
-#: ../templates/lists/changePassword.php:188
+#: ../templates/lists/changePassword.php:183
 msgid "I am sure"
 msgstr "确认"
 
-#: ../lib/modules/posixGroup.inc:468
-#: ../lib/modules/posixGroup.inc:579
-#: ../lib/modules/posixAccount.inc:70
-#: ../lib/modules/posixAccount.inc:773
+#: ../lib/modules/posixGroup.inc:469
+#: ../lib/modules/posixGroup.inc:580
+#: ../lib/modules/posixAccount.inc:71
+#: ../lib/modules/posixAccount.inc:781
 msgid "ID is already in use"
 msgstr "ID已经被使用"
 
-#: ../lib/modules/posixGroup.inc:466
 #: ../lib/modules/posixGroup.inc:467
 #: ../lib/modules/posixGroup.inc:468
-#: ../lib/modules/posixGroup.inc:571
-#: ../lib/modules/posixGroup.inc:579
-#: ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/posixGroup.inc:469
+#: ../lib/modules/posixGroup.inc:572
+#: ../lib/modules/posixGroup.inc:580
 #: ../lib/modules/posixAccount.inc:69
 #: ../lib/modules/posixAccount.inc:70
-#: ../lib/modules/posixAccount.inc:769
-#: ../lib/modules/posixAccount.inc:773
+#: ../lib/modules/posixAccount.inc:71
+#: ../lib/modules/posixAccount.inc:777
+#: ../lib/modules/posixAccount.inc:781
 msgid "ID-Number"
 msgstr "ID号"
 
-#: ../lib/modules/fixed_ip.inc:85
-#: ../lib/modules/fixed_ip.inc:340
-#: ../lib/modules/fixed_ip.inc:527
+#: ../lib/modules/ipHost.inc:48
+#: ../lib/modules/ipHost.inc:58
+#: ../lib/modules/ipHost.inc:122
+#: ../lib/modules/fixed_ip.inc:87
+#: ../lib/modules/fixed_ip.inc:334
+#: ../lib/modules/fixed_ip.inc:518
 msgid "IP address"
 msgstr "IP地址"
 
-#: ../lib/modules/ddns.inc:94
-#: ../lib/modules/ddns.inc:114
-#: ../lib/modules/ddns.inc:359
-#: ../lib/modules/ddns.inc:406
+#: ../lib/modules/ddns.inc:96
+#: ../lib/modules/ddns.inc:116
+#: ../lib/modules/ddns.inc:364
+#: ../lib/modules/ddns.inc:411
 msgid "IP address of the DNS server"
 msgstr "DNS服务器IP地址"
 
-#: ../templates/masscreate.php:165
-#: ../templates/masscreate.php:177
-#: ../templates/masscreate.php:315
+#: ../lib/modules/ipHost.inc:62
+#: ../lib/modules/ipHost.inc:77
+#: ../lib/modules/ipHost.inc:310
+msgid "IP address(es)"
+msgstr "IP地址"
+
+#: ../templates/masscreate.php:243
+#: ../templates/masscreate.php:255
+#: ../templates/masscreate.php:396
 msgid "Identifier"
 msgstr "标识"
 
-#: ../lib/modules/sambaSamAccount.inc:1505
-#: ../lib/modules/sambaSamAccount.inc:1849
+#: ../lib/modules/sambaSamAccount.inc:1474
+#: ../lib/modules/sambaSamAccount.inc:1805
 msgid "Idle time limit"
 msgstr "空闲时间限制"
 
-#: ../lib/modules/sambaSamAccount.inc:247
+#: ../lib/modules/sambaSamAccount.inc:242
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "如果选中将使用UNIX密码作为SAMBA密码."
 
-#: ../lib/modules/posixAccount.inc:393
+#: ../lib/modules/posixAccount.inc:385
 msgid "If checked account will be deactivated by putting a \"!\" before the encrypted password."
 msgstr "在密码前加\"!\",此帐号会被停用."
 
-#: ../lib/modules/sambaSamAccount.inc:253
+#: ../lib/modules/sambaSamAccount.inc:248
 msgid "If checked no password will be used."
 msgstr "如果选中,不需要密码."
 
-#: ../lib/modules/sambaSamAccount.inc:259
+#: ../lib/modules/sambaSamAccount.inc:254
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "密码不过期.(设置X标志)"
 
-#: ../lib/modules/sambaSamAccount.inc:265
+#: ../lib/modules/sambaSamAccount.inc:260
 msgid "If checked then the account will be deactivated. (Setting D-Flag)"
 msgstr "密码停用(设置D标志)"
 
-#: ../lib/modules/sambaSamAccount.inc:268
+#: ../lib/modules/sambaSamAccount.inc:263
 msgid "If checked then the account will be locked (setting L-Flag). You usually want to use this setting to unlock user accounts which were locked because of failed login attempts."
 msgstr "帐号被锁定(设置L标志).多次登录失败后帐号会被锁定.在此可以解除锁定."
 
-#: ../lib/modules/posixGroup.inc:379
+#: ../lib/modules/posixGroup.inc:380
 msgid "If empty GID number will be generated automaticly depending on your configuration settings."
 msgstr "如果为空,视配置而定,GID号自动产生."
 
-#: ../lib/modules/posixAccount.inc:348
+#: ../lib/modules/posixAccount.inc:340
 msgid "If empty UID number will be generated automaticly."
 msgstr "如果为空,UID号会自动生成."
 
+#: ../lib/modules/ppolicy.inc:117
+msgid "If enabled the user will not be allowed to login after there have been a specified number of consecutive failed login attempts."
+msgstr "此项如果设置，用户在连续特定数量的登录失败后，将不允许再登录。"
+
+#: ../lib/modules/ppolicy.inc:121
+msgid "If enabled users must change their passwords when they first login after a password is set or reset by the administrator."
+msgstr "如果此项设置，用户在设置密码或管理员复位密码后第一次登录时，必须要更改密码。"
+
 #: ../lib/modules/sambaDomain.inc:103
 msgid "If set then users need to login to change their password."
 msgstr "如果设置,用户需要密码才能登录."
 
-#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/sambaSamAccount.inc:245
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr "如果设为\"true\",会用UNIX用户密码做为SAMBA密码."
 
-#: ../lib/modules/sambaSamAccount.inc:271
+#: ../lib/modules/sambaSamAccount.inc:266
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr "如果设为\"true\",帐号会被停用(设置D标志)."
 
-#: ../lib/modules/sambaSamAccount.inc:256
+#: ../lib/modules/sambaSamAccount.inc:251
 msgid "If set to \"true\" no password will be used."
 msgstr "如果设为\"true\",则不需要密码."
 
-#: ../lib/modules/sambaSamAccount.inc:262
+#: ../lib/modules/sambaSamAccount.inc:257
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr "如果设为\"true\",密码不会过期(设为X标志)."
 
-#: ../help/help.inc:189
+#: ../help/help.inc:191
 msgid "If you decide to send the password via mail then the mail template \"config/passwordMailTemplate.txt\" will be used."
 msgstr "如果您决定通过邮件发送密码，将会使用\"config/passwordMailTemplate.txt\"邮件模板。"
 
-#: ../lib/modules/sambaSamAccount.inc:310
+#: ../lib/modules/sambaSamAccount.inc:305
 msgid "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr "如果留空,LAM会用如下算法:uidNumber*2 + sambaAlgorithmicRidBase."
 
-#: ../lib/modules/sambaSamAccount.inc:274
+#: ../lib/modules/sambaSamAccount.inc:269
 msgid "If you set this option then the user has to change his password at the next login."
 msgstr "如果您选中此项，用户在下次登录时必须修改密码。"
 
@@ -2805,11 +2888,11 @@ msgstr "如果设为\"true\",则会增加 phpGroupWare 扩展."
 msgid "If you want to change the current preferences password, please enter it here."
 msgstr "在此设置当前管理密码."
 
-#: ../help/help.inc:130
+#: ../help/help.inc:132
 msgid "If you want to change your master configuration password, please enter it here."
 msgstr "在此变更管理配置密码."
 
-#: ../lib/modules/sambaGroupMapping.inc:359
+#: ../lib/modules/sambaGroupMapping.inc:360
 msgid "If you want to use a well known RID you can selcet a well known group."
 msgstr "如果想用知名的RID,需要选择知名的组。"
 
@@ -2825,56 +2908,56 @@ msgstr "包括系统属性"
 msgid "Information about the LDAP server."
 msgstr "有关LDAP服务器的信息"
 
-#: ../lib/modules/sambaSamAccount.inc:339
-#: ../lib/modules/sambaSamAccount.inc:1480
-#: ../lib/modules/sambaSamAccount.inc:1844
+#: ../lib/modules/sambaSamAccount.inc:334
+#: ../lib/modules/sambaSamAccount.inc:1449
+#: ../lib/modules/sambaSamAccount.inc:1800
 msgid "Inherit client startup configuration"
 msgstr "继承客户初始配置"
 
-#: ../templates/schema/schema.php:401
-#: ../templates/schema/schema.php:422
+#: ../templates/schema/schema.php:394
+#: ../templates/schema/schema.php:415
 msgid "Inherited from"
 msgstr "继承自"
 
-#: ../templates/schema/schema.php:162
-#: ../templates/schema/schema.php:358
+#: ../templates/schema/schema.php:155
+#: ../templates/schema/schema.php:351
 msgid "Inherits from"
 msgstr "继承自"
 
-#: ../lib/modules/sambaSamAccount.inc:342
-#: ../lib/modules/sambaSamAccount.inc:1485
-#: ../lib/modules/sambaSamAccount.inc:1845
+#: ../lib/modules/sambaSamAccount.inc:337
+#: ../lib/modules/sambaSamAccount.inc:1454
+#: ../lib/modules/sambaSamAccount.inc:1801
 msgid "Initial program"
 msgstr "初始化程序"
 
-#: ../lib/modules/quota.inc:52
+#: ../lib/modules/quota.inc:54
 msgid "Inode hard quota"
 msgstr "inode硬配额"
 
-#: ../lib/modules/quota.inc:52
-#: ../lib/modules/quota.inc:53
+#: ../lib/modules/quota.inc:54
+#: ../lib/modules/quota.inc:55
 msgid "Inode hard quota contains invalid characters. Only natural numbers are allowed."
 msgstr "inode硬配额包含非法字符,只允许使用自然数."
 
-#: ../lib/modules/quota.inc:56
+#: ../lib/modules/quota.inc:58
 msgid "Inode quota"
 msgstr "inode配额"
 
-#: ../lib/modules/quota.inc:50
+#: ../lib/modules/quota.inc:52
 msgid "Inode soft quota"
 msgstr "inode软配额"
 
-#: ../lib/modules/quota.inc:50
-#: ../lib/modules/quota.inc:51
+#: ../lib/modules/quota.inc:52
+#: ../lib/modules/quota.inc:53
 msgid "Inode soft quota contains invalid characters. Only natural numbers are allowed."
 msgstr "inode软配额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:56
-#: ../lib/modules/quota.inc:57
+#: ../lib/modules/quota.inc:58
+#: ../lib/modules/quota.inc:59
 msgid "Inode soft quota must be smaller than inode hard quota."
 msgstr "inode软配额必须小于硬配额."
 
-#: ../templates/selfService/adminMain.php:464
+#: ../templates/selfService/adminMain.php:472
 msgid "Input fields"
 msgstr "输入框"
 
@@ -2890,11 +2973,11 @@ msgstr "在登录脚本中插入用户名或组名."
 msgid "Inserted user or group name in profile path."
 msgstr "在配置路径中插入用户名或组名."
 
-#: ../lib/modules/fixed_ip.inc:382
+#: ../lib/modules/fixed_ip.inc:373
 msgid "Invalid MAC address."
 msgstr "非法的MAC地址"
 
-#: ../templates/massBuildAccounts.php:172
+#: ../templates/massBuildAccounts.php:169
 msgid "Invalid RDN attribute!"
 msgstr "错误的RDN属性!"
 
@@ -2906,8 +2989,8 @@ msgstr "无效的帐号"
 #: ../lib/modules/kolabUser.inc:135
 #: ../lib/modules/kolabUser.inc:182
 #: ../lib/modules/kolabUser.inc:343
-#: ../lib/modules/kolabUser.inc:780
-#: ../lib/modules/kolabUser.inc:903
+#: ../lib/modules/kolabUser.inc:781
+#: ../lib/modules/kolabUser.inc:905
 msgid "Invitation policy"
 msgstr "邀请原则"
 
@@ -2915,16 +2998,16 @@ msgstr "邀请原则"
 msgid "Invitation policy list"
 msgstr "邀请原则列表"
 
-#: ../lib/modules/sambaSamAccount.inc:563
+#: ../lib/modules/sambaSamAccount.inc:544
 msgid "Islamabad, Karachi"
 msgstr "伊斯兰堡,卡拉奇"
 
-#: ../lib/modules/range.inc:97
+#: ../lib/modules/range.inc:99
 msgid "It is not possible to delete all ranges."
 msgstr "不能删除所有范围"
 
-#: ../lib/modules/posixGroup.inc:466
-#: ../lib/modules/posixAccount.inc:69
+#: ../lib/modules/posixGroup.inc:467
+#: ../lib/modules/posixAccount.inc:70
 msgid "It is possible that this ID-number is reused. This can cause several problems because files with old permissions might still exist. To avoid this warning set maxUID to a higher value."
 msgstr "UID可能被重用,因为旧的权限有可能仍然存在,所以会带来一些问题.要避免本警告消息,请把最大UID设得高一点."
 
@@ -2932,27 +3015,27 @@ msgstr "UID可能被重用,因为旧的权限有可能仍然存在,所以会带
 #: ../lib/modules/inetOrgPerson.inc:177
 #: ../lib/modules/inetOrgPerson.inc:261
 #: ../lib/modules/inetOrgPerson.inc:326
-#: ../lib/modules/inetOrgPerson.inc:588
-#: ../lib/modules/inetOrgPerson.inc:1099
-#: ../lib/modules/inetOrgPerson.inc:1243
+#: ../lib/modules/inetOrgPerson.inc:567
+#: ../lib/modules/inetOrgPerson.inc:1078
+#: ../lib/modules/inetOrgPerson.inc:1222
 msgid "Job title"
 msgstr "头衔"
 
-#: ../lib/modules/inetOrgPerson.inc:589
+#: ../lib/modules/inetOrgPerson.inc:568
 msgid "Job title of user: President, department manager, ..."
 msgstr "用户头衔:如总裁,部门经理..."
 
-#: ../templates/schema/schema.php:260
+#: ../templates/schema/schema.php:253
 msgid "Jump to a matching rule"
 msgstr "选择一个匹配规则"
 
-#: ../templates/schema/schema.php:119
+#: ../templates/schema/schema.php:112
 msgid "Jump to an attribute type"
 msgstr "选择一个属性类型"
 
-#: ../templates/schema/schema.php:313
-#: ../templates/schema/schema.php:363
-#: ../templates/schema/schema.php:378
+#: ../templates/schema/schema.php:306
+#: ../templates/schema/schema.php:356
+#: ../templates/schema/schema.php:371
 msgid "Jump to an object class"
 msgstr "选择一个目标类"
 
@@ -2965,57 +3048,57 @@ msgstr "Kolab"
 msgid "LAM can recursively delete this entry and all of its children. See below for a list of all the entries that this action will delete. Do you want to do this?"
 msgstr "LAM会递归删除本条目及所有子条目,下面列表中所有条目都会被删除,确定吗?"
 
-#: ../templates/login.php:219
+#: ../templates/login.php:177
 #: ../templates/config/index.php:63
 msgid "LAM configuration"
 msgstr "LAM 配置"
 
-#: ../templates/massBuildAccounts.php:196
+#: ../templates/massBuildAccounts.php:194
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "您的输入检查完毕,即将建立帐号"
 
-#: ../lib/modules/inetOrgPerson.inc:693
-#: ../lib/modules/posixGroup.inc:403
-#: ../lib/modules/posixAccount.inc:344
+#: ../lib/modules/inetOrgPerson.inc:672
+#: ../lib/modules/posixGroup.inc:404
+#: ../lib/modules/posixAccount.inc:336
 msgid "LAM supports CRYPT, SHA, SSHA, MD5 and SMD5 to generate the hash value of passwords. SSHA and CRYPT are the most common but CRYPT does not support passwords greater than 8 letters. We do not recommend to use plain text passwords."
 msgstr "系统支持CRYPT, SHA, SSHA, MD5 和 SMD5等HASH算法,用来产生密码的HASH值.SSHA 和 CRYPT是最常用的,但CRYPT 不支持8个字符以上的密码.不建议使用明文密码."
 
-#: ../templates/tests/index.php:54
+#: ../templates/tests/index.php:46
 msgid "LAM tests"
 msgstr "LAM 测试"
 
 #: ../templates/tree/create.php:184
-#: ../templates/massDoUpload.php:90
+#: ../templates/massDoUpload.php:86
 #, php-format
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAM无法建立%s帐号,LDAP发生错误."
 
-#: ../lib/modules/sambaGroupMapping.inc:438
+#: ../lib/modules/sambaGroupMapping.inc:439
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "系统找不到这个Samba域!"
 
-#: ../lib/modules/sambaSamAccount.inc:105
+#: ../lib/modules/sambaSamAccount.inc:103
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAM找不到这个域!"
 
-#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/posixAccount.inc:88
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAM找不到这个组"
 
-#: ../lib/modules/posixAccount.inc:1575
+#: ../lib/modules/posixAccount.inc:1579
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAM无法修改 %s组成员"
 
-#: ../help/help.inc:168
+#: ../help/help.inc:170
 msgid "LAM will search for accounts in this part of the LDAP tree."
 msgstr "LAM将在这部分LDAP树搜索帐号."
 
-#: ../help/help.inc:170
+#: ../help/help.inc:172
 msgid "LAM will use this LDAP DN and password to search for accounts. It is sufficient to specify an account with read rights. If nothing is inserted then LAM will try to connect anonymously."
 msgstr "LAM将会这个使用 LDAP DN 和密码搜索帐号.这个帐号需要有读权限.如果留空,LAM将匿名登录LDAP."
 
-#: ../templates/profedit/profilepage.php:181
+#: ../templates/profedit/profilepage.php:177
 msgid "LDAP"
 msgstr "LDAP"
 
@@ -3028,56 +3111,60 @@ msgstr "LDAP"
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP帐号管理配置"
 
-#: ../templates/config/conftypes.php:306
+#: ../templates/config/conftypes.php:312
 msgid "LDAP Suffix is invalid!"
 msgstr "LDAP后缀无效!"
 
-#: ../templates/login.php:526
+#: ../templates/login.php:474
 msgid "LDAP error, server says:"
 msgstr "LDAP错误,服务器错误消息:"
 
-#: ../templates/config/confmain.php:479
+#: ../templates/config/confmain.php:506
 msgid "LDAP filter"
 msgstr "LDAP过滤条件"
 
-#: ../lib/modules.inc:1400
+#: ../lib/modules.inc:1433
 msgid "LDAP operation successful."
 msgstr "LDAP操作成功."
 
-#: ../templates/selfService/adminMain.php:362
+#: ../templates/selfService/adminMain.php:370
 msgid "LDAP password"
 msgstr "LDAP 密码"
 
-#: ../templates/config/confmain.php:447
-#: ../templates/config/confmain.php:450
+#: ../templates/config/confmain.php:474
+#: ../templates/config/confmain.php:477
 #: ../help/help.inc:117
 msgid "LDAP search"
 msgstr "LDAP搜索"
 
-#: ../templates/selfService/adminMain.php:373
-#: ../help/help.inc:171
+#: ../templates/selfService/adminMain.php:381
+#: ../help/help.inc:173
 msgid "LDAP search attribute"
 msgstr "LDAP搜索属性"
 
-#: ../lib/lists.inc:848
+#: ../lib/account.inc:634
 msgid "LDAP search failed! Please check your preferences."
 msgstr "LDAP搜索失败，请检查配置。"
 
-#: ../templates/login.php:356
+#: ../templates/config/confmain.php:295
+#: ../help/help.inc:119
+msgid "LDAP search limit"
+msgstr "LDAP搜索限制"
+
+#: ../templates/login.php:314
 msgid "LDAP server"
 msgstr "LDAP服务器"
 
-#: ../lib/lists.inc:831
-#: ../lib/types/group.inc:247
+#: ../lib/account.inc:625
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "超过LDAP限制的大小,无法显示所有条目."
 
-#: ../templates/selfService/adminMain.php:338
-#: ../templates/profedit/profilepage.php:185
-#: ../templates/config/conftypes.php:236
-#: ../templates/config/confmain.php:470
+#: ../templates/selfService/adminMain.php:346
+#: ../templates/profedit/profilepage.php:181
+#: ../templates/config/conftypes.php:242
+#: ../templates/config/confmain.php:497
 #: ../help/help.inc:70
-#: ../help/help.inc:167
+#: ../help/help.inc:169
 msgid "LDAP suffix"
 msgstr "LDAP后缀"
 
@@ -3085,19 +3172,19 @@ msgstr "LDAP后缀"
 msgid "LDAP upload has finished"
 msgstr "LDAP上传完毕"
 
-#: ../templates/massDoUpload.php:74
+#: ../templates/massDoUpload.php:70
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAP上传中,请稍等..."
 
-#: ../templates/selfService/adminMain.php:350
+#: ../templates/selfService/adminMain.php:358
 msgid "LDAP user"
 msgstr "LDAP用户"
 
-#: ../help/help.inc:169
+#: ../help/help.inc:171
 msgid "LDAP user and password"
 msgstr "LDAP用户名和密码"
 
-#: ../templates/serverInfo.php:100
+#: ../templates/serverInfo.php:96
 msgid "LDAP version"
 msgstr "LDAP版本"
 
@@ -3110,61 +3197,69 @@ msgstr "输出到LDIF文件名:%s"
 msgid "Label"
 msgstr "标签"
 
-#: ../templates/tests/lamdaemonTest.php:214
+#: ../templates/tests/lamdaemonTest.php:207
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemon 服务器和路径"
 
-#: ../templates/tests/lamdaemonTest.php:178
+#: ../templates/config/confmain.php:394
+msgid "Lamdaemon settings"
+msgstr "Lamdaemon设置"
+
+#: ../templates/tests/lamdaemonTest.php:170
 msgid "Lamdaemon successfully run."
 msgstr "Lamdaemon成功执行."
 
-#: ../templates/tests/index.php:58
-#: ../templates/tests/lamdaemonTest.php:55
-#: ../templates/tests/lamdaemonTest.php:76
+#: ../templates/tests/index.php:50
+#: ../templates/tests/lamdaemonTest.php:47
+#: ../templates/tests/lamdaemonTest.php:68
 msgid "Lamdaemon test"
 msgstr "Lamdaemon测试"
 
-#: ../templates/tests/lamdaemonTest.php:319
+#: ../templates/tests/lamdaemonTest.php:309
 msgid "Lamdaemon test finished."
 msgstr "Lamdaemon 测试结束."
 
-#: ../templates/tests/lamdaemonTest.php:311
+#: ../templates/tests/lamdaemonTest.php:301
 msgid "Lamdaemon: Quota module installed"
 msgstr "Lamdaemon: 配额模块已安装."
 
-#: ../templates/tests/lamdaemonTest.php:314
+#: ../templates/tests/lamdaemonTest.php:297
+msgid "Lamdaemon: check NSS LDAP"
+msgstr "Lamdaemon: 检查 NSS LDAP"
+
+#: ../templates/tests/lamdaemonTest.php:304
 msgid "Lamdaemon: read quotas"
 msgstr "Lamdaemon: 读取配额"
 
-#: ../templates/login.php:305
+#: ../templates/login.php:263
 msgid "Language"
 msgstr "语言"
 
-#: ../templates/config/confmain.php:558
+#: ../templates/config/confmain.php:586
 msgid "Language is not defined!"
 msgstr "尚未定义语言"
 
-#: ../templates/config/confmain.php:322
+#: ../templates/config/confmain.php:349
 msgid "Language settings"
 msgstr "语言设定"
 
-#: ../lib/modules/phpGroupwareUser.inc:160
-#: ../lib/modules/phpGroupwareUser.inc:379
+#: ../lib/modules/phpGroupwareUser.inc:171
+#: ../lib/modules/phpGroupwareUser.inc:350
 msgid "Last login"
 msgstr "上次登录"
 
-#: ../lib/modules/phpGroupwareUser.inc:168
-#: ../lib/modules/phpGroupwareUser.inc:374
+#: ../lib/modules/phpGroupwareUser.inc:179
+#: ../lib/modules/phpGroupwareUser.inc:345
 msgid "Last login from"
 msgstr "上一次登录地"
 
 #: ../lib/modules/inetOrgPerson.inc:75
 #: ../lib/modules/inetOrgPerson.inc:148
 #: ../lib/modules/inetOrgPerson.inc:309
-#: ../lib/modules/inetOrgPerson.inc:596
-#: ../lib/modules/inetOrgPerson.inc:948
-#: ../lib/modules/inetOrgPerson.inc:1245
-#: ../lib/modules/inetOrgPerson.inc:1576
+#: ../lib/modules/inetOrgPerson.inc:575
+#: ../lib/modules/inetOrgPerson.inc:927
+#: ../lib/modules/inetOrgPerson.inc:1224
+#: ../lib/modules/inetOrgPerson.inc:1593
 #: ../lib/types/user.inc:97
 msgid "Last name"
 msgstr "姓"
@@ -3174,19 +3269,19 @@ msgstr "姓"
 msgid "Last name contains invalid characters or is empty!"
 msgstr "姓包含非法字符或为空!"
 
-#: ../lib/modules/inetOrgPerson.inc:597
+#: ../lib/modules/inetOrgPerson.inc:576
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "用户姓.只允许字符,-和空格."
 
-#: ../lib/modules/shadowAccount.inc:389
+#: ../lib/modules/shadowAccount.inc:416
 msgid "Last password change"
 msgstr "最后密码变更"
 
-#: ../lib/modules/dhcp_settings.inc:124
-#: ../lib/modules/dhcp_settings.inc:191
-#: ../lib/modules/dhcp_settings.inc:243
-#: ../lib/modules/dhcp_settings.inc:536
-#: ../lib/modules/dhcp_settings.inc:648
+#: ../lib/modules/dhcp_settings.inc:125
+#: ../lib/modules/dhcp_settings.inc:192
+#: ../lib/modules/dhcp_settings.inc:244
+#: ../lib/modules/dhcp_settings.inc:557
+#: ../lib/modules/dhcp_settings.inc:669
 msgid "Lease time"
 msgstr "释放时间"
 
@@ -3194,24 +3289,24 @@ msgstr "释放时间"
 msgid "Line ends"
 msgstr "行结尾"
 
-#: ../templates/selfService/adminMain.php:313
+#: ../templates/selfService/adminMain.php:321
 msgid "Link to login page for this self service profile"
 msgstr "自助服务登录界面."
 
-#: ../templates/config/conftypes.php:250
+#: ../templates/config/conftypes.php:256
 #: ../help/help.inc:82
 msgid "List attributes"
 msgstr "属性列表"
 
-#: ../templates/config/conftypes.php:313
+#: ../templates/config/conftypes.php:319
 msgid "List attributes are invalid!"
 msgstr "属性列表非法!"
 
-#: ../lib/modules/sambaSamAccount.inc:294
+#: ../lib/modules/sambaSamAccount.inc:289
 msgid "List of Samba workstations the user is allowed to login. Empty means every workstation."
 msgstr "允许用户登录的Samba工作站,留空表示所有工作站."
 
-#: ../templates/config/confmain.php:552
+#: ../templates/config/confmain.php:580
 msgid "List of admin users is empty or invalid!"
 msgstr "管理员清单为空或非法."
 
@@ -3219,12 +3314,12 @@ msgstr "管理员清单为空或非法."
 msgid "List of entries to be deleted:"
 msgstr "将被删除的条目列表:"
 
-#: ../templates/config/confmain.php:461
+#: ../templates/config/confmain.php:488
 msgid "List of valid users"
 msgstr "合法用户列表"
 
-#: ../lib/modules.inc:1343
-#: ../help/help.inc:158
+#: ../lib/modules.inc:1382
+#: ../help/help.inc:160
 msgid "Load profile"
 msgstr "调入配置文件"
 
@@ -3235,7 +3330,7 @@ msgstr "本机邮件"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:69
 #: ../lib/modules/inetLocalMailRecipient.inc:102
-#: ../lib/modules/inetLocalMailRecipient.inc:316
+#: ../lib/modules/inetLocalMailRecipient.inc:317
 msgid "Local address list"
 msgstr "本机邮递列表"
 
@@ -3247,23 +3342,32 @@ msgstr "本地组"
 #: ../lib/modules/inetOrgPerson.inc:159
 #: ../lib/modules/inetOrgPerson.inc:228
 #: ../lib/modules/inetOrgPerson.inc:446
-#: ../lib/modules/inetOrgPerson.inc:668
-#: ../lib/modules/inetOrgPerson.inc:1003
-#: ../lib/modules/inetOrgPerson.inc:1262
-#: ../lib/modules/inetOrgPerson.inc:1664
+#: ../lib/modules/inetOrgPerson.inc:647
+#: ../lib/modules/inetOrgPerson.inc:982
+#: ../lib/modules/inetOrgPerson.inc:1241
+#: ../lib/modules/inetOrgPerson.inc:1681
+#: ../lib/modules/ipHost.inc:66
+#: ../lib/modules/ipHost.inc:84
+#: ../lib/modules/ipHost.inc:146
+#: ../lib/modules/ipHost.inc:313
 msgid "Location"
 msgstr "地点"
 
-#: ../lib/modules/posixGroup.inc:187
-#: ../lib/modules/posixAccount.inc:259
-#: ../lib/modules/posixAccount.inc:989
+#: ../lib/modules/posixGroup.inc:188
+#: ../lib/modules/posixAccount.inc:262
+#: ../lib/modules/posixAccount.inc:999
 msgid "Lock password"
 msgstr "锁定密码"
 
+#: ../lib/modules/ppolicy.inc:96
+#: ../lib/modules/ppolicy.inc:150
+#: ../lib/modules/ppolicy.inc:252
+#: ../lib/modules/ppolicy.inc:482
 #: ../lib/modules/sambaDomain.inc:126
 #: ../lib/modules/sambaDomain.inc:203
 #: ../lib/modules/sambaDomain.inc:337
-#: ../lib/modules/sambaDomain.inc:681
+#: ../lib/modules/sambaDomain.inc:682
+#: ../lib/types/ppolicyType.inc:83
 msgid "Lockout duration"
 msgstr "帐号锁定期"
 
@@ -3271,10 +3375,17 @@ msgstr "帐号锁定期"
 msgid "Lockout duration must be are natural number."
 msgstr "帐号锁定期必须是自然数."
 
+#: ../lib/modules/ppolicy.inc:116
+#: ../lib/modules/ppolicy.inc:243
+#: ../lib/modules/ppolicy.inc:491
+#: ../lib/types/ppolicyType.inc:88
+msgid "Lockout users"
+msgstr "锁定的用户"
+
 #: ../lib/modules/sambaDomain.inc:114
 #: ../lib/modules/sambaDomain.inc:205
 #: ../lib/modules/sambaDomain.inc:310
-#: ../lib/modules/sambaDomain.inc:672
+#: ../lib/modules/sambaDomain.inc:673
 msgid "Lockout users after bad logon attempts"
 msgstr "在多次错误登录后锁定用户."
 
@@ -3282,82 +3393,82 @@ msgstr "在多次错误登录后锁定用户."
 msgid "Lockout users after bad logon attempts must be between 0 and 999."
 msgstr "用户锁定前错误的登录次数必须在0－999之间。"
 
-#: ../templates/config/mainmanage.php:279
-#: ../help/help.inc:139
+#: ../templates/config/mainmanage.php:284
+#: ../help/help.inc:141
 msgid "Log destination"
 msgstr "日志存储位置"
 
-#: ../templates/config/mainmanage.php:253
-#: ../help/help.inc:137
+#: ../templates/config/mainmanage.php:259
+#: ../help/help.inc:139
 msgid "Log level"
 msgstr "日志等级"
 
-#: ../templates/config/mainmanage.php:247
+#: ../templates/config/mainmanage.php:253
 msgid "Logging"
 msgstr "日志"
 
-#: ../templates/selfService/adminMain.php:314
-#: ../templates/selfService/adminLogin.php:63
-#: ../templates/selfService/selfServiceLogin.php:137
-#: ../templates/login.php:331
-#: ../templates/config/conflogin.php:61
-#: ../templates/config/mainlogin.php:69
+#: ../templates/selfService/adminMain.php:322
+#: ../templates/selfService/adminLogin.php:64
+#: ../templates/selfService/selfServiceLogin.php:136
+#: ../templates/login.php:289
+#: ../templates/config/conflogin.php:62
+#: ../templates/config/mainlogin.php:70
 #: ../help/help.inc:55
 msgid "Login"
 msgstr "登录"
 
-#: ../templates/selfService/adminMain.php:399
-#: ../help/help.inc:173
+#: ../templates/selfService/adminMain.php:407
+#: ../help/help.inc:175
 msgid "Login attribute label"
 msgstr "登录属性标签"
 
-#: ../templates/selfService/adminMain.php:412
-#: ../help/help.inc:175
+#: ../templates/selfService/adminMain.php:420
+#: ../help/help.inc:177
 msgid "Login caption"
 msgstr "登录标题"
 
-#: ../templates/config/confmain.php:438
+#: ../templates/config/confmain.php:465
 #: ../help/help.inc:115
 msgid "Login method"
 msgstr "登录方法"
 
-#: ../lib/modules/posixAccount.inc:245
-#: ../lib/modules/posixAccount.inc:396
-#: ../lib/modules/posixAccount.inc:983
-#: ../lib/modules/posixAccount.inc:1097
-#: ../lib/modules/posixAccount.inc:1174
+#: ../lib/modules/posixAccount.inc:248
+#: ../lib/modules/posixAccount.inc:388
+#: ../lib/modules/posixAccount.inc:993
+#: ../lib/modules/posixAccount.inc:1107
+#: ../lib/modules/posixAccount.inc:1184
 #: ../lib/types/user.inc:99
 msgid "Login shell"
 msgstr "登录shell"
 
-#: ../templates/pdfedit/pdfpage.php:400
+#: ../templates/pdfedit/pdfpage.php:389
 msgid "Logo"
 msgstr "标志"
 
 #: ../lib/modules/sambaDomain.inc:102
 #: ../lib/modules/sambaDomain.inc:277
-#: ../lib/modules/sambaDomain.inc:659
+#: ../lib/modules/sambaDomain.inc:660
 msgid "Logon for password change"
 msgstr "密码修改登录"
 
-#: ../lib/modules/sambaSamAccount.inc:106
-#: ../lib/modules/sambaSamAccount.inc:318
-#: ../lib/modules/sambaSamAccount.inc:321
-#: ../lib/modules/sambaSamAccount.inc:516
-#: ../lib/modules/sambaSamAccount.inc:607
-#: ../lib/modules/sambaSamAccount.inc:1265
-#: ../lib/modules/sambaSamAccount.inc:1681
+#: ../lib/modules/sambaSamAccount.inc:104
+#: ../lib/modules/sambaSamAccount.inc:313
+#: ../lib/modules/sambaSamAccount.inc:316
+#: ../lib/modules/sambaSamAccount.inc:497
+#: ../lib/modules/sambaSamAccount.inc:588
+#: ../lib/modules/sambaSamAccount.inc:1237
+#: ../lib/modules/sambaSamAccount.inc:1640
 msgid "Logon hours"
 msgstr "可登录时间"
 
 #: ../lib/modules/sambaSamAccount.inc:87
 #: ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:290
-#: ../lib/modules/sambaSamAccount.inc:500
-#: ../lib/modules/sambaSamAccount.inc:601
-#: ../lib/modules/sambaSamAccount.inc:1209
-#: ../lib/modules/sambaSamAccount.inc:1643
-#: ../lib/modules/sambaSamAccount.inc:1814
+#: ../lib/modules/sambaSamAccount.inc:285
+#: ../lib/modules/sambaSamAccount.inc:481
+#: ../lib/modules/sambaSamAccount.inc:582
+#: ../lib/modules/sambaSamAccount.inc:1181
+#: ../lib/modules/sambaSamAccount.inc:1602
+#: ../lib/modules/sambaSamAccount.inc:1770
 msgid "Logon script"
 msgstr "登录脚本"
 
@@ -3368,8 +3479,8 @@ msgstr "登录脚本非法!"
 
 #: ../templates/logout.php:67
 #: ../templates/selfService/selfServiceMain.php:45
-#: ../templates/selfService/selfServiceMain.php:121
-#: ../templates/main_header.php:69
+#: ../templates/selfService/selfServiceMain.php:127
+#: ../templates/main_header.php:70
 msgid "Logout"
 msgstr "退出"
 
@@ -3381,9 +3492,9 @@ msgstr "M-节点 (0x04)"
 #: ../lib/modules/ieee802device.inc:61
 #: ../lib/modules/ieee802device.inc:72
 #: ../lib/modules/ieee802device.inc:102
-#: ../lib/modules/fixed_ip.inc:82
-#: ../lib/modules/fixed_ip.inc:336
-#: ../lib/modules/fixed_ip.inc:527
+#: ../lib/modules/fixed_ip.inc:84
+#: ../lib/modules/fixed_ip.inc:330
+#: ../lib/modules/fixed_ip.inc:518
 msgid "MAC address"
 msgstr "MAC地址"
 
@@ -3391,11 +3502,11 @@ msgstr "MAC地址"
 msgid "MAC address list"
 msgstr "MAC地址列表"
 
-#: ../lib/modules/ieee802device.inc:197
+#: ../lib/modules/ieee802device.inc:198
 msgid "MAC address(es)"
 msgstr "MAC地址"
 
-#: ../lib/modules/sambaSamAccount.inc:569
+#: ../lib/modules/sambaSamAccount.inc:550
 msgid "Magadan, Solomon Islands"
 msgstr "马加丹,所罗门群岛"
 
@@ -3408,7 +3519,7 @@ msgstr "邮件别名"
 #: ../lib/modules/kolabUser.inc:171
 #: ../lib/modules/kolabUser.inc:219
 #: ../lib/modules/kolabUser.inc:300
-#: ../lib/modules/kolabUser.inc:764
+#: ../lib/modules/kolabUser.inc:765
 msgid "Mail quota"
 msgstr "邮件限额"
 
@@ -3426,11 +3537,11 @@ msgstr "邮件路由"
 #: ../lib/modules/inetLocalMailRecipient.inc:79
 #: ../lib/modules/inetLocalMailRecipient.inc:108
 #: ../lib/modules/inetLocalMailRecipient.inc:150
-#: ../lib/modules/inetLocalMailRecipient.inc:319
+#: ../lib/modules/inetLocalMailRecipient.inc:320
 msgid "Mail server"
 msgstr "邮件服务器"
 
-#: ../templates/lists/changePassword.php:327
+#: ../templates/lists/changePassword.php:314
 #, php-format
 msgid "Mail successfully sent to %s."
 msgstr "邮件已经成功发送到%s."
@@ -3439,7 +3550,7 @@ msgstr "邮件已经成功发送到%s."
 #: ../lib/modules/kolabUser.inc:194
 #: ../lib/modules/kolabUser.inc:288
 #: ../lib/modules/kolabUser.inc:294
-#: ../lib/modules/kolabUser.inc:760
+#: ../lib/modules/kolabUser.inc:761
 msgid "Mailbox home server"
 msgstr "邮件宿主服务器"
 
@@ -3460,40 +3571,44 @@ msgstr "邮件别名(例如:NIS邮件别名)"
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "邮件转发."
 
-#: ../templates/pdfedit/pdfpage.php:645
+#: ../templates/pdfedit/pdfpage.php:634
 msgid "Main"
 msgstr "主要设置"
 
-#: ../templates/selfService/adminMain.php:425
-#: ../help/help.inc:177
+#: ../templates/selfService/adminMain.php:433
+#: ../help/help.inc:179
 msgid "Main page caption"
 msgstr "主页标题"
 
-#: ../templates/pdfedit/pdfmain.php:142
+#: ../templates/pdfedit/pdfmain.php:137
 msgid "Manage existing PDF structures"
 msgstr "管理已有的PDF架构"
 
-#: ../templates/profedit/profilemain.php:136
+#: ../templates/profedit/profilemain.php:126
 msgid "Manage existing profiles"
 msgstr "管理已有的设置"
 
-#: ../templates/selfService/adminLogin.php:137
+#: ../templates/selfService/adminLogin.php:144
 msgid "Manage self service profiles"
 msgstr "管理自助服务设置"
 
-#: ../templates/config/conflogin.php:141
+#: ../templates/config/conflogin.php:148
 msgid "Manage server profiles"
 msgstr "管理服务器设置"
 
-#: ../templates/serverInfo.php:97
+#: ../templates/serverInfo.php:93
 msgid "Managed suffixes"
 msgstr "管理后缀"
 
 #: ../lib/modules/inetOrgPerson.inc:278
 #: ../lib/modules/inetOrgPerson.inc:342
-#: ../lib/modules/inetOrgPerson.inc:604
-#: ../lib/modules/inetOrgPerson.inc:1166
-#: ../lib/modules/inetOrgPerson.inc:1247
+#: ../lib/modules/inetOrgPerson.inc:583
+#: ../lib/modules/inetOrgPerson.inc:1145
+#: ../lib/modules/inetOrgPerson.inc:1226
+#: ../lib/modules/ipHost.inc:70
+#: ../lib/modules/ipHost.inc:90
+#: ../lib/modules/ipHost.inc:165
+#: ../lib/modules/ipHost.inc:316
 msgid "Manager"
 msgstr "管理员"
 
@@ -3513,7 +3628,7 @@ msgstr "如果冲突使用手动"
 #: ../lib/modules/nisObject.inc:89
 #: ../lib/modules/nisObject.inc:115
 #: ../lib/modules/nisObject.inc:141
-#: ../lib/modules/nisObject.inc:219
+#: ../lib/modules/nisObject.inc:220
 #: ../lib/types/nisObjectType.inc:78
 msgid "Mapping entry"
 msgstr "映射条目"
@@ -3526,7 +3641,7 @@ msgstr "映射条目包含非法字符,只能使用 ASCII 字符."
 #: ../lib/modules/nisObject.inc:62
 #: ../lib/modules/nisObject.inc:82
 #: ../lib/modules/nisObject.inc:135
-#: ../lib/modules/nisObject.inc:220
+#: ../lib/modules/nisObject.inc:221
 #: ../lib/types/nisObjectType.inc:79
 msgid "Mapping name"
 msgstr "映射的名字"
@@ -3540,97 +3655,111 @@ msgstr "将此帐号标记为删除"
 msgid "Mark for deletion"
 msgstr "标记为删除"
 
-#: ../templates/selfService/profManage.php:243
-#: ../templates/config/profmanage.php:343
-#: ../help/help.inc:131
+#: ../templates/selfService/profManage.php:251
+#: ../templates/config/profmanage.php:349
+#: ../help/help.inc:133
 msgid "Master password"
 msgstr "管理员密码"
 
-#: ../templates/selfService/profManage.php:60
-#: ../templates/config/profmanage.php:72
+#: ../templates/selfService/profManage.php:68
+#: ../templates/config/profmanage.php:78
 msgid "Master password is wrong!"
 msgstr "系统管理员密码错误!"
 
-#: ../templates/config/mainmanage.php:92
+#: ../templates/config/mainmanage.php:98
 msgid "Master passwords are different or empty!"
 msgstr "管理员密码不同或为空!"
 
-#: ../templates/schema/schema.php:273
+#: ../templates/schema/schema.php:266
 msgid "Matching rule OID"
 msgstr "匹配规则OID"
 
-#: ../templates/schema/schema.php:82
-#: ../templates/schema/schema.php:83
+#: ../templates/schema/schema.php:75
+#: ../templates/schema/schema.php:76
 msgid "Matching rules"
 msgstr "匹配规则"
 
-#: ../lib/modules/posixGroup.inc:299
-#: ../lib/modules/posixGroup.inc:470
+#: ../lib/modules/posixGroup.inc:300
 #: ../lib/modules/posixGroup.inc:471
+#: ../lib/modules/posixGroup.inc:472
 msgid "Maximum GID number"
 msgstr "最大GID号"
 
-#: ../lib/modules/posixGroup.inc:470
+#: ../lib/modules/posixGroup.inc:471
 msgid "Maximum GID number is invalid or empty!"
 msgstr "最大的GID非法或为空!"
 
-#: ../lib/modules/posixGroup.inc:471
+#: ../lib/modules/posixGroup.inc:472
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "最大GID必须大于最小GID!"
 
-#: ../lib/modules/posixAccount.inc:58
-#: ../lib/modules/posixAccount.inc:60
+#: ../lib/modules/posixAccount.inc:59
 #: ../lib/modules/posixAccount.inc:61
 #: ../lib/modules/posixAccount.inc:62
-#: ../lib/modules/posixAccount.inc:161
-#: ../lib/modules/posixAccount.inc:170
+#: ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:164
+#: ../lib/modules/posixAccount.inc:173
 msgid "Maximum UID number"
 msgstr "最大UID号"
 
-#: ../lib/modules/posixAccount.inc:58
-#: ../lib/modules/posixAccount.inc:60
+#: ../lib/modules/posixAccount.inc:59
+#: ../lib/modules/posixAccount.inc:61
 msgid "Maximum UID number is invalid!"
 msgstr "最大UID号非法"
 
-#: ../lib/modules/posixAccount.inc:61
 #: ../lib/modules/posixAccount.inc:62
+#: ../lib/modules/posixAccount.inc:63
 msgid "Maximum UID number must be greater than minimum UID number!"
 msgstr "最大UID号必须大于最小UID号!"
 
+#: ../lib/modules/ppolicy.inc:100
+#: ../lib/modules/ppolicy.inc:151
+#: ../lib/modules/ppolicy.inc:261
+#: ../lib/modules/ppolicy.inc:483
+#: ../lib/types/ppolicyType.inc:84
+msgid "Maximum failure count"
+msgstr "最大失败次数"
+
 #: ../templates/tree/add_attr_form.php:167
 #, php-format
 msgid "Maximum file size: %s"
 msgstr "最大文件大小: %s"
 
-#: ../lib/modules/dhcp_settings.inc:127
-#: ../lib/modules/dhcp_settings.inc:196
-#: ../lib/modules/dhcp_settings.inc:249
-#: ../lib/modules/dhcp_settings.inc:542
-#: ../lib/modules/dhcp_settings.inc:649
+#: ../lib/modules/dhcp_settings.inc:128
+#: ../lib/modules/dhcp_settings.inc:197
+#: ../lib/modules/dhcp_settings.inc:250
+#: ../lib/modules/dhcp_settings.inc:563
+#: ../lib/modules/dhcp_settings.inc:670
 msgid "Maximum lease time"
 msgstr "最大释放时间"
 
-#: ../templates/schema/schema.php:219
+#: ../templates/schema/schema.php:212
 #: ../templates/tree/add_value_form.php:194
 msgid "Maximum length"
 msgstr "最大长度"
 
-#: ../lib/lists.inc:869
+#: ../lib/lists.inc:781
 #: ../help/help.inc:92
 msgid "Maximum list entries"
 msgstr "最大列表条目"
 
+#: ../lib/modules/ppolicy.inc:80
+#: ../lib/modules/ppolicy.inc:146
+#: ../lib/modules/ppolicy.inc:147
+#: ../lib/modules/ppolicy.inc:188
+#: ../lib/modules/ppolicy.inc:469
 #: ../lib/modules/shadowAccount.inc:59
 #: ../lib/modules/shadowAccount.inc:65
-#: ../lib/modules/shadowAccount.inc:115
-#: ../lib/modules/shadowAccount.inc:181
-#: ../lib/modules/shadowAccount.inc:211
-#: ../lib/modules/shadowAccount.inc:301
+#: ../lib/modules/shadowAccount.inc:119
+#: ../lib/modules/shadowAccount.inc:185
+#: ../lib/modules/shadowAccount.inc:219
+#: ../lib/modules/shadowAccount.inc:321
 #: ../lib/modules/sambaDomain.inc:122
 #: ../lib/modules/sambaDomain.inc:200
 #: ../lib/modules/sambaDomain.inc:202
 #: ../lib/modules/sambaDomain.inc:328
-#: ../lib/modules/sambaDomain.inc:678
+#: ../lib/modules/sambaDomain.inc:679
+#: ../lib/types/ppolicyType.inc:79
 msgid "Maximum password age"
 msgstr "密码最长生命"
 
@@ -3638,21 +3767,21 @@ msgstr "密码最长生命"
 #: ../lib/modules/nisnetgroup.inc:84
 #: ../lib/modules/nisnetgroup.inc:117
 #: ../lib/modules/nisnetgroup.inc:250
-#: ../lib/modules/nisnetgroup.inc:570
+#: ../lib/modules/nisnetgroup.inc:571
 #: ../lib/modules/groupOfNames.inc:72
 #: ../lib/modules/groupOfNames.inc:76
 #: ../lib/modules/groupOfNames.inc:103
 #: ../lib/modules/groupOfNames.inc:173
-#: ../lib/modules/groupOfNames.inc:451
+#: ../lib/modules/groupOfNames.inc:448
 #: ../lib/types/netgroup.inc:94
 msgid "Members"
 msgstr "组成员"
 
-#: ../lib/modules/sambaSamAccount.inc:556
+#: ../lib/modules/sambaSamAccount.inc:537
 msgid "Mid-Atlantic"
 msgstr "大西洋地区中部"
 
-#: ../lib/modules/sambaSamAccount.inc:547
+#: ../lib/modules/sambaSamAccount.inc:528
 msgid "Midway Island, Samoa"
 msgstr "中途岛,萨摩亚"
 
@@ -3662,64 +3791,74 @@ msgstr "米勒"
 
 #: ../lib/modules/sambaDomain.inc:94
 #: ../lib/modules/sambaDomain.inc:255
-#: ../lib/modules/sambaDomain.inc:651
+#: ../lib/modules/sambaDomain.inc:652
 msgid "Minimal password length"
 msgstr "最短密码长度"
 
-#: ../lib/modules/posixGroup.inc:296
-#: ../lib/modules/posixGroup.inc:469
+#: ../lib/modules/posixGroup.inc:297
+#: ../lib/modules/posixGroup.inc:470
 msgid "Minimum GID number"
 msgstr "最小GID号"
 
-#: ../lib/modules/posixGroup.inc:469
+#: ../lib/modules/posixGroup.inc:470
 msgid "Minimum GID number is invalid or empty!"
 msgstr "最小GID错误或为空"
 
-#: ../lib/modules/posixAccount.inc:57
-#: ../lib/modules/posixAccount.inc:59
-#: ../lib/modules/posixAccount.inc:158
-#: ../lib/modules/posixAccount.inc:167
+#: ../lib/modules/posixAccount.inc:58
+#: ../lib/modules/posixAccount.inc:60
+#: ../lib/modules/posixAccount.inc:161
+#: ../lib/modules/posixAccount.inc:170
 msgid "Minimum UID number"
 msgstr "最小UID号"
 
-#: ../lib/modules/posixAccount.inc:57
-#: ../lib/modules/posixAccount.inc:59
+#: ../lib/modules/posixAccount.inc:58
+#: ../lib/modules/posixAccount.inc:60
 msgid "Minimum UID number is invalid!"
 msgstr "最小UID非法!"
 
-#: ../templates/config/mainmanage.php:218
+#: ../templates/config/mainmanage.php:224
 msgid "Minimum character classes"
 msgstr "最少字符类别"
 
-#: ../templates/config/mainmanage.php:214
+#: ../templates/config/mainmanage.php:220
 msgid "Minimum lowercase characters"
 msgstr "最少小写字母字符数"
 
-#: ../templates/config/mainmanage.php:216
+#: ../templates/config/mainmanage.php:222
 msgid "Minimum numeric characters"
 msgstr "最少数字字符数"
 
+#: ../lib/modules/ppolicy.inc:76
+#: ../lib/modules/ppolicy.inc:145
+#: ../lib/modules/ppolicy.inc:179
+#: ../lib/modules/ppolicy.inc:468
 #: ../lib/modules/shadowAccount.inc:57
-#: ../lib/modules/shadowAccount.inc:110
-#: ../lib/modules/shadowAccount.inc:177
-#: ../lib/modules/shadowAccount.inc:205
-#: ../lib/modules/shadowAccount.inc:295
+#: ../lib/modules/shadowAccount.inc:114
+#: ../lib/modules/shadowAccount.inc:181
+#: ../lib/modules/shadowAccount.inc:213
+#: ../lib/modules/shadowAccount.inc:315
 #: ../lib/modules/sambaDomain.inc:118
 #: ../lib/modules/sambaDomain.inc:201
 #: ../lib/modules/sambaDomain.inc:319
-#: ../lib/modules/sambaDomain.inc:675
+#: ../lib/modules/sambaDomain.inc:676
+#: ../lib/types/ppolicyType.inc:78
 msgid "Minimum password age"
 msgstr "密码最短生命"
 
-#: ../templates/config/mainmanage.php:213
+#: ../templates/config/mainmanage.php:219
+#: ../lib/modules/ppolicy.inc:112
+#: ../lib/modules/ppolicy.inc:154
+#: ../lib/modules/ppolicy.inc:234
+#: ../lib/modules/ppolicy.inc:486
+#: ../lib/types/ppolicyType.inc:87
 msgid "Minimum password length"
 msgstr "最短密码长度"
 
-#: ../templates/config/mainmanage.php:217
+#: ../templates/config/mainmanage.php:223
 msgid "Minimum symbolic characters"
 msgstr "最少标点符号字符数"
 
-#: ../templates/config/mainmanage.php:215
+#: ../templates/config/mainmanage.php:221
 msgid "Minimum uppercase characters"
 msgstr "最少的大字字母字符数"
 
@@ -3727,51 +3866,51 @@ msgstr "最少的大字字母字符数"
 #: ../lib/modules/inetOrgPerson.inc:149
 #: ../lib/modules/inetOrgPerson.inc:251
 #: ../lib/modules/inetOrgPerson.inc:406
-#: ../lib/modules/inetOrgPerson.inc:628
-#: ../lib/modules/inetOrgPerson.inc:629
-#: ../lib/modules/inetOrgPerson.inc:1069
-#: ../lib/modules/inetOrgPerson.inc:1254
+#: ../lib/modules/inetOrgPerson.inc:607
+#: ../lib/modules/inetOrgPerson.inc:608
+#: ../lib/modules/inetOrgPerson.inc:1048
+#: ../lib/modules/inetOrgPerson.inc:1233
 msgid "Mobile number"
 msgstr "手机号码"
 
-#: ../lib/modules/inetOrgPerson.inc:1608
+#: ../lib/modules/inetOrgPerson.inc:1625
 msgid "Mobile telephone number"
 msgstr "手机号码"
 
-#: ../templates/lists/changePassword.php:181
+#: ../templates/lists/changePassword.php:176
 msgid "Mode"
 msgstr "模式"
 
-#: ../templates/config/conftypes.php:170
-#: ../templates/config/confmain.php:189
-#: ../templates/config/confmodules.php:155
-#: ../templates/config/moduleSettings.php:154
+#: ../templates/config/conftypes.php:176
+#: ../templates/config/confmain.php:194
+#: ../templates/config/confmodules.php:161
+#: ../templates/config/moduleSettings.php:160
 msgid "Module settings"
 msgstr "模块设置"
 
-#: ../templates/config/conftypes.php:160
-#: ../templates/config/confmain.php:179
-#: ../templates/config/confmodules.php:145
-#: ../templates/config/moduleSettings.php:144
+#: ../templates/config/conftypes.php:166
+#: ../templates/config/confmain.php:184
+#: ../templates/config/confmodules.php:151
+#: ../templates/config/moduleSettings.php:150
 msgid "Modules"
 msgstr "模块"
 
-#: ../lib/modules/sambaSamAccount.inc:1338
+#: ../lib/modules/sambaSamAccount.inc:1317
 msgid "Monday"
 msgstr "星期一"
 
-#: ../lib/modules/sambaSamAccount.inc:551
+#: ../lib/modules/sambaSamAccount.inc:532
 msgid "Mountain Time (US & Canada)"
 msgstr "时区(美国和加拿大)"
 
-#: ../lib/modules/quota.inc:95
-#: ../lib/modules/quota.inc:383
-#: ../lib/modules/quota.inc:469
-#: ../lib/modules/quota.inc:578
+#: ../lib/modules/quota.inc:97
+#: ../lib/modules/quota.inc:385
+#: ../lib/modules/quota.inc:471
+#: ../lib/modules/quota.inc:580
 msgid "Mountpoint"
 msgstr "挂接点"
 
-#: ../lib/modules/quota.inc:96
+#: ../lib/modules/quota.inc:98
 msgid "Mountpoint of device with enabled quotas."
 msgstr "可限制配额设备挂接点"
 
@@ -3782,6 +3921,7 @@ msgid "Multiple values are separated by comma."
 msgstr "用逗号分隔多值."
 
 #: ../lib/modules/inetOrgPerson.inc:448
+#: ../lib/modules/ipHost.inc:86
 msgid "MyCity"
 msgstr "城市"
 
@@ -3817,39 +3957,43 @@ msgstr "NIS 对象条目"
 msgid "NIS objects"
 msgstr "NIS 对象"
 
-#: ../templates/schema/schema.php:273
+#: ../templates/schema/schema.php:266
 #: ../templates/tree/templates/creation/new_ou_template.php:59
 #: ../templates/tree/templates/creation/new_ou_template.php:104
-#: ../templates/pdfedit/pdfdelete.php:62
-#: ../templates/pdfedit/pdfdelete.php:65
-#: ../templates/pdfedit/pdfdelete.php:90
+#: ../templates/pdfedit/pdfdelete.php:60
+#: ../templates/pdfedit/pdfdelete.php:63
+#: ../templates/pdfedit/pdfdelete.php:88
+#: ../lib/modules/ppolicy.inc:72
+#: ../lib/modules/ppolicy.inc:170
+#: ../lib/modules/ppolicy.inc:467
 #: ../lib/modules/groupOfNames.inc:138
+#: ../lib/types/ppolicyType.inc:77
 msgid "Name"
 msgstr "名"
 
-#: ../help/help.inc:153
+#: ../help/help.inc:155
 msgid "Name under which the profile will be saved. If a profile with the same name exists, it will be overwritten."
 msgstr "将来保存的配置名,如果配置名存在,会被覆盖."
 
-#: ../lib/modules/dhcp_settings.inc:157
-#: ../lib/modules/dhcp_settings.inc:587
-#: ../lib/modules/dhcp_settings.inc:655
+#: ../lib/modules/dhcp_settings.inc:158
+#: ../lib/modules/dhcp_settings.inc:608
+#: ../lib/modules/dhcp_settings.inc:676
 msgid "Net mask"
 msgstr "子网掩码"
 
-#: ../lib/modules/dhcp_settings.inc:136
-#: ../lib/modules/dhcp_settings.inc:211
-#: ../lib/modules/dhcp_settings.inc:267
-#: ../lib/modules/dhcp_settings.inc:560
-#: ../lib/modules/dhcp_settings.inc:652
+#: ../lib/modules/dhcp_settings.inc:137
+#: ../lib/modules/dhcp_settings.inc:212
+#: ../lib/modules/dhcp_settings.inc:268
+#: ../lib/modules/dhcp_settings.inc:581
+#: ../lib/modules/dhcp_settings.inc:673
 msgid "Netbios name servers"
 msgstr "Netbios命名服务器"
 
-#: ../lib/modules/dhcp_settings.inc:139
-#: ../lib/modules/dhcp_settings.inc:216
-#: ../lib/modules/dhcp_settings.inc:273
-#: ../lib/modules/dhcp_settings.inc:574
-#: ../lib/modules/dhcp_settings.inc:653
+#: ../lib/modules/dhcp_settings.inc:140
+#: ../lib/modules/dhcp_settings.inc:217
+#: ../lib/modules/dhcp_settings.inc:274
+#: ../lib/modules/dhcp_settings.inc:595
+#: ../lib/modules/dhcp_settings.inc:674
 msgid "Netbios node type"
 msgstr "Netbios 节点类型"
 
@@ -3857,6 +4001,10 @@ msgstr "Netbios 节点类型"
 msgid "New DHCP"
 msgstr "新DHCP"
 
+#: ../lib/modules/ipHost.inc:135
+msgid "New IP address"
+msgstr "新IP地址"
+
 #: ../lib/modules/ieee802device.inc:109
 msgid "New MAC address"
 msgstr "新MAC地址"
@@ -3882,7 +4030,7 @@ msgstr "纽约"
 msgid "New alias"
 msgstr "新别名"
 
-#: ../templates/config/profmanage.php:131
+#: ../templates/config/profmanage.php:137
 msgid "New default profile set successfully."
 msgstr "新缺省配置设置成功."
 
@@ -3894,7 +4042,7 @@ msgstr "新域"
 msgid "New extension"
 msgstr "新扩展"
 
-#: ../templates/pdfedit/pdfpage.php:634
+#: ../templates/pdfedit/pdfpage.php:623
 msgid "New field"
 msgstr "新字段"
 
@@ -3912,42 +4060,46 @@ msgstr "新主机"
 msgid "New local address"
 msgstr "新本地邮件地址"
 
-#: ../templates/config/mainmanage.php:339
+#: ../templates/config/mainmanage.php:344
 msgid "New master password"
 msgstr "新管理员密码"
 
-#: ../templates/config/mainmanage.php:89
+#: ../templates/config/mainmanage.php:95
 msgid "New master password set successfully."
 msgstr "新管理员密码设置成功."
 
-#: ../lib/lists.inc:105
+#: ../lib/lists.inc:108
 msgid "New object"
 msgstr "新对象"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:47
-#: ../templates/ou_edit.php:172
-#: ../help/help.inc:198
+#: ../templates/ou_edit.php:162
+#: ../help/help.inc:200
 msgid "New organizational unit"
 msgstr "新组织单元"
 
-#: ../lib/modules/groupOfNames.inc:252
+#: ../lib/modules/groupOfNames.inc:250
 msgid "New owner"
 msgstr "新拥有者"
 
-#: ../templates/config/confmain.php:490
-#: ../lib/modules/posixAccount.inc:1702
+#: ../templates/config/confmain.php:517
+#: ../lib/modules/posixAccount.inc:1706
 msgid "New password"
 msgstr "新密码"
 
-#: ../templates/config/profmanage.php:121
-#: ../lib/modules.inc:1037
+#: ../templates/config/profmanage.php:127
+#: ../lib/modules.inc:1065
 msgid "New password set successfully."
 msgstr "新密码设置成功."
 
-#: ../lib/modules/range.inc:85
-#: ../lib/modules/range.inc:96
-#: ../lib/modules/range.inc:436
-#: ../lib/modules/range.inc:437
+#: ../lib/types/ppolicyType.inc:127
+msgid "New policy"
+msgstr "新策略"
+
+#: ../lib/modules/range.inc:87
+#: ../lib/modules/range.inc:98
+#: ../lib/modules/range.inc:438
+#: ../lib/modules/range.inc:439
 msgid "New range"
 msgstr "新范围"
 
@@ -3959,7 +4111,7 @@ msgstr "新收信者"
 msgid "New required attributes:"
 msgstr "新必要属性"
 
-#: ../templates/pdfedit/pdfpage.php:553
+#: ../templates/pdfedit/pdfpage.php:542
 msgid "New section"
 msgstr "新节"
 
@@ -3980,7 +4132,7 @@ msgstr "下一步"
 #: ../lib/modules/sambaDomain.inc:78
 #: ../lib/modules/sambaDomain.inc:158
 #: ../lib/modules/sambaDomain.inc:359
-#: ../lib/modules/sambaDomain.inc:639
+#: ../lib/modules/sambaDomain.inc:640
 msgid "Next RID"
 msgstr "下一个RID"
 
@@ -4004,7 +4156,7 @@ msgstr "建立用户帐号使用的下一个RID(Winbind)."
 #: ../lib/modules/sambaDomain.inc:86
 #: ../lib/modules/sambaDomain.inc:170
 #: ../lib/modules/sambaDomain.inc:369
-#: ../lib/modules/sambaDomain.inc:645
+#: ../lib/modules/sambaDomain.inc:646
 msgid "Next group RID"
 msgstr "下一个组的RID"
 
@@ -4016,7 +4168,7 @@ msgstr "下一个组的RID不是数字!"
 #: ../lib/modules/sambaDomain.inc:82
 #: ../lib/modules/sambaDomain.inc:164
 #: ../lib/modules/sambaDomain.inc:364
-#: ../lib/modules/sambaDomain.inc:642
+#: ../lib/modules/sambaDomain.inc:643
 msgid "Next user RID"
 msgstr "下一个用户的RID"
 
@@ -4026,16 +4178,16 @@ msgid "Next user RID is not a number!"
 msgstr "下一个用户的RID不是数字!"
 
 #: ../lib/modules/eduPerson.inc:86
-#: ../lib/modules/eduPerson.inc:157
-#: ../lib/modules/eduPerson.inc:299
-#: ../lib/modules/eduPerson.inc:631
+#: ../lib/modules/eduPerson.inc:168
+#: ../lib/modules/eduPerson.inc:307
+#: ../lib/modules/eduPerson.inc:675
 msgid "Nick names"
 msgstr "昵称"
 
-#: ../templates/schema/schema.php:158
-#: ../templates/schema/schema.php:200
-#: ../templates/schema/schema.php:205
-#: ../templates/schema/schema.php:210
+#: ../templates/schema/schema.php:151
+#: ../templates/schema/schema.php:193
+#: ../templates/schema/schema.php:198
+#: ../templates/schema/schema.php:203
 msgid "No"
 msgstr "否"
 
@@ -4048,16 +4200,16 @@ msgid "No NIS objects found!"
 msgstr "未发现 NIS 对象!"
 
 #: ../lib/modules/sambaGroupMapping.inc:90
-#: ../lib/modules/sambaGroupMapping.inc:217
-#: ../lib/modules/sambaGroupMapping.inc:470
-#: ../lib/modules/sambaSamAccount.inc:634
-#: ../lib/modules/sambaSamAccount.inc:738
-#: ../lib/modules/sambaSamAccount.inc:1061
+#: ../lib/modules/sambaGroupMapping.inc:218
+#: ../lib/modules/sambaGroupMapping.inc:471
+#: ../lib/modules/sambaSamAccount.inc:615
+#: ../lib/modules/sambaSamAccount.inc:741
+#: ../lib/modules/sambaSamAccount.inc:1055
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Samba域,请先建立一个."
 
-#: ../lib/modules/posixAccount.inc:448
-#: ../lib/modules/posixAccount.inc:920
+#: ../lib/modules/posixAccount.inc:440
+#: ../lib/modules/posixAccount.inc:930
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Unix组,请先建立一个."
 
@@ -4066,11 +4218,11 @@ msgstr "在LDAP中没有发现Unix组,请先建立一个."
 msgid "No aliases found!"
 msgstr "没有发现别名!"
 
-#: ../templates/initsuff.php:166
+#: ../templates/initsuff.php:163
 msgid "No changes were made."
 msgstr "未做任何修改."
 
-#: ../templates/schema/schema.php:149
+#: ../templates/schema/schema.php:142
 msgid "No description"
 msgstr "没有描述"
 
@@ -4086,8 +4238,8 @@ msgstr "没有发现扩展!"
 msgid "No file selected."
 msgstr "没有选择文件!"
 
-#: ../lib/modules/posixGroup.inc:467
-#: ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/posixGroup.inc:468
+#: ../lib/modules/posixAccount.inc:69
 msgid "No free ID-Number!"
 msgstr "没有可用的ID号!"
 
@@ -4101,32 +4253,32 @@ msgstr "没有发现组!"
 msgid "No hosts found!"
 msgstr "没有发现主机!"
 
-#: ../templates/tree/edit.php:193
+#: ../templates/tree/edit.php:196
 msgid "No internal attributes"
 msgstr "没有内部属性"
 
-#: ../templates/tests/lamdaemonTest.php:221
+#: ../templates/tests/lamdaemonTest.php:214
 msgid "No lamdaemon path set, please update your LAM configuration settings."
 msgstr "没有设定lamdaemon路径设置,请更改LAM配置."
 
-#: ../templates/tests/lamdaemonTest.php:113
-#: ../templates/tests/lamdaemonTest.php:217
+#: ../templates/tests/lamdaemonTest.php:105
+#: ../templates/tests/lamdaemonTest.php:210
 msgid "No lamdaemon server set, please update your LAM configuration settings."
 msgstr "没有设置lamdaemon服务器,请先设置LAM配置."
 
-#: ../templates/config/mainmanage.php:295
+#: ../templates/config/mainmanage.php:300
 msgid "No logging"
 msgstr "无日志"
 
-#: ../templates/pdfedit/pdfpage.php:371
+#: ../templates/pdfedit/pdfpage.php:366
 msgid "No logo"
 msgstr "无标志"
 
-#: ../lib/lists.inc:104
+#: ../lib/lists.inc:107
 msgid "No objects found!"
 msgstr "未发现对象!"
 
-#: ../templates/config/confmodules.php:368
+#: ../templates/config/confmodules.php:374
 msgid "No or more than one base module selected!"
 msgstr "未选择基本模块或选择多于一个!"
 
@@ -4135,7 +4287,11 @@ msgstr "未选择基本模块或选择多于一个!"
 msgid "No password was entered!"
 msgstr "没有输入密码!"
 
-#: ../templates/tests/schemaTest.php:80
+#: ../lib/types/ppolicyType.inc:126
+msgid "No policies found!"
+msgstr "没有发现策略!"
+
+#: ../templates/tests/schemaTest.php:69
 msgid "No problems found."
 msgstr "未发现问题!"
 
@@ -4143,19 +4299,19 @@ msgstr "未发现问题!"
 msgid "No scripts to run."
 msgstr "没有运行的脚本"
 
-#: ../templates/pdfedit/pdfpage.php:126
+#: ../templates/pdfedit/pdfpage.php:121
 msgid "No section text specified"
 msgstr "没有指定段文本"
 
-#: ../templates/config/conflogin.php:98
+#: ../templates/config/conflogin.php:105
 msgid "No server profiles found. Please create one."
 msgstr "没有服务器设置,请先建立一个."
 
-#: ../templates/pdfedit/pdfpage.php:114
+#: ../templates/pdfedit/pdfpage.php:109
 msgid "No static text specified"
 msgstr "没有指定静态文本"
 
-#: ../lib/modules/dhcp_settings.inc:299
+#: ../lib/modules/dhcp_settings.inc:300
 msgid "No subnet entered."
 msgstr "没有输入子网掩码!"
 
@@ -4163,7 +4319,7 @@ msgstr "没有输入子网掩码!"
 msgid "No such entry!"
 msgstr "没有这个条目!"
 
-#: ../templates/schema/schema.php:442
+#: ../templates/schema/schema.php:435
 #, php-format
 msgid "No such schema item: \"%s\""
 msgstr "没有这个schema项:\"%s\""
@@ -4180,23 +4336,23 @@ msgstr "备注"
 msgid "Note: You will get an \"inappropriate matching\" error if you have not setup an EQUALITY rule on your LDAP server for this attribute."
 msgstr "注意:如果在LDAP中没有为这个发生设置EQUALITY规则,会产生\"inappropriate matching\"错误."
 
-#: ../templates/config/mainmanage.php:256
+#: ../templates/config/mainmanage.php:262
 msgid "Notice"
 msgstr "注意"
 
-#: ../templates/delete.php:99
+#: ../templates/delete.php:94
 msgid "Number of child entries"
 msgstr "子条目的数量"
 
-#: ../lib/modules/shadowAccount.inc:174
+#: ../lib/modules/shadowAccount.inc:178
 msgid "Number of days a user can login even his password has expired. -1=always."
 msgstr "用户密码过期后允许登录的天数,-1为不限制."
 
-#: ../lib/modules/shadowAccount.inc:178
+#: ../lib/modules/shadowAccount.inc:182
 msgid "Number of days a user has to wait until he is allowed to change his password again. If set value must be >0."
 msgstr "允许用户修改密码的最短间隔天数,如果设置一定要大于0."
 
-#: ../lib/modules/shadowAccount.inc:182
+#: ../lib/modules/shadowAccount.inc:186
 msgid "Number of days after a user has to change his password again. If set value must be >0."
 msgstr "用户必须再次修改密码的天数.如果设置一定要大于0."
 
@@ -4204,16 +4360,18 @@ msgstr "用户必须再次修改密码的天数.如果设置一定要大于0."
 msgid "Number of minutes after which the bad logon attempts are reset."
 msgstr "重置错误登录次数的分钟数."
 
+#: ../lib/modules/ppolicy.inc:77
 #: ../lib/modules/sambaDomain.inc:119
 msgid "Number of seconds after the user is allowed to change his password again."
 msgstr "允许用户再次修改密码的秒数."
 
+#: ../lib/modules/ppolicy.inc:81
 #: ../lib/modules/sambaDomain.inc:123
 msgid "Number of seconds after which the user must change his password."
 msgstr "多後之後使用者必須更改密碼.(密碼到期),以秒為單位"
 
-#: ../templates/schema/schema.php:152
-#: ../templates/schema/schema.php:349
+#: ../templates/schema/schema.php:145
+#: ../templates/schema/schema.php:342
 msgid "OID"
 msgstr "OID"
 
@@ -4225,8 +4383,8 @@ msgstr "OU已经存在!"
 msgid "OU deleted successfully."
 msgstr "OU删除成功."
 
-#: ../templates/ou_edit.php:154
-#: ../templates/ou_edit.php:168
+#: ../templates/ou_edit.php:144
+#: ../templates/ou_edit.php:158
 #: ../lib/tools/ouEditor.inc:44
 msgid "OU editor"
 msgstr "OU编辑器"
@@ -4239,70 +4397,70 @@ msgstr "OU无效!"
 msgid "OU is not empty or invalid!"
 msgstr "OU不为空或非法!"
 
-#: ../help/help.inc:198
 #: ../help/help.inc:200
+#: ../help/help.inc:202
 msgid "OU-Editor"
 msgstr "OU编辑器"
 
-#: ../templates/schema/schema.php:70
-#: ../templates/schema/schema.php:71
+#: ../templates/schema/schema.php:63
+#: ../templates/schema/schema.php:64
 #: ../templates/tree/templates/creation/custom.php:70
 msgid "Object classes"
 msgstr "对象类"
 
-#: ../templates/schema/schema.php:157
-#: ../templates/schema/schema.php:288
+#: ../templates/schema/schema.php:150
+#: ../templates/schema/schema.php:281
 msgid "Obsolete"
 msgstr "已过时的"
 
 #: ../lib/modules/sambaDomain.inc:279
 #: ../lib/modules/sambaDomain.inc:290
 #: ../lib/modules/sambaDomain.inc:301
-#: ../lib/modules/sambaDomain.inc:657
-#: ../lib/modules/sambaDomain.inc:662
-#: ../lib/modules/sambaDomain.inc:667
+#: ../lib/modules/sambaDomain.inc:658
+#: ../lib/modules/sambaDomain.inc:663
+#: ../lib/modules/sambaDomain.inc:668
 msgid "Off"
 msgstr "关闭"
 
 #: ../lib/modules/inetOrgPerson.inc:153
 #: ../lib/modules/inetOrgPerson.inc:238
 #: ../lib/modules/inetOrgPerson.inc:470
-#: ../lib/modules/inetOrgPerson.inc:680
-#: ../lib/modules/inetOrgPerson.inc:1030
-#: ../lib/modules/inetOrgPerson.inc:1264
-#: ../lib/modules/inetOrgPerson.inc:1688
+#: ../lib/modules/inetOrgPerson.inc:659
+#: ../lib/modules/inetOrgPerson.inc:1009
+#: ../lib/modules/inetOrgPerson.inc:1243
+#: ../lib/modules/inetOrgPerson.inc:1705
 msgid "Office name"
 msgstr "办公室名"
 
 #: ../templates/tree/export_form.php:165
-#: ../templates/selfService/profManage.php:248
-#: ../templates/selfService/adminMain.php:534
-#: ../templates/selfService/adminMain.php:566
-#: ../templates/selfService/adminLogin.php:125
-#: ../templates/selfService/adminLogin.php:126
-#: ../templates/selfService/selfServiceLogin.php:220
-#: ../templates/tests/lamdaemonTest.php:108
-#: ../templates/masscreate.php:113
-#: ../templates/ou_edit.php:179
-#: ../templates/ou_edit.php:195
-#: ../templates/profedit/profiledelete.php:85
-#: ../templates/config/conflogin.php:128
-#: ../templates/config/conflogin.php:129
-#: ../templates/config/mainmanage.php:366
-#: ../templates/config/profmanage.php:348
-#: ../templates/config/mainlogin.php:128
-#: ../lib/modules.inc:1259
+#: ../templates/selfService/profManage.php:256
+#: ../templates/selfService/adminMain.php:542
+#: ../templates/selfService/adminMain.php:574
+#: ../templates/selfService/adminLogin.php:132
+#: ../templates/selfService/adminLogin.php:133
+#: ../templates/selfService/selfServiceLogin.php:226
+#: ../templates/tests/lamdaemonTest.php:100
+#: ../templates/masscreate.php:190
+#: ../templates/ou_edit.php:169
+#: ../templates/ou_edit.php:185
+#: ../templates/profedit/profiledelete.php:83
+#: ../templates/config/conflogin.php:135
+#: ../templates/config/conflogin.php:136
+#: ../templates/config/mainmanage.php:371
+#: ../templates/config/profmanage.php:354
+#: ../templates/config/mainlogin.php:135
+#: ../lib/modules.inc:1288
 #: ../lib/modules/nisnetgroup.inc:450
 #: ../lib/modules/nisnetgroup.inc:466
-#: ../lib/modules/groupOfNames.inc:230
-#: ../lib/modules/groupOfNames.inc:257
-#: ../lib/modules/groupOfNames.inc:344
-#: ../lib/modules/sambaSamAccount.inc:1385
-#: ../lib/modules/sambaSamAccount.inc:1556
+#: ../lib/modules/groupOfNames.inc:234
+#: ../lib/modules/groupOfNames.inc:255
+#: ../lib/modules/groupOfNames.inc:340
+#: ../lib/modules/sambaSamAccount.inc:1364
+#: ../lib/modules/sambaSamAccount.inc:1525
 #: ../lib/modules/aliasEntry.inc:146
-#: ../lib/modules/aliasEntry.inc:172
-#: ../lib/lists.inc:661
-#: ../lib/lists.inc:892
+#: ../lib/modules/aliasEntry.inc:166
+#: ../lib/lists.inc:588
+#: ../lib/lists.inc:804
 msgid "Ok"
 msgstr "确定"
 
@@ -4313,15 +4471,15 @@ msgstr "旧值"
 #: ../lib/modules/sambaDomain.inc:279
 #: ../lib/modules/sambaDomain.inc:290
 #: ../lib/modules/sambaDomain.inc:301
-#: ../lib/modules/sambaDomain.inc:658
-#: ../lib/modules/sambaDomain.inc:663
-#: ../lib/modules/sambaDomain.inc:668
+#: ../lib/modules/sambaDomain.inc:659
+#: ../lib/modules/sambaDomain.inc:664
+#: ../lib/modules/sambaDomain.inc:669
 msgid "On"
 msgstr "On"
 
-#: ../lib/modules/sambaSamAccount.inc:363
-#: ../lib/modules/sambaSamAccount.inc:1541
-#: ../lib/modules/sambaSamAccount.inc:1883
+#: ../lib/modules/sambaSamAccount.inc:358
+#: ../lib/modules/sambaSamAccount.inc:1510
+#: ../lib/modules/sambaSamAccount.inc:1839
 msgid "On broken or timed out connection"
 msgstr "中断或超时连接"
 
@@ -4329,12 +4487,12 @@ msgstr "中断或超时连接"
 msgid "One (one level beneath base)"
 msgstr "One (基类下第一层)"
 
-#: ../lib/modules/range.inc:95
-#: ../lib/modules/fixed_ip.inc:94
+#: ../lib/modules/range.inc:97
+#: ../lib/modules/fixed_ip.inc:96
 msgid "One or more errors occured. The invalid fields are marked."
 msgstr "发生了错误,非法域已经被标记."
 
-#: ../templates/schema/schema.php:389
+#: ../templates/schema/schema.php:382
 #: ../templates/tree/templates/creation/custom.php:209
 msgid "Optional attributes"
 msgstr "可选属性"
@@ -4343,19 +4501,20 @@ msgstr "可选属性"
 msgid "Optional binary attributes"
 msgstr "可选二进制属性"
 
-#: ../templates/lists/changePassword.php:133
+#: ../templates/lists/changePassword.php:128
+#: ../lib/modules/asteriskExtension.inc:106
 msgid "Options"
 msgstr "选项"
 
-#: ../templates/schema/schema.php:176
+#: ../templates/schema/schema.php:169
 msgid "Ordering"
 msgstr "排序"
 
 #: ../lib/modules/eduPerson.inc:111
-#: ../lib/modules/eduPerson.inc:169
-#: ../lib/modules/eduPerson.inc:201
-#: ../lib/modules/eduPerson.inc:343
-#: ../lib/modules/eduPerson.inc:642
+#: ../lib/modules/eduPerson.inc:180
+#: ../lib/modules/eduPerson.inc:212
+#: ../lib/modules/eduPerson.inc:351
+#: ../lib/modules/eduPerson.inc:686
 msgid "Organization"
 msgstr "组织"
 
@@ -4365,17 +4524,17 @@ msgstr "组织单元"
 
 #: ../lib/modules/eduPerson.inc:119
 #: ../lib/modules/eduPerson.inc:123
-#: ../lib/modules/eduPerson.inc:181
-#: ../lib/modules/eduPerson.inc:371
-#: ../lib/modules/eduPerson.inc:648
+#: ../lib/modules/eduPerson.inc:192
+#: ../lib/modules/eduPerson.inc:379
+#: ../lib/modules/eduPerson.inc:692
 msgid "Organizational units"
 msgstr "组织单元"
 
-#: ../lib/modules/eduPerson.inc:205
+#: ../lib/modules/eduPerson.inc:216
 msgid "Organizational units contains an invalid entry."
 msgstr "组织单元中有一个非法条目"
 
-#: ../templates/config/confmain.php:418
+#: ../templates/config/confmain.php:445
 msgid "Other"
 msgstr "其它"
 
@@ -4384,12 +4543,12 @@ msgstr "其它"
 msgid "Output of command \"%s\" with return code %s"
 msgstr "\"%s\"命令的输出和返回值%s"
 
-#: ../templates/config/confmain.php:410
+#: ../templates/config/confmain.php:437
 #: ../lib/modules/groupOfNames.inc:68
 #: ../lib/modules/groupOfNames.inc:97
 #: ../lib/modules/groupOfNames.inc:149
 #: ../lib/modules/groupOfNames.inc:167
-#: ../lib/modules/groupOfNames.inc:447
+#: ../lib/modules/groupOfNames.inc:444
 #: ../lib/types/gon.inc:94
 msgid "Owner"
 msgstr "拥有者"
@@ -4398,88 +4557,98 @@ msgstr "拥有者"
 msgid "P-Node (0x02)"
 msgstr "P-节点 (0x02)"
 
-#: ../lib/modules/fixed_ip.inc:79
-#: ../lib/modules/fixed_ip.inc:332
-#: ../lib/modules/fixed_ip.inc:527
+#: ../lib/modules/fixed_ip.inc:81
+#: ../lib/modules/fixed_ip.inc:326
+#: ../lib/modules/fixed_ip.inc:518
 msgid "PC name"
 msgstr "PC机器名"
 
-#: ../templates/pdfedit/pdfmain.php:115
+#: ../templates/pdfedit/pdfmain.php:110
 #: ../lib/tools/pdfEdit.inc:44
 msgid "PDF editor"
 msgstr "PDF编辑器"
 
-#: ../lib/lists.inc:633
+#: ../lib/lists.inc:560
 msgid "PDF structure"
 msgstr "PDF架构"
 
-#: ../templates/pdfedit/pdfpage.php:100
+#: ../templates/pdfedit/pdfpage.php:95
 msgid "PDF structure was successfully saved."
 msgstr "PDF架构成功保存."
 
-#: ../templates/pdfedit/pdfpage.php:95
+#: ../templates/pdfedit/pdfpage.php:90
 msgid "PDF-structure name not valid"
 msgstr "PDF架构名无效"
 
-#: ../lib/modules/sambaSamAccount.inc:550
+#: ../lib/modules/sambaSamAccount.inc:531
 msgid "Pacific Time (US & Canada)"
 msgstr "太平洋时间(美国和加拿大)"
 
-#: ../lib/modules/dhcp_settings.inc:134
+#: ../lib/modules/dhcp_settings.inc:135
 msgid "Packets are sent to the default gateway if the receiver does not reside in the same network. The default gateway routes them to the target network."
 msgstr "如果数据包的接收者不在同一个网络,数据包将会发往缺省网关.缺省网关将数据包转向目标网络."
 
-#: ../templates/selfService/adminMain.php:438
-#: ../help/help.inc:183
+#: ../templates/selfService/adminMain.php:446
+#: ../help/help.inc:185
 msgid "Page header"
 msgstr "页首"
 
-#: ../templates/schema/schema.php:371
+#: ../templates/schema/schema.php:364
 msgid "Parent to"
 msgstr "继承于"
 
-#: ../templates/selfService/selfServiceLogin.php:206
-#: ../templates/lists/changePassword.php:203
-#: ../templates/login.php:295
-#: ../lib/modules.inc:1235
-#: ../lib/modules/posixGroup.inc:194
-#: ../lib/modules/posixGroup.inc:464
-#: ../lib/modules/posixAccount.inc:137
-#: ../lib/modules/posixAccount.inc:253
-#: ../lib/modules/posixAccount.inc:388
-#: ../lib/modules/posixAccount.inc:995
-#: ../lib/modules/asteriskAccount.inc:80
-#: ../lib/modules/asteriskAccount.inc:131
-#: ../lib/modules/sambaSamAccount.inc:401
-#: ../help/help.inc:162
+#: ../templates/selfService/selfServiceLogin.php:212
+#: ../templates/lists/changePassword.php:198
+#: ../templates/login.php:253
+#: ../lib/modules.inc:1262
+#: ../lib/modules/posixGroup.inc:195
+#: ../lib/modules/posixGroup.inc:465
+#: ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:140
+#: ../lib/modules/posixAccount.inc:256
+#: ../lib/modules/posixAccount.inc:380
+#: ../lib/modules/posixAccount.inc:1005
+#: ../lib/modules/asteriskAccount.inc:89
+#: ../lib/modules/asteriskAccount.inc:140
+#: ../lib/modules/sambaSamAccount.inc:396
+#: ../help/help.inc:164
 msgid "Password"
 msgstr "密码"
 
-#: ../lib/modules/sambaSamAccount.inc:273
-#: ../lib/modules/sambaSamAccount.inc:1115
+#: ../lib/modules/sambaSamAccount.inc:268
+#: ../lib/modules/sambaSamAccount.inc:1109
 msgid "Password change at next login"
 msgstr "下次登录时修改密码"
 
-#: ../lib/modules/posixGroup.inc:464
-#: ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/ppolicy.inc:128
+#: ../lib/modules/ppolicy.inc:297
+#: ../lib/modules/ppolicy.inc:506
+#: ../lib/types/ppolicyType.inc:91
+msgid "Password change requires old password"
+msgstr "修改密码时需要旧密码"
+
+#: ../lib/modules/posixGroup.inc:465
+#: ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:76
 #: ../lib/modules/sambaSamAccount.inc:92
 msgid "Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!%&/|?{[()]}=@$ !"
 msgstr "密码包括无效字符,合法字符为a-z, A-Z, 0-9 和 #*,.;:_-+!%&/|?{[()]}=@$ !"
 
-#: ../lib/modules/sambaSamAccount.inc:258
-#: ../lib/modules/sambaSamAccount.inc:261
-#: ../lib/modules/sambaSamAccount.inc:423
-#: ../lib/modules/sambaSamAccount.inc:1098
-#: ../lib/modules/sambaSamAccount.inc:1589
+#: ../lib/modules/sambaSamAccount.inc:253
+#: ../lib/modules/sambaSamAccount.inc:256
+#: ../lib/modules/sambaSamAccount.inc:418
+#: ../lib/modules/sambaSamAccount.inc:1092
+#: ../lib/modules/sambaSamAccount.inc:1558
 msgid "Password does not expire"
 msgstr "密码永不过期"
 
 #: ../lib/modules/shadowAccount.inc:61
-#: ../lib/modules/shadowAccount.inc:105
-#: ../lib/modules/shadowAccount.inc:173
-#: ../lib/modules/shadowAccount.inc:199
-#: ../lib/modules/shadowAccount.inc:289
-#: ../lib/modules/shadowAccount.inc:392
+#: ../lib/modules/shadowAccount.inc:109
+#: ../lib/modules/shadowAccount.inc:177
+#: ../lib/modules/shadowAccount.inc:207
+#: ../lib/modules/shadowAccount.inc:309
+#: ../lib/modules/shadowAccount.inc:419
 msgid "Password expiration"
 msgstr "密码超期"
 
@@ -4489,50 +4658,80 @@ msgid "Password expiration must be are natural number or -1."
 msgstr "密码超期必须是自然数或-1."
 
 #: ../lib/modules/inetOrgPerson.inc:290
-#: ../lib/modules/inetOrgPerson.inc:692
-#: ../lib/modules/posixGroup.inc:402
-#: ../lib/modules/posixGroup.inc:425
-#: ../lib/modules/posixAccount.inc:141
-#: ../lib/modules/posixAccount.inc:176
-#: ../lib/modules/posixAccount.inc:343
+#: ../lib/modules/inetOrgPerson.inc:671
+#: ../lib/modules/posixGroup.inc:403
+#: ../lib/modules/posixGroup.inc:426
+#: ../lib/modules/posixAccount.inc:144
+#: ../lib/modules/posixAccount.inc:179
+#: ../lib/modules/posixAccount.inc:335
 msgid "Password hash type"
 msgstr "密码哈希类型"
 
+#: ../lib/modules/ppolicy.inc:84
+#: ../lib/modules/ppolicy.inc:148
+#: ../lib/modules/ppolicy.inc:215
+#: ../lib/modules/ppolicy.inc:470
 #: ../lib/modules/sambaDomain.inc:98
 #: ../lib/modules/sambaDomain.inc:266
-#: ../lib/modules/sambaDomain.inc:654
+#: ../lib/modules/sambaDomain.inc:655
+#: ../lib/types/ppolicyType.inc:80
 msgid "Password history length"
 msgstr "历史密码长度"
 
+#: ../lib/modules/ppolicy.inc:146
 #: ../lib/modules/shadowAccount.inc:59
 #: ../lib/modules/shadowAccount.inc:60
 #: ../lib/modules/sambaDomain.inc:202
 msgid "Password maximum age must be are natural number."
 msgstr "密码最长生命期必须是自然数."
 
+#: ../lib/modules/ppolicy.inc:147
 #: ../lib/modules/shadowAccount.inc:65
 #: ../lib/modules/shadowAccount.inc:66
 #: ../lib/modules/sambaDomain.inc:200
 msgid "Password maximum age must be bigger as password minimum age."
 msgstr "密码最长生命期必须小于最短生命期."
 
+#: ../lib/modules/ppolicy.inc:145
 #: ../lib/modules/shadowAccount.inc:57
 #: ../lib/modules/shadowAccount.inc:58
 #: ../lib/modules/sambaDomain.inc:201
 msgid "Password minimum age must be are natural number."
 msgstr "密码最短生命期必须是自然数."
 
-#: ../templates/config/mainmanage.php:208
-#: ../help/help.inc:143
+#: ../lib/types/ppolicyType.inc:39
+msgid "Password policies"
+msgstr "密码策略"
+
+#: ../lib/types/ppolicyType.inc:48
+msgid "Password policies (ppolicy)"
+msgstr "密码策略"
+
+#: ../templates/config/mainmanage.php:214
+#: ../lib/modules/ppolicy.inc:54
+#: ../lib/modules/ppolicyUser.inc:38
+#: ../lib/modules/ppolicyUser.inc:48
+#: ../lib/modules/ppolicyUser.inc:55
+#: ../lib/modules/ppolicyUser.inc:95
+#: ../lib/modules/ppolicyUser.inc:161
+#: ../lib/modules/ppolicyUser.inc:188
+#: ../help/help.inc:145
 msgid "Password policy"
 msgstr "密码策略"
 
+#: ../lib/modules/ppolicy.inc:88
+#: ../lib/modules/ppolicy.inc:224
+#: ../lib/modules/ppolicy.inc:480
+#: ../lib/types/ppolicyType.inc:81
+msgid "Password quality check"
+msgstr "密码质量检查"
+
 #: ../lib/modules/shadowAccount.inc:63
-#: ../lib/modules/shadowAccount.inc:100
-#: ../lib/modules/shadowAccount.inc:169
-#: ../lib/modules/shadowAccount.inc:193
-#: ../lib/modules/shadowAccount.inc:283
-#: ../lib/modules/shadowAccount.inc:390
+#: ../lib/modules/shadowAccount.inc:104
+#: ../lib/modules/shadowAccount.inc:173
+#: ../lib/modules/shadowAccount.inc:201
+#: ../lib/modules/shadowAccount.inc:303
+#: ../lib/modules/shadowAccount.inc:417
 msgid "Password warning"
 msgstr "密码提醒日期"
 
@@ -4541,8 +4740,8 @@ msgstr "密码提醒日期"
 msgid "Password warning must be are natural number."
 msgstr "密码提醒日期必须是自然数."
 
-#: ../templates/config/confmain.php:585
-#: ../lib/modules.inc:1285
+#: ../templates/config/confmain.php:613
+#: ../lib/modules.inc:1324
 msgid "Passwords are different!"
 msgstr "密码不同!"
 
@@ -4550,25 +4749,25 @@ msgstr "密码不同!"
 #: ../lib/modules/nisObject.inc:74
 #: ../lib/modules/nisObject.inc:113
 #: ../lib/modules/nisObject.inc:129
-#: ../lib/modules/nisObject.inc:218
+#: ../lib/modules/nisObject.inc:219
 #: ../lib/types/nisObjectType.inc:77
 msgid "Path"
 msgstr "路径"
 
-#: ../lib/modules/sambaSamAccount.inc:337
+#: ../lib/modules/sambaSamAccount.inc:332
 msgid "Path of the user profile."
 msgstr "用户配置文件所在路径。"
 
-#: ../lib/modules/sambaSamAccount.inc:288
+#: ../lib/modules/sambaSamAccount.inc:283
 msgid "Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $user and $group are replaced with user and group name."
 msgstr "用户配置文件路径. 可以是本地绝对路径或UNC路径(\\\\server\\share).$user和$group会被用户名和组名代替."
 
-#: ../templates/config/confmain.php:378
+#: ../templates/config/confmain.php:405
 msgid "Path to external script"
 msgstr "外部脚本路径"
 
-#: ../lib/modules/ddns.inc:90
-#: ../lib/modules/ddns.inc:348
+#: ../lib/modules/ddns.inc:92
+#: ../lib/modules/ddns.inc:353
 msgid "Path to key for DNS updates"
 msgstr "DNS更新的KEY文件所有路径"
 
@@ -4581,16 +4780,16 @@ msgid "Personal"
 msgstr "个人信息"
 
 #: ../lib/modules/inetOrgPerson.inc:151
-#: ../lib/modules/inetOrgPerson.inc:1183
-#: ../lib/modules/inetOrgPerson.inc:1708
-#: ../lib/modules/inetOrgPerson.inc:1711
+#: ../lib/modules/inetOrgPerson.inc:1162
 #: ../lib/modules/inetOrgPerson.inc:1725
+#: ../lib/modules/inetOrgPerson.inc:1728
+#: ../lib/modules/inetOrgPerson.inc:1742
 #: ../lib/types/user.inc:102
-#: ../lib/types/user.inc:218
+#: ../lib/types/user.inc:219
 msgid "Photo"
 msgstr "照片"
 
-#: ../lib/modules/inetOrgPerson.inc:1222
+#: ../lib/modules/inetOrgPerson.inc:1201
 msgid "Photo file (JPG format)"
 msgstr "照片文件(JPG格式)"
 
@@ -4598,19 +4797,19 @@ msgstr "照片文件(JPG格式)"
 msgid "Please a comma separated list of your public SSH keys."
 msgstr "您的公钥列表,以逗号分隔."
 
-#: ../lib/modules/asteriskExtension.inc:184
+#: ../lib/modules/asteriskExtension.inc:202
 msgid "Please add at least one member."
 msgstr "至少需要增加一个成员."
 
-#: ../lib/modules/sambaSamAccount.inc:1055
+#: ../lib/modules/sambaSamAccount.inc:1049
 msgid "Please check your settings on the Unix page!"
 msgstr "请在UNIX中检查设置"
 
-#: ../templates/delete.php:87
+#: ../templates/delete.php:82
 msgid "Please confirm:"
 msgstr "请确认:"
 
-#: ../lib/modules/phpGroupwareUser.inc:124
+#: ../lib/modules/phpGroupwareUser.inc:135
 msgid "Please enter \"active\" or \"inactive\"."
 msgstr "请输入 \"active\" 或 \"inactive\"."
 
@@ -4618,11 +4817,11 @@ msgstr "请输入 \"active\" 或 \"inactive\"."
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "请输入RID或特殊账号名!"
 
-#: ../lib/modules/asteriskAccount.inc:143
+#: ../lib/modules/asteriskAccount.inc:152
 msgid "Please enter a caller ID."
 msgstr "请输入一个拨号ID."
 
-#: ../lib/modules/inetOrgPerson.inc:649
+#: ../lib/modules/inetOrgPerson.inc:628
 msgid "Please enter a comma separated list of host names where this user is allowed to log in. If you enable host restrictions for your servers then \"*\" means every host and an empty field means no host."
 msgstr "请输入允许用户登录的主机名(以逗号分隔).如果已经启用主机限制,\"*\"号代表所有主机,留空意味没有主机."
 
@@ -4631,7 +4830,7 @@ msgstr "请输入允许用户登录的主机名(以逗号分隔).如果已经启
 msgid "Please enter a comma separated list of host names!"
 msgstr "请输入以逗号分隔的主机名!"
 
-#: ../lib/modules/asteriskExtension.inc:177
+#: ../lib/modules/asteriskExtension.inc:195
 msgid "Please enter a common name."
 msgstr "请输入一个一般命名!"
 
@@ -4639,13 +4838,45 @@ msgstr "请输入一个一般命名!"
 msgid "Please enter a group name!"
 msgstr "请输入组名!"
 
+#: ../lib/modules/ppolicy.inc:153
+msgid "Please enter a numeric value for the expire warning."
+msgstr "请为过期告警输入一个数值。"
+
+#: ../lib/modules/ppolicy.inc:152
+msgid "Please enter a numeric value for the failure count interval."
+msgstr "请失败记录间隔输入一个数值。"
+
+#: ../lib/modules/ppolicy.inc:149
+msgid "Please enter a numeric value for the grace authentication limit."
+msgstr "请为缓期认证限制次数提供一个数值"
+
+#: ../lib/modules/ppolicy.inc:150
+msgid "Please enter a numeric value for the lockout duration."
+msgstr "请为锁定周期输入一个数值。"
+
+#: ../lib/modules/ppolicy.inc:151
+msgid "Please enter a numeric value for the maximum failure count."
+msgstr "请为最大失败次数记录输入一个数值"
+
+#: ../lib/modules/ppolicy.inc:154
+msgid "Please enter a numeric value for the minimum password length."
+msgstr "请为密码最小长度输入一个数值"
+
+#: ../lib/modules/ppolicy.inc:148
+msgid "Please enter a numeric value for the password history length."
+msgstr "请为密码历史长度输入一个数值"
+
+#: ../lib/modules/ppolicy.inc:73
+msgid "Please enter a unique name for this password policy."
+msgstr "请为这个密码策略输入一个唯一的名字"
+
 #: ../lib/modules/kolabUser.inc:264
 #: ../lib/modules/kolabUser.inc:268
 msgid "Please enter a user password."
 msgstr "请输入用户密码."
 
-#: ../lib/modules/eduPerson.inc:201
-#: ../lib/modules/eduPerson.inc:203
+#: ../lib/modules/eduPerson.inc:212
+#: ../lib/modules/eduPerson.inc:214
 msgid "Please enter a valid DN in the field:"
 msgstr "请输入有效的DN!"
 
@@ -4656,14 +4887,12 @@ msgstr "请输入有效的商业种类!"
 
 #: ../lib/modules/inetOrgPerson.inc:97
 #: ../lib/modules/inetOrgPerson.inc:98
-#: ../lib/modules/posixAccount.inc:91
-#: ../lib/modules/posixAccount.inc:92
+#: ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:95
 msgid "Please enter a valid common name!"
 msgstr "请输入有效的全名!"
 
 #: ../lib/modules/sambaSamAccount.inc:101
-#: ../lib/modules/sambaSamAccount.inc:102
-#: ../lib/modules/sambaSamAccount.inc:103
 msgid "Please enter a valid date in format DD-MM-YYYY."
 msgstr "请输入日期,格式为(DD-MM-YYYY)."
 
@@ -4672,7 +4901,7 @@ msgstr "请输入日期,格式为(DD-MM-YYYY)."
 msgid "Please enter a valid display name!"
 msgstr "请输入有效的显示名!"
 
-#: ../lib/modules/sambaSamAccount.inc:104
+#: ../lib/modules/sambaSamAccount.inc:102
 msgid "Please enter a valid drive letter."
 msgstr "请输入有效的盘符."
 
@@ -4691,7 +4920,7 @@ msgstr "请输入有效的雇员类别!"
 msgid "Please enter a valid fax number!"
 msgstr "请输入有效的传真号!"
 
-#: ../lib/modules/sambaSamAccount.inc:108
+#: ../lib/modules/sambaSamAccount.inc:106
 msgid "Please enter a valid group name!"
 msgstr "请输入有效的组名!"
 
@@ -4700,7 +4929,7 @@ msgstr "请输入有效的组名!"
 msgid "Please enter a valid job title!"
 msgstr "请输入有效的头衔!"
 
-#: ../lib/modules/eduPerson.inc:209
+#: ../lib/modules/eduPerson.inc:220
 msgid "Please enter a valid list of affiliations."
 msgstr "请输入有效的联系列表."
 
@@ -4724,11 +4953,11 @@ msgstr "请输入有效的邮政地址."
 msgid "Please enter a valid postal code!"
 msgstr "请输入有效的邮政编码!"
 
-#: ../lib/modules/eduPerson.inc:207
+#: ../lib/modules/eduPerson.inc:218
 msgid "Please enter a valid primary affiliation."
 msgstr "请输入有效的主要联系."
 
-#: ../lib/modules/eduPerson.inc:208
+#: ../lib/modules/eduPerson.inc:219
 msgid "Please enter a valid scoped affiliation."
 msgstr "请输入有效的有限联系."
 
@@ -4744,8 +4973,8 @@ msgstr "请输入有效的街道名!"
 msgid "Please enter a valid telephone number!"
 msgstr "请输入有效的电话号码!"
 
-#: ../lib/modules/posixGroup.inc:571
-#: ../lib/modules/posixAccount.inc:769
+#: ../lib/modules/posixGroup.inc:572
+#: ../lib/modules/posixAccount.inc:777
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "请输入有效值(介于%s和%s之间)!"
@@ -4755,7 +4984,7 @@ msgstr "请输入有效值(介于%s和%s之间)!"
 msgid "Please enter an email address on this page: %s"
 msgstr "请在本页面输入邮件地址:%s"
 
-#: ../lib/modules/ddns.inc:95
+#: ../lib/modules/ddns.inc:97
 msgid "Please enter the IP address of your DNS server."
 msgstr "请输入DNS服务器IP地址"
 
@@ -4763,15 +4992,15 @@ msgstr "请输入DNS服务器IP地址"
 msgid "Please enter the LDAP suffix where LAM should start to search for users. The LDAP filter needs to match the given user name to exactly one DN. The value \"%USER%\" will be replaced by the user name from the login page."
 msgstr "请输入LAM开始搜索用户的LDAP后缀.所给用户名经LDAP过滤器后需要精确匹配到一个DN.\"%USER%\"将在登录页替换为用户名."
 
-#: ../lib/modules.inc:1147
+#: ../lib/modules.inc:1174
 msgid "Please enter the account information on the other pages first."
 msgstr "请先在另一个页面输入帐号信息."
 
-#: ../lib/modules/asteriskExtension.inc:179
+#: ../lib/modules/asteriskExtension.inc:197
 msgid "Please enter the application data."
 msgstr "请输入应用数据."
 
-#: ../lib/modules/asteriskExtension.inc:178
+#: ../lib/modules/asteriskExtension.inc:196
 msgid "Please enter the application."
 msgstr "请输入应用名."
 
@@ -4779,16 +5008,16 @@ msgstr "请输入应用名."
 msgid "Please enter the configuration password. This is NOT your LDAP password. It is stored in your .conf-file. If this is the first time you log in, enter \"lam\"."
 msgstr "请输入配置文件的密码,不是LDAP中的密码,这个密码存放在配置文件中,第一次登录的话,请输入\"lam\"."
 
-#: ../lib/modules/asteriskExtension.inc:180
-#: ../lib/modules/asteriskAccount.inc:147
+#: ../lib/modules/asteriskExtension.inc:198
+#: ../lib/modules/asteriskAccount.inc:156
 msgid "Please enter the extension context."
 msgstr "请输入扩展的上下文."
 
-#: ../lib/modules/asteriskExtension.inc:181
+#: ../lib/modules/asteriskExtension.inc:199
 msgid "Please enter the extension name."
 msgstr "请输入扩展的名字."
 
-#: ../lib/modules/asteriskAccount.inc:150
+#: ../lib/modules/asteriskAccount.inc:159
 msgid "Please enter the host name."
 msgstr "请输入主机名."
 
@@ -4808,11 +5037,11 @@ msgstr "请输入映射条目(比如:\"-fstype=nfs,rw server:/projects\")"
 msgid "Please enter the mapping name for this entry (e.g. auto.home)."
 msgstr "请输入本条目的映射名(比如:auto.home)."
 
-#: ../help/help.inc:132
+#: ../help/help.inc:134
 msgid "Please enter the master configuration password. This is NOT your LDAP password. It is stored in your config.cfg file. If this is the first time you log in, enter \"lam\"."
 msgstr "请输入本系统管理配置密码,不是LDAP密码,存在在config.cfg文件中,如果第一次登录,请输入\"lam\"."
 
-#: ../templates/config/mainlogin.php:108
+#: ../templates/config/mainlogin.php:115
 msgid "Please enter the master password to change the general preferences:"
 msgstr "更改一般配置,请输入管理密码:"
 
@@ -4820,48 +5049,49 @@ msgstr "更改一般配置,请输入管理密码:"
 msgid "Please enter the mount point for this entry (e.g. /home)."
 msgstr "请输入本条目的mount点(比如:/home)."
 
-#: ../help/help.inc:120
+#: ../help/help.inc:122
 msgid "Please enter the name of the new profile and the password to change its settings. Profile names may contain letters, numbers and -/_."
 msgstr "请输入新配置文件名和密码.配置文件名可以包含字符和-/_ ."
 
-#: ../help/help.inc:122
+#: ../help/help.inc:124
 msgid "Please enter the new name of the profile. The name may contain letters, numbers and -/_."
 msgstr "請輸入新的設定檔名稱.可以包含字母,數字和 -/_ ."
 
-#: ../lib/modules/posixAccount.inc:389
-#: ../lib/modules/asteriskAccount.inc:81
+#: ../lib/modules/posixAccount.inc:381
+#: ../lib/modules/asteriskAccount.inc:90
 msgid "Please enter the password which you want to set for this account."
 msgstr "请输入这个帐号的密码."
 
-#: ../help/help.inc:163
+#: ../help/help.inc:165
 msgid "Please enter the password which you want to set for this account. You may also generate a random password (12 characters) which will be displayed on your screen."
 msgstr "请输入本帐号的密码.可以生成一个12个字符长的随机密码,显示在屏幕上."
 
-#: ../lib/modules/posixAccount.inc:360
+#: ../lib/modules/posixAccount.inc:352
 msgid "Please enter the path to the user's home directory."
 msgstr "请输入用户主目录路径."
 
-#: ../lib/modules/asteriskExtension.inc:182
+#: ../lib/modules/asteriskExtension.inc:200
 msgid "Please enter the priority."
 msgstr "请输入优先级."
 
-#: ../lib/modules/quota.inc:144
+#: ../lib/modules/quota.inc:146
 msgid "Please enter the quota settings for this mount point. The syntax is: {soft block limit},{hard block limit},{soft inode limit},{hard inode limit}"
 msgstr "请输入本挂接点的配额设置.语法为:(软块限制},{硬块限制},{软件节点限制},{硬节点限制}."
 
-#: ../templates/lists/changePassword.php:267
-msgid "Please enter the same password in both password-fields."
-msgstr "请在两个密码输入框输入相同的密码."
+#: ../templates/lists/changePassword.php:254
+#: ../lib/modules/posixAccount.inc:74
+msgid "Please enter the same password in both password fields."
+msgstr "在两个密码输入框请输入相同的密码."
 
-#: ../lib/modules/sambaSamAccount.inc:349
+#: ../lib/modules/sambaSamAccount.inc:344
 msgid "Please enter the time limit in minutes. 0 means unlimited."
 msgstr "请输入时间限制（分钟）。0代表不限制。"
 
-#: ../templates/selfService/adminLogin.php:100
+#: ../templates/selfService/adminLogin.php:107
 msgid "Please enter your master configuration password to change the self service profile:"
 msgstr "改变自助服务配置文件,请输入管理密码:"
 
-#: ../templates/config/conflogin.php:93
+#: ../templates/config/conflogin.php:100
 msgid "Please enter your password to change the server preferences:"
 msgstr "改变服务器配置,请输入密码:"
 
@@ -4869,47 +5099,47 @@ msgstr "改变服务器配置,请输入密码:"
 msgid "Please enter your public SSH key."
 msgstr "请输入您的SSH公钥."
 
-#: ../lib/modules/range.inc:380
-#: ../lib/modules/fixed_ip.inc:326
+#: ../lib/modules/range.inc:382
+#: ../lib/modules/fixed_ip.inc:320
 msgid "Please fill out the DHCP settings first."
 msgstr "请先填写DHCP设置"
 
-#: ../templates/tests/lamdaemonTest.php:268
+#: ../templates/tests/lamdaemonTest.php:261
 msgid "Please install the SSH2 module for PHP and activate it in your php.ini!"
 msgstr "请在PHP中安装SSH2模块并在php.ini中启用!"
 
-#: ../templates/masscreate.php:131
+#: ../templates/masscreate.php:208
 msgid "Please provide a CSV formated file with your account data. The cells in the first row must be filled with the column identifiers. The following rows represent one account for each row."
 msgstr "请提供帐号数据CSV格式文件.第一行必须为栏目标识,以下每行表示一个帐号."
 
-#: ../lib/modules/inetOrgPerson.inc:653
+#: ../templates/massBuildAccounts.php:211
+msgid "Please provide a file to upload."
+msgstr "请提供上传的文件。"
+
+#: ../lib/modules/inetOrgPerson.inc:632
 msgid "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr "请选择图像文件上传,必须是JPG格式(.jpg/.jpeg)."
 
-#: ../templates/masscreate.php:98
-msgid "Please select your account type:"
-msgstr "请选择帐号类型:"
-
-#: ../help/help.inc:138
+#: ../help/help.inc:140
 msgid "Please select your prefered log level. Messages with a lower level will not be logged."
 msgstr "请选择日志等级,在此等级以下的日志不会被记录."
 
-#: ../templates/login.php:265
+#: ../templates/login.php:223
 msgid "Please select your user name and enter your password to log in."
 msgstr "请输入用户名和密码登录."
 
-#: ../lib/modules.inc:1102
+#: ../lib/modules.inc:1129
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "请在页面%s上输入必须的属性."
 
-#: ../templates/selfService/profManage.php:117
-#: ../templates/config/profmanage.php:148
+#: ../templates/selfService/profManage.php:125
+#: ../templates/config/profmanage.php:154
 msgid "Please set up your master configuration file (config/config.cfg) first!"
 msgstr "请先主配置文件(config/config.cfg)!"
 
-#: ../lib/modules/dhcp_settings.inc:514
-#: ../lib/modules/ddns.inc:326
+#: ../lib/modules/dhcp_settings.inc:535
+#: ../lib/modules/ddns.inc:331
 msgid "Please set your LDAP suffix to an LDAP entry with object class \"dhcpServer\"."
 msgstr "请在您的LDAP后缀中设置一个含对象类\"dhcpServer\"."
 
@@ -4917,16 +5147,16 @@ msgstr "请在您的LDAP后缀中设置一个含对象类\"dhcpServer\"."
 msgid "Policy list has invalid format!"
 msgstr "策略列表含有非法格式!"
 
-#: ../templates/pdfedit/pdfpage.php:568
-#: ../templates/pdfedit/pdfpage.php:585
-#: ../templates/pdfedit/pdfpage.php:613
-#: ../templates/pdfedit/pdfpage.php:656
+#: ../templates/pdfedit/pdfpage.php:557
+#: ../templates/pdfedit/pdfpage.php:574
+#: ../templates/pdfedit/pdfpage.php:602
+#: ../templates/pdfedit/pdfpage.php:645
 msgid "Position"
 msgstr "位置"
 
-#: ../templates/masscreate.php:178
-#: ../templates/masscreate.php:319
-#: ../lib/modules/sambaGroupMapping.inc:439
+#: ../templates/masscreate.php:256
+#: ../templates/masscreate.php:400
+#: ../lib/modules/sambaGroupMapping.inc:440
 #: ../lib/modules/customScripts.inc:102
 #: ../lib/modules/customScripts.inc:104
 #: ../lib/modules/customScripts.inc:106
@@ -4936,11 +5166,11 @@ msgstr "可能的值"
 #: ../lib/modules/inetOrgPerson.inc:151
 #: ../lib/modules/inetOrgPerson.inc:221
 #: ../lib/modules/inetOrgPerson.inc:382
-#: ../lib/modules/inetOrgPerson.inc:612
-#: ../lib/modules/inetOrgPerson.inc:613
-#: ../lib/modules/inetOrgPerson.inc:985
-#: ../lib/modules/inetOrgPerson.inc:1249
-#: ../lib/modules/inetOrgPerson.inc:1648
+#: ../lib/modules/inetOrgPerson.inc:591
+#: ../lib/modules/inetOrgPerson.inc:592
+#: ../lib/modules/inetOrgPerson.inc:964
+#: ../lib/modules/inetOrgPerson.inc:1228
+#: ../lib/modules/inetOrgPerson.inc:1665
 msgid "Post office box"
 msgstr "邮政信箱"
 
@@ -4948,14 +5178,14 @@ msgstr "邮政信箱"
 #: ../lib/modules/inetOrgPerson.inc:150
 #: ../lib/modules/inetOrgPerson.inc:235
 #: ../lib/modules/inetOrgPerson.inc:374
-#: ../lib/modules/inetOrgPerson.inc:620
-#: ../lib/modules/inetOrgPerson.inc:1021
-#: ../lib/modules/inetOrgPerson.inc:1251
-#: ../lib/modules/inetOrgPerson.inc:1632
+#: ../lib/modules/inetOrgPerson.inc:599
+#: ../lib/modules/inetOrgPerson.inc:1000
+#: ../lib/modules/inetOrgPerson.inc:1230
+#: ../lib/modules/inetOrgPerson.inc:1649
 msgid "Postal address"
 msgstr "邮政地址"
 
-#: ../lib/modules/inetOrgPerson.inc:621
+#: ../lib/modules/inetOrgPerson.inc:600
 msgid "Postal address, city"
 msgstr "邮政地址,城市"
 
@@ -4963,11 +5193,11 @@ msgstr "邮政地址,城市"
 #: ../lib/modules/inetOrgPerson.inc:151
 #: ../lib/modules/inetOrgPerson.inc:225
 #: ../lib/modules/inetOrgPerson.inc:366
-#: ../lib/modules/inetOrgPerson.inc:616
-#: ../lib/modules/inetOrgPerson.inc:617
-#: ../lib/modules/inetOrgPerson.inc:994
-#: ../lib/modules/inetOrgPerson.inc:1250
-#: ../lib/modules/inetOrgPerson.inc:1640
+#: ../lib/modules/inetOrgPerson.inc:595
+#: ../lib/modules/inetOrgPerson.inc:596
+#: ../lib/modules/inetOrgPerson.inc:973
+#: ../lib/modules/inetOrgPerson.inc:1229
+#: ../lib/modules/inetOrgPerson.inc:1657
 msgid "Postal code"
 msgstr "邮政编码"
 
@@ -4980,117 +5210,117 @@ msgid "President"
 msgstr "总裁"
 
 #: ../lib/modules/eduPerson.inc:78
-#: ../lib/modules/eduPerson.inc:137
-#: ../lib/modules/eduPerson.inc:239
-#: ../lib/modules/eduPerson.inc:621
+#: ../lib/modules/eduPerson.inc:148
+#: ../lib/modules/eduPerson.inc:247
+#: ../lib/modules/eduPerson.inc:665
 msgid "Primary affiliation"
 msgstr "主要联系"
 
-#: ../lib/modules/posixGroup.inc:478
-#: ../lib/modules/posixAccount.inc:218
-#: ../lib/modules/posixAccount.inc:292
-#: ../lib/modules/posixAccount.inc:351
-#: ../lib/modules/posixAccount.inc:380
-#: ../lib/modules/posixAccount.inc:418
-#: ../lib/modules/posixAccount.inc:950
-#: ../lib/modules/posixAccount.inc:1081
-#: ../lib/modules/posixAccount.inc:1121
-#: ../lib/modules/posixAccount.inc:1171
+#: ../lib/modules/posixGroup.inc:479
+#: ../lib/modules/posixAccount.inc:221
+#: ../lib/modules/posixAccount.inc:295
+#: ../lib/modules/posixAccount.inc:343
+#: ../lib/modules/posixAccount.inc:372
+#: ../lib/modules/posixAccount.inc:410
+#: ../lib/modules/posixAccount.inc:960
+#: ../lib/modules/posixAccount.inc:1091
+#: ../lib/modules/posixAccount.inc:1131
+#: ../lib/modules/posixAccount.inc:1181
 msgid "Primary group"
 msgstr "主要组"
 
 #: ../lib/modules/eduPerson.inc:115
-#: ../lib/modules/eduPerson.inc:175
-#: ../lib/modules/eduPerson.inc:203
-#: ../lib/modules/eduPerson.inc:353
-#: ../lib/modules/eduPerson.inc:645
+#: ../lib/modules/eduPerson.inc:186
+#: ../lib/modules/eduPerson.inc:214
+#: ../lib/modules/eduPerson.inc:361
+#: ../lib/modules/eduPerson.inc:689
 msgid "Primary organizational unit"
 msgstr "主要组织单元"
 
 #: ../lib/modules/eduPerson.inc:99
-#: ../lib/modules/eduPerson.inc:130
-#: ../lib/modules/eduPerson.inc:229
-#: ../lib/modules/eduPerson.inc:627
+#: ../lib/modules/eduPerson.inc:141
+#: ../lib/modules/eduPerson.inc:237
+#: ../lib/modules/eduPerson.inc:671
 msgid "Principal name"
 msgstr "主要的名字"
 
-#: ../lib/modules/eduPerson.inc:199
-#: ../lib/modules/eduPerson.inc:200
+#: ../lib/modules/eduPerson.inc:210
+#: ../lib/modules/eduPerson.inc:211
 msgid "Principal name is invalid!"
 msgstr "主要的名字非法!"
 
-#: ../lib/modules/asteriskExtension.inc:76
-#: ../lib/modules/asteriskExtension.inc:99
-#: ../lib/modules/asteriskExtension.inc:128
-#: ../lib/modules/asteriskExtension.inc:208
-#: ../lib/modules/asteriskExtension.inc:433
+#: ../lib/modules/asteriskExtension.inc:90
+#: ../lib/modules/asteriskExtension.inc:117
+#: ../lib/modules/asteriskExtension.inc:146
+#: ../lib/modules/asteriskExtension.inc:226
+#: ../lib/modules/asteriskExtension.inc:466
 #: ../lib/types/asteriskExt.inc:93
 msgid "Priority"
 msgstr "优先级"
 
-#: ../lib/modules/inetOrgPerson.inc:657
+#: ../lib/modules/inetOrgPerson.inc:636
 msgid "Private telephone number"
 msgstr "个人电话号码"
 
-#: ../templates/selfService/profManage.php:100
-#: ../templates/config/profmanage.php:110
+#: ../templates/selfService/profManage.php:108
+#: ../templates/config/profmanage.php:116
 msgid "Profile deleted."
 msgstr "配置文件被删除."
 
-#: ../templates/profedit/profilemain.php:108
+#: ../templates/profedit/profilemain.php:98
 #: ../lib/tools/profileEditor.inc:44
 msgid "Profile editor"
 msgstr "配置文件编辑器"
 
 #: ../templates/selfService/profManage.php:38
-#: ../templates/selfService/profManage.php:130
+#: ../templates/selfService/profManage.php:138
 #: ../templates/config/profmanage.php:52
-#: ../templates/config/profmanage.php:161
-#: ../help/help.inc:119
+#: ../templates/config/profmanage.php:167
 #: ../help/help.inc:121
 #: ../help/help.inc:123
 #: ../help/help.inc:125
 #: ../help/help.inc:127
+#: ../help/help.inc:129
 msgid "Profile management"
 msgstr "配置文件管理"
 
-#: ../templates/selfService/profManage.php:145
-#: ../templates/selfService/profManage.php:193
-#: ../templates/profedit/profilepage.php:251
-#: ../templates/config/profmanage.php:176
-#: ../templates/config/profmanage.php:225
-#: ../help/help.inc:152
+#: ../templates/selfService/profManage.php:153
+#: ../templates/selfService/profManage.php:201
+#: ../templates/profedit/profilepage.php:247
+#: ../templates/config/profmanage.php:182
+#: ../templates/config/profmanage.php:231
+#: ../help/help.inc:154
 msgid "Profile name"
 msgstr "配置文件名"
 
-#: ../templates/selfService/profManage.php:76
-#: ../templates/selfService/profManage.php:91
-#: ../templates/config/profmanage.php:94
-#: ../templates/config/profmanage.php:105
+#: ../templates/selfService/profManage.php:84
+#: ../templates/selfService/profManage.php:99
+#: ../templates/config/profmanage.php:100
+#: ../templates/config/profmanage.php:111
 msgid "Profile name is invalid!"
 msgstr "配置文件名非法!"
 
-#: ../templates/config/profmanage.php:189
-#: ../templates/config/profmanage.php:283
+#: ../templates/config/profmanage.php:195
+#: ../templates/config/profmanage.php:289
 msgid "Profile password"
 msgstr "配置文件密码"
 
-#: ../templates/config/profmanage.php:92
-#: ../templates/config/profmanage.php:123
+#: ../templates/config/profmanage.php:98
+#: ../templates/config/profmanage.php:129
 msgid "Profile passwords are different or empty!"
 msgstr "配置文件密码不同或为空!"
 
 #: ../lib/modules/sambaSamAccount.inc:84
 #: ../lib/modules/sambaSamAccount.inc:85
-#: ../lib/modules/sambaSamAccount.inc:287
-#: ../lib/modules/sambaSamAccount.inc:336
-#: ../lib/modules/sambaSamAccount.inc:492
-#: ../lib/modules/sambaSamAccount.inc:597
-#: ../lib/modules/sambaSamAccount.inc:1199
-#: ../lib/modules/sambaSamAccount.inc:1475
-#: ../lib/modules/sambaSamAccount.inc:1635
-#: ../lib/modules/sambaSamAccount.inc:1817
-#: ../lib/modules/sambaSamAccount.inc:1839
+#: ../lib/modules/sambaSamAccount.inc:282
+#: ../lib/modules/sambaSamAccount.inc:331
+#: ../lib/modules/sambaSamAccount.inc:473
+#: ../lib/modules/sambaSamAccount.inc:578
+#: ../lib/modules/sambaSamAccount.inc:1171
+#: ../lib/modules/sambaSamAccount.inc:1444
+#: ../lib/modules/sambaSamAccount.inc:1594
+#: ../lib/modules/sambaSamAccount.inc:1773
+#: ../lib/modules/sambaSamAccount.inc:1795
 msgid "Profile path"
 msgstr "配置文件路径"
 
@@ -5099,21 +5329,21 @@ msgstr "配置文件路径"
 msgid "Profile path is invalid!"
 msgstr "配置文件路径非法!"
 
-#: ../templates/profedit/profilepage.php:126
+#: ../templates/profedit/profilepage.php:122
 msgid "Profile was saved."
 msgstr "配置文件已保存."
 
-#: ../lib/modules/quota.inc:75
-#: ../lib/modules/quota.inc:143
+#: ../lib/modules/quota.inc:77
+#: ../lib/modules/quota.inc:145
 msgid "Quota"
 msgstr "配额"
 
-#: ../lib/modules/quota.inc:635
+#: ../lib/modules/quota.inc:638
 #, php-format
 msgid "Quota for %s on %s"
 msgstr "%s 在 %s 的硬盘配额:"
 
-#: ../lib/modules/quota.inc:58
+#: ../lib/modules/quota.inc:60
 msgid "Quota has wrong format!"
 msgstr "磁盘配额格式错误!"
 
@@ -5121,10 +5351,10 @@ msgstr "磁盘配额格式错误!"
 msgid "RDN"
 msgstr "RDN"
 
-#: ../templates/masscreate.php:171
-#: ../templates/profedit/profilepage.php:205
-#: ../lib/modules.inc:1521
-#: ../help/help.inc:150
+#: ../templates/masscreate.php:249
+#: ../templates/profedit/profilepage.php:201
+#: ../lib/modules.inc:1548
+#: ../help/help.inc:152
 msgid "RDN identifier"
 msgstr "RDN标志"
 
@@ -5136,31 +5366,31 @@ msgstr "RID (Windows UID)"
 #: ../lib/modules/sambaDomain.inc:151
 #: ../lib/modules/sambaDomain.inc:376
 #: ../lib/modules/sambaDomain.inc:382
-#: ../lib/modules/sambaDomain.inc:648
+#: ../lib/modules/sambaDomain.inc:649
 msgid "RID base"
 msgstr "RID 基类"
 
-#: ../lib/modules/range.inc:76
-#: ../lib/modules/range.inc:405
+#: ../lib/modules/range.inc:78
+#: ../lib/modules/range.inc:407
 msgid "Range from"
 msgstr "范围起始自"
 
-#: ../lib/modules/range.inc:79
-#: ../lib/modules/range.inc:419
+#: ../lib/modules/range.inc:81
+#: ../lib/modules/range.inc:421
 msgid "Range to"
 msgstr "范围到"
 
 #: ../lib/modules/range.inc:60
-#: ../lib/modules/range.inc:472
+#: ../lib/modules/range.inc:474
 msgid "Ranges"
 msgstr "范围"
 
-#: ../templates/config/confmain.php:407
+#: ../templates/config/confmain.php:434
 msgid "Read"
 msgstr "读"
 
-#: ../templates/config/confmain.php:305
-#: ../templates/config/confmain.php:308
+#: ../templates/config/confmain.php:332
+#: ../templates/config/confmain.php:335
 msgid "Read only"
 msgstr "只读"
 
@@ -5168,7 +5398,7 @@ msgstr "只读"
 msgid "Really create this new OU?"
 msgstr "确认增加新的OU?"
 
-#: ../templates/tree/edit.php:527
+#: ../templates/tree/edit.php:530
 msgid "Really delete attribute?"
 msgstr "确定删除属性?"
 
@@ -5179,14 +5409,14 @@ msgstr "收件人"
 
 #: ../lib/modules/nisMailAlias.inc:75
 #: ../lib/modules/nisMailAlias.inc:89
-#: ../lib/modules/nisMailAlias.inc:280
+#: ../lib/modules/nisMailAlias.inc:281
 #: ../lib/types/mailAlias.inc:92
 msgid "Recipient list"
 msgstr "收件人列表"
 
-#: ../lib/modules/sambaSamAccount.inc:366
-#: ../lib/modules/sambaSamAccount.inc:1550
-#: ../lib/modules/sambaSamAccount.inc:1891
+#: ../lib/modules/sambaSamAccount.inc:361
+#: ../lib/modules/sambaSamAccount.inc:1519
+#: ../lib/modules/sambaSamAccount.inc:1847
 msgid "Reconnect if disconnected"
 msgstr "如果中断重新连接"
 
@@ -5194,22 +5424,23 @@ msgstr "如果中断重新连接"
 msgid "Recursive delete progress"
 msgstr "递归删除过程"
 
-#: ../templates/config/mainmanage.php:352
+#: ../templates/config/mainmanage.php:357
 msgid "Reenter new master password"
 msgstr "请重新输入管理密码"
 
-#: ../templates/config/confmain.php:498
-#: ../lib/modules/posixAccount.inc:1704
+#: ../templates/config/confmain.php:525
+#: ../lib/modules/posixAccount.inc:1708
 msgid "Reenter password"
 msgstr "再次输入密码"
 
-#: ../templates/config/profmanage.php:198
-#: ../templates/config/profmanage.php:296
+#: ../templates/config/profmanage.php:204
+#: ../templates/config/profmanage.php:302
 msgid "Reenter profile password"
 msgstr "再次输入配置文件密码"
 
 #: ../templates/tree/edit.php:101
-#: ../lib/lists.inc:321
+#: ../lib/modules/asteriskExtension.inc:297
+#: ../lib/lists.inc:268
 #: ../lib/tree.inc:88
 #: ../lib/tree.inc:89
 msgid "Refresh"
@@ -5223,94 +5454,118 @@ msgstr "如果冲突会被拒绝"
 msgid "Relative distinguished name"
 msgstr "相对区别名称(RDN)"
 
-#: ../templates/pdfedit/pdfpage.php:426
-#: ../templates/config/confmodules.php:267
+#: ../templates/pdfedit/pdfpage.php:415
+#: ../templates/config/confmodules.php:273
 #: ../lib/modules/nisMailAlias.inc:148
 #: ../lib/modules/ieee802device.inc:104
+#: ../lib/modules/ipHost.inc:125
 #: ../lib/modules/groupOfNames.inc:158
 #: ../lib/modules/kolabUser.inc:332
 #: ../lib/modules/kolabUser.inc:351
 #: ../lib/modules/kolabUser.inc:377
-#: ../lib/modules/kolabUser.inc:893
+#: ../lib/modules/kolabUser.inc:895
 #: ../lib/modules/ldapPublicKey.inc:98
 #: ../lib/modules/inetLocalMailRecipient.inc:160
-#: ../lib/modules/sambaSamAccount.inc:1432
-#: ../lib/modules/shadowAccount.inc:374
-#: ../lib/modules/phpGroupwareUser.inc:247
+#: ../lib/modules/sambaSamAccount.inc:1401
+#: ../lib/modules/shadowAccount.inc:401
+#: ../lib/modules/phpGroupwareUser.inc:258
 msgid "Remove"
 msgstr "删除"
 
-#: ../lib/modules/posixGroup.inc:198
-#: ../lib/modules/posixAccount.inc:999
+#: ../lib/modules/eduPerson.inc:396
+msgid "Remove EDU person extension"
+msgstr "删除EDU用户扩展"
+
+#: ../lib/modules/ipHost.inc:175
+msgid "Remove IP address extension"
+msgstr "删除 IP 地址扩展"
+
+#: ../lib/modules/sambaSamAccount.inc:1261
+msgid "Remove Samba 3 extension"
+msgstr "删除 Samba 3 扩展"
+
+#: ../lib/modules/shadowAccount.inc:343
+msgid "Remove Shadow account extension"
+msgstr "删除 Shadow 帐号扩展"
+
+#: ../lib/modules/posixGroup.inc:199
+#: ../lib/modules/posixAccount.inc:1009
 msgid "Remove password"
 msgstr "删除密码"
 
 #: ../lib/modules/phpGroupwareGroup.inc:101
-#: ../lib/modules/phpGroupwareUser.inc:178
+#: ../lib/modules/phpGroupwareUser.inc:189
 msgid "Remove phpGroupWare extension"
 msgstr "删除 phpGroupWare 扩展"
 
-#: ../lib/modules/groupOfNames.inc:328
+#: ../lib/modules/groupOfNames.inc:320
 msgid "Remove selected entries"
 msgstr "删除所选条目"
 
-#: ../templates/config/conftypes.php:229
+#: ../templates/config/conftypes.php:235
 msgid "Remove this account type"
 msgstr "删除这个帐号类型"
 
-#: ../lib/modules/inetOrgPerson.inc:1716
+#: ../lib/modules/inetOrgPerson.inc:1733
 msgid "Remove/replace photo"
 msgstr "删除/更改照片"
 
-#: ../templates/selfService/profManage.php:189
-#: ../templates/config/profmanage.php:221
-#: ../help/help.inc:121
+#: ../templates/selfService/profManage.php:197
+#: ../templates/config/profmanage.php:227
+#: ../help/help.inc:123
 msgid "Rename profile"
 msgstr "配置文件重命名"
 
-#: ../templates/selfService/profManage.php:87
-#: ../templates/config/profmanage.php:101
+#: ../templates/selfService/profManage.php:95
+#: ../templates/config/profmanage.php:107
 msgid "Renamed profile."
 msgstr "已更名的配置文件."
 
-#: ../templates/lists/changePassword.php:211
-#: ../lib/modules.inc:1256
+#: ../templates/lists/changePassword.php:206
+#: ../lib/modules.inc:1285
 msgid "Repeat password"
 msgstr "确认密码"
 
-#: ../lib/modules/posixAccount.inc:65
-#: ../lib/modules/posixAccount.inc:792
+#: ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:800
 msgid "Replaced $user or $group in homedir."
 msgstr "在homedir中已更改$user和$group. "
 
-#: ../templates/tree/edit.php:246
+#: ../lib/modules/ppolicy.inc:120
+#: ../lib/modules/ppolicy.inc:279
+#: ../lib/modules/ppolicy.inc:496
+#: ../lib/types/ppolicyType.inc:89
+msgid "Require password change on first login"
+msgstr "第一次登录时需要修改密码"
+
+#: ../templates/tree/edit.php:249
 #, php-format
 msgid "Required attribute for objectClass(es) %s"
 msgstr "%s 对象类的必选属性"
 
-#: ../templates/schema/schema.php:388
+#: ../templates/schema/schema.php:381
 #: ../templates/tree/templates/creation/custom.php:187
 msgid "Required attributes"
 msgstr "必选属性"
 
-#: ../templates/profedit/profilepage.php:259
-#: ../lib/modules/sambaSamAccount.inc:1281
+#: ../templates/profedit/profilepage.php:255
+#: ../lib/modules/sambaSamAccount.inc:1253
 msgid "Reset"
 msgstr "复位"
 
-#: ../lib/modules.inc:1322
+#: ../lib/modules.inc:1361
 msgid "Reset changes"
 msgstr "复位设定"
 
-#: ../lib/modules/sambaSamAccount.inc:243
-#: ../lib/modules/sambaSamAccount.inc:1280
+#: ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/sambaSamAccount.inc:1252
 msgid "Reset password"
 msgstr "复位密码"
 
 #: ../lib/modules/sambaDomain.inc:130
 #: ../lib/modules/sambaDomain.inc:204
 #: ../lib/modules/sambaDomain.inc:346
-#: ../lib/modules/sambaDomain.inc:684
+#: ../lib/modules/sambaDomain.inc:685
 msgid "Reset time after lockout"
 msgstr "在锁定后复位时间"
 
@@ -5318,14 +5573,14 @@ msgstr "在锁定后复位时间"
 msgid "Reset time after lockout must be are natural number."
 msgstr "锁定帐号后复位时间必须是自然数."
 
-#: ../lib/modules/ddns.inc:100
-#: ../lib/modules/ddns.inc:128
-#: ../lib/modules/ddns.inc:379
-#: ../lib/modules/ddns.inc:408
+#: ../lib/modules/ddns.inc:102
+#: ../lib/modules/ddns.inc:130
+#: ../lib/modules/ddns.inc:384
+#: ../lib/modules/ddns.inc:413
 msgid "Reverse zone names"
 msgstr "反向域名"
 
-#: ../templates/config/confmain.php:384
+#: ../templates/config/confmain.php:411
 #: ../help/help.inc:113
 msgid "Rights for the home directory"
 msgstr "个人目录的权限"
@@ -5333,29 +5588,29 @@ msgstr "个人目录的权限"
 #: ../lib/modules/inetOrgPerson.inc:152
 #: ../lib/modules/inetOrgPerson.inc:241
 #: ../lib/modules/inetOrgPerson.inc:430
-#: ../lib/modules/inetOrgPerson.inc:660
-#: ../lib/modules/inetOrgPerson.inc:1039
-#: ../lib/modules/inetOrgPerson.inc:1258
-#: ../lib/modules/inetOrgPerson.inc:1656
+#: ../lib/modules/inetOrgPerson.inc:639
+#: ../lib/modules/inetOrgPerson.inc:1018
+#: ../lib/modules/inetOrgPerson.inc:1237
+#: ../lib/modules/inetOrgPerson.inc:1673
 msgid "Room number"
 msgstr "房间号"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:61
 #: ../lib/modules/inetLocalMailRecipient.inc:96
 #: ../lib/modules/inetLocalMailRecipient.inc:143
-#: ../lib/modules/inetLocalMailRecipient.inc:313
+#: ../lib/modules/inetLocalMailRecipient.inc:314
 msgid "Routing address"
 msgstr "邮寄地址"
 
-#: ../templates/serverInfo.php:111
+#: ../templates/serverInfo.php:112
 msgid "SASL mechanisms"
 msgstr "SASL机制"
 
-#: ../templates/tests/lamdaemonTest.php:278
+#: ../templates/tests/lamdaemonTest.php:271
 msgid "SSH connection"
 msgstr "SSH连接"
 
-#: ../templates/tests/lamdaemonTest.php:295
+#: ../templates/tests/lamdaemonTest.php:282
 msgid "SSH connection could be established."
 msgstr "SSH连接可以建立."
 
@@ -5367,20 +5622,20 @@ msgstr "SSH连接可以建立."
 msgid "SSH public key"
 msgstr "SSH公钥"
 
-#: ../lib/modules/ldapPublicKey.inc:167
+#: ../lib/modules/ldapPublicKey.inc:168
 msgid "SSH public key(s)"
 msgstr "SSH 公钥"
 
-#: ../templates/tests/lamdaemonTest.php:261
+#: ../templates/tests/lamdaemonTest.php:254
 msgid "SSH2 module"
 msgstr "SSH2模块"
 
-#: ../templates/tests/lamdaemonTest.php:264
+#: ../templates/tests/lamdaemonTest.php:257
 msgid "SSH2 module is installed."
 msgstr "SSH2模块已安装."
 
-#: ../lib/modules/sambaGroupMapping.inc:299
-#: ../lib/modules/sambaSamAccount.inc:126
+#: ../lib/modules/sambaGroupMapping.inc:300
+#: ../lib/modules/sambaSamAccount.inc:124
 msgid "Samba 3"
 msgstr "Samba 3"
 
@@ -5393,19 +5648,19 @@ msgstr "Samba 3 域SID非法!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 域条目"
 
-#: ../lib/modules/sambaSamAccount.inc:308
-#: ../lib/modules/sambaSamAccount.inc:312
-#: ../lib/modules/sambaSamAccount.inc:467
-#: ../lib/modules/sambaSamAccount.inc:533
+#: ../lib/modules/sambaSamAccount.inc:303
+#: ../lib/modules/sambaSamAccount.inc:307
+#: ../lib/modules/sambaSamAccount.inc:448
+#: ../lib/modules/sambaSamAccount.inc:514
 msgid "Samba RID"
 msgstr "Samba RID"
 
-#: ../lib/modules/sambaGroupMapping.inc:337
-#: ../lib/modules/sambaGroupMapping.inc:362
+#: ../lib/modules/sambaGroupMapping.inc:338
+#: ../lib/modules/sambaGroupMapping.inc:363
 msgid "Samba RID number"
 msgstr "Samba RID号"
 
-#: ../lib/modules/sambaGroupMapping.inc:331
+#: ../lib/modules/sambaGroupMapping.inc:332
 msgid "Samba display name"
 msgstr "Samba 显示名"
 
@@ -5413,7 +5668,7 @@ msgstr "Samba 显示名"
 msgid "Samba domain"
 msgstr "Samba 域"
 
-#: ../lib/modules/sambaGroupMapping.inc:323
+#: ../lib/modules/sambaGroupMapping.inc:324
 msgid "Samba domain name"
 msgstr "Samba 域名"
 
@@ -5421,42 +5676,42 @@ msgstr "Samba 域名"
 msgid "Samba domains"
 msgstr "Samba 域"
 
-#: ../lib/modules/sambaGroupMapping.inc:343
-#: ../lib/modules/sambaGroupMapping.inc:370
-#: ../lib/modules/sambaGroupMapping.inc:388
+#: ../lib/modules/sambaGroupMapping.inc:344
+#: ../lib/modules/sambaGroupMapping.inc:371
+#: ../lib/modules/sambaGroupMapping.inc:389
 msgid "Samba group type"
 msgstr "Samba 组类型"
 
-#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:235
 msgid "Samba password"
 msgstr "Samba密码"
 
 #: ../lib/modules/sambaSamAccount.inc:90
-#: ../lib/modules/sambaSamAccount.inc:293
-#: ../lib/modules/sambaSamAccount.inc:296
-#: ../lib/modules/sambaSamAccount.inc:508
-#: ../lib/modules/sambaSamAccount.inc:604
-#: ../lib/modules/sambaSamAccount.inc:1215
-#: ../lib/modules/sambaSamAccount.inc:1651
-#: ../lib/modules/sambaSamAccount.inc:1820
+#: ../lib/modules/sambaSamAccount.inc:288
+#: ../lib/modules/sambaSamAccount.inc:291
+#: ../lib/modules/sambaSamAccount.inc:489
+#: ../lib/modules/sambaSamAccount.inc:585
+#: ../lib/modules/sambaSamAccount.inc:1187
+#: ../lib/modules/sambaSamAccount.inc:1610
+#: ../lib/modules/sambaSamAccount.inc:1776
 msgid "Samba workstations"
 msgstr "Samba工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:1339
+#: ../lib/modules/sambaSamAccount.inc:1318
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../templates/tree/edit.php:512
-#: ../templates/selfService/adminMain.php:288
-#: ../templates/selfService/selfServiceMain.php:111
-#: ../templates/pdfedit/pdfpage.php:669
-#: ../templates/pdfedit/pdfpage.php:705
-#: ../templates/profedit/profilepage.php:257
-#: ../templates/config/conftypes.php:183
-#: ../templates/config/confmain.php:202
-#: ../templates/config/confmodules.php:168
-#: ../templates/config/moduleSettings.php:167
-#: ../lib/modules.inc:1319
+#: ../templates/tree/edit.php:515
+#: ../templates/selfService/adminMain.php:296
+#: ../templates/selfService/selfServiceMain.php:117
+#: ../templates/pdfedit/pdfpage.php:658
+#: ../templates/pdfedit/pdfpage.php:694
+#: ../templates/profedit/profilepage.php:253
+#: ../templates/config/conftypes.php:189
+#: ../templates/config/confmain.php:207
+#: ../templates/config/confmodules.php:174
+#: ../templates/config/moduleSettings.php:173
+#: ../lib/modules.inc:1358
 msgid "Save"
 msgstr "保存"
 
@@ -5468,24 +5723,24 @@ msgstr "保存为文件"
 msgid "Schema browser"
 msgstr "Schema浏览器"
 
-#: ../templates/serverInfo.php:108
+#: ../templates/serverInfo.php:104
 msgid "Schema suffix"
 msgstr "Schema 后缀"
 
-#: ../templates/tests/index.php:61
-#: ../templates/tests/schemaTest.php:61
+#: ../templates/tests/index.php:53
+#: ../templates/tests/schemaTest.php:50
 msgid "Schema test"
 msgstr "Schema测试"
 
-#: ../templates/pdfedit/pdfdelete.php:62
-#: ../templates/pdfedit/pdfdelete.php:65
+#: ../templates/pdfedit/pdfdelete.php:60
+#: ../templates/pdfedit/pdfdelete.php:63
 msgid "Scope"
 msgstr "范围"
 
 #: ../lib/modules/eduPerson.inc:82
-#: ../lib/modules/eduPerson.inc:144
-#: ../lib/modules/eduPerson.inc:252
-#: ../lib/modules/eduPerson.inc:624
+#: ../lib/modules/eduPerson.inc:155
+#: ../lib/modules/eduPerson.inc:260
+#: ../lib/modules/eduPerson.inc:668
 msgid "Scoped affiliation"
 msgstr "联系范围"
 
@@ -5493,15 +5748,15 @@ msgstr "联系范围"
 msgid "Script path"
 msgstr "脚本路径"
 
-#: ../templates/config/confmain.php:561
+#: ../templates/config/confmain.php:589
 msgid "Script path is invalid!"
 msgstr "脚本路径非法!"
 
-#: ../templates/config/confmain.php:580
+#: ../templates/config/confmain.php:608
 msgid "Script rights are invalid!"
 msgstr "脚本权限非法!"
 
-#: ../templates/config/confmain.php:564
+#: ../templates/config/confmain.php:592
 msgid "Script server is invalid!"
 msgstr "脚本服务器非法!"
 
@@ -5509,10 +5764,6 @@ msgstr "脚本服务器非法!"
 msgid "Script servers"
 msgstr "脚本服务器"
 
-#: ../templates/config/confmain.php:367
-msgid "Script settings"
-msgstr "脚本设定"
-
 #: ../templates/tree/export_form.php:115
 #: ../lib/export.inc:443
 #: ../lib/export.inc:513
@@ -5525,12 +5776,16 @@ msgstr "搜索过滤器"
 msgid "Search scope"
 msgstr "搜索范围"
 
-#: ../templates/pdfedit/pdfpage.php:560
+#: ../lib/modules/asteriskExtension.inc:292
+msgid "Search tree suffix for users"
+msgstr "查询用户的树后缀"
+
+#: ../templates/pdfedit/pdfpage.php:549
 msgid "Section"
 msgstr "节"
 
-#: ../templates/config/mainmanage.php:161
-#: ../templates/config/confmain.php:434
+#: ../templates/config/mainmanage.php:167
+#: ../templates/config/confmain.php:461
 msgid "Security settings"
 msgstr "安全设定"
 
@@ -5538,8 +5793,7 @@ msgstr "安全设定"
 msgid "See also"
 msgstr "同时参考"
 
-#: ../lib/lists.inc:831
-#: ../lib/types/group.inc:247
+#: ../lib/account.inc:628
 msgid "See the manual for instructions to solve this problem."
 msgstr "参考手册来解决本问题."
 
@@ -5547,7 +5801,7 @@ msgstr "参考手册来解决本问题."
 msgid "Select a template for the creation process"
 msgstr "为新建处理选择模板"
 
-#: ../lib/lists.inc:442
+#: ../lib/lists.inc:382
 msgid "Select all"
 msgstr "全选"
 
@@ -5562,16 +5816,17 @@ msgid "Select user"
 msgstr "选择用户"
 
 #: ../lib/modules/nisnetgroup.inc:354
-#: ../lib/modules/posixAccount.inc:1043
+#: ../lib/modules/posixAccount.inc:1053
 msgid "Selected groups"
 msgstr "已选择的组"
 
-#: ../templates/config/confmodules.php:243
+#: ../templates/masscreate.php:146
+#: ../templates/config/confmodules.php:249
 msgid "Selected modules"
 msgstr "已选择的模块"
 
-#: ../lib/modules/posixGroup.inc:242
-#: ../lib/modules/asteriskExtension.inc:270
+#: ../lib/modules/posixGroup.inc:243
+#: ../lib/modules/asteriskExtension.inc:303
 msgid "Selected users"
 msgstr "已选择的用户"
 
@@ -5579,45 +5834,45 @@ msgstr "已选择的用户"
 msgid "Self service configuration"
 msgstr "自助服务配置"
 
-#: ../templates/selfService/adminMain.php:267
+#: ../templates/selfService/adminMain.php:275
 msgid "Self service configuration editor"
 msgstr "自助服务配置编辑器"
 
-#: ../templates/tests/lamdaemonTest.php:80
+#: ../templates/tests/lamdaemonTest.php:72
 msgid "Server"
 msgstr "服务器"
 
-#: ../templates/selfService/adminMain.php:324
-#: ../templates/config/confmain.php:224
+#: ../templates/selfService/adminMain.php:332
+#: ../templates/config/confmain.php:229
 #: ../help/help.inc:57
 msgid "Server address"
 msgstr "服务器地址"
 
 #: ../templates/selfService/adminMain.php:95
-#: ../templates/config/confmain.php:532
+#: ../templates/config/confmain.php:559
 msgid "Server address is invalid!"
 msgstr "服务器地址非法!"
 
-#: ../templates/serverInfo.php:93
+#: ../templates/serverInfo.php:89
 #: ../lib/tools/serverInfo.inc:44
 msgid "Server information"
 msgstr "服务器信息"
 
-#: ../templates/config/confmain.php:371
+#: ../templates/config/confmain.php:398
 msgid "Server list"
 msgstr "服务器列表"
 
-#: ../templates/login.php:364
+#: ../templates/login.php:322
 msgid "Server profile"
 msgstr "服务器设置文件"
 
-#: ../templates/selfService/adminMain.php:321
-#: ../templates/config/confmain.php:221
+#: ../templates/selfService/adminMain.php:329
+#: ../templates/config/confmain.php:226
 msgid "Server settings"
 msgstr "服务器设置"
 
-#: ../templates/config/mainmanage.php:167
-#: ../help/help.inc:135
+#: ../templates/config/mainmanage.php:173
+#: ../help/help.inc:137
 msgid "Session timeout"
 msgstr "会话超时"
 
@@ -5625,30 +5880,30 @@ msgstr "会话超时"
 msgid "Set"
 msgstr "设置"
 
-#: ../lib/modules.inc:1225
-#: ../lib/modules.inc:1326
+#: ../lib/modules.inc:1252
+#: ../lib/modules.inc:1365
 msgid "Set password"
 msgstr "设置密码"
 
-#: ../lib/modules/posixAccount.inc:184
-#: ../lib/modules/posixAccount.inc:331
+#: ../lib/modules/posixAccount.inc:187
+#: ../lib/modules/posixAccount.inc:323
 msgid "Set primary group as memberUid"
 msgstr "为主组设置memberUid"
 
-#: ../templates/config/profmanage.php:279
-#: ../help/help.inc:125
+#: ../templates/config/profmanage.php:285
+#: ../help/help.inc:127
 msgid "Set profile password"
 msgstr "设置文件密码"
 
-#: ../lib/modules.inc:1263
+#: ../lib/modules.inc:1294
 msgid "Set random password"
 msgstr "设置随机密码"
 
-#: ../templates/lists/changePassword.php:198
+#: ../templates/lists/changePassword.php:193
 msgid "Set specific password"
 msgstr "设置特定的密码"
 
-#: ../lib/modules/posixGroup.inc:395
+#: ../lib/modules/posixGroup.inc:396
 msgid "Sets the group password."
 msgstr "设置组密码"
 
@@ -5656,21 +5911,21 @@ msgstr "设置组密码"
 msgid "Shadow"
 msgstr "Shadow"
 
-#: ../lib/modules/sambaSamAccount.inc:360
-#: ../lib/modules/sambaSamAccount.inc:1532
-#: ../lib/modules/sambaSamAccount.inc:1875
+#: ../lib/modules/sambaSamAccount.inc:355
+#: ../lib/modules/sambaSamAccount.inc:1501
+#: ../lib/modules/sambaSamAccount.inc:1831
 msgid "Shadowing"
 msgstr "遮蔽化(shadow)"
 
-#: ../lib/modules/ddns.inc:82
+#: ../lib/modules/ddns.inc:84
 msgid "Should DDNS (Dynamic DNS) be activated?"
 msgstr "DDNS(动态DNS)是否已经激活?"
 
-#: ../lib/modules/ddns.inc:85
+#: ../lib/modules/ddns.inc:87
 msgid "Should fix IP addresses be added to the DNS server?"
 msgstr "增加一个固定IP地址到DNS服务器吗?"
 
-#: ../templates/massBuildAccounts.php:204
+#: ../templates/massBuildAccounts.php:202
 msgid "Show LDIF file"
 msgstr "显示LDIF文件"
 
@@ -5678,39 +5933,43 @@ msgstr "显示LDIF文件"
 msgid "Show internal attributes"
 msgstr "显示内部属性"
 
-#: ../lib/types/group.inc:269
+#: ../lib/modules/asteriskExtension.inc:287
+msgid "Show only Asterisk accounts"
+msgstr "只显示 Asterisk 帐号"
+
+#: ../lib/types/group.inc:256
 msgid "Show primary group members as normal group members"
 msgstr "主组用户显示为普通组用户"
 
-#: ../templates/schema/schema.php:199
+#: ../templates/schema/schema.php:192
 msgid "Single valued"
 msgstr "单值"
 
-#: ../lib/modules/quota.inc:579
+#: ../lib/modules/quota.inc:581
 msgid "Soft block"
 msgstr "软块"
 
-#: ../lib/modules/quota.inc:103
-#: ../lib/modules/quota.inc:385
-#: ../lib/modules/quota.inc:470
+#: ../lib/modules/quota.inc:105
+#: ../lib/modules/quota.inc:387
+#: ../lib/modules/quota.inc:472
 msgid "Soft block limit"
 msgstr "软块限制"
 
-#: ../lib/modules/quota.inc:104
+#: ../lib/modules/quota.inc:106
 msgid "Soft block limit."
 msgstr "软块限制."
 
-#: ../lib/modules/quota.inc:581
+#: ../lib/modules/quota.inc:583
 msgid "Soft inode"
 msgstr "软节点"
 
-#: ../lib/modules/quota.inc:126
+#: ../lib/modules/quota.inc:128
 msgid "Soft inode (files) limit."
 msgstr "软节点限制."
 
-#: ../lib/modules/quota.inc:125
-#: ../lib/modules/quota.inc:389
-#: ../lib/modules/quota.inc:472
+#: ../lib/modules/quota.inc:127
+#: ../lib/modules/quota.inc:391
+#: ../lib/modules/quota.inc:474
 msgid "Soft inode limit"
 msgstr "软节点限制."
 
@@ -5719,7 +5978,7 @@ msgstr "软节点限制."
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "下面被选中的属性(%s)已经被修改."
 
-#: ../lib/modules.inc:1101
+#: ../lib/modules.inc:1128
 msgid "Some required information is missing"
 msgstr "缺少一些必要的信息"
 
@@ -5733,11 +5992,39 @@ msgstr "对不起，本模块({bold}%s{endbold}) 尚无帮助说明 (help id {bo
 msgid "Sorry this help number ({bold}%d{endbold}) is not available."
 msgstr "对不起,本帮助号({bold}%d{endbold})并不存在."
 
-#: ../lib/modules/sambaSamAccount.inc:305
-#: ../lib/modules/sambaSamAccount.inc:1253
+#: ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/sambaSamAccount.inc:1225
 msgid "Special user"
 msgstr "特殊用户"
 
+#: ../lib/modules/ppolicy.inc:125
+msgid "Specifies if users are allowed to change their own passwords or not."
+msgstr "指定用户是否允许修改自己的密码。"
+
+#: ../lib/modules/ppolicy.inc:109
+msgid "Specifies the maximum number of seconds before a password is due to expire that expiration warning messages will be returned to a user."
+msgstr "在密码过期前，对用户提示密码过期警告的最长时间（秒数）。"
+
+#: ../lib/modules/ppolicy.inc:113
+msgid "Specifies the minimum number of characters that will be accepted in a password."
+msgstr "指定在密码中的字符的最少个数"
+
+#: ../lib/modules/ppolicy.inc:101
+msgid "Specifies the number of consecutive failed login attempts after which the password may not be used to login."
+msgstr "指定锁定帐号前连续登录失败的次数。"
+
+#: ../lib/modules/ppolicy.inc:85
+msgid "Specifies the number of previously used passwords which should be saved in the password history. New passwords can only be set if they are not in the password history."
+msgstr "指定用户旧密码的历史记录个数。新密码不能与历史记录中的旧密码相同。"
+
+#: ../lib/modules/ppolicy.inc:105
+msgid "Specifies the number of seconds after which old consecutive failed login attempts are purged from the failure counter, even though no successful authentication has occurred."
+msgstr "指定从失败记录器中清除原来的连续登录失败记录的最长时间（秒数）。"
+
+#: ../lib/modules/ppolicy.inc:97
+msgid "Specifies the number of seconds during which the password cannot be used to login due to too many consecutive failed bind attempts."
+msgstr "指定在连续登录失败后，用户不能登录的最长时间（秒数）。"
+
 #: ../lib/modules/eduPerson.inc:83
 msgid "Specifies the person's affiliation within a particular security domain in broad categories such as student, faculty, staff, alum, etc."
 msgstr "指定一个用户的联系,要求是公开目录中明确的安全域,比如学生,教职员工,校友等等."
@@ -5751,19 +6038,23 @@ msgstr "指定用户的主要关系,要求是公开目录的惯例,比如学生,
 msgid "Specifies the person's relationship(s) to the institution in broad categories such as student, faculty, staff, alum, etc."
 msgstr "指定用户的关系,要求是公开目录中的惯例,比如学生,教职员工,校友等等."
 
+#: ../lib/modules/ppolicy.inc:129
+msgid "Specifies whether the user's existing password must be sent along with their new password when changing a password. Attention, LAM does not support password changes which require the old password."
+msgstr "在用户更改密码时是否需要输入旧密码。注意，LAM不支持更改密码时需要旧密码。"
+
 #: ../lib/modules/inetOrgPerson.inc:153
 #: ../lib/modules/inetOrgPerson.inc:171
 #: ../lib/modules/inetOrgPerson.inc:231
 #: ../lib/modules/inetOrgPerson.inc:454
-#: ../lib/modules/inetOrgPerson.inc:672
-#: ../lib/modules/inetOrgPerson.inc:1012
-#: ../lib/modules/inetOrgPerson.inc:1263
-#: ../lib/modules/inetOrgPerson.inc:1672
+#: ../lib/modules/inetOrgPerson.inc:651
+#: ../lib/modules/inetOrgPerson.inc:991
+#: ../lib/modules/inetOrgPerson.inc:1242
+#: ../lib/modules/inetOrgPerson.inc:1689
 msgid "State"
 msgstr "地点"
 
-#: ../templates/pdfedit/pdfpage.php:493
-#: ../templates/pdfedit/pdfpage.php:497
+#: ../templates/pdfedit/pdfpage.php:482
+#: ../templates/pdfedit/pdfpage.php:486
 msgid "Static text"
 msgstr "静态文本"
 
@@ -5779,17 +6070,17 @@ msgstr "步骤2/2:指定的属性和属性值"
 msgid "Steve"
 msgstr "Steve"
 
-#: ../lib/modules/inetOrgPerson.inc:483
-#: ../lib/modules/posixAccount.inc:208
-#: ../lib/modules/sambaSamAccount.inc:397
+#: ../lib/modules/inetOrgPerson.inc:1292
+#: ../lib/modules/posixAccount.inc:211
+#: ../lib/modules/sambaSamAccount.inc:392
 msgid "Steve Miller"
 msgstr "Steve Miller"
 
-#: ../lib/modules/posixAccount.inc:269
+#: ../lib/modules/posixAccount.inc:272
 msgid "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 msgstr "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 
-#: ../lib/modules/eduPerson.inc:159
+#: ../lib/modules/eduPerson.inc:170
 msgid "Steve, Stevo"
 msgstr "Steve,Stevo"
 
@@ -5797,15 +6088,15 @@ msgstr "Steve,Stevo"
 #: ../lib/modules/inetOrgPerson.inc:150
 #: ../lib/modules/inetOrgPerson.inc:218
 #: ../lib/modules/inetOrgPerson.inc:358
-#: ../lib/modules/inetOrgPerson.inc:608
-#: ../lib/modules/inetOrgPerson.inc:609
-#: ../lib/modules/inetOrgPerson.inc:976
-#: ../lib/modules/inetOrgPerson.inc:1248
-#: ../lib/modules/inetOrgPerson.inc:1624
+#: ../lib/modules/inetOrgPerson.inc:587
+#: ../lib/modules/inetOrgPerson.inc:588
+#: ../lib/modules/inetOrgPerson.inc:955
+#: ../lib/modules/inetOrgPerson.inc:1227
+#: ../lib/modules/inetOrgPerson.inc:1641
 msgid "Street"
 msgstr "街道"
 
-#: ../templates/pdfedit/pdfpage.php:677
+#: ../templates/pdfedit/pdfpage.php:666
 msgid "Structure name"
 msgstr "结构名"
 
@@ -5817,28 +6108,28 @@ msgstr "Sub (条目的子树)"
 #: ../lib/modules/nisnetgroup.inc:111
 #: ../lib/modules/nisnetgroup.inc:193
 #: ../lib/modules/nisnetgroup.inc:352
-#: ../lib/modules/nisnetgroup.inc:567
+#: ../lib/modules/nisnetgroup.inc:568
 #: ../lib/types/netgroup.inc:93
 msgid "Subgroups"
 msgstr "分组"
 
-#: ../lib/modules/dhcp_settings.inc:121
-#: ../lib/modules/dhcp_settings.inc:181
-#: ../lib/modules/dhcp_settings.inc:229
-#: ../lib/modules/dhcp_settings.inc:522
-#: ../lib/modules/dhcp_settings.inc:646
+#: ../lib/modules/dhcp_settings.inc:122
+#: ../lib/modules/dhcp_settings.inc:182
+#: ../lib/modules/dhcp_settings.inc:230
+#: ../lib/modules/dhcp_settings.inc:543
+#: ../lib/modules/dhcp_settings.inc:667
 msgid "Subnet"
 msgstr "子网"
 
-#: ../lib/modules/dhcp_settings.inc:154
-#: ../lib/modules/dhcp_settings.inc:221
-#: ../lib/modules/dhcp_settings.inc:281
-#: ../lib/modules/dhcp_settings.inc:581
-#: ../lib/modules/dhcp_settings.inc:654
+#: ../lib/modules/dhcp_settings.inc:155
+#: ../lib/modules/dhcp_settings.inc:222
+#: ../lib/modules/dhcp_settings.inc:282
+#: ../lib/modules/dhcp_settings.inc:602
+#: ../lib/modules/dhcp_settings.inc:675
 msgid "Subnet mask"
 msgstr "子网掩码"
 
-#: ../templates/schema/schema.php:181
+#: ../templates/schema/schema.php:174
 msgid "Substring Rule"
 msgstr "子字符串规则"
 
@@ -5847,44 +6138,44 @@ msgstr "子字符串规则"
 msgid "Success"
 msgstr "成功"
 
-#: ../templates/tests/lamdaemonTest.php:166
+#: ../templates/tests/lamdaemonTest.php:158
 msgid "Sudo is not setup correctly!"
 msgstr "Sudo的设置不正确 !"
 
-#: ../lib/modules.inc:1503
-#: ../lib/lists.inc:682
+#: ../lib/modules.inc:1530
+#: ../lib/lists.inc:609
 msgid "Suffix"
 msgstr "后缀"
 
-#: ../lib/modules/sambaSamAccount.inc:1339
+#: ../lib/modules/sambaSamAccount.inc:1318
 msgid "Sunday"
 msgstr "星期日"
 
-#: ../templates/lists/changePassword.php:113
-#: ../lib/modules/sambaSamAccount.inc:229
+#: ../templates/lists/changePassword.php:108
+#: ../lib/modules/sambaSamAccount.inc:226
 msgid "Sync Samba LM password with Unix password"
 msgstr "同步 Samba LM 密码和Unix的密码"
 
-#: ../templates/lists/changePassword.php:112
-#: ../lib/modules/sambaSamAccount.inc:228
+#: ../templates/lists/changePassword.php:107
+#: ../lib/modules/sambaSamAccount.inc:225
 msgid "Sync Samba NT password with Unix password"
 msgstr "同步Samba NT的密码和 Unix的密码"
 
-#: ../templates/schema/schema.php:186
+#: ../templates/schema/schema.php:179
 #: ../templates/tree/add_value_form.php:190
 msgid "Syntax"
 msgstr "语法"
 
-#: ../templates/schema/schema.php:94
+#: ../templates/schema/schema.php:87
 msgid "Syntax OID"
 msgstr "OID语法"
 
-#: ../templates/schema/schema.php:78
-#: ../templates/schema/schema.php:79
+#: ../templates/schema/schema.php:71
+#: ../templates/schema/schema.php:72
 msgid "Syntaxes"
 msgstr "语法"
 
-#: ../templates/config/mainmanage.php:308
+#: ../templates/config/mainmanage.php:313
 msgid "System logging"
 msgstr "系统日志"
 
@@ -5896,16 +6187,16 @@ msgstr "TLS不能与ldaps://结合"
 msgid "Target of invitation policy is invalid!"
 msgstr "邀请策略的目标非法 !"
 
-#: ../templates/lists/changePassword.php:166
+#: ../templates/lists/changePassword.php:161
 #: ../lib/modules/inetOrgPerson.inc:77
 #: ../lib/modules/inetOrgPerson.inc:149
 #: ../lib/modules/inetOrgPerson.inc:245
 #: ../lib/modules/inetOrgPerson.inc:390
-#: ../lib/modules/inetOrgPerson.inc:624
-#: ../lib/modules/inetOrgPerson.inc:625
-#: ../lib/modules/inetOrgPerson.inc:1051
-#: ../lib/modules/inetOrgPerson.inc:1252
-#: ../lib/modules/inetOrgPerson.inc:1592
+#: ../lib/modules/inetOrgPerson.inc:603
+#: ../lib/modules/inetOrgPerson.inc:604
+#: ../lib/modules/inetOrgPerson.inc:1030
+#: ../lib/modules/inetOrgPerson.inc:1231
+#: ../lib/modules/inetOrgPerson.inc:1609
 msgid "Telephone number"
 msgstr "电话号码"
 
@@ -5921,9 +6212,9 @@ msgstr "临时,合同到年底"
 msgid "Template"
 msgstr "模板"
 
-#: ../lib/modules/sambaSamAccount.inc:369
-#: ../lib/modules/sambaSamAccount.inc:611
-#: ../lib/modules/sambaSamAccount.inc:1271
+#: ../lib/modules/sambaSamAccount.inc:364
+#: ../lib/modules/sambaSamAccount.inc:592
+#: ../lib/modules/sambaSamAccount.inc:1243
 msgid "Terminal server options"
 msgstr "终端服务选项"
 
@@ -5931,7 +6222,7 @@ msgstr "终端服务选项"
 msgid "Tests"
 msgstr "测试"
 
-#: ../templates/pdfedit/pdfpage.php:605
+#: ../templates/pdfedit/pdfpage.php:594
 msgid "Text field"
 msgstr "输入框"
 
@@ -5947,7 +6238,7 @@ msgstr "用户用来进行机构间认证的\"NetID\".格式是\"user@scope\",
 msgid "The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
 msgstr "用户Cyrus邮件限制(MB),留空意味着不限制."
 
-#: ../lib/modules/dhcp_settings.inc:316
+#: ../lib/modules/dhcp_settings.inc:317
 msgid "The DHCP ranges were changed to fit for the new subnet."
 msgstr "为适应新子网的变化,DHCP范围已经更改."
 
@@ -5964,60 +6255,60 @@ msgstr "代表用户主要组织单位的目录条目的DN."
 msgid "The DNs of the directory entries representing the person's organizational units."
 msgstr "代表用户组织单元的目录条目的DN."
 
-#: ../templates/config/mainmanage.php:110
+#: ../templates/config/mainmanage.php:116
 #, php-format
 msgid "The IP address %s is invalid!"
 msgstr "IP地址 %s非法 !"
 
-#: ../lib/modules/fixed_ip.inc:396
+#: ../lib/modules/fixed_ip.inc:387
 msgid "The IP address does not match the subnet."
 msgstr "IP地址与子网不匹配."
 
-#: ../lib/modules/fixed_ip.inc:399
+#: ../lib/modules/fixed_ip.inc:390
 msgid "The IP address is already in use."
 msgstr "IP地址已被使用: "
 
-#: ../lib/modules/range.inc:394
-#: ../lib/modules/range.inc:412
-#: ../lib/modules/fixed_ip.inc:391
+#: ../lib/modules/range.inc:396
+#: ../lib/modules/range.inc:414
+#: ../lib/modules/fixed_ip.inc:382
 msgid "The IP address is invalid."
 msgstr "IP地址非法 !"
 
-#: ../lib/modules/fixed_ip.inc:86
+#: ../lib/modules/fixed_ip.inc:88
 msgid "The IP address of the PC."
 msgstr "PC机的IP地址."
 
-#: ../lib/modules/dhcp_settings.inc:131
+#: ../lib/modules/dhcp_settings.inc:132
 msgid "The IP address(es) of the DNS servers. Multiple addresses are separated by \",\". Example: 192.168.0.10, 192.168.0.11"
 msgstr "DNS服务器IP地址,多地址用\",\"隔离. 例如: 192.168.0.10, 192.168.0.11"
 
-#: ../lib/modules/dhcp_settings.inc:137
+#: ../lib/modules/dhcp_settings.inc:138
 msgid "The IP addresses of the Netbios name servers (e.g. \"123.123.123.123, 123.123.123.124\")."
 msgstr "Netbios命名服务器的IP地址(比如: \"123.123.123.123, 123.123.123.124\")."
 
-#: ../lib/modules/range.inc:398
-#: ../lib/modules/range.inc:414
+#: ../lib/modules/range.inc:400
+#: ../lib/modules/range.inc:416
 msgid "The IP does not match the subnet."
 msgstr "IP与子网掩码不匹配."
 
-#: ../lib/modules/fixed_ip.inc:83
+#: ../lib/modules/fixed_ip.inc:85
 msgid "The MAC address of the PC. Example: 11:22:33:44:55:aa"
 msgstr "PC机的 MAC 地址.比如: 11:22:33:44:55:aa"
 
-#: ../lib/modules/dhcp_settings.inc:309
 #: ../lib/modules/dhcp_settings.inc:310
+#: ../lib/modules/dhcp_settings.inc:311
 msgid "The Netbios server is invalid."
 msgstr "Netbios服务器非法."
 
-#: ../lib/modules/fixed_ip.inc:363
+#: ../lib/modules/fixed_ip.inc:354
 msgid "The PC name may not be longer than 20 characters."
 msgstr "PC机器名的长度不能超过20个字符."
 
-#: ../lib/modules/fixed_ip.inc:372
+#: ../lib/modules/fixed_ip.inc:363
 msgid "The PC name may only contain A-Z, a-z and 0-9."
 msgstr "PC机的机器名只能包含 A-Z, a-z 和 0-9."
 
-#: ../lib/modules/fixed_ip.inc:366
+#: ../lib/modules/fixed_ip.inc:357
 msgid "The PC name needs to be at least 2 characters long."
 msgstr "PC机器名的长度最短需要两个字符."
 
@@ -6025,26 +6316,26 @@ msgstr "PC机器名的长度最短需要两个字符."
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "您的Samba服务器的SID,可以通过使用\"net getlocalsid\"命令获取."
 
-#: ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:64
 msgid "The UID ranges for users and hosts overlap! This is a problem because LAM uses the highest UID in use + 1 for new accounts. Please set the minimum UID to equal values or use independent ranges."
 msgstr "用户UID范围与主机帐号重叠,因为LAM用户使用最高UID+1做为新帐号的UID.请将最小的UID设为相等或使用独立的范围."
 
-#: ../lib/modules/asteriskExtension.inc:69
-#: ../lib/modules/asteriskAccount.inc:77
+#: ../lib/modules/asteriskExtension.inc:83
+#: ../lib/modules/asteriskAccount.inc:86
 msgid "The account context stores information about the dial plan."
 msgstr "帐号的上下文存储有关拨号模板的信息"
 
-#: ../help/help.inc:155
+#: ../help/help.inc:157
 msgid "The account will be saved under this LDAP suffix."
 msgstr "帐号将会保存在此后缀下."
 
-#: ../templates/tests/schemaTest.php:133
+#: ../templates/tests/schemaTest.php:122
 #, php-format
 msgid "The attribute %s is not supported for the object class(es) %s by your LDAP server."
 msgstr "在你的LDAP服务器中%s属性(属于%s对象类)不被支持。"
 
-#: ../lib/modules/asteriskAccount.inc:144
-#: ../lib/modules/asteriskAccount.inc:146
+#: ../lib/modules/asteriskAccount.inc:153
+#: ../lib/modules/asteriskAccount.inc:155
 msgid "The caller ID format is invalid."
 msgstr "拨号ID格式不合法."
 
@@ -6057,58 +6348,58 @@ msgstr "您指定的容器%s不存在,请重试."
 msgid "The country name of the user."
 msgstr "用户国籍."
 
-#: ../lib/modules/dhcp_settings.inc:307
 #: ../lib/modules/dhcp_settings.inc:308
+#: ../lib/modules/dhcp_settings.inc:309
 msgid "The default gateway is invalid."
 msgstr "缺省网关非法."
 
-#: ../lib/modules/dhcp_settings.inc:320
-#: ../lib/modules/dhcp_settings.inc:323
+#: ../lib/modules/dhcp_settings.inc:321
+#: ../lib/modules/dhcp_settings.inc:324
 msgid "The domain name includes invalid characters. Valid characters are A-Z, a-z, 0-9, \".\", \"_\",\"-\"."
 msgstr "域名包含非法字符,只能使用A-Z, a-z, 0-9, \".\", \"_\",\"-\"."
 
-#: ../lib/modules/dhcp_settings.inc:318
-#: ../lib/modules/dhcp_settings.inc:321
+#: ../lib/modules/dhcp_settings.inc:319
+#: ../lib/modules/dhcp_settings.inc:322
 msgid "The domain name needs to be shorter than 15 characters."
 msgstr "域名的长度不能超过15个字符."
 
-#: ../lib/modules/dhcp_settings.inc:319
-#: ../lib/modules/dhcp_settings.inc:322
+#: ../lib/modules/dhcp_settings.inc:320
+#: ../lib/modules/dhcp_settings.inc:323
 msgid "The domain name needs to have at least 3 characters."
 msgstr "域名最少需要3个字符."
 
-#: ../lib/modules/dhcp_settings.inc:119
+#: ../lib/modules/dhcp_settings.inc:120
 msgid "The domain name of the subnet."
 msgstr "域名的子网掩码."
 
-#: ../lib/modules/range.inc:80
+#: ../lib/modules/range.inc:82
 msgid "The ending IP address of the range."
 msgstr "范围的最高IP地址."
 
-#: ../lib/modules/dhcp_settings.inc:311
+#: ../lib/modules/dhcp_settings.inc:312
 msgid "The entered Netbios node type does not exist."
 msgstr "输入的Netbios节点类型不存在."
 
 #: ../lib/modules/shadowAccount.inc:67
-#: ../lib/modules/phpGroupwareUser.inc:125
+#: ../lib/modules/phpGroupwareUser.inc:136
 msgid "The expiration date is invalid."
 msgstr "过期日期非法."
 
-#: ../lib/modules/asteriskAccount.inc:148
-#: ../lib/modules/asteriskAccount.inc:149
+#: ../lib/modules/asteriskAccount.inc:157
+#: ../lib/modules/asteriskAccount.inc:158
 msgid "The extension context is invalid."
 msgstr "扩展的上下文非法."
 
-#: ../help/help.inc:191
+#: ../help/help.inc:193
 msgid "The first line is the subject."
 msgstr "第一行是对象。"
 
-#: ../templates/initsuff.php:183
+#: ../templates/initsuff.php:177
 msgid "The following suffix(es) are missing in LDAP. LAM can create them for you."
 msgstr "LDAP中没有下列后缀,LAM会自动建立."
 
-#: ../lib/modules/sambaSamAccount.inc:106
-#: ../lib/modules/sambaSamAccount.inc:107
+#: ../lib/modules/sambaSamAccount.inc:104
+#: ../lib/modules/sambaSamAccount.inc:105
 msgid "The format of the logon hours field is invalid!"
 msgstr "登录时间列的格式非法!"
 
@@ -6116,67 +6407,71 @@ msgstr "登录时间列的格式非法!"
 msgid "The format of this custom script setting is invalid."
 msgstr "自定义脚本设置的格式非法!"
 
-#: ../templates/login.php:455
+#: ../templates/login.php:415
 msgid "The given user name matches multiple LDAP entries."
 msgstr "给定的用户名匹配了多条LDAP条目."
 
-#: ../templates/pdfedit/pdfpage.php:126
+#: ../lib/modules/ppolicy.inc:93
+msgid "The grace authentication limit specifies the number of times that an expired password may be used to login."
+msgstr "缓期认证限量指定了密码过期后还能认证的次数。"
+
+#: ../templates/pdfedit/pdfpage.php:121
 msgid "The headline for a new section must contain at least one character."
 msgstr "新段的标题最少要有一个字符."
 
-#: ../lib/modules/sambaSamAccount.inc:282
+#: ../lib/modules/sambaSamAccount.inc:277
 msgid "The home directory will be connected under this drive letter."
 msgstr "将会从这个驱动器号上连接用户目录。"
 
-#: ../lib/modules/asteriskAccount.inc:151
-#: ../lib/modules/asteriskAccount.inc:152
+#: ../lib/modules/asteriskAccount.inc:160
+#: ../lib/modules/asteriskAccount.inc:161
 msgid "The host name is invalid."
 msgstr "主机名非法"
 
-#: ../lib/modules/ddns.inc:91
+#: ../lib/modules/ddns.inc:93
 msgid "The key enables the DHCP server to perform DNS updates. The key is generated with \"genDDNSkey\"."
 msgstr "使DHCP服务器能够进行DNS更新的KEY. 产生KEY的命令是 \"genDDNSkey\"."
 
-#: ../lib/modules/dhcp_settings.inc:305
 #: ../lib/modules/dhcp_settings.inc:306
+#: ../lib/modules/dhcp_settings.inc:307
 msgid "The lease time is invalid."
 msgstr "释放时间非法."
 
-#: ../lib/modules/dhcp_settings.inc:125
+#: ../lib/modules/dhcp_settings.inc:126
 msgid "The lease time specifies after how many seconds the client should request a new IP address."
 msgstr "指定客户端必须重新申请新IP地址的释放时间(秒数)."
 
-#: ../templates/config/mainmanage.php:126
+#: ../templates/config/mainmanage.php:132
 msgid "The log file is empty or contains invalid characters! Valid characters are: a-z, A-Z, 0-9, /, \\, ., :, _ and -."
 msgstr "日志文件为空或包含非法字符.合法字符为a-z, A-Z, 0-9, /, \\, ., :, _和-."
 
-#: ../lib/modules/dhcp_settings.inc:312
 #: ../lib/modules/dhcp_settings.inc:313
+#: ../lib/modules/dhcp_settings.inc:314
 msgid "The maximum lease time is invalid."
 msgstr "最长释放时间非法."
 
-#: ../lib/modules/dhcp_settings.inc:128
+#: ../lib/modules/dhcp_settings.inc:129
 msgid "The maximum lease time specifies after how many seconds the client must request a new IP address."
 msgstr "指定客户端必须重新申请新IP地址的最长释放时间."
 
-#: ../lib/modules.inc:1146
+#: ../lib/modules.inc:1173
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "%s模块未启动."
 
-#: ../templates/pdfedit/pdfpage.php:95
+#: ../templates/pdfedit/pdfpage.php:90
 msgid "The name for that PDF-structure you submitted is not valid. A valid name must constist at least of one of the following characters 'a-z','A-Z','0-9','_','-','.'."
 msgstr "您提供的PDF架构名非法,合法字符为a-z,A-Z,0-9,_,- ."
 
-#: ../lib/modules/asteriskExtension.inc:81
+#: ../lib/modules/asteriskExtension.inc:95
 msgid "The name of a command to execute. The available commands may be listed at the Asterisk command line by executing \"core show applications\"."
 msgstr "将要运行的命令的名字.在Asterisk 命令行运行\"core show applications\"将列出所有有效的命令"
 
-#: ../lib/modules/fixed_ip.inc:80
+#: ../lib/modules/fixed_ip.inc:82
 msgid "The name of the PC."
 msgstr "PC机器名."
 
-#: ../lib/modules/asteriskExtension.inc:73
+#: ../lib/modules/asteriskExtension.inc:87
 msgid "The name of the extension (e.g. voicemail or sip)."
 msgstr "扩展的名字(比如:voicemail 或 sip)."
 
@@ -6184,7 +6479,7 @@ msgstr "扩展的名字(比如:voicemail 或 sip)."
 msgid "The name of the server where the mailbox is located."
 msgstr "邮箱所在服务器名."
 
-#: ../lib/modules/dhcp_settings.inc:122
+#: ../lib/modules/dhcp_settings.inc:123
 msgid "The name of the subnet. Example: 192.168.10.0"
 msgstr "子网名称.比如: 192.168.10.0"
 
@@ -6192,11 +6487,11 @@ msgstr "子网名称.比如: 192.168.10.0"
 msgid "The name of your Windows domain or workgroup."
 msgstr "WINDOWS域名或工作组名."
 
-#: ../lib/modules/dhcp_settings.inc:158
+#: ../lib/modules/dhcp_settings.inc:159
 msgid "The net mask is derived from the subnet mask. If you leave this field empty then LAM will calculate it for you."
 msgstr "网络掩码源自子网掩码,如果留空LAM将会计算得出."
 
-#: ../lib/modules.inc:1037
+#: ../lib/modules.inc:1065
 msgid "The new password will be stored in the directory after you save this account."
 msgstr "保存帐号后新密码同时保存到目录服务器."
 
@@ -6204,17 +6499,17 @@ msgstr "保存帐号后新密码同时保存到目录服务器."
 msgid "The number of users who may login to LAM is restricted. This can be either a fixed list of DNs or LAM can search LDAP to find a DN which matches the given user name."
 msgstr "可以登录LAM的用户数量受限,或是DN的固定列表数量受限,还可能是LAM在LDAP中搜索给定用户名的DN数量受限."
 
-#: ../templates/tests/schemaTest.php:122
+#: ../templates/tests/schemaTest.php:111
 #, php-format
 msgid "The object class %s is not supported by your LDAP server."
 msgstr "在你的LDAP服务器中对象类%s不被支持。"
 
-#: ../lib/modules/inetOrgPerson.inc:681
+#: ../lib/modules/inetOrgPerson.inc:660
 msgid "The office name of the user (e.g. YourCompany, Human Resources)."
 msgstr "用户的办公室名(比如:某某公司,人力资源部)"
 
-#: ../templates/selfService/selfServiceMain.php:261
-#: ../lib/modules.inc:1859
+#: ../templates/selfService/selfServiceMain.php:259
+#: ../lib/modules.inc:1888
 msgid "The operation was stopped because of the above errors."
 msgstr "由于发生了以上错误，操作中止."
 
@@ -6222,10 +6517,10 @@ msgstr "由于发生了以上错误，操作中止."
 msgid "The owner of this group."
 msgstr "此组的拥有者."
 
-#: ../templates/selfService/adminLogin.php:53
+#: ../templates/selfService/adminLogin.php:54
 #: ../templates/config/confmain.php:72
 #: ../templates/config/confsave.php:71
-#: ../templates/config/mainlogin.php:58
+#: ../templates/config/mainlogin.php:59
 msgid "The password is invalid! Please try again."
 msgstr "密码无效,请重试!"
 
@@ -6259,39 +6554,39 @@ msgstr "密码强度不够.最少需要%s个标点符号字符."
 msgid "The password is too weak. You have to enter at least %s upper case characters."
 msgstr "密码强度不够.最少需要%s个大写字母字符."
 
-#: ../lib/modules.inc:1280
+#: ../lib/modules.inc:1319
 msgid "The password was set to:"
 msgstr "密码被设置为:"
 
-#: ../templates/lists/changePassword.php:334
+#: ../templates/lists/changePassword.php:321
 msgid "The password(s) were set to:"
 msgstr "密码被设置为:"
 
-#: ../lib/modules/posixAccount.inc:352
+#: ../lib/modules/posixAccount.inc:344
 msgid "The primary group for this account. You can insert a GID number or a group name."
 msgstr "本帐号的主组名,您可以输入一个GID号或组名."
 
-#: ../lib/modules/posixAccount.inc:419
+#: ../lib/modules/posixAccount.inc:411
 msgid "The primary group the host should be member of."
 msgstr "该主机所属的主组名."
 
-#: ../lib/modules/posixAccount.inc:381
+#: ../lib/modules/posixAccount.inc:373
 msgid "The primary group the user should be member of."
 msgstr "该用户所属的主组名."
 
-#: ../lib/modules/asteriskExtension.inc:77
+#: ../lib/modules/asteriskExtension.inc:91
 msgid "The priority is a sequence number used to order the execution of commands. Commands are executed beginning with the lowest sequence number."
 msgstr "优先级是一个序号,用来表示运行命令的顺序.最小的序号代表的命令会最先运行."
 
-#: ../lib/modules/range.inc:400
+#: ../lib/modules/range.inc:402
 msgid "The range conflicts with another range."
 msgstr "此范围与其它范围冲突."
 
-#: ../lib/modules/range.inc:396
+#: ../lib/modules/range.inc:398
 msgid "The range end needs to be greater than the range start."
 msgstr "范围的终止地址需要大于起始地址."
 
-#: ../lib/modules/inetOrgPerson.inc:661
+#: ../lib/modules/inetOrgPerson.inc:640
 msgid "The room number of the employee's office."
 msgstr "雇员办公室房间号码"
 
@@ -6300,46 +6595,46 @@ msgstr "雇员办公室房间号码"
 msgid "The scripts will be run on your web server in the user context of your web server (e.g. apache/www-data)."
 msgstr "在web服务器中运行的与用户上下文相关的脚本(比如:apache/www-data)."
 
-#: ../lib/modules/inetOrgPerson.inc:689
-#: ../lib/modules/sambaSamAccount.inc:379
+#: ../lib/modules/inetOrgPerson.inc:668
+#: ../lib/modules/sambaSamAccount.inc:371
 msgid "The selected options will not be managed inside LAM. You can use this to reduce the number of displayed input fields."
 msgstr "选中项将不被LAM所管理,可以用此来减少所显示的输入框个数."
 
-#: ../lib/modules/range.inc:77
+#: ../lib/modules/range.inc:79
 msgid "The starting IP address of the range."
 msgstr "范围的起始IP地址."
 
-#: ../lib/modules/inetOrgPerson.inc:673
+#: ../lib/modules/inetOrgPerson.inc:652
 msgid "The state where the user resides or works."
 msgstr "用户居住或工作地点."
 
-#: ../templates/pdfedit/pdfpage.php:114
+#: ../templates/pdfedit/pdfpage.php:109
 msgid "The static text must contain at least one character."
 msgstr "静态文本至少包含一个字符."
 
-#: ../lib/modules/dhcp_settings.inc:300
+#: ../lib/modules/dhcp_settings.inc:301
 msgid "The subnet is already in use."
 msgstr "子网掩码已经被占用."
 
-#: ../lib/modules/dhcp_settings.inc:301
 #: ../lib/modules/dhcp_settings.inc:302
+#: ../lib/modules/dhcp_settings.inc:303
 msgid "The subnet is invalid."
 msgstr "子网非法"
 
-#: ../lib/modules/dhcp_settings.inc:314
 #: ../lib/modules/dhcp_settings.inc:315
+#: ../lib/modules/dhcp_settings.inc:316
 msgid "The subnet mask is invalid."
 msgstr "子网掩码非法"
 
-#: ../lib/modules/dhcp_settings.inc:155
+#: ../lib/modules/dhcp_settings.inc:156
 msgid "The subnet mask of the network."
 msgstr "网络的子网掩码."
 
-#: ../lib/modules/sambaSamAccount.inc:109
+#: ../lib/modules/sambaSamAccount.inc:107
 msgid "The value for the Samba 3 field \"User can/must change password\" needs to be a number."
 msgstr "Samba 3 的 \"用户可以/必须修改密码\" 的取值必须是一个数字."
 
-#: ../help/help.inc:194
+#: ../help/help.inc:196
 msgid "The wildcard for the new password is @@newPassword@@."
 msgstr "新密码的通配符为@@newPassword@@."
 
@@ -6347,15 +6642,15 @@ msgstr "新密码的通配符为@@newPassword@@."
 msgid "There are new required attributes which need to be set."
 msgstr "必须设置的新属性"
 
-#: ../lib/modules/posixGroup.inc:478
+#: ../lib/modules/posixGroup.inc:479
 msgid "There are still users who have this group as their primary group."
 msgstr "仍有用户的主组为本组."
 
-#: ../lib/modules/sambaGroupMapping.inc:437
+#: ../lib/modules/sambaGroupMapping.inc:438
 msgid "There can be only one group of this type."
 msgstr "只能有一种本类型组."
 
-#: ../lib/modules/asteriskAccount.inc:145
+#: ../lib/modules/asteriskAccount.inc:154
 msgid "There is already another user with this caller ID."
 msgstr "已经有其他的帐号使用这个拨号ID."
 
@@ -6363,15 +6658,15 @@ msgstr "已经有其他的帐号使用这个拨号ID."
 msgid "There were errors while uploading:"
 msgstr "上传时发生错误."
 
-#: ../lib/modules/posixGroup.inc:399
+#: ../lib/modules/posixGroup.inc:400
 msgid "These are the minimum and maximum numbers to use for group IDs when creating new group accounts. New group accounts will always get the highest number in use plus one."
 msgstr "新建立新组帐号时,最大和最小的GID号.新组号自动在已用最大号加1."
 
-#: ../lib/modules/posixAccount.inc:340
+#: ../lib/modules/posixAccount.inc:332
 msgid "These are the minimum and maximum numbers to use for machine IDs when creating new accounts for hosts. The range should be different from that of users. New host accounts will always get the highest number in use plus one."
 msgstr "这是为主机新建账号时机器ID号的最小值和最大值.这个范围不同于用户数量.新主机帐号的ID总是得到当前最高值加1."
 
-#: ../lib/modules/posixAccount.inc:336
+#: ../lib/modules/posixAccount.inc:328
 msgid "These are the minimum and maximum numbers to use for user IDs when creating new user accounts. The range should be different from that of machines. New user accounts will always get the highest number in use plus one."
 msgstr "建立新用户帐号时所使用的最大和最小UID号,UID范围不能与机器ID号一致.新帐号使用已用最大号加1."
 
@@ -6380,15 +6675,19 @@ msgstr "建立新用户帐号时所使用的最大和最小UID号,UID范围不
 msgid "These entries specify the members of the netgroup. You can limit the set to a host name, a user name, a domain name or any combination of them."
 msgstr "这些条目指定了网络组的成员.您可以指定一个主机名集,或一个用户名集,或一个域名集,或上述的任意组合."
 
-#: ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/asteriskExtension.inc:107
+msgid "These options change the list of potential extension owners below. You can select to show Asterisk accounts or all users. It is also possible to search the tree suffix if you have users which are not in the standard user suffix."
+msgstr "这个选项改变以下其它的扩展属主列表。你可以选择来显示 Asterisk 帐号或所有用户。在标准用户后缀树以外的后缀树中，查询用户也是可以的。"
+
+#: ../lib/modules/posixAccount.inc:89
 msgid "This GID number is invalid! Please provide either a number or a group name."
 msgstr "GID号非法!请提供新号或组名."
 
-#: ../help/help.inc:184
+#: ../help/help.inc:186
 msgid "This HTML code will be placed on top of all self service pages. E.g. you can use this to place your custom logo. Any HTML code is permitted."
 msgstr "这些HTML代码将显示在自助服务主页的上端,比如可以在此放在贵公司标志,可以输入任何HTML代码."
 
-#: ../lib/modules/fixed_ip.inc:369
+#: ../lib/modules/fixed_ip.inc:360
 msgid "This PC name already exists."
 msgstr "PC机器名已经存在!"
 
@@ -6396,23 +6695,23 @@ msgstr "PC机器名已经存在!"
 msgid "This account is marked for deletion."
 msgstr "本帐号标记为删除."
 
-#: ../lib/modules/sambaSamAccount.inc:306
+#: ../lib/modules/sambaSamAccount.inc:301
 msgid "This allows you to define this account as a special user like administrator or guest."
 msgstr "您可以指定本帐号为特殊帐号,比如管理员或来宾."
 
-#: ../lib/modules/inetOrgPerson.inc:677
+#: ../lib/modules/inetOrgPerson.inc:656
 msgid "This can be used to specify if the user has a car license."
 msgstr "用来指定用户是否拥有汽车执照."
 
-#: ../help/help.inc:126
+#: ../help/help.inc:128
 msgid "This changes the password of the selected profile."
 msgstr "改变设置文件的密码."
 
-#: ../help/help.inc:128
+#: ../help/help.inc:130
 msgid "This changes the profile which is selected by default at login."
 msgstr "改变缺省登录使用的配置文件."
 
-#: ../templates/massBuildAccounts.php:152
+#: ../templates/massBuildAccounts.php:149
 msgid "This column is defined to include unique entries but duplicates were found:"
 msgstr "本列不能有重复的条目,但发现了下列重复条目:"
 
@@ -6433,11 +6732,15 @@ msgstr "设置登录语言和默认语言.用户可以在登录时更改."
 msgid "This defines the rights for the home directories which are created by lamdaemon."
 msgstr "设置lamdaemon建立的用户目录的权限."
 
-#: ../lib/modules/asteriskExtension.inc:65
+#: ../lib/modules/asteriskExtension.inc:79
 msgid "This defines what application Asterisk has to start for this user (e.g. SIP/user1)."
 msgstr "定义为这个用户启动的Asterisk 应用(比如:SIP/user1)."
 
-#: ../lib/modules/inetOrgPerson.inc:669
+#: ../lib/modules/ipHost.inc:67
+msgid "This describes the location of the host."
+msgstr "描述主机所在地点."
+
+#: ../lib/modules/inetOrgPerson.inc:648
 msgid "This describes the location of the user."
 msgstr "描述用户所在地点."
 
@@ -6445,7 +6748,7 @@ msgstr "描述用户所在地点."
 msgid "This document was automatically created by LDAP Account Manager"
 msgstr "本文件由本系统自动产生."
 
-#: ../templates/tree/edit.php:210
+#: ../templates/tree/edit.php:213
 msgid "This entry has no attributes"
 msgstr "本条目没有任何属性."
 
@@ -6454,10 +6757,14 @@ msgstr "本条目没有任何属性."
 msgid "This entry is the root of a sub-tree containing %s entries."
 msgstr "本条目是一个包含%s 子条目的子树的根."
 
-#: ../lib/modules/posixAccount.inc:88
+#: ../lib/modules/posixAccount.inc:91
 msgid "This gecos value is invalid!"
 msgstr "备注值非法!"
 
+#: ../lib/modules/ipHost.inc:63
+msgid "This is a comma separated list of IP addresses."
+msgstr "这是以逗号分隔的IP地址列表."
+
 #: ../lib/modules/ieee802device.inc:66
 msgid "This is a comma separated list of MAC addresses."
 msgstr "这是以逗号分隔的MAC地址列表."
@@ -6482,7 +6789,7 @@ msgstr "这是以逗号分隔的收件人列表."
 msgid "This is a comma separated list of the users public email addresses."
 msgstr "这是逗号分隔的用户公开邮件地址."
 
-#: ../help/help.inc:142
+#: ../help/help.inc:144
 msgid "This is a list of IP addresses from hosts who may access LAM. You can use \"*\" as wildcard (e.g. 192.168.0.*)."
 msgstr "这是可以访问本系统的IP地址列表,你可以使用\"*\" 代表多台主机,(例如192.168.0.*)."
 
@@ -6506,7 +6813,7 @@ msgstr "这是lamdaemon指令所在的服务器列表.本系统将用户登录
 msgid "This is a list of valid DN entries of all users that are allowed to login to LDAP Account Manager. Please enter one DN per line."
 msgstr "这是允许登录本系统的DN列表,每行输入一个DN."
 
-#: ../templates/masscreate.php:230
+#: ../templates/masscreate.php:311
 msgid "This is an example how it would look in your spreadsheet program before you convert to CSV:"
 msgstr "电子表格未存成CSV格式的样例:"
 
@@ -6514,13 +6821,14 @@ msgstr "电子表格未存成CSV格式的样例:"
 msgid "This is an optional description for this entry."
 msgstr "可以输入此条目的描述(可选)"
 
-#: ../help/help.inc:172
+#: ../help/help.inc:174
 msgid "This is needed to find the LDAP DNs of your user accounts. E.g. if you use \"uid\" and your user inputs \"miller\" then LAM will search for an account with uid=miller."
 msgstr "用于搜索用户帐号的LDAP DN.比如您输入\"uid\" 而用户输入\"miller\" ,系统会使用uid=miller这个条件来搜索帐号."
 
 #: ../lib/modules/inetOrgPerson.inc:102
-#: ../lib/modules/eduPerson.inc:202
-#: ../lib/modules/eduPerson.inc:204
+#: ../lib/modules/ipHost.inc:108
+#: ../lib/modules/eduPerson.inc:213
+#: ../lib/modules/eduPerson.inc:215
 #: ../lib/modules/aliasEntry.inc:79
 msgid "This is not a valid DN!"
 msgstr "不是一个有效的DN!"
@@ -6529,11 +6837,11 @@ msgstr "不是一个有效的DN!"
 msgid "This is not a valid RID number!"
 msgstr "不是一个有效的RID号!"
 
-#: ../lib/modules/sambaGroupMapping.inc:439
+#: ../lib/modules/sambaGroupMapping.inc:440
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不是一个有效的Samba 3 组类型!"
 
-#: ../lib/modules/eduPerson.inc:206
+#: ../lib/modules/eduPerson.inc:217
 msgid "This is not a valid list of DNs!"
 msgstr "这不是一个有效的DN列表!"
 
@@ -6545,11 +6853,19 @@ msgstr "用户公开邮件地址之一."
 msgid "This is one recipient for this alias."
 msgstr "这个别名的一个收件人."
 
-#: ../lib/modules/asteriskAccount.inc:69
+#: ../lib/modules/asteriskAccount.inc:78
 msgid "This is the ID of the user in the Asterisk database. It may contain digits and letters (e.g. user1 or 200134)."
 msgstr "这是在Asterisk数据库中的用户ID,可以包含数字或字母(比如:user1 或 200134)."
 
-#: ../lib/modules/inetOrgPerson.inc:605
+#: ../lib/modules/ipHost.inc:59
+msgid "This is the IP address of the network card of the device (e.g. 123.123.123.123)."
+msgstr "设备的网卡的IPC地址(比如:123.123.123.123)."
+
+#: ../lib/modules/ipHost.inc:71
+msgid "This is the LDAP DN of the host's manager."
+msgstr "主机管理员的LDAP DB"
+
+#: ../lib/modules/inetOrgPerson.inc:584
 msgid "This is the LDAP DN of the user's manager. Use this property to represent hierarchies in your company."
 msgstr "用户管理员的LDAP DN.显示您在公司的阶层."
 
@@ -6557,7 +6873,7 @@ msgstr "用户管理员的LDAP DN.显示您在公司的阶层."
 msgid "This is the MAC address of the network card of the device (e.g. 00:01:02:DE:EF:18)."
 msgstr "网卡的MAC地址(比如:00:01:02:DE:EF:18)."
 
-#: ../lib/modules/sambaSamAccount.inc:303
+#: ../lib/modules/sambaSamAccount.inc:298
 msgid "This is the SID of the user's primary Windows group."
 msgstr "用户Windows主组的SID."
 
@@ -6565,25 +6881,29 @@ msgstr "用户Windows主组的SID."
 msgid "This is the absolute path to an external script for setting quotas and creating home directories."
 msgstr "这是设置硬盘配额和建立主目录的外部脚本所在的绝对路径."
 
-#: ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/sambaSamAccount.inc:236
 msgid "This is the account's Windows password."
 msgstr "帐号在Windows中的密码."
 
-#: ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/sambaSamAccount.inc:233
 msgid "This is the account's full name on Windows systems."
 msgstr "用户在Windows系统中的全名."
 
-#: ../lib/modules/sambaSamAccount.inc:325
-#: ../lib/modules/shadowAccount.inc:186
+#: ../lib/modules/ppolicyUser.inc:49
+msgid "This is the active password policy for this account."
+msgstr "本帐号正在使用的帐号策略。"
+
+#: ../lib/modules/sambaSamAccount.inc:320
+#: ../lib/modules/shadowAccount.inc:190
 #: ../lib/modules/phpGroupwareUser.inc:83
 msgid "This is the date when the account will expire. Format: DD-MM-YYYY"
 msgstr "帐号过期日期: DD-MM-YYYY"
 
-#: ../lib/modules/sambaGroupMapping.inc:355
+#: ../lib/modules/sambaGroupMapping.inc:356
 msgid "This is the group name which will be shown in Windows."
 msgstr "显示在Windows系统中的组名."
 
-#: ../help/help.inc:151
+#: ../help/help.inc:153
 msgid "This is the identifier for the relative DN value. It must be one of the given allowed LDAP attributes (e.g. user accounts usually use \"uid\" while groups use \"cn\")."
 msgstr "RDN值的标志.必须是您LDAP属性中的一个值(比如,用户帐号经常使用\"uid\",而组名经常使用\"cn\"))"
 
@@ -6591,7 +6911,7 @@ msgstr "RDN值的标志.必须是您LDAP属性中的一个值(比如,用户帐
 msgid "This is the list of attributes to show in the account list. The entries can either be predefined values, \"#attribute\", or individual ones, \"attribute:description\". Several entries are separated by semicolons."
 msgstr "帐号列表所显示的属性列表.可以是预定义值\"#attribute\",或者独立的值,\"attribute:description\".用分号隔离多个条目."
 
-#: ../lib/modules/asteriskAccount.inc:73
+#: ../lib/modules/asteriskAccount.inc:82
 msgid "This is the machine id (e.g. IP address or host name) from which the user can call/receive calls."
 msgstr "这是用户可以拨打或接听的机器ID(比如:IP地址或主机名)"
 
@@ -6604,15 +6924,15 @@ msgstr "用户的邮件服务器."
 msgid "This is the name of this group."
 msgstr "组名."
 
-#: ../lib/modules/posixAccount.inc:427
+#: ../lib/modules/posixAccount.inc:419
 msgid "This is the natural name of the host. If empty, the host name will be used."
 msgstr "主机帐号的自然名(natural name).留空使用主机名."
 
-#: ../lib/modules/inetOrgPerson.inc:641
+#: ../lib/modules/inetOrgPerson.inc:620
 msgid "This is the natural name of the user. If empty, the first and last name is used."
 msgstr "用户自然名,留空会使用姓名."
 
-#: ../lib/modules/posixAccount.inc:405
+#: ../lib/modules/posixAccount.inc:397
 msgid "This is the natural name of the user. If empty, the first and last name or user name is used."
 msgstr "用户的自然名.留空会使用姓名."
 
@@ -6628,23 +6948,19 @@ msgstr "为防止用户使用旧的密码而保存的历史密码数量."
 msgid "This is the number of rows to show in the account list. If more entries are found the list will be split into several pages."
 msgstr "显示帐号中的行数，如果搜索到更多的行数会分页显示."
 
-#: ../lib/modules/sambaSamAccount.inc:373
-msgid "This is the number of seconds after when the user may or has to change his password."
-msgstr "用户再次修改密码的时间(秒数)."
-
-#: ../lib/modules/sambaSamAccount.inc:334
+#: ../lib/modules/sambaSamAccount.inc:329
 msgid "This is the path to the user's home directory."
 msgstr "这是用户的主目录路径."
 
-#: ../lib/modules/sambaGroupMapping.inc:363
+#: ../lib/modules/sambaGroupMapping.inc:364
 msgid "This is the relative ID (similar to UID on Unix) for Windows accounts. If you leave this empty LAM will calculate the RID from the UID. This can be either a number or the name of a special group:"
 msgstr "Windows帐号的关联ID(有点象Unix中的UID).留空系统会从UID计算RID.可以是一个数字或一个特殊组名."
 
-#: ../lib/modules/sambaSamAccount.inc:309
+#: ../lib/modules/sambaSamAccount.inc:304
 msgid "This is the relative ID number for your Windows account. You can either enter a number or one of these special accounts: "
 msgstr "Windows帐号的关联ID.可以输入一个数字或以下特殊帐号:"
 
-#: ../lib/modules/sambaSamAccount.inc:313
+#: ../lib/modules/sambaSamAccount.inc:308
 msgid "This is the relative ID number for your host account. If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr "主机帐号的关联ID号.留空系统使用:uidNumber*2 + sambaAlgorithmicRidBase."
 
@@ -6674,7 +6990,7 @@ msgstr "此别名条件的实际名."
 msgid "This is the time (in minutes) for which the user may not log in after the account was locked. -1 means forever."
 msgstr "用户帐号被锁定后用户不能登录的时间(分钟),-1表示永久."
 
-#: ../help/help.inc:136
+#: ../help/help.inc:138
 msgid "This is the time (in minutes) of inactivity after which a user is automatically logged off."
 msgstr "在自动退出前,用户不活动时间(分钟)."
 
@@ -6686,15 +7002,15 @@ msgstr "LAM缓存有效时间(分钟),较短的时间会增加LDAP压力,但减
 msgid "This is the time limit (in days) for other users who want to check future appointments. If you leave this blank the default (60 days) will be set."
 msgstr "其它用户检查未来约会的天数.如果留空,默认值为60天."
 
-#: ../lib/modules/sambaSamAccount.inc:328
+#: ../lib/modules/sambaSamAccount.inc:323
 msgid "This is the time zone of your Samba server. LAM needs this information to display the logon hours correctly."
 msgstr "这是Samba服务器的时区.LAM用此信息显示正确的登录时间."
 
-#: ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/sambaSamAccount.inc:295
 msgid "This is the user's primary Windows group."
 msgstr "用户的Windows主要组."
 
-#: ../lib/modules/posixAccount.inc:89
+#: ../lib/modules/posixAccount.inc:92
 msgid "This login shell is invalid!"
 msgstr "登录shell非法!"
 
@@ -6702,47 +7018,48 @@ msgstr "登录shell非法!"
 msgid "This mail address is already in use:"
 msgstr "邮件地址已被使用: "
 
-#: ../lib/modules/quota.inc:362
+#: ../lib/modules/quota.inc:364
+#: ../lib/lamdaemon.inc:44
 msgid "This module requires the PHP ssh2 extension."
 msgstr "本模块需要PHP ssh2 扩展支持"
 
-#: ../templates/schema/schema.php:355
+#: ../templates/schema/schema.php:348
 msgid "This object class is obsolete."
 msgstr "这个对象类是陈旧的."
 
-#: ../lib/modules/sambaSamAccount.inc:319
+#: ../lib/modules/sambaSamAccount.inc:314
 msgid "This option defines the allowed logon hours for this account."
 msgstr "允许帐号登录的时间."
 
-#: ../lib/modules/sambaSamAccount.inc:322
+#: ../lib/modules/sambaSamAccount.inc:317
 msgid "This option defines the allowed logon hours for this account. The format is the same as for the LDAP attribute. The 24*7 hours are represented as 168 bit which are saved as 21 hex (21*8 = 168) values. The first bit represents Sunday 0:00 - 0:59 in GMT."
 msgstr "帐号可以登录的时间.格式与LDAP属性一致.使用168位代理24*7,168位以21个16进制字节表示.第一位代表GMT时间星期天0:00-0.59."
 
-#: ../lib/modules/asteriskExtension.inc:183
+#: ../lib/modules/asteriskExtension.inc:201
 msgid "This pair of extension name and priority already exists."
 msgstr "扩展名和优先级的配对已经存在!"
 
-#: ../lib/modules/sambaSamAccount.inc:343
+#: ../lib/modules/sambaSamAccount.inc:338
 msgid "This program is run after the login."
 msgstr "登录后运行的程序。"
 
-#: ../lib/modules/sambaSamAccount.inc:367
+#: ../lib/modules/sambaSamAccount.inc:362
 msgid "This specifies the reconnect policy."
 msgstr "这里指定断开连接的策略。"
 
-#: ../lib/modules/sambaSamAccount.inc:364
+#: ../lib/modules/sambaSamAccount.inc:359
 msgid "This specifies what to do when the client connection is broken."
 msgstr "这里指定客户连接中断的动作。"
 
-#: ../help/help.inc:176
+#: ../help/help.inc:178
 msgid "This text is displayed on top of the self service login page. You can also input HTML code here."
 msgstr "这些文本显示在自助服务登录面的上端.你可以在此输入HTML代码."
 
-#: ../help/help.inc:178
+#: ../help/help.inc:180
 msgid "This text is displayed on top of the self service main page. You can also input HTML code here."
 msgstr "这些文本显示在自助服务主页的上端,可以在此输入HTML代码."
 
-#: ../help/help.inc:174
+#: ../help/help.inc:176
 msgid "This text should shortly describe your selected LDAP search attribute (e.g. email or user name)."
 msgstr "这些文本简短描述了您所选的LDAP搜索属性(比如邮件或用户名)."
 
@@ -6754,8 +7071,8 @@ msgstr "这些文本会显示在每个用户PDF文件的上端."
 msgid "This tool allows you to customize the PDF pages."
 msgstr "本工具可以让用户自定义PDF页面."
 
-#: ../templates/lists/userlink.php:64
-#: ../templates/lists/changePassword.php:51
+#: ../templates/lists/userlink.php:61
+#: ../templates/lists/changePassword.php:46
 msgid "This user was not found!"
 msgstr "用户未找到!"
 
@@ -6766,36 +7083,43 @@ msgstr "用户未找到!"
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"!"
 msgstr "此值只能设为 \\\"true\\\" 或 \\\"false\\\"!"
 
-#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:93
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"."
 msgstr "此值只能设为 \\\"true\\\" 或 \\\"false\\\"."
 
-#: ../lib/modules/posixGroup.inc:477
+#: ../lib/modules/posixGroup.inc:478
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "此值必须是用分号分开的用户名列表."
 
-#: ../help/help.inc:199
+#: ../help/help.inc:201
 msgid "This will create a new organizational unit under the selected one."
 msgstr "在所选的节点下建立新的组织单元."
 
-#: ../lib/modules/posixAccount.inc:368
+#: ../lib/modules/posixAccount.inc:360
 msgid "This will create the user's home directory on the specified server."
 msgstr "将在指定的服务器上建立用户的主目录."
 
-#: ../help/help.inc:201
+#: ../help/help.inc:203
 msgid "This will delete the selected organizational unit. The OU has to be empty."
 msgstr "将删除所选的组织单元.组织单元必须为空."
 
-#: ../help/help.inc:124
+#: ../help/help.inc:126
 msgid "This will delete the selected profile."
 msgstr "将删除所选的配置文件."
 
-#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/eduPerson.inc:128
+#: ../lib/modules/sambaSamAccount.inc:374
+#: ../lib/modules/shadowAccount.inc:194
+#: ../lib/modules/phpGroupwareUser.inc:87
+msgid "This will enable the extension automatically if this profile is loaded."
+msgstr "在配置文件调入时，将自动打开扩展项。"
+
+#: ../lib/modules/sambaSamAccount.inc:239
 msgid "This will reset the host's password to a default value."
 msgstr "将主机密码复位到缺省值."
 
-#: ../templates/lists/changePassword.php:180
-#: ../help/help.inc:188
+#: ../templates/lists/changePassword.php:175
+#: ../help/help.inc:190
 msgid "This will set a random password and display it on the screen or send it the user via mail."
 msgstr "将会生成一个随机的密码并在屏幕上显示或通过邮件发送给用户。"
 
@@ -6803,37 +7127,37 @@ msgstr "将会生成一个随机的密码并在屏幕上显示或通过邮件发
 msgid "This will set a special flag on the account which tells Kolabd to remove it. Use this to cleanly delete Kolab accounts (e.g. this removes mail boxes)."
 msgstr "将为用户设定特殊的标记,以通知Kolabd删除帐号.用来完全删除Kolab帐号(比如删除邮箱)."
 
-#: ../lib/modules/sambaSamAccount.inc:1338
+#: ../lib/modules/sambaSamAccount.inc:1317
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../lib/modules/sambaSamAccount.inc:1379
+#: ../lib/modules/sambaSamAccount.inc:1358
 msgid "Time"
 msgstr "时间"
 
-#: ../lib/modules/sambaSamAccount.inc:348
+#: ../lib/modules/sambaSamAccount.inc:343
 msgid "Time limit"
 msgstr "时间限制"
 
-#: ../lib/modules/sambaSamAccount.inc:327
-#: ../lib/modules/sambaSamAccount.inc:543
+#: ../lib/modules/sambaSamAccount.inc:322
+#: ../lib/modules/sambaSamAccount.inc:524
 msgid "Time zone"
 msgstr "时区"
 
-#: ../templates/tests/lamdaemonTest.php:154
-#: ../lib/lamdaemon.inc:72
+#: ../templates/tests/lamdaemonTest.php:146
+#: ../lib/lamdaemon.inc:75
 msgid "Timeout while executing lamdaemon commands!"
 msgstr "运行lamdaemon命令超时!"
 
-#: ../lib/modules/posixAccount.inc:397
+#: ../lib/modules/posixAccount.inc:389
 msgid "To disable login use /bin/false. The list of shells is read from lam/config/shells"
 msgstr "使用/bin/false来禁止用户登录.shells列表来自/lam/config/shells."
 
-#: ../lib/modules/sambaSamAccount.inc:567
+#: ../lib/modules/sambaSamAccount.inc:548
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "东京,首尔,大孤,雅库茨克"
 
-#: ../templates/main_header.php:64
+#: ../templates/main_header.php:65
 msgid "Tools"
 msgstr "工具"
 
@@ -6842,67 +7166,67 @@ msgstr "工具"
 msgid "Total entries"
 msgstr "所有条目"
 
-#: ../lib/types/user.inc:256
+#: ../lib/types/user.inc:260
 msgid "Translate GID number to group name"
 msgstr "将GID号改为组名"
 
-#: ../templates/config/confmain.php:257
+#: ../templates/config/confmain.php:262
 #: ../help/help.inc:76
 msgid "Tree suffix"
 msgstr "树状结构后缀"
 
-#: ../templates/main_header.php:76
+#: ../templates/main_header.php:77
 msgid "Tree view"
 msgstr "树状结构"
 
-#: ../templates/config/confmain.php:555
+#: ../templates/config/confmain.php:583
 msgid "TreeSuffix is invalid!"
 msgstr "树状结构后缀非法!"
 
-#: ../lib/modules/sambaSamAccount.inc:1338
+#: ../lib/modules/sambaSamAccount.inc:1317
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../templates/schema/schema.php:353
-#: ../templates/selfService/profManage.php:148
+#: ../templates/schema/schema.php:346
+#: ../templates/selfService/profManage.php:156
 msgid "Type"
 msgstr "类型"
 
-#: ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:77
 msgid "UID"
 msgstr "UID"
 
-#: ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:77
 msgid "UID has changed. Do you want to change home directory?"
 msgstr "UID已经改变,想改变主目录吗?"
 
-#: ../lib/modules/posixAccount.inc:71
+#: ../lib/modules/posixAccount.inc:72
 msgid "UID must be a number. It has to be inside the UID range which is defined in your configuration profile."
 msgstr "UID必须是一个数字,必须在配置文件中所定的UID范围内."
 
-#: ../lib/modules/posixAccount.inc:72
-#: ../lib/modules/posixAccount.inc:212
-#: ../lib/modules/posixAccount.inc:286
-#: ../lib/modules/posixAccount.inc:335
+#: ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:215
+#: ../lib/modules/posixAccount.inc:289
+#: ../lib/modules/posixAccount.inc:327
+#: ../lib/modules/posixAccount.inc:331
 #: ../lib/modules/posixAccount.inc:339
-#: ../lib/modules/posixAccount.inc:347
-#: ../lib/modules/posixAccount.inc:940
-#: ../lib/modules/posixAccount.inc:1168
+#: ../lib/modules/posixAccount.inc:950
+#: ../lib/modules/posixAccount.inc:1178
 #: ../lib/types/user.inc:92
 #: ../lib/types/host.inc:95
 msgid "UID number"
 msgstr "UID编号"
 
-#: ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:73
 #, php-format
 msgid "UID number has changed. To keep file ownership you have to run the following command as root: 'find / -uid %s -exec chown %s {} \\;'"
 msgstr "UID号已经改变.为保持文件属主,必须用root身份运行如下命令: 'find / -uid %s -exec chown %s {} \\;'"
 
-#: ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:64
 msgid "UID ranges for Unix accounts"
 msgstr "Unix帐号的UID范围"
 
-#: ../lib/modules/sambaSamAccount.inc:285
+#: ../lib/modules/sambaSamAccount.inc:280
 msgid "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced with user and group name."
 msgstr "用户主目录(\\\\server\\share).$user和$group会使用用户和组名来替代."
 
@@ -6911,14 +7235,14 @@ msgstr "用户主目录(\\\\server\\share).$user和$group会使用用户和组
 msgid "URI (either URN or URL) that indicates a set of rights to specific resources."
 msgstr "表示指定资源的权限集的URI(或是URN,或是URL)"
 
-#: ../templates/selfService/selfServiceMain.php:264
+#: ../templates/selfService/selfServiceMain.php:262
 msgid "Unable to change your account. Maybe you do not have enough rights to change the settings."
 msgstr "无法改变您的帐号,可以没有足够的权限改变设置."
 
-#: ../templates/tests/lamdaemonTest.php:143
-#: ../templates/tests/lamdaemonTest.php:299
-#: ../lib/lamdaemon.inc:85
-#: ../lib/lamdaemon.inc:90
+#: ../templates/tests/lamdaemonTest.php:135
+#: ../templates/tests/lamdaemonTest.php:286
+#: ../lib/lamdaemon.inc:88
+#: ../lib/lamdaemon.inc:93
 msgid "Unable to connect to remote server!"
 msgstr "无法连接远端服务器 !"
 
@@ -6926,8 +7250,8 @@ msgstr "无法连接远端服务器 !"
 msgid "Unable to create new OU!"
 msgstr "无法建立新OU!"
 
-#: ../templates/selfService/profManage.php:74
-#: ../templates/config/profmanage.php:90
+#: ../templates/selfService/profManage.php:82
+#: ../templates/config/profmanage.php:96
 msgid "Unable to create new profile!"
 msgstr "无法建立新的配置文件!"
 
@@ -6935,36 +7259,33 @@ msgstr "无法建立新的配置文件!"
 msgid "Unable to delete OU!"
 msgstr "无法删除OU!"
 
-#: ../templates/pdfedit/pdfdelete.php:62
+#: ../templates/pdfedit/pdfdelete.php:60
 msgid "Unable to delete PDF structure!"
 msgstr "无法删除PDF结构!"
 
-#: ../templates/selfService/profManage.php:102
-#: ../templates/profedit/profiledelete.php:64
-#: ../templates/config/profmanage.php:112
+#: ../templates/selfService/profManage.php:110
+#: ../templates/profedit/profiledelete.php:62
+#: ../templates/config/profmanage.php:118
 msgid "Unable to delete profile!"
 msgstr "无法删除配置文件!"
 
-#: ../lib/modules/nisnetgroup.inc:525
-#: ../lib/modules/posixAccount.inc:1351
-#: ../lib/modules/posixAccount.inc:1592
+#: ../lib/modules/nisnetgroup.inc:526
+#: ../lib/modules/posixAccount.inc:1362
+#: ../lib/modules/posixAccount.inc:1596
 msgid "Unable to find group in LDAP."
 msgstr "LDAP中找不到组."
 
-#: ../templates/login.php:463
-#: ../templates/login.php:469
+#: ../templates/login.php:423
+#: ../templates/login.php:429
 msgid "Unable to find the user name in LDAP."
 msgstr "LDAP中找不到用户名."
 
-#: ../lib/modules.inc:1629
-#: ../lib/modules.inc:1633
-#: ../lib/modules/asteriskExtension.inc:253
-#: ../lib/modules/asteriskExtension.inc:352
-#: ../lib/modules/asteriskAccount.inc:218
+#: ../lib/modules.inc:1657
+#: ../lib/modules.inc:1661
 msgid "Unable to load LDAP entry:"
 msgstr "无法调入LDAP条目:"
 
-#: ../templates/config/confmain.php:354
+#: ../templates/config/confmain.php:381
 msgid "Unable to load available languages. Setting English as default language. For further instructions please contact the Admin of this site."
 msgstr "无法调入语言配置文件,将使用英语做为缺省语言,请联系网络管理员获取进一步的信息."
 
@@ -6975,49 +7296,46 @@ msgstr "无法调入语言配置文件,将使用英语做为缺省语言,请联
 msgid "Unable to load profile!"
 msgstr "无法调入配置文件!"
 
-#: ../templates/lists/changePassword.php:378
-#: ../lib/modules/sambaSamAccount.inc:2283
+#: ../templates/lists/changePassword.php:365
 msgid "Unable to read sambaSID attribute."
 msgstr "读取sambaSID属性失败."
 
-#: ../templates/schema/schema.php:98
-#: ../templates/schema/schema.php:116
-#: ../templates/schema/schema.php:277
-#: ../templates/schema/schema.php:311
-#: ../templates/tests/schemaTest.php:67
+#: ../templates/schema/schema.php:91
+#: ../templates/schema/schema.php:109
+#: ../templates/schema/schema.php:270
+#: ../templates/schema/schema.php:304
+#: ../templates/tests/schemaTest.php:56
 msgid "Unable to retrieve schema!"
 msgstr "无法获取schema!"
 
 #: ../templates/selfService/adminMain.php:150
-#: ../templates/profedit/profilepage.php:131
+#: ../templates/profedit/profilepage.php:127
 msgid "Unable to save profile!"
 msgstr "无法存储配置文件!"
 
-#: ../templates/lists/changePassword.php:330
+#: ../templates/lists/changePassword.php:317
 msgid "Unable to send mail!"
 msgstr "无法发送邮件!"
 
-#: ../templates/lists/changePassword.php:374
-#: ../templates/lists/changePassword.php:389
-#: ../lib/modules/sambaSamAccount.inc:2279
-#: ../lib/modules/sambaSamAccount.inc:2294
+#: ../templates/lists/changePassword.php:361
+#: ../templates/lists/changePassword.php:376
 msgid "Unable to sync the time when the user can/must change his password because no domain was found."
 msgstr "用户可以/必须修改密码时,因域名未发现而不能同步时间."
 
-#: ../lib/modules/posixGroup.inc:282
-#: ../lib/modules/posixAccount.inc:123
+#: ../lib/modules/posixGroup.inc:283
+#: ../lib/modules/posixAccount.inc:126
 msgid "Unix"
 msgstr "unix"
 
-#: ../templates/tests/lamdaemonTest.php:234
+#: ../templates/tests/lamdaemonTest.php:227
 msgid "Unix account"
 msgstr "Unix帐号"
 
 #: ../lib/modules/inetOrgPerson.inc:71
-#: ../lib/modules/inetOrgPerson.inc:501
-#: ../lib/modules/inetOrgPerson.inc:648
-#: ../lib/modules/inetOrgPerson.inc:1146
-#: ../lib/modules/inetOrgPerson.inc:1242
+#: ../lib/modules/inetOrgPerson.inc:480
+#: ../lib/modules/inetOrgPerson.inc:627
+#: ../lib/modules/inetOrgPerson.inc:1125
+#: ../lib/modules/inetOrgPerson.inc:1221
 msgid "Unix workstations"
 msgstr "unix工作站"
 
@@ -7026,88 +7344,81 @@ msgstr "unix工作站"
 msgid "Unix workstations are invalid!"
 msgstr "unix工作站无效!"
 
-#: ../templates/tests/lamdaemonTest.php:169
+#: ../templates/tests/lamdaemonTest.php:161
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../templates/lists/changePassword.php:116
+#: ../templates/lists/changePassword.php:111
 msgid "Unlock Samba account"
 msgstr "解锁Samba账号."
 
-#: ../lib/modules/posixGroup.inc:190
-#: ../lib/modules/posixAccount.inc:992
+#: ../lib/modules/posixGroup.inc:191
+#: ../lib/modules/posixAccount.inc:1002
 msgid "Unlock password"
 msgstr "解除密码锁定"
 
-#: ../templates/config/confmodules.php:348
+#: ../templates/masscreate.php:98
+#: ../templates/config/confmodules.php:354
 msgid "Unsolved dependency:"
 msgstr "未解决的依赖性问题:"
 
-#: ../templates/pdfedit/pdfpage.php:416
+#: ../templates/pdfedit/pdfpage.php:405
 msgid "Up"
 msgstr "向上"
 
-#: ../templates/lists/changePassword.php:119
+#: ../templates/lists/changePassword.php:114
 msgid "Update Samba password timestamps"
 msgstr "修改 Samba 密码时间戳."
 
-#: ../lib/modules/sambaSamAccount.inc:232
-msgid "Update attribute \"sambaPwdCanChange\" on password change"
-msgstr "在密码修改时修改 \"sambaPwdCanChange\"属性"
-
-#: ../lib/modules/sambaSamAccount.inc:230
+#: ../lib/modules/sambaSamAccount.inc:227
 msgid "Update attribute \"sambaPwdLastSet\" on password change"
 msgstr "在密码修改时修改 \"sambaPwdLastSet\"属性"
 
-#: ../lib/modules/sambaSamAccount.inc:231
-msgid "Update attribute \"sambaPwdMustChange\" on password change"
-msgstr "在密码修改时修改 \"sambaPwdMustChange\"属性"
-
-#: ../templates/massBuildAccounts.php:201
+#: ../templates/massBuildAccounts.php:199
 msgid "Upload accounts to LDAP"
 msgstr "上传帐号到LDAP"
 
-#: ../templates/masscreate.php:143
+#: ../templates/masscreate.php:220
 msgid "Upload file and create accounts"
 msgstr "开始上传,建立帐号"
 
-#: ../lib/modules.inc:459
+#: ../lib/modules.inc:464
 #, php-format
 msgid "Upload was stopped after errors in %s module!"
 msgstr "因为在%s模块中有错,上传停止."
 
-#: ../templates/schema/schema.php:214
+#: ../templates/schema/schema.php:207
 msgid "Usage"
 msgstr "用法"
 
-#: ../lib/modules/sambaSamAccount.inc:246
-#: ../lib/modules/sambaSamAccount.inc:249
-#: ../lib/modules/sambaSamAccount.inc:407
+#: ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/sambaSamAccount.inc:402
 msgid "Use Unix password"
 msgstr "使用unix的密码"
 
-#: ../lib/modules/sambaSamAccount.inc:252
-#: ../lib/modules/sambaSamAccount.inc:255
-#: ../lib/modules/sambaSamAccount.inc:415
-#: ../lib/modules/sambaSamAccount.inc:1094
-#: ../lib/modules/sambaSamAccount.inc:1577
+#: ../lib/modules/sambaSamAccount.inc:247
+#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/sambaSamAccount.inc:410
+#: ../lib/modules/sambaSamAccount.inc:1088
+#: ../lib/modules/sambaSamAccount.inc:1546
 msgid "Use no password"
 msgstr "无需密码"
 
-#: ../lib/modules/quota.inc:99
-#: ../lib/modules/quota.inc:384
+#: ../lib/modules/quota.inc:101
+#: ../lib/modules/quota.inc:386
 msgid "Used blocks"
 msgstr "已使用的块数"
 
-#: ../lib/modules/quota.inc:100
+#: ../lib/modules/quota.inc:102
 msgid "Used blocks. 1000 blocks are usually 1MB"
 msgstr "已经使用的块数,1000块约等于1MB"
 
-#: ../templates/schema/schema.php:273
+#: ../templates/schema/schema.php:266
 msgid "Used by attributes"
 msgstr "被属性使用"
 
-#: ../templates/schema/schema.php:242
+#: ../templates/schema/schema.php:235
 msgid "Used by object classes"
 msgstr "被对象类使用"
 
@@ -7115,17 +7426,17 @@ msgstr "被对象类使用"
 msgid "Used for calculating RIDs from UID/GID. Do not change if unsure."
 msgstr "用来从UID/GID计算RID,不确定的话请不用修改."
 
-#: ../lib/modules/quota.inc:121
-#: ../lib/modules/quota.inc:388
+#: ../lib/modules/quota.inc:123
+#: ../lib/modules/quota.inc:390
 msgid "Used inodes"
 msgstr "已经使用的节点"
 
-#: ../lib/modules/quota.inc:122
+#: ../lib/modules/quota.inc:124
 msgid "Used inodes (files)"
 msgstr "已经使用的节点(文件)"
 
 #: ../lib/modules/nisnetgroup.inc:204
-#: ../lib/modules/nisnetgroup.inc:573
+#: ../lib/modules/nisnetgroup.inc:574
 #: ../lib/modules/sambaGroupMapping.inc:67
 msgid "User"
 msgstr "用户"
@@ -7138,23 +7449,16 @@ msgstr "用户ID"
 msgid "User accounts (e.g. Unix, Samba and Kolab)"
 msgstr "用户帐号(例如 Unix, Samba和Kolab)"
 
-#: ../lib/modules/sambaSamAccount.inc:276
-#: ../lib/modules/sambaSamAccount.inc:439
-#: ../lib/modules/sambaSamAccount.inc:1130
-#: ../lib/modules/sambaSamAccount.inc:1401
-#: ../lib/modules/sambaSamAccount.inc:1606
+#: ../lib/modules/sambaSamAccount.inc:271
+#: ../lib/modules/sambaSamAccount.inc:1114
 msgid "User can change password"
 msgstr "用户可以修改密码"
 
-#: ../lib/modules/sambaSamAccount.inc:372
-msgid "User can/must change password"
-msgstr "用户可以/必须修改密码"
-
-#: ../lib/modules/posixAccount.inc:377
+#: ../lib/modules/posixAccount.inc:369
 msgid "User description. If left empty first and last name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名."
 
-#: ../lib/modules/inetOrgPerson.inc:585
+#: ../lib/modules/inetOrgPerson.inc:564
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名"
 
@@ -7162,100 +7466,97 @@ msgstr "用户描述,如果留空将会使用用户姓名"
 msgid "User description. If left empty user name will be used."
 msgstr "用户的描述,如果留空将会使用用户名."
 
-#: ../templates/schema/schema.php:209
+#: ../templates/schema/schema.php:202
 msgid "User modification"
 msgstr "用户修改"
 
-#: ../lib/modules/sambaSamAccount.inc:278
-#: ../lib/modules/sambaSamAccount.inc:446
-#: ../lib/modules/sambaSamAccount.inc:1147
-#: ../lib/modules/sambaSamAccount.inc:1406
-#: ../lib/modules/sambaSamAccount.inc:1611
+#: ../lib/modules/sambaSamAccount.inc:273
+#: ../lib/modules/sambaSamAccount.inc:1120
 msgid "User must change password"
 msgstr "用户必须修改密码"
 
-#: ../templates/lists/changePassword.php:139
-#: ../templates/login.php:271
+#: ../templates/lists/changePassword.php:134
+#: ../templates/login.php:229
 #: ../lib/modules/nisnetgroup.inc:135
 #: ../lib/modules/nisnetgroup.inc:454
 #: ../lib/modules/account.inc:94
-#: ../lib/modules/account.inc:115
-#: ../lib/modules/account.inc:135
-#: ../lib/modules/account.inc:137
-#: ../lib/modules/account.inc:138
-#: ../lib/modules/account.inc:220
-#: ../lib/modules/account.inc:241
+#: ../lib/modules/account.inc:116
+#: ../lib/modules/account.inc:118
+#: ../lib/modules/account.inc:119
+#: ../lib/modules/account.inc:201
+#: ../lib/modules/account.inc:223
+#: ../lib/modules/account.inc:247
 #: ../lib/modules/inetOrgPerson.inc:99
-#: ../lib/modules/inetOrgPerson.inc:488
-#: ../lib/modules/inetOrgPerson.inc:644
-#: ../lib/modules/inetOrgPerson.inc:933
-#: ../lib/modules/inetOrgPerson.inc:1260
+#: ../lib/modules/inetOrgPerson.inc:623
+#: ../lib/modules/inetOrgPerson.inc:912
+#: ../lib/modules/inetOrgPerson.inc:1239
+#: ../lib/modules/inetOrgPerson.inc:1297
 #: ../lib/modules/uidObject.inc:38
 #: ../lib/modules/uidObject.inc:60
 #: ../lib/modules/uidObject.inc:78
 #: ../lib/modules/uidObject.inc:92
-#: ../lib/modules/uidObject.inc:153
-#: ../lib/modules/posixAccount.inc:75
-#: ../lib/modules/posixAccount.inc:76
+#: ../lib/modules/uidObject.inc:154
+#: ../lib/modules/posixAccount.inc:78
 #: ../lib/modules/posixAccount.inc:79
-#: ../lib/modules/posixAccount.inc:198
-#: ../lib/modules/posixAccount.inc:372
-#: ../lib/modules/posixAccount.inc:928
-#: ../lib/modules/posixAccount.inc:1166
+#: ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixAccount.inc:201
+#: ../lib/modules/posixAccount.inc:364
+#: ../lib/modules/posixAccount.inc:938
+#: ../lib/modules/posixAccount.inc:1176
 #: ../lib/types/user.inc:94
 #: ../lib/types/alias.inc:91
 msgid "User name"
 msgstr "用户名"
 
 #: ../lib/modules/inetOrgPerson.inc:101
-#: ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/posixAccount.inc:86
 msgid "User name already exists!"
 msgstr "用户名已经存在!"
 
 #: ../lib/modules/nisnetgroup.inc:135
-#: ../lib/modules/account.inc:135
-#: ../lib/modules/account.inc:136
-#: ../lib/modules/account.inc:138
+#: ../lib/modules/account.inc:116
+#: ../lib/modules/account.inc:117
+#: ../lib/modules/account.inc:119
 #: ../lib/modules/inetOrgPerson.inc:99
 #: ../lib/modules/inetOrgPerson.inc:100
 #: ../lib/modules/uidObject.inc:78
-#: ../lib/modules/posixAccount.inc:76
-#: ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:79
+#: ../lib/modules/posixAccount.inc:84
 msgid "User name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !"
 msgstr "用户名包含非法字符,只能使用a-z,A-Z,0-9,和 .-_!"
 
-#: ../lib/modules/posixAccount.inc:79
+#: ../lib/modules/posixAccount.inc:82
 msgid "User name in use. Selected next free user name."
 msgstr "用户名存在,请选择其他的用户名."
 
 #: ../lib/modules/account.inc:95
-#: ../lib/modules/inetOrgPerson.inc:645
-#: ../lib/modules/posixAccount.inc:373
+#: ../lib/modules/inetOrgPerson.inc:624
+#: ../lib/modules/posixAccount.inc:365
 msgid "User name of the user who should be created. Valid characters are: a-z,A-Z,0-9, .-_. If user name is already used user name will be expanded with a number. The next free number will be used. Warning: Older systems have problems with user names longer than 8 characters. You can not log in to Windows if user name is longer than 16 characters."
 msgstr "将要建立的用户名,合法字符为:a-z,A-Z,,0-9.-_. 如果用户名已经存在,系统会在用户名后面增加一个数字.警告:超过8个字符的帐号在旧的系统中会产生问题,如果超过16个字符,无法登录Windows。"
 
-#: ../lib/modules/posixAccount.inc:57
 #: ../lib/modules/posixAccount.inc:58
-#: ../lib/modules/posixAccount.inc:61
-#: ../lib/modules/posixAccount.inc:158
+#: ../lib/modules/posixAccount.inc:59
+#: ../lib/modules/posixAccount.inc:62
+#: ../lib/modules/posixAccount.inc:161
 #: ../lib/types/user.inc:53
 msgid "Users"
 msgstr "用户"
 
-#: ../lib/modules/posixGroup.inc:387
+#: ../lib/modules/posixGroup.inc:388
 msgid "Users who are member of the current group. Users who have set their primary group to this group will not be shown."
 msgstr "当前组成员,这里不会显示将此组设为主要组的用户"
 
-#: ../lib/modules/posixGroup.inc:391
+#: ../lib/modules/posixGroup.inc:392
 msgid "Users who will become member of the current group. User names are separated by semicolons."
 msgstr "属于当前组的用户,以分号隔开."
 
-#: ../templates/tests/lamdaemonTest.php:226
+#: ../templates/tests/lamdaemonTest.php:219
 #, php-format
 msgid "Using %s as lamdaemon remote server."
 msgstr "使用%s做为lamdeamon的远程服务器."
 
-#: ../templates/tests/lamdaemonTest.php:247
+#: ../templates/tests/lamdaemonTest.php:240
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "使用%s连接远程服务器."
@@ -7264,7 +7565,7 @@ msgstr "使用%s连接远程服务器."
 msgid "Using template:"
 msgstr "使用模板:"
 
-#: ../lib/modules/posixAccount.inc:332
+#: ../lib/modules/posixAccount.inc:324
 msgid "Usually, users are not added to groups as memberUid if they have this group as primary group. If your application ignores primary groups then you can select this option to override this behaviour."
 msgstr "通常,用户不作为memberUid加入主组.如果你的应用程序不支持主组,你可以选择此项修改原来的选项."
 
@@ -7272,36 +7573,36 @@ msgstr "通常,用户不作为memberUid加入主组.如果你的应用程序不
 msgid "Valid users"
 msgstr "合法用户"
 
-#: ../templates/serverInfo.php:115
+#: ../templates/serverInfo.php:116
 msgid "Vendor name"
 msgstr "生产商"
 
-#: ../templates/serverInfo.php:120
+#: ../templates/serverInfo.php:121
 msgid "Vendor version"
 msgstr "生产商版本"
 
-#: ../templates/login.php:224
+#: ../templates/login.php:182
 msgid "Want more features? Get LAM Pro!"
 msgstr "需要更多的功能吗? 参见系统专业版! "
 
-#: ../templates/config/mainmanage.php:256
+#: ../templates/config/mainmanage.php:262
 msgid "Warning"
 msgstr "警告"
 
-#: ../templates/delete.php:203
-#: ../lib/modules.inc:1915
+#: ../templates/delete.php:194
+#: ../lib/modules.inc:1946
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "无法为DN: %s增加属性."
 
-#: ../lib/modules.inc:1886
+#: ../lib/modules.inc:1916
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "无法创建DN: %s."
 
 #: ../templates/tree/delete.php:113
-#: ../templates/delete.php:283
-#: ../templates/delete.php:291
+#: ../templates/delete.php:270
+#: ../templates/delete.php:278
 #, php-format
 msgid "Was unable to delete DN: %s."
 msgstr "无法删除DN: %s."
@@ -7309,36 +7610,33 @@ msgstr "无法删除DN: %s."
 #: ../templates/tree/update.php:109
 #: ../templates/tree/add_oclass_form.php:162
 #: ../templates/tree/add_oclass.php:93
-#: ../templates/delete.php:195
-#: ../lib/modules.inc:1903
+#: ../templates/delete.php:186
+#: ../lib/modules.inc:1934
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "无法修改DN: %s的属性"
 
-#: ../templates/lists/changePassword.php:406
+#: ../templates/lists/changePassword.php:393
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "无法修改DN: %s的属性"
 
-#: ../templates/delete.php:211
-#: ../lib/modules.inc:1927
-#: ../lib/modules/phpGroupwareGroup.inc:189
-#: ../lib/modules/phpGroupwareUser.inc:326
-#: ../lib/modules/phpGroupwareUser.inc:346
+#: ../templates/delete.php:202
+#: ../lib/modules.inc:1958
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "无法删除DN: %s的属性."
 
-#: ../lib/modules.inc:1873
+#: ../lib/modules.inc:1903
 #, php-format
 msgid "Was unable to rename DN: %s."
 msgstr "无法重命名DN: %s."
 
-#: ../lib/modules/sambaSamAccount.inc:1338
+#: ../lib/modules/sambaSamAccount.inc:1317
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../lib/modules/sambaSamAccount.inc:558
+#: ../lib/modules/sambaSamAccount.inc:539
 msgid "Western Europe Time, London, Lisbon"
 msgstr "西欧时间,伦敦,里斯本"
 
@@ -7346,40 +7644,40 @@ msgstr "西欧时间,伦敦,里斯本"
 msgid "When using ldaps:// or TLS be sure to use exactly the same IP/domain name as in your certificate!"
 msgstr "当使用ldaps://或TLS协议时确认在证书中使用相同的ip/domain!"
 
-#: ../lib/modules/sambaSamAccount.inc:316
+#: ../lib/modules/sambaSamAccount.inc:311
 msgid "Windows domain name of account."
 msgstr "帐号所属的windows域"
 
-#: ../lib/modules/sambaGroupMapping.inc:255
-#: ../lib/modules/sambaGroupMapping.inc:386
-#: ../lib/modules/sambaSamAccount.inc:460
-#: ../lib/modules/sambaSamAccount.inc:1234
-#: ../lib/modules/sambaSamAccount.inc:1674
-#: ../lib/modules/sambaSamAccount.inc:1826
+#: ../lib/modules/sambaGroupMapping.inc:256
+#: ../lib/modules/sambaGroupMapping.inc:387
+#: ../lib/modules/sambaSamAccount.inc:441
+#: ../lib/modules/sambaSamAccount.inc:1206
+#: ../lib/modules/sambaSamAccount.inc:1633
+#: ../lib/modules/sambaSamAccount.inc:1782
 msgid "Windows group"
 msgstr "Windows组"
 
-#: ../lib/modules/sambaGroupMapping.inc:358
+#: ../lib/modules/sambaGroupMapping.inc:359
 msgid "Windows group name"
 msgstr "Windows组名"
 
-#: ../lib/modules/sambaGroupMapping.inc:371
+#: ../lib/modules/sambaGroupMapping.inc:372
 msgid "Windows group type."
 msgstr "Windows组类型"
 
-#: ../lib/modules/sambaSamAccount.inc:376
+#: ../lib/modules/sambaSamAccount.inc:368
 msgid "Windows password hashes are saved by default as NT and LM hashes. LM hashes are insecure and only needed for old versions of Windows. You should disable them unless you really need them."
 msgstr "windows密码的哈希方法缺少设置为NT和LM方法.LM哈希方法是不安全的,只用于旧版本的Windows系统.除非必要,一般需要屏蔽之."
 
-#: ../lib/modules/sambaSamAccount.inc:299
+#: ../lib/modules/sambaSamAccount.inc:294
 msgid "Windows primary group"
 msgstr "Windows主组"
 
-#: ../lib/modules/sambaSamAccount.inc:302
+#: ../lib/modules/sambaSamAccount.inc:297
 msgid "Windows primary group SID"
 msgstr "Windows主组的SID"
 
-#: ../lib/modules/sambaGroupMapping.inc:367
+#: ../lib/modules/sambaGroupMapping.inc:368
 msgid "Windows-Domain name of group."
 msgstr "组的windows域名."
 
@@ -7387,46 +7685,46 @@ msgstr "组的windows域名."
 msgid "Workgroup"
 msgstr "工作组"
 
-#: ../lib/modules/sambaSamAccount.inc:345
-#: ../lib/modules/sambaSamAccount.inc:1490
-#: ../lib/modules/sambaSamAccount.inc:1846
+#: ../lib/modules/sambaSamAccount.inc:340
+#: ../lib/modules/sambaSamAccount.inc:1459
+#: ../lib/modules/sambaSamAccount.inc:1802
 msgid "Working directory"
 msgstr "工作目录"
 
-#: ../lib/modules/sambaSamAccount.inc:346
+#: ../lib/modules/sambaSamAccount.inc:341
 msgid "Working directory of initial program."
 msgstr "初始化程序的工作目录。"
 
-#: ../templates/config/confmain.php:408
+#: ../templates/config/confmain.php:435
 msgid "Write"
 msgstr "写入"
 
-#: ../templates/config/confmain.php:293
-#: ../templates/config/confmain.php:296
+#: ../templates/config/confmain.php:320
+#: ../templates/config/confmain.php:323
 msgid "Write access"
 msgstr "写权限"
 
-#: ../templates/selfService/selfServiceLogin.php:91
-#: ../templates/selfService/selfServiceLogin.php:109
-#: ../templates/login.php:451
-#: ../templates/login.php:519
+#: ../templates/selfService/selfServiceLogin.php:96
+#: ../templates/selfService/selfServiceLogin.php:114
+#: ../templates/login.php:411
+#: ../templates/login.php:469
 msgid "Wrong password/user name combination. Please try again."
 msgstr "错误的密码和用户组合,请重试!"
 
-#: ../templates/schema/schema.php:158
-#: ../templates/schema/schema.php:200
-#: ../templates/schema/schema.php:205
-#: ../templates/schema/schema.php:210
+#: ../templates/schema/schema.php:151
+#: ../templates/schema/schema.php:193
+#: ../templates/schema/schema.php:198
+#: ../templates/schema/schema.php:203
 msgid "Yes"
 msgstr "是"
 
-#: ../lib/modules/posixGroup.inc:473
+#: ../lib/modules/posixGroup.inc:474
 msgid "You are using a capital letters. This can cause problems because Windows isn't case-sensitive."
 msgstr "您使用了大写字符,这会造成一些问题,因为windows大小写不敏感."
 
-#: ../lib/modules/account.inc:137
-#: ../lib/modules/posixAccount.inc:75
-#: ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/account.inc:118
+#: ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:80
 msgid "You are using a capital letters. This can cause problems because windows isn't case-sensitive."
 msgstr "您使用了大写字符,这会造成一些问题,因为windows大小写不敏感."
 
@@ -7434,7 +7732,7 @@ msgstr "您使用了大写字符,这会造成一些问题,因为windows大小写
 msgid "You can specify if LAM allows full write access, password changes or only read access."
 msgstr "您可以指定LAM是否允许全部权限,只能更改密码,或是只读."
 
-#: ../help/help.inc:193
+#: ../help/help.inc:195
 msgid "You can use wildcards for LDAP attributes in the form @@attribute@@ (e.g. @@uid@@ for the user name)."
 msgstr "您可以用@@attribute@@的通配符形式代表LDAP属性（比如@@uid@@代表用户名）。"
 
@@ -7447,12 +7745,12 @@ msgstr "可以按照$wildcard$的格式来利用通配符,该内容将会被相
 msgid "You did not select any object classes for this object. Please go back and do so."
 msgstr "您没有为此对象选择对象类,请返回重新选择."
 
-#: ../templates/tests/schemaTest.php:67
+#: ../templates/tests/schemaTest.php:56
 msgid "You do not have the required access rights or the LDAP schema is not published by your server."
 msgstr "您无权访问或LDAP架构未发布到LDAP服务器。"
 
-#: ../lib/modules/dhcp_settings.inc:303
 #: ../lib/modules/dhcp_settings.inc:304
+#: ../lib/modules/dhcp_settings.inc:305
 msgid "You entered one or more invalid DNS servers."
 msgstr "您输入了一个或多个非常的DNS服务器."
 
@@ -7460,7 +7758,7 @@ msgstr "您输入了一个或多个非常的DNS服务器."
 msgid "You have been logged off from LDAP Account Manager."
 msgstr "您已经从系统退出"
 
-#: ../templates/lists/changePassword.php:291
+#: ../templates/lists/changePassword.php:278
 msgid "You have to activate the \"I am sure\" checkbox."
 msgstr "您必须激活\"我确认\"选项。"
 
@@ -7482,13 +7780,13 @@ msgstr "您没有做任何修改."
 msgid "You need to add at least one member to this group."
 msgstr "您至少需要为这个组增加一个成员."
 
-#: ../templates/tests/lamdaemonTest.php:251
+#: ../templates/tests/lamdaemonTest.php:244
 #, php-format
 msgid "Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"
 msgstr "系统管理者(%s)必须有一个合法的UNIX帐号才能运行lamdaemon !"
 
-#: ../lib/lamdaemon.inc:56
-#: ../lib/lamdaemon.inc:61
+#: ../lib/lamdaemon.inc:59
+#: ../lib/lamdaemon.inc:64
 msgid "Your LAM admin user must be a valid Unix account to work with lamdaemon!"
 msgstr "系统管理者必须有一个合法的UNIX帐号才能运行lamdaemon !"
 
@@ -7500,13 +7798,13 @@ msgstr "PHP设置已经关闭了文件上传,请检查PHP.INI ."
 msgid "Your session expired, click here to go back to the login page."
 msgstr "超时,请点此外返回到登录界面."
 
-#: ../templates/login.php:250
+#: ../templates/login.php:208
 msgid "Your session expired, please log in again."
 msgstr "超时,请重新登录."
 
 #: ../templates/selfService/adminMain.php:139
-#: ../templates/config/mainmanage.php:142
-#: ../lib/config.inc:412
+#: ../templates/config/mainmanage.php:148
+#: ../lib/config.inc:416
 msgid "Your settings were successfully saved."
 msgstr "设置保存成功."
 
@@ -7514,14 +7812,14 @@ msgstr "设置保存成功."
 msgid "YourCompany, Human Resources"
 msgstr "某某公司,人力资源部"
 
-#: ../lib/modules/ddns.inc:97
-#: ../lib/modules/ddns.inc:121
-#: ../lib/modules/ddns.inc:374
-#: ../lib/modules/ddns.inc:407
+#: ../lib/modules/ddns.inc:99
+#: ../lib/modules/ddns.inc:123
+#: ../lib/modules/ddns.inc:379
+#: ../lib/modules/ddns.inc:412
 msgid "Zone names"
 msgstr "区域名"
 
-#: ../lib/modules/ddns.inc:98
+#: ../lib/modules/ddns.inc:100
 msgid "Zone names for the DNS server (e.g. company.local)."
 msgstr "DNS服务器的区域名(比如: company.local)."
 
@@ -7530,34 +7828,34 @@ msgstr "DNS服务器的区域名(比如: company.local)."
 msgid "[attribute deleted]"
 msgstr "[删除属性]"
 
-#: ../lib/modules/sambaSamAccount.inc:486
+#: ../lib/modules/sambaSamAccount.inc:467
 msgid "\\\\server\\homes\\smiller"
 msgstr "\\\\server\\homes\\smiller"
 
-#: ../lib/modules/sambaSamAccount.inc:494
+#: ../lib/modules/sambaSamAccount.inc:475
 msgid "\\\\server\\profiles\\smiller"
 msgstr "\\\\server\\profiles\\smiller"
 
-#: ../lib/modules/phpGroupwareUser.inc:151
-#: ../lib/modules/phpGroupwareUser.inc:361
+#: ../lib/modules/phpGroupwareUser.inc:162
+#: ../lib/modules/phpGroupwareUser.inc:332
 msgid "active"
 msgstr "激活"
 
-#: ../templates/tree/edit.php:494
+#: ../templates/tree/edit.php:497
 msgid "add value"
 msgstr "增加值"
 
 #: ../lib/modules/nisnetgroup.inc:99
 #: ../lib/modules/groupOfNames.inc:86
-#: ../lib/modules/posixGroup.inc:359
+#: ../lib/modules/posixGroup.inc:360
 msgid "adminstrators"
 msgstr "管理员"
 
-#: ../templates/schema/schema.php:225
+#: ../templates/schema/schema.php:218
 msgid "character"
 msgstr "字符"
 
-#: ../templates/schema/schema.php:224
+#: ../templates/schema/schema.php:217
 msgid "characters"
 msgstr "字符"
 
@@ -7565,92 +7863,103 @@ msgstr "字符"
 msgid "dc=yourcompany,dc=com"
 msgstr "dc=yourcompany,dc=com"
 
-#: ../templates/tree/edit.php:314
+#: ../lib/modules/ppolicyUser.inc:88
+#: ../lib/modules/ppolicyUser.inc:93
+#: ../lib/modules/ppolicyUser.inc:110
+#: ../lib/modules/ppolicyUser.inc:154
+msgid "default"
+msgstr "缺省"
+
+#: ../templates/tree/edit.php:317
 msgid "delete attribute"
 msgstr "删除属性"
 
-#: ../lib/modules/sambaSamAccount.inc:1525
-#: ../lib/modules/sambaSamAccount.inc:1866
+#: ../lib/modules/sambaSamAccount.inc:1494
+#: ../lib/modules/sambaSamAccount.inc:1822
 msgid "disabled"
 msgstr "关闭"
 
-#: ../lib/modules/sambaSamAccount.inc:1537
-#: ../lib/modules/sambaSamAccount.inc:1877
+#: ../lib/modules/sambaSamAccount.inc:1506
+#: ../lib/modules/sambaSamAccount.inc:1833
 msgid "disconnect"
 msgstr "中断连接"
 
-#: ../templates/lists/changePassword.php:183
+#: ../templates/lists/changePassword.php:178
 msgid "display on screen"
 msgstr "屏幕显示"
 
 #: ../templates/tree/add_value_form.php:107
 #: ../templates/tree/add_value_form.php:110
-#: ../templates/tree/edit.php:179
-#: ../templates/tree/edit.php:181
-#: ../templates/tree/edit.php:308
-#: ../templates/tree/edit.php:310
+#: ../templates/tree/edit.php:182
+#: ../templates/tree/edit.php:184
+#: ../templates/tree/edit.php:311
+#: ../templates/tree/edit.php:313
 msgid "download value"
 msgstr "下载值"
 
-#: ../templates/lists/changePassword.php:157
+#: ../templates/lists/changePassword.php:152
 #: ../lib/modules/inetOrgPerson.inc:85
 #: ../lib/modules/inetOrgPerson.inc:149
 #: ../lib/modules/inetOrgPerson.inc:258
 #: ../lib/modules/inetOrgPerson.inc:422
-#: ../lib/modules/inetOrgPerson.inc:636
-#: ../lib/modules/inetOrgPerson.inc:637
-#: ../lib/modules/inetOrgPerson.inc:1087
-#: ../lib/modules/inetOrgPerson.inc:1256
-#: ../lib/modules/inetOrgPerson.inc:1584
+#: ../lib/modules/inetOrgPerson.inc:615
+#: ../lib/modules/inetOrgPerson.inc:616
+#: ../lib/modules/inetOrgPerson.inc:1066
+#: ../lib/modules/inetOrgPerson.inc:1235
+#: ../lib/modules/inetOrgPerson.inc:1601
 msgid "eMail address"
 msgstr "电子邮件地址"
 
-#: ../templates/tree/edit.php:391
+#: ../templates/tree/edit.php:394
 msgid "false"
 msgstr "失败"
 
-#: ../lib/modules/sambaSamAccount.inc:1546
-#: ../lib/modules/sambaSamAccount.inc:1885
+#: ../lib/modules/ppolicy.inc:36
+msgid "force"
+msgstr "强制"
+
+#: ../lib/modules/sambaSamAccount.inc:1515
+#: ../lib/modules/sambaSamAccount.inc:1841
 msgid "from any client"
 msgstr "从任何客户端"
 
-#: ../lib/modules/sambaSamAccount.inc:1547
-#: ../lib/modules/sambaSamAccount.inc:1886
+#: ../lib/modules/sambaSamAccount.inc:1516
+#: ../lib/modules/sambaSamAccount.inc:1842
 msgid "from previous client only"
 msgstr "仅从以前的客户端"
 
 #: ../lib/modules/nisnetgroup.inc:113
-#: ../lib/modules/posixAccount.inc:227
+#: ../lib/modules/posixAccount.inc:230
 msgid "group01,group02"
 msgstr "group01,group02"
 
-#: ../lib/modules/quota.inc:184
 #: ../lib/modules/quota.inc:186
+#: ../lib/modules/quota.inc:188
 msgid "hours"
 msgstr "小时"
 
-#: ../lib/modules/phpGroupwareUser.inc:151
-#: ../lib/modules/phpGroupwareUser.inc:364
+#: ../lib/modules/phpGroupwareUser.inc:162
+#: ../lib/modules/phpGroupwareUser.inc:335
 msgid "inactive"
 msgstr "停用"
 
-#: ../lib/modules/sambaSamAccount.inc:1529
-#: ../lib/modules/sambaSamAccount.inc:1870
+#: ../lib/modules/sambaSamAccount.inc:1498
+#: ../lib/modules/sambaSamAccount.inc:1826
 msgid "input off, notify off"
 msgstr "输入关，提醒关"
 
-#: ../lib/modules/sambaSamAccount.inc:1528
-#: ../lib/modules/sambaSamAccount.inc:1869
+#: ../lib/modules/sambaSamAccount.inc:1497
+#: ../lib/modules/sambaSamAccount.inc:1825
 msgid "input off, notify on"
 msgstr "输入关，提醒开"
 
-#: ../lib/modules/sambaSamAccount.inc:1527
-#: ../lib/modules/sambaSamAccount.inc:1868
+#: ../lib/modules/sambaSamAccount.inc:1496
+#: ../lib/modules/sambaSamAccount.inc:1824
 msgid "input on, notify off"
 msgstr "输入开，提醒关"
 
-#: ../lib/modules/sambaSamAccount.inc:1526
-#: ../lib/modules/sambaSamAccount.inc:1867
+#: ../lib/modules/sambaSamAccount.inc:1495
+#: ../lib/modules/sambaSamAccount.inc:1823
 msgid "input on, notify on"
 msgstr "输入开，提醒开"
 
@@ -7666,7 +7975,7 @@ msgstr "ldap://localhost:389 表示使用标准的LDAP连接端口389连接到lo
 msgid "ldaps://ldap.domain.com connects to ldap.domain.com using an encrypted LDAP connection."
 msgstr "连接到ldap.domain.com的ldaps://ldap.domain.com连接使用加密的LDAP连接."
 
-#: ../lib/modules/posixAccount.inc:294
+#: ../lib/modules/posixAccount.inc:297
 msgid "machines"
 msgstr "机器"
 
@@ -7674,51 +7983,57 @@ msgstr "机器"
 msgid "mail.yourdomain.org"
 msgstr "mail.yourdomain.org"
 
-#: ../lib/modules/sambaSamAccount.inc:391
-#: ../lib/modules/sambaSamAccount.inc:529
+#: ../lib/modules/sambaSamAccount.inc:386
+#: ../lib/modules/sambaSamAccount.inc:510
 msgid "mydomain"
 msgstr "我的域"
 
-#: ../lib/modules/sambaSamAccount.inc:462
+#: ../lib/modules/sambaSamAccount.inc:443
 msgid "mygroup"
 msgstr "我的组"
 
-#: ../templates/config/confmain.php:239
-#: ../templates/config/confmain.php:243
-#: ../lib/modules/sambaSamAccount.inc:580
-#: ../lib/modules/sambaSamAccount.inc:1834
-#: ../lib/modules/sambaSamAccount.inc:1842
-#: ../lib/modules/sambaSamAccount.inc:1852
-#: ../lib/modules/sambaSamAccount.inc:1857
-#: ../lib/modules/sambaSamAccount.inc:1862
+#: ../templates/config/confmain.php:244
+#: ../templates/config/confmain.php:248
+#: ../lib/modules/ppolicy.inc:34
+#: ../lib/modules/ppolicy.inc:471
+#: ../lib/modules/ppolicy.inc:487
+#: ../lib/modules/ppolicy.inc:492
+#: ../lib/modules/ppolicy.inc:499
+#: ../lib/modules/ppolicy.inc:502
+#: ../lib/modules/sambaSamAccount.inc:561
+#: ../lib/modules/sambaSamAccount.inc:1790
+#: ../lib/modules/sambaSamAccount.inc:1798
+#: ../lib/modules/sambaSamAccount.inc:1808
+#: ../lib/modules/sambaSamAccount.inc:1813
+#: ../lib/modules/sambaSamAccount.inc:1818
 msgid "no"
 msgstr "否"
 
-#: ../templates/schema/schema.php:165
-#: ../templates/schema/schema.php:234
-#: ../templates/schema/schema.php:245
-#: ../templates/schema/schema.php:294
-#: ../templates/schema/schema.php:360
-#: ../templates/schema/schema.php:375
-#: ../templates/schema/schema.php:409
-#: ../templates/schema/schema.php:431
+#: ../templates/schema/schema.php:158
+#: ../templates/schema/schema.php:227
+#: ../templates/schema/schema.php:238
+#: ../templates/schema/schema.php:287
+#: ../templates/schema/schema.php:353
+#: ../templates/schema/schema.php:368
+#: ../templates/schema/schema.php:402
+#: ../templates/schema/schema.php:424
 #: ../templates/tree/templates/creation/custom.php:189
 #: ../templates/tree/templates/creation/custom.php:212
 msgid "none"
 msgstr "空"
 
-#: ../templates/tree/edit.php:392
+#: ../templates/tree/edit.php:395
 msgid "none, remove value"
 msgstr "空,删除值"
 
-#: ../templates/schema/schema.php:221
+#: ../templates/schema/schema.php:214
 msgid "not applicable"
 msgstr "不可用"
 
-#: ../templates/schema/schema.php:172
-#: ../templates/schema/schema.php:177
-#: ../templates/schema/schema.php:182
-#: ../templates/schema/schema.php:215
+#: ../templates/schema/schema.php:165
+#: ../templates/schema/schema.php:170
+#: ../templates/schema/schema.php:175
+#: ../templates/schema/schema.php:208
 msgid "not specified"
 msgstr "未指定"
 
@@ -7726,52 +8041,52 @@ msgstr "未指定"
 msgid "ou=People,dc=yourcompany,dc=com will read and store all accounts in this subtree."
 msgstr "ou=People,dc=yourcompany,dc=com 表示将会在此子树下读取和保存所有帐号"
 
-#: ../templates/masscreate.php:166
-#: ../lib/modules/eduPerson.inc:171
-#: ../lib/modules/eduPerson.inc:177
-#: ../lib/modules/eduPerson.inc:183
+#: ../templates/masscreate.php:244
+#: ../lib/modules/eduPerson.inc:182
+#: ../lib/modules/eduPerson.inc:188
+#: ../lib/modules/eduPerson.inc:194
 msgid "ou=accounts,dc=yourdomain,dc=org"
 msgstr "ou=accounts,dc=yourdomain,dc=org"
 
-#: ../lib/modules/posixAccount.inc:280
+#: ../lib/modules/posixAccount.inc:283
 msgid "pc01$"
 msgstr "pc01$"
 
-#: ../lib/modules/posixAccount.inc:301
+#: ../lib/modules/posixAccount.inc:304
 msgid "pc01,Room 2.34"
 msgstr "pc01,Room 2.34"
 
-#: ../lib/modules/inetOrgPerson.inc:503
+#: ../lib/modules/inetOrgPerson.inc:482
 msgid "pc01,pc02"
 msgstr "pc01,pc02"
 
-#: ../templates/tree/edit.php:246
-#: ../templates/selfService/adminMain.php:597
-#: ../templates/config/confmain.php:504
-#: ../lib/modules.inc:1205
+#: ../templates/tree/edit.php:249
+#: ../templates/selfService/adminMain.php:605
+#: ../templates/config/confmain.php:531
+#: ../lib/modules.inc:1232
 msgid "required"
 msgstr "必选项"
 
-#: ../lib/modules/sambaSamAccount.inc:1538
-#: ../lib/modules/sambaSamAccount.inc:1878
+#: ../lib/modules/sambaSamAccount.inc:1507
+#: ../lib/modules/sambaSamAccount.inc:1834
 msgid "reset"
 msgstr "复位"
 
-#: ../lib/modules/posixGroup.inc:350
-#: ../lib/modules/posixAccount.inc:255
-#: ../lib/modules/asteriskAccount.inc:133
-#: ../lib/modules/sambaSamAccount.inc:403
+#: ../lib/modules/posixGroup.inc:351
+#: ../lib/modules/posixAccount.inc:258
+#: ../lib/modules/asteriskAccount.inc:142
+#: ../lib/modules/sambaSamAccount.inc:398
 msgid "secret"
 msgstr "secret"
 
-#: ../templates/lists/changePassword.php:185
+#: ../templates/lists/changePassword.php:180
 msgid "send via mail"
 msgstr "通过邮件发送"
 
 #: ../lib/modules/nisMailAlias.inc:91
-#: ../lib/modules/inetOrgPerson.inc:490
+#: ../lib/modules/inetOrgPerson.inc:1299
 #: ../lib/modules/uidObject.inc:62
-#: ../lib/modules/posixAccount.inc:200
+#: ../lib/modules/posixAccount.inc:203
 msgid "smiller"
 msgstr "smiller"
 
@@ -7787,52 +8102,84 @@ msgstr "smiller@yourdomain.org"
 msgid "ssh-dss 234234 user@host"
 msgstr "ssh-dss 234234 user@host"
 
-#: ../templates/tree/edit.php:437
+#: ../templates/tree/edit.php:440
 msgid "structural"
 msgstr "结构"
 
-#: ../lib/modules/asteriskExtension.inc:157
+#: ../lib/modules/asteriskExtension.inc:175
 msgid "test"
 msgstr "测试"
 
-#: ../lib/modules/asteriskExtension.inc:151
+#: ../lib/modules/asteriskExtension.inc:169
 msgid "test-start"
 msgstr "测试-开始"
 
-#: ../templates/tree/edit.php:389
+#: ../templates/tree/edit.php:392
 msgid "true"
 msgstr "true"
 
 #: ../lib/modules/inetOrgPerson.inc:344
+#: ../lib/modules/ipHost.inc:92
 #: ../lib/modules/aliasEntry.inc:64
 msgid "uid=smiller,ou=People,dc=company,dc=com"
 msgstr "uid=smiller,ou=People,dc=company,dc=com"
 
-#: ../lib/modules/posixGroup.inc:344
+#: ../lib/modules/posixGroup.inc:345
 msgid "user01,user02,user03"
 msgstr "user01,user02,user03"
 
 #: ../lib/modules/inetOrgPerson.inc:424
-#: ../lib/modules/eduPerson.inc:132
+#: ../lib/modules/eduPerson.inc:143
 msgid "user@company.com"
 msgstr "user@company.com"
 
-#: ../lib/modules/posixAccount.inc:220
+#: ../lib/modules/posixAccount.inc:223
 msgid "users"
 msgstr "用户"
 
-#: ../templates/config/confmain.php:238
-#: ../templates/config/confmain.php:242
+#: ../templates/config/confmain.php:243
+#: ../templates/config/confmain.php:247
+#: ../lib/modules/ppolicy.inc:35
+#: ../lib/modules/ppolicy.inc:489
+#: ../lib/modules/ppolicy.inc:494
+#: ../lib/modules/ppolicy.inc:497
+#: ../lib/modules/ppolicy.inc:504
 #: ../lib/modules/inetOrgPerson.inc:464
-#: ../lib/modules/sambaSamAccount.inc:579
-#: ../lib/modules/sambaSamAccount.inc:1832
-#: ../lib/modules/sambaSamAccount.inc:1840
-#: ../lib/modules/sambaSamAccount.inc:1850
-#: ../lib/modules/sambaSamAccount.inc:1855
-#: ../lib/modules/sambaSamAccount.inc:1860
+#: ../lib/modules/sambaSamAccount.inc:560
+#: ../lib/modules/sambaSamAccount.inc:1788
+#: ../lib/modules/sambaSamAccount.inc:1796
+#: ../lib/modules/sambaSamAccount.inc:1806
+#: ../lib/modules/sambaSamAccount.inc:1811
+#: ../lib/modules/sambaSamAccount.inc:1816
 msgid "yes"
 msgstr "是"
 
+#~ msgid "Add Samba 3 account"
+#~ msgstr "增加Samba3帐号"
+#~ msgid "Change suffix"
+#~ msgstr "更改后缀"
+#~ msgid "Delete PDF structure"
+#~ msgstr "删除PDF结构"
+#~ msgid "Donate"
+#~ msgstr "捐赠"
+#~ msgid "Host list"
+#~ msgstr "主机列表"
+#~ msgid "Please enter the same password in both password-fields."
+#~ msgstr "请在两个密码输入框输入相同的密码."
+#~ msgid "Please select your account type:"
+#~ msgstr "请选择帐号类型:"
+#~ msgid "Script settings"
+#~ msgstr "脚本设定"
+#~ msgid ""
+#~ "This is the number of seconds after when the user may or has to change "
+#~ "his password."
+#~ msgstr "用户再次修改密码的时间(秒数)."
+#~ msgid "Update attribute \"sambaPwdCanChange\" on password change"
+#~ msgstr "在密码修改时修改 \"sambaPwdCanChange\"属性"
+#~ msgid "Update attribute \"sambaPwdMustChange\" on password change"
+#~ msgstr "在密码修改时修改 \"sambaPwdMustChange\"属性"
+#~ msgid "User can/must change password"
+#~ msgstr "用户可以/必须修改密码"
 #~ msgid "The net mask was invalid and was corrected."
 #~ msgstr "网络掩码非法,已经进行修正."
 #~ msgid "The netmask was set."
@@ -7857,8 +8204,6 @@ msgstr "是"
 #~ msgstr "使用这个选项,建立域管理员或其它特殊帐号."
 #~ msgid "Please enter a valid special user name."
 #~ msgstr "请输入有效的特殊用户名."
-#~ msgid "Please enter the same password in both password fields."
-#~ msgstr "在两个密码输入框请输入相同的密码."
 #~ msgid "Samba 2"
 #~ msgstr "Samba 2"
 #~ msgid "This is the RID of the user's primary Windows group."
@@ -7984,8 +8329,6 @@ msgstr "是"
 #~ msgstr "这是用的Quake ID."
 #~ msgid "This is the user's login name for the wiki."
 #~ msgstr "这是wiki系统中用户的登录名."
-#~ msgid "Use default"
-#~ msgstr "使用缺省值"
 #~ msgid "required for Samba 3 accounts"
 #~ msgstr "Samba3帐号的必选项"
 #~ msgid "Apply"