diff --git a/lam/locale/zh_CN/LC_MESSAGES/messages.mo b/lam/locale/zh_CN/LC_MESSAGES/messages.mo
index b8e1e09c..8bdc9d17 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 3c46565f..868b9683 100644
--- a/lam/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/lam/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ 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: 2010-03-08 11:26+0800\n"
+"PO-Revision-Date: 2010-06-13 18:14+0800\n"
 "Last-Translator: Needham <needham@sina.com>\n"
 "Language-Team: Chinese(Simplified) <needham@sina.com>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../lib/modules/posixAccount.inc:377
+#: ../lib/modules/posixAccount.inc:379
 msgid "$user and $group will be replaced with user name and primary group name."
 msgstr "$usert和$group会被用户名或主要组名替代 "
 
@@ -48,9 +48,9 @@ msgstr "找到 %s 个 Samba 域"
 msgid "%s extension(s) found"
 msgstr "找到 %s 个扩展"
 
+#: ../lib/types/gon.inc:119
 #: ../lib/types/group.inc:131
 #: ../lib/types/netgroup.inc:119
-#: ../lib/types/gon.inc:119
 #, php-format
 msgid "%s group(s) found"
 msgstr "找到 %s 个组"
@@ -70,6 +70,11 @@ msgstr "找到 %s 个对象"
 msgid "%s policy(ies) found"
 msgstr "找到 %s 个策略"
 
+#: ../lib/types/sudo.inc:109
+#, php-format
+msgid "%s sudo role(s) found"
+msgstr "找到 %s 个sudo角色"
+
 #: ../lib/types/user.inc:135
 #, php-format
 msgid "%s user(s) found"
@@ -95,27 +100,28 @@ msgstr "(本条目没有新的可用属性)"
 msgid "(no new binary attributes available for this entry)"
 msgstr "(本条目没有新的可用binary属性)"
 
-#: ../lib/modules/posixAccount.inc:236
+#: ../lib/modules/posixAccount.inc:237
 msgid "/home/smiller"
 msgstr "/home/smiller"
 
-#: ../lib/modules/inetOrgPerson.inc:392
+#: ../lib/modules/inetOrgPerson.inc:332
+#: ../lib/modules/asteriskVoicemail.inc:182
 msgid "123-123-1234"
 msgstr "123-123-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:408
+#: ../lib/modules/inetOrgPerson.inc:348
 msgid "123-123-1235"
 msgstr "123-123-1235"
 
-#: ../lib/modules/inetOrgPerson.inc:416
+#: ../lib/modules/inetOrgPerson.inc:356
 msgid "123-123-1236"
 msgstr "123-123-1236"
 
-#: ../lib/modules/inetOrgPerson.inc:400
+#: ../lib/modules/inetOrgPerson.inc:340
 msgid "123-124-1234"
 msgstr "123-124-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:384
+#: ../lib/modules/inetOrgPerson.inc:324
 msgid "12345"
 msgstr "12345"
 
@@ -149,6 +155,11 @@ msgstr ""
 "\n"
 "缺省情况下,小型网络中节点被配置成H-节点模式,大型网络使用点到点模式."
 
+#: ../lib/modules/sudoRole.inc:84
+#: ../lib/modules/sudoRole.inc:113
+msgid "A list of options (e.g. NOPASSWD)."
+msgstr "选项列表(比如:NOPASSWD)."
+
 #: ../templates/massBuildAccounts.php:114
 msgid "A required column is missing in your CSV file."
 msgstr "您的CSV文件中缺少一个必要的列."
@@ -157,7 +168,7 @@ 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:543
+#: ../lib/modules/sambaSamAccount.inc:545
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "阿布达比, 马斯凯特, 巴库"
 
@@ -171,6 +182,16 @@ msgid "Account"
 msgstr "帐号"
 
 #: ../templates/massBuildAccounts.php:169
+#: ../lib/modules/ipHost.inc:109
+#: ../lib/modules/ipHost.inc:110
+#: ../lib/modules/asteriskAccount.inc:171
+#: ../lib/modules/asteriskAccount.inc:174
+#: ../lib/modules/asteriskAccount.inc:177
+#: ../lib/modules/account.inc:117
+#: ../lib/modules/ieee802device.inc:89
+#: ../lib/modules/posixGroup.inc:473
+#: ../lib/modules/posixGroup.inc:477
+#: ../lib/modules/posixGroup.inc:478
 #: ../lib/modules/dhcp_settings.inc:303
 #: ../lib/modules/dhcp_settings.inc:305
 #: ../lib/modules/dhcp_settings.inc:307
@@ -182,71 +203,20 @@ msgstr "帐号"
 #: ../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:117
-#: ../lib/modules/ddns.inc:147
-#: ../lib/modules/inetOrgPerson.inc:72
-#: ../lib/modules/inetOrgPerson.inc:74
-#: ../lib/modules/inetOrgPerson.inc:76
-#: ../lib/modules/inetOrgPerson.inc:78
-#: ../lib/modules/inetOrgPerson.inc:80
-#: ../lib/modules/inetOrgPerson.inc:82
-#: ../lib/modules/inetOrgPerson.inc:84
-#: ../lib/modules/inetOrgPerson.inc:86
-#: ../lib/modules/inetOrgPerson.inc:88
-#: ../lib/modules/inetOrgPerson.inc:90
-#: ../lib/modules/inetOrgPerson.inc:92
-#: ../lib/modules/inetOrgPerson.inc:94
-#: ../lib/modules/inetOrgPerson.inc:96
-#: ../lib/modules/inetOrgPerson.inc:98
-#: ../lib/modules/inetOrgPerson.inc:100
-#: ../lib/modules/inetOrgPerson.inc:101
-#: ../lib/modules/inetOrgPerson.inc:102
-#: ../lib/modules/inetOrgPerson.inc:105
-#: ../lib/modules/ieee802device.inc:89
-#: ../lib/modules/ipHost.inc:107
-#: ../lib/modules/ipHost.inc:108
-#: ../lib/modules/sambaGroupMapping.inc:439
-#: ../lib/modules/sambaGroupMapping.inc:440
-#: ../lib/modules/posixGroup.inc:473
-#: ../lib/modules/posixGroup.inc:477
-#: ../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: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
-#: ../lib/modules/kolabUser.inc:242
-#: ../lib/modules/kolabUser.inc:244
-#: ../lib/modules/kolabUser.inc:246
-#: ../lib/modules/kolabUser.inc:248
-#: ../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: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
+#: ../lib/modules/eduPerson.inc:221
+#: ../lib/modules/eduPerson.inc:223
+#: ../lib/modules/eduPerson.inc:224
+#: ../lib/modules/eduPerson.inc:225
+#: ../lib/modules/eduPerson.inc:226
+#: ../lib/modules/quota.inc:51
+#: ../lib/modules/quota.inc:53
+#: ../lib/modules/quota.inc:55
+#: ../lib/modules/quota.inc:57
+#: ../lib/modules/quota.inc:59
+#: ../lib/modules/quota.inc:61
+#: ../lib/modules/quota.inc:62
 #: ../lib/modules/sambaSamAccount.inc:83
 #: ../lib/modules/sambaSamAccount.inc:86
 #: ../lib/modules/sambaSamAccount.inc:89
@@ -264,89 +234,148 @@ msgstr "帐号"
 #: ../lib/modules/sambaSamAccount.inc:103
 #: ../lib/modules/sambaSamAccount.inc:105
 #: ../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:59
-#: ../lib/modules/quota.inc:60
+#: ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:77
+#: ../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:92
+#: ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:96
+#: ../lib/modules/kolabUser.inc:242
+#: ../lib/modules/kolabUser.inc:244
+#: ../lib/modules/kolabUser.inc:246
+#: ../lib/modules/kolabUser.inc:248
+#: ../lib/modules/kolabUser.inc:250
+#: ../lib/modules/kolabUser.inc:252
+#: ../lib/modules/kolabUser.inc:254
+#: ../lib/modules/phpGroupwareUser.inc:137
+#: ../lib/modules/phpGroupwareUser.inc:138
+#: ../lib/modules/ddns.inc:147
+#: ../lib/modules/nisObject.inc:117
+#: ../lib/modules/sambaGroupMapping.inc:439
+#: ../lib/modules/sambaGroupMapping.inc:440
 #: ../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:135
-#: ../lib/modules/phpGroupwareUser.inc:136
-#: ../lib/modules/sambaDomain.inc:189
-#: ../lib/modules/sambaDomain.inc:191
-#: ../lib/modules/sambaDomain.inc:193
-#: ../lib/modules/sambaDomain.inc:195
-#: ../lib/modules/sambaDomain.inc:197
-#: ../lib/modules/sambaDomain.inc:199
+#: ../lib/modules/sambaDomain.inc:202
+#: ../lib/modules/sambaDomain.inc:204
+#: ../lib/modules/sambaDomain.inc:206
+#: ../lib/modules/sambaDomain.inc:208
+#: ../lib/modules/sambaDomain.inc:210
+#: ../lib/modules/sambaDomain.inc:212
+#: ../lib/modules/inetOrgPerson.inc:45
+#: ../lib/modules/inetOrgPerson.inc:47
+#: ../lib/modules/inetOrgPerson.inc:49
+#: ../lib/modules/inetOrgPerson.inc:51
+#: ../lib/modules/inetOrgPerson.inc:53
+#: ../lib/modules/inetOrgPerson.inc:55
+#: ../lib/modules/inetOrgPerson.inc:57
+#: ../lib/modules/inetOrgPerson.inc:59
+#: ../lib/modules/inetOrgPerson.inc:61
+#: ../lib/modules/inetOrgPerson.inc:63
+#: ../lib/modules/inetOrgPerson.inc:65
+#: ../lib/modules/inetOrgPerson.inc:67
+#: ../lib/modules/inetOrgPerson.inc:69
+#: ../lib/modules/inetOrgPerson.inc:71
+#: ../lib/modules/inetOrgPerson.inc:72
+#: ../lib/modules/inetOrgPerson.inc:73
+#: ../lib/modules/inetOrgPerson.inc:76
+#: ../lib/modules/sudoRole.inc:240
+#: ../lib/modules/sudoRole.inc:242
+#: ../lib/modules/sudoRole.inc:244
+#: ../lib/modules/sudoRole.inc:246
+#: ../lib/modules/sudoRole.inc:248
+#: ../lib/modules/sudoRole.inc:250
+#: ../lib/modules/asteriskVoicemail.inc:211
+#: ../lib/modules/asteriskVoicemail.inc:217
+#: ../lib/modules/asteriskVoicemail.inc:219
+#: ../lib/modules/inetLocalMailRecipient.inc:127
+#: ../lib/modules/inetLocalMailRecipient.inc:129
+#: ../lib/modules/inetLocalMailRecipient.inc:131
 #: ../lib/modules/aliasEntry.inc:79
+#: ../lib/modules/nisMailAlias.inc:107
+#: ../lib/modules/nisMailAlias.inc:109
+#: ../lib/modules/hostObject.inc:107
 #, php-format
 msgid "Account %s:"
 msgstr "帐号 %s:"
 
+#: ../lib/modules/asteriskAccount.inc:87
+#: ../lib/modules/asteriskAccount.inc:114
+#: ../lib/modules/asteriskAccount.inc:126
+#: ../lib/modules/asteriskAccount.inc:142
+#: ../lib/modules/asteriskAccount.inc:202
+#: ../lib/modules/asteriskAccount.inc:288
 #: ../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
+#: ../lib/modules/asteriskExtension.inc:133
+#: ../lib/modules/asteriskExtension.inc:178
+#: ../lib/modules/asteriskExtension.inc:223
+#: ../lib/modules/asteriskExtension.inc:463
+#: ../lib/modules/asteriskVoicemail.inc:78
+#: ../lib/modules/asteriskVoicemail.inc:121
+#: ../lib/modules/asteriskVoicemail.inc:133
+#: ../lib/modules/asteriskVoicemail.inc:147
+#: ../lib/modules/asteriskVoicemail.inc:238
+#: ../lib/modules/asteriskVoicemail.inc:374
 msgid "Account context"
-msgstr "帐号上下文"
+msgstr "帐号语境"
 
 #: ../templates/masscreate.php:110
 msgid "Account creation via file upload"
 msgstr "通过上传文件建立帐号"
 
-#: ../lib/modules/posixAccount.inc:384
+#: ../lib/modules/posixAccount.inc:386
 msgid "Account deactivated"
 msgstr "帐号已停用"
 
-#: ../templates/lists/changePassword.php:124
+#: ../templates/lists/changePassword.php:135
 msgid "Account details"
 msgstr "帐号详细信息"
 
-#: ../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/sambaSamAccount.inc:321
+#: ../lib/modules/sambaSamAccount.inc:436
+#: ../lib/modules/sambaSamAccount.inc:1138
+#: ../lib/modules/sambaSamAccount.inc:1382
+#: ../lib/modules/sambaSamAccount.inc:1566
+#: ../lib/modules/phpGroupwareUser.inc:82
+#: ../lib/modules/phpGroupwareUser.inc:100
+#: ../lib/modules/phpGroupwareUser.inc:124
+#: ../lib/modules/phpGroupwareUser.inc:155
+#: ../lib/modules/phpGroupwareUser.inc:239
+#: ../lib/modules/phpGroupwareUser.inc:344
 #: ../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:122
-#: ../lib/modules/phpGroupwareUser.inc:153
-#: ../lib/modules/phpGroupwareUser.inc:237
-#: ../lib/modules/phpGroupwareUser.inc:342
+#: ../lib/modules/shadowAccount.inc:419
 msgid "Account expiration date"
 msgstr "帐号过期日期"
 
-#: ../lib/modules/shadowAccount.inc:418
+#: ../lib/modules/shadowAccount.inc:167
 msgid "Account inactive"
 msgstr "帐号停用(inactive)"
 
-#: ../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
+#: ../lib/modules/sambaSamAccount.inc:261
+#: ../lib/modules/sambaSamAccount.inc:267
+#: ../lib/modules/sambaSamAccount.inc:428
+#: ../lib/modules/sambaSamAccount.inc:1098
+#: ../lib/modules/sambaSamAccount.inc:1554
 msgid "Account is deactivated"
 msgstr "帐号已经停用"
 
-#: ../lib/modules/sambaSamAccount.inc:262
-#: ../lib/modules/sambaSamAccount.inc:1104
+#: ../lib/modules/sambaSamAccount.inc:264
+#: ../lib/modules/sambaSamAccount.inc:1106
 msgid "Account is locked"
 msgstr "帐号锁定"
 
@@ -355,23 +384,23 @@ msgid "Account name:"
 msgstr "帐号名"
 
 #: ../lib/modules/phpGroupwareUser.inc:78
-#: ../lib/modules/phpGroupwareUser.inc:115
-#: ../lib/modules/phpGroupwareUser.inc:160
-#: ../lib/modules/phpGroupwareUser.inc:337
+#: ../lib/modules/phpGroupwareUser.inc:99
+#: ../lib/modules/phpGroupwareUser.inc:117
+#: ../lib/modules/phpGroupwareUser.inc:162
+#: ../lib/modules/phpGroupwareUser.inc:339
 msgid "Account status"
 msgstr "帐号状态"
 
-#: ../templates/pdfedit/pdfdelete.php:85
 #: ../templates/masscreate.php:130
-#: ../lib/modules/groupOfNames.inc:229
-#: ../lib/modules/aliasEntry.inc:141
+#: ../templates/pdfedit/pdfdelete.php:82
+#: ../lib/modules/groupOfNames.inc:232
 msgid "Account type"
 msgstr "帐号类型"
 
-#: ../templates/config/conftypes.php:156
-#: ../templates/config/confmain.php:174
 #: ../templates/config/confmodules.php:141
+#: ../templates/config/confmain.php:174
 #: ../templates/config/moduleSettings.php:140
+#: ../templates/config/conftypes.php:159
 msgid "Account types"
 msgstr "帐号类型"
 
@@ -383,16 +412,16 @@ 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:1428
+#: ../lib/modules.inc:1454
 msgid "Account was created successfully."
 msgstr "新增帐号成功"
 
-#: ../templates/lists/changePassword.php:399
-#: ../lib/modules.inc:1431
+#: ../templates/lists/changePassword.php:428
+#: ../lib/modules.inc:1457
 msgid "Account was modified successfully."
 msgstr "帐号修改成功"
 
-#: ../lib/modules/customScripts.inc:119
+#: ../lib/modules/customScripts.inc:128
 msgid "Action type"
 msgstr "动作类型"
 
@@ -405,31 +434,31 @@ msgstr "活动的动态DNS"
 msgid "Activate TLS"
 msgstr "激活TLS"
 
-#: ../lib/modules/sambaSamAccount.inc:326
+#: ../lib/modules/sambaSamAccount.inc:328
 msgid "Activate this checkbox to allow this user to use the terminal service."
 msgstr "激活这个选项允许用户使用终端服务。"
 
-#: ../lib/modules/sambaSamAccount.inc:347
+#: ../lib/modules/sambaSamAccount.inc:349
 msgid "Activate this checkbox to connect drives from the client machine."
 msgstr "激活这个选项将从客户机上连接驱动器。"
 
-#: ../lib/modules/sambaSamAccount.inc:350
+#: ../lib/modules/sambaSamAccount.inc:352
 msgid "Activate this checkbox to connect printers from the client machine."
 msgstr "激活这个选项将从客户机上连接打印机。"
 
-#: ../lib/modules/sambaSamAccount.inc:335
+#: ../lib/modules/sambaSamAccount.inc:337
 msgid "Activate this checkbox to inherit the initial program and working directory from the client machine."
 msgstr "激活这个选项将从客户机上继承初始化程序和工作目录。"
 
-#: ../lib/modules/sambaSamAccount.inc:353
+#: ../lib/modules/sambaSamAccount.inc:355
 msgid "Activate this checkbox to set the client's printer as default printer."
 msgstr "激活这个选项将会设置客户打印机为缺省打印机。"
 
-#: ../lib/modules/posixAccount.inc:356
+#: ../lib/modules/posixAccount.inc:358
 msgid "Activating this checkbox will remove the user's home directory."
 msgstr "激活这个选项将会删除用户的主目录."
 
-#: ../templates/config/conftypes.php:230
+#: ../templates/config/conftypes.php:233
 msgid "Active account types"
 msgstr "激活帐号类型"
 
@@ -438,50 +467,61 @@ 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: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
+#: ../templates/config/confmodules.php:275
+#: ../templates/config/conftypes.php:221
+#: ../templates/pdfedit/pdfpage.php:579
+#: ../templates/pdfedit/pdfpage.php:596
+#: ../templates/pdfedit/pdfpage.php:624
+#: ../templates/pdfedit/pdfpage.php:660
+#: ../lib/modules/ipHost.inc:140
 #: ../lib/modules/ieee802device.inc:111
-#: ../lib/modules/ipHost.inc:138
-#: ../lib/modules/groupOfNames.inc:168
-#: ../lib/modules/groupOfNames.inc:302
-#: ../lib/modules/kolabUser.inc:340
-#: ../lib/modules/kolabUser.inc:357
-#: ../lib/modules/kolabUser.inc:383
-#: ../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
+#: ../lib/modules/eduPerson.inc:296
+#: ../lib/modules/eduPerson.inc:321
+#: ../lib/modules/eduPerson.inc:347
+#: ../lib/modules/eduPerson.inc:393
+#: ../lib/modules/kolabUser.inc:346
+#: ../lib/modules/kolabUser.inc:363
+#: ../lib/modules/kolabUser.inc:389
+#: ../lib/modules/kolabUser.inc:869
+#: ../lib/modules/kolabUser.inc:909
+#: ../lib/modules/ldapPublicKey.inc:109
+#: ../lib/modules/nisnetgroup.inc:251
+#: ../lib/modules/sudoRole.inc:290
+#: ../lib/modules/sudoRole.inc:317
+#: ../lib/modules/sudoRole.inc:344
+#: ../lib/modules/sudoRole.inc:371
+#: ../lib/modules/sudoRole.inc:398
+#: ../lib/modules/sudoRole.inc:425
+#: ../lib/modules/inetLocalMailRecipient.inc:169
+#: ../lib/modules/groupOfNames.inc:171
+#: ../lib/modules/groupOfNames.inc:305
+#: ../lib/modules/nisMailAlias.inc:156
+#: ../lib/modules/hostObject.inc:152
 msgid "Add"
 msgstr "增加"
 
-#: ../lib/modules/asteriskAccount.inc:192
+#: ../lib/modules/asteriskAccount.inc:208
 msgid "Add Asterisk account"
 msgstr "增加 Asterisk 帐号"
 
-#: ../lib/modules/eduPerson.inc:402
+#: ../lib/modules/asteriskVoicemail.inc:272
+msgid "Add Asterisk voicemail extension"
+msgstr "增加Asterisk语音邮件扩展"
+
+#: ../lib/modules/eduPerson.inc:408
 msgid "Add EDU person extension"
 msgstr "增加EDU用户扩展"
 
-#: ../lib/modules/ipHost.inc:181
+#: ../lib/modules/ipHost.inc:186
 msgid "Add IP address extension"
 msgstr "增加IP地址扩展"
 
-#: ../lib/modules/kolabUser.inc:401
+#: ../lib/modules/kolabUser.inc:407
 msgid "Add Kolab extension"
 msgstr "增加 Kolab 扩展"
 
+#: ../lib/modules/sambaSamAccount.inc:1269
 #: ../lib/modules/sambaGroupMapping.inc:280
-#: ../lib/modules/sambaSamAccount.inc:1267
 msgid "Add Samba 3 extension"
 msgstr "增加 Samba 3 扩展"
 
@@ -489,7 +529,7 @@ msgstr "增加 Samba 3 扩展"
 msgid "Add Shadow account extension"
 msgstr "增加 Shadow 帐号扩展"
 
-#: ../lib/modules/groupOfNames.inc:338
+#: ../lib/modules/groupOfNames.inc:344
 msgid "Add entries of this type:"
 msgstr "增加类型条目"
 
@@ -497,15 +537,19 @@ msgstr "增加类型条目"
 msgid "Add fix IP addresses to DNS"
 msgstr "为DNS增加一个固定的IP地址"
 
+#: ../lib/modules/hostObject.inc:166
+msgid "Add host extension"
+msgstr "增加 host 扩展"
+
 #: ../templates/selfService/adminMain.php:553
 #: ../help/help.inc:183
 msgid "Add input field"
 msgstr "增加输入栏目"
 
+#: ../templates/tree/edit.php:127
 #: ../templates/tree/add_value_form.php:95
 #: ../templates/tree/add_attr_form.php:72
 #: ../templates/tree/add_attr_form.php:109
-#: ../templates/tree/edit.php:130
 #, php-format
 msgid "Add new attribute"
 msgstr "新增属性"
@@ -519,10 +563,10 @@ msgstr "新增binary属性."
 msgid "Add new group"
 msgstr "新增组"
 
-#: ../lib/modules/inetOrgPerson.inc:631
-#: ../lib/modules/inetOrgPerson.inc:1164
-#: ../lib/modules/inetOrgPerson.inc:1207
-#: ../lib/modules/inetOrgPerson.inc:1744
+#: ../lib/modules/inetOrgPerson.inc:555
+#: ../lib/modules/inetOrgPerson.inc:1066
+#: ../lib/modules/inetOrgPerson.inc:1109
+#: ../lib/modules/inetOrgPerson.inc:1634
 msgid "Add photo"
 msgstr "新增照片"
 
@@ -530,13 +574,13 @@ msgstr "新增照片"
 #: ../lib/modules/phpGroupwareGroup.inc:83
 #: ../lib/modules/phpGroupwareGroup.inc:106
 #: ../lib/modules/phpGroupwareUser.inc:74
-#: ../lib/modules/phpGroupwareUser.inc:108
-#: ../lib/modules/phpGroupwareUser.inc:194
+#: ../lib/modules/phpGroupwareUser.inc:110
+#: ../lib/modules/phpGroupwareUser.inc:196
 msgid "Add phpGroupWare extension"
 msgstr "增加 phpGroupWare 扩展"
 
-#: ../templates/selfService/profManage.php:149
 #: ../templates/config/profmanage.php:178
+#: ../templates/selfService/profManage.php:149
 #: ../help/help.inc:121
 msgid "Add profile"
 msgstr "增加配置文件"
@@ -554,13 +598,14 @@ msgstr "因为发生了错误致使增加范围失败"
 msgid "Additional CSS links"
 msgstr "附加的CSS连接"
 
-#: ../lib/modules/posixAccount.inc:228
-#: ../lib/modules/posixAccount.inc:347
-#: ../lib/modules/posixAccount.inc:392
+#: ../lib/modules/posixAccount.inc:229
+#: ../lib/modules/posixAccount.inc:316
+#: ../lib/modules/posixAccount.inc:349
+#: ../lib/modules/posixAccount.inc:394
 #: ../lib/modules/posixAccount.inc:966
-#: ../lib/modules/posixAccount.inc:1051
-#: ../lib/modules/posixAccount.inc:1096
-#: ../lib/modules/posixAccount.inc:1182
+#: ../lib/modules/posixAccount.inc:1050
+#: ../lib/modules/posixAccount.inc:1095
+#: ../lib/modules/posixAccount.inc:1181
 msgid "Additional groups"
 msgstr "附加组"
 
@@ -580,31 +625,32 @@ msgstr "为选定的组元素增加新的自助服务选项."
 msgid "Adds input fields for a new IP range."
 msgstr "为新IP范围增加输入域"
 
-#: ../lib/modules/inetOrgPerson.inc:352
-#: ../lib/modules/inetOrgPerson.inc:440
+#: ../lib/modules/inetOrgPerson.inc:292
+#: ../lib/modules/inetOrgPerson.inc:380
 msgid "Administration"
 msgstr "管理者"
 
+#: ../lib/modules/posixGroup.inc:372
 #: ../lib/modules/nisnetgroup.inc:107
 #: ../lib/modules/groupOfNames.inc:93
-#: ../lib/modules/posixGroup.inc:372
 msgid "Administrators group"
 msgstr "管理员组"
 
 #: ../lib/modules/eduPerson.inc:90
 #: ../lib/modules/eduPerson.inc:94
 #: ../lib/modules/eduPerson.inc:161
-#: ../lib/modules/eduPerson.inc:282
-#: ../lib/modules/eduPerson.inc:679
+#: ../lib/modules/eduPerson.inc:199
+#: ../lib/modules/eduPerson.inc:288
+#: ../lib/modules/eduPerson.inc:688
 msgid "Affiliations"
 msgstr "联系"
 
-#: ../lib/modules/sambaSamAccount.inc:530
+#: ../lib/modules/sambaSamAccount.inc:532
 msgid "Alaska"
 msgstr "阿拉斯加"
 
-#: ../lib/modules/sambaDomain.inc:198
-#: ../lib/modules/sambaDomain.inc:199
+#: ../lib/modules/sambaDomain.inc:211
+#: ../lib/modules/sambaDomain.inc:212
 msgid "Algorithmic RID base is not a number!"
 msgstr "RID算法的基数不是一个数字!"
 
@@ -616,23 +662,29 @@ msgstr "别名"
 msgid "Alias entries"
 msgstr "别名条目"
 
+#: ../lib/modules/nisMailAlias.inc:106
+#: ../lib/modules/nisMailAlias.inc:107
+msgid "Alias is empty or invalid!"
+msgstr "别名为空或错误."
+
+#: ../lib/types/mailAlias.inc:91
 #: ../lib/modules/nisMailAlias.inc:67
 #: ../lib/modules/nisMailAlias.inc:82
-#: ../lib/modules/nisMailAlias.inc:139
-#: ../lib/modules/nisMailAlias.inc:278
-#: ../lib/types/mailAlias.inc:91
+#: ../lib/modules/nisMailAlias.inc:96
+#: ../lib/modules/nisMailAlias.inc:140
+#: ../lib/modules/nisMailAlias.inc:279
 msgid "Alias name"
 msgstr "别名"
 
-#: ../lib/modules/uidObject.inc:52
+#: ../lib/types/alias.inc:92
 #: ../lib/modules/customScripts.inc:45
+#: ../lib/modules/uidObject.inc:52
 #: ../lib/modules/aliasEntry.inc:54
 #: ../lib/modules/aliasEntry.inc:62
+#: ../lib/modules/aliasEntry.inc:70
 #: ../lib/modules/aliasEntry.inc:92
-#: ../lib/modules/aliasEntry.inc:109
-#: ../lib/modules/aliasEntry.inc:161
-#: ../lib/modules/aliasEntry.inc:237
-#: ../lib/types/alias.inc:92
+#: ../lib/modules/aliasEntry.inc:101
+#: ../lib/modules/aliasEntry.inc:230
 msgid "Aliased entry"
 msgstr "已有别名条目"
 
@@ -641,12 +693,12 @@ msgstr "已有别名条目"
 msgid "Aliases"
 msgstr "别名"
 
-#: ../lib/lists.inc:579
+#: ../lib/lists.inc:603
 #, php-format
 msgid "All accounts (%s)"
 msgstr "所有帐号 %s:"
 
-#: ../templates/selfService/selfServiceMain.php:282
+#: ../templates/selfService/selfServiceMain.php:284
 #: ../templates/initsuff.php:157
 msgid "All changes were successful."
 msgstr "修改成功."
@@ -655,42 +707,45 @@ msgstr "修改成功."
 msgid "All following lines form the mail body."
 msgstr "邮件主体的所有行"
 
-#: ../lib/lists.inc:578
+#: ../lib/lists.inc:602
 #, php-format
 msgid "All selected accounts (%s)"
 msgstr "所有选中的帐号(%s)"
 
 #: ../lib/modules/sambaDomain.inc:110
-#: ../lib/modules/sambaDomain.inc:299
-#: ../lib/modules/sambaDomain.inc:670
+#: ../lib/modules/sambaDomain.inc:187
+#: ../lib/modules/sambaDomain.inc:312
+#: ../lib/modules/sambaDomain.inc:684
 msgid "Allow machine password changes"
 msgstr "允许改变主机密码"
 
-#: ../lib/modules/ppolicy.inc:124
-#: ../lib/modules/ppolicy.inc:288
-#: ../lib/modules/ppolicy.inc:501
 #: ../lib/types/ppolicyType.inc:90
+#: ../lib/modules/ppolicy.inc:124
+#: ../lib/modules/ppolicy.inc:147
+#: ../lib/modules/ppolicy.inc:301
+#: ../lib/modules/ppolicy.inc:517
 msgid "Allow password change"
 msgstr "允许改变密码"
 
-#: ../lib/modules/sambaSamAccount.inc:325
-#: ../lib/modules/sambaSamAccount.inc:1423
-#: ../lib/modules/sambaSamAccount.inc:1792
+#: ../lib/modules/sambaSamAccount.inc:209
+#: ../lib/modules/sambaSamAccount.inc:327
+#: ../lib/modules/sambaSamAccount.inc:1425
+#: ../lib/modules/sambaSamAccount.inc:1794
 msgid "Allow terminal server login"
 msgstr "允许终端服务登录"
 
-#: ../templates/config/mainmanage.php:199
+#: ../templates/config/mainmanage.php:204
 #: ../lib/types/user.inc:95
 #: ../help/help.inc:143
 msgid "Allowed hosts"
 msgstr "允许的主机"
 
-#: ../lib/modules/sambaSamAccount.inc:1290
-#: ../lib/modules/sambaSamAccount.inc:1291
+#: ../lib/modules/sambaSamAccount.inc:1292
+#: ../lib/modules/sambaSamAccount.inc:1293
 msgid "Allowed workstations"
 msgstr "允许的工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:545
+#: ../lib/modules/sambaSamAccount.inc:547
 msgid "Almaty, Dhaka, Colombo"
 msgstr "阿尔迈迪，达卡，科伦坡"
 
@@ -702,29 +757,35 @@ msgstr "总会接受"
 msgid "Always reject"
 msgstr "总是拒绝"
 
-#: ../templates/tree/edit.php:143
+#: ../templates/tree/edit.php:140
 #, php-format
 msgid "An attribute (%s) was modified and is highlighted below."
 msgstr "下面高亮的属性(%s)已经被修改."
 
-#: ../lib/modules/kolabUser.inc:322
-#: ../lib/modules/kolabUser.inc:781
-#: ../lib/modules/kolabUser.inc:884
+#: ../lib/modules/sudoRole.inc:238
+msgid "An sudo role with this name already exists. Please choose another name."
+msgstr "这个名字的duso角色已经存在,请选择另外一个名字."
+
+#: ../lib/modules/kolabUser.inc:328
+#: ../lib/modules/kolabUser.inc:787
+#: ../lib/modules/kolabUser.inc:890
 msgid "Anyone"
 msgstr "任何人"
 
 #: ../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
+#: ../lib/modules/asteriskExtension.inc:136
+#: ../lib/modules/asteriskExtension.inc:165
+#: ../lib/modules/asteriskExtension.inc:235
+#: ../lib/modules/asteriskExtension.inc:469
 msgid "Application"
 msgstr "应用"
 
 #: ../lib/modules/asteriskExtension.inc:78
-#: ../lib/modules/asteriskExtension.inc:167
-#: ../lib/modules/asteriskExtension.inc:234
-#: ../lib/modules/asteriskExtension.inc:460
+#: ../lib/modules/asteriskExtension.inc:132
+#: ../lib/modules/asteriskExtension.inc:172
+#: ../lib/modules/asteriskExtension.inc:239
+#: ../lib/modules/asteriskExtension.inc:466
 msgid "Application data"
 msgstr "应用数据"
 
@@ -732,7 +793,7 @@ msgstr "应用数据"
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "确认永久删除这个对象?"
 
-#: ../lib/modules/asteriskAccount.inc:64
+#: ../lib/modules/asteriskAccount.inc:66
 msgid "Asterisk"
 msgstr "Asterisk"
 
@@ -748,7 +809,20 @@ msgstr "Asterisk 扩展"
 msgid "Asterisk extensions entries"
 msgstr "Asterisk 扩展条目"
 
-#: ../lib/modules/sambaSamAccount.inc:535
+#: ../lib/modules/asteriskAccount.inc:95
+#: ../lib/modules/asteriskAccount.inc:102
+msgid "Asterisk realm"
+msgstr "Asterisk域"
+
+#: ../lib/modules/asteriskVoicemail.inc:64
+msgid "Asterisk voicemail"
+msgstr "Asterisk语音邮件"
+
+#: ../lib/modules/asteriskVoicemail.inc:107
+msgid "Asterisk voicemail context."
+msgstr "Asterisk语音邮件的语境."
+
+#: ../lib/modules/sambaSamAccount.inc:537
 msgid "Atlantic time (Canada), Caracas"
 msgstr "大西洋时间(加拿大),卡拉卡斯"
 
@@ -765,22 +839,28 @@ msgstr "属性"
 msgid "Attribute types"
 msgstr "属性类型"
 
-#: ../lib/modules/sambaSamAccount.inc:551
+#: ../lib/modules/sambaSamAccount.inc:553
 msgid "Auckland, Fiji, Kamchatka"
 msgstr "奥克兰,斐济,堪察加"
 
+#: ../lib/modules/asteriskAccount.inc:96
+msgid "Authentication realm for Asterisk server (default: asterisk). This value set in sip.conf (option: \"realm\")."
+msgstr "Asterisk的认证域(缺少值:asterisk).这个值设置在sip.conf中(选项:\"realm\")."
+
 #: ../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/sambaSamAccount.inc:375
 #: ../lib/modules/phpGroupwareUser.inc:86
 #: ../lib/modules/phpGroupwareUser.inc:93
+#: ../lib/modules/shadowAccount.inc:99
+#: ../lib/modules/shadowAccount.inc:193
+#: ../lib/modules/hostObject.inc:76
+#: ../lib/modules/hostObject.inc:95
 msgid "Automatically add this extension"
 msgstr "自动增加这个扩展项"
 
-#: ../templates/config/conftypes.php:211
+#: ../templates/config/conftypes.php:214
 #: ../lib/modules/customScripts.inc:54
 msgid "Available account types"
 msgstr "有效的帐号类型"
@@ -790,25 +870,25 @@ msgstr "有效的帐号类型"
 msgid "Available actions"
 msgstr "可选动作"
 
-#: ../lib/modules/nisnetgroup.inc:364
-#: ../lib/modules/posixAccount.inc:1063
+#: ../lib/modules/posixAccount.inc:1062
+#: ../lib/modules/nisnetgroup.inc:368
 msgid "Available groups"
 msgstr "可选组"
 
-#: ../templates/config/confmodules.php:279
+#: ../templates/config/confmodules.php:284
 msgid "Available modules"
 msgstr "可选模块"
 
 #: ../lib/modules/posixGroup.inc:253
-#: ../lib/modules/asteriskExtension.inc:311
+#: ../lib/modules/asteriskExtension.inc:317
 msgid "Available users"
 msgstr "可选用户"
 
-#: ../lib/modules/sambaSamAccount.inc:1296
+#: ../lib/modules/sambaSamAccount.inc:1298
 msgid "Available workstations"
 msgstr "可选工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:538
+#: ../lib/modules/sambaSamAccount.inc:540
 msgid "Azores, Cape Verde Islands"
 msgstr "亚速尔,维德角岛"
 
@@ -816,15 +896,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:1208
-#: ../lib/modules/groupOfNames.inc:348
+#: ../templates/massBuildAccounts.php:212
 #: ../lib/modules/posixGroup.inc:259
-#: ../lib/modules/asteriskExtension.inc:318
-#: ../lib/modules/posixAccount.inc:1069
-#: ../lib/modules/sambaSamAccount.inc:1300
+#: ../lib/modules/sambaSamAccount.inc:1302
+#: ../lib/modules/posixAccount.inc:1068
+#: ../lib/modules/nisnetgroup.inc:374
+#: ../lib/modules/inetOrgPerson.inc:1110
+#: ../lib/modules/asteriskExtension.inc:324
+#: ../lib/modules/groupOfNames.inc:354
 msgid "Back"
 msgstr "返回"
 
@@ -832,13 +912,11 @@ msgstr "返回"
 msgid "Back to DHCP list"
 msgstr "返回到DHCP列表"
 
-#: ../templates/logout.php:78
-#: ../templates/selfService/adminMain.php:140
-#: ../templates/selfService/adminLogin.php:157
 #: ../templates/config/index.php:115
 #: ../templates/config/conflogin.php:161
-#: ../templates/config/confsave.php:88
 #: ../templates/config/mainlogin.php:154
+#: ../templates/selfService/adminLogin.php:157
+#: ../templates/selfService/adminMain.php:140
 msgid "Back to Login"
 msgstr "返回到登录界面"
 
@@ -846,17 +924,6 @@ msgstr "返回到登录界面"
 msgid "Back to NIS object list"
 msgstr "返回到 NIS 对象列表"
 
-#: ../templates/ou_edit.php:123
-#: ../templates/ou_edit.php:127
-msgid "Back to OU-Editor"
-msgstr "返回到OU编辑器"
-
-#: ../templates/pdfedit/pdfpage.php:101
-#: ../templates/pdfedit/pdfdelete.php:65
-#: ../templates/pdfedit/pdfdelete.php:73
-msgid "Back to PDF Editor"
-msgstr "返回到PDF编辑器"
-
 #: ../lib/baseType.inc:46
 msgid "Back to account list"
 msgstr "返回到帐号列表"
@@ -875,9 +942,9 @@ msgid "Back to extensions list"
 msgstr "返回到扩展列表"
 
 #: ../templates/lists/userlink.php:63
+#: ../lib/types/gon.inc:44
 #: ../lib/types/group.inc:45
 #: ../lib/types/netgroup.inc:44
-#: ../lib/types/gon.inc:44
 msgid "Back to group list"
 msgstr "返回到组列表"
 
@@ -889,35 +956,32 @@ msgstr "返回到主机列表"
 msgid "Back to list"
 msgstr "返回列表"
 
-#: ../templates/config/mainmanage.php:150
-#: ../templates/config/mainmanage.php:382
-msgid "Back to login"
-msgstr "返回到登录界面"
-
 #: ../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:267
 #: ../templates/config/profmanage.php:365
+#: ../templates/selfService/profManage.php:277
 msgid "Back to profile login"
 msgstr "返回到配置文件登录"
 
+#: ../lib/types/sudo.inc:30
+msgid "Back to sudo role list"
+msgstr "返回到sudo角色列表"
+
 #: ../lib/types/user.inc:44
 msgid "Back to user list"
 msgstr "返回到用户列表"
 
-#: ../lib/modules/sambaSamAccount.inc:542
+#: ../lib/modules/sudoRole.inc:130
+msgid "Backup script"
+msgstr "备份脚本"
+
+#: ../lib/modules/sambaSamAccount.inc:544
 msgid "Baghdad, Riyadh, Moscow"
 msgstr "巴格达,利雅得,莫斯科"
 
-#: ../lib/modules/sambaSamAccount.inc:546
+#: ../lib/modules/sambaSamAccount.inc:548
 msgid "Bangkok, Hanoi, Jakarta"
 msgstr "曼谷,河内,安卡拉"
 
@@ -934,47 +998,47 @@ msgstr "基本DN"
 msgid "Base module"
 msgstr "基本模块"
 
-#: ../templates/pdfedit/pdfpage.php:396
+#: ../templates/pdfedit/pdfpage.php:420
 msgid "Beginning"
 msgstr "开始"
 
-#: ../lib/modules/sambaSamAccount.inc:547
+#: ../lib/modules/sambaSamAccount.inc:549
 msgid "Beijing, Perth, Singapore"
 msgstr "北京,佩斯,新加坡"
 
-#: ../templates/tree/edit.php:179
-#: ../templates/tree/edit.php:308
+#: ../templates/tree/edit.php:176
+#: ../templates/tree/edit.php:305
 msgid "Binary value"
 msgstr "二进制值"
 
-#: ../lib/modules/quota.inc:50
+#: ../lib/modules/quota.inc:52
 msgid "Block hard quota"
 msgstr "块数硬性限额"
 
-#: ../lib/modules/quota.inc:50
-#: ../lib/modules/quota.inc:51
+#: ../lib/modules/quota.inc:52
+#: ../lib/modules/quota.inc:53
 msgid "Block hard quota contains invalid characters. Only natural numbers are allowed."
 msgstr "块数硬性限额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:56
+#: ../lib/modules/quota.inc:58
 msgid "Block quota"
 msgstr "块数限额"
 
-#: ../lib/modules/quota.inc:48
+#: ../lib/modules/quota.inc:50
 msgid "Block soft quota"
 msgstr "块数软性限额"
 
-#: ../lib/modules/quota.inc:48
-#: ../lib/modules/quota.inc:49
+#: ../lib/modules/quota.inc:50
+#: ../lib/modules/quota.inc:51
 msgid "Block soft quota contains invalid characters. Only natural numbers are allowed."
 msgstr "块数软性限额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:56
-#: ../lib/modules/quota.inc:57
+#: ../lib/modules/quota.inc:58
+#: ../lib/modules/quota.inc:59
 msgid "Block soft quota must be smaller than block hard quota."
 msgstr "块数软性限额必须小于硬性限额."
 
-#: ../lib/modules/sambaSamAccount.inc:536
+#: ../lib/modules/sambaSamAccount.inc:538
 msgid "Brazil, Buenos Aires"
 msgstr "巴西,布宜诺斯艾利斯"
 
@@ -982,22 +1046,27 @@ msgstr "巴西,布宜诺斯艾利斯"
 msgid "Builtin group"
 msgstr "内置组"
 
-#: ../lib/modules/inetOrgPerson.inc:104
-#: ../lib/modules/inetOrgPerson.inc:153
-#: ../lib/modules/inetOrgPerson.inc:271
-#: ../lib/modules/inetOrgPerson.inc:350
-#: ../lib/modules/inetOrgPerson.inc:643
-#: ../lib/modules/inetOrgPerson.inc:1105
-#: ../lib/modules/inetOrgPerson.inc:1238
-#: ../lib/modules/inetOrgPerson.inc:1713
+#: ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/inetOrgPerson.inc:121
+#: ../lib/modules/inetOrgPerson.inc:217
+#: ../lib/modules/inetOrgPerson.inc:290
+#: ../lib/modules/inetOrgPerson.inc:472
+#: ../lib/modules/inetOrgPerson.inc:567
+#: ../lib/modules/inetOrgPerson.inc:1015
+#: ../lib/modules/inetOrgPerson.inc:1139
+#: ../lib/modules/inetOrgPerson.inc:1603
 msgid "Business category"
 msgstr "商业种类"
 
-#: ../lib/modules/inetOrgPerson.inc:644
+#: ../lib/modules/inetOrgPerson.inc:568
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "商业种类(比如:行政部门,IT服务部门,管理部门,...)"
 
-#: ../templates/masscreate.php:219
+#: ../lib/modules/customScripts.inc:81
+msgid "By default, LAM will show the executed command along with any output of it. If you want to hide the command and only show the output then activate this option."
+msgstr "缺省情况下,LAM显示运行命令及其输出.如果您想隐藏命令而仅显示输出,请激活这个选项."
+
+#: ../templates/masscreate.php:224
 msgid "CSV file:"
 msgstr "CSV 文件:"
 
@@ -1010,19 +1079,20 @@ msgstr "缓存超时"
 msgid "Cache timeout is invalid!"
 msgstr "缓存超时非法"
 
-#: ../lib/modules/asteriskAccount.inc:77
-#: ../lib/modules/asteriskAccount.inc:119
-#: ../lib/modules/asteriskAccount.inc:175
-#: ../lib/modules/asteriskAccount.inc:271
+#: ../lib/modules/asteriskAccount.inc:79
+#: ../lib/modules/asteriskAccount.inc:125
+#: ../lib/modules/asteriskAccount.inc:135
+#: ../lib/modules/asteriskAccount.inc:191
+#: ../lib/modules/asteriskAccount.inc:287
 msgid "Caller ID"
 msgstr "拨号 ID号"
 
+#: ../lib/modules/sambaSamAccount.inc:282
+#: ../lib/modules/sambaSamAccount.inc:285
+#: ../lib/modules/sambaSamAccount.inc:288
+#: ../lib/modules/sambaSamAccount.inc:294
+#: ../lib/modules/posixAccount.inc:395
 #: ../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
@@ -1030,50 +1100,51 @@ msgstr "拨号 ID号"
 msgid "Can be left empty."
 msgstr "可以置空"
 
+#: ../templates/tree/update_confirm.php:241
 #: ../templates/tree/delete_form.php:119
 #: ../templates/tree/delete_form.php:168
-#: ../templates/tree/update_confirm.php:241
-#: ../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:257
-#: ../templates/profedit/profiledelete.php:84
-#: ../templates/config/conftypes.php:199
-#: ../templates/config/confmain.php:217
+#: ../templates/ou_edit.php:113
+#: ../templates/config/mainmanage.php:378
 #: ../templates/config/confmodules.php:184
+#: ../templates/config/confmain.php:217
 #: ../templates/config/moduleSettings.php:183
+#: ../templates/config/conftypes.php:202
+#: ../templates/selfService/adminMain.php:306
+#: ../templates/pdfedit/pdfdelete.php:92
+#: ../templates/pdfedit/pdfpage.php:688
+#: ../templates/delete.php:112
+#: ../templates/profedit/profiledelete.php:83
+#: ../templates/profedit/profilepage.php:259
 #: ../templates/initsuff.php:187
-#: ../lib/modules.inc:1291
-#: ../lib/modules/nisnetgroup.inc:467
-#: ../lib/modules/groupOfNames.inc:235
-#: ../lib/modules/groupOfNames.inc:256
-#: ../lib/modules/groupOfNames.inc:303
-#: ../lib/modules/kolabUser.inc:570
-#: ../lib/modules/sambaSamAccount.inc:1365
-#: ../lib/modules/sambaSamAccount.inc:1403
-#: ../lib/modules/sambaSamAccount.inc:1526
+#: ../lib/modules/sambaSamAccount.inc:1367
+#: ../lib/modules/sambaSamAccount.inc:1405
+#: ../lib/modules/sambaSamAccount.inc:1528
+#: ../lib/modules/kolabUser.inc:576
+#: ../lib/modules/phpGroupwareUser.inc:262
 #: ../lib/modules/shadowAccount.inc:403
-#: ../lib/modules/phpGroupwareUser.inc:260
-#: ../lib/modules/aliasEntry.inc:147
-#: ../lib/modules/aliasEntry.inc:167
-#: ../lib/lists.inc:589
-#: ../lib/lists.inc:805
+#: ../lib/modules/nisnetgroup.inc:471
+#: ../lib/modules/aliasEntry.inc:142
+#: ../lib/modules/aliasEntry.inc:161
+#: ../lib/modules/groupOfNames.inc:238
+#: ../lib/modules/groupOfNames.inc:259
+#: ../lib/modules/groupOfNames.inc:306
+#: ../lib/lists.inc:614
+#: ../lib/lists.inc:830
+#: ../lib/modules.inc:1317
 msgid "Cancel"
 msgstr "取消"
 
-#: ../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
+#: ../templates/login.php:417
+#: ../templates/login.php:475
+#: ../templates/login.php:480
+#: ../templates/selfService/selfServiceLogin.php:120
+#: ../templates/selfService/selfServiceLogin.php:124
+#: ../templates/selfService/selfServiceMain.php:165
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "无法连接指定的LDAP服务器,请再试一次."
 
-#: ../lib/config.inc:419
-#: ../lib/config.inc:1146
+#: ../templates/login.php:220
+#: ../lib/config.inc:1150
 msgid "Cannot open config file!"
 msgstr "无法打开配置文件!"
 
@@ -1081,37 +1152,38 @@ msgstr "无法打开配置文件!"
 msgid "Captions and labels"
 msgstr "标题和标签"
 
-#: ../lib/modules/inetOrgPerson.inc:152
-#: ../lib/modules/inetOrgPerson.inc:265
-#: ../lib/modules/inetOrgPerson.inc:462
-#: ../lib/modules/inetOrgPerson.inc:655
-#: ../lib/modules/inetOrgPerson.inc:1087
-#: ../lib/modules/inetOrgPerson.inc:1240
-#: ../lib/modules/inetOrgPerson.inc:1697
+#: ../lib/modules/inetOrgPerson.inc:120
+#: ../lib/modules/inetOrgPerson.inc:213
+#: ../lib/modules/inetOrgPerson.inc:402
+#: ../lib/modules/inetOrgPerson.inc:466
+#: ../lib/modules/inetOrgPerson.inc:579
+#: ../lib/modules/inetOrgPerson.inc:997
+#: ../lib/modules/inetOrgPerson.inc:1141
+#: ../lib/modules/inetOrgPerson.inc:1587
 msgid "Car license"
 msgstr "汽车执照"
 
-#: ../lib/modules/sambaSamAccount.inc:540
+#: ../lib/modules/sambaSamAccount.inc:542
 msgid "Central Europe Time, Paris, Berlin"
 msgstr "欧洲中央时间,巴黎,柏林"
 
-#: ../lib/modules/sambaSamAccount.inc:533
+#: ../lib/modules/sambaSamAccount.inc:535
 msgid "Central Time (US & Canada), Mexico City"
 msgstr "中央时间(美国和加拿大),墨西哥市 "
 
 #: ../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:240
-#: ../lib/modules/sambaSamAccount.inc:1139
-#: ../lib/modules/sambaSamAccount.inc:1399
+#: ../templates/pdfedit/pdfpage.php:468
+#: ../templates/pdfedit/pdfpage.php:474
+#: ../lib/modules/sambaSamAccount.inc:1141
+#: ../lib/modules/sambaSamAccount.inc:1401
+#: ../lib/modules/phpGroupwareUser.inc:158
+#: ../lib/modules/phpGroupwareUser.inc:258
 #: ../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
+#: ../lib/modules/asteriskExtension.inc:245
+#: ../lib/modules/aliasEntry.inc:94
+#: ../lib/modules/groupOfNames.inc:160
+#: ../lib/modules/groupOfNames.inc:177
 msgid "Change"
 msgstr "更改"
 
@@ -1124,17 +1196,17 @@ msgstr "更改用户和主机的GID号"
 msgid "Change default profile"
 msgstr "更改缺省的配置文件"
 
-#: ../lib/lists.inc:791
+#: ../lib/lists.inc:816
 msgid "Change list settings"
 msgstr "改变列表设置"
 
-#: ../templates/config/mainmanage.php:337
+#: ../templates/config/mainmanage.php:342
 #: ../help/help.inc:131
 msgid "Change master password"
 msgstr "更改管理员密码"
 
-#: ../templates/lists/changePassword.php:117
-#: ../templates/lists/changePassword.php:187
+#: ../templates/lists/changePassword.php:128
+#: ../templates/lists/changePassword.php:183
 #: ../templates/lists/changePassword.php:214
 #: ../lib/types/user.inc:247
 #: ../help/help.inc:98
@@ -1146,16 +1218,16 @@ msgstr "更改密码"
 msgid "Change passwords"
 msgstr "更改密码 "
 
-#: ../templates/login.php:340
+#: ../templates/login.php:352
 msgid "Change profile"
 msgstr "改变配置文件"
 
-#: ../lib/lists.inc:642
-#: ../lib/lists.inc:643
+#: ../lib/lists.inc:667
+#: ../lib/lists.inc:668
 msgid "Change settings"
 msgstr "修改设置"
 
-#: ../lib/modules/posixAccount.inc:872
+#: ../lib/modules/posixAccount.inc:837
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "值已改变,因为只能使用ASCII字符."
 
@@ -1171,11 +1243,11 @@ msgstr "检查LDAP的架构是否符合选中的帐号模块需求"
 msgid "Check quotas"
 msgstr "检查限额"
 
-#: ../templates/masscreate.php:210
+#: ../templates/masscreate.php:215
 msgid "Check your input carefully. LAM will only do some basic checks on the upload data."
 msgstr "请仔细检查输入,上传前程序仅做基本检查."
 
-#: ../lib/modules/posixAccount.inc:96
+#: ../lib/modules/posixAccount.inc:97
 msgid "Choose a server for the home directory!"
 msgstr "请选择主目录所在服务器!"
 
@@ -1192,9 +1264,10 @@ msgstr "如果没有自动跳转到下一页请点此处."
 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
+#: ../lib/modules/sambaSamAccount.inc:221
+#: ../lib/modules/sambaSamAccount.inc:354
+#: ../lib/modules/sambaSamAccount.inc:1491
+#: ../lib/modules/sambaSamAccount.inc:1822
 msgid "Client printer is default"
 msgstr "缺省为客户打印机"
 
@@ -1202,37 +1275,51 @@ msgstr "缺省为客户打印机"
 msgid "Collective"
 msgstr "集合(Collective)"
 
-#: ../templates/masscreate.php:230
+#: ../templates/masscreate.php:235
 msgid "Columns:"
 msgstr "列:"
 
-#: ../lib/modules/sambaSamAccount.inc:292
+#: ../lib/modules/sambaSamAccount.inc:294
 msgid "Comma separated list of Samba workstations the user is allowed to login. Empty means every workstation."
 msgstr "用户可以登录的Samba工作站,用逗号分隔,空值表示所有工作站."
 
-#: ../lib/modules/customScripts.inc:120
+#: ../lib/types/sudo.inc:80
+#: ../lib/modules/customScripts.inc:129
 msgid "Command"
 msgstr "命令"
 
+#: ../lib/modules/sudoRole.inc:71
+#: ../lib/modules/sudoRole.inc:97
+#: ../lib/modules/sudoRole.inc:146
+#: ../lib/modules/sudoRole.inc:175
+#: ../lib/modules/sudoRole.inc:190
+#: ../lib/modules/sudoRole.inc:339
+#: ../lib/modules/sudoRole.inc:714
+msgid "Commands"
+msgstr "命令"
+
 #: ../templates/tree/update_confirm.php:234
 msgid "Commit"
 msgstr "提交"
 
-#: ../lib/modules/inetOrgPerson.inc:97
-#: ../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:95
+#: ../lib/modules/posixAccount.inc:210
+#: ../lib/modules/posixAccount.inc:319
+#: ../lib/modules/posixAccount.inc:398
+#: ../lib/modules/posixAccount.inc:420
 #: ../lib/modules/posixAccount.inc:944
-#: ../lib/modules/posixAccount.inc:1177
+#: ../lib/modules/posixAccount.inc:1176
+#: ../lib/modules/inetOrgPerson.inc:68
+#: ../lib/modules/inetOrgPerson.inc:485
+#: ../lib/modules/inetOrgPerson.inc:547
+#: ../lib/modules/inetOrgPerson.inc:845
+#: ../lib/modules/inetOrgPerson.inc:1137
+#: ../lib/modules/inetOrgPerson.inc:1191
+#: ../lib/modules/asteriskExtension.inc:102
+#: ../lib/modules/asteriskExtension.inc:138
+#: ../lib/modules/asteriskExtension.inc:158
+#: ../lib/modules/asteriskExtension.inc:219
+#: ../lib/modules/asteriskExtension.inc:481
 msgid "Common name"
 msgstr "全名"
 
@@ -1248,29 +1335,32 @@ msgstr "配置后缀"
 msgid "Configuration overview"
 msgstr "配置总览"
 
-#: ../templates/config/confmodules.php:362
+#: ../templates/config/confmodules.php:367
 msgid "Conflicting module:"
 msgstr "冲突的模块:"
 
-#: ../lib/modules/sambaSamAccount.inc:346
-#: ../lib/modules/sambaSamAccount.inc:1479
-#: ../lib/modules/sambaSamAccount.inc:1810
+#: ../lib/modules/sambaSamAccount.inc:219
+#: ../lib/modules/sambaSamAccount.inc:348
+#: ../lib/modules/sambaSamAccount.inc:1481
+#: ../lib/modules/sambaSamAccount.inc:1812
 msgid "Connect client drives"
 msgstr "连接客户驱动器"
 
-#: ../lib/modules/sambaSamAccount.inc:349
-#: ../lib/modules/sambaSamAccount.inc:1484
-#: ../lib/modules/sambaSamAccount.inc:1815
+#: ../lib/modules/sambaSamAccount.inc:220
+#: ../lib/modules/sambaSamAccount.inc:351
+#: ../lib/modules/sambaSamAccount.inc:1486
+#: ../lib/modules/sambaSamAccount.inc:1817
 msgid "Connect client printers"
 msgstr "连接客户打印机"
 
-#: ../lib/modules/sambaSamAccount.inc:1464
-#: ../lib/modules/sambaSamAccount.inc:1803
+#: ../lib/modules/sambaSamAccount.inc:216
+#: ../lib/modules/sambaSamAccount.inc:1466
+#: ../lib/modules/sambaSamAccount.inc:1805
 msgid "Connection time limit"
 msgstr "连接时间限制"
 
-#: ../templates/tree/templates/creation/new_ou_template.php:105
 #: ../templates/tree/templates/creation/custom.php:66
+#: ../templates/tree/templates/creation/new_ou_template.php:105
 msgid "Container"
 msgstr "容器"
 
@@ -1282,32 +1372,33 @@ msgstr "容器的DN"
 msgid "Could not perform ldap_modify operation."
 msgstr "无法执行ldap_modify命令"
 
-#: ../templates/selfService/profManage.php:97
 #: ../templates/config/profmanage.php:109
+#: ../templates/selfService/profManage.php:97
 msgid "Could not rename file!"
 msgstr "不能更改文件名"
 
-#: ../templates/pdfedit/pdfpage.php:98
-msgid "Could not save PDF profile, access denied."
-msgstr "无法保存PDF文件,存取拒绝."
+#: ../templates/pdfedit/pdfpage.php:99
+msgid "Could not save PDF structure, access denied."
+msgstr "无法保存PDF结构,存取拒绝."
 
 #: ../lib/modules/kolabUser.inc:90
 #: ../lib/modules/kolabUser.inc:159
 #: ../lib/modules/kolabUser.inc:188
-#: ../lib/modules/kolabUser.inc:282
-#: ../lib/modules/kolabUser.inc:757
+#: ../lib/modules/kolabUser.inc:227
+#: ../lib/modules/kolabUser.inc:288
+#: ../lib/modules/kolabUser.inc:763
 msgid "Country"
 msgstr "国家"
 
-#: ../lib/modules/kolabUser.inc:239
-#: ../lib/modules/kolabUser.inc:240
+#: ../lib/modules/kolabUser.inc:245
+#: ../lib/modules/kolabUser.inc:246
 msgid "Country name is invalid!"
 msgstr "国家名称非法!"
 
-#: ../templates/tree/templates/creation/new_ou_template.php:107
 #: ../templates/tree/templates/creation/custom.php:234
-#: ../templates/pdfedit/pdfmain.php:126
-#: ../templates/profedit/profilemain.php:117
+#: ../templates/tree/templates/creation/new_ou_template.php:107
+#: ../templates/pdfedit/pdfmain.php:144
+#: ../templates/profedit/profilemain.php:139
 #: ../templates/initsuff.php:186
 msgid "Create"
 msgstr "建立"
@@ -1317,18 +1408,18 @@ msgstr "建立"
 msgid "Create Object"
 msgstr "对立对象"
 
-#: ../lib/modules.inc:1442
-#: ../lib/lists.inc:405
-#: ../lib/lists.inc:556
+#: ../lib/lists.inc:411
+#: ../lib/lists.inc:573
+#: ../lib/modules.inc:1468
 #: ../help/help.inc:162
 msgid "Create PDF file"
 msgstr "建立PDF文件"
 
-#: ../templates/pdfedit/pdfmain.php:117
+#: ../templates/pdfedit/pdfmain.php:135
 msgid "Create a new PDF structure"
 msgstr "建立新的PDF架构"
 
-#: ../templates/profedit/profilemain.php:106
+#: ../templates/profedit/profilemain.php:123
 msgid "Create a new profile"
 msgstr "建立新的配置文件"
 
@@ -1357,9 +1448,9 @@ msgstr "建立另外一个域"
 msgid "Create another extension"
 msgstr "建立另外一个扩展"
 
+#: ../lib/types/gon.inc:43
 #: ../lib/types/group.inc:44
 #: ../lib/types/netgroup.inc:43
-#: ../lib/types/gon.inc:43
 msgid "Create another group"
 msgstr "建立另外一个组"
 
@@ -1371,24 +1462,28 @@ msgstr "建立另外一个主机"
 msgid "Create another policy"
 msgstr "建立另外一个策略"
 
+#: ../lib/types/sudo.inc:29
+msgid "Create another sudo role"
+msgstr "建立另外一个sudo角色"
+
 #: ../lib/types/user.inc:43
 msgid "Create another user"
 msgstr "建立另外一个用户"
 
-#: ../lib/lists.inc:573
+#: ../lib/lists.inc:590
 msgid "Create for"
 msgstr "建立"
 
-#: ../lib/modules/posixAccount.inc:241
-#: ../lib/modules/posixAccount.inc:984
-#: ../lib/modules/posixAccount.inc:1113
+#: ../lib/modules/posixAccount.inc:242
+#: ../lib/modules/posixAccount.inc:983
+#: ../lib/modules/posixAccount.inc:1112
 msgid "Create home directory"
 msgstr "建立主目录"
 
+#: ../templates/tree/edit.php:125
 #: ../templates/tree/tree.php:189
 #: ../templates/tree/tree.php:191
 #: ../templates/tree/tree.php:192
-#: ../templates/tree/edit.php:128
 #: ../lib/tree.inc:92
 #: ../lib/tree.inc:93
 #: ../lib/tree.inc:157
@@ -1397,8 +1492,8 @@ msgstr "建立主目录"
 msgid "Create new entry"
 msgstr "新建条目"
 
-#: ../templates/selfService/profManage.php:80
 #: ../templates/config/profmanage.php:94
+#: ../templates/selfService/profManage.php:80
 msgid "Created new profile."
 msgstr "新增配置文件"
 
@@ -1417,8 +1512,8 @@ msgstr "自定义"
 #: ../lib/modules/customScripts.inc:41
 #: ../lib/modules/customScripts.inc:52
 #: ../lib/modules/customScripts.inc:65
-#: ../lib/modules/customScripts.inc:79
-#: ../lib/modules/customScripts.inc:87
+#: ../lib/modules/customScripts.inc:86
+#: ../lib/modules/customScripts.inc:95
 msgid "Custom scripts"
 msgstr "自定义脚本"
 
@@ -1438,33 +1533,35 @@ msgstr "DHCP"
 msgid "DHCP administration"
 msgstr "DHCP管理者"
 
-#: ../lib/modules/dhcp_settings.inc:101
 #: ../lib/types/dhcp.inc:126
+#: ../lib/modules/dhcp_settings.inc:101
 msgid "DHCP settings"
 msgstr "DHCP 设置"
 
+#: ../templates/tree/edit.php:92
 #: ../templates/tree/add_value_form.php:99
+#: ../templates/tree/add_oclass_form.php:124
+#: ../templates/tree/update_confirm.php:79
+#: ../templates/tree/add_attr_form.php:73
 #: ../templates/tree/delete_form.php:77
 #: ../templates/tree/delete_form.php:151
-#: ../templates/tree/update_confirm.php:79
-#: ../templates/tree/add_oclass_form.php:124
-#: ../templates/tree/add_attr_form.php:73
-#: ../templates/tree/edit.php:92
 #: ../templates/delete.php:91
-#: ../lib/modules.inc:1526
-#: ../lib/modules.inc:1993
+#: ../lib/modules.inc:384
+#: ../lib/modules.inc:1546
+#: ../lib/modules.inc:2019
 msgid "DN"
 msgstr "DN"
 
-#: ../templates/masscreate.php:233
+#: ../templates/masscreate.php:238
 msgid "DN settings"
 msgstr "DN 设置"
 
-#: ../templates/masscreate.php:237
+#: ../templates/masscreate.php:242
 #: ../help/help.inc:156
 msgid "DN suffix"
 msgstr "DN 后缀"
 
+#: ../lib/modules/dhcp_settings.inc:170
 #: ../lib/modules/dhcp_settings.inc:202
 #: ../lib/modules/dhcp_settings.inc:256
 #: ../lib/modules/dhcp_settings.inc:569
@@ -1489,11 +1586,11 @@ msgstr "DSML输出 %s"
 msgid "Data field for RDN is empty!"
 msgstr "RDN数据文件是空的"
 
-#: ../lib/modules/sambaSamAccount.inc:272
+#: ../lib/modules/sambaSamAccount.inc:274
 msgid "Date after the user is able to change his password."
 msgstr "多少天后用户才能修改密码。"
 
-#: ../lib/modules/sambaSamAccount.inc:274
+#: ../lib/modules/sambaSamAccount.inc:276
 msgid "Date after the user must change his password."
 msgstr "多少天后用户必须修改密码"
 
@@ -1501,11 +1598,12 @@ msgstr "多少天后用户必须修改密码"
 msgid "Days before password is to expire that user is warned of pending password expiration. If set value must be >0."
 msgstr "在密码过期前提醒用户的天数,若设其值,必大于0."
 
-#: ../templates/config/mainmanage.php:262
+#: ../templates/config/mainmanage.php:267
 msgid "Debug"
 msgstr "调试"
 
 #: ../lib/modules/dhcp_settings.inc:134
+#: ../lib/modules/dhcp_settings.inc:171
 #: ../lib/modules/dhcp_settings.inc:207
 #: ../lib/modules/dhcp_settings.inc:262
 #: ../lib/modules/dhcp_settings.inc:575
@@ -1518,8 +1616,8 @@ msgstr "缺省网关"
 msgid "Default language"
 msgstr "缺省语言"
 
-#: ../templates/masscreate.php:245
-#: ../templates/masscreate.php:408
+#: ../templates/masscreate.php:250
+#: ../templates/masscreate.php:413
 msgid "Default value"
 msgstr "缺省值"
 
@@ -1531,31 +1629,32 @@ msgstr "定义工作站是否更改密码."
 #: ../lib/modules/kolabUser.inc:143
 #: ../lib/modules/kolabUser.inc:147
 #: ../lib/modules/kolabUser.inc:207
-#: ../lib/modules/kolabUser.inc:386
-#: ../lib/modules/kolabUser.inc:795
-#: ../lib/modules/kolabUser.inc:866
+#: ../lib/modules/kolabUser.inc:230
+#: ../lib/modules/kolabUser.inc:392
+#: ../lib/modules/kolabUser.inc:801
+#: ../lib/modules/kolabUser.inc:872
 msgid "Delegates"
 msgstr "代理(Delegates)"
 
-#: ../lib/modules/kolabUser.inc:244
+#: ../lib/modules/kolabUser.inc:250
 msgid "Delegates has invalid format!"
 msgstr "代理(Delegates)格式错误"
 
+#: ../templates/tree/edit.php:112
 #: ../templates/tree/delete_form.php:159
-#: ../templates/tree/edit.php:115
-#: ../templates/pdfedit/pdfdelete.php:94
-#: ../templates/pdfedit/pdfmain.php:160
+#: ../templates/ou_edit.php:112
+#: ../templates/pdfedit/pdfdelete.php:91
+#: ../templates/pdfedit/pdfmain.php:178
 #: ../templates/delete.php:111
-#: ../templates/ou_edit.php:107
-#: ../templates/profedit/profilemain.php:148
-#: ../lib/modules/nisnetgroup.inc:225
-#: ../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
+#: ../templates/profedit/profilemain.php:170
 #: ../lib/tree.inc:1176
+#: ../lib/modules/eduPerson.inc:280
+#: ../lib/modules/eduPerson.inc:305
+#: ../lib/modules/eduPerson.inc:331
+#: ../lib/modules/eduPerson.inc:377
+#: ../lib/modules/kolabUser.inc:863
+#: ../lib/modules/nisnetgroup.inc:229
+#: ../lib/lists.inc:406
 msgid "Delete"
 msgstr "删除"
 
@@ -1568,7 +1667,7 @@ msgstr "删除 %s"
 msgid "Delete DHCP(s)"
 msgstr "删除DHCP"
 
-#: ../lib/modules/kolabUser.inc:395
+#: ../lib/modules/kolabUser.inc:401
 msgid "Delete Kolab account"
 msgstr "删除Kolab帐号"
 
@@ -1594,13 +1693,13 @@ msgstr "删除域"
 msgid "Delete extension(s)"
 msgstr "删除扩展"
 
+#: ../lib/types/gon.inc:122
 #: ../lib/types/group.inc:134
 #: ../lib/types/netgroup.inc:122
-#: ../lib/types/gon.inc:122
 msgid "Delete group(s)"
 msgstr "删除组"
 
-#: ../lib/modules/posixAccount.inc:1023
+#: ../lib/modules/posixAccount.inc:1022
 msgid "Delete home directory"
 msgstr "删除主目录"
 
@@ -1612,17 +1711,12 @@ msgstr "删除主机"
 msgid "Delete object"
 msgstr "删除对象"
 
-#: ../templates/pdfedit/pdfdelete.php:72
-#: ../templates/profedit/profiledelete.php:72
-msgid "Delete operation canceled."
-msgstr "取消删除动作"
-
-#: ../templates/ou_edit.php:178
+#: ../templates/ou_edit.php:181
 #: ../help/help.inc:202
 msgid "Delete organizational unit"
 msgstr "删除组织单元"
 
-#: ../lib/modules/inetOrgPerson.inc:1167
+#: ../lib/modules/inetOrgPerson.inc:1069
 msgid "Delete photo"
 msgstr "删除照片"
 
@@ -1630,8 +1724,8 @@ msgstr "删除照片"
 msgid "Delete policy(ies)"
 msgstr "删除策略"
 
-#: ../templates/selfService/profManage.php:233
 #: ../templates/config/profmanage.php:258
+#: ../templates/selfService/profManage.php:243
 #: ../help/help.inc:125
 msgid "Delete profile"
 msgstr "删除配置文件"
@@ -1643,6 +1737,10 @@ msgstr "删除配置文件"
 msgid "Delete range"
 msgstr "删除范围"
 
+#: ../lib/types/sudo.inc:112
+msgid "Delete sudo role(s)"
+msgstr "删除sudo角色"
+
 #: ../lib/types/user.inc:138
 msgid "Delete user(s)"
 msgstr "删除用户"
@@ -1652,17 +1750,17 @@ msgstr "删除用户"
 msgid "Deleted DN: %s"
 msgstr "删除的DN: %s"
 
-#: ../templates/pdfedit/pdfdelete.php:63
-msgid "Deleted PDF structure:"
-msgstr "删除的PDF结构:"
+#: ../templates/pdfedit/pdfmain.php:125
+msgid "Deleted PDF structure."
+msgstr "删除的PDF结构."
 
 #: ../lib/modules/sambaGroupMapping.inc:72
 msgid "Deleted account"
 msgstr "已删除的帐号"
 
-#: ../templates/profedit/profiledelete.php:64
-msgid "Deleted profile:"
-msgstr "已删除的配置文件:"
+#: ../templates/profedit/profilemain.php:114
+msgid "Deleted profile."
+msgstr "已删除的配置文件."
 
 #: ../lib/modules/range.inc:85
 msgid "Deletes an IP range."
@@ -1679,59 +1777,74 @@ msgstr "正在删除%s"
 msgid "Deleting. Please stand by ..."
 msgstr "正在删除,请稍等..."
 
-#: ../lib/modules/inetOrgPerson.inc:154
-#: ../lib/modules/inetOrgPerson.inc:165
-#: ../lib/modules/inetOrgPerson.inc:275
-#: ../lib/modules/inetOrgPerson.inc:438
-#: ../lib/modules/inetOrgPerson.inc:663
-#: ../lib/modules/inetOrgPerson.inc:1114
-#: ../lib/modules/inetOrgPerson.inc:1246
-#: ../lib/modules/inetOrgPerson.inc:1754
+#: ../lib/modules/inetOrgPerson.inc:122
+#: ../lib/modules/inetOrgPerson.inc:133
+#: ../lib/modules/inetOrgPerson.inc:219
+#: ../lib/modules/inetOrgPerson.inc:378
+#: ../lib/modules/inetOrgPerson.inc:475
+#: ../lib/modules/inetOrgPerson.inc:587
+#: ../lib/modules/inetOrgPerson.inc:1024
+#: ../lib/modules/inetOrgPerson.inc:1147
+#: ../lib/modules/inetOrgPerson.inc:1644
 msgid "Department(s)"
 msgstr "部门"
 
+#: ../templates/tree/add_value_form.php:186
 #: ../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: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/types/nisObjectType.inc:80
+#: ../lib/types/user.inc:101
+#: ../lib/types/sudo.inc:84
+#: ../lib/types/netgroup.inc:92
+#: ../lib/modules/account.inc:75
 #: ../lib/modules/account.inc:88
 #: ../lib/modules/account.inc:98
 #: ../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: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:440
-#: ../lib/modules/sambaGroupMapping.inc:390
 #: ../lib/modules/posixGroup.inc:178
+#: ../lib/modules/posixGroup.inc:331
 #: ../lib/modules/posixGroup.inc:383
 #: ../lib/modules/posixGroup.inc:449
-#: ../lib/modules/posixAccount.inc:414
+#: ../lib/modules/dhcp_settings.inc:161
+#: ../lib/modules/dhcp_settings.inc:176
+#: ../lib/modules/dhcp_settings.inc:289
+#: ../lib/modules/dhcp_settings.inc:615
+#: ../lib/modules/dhcp_settings.inc:677
+#: ../lib/modules/posixAccount.inc:416
 #: ../lib/modules/nisObject.inc:66
 #: ../lib/modules/nisObject.inc:96
-#: ../lib/modules/nisObject.inc:147
-#: ../lib/modules/nisObject.inc:222
-#: ../lib/types/netgroup.inc:92
-#: ../lib/types/user.inc:101
-#: ../lib/types/nisObjectType.inc:80
+#: ../lib/modules/nisObject.inc:107
+#: ../lib/modules/nisObject.inc:148
+#: ../lib/modules/nisObject.inc:213
+#: ../lib/modules/sambaGroupMapping.inc:313
+#: ../lib/modules/sambaGroupMapping.inc:390
+#: ../lib/modules/nisnetgroup.inc:72
+#: ../lib/modules/nisnetgroup.inc:125
+#: ../lib/modules/nisnetgroup.inc:184
+#: ../lib/modules/nisnetgroup.inc:569
+#: ../lib/modules/inetOrgPerson.inc:183
+#: ../lib/modules/inetOrgPerson.inc:258
+#: ../lib/modules/inetOrgPerson.inc:421
+#: ../lib/modules/inetOrgPerson.inc:491
+#: ../lib/modules/inetOrgPerson.inc:854
+#: ../lib/modules/inetOrgPerson.inc:1122
+#: ../lib/modules/sudoRole.inc:59
+#: ../lib/modules/sudoRole.inc:128
+#: ../lib/modules/sudoRole.inc:172
+#: ../lib/modules/sudoRole.inc:272
+#: ../lib/modules/sudoRole.inc:705
+#: ../lib/modules/groupOfNames.inc:64
+#: ../lib/modules/groupOfNames.inc:91
+#: ../lib/modules/groupOfNames.inc:112
+#: ../lib/modules/groupOfNames.inc:146
+#: ../lib/modules/groupOfNames.inc:446
 msgid "Description"
 msgstr "描述"
 
-#: ../lib/modules/sambaSamAccount.inc:367
-#: ../lib/modules/sambaSamAccount.inc:557
+#: ../lib/modules/sambaSamAccount.inc:369
+#: ../lib/modules/sambaSamAccount.inc:559
 msgid "Disable LM hashes"
 msgstr "屏蔽LM哈希方法"
 
@@ -1745,13 +1858,15 @@ msgid "Disables the client to update DNS entries."
 msgstr "禁止客户端更新DNS条目."
 
 #: ../lib/modules/sambaDomain.inc:106
-#: ../lib/modules/sambaDomain.inc:288
-#: ../lib/modules/sambaDomain.inc:665
+#: ../lib/modules/sambaDomain.inc:186
+#: ../lib/modules/sambaDomain.inc:301
+#: ../lib/modules/sambaDomain.inc:679
 msgid "Disconnect users outside logon hours"
 msgstr "切断连接前用户登录小时数"
 
-#: ../lib/modules/sambaSamAccount.inc:1469
-#: ../lib/modules/sambaSamAccount.inc:1804
+#: ../lib/modules/sambaSamAccount.inc:217
+#: ../lib/modules/sambaSamAccount.inc:1471
+#: ../lib/modules/sambaSamAccount.inc:1806
 msgid "Disconnection time limit"
 msgstr "断开连接时间限制"
 
@@ -1759,34 +1874,40 @@ msgstr "断开连接时间限制"
 msgid "Disconnects users if they are logged in outside logon hours."
 msgstr "如果用户登录限制时间到则断开连接."
 
+#: ../lib/modules/sambaSamAccount.inc:96
+#: ../lib/modules/sambaSamAccount.inc:189
+#: ../lib/modules/sambaSamAccount.inc:234
+#: ../lib/modules/sambaSamAccount.inc:392
+#: ../lib/modules/sambaSamAccount.inc:1083
+#: ../lib/modules/sambaSamAccount.inc:1763
 #: ../lib/modules/sambaGroupMapping.inc:236
+#: ../lib/modules/sambaGroupMapping.inc:311
 #: ../lib/modules/sambaGroupMapping.inc:355
 #: ../lib/modules/sambaGroupMapping.inc:388
-#: ../lib/modules/sambaSamAccount.inc:96
-#: ../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:463
+#: ../templates/lists/changePassword.php:174
+msgid "Display on screen"
+msgstr "屏幕显示"
+
+#: ../lib/modules.inc:477
 msgid "Displayed account numbers start at \"0\". Add 2 to get the row in your spreadsheet."
 msgstr "显示的帐号数以\"0\"开始,加2才是您的电子表格的行数."
 
-#: ../templates/ou_edit.php:101
+#: ../templates/ou_edit.php:106
 msgid "Do you really want to delete this OU?"
 msgstr "确认删除这个OU?"
 
-#: ../templates/pdfedit/pdfdelete.php:80
+#: ../templates/pdfedit/pdfdelete.php:77
 msgid "Do you really want to delete this PDF structure?"
 msgstr "确认删除这个PDF结构?"
 
-#: ../templates/profedit/profiledelete.php:79
+#: ../templates/profedit/profiledelete.php:78
 msgid "Do you really want to delete this profile?"
 msgstr "确认删除这个配置文件?"
 
-#: ../lib/modules/kolabUser.inc:565
+#: ../lib/modules/kolabUser.inc:571
 msgid "Do you really want to mark this account for deletion?"
 msgstr "确认将此帐号打上删除标记?"
 
@@ -1798,28 +1919,30 @@ msgstr "确认删除下列帐号?"
 msgid "Do you want to make these changes?"
 msgstr "确认如下更改?"
 
-#: ../lib/modules/nisnetgroup.inc:205
-#: ../lib/modules/nisnetgroup.inc:575
+#: ../lib/modules/sambaSamAccount.inc:190
+#: ../lib/modules/sambaSamAccount.inc:312
+#: ../lib/modules/sambaSamAccount.inc:385
+#: ../lib/modules/sambaSamAccount.inc:509
+#: ../lib/modules/sambaSamAccount.inc:1232
+#: ../lib/modules/sambaSamAccount.inc:1624
+#: ../lib/modules/sambaSamAccount.inc:1656
+#: ../lib/modules/sambaSamAccount.inc:1781
 #: ../lib/modules/sambaGroupMapping.inc:69
 #: ../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
+#: ../lib/modules/nisnetgroup.inc:209
+#: ../lib/modules/nisnetgroup.inc:579
 msgid "Domain"
 msgstr "域"
 
+#: ../lib/types/smbDomain.inc:91
 #: ../lib/modules/sambaDomain.inc:74
 #: ../lib/modules/sambaDomain.inc:144
-#: ../lib/modules/sambaDomain.inc:231
-#: ../lib/modules/sambaDomain.inc:237
-#: ../lib/modules/sambaDomain.inc:637
-#: ../lib/types/smbDomain.inc:91
+#: ../lib/modules/sambaDomain.inc:178
+#: ../lib/modules/sambaDomain.inc:244
+#: ../lib/modules/sambaDomain.inc:250
+#: ../lib/modules/sambaDomain.inc:651
 msgid "Domain SID"
 msgstr "域SID"
 
@@ -1827,30 +1950,30 @@ msgstr "域SID"
 msgid "Domain administrators"
 msgstr "域管理员"
 
+#: ../lib/modules/sambaSamAccount.inc:69
 #: ../lib/modules/sambaGroupMapping.inc:56
 #: ../lib/modules/sambaGroupMapping.inc:340
-#: ../lib/modules/sambaSamAccount.inc:69
 msgid "Domain admins"
 msgstr "域管理员"
 
-#: ../lib/modules/sambaGroupMapping.inc:61
 #: ../lib/modules/sambaSamAccount.inc:70
+#: ../lib/modules/sambaGroupMapping.inc:61
 msgid "Domain certificate admins"
 msgstr "域认证管理员"
 
-#: ../lib/modules/sambaGroupMapping.inc:59
 #: ../lib/modules/sambaSamAccount.inc:70
-#: ../lib/modules/sambaSamAccount.inc:795
+#: ../lib/modules/sambaSamAccount.inc:797
+#: ../lib/modules/sambaGroupMapping.inc:59
 msgid "Domain computers"
 msgstr "域内计算机"
 
-#: ../lib/modules/sambaGroupMapping.inc:60
 #: ../lib/modules/sambaSamAccount.inc:70
+#: ../lib/modules/sambaGroupMapping.inc:60
 msgid "Domain controllers"
 msgstr "域控制器"
 
-#: ../lib/modules/sambaGroupMapping.inc:63
 #: ../lib/modules/sambaSamAccount.inc:71
+#: ../lib/modules/sambaGroupMapping.inc:63
 msgid "Domain enterprise admins"
 msgstr "域企业管理员"
 
@@ -1859,53 +1982,55 @@ msgstr "域企业管理员"
 msgid "Domain group"
 msgstr "域内组"
 
-#: ../lib/modules/sambaGroupMapping.inc:58
 #: ../lib/modules/sambaSamAccount.inc:69
+#: ../lib/modules/sambaGroupMapping.inc:58
 msgid "Domain guests"
 msgstr "域内来宾"
 
-#: ../lib/modules/nisnetgroup.inc:137
+#: ../lib/types/smbDomain.inc:92
 #: ../lib/modules/dhcp_settings.inc:119
+#: ../lib/modules/dhcp_settings.inc:167
 #: ../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/nisnetgroup.inc:139
 #: ../lib/modules/sambaDomain.inc:70
 #: ../lib/modules/sambaDomain.inc:137
-#: ../lib/modules/sambaDomain.inc:218
-#: ../lib/modules/sambaDomain.inc:224
-#: ../lib/modules/sambaDomain.inc:634
-#: ../lib/types/smbDomain.inc:92
+#: ../lib/modules/sambaDomain.inc:177
+#: ../lib/modules/sambaDomain.inc:231
+#: ../lib/modules/sambaDomain.inc:237
+#: ../lib/modules/sambaDomain.inc:648
 msgid "Domain name"
 msgstr "域名"
 
-#: ../lib/modules/nisnetgroup.inc:137
-#: ../lib/modules/sambaDomain.inc:188
-#: ../lib/modules/sambaDomain.inc:189
+#: ../lib/modules/nisnetgroup.inc:139
+#: ../lib/modules/sambaDomain.inc:201
+#: ../lib/modules/sambaDomain.inc:202
 msgid "Domain name is invalid!"
 msgstr "域名非法!"
 
-#: ../lib/modules/sambaGroupMapping.inc:64
 #: ../lib/modules/sambaSamAccount.inc:71
+#: ../lib/modules/sambaGroupMapping.inc:64
 msgid "Domain policy admins"
 msgstr "域策略管理员"
 
-#: ../lib/modules/sambaGroupMapping.inc:62
 #: ../lib/modules/sambaSamAccount.inc:71
+#: ../lib/modules/sambaGroupMapping.inc:62
 msgid "Domain schema admins"
 msgstr "域架构管理员"
 
-#: ../lib/modules/sambaGroupMapping.inc:57
 #: ../lib/modules/sambaSamAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:2086
+#: ../lib/modules/sambaSamAccount.inc:2088
+#: ../lib/modules/sambaGroupMapping.inc:57
 msgid "Domain users"
 msgstr "域内用户"
 
-#: ../templates/pdfedit/pdfpage.php:410
+#: ../templates/pdfedit/pdfpage.php:434
 msgid "Down"
 msgstr "向下"
 
-#: ../templates/masscreate.php:364
+#: ../templates/masscreate.php:369
 msgid "Download sample CSV file"
 msgstr "下载CSV示例文件"
 
@@ -1913,62 +2038,32 @@ msgstr "下载CSV示例文件"
 msgid "Dynamic subtrees"
 msgstr "动态子树"
 
-#: ../lib/types/user.inc:100
-msgid "E-Mail"
-msgstr "电子邮件"
-
 #: ../lib/modules/eduPerson.inc:64
 msgid "EDU person"
 msgstr "EDU用户"
 
-#: ../lib/modules/kolabUser.inc:151
-msgid "EMail alias"
-msgstr "电子邮件别名"
-
-#: ../lib/modules/kolabUser.inc:152
-msgid "EMail alias for this account."
-msgstr "此帐号的电子邮件别名"
-
-#: ../lib/modules/kolabUser.inc:237
-msgid "EMail alias is invalid!"
-msgstr "电子邮件别名非法!"
-
-#: ../lib/modules/kolabUser.inc:155
-msgid "EMail alias list"
-msgstr "电子邮件别名列表"
-
-#: ../lib/modules/kolabUser.inc:238
-msgid "EMail alias list has invalid format!"
-msgstr "电子邮件别名列表格式非法!"
-
-#: ../lib/modules/kolabUser.inc:201
-#: ../lib/modules/kolabUser.inc:360
-#: ../lib/modules/kolabUser.inc:791
-msgid "EMail aliases"
-msgstr "电子邮件别名"
-
-#: ../lib/modules/sambaSamAccount.inc:549
+#: ../lib/modules/sambaSamAccount.inc:551
 msgid "East Australian Standard, Guam"
 msgstr "澳东标准时间,关岛"
 
-#: ../lib/modules/sambaSamAccount.inc:541
+#: ../lib/modules/sambaSamAccount.inc:543
 msgid "Eastern Europe Time, South Africa"
 msgstr "东欧时间,南非"
 
-#: ../lib/modules/sambaSamAccount.inc:534
+#: ../lib/modules/sambaSamAccount.inc:536
 msgid "Eastern Time (US & Canada), Bogota"
 msgstr "美国东部时间(美国和加拿大),波哥大"
 
-#: ../templates/pdfedit/pdfmain.php:157
-#: ../templates/profedit/profilemain.php:145
-#: ../lib/modules/sambaSamAccount.inc:1238
-#: ../lib/modules/sambaSamAccount.inc:1244
-#: ../lib/lists.inc:396
+#: ../templates/pdfedit/pdfmain.php:175
+#: ../templates/profedit/profilemain.php:167
+#: ../lib/modules/sambaSamAccount.inc:1240
+#: ../lib/modules/sambaSamAccount.inc:1246
+#: ../lib/lists.inc:401
 msgid "Edit"
 msgstr "编辑"
 
+#: ../templates/config/mainmanage.php:134
 #: ../templates/config/index.php:77
-#: ../templates/config/mainmanage.php:60
 msgid "Edit general settings"
 msgstr "编辑通用设置"
 
@@ -1988,31 +2083,86 @@ msgstr "编辑自动服务功能"
 msgid "Edit server profiles"
 msgstr "编辑服务器配置文件"
 
-#: ../lib/modules/nisnetgroup.inc:191
+#: ../lib/modules/nisnetgroup.inc:195
 msgid "Edit subgroups"
 msgstr "编辑分组"
 
-#: ../lib/modules/sambaSamAccount.inc:1188
+#: ../lib/modules/sambaSamAccount.inc:1190
 msgid "Edit workstations"
 msgstr "编辑工作站"
 
-#: ../lib/modules/inetOrgPerson.inc:95
-#: ../lib/modules/inetOrgPerson.inc:183
-#: ../lib/modules/inetOrgPerson.inc:268
-#: ../lib/modules/inetOrgPerson.inc:334
-#: ../lib/modules/inetOrgPerson.inc:579
-#: ../lib/modules/inetOrgPerson.inc:1096
-#: ../lib/modules/inetOrgPerson.inc:1225
+#: ../lib/types/user.inc:100
+msgid "Email"
+msgstr "电子邮件"
+
+#: ../templates/lists/changePassword.php:158
+#: ../lib/modules/inetOrgPerson.inc:56
+#: ../lib/modules/inetOrgPerson.inc:117
+#: ../lib/modules/inetOrgPerson.inc:209
+#: ../lib/modules/inetOrgPerson.inc:362
+#: ../lib/modules/inetOrgPerson.inc:460
+#: ../lib/modules/inetOrgPerson.inc:543
+#: ../lib/modules/inetOrgPerson.inc:544
+#: ../lib/modules/inetOrgPerson.inc:976
+#: ../lib/modules/inetOrgPerson.inc:1136
+#: ../lib/modules/inetOrgPerson.inc:1491
+#: ../lib/modules/asteriskVoicemail.inc:94
+#: ../lib/modules/asteriskVoicemail.inc:136
+#: ../lib/modules/asteriskVoicemail.inc:174
+#: ../lib/modules/asteriskVoicemail.inc:249
+#: ../lib/modules/asteriskVoicemail.inc:378
+msgid "Email address"
+msgstr "电子邮件地址"
+
+#: ../lib/modules/asteriskVoicemail.inc:95
+msgid "Email address for this voicemail account."
+msgstr "此语音邮件帐号的电子邮件地址"
+
+#: ../lib/modules/kolabUser.inc:151
+msgid "Email alias"
+msgstr "电子邮件别名"
+
+#: ../lib/modules/kolabUser.inc:152
+msgid "Email alias for this account."
+msgstr "此帐号的电子邮件别名"
+
+#: ../lib/modules/kolabUser.inc:243
+msgid "Email alias is invalid!"
+msgstr "电子邮件别名非法!"
+
+#: ../lib/modules/kolabUser.inc:155
+msgid "Email alias list"
+msgstr "电子邮件别名列表"
+
+#: ../lib/modules/kolabUser.inc:244
+msgid "Email alias list has invalid format!"
+msgstr "电子邮件别名列表格式非法!"
+
+#: ../lib/modules/kolabUser.inc:201
+#: ../lib/modules/kolabUser.inc:229
+#: ../lib/modules/kolabUser.inc:366
+#: ../lib/modules/kolabUser.inc:797
+msgid "Email aliases"
+msgstr "电子邮件别名"
+
+#: ../lib/modules/inetOrgPerson.inc:66
+#: ../lib/modules/inetOrgPerson.inc:151
+#: ../lib/modules/inetOrgPerson.inc:215
+#: ../lib/modules/inetOrgPerson.inc:274
+#: ../lib/modules/inetOrgPerson.inc:469
+#: ../lib/modules/inetOrgPerson.inc:507
+#: ../lib/modules/inetOrgPerson.inc:1006
+#: ../lib/modules/inetOrgPerson.inc:1126
 msgid "Employee type"
 msgstr "雇员类型"
 
-#: ../lib/modules/inetOrgPerson.inc:580
+#: ../lib/modules/inetOrgPerson.inc:508
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇员类型: 承包商,雇员,实习生,临时工,外部员工,..."
 
-#: ../templates/lists/changePassword.php:244
-#: ../templates/lists/changePassword.php:250
-#: ../templates/login.php:382
+#: ../templates/lists/changePassword.php:246
+#: ../templates/lists/changePassword.php:252
+#: ../templates/login.php:394
 msgid "Empty password submitted. Please try again."
 msgstr "提交了空密码,请重试."
 
@@ -2024,7 +2174,7 @@ msgstr "打开密码质量（比如密码长度）检查。如果设置为“强
 msgid "Encountered an error while performing search."
 msgstr "检索时发生错误."
 
-#: ../lib/modules/sambaSamAccount.inc:527
+#: ../lib/modules/sambaSamAccount.inc:529
 msgid "Eniwetok, Kwajalein"
 msgstr "埃尼威托克,瓜加林"
 
@@ -2035,8 +2185,9 @@ msgstr "输入想增加的值:"
 #: ../lib/modules/eduPerson.inc:103
 #: ../lib/modules/eduPerson.inc:107
 #: ../lib/modules/eduPerson.inc:174
-#: ../lib/modules/eduPerson.inc:333
-#: ../lib/modules/eduPerson.inc:683
+#: ../lib/modules/eduPerson.inc:205
+#: ../lib/modules/eduPerson.inc:339
+#: ../lib/modules/eduPerson.inc:692
 msgid "Entitlements"
 msgstr "授权"
 
@@ -2058,7 +2209,7 @@ msgstr "条目%s删除成功"
 msgid "Equality"
 msgstr "相等"
 
-#: ../templates/config/mainmanage.php:262
+#: ../templates/config/mainmanage.php:267
 msgid "Error"
 msgstr "错误"
 
@@ -2071,9 +2222,9 @@ msgstr "删除DN: %s时发生错误"
 msgid "Every account type needs exactly one base module. This module provides a structural object class."
 msgstr "每个帐号类型都需要一个基本模块,这个模块提供一个结构化对象类"
 
-#: ../lib/modules/dhcp_settings.inc:546
 #: ../lib/modules/customScripts.inc:60
 #: ../lib/modules/customScripts.inc:72
+#: ../lib/modules/dhcp_settings.inc:546
 #: ../help/help.inc:73
 #: ../help/help.inc:79
 #: ../help/help.inc:85
@@ -2082,8 +2233,8 @@ msgstr "每个帐号类型都需要一个基本模块,这个模块提供一个
 msgid "Example"
 msgstr "示例"
 
-#: ../templates/masscreate.php:244
-#: ../templates/masscreate.php:404
+#: ../templates/masscreate.php:249
+#: ../templates/masscreate.php:409
 msgid "Example value"
 msgstr "示例值"
 
@@ -2095,21 +2246,22 @@ msgstr "示例"
 msgid "Execute"
 msgstr "运行"
 
-#: ../templates/tests/lamdaemonTest.php:294
+#: ../templates/tests/lamdaemonTest.php:249
 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
+#: ../lib/modules/ppolicy.inc:108
+#: ../lib/modules/ppolicy.inc:140
+#: ../lib/modules/ppolicy.inc:166
+#: ../lib/modules/ppolicy.inc:210
+#: ../lib/modules/ppolicy.inc:501
 msgid "Expire warning"
 msgstr "密码过期告警"
 
+#: ../templates/tree/edit.php:116
 #: ../templates/tree/export_form.php:88
 #: ../templates/tree/export_form.php:96
-#: ../templates/tree/edit.php:119
 msgid "Export"
 msgstr "导出"
 
@@ -2117,19 +2269,21 @@ msgstr "导出"
 msgid "Export format"
 msgstr "导出格式"
 
-#: ../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
+#: ../lib/modules/asteriskExtension.inc:86
+#: ../lib/modules/asteriskExtension.inc:134
+#: ../lib/modules/asteriskExtension.inc:144
+#: ../lib/modules/asteriskExtension.inc:227
+#: ../lib/modules/asteriskExtension.inc:475
 msgid "Extension name"
 msgstr "扩展名"
 
 #: ../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
+#: ../lib/modules/asteriskExtension.inc:137
+#: ../lib/modules/asteriskExtension.inc:185
+#: ../lib/modules/asteriskExtension.inc:244
+#: ../lib/modules/asteriskExtension.inc:307
+#: ../lib/modules/asteriskExtension.inc:478
 msgid "Extension owners"
 msgstr "扩展属主"
 
@@ -2148,35 +2302,37 @@ 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
+#: ../lib/modules/ppolicy.inc:104
+#: ../lib/modules/ppolicy.inc:145
+#: ../lib/modules/ppolicy.inc:165
+#: ../lib/modules/ppolicy.inc:283
+#: ../lib/modules/ppolicy.inc:500
 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:611
-#: ../lib/modules/inetOrgPerson.inc:612
-#: ../lib/modules/inetOrgPerson.inc:1057
-#: ../lib/modules/inetOrgPerson.inc:1234
-#: ../lib/modules/inetOrgPerson.inc:1633
+#: ../lib/modules/inetOrgPerson.inc:54
+#: ../lib/modules/inetOrgPerson.inc:118
+#: ../lib/modules/inetOrgPerson.inc:207
+#: ../lib/modules/inetOrgPerson.inc:354
+#: ../lib/modules/inetOrgPerson.inc:457
+#: ../lib/modules/inetOrgPerson.inc:539
+#: ../lib/modules/inetOrgPerson.inc:540
+#: ../lib/modules/inetOrgPerson.inc:967
+#: ../lib/modules/inetOrgPerson.inc:1135
+#: ../lib/modules/inetOrgPerson.inc:1523
 msgid "Fax number"
 msgstr "传真号"
 
-#: ../templates/config/mainmanage.php:328
+#: ../templates/config/mainmanage.php:333
 msgid "File"
 msgstr "文件"
 
-#: ../lib/modules/sambaSamAccount.inc:286
+#: ../lib/modules/sambaSamAccount.inc:288
 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:206
+#: ../templates/masscreate.php:211
 #: ../lib/tools/fileUpload.inc:44
 msgid "File upload"
 msgstr "文件上传"
@@ -2186,29 +2342,30 @@ msgid "File upload failed!"
 msgstr "文件上传失败!"
 
 #: ../lib/modules/nisnetgroup.inc:89
-#: ../lib/modules/nisnetgroup.inc:448
-#: ../lib/lists.inc:329
+#: ../lib/modules/nisnetgroup.inc:452
+#: ../lib/lists.inc:334
 #: ../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:571
-#: ../lib/modules/inetOrgPerson.inc:920
-#: ../lib/modules/inetOrgPerson.inc:1223
-#: ../lib/modules/inetOrgPerson.inc:1585
 #: ../lib/types/user.inc:96
+#: ../lib/modules/inetOrgPerson.inc:44
+#: ../lib/modules/inetOrgPerson.inc:116
+#: ../lib/modules/inetOrgPerson.inc:243
+#: ../lib/modules/inetOrgPerson.inc:417
+#: ../lib/modules/inetOrgPerson.inc:499
+#: ../lib/modules/inetOrgPerson.inc:830
+#: ../lib/modules/inetOrgPerson.inc:1124
+#: ../lib/modules/inetOrgPerson.inc:1475
 msgid "First name"
 msgstr "名字"
 
-#: ../lib/modules/inetOrgPerson.inc:73
-#: ../lib/modules/inetOrgPerson.inc:74
+#: ../lib/modules/inetOrgPerson.inc:44
+#: ../lib/modules/inetOrgPerson.inc:45
 msgid "First name contains invalid characters!"
 msgstr "名字包含非法字符"
 
-#: ../lib/modules/inetOrgPerson.inc:572
+#: ../lib/modules/inetOrgPerson.inc:500
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "用户名字只允许字母,-和空格"
 
@@ -2241,41 +2398,54 @@ msgstr "格式"
 #: ../lib/modules/kolabUser.inc:128
 #: ../lib/modules/kolabUser.inc:167
 #: ../lib/modules/kolabUser.inc:213
-#: ../lib/modules/kolabUser.inc:305
-#: ../lib/modules/kolabUser.inc:769
-#: ../lib/modules/kolabUser.inc:821
+#: ../lib/modules/kolabUser.inc:231
+#: ../lib/modules/kolabUser.inc:311
+#: ../lib/modules/kolabUser.inc:775
+#: ../lib/modules/kolabUser.inc:827
 msgid "Free/Busy interval"
 msgstr "空闲/忙碌 间隔"
 
-#: ../lib/modules/kolabUser.inc:245
-#: ../lib/modules/kolabUser.inc:246
+#: ../lib/modules/kolabUser.inc:251
+#: ../lib/modules/kolabUser.inc:252
 msgid "Free/Busy interval must be a number!"
 msgstr "空闲/忙碌间隔必须是一个数字!"
 
-#: ../lib/modules/sambaSamAccount.inc:1318
+#: ../lib/modules/sambaSamAccount.inc:1320
 msgid "Friday"
 msgstr "星期五"
 
-#: ../templates/lists/changePassword.php:143
+#: ../templates/lists/changePassword.php:154
+#: ../lib/modules/asteriskVoicemail.inc:90
+#: ../lib/modules/asteriskVoicemail.inc:135
+#: ../lib/modules/asteriskVoicemail.inc:168
+#: ../lib/modules/asteriskVoicemail.inc:245
+#: ../lib/modules/asteriskVoicemail.inc:375
 msgid "Full name"
 msgstr "全名"
 
-#: ../lib/modules/inetOrgPerson.inc:368
+#: ../lib/modules/asteriskVoicemail.inc:91
+msgid "Full name for Asterisk voicemail mailbox."
+msgstr "Asterisk语音邮箱的全名."
+
+#: ../lib/modules/inetOrgPerson.inc:308
 msgid "GB-12345"
 msgstr "GB-12345"
 
-#: ../lib/modules/sambaGroupMapping.inc:386
+#: ../lib/types/host.inc:96
+#: ../lib/types/group.inc:93
+#: ../lib/types/user.inc:93
 #: ../lib/modules/posixGroup.inc:173
+#: ../lib/modules/posixGroup.inc:324
 #: ../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
+#: ../lib/modules/posixAccount.inc:91
+#: ../lib/modules/posixAccount.inc:313
+#: ../lib/modules/posixAccount.inc:1178
+#: ../lib/modules/sambaGroupMapping.inc:309
+#: ../lib/modules/sambaGroupMapping.inc:386
 msgid "GID number"
 msgstr "GID编号"
 
@@ -2283,7 +2453,7 @@ msgstr "GID编号"
 msgid "GID number has changed. Please select checkbox to change GID number of users and hosts."
 msgstr "GID的编号已经更改,请点击选择框来改变用户GID号"
 
-#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:91
 #, 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 {} \\;'"
@@ -2292,23 +2462,24 @@ msgstr "GID已经更改,要保持文件属性一,你必须以root身份运行以
 msgid "GID number has to be a numeric value!"
 msgstr "GID号必须使用数字"
 
-#: ../lib/modules/posixAccount.inc:270
-#: ../lib/modules/posixAccount.inc:302
-#: ../lib/modules/posixAccount.inc:368
-#: ../lib/modules/posixAccount.inc:406
+#: ../lib/modules/posixAccount.inc:271
+#: ../lib/modules/posixAccount.inc:303
+#: ../lib/modules/posixAccount.inc:314
+#: ../lib/modules/posixAccount.inc:370
+#: ../lib/modules/posixAccount.inc:408
 #: ../lib/modules/posixAccount.inc:956
-#: ../lib/modules/posixAccount.inc:1180
+#: ../lib/modules/posixAccount.inc:1179
 msgid "Gecos"
 msgstr "备注(Gecos)"
 
-#: ../templates/config/conftypes.php:146
-#: ../templates/config/confmain.php:164
 #: ../templates/config/confmodules.php:131
+#: ../templates/config/confmain.php:164
 #: ../templates/config/moduleSettings.php:130
+#: ../templates/config/conftypes.php:149
 msgid "General settings"
 msgstr "通用设置"
 
-#: ../templates/lists/changePassword.php:174
+#: ../templates/lists/changePassword.php:170
 #: ../help/help.inc:189
 msgid "Generate random password"
 msgstr "生成随机密码"
@@ -2324,16 +2495,17 @@ msgstr "德国"
 msgid "Go"
 msgstr "开始"
 
-#: ../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
+#: ../lib/modules/ppolicy.inc:92
+#: ../lib/modules/ppolicy.inc:141
+#: ../lib/modules/ppolicy.inc:162
+#: ../lib/modules/ppolicy.inc:219
+#: ../lib/modules/ppolicy.inc:497
 msgid "Grace authentication limit"
 msgstr "缓期认证限制"
 
 #: ../lib/modules/quota.inc:117
-#: ../lib/modules/quota.inc:389
+#: ../lib/modules/quota.inc:385
 msgid "Grace block period"
 msgstr "块限制宽限周期"
 
@@ -2346,12 +2518,12 @@ msgid "Grace inode (files) period. Most filesystems use a fixed maximum value of
 msgstr "节点限制的宽限期,大部分文件系统都使用最大值7天."
 
 #: ../lib/modules/quota.inc:139
-#: ../lib/modules/quota.inc:393
+#: ../lib/modules/quota.inc:389
 msgid "Grace inode period"
 msgstr "节点限制宽限期"
 
-#: ../templates/selfService/adminMain.php:568
 #: ../templates/config/confmain.php:441
+#: ../templates/selfService/adminMain.php:579
 msgid "Group"
 msgstr "组"
 
@@ -2359,9 +2531,9 @@ msgstr "组"
 msgid "Group accounts (e.g. Unix and Samba)"
 msgstr "组帐号(比如unix和samba)"
 
-#: ../lib/modules/nisnetgroup.inc:105
-#: ../lib/modules/posixGroup.inc:370
 #: ../lib/types/group.inc:96
+#: ../lib/modules/posixGroup.inc:370
+#: ../lib/modules/nisnetgroup.inc:105
 msgid "Group description"
 msgstr "组说明"
 
@@ -2369,46 +2541,50 @@ msgstr "组说明"
 msgid "Group description. If left empty group name will be used."
 msgstr "组说明,若空则会使用组名来替代."
 
-#: ../lib/types/group.inc:95
 #: ../lib/types/gon.inc:92
 #: ../lib/types/gon.inc:93
+#: ../lib/types/group.inc:95
 msgid "Group member DNs"
 msgstr "组成员DN"
 
+#: ../lib/types/group.inc:94
 #: ../lib/modules/posixGroup.inc:183
 #: ../lib/modules/posixGroup.inc:241
+#: ../lib/modules/posixGroup.inc:325
 #: ../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 "组成员"
 
-#: ../lib/modules/nisnetgroup.inc:68
-#: ../lib/modules/nisnetgroup.inc:97
-#: ../lib/modules/nisnetgroup.inc:134
-#: ../lib/modules/nisnetgroup.inc:176
-#: ../lib/modules/nisnetgroup.inc:563
-#: ../lib/modules/groupOfNames.inc:60
-#: ../lib/modules/groupOfNames.inc:84
-#: ../lib/modules/groupOfNames.inc:436
+#: ../lib/types/gon.inc:91
+#: ../lib/types/group.inc:92
+#: ../lib/types/netgroup.inc:91
 #: ../lib/modules/posixGroup.inc:168
+#: ../lib/modules/posixGroup.inc:328
 #: ../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
+#: ../lib/modules/nisnetgroup.inc:68
+#: ../lib/modules/nisnetgroup.inc:97
+#: ../lib/modules/nisnetgroup.inc:124
+#: ../lib/modules/nisnetgroup.inc:136
+#: ../lib/modules/nisnetgroup.inc:178
+#: ../lib/modules/nisnetgroup.inc:567
+#: ../lib/modules/groupOfNames.inc:60
+#: ../lib/modules/groupOfNames.inc:84
+#: ../lib/modules/groupOfNames.inc:111
+#: ../lib/modules/groupOfNames.inc:442
 msgid "Group name"
 msgstr "组名"
 
-#: ../lib/modules/nisnetgroup.inc:134
 #: ../lib/modules/posixGroup.inc:476
 #: ../lib/modules/posixGroup.inc:477
+#: ../lib/modules/nisnetgroup.inc:136
 msgid "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !"
 msgstr "组名包含非法字符,可用字符为: a-z, A-Z, 0-9,及 -或_ !"
 
@@ -2420,8 +2596,8 @@ msgstr "组名已被使用,请选择可用的组名."
 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,.-_ .如果该组名存在,会在组名末尾增加下一个可以使用的数字。"
 
-#: ../lib/modules/groupOfNames.inc:44
 #: ../lib/types/gon.inc:53
+#: ../lib/modules/groupOfNames.inc:44
 msgid "Group of names"
 msgstr "组名"
 
@@ -2442,8 +2618,8 @@ msgstr "组密码"
 msgid "Group type"
 msgstr "组类型"
 
-#: ../lib/modules/posixGroup.inc:297
 #: ../lib/types/group.inc:54
+#: ../lib/modules/posixGroup.inc:297
 msgid "Groups"
 msgstr "组"
 
@@ -2451,18 +2627,18 @@ msgstr "组"
 msgid "H-Node (0x08)"
 msgstr "H-节点 (0x08)"
 
-#: ../lib/modules/quota.inc:582
+#: ../lib/modules/quota.inc:592
 msgid "Hard block"
 msgstr "块的硬性限制"
 
 #: ../lib/modules/quota.inc:111
 #: ../lib/modules/quota.inc:112
-#: ../lib/modules/quota.inc:388
-#: ../lib/modules/quota.inc:473
+#: ../lib/modules/quota.inc:384
+#: ../lib/modules/quota.inc:476
 msgid "Hard block limit"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:584
+#: ../lib/modules/quota.inc:594
 msgid "Hard inode"
 msgstr "节点的硬性限制"
 
@@ -2471,26 +2647,26 @@ msgid "Hard inode (files) limit"
 msgstr "节点的硬性限制"
 
 #: ../lib/modules/quota.inc:133
-#: ../lib/modules/quota.inc:392
-#: ../lib/modules/quota.inc:475
+#: ../lib/modules/quota.inc:388
+#: ../lib/modules/quota.inc:478
 msgid "Hard inode limit"
 msgstr "节点硬性限制"
 
-#: ../lib/modules/sambaSamAccount.inc:529
+#: ../lib/modules/sambaSamAccount.inc:531
 msgid "Hawaii"
 msgstr "夏威夷"
 
-#: ../templates/pdfedit/pdfpage.php:386
-#: ../templates/pdfedit/pdfpage.php:554
-#: ../templates/pdfedit/pdfpage.php:568
+#: ../templates/pdfedit/pdfpage.php:410
+#: ../templates/pdfedit/pdfpage.php:570
+#: ../templates/pdfedit/pdfpage.php:584
 msgid "Headline"
 msgstr "标题"
 
-#: ../lib/modules.inc:925
+#: ../lib/modules.inc:952
 msgid "Help"
 msgstr "帮助"
 
-#: ../templates/masscreate.php:228
+#: ../templates/masscreate.php:233
 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文件中,在帐号中属于必填项目."
 
@@ -2498,7 +2674,7 @@ msgstr "这是可能的列的列表,红色的列必须包含在CSV文件中,在
 msgid "Here you can browse LDAP object classes and attributes."
 msgstr "这是你可浏览的LDAP对象类和属性."
 
-#: ../lib/modules/sambaSamAccount.inc:365
+#: ../lib/modules/sambaSamAccount.inc:367
 msgid "Here you can change the settings for the terminal server access."
 msgstr "这里可以改变终端服务访问的设置。"
 
@@ -2515,15 +2691,19 @@ msgstr "可以输入此DHCP条目的描述"
 msgid "Here you can enter a description for this group."
 msgstr "在这输入组的描述."
 
+#: ../lib/modules/sudoRole.inc:60
+msgid "Here you can enter a description for this role."
+msgstr "在这输入这个角色的描述."
+
 #: ../lib/modules/nisnetgroup.inc:90
 msgid "Here you can enter a filter value. Only entries which contain the filter text will be shown."
 msgstr "这里您可以输入过滤条件,只显示符合过滤条件的条目."
 
-#: ../lib/modules/posixAccount.inc:348
+#: ../lib/modules/posixAccount.inc:350
 msgid "Here you can enter a list of additional group memberships. The group names are separated by commas."
 msgstr "您可以在此输入附加的组成员,组名以逗号分隔."
 
-#: ../lib/modules/inetOrgPerson.inc:664
+#: ../lib/modules/inetOrgPerson.inc:588
 msgid "Here you can enter the user's department(s). Multiple entries are separated by semicolons."
 msgstr "这里可以输入用户的部门.多个条目以分号隔开."
 
@@ -2571,15 +2751,19 @@ msgstr "在此指定用户密码的最小需求.字符类别包括:小写,大写
 msgid "Here you can specify subgroups which are included in this NIS netgroup. All members of the subgroups will be treated as members of this group."
 msgstr "这里可以指定一个包含在NIS网络组中的分组.此分组中所有用户都会认同为这个网络组中的成员."
 
+#: ../lib/modules/hostObject.inc:73
+msgid "Here you can specify the list of host names where this account has login privileges. The wildcard \"*\" represents all hosts. You may also use \"!\" in front of a host name to deny access to a host."
+msgstr "在这儿您可以指定这个账号有登录权的主机列表.通配符\"*\"代表所有的主机.您可以在主机名前加\"!\"来拒绝对主机的访问."
+
 #: ../lib/modules/sambaDomain.inc:95
 msgid "Here you can specify the minimum number of characters for a user password."
 msgstr "在此指定用户密码的最小长度."
 
-#: ../templates/lists/changePassword.php:194
+#: ../templates/lists/changePassword.php:190
 msgid "Here you can specify the new password yourself."
 msgstr "这里可以设置自己的新密码。"
 
-#: ../lib/modules/sambaSamAccount.inc:356
+#: ../lib/modules/sambaSamAccount.inc:358
 msgid "Here you can specify the shadowing mode."
 msgstr "这里可以指定遮蔽(shadow)模型。"
 
@@ -2587,77 +2771,88 @@ msgstr "这里可以指定遮蔽(shadow)模型。"
 msgid "Here you can test if certain LAM features work on your installation."
 msgstr "测试您安装的系统功能是否正确."
 
-#: ../lib/modules/inetOrgPerson.inc:211
-#: ../lib/modules/inetOrgPerson.inc:667
-#: ../lib/modules/sambaSamAccount.inc:370
-#: ../lib/modules/sambaSamAccount.inc:568
+#: ../lib/modules/sambaSamAccount.inc:372
+#: ../lib/modules/sambaSamAccount.inc:570
+#: ../lib/modules/inetOrgPerson.inc:179
+#: ../lib/modules/inetOrgPerson.inc:591
 msgid "Hidden options"
 msgstr "隐藏的选项"
 
-#: ../templates/tree/edit.php:104
+#: ../lib/modules/customScripts.inc:80
+#: ../lib/modules/customScripts.inc:90
+#: ../lib/modules/customScripts.inc:99
+msgid "Hide command in messages"
+msgstr "在消息中隐藏命令."
+
+#: ../templates/tree/edit.php:101
 msgid "Hide internal attributes"
 msgstr "隐藏内部属性"
 
-#: ../templates/masscreate.php:212
+#: ../templates/masscreate.php:217
 msgid "Hint: Format all cells as text in your spreadsheet program and turn off auto correction."
 msgstr "提示:将电子表格的格式设定为文字,然后关闭自动更正功能"
 
-#: ../templates/tree/edit.php:124
+#: ../templates/tree/edit.php:121
 msgid "Hint: To delete an attribute, empty the text field and click save."
 msgstr "提示:要删除一个属性,先清空文本区然后保存."
 
-#: ../lib/modules/posixAccount.inc:393
+#: ../lib/modules/posixAccount.inc:395
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr "按住CTRL键可以多选组."
 
-#: ../lib/modules/posixAccount.inc:65
-#: ../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: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
+#: ../lib/modules/sambaSamAccount.inc:210
+#: ../lib/modules/sambaSamAccount.inc:330
+#: ../lib/modules/sambaSamAccount.inc:1430
+#: ../lib/modules/sambaSamAccount.inc:1795
+#: ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixAccount.inc:69
+#: ../lib/modules/posixAccount.inc:97
+#: ../lib/modules/posixAccount.inc:235
+#: ../lib/modules/posixAccount.inc:317
+#: ../lib/modules/posixAccount.inc:353
+#: ../lib/modules/posixAccount.inc:357
+#: ../lib/modules/posixAccount.inc:361
+#: ../lib/modules/posixAccount.inc:378
+#: ../lib/modules/posixAccount.inc:765
+#: ../lib/modules/posixAccount.inc:970
+#: ../lib/modules/posixAccount.inc:1101
+#: ../lib/modules/posixAccount.inc:1182
 msgid "Home directory"
 msgstr "个人目录"
 
-#: ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/posixAccount.inc:69
 #, 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:1123
+#: ../lib/modules/posixAccount.inc:1122
 msgid "Home directory server"
 msgstr "主目录服务器"
 
-#: ../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
+#: ../lib/modules/sambaSamAccount.inc:194
+#: ../lib/modules/sambaSamAccount.inc:211
+#: ../lib/modules/sambaSamAccount.inc:278
+#: ../lib/modules/sambaSamAccount.inc:459
+#: ../lib/modules/sambaSamAccount.inc:574
+#: ../lib/modules/sambaSamAccount.inc:1153
+#: ../lib/modules/sambaSamAccount.inc:1441
+#: ../lib/modules/sambaSamAccount.inc:1580
+#: ../lib/modules/sambaSamAccount.inc:1769
+#: ../lib/modules/sambaSamAccount.inc:1796
 msgid "Home drive"
 msgstr "个人驱动器"
 
 #: ../lib/modules/sambaSamAccount.inc:81
 #: ../lib/modules/sambaSamAccount.inc:82
-#: ../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
+#: ../lib/modules/sambaSamAccount.inc:197
+#: ../lib/modules/sambaSamAccount.inc:281
+#: ../lib/modules/sambaSamAccount.inc:467
+#: ../lib/modules/sambaSamAccount.inc:577
+#: ../lib/modules/sambaSamAccount.inc:1163
+#: ../lib/modules/sambaSamAccount.inc:1588
+#: ../lib/modules/sambaSamAccount.inc:1766
 msgid "Home path"
 msgstr "个人目录路径"
 
@@ -2666,29 +2861,32 @@ msgstr "个人目录路径"
 msgid "Home path is invalid."
 msgstr "个人目录路径无效"
 
-#: ../lib/modules/inetOrgPerson.inc:79
-#: ../lib/modules/inetOrgPerson.inc:152
-#: ../lib/modules/inetOrgPerson.inc:248
-#: ../lib/modules/inetOrgPerson.inc:398
-#: ../lib/modules/inetOrgPerson.inc:635
-#: ../lib/modules/inetOrgPerson.inc:1039
-#: ../lib/modules/inetOrgPerson.inc:1232
-#: ../lib/modules/inetOrgPerson.inc:1617
+#: ../lib/modules/inetOrgPerson.inc:50
+#: ../lib/modules/inetOrgPerson.inc:120
+#: ../lib/modules/inetOrgPerson.inc:203
+#: ../lib/modules/inetOrgPerson.inc:338
+#: ../lib/modules/inetOrgPerson.inc:451
+#: ../lib/modules/inetOrgPerson.inc:559
+#: ../lib/modules/inetOrgPerson.inc:949
+#: ../lib/modules/inetOrgPerson.inc:1133
+#: ../lib/modules/inetOrgPerson.inc:1507
 msgid "Home telephone number"
 msgstr "宅电"
 
-#: ../lib/modules/posixAccount.inc:65
-#: ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:68
 msgid "Homedirectory contains invalid characters."
 msgstr "个人目录包含非法字符"
 
-#: ../lib/modules/nisnetgroup.inc:203
-#: ../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
+#: ../lib/modules/asteriskAccount.inc:83
+#: ../lib/modules/asteriskAccount.inc:110
+#: ../lib/modules/asteriskAccount.inc:127
+#: ../lib/modules/asteriskAccount.inc:149
+#: ../lib/modules/asteriskAccount.inc:195
+#: ../lib/modules/asteriskAccount.inc:289
+#: ../lib/modules/nisnetgroup.inc:207
+#: ../lib/modules/nisnetgroup.inc:577
+#: ../lib/modules/hostObject.inc:143
 msgid "Host"
 msgstr "主机"
 
@@ -2701,63 +2899,82 @@ msgid "Host description"
 msgstr "主机描述"
 
 #: ../lib/modules/account.inc:89
-#: ../lib/modules/posixAccount.inc:407
-#: ../lib/modules/posixAccount.inc:415
+#: ../lib/modules/posixAccount.inc:409
+#: ../lib/modules/posixAccount.inc:417
 msgid "Host description. If left empty host name will be used."
 msgstr "主机描述.如果留空会使用主机名."
 
-#: ../lib/modules/nisnetgroup.inc:136
-#: ../lib/modules/nisnetgroup.inc:453
-#: ../lib/modules/account.inc:84
-#: ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:81
-#: ../lib/modules/posixAccount.inc:83
-#: ../lib/modules/posixAccount.inc:281
-#: ../lib/modules/posixAccount.inc:402
+#: ../lib/modules/hostObject.inc:84
+#: ../lib/modules/hostObject.inc:91
+#: ../lib/modules/hostObject.inc:261
+msgid "Host list"
+msgstr "主机列表"
+
 #: ../lib/types/host.inc:91
 #: ../lib/types/host.inc:92
+#: ../lib/modules/account.inc:84
+#: ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:282
+#: ../lib/modules/posixAccount.inc:404
+#: ../lib/modules/nisnetgroup.inc:138
+#: ../lib/modules/nisnetgroup.inc:457
 msgid "Host name"
 msgstr "主机名"
 
-#: ../lib/modules/posixAccount.inc:87
+#: ../lib/modules/posixAccount.inc:88
 msgid "Host name already exists!"
 msgstr "主机名已经存在!"
 
-#: ../lib/modules/nisnetgroup.inc:136
-#: ../lib/modules/posixAccount.inc:81
-#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/nisnetgroup.inc:138
 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:83
+#: ../lib/modules/posixAccount.inc:84
 msgid "Host name in use. Selected next free host name."
 msgstr "主机名已被使用, 请选择其它的主机名."
 
-#: ../lib/modules/sambaSamAccount.inc:1049
+#: ../lib/modules/sambaSamAccount.inc:1051
 msgid "Host name must end with $!"
 msgstr "主机名必须使用$结尾!"
 
 #: ../lib/modules/account.inc:85
-#: ../lib/modules/posixAccount.inc:403
+#: ../lib/modules/posixAccount.inc:405
 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:60
-#: ../lib/modules/posixAccount.inc:61
-#: ../lib/modules/posixAccount.inc:63
-#: ../lib/modules/posixAccount.inc:170
+#: ../lib/types/sudo.inc:79
+msgid "Host(s)"
+msgstr "主机"
+
 #: ../lib/types/host.inc:53
+#: ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:62
+#: ../lib/modules/posixAccount.inc:64
+#: ../lib/modules/posixAccount.inc:171
+#: ../lib/modules/sudoRole.inc:67
+#: ../lib/modules/sudoRole.inc:92
+#: ../lib/modules/sudoRole.inc:140
+#: ../lib/modules/sudoRole.inc:174
+#: ../lib/modules/sudoRole.inc:186
+#: ../lib/modules/sudoRole.inc:312
+#: ../lib/modules/sudoRole.inc:711
+#: ../lib/modules/hostObject.inc:62
+#: ../lib/modules/hostObject.inc:72
 msgid "Hosts"
 msgstr "主机"
 
-#: ../templates/lists/changePassword.php:183
+#: ../templates/lists/changePassword.php:181
 msgid "I am sure"
 msgstr "确认"
 
 #: ../lib/modules/posixGroup.inc:469
 #: ../lib/modules/posixGroup.inc:580
-#: ../lib/modules/posixAccount.inc:71
-#: ../lib/modules/posixAccount.inc:781
+#: ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:746
 msgid "ID is already in use"
 msgstr "ID已经被使用"
 
@@ -2766,17 +2983,17 @@ msgstr "ID已经被使用"
 #: ../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:71
-#: ../lib/modules/posixAccount.inc:777
-#: ../lib/modules/posixAccount.inc:781
+#: ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:742
+#: ../lib/modules/posixAccount.inc:746
 msgid "ID-Number"
 msgstr "ID号"
 
 #: ../lib/modules/ipHost.inc:48
 #: ../lib/modules/ipHost.inc:58
-#: ../lib/modules/ipHost.inc:122
+#: ../lib/modules/ipHost.inc:124
 #: ../lib/modules/fixed_ip.inc:87
 #: ../lib/modules/fixed_ip.inc:334
 #: ../lib/modules/fixed_ip.inc:518
@@ -2784,6 +3001,7 @@ msgid "IP address"
 msgstr "IP地址"
 
 #: ../lib/modules/ddns.inc:96
+#: ../lib/modules/ddns.inc:107
 #: ../lib/modules/ddns.inc:116
 #: ../lib/modules/ddns.inc:364
 #: ../lib/modules/ddns.inc:411
@@ -2792,42 +3010,48 @@ msgstr "DNS服务器IP地址"
 
 #: ../lib/modules/ipHost.inc:62
 #: ../lib/modules/ipHost.inc:77
-#: ../lib/modules/ipHost.inc:310
+#: ../lib/modules/ipHost.inc:97
+#: ../lib/modules/ipHost.inc:315
 msgid "IP address(es)"
 msgstr "IP地址"
 
-#: ../templates/masscreate.php:243
-#: ../templates/masscreate.php:255
-#: ../templates/masscreate.php:396
+#: ../lib/modules/fixed_ip.inc:91
+msgid "IP list"
+msgstr "IP列表"
+
+#: ../templates/masscreate.php:248
+#: ../templates/masscreate.php:260
+#: ../templates/masscreate.php:401
 msgid "Identifier"
 msgstr "标识"
 
-#: ../lib/modules/sambaSamAccount.inc:1474
-#: ../lib/modules/sambaSamAccount.inc:1805
+#: ../lib/modules/sambaSamAccount.inc:218
+#: ../lib/modules/sambaSamAccount.inc:1476
+#: ../lib/modules/sambaSamAccount.inc:1807
 msgid "Idle time limit"
 msgstr "空闲时间限制"
 
-#: ../lib/modules/sambaSamAccount.inc:242
+#: ../lib/modules/sambaSamAccount.inc:244
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "如果选中将使用UNIX密码作为SAMBA密码."
 
-#: ../lib/modules/posixAccount.inc:385
+#: ../lib/modules/posixAccount.inc:387
 msgid "If checked account will be deactivated by putting a \"!\" before the encrypted password."
 msgstr "在密码前加\"!\",此帐号会被停用."
 
-#: ../lib/modules/sambaSamAccount.inc:248
+#: ../lib/modules/sambaSamAccount.inc:250
 msgid "If checked no password will be used."
 msgstr "如果选中,不需要密码."
 
-#: ../lib/modules/sambaSamAccount.inc:254
+#: ../lib/modules/sambaSamAccount.inc:256
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "密码不过期.(设置X标志)"
 
-#: ../lib/modules/sambaSamAccount.inc:260
+#: ../lib/modules/sambaSamAccount.inc:262
 msgid "If checked then the account will be deactivated. (Setting D-Flag)"
 msgstr "密码停用(设置D标志)"
 
-#: ../lib/modules/sambaSamAccount.inc:263
+#: ../lib/modules/sambaSamAccount.inc:265
 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标志).多次登录失败后帐号会被锁定.在此可以解除锁定."
 
@@ -2835,7 +3059,7 @@ msgstr "帐号被锁定(设置L标志).多次登录失败后帐号会被锁定.
 msgid "If empty GID number will be generated automaticly depending on your configuration settings."
 msgstr "如果为空,视配置而定,GID号自动产生."
 
-#: ../lib/modules/posixAccount.inc:340
+#: ../lib/modules/posixAccount.inc:342
 msgid "If empty UID number will be generated automaticly."
 msgstr "如果为空,UID号会自动生成."
 
@@ -2851,19 +3075,19 @@ msgstr "如果此项设置，用户在设置密码或管理员复位密码后第
 msgid "If set then users need to login to change their password."
 msgstr "如果设置,用户需要密码才能登录."
 
-#: ../lib/modules/sambaSamAccount.inc:245
+#: ../lib/modules/sambaSamAccount.inc:247
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr "如果设为\"true\",会用UNIX用户密码做为SAMBA密码."
 
-#: ../lib/modules/sambaSamAccount.inc:266
+#: ../lib/modules/sambaSamAccount.inc:268
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr "如果设为\"true\",帐号会被停用(设置D标志)."
 
-#: ../lib/modules/sambaSamAccount.inc:251
+#: ../lib/modules/sambaSamAccount.inc:253
 msgid "If set to \"true\" no password will be used."
 msgstr "如果设为\"true\",则不需要密码."
 
-#: ../lib/modules/sambaSamAccount.inc:257
+#: ../lib/modules/sambaSamAccount.inc:259
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr "如果设为\"true\",密码不会过期(设为X标志)."
 
@@ -2871,11 +3095,11 @@ msgstr "如果设为\"true\",密码不会过期(设为X标志)."
 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:305
+#: ../lib/modules/sambaSamAccount.inc:307
 msgid "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr "如果留空,LAM会用如下算法:uidNumber*2 + sambaAlgorithmicRidBase."
 
-#: ../lib/modules/sambaSamAccount.inc:269
+#: ../lib/modules/sambaSamAccount.inc:271
 msgid "If you set this option then the user has to change his password at the next login."
 msgstr "如果您选中此项，用户在下次登录时必须修改密码。"
 
@@ -2908,9 +3132,10 @@ msgstr "包括系统属性"
 msgid "Information about the LDAP server."
 msgstr "有关LDAP服务器的信息"
 
-#: ../lib/modules/sambaSamAccount.inc:334
-#: ../lib/modules/sambaSamAccount.inc:1449
-#: ../lib/modules/sambaSamAccount.inc:1800
+#: ../lib/modules/sambaSamAccount.inc:213
+#: ../lib/modules/sambaSamAccount.inc:336
+#: ../lib/modules/sambaSamAccount.inc:1451
+#: ../lib/modules/sambaSamAccount.inc:1802
 msgid "Inherit client startup configuration"
 msgstr "继承客户初始配置"
 
@@ -2924,36 +3149,37 @@ msgstr "继承自"
 msgid "Inherits from"
 msgstr "继承自"
 
-#: ../lib/modules/sambaSamAccount.inc:337
-#: ../lib/modules/sambaSamAccount.inc:1454
-#: ../lib/modules/sambaSamAccount.inc:1801
+#: ../lib/modules/sambaSamAccount.inc:214
+#: ../lib/modules/sambaSamAccount.inc:339
+#: ../lib/modules/sambaSamAccount.inc:1456
+#: ../lib/modules/sambaSamAccount.inc:1803
 msgid "Initial program"
 msgstr "初始化程序"
 
-#: ../lib/modules/quota.inc:54
+#: ../lib/modules/quota.inc:56
 msgid "Inode hard quota"
 msgstr "inode硬配额"
 
-#: ../lib/modules/quota.inc:54
-#: ../lib/modules/quota.inc:55
+#: ../lib/modules/quota.inc:56
+#: ../lib/modules/quota.inc:57
 msgid "Inode hard quota contains invalid characters. Only natural numbers are allowed."
 msgstr "inode硬配额包含非法字符,只允许使用自然数."
 
-#: ../lib/modules/quota.inc:58
+#: ../lib/modules/quota.inc:60
 msgid "Inode quota"
 msgstr "inode配额"
 
-#: ../lib/modules/quota.inc:52
+#: ../lib/modules/quota.inc:54
 msgid "Inode soft 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 soft quota contains invalid characters. Only natural numbers are allowed."
 msgstr "inode软配额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:58
-#: ../lib/modules/quota.inc:59
+#: ../lib/modules/quota.inc:60
+#: ../lib/modules/quota.inc:61
 msgid "Inode soft quota must be smaller than inode hard quota."
 msgstr "inode软配额必须小于硬配额."
 
@@ -2988,9 +3214,10 @@ msgstr "无效的帐号"
 #: ../lib/modules/kolabUser.inc:130
 #: ../lib/modules/kolabUser.inc:135
 #: ../lib/modules/kolabUser.inc:182
-#: ../lib/modules/kolabUser.inc:343
-#: ../lib/modules/kolabUser.inc:781
-#: ../lib/modules/kolabUser.inc:905
+#: ../lib/modules/kolabUser.inc:226
+#: ../lib/modules/kolabUser.inc:349
+#: ../lib/modules/kolabUser.inc:787
+#: ../lib/modules/kolabUser.inc:911
 msgid "Invitation policy"
 msgstr "邀请原则"
 
@@ -2998,7 +3225,7 @@ msgstr "邀请原则"
 msgid "Invitation policy list"
 msgstr "邀请原则列表"
 
-#: ../lib/modules/sambaSamAccount.inc:544
+#: ../lib/modules/sambaSamAccount.inc:546
 msgid "Islamabad, Karachi"
 msgstr "伊斯兰堡,卡拉奇"
 
@@ -3007,21 +3234,22 @@ msgid "It is not possible to delete all ranges."
 msgstr "不能删除所有范围"
 
 #: ../lib/modules/posixGroup.inc:467
-#: ../lib/modules/posixAccount.inc:70
+#: ../lib/modules/posixAccount.inc:71
 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设得高一点."
 
-#: ../lib/modules/inetOrgPerson.inc:93
-#: ../lib/modules/inetOrgPerson.inc:177
-#: ../lib/modules/inetOrgPerson.inc:261
-#: ../lib/modules/inetOrgPerson.inc:326
-#: ../lib/modules/inetOrgPerson.inc:567
-#: ../lib/modules/inetOrgPerson.inc:1078
-#: ../lib/modules/inetOrgPerson.inc:1222
+#: ../lib/modules/inetOrgPerson.inc:64
+#: ../lib/modules/inetOrgPerson.inc:145
+#: ../lib/modules/inetOrgPerson.inc:211
+#: ../lib/modules/inetOrgPerson.inc:266
+#: ../lib/modules/inetOrgPerson.inc:463
+#: ../lib/modules/inetOrgPerson.inc:495
+#: ../lib/modules/inetOrgPerson.inc:988
+#: ../lib/modules/inetOrgPerson.inc:1123
 msgid "Job title"
 msgstr "头衔"
 
-#: ../lib/modules/inetOrgPerson.inc:568
+#: ../lib/modules/inetOrgPerson.inc:496
 msgid "Job title of user: President, department manager, ..."
 msgstr "用户头衔:如总裁,部门经理..."
 
@@ -3048,7 +3276,7 @@ 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:177
+#: ../templates/login.php:175
 #: ../templates/config/index.php:63
 msgid "LAM configuration"
 msgstr "LAM 配置"
@@ -3057,9 +3285,9 @@ msgstr "LAM 配置"
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "您的输入检查完毕,即将建立帐号"
 
-#: ../lib/modules/inetOrgPerson.inc:672
 #: ../lib/modules/posixGroup.inc:404
-#: ../lib/modules/posixAccount.inc:336
+#: ../lib/modules/posixAccount.inc:338
+#: ../lib/modules/inetOrgPerson.inc:596
 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个字符以上的密码.不建议使用明文密码."
 
@@ -3081,11 +3309,11 @@ msgstr "系统找不到这个Samba域!"
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAM找不到这个域!"
 
-#: ../lib/modules/posixAccount.inc:88
+#: ../lib/modules/posixAccount.inc:89
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAM找不到这个组"
 
-#: ../lib/modules/posixAccount.inc:1579
+#: ../lib/modules/posixAccount.inc:1581
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAM无法修改 %s组成员"
@@ -3098,24 +3326,23 @@ msgstr "LAM将在这部分LDAP树搜索帐号."
 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:177
+#: ../templates/profedit/profilepage.php:175
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../templates/selfService/adminMain.php:133
-#: ../templates/config/conftypes.php:112
-#: ../templates/config/confmain.php:122
 #: ../templates/config/confmodules.php:97
+#: ../templates/config/confmain.php:122
 #: ../templates/config/moduleSettings.php:96
-#: ../templates/config/confsave.php:81
+#: ../templates/config/conftypes.php:115
+#: ../templates/selfService/adminMain.php:133
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP帐号管理配置"
 
-#: ../templates/config/conftypes.php:312
+#: ../templates/config/conftypes.php:315
 msgid "LDAP Suffix is invalid!"
 msgstr "LDAP后缀无效!"
 
-#: ../templates/login.php:474
+#: ../templates/login.php:490
 msgid "LDAP error, server says:"
 msgstr "LDAP错误,服务器错误消息:"
 
@@ -3123,7 +3350,7 @@ msgstr "LDAP错误,服务器错误消息:"
 msgid "LDAP filter"
 msgstr "LDAP过滤条件"
 
-#: ../lib/modules.inc:1433
+#: ../lib/modules.inc:1459
 msgid "LDAP operation successful."
 msgstr "LDAP操作成功."
 
@@ -3142,7 +3369,7 @@ msgstr "LDAP搜索"
 msgid "LDAP search attribute"
 msgstr "LDAP搜索属性"
 
-#: ../lib/account.inc:634
+#: ../lib/account.inc:641
 msgid "LDAP search failed! Please check your preferences."
 msgstr "LDAP搜索失败，请检查配置。"
 
@@ -3151,18 +3378,18 @@ msgstr "LDAP搜索失败，请检查配置。"
 msgid "LDAP search limit"
 msgstr "LDAP搜索限制"
 
-#: ../templates/login.php:314
+#: ../templates/login.php:326
 msgid "LDAP server"
 msgstr "LDAP服务器"
 
-#: ../lib/account.inc:625
+#: ../lib/account.inc:632
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "超过LDAP限制的大小,无法显示所有条目."
 
-#: ../templates/selfService/adminMain.php:346
-#: ../templates/profedit/profilepage.php:181
-#: ../templates/config/conftypes.php:242
 #: ../templates/config/confmain.php:497
+#: ../templates/config/conftypes.php:245
+#: ../templates/selfService/adminMain.php:346
+#: ../templates/profedit/profilepage.php:179
 #: ../help/help.inc:70
 #: ../help/help.inc:169
 msgid "LDAP suffix"
@@ -3197,7 +3424,7 @@ msgstr "输出到LDIF文件名:%s"
 msgid "Label"
 msgstr "标签"
 
-#: ../templates/tests/lamdaemonTest.php:207
+#: ../templates/tests/lamdaemonTest.php:179
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemon 服务器和路径"
 
@@ -3205,7 +3432,7 @@ msgstr "Lamdaemon 服务器和路径"
 msgid "Lamdaemon settings"
 msgstr "Lamdaemon设置"
 
-#: ../templates/tests/lamdaemonTest.php:170
+#: ../templates/tests/lamdaemonTest.php:137
 msgid "Lamdaemon successfully run."
 msgstr "Lamdaemon成功执行."
 
@@ -3215,23 +3442,23 @@ msgstr "Lamdaemon成功执行."
 msgid "Lamdaemon test"
 msgstr "Lamdaemon测试"
 
-#: ../templates/tests/lamdaemonTest.php:309
+#: ../templates/tests/lamdaemonTest.php:264
 msgid "Lamdaemon test finished."
 msgstr "Lamdaemon 测试结束."
 
-#: ../templates/tests/lamdaemonTest.php:301
+#: ../templates/tests/lamdaemonTest.php:256
 msgid "Lamdaemon: Quota module installed"
 msgstr "Lamdaemon: 配额模块已安装."
 
-#: ../templates/tests/lamdaemonTest.php:297
+#: ../templates/tests/lamdaemonTest.php:252
 msgid "Lamdaemon: check NSS LDAP"
 msgstr "Lamdaemon: 检查 NSS LDAP"
 
-#: ../templates/tests/lamdaemonTest.php:304
+#: ../templates/tests/lamdaemonTest.php:259
 msgid "Lamdaemon: read quotas"
 msgstr "Lamdaemon: 读取配额"
 
-#: ../templates/login.php:263
+#: ../templates/login.php:275
 msgid "Language"
 msgstr "语言"
 
@@ -3243,41 +3470,46 @@ msgstr "尚未定义语言"
 msgid "Language settings"
 msgstr "语言设定"
 
-#: ../lib/modules/phpGroupwareUser.inc:171
-#: ../lib/modules/phpGroupwareUser.inc:350
+#: ../lib/modules/phpGroupwareUser.inc:102
+#: ../lib/modules/phpGroupwareUser.inc:173
+#: ../lib/modules/phpGroupwareUser.inc:352
 msgid "Last login"
 msgstr "上次登录"
 
-#: ../lib/modules/phpGroupwareUser.inc:179
-#: ../lib/modules/phpGroupwareUser.inc:345
+#: ../lib/modules/phpGroupwareUser.inc:101
+#: ../lib/modules/phpGroupwareUser.inc:181
+#: ../lib/modules/phpGroupwareUser.inc:347
 msgid "Last login from"
 msgstr "上一次登录地"
 
-#: ../lib/modules/inetOrgPerson.inc:75
-#: ../lib/modules/inetOrgPerson.inc:148
-#: ../lib/modules/inetOrgPerson.inc:309
-#: ../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
+#: ../lib/modules/inetOrgPerson.inc:46
+#: ../lib/modules/inetOrgPerson.inc:116
+#: ../lib/modules/inetOrgPerson.inc:249
+#: ../lib/modules/inetOrgPerson.inc:418
+#: ../lib/modules/inetOrgPerson.inc:503
+#: ../lib/modules/inetOrgPerson.inc:837
+#: ../lib/modules/inetOrgPerson.inc:1125
+#: ../lib/modules/inetOrgPerson.inc:1483
 msgid "Last name"
 msgstr "姓"
 
-#: ../lib/modules/inetOrgPerson.inc:75
-#: ../lib/modules/inetOrgPerson.inc:76
+#: ../lib/modules/inetOrgPerson.inc:46
+#: ../lib/modules/inetOrgPerson.inc:47
 msgid "Last name contains invalid characters or is empty!"
 msgstr "姓包含非法字符或为空!"
 
-#: ../lib/modules/inetOrgPerson.inc:576
+#: ../lib/modules/inetOrgPerson.inc:504
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "用户姓.只允许字符,-和空格."
 
+#: ../lib/modules/shadowAccount.inc:165
 #: ../lib/modules/shadowAccount.inc:416
 msgid "Last password change"
 msgstr "最后密码变更"
 
 #: ../lib/modules/dhcp_settings.inc:125
+#: ../lib/modules/dhcp_settings.inc:168
 #: ../lib/modules/dhcp_settings.inc:192
 #: ../lib/modules/dhcp_settings.inc:244
 #: ../lib/modules/dhcp_settings.inc:557
@@ -3290,19 +3522,19 @@ msgid "Line ends"
 msgstr "行结尾"
 
 #: ../templates/selfService/adminMain.php:321
-msgid "Link to login page for this self service profile"
-msgstr "自助服务登录界面."
+msgid "Link to self service login page for your users"
+msgstr "对用户自助服务登录界面的链接."
 
-#: ../templates/config/conftypes.php:256
+#: ../templates/config/conftypes.php:259
 #: ../help/help.inc:82
 msgid "List attributes"
 msgstr "属性列表"
 
-#: ../templates/config/conftypes.php:319
+#: ../templates/config/conftypes.php:322
 msgid "List attributes are invalid!"
 msgstr "属性列表非法!"
 
-#: ../lib/modules/sambaSamAccount.inc:289
+#: ../lib/modules/sambaSamAccount.inc:291
 msgid "List of Samba workstations the user is allowed to login. Empty means every workstation."
 msgstr "允许用户登录的Samba工作站,留空表示所有工作站."
 
@@ -3318,19 +3550,20 @@ msgstr "将被删除的条目列表:"
 msgid "List of valid users"
 msgstr "合法用户列表"
 
-#: ../lib/modules.inc:1382
+#: ../lib/modules.inc:1408
 #: ../help/help.inc:160
 msgid "Load profile"
 msgstr "调入配置文件"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:65
-#: ../lib/modules/inetLocalMailRecipient.inc:158
+#: ../lib/modules/inetLocalMailRecipient.inc:160
 msgid "Local address"
 msgstr "本机邮件"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:69
 #: ../lib/modules/inetLocalMailRecipient.inc:102
-#: ../lib/modules/inetLocalMailRecipient.inc:317
+#: ../lib/modules/inetLocalMailRecipient.inc:116
+#: ../lib/modules/inetLocalMailRecipient.inc:319
 msgid "Local address list"
 msgstr "本机邮递列表"
 
@@ -3338,81 +3571,86 @@ msgstr "本机邮递列表"
 msgid "Local group"
 msgstr "本地组"
 
-#: ../lib/modules/inetOrgPerson.inc:153
-#: ../lib/modules/inetOrgPerson.inc:159
-#: ../lib/modules/inetOrgPerson.inc:228
-#: ../lib/modules/inetOrgPerson.inc:446
-#: ../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
+#: ../lib/modules/ipHost.inc:98
+#: ../lib/modules/ipHost.inc:148
+#: ../lib/modules/ipHost.inc:318
+#: ../lib/modules/inetOrgPerson.inc:121
+#: ../lib/modules/inetOrgPerson.inc:127
+#: ../lib/modules/inetOrgPerson.inc:191
+#: ../lib/modules/inetOrgPerson.inc:386
+#: ../lib/modules/inetOrgPerson.inc:433
+#: ../lib/modules/inetOrgPerson.inc:571
+#: ../lib/modules/inetOrgPerson.inc:892
+#: ../lib/modules/inetOrgPerson.inc:1142
+#: ../lib/modules/inetOrgPerson.inc:1571
 msgid "Location"
 msgstr "地点"
 
 #: ../lib/modules/posixGroup.inc:188
-#: ../lib/modules/posixAccount.inc:262
-#: ../lib/modules/posixAccount.inc:999
+#: ../lib/modules/posixAccount.inc:263
+#: ../lib/modules/posixAccount.inc:998
 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:682
 #: ../lib/types/ppolicyType.inc:83
+#: ../lib/modules/ppolicy.inc:96
+#: ../lib/modules/ppolicy.inc:143
+#: ../lib/modules/ppolicy.inc:163
+#: ../lib/modules/ppolicy.inc:265
+#: ../lib/modules/ppolicy.inc:498
+#: ../lib/modules/sambaDomain.inc:126
+#: ../lib/modules/sambaDomain.inc:191
+#: ../lib/modules/sambaDomain.inc:216
+#: ../lib/modules/sambaDomain.inc:350
+#: ../lib/modules/sambaDomain.inc:696
 msgid "Lockout duration"
 msgstr "帐号锁定期"
 
-#: ../lib/modules/sambaDomain.inc:203
+#: ../lib/modules/sambaDomain.inc:216
 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
+#: ../lib/modules/ppolicy.inc:116
+#: ../lib/modules/ppolicy.inc:142
+#: ../lib/modules/ppolicy.inc:256
+#: ../lib/modules/ppolicy.inc:507
 msgid "Lockout users"
 msgstr "锁定的用户"
 
 #: ../lib/modules/sambaDomain.inc:114
-#: ../lib/modules/sambaDomain.inc:205
-#: ../lib/modules/sambaDomain.inc:310
-#: ../lib/modules/sambaDomain.inc:673
+#: ../lib/modules/sambaDomain.inc:188
+#: ../lib/modules/sambaDomain.inc:218
+#: ../lib/modules/sambaDomain.inc:323
+#: ../lib/modules/sambaDomain.inc:687
 msgid "Lockout users after bad logon attempts"
 msgstr "在多次错误登录后锁定用户."
 
-#: ../lib/modules/sambaDomain.inc:205
+#: ../lib/modules/sambaDomain.inc:218
 msgid "Lockout users after bad logon attempts must be between 0 and 999."
 msgstr "用户锁定前错误的登录次数必须在0－999之间。"
 
-#: ../templates/config/mainmanage.php:284
+#: ../templates/config/mainmanage.php:289
 #: ../help/help.inc:141
 msgid "Log destination"
 msgstr "日志存储位置"
 
-#: ../templates/config/mainmanage.php:259
+#: ../templates/config/mainmanage.php:264
 #: ../help/help.inc:139
 msgid "Log level"
 msgstr "日志等级"
 
-#: ../templates/config/mainmanage.php:253
+#: ../templates/config/mainmanage.php:258
 msgid "Logging"
 msgstr "日志"
 
-#: ../templates/selfService/adminMain.php:322
-#: ../templates/selfService/adminLogin.php:64
-#: ../templates/selfService/selfServiceLogin.php:136
-#: ../templates/login.php:289
+#: ../templates/login.php:301
 #: ../templates/config/conflogin.php:62
 #: ../templates/config/mainlogin.php:70
+#: ../templates/selfService/selfServiceLogin.php:138
+#: ../templates/selfService/adminLogin.php:64
 #: ../help/help.inc:55
 msgid "Login"
 msgstr "登录"
@@ -3432,43 +3670,46 @@ msgstr "登录标题"
 msgid "Login method"
 msgstr "登录方法"
 
-#: ../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
+#: ../lib/modules/posixAccount.inc:249
+#: ../lib/modules/posixAccount.inc:318
+#: ../lib/modules/posixAccount.inc:390
+#: ../lib/modules/posixAccount.inc:992
+#: ../lib/modules/posixAccount.inc:1106
+#: ../lib/modules/posixAccount.inc:1183
 msgid "Login shell"
 msgstr "登录shell"
 
-#: ../templates/pdfedit/pdfpage.php:389
+#: ../templates/pdfedit/pdfpage.php:413
 msgid "Logo"
 msgstr "标志"
 
 #: ../lib/modules/sambaDomain.inc:102
-#: ../lib/modules/sambaDomain.inc:277
-#: ../lib/modules/sambaDomain.inc:660
+#: ../lib/modules/sambaDomain.inc:185
+#: ../lib/modules/sambaDomain.inc:290
+#: ../lib/modules/sambaDomain.inc:674
 msgid "Logon for password change"
 msgstr "密码修改登录"
 
 #: ../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
+#: ../lib/modules/sambaSamAccount.inc:315
+#: ../lib/modules/sambaSamAccount.inc:318
+#: ../lib/modules/sambaSamAccount.inc:499
+#: ../lib/modules/sambaSamAccount.inc:590
+#: ../lib/modules/sambaSamAccount.inc:1239
+#: ../lib/modules/sambaSamAccount.inc:1642
 msgid "Logon hours"
 msgstr "可登录时间"
 
 #: ../lib/modules/sambaSamAccount.inc:87
 #: ../lib/modules/sambaSamAccount.inc:88
-#: ../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
+#: ../lib/modules/sambaSamAccount.inc:203
+#: ../lib/modules/sambaSamAccount.inc:287
+#: ../lib/modules/sambaSamAccount.inc:483
+#: ../lib/modules/sambaSamAccount.inc:584
+#: ../lib/modules/sambaSamAccount.inc:1183
+#: ../lib/modules/sambaSamAccount.inc:1604
+#: ../lib/modules/sambaSamAccount.inc:1772
 msgid "Logon script"
 msgstr "登录脚本"
 
@@ -3477,9 +3718,8 @@ msgstr "登录脚本"
 msgid "Logon script is invalid!"
 msgstr "登录脚本非法!"
 
-#: ../templates/logout.php:67
-#: ../templates/selfService/selfServiceMain.php:45
-#: ../templates/selfService/selfServiceMain.php:127
+#: ../templates/selfService/selfServiceMain.php:47
+#: ../templates/selfService/selfServiceMain.php:129
 #: ../templates/main_header.php:70
 msgid "Logout"
 msgstr "退出"
@@ -3502,29 +3742,31 @@ msgstr "MAC地址"
 msgid "MAC address list"
 msgstr "MAC地址列表"
 
+#: ../lib/modules/ieee802device.inc:79
 #: ../lib/modules/ieee802device.inc:198
 msgid "MAC address(es)"
 msgstr "MAC地址"
 
-#: ../lib/modules/sambaSamAccount.inc:550
+#: ../lib/modules/sambaSamAccount.inc:552
 msgid "Magadan, Solomon Islands"
 msgstr "马加丹,所罗门群岛"
 
-#: ../lib/modules/nisMailAlias.inc:55
 #: ../lib/types/mailAlias.inc:53
+#: ../lib/modules/nisMailAlias.inc:55
 msgid "Mail aliases"
 msgstr "邮件别名"
 
 #: ../lib/modules/kolabUser.inc:98
 #: ../lib/modules/kolabUser.inc:171
 #: ../lib/modules/kolabUser.inc:219
-#: ../lib/modules/kolabUser.inc:300
-#: ../lib/modules/kolabUser.inc:765
+#: ../lib/modules/kolabUser.inc:232
+#: ../lib/modules/kolabUser.inc:306
+#: ../lib/modules/kolabUser.inc:771
 msgid "Mail quota"
 msgstr "邮件限额"
 
-#: ../lib/modules/kolabUser.inc:247
-#: ../lib/modules/kolabUser.inc:248
+#: ../lib/modules/kolabUser.inc:253
+#: ../lib/modules/kolabUser.inc:254
 msgid "Mail quota must be a number!"
 msgstr "邮件限额必须是数字!"
 
@@ -3536,30 +3778,40 @@ msgstr "邮件路由"
 #: ../lib/modules/inetLocalMailRecipient.inc:73
 #: ../lib/modules/inetLocalMailRecipient.inc:79
 #: ../lib/modules/inetLocalMailRecipient.inc:108
-#: ../lib/modules/inetLocalMailRecipient.inc:150
-#: ../lib/modules/inetLocalMailRecipient.inc:320
+#: ../lib/modules/inetLocalMailRecipient.inc:117
+#: ../lib/modules/inetLocalMailRecipient.inc:152
+#: ../lib/modules/inetLocalMailRecipient.inc:322
 msgid "Mail server"
 msgstr "邮件服务器"
 
-#: ../templates/lists/changePassword.php:314
+#: ../templates/lists/changePassword.php:338
 #, php-format
 msgid "Mail successfully sent to %s."
 msgstr "邮件已经成功发送到%s."
 
+#: ../lib/modules/asteriskVoicemail.inc:82
+#: ../lib/modules/asteriskVoicemail.inc:134
+#: ../lib/modules/asteriskVoicemail.inc:154
+#: ../lib/modules/asteriskVoicemail.inc:234
+#: ../lib/modules/asteriskVoicemail.inc:373
+msgid "Mailbox"
+msgstr "邮箱"
+
 #: ../lib/modules/kolabUser.inc:163
 #: ../lib/modules/kolabUser.inc:194
-#: ../lib/modules/kolabUser.inc:288
+#: ../lib/modules/kolabUser.inc:228
 #: ../lib/modules/kolabUser.inc:294
-#: ../lib/modules/kolabUser.inc:761
+#: ../lib/modules/kolabUser.inc:300
+#: ../lib/modules/kolabUser.inc:767
 msgid "Mailbox home server"
 msgstr "邮件宿主服务器"
 
-#: ../lib/modules/kolabUser.inc:243
+#: ../lib/modules/kolabUser.inc:249
 msgid "Mailbox home server name is empty!"
 msgstr "邮件宿主服务器为空 !"
 
-#: ../lib/modules/kolabUser.inc:241
-#: ../lib/modules/kolabUser.inc:242
+#: ../lib/modules/kolabUser.inc:247
+#: ../lib/modules/kolabUser.inc:248
 msgid "Mailbox home server name is invalid!"
 msgstr "邮件宿主服务器非法!"
 
@@ -3571,7 +3823,8 @@ msgstr "邮件别名(例如:NIS邮件别名)"
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "邮件转发."
 
-#: ../templates/pdfedit/pdfpage.php:634
+#: ../templates/pdfedit/pdfpage.php:360
+#: ../templates/pdfedit/pdfpage.php:716
 msgid "Main"
 msgstr "主要设置"
 
@@ -3580,11 +3833,11 @@ msgstr "主要设置"
 msgid "Main page caption"
 msgstr "主页标题"
 
-#: ../templates/pdfedit/pdfmain.php:137
+#: ../templates/pdfedit/pdfmain.php:155
 msgid "Manage existing PDF structures"
 msgstr "管理已有的PDF架构"
 
-#: ../templates/profedit/profilemain.php:126
+#: ../templates/profedit/profilemain.php:148
 msgid "Manage existing profiles"
 msgstr "管理已有的设置"
 
@@ -3600,15 +3853,17 @@ msgstr "管理服务器设置"
 msgid "Managed suffixes"
 msgstr "管理后缀"
 
-#: ../lib/modules/inetOrgPerson.inc:278
-#: ../lib/modules/inetOrgPerson.inc:342
-#: ../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
+#: ../lib/modules/ipHost.inc:99
+#: ../lib/modules/ipHost.inc:170
+#: ../lib/modules/ipHost.inc:321
+#: ../lib/modules/inetOrgPerson.inc:221
+#: ../lib/modules/inetOrgPerson.inc:282
+#: ../lib/modules/inetOrgPerson.inc:478
+#: ../lib/modules/inetOrgPerson.inc:511
+#: ../lib/modules/inetOrgPerson.inc:1047
+#: ../lib/modules/inetOrgPerson.inc:1127
 msgid "Manager"
 msgstr "管理员"
 
@@ -3624,30 +3879,32 @@ msgstr "手动"
 msgid "Manual if conflicts"
 msgstr "如果冲突使用手动"
 
+#: ../lib/types/nisObjectType.inc:78
 #: ../lib/modules/nisObject.inc:58
 #: ../lib/modules/nisObject.inc:89
-#: ../lib/modules/nisObject.inc:115
-#: ../lib/modules/nisObject.inc:141
-#: ../lib/modules/nisObject.inc:220
-#: ../lib/types/nisObjectType.inc:78
+#: ../lib/modules/nisObject.inc:105
+#: ../lib/modules/nisObject.inc:116
+#: ../lib/modules/nisObject.inc:142
+#: ../lib/modules/nisObject.inc:211
 msgid "Mapping entry"
 msgstr "映射条目"
 
-#: ../lib/modules/nisObject.inc:115
 #: ../lib/modules/nisObject.inc:116
+#: ../lib/modules/nisObject.inc:117
 msgid "Mapping entry contains invalid characters. Only ASCII characters are allowed."
 msgstr "映射条目包含非法字符,只能使用 ASCII 字符."
 
+#: ../lib/types/nisObjectType.inc:79
 #: ../lib/modules/nisObject.inc:62
 #: ../lib/modules/nisObject.inc:82
-#: ../lib/modules/nisObject.inc:135
-#: ../lib/modules/nisObject.inc:221
-#: ../lib/types/nisObjectType.inc:79
+#: ../lib/modules/nisObject.inc:106
+#: ../lib/modules/nisObject.inc:136
+#: ../lib/modules/nisObject.inc:212
 msgid "Mapping name"
 msgstr "映射的名字"
 
-#: ../lib/modules/kolabUser.inc:392
-#: ../lib/modules/kolabUser.inc:569
+#: ../lib/modules/kolabUser.inc:398
+#: ../lib/modules/kolabUser.inc:575
 msgid "Mark account for deletion"
 msgstr "将此帐号标记为删除"
 
@@ -3655,18 +3912,18 @@ msgstr "将此帐号标记为删除"
 msgid "Mark for deletion"
 msgstr "标记为删除"
 
-#: ../templates/selfService/profManage.php:251
 #: ../templates/config/profmanage.php:349
+#: ../templates/selfService/profManage.php:261
 #: ../help/help.inc:133
 msgid "Master password"
 msgstr "管理员密码"
 
-#: ../templates/selfService/profManage.php:68
 #: ../templates/config/profmanage.php:78
+#: ../templates/selfService/profManage.php:68
 msgid "Master password is wrong!"
 msgstr "系统管理员密码错误!"
 
-#: ../templates/config/mainmanage.php:98
+#: ../templates/config/mainmanage.php:77
 msgid "Master passwords are different or empty!"
 msgstr "管理员密码不同或为空!"
 
@@ -3693,30 +3950,31 @@ msgstr "最大的GID非法或为空!"
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "最大GID必须大于最小GID!"
 
-#: ../lib/modules/posixAccount.inc:59
-#: ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:60
 #: ../lib/modules/posixAccount.inc:62
 #: ../lib/modules/posixAccount.inc:63
-#: ../lib/modules/posixAccount.inc:164
-#: ../lib/modules/posixAccount.inc:173
+#: ../lib/modules/posixAccount.inc:64
+#: ../lib/modules/posixAccount.inc:165
+#: ../lib/modules/posixAccount.inc:174
 msgid "Maximum UID number"
 msgstr "最大UID号"
 
-#: ../lib/modules/posixAccount.inc:59
-#: ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:60
+#: ../lib/modules/posixAccount.inc:62
 msgid "Maximum UID number is invalid!"
 msgstr "最大UID号非法"
 
-#: ../lib/modules/posixAccount.inc:62
 #: ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:64
 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
+#: ../lib/modules/ppolicy.inc:100
+#: ../lib/modules/ppolicy.inc:144
+#: ../lib/modules/ppolicy.inc:164
+#: ../lib/modules/ppolicy.inc:274
+#: ../lib/modules/ppolicy.inc:499
 msgid "Maximum failure count"
 msgstr "最大失败次数"
 
@@ -3726,6 +3984,7 @@ msgid "Maximum file size: %s"
 msgstr "最大文件大小: %s"
 
 #: ../lib/modules/dhcp_settings.inc:128
+#: ../lib/modules/dhcp_settings.inc:169
 #: ../lib/modules/dhcp_settings.inc:197
 #: ../lib/modules/dhcp_settings.inc:250
 #: ../lib/modules/dhcp_settings.inc:563
@@ -3733,65 +3992,70 @@ msgstr "最大文件大小: %s"
 msgid "Maximum lease time"
 msgstr "最大释放时间"
 
-#: ../templates/schema/schema.php:212
 #: ../templates/tree/add_value_form.php:194
+#: ../templates/schema/schema.php:212
 msgid "Maximum length"
 msgstr "最大长度"
 
-#: ../lib/lists.inc:781
+#: ../lib/lists.inc:806
 #: ../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/types/ppolicyType.inc:79
 #: ../lib/modules/shadowAccount.inc:59
 #: ../lib/modules/shadowAccount.inc:65
 #: ../lib/modules/shadowAccount.inc:119
 #: ../lib/modules/shadowAccount.inc:185
 #: ../lib/modules/shadowAccount.inc:219
 #: ../lib/modules/shadowAccount.inc:321
+#: ../lib/modules/ppolicy.inc:80
+#: ../lib/modules/ppolicy.inc:136
+#: ../lib/modules/ppolicy.inc:159
+#: ../lib/modules/ppolicy.inc:160
+#: ../lib/modules/ppolicy.inc:201
+#: ../lib/modules/ppolicy.inc:485
 #: ../lib/modules/sambaDomain.inc:122
-#: ../lib/modules/sambaDomain.inc:200
-#: ../lib/modules/sambaDomain.inc:202
-#: ../lib/modules/sambaDomain.inc:328
-#: ../lib/modules/sambaDomain.inc:679
-#: ../lib/types/ppolicyType.inc:79
+#: ../lib/modules/sambaDomain.inc:190
+#: ../lib/modules/sambaDomain.inc:213
+#: ../lib/modules/sambaDomain.inc:215
+#: ../lib/modules/sambaDomain.inc:341
+#: ../lib/modules/sambaDomain.inc:693
 msgid "Maximum password age"
 msgstr "密码最长生命"
 
+#: ../lib/types/netgroup.inc:94
 #: ../lib/modules/nisnetgroup.inc:80
 #: ../lib/modules/nisnetgroup.inc:84
 #: ../lib/modules/nisnetgroup.inc:117
-#: ../lib/modules/nisnetgroup.inc:250
-#: ../lib/modules/nisnetgroup.inc:571
+#: ../lib/modules/nisnetgroup.inc:127
+#: ../lib/modules/nisnetgroup.inc:254
+#: ../lib/modules/nisnetgroup.inc:575
 #: ../lib/modules/groupOfNames.inc:72
 #: ../lib/modules/groupOfNames.inc:76
 #: ../lib/modules/groupOfNames.inc:103
-#: ../lib/modules/groupOfNames.inc:173
-#: ../lib/modules/groupOfNames.inc:448
-#: ../lib/types/netgroup.inc:94
+#: ../lib/modules/groupOfNames.inc:114
+#: ../lib/modules/groupOfNames.inc:176
+#: ../lib/modules/groupOfNames.inc:454
 msgid "Members"
 msgstr "组成员"
 
-#: ../lib/modules/sambaSamAccount.inc:537
+#: ../lib/modules/sambaSamAccount.inc:539
 msgid "Mid-Atlantic"
 msgstr "大西洋地区中部"
 
-#: ../lib/modules/sambaSamAccount.inc:528
+#: ../lib/modules/sambaSamAccount.inc:530
 msgid "Midway Island, Samoa"
 msgstr "中途岛,萨摩亚"
 
-#: ../lib/modules/inetOrgPerson.inc:311
+#: ../lib/modules/inetOrgPerson.inc:251
 msgid "Miller"
 msgstr "米勒"
 
 #: ../lib/modules/sambaDomain.inc:94
-#: ../lib/modules/sambaDomain.inc:255
-#: ../lib/modules/sambaDomain.inc:652
+#: ../lib/modules/sambaDomain.inc:183
+#: ../lib/modules/sambaDomain.inc:268
+#: ../lib/modules/sambaDomain.inc:666
 msgid "Minimal password length"
 msgstr "最短密码长度"
 
@@ -3804,109 +4068,109 @@ msgstr "最小GID号"
 msgid "Minimum GID number is invalid or empty!"
 msgstr "最小GID错误或为空"
 
-#: ../lib/modules/posixAccount.inc:58
-#: ../lib/modules/posixAccount.inc:60
-#: ../lib/modules/posixAccount.inc:161
-#: ../lib/modules/posixAccount.inc:170
+#: ../lib/modules/posixAccount.inc:59
+#: ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:162
+#: ../lib/modules/posixAccount.inc:171
 msgid "Minimum 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 "Minimum UID number is invalid!"
 msgstr "最小UID非法!"
 
-#: ../templates/config/mainmanage.php:224
+#: ../templates/config/mainmanage.php:229
 msgid "Minimum character classes"
 msgstr "最少字符类别"
 
-#: ../templates/config/mainmanage.php:220
+#: ../templates/config/mainmanage.php:225
 msgid "Minimum lowercase characters"
 msgstr "最少小写字母字符数"
 
-#: ../templates/config/mainmanage.php:222
+#: ../templates/config/mainmanage.php:227
 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/types/ppolicyType.inc:78
 #: ../lib/modules/shadowAccount.inc:57
 #: ../lib/modules/shadowAccount.inc:114
 #: ../lib/modules/shadowAccount.inc:181
 #: ../lib/modules/shadowAccount.inc:213
 #: ../lib/modules/shadowAccount.inc:315
+#: ../lib/modules/ppolicy.inc:76
+#: ../lib/modules/ppolicy.inc:135
+#: ../lib/modules/ppolicy.inc:158
+#: ../lib/modules/ppolicy.inc:192
+#: ../lib/modules/ppolicy.inc:484
 #: ../lib/modules/sambaDomain.inc:118
-#: ../lib/modules/sambaDomain.inc:201
-#: ../lib/modules/sambaDomain.inc:319
-#: ../lib/modules/sambaDomain.inc:676
-#: ../lib/types/ppolicyType.inc:78
+#: ../lib/modules/sambaDomain.inc:189
+#: ../lib/modules/sambaDomain.inc:214
+#: ../lib/modules/sambaDomain.inc:332
+#: ../lib/modules/sambaDomain.inc:690
 msgid "Minimum password age"
 msgstr "密码最短生命"
 
-#: ../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
+#: ../templates/config/mainmanage.php:224
 #: ../lib/types/ppolicyType.inc:87
+#: ../lib/modules/ppolicy.inc:112
+#: ../lib/modules/ppolicy.inc:139
+#: ../lib/modules/ppolicy.inc:167
+#: ../lib/modules/ppolicy.inc:247
+#: ../lib/modules/ppolicy.inc:502
 msgid "Minimum password length"
 msgstr "最短密码长度"
 
-#: ../templates/config/mainmanage.php:223
+#: ../templates/config/mainmanage.php:228
 msgid "Minimum symbolic characters"
 msgstr "最少标点符号字符数"
 
-#: ../templates/config/mainmanage.php:221
+#: ../templates/config/mainmanage.php:226
 msgid "Minimum uppercase characters"
 msgstr "最少的大字字母字符数"
 
-#: ../lib/modules/inetOrgPerson.inc:81
-#: ../lib/modules/inetOrgPerson.inc:149
-#: ../lib/modules/inetOrgPerson.inc:251
-#: ../lib/modules/inetOrgPerson.inc:406
-#: ../lib/modules/inetOrgPerson.inc:607
-#: ../lib/modules/inetOrgPerson.inc:608
-#: ../lib/modules/inetOrgPerson.inc:1048
-#: ../lib/modules/inetOrgPerson.inc:1233
+#: ../lib/modules/inetOrgPerson.inc:52
+#: ../lib/modules/inetOrgPerson.inc:117
+#: ../lib/modules/inetOrgPerson.inc:205
+#: ../lib/modules/inetOrgPerson.inc:346
+#: ../lib/modules/inetOrgPerson.inc:454
+#: ../lib/modules/inetOrgPerson.inc:535
+#: ../lib/modules/inetOrgPerson.inc:536
+#: ../lib/modules/inetOrgPerson.inc:958
+#: ../lib/modules/inetOrgPerson.inc:1134
 msgid "Mobile number"
 msgstr "手机号码"
 
-#: ../lib/modules/inetOrgPerson.inc:1625
+#: ../lib/modules/inetOrgPerson.inc:1515
 msgid "Mobile telephone number"
 msgstr "手机号码"
 
-#: ../templates/lists/changePassword.php:176
-msgid "Mode"
-msgstr "模式"
-
-#: ../templates/config/conftypes.php:176
-#: ../templates/config/confmain.php:194
 #: ../templates/config/confmodules.php:161
+#: ../templates/config/confmain.php:194
 #: ../templates/config/moduleSettings.php:160
+#: ../templates/config/conftypes.php:179
 msgid "Module settings"
 msgstr "模块设置"
 
-#: ../templates/config/conftypes.php:166
-#: ../templates/config/confmain.php:184
 #: ../templates/config/confmodules.php:151
+#: ../templates/config/confmain.php:184
 #: ../templates/config/moduleSettings.php:150
+#: ../templates/config/conftypes.php:169
 msgid "Modules"
 msgstr "模块"
 
-#: ../lib/modules/sambaSamAccount.inc:1317
+#: ../lib/modules/sambaSamAccount.inc:1319
 msgid "Monday"
 msgstr "星期一"
 
-#: ../lib/modules/sambaSamAccount.inc:532
+#: ../lib/modules/sambaSamAccount.inc:534
 msgid "Mountain Time (US & Canada)"
 msgstr "时区(美国和加拿大)"
 
 #: ../lib/modules/quota.inc:97
-#: ../lib/modules/quota.inc:385
-#: ../lib/modules/quota.inc:471
-#: ../lib/modules/quota.inc:580
+#: ../lib/modules/quota.inc:381
+#: ../lib/modules/quota.inc:474
+#: ../lib/modules/quota.inc:590
 msgid "Mountpoint"
 msgstr "挂接点"
 
@@ -3917,19 +4181,25 @@ msgstr "可限制配额设备挂接点"
 #: ../lib/modules/eduPerson.inc:96
 #: ../lib/modules/eduPerson.inc:108
 #: ../lib/modules/eduPerson.inc:124
+#: ../lib/modules/sudoRole.inc:89
+#: ../lib/modules/sudoRole.inc:94
+#: ../lib/modules/sudoRole.inc:99
+#: ../lib/modules/sudoRole.inc:104
+#: ../lib/modules/sudoRole.inc:109
+#: ../lib/modules/sudoRole.inc:114
 msgid "Multiple values are separated by comma."
 msgstr "用逗号分隔多值."
 
-#: ../lib/modules/inetOrgPerson.inc:448
 #: ../lib/modules/ipHost.inc:86
+#: ../lib/modules/inetOrgPerson.inc:388
 msgid "MyCity"
 msgstr "城市"
 
-#: ../lib/modules/inetOrgPerson.inc:376
+#: ../lib/modules/inetOrgPerson.inc:316
 msgid "Mycity"
 msgstr "城市"
 
-#: ../lib/modules/inetOrgPerson.inc:360
+#: ../lib/modules/inetOrgPerson.inc:300
 msgid "Mystreetname 42"
 msgstr "街道42号"
 
@@ -3957,17 +4227,22 @@ msgstr "NIS 对象条目"
 msgid "NIS objects"
 msgstr "NIS 对象"
 
-#: ../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: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
+#: ../templates/schema/schema.php:266
+#: ../templates/pdfedit/pdfdelete.php:85
 #: ../lib/types/ppolicyType.inc:77
+#: ../lib/modules/nisObject.inc:54
+#: ../lib/modules/nisObject.inc:74
+#: ../lib/modules/nisObject.inc:104
+#: ../lib/modules/nisObject.inc:130
+#: ../lib/modules/nisObject.inc:210
+#: ../lib/modules/ppolicy.inc:72
+#: ../lib/modules/ppolicy.inc:134
+#: ../lib/modules/ppolicy.inc:157
+#: ../lib/modules/ppolicy.inc:183
+#: ../lib/modules/ppolicy.inc:483
+#: ../lib/modules/groupOfNames.inc:141
 msgid "Name"
 msgstr "名"
 
@@ -3976,12 +4251,14 @@ msgid "Name under which the profile will be saved. If a profile with the same na
 msgstr "将来保存的配置名,如果配置名存在,会被覆盖."
 
 #: ../lib/modules/dhcp_settings.inc:158
+#: ../lib/modules/dhcp_settings.inc:175
 #: ../lib/modules/dhcp_settings.inc:608
 #: ../lib/modules/dhcp_settings.inc:676
 msgid "Net mask"
 msgstr "子网掩码"
 
 #: ../lib/modules/dhcp_settings.inc:137
+#: ../lib/modules/dhcp_settings.inc:172
 #: ../lib/modules/dhcp_settings.inc:212
 #: ../lib/modules/dhcp_settings.inc:268
 #: ../lib/modules/dhcp_settings.inc:581
@@ -3990,6 +4267,7 @@ msgid "Netbios name servers"
 msgstr "Netbios命名服务器"
 
 #: ../lib/modules/dhcp_settings.inc:140
+#: ../lib/modules/dhcp_settings.inc:173
 #: ../lib/modules/dhcp_settings.inc:217
 #: ../lib/modules/dhcp_settings.inc:274
 #: ../lib/modules/dhcp_settings.inc:595
@@ -4001,7 +4279,7 @@ msgstr "Netbios 节点类型"
 msgid "New DHCP"
 msgstr "新DHCP"
 
-#: ../lib/modules/ipHost.inc:135
+#: ../lib/modules/ipHost.inc:137
 msgid "New IP address"
 msgstr "新IP地址"
 
@@ -4013,15 +4291,15 @@ msgstr "新MAC地址"
 msgid "New NIS object"
 msgstr "新 NIS 对象"
 
-#: ../templates/ou_edit.php:71
+#: ../templates/ou_edit.php:74
 msgid "New OU created successfully."
 msgstr "新OU建立成功."
 
-#: ../lib/modules/ldapPublicKey.inc:103
+#: ../lib/modules/ldapPublicKey.inc:107
 msgid "New SSH public key"
 msgstr "新SSH公钥"
 
-#: ../lib/modules/inetOrgPerson.inc:456
+#: ../lib/modules/inetOrgPerson.inc:396
 msgid "New York"
 msgstr "纽约"
 
@@ -4042,29 +4320,30 @@ msgstr "新域"
 msgid "New extension"
 msgstr "新扩展"
 
-#: ../templates/pdfedit/pdfpage.php:623
+#: ../templates/pdfedit/pdfpage.php:639
 msgid "New field"
 msgstr "新字段"
 
+#: ../lib/types/gon.inc:121
 #: ../lib/types/group.inc:133
 #: ../lib/types/netgroup.inc:121
-#: ../lib/types/gon.inc:121
 msgid "New group"
 msgstr "新组"
 
 #: ../lib/types/host.inc:123
+#: ../lib/modules/hostObject.inc:150
 msgid "New host"
 msgstr "新主机"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:165
+#: ../lib/modules/inetLocalMailRecipient.inc:167
 msgid "New local address"
 msgstr "新本地邮件地址"
 
-#: ../templates/config/mainmanage.php:344
+#: ../templates/config/mainmanage.php:349
 msgid "New master password"
 msgstr "新管理员密码"
 
-#: ../templates/config/mainmanage.php:95
+#: ../templates/config/mainmanage.php:74
 msgid "New master password set successfully."
 msgstr "新管理员密码设置成功."
 
@@ -4073,22 +4352,22 @@ msgid "New object"
 msgstr "新对象"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:47
-#: ../templates/ou_edit.php:162
+#: ../templates/ou_edit.php:165
 #: ../help/help.inc:200
 msgid "New organizational unit"
 msgstr "新组织单元"
 
-#: ../lib/modules/groupOfNames.inc:250
+#: ../lib/modules/groupOfNames.inc:253
 msgid "New owner"
 msgstr "新拥有者"
 
 #: ../templates/config/confmain.php:517
-#: ../lib/modules/posixAccount.inc:1706
+#: ../lib/modules/posixAccount.inc:1708
 msgid "New password"
 msgstr "新密码"
 
 #: ../templates/config/profmanage.php:127
-#: ../lib/modules.inc:1065
+#: ../lib/modules.inc:1092
 msgid "New password set successfully."
 msgstr "新密码设置成功."
 
@@ -4103,7 +4382,7 @@ msgstr "新策略"
 msgid "New range"
 msgstr "新范围"
 
-#: ../lib/modules/nisMailAlias.inc:153
+#: ../lib/modules/nisMailAlias.inc:154
 msgid "New recipient"
 msgstr "新收信者"
 
@@ -4111,10 +4390,14 @@ msgstr "新收信者"
 msgid "New required attributes:"
 msgstr "新必要属性"
 
-#: ../templates/pdfedit/pdfpage.php:542
+#: ../templates/pdfedit/pdfpage.php:558
 msgid "New section"
 msgstr "新节"
 
+#: ../lib/types/sudo.inc:111
+msgid "New sudo role"
+msgstr "新sudo角色"
+
 #: ../lib/types/user.inc:137
 msgid "New user"
 msgstr "新用户"
@@ -4123,21 +4406,22 @@ msgstr "新用户"
 msgid "New value"
 msgstr "新值"
 
-#: ../templates/tree/templates/creation/new_ou_template.php:69
-#: ../templates/tree/templates/creation/custom.php:86
 #: ../templates/tree/create_form.php:138
+#: ../templates/tree/templates/creation/custom.php:86
+#: ../templates/tree/templates/creation/new_ou_template.php:69
 msgid "Next"
 msgstr "下一步"
 
 #: ../lib/modules/sambaDomain.inc:78
 #: ../lib/modules/sambaDomain.inc:158
-#: ../lib/modules/sambaDomain.inc:359
-#: ../lib/modules/sambaDomain.inc:640
+#: ../lib/modules/sambaDomain.inc:179
+#: ../lib/modules/sambaDomain.inc:372
+#: ../lib/modules/sambaDomain.inc:654
 msgid "Next RID"
 msgstr "下一个RID"
 
-#: ../lib/modules/sambaDomain.inc:192
-#: ../lib/modules/sambaDomain.inc:193
+#: ../lib/modules/sambaDomain.inc:205
+#: ../lib/modules/sambaDomain.inc:206
 msgid "Next RID is not a number!"
 msgstr "下一个RID不是一个数字!"
 
@@ -4155,32 +4439,35 @@ msgstr "建立用户帐号使用的下一个RID(Winbind)."
 
 #: ../lib/modules/sambaDomain.inc:86
 #: ../lib/modules/sambaDomain.inc:170
-#: ../lib/modules/sambaDomain.inc:369
-#: ../lib/modules/sambaDomain.inc:646
+#: ../lib/modules/sambaDomain.inc:181
+#: ../lib/modules/sambaDomain.inc:382
+#: ../lib/modules/sambaDomain.inc:660
 msgid "Next group RID"
 msgstr "下一个组的RID"
 
-#: ../lib/modules/sambaDomain.inc:196
-#: ../lib/modules/sambaDomain.inc:197
+#: ../lib/modules/sambaDomain.inc:209
+#: ../lib/modules/sambaDomain.inc:210
 msgid "Next group RID is not a number!"
 msgstr "下一个组的RID不是数字!"
 
 #: ../lib/modules/sambaDomain.inc:82
 #: ../lib/modules/sambaDomain.inc:164
-#: ../lib/modules/sambaDomain.inc:364
-#: ../lib/modules/sambaDomain.inc:643
+#: ../lib/modules/sambaDomain.inc:180
+#: ../lib/modules/sambaDomain.inc:377
+#: ../lib/modules/sambaDomain.inc:657
 msgid "Next user RID"
 msgstr "下一个用户的RID"
 
-#: ../lib/modules/sambaDomain.inc:194
-#: ../lib/modules/sambaDomain.inc:195
+#: ../lib/modules/sambaDomain.inc:207
+#: ../lib/modules/sambaDomain.inc:208
 msgid "Next user RID is not a number!"
 msgstr "下一个用户的RID不是数字!"
 
 #: ../lib/modules/eduPerson.inc:86
 #: ../lib/modules/eduPerson.inc:168
-#: ../lib/modules/eduPerson.inc:307
-#: ../lib/modules/eduPerson.inc:675
+#: ../lib/modules/eduPerson.inc:200
+#: ../lib/modules/eduPerson.inc:313
+#: ../lib/modules/eduPerson.inc:684
 msgid "Nick names"
 msgstr "昵称"
 
@@ -4199,17 +4486,17 @@ msgstr "没有发现DHCP主机!"
 msgid "No NIS objects found!"
 msgstr "未发现 NIS 对象!"
 
+#: ../lib/modules/sambaSamAccount.inc:617
+#: ../lib/modules/sambaSamAccount.inc:743
+#: ../lib/modules/sambaSamAccount.inc:1057
 #: ../lib/modules/sambaGroupMapping.inc:90
 #: ../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:440
-#: ../lib/modules/posixAccount.inc:930
+#: ../lib/modules/posixAccount.inc:442
+#: ../lib/modules/posixAccount.inc:895
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Unix组,请先建立一个."
 
@@ -4234,18 +4521,18 @@ msgstr "没有发现域!"
 msgid "No extension(s) found!"
 msgstr "没有发现扩展!"
 
-#: ../lib/modules/inetOrgPerson.inc:103
+#: ../lib/modules/inetOrgPerson.inc:74
 msgid "No file selected."
 msgstr "没有选择文件!"
 
 #: ../lib/modules/posixGroup.inc:468
-#: ../lib/modules/posixAccount.inc:69
+#: ../lib/modules/posixAccount.inc:70
 msgid "No free ID-Number!"
 msgstr "没有可用的ID号!"
 
+#: ../lib/types/gon.inc:120
 #: ../lib/types/group.inc:132
 #: ../lib/types/netgroup.inc:120
-#: ../lib/types/gon.inc:120
 msgid "No groups found!"
 msgstr "没有发现组!"
 
@@ -4253,24 +4540,24 @@ msgstr "没有发现组!"
 msgid "No hosts found!"
 msgstr "没有发现主机!"
 
-#: ../templates/tree/edit.php:196
+#: ../templates/tree/edit.php:193
 msgid "No internal attributes"
 msgstr "没有内部属性"
 
-#: ../templates/tests/lamdaemonTest.php:214
+#: ../templates/tests/lamdaemonTest.php:186
 msgid "No lamdaemon path set, please update your LAM configuration settings."
 msgstr "没有设定lamdaemon路径设置,请更改LAM配置."
 
 #: ../templates/tests/lamdaemonTest.php:105
-#: ../templates/tests/lamdaemonTest.php:210
+#: ../templates/tests/lamdaemonTest.php:182
 msgid "No lamdaemon server set, please update your LAM configuration settings."
 msgstr "没有设置lamdaemon服务器,请先设置LAM配置."
 
-#: ../templates/config/mainmanage.php:300
+#: ../templates/config/mainmanage.php:305
 msgid "No logging"
 msgstr "无日志"
 
-#: ../templates/pdfedit/pdfpage.php:366
+#: ../templates/pdfedit/pdfpage.php:382
 msgid "No logo"
 msgstr "无标志"
 
@@ -4278,12 +4565,12 @@ msgstr "无标志"
 msgid "No objects found!"
 msgstr "未发现对象!"
 
-#: ../templates/config/confmodules.php:374
+#: ../templates/config/confmodules.php:379
 msgid "No or more than one base module selected!"
 msgstr "未选择基本模块或选择多于一个!"
 
-#: ../templates/config/confmain.php:54
 #: ../templates/config/confsave.php:53
+#: ../templates/config/confmain.php:54
 msgid "No password was entered!"
 msgstr "没有输入密码!"
 
@@ -4295,11 +4582,11 @@ msgstr "没有发现策略!"
 msgid "No problems found."
 msgstr "未发现问题!"
 
-#: ../lib/modules/customScripts.inc:152
+#: ../lib/modules/customScripts.inc:160
 msgid "No scripts to run."
 msgstr "没有运行的脚本"
 
-#: ../templates/pdfedit/pdfpage.php:121
+#: ../templates/pdfedit/pdfpage.php:119
 msgid "No section text specified"
 msgstr "没有指定段文本"
 
@@ -4307,7 +4594,7 @@ msgstr "没有指定段文本"
 msgid "No server profiles found. Please create one."
 msgstr "没有服务器设置,请先建立一个."
 
-#: ../templates/pdfedit/pdfpage.php:109
+#: ../templates/pdfedit/pdfpage.php:107
 msgid "No static text specified"
 msgstr "没有指定静态文本"
 
@@ -4324,6 +4611,10 @@ msgstr "没有这个条目!"
 msgid "No such schema item: \"%s\""
 msgstr "没有这个schema项:\"%s\""
 
+#: ../lib/types/sudo.inc:110
+msgid "No sudo roles found!"
+msgstr "未发现sudo角色!"
+
 #: ../lib/types/user.inc:136
 msgid "No users found!"
 msgstr "未发现用户!"
@@ -4336,7 +4627,7 @@ 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:262
+#: ../templates/config/mainmanage.php:267
 msgid "Notice"
 msgstr "注意"
 
@@ -4375,25 +4666,25 @@ msgstr "多後之後使用者必須更改密碼.(密碼到期),以秒為單位"
 msgid "OID"
 msgstr "OID"
 
-#: ../templates/ou_edit.php:77
+#: ../templates/ou_edit.php:80
 msgid "OU already exists!"
 msgstr "OU已经存在!"
 
-#: ../templates/ou_edit.php:88
+#: ../templates/ou_edit.php:91
 msgid "OU deleted successfully."
 msgstr "OU删除成功."
 
-#: ../templates/ou_edit.php:144
-#: ../templates/ou_edit.php:158
+#: ../templates/ou_edit.php:135
+#: ../templates/ou_edit.php:161
 #: ../lib/tools/ouEditor.inc:44
 msgid "OU editor"
 msgstr "OU编辑器"
 
-#: ../templates/ou_edit.php:81
+#: ../templates/ou_edit.php:84
 msgid "OU is invalid!"
 msgstr "OU无效!"
 
-#: ../templates/ou_edit.php:112
+#: ../templates/ou_edit.php:119
 msgid "OU is not empty or invalid!"
 msgstr "OU不为空或非法!"
 
@@ -4402,9 +4693,9 @@ msgstr "OU不为空或非法!"
 msgid "OU-Editor"
 msgstr "OU编辑器"
 
+#: ../templates/tree/templates/creation/custom.php:70
 #: ../templates/schema/schema.php:63
 #: ../templates/schema/schema.php:64
-#: ../templates/tree/templates/creation/custom.php:70
 msgid "Object classes"
 msgstr "对象类"
 
@@ -4413,54 +4704,55 @@ msgstr "对象类"
 msgid "Obsolete"
 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:292
+#: ../lib/modules/sambaDomain.inc:303
+#: ../lib/modules/sambaDomain.inc:314
+#: ../lib/modules/sambaDomain.inc:672
+#: ../lib/modules/sambaDomain.inc:677
+#: ../lib/modules/sambaDomain.inc:682
 msgid "Off"
 msgstr "关闭"
 
-#: ../lib/modules/inetOrgPerson.inc:153
-#: ../lib/modules/inetOrgPerson.inc:238
-#: ../lib/modules/inetOrgPerson.inc:470
-#: ../lib/modules/inetOrgPerson.inc:659
-#: ../lib/modules/inetOrgPerson.inc:1009
-#: ../lib/modules/inetOrgPerson.inc:1243
-#: ../lib/modules/inetOrgPerson.inc:1705
+#: ../lib/modules/inetOrgPerson.inc:121
+#: ../lib/modules/inetOrgPerson.inc:197
+#: ../lib/modules/inetOrgPerson.inc:410
+#: ../lib/modules/inetOrgPerson.inc:442
+#: ../lib/modules/inetOrgPerson.inc:583
+#: ../lib/modules/inetOrgPerson.inc:919
+#: ../lib/modules/inetOrgPerson.inc:1144
+#: ../lib/modules/inetOrgPerson.inc:1595
 msgid "Office name"
 msgstr "办公室名"
 
 #: ../templates/tree/export_form.php:165
-#: ../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/ou_edit.php:172
+#: ../templates/ou_edit.php:188
+#: ../templates/masscreate.php:195
+#: ../templates/config/profmanage.php:354
+#: ../templates/config/mainmanage.php:376
 #: ../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: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:166
-#: ../lib/lists.inc:588
-#: ../lib/lists.inc:804
+#: ../templates/selfService/selfServiceLogin.php:228
+#: ../templates/selfService/profManage.php:266
+#: ../templates/selfService/adminLogin.php:132
+#: ../templates/selfService/adminLogin.php:133
+#: ../templates/selfService/adminMain.php:542
+#: ../templates/selfService/adminMain.php:585
+#: ../templates/profedit/profiledelete.php:82
+#: ../lib/modules/sambaSamAccount.inc:1366
+#: ../lib/modules/sambaSamAccount.inc:1527
+#: ../lib/modules/nisnetgroup.inc:454
+#: ../lib/modules/nisnetgroup.inc:470
+#: ../lib/modules/aliasEntry.inc:141
+#: ../lib/modules/aliasEntry.inc:160
+#: ../lib/modules/groupOfNames.inc:237
+#: ../lib/modules/groupOfNames.inc:258
+#: ../lib/modules/groupOfNames.inc:346
+#: ../lib/lists.inc:613
+#: ../lib/lists.inc:829
+#: ../lib/modules.inc:1314
 msgid "Ok"
 msgstr "确定"
 
@@ -4468,18 +4760,19 @@ msgstr "确定"
 msgid "Old value"
 msgstr "旧值"
 
-#: ../lib/modules/sambaDomain.inc:279
-#: ../lib/modules/sambaDomain.inc:290
-#: ../lib/modules/sambaDomain.inc:301
-#: ../lib/modules/sambaDomain.inc:659
-#: ../lib/modules/sambaDomain.inc:664
-#: ../lib/modules/sambaDomain.inc:669
+#: ../lib/modules/sambaDomain.inc:292
+#: ../lib/modules/sambaDomain.inc:303
+#: ../lib/modules/sambaDomain.inc:314
+#: ../lib/modules/sambaDomain.inc:673
+#: ../lib/modules/sambaDomain.inc:678
+#: ../lib/modules/sambaDomain.inc:683
 msgid "On"
 msgstr "On"
 
-#: ../lib/modules/sambaSamAccount.inc:358
-#: ../lib/modules/sambaSamAccount.inc:1510
-#: ../lib/modules/sambaSamAccount.inc:1839
+#: ../lib/modules/sambaSamAccount.inc:223
+#: ../lib/modules/sambaSamAccount.inc:360
+#: ../lib/modules/sambaSamAccount.inc:1512
+#: ../lib/modules/sambaSamAccount.inc:1841
 msgid "On broken or timed out connection"
 msgstr "中断或超时连接"
 
@@ -4492,8 +4785,8 @@ msgstr "One (基类下第一层)"
 msgid "One or more errors occured. The invalid fields are marked."
 msgstr "发生了错误,非法域已经被标记."
 
-#: ../templates/schema/schema.php:382
 #: ../templates/tree/templates/creation/custom.php:209
+#: ../templates/schema/schema.php:382
 msgid "Optional attributes"
 msgstr "可选属性"
 
@@ -4501,20 +4794,39 @@ msgstr "可选属性"
 msgid "Optional binary attributes"
 msgstr "可选二进制属性"
 
-#: ../templates/lists/changePassword.php:128
+#: ../templates/lists/changePassword.php:139
+#: ../lib/types/sudo.inc:83
+#: ../lib/modules/sudoRole.inc:83
+#: ../lib/modules/sudoRole.inc:112
+#: ../lib/modules/sudoRole.inc:164
+#: ../lib/modules/sudoRole.inc:178
+#: ../lib/modules/sudoRole.inc:202
+#: ../lib/modules/sudoRole.inc:420
+#: ../lib/modules/sudoRole.inc:723
 #: ../lib/modules/asteriskExtension.inc:106
+#: ../lib/modules/asteriskVoicemail.inc:102
+#: ../lib/modules/asteriskVoicemail.inc:113
+#: ../lib/modules/asteriskVoicemail.inc:138
+#: ../lib/modules/asteriskVoicemail.inc:186
+#: ../lib/modules/asteriskVoicemail.inc:257
+#: ../lib/modules/asteriskVoicemail.inc:379
 msgid "Options"
 msgstr "选项"
 
+#: ../lib/modules/asteriskVoicemail.inc:103
+msgid "Options for Asterisk voicemail account (e.g. sendvoicemail=yes)."
+msgstr "Asterisk语音邮件账号的选项(比如:sendvoicemail=yes)."
+
 #: ../templates/schema/schema.php:169
 msgid "Ordering"
 msgstr "排序"
 
 #: ../lib/modules/eduPerson.inc:111
 #: ../lib/modules/eduPerson.inc:180
-#: ../lib/modules/eduPerson.inc:212
-#: ../lib/modules/eduPerson.inc:351
-#: ../lib/modules/eduPerson.inc:686
+#: ../lib/modules/eduPerson.inc:201
+#: ../lib/modules/eduPerson.inc:218
+#: ../lib/modules/eduPerson.inc:357
+#: ../lib/modules/eduPerson.inc:695
 msgid "Organization"
 msgstr "组织"
 
@@ -4525,12 +4837,13 @@ msgstr "组织单元"
 #: ../lib/modules/eduPerson.inc:119
 #: ../lib/modules/eduPerson.inc:123
 #: ../lib/modules/eduPerson.inc:192
-#: ../lib/modules/eduPerson.inc:379
-#: ../lib/modules/eduPerson.inc:692
+#: ../lib/modules/eduPerson.inc:202
+#: ../lib/modules/eduPerson.inc:385
+#: ../lib/modules/eduPerson.inc:701
 msgid "Organizational units"
 msgstr "组织单元"
 
-#: ../lib/modules/eduPerson.inc:216
+#: ../lib/modules/eduPerson.inc:222
 msgid "Organizational units contains an invalid entry."
 msgstr "组织单元中有一个非法条目"
 
@@ -4538,18 +4851,25 @@ msgstr "组织单元中有一个非法条目"
 msgid "Other"
 msgstr "其它"
 
-#: ../lib/modules/customScripts.inc:392
+#: ../lib/modules/customScripts.inc:76
+#: ../lib/modules/customScripts.inc:88
+#: ../lib/modules/customScripts.inc:97
+msgid "Output may contain HTML"
+msgstr "输出可以包含HTML语句"
+
+#: ../lib/modules/customScripts.inc:416
 #, php-format
 msgid "Output of command \"%s\" with return code %s"
 msgstr "\"%s\"命令的输出和返回值%s"
 
 #: ../templates/config/confmain.php:437
+#: ../lib/types/gon.inc:94
 #: ../lib/modules/groupOfNames.inc:68
 #: ../lib/modules/groupOfNames.inc:97
-#: ../lib/modules/groupOfNames.inc:149
-#: ../lib/modules/groupOfNames.inc:167
-#: ../lib/modules/groupOfNames.inc:444
-#: ../lib/types/gon.inc:94
+#: ../lib/modules/groupOfNames.inc:113
+#: ../lib/modules/groupOfNames.inc:152
+#: ../lib/modules/groupOfNames.inc:170
+#: ../lib/modules/groupOfNames.inc:450
 msgid "Owner"
 msgstr "拥有者"
 
@@ -4563,24 +4883,24 @@ msgstr "P-节点 (0x02)"
 msgid "PC name"
 msgstr "PC机器名"
 
-#: ../templates/pdfedit/pdfmain.php:110
+#: ../templates/pdfedit/pdfmain.php:115
 #: ../lib/tools/pdfEdit.inc:44
 msgid "PDF editor"
 msgstr "PDF编辑器"
 
-#: ../lib/lists.inc:560
+#: ../lib/lists.inc:577
 msgid "PDF structure"
 msgstr "PDF架构"
 
-#: ../templates/pdfedit/pdfpage.php:95
+#: ../templates/pdfedit/pdfpage.php:90
+msgid "PDF structure name not valid"
+msgstr "PDF架构名无效"
+
+#: ../templates/pdfedit/pdfmain.php:119
 msgid "PDF structure was successfully saved."
 msgstr "PDF架构成功保存."
 
-#: ../templates/pdfedit/pdfpage.php:90
-msgid "PDF-structure name not valid"
-msgstr "PDF架构名无效"
-
-#: ../lib/modules/sambaSamAccount.inc:531
+#: ../lib/modules/sambaSamAccount.inc:533
 msgid "Pacific Time (US & Canada)"
 msgstr "太平洋时间(美国和加拿大)"
 
@@ -4593,62 +4913,80 @@ msgstr "如果数据包的接收者不在同一个网络,数据包将会发往
 msgid "Page header"
 msgstr "页首"
 
+#: ../lib/modules/asteriskVoicemail.inc:98
+#: ../lib/modules/asteriskVoicemail.inc:137
+#: ../lib/modules/asteriskVoicemail.inc:180
+#: ../lib/modules/asteriskVoicemail.inc:253
+#: ../lib/modules/asteriskVoicemail.inc:377
+msgid "Pager"
+msgstr "呼号"
+
+#: ../lib/modules/asteriskVoicemail.inc:99
+msgid "Pager number for Asterisk voicemail."
+msgstr "Asterisk语音邮件的呼号"
+
 #: ../templates/schema/schema.php:364
 msgid "Parent to"
 msgstr "继承于"
 
-#: ../templates/selfService/selfServiceLogin.php:212
-#: ../templates/lists/changePassword.php:198
-#: ../templates/login.php:253
-#: ../lib/modules.inc:1262
+#: ../templates/lists/changePassword.php:194
+#: ../templates/login.php:265
+#: ../templates/selfService/selfServiceLogin.php:214
+#: ../lib/modules/asteriskAccount.inc:91
+#: ../lib/modules/asteriskAccount.inc:156
 #: ../lib/modules/posixGroup.inc:195
 #: ../lib/modules/posixGroup.inc:465
-#: ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/sambaSamAccount.inc:398
 #: ../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
+#: ../lib/modules/posixAccount.inc:76
+#: ../lib/modules/posixAccount.inc:141
+#: ../lib/modules/posixAccount.inc:257
+#: ../lib/modules/posixAccount.inc:320
+#: ../lib/modules/posixAccount.inc:382
+#: ../lib/modules/posixAccount.inc:1004
+#: ../lib/modules/posixAccount.inc:1186
+#: ../lib/modules/asteriskVoicemail.inc:86
+#: ../lib/modules/asteriskVoicemail.inc:161
+#: ../lib/modules.inc:1288
 #: ../help/help.inc:164
 msgid "Password"
 msgstr "密码"
 
-#: ../lib/modules/sambaSamAccount.inc:268
-#: ../lib/modules/sambaSamAccount.inc:1109
+#: ../lib/modules/sambaSamAccount.inc:270
+#: ../lib/modules/sambaSamAccount.inc:1111
 msgid "Password change at next login"
 msgstr "下次登录时修改密码"
 
-#: ../lib/modules/ppolicy.inc:128
-#: ../lib/modules/ppolicy.inc:297
-#: ../lib/modules/ppolicy.inc:506
 #: ../lib/types/ppolicyType.inc:91
+#: ../lib/modules/ppolicy.inc:128
+#: ../lib/modules/ppolicy.inc:148
+#: ../lib/modules/ppolicy.inc:310
+#: ../lib/modules/ppolicy.inc:522
 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
+#: ../lib/modules/posixAccount.inc:76
+#: ../lib/modules/posixAccount.inc:77
 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:253
-#: ../lib/modules/sambaSamAccount.inc:256
-#: ../lib/modules/sambaSamAccount.inc:418
-#: ../lib/modules/sambaSamAccount.inc:1092
-#: ../lib/modules/sambaSamAccount.inc:1558
+#: ../lib/modules/sambaSamAccount.inc:255
+#: ../lib/modules/sambaSamAccount.inc:258
+#: ../lib/modules/sambaSamAccount.inc:420
+#: ../lib/modules/sambaSamAccount.inc:1094
+#: ../lib/modules/sambaSamAccount.inc:1560
 msgid "Password does not expire"
 msgstr "密码永不过期"
 
 #: ../lib/modules/shadowAccount.inc:61
 #: ../lib/modules/shadowAccount.inc:109
+#: ../lib/modules/shadowAccount.inc:168
 #: ../lib/modules/shadowAccount.inc:177
 #: ../lib/modules/shadowAccount.inc:207
 #: ../lib/modules/shadowAccount.inc:309
-#: ../lib/modules/shadowAccount.inc:419
+#: ../lib/modules/shadowAccount.inc:418
 msgid "Password expiration"
 msgstr "密码超期"
 
@@ -4657,45 +4995,54 @@ msgstr "密码超期"
 msgid "Password expiration must be are natural number or -1."
 msgstr "密码超期必须是自然数或-1."
 
-#: ../lib/modules/inetOrgPerson.inc:290
-#: ../lib/modules/inetOrgPerson.inc:671
+#: ../lib/modules/asteriskVoicemail.inc:87
+msgid "Password for voicemail mailbox."
+msgstr "语音邮箱的密码."
+
 #: ../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
+#: ../lib/modules/posixAccount.inc:145
+#: ../lib/modules/posixAccount.inc:180
+#: ../lib/modules/posixAccount.inc:337
+#: ../lib/modules/inetOrgPerson.inc:229
+#: ../lib/modules/inetOrgPerson.inc:595
 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:655
 #: ../lib/types/ppolicyType.inc:80
+#: ../lib/modules/ppolicy.inc:84
+#: ../lib/modules/ppolicy.inc:137
+#: ../lib/modules/ppolicy.inc:161
+#: ../lib/modules/ppolicy.inc:228
+#: ../lib/modules/ppolicy.inc:486
+#: ../lib/modules/sambaDomain.inc:98
+#: ../lib/modules/sambaDomain.inc:184
+#: ../lib/modules/sambaDomain.inc:279
+#: ../lib/modules/sambaDomain.inc:669
 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
+#: ../lib/modules/ppolicy.inc:159
+#: ../lib/modules/sambaDomain.inc:215
 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:65
+#: ../lib/modules/ppolicy.inc:160
+#: ../lib/modules/sambaDomain.inc:213
+msgid "Password maximum age must be bigger than password minimum age."
+msgstr "密码最长生命期必须大于最短生命期."
+
 #: ../lib/modules/shadowAccount.inc:57
 #: ../lib/modules/shadowAccount.inc:58
-#: ../lib/modules/sambaDomain.inc:201
+#: ../lib/modules/ppolicy.inc:158
+#: ../lib/modules/sambaDomain.inc:214
 msgid "Password minimum age must be are natural number."
 msgstr "密码最短生命期必须是自然数."
 
@@ -4707,27 +5054,30 @@ msgstr "密码策略"
 msgid "Password policies (ppolicy)"
 msgstr "密码策略"
 
-#: ../templates/config/mainmanage.php:214
-#: ../lib/modules/ppolicy.inc:54
+#: ../templates/config/mainmanage.php:219
 #: ../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
+#: ../lib/modules/ppolicyUser.inc:63
+#: ../lib/modules/ppolicyUser.inc:98
+#: ../lib/modules/ppolicyUser.inc:168
+#: ../lib/modules/ppolicyUser.inc:196
+#: ../lib/modules/ppolicy.inc:54
 #: ../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
+#: ../lib/modules/ppolicy.inc:88
+#: ../lib/modules/ppolicy.inc:138
+#: ../lib/modules/ppolicy.inc:237
+#: ../lib/modules/ppolicy.inc:496
 msgid "Password quality check"
 msgstr "密码质量检查"
 
 #: ../lib/modules/shadowAccount.inc:63
 #: ../lib/modules/shadowAccount.inc:104
+#: ../lib/modules/shadowAccount.inc:166
 #: ../lib/modules/shadowAccount.inc:173
 #: ../lib/modules/shadowAccount.inc:201
 #: ../lib/modules/shadowAccount.inc:303
@@ -4741,24 +5091,19 @@ msgid "Password warning must be are natural number."
 msgstr "密码提醒日期必须是自然数."
 
 #: ../templates/config/confmain.php:613
-#: ../lib/modules.inc:1324
+#: ../lib/modules.inc:1350
 msgid "Passwords are different!"
 msgstr "密码不同!"
 
-#: ../lib/modules/nisObject.inc:54
-#: ../lib/modules/nisObject.inc:74
-#: ../lib/modules/nisObject.inc:113
-#: ../lib/modules/nisObject.inc:129
-#: ../lib/modules/nisObject.inc:219
 #: ../lib/types/nisObjectType.inc:77
 msgid "Path"
 msgstr "路径"
 
-#: ../lib/modules/sambaSamAccount.inc:332
+#: ../lib/modules/sambaSamAccount.inc:334
 msgid "Path of the user profile."
 msgstr "用户配置文件所在路径。"
 
-#: ../lib/modules/sambaSamAccount.inc:283
+#: ../lib/modules/sambaSamAccount.inc:285
 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会被用户名和组名代替."
 
@@ -4775,21 +5120,21 @@ msgstr "DNS更新的KEY文件所有路径"
 msgid "Permanently delete all children, too?"
 msgstr "也要永久删除所有子集?"
 
-#: ../lib/modules/inetOrgPerson.inc:122
+#: ../lib/modules/inetOrgPerson.inc:93
 msgid "Personal"
 msgstr "个人信息"
 
-#: ../lib/modules/inetOrgPerson.inc:151
-#: ../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:219
+#: ../lib/modules/inetOrgPerson.inc:119
+#: ../lib/modules/inetOrgPerson.inc:1064
+#: ../lib/modules/inetOrgPerson.inc:1615
+#: ../lib/modules/inetOrgPerson.inc:1618
+#: ../lib/modules/inetOrgPerson.inc:1632
 msgid "Photo"
 msgstr "照片"
 
-#: ../lib/modules/inetOrgPerson.inc:1201
+#: ../lib/modules/inetOrgPerson.inc:1103
 msgid "Photo file (JPG format)"
 msgstr "照片文件(JPG格式)"
 
@@ -4797,11 +5142,15 @@ msgstr "照片文件(JPG格式)"
 msgid "Please a comma separated list of your public SSH keys."
 msgstr "您的公钥列表,以逗号分隔."
 
-#: ../lib/modules/asteriskExtension.inc:202
+#: ../lib/modules/customScripts.inc:77
+msgid "Please activate this option if your scripts may generate HTML output. Otherwise, the output is treated as plain text."
+msgstr "如果你的脚本中会生成HTML输出,请激活这个选项.如果不激活,输出为文本文件."
+
+#: ../lib/modules/asteriskExtension.inc:207
 msgid "Please add at least one member."
 msgstr "至少需要增加一个成员."
 
-#: ../lib/modules/sambaSamAccount.inc:1049
+#: ../lib/modules/sambaSamAccount.inc:1051
 msgid "Please check your settings on the Unix page!"
 msgstr "请在UNIX中检查设置"
 
@@ -4809,7 +5158,7 @@ msgstr "请在UNIX中检查设置"
 msgid "Please confirm:"
 msgstr "请确认:"
 
-#: ../lib/modules/phpGroupwareUser.inc:135
+#: ../lib/modules/phpGroupwareUser.inc:137
 msgid "Please enter \"active\" or \"inactive\"."
 msgstr "请输入 \"active\" 或 \"inactive\"."
 
@@ -4817,78 +5166,91 @@ msgstr "请输入 \"active\" 或 \"inactive\"."
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "请输入RID或特殊账号名!"
 
-#: ../lib/modules/asteriskAccount.inc:152
+#: ../lib/modules/asteriskAccount.inc:168
 msgid "Please enter a caller ID."
 msgstr "请输入一个拨号ID."
 
-#: ../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 "请输入允许用户登录的主机名(以逗号分隔).如果已经启用主机限制,\"*\"号代表所有主机,留空意味没有主机."
-
 #: ../lib/modules/sambaSamAccount.inc:90
 #: ../lib/modules/sambaSamAccount.inc:91
 msgid "Please enter a comma separated list of host names!"
 msgstr "请输入以逗号分隔的主机名!"
 
-#: ../lib/modules/asteriskExtension.inc:195
+#: ../lib/modules/asteriskExtension.inc:200
 msgid "Please enter a common name."
 msgstr "请输入一个一般命名!"
 
-#: ../lib/modules/groupOfNames.inc:120
+#: ../lib/modules/nisObject.inc:55
+#: ../lib/modules/sudoRole.inc:56
+msgid "Please enter a descriptive name for this entry."
+msgstr "输入此条目的描述"
+
+#: ../lib/modules/groupOfNames.inc:123
 msgid "Please enter a group name!"
 msgstr "请输入组名!"
 
-#: ../lib/modules/ppolicy.inc:153
+#: ../lib/modules/asteriskVoicemail.inc:205
+msgid "Please enter a mailbox."
+msgstr "请输入一个邮箱."
+
+#: ../lib/modules/ppolicy.inc:157
+msgid "Please enter a name for this policy."
+msgstr "请为这个密码策略输入一个名字."
+
+#: ../lib/modules/ppolicy.inc:166
 msgid "Please enter a numeric value for the expire warning."
 msgstr "请为过期告警输入一个数值。"
 
-#: ../lib/modules/ppolicy.inc:152
+#: ../lib/modules/ppolicy.inc:165
 msgid "Please enter a numeric value for the failure count interval."
 msgstr "请失败记录间隔输入一个数值。"
 
-#: ../lib/modules/ppolicy.inc:149
+#: ../lib/modules/ppolicy.inc:162
 msgid "Please enter a numeric value for the grace authentication limit."
 msgstr "请为缓期认证限制次数提供一个数值"
 
-#: ../lib/modules/ppolicy.inc:150
+#: ../lib/modules/ppolicy.inc:163
 msgid "Please enter a numeric value for the lockout duration."
 msgstr "请为锁定周期输入一个数值。"
 
-#: ../lib/modules/ppolicy.inc:151
+#: ../lib/modules/ppolicy.inc:164
 msgid "Please enter a numeric value for the maximum failure count."
 msgstr "请为最大失败次数记录输入一个数值"
 
-#: ../lib/modules/ppolicy.inc:154
+#: ../lib/modules/ppolicy.inc:167
 msgid "Please enter a numeric value for the minimum password length."
 msgstr "请为密码最小长度输入一个数值"
 
-#: ../lib/modules/ppolicy.inc:148
+#: ../lib/modules/ppolicy.inc:161
 msgid "Please enter a numeric value for the password history length."
 msgstr "请为密码历史长度输入一个数值"
 
+#: ../lib/modules/sudoRole.inc:237
+msgid "Please enter a role name."
+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
+#: ../lib/modules/kolabUser.inc:270
+#: ../lib/modules/kolabUser.inc:274
 msgid "Please enter a user password."
 msgstr "请输入用户密码."
 
-#: ../lib/modules/eduPerson.inc:212
-#: ../lib/modules/eduPerson.inc:214
+#: ../lib/modules/eduPerson.inc:218
+#: ../lib/modules/eduPerson.inc:220
 msgid "Please enter a valid DN in the field:"
 msgstr "请输入有效的DN!"
 
-#: ../lib/modules/inetOrgPerson.inc:104
-#: ../lib/modules/inetOrgPerson.inc:105
+#: ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/inetOrgPerson.inc:76
 msgid "Please enter a valid business category!"
 msgstr "请输入有效的商业种类!"
 
-#: ../lib/modules/inetOrgPerson.inc:97
-#: ../lib/modules/inetOrgPerson.inc:98
-#: ../lib/modules/posixAccount.inc:94
 #: ../lib/modules/posixAccount.inc:95
+#: ../lib/modules/posixAccount.inc:96
+#: ../lib/modules/inetOrgPerson.inc:68
+#: ../lib/modules/inetOrgPerson.inc:69
 msgid "Please enter a valid common name!"
 msgstr "请输入有效的全名!"
 
@@ -4905,85 +5267,118 @@ msgstr "请输入有效的显示名!"
 msgid "Please enter a valid drive letter."
 msgstr "请输入有效的盘符."
 
-#: ../lib/modules/inetOrgPerson.inc:85
-#: ../lib/modules/inetOrgPerson.inc:86
-msgid "Please enter a valid eMail address!"
+#: ../lib/modules/inetOrgPerson.inc:56
+#: ../lib/modules/inetOrgPerson.inc:57
+msgid "Please enter a valid email address!"
 msgstr "请输入有效的邮件地址!"
 
-#: ../lib/modules/inetOrgPerson.inc:95
-#: ../lib/modules/inetOrgPerson.inc:96
+#: ../lib/modules/inetOrgPerson.inc:66
+#: ../lib/modules/inetOrgPerson.inc:67
 msgid "Please enter a valid employee type!"
 msgstr "请输入有效的雇员类别!"
 
-#: ../lib/modules/inetOrgPerson.inc:83
-#: ../lib/modules/inetOrgPerson.inc:84
+#: ../lib/modules/inetOrgPerson.inc:54
+#: ../lib/modules/inetOrgPerson.inc:55
 msgid "Please enter a valid fax number!"
 msgstr "请输入有效的传真号!"
 
+#: ../lib/lists.inc:221
+msgid "Please enter a valid filter. Only letters, numbers and \" _*$.-\" are allowed."
+msgstr "请输入合法的过滤器.只允许字母,数字和 \" _*$.-\"."
+
 #: ../lib/modules/sambaSamAccount.inc:106
 msgid "Please enter a valid group name!"
 msgstr "请输入有效的组名!"
 
-#: ../lib/modules/inetOrgPerson.inc:93
-#: ../lib/modules/inetOrgPerson.inc:94
+#: ../lib/modules/inetOrgPerson.inc:64
+#: ../lib/modules/inetOrgPerson.inc:65
 msgid "Please enter a valid job title!"
 msgstr "请输入有效的头衔!"
 
-#: ../lib/modules/eduPerson.inc:220
+#: ../lib/modules/eduPerson.inc:226
 msgid "Please enter a valid list of affiliations."
 msgstr "请输入有效的联系列表."
 
-#: ../lib/modules/inetOrgPerson.inc:81
-#: ../lib/modules/inetOrgPerson.inc:82
+#: ../lib/modules/hostObject.inc:107
+msgid "Please enter a valid list of host names."
+msgstr "请输入有效的主机列表."
+
+#: ../lib/modules/inetOrgPerson.inc:52
+#: ../lib/modules/inetOrgPerson.inc:53
 msgid "Please enter a valid mobile number!"
 msgstr "请输入有效的手机号!"
 
-#: ../lib/modules/nisObject.inc:113
-#: ../lib/modules/nisObject.inc:114
-msgid "Please enter a valid path."
-msgstr "请输入有效的路径."
-
-#: ../lib/modules/inetOrgPerson.inc:89
-#: ../lib/modules/inetOrgPerson.inc:90
+#: ../lib/modules/inetOrgPerson.inc:60
+#: ../lib/modules/inetOrgPerson.inc:61
 msgid "Please enter a valid postal address!"
 msgstr "请输入有效的邮政地址."
 
-#: ../lib/modules/inetOrgPerson.inc:91
-#: ../lib/modules/inetOrgPerson.inc:92
+#: ../lib/modules/inetOrgPerson.inc:62
+#: ../lib/modules/inetOrgPerson.inc:63
 msgid "Please enter a valid postal code!"
 msgstr "请输入有效的邮政编码!"
 
-#: ../lib/modules/eduPerson.inc:218
+#: ../lib/modules/eduPerson.inc:224
 msgid "Please enter a valid primary affiliation."
 msgstr "请输入有效的主要联系."
 
-#: ../lib/modules/eduPerson.inc:219
+#: ../lib/modules/eduPerson.inc:225
 msgid "Please enter a valid scoped affiliation."
 msgstr "请输入有效的有限联系."
 
-#: ../lib/modules/inetOrgPerson.inc:87
-#: ../lib/modules/inetOrgPerson.inc:88
+#: ../lib/modules/inetOrgPerson.inc:58
+#: ../lib/modules/inetOrgPerson.inc:59
 msgid "Please enter a valid street name!"
 msgstr "请输入有效的街道名!"
 
-#: ../lib/modules/inetOrgPerson.inc:77
-#: ../lib/modules/inetOrgPerson.inc:78
-#: ../lib/modules/inetOrgPerson.inc:79
-#: ../lib/modules/inetOrgPerson.inc:80
+#: ../lib/modules/inetOrgPerson.inc:48
+#: ../lib/modules/inetOrgPerson.inc:49
+#: ../lib/modules/inetOrgPerson.inc:50
+#: ../lib/modules/inetOrgPerson.inc:51
 msgid "Please enter a valid telephone number!"
 msgstr "请输入有效的电话号码!"
 
 #: ../lib/modules/posixGroup.inc:572
-#: ../lib/modules/posixAccount.inc:777
+#: ../lib/modules/posixAccount.inc:742
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "请输入有效值(介于%s和%s之间)!"
 
-#: ../lib/modules/kolabUser.inc:272
+#: ../lib/modules/kolabUser.inc:278
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "请在本页面输入邮件地址:%s"
 
+#: ../lib/modules/sudoRole.inc:243
+#: ../lib/modules/sudoRole.inc:244
+msgid "Please enter only ASCII characters for the commands."
+msgstr "输入命令行只能使用ASCII字符."
+
+#: ../lib/modules/sudoRole.inc:241
+#: ../lib/modules/sudoRole.inc:242
+msgid "Please enter only ASCII characters for the host names."
+msgstr "输入主机名只能使用ASCII字符"
+
+#: ../lib/modules/sudoRole.inc:249
+#: ../lib/modules/sudoRole.inc:250
+msgid "Please enter only ASCII characters for the options."
+msgstr "这个选项只能使用ASCII字符."
+
+#: ../lib/modules/sudoRole.inc:247
+#: ../lib/modules/sudoRole.inc:248
+msgid "Please enter only ASCII characters for the run groups."
+msgstr "输入运行的组只能使用ASCII字符."
+
+#: ../lib/modules/sudoRole.inc:245
+#: ../lib/modules/sudoRole.inc:246
+msgid "Please enter only ASCII characters for the run users."
+msgstr "输入运行用户只能使用ASCII字符."
+
+#: ../lib/modules/sudoRole.inc:239
+#: ../lib/modules/sudoRole.inc:240
+msgid "Please enter only ASCII characters for the user names."
+msgstr "输入用户名只能使用ASCII字符."
+
 #: ../lib/modules/ddns.inc:97
 msgid "Please enter the IP address of your DNS server."
 msgstr "请输入DNS服务器IP地址"
@@ -4992,15 +5387,19 @@ 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:1174
+#: ../lib/modules/asteriskVoicemail.inc:209
+msgid "Please enter the account context."
+msgstr "请输入账号的语境. "
+
+#: ../lib/modules.inc:1201
 msgid "Please enter the account information on the other pages first."
 msgstr "请先在另一个页面输入帐号信息."
 
-#: ../lib/modules/asteriskExtension.inc:197
+#: ../lib/modules/asteriskExtension.inc:202
 msgid "Please enter the application data."
 msgstr "请输入应用数据."
 
-#: ../lib/modules/asteriskExtension.inc:196
+#: ../lib/modules/asteriskExtension.inc:201
 msgid "Please enter the application."
 msgstr "请输入应用名."
 
@@ -5008,16 +5407,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:198
-#: ../lib/modules/asteriskAccount.inc:156
+#: ../lib/modules/asteriskAccount.inc:172
+#: ../lib/modules/asteriskExtension.inc:203
 msgid "Please enter the extension context."
-msgstr "请输入扩展的上下文."
+msgstr "请输入扩展的语境."
 
-#: ../lib/modules/asteriskExtension.inc:199
+#: ../lib/modules/asteriskExtension.inc:204
 msgid "Please enter the extension name."
 msgstr "请输入扩展的名字."
 
-#: ../lib/modules/asteriskAccount.inc:159
+#: ../lib/modules/asteriskAccount.inc:175
 msgid "Please enter the host name."
 msgstr "请输入主机名."
 
@@ -5045,10 +5444,6 @@ msgstr "请输入本系统管理配置密码,不是LDAP密码,存在在config.cf
 msgid "Please enter the master password to change the general preferences:"
 msgstr "更改一般配置,请输入管理密码:"
 
-#: ../lib/modules/nisObject.inc:55
-msgid "Please enter the mount point for this entry (e.g. /home)."
-msgstr "请输入本条目的mount点(比如:/home)."
-
 #: ../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 "请输入新配置文件名和密码.配置文件名可以包含字符和-/_ ."
@@ -5057,8 +5452,8 @@ msgstr "请输入新配置文件名和密码.配置文件名可以包含字符
 msgid "Please enter the new name of the profile. The name may contain letters, numbers and -/_."
 msgstr "請輸入新的設定檔名稱.可以包含字母,數字和 -/_ ."
 
-#: ../lib/modules/posixAccount.inc:381
-#: ../lib/modules/asteriskAccount.inc:90
+#: ../lib/modules/asteriskAccount.inc:92
+#: ../lib/modules/posixAccount.inc:383
 msgid "Please enter the password which you want to set for this account."
 msgstr "请输入这个帐号的密码."
 
@@ -5066,11 +5461,11 @@ msgstr "请输入这个帐号的密码."
 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:352
+#: ../lib/modules/posixAccount.inc:354
 msgid "Please enter the path to the user's home directory."
 msgstr "请输入用户主目录路径."
 
-#: ../lib/modules/asteriskExtension.inc:200
+#: ../lib/modules/asteriskExtension.inc:205
 msgid "Please enter the priority."
 msgstr "请输入优先级."
 
@@ -5078,12 +5473,12 @@ msgstr "请输入优先级."
 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:254
-#: ../lib/modules/posixAccount.inc:74
+#: ../templates/lists/changePassword.php:256
+#: ../lib/modules/posixAccount.inc:75
 msgid "Please enter the same password in both password fields."
 msgstr "在两个密码输入框请输入相同的密码."
 
-#: ../lib/modules/sambaSamAccount.inc:344
+#: ../lib/modules/sambaSamAccount.inc:346
 msgid "Please enter the time limit in minutes. 0 means unlimited."
 msgstr "请输入时间限制（分钟）。0代表不限制。"
 
@@ -5104,11 +5499,7 @@ msgstr "请输入您的SSH公钥."
 msgid "Please fill out the DHCP settings first."
 msgstr "请先填写DHCP设置"
 
-#: ../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:208
+#: ../templates/masscreate.php:213
 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格式文件.第一行必须为栏目标识,以下每行表示一个帐号."
 
@@ -5116,7 +5507,7 @@ msgstr "请提供帐号数据CSV格式文件.第一行必须为栏目标识,以
 msgid "Please provide a file to upload."
 msgstr "请提供上传的文件。"
 
-#: ../lib/modules/inetOrgPerson.inc:632
+#: ../lib/modules/inetOrgPerson.inc:556
 msgid "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr "请选择图像文件上传,必须是JPG格式(.jpg/.jpeg)."
 
@@ -5124,17 +5515,21 @@ msgstr "请选择图像文件上传,必须是JPG格式(.jpg/.jpeg)."
 msgid "Please select your prefered log level. Messages with a lower level will not be logged."
 msgstr "请选择日志等级,在此等级以下的日志不会被记录."
 
-#: ../templates/login.php:223
+#: ../templates/login.php:235
 msgid "Please select your user name and enter your password to log in."
 msgstr "请输入用户名和密码登录."
 
-#: ../lib/modules.inc:1129
+#: ../lib/modules/asteriskVoicemail.inc:220
+msgid "Please set the voicemail password with \"Set password\" before saving."
+msgstr "在保存前请设置语音邮件的密码."
+
+#: ../lib/modules.inc:1156
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "请在页面%s上输入必须的属性."
 
-#: ../templates/selfService/profManage.php:125
 #: ../templates/config/profmanage.php:154
+#: ../templates/selfService/profManage.php:125
 msgid "Please set up your master configuration file (config/config.cfg) first!"
 msgstr "请先主配置文件(config/config.cfg)!"
 
@@ -5143,61 +5538,64 @@ msgstr "请先主配置文件(config/config.cfg)!"
 msgid "Please set your LDAP suffix to an LDAP entry with object class \"dhcpServer\"."
 msgstr "请在您的LDAP后缀中设置一个含对象类\"dhcpServer\"."
 
-#: ../lib/modules/kolabUser.inc:236
+#: ../lib/modules/kolabUser.inc:242
 msgid "Policy list has invalid format!"
 msgstr "策略列表含有非法格式!"
 
-#: ../templates/pdfedit/pdfpage.php:557
-#: ../templates/pdfedit/pdfpage.php:574
-#: ../templates/pdfedit/pdfpage.php:602
-#: ../templates/pdfedit/pdfpage.php:645
+#: ../templates/pdfedit/pdfpage.php:573
+#: ../templates/pdfedit/pdfpage.php:590
+#: ../templates/pdfedit/pdfpage.php:618
+#: ../templates/pdfedit/pdfpage.php:656
 msgid "Position"
 msgstr "位置"
 
-#: ../templates/masscreate.php:256
-#: ../templates/masscreate.php:400
+#: ../templates/masscreate.php:261
+#: ../templates/masscreate.php:405
+#: ../lib/modules/customScripts.inc:112
+#: ../lib/modules/customScripts.inc:114
+#: ../lib/modules/customScripts.inc:116
 #: ../lib/modules/sambaGroupMapping.inc:440
-#: ../lib/modules/customScripts.inc:102
-#: ../lib/modules/customScripts.inc:104
-#: ../lib/modules/customScripts.inc:106
 msgid "Possible values"
 msgstr "可能的值"
 
-#: ../lib/modules/inetOrgPerson.inc:151
-#: ../lib/modules/inetOrgPerson.inc:221
-#: ../lib/modules/inetOrgPerson.inc:382
-#: ../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
+#: ../lib/modules/inetOrgPerson.inc:119
+#: ../lib/modules/inetOrgPerson.inc:187
+#: ../lib/modules/inetOrgPerson.inc:322
+#: ../lib/modules/inetOrgPerson.inc:427
+#: ../lib/modules/inetOrgPerson.inc:519
+#: ../lib/modules/inetOrgPerson.inc:520
+#: ../lib/modules/inetOrgPerson.inc:874
+#: ../lib/modules/inetOrgPerson.inc:1129
+#: ../lib/modules/inetOrgPerson.inc:1555
 msgid "Post office box"
 msgstr "邮政信箱"
 
-#: ../lib/modules/inetOrgPerson.inc:89
-#: ../lib/modules/inetOrgPerson.inc:150
-#: ../lib/modules/inetOrgPerson.inc:235
-#: ../lib/modules/inetOrgPerson.inc:374
-#: ../lib/modules/inetOrgPerson.inc:599
-#: ../lib/modules/inetOrgPerson.inc:1000
-#: ../lib/modules/inetOrgPerson.inc:1230
-#: ../lib/modules/inetOrgPerson.inc:1649
+#: ../lib/modules/inetOrgPerson.inc:60
+#: ../lib/modules/inetOrgPerson.inc:118
+#: ../lib/modules/inetOrgPerson.inc:195
+#: ../lib/modules/inetOrgPerson.inc:314
+#: ../lib/modules/inetOrgPerson.inc:439
+#: ../lib/modules/inetOrgPerson.inc:527
+#: ../lib/modules/inetOrgPerson.inc:910
+#: ../lib/modules/inetOrgPerson.inc:1131
+#: ../lib/modules/inetOrgPerson.inc:1539
 msgid "Postal address"
 msgstr "邮政地址"
 
-#: ../lib/modules/inetOrgPerson.inc:600
+#: ../lib/modules/inetOrgPerson.inc:528
 msgid "Postal address, city"
 msgstr "邮政地址,城市"
 
-#: ../lib/modules/inetOrgPerson.inc:91
-#: ../lib/modules/inetOrgPerson.inc:151
-#: ../lib/modules/inetOrgPerson.inc:225
-#: ../lib/modules/inetOrgPerson.inc:366
-#: ../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
+#: ../lib/modules/inetOrgPerson.inc:62
+#: ../lib/modules/inetOrgPerson.inc:119
+#: ../lib/modules/inetOrgPerson.inc:189
+#: ../lib/modules/inetOrgPerson.inc:306
+#: ../lib/modules/inetOrgPerson.inc:430
+#: ../lib/modules/inetOrgPerson.inc:523
+#: ../lib/modules/inetOrgPerson.inc:524
+#: ../lib/modules/inetOrgPerson.inc:883
+#: ../lib/modules/inetOrgPerson.inc:1130
+#: ../lib/modules/inetOrgPerson.inc:1547
 msgid "Postal code"
 msgstr "邮政编码"
 
@@ -5205,77 +5603,82 @@ msgstr "邮政编码"
 msgid "Predefined values"
 msgstr "预订值"
 
-#: ../lib/modules/inetOrgPerson.inc:328
+#: ../lib/modules/inetOrgPerson.inc:268
 msgid "President"
 msgstr "总裁"
 
 #: ../lib/modules/eduPerson.inc:78
 #: ../lib/modules/eduPerson.inc:148
-#: ../lib/modules/eduPerson.inc:247
-#: ../lib/modules/eduPerson.inc:665
+#: ../lib/modules/eduPerson.inc:203
+#: ../lib/modules/eduPerson.inc:253
+#: ../lib/modules/eduPerson.inc:674
 msgid "Primary affiliation"
 msgstr "主要联系"
 
 #: ../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:222
+#: ../lib/modules/posixAccount.inc:296
+#: ../lib/modules/posixAccount.inc:315
+#: ../lib/modules/posixAccount.inc:345
+#: ../lib/modules/posixAccount.inc:374
+#: ../lib/modules/posixAccount.inc:412
 #: ../lib/modules/posixAccount.inc:960
-#: ../lib/modules/posixAccount.inc:1091
-#: ../lib/modules/posixAccount.inc:1131
-#: ../lib/modules/posixAccount.inc:1181
+#: ../lib/modules/posixAccount.inc:1090
+#: ../lib/modules/posixAccount.inc:1130
+#: ../lib/modules/posixAccount.inc:1180
 msgid "Primary group"
 msgstr "主要组"
 
 #: ../lib/modules/eduPerson.inc:115
 #: ../lib/modules/eduPerson.inc:186
-#: ../lib/modules/eduPerson.inc:214
-#: ../lib/modules/eduPerson.inc:361
-#: ../lib/modules/eduPerson.inc:689
+#: ../lib/modules/eduPerson.inc:206
+#: ../lib/modules/eduPerson.inc:220
+#: ../lib/modules/eduPerson.inc:367
+#: ../lib/modules/eduPerson.inc:698
 msgid "Primary organizational unit"
 msgstr "主要组织单元"
 
 #: ../lib/modules/eduPerson.inc:99
 #: ../lib/modules/eduPerson.inc:141
-#: ../lib/modules/eduPerson.inc:237
-#: ../lib/modules/eduPerson.inc:671
+#: ../lib/modules/eduPerson.inc:204
+#: ../lib/modules/eduPerson.inc:243
+#: ../lib/modules/eduPerson.inc:680
 msgid "Principal name"
 msgstr "主要的名字"
 
-#: ../lib/modules/eduPerson.inc:210
-#: ../lib/modules/eduPerson.inc:211
+#: ../lib/modules/eduPerson.inc:216
+#: ../lib/modules/eduPerson.inc:217
 msgid "Principal name is invalid!"
 msgstr "主要的名字非法!"
 
+#: ../lib/types/asteriskExt.inc:93
 #: ../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
+#: ../lib/modules/asteriskExtension.inc:135
+#: ../lib/modules/asteriskExtension.inc:151
+#: ../lib/modules/asteriskExtension.inc:231
+#: ../lib/modules/asteriskExtension.inc:472
 msgid "Priority"
 msgstr "优先级"
 
-#: ../lib/modules/inetOrgPerson.inc:636
+#: ../lib/modules/inetOrgPerson.inc:560
 msgid "Private telephone number"
 msgstr "个人电话号码"
 
-#: ../templates/selfService/profManage.php:108
 #: ../templates/config/profmanage.php:116
+#: ../templates/selfService/profManage.php:108
 msgid "Profile deleted."
 msgstr "配置文件被删除."
 
-#: ../templates/profedit/profilemain.php:98
+#: ../templates/profedit/profilemain.php:105
 #: ../lib/tools/profileEditor.inc:44
 msgid "Profile editor"
 msgstr "配置文件编辑器"
 
-#: ../templates/selfService/profManage.php:38
-#: ../templates/selfService/profManage.php:138
 #: ../templates/config/profmanage.php:52
 #: ../templates/config/profmanage.php:167
+#: ../templates/selfService/profManage.php:38
+#: ../templates/selfService/profManage.php:138
 #: ../help/help.inc:121
 #: ../help/help.inc:123
 #: ../help/help.inc:125
@@ -5284,19 +5687,19 @@ msgstr "配置文件编辑器"
 msgid "Profile management"
 msgstr "配置文件管理"
 
-#: ../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
+#: ../templates/selfService/profManage.php:153
+#: ../templates/selfService/profManage.php:206
+#: ../templates/profedit/profilepage.php:245
 #: ../help/help.inc:154
 msgid "Profile name"
 msgstr "配置文件名"
 
-#: ../templates/selfService/profManage.php:84
-#: ../templates/selfService/profManage.php:99
 #: ../templates/config/profmanage.php:100
 #: ../templates/config/profmanage.php:111
+#: ../templates/selfService/profManage.php:84
+#: ../templates/selfService/profManage.php:99
 msgid "Profile name is invalid!"
 msgstr "配置文件名非法!"
 
@@ -5312,15 +5715,17 @@ msgstr "配置文件密码不同或为空!"
 
 #: ../lib/modules/sambaSamAccount.inc:84
 #: ../lib/modules/sambaSamAccount.inc:85
-#: ../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
+#: ../lib/modules/sambaSamAccount.inc:200
+#: ../lib/modules/sambaSamAccount.inc:212
+#: ../lib/modules/sambaSamAccount.inc:284
+#: ../lib/modules/sambaSamAccount.inc:333
+#: ../lib/modules/sambaSamAccount.inc:475
+#: ../lib/modules/sambaSamAccount.inc:580
+#: ../lib/modules/sambaSamAccount.inc:1173
+#: ../lib/modules/sambaSamAccount.inc:1446
+#: ../lib/modules/sambaSamAccount.inc:1596
+#: ../lib/modules/sambaSamAccount.inc:1775
+#: ../lib/modules/sambaSamAccount.inc:1797
 msgid "Profile path"
 msgstr "配置文件路径"
 
@@ -5329,21 +5734,22 @@ msgstr "配置文件路径"
 msgid "Profile path is invalid!"
 msgstr "配置文件路径非法!"
 
-#: ../templates/profedit/profilepage.php:122
+#: ../templates/profedit/profilemain.php:108
 msgid "Profile was saved."
 msgstr "配置文件已保存."
 
-#: ../lib/modules/quota.inc:77
+#: ../lib/modules/quota.inc:79
+#: ../lib/modules/quota.inc:92
 #: ../lib/modules/quota.inc:145
 msgid "Quota"
 msgstr "配额"
 
-#: ../lib/modules/quota.inc:638
+#: ../lib/modules/quota.inc:655
 #, php-format
 msgid "Quota for %s on %s"
 msgstr "%s 在 %s 的硬盘配额:"
 
-#: ../lib/modules/quota.inc:60
+#: ../lib/modules/quota.inc:62
 msgid "Quota has wrong format!"
 msgstr "磁盘配额格式错误!"
 
@@ -5351,9 +5757,9 @@ msgstr "磁盘配额格式错误!"
 msgid "RDN"
 msgstr "RDN"
 
-#: ../templates/masscreate.php:249
-#: ../templates/profedit/profilepage.php:201
-#: ../lib/modules.inc:1548
+#: ../templates/masscreate.php:254
+#: ../templates/profedit/profilepage.php:199
+#: ../lib/modules.inc:1568
 #: ../help/help.inc:152
 msgid "RDN identifier"
 msgstr "RDN标志"
@@ -5364,9 +5770,10 @@ msgstr "RID (Windows UID)"
 
 #: ../lib/modules/sambaDomain.inc:90
 #: ../lib/modules/sambaDomain.inc:151
-#: ../lib/modules/sambaDomain.inc:376
-#: ../lib/modules/sambaDomain.inc:382
-#: ../lib/modules/sambaDomain.inc:649
+#: ../lib/modules/sambaDomain.inc:182
+#: ../lib/modules/sambaDomain.inc:389
+#: ../lib/modules/sambaDomain.inc:395
+#: ../lib/modules/sambaDomain.inc:663
 msgid "RID base"
 msgstr "RID 基类"
 
@@ -5381,6 +5788,7 @@ msgid "Range to"
 msgstr "范围到"
 
 #: ../lib/modules/range.inc:60
+#: ../lib/modules/range.inc:92
 #: ../lib/modules/range.inc:474
 msgid "Ranges"
 msgstr "范围"
@@ -5398,25 +5806,32 @@ msgstr "只读"
 msgid "Really create this new OU?"
 msgstr "确认增加新的OU?"
 
-#: ../templates/tree/edit.php:530
+#: ../templates/tree/edit.php:527
 msgid "Really delete attribute?"
 msgstr "确定删除属性?"
 
 #: ../lib/modules/nisMailAlias.inc:71
-#: ../lib/modules/nisMailAlias.inc:146
+#: ../lib/modules/nisMailAlias.inc:147
 msgid "Recipient"
 msgstr "收件人"
 
+#: ../lib/modules/nisMailAlias.inc:108
+#: ../lib/modules/nisMailAlias.inc:109
+msgid "Recipient is invalid!"
+msgstr "接收者非法!"
+
+#: ../lib/types/mailAlias.inc:92
 #: ../lib/modules/nisMailAlias.inc:75
 #: ../lib/modules/nisMailAlias.inc:89
-#: ../lib/modules/nisMailAlias.inc:281
-#: ../lib/types/mailAlias.inc:92
+#: ../lib/modules/nisMailAlias.inc:97
+#: ../lib/modules/nisMailAlias.inc:282
 msgid "Recipient list"
 msgstr "收件人列表"
 
-#: ../lib/modules/sambaSamAccount.inc:361
-#: ../lib/modules/sambaSamAccount.inc:1519
-#: ../lib/modules/sambaSamAccount.inc:1847
+#: ../lib/modules/sambaSamAccount.inc:224
+#: ../lib/modules/sambaSamAccount.inc:363
+#: ../lib/modules/sambaSamAccount.inc:1521
+#: ../lib/modules/sambaSamAccount.inc:1849
 msgid "Reconnect if disconnected"
 msgstr "如果中断重新连接"
 
@@ -5424,12 +5839,12 @@ msgstr "如果中断重新连接"
 msgid "Recursive delete progress"
 msgstr "递归删除过程"
 
-#: ../templates/config/mainmanage.php:357
+#: ../templates/config/mainmanage.php:362
 msgid "Reenter new master password"
 msgstr "请重新输入管理密码"
 
 #: ../templates/config/confmain.php:525
-#: ../lib/modules/posixAccount.inc:1708
+#: ../lib/modules/posixAccount.inc:1710
 msgid "Reenter password"
 msgstr "再次输入密码"
 
@@ -5438,11 +5853,11 @@ msgstr "再次输入密码"
 msgid "Reenter profile password"
 msgstr "再次输入配置文件密码"
 
-#: ../templates/tree/edit.php:101
-#: ../lib/modules/asteriskExtension.inc:297
-#: ../lib/lists.inc:268
+#: ../templates/tree/edit.php:98
 #: ../lib/tree.inc:88
 #: ../lib/tree.inc:89
+#: ../lib/modules/asteriskExtension.inc:303
+#: ../lib/lists.inc:273
 msgid "Refresh"
 msgstr "刷新"
 
@@ -5454,33 +5869,44 @@ msgstr "如果冲突会被拒绝"
 msgid "Relative distinguished name"
 msgstr "相对区别名称(RDN)"
 
-#: ../templates/pdfedit/pdfpage.php:415
-#: ../templates/config/confmodules.php:273
-#: ../lib/modules/nisMailAlias.inc:148
+#: ../templates/config/confmodules.php:278
+#: ../templates/pdfedit/pdfpage.php:439
+#: ../lib/modules/ipHost.inc:127
 #: ../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:895
-#: ../lib/modules/ldapPublicKey.inc:98
-#: ../lib/modules/inetLocalMailRecipient.inc:160
-#: ../lib/modules/sambaSamAccount.inc:1401
+#: ../lib/modules/sambaSamAccount.inc:1403
+#: ../lib/modules/kolabUser.inc:338
+#: ../lib/modules/kolabUser.inc:357
+#: ../lib/modules/kolabUser.inc:383
+#: ../lib/modules/kolabUser.inc:901
+#: ../lib/modules/phpGroupwareUser.inc:260
 #: ../lib/modules/shadowAccount.inc:401
-#: ../lib/modules/phpGroupwareUser.inc:258
+#: ../lib/modules/ldapPublicKey.inc:101
+#: ../lib/modules/sudoRole.inc:287
+#: ../lib/modules/sudoRole.inc:314
+#: ../lib/modules/sudoRole.inc:341
+#: ../lib/modules/sudoRole.inc:368
+#: ../lib/modules/sudoRole.inc:395
+#: ../lib/modules/sudoRole.inc:422
+#: ../lib/modules/inetLocalMailRecipient.inc:162
+#: ../lib/modules/groupOfNames.inc:161
+#: ../lib/modules/nisMailAlias.inc:149
+#: ../lib/modules/hostObject.inc:145
 msgid "Remove"
 msgstr "删除"
 
-#: ../lib/modules/eduPerson.inc:396
+#: ../lib/modules/asteriskVoicemail.inc:266
+msgid "Remove Asterisk voicemail extension"
+msgstr "删除Asterisk语音邮件扩展"
+
+#: ../lib/modules/eduPerson.inc:402
 msgid "Remove EDU person extension"
 msgstr "删除EDU用户扩展"
 
-#: ../lib/modules/ipHost.inc:175
+#: ../lib/modules/ipHost.inc:180
 msgid "Remove IP address extension"
 msgstr "删除 IP 地址扩展"
 
-#: ../lib/modules/sambaSamAccount.inc:1261
+#: ../lib/modules/sambaSamAccount.inc:1263
 msgid "Remove Samba 3 extension"
 msgstr "删除 Samba 3 扩展"
 
@@ -5488,92 +5914,99 @@ msgstr "删除 Samba 3 扩展"
 msgid "Remove Shadow account extension"
 msgstr "删除 Shadow 帐号扩展"
 
+#: ../lib/modules/hostObject.inc:160
+msgid "Remove host extension"
+msgstr "删除主机扩展"
+
 #: ../lib/modules/posixGroup.inc:199
-#: ../lib/modules/posixAccount.inc:1009
+#: ../lib/modules/posixAccount.inc:1008
 msgid "Remove password"
 msgstr "删除密码"
 
 #: ../lib/modules/phpGroupwareGroup.inc:101
-#: ../lib/modules/phpGroupwareUser.inc:189
+#: ../lib/modules/phpGroupwareUser.inc:191
 msgid "Remove phpGroupWare extension"
 msgstr "删除 phpGroupWare 扩展"
 
-#: ../lib/modules/groupOfNames.inc:320
+#: ../lib/modules/groupOfNames.inc:326
 msgid "Remove selected entries"
 msgstr "删除所选条目"
 
-#: ../templates/config/conftypes.php:235
+#: ../templates/config/conftypes.php:238
 msgid "Remove this account type"
 msgstr "删除这个帐号类型"
 
-#: ../lib/modules/inetOrgPerson.inc:1733
+#: ../lib/modules/inetOrgPerson.inc:1623
 msgid "Remove/replace photo"
 msgstr "删除/更改照片"
 
-#: ../templates/selfService/profManage.php:197
 #: ../templates/config/profmanage.php:227
+#: ../templates/selfService/profManage.php:202
 #: ../help/help.inc:123
 msgid "Rename profile"
 msgstr "配置文件重命名"
 
-#: ../templates/selfService/profManage.php:95
 #: ../templates/config/profmanage.php:107
+#: ../templates/selfService/profManage.php:95
 msgid "Renamed profile."
 msgstr "已更名的配置文件."
 
-#: ../templates/lists/changePassword.php:206
-#: ../lib/modules.inc:1285
+#: ../templates/lists/changePassword.php:202
+#: ../lib/modules.inc:1311
 msgid "Repeat password"
 msgstr "确认密码"
 
-#: ../lib/modules/posixAccount.inc:66
-#: ../lib/modules/posixAccount.inc:800
+#: ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixAccount.inc:765
 msgid "Replaced $user or $group in homedir."
 msgstr "在homedir中已更改$user和$group. "
 
-#: ../lib/modules/ppolicy.inc:120
-#: ../lib/modules/ppolicy.inc:279
-#: ../lib/modules/ppolicy.inc:496
 #: ../lib/types/ppolicyType.inc:89
+#: ../lib/modules/ppolicy.inc:120
+#: ../lib/modules/ppolicy.inc:146
+#: ../lib/modules/ppolicy.inc:292
+#: ../lib/modules/ppolicy.inc:512
 msgid "Require password change on first login"
 msgstr "第一次登录时需要修改密码"
 
-#: ../templates/tree/edit.php:249
+#: ../templates/tree/edit.php:246
 #, php-format
 msgid "Required attribute for objectClass(es) %s"
 msgstr "%s 对象类的必选属性"
 
-#: ../templates/schema/schema.php:381
 #: ../templates/tree/templates/creation/custom.php:187
+#: ../templates/schema/schema.php:381
 msgid "Required attributes"
 msgstr "必选属性"
 
-#: ../templates/profedit/profilepage.php:255
-#: ../lib/modules/sambaSamAccount.inc:1253
+#: ../templates/profedit/profilepage.php:257
+#: ../lib/modules/sambaSamAccount.inc:1255
 msgid "Reset"
 msgstr "复位"
 
-#: ../lib/modules.inc:1361
+#: ../lib/modules.inc:1387
 msgid "Reset changes"
 msgstr "复位设定"
 
-#: ../lib/modules/sambaSamAccount.inc:238
-#: ../lib/modules/sambaSamAccount.inc:1252
+#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:1254
 msgid "Reset password"
 msgstr "复位密码"
 
 #: ../lib/modules/sambaDomain.inc:130
-#: ../lib/modules/sambaDomain.inc:204
-#: ../lib/modules/sambaDomain.inc:346
-#: ../lib/modules/sambaDomain.inc:685
+#: ../lib/modules/sambaDomain.inc:192
+#: ../lib/modules/sambaDomain.inc:217
+#: ../lib/modules/sambaDomain.inc:359
+#: ../lib/modules/sambaDomain.inc:699
 msgid "Reset time after lockout"
 msgstr "在锁定后复位时间"
 
-#: ../lib/modules/sambaDomain.inc:204
+#: ../lib/modules/sambaDomain.inc:217
 msgid "Reset time after lockout must be are natural number."
 msgstr "锁定帐号后复位时间必须是自然数."
 
 #: ../lib/modules/ddns.inc:102
+#: ../lib/modules/ddns.inc:109
 #: ../lib/modules/ddns.inc:130
 #: ../lib/modules/ddns.inc:384
 #: ../lib/modules/ddns.inc:413
@@ -5585,32 +6018,71 @@ msgstr "反向域名"
 msgid "Rights for the home directory"
 msgstr "个人目录的权限"
 
-#: ../lib/modules/inetOrgPerson.inc:152
-#: ../lib/modules/inetOrgPerson.inc:241
-#: ../lib/modules/inetOrgPerson.inc:430
-#: ../lib/modules/inetOrgPerson.inc:639
-#: ../lib/modules/inetOrgPerson.inc:1018
-#: ../lib/modules/inetOrgPerson.inc:1237
-#: ../lib/modules/inetOrgPerson.inc:1673
+#: ../lib/types/sudo.inc:77
+#: ../lib/modules/sudoRole.inc:55
+#: ../lib/modules/sudoRole.inc:121
+#: ../lib/modules/sudoRole.inc:171
+#: ../lib/modules/sudoRole.inc:264
+#: ../lib/modules/sudoRole.inc:703
+msgid "Role name"
+msgstr "角色名"
+
+#: ../lib/modules/inetOrgPerson.inc:120
+#: ../lib/modules/inetOrgPerson.inc:199
+#: ../lib/modules/inetOrgPerson.inc:370
+#: ../lib/modules/inetOrgPerson.inc:445
+#: ../lib/modules/inetOrgPerson.inc:563
+#: ../lib/modules/inetOrgPerson.inc:928
+#: ../lib/modules/inetOrgPerson.inc:1138
+#: ../lib/modules/inetOrgPerson.inc:1563
 msgid "Room number"
 msgstr "房间号"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:61
 #: ../lib/modules/inetLocalMailRecipient.inc:96
-#: ../lib/modules/inetLocalMailRecipient.inc:143
-#: ../lib/modules/inetLocalMailRecipient.inc:314
+#: ../lib/modules/inetLocalMailRecipient.inc:115
+#: ../lib/modules/inetLocalMailRecipient.inc:145
+#: ../lib/modules/inetLocalMailRecipient.inc:316
 msgid "Routing address"
 msgstr "邮寄地址"
 
+#: ../lib/types/sudo.inc:82
+msgid "Run group(s)"
+msgstr "运行组"
+
+#: ../lib/modules/sudoRole.inc:79
+#: ../lib/modules/sudoRole.inc:107
+#: ../lib/modules/sudoRole.inc:158
+#: ../lib/modules/sudoRole.inc:177
+#: ../lib/modules/sudoRole.inc:198
+#: ../lib/modules/sudoRole.inc:393
+#: ../lib/modules/sudoRole.inc:720
+msgid "Run groups"
+msgstr "运行组"
+
+#: ../lib/types/sudo.inc:81
+msgid "Run user"
+msgstr "运行用户"
+
+#: ../lib/modules/sudoRole.inc:75
+#: ../lib/modules/sudoRole.inc:102
+#: ../lib/modules/sudoRole.inc:152
+#: ../lib/modules/sudoRole.inc:176
+#: ../lib/modules/sudoRole.inc:194
+#: ../lib/modules/sudoRole.inc:366
+#: ../lib/modules/sudoRole.inc:717
+msgid "Run users"
+msgstr "运行用户"
+
 #: ../templates/serverInfo.php:112
 msgid "SASL mechanisms"
 msgstr "SASL机制"
 
-#: ../templates/tests/lamdaemonTest.php:271
+#: ../templates/tests/lamdaemonTest.php:226
 msgid "SSH connection"
 msgstr "SSH连接"
 
-#: ../templates/tests/lamdaemonTest.php:282
+#: ../templates/tests/lamdaemonTest.php:237
 msgid "SSH connection could be established."
 msgstr "SSH连接可以建立."
 
@@ -5618,29 +6090,22 @@ msgstr "SSH连接可以建立."
 #: ../lib/modules/ldapPublicKey.inc:62
 #: ../lib/modules/ldapPublicKey.inc:66
 #: ../lib/modules/ldapPublicKey.inc:74
-#: ../lib/modules/ldapPublicKey.inc:96
+#: ../lib/modules/ldapPublicKey.inc:99
 msgid "SSH public key"
 msgstr "SSH公钥"
 
-#: ../lib/modules/ldapPublicKey.inc:168
+#: ../lib/modules/ldapPublicKey.inc:81
+#: ../lib/modules/ldapPublicKey.inc:172
 msgid "SSH public key(s)"
 msgstr "SSH 公钥"
 
-#: ../templates/tests/lamdaemonTest.php:254
-msgid "SSH2 module"
-msgstr "SSH2模块"
-
-#: ../templates/tests/lamdaemonTest.php:257
-msgid "SSH2 module is installed."
-msgstr "SSH2模块已安装."
-
-#: ../lib/modules/sambaGroupMapping.inc:300
 #: ../lib/modules/sambaSamAccount.inc:124
+#: ../lib/modules/sambaGroupMapping.inc:300
 msgid "Samba 3"
 msgstr "Samba 3"
 
-#: ../lib/modules/sambaDomain.inc:190
-#: ../lib/modules/sambaDomain.inc:191
+#: ../lib/modules/sambaDomain.inc:203
+#: ../lib/modules/sambaDomain.inc:204
 msgid "Samba 3 domain SID is invalid!"
 msgstr "Samba 3 域SID非法!"
 
@@ -5648,10 +6113,10 @@ msgstr "Samba 3 域SID非法!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 域条目"
 
-#: ../lib/modules/sambaSamAccount.inc:303
-#: ../lib/modules/sambaSamAccount.inc:307
-#: ../lib/modules/sambaSamAccount.inc:448
-#: ../lib/modules/sambaSamAccount.inc:514
+#: ../lib/modules/sambaSamAccount.inc:305
+#: ../lib/modules/sambaSamAccount.inc:309
+#: ../lib/modules/sambaSamAccount.inc:450
+#: ../lib/modules/sambaSamAccount.inc:516
 msgid "Samba RID"
 msgstr "Samba RID"
 
@@ -5676,42 +6141,44 @@ msgstr "Samba 域名"
 msgid "Samba domains"
 msgstr "Samba 域"
 
+#: ../lib/modules/sambaGroupMapping.inc:312
 #: ../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:235
+#: ../lib/modules/sambaSamAccount.inc:237
 msgid "Samba password"
 msgstr "Samba密码"
 
 #: ../lib/modules/sambaSamAccount.inc:90
-#: ../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
+#: ../lib/modules/sambaSamAccount.inc:206
+#: ../lib/modules/sambaSamAccount.inc:290
+#: ../lib/modules/sambaSamAccount.inc:293
+#: ../lib/modules/sambaSamAccount.inc:491
+#: ../lib/modules/sambaSamAccount.inc:587
+#: ../lib/modules/sambaSamAccount.inc:1189
+#: ../lib/modules/sambaSamAccount.inc:1612
+#: ../lib/modules/sambaSamAccount.inc:1778
 msgid "Samba workstations"
 msgstr "Samba工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:1318
+#: ../lib/modules/sambaSamAccount.inc:1320
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../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/tree/edit.php:512
 #: ../templates/config/confmodules.php:174
+#: ../templates/config/confmain.php:207
 #: ../templates/config/moduleSettings.php:173
-#: ../lib/modules.inc:1358
+#: ../templates/config/conftypes.php:192
+#: ../templates/selfService/selfServiceMain.php:119
+#: ../templates/selfService/adminMain.php:296
+#: ../templates/pdfedit/pdfpage.php:669
+#: ../templates/pdfedit/pdfpage.php:686
+#: ../templates/profedit/profilepage.php:255
+#: ../lib/modules.inc:1384
 msgid "Save"
 msgstr "保存"
 
@@ -5727,20 +6194,16 @@ msgstr "Schema浏览器"
 msgid "Schema suffix"
 msgstr "Schema 后缀"
 
-#: ../templates/tests/index.php:53
 #: ../templates/tests/schemaTest.php:50
+#: ../templates/tests/index.php:53
 msgid "Schema test"
 msgstr "Schema测试"
 
-#: ../templates/pdfedit/pdfdelete.php:60
-#: ../templates/pdfedit/pdfdelete.php:63
-msgid "Scope"
-msgstr "范围"
-
 #: ../lib/modules/eduPerson.inc:82
 #: ../lib/modules/eduPerson.inc:155
-#: ../lib/modules/eduPerson.inc:260
-#: ../lib/modules/eduPerson.inc:668
+#: ../lib/modules/eduPerson.inc:207
+#: ../lib/modules/eduPerson.inc:266
+#: ../lib/modules/eduPerson.inc:677
 msgid "Scoped affiliation"
 msgstr "联系范围"
 
@@ -5776,15 +6239,15 @@ msgstr "搜索过滤器"
 msgid "Search scope"
 msgstr "搜索范围"
 
-#: ../lib/modules/asteriskExtension.inc:292
+#: ../lib/modules/asteriskExtension.inc:298
 msgid "Search tree suffix for users"
 msgstr "查询用户的树后缀"
 
-#: ../templates/pdfedit/pdfpage.php:549
+#: ../templates/pdfedit/pdfpage.php:565
 msgid "Section"
 msgstr "节"
 
-#: ../templates/config/mainmanage.php:167
+#: ../templates/config/mainmanage.php:172
 #: ../templates/config/confmain.php:461
 msgid "Security settings"
 msgstr "安全设定"
@@ -5793,7 +6256,7 @@ msgstr "安全设定"
 msgid "See also"
 msgstr "同时参考"
 
-#: ../lib/account.inc:628
+#: ../lib/account.inc:635
 msgid "See the manual for instructions to solve this problem."
 msgstr "参考手册来解决本问题."
 
@@ -5801,32 +6264,32 @@ msgstr "参考手册来解决本问题."
 msgid "Select a template for the creation process"
 msgstr "为新建处理选择模板"
 
-#: ../lib/lists.inc:382
+#: ../lib/lists.inc:387
 msgid "Select all"
 msgstr "全选"
 
-#: ../lib/modules/nisnetgroup.inc:220
-#: ../lib/modules/nisnetgroup.inc:242
+#: ../lib/modules/nisnetgroup.inc:224
+#: ../lib/modules/nisnetgroup.inc:246
 msgid "Select host"
 msgstr "选择主机"
 
-#: ../lib/modules/nisnetgroup.inc:222
-#: ../lib/modules/nisnetgroup.inc:244
+#: ../lib/modules/nisnetgroup.inc:226
+#: ../lib/modules/nisnetgroup.inc:248
 msgid "Select user"
 msgstr "选择用户"
 
-#: ../lib/modules/nisnetgroup.inc:354
-#: ../lib/modules/posixAccount.inc:1053
+#: ../lib/modules/posixAccount.inc:1052
+#: ../lib/modules/nisnetgroup.inc:358
 msgid "Selected groups"
 msgstr "已选择的组"
 
-#: ../templates/masscreate.php:146
-#: ../templates/config/confmodules.php:249
+#: ../templates/masscreate.php:149
+#: ../templates/config/confmodules.php:254
 msgid "Selected modules"
 msgstr "已选择的模块"
 
 #: ../lib/modules/posixGroup.inc:243
-#: ../lib/modules/asteriskExtension.inc:303
+#: ../lib/modules/asteriskExtension.inc:309
 msgid "Selected users"
 msgstr "已选择的用户"
 
@@ -5838,18 +6301,27 @@ msgstr "自助服务配置"
 msgid "Self service configuration editor"
 msgstr "自助服务配置编辑器"
 
+#: ../templates/selfService/adminMain.php:322
+msgid "Self service login"
+msgstr "自助服务登录"
+
+#: ../templates/lists/changePassword.php:179
+#: ../templates/lists/changePassword.php:211
+msgid "Send via mail"
+msgstr "通过邮件发送"
+
 #: ../templates/tests/lamdaemonTest.php:72
 msgid "Server"
 msgstr "服务器"
 
-#: ../templates/selfService/adminMain.php:332
 #: ../templates/config/confmain.php:229
+#: ../templates/selfService/adminMain.php:332
 #: ../help/help.inc:57
 msgid "Server address"
 msgstr "服务器地址"
 
-#: ../templates/selfService/adminMain.php:95
 #: ../templates/config/confmain.php:559
+#: ../templates/selfService/adminMain.php:95
 msgid "Server address is invalid!"
 msgstr "服务器地址非法!"
 
@@ -5862,31 +6334,31 @@ msgstr "服务器信息"
 msgid "Server list"
 msgstr "服务器列表"
 
-#: ../templates/login.php:322
+#: ../templates/login.php:334
 msgid "Server profile"
 msgstr "服务器设置文件"
 
-#: ../templates/selfService/adminMain.php:329
 #: ../templates/config/confmain.php:226
+#: ../templates/selfService/adminMain.php:329
 msgid "Server settings"
 msgstr "服务器设置"
 
-#: ../templates/config/mainmanage.php:173
+#: ../templates/config/mainmanage.php:178
 #: ../help/help.inc:137
 msgid "Session timeout"
 msgstr "会话超时"
 
-#: ../lib/modules/aliasEntry.inc:110
+#: ../lib/modules/aliasEntry.inc:102
 msgid "Set"
 msgstr "设置"
 
-#: ../lib/modules.inc:1252
-#: ../lib/modules.inc:1365
+#: ../lib/modules.inc:1278
+#: ../lib/modules.inc:1391
 msgid "Set password"
 msgstr "设置密码"
 
-#: ../lib/modules/posixAccount.inc:187
-#: ../lib/modules/posixAccount.inc:323
+#: ../lib/modules/posixAccount.inc:188
+#: ../lib/modules/posixAccount.inc:325
 msgid "Set primary group as memberUid"
 msgstr "为主组设置memberUid"
 
@@ -5895,11 +6367,11 @@ msgstr "为主组设置memberUid"
 msgid "Set profile password"
 msgstr "设置文件密码"
 
-#: ../lib/modules.inc:1294
+#: ../lib/modules.inc:1320
 msgid "Set random password"
 msgstr "设置随机密码"
 
-#: ../templates/lists/changePassword.php:193
+#: ../templates/lists/changePassword.php:189
 msgid "Set specific password"
 msgstr "设置特定的密码"
 
@@ -5911,9 +6383,10 @@ msgstr "设置组密码"
 msgid "Shadow"
 msgstr "Shadow"
 
-#: ../lib/modules/sambaSamAccount.inc:355
-#: ../lib/modules/sambaSamAccount.inc:1501
-#: ../lib/modules/sambaSamAccount.inc:1831
+#: ../lib/modules/sambaSamAccount.inc:222
+#: ../lib/modules/sambaSamAccount.inc:357
+#: ../lib/modules/sambaSamAccount.inc:1503
+#: ../lib/modules/sambaSamAccount.inc:1833
 msgid "Shadowing"
 msgstr "遮蔽化(shadow)"
 
@@ -5929,11 +6402,11 @@ msgstr "增加一个固定IP地址到DNS服务器吗?"
 msgid "Show LDIF file"
 msgstr "显示LDIF文件"
 
-#: ../templates/tree/edit.php:107
+#: ../templates/tree/edit.php:104
 msgid "Show internal attributes"
 msgstr "显示内部属性"
 
-#: ../lib/modules/asteriskExtension.inc:287
+#: ../lib/modules/asteriskExtension.inc:293
 msgid "Show only Asterisk accounts"
 msgstr "只显示 Asterisk 帐号"
 
@@ -5945,13 +6418,13 @@ msgstr "主组用户显示为普通组用户"
 msgid "Single valued"
 msgstr "单值"
 
-#: ../lib/modules/quota.inc:581
+#: ../lib/modules/quota.inc:591
 msgid "Soft block"
 msgstr "软块"
 
 #: ../lib/modules/quota.inc:105
-#: ../lib/modules/quota.inc:387
-#: ../lib/modules/quota.inc:472
+#: ../lib/modules/quota.inc:383
+#: ../lib/modules/quota.inc:475
 msgid "Soft block limit"
 msgstr "软块限制"
 
@@ -5959,7 +6432,7 @@ msgstr "软块限制"
 msgid "Soft block limit."
 msgstr "软块限制."
 
-#: ../lib/modules/quota.inc:583
+#: ../lib/modules/quota.inc:593
 msgid "Soft inode"
 msgstr "软节点"
 
@@ -5968,17 +6441,17 @@ msgid "Soft inode (files) limit."
 msgstr "软节点限制."
 
 #: ../lib/modules/quota.inc:127
-#: ../lib/modules/quota.inc:391
-#: ../lib/modules/quota.inc:474
+#: ../lib/modules/quota.inc:387
+#: ../lib/modules/quota.inc:477
 msgid "Soft inode limit"
 msgstr "软节点限制."
 
-#: ../templates/tree/edit.php:141
+#: ../templates/tree/edit.php:138
 #, php-format
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "下面被选中的属性(%s)已经被修改."
 
-#: ../lib/modules.inc:1128
+#: ../lib/modules.inc:1155
 msgid "Some required information is missing"
 msgstr "缺少一些必要的信息"
 
@@ -5992,8 +6465,8 @@ 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:300
-#: ../lib/modules/sambaSamAccount.inc:1225
+#: ../lib/modules/sambaSamAccount.inc:302
+#: ../lib/modules/sambaSamAccount.inc:1227
 msgid "Special user"
 msgstr "特殊用户"
 
@@ -6042,19 +6515,20 @@ msgstr "指定用户的关系,要求是公开目录中的惯例,比如学生,教
 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:651
-#: ../lib/modules/inetOrgPerson.inc:991
-#: ../lib/modules/inetOrgPerson.inc:1242
-#: ../lib/modules/inetOrgPerson.inc:1689
+#: ../lib/modules/inetOrgPerson.inc:121
+#: ../lib/modules/inetOrgPerson.inc:139
+#: ../lib/modules/inetOrgPerson.inc:193
+#: ../lib/modules/inetOrgPerson.inc:394
+#: ../lib/modules/inetOrgPerson.inc:436
+#: ../lib/modules/inetOrgPerson.inc:575
+#: ../lib/modules/inetOrgPerson.inc:901
+#: ../lib/modules/inetOrgPerson.inc:1143
+#: ../lib/modules/inetOrgPerson.inc:1579
 msgid "State"
 msgstr "地点"
 
-#: ../templates/pdfedit/pdfpage.php:482
-#: ../templates/pdfedit/pdfpage.php:486
+#: ../templates/pdfedit/pdfpage.php:498
+#: ../templates/pdfedit/pdfpage.php:502
 msgid "Static text"
 msgstr "静态文本"
 
@@ -6066,17 +6540,18 @@ msgstr "步骤1/2:名称和对象类"
 msgid "Step 2 of 2: Specify attributes and values"
 msgstr "步骤2/2:指定的属性和属性值"
 
-#: ../lib/modules/inetOrgPerson.inc:305
+#: ../lib/modules/inetOrgPerson.inc:245
 msgid "Steve"
 msgstr "Steve"
 
-#: ../lib/modules/inetOrgPerson.inc:1292
-#: ../lib/modules/posixAccount.inc:211
-#: ../lib/modules/sambaSamAccount.inc:392
+#: ../lib/modules/sambaSamAccount.inc:394
+#: ../lib/modules/posixAccount.inc:212
+#: ../lib/modules/inetOrgPerson.inc:1193
+#: ../lib/modules/asteriskVoicemail.inc:170
 msgid "Steve Miller"
 msgstr "Steve Miller"
 
-#: ../lib/modules/posixAccount.inc:272
+#: ../lib/modules/posixAccount.inc:273
 msgid "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 msgstr "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 
@@ -6084,19 +6559,20 @@ msgstr "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 msgid "Steve, Stevo"
 msgstr "Steve,Stevo"
 
-#: ../lib/modules/inetOrgPerson.inc:87
-#: ../lib/modules/inetOrgPerson.inc:150
-#: ../lib/modules/inetOrgPerson.inc:218
-#: ../lib/modules/inetOrgPerson.inc:358
-#: ../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
+#: ../lib/modules/inetOrgPerson.inc:58
+#: ../lib/modules/inetOrgPerson.inc:118
+#: ../lib/modules/inetOrgPerson.inc:185
+#: ../lib/modules/inetOrgPerson.inc:298
+#: ../lib/modules/inetOrgPerson.inc:424
+#: ../lib/modules/inetOrgPerson.inc:515
+#: ../lib/modules/inetOrgPerson.inc:516
+#: ../lib/modules/inetOrgPerson.inc:865
+#: ../lib/modules/inetOrgPerson.inc:1128
+#: ../lib/modules/inetOrgPerson.inc:1531
 msgid "Street"
 msgstr "街道"
 
-#: ../templates/pdfedit/pdfpage.php:666
+#: ../templates/pdfedit/pdfpage.php:671
 msgid "Structure name"
 msgstr "结构名"
 
@@ -6104,16 +6580,18 @@ msgstr "结构名"
 msgid "Sub (entire subtree)"
 msgstr "Sub (条目的子树)"
 
+#: ../lib/types/netgroup.inc:93
 #: ../lib/modules/nisnetgroup.inc:76
 #: ../lib/modules/nisnetgroup.inc:111
-#: ../lib/modules/nisnetgroup.inc:193
-#: ../lib/modules/nisnetgroup.inc:352
-#: ../lib/modules/nisnetgroup.inc:568
-#: ../lib/types/netgroup.inc:93
+#: ../lib/modules/nisnetgroup.inc:126
+#: ../lib/modules/nisnetgroup.inc:197
+#: ../lib/modules/nisnetgroup.inc:356
+#: ../lib/modules/nisnetgroup.inc:572
 msgid "Subgroups"
 msgstr "分组"
 
 #: ../lib/modules/dhcp_settings.inc:122
+#: ../lib/modules/dhcp_settings.inc:166
 #: ../lib/modules/dhcp_settings.inc:182
 #: ../lib/modules/dhcp_settings.inc:230
 #: ../lib/modules/dhcp_settings.inc:543
@@ -6122,6 +6600,7 @@ msgid "Subnet"
 msgstr "子网"
 
 #: ../lib/modules/dhcp_settings.inc:155
+#: ../lib/modules/dhcp_settings.inc:174
 #: ../lib/modules/dhcp_settings.inc:222
 #: ../lib/modules/dhcp_settings.inc:282
 #: ../lib/modules/dhcp_settings.inc:602
@@ -6138,31 +6617,47 @@ msgstr "子字符串规则"
 msgid "Success"
 msgstr "成功"
 
-#: ../templates/tests/lamdaemonTest.php:158
-msgid "Sudo is not setup correctly!"
-msgstr "Sudo的设置不正确 !"
+#: ../lib/modules/sudoRole.inc:38
+msgid "Sudo role"
+msgstr "Sudo角色"
 
-#: ../lib/modules.inc:1530
-#: ../lib/lists.inc:609
+#: ../lib/types/sudo.inc:48
+msgid "Sudo role management"
+msgstr "Sudo角色管理"
+
+#: ../lib/types/sudo.inc:39
+msgid "Sudo roles"
+msgstr "Sudo角色"
+
+#: ../lib/lists.inc:634
+#: ../lib/modules.inc:1550
 msgid "Suffix"
 msgstr "后缀"
 
-#: ../lib/modules/sambaSamAccount.inc:1318
+#: ../lib/modules/sambaSamAccount.inc:1320
 msgid "Sunday"
 msgstr "星期日"
 
+#: ../templates/lists/changePassword.php:117
+msgid "Sync Asterisk password with Unix password"
+msgstr "同步Asterisk和Unix的密码"
+
+#: ../templates/lists/changePassword.php:120
+msgid "Sync Asterisk voicemail password with Unix password"
+msgstr "同步Asterisk语音邮件和Unix的密码"
+
 #: ../templates/lists/changePassword.php:108
-#: ../lib/modules/sambaSamAccount.inc:226
+#: ../lib/modules/sambaSamAccount.inc:228
 msgid "Sync Samba LM password with Unix password"
 msgstr "同步 Samba LM 密码和Unix的密码"
 
 #: ../templates/lists/changePassword.php:107
-#: ../lib/modules/sambaSamAccount.inc:225
+#: ../lib/modules/sambaSamAccount.inc:227
 msgid "Sync Samba NT password with Unix password"
 msgstr "同步Samba NT的密码和 Unix的密码"
 
-#: ../templates/schema/schema.php:179
 #: ../templates/tree/add_value_form.php:190
+#: ../templates/schema/schema.php:179
 msgid "Syntax"
 msgstr "语法"
 
@@ -6175,7 +6670,7 @@ msgstr "OID语法"
 msgid "Syntaxes"
 msgstr "语法"
 
-#: ../templates/config/mainmanage.php:313
+#: ../templates/config/mainmanage.php:318
 msgid "System logging"
 msgstr "系统日志"
 
@@ -6183,28 +6678,29 @@ msgstr "系统日志"
 msgid "TLS cannot be combined with ldaps://."
 msgstr "TLS不能与ldaps://结合"
 
-#: ../lib/modules/kolabUser.inc:235
+#: ../lib/modules/kolabUser.inc:241
 msgid "Target of invitation policy is invalid!"
 msgstr "邀请策略的目标非法 !"
 
-#: ../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:603
-#: ../lib/modules/inetOrgPerson.inc:604
-#: ../lib/modules/inetOrgPerson.inc:1030
-#: ../lib/modules/inetOrgPerson.inc:1231
-#: ../lib/modules/inetOrgPerson.inc:1609
+#: ../templates/lists/changePassword.php:162
+#: ../lib/modules/inetOrgPerson.inc:48
+#: ../lib/modules/inetOrgPerson.inc:117
+#: ../lib/modules/inetOrgPerson.inc:201
+#: ../lib/modules/inetOrgPerson.inc:330
+#: ../lib/modules/inetOrgPerson.inc:448
+#: ../lib/modules/inetOrgPerson.inc:531
+#: ../lib/modules/inetOrgPerson.inc:532
+#: ../lib/modules/inetOrgPerson.inc:940
+#: ../lib/modules/inetOrgPerson.inc:1132
+#: ../lib/modules/inetOrgPerson.inc:1499
 msgid "Telephone number"
 msgstr "电话号码"
 
-#: ../lib/modules/inetOrgPerson.inc:336
+#: ../lib/modules/inetOrgPerson.inc:276
 msgid "Temp"
 msgstr "临时"
 
-#: ../lib/modules/inetOrgPerson.inc:320
+#: ../lib/modules/inetOrgPerson.inc:260
 msgid "Temp, contract until december"
 msgstr "临时,合同到年底"
 
@@ -6212,9 +6708,9 @@ msgstr "临时,合同到年底"
 msgid "Template"
 msgstr "模板"
 
-#: ../lib/modules/sambaSamAccount.inc:364
-#: ../lib/modules/sambaSamAccount.inc:592
-#: ../lib/modules/sambaSamAccount.inc:1243
+#: ../lib/modules/sambaSamAccount.inc:366
+#: ../lib/modules/sambaSamAccount.inc:594
+#: ../lib/modules/sambaSamAccount.inc:1245
 msgid "Terminal server options"
 msgstr "终端服务选项"
 
@@ -6222,7 +6718,7 @@ msgstr "终端服务选项"
 msgid "Tests"
 msgstr "测试"
 
-#: ../templates/pdfedit/pdfpage.php:594
+#: ../templates/pdfedit/pdfpage.php:610
 msgid "Text field"
 msgstr "输入框"
 
@@ -6255,7 +6751,7 @@ msgstr "代表用户主要组织单位的目录条目的DN."
 msgid "The DNs of the directory entries representing the person's organizational units."
 msgstr "代表用户组织单元的目录条目的DN."
 
-#: ../templates/config/mainmanage.php:116
+#: ../templates/config/mainmanage.php:95
 #, php-format
 msgid "The IP address %s is invalid!"
 msgstr "IP地址 %s非法 !"
@@ -6316,14 +6812,20 @@ msgstr "PC机器名的长度最短需要两个字符."
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "您的Samba服务器的SID,可以通过使用\"net getlocalsid\"命令获取."
 
-#: ../lib/modules/posixAccount.inc:64
+#: ../lib/modules/posixAccount.inc:65
 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/asteriskVoicemail.inc:210
+#: ../lib/modules/asteriskVoicemail.inc:211
+msgid "The account context is invalid."
+msgstr "账号语境非法."
+
+#: ../lib/modules/asteriskAccount.inc:88
 #: ../lib/modules/asteriskExtension.inc:83
-#: ../lib/modules/asteriskAccount.inc:86
+#: ../lib/modules/asteriskVoicemail.inc:79
 msgid "The account context stores information about the dial plan."
-msgstr "帐号的上下文存储有关拨号模板的信息"
+msgstr "帐号的语境存储有关拨号模板的信息"
 
 #: ../help/help.inc:157
 msgid "The account will be saved under this LDAP suffix."
@@ -6334,8 +6836,8 @@ msgstr "帐号将会保存在此后缀下."
 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:153
-#: ../lib/modules/asteriskAccount.inc:155
+#: ../lib/modules/asteriskAccount.inc:169
+#: ../lib/modules/asteriskAccount.inc:171
 msgid "The caller ID format is invalid."
 msgstr "拨号ID格式不合法."
 
@@ -6372,6 +6874,10 @@ msgstr "域名最少需要3个字符."
 msgid "The domain name of the subnet."
 msgstr "域名的子网掩码."
 
+#: ../lib/modules/asteriskVoicemail.inc:214
+msgid "The email address is invalid."
+msgstr "邮件地址非法 !"
+
 #: ../lib/modules/range.inc:82
 msgid "The ending IP address of the range."
 msgstr "范围的最高IP地址."
@@ -6380,15 +6886,15 @@ msgstr "范围的最高IP地址."
 msgid "The entered Netbios node type does not exist."
 msgstr "输入的Netbios节点类型不存在."
 
+#: ../lib/modules/phpGroupwareUser.inc:138
 #: ../lib/modules/shadowAccount.inc:67
-#: ../lib/modules/phpGroupwareUser.inc:136
 msgid "The expiration date is invalid."
 msgstr "过期日期非法."
 
-#: ../lib/modules/asteriskAccount.inc:157
-#: ../lib/modules/asteriskAccount.inc:158
+#: ../lib/modules/asteriskAccount.inc:173
+#: ../lib/modules/asteriskAccount.inc:174
 msgid "The extension context is invalid."
-msgstr "扩展的上下文非法."
+msgstr "扩展的语境非法."
 
 #: ../help/help.inc:193
 msgid "The first line is the subject."
@@ -6403,11 +6909,15 @@ msgstr "LDAP中没有下列后缀,LAM会自动建立."
 msgid "The format of the logon hours field is invalid!"
 msgstr "登录时间列的格式非法!"
 
-#: ../lib/modules/customScripts.inc:100
+#: ../lib/modules/customScripts.inc:110
 msgid "The format of this custom script setting is invalid."
 msgstr "自定义脚本设置的格式非法!"
 
-#: ../templates/login.php:415
+#: ../lib/modules/asteriskVoicemail.inc:213
+msgid "The full name name is invalid."
+msgstr "全名非法."
+
+#: ../templates/login.php:431
 msgid "The given user name matches multiple LDAP entries."
 msgstr "给定的用户名匹配了多条LDAP条目."
 
@@ -6415,16 +6925,16 @@ msgstr "给定的用户名匹配了多条LDAP条目."
 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
+#: ../templates/pdfedit/pdfpage.php:119
 msgid "The headline for a new section must contain at least one character."
 msgstr "新段的标题最少要有一个字符."
 
-#: ../lib/modules/sambaSamAccount.inc:277
+#: ../lib/modules/sambaSamAccount.inc:279
 msgid "The home directory will be connected under this drive letter."
 msgstr "将会从这个驱动器号上连接用户目录。"
 
-#: ../lib/modules/asteriskAccount.inc:160
-#: ../lib/modules/asteriskAccount.inc:161
+#: ../lib/modules/asteriskAccount.inc:176
+#: ../lib/modules/asteriskAccount.inc:177
 msgid "The host name is invalid."
 msgstr "主机名非法"
 
@@ -6441,10 +6951,29 @@ msgstr "释放时间非法."
 msgid "The lease time specifies after how many seconds the client should request a new IP address."
 msgstr "指定客户端必须重新申请新IP地址的释放时间(秒数)."
 
-#: ../templates/config/mainmanage.php:132
+#: ../lib/modules/sudoRole.inc:72
+#: ../lib/modules/sudoRole.inc:98
+msgid "The list of commands which may be run."
+msgstr "可以运行的命令列表"
+
+#: ../lib/modules/sudoRole.inc:68
+#: ../lib/modules/sudoRole.inc:93
+msgid "The list of hosts from which the user may run the commands."
+msgstr "用户可以运行命令的主机列表."
+
+#: ../lib/modules/sudoRole.inc:64
+#: ../lib/modules/sudoRole.inc:88
+msgid "The list of users who own this sudo role and may run the commands."
+msgstr "具备sudo角色并可以运行命令的用户列表."
+
+#: ../templates/config/mainmanage.php:111
 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/asteriskVoicemail.inc:206
+msgid "The mailbox format is invalid."
+msgstr "邮箱格式不合法."
+
 #: ../lib/modules/dhcp_settings.inc:313
 #: ../lib/modules/dhcp_settings.inc:314
 msgid "The maximum lease time is invalid."
@@ -6454,14 +6983,14 @@ msgstr "最长释放时间非法."
 msgid "The maximum lease time specifies after how many seconds the client must request a new IP address."
 msgstr "指定客户端必须重新申请新IP地址的最长释放时间."
 
-#: ../lib/modules.inc:1173
+#: ../lib/modules.inc:1200
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "%s模块未启动."
 
 #: ../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,_,- ."
+msgid "The name for that PDF-structure you submitted is not valid. A valid name must consist of the following characters: 'a-z','A-Z','0-9','_','-'."
+msgstr "您提供的PDF架构名非法,一个合法的命令由下列字符组成: 'a-z','A-Z','0-9','_','-'."
 
 #: ../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\"."
@@ -6491,7 +7020,7 @@ msgstr "WINDOWS域名或工作组名."
 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:1065
+#: ../lib/modules.inc:1092
 msgid "The new password will be stored in the directory after you save this account."
 msgstr "保存帐号后新密码同时保存到目录服务器."
 
@@ -6504,73 +7033,82 @@ msgstr "可以登录LAM的用户数量受限,或是DN的固定列表数量受限
 msgid "The object class %s is not supported by your LDAP server."
 msgstr "在你的LDAP服务器中对象类%s不被支持。"
 
-#: ../lib/modules/inetOrgPerson.inc:660
+#: ../lib/modules/inetOrgPerson.inc:584
 msgid "The office name of the user (e.g. YourCompany, Human Resources)."
 msgstr "用户的办公室名(比如:某某公司,人力资源部)"
 
-#: ../templates/selfService/selfServiceMain.php:259
-#: ../lib/modules.inc:1888
+#: ../templates/selfService/selfServiceMain.php:261
+#: ../lib/modules.inc:1908
 msgid "The operation was stopped because of the above errors."
 msgstr "由于发生了以上错误，操作中止."
 
+#: ../lib/modules/asteriskVoicemail.inc:216
+#: ../lib/modules/asteriskVoicemail.inc:217
+msgid "The options have bad format."
+msgstr "选项的格式不正确."
+
 #: ../lib/modules/groupOfNames.inc:69
 msgid "The owner of this group."
 msgstr "此组的拥有者."
 
-#: ../templates/selfService/adminLogin.php:54
-#: ../templates/config/confmain.php:72
+#: ../lib/modules/asteriskVoicemail.inc:215
+msgid "The pager number has bad format."
+msgstr "呼号的格式不正确."
+
 #: ../templates/config/confsave.php:71
+#: ../templates/config/confmain.php:72
 #: ../templates/config/mainlogin.php:59
+#: ../templates/selfService/adminLogin.php:54
 msgid "The password is invalid! Please try again."
 msgstr "密码无效,请重试!"
 
-#: ../lib/security.inc:233
+#: ../lib/security.inc:237
 #, php-format
 msgid "The password is too short. You have to enter at least %s characters."
 msgstr "密码太短,至少需要%s个字符."
 
-#: ../lib/security.inc:285
+#: ../lib/security.inc:289
 #, php-format
 msgid "The password is too weak. You have to enter at least %s different character classes (upper/lower case, numbers and symbols)."
 msgstr "密码弱度不够.最少需要输入%s个字符类别(大/小写,数字和符号)."
 
-#: ../lib/security.inc:256
+#: ../lib/security.inc:260
 #, php-format
 msgid "The password is too weak. You have to enter at least %s lower case characters."
 msgstr "密码强度不够,最少需要%s个小写字母."
 
-#: ../lib/security.inc:264
+#: ../lib/security.inc:268
 #, php-format
 msgid "The password is too weak. You have to enter at least %s numeric characters."
 msgstr "密码强度不够,最少需要%s个数字字符."
 
-#: ../lib/security.inc:268
+#: ../lib/security.inc:272
 #, php-format
 msgid "The password is too weak. You have to enter at least %s symbolic characters."
 msgstr "密码强度不够.最少需要%s个标点符号字符."
 
-#: ../lib/security.inc:260
+#: ../lib/security.inc:264
 #, php-format
 msgid "The password is too weak. You have to enter at least %s upper case characters."
 msgstr "密码强度不够.最少需要%s个大写字母字符."
 
-#: ../lib/modules.inc:1319
+#: ../lib/modules.inc:1345
 msgid "The password was set to:"
 msgstr "密码被设置为:"
 
-#: ../templates/lists/changePassword.php:321
+#: ../templates/lists/changePassword.php:297
 msgid "The password(s) were set to:"
 msgstr "密码被设置为:"
 
-#: ../lib/modules/posixAccount.inc:344
+#: ../lib/modules/posixAccount.inc:346
 msgid "The primary group for this account. You can insert a GID number or a group name."
 msgstr "本帐号的主组名,您可以输入一个GID号或组名."
 
-#: ../lib/modules/posixAccount.inc:411
+#: ../lib/modules/posixAccount.inc:413
 msgid "The primary group the host should be member of."
 msgstr "该主机所属的主组名."
 
-#: ../lib/modules/posixAccount.inc:373
+#: ../lib/modules/posixAccount.inc:375
 msgid "The primary group the user should be member of."
 msgstr "该用户所属的主组名."
 
@@ -6586,17 +7124,17 @@ msgstr "此范围与其它范围冲突."
 msgid "The range end needs to be greater than the range start."
 msgstr "范围的终止地址需要大于起始地址."
 
-#: ../lib/modules/inetOrgPerson.inc:640
+#: ../lib/modules/inetOrgPerson.inc:564
 msgid "The room number of the employee's office."
 msgstr "雇员办公室房间号码"
 
 #: ../lib/modules/customScripts.inc:57
 #: ../lib/modules/customScripts.inc:69
 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)."
+msgstr "在web服务器中运行的与用户语境相关的脚本(比如:apache/www-data)."
 
-#: ../lib/modules/inetOrgPerson.inc:668
-#: ../lib/modules/sambaSamAccount.inc:371
+#: ../lib/modules/sambaSamAccount.inc:373
+#: ../lib/modules/inetOrgPerson.inc:592
 msgid "The selected options will not be managed inside LAM. You can use this to reduce the number of displayed input fields."
 msgstr "选中项将不被LAM所管理,可以用此来减少所显示的输入框个数."
 
@@ -6604,11 +7142,11 @@ msgstr "选中项将不被LAM所管理,可以用此来减少所显示的输入
 msgid "The starting IP address of the range."
 msgstr "范围的起始IP地址."
 
-#: ../lib/modules/inetOrgPerson.inc:652
+#: ../lib/modules/inetOrgPerson.inc:576
 msgid "The state where the user resides or works."
 msgstr "用户居住或工作地点."
 
-#: ../templates/pdfedit/pdfpage.php:109
+#: ../templates/pdfedit/pdfpage.php:107
 msgid "The static text must contain at least one character."
 msgstr "静态文本至少包含一个字符."
 
@@ -6630,10 +7168,25 @@ msgstr "子网掩码非法"
 msgid "The subnet mask of the network."
 msgstr "网络的子网掩码."
 
+#: ../lib/modules/sudoRole.inc:80
+#: ../lib/modules/sudoRole.inc:108
+msgid "The sudo commands are executed with these group memberships."
+msgstr "sudo命令以这些组员的身份运行."
+
+#: ../lib/modules/sudoRole.inc:76
+#: ../lib/modules/sudoRole.inc:103
+msgid "The sudo commands may be run as these users (e.g. root)."
+msgstr "sudo命令以这个用户的身份运行(比如:root)."
+
 #: ../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 的 \"用户可以/必须修改密码\" 的取值必须是一个数字."
 
+#: ../lib/modules/asteriskVoicemail.inc:218
+#: ../lib/modules/asteriskVoicemail.inc:219
+msgid "The voicemail context name is invalid."
+msgstr "语音邮件的语境名非法."
+
 #: ../help/help.inc:196
 msgid "The wildcard for the new password is @@newPassword@@."
 msgstr "新密码的通配符为@@newPassword@@."
@@ -6650,10 +7203,14 @@ msgstr "仍有用户的主组为本组."
 msgid "There can be only one group of this type."
 msgstr "只能有一种本类型组."
 
-#: ../lib/modules/asteriskAccount.inc:154
+#: ../lib/modules/asteriskAccount.inc:170
 msgid "There is already another user with this caller ID."
 msgstr "已经有其他的帐号使用这个拨号ID."
 
+#: ../lib/modules/asteriskVoicemail.inc:207
+msgid "There is already another user with this mailbox name."
+msgstr "已经有其他的帐号使用这个邮箱名."
+
 #: ../templates/massDoUpload.php:128
 msgid "There were errors while uploading:"
 msgstr "上传时发生错误."
@@ -6662,11 +7219,11 @@ msgstr "上传时发生错误."
 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:332
+#: ../lib/modules/posixAccount.inc:334
 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:328
+#: ../lib/modules/posixAccount.inc:330
 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."
 
@@ -6679,7 +7236,7 @@ msgstr "这些条目指定了网络组的成员.您可以指定一个主机名
 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
+#: ../lib/modules/posixAccount.inc:90
 msgid "This GID number is invalid! Please provide either a number or a group name."
 msgstr "GID号非法!请提供新号或组名."
 
@@ -6691,15 +7248,15 @@ msgstr "这些HTML代码将显示在自助服务主页的上端,比如可以在
 msgid "This PC name already exists."
 msgstr "PC机器名已经存在!"
 
-#: ../lib/modules/kolabUser.inc:277
+#: ../lib/modules/kolabUser.inc:283
 msgid "This account is marked for deletion."
 msgstr "本帐号标记为删除."
 
-#: ../lib/modules/sambaSamAccount.inc:301
+#: ../lib/modules/sambaSamAccount.inc:303
 msgid "This allows you to define this account as a special user like administrator or guest."
 msgstr "您可以指定本帐号为特殊帐号,比如管理员或来宾."
 
-#: ../lib/modules/inetOrgPerson.inc:656
+#: ../lib/modules/inetOrgPerson.inc:580
 msgid "This can be used to specify if the user has a car license."
 msgstr "用来指定用户是否拥有汽车执照."
 
@@ -6715,12 +7272,12 @@ msgstr "改变缺省登录使用的配置文件."
 msgid "This column is defined to include unique entries but duplicates were found:"
 msgstr "本列不能有重复的条目,但发现了下列重复条目:"
 
-#: ../lib/modules/customScripts.inc:101
+#: ../lib/modules/customScripts.inc:111
 msgid "This custom script setting includes an invalid account type."
 msgstr "自定义脚本设置中包含一个非法的帐号类型."
 
-#: ../lib/modules/customScripts.inc:103
-#: ../lib/modules/customScripts.inc:105
+#: ../lib/modules/customScripts.inc:113
+#: ../lib/modules/customScripts.inc:115
 msgid "This custom script setting includes an invalid action type."
 msgstr "自定义脚本设置中包含一个非法的动作类型"
 
@@ -6740,7 +7297,7 @@ msgstr "定义为这个用户启动的Asterisk 应用(比如:SIP/user1)."
 msgid "This describes the location of the host."
 msgstr "描述主机所在地点."
 
-#: ../lib/modules/inetOrgPerson.inc:648
+#: ../lib/modules/inetOrgPerson.inc:572
 msgid "This describes the location of the user."
 msgstr "描述用户所在地点."
 
@@ -6748,7 +7305,7 @@ msgstr "描述用户所在地点."
 msgid "This document was automatically created by LDAP Account Manager"
 msgstr "本文件由本系统自动产生."
 
-#: ../templates/tree/edit.php:213
+#: ../templates/tree/edit.php:210
 msgid "This entry has no attributes"
 msgstr "本条目没有任何属性."
 
@@ -6757,7 +7314,7 @@ msgstr "本条目没有任何属性."
 msgid "This entry is the root of a sub-tree containing %s entries."
 msgstr "本条目是一个包含%s 子条目的子树的根."
 
-#: ../lib/modules/posixAccount.inc:91
+#: ../lib/modules/posixAccount.inc:92
 msgid "This gecos value is invalid!"
 msgstr "备注值非法!"
 
@@ -6813,7 +7370,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:311
+#: ../templates/masscreate.php:316
 msgid "This is an example how it would look in your spreadsheet program before you convert to CSV:"
 msgstr "电子表格未存成CSV格式的样例:"
 
@@ -6825,10 +7382,10 @@ msgstr "可以输入此条目的描述(可选)"
 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/ipHost.inc:108
-#: ../lib/modules/eduPerson.inc:213
-#: ../lib/modules/eduPerson.inc:215
+#: ../lib/modules/ipHost.inc:110
+#: ../lib/modules/eduPerson.inc:219
+#: ../lib/modules/eduPerson.inc:221
+#: ../lib/modules/inetOrgPerson.inc:73
 #: ../lib/modules/aliasEntry.inc:79
 msgid "This is not a valid DN!"
 msgstr "不是一个有效的DN!"
@@ -6841,7 +7398,7 @@ msgstr "不是一个有效的RID号!"
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不是一个有效的Samba 3 组类型!"
 
-#: ../lib/modules/eduPerson.inc:217
+#: ../lib/modules/eduPerson.inc:223
 msgid "This is not a valid list of DNs!"
 msgstr "这不是一个有效的DN列表!"
 
@@ -6853,7 +7410,7 @@ msgstr "用户公开邮件地址之一."
 msgid "This is one recipient for this alias."
 msgstr "这个别名的一个收件人."
 
-#: ../lib/modules/asteriskAccount.inc:78
+#: ../lib/modules/asteriskAccount.inc:80
 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)."
 
@@ -6865,7 +7422,7 @@ msgstr "设备的网卡的IPC地址(比如:123.123.123.123)."
 msgid "This is the LDAP DN of the host's manager."
 msgstr "主机管理员的LDAP DB"
 
-#: ../lib/modules/inetOrgPerson.inc:584
+#: ../lib/modules/inetOrgPerson.inc:512
 msgid "This is the LDAP DN of the user's manager. Use this property to represent hierarchies in your company."
 msgstr "用户管理员的LDAP DN.显示您在公司的阶层."
 
@@ -6873,7 +7430,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:298
+#: ../lib/modules/sambaSamAccount.inc:300
 msgid "This is the SID of the user's primary Windows group."
 msgstr "用户Windows主组的SID."
 
@@ -6881,11 +7438,11 @@ 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:236
+#: ../lib/modules/sambaSamAccount.inc:238
 msgid "This is the account's Windows password."
 msgstr "帐号在Windows中的密码."
 
-#: ../lib/modules/sambaSamAccount.inc:233
+#: ../lib/modules/sambaSamAccount.inc:235
 msgid "This is the account's full name on Windows systems."
 msgstr "用户在Windows系统中的全名."
 
@@ -6893,9 +7450,9 @@ msgstr "用户在Windows系统中的全名."
 msgid "This is the active password policy for this account."
 msgstr "本帐号正在使用的帐号策略。"
 
-#: ../lib/modules/sambaSamAccount.inc:320
-#: ../lib/modules/shadowAccount.inc:190
+#: ../lib/modules/sambaSamAccount.inc:322
 #: ../lib/modules/phpGroupwareUser.inc:83
+#: ../lib/modules/shadowAccount.inc:190
 msgid "This is the date when the account will expire. Format: DD-MM-YYYY"
 msgstr "帐号过期日期: DD-MM-YYYY"
 
@@ -6911,7 +7468,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:82
+#: ../lib/modules/asteriskAccount.inc:84
 msgid "This is the machine id (e.g. IP address or host name) from which the user can call/receive calls."
 msgstr "这是用户可以拨打或接听的机器ID(比如:IP地址或主机名)"
 
@@ -6924,15 +7481,15 @@ msgstr "用户的邮件服务器."
 msgid "This is the name of this group."
 msgstr "组名."
 
-#: ../lib/modules/posixAccount.inc:419
+#: ../lib/modules/posixAccount.inc:421
 msgid "This is the natural name of the host. If empty, the host name will be used."
 msgstr "主机帐号的自然名(natural name).留空使用主机名."
 
-#: ../lib/modules/inetOrgPerson.inc:620
+#: ../lib/modules/inetOrgPerson.inc:548
 msgid "This is the natural name of the user. If empty, the first and last name is used."
 msgstr "用户自然名,留空会使用姓名."
 
-#: ../lib/modules/posixAccount.inc:397
+#: ../lib/modules/posixAccount.inc:399
 msgid "This is the natural name of the user. If empty, the first and last name or user name is used."
 msgstr "用户的自然名.留空会使用姓名."
 
@@ -6948,7 +7505,7 @@ 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:329
+#: ../lib/modules/sambaSamAccount.inc:331
 msgid "This is the path to the user's home directory."
 msgstr "这是用户的主目录路径."
 
@@ -6956,11 +7513,11 @@ msgstr "这是用户的主目录路径."
 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:304
+#: ../lib/modules/sambaSamAccount.inc:306
 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:308
+#: ../lib/modules/sambaSamAccount.inc:310
 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."
 
@@ -6980,8 +7537,8 @@ msgstr "搜索LDAP时的LDAP树后缀.只有在这个子树下的条目被显示
 msgid "This is the target email address for the user's mails."
 msgstr "用户邮件的最终地址."
 
-#: ../lib/modules/uidObject.inc:53
 #: ../lib/modules/customScripts.inc:46
+#: ../lib/modules/uidObject.inc:53
 #: ../lib/modules/aliasEntry.inc:55
 msgid "This is the target of this alias entry."
 msgstr "此别名条件的实际名."
@@ -7002,24 +7559,23 @@ 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:323
+#: ../lib/modules/sambaSamAccount.inc:325
 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:295
+#: ../lib/modules/sambaSamAccount.inc:297
 msgid "This is the user's primary Windows group."
 msgstr "用户的Windows主要组."
 
-#: ../lib/modules/posixAccount.inc:92
+#: ../lib/modules/posixAccount.inc:93
 msgid "This login shell is invalid!"
 msgstr "登录shell非法!"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:233
+#: ../lib/modules/inetLocalMailRecipient.inc:235
 msgid "This mail address is already in use:"
 msgstr "邮件地址已被使用: "
 
-#: ../lib/modules/quota.inc:364
-#: ../lib/lamdaemon.inc:44
+#: ../lib/lamdaemon.inc:46
 msgid "This module requires the PHP ssh2 extension."
 msgstr "本模块需要PHP ssh2 扩展支持"
 
@@ -7027,27 +7583,27 @@ msgstr "本模块需要PHP ssh2 扩展支持"
 msgid "This object class is obsolete."
 msgstr "这个对象类是陈旧的."
 
-#: ../lib/modules/sambaSamAccount.inc:314
+#: ../lib/modules/sambaSamAccount.inc:316
 msgid "This option defines the allowed logon hours for this account."
 msgstr "允许帐号登录的时间."
 
-#: ../lib/modules/sambaSamAccount.inc:317
+#: ../lib/modules/sambaSamAccount.inc:319
 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:201
+#: ../lib/modules/asteriskExtension.inc:206
 msgid "This pair of extension name and priority already exists."
 msgstr "扩展名和优先级的配对已经存在!"
 
-#: ../lib/modules/sambaSamAccount.inc:338
+#: ../lib/modules/sambaSamAccount.inc:340
 msgid "This program is run after the login."
 msgstr "登录后运行的程序。"
 
-#: ../lib/modules/sambaSamAccount.inc:362
+#: ../lib/modules/sambaSamAccount.inc:364
 msgid "This specifies the reconnect policy."
 msgstr "这里指定断开连接的策略。"
 
-#: ../lib/modules/sambaSamAccount.inc:359
+#: ../lib/modules/sambaSamAccount.inc:361
 msgid "This specifies what to do when the client connection is broken."
 msgstr "这里指定客户连接中断的动作。"
 
@@ -7083,7 +7639,7 @@ msgstr "用户未找到!"
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"!"
 msgstr "此值只能设为 \\\"true\\\" 或 \\\"false\\\"!"
 
-#: ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/posixAccount.inc:94
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"."
 msgstr "此值只能设为 \\\"true\\\" 或 \\\"false\\\"."
 
@@ -7095,7 +7651,7 @@ msgstr "此值必须是用分号分开的用户名列表."
 msgid "This will create a new organizational unit under the selected one."
 msgstr "在所选的节点下建立新的组织单元."
 
-#: ../lib/modules/posixAccount.inc:360
+#: ../lib/modules/posixAccount.inc:362
 msgid "This will create the user's home directory on the specified server."
 msgstr "将在指定的服务器上建立用户的主目录."
 
@@ -7108,17 +7664,18 @@ msgid "This will delete the selected profile."
 msgstr "将删除所选的配置文件."
 
 #: ../lib/modules/eduPerson.inc:128
-#: ../lib/modules/sambaSamAccount.inc:374
-#: ../lib/modules/shadowAccount.inc:194
+#: ../lib/modules/sambaSamAccount.inc:376
 #: ../lib/modules/phpGroupwareUser.inc:87
+#: ../lib/modules/shadowAccount.inc:194
+#: ../lib/modules/hostObject.inc:77
 msgid "This will enable the extension automatically if this profile is loaded."
 msgstr "在配置文件调入时，将自动打开扩展项。"
 
-#: ../lib/modules/sambaSamAccount.inc:239
+#: ../lib/modules/sambaSamAccount.inc:241
 msgid "This will reset the host's password to a default value."
 msgstr "将主机密码复位到缺省值."
 
-#: ../templates/lists/changePassword.php:175
+#: ../templates/lists/changePassword.php:171
 #: ../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 "将会生成一个随机的密码并在屏幕上显示或通过邮件发送给用户。"
@@ -7127,33 +7684,32 @@ 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:1317
+#: ../lib/modules/sambaSamAccount.inc:1319
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../lib/modules/sambaSamAccount.inc:1358
+#: ../lib/modules/sambaSamAccount.inc:1360
 msgid "Time"
 msgstr "时间"
 
-#: ../lib/modules/sambaSamAccount.inc:343
+#: ../lib/modules/sambaSamAccount.inc:345
 msgid "Time limit"
 msgstr "时间限制"
 
-#: ../lib/modules/sambaSamAccount.inc:322
-#: ../lib/modules/sambaSamAccount.inc:524
+#: ../lib/modules/sambaSamAccount.inc:324
+#: ../lib/modules/sambaSamAccount.inc:526
 msgid "Time zone"
 msgstr "时区"
 
-#: ../templates/tests/lamdaemonTest.php:146
 #: ../lib/lamdaemon.inc:75
 msgid "Timeout while executing lamdaemon commands!"
 msgstr "运行lamdaemon命令超时!"
 
-#: ../lib/modules/posixAccount.inc:389
+#: ../lib/modules/posixAccount.inc:391
 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:548
+#: ../lib/modules/sambaSamAccount.inc:550
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "东京,首尔,大孤,雅库茨克"
 
@@ -7183,50 +7739,51 @@ msgstr "树状结构"
 msgid "TreeSuffix is invalid!"
 msgstr "树状结构后缀非法!"
 
-#: ../lib/modules/sambaSamAccount.inc:1317
+#: ../lib/modules/sambaSamAccount.inc:1319
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../templates/schema/schema.php:346
 #: ../templates/selfService/profManage.php:156
+#: ../templates/schema/schema.php:346
 msgid "Type"
 msgstr "类型"
 
-#: ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:78
 msgid "UID"
 msgstr "UID"
 
-#: ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:78
 msgid "UID has changed. Do you want to change home directory?"
 msgstr "UID已经改变,想改变主目录吗?"
 
-#: ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:73
 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: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:950
-#: ../lib/modules/posixAccount.inc:1178
-#: ../lib/types/user.inc:92
 #: ../lib/types/host.inc:95
+#: ../lib/types/user.inc:92
+#: ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:216
+#: ../lib/modules/posixAccount.inc:290
+#: ../lib/modules/posixAccount.inc:312
+#: ../lib/modules/posixAccount.inc:329
+#: ../lib/modules/posixAccount.inc:333
+#: ../lib/modules/posixAccount.inc:341
+#: ../lib/modules/posixAccount.inc:950
+#: ../lib/modules/posixAccount.inc:1177
 msgid "UID number"
 msgstr "UID编号"
 
-#: ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:74
 #, 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:64
+#: ../lib/modules/posixAccount.inc:65
 msgid "UID ranges for Unix accounts"
 msgstr "Unix帐号的UID范围"
 
-#: ../lib/modules/sambaSamAccount.inc:280
+#: ../lib/modules/sambaSamAccount.inc:282
 msgid "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced with user and group name."
 msgstr "用户主目录(\\\\server\\share).$user和$group会使用用户和组名来替代."
 
@@ -7235,53 +7792,54 @@ 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:262
+#: ../templates/selfService/selfServiceMain.php:264
 msgid "Unable to change your account. Maybe you do not have enough rights to change the settings."
 msgstr "无法改变您的帐号,可以没有足够的权限改变设置."
 
-#: ../templates/tests/lamdaemonTest.php:135
-#: ../templates/tests/lamdaemonTest.php:286
+#: ../templates/tests/lamdaemonTest.php:241
 #: ../lib/lamdaemon.inc:88
 #: ../lib/lamdaemon.inc:93
+#: ../lib/lamdaemon.inc:137
+#: ../lib/lamdaemon.inc:142
 msgid "Unable to connect to remote server!"
 msgstr "无法连接远端服务器 !"
 
-#: ../templates/ou_edit.php:74
+#: ../templates/ou_edit.php:77
 msgid "Unable to create new OU!"
 msgstr "无法建立新OU!"
 
-#: ../templates/selfService/profManage.php:82
 #: ../templates/config/profmanage.php:96
+#: ../templates/selfService/profManage.php:82
 msgid "Unable to create new profile!"
 msgstr "无法建立新的配置文件!"
 
-#: ../templates/ou_edit.php:91
+#: ../templates/ou_edit.php:94
 msgid "Unable to delete OU!"
 msgstr "无法删除OU!"
 
-#: ../templates/pdfedit/pdfdelete.php:60
+#: ../templates/pdfedit/pdfmain.php:122
 msgid "Unable to delete PDF structure!"
 msgstr "无法删除PDF结构!"
 
-#: ../templates/selfService/profManage.php:110
-#: ../templates/profedit/profiledelete.php:62
 #: ../templates/config/profmanage.php:118
+#: ../templates/selfService/profManage.php:110
+#: ../templates/profedit/profilemain.php:111
 msgid "Unable to delete profile!"
 msgstr "无法删除配置文件!"
 
-#: ../lib/modules/nisnetgroup.inc:526
-#: ../lib/modules/posixAccount.inc:1362
-#: ../lib/modules/posixAccount.inc:1596
+#: ../lib/modules/posixAccount.inc:1364
+#: ../lib/modules/posixAccount.inc:1598
+#: ../lib/modules/nisnetgroup.inc:530
 msgid "Unable to find group in LDAP."
 msgstr "LDAP中找不到组."
 
-#: ../templates/login.php:423
-#: ../templates/login.php:429
+#: ../templates/login.php:439
+#: ../templates/login.php:445
 msgid "Unable to find the user name in LDAP."
 msgstr "LDAP中找不到用户名."
 
-#: ../lib/modules.inc:1657
-#: ../lib/modules.inc:1661
+#: ../lib/modules.inc:1677
+#: ../lib/modules.inc:1681
 msgid "Unable to load LDAP entry:"
 msgstr "无法调入LDAP条目:"
 
@@ -7289,80 +7847,63 @@ msgstr "无法调入LDAP条目:"
 msgid "Unable to load available languages. Setting English as default language. For further instructions please contact the Admin of this site."
 msgstr "无法调入语言配置文件,将使用英语做为缺省语言,请联系网络管理员获取进一步的信息."
 
-#: ../lib/selfService.inc:174
-#: ../lib/selfService.inc:178
 #: ../lib/profiles.inc:91
 #: ../lib/profiles.inc:95
+#: ../lib/selfService.inc:174
+#: ../lib/selfService.inc:178
 msgid "Unable to load profile!"
 msgstr "无法调入配置文件!"
 
-#: ../templates/lists/changePassword.php:365
+#: ../templates/lists/changePassword.php:385
 msgid "Unable to read sambaSID attribute."
 msgstr "读取sambaSID属性失败."
 
+#: ../templates/tests/schemaTest.php:56
 #: ../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:127
+#: ../templates/profedit/profilepage.php:113
 msgid "Unable to save profile!"
 msgstr "无法存储配置文件!"
 
-#: ../templates/lists/changePassword.php:317
+#: ../templates/lists/changePassword.php:341
 msgid "Unable to send mail!"
 msgstr "无法发送邮件!"
 
-#: ../templates/lists/changePassword.php:361
-#: ../templates/lists/changePassword.php:376
+#: ../templates/lists/changePassword.php:381
+#: ../templates/lists/changePassword.php:396
 msgid "Unable to sync the time when the user can/must change his password because no domain was found."
 msgstr "用户可以/必须修改密码时,因域名未发现而不能同步时间."
 
 #: ../lib/modules/posixGroup.inc:283
-#: ../lib/modules/posixAccount.inc:126
+#: ../lib/modules/posixAccount.inc:127
 msgid "Unix"
 msgstr "unix"
 
-#: ../templates/tests/lamdaemonTest.php:227
+#: ../templates/tests/lamdaemonTest.php:199
 msgid "Unix account"
 msgstr "Unix帐号"
 
-#: ../lib/modules/inetOrgPerson.inc:71
-#: ../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工作站"
-
-#: ../lib/modules/inetOrgPerson.inc:71
-#: ../lib/modules/inetOrgPerson.inc:72
-msgid "Unix workstations are invalid!"
-msgstr "unix工作站无效!"
-
-#: ../templates/tests/lamdaemonTest.php:161
-msgid "Unknown error"
-msgstr "未知错误"
-
 #: ../templates/lists/changePassword.php:111
 msgid "Unlock Samba account"
 msgstr "解锁Samba账号."
 
 #: ../lib/modules/posixGroup.inc:191
-#: ../lib/modules/posixAccount.inc:1002
+#: ../lib/modules/posixAccount.inc:1001
 msgid "Unlock password"
 msgstr "解除密码锁定"
 
 #: ../templates/masscreate.php:98
-#: ../templates/config/confmodules.php:354
+#: ../templates/config/confmodules.php:359
 msgid "Unsolved dependency:"
 msgstr "未解决的依赖性问题:"
 
-#: ../templates/pdfedit/pdfpage.php:405
+#: ../templates/pdfedit/pdfpage.php:429
 msgid "Up"
 msgstr "向上"
 
@@ -7370,7 +7911,7 @@ msgstr "向上"
 msgid "Update Samba password timestamps"
 msgstr "修改 Samba 密码时间戳."
 
-#: ../lib/modules/sambaSamAccount.inc:227
+#: ../lib/modules/sambaSamAccount.inc:229
 msgid "Update attribute \"sambaPwdLastSet\" on password change"
 msgstr "在密码修改时修改 \"sambaPwdLastSet\"属性"
 
@@ -7378,11 +7919,11 @@ msgstr "在密码修改时修改 \"sambaPwdLastSet\"属性"
 msgid "Upload accounts to LDAP"
 msgstr "上传帐号到LDAP"
 
-#: ../templates/masscreate.php:220
+#: ../templates/masscreate.php:225
 msgid "Upload file and create accounts"
 msgstr "开始上传,建立帐号"
 
-#: ../lib/modules.inc:464
+#: ../lib/modules.inc:478
 #, php-format
 msgid "Upload was stopped after errors in %s module!"
 msgstr "因为在%s模块中有错,上传停止."
@@ -7391,22 +7932,22 @@ msgstr "因为在%s模块中有错,上传停止."
 msgid "Usage"
 msgstr "用法"
 
-#: ../lib/modules/sambaSamAccount.inc:241
-#: ../lib/modules/sambaSamAccount.inc:244
-#: ../lib/modules/sambaSamAccount.inc:402
+#: ../lib/modules/sambaSamAccount.inc:243
+#: ../lib/modules/sambaSamAccount.inc:246
+#: ../lib/modules/sambaSamAccount.inc:404
 msgid "Use Unix password"
 msgstr "使用unix的密码"
 
-#: ../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
+#: ../lib/modules/sambaSamAccount.inc:249
+#: ../lib/modules/sambaSamAccount.inc:252
+#: ../lib/modules/sambaSamAccount.inc:412
+#: ../lib/modules/sambaSamAccount.inc:1090
+#: ../lib/modules/sambaSamAccount.inc:1548
 msgid "Use no password"
 msgstr "无需密码"
 
 #: ../lib/modules/quota.inc:101
-#: ../lib/modules/quota.inc:386
+#: ../lib/modules/quota.inc:382
 msgid "Used blocks"
 msgstr "已使用的块数"
 
@@ -7427,7 +7968,7 @@ msgid "Used for calculating RIDs from UID/GID. Do not change if unsure."
 msgstr "用来从UID/GID计算RID,不确定的话请不用修改."
 
 #: ../lib/modules/quota.inc:123
-#: ../lib/modules/quota.inc:390
+#: ../lib/modules/quota.inc:386
 msgid "Used inodes"
 msgstr "已经使用的节点"
 
@@ -7435,9 +7976,9 @@ msgstr "已经使用的节点"
 msgid "Used inodes (files)"
 msgstr "已经使用的节点(文件)"
 
-#: ../lib/modules/nisnetgroup.inc:204
-#: ../lib/modules/nisnetgroup.inc:574
 #: ../lib/modules/sambaGroupMapping.inc:67
+#: ../lib/modules/nisnetgroup.inc:208
+#: ../lib/modules/nisnetgroup.inc:578
 msgid "User"
 msgstr "用户"
 
@@ -7449,16 +7990,16 @@ msgstr "用户ID"
 msgid "User accounts (e.g. Unix, Samba and Kolab)"
 msgstr "用户帐号(例如 Unix, Samba和Kolab)"
 
-#: ../lib/modules/sambaSamAccount.inc:271
-#: ../lib/modules/sambaSamAccount.inc:1114
+#: ../lib/modules/sambaSamAccount.inc:273
+#: ../lib/modules/sambaSamAccount.inc:1116
 msgid "User can change password"
 msgstr "用户可以修改密码"
 
-#: ../lib/modules/posixAccount.inc:369
+#: ../lib/modules/posixAccount.inc:371
 msgid "User description. If left empty first and last name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名."
 
-#: ../lib/modules/inetOrgPerson.inc:564
+#: ../lib/modules/inetOrgPerson.inc:492
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名"
 
@@ -7470,15 +8011,16 @@ msgstr "用户的描述,如果留空将会使用用户名."
 msgid "User modification"
 msgstr "用户修改"
 
-#: ../lib/modules/sambaSamAccount.inc:273
-#: ../lib/modules/sambaSamAccount.inc:1120
+#: ../lib/modules/sambaSamAccount.inc:275
+#: ../lib/modules/sambaSamAccount.inc:1122
 msgid "User must change password"
 msgstr "用户必须修改密码"
 
-#: ../templates/lists/changePassword.php:134
-#: ../templates/login.php:229
-#: ../lib/modules/nisnetgroup.inc:135
-#: ../lib/modules/nisnetgroup.inc:454
+#: ../templates/lists/changePassword.php:145
+#: ../templates/login.php:241
+#: ../lib/types/alias.inc:91
+#: ../lib/types/user.inc:94
+#: ../lib/modules/account.inc:78
 #: ../lib/modules/account.inc:94
 #: ../lib/modules/account.inc:116
 #: ../lib/modules/account.inc:118
@@ -7486,60 +8028,75 @@ msgstr "用户必须修改密码"
 #: ../lib/modules/account.inc:201
 #: ../lib/modules/account.inc:223
 #: ../lib/modules/account.inc:247
-#: ../lib/modules/inetOrgPerson.inc:99
-#: ../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:69
 #: ../lib/modules/uidObject.inc:78
-#: ../lib/modules/uidObject.inc:92
-#: ../lib/modules/uidObject.inc:154
-#: ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/uidObject.inc:93
+#: ../lib/modules/uidObject.inc:155
 #: ../lib/modules/posixAccount.inc:79
-#: ../lib/modules/posixAccount.inc:82
-#: ../lib/modules/posixAccount.inc:201
-#: ../lib/modules/posixAccount.inc:364
+#: ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/posixAccount.inc:202
+#: ../lib/modules/posixAccount.inc:311
+#: ../lib/modules/posixAccount.inc:366
 #: ../lib/modules/posixAccount.inc:938
-#: ../lib/modules/posixAccount.inc:1176
-#: ../lib/types/user.inc:94
-#: ../lib/types/alias.inc:91
+#: ../lib/modules/posixAccount.inc:1175
+#: ../lib/modules/nisnetgroup.inc:137
+#: ../lib/modules/nisnetgroup.inc:458
+#: ../lib/modules/inetOrgPerson.inc:70
+#: ../lib/modules/inetOrgPerson.inc:484
+#: ../lib/modules/inetOrgPerson.inc:551
+#: ../lib/modules/inetOrgPerson.inc:822
+#: ../lib/modules/inetOrgPerson.inc:1140
+#: ../lib/modules/inetOrgPerson.inc:1198
 msgid "User name"
 msgstr "用户名"
 
-#: ../lib/modules/inetOrgPerson.inc:101
-#: ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:87
+#: ../lib/modules/inetOrgPerson.inc:72
 msgid "User name already exists!"
 msgstr "用户名已经存在!"
 
-#: ../lib/modules/nisnetgroup.inc:135
 #: ../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:79
-#: ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/nisnetgroup.inc:137
+#: ../lib/modules/inetOrgPerson.inc:70
+#: ../lib/modules/inetOrgPerson.inc:71
 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:82
+#: ../lib/modules/posixAccount.inc:83
 msgid "User name in use. Selected next free user name."
 msgstr "用户名存在,请选择其他的用户名."
 
 #: ../lib/modules/account.inc:95
-#: ../lib/modules/inetOrgPerson.inc:624
-#: ../lib/modules/posixAccount.inc:365
+#: ../lib/modules/posixAccount.inc:367
+#: ../lib/modules/inetOrgPerson.inc:552
 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:58
-#: ../lib/modules/posixAccount.inc:59
-#: ../lib/modules/posixAccount.inc:62
-#: ../lib/modules/posixAccount.inc:161
+#: ../lib/types/sudo.inc:78
+msgid "User(s)"
+msgstr "用户"
+
 #: ../lib/types/user.inc:53
+#: ../lib/modules/asteriskAccount.inc:102
+#: ../lib/modules/posixAccount.inc:59
+#: ../lib/modules/posixAccount.inc:60
+#: ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:162
+#: ../lib/modules/sudoRole.inc:63
+#: ../lib/modules/sudoRole.inc:87
+#: ../lib/modules/sudoRole.inc:134
+#: ../lib/modules/sudoRole.inc:173
+#: ../lib/modules/sudoRole.inc:182
+#: ../lib/modules/sudoRole.inc:285
+#: ../lib/modules/sudoRole.inc:708
 msgid "Users"
 msgstr "用户"
 
@@ -7551,12 +8108,12 @@ msgstr "当前组成员,这里不会显示将此组设为主要组的用户"
 msgid "Users who will become member of the current group. User names are separated by semicolons."
 msgstr "属于当前组的用户,以分号隔开."
 
-#: ../templates/tests/lamdaemonTest.php:219
+#: ../templates/tests/lamdaemonTest.php:191
 #, php-format
 msgid "Using %s as lamdaemon remote server."
 msgstr "使用%s做为lamdeamon的远程服务器."
 
-#: ../templates/tests/lamdaemonTest.php:240
+#: ../templates/tests/lamdaemonTest.php:212
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "使用%s连接远程服务器."
@@ -7565,7 +8122,7 @@ msgstr "使用%s连接远程服务器."
 msgid "Using template:"
 msgstr "使用模板:"
 
-#: ../lib/modules/posixAccount.inc:324
+#: ../lib/modules/posixAccount.inc:326
 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加入主组.如果你的应用程序不支持主组,你可以选择此项修改原来的选项."
 
@@ -7581,21 +8138,34 @@ msgstr "生产商"
 msgid "Vendor version"
 msgstr "生产商版本"
 
-#: ../templates/login.php:182
+#: ../lib/modules/asteriskVoicemail.inc:106
+#: ../lib/modules/asteriskVoicemail.inc:117
+#: ../lib/modules/asteriskVoicemail.inc:139
+#: ../lib/modules/asteriskVoicemail.inc:192
+#: ../lib/modules/asteriskVoicemail.inc:261
+#: ../lib/modules/asteriskVoicemail.inc:376
+msgid "Voicemail context"
+msgstr "语音邮件的语境."
+
+#: ../lib/modules/asteriskVoicemail.inc:83
+msgid "Voicemail mailbox for this account."
+msgstr "此帐号的语音邮箱."
+
+#: ../templates/login.php:180
 msgid "Want more features? Get LAM Pro!"
 msgstr "需要更多的功能吗? 参见系统专业版! "
 
-#: ../templates/config/mainmanage.php:262
+#: ../templates/config/mainmanage.php:267
 msgid "Warning"
 msgstr "警告"
 
 #: ../templates/delete.php:194
-#: ../lib/modules.inc:1946
+#: ../lib/modules.inc:1972
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "无法为DN: %s增加属性."
 
-#: ../lib/modules.inc:1916
+#: ../lib/modules.inc:1942
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "无法创建DN: %s."
@@ -7608,35 +8178,35 @@ msgid "Was unable to delete DN: %s."
 msgstr "无法删除DN: %s."
 
 #: ../templates/tree/update.php:109
-#: ../templates/tree/add_oclass_form.php:162
 #: ../templates/tree/add_oclass.php:93
+#: ../templates/tree/add_oclass_form.php:162
 #: ../templates/delete.php:186
-#: ../lib/modules.inc:1934
+#: ../lib/modules.inc:1960
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "无法修改DN: %s的属性"
 
-#: ../templates/lists/changePassword.php:393
+#: ../templates/lists/changePassword.php:422
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "无法修改DN: %s的属性"
 
 #: ../templates/delete.php:202
-#: ../lib/modules.inc:1958
+#: ../lib/modules.inc:1984
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "无法删除DN: %s的属性."
 
-#: ../lib/modules.inc:1903
+#: ../lib/modules.inc:1923
 #, php-format
 msgid "Was unable to rename DN: %s."
 msgstr "无法重命名DN: %s."
 
-#: ../lib/modules/sambaSamAccount.inc:1317
+#: ../lib/modules/sambaSamAccount.inc:1319
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../lib/modules/sambaSamAccount.inc:539
+#: ../lib/modules/sambaSamAccount.inc:541
 msgid "Western Europe Time, London, Lisbon"
 msgstr "西欧时间,伦敦,里斯本"
 
@@ -7644,16 +8214,18 @@ 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:311
+#: ../lib/modules/sambaSamAccount.inc:313
 msgid "Windows domain name of account."
 msgstr "帐号所属的windows域"
 
+#: ../lib/modules/sambaSamAccount.inc:191
+#: ../lib/modules/sambaSamAccount.inc:443
+#: ../lib/modules/sambaSamAccount.inc:1208
+#: ../lib/modules/sambaSamAccount.inc:1635
+#: ../lib/modules/sambaSamAccount.inc:1784
 #: ../lib/modules/sambaGroupMapping.inc:256
+#: ../lib/modules/sambaGroupMapping.inc:310
 #: ../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组"
 
@@ -7665,15 +8237,15 @@ msgstr "Windows组名"
 msgid "Windows group type."
 msgstr "Windows组类型"
 
-#: ../lib/modules/sambaSamAccount.inc:368
+#: ../lib/modules/sambaSamAccount.inc:370
 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:294
+#: ../lib/modules/sambaSamAccount.inc:296
 msgid "Windows primary group"
 msgstr "Windows主组"
 
-#: ../lib/modules/sambaSamAccount.inc:297
+#: ../lib/modules/sambaSamAccount.inc:299
 msgid "Windows primary group SID"
 msgstr "Windows主组的SID"
 
@@ -7685,13 +8257,14 @@ msgstr "组的windows域名."
 msgid "Workgroup"
 msgstr "工作组"
 
-#: ../lib/modules/sambaSamAccount.inc:340
-#: ../lib/modules/sambaSamAccount.inc:1459
-#: ../lib/modules/sambaSamAccount.inc:1802
+#: ../lib/modules/sambaSamAccount.inc:215
+#: ../lib/modules/sambaSamAccount.inc:342
+#: ../lib/modules/sambaSamAccount.inc:1461
+#: ../lib/modules/sambaSamAccount.inc:1804
 msgid "Working directory"
 msgstr "工作目录"
 
-#: ../lib/modules/sambaSamAccount.inc:341
+#: ../lib/modules/sambaSamAccount.inc:343
 msgid "Working directory of initial program."
 msgstr "初始化程序的工作目录。"
 
@@ -7704,10 +8277,10 @@ msgstr "写入"
 msgid "Write access"
 msgstr "写权限"
 
-#: ../templates/selfService/selfServiceLogin.php:96
-#: ../templates/selfService/selfServiceLogin.php:114
-#: ../templates/login.php:411
-#: ../templates/login.php:469
+#: ../templates/login.php:427
+#: ../templates/login.php:485
+#: ../templates/selfService/selfServiceLogin.php:98
+#: ../templates/selfService/selfServiceLogin.php:116
 msgid "Wrong password/user name combination. Please try again."
 msgstr "错误的密码和用户组合,请重试!"
 
@@ -7723,11 +8296,14 @@ msgid "You are using a capital letters. This can cause problems because Windows
 msgstr "您使用了大写字符,这会造成一些问题,因为windows大小写不敏感."
 
 #: ../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大小写不敏感."
 
+#: ../lib/modules/posixAccount.inc:79
+#: ../lib/modules/posixAccount.inc:81
+msgid "You are using capital letters. This can cause problems because Windows is not case-sensitive."
+msgstr "您正在使用大写字符,这会造成一些问题,因为windows大小写不敏感."
+
 #: ../help/help.inc:103
 msgid "You can specify if LAM allows full write access, password changes or only read access."
 msgstr "您可以指定LAM是否允许全部权限,只能更改密码,或是只读."
@@ -7754,11 +8330,7 @@ msgstr "您无权访问或LDAP架构未发布到LDAP服务器。"
 msgid "You entered one or more invalid DNS servers."
 msgstr "您输入了一个或多个非常的DNS服务器."
 
-#: ../templates/logout.php:77
-msgid "You have been logged off from LDAP Account Manager."
-msgstr "您已经从系统退出"
-
-#: ../templates/lists/changePassword.php:278
+#: ../templates/lists/changePassword.php:285
 msgid "You have to activate the \"I am sure\" checkbox."
 msgstr "您必须激活\"我确认\"选项。"
 
@@ -7775,18 +8347,20 @@ msgstr "%s是必填项目."
 msgid "You made no changes."
 msgstr "您没有做任何修改."
 
-#: ../lib/modules/groupOfNames.inc:121
-#: ../lib/modules/groupOfNames.inc:122
+#: ../lib/modules/groupOfNames.inc:124
+#: ../lib/modules/groupOfNames.inc:125
 msgid "You need to add at least one member to this group."
 msgstr "您至少需要为这个组增加一个成员."
 
-#: ../templates/tests/lamdaemonTest.php:244
+#: ../templates/tests/lamdaemonTest.php:216
 #, 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:59
-#: ../lib/lamdaemon.inc:64
+#: ../lib/lamdaemon.inc:60
+#: ../lib/lamdaemon.inc:65
+#: ../lib/lamdaemon.inc:122
+#: ../lib/lamdaemon.inc:127
 msgid "Your LAM admin user must be a valid Unix account to work with lamdaemon!"
 msgstr "系统管理者必须有一个合法的UNIX帐号才能运行lamdaemon !"
 
@@ -7794,25 +8368,26 @@ msgstr "系统管理者必须有一个合法的UNIX帐号才能运行lamdaemon !
 msgid "Your PHP configuration has disabled file uploads. Please check php.ini before proceeding."
 msgstr "PHP设置已经关闭了文件上传,请检查PHP.INI ."
 
-#: ../lib/security.inc:141
+#: ../lib/security.inc:145
 msgid "Your session expired, click here to go back to the login page."
 msgstr "超时,请点此外返回到登录界面."
 
-#: ../templates/login.php:208
+#: ../templates/login.php:206
 msgid "Your session expired, please log in again."
 msgstr "超时,请重新登录."
 
+#: ../templates/login.php:211
+#: ../templates/login.php:216
 #: ../templates/selfService/adminMain.php:139
-#: ../templates/config/mainmanage.php:148
-#: ../lib/config.inc:416
 msgid "Your settings were successfully saved."
 msgstr "设置保存成功."
 
-#: ../lib/modules/inetOrgPerson.inc:472
+#: ../lib/modules/inetOrgPerson.inc:412
 msgid "YourCompany, Human Resources"
 msgstr "某某公司,人力资源部"
 
 #: ../lib/modules/ddns.inc:99
+#: ../lib/modules/ddns.inc:108
 #: ../lib/modules/ddns.inc:123
 #: ../lib/modules/ddns.inc:379
 #: ../lib/modules/ddns.inc:412
@@ -7828,29 +8403,33 @@ msgstr "DNS服务器的区域名(比如: company.local)."
 msgid "[attribute deleted]"
 msgstr "[删除属性]"
 
-#: ../lib/modules/sambaSamAccount.inc:467
+#: ../lib/modules/sambaSamAccount.inc:469
 msgid "\\\\server\\homes\\smiller"
 msgstr "\\\\server\\homes\\smiller"
 
-#: ../lib/modules/sambaSamAccount.inc:475
+#: ../lib/modules/sambaSamAccount.inc:477
 msgid "\\\\server\\profiles\\smiller"
 msgstr "\\\\server\\profiles\\smiller"
 
-#: ../lib/modules/phpGroupwareUser.inc:162
-#: ../lib/modules/phpGroupwareUser.inc:332
+#: ../lib/modules/phpGroupwareUser.inc:164
+#: ../lib/modules/phpGroupwareUser.inc:334
 msgid "active"
 msgstr "激活"
 
-#: ../templates/tree/edit.php:497
+#: ../templates/tree/edit.php:494
 msgid "add value"
 msgstr "增加值"
 
+#: ../lib/modules/posixGroup.inc:360
 #: ../lib/modules/nisnetgroup.inc:99
 #: ../lib/modules/groupOfNames.inc:86
-#: ../lib/modules/posixGroup.inc:360
 msgid "adminstrators"
 msgstr "管理员"
 
+#: ../lib/modules/sudoRole.inc:123
+msgid "backupRootFileSystem"
+msgstr "备份根文件系统"
+
 #: ../templates/schema/schema.php:218
 msgid "character"
 msgstr "字符"
@@ -7864,53 +8443,36 @@ msgid "dc=yourcompany,dc=com"
 msgstr "dc=yourcompany,dc=com"
 
 #: ../lib/modules/ppolicyUser.inc:88
-#: ../lib/modules/ppolicyUser.inc:93
-#: ../lib/modules/ppolicyUser.inc:110
-#: ../lib/modules/ppolicyUser.inc:154
+#: ../lib/modules/ppolicyUser.inc:96
+#: ../lib/modules/ppolicyUser.inc:114
+#: ../lib/modules/ppolicyUser.inc:158
 msgid "default"
 msgstr "缺省"
 
-#: ../templates/tree/edit.php:317
+#: ../templates/tree/edit.php:314
 msgid "delete attribute"
 msgstr "删除属性"
 
-#: ../lib/modules/sambaSamAccount.inc:1494
-#: ../lib/modules/sambaSamAccount.inc:1822
+#: ../lib/modules/sambaSamAccount.inc:1496
+#: ../lib/modules/sambaSamAccount.inc:1824
 msgid "disabled"
 msgstr "关闭"
 
-#: ../lib/modules/sambaSamAccount.inc:1506
-#: ../lib/modules/sambaSamAccount.inc:1833
+#: ../lib/modules/sambaSamAccount.inc:1508
+#: ../lib/modules/sambaSamAccount.inc:1835
 msgid "disconnect"
 msgstr "中断连接"
 
-#: ../templates/lists/changePassword.php:178
-msgid "display on screen"
-msgstr "屏幕显示"
-
+#: ../templates/tree/edit.php:179
+#: ../templates/tree/edit.php:181
+#: ../templates/tree/edit.php:308
+#: ../templates/tree/edit.php:310
 #: ../templates/tree/add_value_form.php:107
 #: ../templates/tree/add_value_form.php:110
-#: ../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: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: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:394
+#: ../templates/tree/edit.php:391
 msgid "false"
 msgstr "失败"
 
@@ -7918,48 +8480,48 @@ msgstr "失败"
 msgid "force"
 msgstr "强制"
 
-#: ../lib/modules/sambaSamAccount.inc:1515
-#: ../lib/modules/sambaSamAccount.inc:1841
+#: ../lib/modules/sambaSamAccount.inc:1517
+#: ../lib/modules/sambaSamAccount.inc:1843
 msgid "from any client"
 msgstr "从任何客户端"
 
-#: ../lib/modules/sambaSamAccount.inc:1516
-#: ../lib/modules/sambaSamAccount.inc:1842
+#: ../lib/modules/sambaSamAccount.inc:1518
+#: ../lib/modules/sambaSamAccount.inc:1844
 msgid "from previous client only"
 msgstr "仅从以前的客户端"
 
+#: ../lib/modules/posixAccount.inc:231
 #: ../lib/modules/nisnetgroup.inc:113
-#: ../lib/modules/posixAccount.inc:230
 msgid "group01,group02"
 msgstr "group01,group02"
 
-#: ../lib/modules/quota.inc:186
-#: ../lib/modules/quota.inc:188
+#: ../lib/modules/quota.inc:187
+#: ../lib/modules/quota.inc:189
 msgid "hours"
 msgstr "小时"
 
-#: ../lib/modules/phpGroupwareUser.inc:162
-#: ../lib/modules/phpGroupwareUser.inc:335
+#: ../lib/modules/phpGroupwareUser.inc:164
+#: ../lib/modules/phpGroupwareUser.inc:337
 msgid "inactive"
 msgstr "停用"
 
-#: ../lib/modules/sambaSamAccount.inc:1498
-#: ../lib/modules/sambaSamAccount.inc:1826
+#: ../lib/modules/sambaSamAccount.inc:1500
+#: ../lib/modules/sambaSamAccount.inc:1828
 msgid "input off, notify off"
 msgstr "输入关，提醒关"
 
-#: ../lib/modules/sambaSamAccount.inc:1497
-#: ../lib/modules/sambaSamAccount.inc:1825
+#: ../lib/modules/sambaSamAccount.inc:1499
+#: ../lib/modules/sambaSamAccount.inc:1827
 msgid "input off, notify on"
 msgstr "输入关，提醒开"
 
-#: ../lib/modules/sambaSamAccount.inc:1496
-#: ../lib/modules/sambaSamAccount.inc:1824
+#: ../lib/modules/sambaSamAccount.inc:1498
+#: ../lib/modules/sambaSamAccount.inc:1826
 msgid "input on, notify off"
 msgstr "输入开，提醒关"
 
-#: ../lib/modules/sambaSamAccount.inc:1495
-#: ../lib/modules/sambaSamAccount.inc:1823
+#: ../lib/modules/sambaSamAccount.inc:1497
+#: ../lib/modules/sambaSamAccount.inc:1825
 msgid "input on, notify on"
 msgstr "输入开，提醒开"
 
@@ -7975,7 +8537,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:297
+#: ../lib/modules/posixAccount.inc:298
 msgid "machines"
 msgstr "机器"
 
@@ -7983,32 +8545,34 @@ msgstr "机器"
 msgid "mail.yourdomain.org"
 msgstr "mail.yourdomain.org"
 
-#: ../lib/modules/sambaSamAccount.inc:386
-#: ../lib/modules/sambaSamAccount.inc:510
+#: ../lib/modules/sambaSamAccount.inc:388
+#: ../lib/modules/sambaSamAccount.inc:512
 msgid "mydomain"
 msgstr "我的域"
 
-#: ../lib/modules/sambaSamAccount.inc:443
+#: ../lib/modules/sambaSamAccount.inc:445
 msgid "mygroup"
 msgstr "我的组"
 
 #: ../templates/config/confmain.php:244
 #: ../templates/config/confmain.php:248
+#: ../lib/modules/sambaSamAccount.inc:563
+#: ../lib/modules/sambaSamAccount.inc:1792
+#: ../lib/modules/sambaSamAccount.inc:1800
+#: ../lib/modules/sambaSamAccount.inc:1810
+#: ../lib/modules/sambaSamAccount.inc:1815
+#: ../lib/modules/sambaSamAccount.inc:1820
 #: ../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
+#: ../lib/modules/ppolicy.inc:503
+#: ../lib/modules/ppolicy.inc:508
+#: ../lib/modules/ppolicy.inc:515
+#: ../lib/modules/ppolicy.inc:518
 msgid "no"
 msgstr "否"
 
+#: ../templates/tree/templates/creation/custom.php:189
+#: ../templates/tree/templates/creation/custom.php:212
 #: ../templates/schema/schema.php:158
 #: ../templates/schema/schema.php:227
 #: ../templates/schema/schema.php:238
@@ -8017,12 +8581,10 @@ msgstr "否"
 #: ../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:395
+#: ../templates/tree/edit.php:392
 msgid "none, remove value"
 msgstr "空,删除值"
 
@@ -8041,52 +8603,48 @@ 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:244
+#: ../templates/masscreate.php:249
 #: ../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:283
+#: ../lib/modules/posixAccount.inc:284
 msgid "pc01$"
 msgstr "pc01$"
 
-#: ../lib/modules/posixAccount.inc:304
+#: ../lib/modules/posixAccount.inc:305
 msgid "pc01,Room 2.34"
 msgstr "pc01,Room 2.34"
 
-#: ../lib/modules/inetOrgPerson.inc:482
+#: ../lib/modules/hostObject.inc:86
 msgid "pc01,pc02"
 msgstr "pc01,pc02"
 
-#: ../templates/tree/edit.php:249
-#: ../templates/selfService/adminMain.php:605
+#: ../templates/tree/edit.php:246
 #: ../templates/config/confmain.php:531
-#: ../lib/modules.inc:1232
+#: ../templates/selfService/adminMain.php:616
 msgid "required"
 msgstr "必选项"
 
-#: ../lib/modules/sambaSamAccount.inc:1507
-#: ../lib/modules/sambaSamAccount.inc:1834
+#: ../lib/modules/sambaSamAccount.inc:1509
+#: ../lib/modules/sambaSamAccount.inc:1836
 msgid "reset"
 msgstr "复位"
 
+#: ../lib/modules/asteriskAccount.inc:158
 #: ../lib/modules/posixGroup.inc:351
-#: ../lib/modules/posixAccount.inc:258
-#: ../lib/modules/asteriskAccount.inc:142
-#: ../lib/modules/sambaSamAccount.inc:398
+#: ../lib/modules/sambaSamAccount.inc:400
+#: ../lib/modules/posixAccount.inc:259
+#: ../lib/modules/asteriskVoicemail.inc:163
 msgid "secret"
 msgstr "secret"
 
-#: ../templates/lists/changePassword.php:180
-msgid "send via mail"
-msgstr "通过邮件发送"
-
-#: ../lib/modules/nisMailAlias.inc:91
-#: ../lib/modules/inetOrgPerson.inc:1299
 #: ../lib/modules/uidObject.inc:62
-#: ../lib/modules/posixAccount.inc:203
+#: ../lib/modules/posixAccount.inc:204
+#: ../lib/modules/inetOrgPerson.inc:1200
+#: ../lib/modules/nisMailAlias.inc:91
 msgid "smiller"
 msgstr "smiller"
 
@@ -8102,24 +8660,24 @@ msgstr "smiller@yourdomain.org"
 msgid "ssh-dss 234234 user@host"
 msgstr "ssh-dss 234234 user@host"
 
-#: ../templates/tree/edit.php:440
+#: ../templates/tree/edit.php:437
 msgid "structural"
 msgstr "结构"
 
-#: ../lib/modules/asteriskExtension.inc:175
+#: ../lib/modules/asteriskExtension.inc:180
 msgid "test"
 msgstr "测试"
 
-#: ../lib/modules/asteriskExtension.inc:169
+#: ../lib/modules/asteriskExtension.inc:174
 msgid "test-start"
 msgstr "测试-开始"
 
-#: ../templates/tree/edit.php:392
+#: ../templates/tree/edit.php:389
 msgid "true"
 msgstr "true"
 
-#: ../lib/modules/inetOrgPerson.inc:344
 #: ../lib/modules/ipHost.inc:92
+#: ../lib/modules/inetOrgPerson.inc:284
 #: ../lib/modules/aliasEntry.inc:64
 msgid "uid=smiller,ou=People,dc=company,dc=com"
 msgstr "uid=smiller,ou=People,dc=company,dc=com"
@@ -8128,32 +8686,77 @@ msgstr "uid=smiller,ou=People,dc=company,dc=com"
 msgid "user01,user02,user03"
 msgstr "user01,user02,user03"
 
-#: ../lib/modules/inetOrgPerson.inc:424
 #: ../lib/modules/eduPerson.inc:143
+#: ../lib/modules/inetOrgPerson.inc:364
+#: ../lib/modules/asteriskVoicemail.inc:176
 msgid "user@company.com"
 msgstr "user@company.com"
 
-#: ../lib/modules/posixAccount.inc:223
+#: ../lib/modules/posixAccount.inc:224
 msgid "users"
 msgstr "用户"
 
 #: ../templates/config/confmain.php:243
 #: ../templates/config/confmain.php:247
+#: ../lib/modules/sambaSamAccount.inc:562
+#: ../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
 #: ../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: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
+#: ../lib/modules/ppolicy.inc:505
+#: ../lib/modules/ppolicy.inc:510
+#: ../lib/modules/ppolicy.inc:513
+#: ../lib/modules/ppolicy.inc:520
+#: ../lib/modules/inetOrgPerson.inc:404
 msgid "yes"
 msgstr "是"
 
+#~ msgid "Back to OU-Editor"
+#~ msgstr "返回到OU编辑器"
+#~ msgid "Back to PDF Editor"
+#~ msgstr "返回到PDF编辑器"
+#~ msgid "Back to login"
+#~ msgstr "返回到登录界面"
+#~ msgid "Back to profile editor"
+#~ msgstr "返回到配置文件编辑器"
+#~ msgid "Delete operation canceled."
+#~ msgstr "取消删除动作"
+#~ msgid "Link to login page for this self service profile"
+#~ msgstr "自助服务登录界面."
+#~ msgid "Mode"
+#~ msgstr "模式"
+#~ 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 ""
+#~ "请输入允许用户登录的主机名(以逗号分隔).如果已经启用主机限制,\"*\"号代表所"
+#~ "有主机,留空意味没有主机."
+#~ msgid "Please enter a valid path."
+#~ msgstr "请输入有效的路径."
+#~ msgid "Please enter the mount point for this entry (e.g. /home)."
+#~ msgstr "请输入本条目的mount点(比如:/home)."
+#~ msgid ""
+#~ "Please install the SSH2 module for PHP and activate it in your php.ini!"
+#~ msgstr "请在PHP中安装SSH2模块并在php.ini中启用!"
+#~ msgid "SSH2 module"
+#~ msgstr "SSH2模块"
+#~ msgid "SSH2 module is installed."
+#~ msgstr "SSH2模块已安装."
+#~ msgid "Scope"
+#~ msgstr "范围"
+#~ msgid "Sudo is not setup correctly!"
+#~ msgstr "Sudo的设置不正确 !"
+#~ msgid "Unix workstations"
+#~ msgstr "unix工作站"
+#~ msgid "Unix workstations are invalid!"
+#~ msgstr "unix工作站无效!"
+#~ msgid "Unknown error"
+#~ msgstr "未知错误"
+#~ msgid "You have been logged off from LDAP Account Manager."
+#~ msgstr "您已经从系统退出"
 #~ msgid "Add Samba 3 account"
 #~ msgstr "增加Samba3帐号"
 #~ msgid "Change suffix"
@@ -8162,8 +8765,6 @@ msgstr "是"
 #~ 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:"