diff --git a/lam/locale/zh_CN/LC_MESSAGES/messages.mo b/lam/locale/zh_CN/LC_MESSAGES/messages.mo
index be6fb5b0..726d731b 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 cbb249d8..078dfca7 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: 2011-11-07 15:34+0800\n"
+"PO-Revision-Date: 2012-03-13 07:22+0800\n"
 "Last-Translator: Needham <needham@sina.com>\n"
 "Language-Team: Chinese(Simplified) <needham@sina.com>\n"
 "Language: \n"
@@ -19,23 +19,46 @@ msgstr ""
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../lib/modules/zarafaUser.inc:128
-#: ../lib/modules/zarafaUser.inc:131
-#: ../lib/modules/zarafaUser.inc:134
-#: ../lib/modules/zarafaUser.inc:179
+#: ../lib/modules/zarafaContact.inc:85
+#: ../lib/modules/zarafaContact.inc:88
+#: ../lib/modules/zarafaContact.inc:91
+#: ../lib/modules/zarafaContact.inc:102
+#: ../lib/modules/zarafaGroup.inc:87
+#: ../lib/modules/zarafaGroup.inc:90
+#: ../lib/modules/zarafaGroup.inc:93
+#: ../lib/modules/zarafaGroup.inc:117
+#: ../lib/modules/zarafaUser.inc:129
+#: ../lib/modules/zarafaUser.inc:132
+#: ../lib/modules/zarafaUser.inc:135
+#: ../lib/modules/zarafaUser.inc:191
 msgid "\"Send as\" attribute"
 msgstr "\"Send as\"属性"
 
-#: ../lib/modules/zarafaUser.inc:88
-#: ../lib/modules/zarafaUser.inc:162
-#: ../lib/modules/zarafaUser.inc:203
-#: ../lib/modules/zarafaUser.inc:354
-#: ../lib/modules/zarafaUser.inc:378
-#: ../lib/modules/zarafaUser.inc:397
-#: ../lib/modules/zarafaUser.inc:441
-#: ../lib/modules/zarafaUser.inc:797
-#: ../lib/modules/zarafaUser.inc:1245
-#: ../lib/modules/zarafaUser.inc:1413
+#: ../lib/modules/zarafaContact.inc:69
+#: ../lib/modules/zarafaContact.inc:124
+#: ../lib/modules/zarafaContact.inc:147
+#: ../lib/modules/zarafaContact.inc:159
+#: ../lib/modules/zarafaContact.inc:196
+#: ../lib/modules/zarafaContact.inc:323
+#: ../lib/modules/zarafaContact.inc:543
+#: ../lib/modules/zarafaGroup.inc:83
+#: ../lib/modules/zarafaGroup.inc:111
+#: ../lib/modules/zarafaGroup.inc:164
+#: ../lib/modules/zarafaGroup.inc:178
+#: ../lib/modules/zarafaGroup.inc:194
+#: ../lib/modules/zarafaGroup.inc:233
+#: ../lib/modules/zarafaGroup.inc:379
+#: ../lib/modules/zarafaGroup.inc:631
+#: ../lib/modules/zarafaUser.inc:89
+#: ../lib/modules/zarafaUser.inc:172
+#: ../lib/modules/zarafaUser.inc:215
+#: ../lib/modules/zarafaUser.inc:374
+#: ../lib/modules/zarafaUser.inc:401
+#: ../lib/modules/zarafaUser.inc:420
+#: ../lib/modules/zarafaUser.inc:464
+#: ../lib/modules/zarafaUser.inc:840
+#: ../lib/modules/zarafaUser.inc:1336
+#: ../lib/modules/zarafaUser.inc:1532
 msgid "\"Send as\" privileges"
 msgstr "\"做为..发送\"权限"
 
@@ -43,75 +66,6 @@ msgstr "\"做为..发送\"权限"
 msgid "$user and $group will be replaced with user name and primary group name."
 msgstr "$usert和$group会被用户名或主要组名替代 "
 
-#: ../lib/types/dhcp.inc:159
-#, php-format
-msgid "%s DHCP(s) found"
-msgstr "发现 %s DHCP"
-
-#: ../lib/types/nisObjectType.inc:144
-#, php-format
-msgid "%s NIS object(s) found"
-msgstr "找到 %s 个 NIS 对象"
-
-#: ../lib/types/zarafaAddressListType.inc:138
-#, php-format
-msgid "%s address list(s) found"
-msgstr "找到 %s 个地址列表"
-
-#: ../lib/types/mailAlias.inc:135
-#: ../lib/types/alias.inc:135
-#, php-format
-msgid "%s alias(es) found"
-msgstr "找到 %s 个別名"
-
-#: ../lib/types/automountType.inc:175
-#, php-format
-msgid "%s automount entry(ies) found"
-msgstr "找到 %s 个自动挂接条目"
-
-#: ../lib/types/smbDomain.inc:156
-#, php-format
-msgid "%s domain(s) found"
-msgstr "找到 %s 个域"
-
-#: ../lib/types/asteriskExt.inc:137
-#, php-format
-msgid "%s extension(s) found"
-msgstr "找到 %s 个扩展"
-
-#: ../lib/types/gon.inc:161
-#: ../lib/types/zarafaDynamicGroupType.inc:154
-#: ../lib/types/group.inc:174
-#: ../lib/types/netgroup.inc:158
-#, php-format
-msgid "%s group(s) found"
-msgstr "找到 %s 个组"
-
-#: ../lib/types/host.inc:161
-#, php-format
-msgid "%s host(s) found"
-msgstr "找到 %s 个主机"
-
-#: ../lib/lists.inc:106
-#, php-format
-msgid "%s object(s) found"
-msgstr "找到 %s 个对象"
-
-#: ../lib/types/ppolicyType.inc:143
-#, php-format
-msgid "%s policy(ies) found"
-msgstr "找到 %s 个策略"
-
-#: ../lib/types/sudo.inc:148
-#, php-format
-msgid "%s sudo role(s) found"
-msgstr "找到 %s 个sudo角色"
-
-#: ../lib/types/user.inc:197
-#, php-format
-msgid "%s user(s) found"
-msgstr "找到 %s 个用户"
-
 #: ../lib/modules/nisnetgroup.inc:124
 msgid "(host1,user1,example.com);(host2,user2,example.com)"
 msgstr "(主机1,用户1,example.com);(主机2,用户2,example.com)"
@@ -120,28 +74,28 @@ msgstr "(主机1,用户1,example.com);(主机2,用户2,example.com)"
 msgid "/home/smiller"
 msgstr "/home/smiller"
 
-#: ../lib/modules/inetOrgPerson.inc:406
+#: ../lib/modules/inetOrgPerson.inc:411
 #: ../lib/modules/asteriskVoicemail.inc:177
 msgid "123-123-1234"
 msgstr "123-123-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:422
+#: ../lib/modules/inetOrgPerson.inc:427
 msgid "123-123-1235"
 msgstr "123-123-1235"
 
-#: ../lib/modules/inetOrgPerson.inc:430
+#: ../lib/modules/inetOrgPerson.inc:435
 msgid "123-123-1236"
 msgstr "123-123-1236"
 
-#: ../lib/modules/inetOrgPerson.inc:414
+#: ../lib/modules/inetOrgPerson.inc:419
 msgid "123-124-1234"
 msgstr "123-124-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:398
+#: ../lib/modules/inetOrgPerson.inc:403
 msgid "12345"
 msgstr "12345"
 
-#: ../lib/modules/dhcp_settings.inc:146
+#: ../lib/modules/dhcp_settings.inc:153
 msgid ""
 "<b>B-Node (0x01): Broadcast.</b><br/>The client tries to find other workstations via broadcasting\n"
 "(works only inside the same collision domain, viz. the same subnet).<br/><br/>\n"
@@ -176,6 +130,10 @@ msgstr ""
 msgid "<b>Maximum length:</b> %s characters"
 msgstr "<b>最大长度:</b> %s 字符"
 
+#: ../lib/modules/passwordSelfReset.inc:1179
+msgid "A confirmation mail was sent. Please click on the link in the mail to proceed."
+msgstr "确认邮件已经发送,请点击邮件中的链接来处理."
+
 #: ../lib/modules/device.inc:75
 msgid "A description for this device."
 msgstr "设备描述."
@@ -189,7 +147,7 @@ msgstr "在结果中显示的属性列表(以逗号分隔)"
 msgid "A list of options (e.g. NOPASSWD)."
 msgstr "选项列表(比如:NOPASSWD)."
 
-#: ../templates/massBuildAccounts.php:115
+#: ../templates/massBuildAccounts.php:118
 msgid "A required column is missing in your CSV file."
 msgstr "您的CSV文件中缺少一个必要的列."
 
@@ -210,15 +168,15 @@ msgid "A valid newrdn attribute should be specified"
 msgstr "必须指定一个合法的newrdn属性"
 
 #: ../templates/3rdParty/pla/lib/import_functions.php:587
-msgid "A valid newsuperier attribute should be specified"
-msgstr "必须指定一个合法的newsuperier属性"
+msgid "A valid newsuperior attribute should be specified"
+msgstr "必须指定一个合法的newsuperior属性"
 
 #: ../lib/modules/asteriskAccount.inc:122
 #: ../lib/modules/asteriskAccount.inc:251
 #: ../lib/modules/asteriskAccount.inc:333
-#: ../lib/modules/asteriskAccount.inc:411
-#: ../lib/modules/asteriskAccount.inc:707
-#: ../lib/modules/asteriskAccount.inc:1199
+#: ../lib/modules/asteriskAccount.inc:409
+#: ../lib/modules/asteriskAccount.inc:701
+#: ../lib/modules/asteriskAccount.inc:1197
 msgid "AMA flags"
 msgstr "AMA标志"
 
@@ -226,7 +184,7 @@ msgstr "AMA标志"
 msgid "Abandon"
 msgstr "终止"
 
-#: ../templates/lists/changePassword.php:546
+#: ../templates/lists/changePassword.php:587
 msgid "Aborted password change."
 msgstr "中断密码更改"
 
@@ -234,8 +192,8 @@ msgstr "中断密码更改"
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "阿布达比, 马斯凯特, 巴库"
 
-#: ../templates/config/confmain.php:246
-#: ../help/help.inc:99
+#: ../templates/config/confmain.php:250
+#: ../help/help.inc:103
 msgid "Access level"
 msgstr "访问级别"
 
@@ -243,7 +201,7 @@ msgstr "访问级别"
 msgid "Account"
 msgstr "帐号"
 
-#: ../templates/massBuildAccounts.php:170
+#: ../templates/massBuildAccounts.php:174
 #: ../lib/modules/zarafaDynamicGroup.inc:171
 #: ../lib/modules/zarafaDynamicGroup.inc:173
 #: ../lib/modules/zarafaDynamicGroup.inc:175
@@ -252,37 +210,43 @@ msgstr "帐号"
 #: ../lib/modules/zarafaDynamicGroup.inc:179
 #: ../lib/modules/ipHost.inc:109
 #: ../lib/modules/ipHost.inc:110
-#: ../lib/modules/asteriskAccount.inc:622
-#: ../lib/modules/asteriskAccount.inc:625
-#: ../lib/modules/asteriskAccount.inc:628
+#: ../lib/modules/asteriskAccount.inc:620
+#: ../lib/modules/asteriskAccount.inc:623
+#: ../lib/modules/asteriskAccount.inc:626
+#: ../lib/modules/asteriskAccount.inc:629
 #: ../lib/modules/asteriskAccount.inc:631
 #: ../lib/modules/asteriskAccount.inc:633
 #: ../lib/modules/asteriskAccount.inc:635
 #: ../lib/modules/asteriskAccount.inc:637
 #: ../lib/modules/asteriskAccount.inc:639
-#: ../lib/modules/asteriskAccount.inc:641
 #: ../lib/modules/account.inc:118
 #: ../lib/modules/ieee802device.inc:89
-#: ../lib/modules/posixGroup.inc:482
-#: ../lib/modules/posixGroup.inc:486
-#: ../lib/modules/posixGroup.inc:487
-#: ../lib/modules/zarafaGroup.inc:138
-#: ../lib/modules/zarafaGroup.inc:140
-#: ../lib/modules/zarafaGroup.inc:141
-#: ../lib/modules/zarafaGroup.inc:142
-#: ../lib/modules/zarafaGroup.inc:143
+#: ../lib/modules/zarafaContact.inc:158
+#: ../lib/modules/zarafaContact.inc:160
+#: ../lib/modules/zarafaContact.inc:161
+#: ../lib/modules/zarafaContact.inc:162
+#: ../lib/modules/zarafaContact.inc:163
+#: ../lib/modules/posixGroup.inc:492
+#: ../lib/modules/posixGroup.inc:496
+#: ../lib/modules/posixGroup.inc:497
+#: ../lib/modules/zarafaGroup.inc:188
+#: ../lib/modules/zarafaGroup.inc:190
+#: ../lib/modules/zarafaGroup.inc:191
+#: ../lib/modules/zarafaGroup.inc:192
+#: ../lib/modules/zarafaGroup.inc:193
+#: ../lib/modules/zarafaGroup.inc:195
 #: ../lib/modules/device.inc:127
 #: ../lib/modules/device.inc:128
-#: ../lib/modules/dhcp_settings.inc:275
-#: ../lib/modules/dhcp_settings.inc:277
-#: ../lib/modules/dhcp_settings.inc:279
-#: ../lib/modules/dhcp_settings.inc:281
-#: ../lib/modules/dhcp_settings.inc:283
-#: ../lib/modules/dhcp_settings.inc:284
 #: ../lib/modules/dhcp_settings.inc:286
 #: ../lib/modules/dhcp_settings.inc:288
-#: ../lib/modules/dhcp_settings.inc:293
+#: ../lib/modules/dhcp_settings.inc:290
+#: ../lib/modules/dhcp_settings.inc:292
 #: ../lib/modules/dhcp_settings.inc:294
+#: ../lib/modules/dhcp_settings.inc:295
+#: ../lib/modules/dhcp_settings.inc:297
+#: ../lib/modules/dhcp_settings.inc:299
+#: ../lib/modules/dhcp_settings.inc:304
+#: ../lib/modules/dhcp_settings.inc:305
 #: ../lib/modules/eduPerson.inc:216
 #: ../lib/modules/eduPerson.inc:218
 #: ../lib/modules/eduPerson.inc:220
@@ -330,20 +294,20 @@ msgstr "帐号"
 #: ../lib/modules/posixAccount.inc:101
 #: ../lib/modules/posixAccount.inc:102
 #: ../lib/modules/posixAccount.inc:104
-#: ../lib/modules/zarafaUser.inc:387
-#: ../lib/modules/zarafaUser.inc:389
-#: ../lib/modules/zarafaUser.inc:391
-#: ../lib/modules/zarafaUser.inc:392
-#: ../lib/modules/zarafaUser.inc:394
-#: ../lib/modules/zarafaUser.inc:396
-#: ../lib/modules/zarafaUser.inc:398
-#: ../lib/modules/zarafaUser.inc:399
-#: ../lib/modules/zarafaUser.inc:400
-#: ../lib/modules/zarafaUser.inc:401
-#: ../lib/modules/zarafaUser.inc:402
-#: ../lib/modules/zarafaUser.inc:403
-#: ../lib/modules/zarafaUser.inc:404
-#: ../lib/modules/zarafaUser.inc:405
+#: ../lib/modules/zarafaUser.inc:410
+#: ../lib/modules/zarafaUser.inc:412
+#: ../lib/modules/zarafaUser.inc:414
+#: ../lib/modules/zarafaUser.inc:415
+#: ../lib/modules/zarafaUser.inc:417
+#: ../lib/modules/zarafaUser.inc:419
+#: ../lib/modules/zarafaUser.inc:421
+#: ../lib/modules/zarafaUser.inc:422
+#: ../lib/modules/zarafaUser.inc:423
+#: ../lib/modules/zarafaUser.inc:424
+#: ../lib/modules/zarafaUser.inc:425
+#: ../lib/modules/zarafaUser.inc:426
+#: ../lib/modules/zarafaUser.inc:427
+#: ../lib/modules/zarafaUser.inc:428
 #: ../lib/modules/ppolicyUser.inc:86
 #: ../lib/modules/kolabUser.inc:230
 #: ../lib/modules/kolabUser.inc:232
@@ -352,9 +316,7 @@ msgstr "帐号"
 #: ../lib/modules/kolabUser.inc:238
 #: ../lib/modules/kolabUser.inc:240
 #: ../lib/modules/kolabUser.inc:242
-#: ../lib/modules/phpGroupwareUser.inc:134
-#: ../lib/modules/phpGroupwareUser.inc:135
-#: ../lib/modules/ddns.inc:151
+#: ../lib/modules/ddns.inc:158
 #: ../lib/modules/nisObject.inc:117
 #: ../lib/modules/sambaGroupMapping.inc:441
 #: ../lib/modules/sambaGroupMapping.inc:442
@@ -419,7 +381,12 @@ msgstr "帐号"
 #: ../lib/modules/inetLocalMailRecipient.inc:126
 #: ../lib/modules/inetLocalMailRecipient.inc:128
 #: ../lib/modules/aliasEntry.inc:79
-#: ../lib/modules/authorizedServiceObject.inc:114
+#: ../lib/modules/authorizedServiceObject.inc:115
+#: ../lib/modules/heimdalKerberos.inc:174
+#: ../lib/modules/heimdalKerberos.inc:175
+#: ../lib/modules/heimdalKerberos.inc:176
+#: ../lib/modules/heimdalKerberos.inc:178
+#: ../lib/modules/heimdalKerberos.inc:180
 #: ../lib/modules/nisMailAlias.inc:107
 #: ../lib/modules/nisMailAlias.inc:109
 #: ../lib/modules/hostObject.inc:104
@@ -427,18 +394,20 @@ msgstr "帐号"
 msgid "Account %s:"
 msgstr "帐号 %s:"
 
+#: ../lib/types/asteriskExt.inc:95
+#: ../lib/types/asteriskExt.inc:153
 #: ../lib/modules/asteriskAccount.inc:102
 #: ../lib/modules/asteriskAccount.inc:317
 #: ../lib/modules/asteriskAccount.inc:329
-#: ../lib/modules/asteriskAccount.inc:375
-#: ../lib/modules/asteriskAccount.inc:677
-#: ../lib/modules/asteriskAccount.inc:1191
-#: ../lib/modules/asteriskExtension.inc:82
-#: ../lib/modules/asteriskExtension.inc:112
-#: ../lib/modules/asteriskExtension.inc:124
-#: ../lib/modules/asteriskExtension.inc:169
-#: ../lib/modules/asteriskExtension.inc:221
-#: ../lib/modules/asteriskExtension.inc:469
+#: ../lib/modules/asteriskAccount.inc:373
+#: ../lib/modules/asteriskAccount.inc:671
+#: ../lib/modules/asteriskAccount.inc:1189
+#: ../lib/modules/asteriskExtension.inc:90
+#: ../lib/modules/asteriskExtension.inc:121
+#: ../lib/modules/asteriskExtension.inc:128
+#: ../lib/modules/asteriskExtension.inc:144
+#: ../lib/modules/asteriskExtension.inc:298
+#: ../lib/modules/asteriskExtension.inc:793
 #: ../lib/modules/asteriskVoicemail.inc:82
 #: ../lib/modules/asteriskVoicemail.inc:118
 #: ../lib/modules/asteriskVoicemail.inc:128
@@ -448,7 +417,7 @@ msgstr "帐号 %s:"
 msgid "Account context"
 msgstr "帐号语境"
 
-#: ../templates/masscreate.php:116
+#: ../templates/masscreate.php:118
 msgid "Account creation via file upload"
 msgstr "通过上传文件建立帐号"
 
@@ -456,28 +425,28 @@ msgstr "通过上传文件建立帐号"
 msgid "Account deactivated"
 msgstr "帐号已停用"
 
-#: ../templates/lists/changePassword.php:177
+#: ../templates/lists/changePassword.php:197
 msgid "Account details"
 msgstr "帐号详细信息"
 
 #: ../lib/types/user.inc:104
 #: ../lib/modules/sambaSamAccount.inc:323
 #: ../lib/modules/sambaSamAccount.inc:438
-#: ../lib/modules/sambaSamAccount.inc:1112
-#: ../lib/modules/sambaSamAccount.inc:1359
-#: ../lib/modules/sambaSamAccount.inc:1496
-#: ../lib/modules/phpGroupwareUser.inc:82
-#: ../lib/modules/phpGroupwareUser.inc:97
-#: ../lib/modules/phpGroupwareUser.inc:121
-#: ../lib/modules/phpGroupwareUser.inc:152
-#: ../lib/modules/phpGroupwareUser.inc:233
-#: ../lib/modules/phpGroupwareUser.inc:343
+#: ../lib/modules/sambaSamAccount.inc:1136
+#: ../lib/modules/sambaSamAccount.inc:1383
+#: ../lib/modules/sambaSamAccount.inc:1523
 #: ../lib/modules/shadowAccount.inc:121
 #: ../lib/modules/shadowAccount.inc:184
 #: ../lib/modules/shadowAccount.inc:224
 #: ../lib/modules/shadowAccount.inc:341
-#: ../lib/modules/shadowAccount.inc:416
-#: ../lib/modules/shadowAccount.inc:471
+#: ../lib/modules/shadowAccount.inc:426
+#: ../lib/modules/shadowAccount.inc:484
+#: ../lib/modules/heimdalKerberos.inc:72
+#: ../lib/modules/heimdalKerberos.inc:122
+#: ../lib/modules/heimdalKerberos.inc:154
+#: ../lib/modules/heimdalKerberos.inc:247
+#: ../lib/modules/heimdalKerberos.inc:347
+#: ../lib/modules/heimdalKerberos.inc:484
 msgid "Account expiration date"
 msgstr "帐号过期日期"
 
@@ -488,13 +457,13 @@ msgstr "帐号停用(inactive)"
 #: ../lib/modules/sambaSamAccount.inc:263
 #: ../lib/modules/sambaSamAccount.inc:269
 #: ../lib/modules/sambaSamAccount.inc:430
-#: ../lib/modules/sambaSamAccount.inc:1080
-#: ../lib/modules/sambaSamAccount.inc:1492
+#: ../lib/modules/sambaSamAccount.inc:1104
+#: ../lib/modules/sambaSamAccount.inc:1519
 msgid "Account is deactivated"
 msgstr "帐号已经停用"
 
 #: ../lib/modules/sambaSamAccount.inc:266
-#: ../lib/modules/sambaSamAccount.inc:1086
+#: ../lib/modules/sambaSamAccount.inc:1110
 msgid "Account is locked"
 msgstr "帐号锁定"
 
@@ -502,46 +471,38 @@ msgstr "帐号锁定"
 msgid "Account name:"
 msgstr "帐号名"
 
-#: ../lib/modules/phpGroupwareUser.inc:78
-#: ../lib/modules/phpGroupwareUser.inc:96
-#: ../lib/modules/phpGroupwareUser.inc:114
-#: ../lib/modules/phpGroupwareUser.inc:161
-#: ../lib/modules/phpGroupwareUser.inc:338
-msgid "Account status"
-msgstr "帐号状态"
-
-#: ../templates/masscreate.php:130
+#: ../templates/masscreate.php:132
 #: ../templates/pdfedit/pdfdelete.php:85
 #: ../lib/modules/asteriskAccount.inc:110
 #: ../lib/modules/asteriskAccount.inc:318
 #: ../lib/modules/asteriskAccount.inc:331
-#: ../lib/modules/asteriskAccount.inc:395
-#: ../lib/modules/asteriskAccount.inc:685
-#: ../lib/modules/asteriskAccount.inc:1193
+#: ../lib/modules/asteriskAccount.inc:393
+#: ../lib/modules/asteriskAccount.inc:679
+#: ../lib/modules/asteriskAccount.inc:1191
 msgid "Account type"
 msgstr "帐号类型"
 
 #: ../templates/config/confmodules.php:159
-#: ../templates/config/confmain.php:192
+#: ../templates/config/confmain.php:196
 #: ../templates/config/moduleSettings.php:158
 #: ../templates/config/conftypes.php:177
 msgid "Account types"
 msgstr "帐号类型"
 
-#: ../help/help.inc:101
+#: ../help/help.inc:105
 msgid "Account types and modules"
 msgstr "帐号类型和模块"
 
-#: ../help/help.inc:103
+#: ../help/help.inc:107
 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:1186
+#: ../lib/modules.inc:1212
 msgid "Account was created successfully."
 msgstr "新增帐号成功"
 
-#: ../templates/lists/changePassword.php:569
-#: ../lib/modules.inc:1189
+#: ../templates/lists/changePassword.php:619
+#: ../lib/modules.inc:1215
 msgid "Account was modified successfully."
 msgstr "帐号修改成功"
 
@@ -550,12 +511,12 @@ msgid "Action type"
 msgstr "动作类型"
 
 #: ../lib/modules/ddns.inc:87
-#: ../lib/modules/ddns.inc:342
+#: ../lib/modules/ddns.inc:352
 msgid "Activate DynDNS"
 msgstr "活动的动态DNS"
 
-#: ../templates/config/confmain.php:226
-#: ../templates/selfService/adminMain.php:354
+#: ../templates/config/confmain.php:230
+#: ../templates/selfService/adminMain.php:365
 msgid "Activate TLS"
 msgstr "激活TLS"
 
@@ -590,20 +551,23 @@ msgstr "激活这个选项将会删除用户的主目录."
 #: ../lib/modules/zarafaDynamicGroup.inc:156
 #: ../lib/modules/zarafaDynamicGroup.inc:255
 #: ../lib/modules/zarafaDynamicGroup.inc:469
+#: ../lib/modules/zarafaContact.inc:65
+#: ../lib/modules/zarafaContact.inc:130
+#: ../lib/modules/zarafaContact.inc:224
 #: ../lib/modules/zarafaGroup.inc:79
-#: ../lib/modules/zarafaGroup.inc:115
-#: ../lib/modules/zarafaGroup.inc:125
-#: ../lib/modules/zarafaGroup.inc:201
-#: ../lib/modules/zarafaGroup.inc:428
+#: ../lib/modules/zarafaGroup.inc:154
+#: ../lib/modules/zarafaGroup.inc:172
+#: ../lib/modules/zarafaGroup.inc:270
+#: ../lib/modules/zarafaGroup.inc:641
 #: ../lib/modules/zarafaAddressList.inc:64
 #: ../lib/modules/zarafaAddressList.inc:109
 #: ../lib/modules/zarafaAddressList.inc:131
 #: ../lib/modules/zarafaAddressList.inc:197
 #: ../lib/modules/zarafaAddressList.inc:330
-#: ../lib/modules/zarafaUser.inc:68
-#: ../lib/modules/zarafaUser.inc:170
-#: ../lib/modules/zarafaUser.inc:262
-#: ../lib/modules/zarafaUser.inc:552
+#: ../lib/modules/zarafaUser.inc:69
+#: ../lib/modules/zarafaUser.inc:180
+#: ../lib/modules/zarafaUser.inc:274
+#: ../lib/modules/zarafaUser.inc:595
 msgid "Active"
 msgstr "激活"
 
@@ -613,8 +577,10 @@ msgstr "激活帐号类型"
 
 #: ../templates/serverInfo.php:305
 #: ../templates/serverInfo.php:382
+#: ../templates/config/profmanage.php:233
 #: ../templates/config/confmodules.php:286
 #: ../templates/config/conftypes.php:214
+#: ../templates/selfService/profManage.php:210
 #: ../templates/pdfedit/pdfpage.php:543
 #: ../templates/pdfedit/pdfpage.php:553
 #: ../templates/pdfedit/pdfpage.php:563
@@ -623,13 +589,16 @@ msgstr "激活帐号类型"
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1210
 #: ../templates/3rdParty/pla/htdocs/add_attr_form.php:78
 #: ../templates/3rdParty/pla/htdocs/add_attr_form.php:121
+#: ../lib/modules/zarafaContact.inc:358
+#: ../lib/modules/zarafaGroup.inc:414
 #: ../lib/modules/device.inc:250
-#: ../lib/modules/zarafaUser.inc:832
-#: ../lib/modules/zarafaUser.inc:1412
-#: ../lib/modules/zarafaUser.inc:1438
-#: ../lib/modules/kolabUser.inc:872
-#: ../lib/modules/kolabUser.inc:906
+#: ../lib/modules/zarafaUser.inc:875
+#: ../lib/modules/zarafaUser.inc:1530
+#: ../lib/modules/zarafaUser.inc:1558
+#: ../lib/modules/kolabUser.inc:876
+#: ../lib/modules/kolabUser.inc:910
 #: ../lib/modules/nisnetgroup.inc:272
+#: ../lib/modules/inetOrgPerson.inc:1841
 #: ../lib/modules/sudoRole.inc:269
 #: ../lib/modules/sudoRole.inc:296
 #: ../lib/modules/sudoRole.inc:323
@@ -641,7 +610,7 @@ msgstr "激活帐号类型"
 msgid "Add"
 msgstr "增加"
 
-#: ../lib/modules/asteriskAccount.inc:974
+#: ../lib/modules/asteriskAccount.inc:968
 msgid "Add Asterisk account"
 msgstr "增加 Asterisk 帐号"
 
@@ -649,7 +618,7 @@ msgstr "增加 Asterisk 帐号"
 msgid "Add Asterisk voicemail extension"
 msgstr "增加Asterisk语音邮件扩展"
 
-#: ../lib/modules/authorizedServiceObject.inc:180
+#: ../lib/modules/authorizedServiceObject.inc:181
 msgid "Add Authorized Service extension"
 msgstr "增加授权服务扩展"
 
@@ -665,11 +634,15 @@ msgstr "增加FreeRadius扩展"
 msgid "Add IP address extension"
 msgstr "增加IP地址扩展"
 
+#: ../lib/modules/heimdalKerberos.inc:271
+msgid "Add Kerberos extension"
+msgstr "增加 Kerberos 扩展"
+
 #: ../lib/modules/kolabUser.inc:398
 msgid "Add Kolab extension"
 msgstr "增加 Kolab 扩展"
 
-#: ../lib/modules/sambaSamAccount.inc:1223
+#: ../lib/modules/sambaSamAccount.inc:1247
 #: ../lib/modules/sambaGroupMapping.inc:293
 msgid "Add Samba 3 extension"
 msgstr "增加 Samba 3 扩展"
@@ -678,11 +651,16 @@ msgstr "增加 Samba 3 扩展"
 msgid "Add Shadow account extension"
 msgstr "增加 Shadow 帐号扩展"
 
-#: ../lib/modules/zarafaGroup.inc:211
-#: ../lib/modules/zarafaUser.inc:143
-#: ../lib/modules/zarafaUser.inc:144
-#: ../lib/modules/zarafaUser.inc:186
-#: ../lib/modules/zarafaUser.inc:416
+#: ../lib/modules/zarafaContact.inc:110
+#: ../lib/modules/zarafaContact.inc:174
+msgid "Add Zarafa contact extension"
+msgstr "增加Zarafa联系人扩展"
+
+#: ../lib/modules/zarafaGroup.inc:280
+#: ../lib/modules/zarafaUser.inc:152
+#: ../lib/modules/zarafaUser.inc:153
+#: ../lib/modules/zarafaUser.inc:198
+#: ../lib/modules/zarafaUser.inc:439
 #: ../lib/modules/zarafaServer.inc:176
 msgid "Add Zarafa extension"
 msgstr "增加Zarafa扩展"
@@ -700,14 +678,24 @@ msgstr "增加所有"
 msgid "Add an additional value to attribute"
 msgstr "给属性新增一个值."
 
+#: ../lib/modules/asteriskExtension.inc:342
+msgid "Add another rule"
+msgstr "增加另外一个规则"
+
+#: ../lib/modules/inetOrgPerson.inc:1876
+msgid "Add entries"
+msgstr "增加条目"
+
+#: ../lib/modules/zarafaContact.inc:397
+#: ../lib/modules/zarafaGroup.inc:453
 #: ../lib/modules/device.inc:293
-#: ../lib/modules/zarafaUser.inc:871
+#: ../lib/modules/zarafaUser.inc:914
 #: ../lib/modules/groupOfNames.inc:315
 #: ../lib/modules/groupOfNames.inc:427
 msgid "Add entries of this type:"
 msgstr "增加类型条目"
 
-#: ../lib/modules/ddns.inc:343
+#: ../lib/modules/ddns.inc:353
 msgid "Add fix IP addresses to DNS"
 msgstr "为DNS增加一个固定的IP地址"
 
@@ -715,8 +703,8 @@ msgstr "为DNS增加一个固定的IP地址"
 msgid "Add host extension"
 msgstr "增加 host 扩展"
 
-#: ../templates/selfService/adminMain.php:448
-#: ../help/help.inc:180
+#: ../templates/selfService/adminMain.php:471
+#: ../help/help.inc:188
 msgid "Add input field"
 msgstr "增加输入栏目"
 
@@ -742,8 +730,8 @@ msgstr "给对象新增属性"
 msgid "Add new binary attribute"
 msgstr "新增binary属性."
 
-#: ../templates/selfService/adminMain.php:440
-#: ../help/help.inc:178
+#: ../templates/selfService/adminMain.php:463
+#: ../help/help.inc:186
 msgid "Add new group"
 msgstr "新增组"
 
@@ -756,33 +744,26 @@ msgstr "增加一个新的对象类"
 msgid "Add new object class to <b>%s</b>"
 msgstr "增加新的对象类到<b>%s</b>"
 
-#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:95
+#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:94
 msgid "Add object class and attributes"
 msgstr "增加对象类和属性"
 
-#: ../lib/modules/passwordSelfReset.inc:176
+#: ../lib/modules/passwordSelfReset.inc:245
 msgid "Add password self reset extension"
 msgstr "增加密码自助复位扩展"
 
-#: ../lib/modules/inetOrgPerson.inc:653
-#: ../lib/modules/inetOrgPerson.inc:1275
-#: ../lib/modules/inetOrgPerson.inc:1310
-#: ../lib/modules/inetOrgPerson.inc:2023
+#: ../lib/modules/inetOrgPerson.inc:709
+#: ../lib/modules/inetOrgPerson.inc:1763
+#: ../lib/modules/inetOrgPerson.inc:1800
+#: ../lib/modules/inetOrgPerson.inc:2641
 msgid "Add photo"
 msgstr "新增照片"
 
-#: ../lib/modules/phpGroupwareGroup.inc:73
-#: ../lib/modules/phpGroupwareGroup.inc:83
-#: ../lib/modules/phpGroupwareGroup.inc:103
-#: ../lib/modules/phpGroupwareUser.inc:74
-#: ../lib/modules/phpGroupwareUser.inc:107
-#: ../lib/modules/phpGroupwareUser.inc:191
-msgid "Add phpGroupWare extension"
-msgstr "增加 phpGroupWare 扩展"
-
-#: ../templates/config/profmanage.php:210
-#: ../templates/selfService/profManage.php:168
-#: ../help/help.inc:118
+#: ../templates/config/profmanage.php:221
+#: ../templates/config/profmanage.php:234
+#: ../templates/selfService/profManage.php:203
+#: ../templates/selfService/profManage.php:211
+#: ../help/help.inc:124
 msgid "Add profile"
 msgstr "增加配置文件"
 
@@ -802,8 +783,8 @@ msgstr "添加中"
 msgid "Adding the range failed because errors occured."
 msgstr "因为发生了错误致使增加范围失败"
 
-#: ../templates/selfService/adminMain.php:388
-#: ../help/help.inc:184
+#: ../templates/selfService/adminMain.php:412
+#: ../help/help.inc:192
 msgid "Additional CSS links"
 msgstr "附加的CSS连接"
 
@@ -818,29 +799,34 @@ msgstr "本条目的附加邮件地址"
 #: ../lib/modules/posixAccount.inc:318
 #: ../lib/modules/posixAccount.inc:354
 #: ../lib/modules/posixAccount.inc:399
-#: ../lib/modules/posixAccount.inc:1109
-#: ../lib/modules/posixAccount.inc:1363
-#: ../lib/modules/posixAccount.inc:1466
+#: ../lib/modules/posixAccount.inc:1112
+#: ../lib/modules/posixAccount.inc:1369
+#: ../lib/modules/posixAccount.inc:1472
 msgid "Additional groups"
 msgstr "附加组"
 
-#: ../templates/massDoUpload.php:103
+#: ../templates/massDoUpload.php:128
 msgid "Additional tasks for module:"
 msgstr "模块的附加任务："
 
-#: ../lib/modules/inetOrgPerson.inc:1066
+#: ../lib/modules/inetOrgPerson.inc:1270
 msgid "Address"
 msgstr "地址"
 
+#: ../lib/types/zarafaAddressListType.inc:138
+#, php-format
+msgid "Address list count: %s"
+msgstr "地址列表总计:%s"
+
 #: ../lib/modules/imapAccess.inc:70
 msgid "Address of IMAP server (e.g. mail.example.org)."
 msgstr "IMAP服务器地址（比如:mail.example.org)"
 
-#: ../help/help.inc:179
+#: ../help/help.inc:187
 msgid "Adds a new group element to the list of self service options. Use this to structure the input fields."
 msgstr "为自助服务选项列表新增组元素.利用它建立输入栏目."
 
-#: ../help/help.inc:181
+#: ../help/help.inc:189
 msgid "Adds a new self service option to the selected group element."
 msgstr "为选定的组元素增加新的自助服务选项."
 
@@ -848,30 +834,30 @@ msgstr "为选定的组元素增加新的自助服务选项."
 msgid "Adds input fields for a new IP range."
 msgstr "为新IP范围增加输入域"
 
-#: ../lib/modules/zarafaUser.inc:92
-#: ../lib/modules/zarafaUser.inc:289
-#: ../lib/modules/zarafaUser.inc:339
-#: ../lib/modules/zarafaUser.inc:561
-#: ../lib/modules/zarafaUser.inc:1227
+#: ../lib/modules/zarafaUser.inc:93
+#: ../lib/modules/zarafaUser.inc:301
+#: ../lib/modules/zarafaUser.inc:359
+#: ../lib/modules/zarafaUser.inc:604
+#: ../lib/modules/zarafaUser.inc:1318
 msgid "Admin"
 msgstr "管理"
 
 #: ../lib/modules/passwordSelfReset.inc:85
-#: ../lib/modules/passwordSelfReset.inc:139
+#: ../lib/modules/passwordSelfReset.inc:173
 msgid "Admin DN"
 msgstr "管理DN"
 
 #: ../lib/modules/passwordSelfReset.inc:89
-#: ../lib/modules/passwordSelfReset.inc:143
+#: ../lib/modules/passwordSelfReset.inc:177
 msgid "Admin password"
 msgstr "管理密码"
 
-#: ../lib/modules/inetOrgPerson.inc:358
-#: ../lib/modules/inetOrgPerson.inc:454
+#: ../lib/modules/inetOrgPerson.inc:363
+#: ../lib/modules/inetOrgPerson.inc:467
 msgid "Administration"
 msgstr "管理者"
 
-#: ../lib/modules/posixGroup.inc:379
+#: ../lib/modules/posixGroup.inc:389
 #: ../lib/modules/nisnetgroup.inc:112
 #: ../lib/modules/groupOfNames.inc:101
 msgid "Administrators group"
@@ -899,6 +885,12 @@ msgstr "RID算法的基数不是一个数字!"
 msgid "Alias"
 msgstr "别名"
 
+#: ../lib/types/mailAlias.inc:135
+#: ../lib/types/alias.inc:135
+#, php-format
+msgid "Alias count: %s"
+msgstr "别名总计: %s"
+
 #: ../lib/types/alias.inc:62
 msgid "Alias entries"
 msgstr "别名条目"
@@ -923,9 +915,9 @@ msgstr "别名"
 #: ../lib/modules/aliasEntry.inc:54
 #: ../lib/modules/aliasEntry.inc:62
 #: ../lib/modules/aliasEntry.inc:70
-#: ../lib/modules/aliasEntry.inc:92
-#: ../lib/modules/aliasEntry.inc:101
-#: ../lib/modules/aliasEntry.inc:231
+#: ../lib/modules/aliasEntry.inc:91
+#: ../lib/modules/aliasEntry.inc:100
+#: ../lib/modules/aliasEntry.inc:229
 msgid "Aliased entry"
 msgstr "已有别名条目"
 
@@ -939,7 +931,7 @@ msgstr "别名"
 msgid "All accounts (%s)"
 msgstr "所有帐号 %s:"
 
-#: ../templates/selfService/selfServiceMain.php:318
+#: ../templates/selfService/selfServiceMain.php:310
 #: ../templates/initsuff.php:157
 msgid "All changes were successful."
 msgstr "修改成功."
@@ -966,28 +958,28 @@ msgstr "允许改变密码"
 
 #: ../lib/modules/sambaSamAccount.inc:211
 #: ../lib/modules/sambaSamAccount.inc:329
-#: ../lib/modules/sambaSamAccount.inc:1402
-#: ../lib/modules/sambaSamAccount.inc:1688
+#: ../lib/modules/sambaSamAccount.inc:1429
+#: ../lib/modules/sambaSamAccount.inc:1715
 msgid "Allow terminal server login"
 msgstr "允许终端服务登录"
 
 #: ../lib/modules/asteriskAccount.inc:194
 #: ../lib/modules/asteriskAccount.inc:287
 #: ../lib/modules/asteriskAccount.inc:351
-#: ../lib/modules/asteriskAccount.inc:543
-#: ../lib/modules/asteriskAccount.inc:884
-#: ../lib/modules/asteriskAccount.inc:1253
+#: ../lib/modules/asteriskAccount.inc:541
+#: ../lib/modules/asteriskAccount.inc:878
+#: ../lib/modules/asteriskAccount.inc:1251
 msgid "Allowed codec"
 msgstr "允许的编码"
 
 #: ../templates/config/mainmanage.php:194
 #: ../lib/types/user.inc:95
-#: ../help/help.inc:140
+#: ../help/help.inc:146
 msgid "Allowed hosts"
 msgstr "允许的主机"
 
-#: ../lib/modules/sambaSamAccount.inc:1249
-#: ../lib/modules/sambaSamAccount.inc:1250
+#: ../lib/modules/sambaSamAccount.inc:1273
+#: ../lib/modules/sambaSamAccount.inc:1274
 msgid "Allowed workstations"
 msgstr "允许的工作站"
 
@@ -1013,39 +1005,52 @@ msgid "An sudo role with this name already exists. Please choose another name."
 msgstr "这个名字的duso角色已经存在,请选择另外一个名字."
 
 #: ../lib/modules/passwordSelfReset.inc:69
-#: ../lib/modules/passwordSelfReset.inc:112
-#: ../lib/modules/passwordSelfReset.inc:120
-#: ../lib/modules/passwordSelfReset.inc:154
-#: ../lib/modules/passwordSelfReset.inc:196
-#: ../lib/modules/passwordSelfReset.inc:302
-#: ../lib/modules/passwordSelfReset.inc:442
-#: ../lib/modules/passwordSelfReset.inc:669
+#: ../lib/modules/passwordSelfReset.inc:144
+#: ../lib/modules/passwordSelfReset.inc:152
+#: ../lib/modules/passwordSelfReset.inc:223
+#: ../lib/modules/passwordSelfReset.inc:265
+#: ../lib/modules/passwordSelfReset.inc:372
+#: ../lib/modules/passwordSelfReset.inc:516
+#: ../lib/modules/passwordSelfReset.inc:789
 msgid "Answer"
 msgstr "回答"
 
 #: ../lib/modules/kolabUser.inc:334
 #: ../lib/modules/kolabUser.inc:795
-#: ../lib/modules/kolabUser.inc:893
+#: ../lib/modules/kolabUser.inc:897
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../lib/modules/asteriskExtension.inc:94
-#: ../lib/modules/asteriskExtension.inc:114
-#: ../lib/modules/asteriskExtension.inc:127
-#: ../lib/modules/asteriskExtension.inc:156
-#: ../lib/modules/asteriskExtension.inc:245
-#: ../lib/modules/asteriskExtension.inc:475
+#: ../lib/modules/asteriskExtension.inc:102
+#: ../lib/modules/asteriskExtension.inc:157
+#: ../lib/modules/asteriskExtension.inc:358
+#: ../lib/modules/asteriskExtension.inc:809
 msgid "Application"
 msgstr "应用"
 
-#: ../lib/modules/asteriskExtension.inc:78
-#: ../lib/modules/asteriskExtension.inc:123
-#: ../lib/modules/asteriskExtension.inc:163
-#: ../lib/modules/asteriskExtension.inc:253
-#: ../lib/modules/asteriskExtension.inc:472
+#: ../lib/modules/asteriskExtension.inc:86
+#: ../lib/modules/asteriskExtension.inc:164
+#: ../lib/modules/asteriskExtension.inc:366
+#: ../lib/modules/asteriskExtension.inc:810
 msgid "Application data"
 msgstr "应用数据"
 
+#: ../lib/modules/zarafaUser.inc:144
+#: ../lib/modules/zarafaUser.inc:148
+#: ../lib/modules/zarafaUser.inc:188
+#: ../lib/modules/zarafaUser.inc:334
+#: ../lib/modules/zarafaUser.inc:398
+#: ../lib/modules/zarafaUser.inc:555
+#: ../lib/modules/zarafaUser.inc:958
+#: ../lib/modules/zarafaUser.inc:1366
+#: ../lib/modules/zarafaUser.inc:1391
+msgid "Archive servers"
+msgstr "归档服务器"
+
+#: ../lib/modules/zarafaUser.inc:553
+msgid "Archiving"
+msgstr "正在归档中"
+
 #: ../templates/3rdParty/pla/htdocs/mass_delete.php:53
 msgid "Are you sure you want to permanently delete these objects?"
 msgstr "确认永久删除这个对象?"
@@ -1067,15 +1072,15 @@ msgstr "Asterisk"
 msgid "Asterisk AMA (Automated Message Accounting) flags."
 msgstr "Asterisk AMA(自动消息账号)标志"
 
-#: ../lib/modules/asteriskExtension.inc:63
+#: ../lib/modules/asteriskExtension.inc:71
 msgid "Asterisk extension"
 msgstr "Asterisk 扩展"
 
-#: ../lib/types/asteriskExt.inc:54
+#: ../lib/types/asteriskExt.inc:56
 msgid "Asterisk extensions"
 msgstr "Asterisk 扩展"
 
-#: ../lib/types/asteriskExt.inc:63
+#: ../lib/types/asteriskExt.inc:65
 msgid "Asterisk extensions entries"
 msgstr "Asterisk 扩展条目"
 
@@ -1140,30 +1145,30 @@ msgstr "Asterisk的认证域(缺少值:asterisk).这个值设置在sip.conf中(
 msgid "Authentication user for outbound proxies."
 msgstr "边界代理的认证用户"
 
-#: ../lib/modules/authorizedServiceObject.inc:63
-#: ../lib/modules/authorizedServiceObject.inc:73
-#: ../lib/modules/authorizedServiceObject.inc:77
-#: ../lib/modules/authorizedServiceObject.inc:89
-#: ../lib/modules/authorizedServiceObject.inc:96
-#: ../lib/modules/authorizedServiceObject.inc:100
-#: ../lib/modules/authorizedServiceObject.inc:154
-#: ../lib/modules/authorizedServiceObject.inc:277
+#: ../lib/modules/authorizedServiceObject.inc:64
+#: ../lib/modules/authorizedServiceObject.inc:74
+#: ../lib/modules/authorizedServiceObject.inc:78
+#: ../lib/modules/authorizedServiceObject.inc:90
+#: ../lib/modules/authorizedServiceObject.inc:97
+#: ../lib/modules/authorizedServiceObject.inc:101
+#: ../lib/modules/authorizedServiceObject.inc:155
+#: ../lib/modules/authorizedServiceObject.inc:278
 msgid "Authorized Services"
 msgstr "授权的服务"
 
+#: ../lib/modules/zarafaContact.inc:77
+#: ../lib/modules/zarafaContact.inc:560
 #: ../lib/modules/eduPerson.inc:129
 #: ../lib/modules/eduPerson.inc:134
 #: ../lib/modules/sambaSamAccount.inc:147
 #: ../lib/modules/sambaSamAccount.inc:377
-#: ../lib/modules/zarafaUser.inc:120
-#: ../lib/modules/zarafaUser.inc:1280
-#: ../lib/modules/phpGroupwareUser.inc:86
-#: ../lib/modules/phpGroupwareUser.inc:92
+#: ../lib/modules/zarafaUser.inc:121
+#: ../lib/modules/zarafaUser.inc:1377
 #: ../lib/modules/shadowAccount.inc:99
 #: ../lib/modules/shadowAccount.inc:188
-#: ../lib/modules/authorizedServiceObject.inc:81
-#: ../lib/modules/authorizedServiceObject.inc:101
-#: ../lib/modules/passwordSelfReset.inc:96
+#: ../lib/modules/authorizedServiceObject.inc:82
+#: ../lib/modules/authorizedServiceObject.inc:102
+#: ../lib/modules/passwordSelfReset.inc:128
 #: ../lib/modules/hostObject.inc:76
 #: ../lib/modules/hostObject.inc:94
 msgid "Automatically add this extension"
@@ -1190,6 +1195,11 @@ msgstr "自动安装条目"
 msgid "Automount entry contains invalid characters. Only ASCII characters are allowed."
 msgstr "自动挂接条目包含非法字符,只能使用 ASCII 字符."
 
+#: ../lib/types/automountType.inc:175
+#, php-format
+msgid "Automount entry count: %s"
+msgstr "自动安装条目总计:%s"
+
 #: ../templates/config/conftypes.php:206
 #: ../lib/modules/customScripts.inc:54
 msgid "Available account types"
@@ -1200,8 +1210,8 @@ msgstr "有效的帐号类型"
 msgid "Available actions"
 msgstr "可选动作"
 
-#: ../lib/modules/posixAccount.inc:1204
-#: ../lib/modules/posixAccount.inc:1234
+#: ../lib/modules/posixAccount.inc:1207
+#: ../lib/modules/posixAccount.inc:1237
 #: ../lib/modules/nisnetgroup.inc:376
 msgid "Available groups"
 msgstr "可选组"
@@ -1214,12 +1224,12 @@ msgstr "可用的用户"
 msgid "Available modules"
 msgstr "可选模块"
 
-#: ../lib/modules/posixGroup.inc:243
-#: ../lib/modules/asteriskExtension.inc:310
+#: ../lib/modules/posixGroup.inc:253
+#: ../lib/modules/asteriskExtension.inc:448
 msgid "Available users"
 msgstr "可选用户"
 
-#: ../lib/modules/sambaSamAccount.inc:1252
+#: ../lib/modules/sambaSamAccount.inc:1276
 msgid "Available workstations"
 msgstr "可选工作站"
 
@@ -1231,15 +1241,19 @@ msgstr "亚速尔,维德角岛"
 msgid "B-Node (0x01)"
 msgstr "B-节点 (0x01)"
 
-#: ../templates/massBuildAccounts.php:227
-#: ../lib/modules/posixGroup.inc:267
+#: ../templates/massBuildAccounts.php:250
+#: ../lib/modules/zarafaContact.inc:404
+#: ../lib/modules/posixGroup.inc:277
+#: ../lib/modules/zarafaGroup.inc:460
 #: ../lib/modules/device.inc:300
-#: ../lib/modules/sambaSamAccount.inc:1269
-#: ../lib/modules/posixAccount.inc:1272
-#: ../lib/modules/posixAccount.inc:1342
-#: ../lib/modules/zarafaUser.inc:878
+#: ../lib/modules/sambaSamAccount.inc:1293
+#: ../lib/modules/posixAccount.inc:1275
+#: ../lib/modules/posixAccount.inc:1348
+#: ../lib/modules/zarafaUser.inc:921
+#: ../lib/modules/zarafaUser.inc:970
 #: ../lib/modules/nisnetgroup.inc:390
-#: ../lib/modules/inetOrgPerson.inc:1311
+#: ../lib/modules/inetOrgPerson.inc:1801
+#: ../lib/modules/inetOrgPerson.inc:1877
 #: ../lib/modules/groupOfNames.inc:322
 #: ../lib/modules/groupOfNames.inc:434
 msgid "Back"
@@ -1274,7 +1288,7 @@ msgstr "返回到自动挂接列表"
 msgid "Back to domain list"
 msgstr "返回到域列表"
 
-#: ../lib/types/asteriskExt.inc:45
+#: ../lib/types/asteriskExt.inc:47
 msgid "Back to extensions list"
 msgstr "返回到扩展列表"
 
@@ -1307,8 +1321,8 @@ msgstr "返回到登录界面"
 msgid "Back to policy list"
 msgstr "返回到策略列表"
 
-#: ../templates/config/profmanage.php:73
-#: ../templates/selfService/profManage.php:73
+#: ../templates/config/profmanage.php:159
+#: ../templates/selfService/profManage.php:136
 msgid "Back to profile login"
 msgstr "返回到配置文件登录"
 
@@ -1365,13 +1379,13 @@ msgid "Base (base dn only)"
 msgstr "Base (只有基本DN)"
 
 #: ../templates/3rdParty/pla/lib/QueryRender.php:121
-#: ../templates/3rdParty/pla/lib/QueryRender.php:508
+#: ../templates/3rdParty/pla/lib/QueryRender.php:506
 #: ../templates/3rdParty/pla/htdocs/export_form.php:59
 msgid "Base DN"
 msgstr "基本DN"
 
 #: ../templates/config/confmodules.php:203
-#: ../help/help.inc:132
+#: ../help/help.inc:138
 msgid "Base module"
 msgstr "基本模块"
 
@@ -1393,6 +1407,18 @@ msgstr "二进制值"
 msgid "Bind"
 msgstr "绑定"
 
+#: ../templates/config/confmain.php:368
+msgid "Bind password"
+msgstr "绑定密码"
+
+#: ../templates/config/confmain.php:366
+msgid "Bind user"
+msgstr "绑定用户"
+
+#: ../help/help.inc:122
+msgid "Bind user and password"
+msgstr "绑定用户名和密码"
+
 #: ../lib/modules/quota.inc:52
 #: ../lib/modules/systemQuotas.inc:94
 msgid "Block hard quota"
@@ -1451,17 +1477,17 @@ msgstr "块更新以下DN"
 
 #: ../lib/modules/inetOrgPerson.inc:81
 #: ../lib/modules/inetOrgPerson.inc:127
-#: ../lib/modules/inetOrgPerson.inc:265
-#: ../lib/modules/inetOrgPerson.inc:356
-#: ../lib/modules/inetOrgPerson.inc:557
-#: ../lib/modules/inetOrgPerson.inc:665
-#: ../lib/modules/inetOrgPerson.inc:1222
-#: ../lib/modules/inetOrgPerson.inc:1442
-#: ../lib/modules/inetOrgPerson.inc:2001
+#: ../lib/modules/inetOrgPerson.inc:268
+#: ../lib/modules/inetOrgPerson.inc:361
+#: ../lib/modules/inetOrgPerson.inc:573
+#: ../lib/modules/inetOrgPerson.inc:725
+#: ../lib/modules/inetOrgPerson.inc:1662
+#: ../lib/modules/inetOrgPerson.inc:2038
+#: ../lib/modules/inetOrgPerson.inc:2619
 msgid "Business category"
 msgstr "商业种类"
 
-#: ../lib/modules/inetOrgPerson.inc:666
+#: ../lib/modules/inetOrgPerson.inc:726
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "商业种类(比如:行政部门,IT服务部门,管理部门,...)"
 
@@ -1474,28 +1500,28 @@ msgstr "缺省情况下,LAM显示运行命令及其输出.如果您想隐藏命
 msgid "Bytes sent"
 msgstr "字节已发送"
 
-#: ../templates/masscreate.php:239
+#: ../templates/masscreate.php:241
 msgid "CSV file"
 msgstr "CSV 文件"
 
-#: ../help/help.inc:97
+#: ../help/help.inc:101
 msgid "Cache timeout"
 msgstr "缓存超时"
 
 #: ../lib/modules/asteriskAccount.inc:126
 #: ../lib/modules/asteriskAccount.inc:253
 #: ../lib/modules/asteriskAccount.inc:334
-#: ../lib/modules/asteriskAccount.inc:419
-#: ../lib/modules/asteriskAccount.inc:716
-#: ../lib/modules/asteriskAccount.inc:1202
+#: ../lib/modules/asteriskAccount.inc:417
+#: ../lib/modules/asteriskAccount.inc:710
+#: ../lib/modules/asteriskAccount.inc:1200
 msgid "Call groups"
 msgstr "呼叫组"
 
 #: ../lib/modules/asteriskAccount.inc:94
 #: ../lib/modules/asteriskAccount.inc:328
-#: ../lib/modules/asteriskAccount.inc:368
-#: ../lib/modules/asteriskAccount.inc:661
-#: ../lib/modules/asteriskAccount.inc:1190
+#: ../lib/modules/asteriskAccount.inc:366
+#: ../lib/modules/asteriskAccount.inc:655
+#: ../lib/modules/asteriskAccount.inc:1188
 msgid "Caller ID"
 msgstr "拨号 ID号"
 
@@ -1515,21 +1541,29 @@ msgstr "可以置空"
 #: ../lib/modules/asteriskAccount.inc:214
 #: ../lib/modules/asteriskAccount.inc:297
 #: ../lib/modules/asteriskAccount.inc:356
-#: ../lib/modules/asteriskAccount.inc:579
-#: ../lib/modules/asteriskAccount.inc:933
-#: ../lib/modules/asteriskAccount.inc:1268
+#: ../lib/modules/asteriskAccount.inc:577
+#: ../lib/modules/asteriskAccount.inc:927
+#: ../lib/modules/asteriskAccount.inc:1266
 msgid "Can call forward"
 msgstr "可能呼叫转移"
 
-#: ../templates/lists/changePassword.php:228
-#: ../templates/lists/changePassword.php:264
+#: ../templates/lists/changePassword.php:248
+#: ../templates/lists/changePassword.php:277
 #: ../templates/ou_edit.php:119
+#: ../templates/config/profmanage.php:235
+#: ../templates/config/profmanage.php:247
+#: ../templates/config/profmanage.php:256
+#: ../templates/config/profmanage.php:273
+#: ../templates/config/profmanage.php:284
 #: ../templates/config/mainmanage.php:253
 #: ../templates/config/confmodules.php:218
-#: ../templates/config/confmain.php:384
+#: ../templates/config/confmain.php:394
 #: ../templates/config/moduleSettings.php:229
 #: ../templates/config/conftypes.php:280
-#: ../templates/selfService/adminMain.php:546
+#: ../templates/selfService/profManage.php:212
+#: ../templates/selfService/profManage.php:228
+#: ../templates/selfService/profManage.php:241
+#: ../templates/selfService/adminMain.php:569
 #: ../templates/pdfedit/pdfdelete.php:96
 #: ../templates/pdfedit/pdfpage.php:585
 #: ../templates/pdfedit/pdfmain.php:158
@@ -1546,39 +1580,42 @@ msgstr "可能呼叫转移"
 #: ../lib/types/automountType.inc:199
 #: ../lib/types/automountType.inc:234
 #: ../lib/types/dhcp.inc:277
+#: ../lib/modules/zarafaContact.inc:359
+#: ../lib/modules/zarafaGroup.inc:415
 #: ../lib/modules/device.inc:251
-#: ../lib/modules/sambaSamAccount.inc:1344
-#: ../lib/modules/sambaSamAccount.inc:1384
-#: ../lib/modules/sambaSamAccount.inc:1470
-#: ../lib/modules/zarafaUser.inc:833
+#: ../lib/modules/sambaSamAccount.inc:1368
+#: ../lib/modules/sambaSamAccount.inc:1411
+#: ../lib/modules/sambaSamAccount.inc:1497
+#: ../lib/modules/zarafaUser.inc:876
 #: ../lib/modules/kolabUser.inc:567
-#: ../lib/modules/phpGroupwareUser.inc:261
-#: ../lib/modules/shadowAccount.inc:432
+#: ../lib/modules/shadowAccount.inc:445
 #: ../lib/modules/nisnetgroup.inc:480
+#: ../lib/modules/inetOrgPerson.inc:1842
 #: ../lib/modules/freeRadius.inc:477
-#: ../lib/modules/aliasEntry.inc:142
-#: ../lib/modules/aliasEntry.inc:162
+#: ../lib/modules/aliasEntry.inc:140
+#: ../lib/modules/aliasEntry.inc:160
+#: ../lib/modules/heimdalKerberos.inc:403
 #: ../lib/modules/groupOfNames.inc:273
 #: ../lib/modules/groupOfNames.inc:385
 #: ../lib/lists.inc:642
 #: ../lib/lists.inc:714
-#: ../lib/modules.inc:1084
+#: ../lib/modules.inc:1109
 msgid "Cancel"
 msgstr "取消"
 
-#: ../templates/login.php:478
-#: ../templates/login.php:536
-#: ../templates/login.php:541
+#: ../templates/login.php:484
+#: ../templates/login.php:542
+#: ../templates/login.php:547
 #: ../templates/selfService/selfServiceLogin.php:90
 #: ../templates/selfService/selfServiceLogin.php:126
 #: ../templates/selfService/selfServiceLogin.php:131
-#: ../templates/selfService/selfServiceMain.php:138
-#: ../templates/selfService/selfServiceMain.php:152
+#: ../templates/selfService/selfServiceMain.php:139
+#: ../templates/selfService/selfServiceMain.php:153
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "无法连接指定的LDAP服务器,请再试一次."
 
 #: ../templates/login.php:247
-#: ../lib/config.inc:1308
+#: ../lib/config.inc:1357
 msgid "Cannot open config file!"
 msgstr "无法打开配置文件!"
 
@@ -1586,28 +1623,28 @@ msgstr "无法打开配置文件!"
 msgid "Cannot update quota."
 msgstr "不能修改配额"
 
-#: ../lib/modules/zarafaUser.inc:104
-#: ../lib/modules/zarafaUser.inc:168
-#: ../lib/modules/zarafaUser.inc:254
-#: ../lib/modules/zarafaUser.inc:363
-#: ../lib/modules/zarafaUser.inc:393
-#: ../lib/modules/zarafaUser.inc:523
-#: ../lib/modules/zarafaUser.inc:1210
+#: ../lib/modules/zarafaUser.inc:105
+#: ../lib/modules/zarafaUser.inc:178
+#: ../lib/modules/zarafaUser.inc:266
+#: ../lib/modules/zarafaUser.inc:383
+#: ../lib/modules/zarafaUser.inc:416
+#: ../lib/modules/zarafaUser.inc:546
+#: ../lib/modules/zarafaUser.inc:1301
 msgid "Capacity"
 msgstr "容量"
 
-#: ../templates/selfService/adminMain.php:389
+#: ../templates/selfService/adminMain.php:413
 msgid "Captions and labels"
 msgstr "标题和标签"
 
 #: ../lib/modules/inetOrgPerson.inc:126
-#: ../lib/modules/inetOrgPerson.inc:261
-#: ../lib/modules/inetOrgPerson.inc:484
-#: ../lib/modules/inetOrgPerson.inc:551
-#: ../lib/modules/inetOrgPerson.inc:677
-#: ../lib/modules/inetOrgPerson.inc:1207
-#: ../lib/modules/inetOrgPerson.inc:1444
-#: ../lib/modules/inetOrgPerson.inc:1987
+#: ../lib/modules/inetOrgPerson.inc:264
+#: ../lib/modules/inetOrgPerson.inc:497
+#: ../lib/modules/inetOrgPerson.inc:567
+#: ../lib/modules/inetOrgPerson.inc:745
+#: ../lib/modules/inetOrgPerson.inc:1647
+#: ../lib/modules/inetOrgPerson.inc:2040
+#: ../lib/modules/inetOrgPerson.inc:2605
 msgid "Car license"
 msgstr "汽车执照"
 
@@ -1619,34 +1656,40 @@ msgstr "欧洲中央时间,巴黎,柏林"
 msgid "Central Time (US & Canada), Mexico City"
 msgstr "中央时间(美国和加拿大),墨西哥市 "
 
-#: ../templates/selfService/adminMain.php:407
+#: ../templates/selfService/adminMain.php:430
 #: ../templates/pdfedit/pdfpage.php:484
 #: ../templates/pdfedit/pdfpage.php:493
+#: ../lib/modules/zarafaContact.inc:199
+#: ../lib/modules/zarafaGroup.inc:236
 #: ../lib/modules/device.inc:180
-#: ../lib/modules/sambaSamAccount.inc:1115
-#: ../lib/modules/sambaSamAccount.inc:1380
-#: ../lib/modules/zarafaUser.inc:444
-#: ../lib/modules/phpGroupwareUser.inc:154
-#: ../lib/modules/phpGroupwareUser.inc:256
+#: ../lib/modules/sambaSamAccount.inc:1139
+#: ../lib/modules/sambaSamAccount.inc:1407
+#: ../lib/modules/zarafaUser.inc:467
+#: ../lib/modules/zarafaUser.inc:558
 #: ../lib/modules/shadowAccount.inc:344
-#: ../lib/modules/shadowAccount.inc:428
+#: ../lib/modules/shadowAccount.inc:441
+#: ../lib/modules/inetOrgPerson.inc:1719
 #: ../lib/modules/freeRadius.inc:333
 #: ../lib/modules/freeRadius.inc:473
-#: ../lib/modules/asteriskExtension.inc:256
-#: ../lib/modules/aliasEntry.inc:94
-#: ../lib/modules/passwordSelfReset.inc:202
+#: ../lib/modules/asteriskExtension.inc:228
+#: ../lib/modules/aliasEntry.inc:93
+#: ../lib/modules/passwordSelfReset.inc:271
+#: ../lib/modules/heimdalKerberos.inc:250
+#: ../lib/modules/heimdalKerberos.inc:261
+#: ../lib/modules/heimdalKerberos.inc:399
 #: ../lib/modules/groupOfNames.inc:181
 #: ../lib/modules/groupOfNames.inc:199
 msgid "Change"
 msgstr "更改"
 
-#: ../lib/modules/posixGroup.inc:207
-#: ../lib/modules/posixGroup.inc:418
+#: ../lib/modules/posixGroup.inc:217
+#: ../lib/modules/posixGroup.inc:428
 msgid "Change GID number of users and hosts"
 msgstr "更改用户和主机的GID号"
 
-#: ../templates/config/profmanage.php:362
-#: ../help/help.inc:126
+#: ../templates/config/profmanage.php:280
+#: ../templates/config/profmanage.php:283
+#: ../help/help.inc:132
 msgid "Change default profile"
 msgstr "更改缺省的配置文件"
 
@@ -1657,26 +1700,26 @@ msgid "Change list settings"
 msgstr "改变列表设置"
 
 #: ../templates/config/mainmanage.php:245
-#: ../help/help.inc:128
+#: ../help/help.inc:134
 msgid "Change master password"
 msgstr "更改管理员密码"
 
-#: ../templates/lists/changePassword.php:170
-#: ../templates/lists/changePassword.php:227
-#: ../templates/lists/changePassword.php:228
-#: ../templates/lists/changePassword.php:263
-#: ../templates/lists/changePassword.php:264
+#: ../templates/lists/changePassword.php:180
+#: ../templates/lists/changePassword.php:245
+#: ../templates/lists/changePassword.php:247
+#: ../templates/lists/changePassword.php:274
+#: ../templates/lists/changePassword.php:276
 #: ../lib/types/user.inc:326
-#: ../help/help.inc:95
+#: ../help/help.inc:99
 msgid "Change password"
 msgstr "更改密码"
 
-#: ../templates/lists/changePassword.php:212
-#: ../templates/lists/changePassword.php:235
+#: ../templates/lists/changePassword.php:187
+#: ../templates/lists/changePassword.php:188
 msgid "Change password now?"
 msgstr "现在更改密码?"
 
-#: ../templates/config/confmain.php:243
+#: ../templates/config/confmain.php:247
 msgid "Change passwords"
 msgstr "更改密码 "
 
@@ -1686,15 +1729,15 @@ msgstr "更改密码 "
 msgid "Change settings"
 msgstr "修改设置"
 
-#: ../lib/modules/posixAccount.inc:906
+#: ../lib/modules/posixAccount.inc:909
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "值已改变,因为只能使用ASCII字符."
 
-#: ../lib/modules/passwordSelfReset.inc:114
+#: ../lib/modules/passwordSelfReset.inc:146
 msgid "Charlie"
 msgstr "Charlie"
 
-#: ../lib/modules/posixAccount.inc:1139
+#: ../lib/modules/posixAccount.inc:1142
 msgid "Check home directories"
 msgstr "检查主目录"
 
@@ -1716,7 +1759,7 @@ msgstr "检查密码"
 msgid "Check quotas"
 msgstr "检查限额"
 
-#: ../templates/masscreate.php:233
+#: ../templates/masscreate.php:235
 msgid "Check your input carefully. LAM will only do some basic checks on the upload data."
 msgstr "请仔细检查输入,上传前程序仅做基本检查."
 
@@ -1751,8 +1794,8 @@ msgstr "点击在缩略图与原来的大小间切换"
 
 #: ../lib/modules/sambaSamAccount.inc:223
 #: ../lib/modules/sambaSamAccount.inc:356
-#: ../lib/modules/sambaSamAccount.inc:1438
-#: ../lib/modules/sambaSamAccount.inc:1716
+#: ../lib/modules/sambaSamAccount.inc:1465
+#: ../lib/modules/sambaSamAccount.inc:1743
 msgid "Client printer is default"
 msgstr "缺省为客户打印机"
 
@@ -1760,7 +1803,7 @@ msgstr "缺省为客户打印机"
 msgid "Collective"
 msgstr "集合(Collective)"
 
-#: ../templates/masscreate.php:250
+#: ../templates/masscreate.php:270
 msgid "Columns"
 msgstr "列"
 
@@ -1768,7 +1811,7 @@ msgstr "列"
 msgid "Comma separated list of Samba workstations the user is allowed to login. Empty means every workstation."
 msgstr "用户可以登录的Samba工作站,用逗号分隔,空值表示所有工作站."
 
-#: ../lib/modules/authorizedServiceObject.inc:78
+#: ../lib/modules/authorizedServiceObject.inc:79
 msgid "Comma separated list of services (e.g. sshd, imap, ftp)."
 msgstr "以逗号间隔的服务列表(比如:sshd,imap,ftp)."
 
@@ -1797,24 +1840,20 @@ msgstr "提交"
 #: ../lib/modules/posixAccount.inc:321
 #: ../lib/modules/posixAccount.inc:403
 #: ../lib/modules/posixAccount.inc:425
-#: ../lib/modules/posixAccount.inc:1089
-#: ../lib/modules/posixAccount.inc:1461
-#: ../lib/modules/posixAccount.inc:2084
+#: ../lib/modules/posixAccount.inc:1092
+#: ../lib/modules/posixAccount.inc:1467
+#: ../lib/modules/posixAccount.inc:2098
 #: ../lib/modules/inetOrgPerson.inc:74
-#: ../lib/modules/inetOrgPerson.inc:579
-#: ../lib/modules/inetOrgPerson.inc:645
-#: ../lib/modules/inetOrgPerson.inc:1051
-#: ../lib/modules/inetOrgPerson.inc:1440
-#: ../lib/modules/inetOrgPerson.inc:1562
-#: ../lib/modules/asteriskExtension.inc:102
-#: ../lib/modules/asteriskExtension.inc:129
-#: ../lib/modules/asteriskExtension.inc:149
-#: ../lib/modules/asteriskExtension.inc:213
-#: ../lib/modules/asteriskExtension.inc:487
+#: ../lib/modules/inetOrgPerson.inc:595
+#: ../lib/modules/inetOrgPerson.inc:701
+#: ../lib/modules/inetOrgPerson.inc:1233
+#: ../lib/modules/inetOrgPerson.inc:2036
+#: ../lib/modules/inetOrgPerson.inc:2163
+#: ../lib/modules/asteriskExtension.inc:110
 msgid "Common name"
 msgstr "全名"
 
-#: ../lib/modules/asteriskExtension.inc:103
+#: ../lib/modules/asteriskExtension.inc:111
 msgid "Common name of the Asterisk extension."
 msgstr "Asterisk 扩展的一般命名"
 
@@ -1853,10 +1892,6 @@ msgstr "比较如下DN条目"
 msgid "Completed"
 msgstr "完成"
 
-#: ../templates/3rdParty/pla/htdocs/export_form.php:93
-msgid "Compress"
-msgstr "压缩"
-
 #: ../templates/serverInfo.php:112
 msgid "Config suffix"
 msgstr "配置后缀"
@@ -1871,15 +1906,15 @@ msgstr "冲突的模块:"
 
 #: ../lib/modules/sambaSamAccount.inc:221
 #: ../lib/modules/sambaSamAccount.inc:350
-#: ../lib/modules/sambaSamAccount.inc:1434
-#: ../lib/modules/sambaSamAccount.inc:1706
+#: ../lib/modules/sambaSamAccount.inc:1461
+#: ../lib/modules/sambaSamAccount.inc:1733
 msgid "Connect client drives"
 msgstr "连接客户驱动器"
 
 #: ../lib/modules/sambaSamAccount.inc:222
 #: ../lib/modules/sambaSamAccount.inc:353
-#: ../lib/modules/sambaSamAccount.inc:1436
-#: ../lib/modules/sambaSamAccount.inc:1711
+#: ../lib/modules/sambaSamAccount.inc:1463
+#: ../lib/modules/sambaSamAccount.inc:1738
 msgid "Connect client printers"
 msgstr "连接客户打印机"
 
@@ -1888,12 +1923,12 @@ msgid "Connection statistics"
 msgstr "连接统计"
 
 #: ../lib/modules/sambaSamAccount.inc:218
-#: ../lib/modules/sambaSamAccount.inc:1422
-#: ../lib/modules/sambaSamAccount.inc:1699
+#: ../lib/modules/sambaSamAccount.inc:1449
+#: ../lib/modules/sambaSamAccount.inc:1726
 msgid "Connection time limit"
 msgstr "连接时间限制"
 
-#: ../lib/modules/inetOrgPerson.inc:1164
+#: ../lib/modules/inetOrgPerson.inc:1473
 msgid "Contact data"
 msgstr "联系数据"
 
@@ -1904,7 +1939,7 @@ msgid "Container"
 msgstr "容器"
 
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1458
-msgid "Container and object class(es)"
+msgid "Container and object classes"
 msgstr "容器和对象类"
 
 #: ../templates/3rdParty/pla/htdocs/copy_form.php:27
@@ -1976,8 +2011,8 @@ msgstr "无法修改对象"
 msgid "Could not perform ldap_modify operation."
 msgstr "无法执行ldap_modify命令"
 
-#: ../templates/config/profmanage.php:136
-#: ../templates/selfService/profManage.php:116
+#: ../templates/config/profmanage.php:94
+#: ../templates/selfService/profManage.php:74
 msgid "Could not rename file!"
 msgstr "不能更改文件名"
 
@@ -2010,17 +2045,22 @@ msgstr "国家名称非法!"
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1185
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1189
 #: ../templates/initsuff.php:188
-#: ../lib/modules/posixAccount.inc:1324
+#: ../lib/modules/posixAccount.inc:1327
 msgid "Create"
 msgstr "建立"
 
 #: ../lib/lists.inc:431
 #: ../lib/lists.inc:617
-#: ../lib/modules.inc:1204
-#: ../help/help.inc:158
+#: ../lib/modules.inc:1243
+#: ../help/help.inc:164
 msgid "Create PDF file"
 msgstr "建立PDF文件"
 
+#: ../templates/massDoUpload.php:170
+#: ../templates/masscreate.php:252
+msgid "Create PDF files"
+msgstr "建立PDF文件"
+
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1186
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1187
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1190
@@ -2068,7 +2108,7 @@ msgstr "建立另外一个域"
 msgid "Create another entry"
 msgstr "新建另外一个条目"
 
-#: ../lib/types/asteriskExt.inc:44
+#: ../lib/types/asteriskExt.inc:46
 msgid "Create another extension"
 msgstr "建立另外一个扩展"
 
@@ -2100,8 +2140,8 @@ msgid "Create for"
 msgstr "建立"
 
 #: ../lib/modules/posixAccount.inc:236
-#: ../lib/modules/posixAccount.inc:1125
-#: ../lib/modules/posixAccount.inc:1386
+#: ../lib/modules/posixAccount.inc:1128
+#: ../lib/modules/posixAccount.inc:1392
 msgid "Create home directory"
 msgstr "建立主目录"
 
@@ -2131,8 +2171,8 @@ msgstr "创建者:"
 msgid "Created new automount map."
 msgstr "建立新的自动挂接映射."
 
-#: ../templates/config/profmanage.php:119
-#: ../templates/selfService/profManage.php:99
+#: ../templates/config/profmanage.php:75
+#: ../templates/selfService/profManage.php:55
 msgid "Created new profile."
 msgstr "新增配置文件"
 
@@ -2180,7 +2220,7 @@ msgstr "剪切"
 msgid "DDNS"
 msgstr "DDNS"
 
-#: ../lib/modules/ddns.inc:352
+#: ../lib/modules/ddns.inc:362
 msgid "DDNS ist not activated. You can activate it in the DHCP settings (DDNS)."
 msgstr "DDNS没有激活.可以DHCP设置中激活(DDNS)"
 
@@ -2192,6 +2232,11 @@ msgstr "DHCP"
 msgid "DHCP administration"
 msgstr "DHCP管理者"
 
+#: ../lib/types/dhcp.inc:159
+#, php-format
+msgid "DHCP count: %s"
+msgstr "DHCP总计: %s"
+
 #: ../lib/types/dhcp.inc:162
 #: ../lib/modules/dhcp_settings.inc:106
 msgid "DHCP settings"
@@ -2207,7 +2252,7 @@ msgstr "DHCP 设置"
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:112
 #: ../templates/3rdParty/pla/htdocs/mass_delete.php:57
 #: ../lib/modules.inc:382
-#: ../lib/modules.inc:1732
+#: ../lib/modules.inc:1788
 msgid "DN"
 msgstr "DN"
 
@@ -2217,28 +2262,28 @@ msgstr "DN"
 msgid "DN does not exist"
 msgstr "DN不存在"
 
-#: ../templates/masscreate.php:254
+#: ../templates/masscreate.php:274
 msgid "DN settings"
 msgstr "DN 设置"
 
-#: ../templates/masscreate.php:283
-#: ../help/help.inc:152
+#: ../templates/masscreate.php:303
+#: ../help/help.inc:158
 msgid "DN suffix"
 msgstr "DN 后缀"
 
-#: ../lib/modules/dhcp_settings.inc:175
-#: ../lib/modules/dhcp_settings.inc:189
-#: ../lib/modules/dhcp_settings.inc:228
-#: ../lib/modules/dhcp_settings.inc:534
-#: ../lib/modules/dhcp_settings.inc:621
+#: ../lib/modules/dhcp_settings.inc:186
+#: ../lib/modules/dhcp_settings.inc:200
+#: ../lib/modules/dhcp_settings.inc:239
+#: ../lib/modules/dhcp_settings.inc:545
+#: ../lib/modules/dhcp_settings.inc:632
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/modules/dhcp_settings.inc:136
+#: ../lib/modules/dhcp_settings.inc:140
 msgid "DNS (Domain Name System)"
 msgstr "DNS(域名解析系统)"
 
-#: ../lib/modules/asteriskExtension.inc:99
+#: ../lib/modules/asteriskExtension.inc:107
 msgid "DNs of the extension owners"
 msgstr "扩展属主的DN名"
 
@@ -2248,13 +2293,13 @@ msgstr "DSML V.1 导出"
 
 #: ../lib/modules/asteriskAccount.inc:255
 #: ../lib/modules/asteriskAccount.inc:335
-#: ../lib/modules/asteriskAccount.inc:426
-#: ../lib/modules/asteriskAccount.inc:729
+#: ../lib/modules/asteriskAccount.inc:424
+#: ../lib/modules/asteriskAccount.inc:723
 msgid "DTFM flags"
 msgstr "DTFM标志"
 
 #: ../lib/modules/asteriskAccount.inc:130
-#: ../lib/modules/asteriskAccount.inc:1205
+#: ../lib/modules/asteriskAccount.inc:1203
 msgid "DTMF mode"
 msgstr "DTMF模式"
 
@@ -2271,6 +2316,7 @@ msgid "Date after the user is able to change his password."
 msgstr "多少天后用户才能修改密码。"
 
 #: ../lib/modules/sambaSamAccount.inc:278
+#: ../lib/modules/heimdalKerberos.inc:77
 msgid "Date after the user must change his password."
 msgstr "多少天后用户必须修改密码"
 
@@ -2287,31 +2333,31 @@ msgstr "调试"
 msgid "Default"
 msgstr "缺省"
 
-#: ../lib/modules/dhcp_settings.inc:139
-#: ../lib/modules/dhcp_settings.inc:176
-#: ../lib/modules/dhcp_settings.inc:190
-#: ../lib/modules/dhcp_settings.inc:234
-#: ../lib/modules/dhcp_settings.inc:536
-#: ../lib/modules/dhcp_settings.inc:622
+#: ../lib/modules/dhcp_settings.inc:144
+#: ../lib/modules/dhcp_settings.inc:187
+#: ../lib/modules/dhcp_settings.inc:201
+#: ../lib/modules/dhcp_settings.inc:245
+#: ../lib/modules/dhcp_settings.inc:547
+#: ../lib/modules/dhcp_settings.inc:633
 msgid "Default gateway"
 msgstr "缺省网关"
 
-#: ../templates/config/confmain.php:268
-#: ../help/help.inc:91
+#: ../templates/config/confmain.php:272
+#: ../help/help.inc:95
 msgid "Default language"
 msgstr "缺省语言"
 
 #: ../lib/modules/asteriskAccount.inc:222
 #: ../lib/modules/asteriskAccount.inc:301
 #: ../lib/modules/asteriskAccount.inc:358
-#: ../lib/modules/asteriskAccount.inc:594
-#: ../lib/modules/asteriskAccount.inc:951
-#: ../lib/modules/asteriskAccount.inc:1274
+#: ../lib/modules/asteriskAccount.inc:592
+#: ../lib/modules/asteriskAccount.inc:945
+#: ../lib/modules/asteriskAccount.inc:1272
 msgid "Default user"
 msgstr "缺省用户"
 
-#: ../templates/masscreate.php:272
-#: ../templates/masscreate.php:347
+#: ../templates/masscreate.php:292
+#: ../templates/masscreate.php:367
 msgid "Default value"
 msgstr "缺省值"
 
@@ -2330,13 +2376,15 @@ msgstr "为此端检查消息等待信号(MWI)来定义邮箱"
 #: ../lib/modules/kolabUser.inc:218
 #: ../lib/modules/kolabUser.inc:374
 #: ../lib/modules/kolabUser.inc:809
-#: ../lib/modules/kolabUser.inc:873
+#: ../lib/modules/kolabUser.inc:877
 msgid "Delegates"
 msgstr "代理(Delegates)"
 
 #: ../templates/serverInfo.php:319
 #: ../templates/serverInfo.php:388
 #: ../templates/ou_edit.php:118
+#: ../templates/config/profmanage.php:254
+#: ../templates/selfService/profManage.php:239
 #: ../templates/pdfedit/pdfdelete.php:95
 #: ../templates/pdfedit/pdfmain.php:157
 #: ../templates/pdfedit/pdfmain.php:158
@@ -2345,19 +2393,15 @@ msgstr "代理(Delegates)"
 #: ../templates/profedit/profilemain.php:157
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:33
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:124
-#: ../lib/modules/posixAccount.inc:1317
-#: ../lib/modules/zarafaUser.inc:1389
-#: ../lib/modules/zarafaUser.inc:1433
-#: ../lib/modules/kolabUser.inc:869
+#: ../lib/modules/posixAccount.inc:1320
+#: ../lib/modules/zarafaUser.inc:1506
+#: ../lib/modules/zarafaUser.inc:1552
+#: ../lib/modules/kolabUser.inc:873
 #: ../lib/modules/nisnetgroup.inc:243
 #: ../lib/lists.inc:425
 msgid "Delete"
 msgstr "删除"
 
-#: ../lib/types/dhcp.inc:163
-msgid "Delete DHCP(s)"
-msgstr "删除DHCP"
-
 #: ../templates/3rdParty/pla/htdocs/delete.php:31
 msgid "Delete DN"
 msgstr "删除DN"
@@ -2366,82 +2410,40 @@ msgstr "删除DN"
 msgid "Delete LDAP entries"
 msgstr "删除LDAP条目"
 
-#: ../lib/types/nisObjectType.inc:147
-msgid "Delete NIS object(s)"
-msgstr "删除 NIS 对象"
-
-#: ../lib/types/zarafaAddressListType.inc:141
-msgid "Delete address list(s)"
-msgstr "删除地址列表"
-
 #: ../templates/3rdParty/pla/htdocs/copy_form.php:77
 #: ../templates/3rdParty/pla/htdocs/copy_form.php:84
 msgid "Delete after copy (move):"
 msgstr "在拷贝(移动)后删除:"
 
-#: ../lib/types/mailAlias.inc:138
-#: ../lib/types/alias.inc:138
-msgid "Delete alias(es)"
-msgstr "删除别名"
-
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:72
 #: ../templates/3rdParty/pla/htdocs/mass_delete.php:110
 #, php-format
 msgid "Delete all %s objects"
 msgstr "删除全部 %s 个对象"
 
-#: ../lib/types/automountType.inc:178
-msgid "Delete automount entry(ies)"
-msgstr "删除自动挂接条目"
-
-#: ../lib/types/smbDomain.inc:159
-msgid "Delete domain(s)"
-msgstr "删除域"
-
-#: ../lib/types/asteriskExt.inc:140
-msgid "Delete extension(s)"
-msgstr "删除扩展"
-
-#: ../lib/types/gon.inc:164
-#: ../lib/types/zarafaDynamicGroupType.inc:157
-#: ../lib/types/group.inc:177
-#: ../lib/types/netgroup.inc:161
-msgid "Delete group(s)"
-msgstr "删除组"
-
-#: ../lib/modules/posixAccount.inc:1174
+#: ../lib/modules/posixAccount.inc:1177
 msgid "Delete home directory"
 msgstr "删除主目录"
 
-#: ../lib/types/host.inc:164
-msgid "Delete host(s)"
-msgstr "删除主机"
-
 #: ../lib/modules/imapAccess.inc:230
 msgid "Delete mailbox"
 msgstr "删除邮箱"
 
-#: ../lib/lists.inc:109
-msgid "Delete object"
-msgstr "删除对象"
-
 #: ../templates/ou_edit.php:192
-#: ../help/help.inc:205
+#: ../help/help.inc:213
 msgid "Delete organisational unit"
 msgstr "删除组织单元"
 
 #: ../templates/3rdParty/pla/lib/functions.php:2014
-#: ../lib/modules/inetOrgPerson.inc:1278
+#: ../lib/modules/inetOrgPerson.inc:1766
 msgid "Delete photo"
 msgstr "删除照片"
 
-#: ../lib/types/ppolicyType.inc:146
-msgid "Delete policy(ies)"
-msgstr "删除策略"
-
-#: ../templates/config/profmanage.php:290
-#: ../templates/selfService/profManage.php:262
-#: ../help/help.inc:122
+#: ../templates/config/profmanage.php:252
+#: ../templates/config/profmanage.php:255
+#: ../templates/selfService/profManage.php:233
+#: ../templates/selfService/profManage.php:240
+#: ../help/help.inc:128
 msgid "Delete profile"
 msgstr "删除配置文件"
 
@@ -2451,24 +2453,77 @@ msgstr "删除配置文件"
 msgid "Delete range"
 msgstr "删除范围"
 
+#: ../lib/modules/asteriskExtension.inc:308
+#: ../lib/modules/asteriskExtension.inc:331
+msgid "Delete rule"
+msgstr "删除规则"
+
+#: ../lib/types/dhcp.inc:163
+msgid "Delete selected DHCP entries"
+msgstr "删除所选DHCP条目"
+
+#: ../lib/types/nisObjectType.inc:147
+msgid "Delete selected NIS objects"
+msgstr "删除选中的 NIS 对象"
+
+#: ../lib/types/zarafaAddressListType.inc:141
+msgid "Delete selected address lists"
+msgstr "删除选中的地址列表"
+
+#: ../lib/types/mailAlias.inc:138
+#: ../lib/types/alias.inc:138
+msgid "Delete selected aliases"
+msgstr "删除选中的别名"
+
+#: ../lib/types/automountType.inc:178
+msgid "Delete selected automount entries"
+msgstr "删除选中的自动挂接条目"
+
+#: ../lib/types/smbDomain.inc:159
+msgid "Delete selected domains"
+msgstr "删除选中的域"
+
+#: ../lib/types/asteriskExt.inc:141
+msgid "Delete selected extensions"
+msgstr "删除选中的扩展"
+
+#: ../lib/types/gon.inc:164
+#: ../lib/types/zarafaDynamicGroupType.inc:157
+#: ../lib/types/group.inc:177
+#: ../lib/types/netgroup.inc:161
+msgid "Delete selected groups"
+msgstr "删除已选择的组"
+
+#: ../lib/types/host.inc:164
+msgid "Delete selected hosts"
+msgstr "删除选中的主机"
+
+#: ../lib/lists.inc:109
+msgid "Delete selected objects"
+msgstr "删除选中的对象"
+
+#: ../lib/types/ppolicyType.inc:146
+msgid "Delete selected policies"
+msgstr "删除选中的策略"
+
+#: ../lib/types/sudo.inc:151
+msgid "Delete selected sudo roles"
+msgstr "删除选中的sudo角色"
+
+#: ../lib/types/user.inc:200
+msgid "Delete selected users"
+msgstr "删除选中的用户"
+
 #: ../templates/3rdParty/pla/htdocs/copy.php:146
 #, php-format
 msgid "Delete successful: %s"
 msgstr "删除成功:%s"
 
-#: ../lib/types/sudo.inc:151
-msgid "Delete sudo role(s)"
-msgstr "删除sudo角色"
-
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1137
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1140
 msgid "Delete this entry"
 msgstr "删除这个条目"
 
-#: ../lib/types/user.inc:200
-msgid "Delete user(s)"
-msgstr "删除用户"
-
 #: ../templates/delete.php:253
 #, php-format
 msgid "Deleted DN: %s"
@@ -2498,7 +2553,7 @@ msgstr "正在删除"
 
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:73
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:125
-msgid "Deleting Object(s)"
+msgid "Deleting objects"
 msgstr "正在删除对象"
 
 #: ../lib/lists.inc:922
@@ -2508,22 +2563,23 @@ msgstr "删除操作成功."
 #: ../lib/modules/asteriskAccount.inc:158
 #: ../lib/modules/asteriskAccount.inc:269
 #: ../lib/modules/asteriskAccount.inc:342
-#: ../lib/modules/asteriskAccount.inc:478
-#: ../lib/modules/asteriskAccount.inc:800
-#: ../lib/modules/asteriskAccount.inc:1226
+#: ../lib/modules/asteriskAccount.inc:476
+#: ../lib/modules/asteriskAccount.inc:794
+#: ../lib/modules/asteriskAccount.inc:1224
 msgid "Deny"
 msgstr "拒绝"
 
 #: ../lib/modules/inetOrgPerson.inc:128
-#: ../lib/modules/inetOrgPerson.inc:162
-#: ../lib/modules/inetOrgPerson.inc:267
-#: ../lib/modules/inetOrgPerson.inc:452
-#: ../lib/modules/inetOrgPerson.inc:560
-#: ../lib/modules/inetOrgPerson.inc:685
-#: ../lib/modules/inetOrgPerson.inc:1227
-#: ../lib/modules/inetOrgPerson.inc:1453
-#: ../lib/modules/inetOrgPerson.inc:2033
-msgid "Department(s)"
+#: ../lib/modules/inetOrgPerson.inc:165
+#: ../lib/modules/inetOrgPerson.inc:270
+#: ../lib/modules/inetOrgPerson.inc:465
+#: ../lib/modules/inetOrgPerson.inc:576
+#: ../lib/modules/inetOrgPerson.inc:753
+#: ../lib/modules/inetOrgPerson.inc:757
+#: ../lib/modules/inetOrgPerson.inc:1672
+#: ../lib/modules/inetOrgPerson.inc:2050
+#: ../lib/modules/inetOrgPerson.inc:2651
+msgid "Department"
 msgstr "部门"
 
 #: ../templates/schema/schema.php:87
@@ -2545,20 +2601,20 @@ msgstr "部门"
 #: ../lib/modules/account.inc:106
 #: ../lib/modules/account.inc:221
 #: ../lib/modules/account.inc:232
-#: ../lib/modules/posixGroup.inc:186
-#: ../lib/modules/posixGroup.inc:338
-#: ../lib/modules/posixGroup.inc:390
-#: ../lib/modules/posixGroup.inc:457
+#: ../lib/modules/posixGroup.inc:196
+#: ../lib/modules/posixGroup.inc:348
+#: ../lib/modules/posixGroup.inc:400
+#: ../lib/modules/posixGroup.inc:467
 #: ../lib/modules/device.inc:74
 #: ../lib/modules/device.inc:107
 #: ../lib/modules/device.inc:117
 #: ../lib/modules/device.inc:163
 #: ../lib/modules/device.inc:448
-#: ../lib/modules/dhcp_settings.inc:166
-#: ../lib/modules/dhcp_settings.inc:181
-#: ../lib/modules/dhcp_settings.inc:261
-#: ../lib/modules/dhcp_settings.inc:568
-#: ../lib/modules/dhcp_settings.inc:627
+#: ../lib/modules/dhcp_settings.inc:176
+#: ../lib/modules/dhcp_settings.inc:192
+#: ../lib/modules/dhcp_settings.inc:272
+#: ../lib/modules/dhcp_settings.inc:579
+#: ../lib/modules/dhcp_settings.inc:638
 #: ../lib/modules/posixAccount.inc:421
 #: ../lib/modules/nisObject.inc:66
 #: ../lib/modules/nisObject.inc:96
@@ -2576,12 +2632,12 @@ msgstr "部门"
 #: ../lib/modules/nisnetgroup.inc:130
 #: ../lib/modules/nisnetgroup.inc:189
 #: ../lib/modules/nisnetgroup.inc:574
-#: ../lib/modules/inetOrgPerson.inc:229
-#: ../lib/modules/inetOrgPerson.inc:316
-#: ../lib/modules/inetOrgPerson.inc:503
-#: ../lib/modules/inetOrgPerson.inc:585
-#: ../lib/modules/inetOrgPerson.inc:1058
-#: ../lib/modules/inetOrgPerson.inc:1424
+#: ../lib/modules/inetOrgPerson.inc:232
+#: ../lib/modules/inetOrgPerson.inc:321
+#: ../lib/modules/inetOrgPerson.inc:516
+#: ../lib/modules/inetOrgPerson.inc:601
+#: ../lib/modules/inetOrgPerson.inc:1246
+#: ../lib/modules/inetOrgPerson.inc:2020
 #: ../lib/modules/sudoRole.inc:59
 #: ../lib/modules/sudoRole.inc:128
 #: ../lib/modules/sudoRole.inc:172
@@ -2609,21 +2665,21 @@ msgstr "设备"
 msgid "Disable LM hashes"
 msgstr "屏蔽LM哈希方法"
 
-#: ../lib/modules/ddns.inc:93
-#: ../lib/modules/ddns.inc:344
+#: ../lib/modules/ddns.inc:95
+#: ../lib/modules/ddns.inc:354
 msgid "Disable client updates"
 msgstr "禁止客户端更新"
 
-#: ../lib/modules/ddns.inc:94
+#: ../lib/modules/ddns.inc:96
 msgid "Disables the client to update DNS entries."
 msgstr "禁止客户端更新DNS条目."
 
 #: ../lib/modules/asteriskAccount.inc:190
 #: ../lib/modules/asteriskAccount.inc:285
 #: ../lib/modules/asteriskAccount.inc:350
-#: ../lib/modules/asteriskAccount.inc:536
-#: ../lib/modules/asteriskAccount.inc:875
-#: ../lib/modules/asteriskAccount.inc:1250
+#: ../lib/modules/asteriskAccount.inc:534
+#: ../lib/modules/asteriskAccount.inc:869
+#: ../lib/modules/asteriskAccount.inc:1248
 msgid "Disallowed codec"
 msgstr "不允许的编码"
 
@@ -2635,8 +2691,8 @@ msgid "Disconnect users outside logon hours"
 msgstr "切断连接前用户登录小时数"
 
 #: ../lib/modules/sambaSamAccount.inc:219
-#: ../lib/modules/sambaSamAccount.inc:1426
-#: ../lib/modules/sambaSamAccount.inc:1700
+#: ../lib/modules/sambaSamAccount.inc:1453
+#: ../lib/modules/sambaSamAccount.inc:1727
 msgid "Disconnection time limit"
 msgstr "断开连接时间限制"
 
@@ -2652,8 +2708,8 @@ msgstr "显示格式"
 #: ../lib/modules/sambaSamAccount.inc:191
 #: ../lib/modules/sambaSamAccount.inc:236
 #: ../lib/modules/sambaSamAccount.inc:394
-#: ../lib/modules/sambaSamAccount.inc:1071
-#: ../lib/modules/sambaSamAccount.inc:1657
+#: ../lib/modules/sambaSamAccount.inc:1095
+#: ../lib/modules/sambaSamAccount.inc:1684
 #: ../lib/modules/sambaGroupMapping.inc:263
 #: ../lib/modules/sambaGroupMapping.inc:323
 #: ../lib/modules/sambaGroupMapping.inc:356
@@ -2661,7 +2717,7 @@ msgstr "显示格式"
 msgid "Display name"
 msgstr "显示名"
 
-#: ../templates/lists/changePassword.php:218
+#: ../templates/lists/changePassword.php:239
 msgid "Display on screen"
 msgstr "屏幕显示"
 
@@ -2673,6 +2729,11 @@ msgstr "显示创建的条目"
 msgid "Displayed account numbers start at \"0\". Add 2 to get the row in your spreadsheet."
 msgstr "显示的帐号数以\"0\"开始,加2才是您的电子表格的行数."
 
+#: ../lib/modules/passwordSelfReset.inc:121
+#: ../lib/modules/passwordSelfReset.inc:214
+msgid "Do not ask security question"
+msgstr "不需要安全提问"
+
 #: ../templates/ou_edit.php:110
 msgid "Do you really want to delete this OU?"
 msgstr "确认删除这个OU?"
@@ -2707,10 +2768,10 @@ msgstr "确认如下更改?"
 #: ../lib/modules/sambaSamAccount.inc:314
 #: ../lib/modules/sambaSamAccount.inc:387
 #: ../lib/modules/sambaSamAccount.inc:511
-#: ../lib/modules/sambaSamAccount.inc:1192
-#: ../lib/modules/sambaSamAccount.inc:1531
-#: ../lib/modules/sambaSamAccount.inc:1553
-#: ../lib/modules/sambaSamAccount.inc:1675
+#: ../lib/modules/sambaSamAccount.inc:1216
+#: ../lib/modules/sambaSamAccount.inc:1558
+#: ../lib/modules/sambaSamAccount.inc:1580
+#: ../lib/modules/sambaSamAccount.inc:1702
 #: ../lib/modules/sambaGroupMapping.inc:71
 #: ../lib/modules/sambaGroupMapping.inc:290
 #: ../lib/modules/sambaGroupMapping.inc:368
@@ -2756,6 +2817,11 @@ msgstr "域内计算机"
 msgid "Domain controllers"
 msgstr "域控制器"
 
+#: ../lib/types/smbDomain.inc:156
+#, php-format
+msgid "Domain count: %s"
+msgstr "域总计:%s"
+
 #: ../lib/modules/sambaSamAccount.inc:76
 #: ../lib/modules/sambaGroupMapping.inc:65
 msgid "Domain enterprise admins"
@@ -2773,11 +2839,11 @@ msgstr "域内来宾"
 
 #: ../lib/types/smbDomain.inc:92
 #: ../lib/modules/dhcp_settings.inc:124
-#: ../lib/modules/dhcp_settings.inc:172
-#: ../lib/modules/dhcp_settings.inc:186
-#: ../lib/modules/dhcp_settings.inc:210
-#: ../lib/modules/dhcp_settings.inc:524
-#: ../lib/modules/dhcp_settings.inc:618
+#: ../lib/modules/dhcp_settings.inc:183
+#: ../lib/modules/dhcp_settings.inc:197
+#: ../lib/modules/dhcp_settings.inc:221
+#: ../lib/modules/dhcp_settings.inc:535
+#: ../lib/modules/dhcp_settings.inc:629
 #: ../lib/modules/nisnetgroup.inc:144
 #: ../lib/modules/sambaDomain.inc:70
 #: ../lib/modules/sambaDomain.inc:137
@@ -2805,7 +2871,7 @@ msgid "Domain schema admins"
 msgstr "域架构管理员"
 
 #: ../lib/modules/sambaSamAccount.inc:74
-#: ../lib/modules/sambaSamAccount.inc:1981
+#: ../lib/modules/sambaSamAccount.inc:2008
 #: ../lib/modules/sambaGroupMapping.inc:59
 msgid "Domain users"
 msgstr "域内用户"
@@ -2818,7 +2884,7 @@ msgstr "发生错误时不停止"
 msgid "Down"
 msgstr "向下"
 
-#: ../templates/masscreate.php:243
+#: ../templates/masscreate.php:244
 msgid "Download sample CSV file"
 msgstr "下载CSV示例文件"
 
@@ -2844,13 +2910,13 @@ msgstr "美国东部时间(美国和加拿大),波哥大"
 
 #: ../templates/pdfedit/pdfmain.php:154
 #: ../templates/profedit/profilemain.php:153
-#: ../lib/modules/sambaSamAccount.inc:1197
-#: ../lib/modules/sambaSamAccount.inc:1202
+#: ../lib/modules/sambaSamAccount.inc:1221
+#: ../lib/modules/sambaSamAccount.inc:1226
 #: ../lib/lists.inc:419
 msgid "Edit"
 msgstr "编辑"
 
-#: ../lib/modules.inc:1212
+#: ../lib/modules.inc:1251
 msgid "Edit again"
 msgstr "再次编辑"
 
@@ -2859,11 +2925,11 @@ msgstr "再次编辑"
 msgid "Edit general settings"
 msgstr "编辑通用设置"
 
-#: ../lib/modules/posixAccount.inc:1110
+#: ../lib/modules/posixAccount.inc:1113
 msgid "Edit groups"
 msgstr "编辑组"
 
-#: ../lib/modules/posixGroup.inc:190
+#: ../lib/modules/posixGroup.inc:200
 msgid "Edit members"
 msgstr "编辑成员"
 
@@ -2879,7 +2945,7 @@ msgstr "编辑服务器配置文件"
 msgid "Edit subgroups"
 msgstr "编辑分组"
 
-#: ../lib/modules/sambaSamAccount.inc:1153
+#: ../lib/modules/sambaSamAccount.inc:1177
 msgid "Edit workstations"
 msgstr "编辑工作站"
 
@@ -2888,12 +2954,12 @@ msgstr "编辑工作站"
 #: ../lib/types/user.inc:100
 #: ../lib/modules/zarafaDynamicGroup.inc:217
 #: ../lib/modules/zarafaDynamicGroup.inc:222
-#: ../lib/modules/zarafaGroup.inc:154
-#: ../lib/modules/zarafaGroup.inc:160
+#: ../lib/modules/zarafaGroup.inc:206
+#: ../lib/modules/zarafaGroup.inc:212
 msgid "Email"
 msgstr "电子邮件"
 
-#: ../templates/lists/changePassword.php:200
+#: ../templates/lists/changePassword.php:205
 #: ../lib/modules/zarafaDynamicGroup.inc:60
 #: ../lib/modules/zarafaDynamicGroup.inc:61
 #: ../lib/modules/zarafaDynamicGroup.inc:113
@@ -2902,28 +2968,29 @@ msgstr "电子邮件"
 #: ../lib/modules/zarafaDynamicGroup.inc:449
 #: ../lib/modules/zarafaGroup.inc:59
 #: ../lib/modules/zarafaGroup.inc:60
-#: ../lib/modules/zarafaGroup.inc:87
-#: ../lib/modules/zarafaGroup.inc:124
-#: ../lib/modules/zarafaGroup.inc:137
-#: ../lib/modules/zarafaGroup.inc:413
+#: ../lib/modules/zarafaGroup.inc:126
+#: ../lib/modules/zarafaGroup.inc:171
+#: ../lib/modules/zarafaGroup.inc:187
+#: ../lib/modules/zarafaGroup.inc:621
 #: ../lib/modules/inetOrgPerson.inc:60
 #: ../lib/modules/inetOrgPerson.inc:123
 #: ../lib/modules/inetOrgPerson.inc:159
-#: ../lib/modules/inetOrgPerson.inc:257
-#: ../lib/modules/inetOrgPerson.inc:436
-#: ../lib/modules/inetOrgPerson.inc:545
-#: ../lib/modules/inetOrgPerson.inc:641
-#: ../lib/modules/inetOrgPerson.inc:1190
-#: ../lib/modules/inetOrgPerson.inc:1439
-#: ../lib/modules/inetOrgPerson.inc:1896
+#: ../lib/modules/inetOrgPerson.inc:260
+#: ../lib/modules/inetOrgPerson.inc:441
+#: ../lib/modules/inetOrgPerson.inc:558
+#: ../lib/modules/inetOrgPerson.inc:685
+#: ../lib/modules/inetOrgPerson.inc:689
+#: ../lib/modules/inetOrgPerson.inc:1588
+#: ../lib/modules/inetOrgPerson.inc:2035
+#: ../lib/modules/inetOrgPerson.inc:2507
 #: ../lib/modules/asteriskVoicemail.inc:98
 #: ../lib/modules/asteriskVoicemail.inc:131
 #: ../lib/modules/asteriskVoicemail.inc:169
 #: ../lib/modules/asteriskVoicemail.inc:261
 #: ../lib/modules/asteriskVoicemail.inc:410
 #: ../lib/modules/imapAccess.inc:206
-#: ../lib/modules/passwordSelfReset.inc:591
-#: ../lib/modules/passwordSelfReset.inc:660
+#: ../lib/modules/passwordSelfReset.inc:672
+#: ../lib/modules/passwordSelfReset.inc:779
 msgid "Email address"
 msgstr "电子邮件地址"
 
@@ -2931,18 +2998,22 @@ msgstr "电子邮件地址"
 msgid "Email address for this voicemail account."
 msgstr "此语音邮件帐号的电子邮件地址"
 
-#: ../lib/modules/zarafaUser.inc:108
+#: ../lib/modules/zarafaContact.inc:73
+#: ../lib/modules/zarafaUser.inc:109
 #: ../lib/modules/kolabUser.inc:139
 msgid "Email alias"
 msgstr "电子邮件别名"
 
-#: ../lib/modules/zarafaUser.inc:109
+#: ../lib/modules/zarafaContact.inc:74
+#: ../lib/modules/zarafaUser.inc:110
 #: ../lib/modules/kolabUser.inc:140
 msgid "Email alias for this account."
 msgstr "此帐号的电子邮件别名"
 
-#: ../lib/modules/zarafaUser.inc:395
-#: ../lib/modules/zarafaUser.inc:396
+#: ../lib/modules/zarafaContact.inc:157
+#: ../lib/modules/zarafaContact.inc:158
+#: ../lib/modules/zarafaUser.inc:418
+#: ../lib/modules/zarafaUser.inc:419
 #: ../lib/modules/kolabUser.inc:231
 msgid "Email alias is invalid!"
 msgstr "电子邮件别名非法!"
@@ -2962,19 +3033,23 @@ msgstr "电子邮件别名列表格式非法!"
 #: ../lib/modules/zarafaDynamicGroup.inc:158
 #: ../lib/modules/zarafaDynamicGroup.inc:232
 #: ../lib/modules/zarafaDynamicGroup.inc:464
+#: ../lib/modules/zarafaContact.inc:118
+#: ../lib/modules/zarafaContact.inc:148
+#: ../lib/modules/zarafaContact.inc:178
+#: ../lib/modules/zarafaContact.inc:549
 #: ../lib/modules/zarafaGroup.inc:63
 #: ../lib/modules/zarafaGroup.inc:67
-#: ../lib/modules/zarafaGroup.inc:93
-#: ../lib/modules/zarafaGroup.inc:127
-#: ../lib/modules/zarafaGroup.inc:170
-#: ../lib/modules/zarafaGroup.inc:418
-#: ../lib/modules/zarafaUser.inc:172
-#: ../lib/modules/zarafaUser.inc:195
-#: ../lib/modules/zarafaUser.inc:369
-#: ../lib/modules/zarafaUser.inc:378
-#: ../lib/modules/zarafaUser.inc:421
-#: ../lib/modules/zarafaUser.inc:1251
-#: ../lib/modules/zarafaUser.inc:1439
+#: ../lib/modules/zarafaGroup.inc:132
+#: ../lib/modules/zarafaGroup.inc:174
+#: ../lib/modules/zarafaGroup.inc:222
+#: ../lib/modules/zarafaGroup.inc:626
+#: ../lib/modules/zarafaUser.inc:182
+#: ../lib/modules/zarafaUser.inc:207
+#: ../lib/modules/zarafaUser.inc:389
+#: ../lib/modules/zarafaUser.inc:401
+#: ../lib/modules/zarafaUser.inc:444
+#: ../lib/modules/zarafaUser.inc:1342
+#: ../lib/modules/zarafaUser.inc:1560
 #: ../lib/modules/kolabUser.inc:189
 #: ../lib/modules/kolabUser.inc:217
 #: ../lib/modules/kolabUser.inc:354
@@ -2982,38 +3057,38 @@ msgstr "电子邮件别名列表格式非法!"
 msgid "Email aliases"
 msgstr "电子邮件别名"
 
-#: ../lib/modules/inetOrgPerson.inc:273
-#: ../lib/modules/inetOrgPerson.inc:332
-#: ../lib/modules/inetOrgPerson.inc:569
-#: ../lib/modules/inetOrgPerson.inc:701
-#: ../lib/modules/inetOrgPerson.inc:1212
-#: ../lib/modules/inetOrgPerson.inc:1449
+#: ../lib/modules/inetOrgPerson.inc:276
+#: ../lib/modules/inetOrgPerson.inc:337
+#: ../lib/modules/inetOrgPerson.inc:585
+#: ../lib/modules/inetOrgPerson.inc:777
+#: ../lib/modules/inetOrgPerson.inc:1652
+#: ../lib/modules/inetOrgPerson.inc:2045
 msgid "Employee number"
 msgstr "雇员号"
 
 #: ../lib/modules/inetOrgPerson.inc:72
-#: ../lib/modules/inetOrgPerson.inc:171
-#: ../lib/modules/inetOrgPerson.inc:263
-#: ../lib/modules/inetOrgPerson.inc:340
-#: ../lib/modules/inetOrgPerson.inc:554
-#: ../lib/modules/inetOrgPerson.inc:601
-#: ../lib/modules/inetOrgPerson.inc:1217
-#: ../lib/modules/inetOrgPerson.inc:1428
+#: ../lib/modules/inetOrgPerson.inc:174
+#: ../lib/modules/inetOrgPerson.inc:266
+#: ../lib/modules/inetOrgPerson.inc:345
+#: ../lib/modules/inetOrgPerson.inc:570
+#: ../lib/modules/inetOrgPerson.inc:617
+#: ../lib/modules/inetOrgPerson.inc:1657
+#: ../lib/modules/inetOrgPerson.inc:2024
 msgid "Employee type"
 msgstr "雇员类型"
 
-#: ../lib/modules/inetOrgPerson.inc:602
+#: ../lib/modules/inetOrgPerson.inc:618
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇员类型: 承包商,雇员,实习生,临时工,外部员工,..."
 
-#: ../templates/lists/changePassword.php:312
-#: ../templates/lists/changePassword.php:319
+#: ../templates/lists/changePassword.php:331
+#: ../templates/lists/changePassword.php:338
 #: ../templates/login.php:458
 msgid "Empty password submitted. Please try again."
 msgstr "提交了空密码,请重试."
 
 #: ../lib/modules/passwordSelfReset.inc:77
-#: ../lib/modules/passwordSelfReset.inc:129
+#: ../lib/modules/passwordSelfReset.inc:161
 msgid "Enable password self reset link"
 msgstr "打开密码自助复位链接"
 
@@ -3039,7 +3114,7 @@ msgid "Eniwetok, Kwajalein"
 msgstr "埃尼威托克,瓜加林"
 
 #: ../templates/3rdParty/pla/htdocs/add_value_form.php:91
-msgid "Enter the value(s) you would like to add:"
+msgid "Enter the values you would like to add:"
 msgstr "输入想增加的值:"
 
 #: ../lib/modules/eduPerson.inc:105
@@ -3051,7 +3126,7 @@ msgstr "输入想增加的值:"
 msgid "Entitlements"
 msgstr "授权"
 
-#: ../templates/3rdParty/pla/lib/QueryRender.php:473
+#: ../templates/3rdParty/pla/lib/QueryRender.php:471
 msgid "Entries found"
 msgstr "个条目被发现"
 
@@ -3086,8 +3161,8 @@ msgstr "条目不存在"
 msgid "Equality"
 msgstr "相等"
 
-#: ../lib/modules/zarafaUser.inc:507
-#: ../lib/modules/zarafaUser.inc:1202
+#: ../lib/modules/zarafaUser.inc:530
+#: ../lib/modules/zarafaUser.inc:1293
 msgid "Equipment"
 msgstr "设备"
 
@@ -3107,37 +3182,43 @@ msgstr "错误"
 msgid "Error number"
 msgstr "错误号"
 
+#: ../lib/modules/heimdalKerberos.inc:792
+msgid "Error while changing Kerberos password."
+msgstr "在修改Kerberos密码时发生错误."
+
 #: ../templates/delete.php:261
 #, php-format
 msgid "Error while deleting DN: %s"
 msgstr "删除DN: %s时发生错误"
 
-#: ../help/help.inc:133
+#: ../help/help.inc:139
 msgid "Every account type needs exactly one base module. This module provides a structural object class."
 msgstr "每个帐号类型都需要一个基本模块,这个模块提供一个结构化对象类"
 
 #: ../lib/modules/customScripts.inc:60
 #: ../lib/modules/customScripts.inc:72
-#: ../lib/modules/dhcp_settings.inc:521
-#: ../lib/modules/zarafaUser.inc:130
-#: ../help/help.inc:70
-#: ../help/help.inc:76
-#: ../help/help.inc:82
-#: ../help/help.inc:87
-#: ../help/help.inc:107
+#: ../lib/modules/zarafaContact.inc:87
+#: ../lib/modules/zarafaGroup.inc:89
+#: ../lib/modules/dhcp_settings.inc:532
+#: ../lib/modules/zarafaUser.inc:131
+#: ../help/help.inc:74
+#: ../help/help.inc:80
+#: ../help/help.inc:86
+#: ../help/help.inc:91
+#: ../help/help.inc:111
 msgid "Example"
 msgstr "示例"
 
-#: ../templates/masscreate.php:268
-#: ../templates/masscreate.php:343
+#: ../templates/masscreate.php:288
+#: ../templates/masscreate.php:363
 msgid "Example value"
 msgstr "示例值"
 
-#: ../help/help.inc:58
+#: ../help/help.inc:62
 msgid "Examples"
 msgstr "示例"
 
-#: ../templates/config/confmain.php:290
+#: ../templates/config/confmain.php:294
 msgid "Execute"
 msgstr "运行"
 
@@ -3157,9 +3238,9 @@ msgstr "过期时间"
 #: ../lib/modules/asteriskAccount.inc:202
 #: ../lib/modules/asteriskAccount.inc:291
 #: ../lib/modules/asteriskAccount.inc:353
-#: ../lib/modules/asteriskAccount.inc:558
-#: ../lib/modules/asteriskAccount.inc:902
-#: ../lib/modules/asteriskAccount.inc:1259
+#: ../lib/modules/asteriskAccount.inc:556
+#: ../lib/modules/asteriskAccount.inc:896
+#: ../lib/modules/asteriskAccount.inc:1257
 msgid "Expiration timestamp"
 msgstr "过期时间戳"
 
@@ -3186,7 +3267,7 @@ msgstr "密码过期告警"
 msgid "Export"
 msgstr "导出"
 
-#: ../templates/3rdParty/pla/htdocs/export_form.php:108
+#: ../templates/3rdParty/pla/htdocs/export_form.php:105
 msgid "Export format"
 msgstr "导出格式"
 
@@ -3199,24 +3280,35 @@ msgstr "导出子树"
 msgid "Extended"
 msgstr "扩展"
 
-#: ../lib/types/asteriskExt.inc:92
-#: ../lib/modules/asteriskExtension.inc:86
-#: ../lib/modules/asteriskExtension.inc:125
-#: ../lib/modules/asteriskExtension.inc:135
-#: ../lib/modules/asteriskExtension.inc:229
-#: ../lib/modules/asteriskExtension.inc:481
+#: ../lib/types/asteriskExt.inc:138
+#, php-format
+msgid "Extension count: %s"
+msgstr "扩展总计:%s"
+
+#: ../lib/types/asteriskExt.inc:94
+#: ../lib/types/asteriskExt.inc:153
+#: ../lib/modules/asteriskExtension.inc:94
+#: ../lib/modules/asteriskExtension.inc:129
+#: ../lib/modules/asteriskExtension.inc:137
+#: ../lib/modules/asteriskExtension.inc:281
+#: ../lib/modules/asteriskExtension.inc:285
+#: ../lib/modules/asteriskExtension.inc:796
 msgid "Extension name"
 msgstr "扩展名"
 
-#: ../lib/modules/asteriskExtension.inc:98
-#: ../lib/modules/asteriskExtension.inc:128
-#: ../lib/modules/asteriskExtension.inc:176
-#: ../lib/modules/asteriskExtension.inc:255
-#: ../lib/modules/asteriskExtension.inc:327
-#: ../lib/modules/asteriskExtension.inc:484
+#: ../lib/modules/asteriskExtension.inc:106
+#: ../lib/modules/asteriskExtension.inc:130
+#: ../lib/modules/asteriskExtension.inc:151
+#: ../lib/modules/asteriskExtension.inc:225
+#: ../lib/modules/asteriskExtension.inc:466
+#: ../lib/modules/asteriskExtension.inc:799
 msgid "Extension owners"
 msgstr "扩展属主"
 
+#: ../lib/modules/asteriskExtension.inc:182
+msgid "Extension with this name is already exists."
+msgstr "扩展名已经使用!"
+
 #: ../templates/3rdParty/pla/htdocs/import.php:66
 msgid "Failed"
 msgstr "失败"
@@ -3237,22 +3329,23 @@ msgstr "失败记录间隔"
 #: ../lib/modules/inetOrgPerson.inc:58
 #: ../lib/modules/inetOrgPerson.inc:124
 #: ../lib/modules/inetOrgPerson.inc:156
-#: ../lib/modules/inetOrgPerson.inc:255
-#: ../lib/modules/inetOrgPerson.inc:428
-#: ../lib/modules/inetOrgPerson.inc:542
-#: ../lib/modules/inetOrgPerson.inc:637
-#: ../lib/modules/inetOrgPerson.inc:1185
-#: ../lib/modules/inetOrgPerson.inc:1438
-#: ../lib/modules/inetOrgPerson.inc:1924
+#: ../lib/modules/inetOrgPerson.inc:258
+#: ../lib/modules/inetOrgPerson.inc:433
+#: ../lib/modules/inetOrgPerson.inc:555
+#: ../lib/modules/inetOrgPerson.inc:677
+#: ../lib/modules/inetOrgPerson.inc:681
+#: ../lib/modules/inetOrgPerson.inc:1562
+#: ../lib/modules/inetOrgPerson.inc:2034
+#: ../lib/modules/inetOrgPerson.inc:2542
 msgid "Fax number"
 msgstr "传真号"
 
-#: ../lib/modules/zarafaUser.inc:139
-#: ../lib/modules/zarafaUser.inc:176
-#: ../lib/modules/zarafaUser.inc:375
-#: ../lib/modules/zarafaUser.inc:596
-#: ../lib/modules/zarafaUser.inc:1265
-#: ../lib/modules/zarafaUser.inc:1301
+#: ../lib/modules/zarafaUser.inc:140
+#: ../lib/modules/zarafaUser.inc:186
+#: ../lib/modules/zarafaUser.inc:395
+#: ../lib/modules/zarafaUser.inc:639
+#: ../lib/modules/zarafaUser.inc:1356
+#: ../lib/modules/zarafaUser.inc:1401
 msgid "Features"
 msgstr "功能"
 
@@ -3276,7 +3369,7 @@ msgstr "用户登录时自动运行的文件名和网络登录共享相对路径
 msgid "File path"
 msgstr "文件路径"
 
-#: ../templates/masscreate.php:229
+#: ../templates/masscreate.php:231
 #: ../lib/tools/fileUpload.inc:44
 #: ../lib/types/automountType.inc:197
 #: ../lib/types/dhcp.inc:242
@@ -3292,32 +3385,33 @@ msgstr "文件上传"
 #: ../lib/modules/zarafaDynamicGroup.inc:160
 #: ../lib/modules/zarafaDynamicGroup.inc:213
 #: ../lib/modules/zarafaDynamicGroup.inc:459
+#: ../lib/modules/zarafaContact.inc:81
 #: ../lib/modules/zarafaAddressList.inc:72
 #: ../lib/modules/zarafaAddressList.inc:123
 #: ../lib/modules/zarafaAddressList.inc:134
 #: ../lib/modules/zarafaAddressList.inc:181
 #: ../lib/modules/zarafaAddressList.inc:325
-#: ../lib/modules/zarafaUser.inc:124
+#: ../lib/modules/zarafaUser.inc:125
 #: ../lib/modules/nisnetgroup.inc:94
 #: ../lib/modules/nisnetgroup.inc:467
 #: ../lib/lists.inc:344
-#: ../help/help.inc:144
+#: ../help/help.inc:150
 msgid "Filter"
 msgstr "过滤器"
 
-#: ../templates/3rdParty/pla/lib/QueryRender.php:511
+#: ../templates/3rdParty/pla/lib/QueryRender.php:509
 msgid "Filter performed"
 msgstr "进行过滤"
 
 #: ../lib/types/user.inc:96
 #: ../lib/modules/inetOrgPerson.inc:48
 #: ../lib/modules/inetOrgPerson.inc:122
-#: ../lib/modules/inetOrgPerson.inc:293
-#: ../lib/modules/inetOrgPerson.inc:499
-#: ../lib/modules/inetOrgPerson.inc:593
-#: ../lib/modules/inetOrgPerson.inc:1037
-#: ../lib/modules/inetOrgPerson.inc:1426
-#: ../lib/modules/inetOrgPerson.inc:1882
+#: ../lib/modules/inetOrgPerson.inc:298
+#: ../lib/modules/inetOrgPerson.inc:512
+#: ../lib/modules/inetOrgPerson.inc:609
+#: ../lib/modules/inetOrgPerson.inc:1219
+#: ../lib/modules/inetOrgPerson.inc:2022
+#: ../lib/modules/inetOrgPerson.inc:2493
 msgid "First name"
 msgstr "名字"
 
@@ -3326,15 +3420,15 @@ msgstr "名字"
 msgid "First name contains invalid characters!"
 msgstr "名字包含非法字符"
 
-#: ../lib/modules/inetOrgPerson.inc:594
+#: ../lib/modules/inetOrgPerson.inc:610
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "用户名字只允许字母,-和空格"
 
-#: ../lib/modules/ddns.inc:90
+#: ../lib/modules/ddns.inc:91
 msgid "Fix IP addresses"
 msgstr "固定IP地址"
 
-#: ../templates/config/confmain.php:341
+#: ../templates/config/confmain.php:345
 msgid "Fixed list"
 msgstr "固定列表"
 
@@ -3346,16 +3440,19 @@ msgstr "自动处理邀请."
 msgid "For the upload please specify the entries in the format \"(HOST,USER,DOMAIN)\". Multiple entries are separated by semicolon."
 msgstr "上传请使用\"(主机,用户,域)\"格式来编写条目.多条目请用分号隔开."
 
+#: ../templates/lists/changePassword.php:171
 #: ../lib/modules/shadowAccount.inc:358
+#: ../lib/modules.inc:998
+#: ../help/help.inc:170
 msgid "Force password change"
 msgstr "强制改变密码"
 
-#: ../lib/modules/passwordSelfReset.inc:537
+#: ../lib/modules/passwordSelfReset.inc:615
 msgid "Forgot password?"
 msgstr "忘记密码?"
 
-#: ../templates/3rdParty/pla/lib/QueryRender.php:486
-#: ../help/help.inc:194
+#: ../templates/3rdParty/pla/lib/QueryRender.php:484
+#: ../help/help.inc:202
 msgid "Format"
 msgstr "格式"
 
@@ -3366,7 +3463,7 @@ msgstr "格式"
 #: ../lib/modules/kolabUser.inc:219
 #: ../lib/modules/kolabUser.inc:314
 #: ../lib/modules/kolabUser.inc:783
-#: ../lib/modules/kolabUser.inc:835
+#: ../lib/modules/kolabUser.inc:839
 msgid "Free/Busy interval"
 msgstr "空闲/忙碌 间隔"
 
@@ -3379,25 +3476,28 @@ msgstr "空闲/忙碌间隔必须是一个数字!"
 msgid "FreeRadius"
 msgstr "FreeRadius"
 
-#: ../lib/modules/sambaSamAccount.inc:1288
+#: ../lib/modules/sambaSamAccount.inc:1312
 msgid "Friday"
 msgstr "星期五"
 
-#: ../templates/config/confmain.php:314
-#: ../help/help.inc:188
+#: ../templates/config/confmain.php:318
+#: ../lib/modules/passwordSelfReset.inc:97
+#: ../lib/modules/passwordSelfReset.inc:190
+#: ../lib/modules/passwordSelfReset.inc:206
+#: ../help/help.inc:196
 msgid "From address"
 msgstr "收件人地址"
 
-#: ../templates/config/confmain.php:424
+#: ../templates/config/confmain.php:437
 msgid "From address for password mails is invalid."
 msgstr "密码邮件的发件人地址非法"
 
 #: ../lib/modules/asteriskAccount.inc:138
 #: ../lib/modules/asteriskAccount.inc:259
 #: ../lib/modules/asteriskAccount.inc:337
-#: ../lib/modules/asteriskAccount.inc:441
-#: ../lib/modules/asteriskAccount.inc:747
-#: ../lib/modules/asteriskAccount.inc:1211
+#: ../lib/modules/asteriskAccount.inc:439
+#: ../lib/modules/asteriskAccount.inc:741
+#: ../lib/modules/asteriskAccount.inc:1209
 msgid "From domain"
 msgstr "来自域"
 
@@ -3408,9 +3508,9 @@ msgstr "此帐号的来自域设置"
 #: ../lib/modules/asteriskAccount.inc:134
 #: ../lib/modules/asteriskAccount.inc:257
 #: ../lib/modules/asteriskAccount.inc:336
-#: ../lib/modules/asteriskAccount.inc:434
-#: ../lib/modules/asteriskAccount.inc:738
-#: ../lib/modules/asteriskAccount.inc:1208
+#: ../lib/modules/asteriskAccount.inc:432
+#: ../lib/modules/asteriskAccount.inc:732
+#: ../lib/modules/asteriskAccount.inc:1206
 msgid "From user"
 msgstr "来自用户"
 
@@ -3421,13 +3521,13 @@ msgstr "此帐号的来自用户设置"
 #: ../lib/modules/asteriskAccount.inc:142
 #: ../lib/modules/asteriskAccount.inc:261
 #: ../lib/modules/asteriskAccount.inc:338
-#: ../lib/modules/asteriskAccount.inc:448
-#: ../lib/modules/asteriskAccount.inc:756
-#: ../lib/modules/asteriskAccount.inc:1214
+#: ../lib/modules/asteriskAccount.inc:446
+#: ../lib/modules/asteriskAccount.inc:750
+#: ../lib/modules/asteriskAccount.inc:1212
 msgid "Full contact"
 msgstr "联系人全称"
 
-#: ../templates/lists/changePassword.php:196
+#: ../templates/lists/changePassword.php:203
 #: ../lib/modules/asteriskVoicemail.inc:94
 #: ../lib/modules/asteriskVoicemail.inc:130
 #: ../lib/modules/asteriskVoicemail.inc:163
@@ -3445,29 +3545,29 @@ msgstr "Asterisk语音邮箱的全名."
 msgid "Function"
 msgstr "功能"
 
-#: ../lib/modules/inetOrgPerson.inc:374
+#: ../lib/modules/inetOrgPerson.inc:379
 msgid "GB-12345"
 msgstr "GB-12345"
 
 #: ../lib/types/host.inc:96
 #: ../lib/types/group.inc:93
 #: ../lib/types/user.inc:93
-#: ../lib/modules/posixGroup.inc:176
-#: ../lib/modules/posixGroup.inc:331
-#: ../lib/modules/posixGroup.inc:344
-#: ../lib/modules/posixGroup.inc:386
-#: ../lib/modules/posixGroup.inc:406
-#: ../lib/modules/posixGroup.inc:455
-#: ../lib/modules/posixGroup.inc:475
+#: ../lib/modules/posixGroup.inc:186
+#: ../lib/modules/posixGroup.inc:341
+#: ../lib/modules/posixGroup.inc:354
+#: ../lib/modules/posixGroup.inc:396
+#: ../lib/modules/posixGroup.inc:416
+#: ../lib/modules/posixGroup.inc:465
+#: ../lib/modules/posixGroup.inc:485
 #: ../lib/modules/posixAccount.inc:99
 #: ../lib/modules/posixAccount.inc:315
-#: ../lib/modules/posixAccount.inc:1463
+#: ../lib/modules/posixAccount.inc:1469
 #: ../lib/modules/sambaGroupMapping.inc:321
 #: ../lib/modules/sambaGroupMapping.inc:390
 msgid "GID number"
 msgstr "GID编号"
 
-#: ../lib/modules/posixGroup.inc:475
+#: ../lib/modules/posixGroup.inc:485
 msgid "GID number has changed. Please select checkbox to change GID number of users and hosts."
 msgstr "GID的编号已经更改,请点击选择框来改变用户GID号"
 
@@ -3476,7 +3576,7 @@ msgstr "GID的编号已经更改,请点击选择框来改变用户GID号"
 msgid "GID number has changed. To keep file ownership you have to run the following command as root: 'find / -gid %s -uid %s -exec chgrp %s {} \\;'"
 msgstr "GID已经更改,要保持文件属性一,你必须以root身份运行以下命令: 'find / -gid %s -uid %s -exec chgrp %s {} \\;'"
 
-#: ../lib/modules/posixGroup.inc:482
+#: ../lib/modules/posixGroup.inc:492
 msgid "GID number has to be a numeric value!"
 msgstr "GID号必须使用数字"
 
@@ -3485,8 +3585,8 @@ msgstr "GID号必须使用数字"
 #: ../lib/modules/posixAccount.inc:316
 #: ../lib/modules/posixAccount.inc:375
 #: ../lib/modules/posixAccount.inc:413
-#: ../lib/modules/posixAccount.inc:1098
-#: ../lib/modules/posixAccount.inc:1464
+#: ../lib/modules/posixAccount.inc:1101
+#: ../lib/modules/posixAccount.inc:1470
 msgid "Gecos"
 msgstr "备注(Gecos)"
 
@@ -3495,16 +3595,16 @@ msgid "General information"
 msgstr "一般信息"
 
 #: ../templates/config/confmodules.php:155
-#: ../templates/config/confmain.php:188
+#: ../templates/config/confmain.php:192
 #: ../templates/config/moduleSettings.php:154
 #: ../templates/config/conftypes.php:173
-#: ../templates/selfService/adminMain.php:337
+#: ../templates/selfService/adminMain.php:348
 #: ../templates/profedit/profilepage.php:204
 msgid "General settings"
 msgstr "通用设置"
 
-#: ../templates/lists/changePassword.php:214
-#: ../help/help.inc:186
+#: ../templates/lists/changePassword.php:230
+#: ../help/help.inc:194
 msgid "Generate random password"
 msgstr "生成随机密码"
 
@@ -3545,7 +3645,7 @@ msgid "Grace authentication limit"
 msgstr "缓期认证限制"
 
 #: ../lib/modules/quota.inc:117
-#: ../lib/modules/quota.inc:390
+#: ../lib/modules/quota.inc:393
 msgid "Grace block period"
 msgstr "块限制宽限周期"
 
@@ -3558,12 +3658,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:394
+#: ../lib/modules/quota.inc:397
 msgid "Grace inode period"
 msgstr "节点限制宽限期"
 
-#: ../templates/config/confmain.php:295
-#: ../templates/selfService/adminMain.php:478
+#: ../templates/config/confmain.php:299
+#: ../templates/selfService/adminMain.php:501
 msgid "Group"
 msgstr "组"
 
@@ -3571,13 +3671,21 @@ msgstr "组"
 msgid "Group accounts (e.g. Unix and Samba)"
 msgstr "组帐号(比如unix和samba)"
 
+#: ../lib/types/gon.inc:161
+#: ../lib/types/zarafaDynamicGroupType.inc:154
+#: ../lib/types/group.inc:174
+#: ../lib/types/netgroup.inc:158
+#, php-format
+msgid "Group count: %s"
+msgstr "帐号总计:%s"
+
 #: ../lib/types/group.inc:96
-#: ../lib/modules/posixGroup.inc:377
+#: ../lib/modules/posixGroup.inc:387
 #: ../lib/modules/nisnetgroup.inc:110
 msgid "Group description"
 msgstr "组说明"
 
-#: ../lib/modules/posixGroup.inc:391
+#: ../lib/modules/posixGroup.inc:401
 msgid "Group description. If left empty group name will be used."
 msgstr "组说明,若空则会使用组名来替代."
 
@@ -3589,13 +3697,13 @@ msgstr "组成员DN"
 
 #: ../templates/3rdParty/pla/htdocs/modify_member_form.php:94
 #: ../lib/types/group.inc:94
-#: ../lib/modules/posixGroup.inc:189
-#: ../lib/modules/posixGroup.inc:239
-#: ../lib/modules/posixGroup.inc:332
-#: ../lib/modules/posixGroup.inc:350
-#: ../lib/modules/posixGroup.inc:394
-#: ../lib/modules/posixGroup.inc:398
-#: ../lib/modules/posixGroup.inc:456
+#: ../lib/modules/posixGroup.inc:199
+#: ../lib/modules/posixGroup.inc:249
+#: ../lib/modules/posixGroup.inc:342
+#: ../lib/modules/posixGroup.inc:360
+#: ../lib/modules/posixGroup.inc:404
+#: ../lib/modules/posixGroup.inc:408
+#: ../lib/modules/posixGroup.inc:466
 msgid "Group members"
 msgstr "组成员"
 
@@ -3610,14 +3718,14 @@ msgstr "组成员"
 #: ../lib/modules/zarafaDynamicGroup.inc:170
 #: ../lib/modules/zarafaDynamicGroup.inc:194
 #: ../lib/modules/zarafaDynamicGroup.inc:444
-#: ../lib/modules/posixGroup.inc:166
-#: ../lib/modules/posixGroup.inc:335
-#: ../lib/modules/posixGroup.inc:365
-#: ../lib/modules/posixGroup.inc:414
-#: ../lib/modules/posixGroup.inc:454
-#: ../lib/modules/posixGroup.inc:483
-#: ../lib/modules/posixGroup.inc:484
-#: ../lib/modules/posixGroup.inc:485
+#: ../lib/modules/posixGroup.inc:176
+#: ../lib/modules/posixGroup.inc:345
+#: ../lib/modules/posixGroup.inc:375
+#: ../lib/modules/posixGroup.inc:424
+#: ../lib/modules/posixGroup.inc:464
+#: ../lib/modules/posixGroup.inc:493
+#: ../lib/modules/posixGroup.inc:494
+#: ../lib/modules/posixGroup.inc:495
 #: ../lib/modules/nisnetgroup.inc:73
 #: ../lib/modules/nisnetgroup.inc:102
 #: ../lib/modules/nisnetgroup.inc:129
@@ -3637,13 +3745,13 @@ msgstr "组名已经被使用"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:170
 #: ../lib/modules/zarafaDynamicGroup.inc:171
-#: ../lib/modules/posixGroup.inc:485
-#: ../lib/modules/posixGroup.inc:486
+#: ../lib/modules/posixGroup.inc:495
+#: ../lib/modules/posixGroup.inc:496
 #: ../lib/modules/nisnetgroup.inc:141
 msgid "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !"
 msgstr "组名包含非法字符,可用字符为: a-z, A-Z, 0-9,及 -或_ !"
 
-#: ../lib/modules/posixGroup.inc:484
+#: ../lib/modules/posixGroup.inc:494
 msgid "Group name in use. Selected next free group name."
 msgstr "组名已被使用,请选择可用的组名."
 
@@ -3651,7 +3759,7 @@ msgstr "组名已被使用,请选择可用的组名."
 msgid "Group name of the group which should be created. Valid characters are: a-z, A-Z, 0-9 and .-_ ."
 msgstr "将要建立的组名,可用字符为: a-z, A-Z, 0-9,及 -或_ "
 
-#: ../lib/modules/posixGroup.inc:415
+#: ../lib/modules/posixGroup.inc:425
 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,.-_ .如果该组名存在,会在组名末尾增加下一个可以使用的数字。"
 
@@ -3669,9 +3777,9 @@ msgstr "组名"
 #: ../lib/types/gon.inc:53
 #: ../lib/modules/posixAccount.inc:273
 #: ../lib/modules/posixAccount.inc:325
-#: ../lib/modules/posixAccount.inc:1231
-#: ../lib/modules/posixAccount.inc:1374
-#: ../lib/modules/posixAccount.inc:1478
+#: ../lib/modules/posixAccount.inc:1234
+#: ../lib/modules/posixAccount.inc:1380
+#: ../lib/modules/posixAccount.inc:1484
 #: ../lib/modules/groupOfNames.inc:44
 msgid "Group of names"
 msgstr "组名"
@@ -3684,8 +3792,8 @@ msgstr "帐号的组名"
 msgid "Group of unique names"
 msgstr "组的唯一名"
 
-#: ../lib/modules/posixGroup.inc:356
-#: ../lib/modules/posixGroup.inc:402
+#: ../lib/modules/posixGroup.inc:366
+#: ../lib/modules/posixGroup.inc:412
 msgid "Group password"
 msgstr "组密码"
 
@@ -3694,7 +3802,8 @@ msgid "Group type"
 msgstr "组类型"
 
 #: ../lib/types/group.inc:54
-#: ../lib/modules/posixGroup.inc:303
+#: ../lib/modules/posixGroup.inc:313
+#: ../lib/modules/zarafaGroup.inc:105
 #: ../lib/modules/generalInformation.inc:103
 msgid "Groups"
 msgstr "组"
@@ -3703,14 +3812,16 @@ msgstr "组"
 msgid "H-Node (0x08)"
 msgstr "H-节点 (0x08)"
 
-#: ../templates/config/confmain.php:327
-#: ../help/help.inc:197
+#: ../templates/config/confmain.php:331
+#: ../lib/modules/passwordSelfReset.inc:194
+#: ../lib/modules/passwordSelfReset.inc:210
+#: ../help/help.inc:205
 msgid "HTML format"
 msgstr "HTML格式"
 
-#: ../templates/config/confmain.php:362
-#: ../templates/selfService/adminMain.php:369
-#: ../help/help.inc:116
+#: ../templates/config/confmain.php:372
+#: ../templates/selfService/adminMain.php:380
+#: ../help/help.inc:120
 msgid "HTTP authentication"
 msgstr "HTTP认证"
 
@@ -3723,21 +3834,21 @@ msgstr "HTTP认证"
 msgid "HTTP port"
 msgstr "HTTP端口"
 
-#: ../lib/modules/quota.inc:621
-#: ../lib/modules/systemQuotas.inc:374
+#: ../lib/modules/quota.inc:624
+#: ../lib/modules/systemQuotas.inc:377
 msgid "Hard block"
 msgstr "块的硬性限制"
 
 #: ../lib/modules/quota.inc:111
 #: ../lib/modules/quota.inc:112
-#: ../lib/modules/quota.inc:389
-#: ../lib/modules/quota.inc:494
+#: ../lib/modules/quota.inc:392
+#: ../lib/modules/quota.inc:497
 #: ../lib/modules/systemQuotas.inc:119
 msgid "Hard block limit"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:623
-#: ../lib/modules/systemQuotas.inc:376
+#: ../lib/modules/quota.inc:626
+#: ../lib/modules/systemQuotas.inc:379
 msgid "Hard inode"
 msgstr "节点的硬性限制"
 
@@ -3746,8 +3857,8 @@ msgid "Hard inode (files) limit"
 msgstr "节点的硬性限制"
 
 #: ../lib/modules/quota.inc:133
-#: ../lib/modules/quota.inc:393
-#: ../lib/modules/quota.inc:496
+#: ../lib/modules/quota.inc:396
+#: ../lib/modules/quota.inc:499
 #: ../lib/modules/systemQuotas.inc:123
 msgid "Hard inode limit"
 msgstr "节点硬性限制"
@@ -3766,8 +3877,8 @@ msgstr "夏威夷"
 msgid "Headline"
 msgstr "标题"
 
-#: ../templates/main_header.php:123
-#: ../lib/modules.inc:619
+#: ../templates/main_header.php:125
+#: ../lib/modules.inc:622
 msgid "Help"
 msgstr "帮助"
 
@@ -3779,11 +3890,11 @@ msgstr "这是你可浏览的LDAP对象类和属性."
 msgid "Here you can change the settings for the terminal server access."
 msgstr "这里可以改变终端服务访问的设置。"
 
-#: ../templates/masscreate.php:121
+#: ../templates/masscreate.php:123
 msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr "您可以上传CSV文件来建立多个帐号"
 
-#: ../lib/modules/dhcp_settings.inc:167
+#: ../lib/modules/dhcp_settings.inc:177
 msgid "Here you can enter a description for this DHCP entry."
 msgstr "可以输入此DHCP条目的描述"
 
@@ -3796,7 +3907,8 @@ msgstr "在这输入组的描述."
 msgid "Here you can enter a description for this role."
 msgstr "在这输入这个角色的描述."
 
-#: ../lib/modules/zarafaUser.inc:125
+#: ../lib/modules/zarafaContact.inc:82
+#: ../lib/modules/zarafaUser.inc:126
 #: ../lib/modules/nisnetgroup.inc:95
 msgid "Here you can enter a filter value. Only entries which contain the filter text will be shown."
 msgstr "这里您可以输入过滤条件,只显示符合过滤条件的条目."
@@ -3809,19 +3921,20 @@ msgstr "您可以在此输入附加的组成员,组名以逗号分隔."
 msgid "Here you can enter a serial number for this device."
 msgstr "在这输入这个设备的序列号."
 
-#: ../lib/modules/inetOrgPerson.inc:686
-msgid "Here you can enter the user's department(s)."
+#: ../lib/modules/inetOrgPerson.inc:754
+#: ../lib/modules/inetOrgPerson.inc:758
+msgid "Here you can enter the user's department."
 msgstr "这里可以输入用户的部门."
 
-#: ../lib/modules/zarafaUser.inc:140
+#: ../lib/modules/zarafaUser.inc:141
 msgid "Here you can explicitly enable and disable Zarafa features."
 msgstr "你可以在这里打开或关闭Zarafa功能."
 
-#: ../help/help.inc:145
+#: ../help/help.inc:151
 msgid "Here you can input simple filter expressions (e.g. 'value' or 'v*'). The filter is case-sensitive."
 msgstr "在此输入简单的过滤语法(例如'value'或'v*'),系统在过滤时区分大小写."
 
-#: ../help/help.inc:157
+#: ../help/help.inc:163
 msgid "Here you can load an account profile to set default settings for your account. The \"default\" profile is automatically loaded for new accounts."
 msgstr "您可以指定一个帐号配置文件做为缺省的配置文件,缺省的配置文件会自动做为新帐号的配置文件."
 
@@ -3829,31 +3942,27 @@ msgstr "您可以指定一个帐号配置文件做为缺省的配置文件,缺
 msgid "Here you can manage your account profiles."
 msgstr "您可以管理您的帐号配置文件."
 
-#: ../help/help.inc:159
+#: ../help/help.inc:165
 msgid "Here you can select a PDF structure and export the account to a PDF file."
 msgstr "您可以选择一个PDF结构,您可以在此選擇一個PDF架構,然後將帳號滙出成PDF檔."
 
-#: ../help/help.inc:139
+#: ../help/help.inc:145
 msgid "Here you can select where LAM should save its log messages. System logging will go to Syslog on Unix systems and event log on Windows. You can also select an extra file."
 msgstr "您在此选择系统日志的存入位置,系统日志记录可以记录在UNIX 系统或WINDOWS 日志系统,您也可以选择文件"
 
-#: ../help/help.inc:102
+#: ../help/help.inc:106
 msgid "Here you can select which plugins you want to use for account management."
 msgstr "在此您可以选择一些选择帐号管理的插件"
 
-#: ../help/help.inc:115
+#: ../help/help.inc:119
 msgid "Here you can set a limit for LDAP searches. This will restrict the number of results for LDAP searches. Please use this if LAM's LDAP queries produce too much load."
 msgstr "设置LDAP查询结果条目数量的限制。如果服务器查询负载较重，可以使用这个设置来限制LDAP查询返回结果的条目数量。"
 
-#: ../help/help.inc:185
+#: ../help/help.inc:193
 msgid "Here you can specify additional CSS links to change the layout of the self service pages. This is useful to adapt them to your corporate design. Please enter one link per line."
 msgstr "这里可以指定附加的CSS链接来改变自助服务页的布局.这样做有利于采用公司的统一设计.每行添加一个CSS连接."
 
-#: ../lib/modules/phpGroupwareUser.inc:79
-msgid "Here you can specify if the account is active or inactive."
-msgstr "这里可以指定用户的激活状态."
-
-#: ../help/help.inc:143
+#: ../help/help.inc:149
 msgid "Here you can specify minimum requirements for passwords. The character classes are: lowercase, uppercase, numeric and symbols."
 msgstr "在此指定用户密码的最小需求.字符类别包括:小写,大写,数字和标点符号."
 
@@ -3861,6 +3970,10 @@ 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网络组中的分组.此分组中所有用户都会认同为这个网络组中的成员."
 
+#: ../help/help.inc:123
+msgid "Here you can specify the DN and password of the bind user that will be used for the LDAP search. This is required if your LDAP server does not allow anonymous access."
+msgstr "输入搜索LDAP时所需要的DN和绑定用户的密码.如果LDAP不支持匿名访问,这些信息是必须的."
+
 #: ../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 "在这儿您可以指定这个账号有登录权的主机列表.通配符\"*\"代表所有的主机.您可以在主机名前加\"!\"来拒绝对主机的访问."
@@ -3869,7 +3982,7 @@ msgstr "在这儿您可以指定这个账号有登录权的主机列表.通配
 msgid "Here you can specify the minimum number of characters for a user password."
 msgstr "在此指定用户密码的最小长度."
 
-#: ../templates/lists/changePassword.php:238
+#: ../templates/lists/changePassword.php:258
 msgid "Here you can specify the new password yourself."
 msgstr "这里可以设置自己的新密码。"
 
@@ -3888,33 +4001,40 @@ msgstr "测试您安装的系统功能是否正确."
 #: ../lib/modules/zarafaDynamicGroup.inc:157
 #: ../lib/modules/zarafaDynamicGroup.inc:247
 #: ../lib/modules/zarafaDynamicGroup.inc:474
+#: ../lib/modules/zarafaContact.inc:61
+#: ../lib/modules/zarafaContact.inc:138
+#: ../lib/modules/zarafaContact.inc:146
+#: ../lib/modules/zarafaContact.inc:217
+#: ../lib/modules/zarafaContact.inc:537
 #: ../lib/modules/zarafaGroup.inc:75
-#: ../lib/modules/zarafaGroup.inc:107
-#: ../lib/modules/zarafaGroup.inc:126
-#: ../lib/modules/zarafaGroup.inc:193
-#: ../lib/modules/zarafaGroup.inc:433
+#: ../lib/modules/zarafaGroup.inc:146
+#: ../lib/modules/zarafaGroup.inc:173
+#: ../lib/modules/zarafaGroup.inc:262
+#: ../lib/modules/zarafaGroup.inc:646
 #: ../lib/modules/zarafaAddressList.inc:60
 #: ../lib/modules/zarafaAddressList.inc:101
 #: ../lib/modules/zarafaAddressList.inc:132
 #: ../lib/modules/zarafaAddressList.inc:189
 #: ../lib/modules/zarafaAddressList.inc:335
-#: ../lib/modules/zarafaUser.inc:64
-#: ../lib/modules/zarafaUser.inc:297
-#: ../lib/modules/zarafaUser.inc:338
-#: ../lib/modules/zarafaUser.inc:366
-#: ../lib/modules/zarafaUser.inc:535
-#: ../lib/modules/zarafaUser.inc:1239
+#: ../lib/modules/zarafaUser.inc:65
+#: ../lib/modules/zarafaUser.inc:309
+#: ../lib/modules/zarafaUser.inc:358
+#: ../lib/modules/zarafaUser.inc:386
+#: ../lib/modules/zarafaUser.inc:578
+#: ../lib/modules/zarafaUser.inc:1330
 msgid "Hidden"
 msgstr "隐藏"
 
 #: ../lib/modules/asteriskAccount.inc:234
 #: ../lib/modules/asteriskAccount.inc:245
+#: ../lib/modules/zarafaGroup.inc:98
+#: ../lib/modules/zarafaGroup.inc:107
 #: ../lib/modules/sambaSamAccount.inc:374
 #: ../lib/modules/sambaSamAccount.inc:564
-#: ../lib/modules/zarafaUser.inc:116
-#: ../lib/modules/zarafaUser.inc:150
-#: ../lib/modules/inetOrgPerson.inc:225
-#: ../lib/modules/inetOrgPerson.inc:689
+#: ../lib/modules/zarafaUser.inc:117
+#: ../lib/modules/zarafaUser.inc:160
+#: ../lib/modules/inetOrgPerson.inc:228
+#: ../lib/modules/inetOrgPerson.inc:761
 #: ../lib/modules/freeRadius.inc:104
 #: ../lib/modules/freeRadius.inc:110
 msgid "Hidden options"
@@ -3942,7 +4062,7 @@ msgstr "隐藏/显示目录树"
 msgid "Hint"
 msgstr "提示"
 
-#: ../templates/masscreate.php:235
+#: ../templates/masscreate.php:237
 msgid "Hint: Format all cells as text in your spreadsheet program and turn off auto correction."
 msgstr "提示:将电子表格的格式设定为文字,然后关闭自动更正功能"
 
@@ -3961,8 +4081,8 @@ msgstr "按住CTRL键可以多选组."
 #: ../lib/types/user.inc:98
 #: ../lib/modules/sambaSamAccount.inc:212
 #: ../lib/modules/sambaSamAccount.inc:332
-#: ../lib/modules/sambaSamAccount.inc:1404
-#: ../lib/modules/sambaSamAccount.inc:1689
+#: ../lib/modules/sambaSamAccount.inc:1431
+#: ../lib/modules/sambaSamAccount.inc:1716
 #: ../lib/modules/posixAccount.inc:74
 #: ../lib/modules/posixAccount.inc:75
 #: ../lib/modules/posixAccount.inc:77
@@ -3972,11 +4092,11 @@ msgstr "按住CTRL键可以多选组."
 #: ../lib/modules/posixAccount.inc:362
 #: ../lib/modules/posixAccount.inc:366
 #: ../lib/modules/posixAccount.inc:383
-#: ../lib/modules/posixAccount.inc:883
-#: ../lib/modules/posixAccount.inc:1113
-#: ../lib/modules/posixAccount.inc:1284
-#: ../lib/modules/posixAccount.inc:1381
-#: ../lib/modules/posixAccount.inc:1467
+#: ../lib/modules/posixAccount.inc:886
+#: ../lib/modules/posixAccount.inc:1116
+#: ../lib/modules/posixAccount.inc:1287
+#: ../lib/modules/posixAccount.inc:1387
+#: ../lib/modules/posixAccount.inc:1473
 msgid "Home directory"
 msgstr "个人目录"
 
@@ -3990,11 +4110,11 @@ msgstr "使用者目录已经改变,要操持一致需要在系统以ROOT用户
 #: ../lib/modules/sambaSamAccount.inc:280
 #: ../lib/modules/sambaSamAccount.inc:461
 #: ../lib/modules/sambaSamAccount.inc:569
-#: ../lib/modules/sambaSamAccount.inc:1126
-#: ../lib/modules/sambaSamAccount.inc:1412
-#: ../lib/modules/sambaSamAccount.inc:1507
-#: ../lib/modules/sambaSamAccount.inc:1663
+#: ../lib/modules/sambaSamAccount.inc:1150
+#: ../lib/modules/sambaSamAccount.inc:1439
+#: ../lib/modules/sambaSamAccount.inc:1534
 #: ../lib/modules/sambaSamAccount.inc:1690
+#: ../lib/modules/sambaSamAccount.inc:1717
 msgid "Home drive"
 msgstr "个人驱动器"
 
@@ -4004,9 +4124,9 @@ msgstr "个人驱动器"
 #: ../lib/modules/sambaSamAccount.inc:283
 #: ../lib/modules/sambaSamAccount.inc:469
 #: ../lib/modules/sambaSamAccount.inc:571
-#: ../lib/modules/sambaSamAccount.inc:1134
-#: ../lib/modules/sambaSamAccount.inc:1511
-#: ../lib/modules/sambaSamAccount.inc:1660
+#: ../lib/modules/sambaSamAccount.inc:1158
+#: ../lib/modules/sambaSamAccount.inc:1538
+#: ../lib/modules/sambaSamAccount.inc:1687
 msgid "Home path"
 msgstr "个人目录路径"
 
@@ -4015,19 +4135,20 @@ msgstr "个人目录路径"
 msgid "Home path is invalid."
 msgstr "个人目录路径无效"
 
-#: ../lib/modules/zarafaUser.inc:113
+#: ../lib/modules/zarafaUser.inc:114
 msgid "Home server for the user."
 msgstr "用户的宿主服务器."
 
 #: ../lib/modules/inetOrgPerson.inc:54
 #: ../lib/modules/inetOrgPerson.inc:126
-#: ../lib/modules/inetOrgPerson.inc:251
-#: ../lib/modules/inetOrgPerson.inc:412
-#: ../lib/modules/inetOrgPerson.inc:536
-#: ../lib/modules/inetOrgPerson.inc:657
-#: ../lib/modules/inetOrgPerson.inc:1175
-#: ../lib/modules/inetOrgPerson.inc:1436
-#: ../lib/modules/inetOrgPerson.inc:1910
+#: ../lib/modules/inetOrgPerson.inc:254
+#: ../lib/modules/inetOrgPerson.inc:417
+#: ../lib/modules/inetOrgPerson.inc:549
+#: ../lib/modules/inetOrgPerson.inc:713
+#: ../lib/modules/inetOrgPerson.inc:717
+#: ../lib/modules/inetOrgPerson.inc:1510
+#: ../lib/modules/inetOrgPerson.inc:2032
+#: ../lib/modules/inetOrgPerson.inc:2528
 msgid "Home telephone number"
 msgstr "宅电"
 
@@ -4036,12 +4157,13 @@ msgstr "宅电"
 msgid "Homedirectory contains invalid characters."
 msgstr "个人目录包含非法字符"
 
+#: ../lib/types/sudo.inc:79
 #: ../lib/modules/asteriskAccount.inc:98
 #: ../lib/modules/asteriskAccount.inc:316
 #: ../lib/modules/asteriskAccount.inc:330
-#: ../lib/modules/asteriskAccount.inc:382
-#: ../lib/modules/asteriskAccount.inc:669
-#: ../lib/modules/asteriskAccount.inc:1192
+#: ../lib/modules/asteriskAccount.inc:380
+#: ../lib/modules/asteriskAccount.inc:663
+#: ../lib/modules/asteriskAccount.inc:1190
 #: ../lib/modules/nisnetgroup.inc:207
 #: ../lib/modules/nisnetgroup.inc:582
 #: ../lib/modules/hostObject.inc:143
@@ -4052,6 +4174,11 @@ msgstr "主机"
 msgid "Host accounts (e.g. Samba)"
 msgstr "主机帐号(比如 Samba)"
 
+#: ../lib/types/host.inc:161
+#, php-format
+msgid "Host count: %s"
+msgstr "主机总计: %s"
+
 #: ../lib/types/host.inc:94
 msgid "Host description"
 msgstr "主机描述"
@@ -4096,7 +4223,7 @@ msgstr "主机名包含非法字符,合法字符包括 a-z, A-Z, 0-9 和 .-_"
 msgid "Host name in use. Selected next free host name."
 msgstr "主机名已被使用, 请选择其它的主机名."
 
-#: ../lib/modules/sambaSamAccount.inc:1040
+#: ../lib/modules/sambaSamAccount.inc:1050
 msgid "Host name must end with $!"
 msgstr "主机名必须使用$结尾!"
 
@@ -4105,10 +4232,6 @@ msgstr "主机名必须使用$结尾!"
 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/types/sudo.inc:79
-msgid "Host(s)"
-msgstr "主机"
-
 #: ../lib/types/host.inc:53
 #: ../lib/modules/posixAccount.inc:69
 #: ../lib/modules/posixAccount.inc:70
@@ -4127,27 +4250,27 @@ msgstr "主机"
 msgid "Hosts"
 msgstr "主机"
 
-#: ../lib/modules/posixGroup.inc:478
+#: ../lib/modules/posixGroup.inc:488
 #: ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:821
+#: ../lib/modules/posixAccount.inc:824
 msgid "ID is already in use"
 msgstr "ID已经被使用"
 
-#: ../lib/modules/posixGroup.inc:476
-#: ../lib/modules/posixGroup.inc:477
-#: ../lib/modules/posixGroup.inc:478
-#: ../lib/modules/posixGroup.inc:576
+#: ../lib/modules/posixGroup.inc:486
+#: ../lib/modules/posixGroup.inc:487
+#: ../lib/modules/posixGroup.inc:488
+#: ../lib/modules/posixGroup.inc:586
 #: ../lib/modules/posixAccount.inc:78
 #: ../lib/modules/posixAccount.inc:79
 #: ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:819
-#: ../lib/modules/posixAccount.inc:821
+#: ../lib/modules/posixAccount.inc:822
+#: ../lib/modules/posixAccount.inc:824
 msgid "ID-Number"
 msgstr "ID号"
 
-#: ../lib/modules/zarafaUser.inc:306
-#: ../lib/modules/zarafaUser.inc:600
-#: ../lib/modules/zarafaUser.inc:1305
+#: ../lib/modules/zarafaUser.inc:318
+#: ../lib/modules/zarafaUser.inc:643
+#: ../lib/modules/zarafaUser.inc:1405
 msgid "IMAP"
 msgstr "IMAP"
 
@@ -4168,9 +4291,9 @@ msgstr "输入IMAP 密码"
 #: ../lib/modules/asteriskAccount.inc:218
 #: ../lib/modules/asteriskAccount.inc:299
 #: ../lib/modules/asteriskAccount.inc:357
-#: ../lib/modules/asteriskAccount.inc:586
-#: ../lib/modules/asteriskAccount.inc:942
-#: ../lib/modules/asteriskAccount.inc:1271
+#: ../lib/modules/asteriskAccount.inc:584
+#: ../lib/modules/asteriskAccount.inc:936
+#: ../lib/modules/asteriskAccount.inc:1269
 #: ../lib/modules/freeRadius.inc:76
 #: ../lib/modules/freeRadius.inc:114
 #: ../lib/modules/freeRadius.inc:185
@@ -4179,15 +4302,15 @@ msgstr "输入IMAP 密码"
 #: ../lib/modules/freeRadius.inc:616
 #: ../lib/modules/fixed_ip.inc:93
 #: ../lib/modules/fixed_ip.inc:342
-#: ../lib/modules/fixed_ip.inc:520
+#: ../lib/modules/fixed_ip.inc:522
 msgid "IP address"
 msgstr "IP地址"
 
-#: ../lib/modules/ddns.inc:100
-#: ../lib/modules/ddns.inc:111
-#: ../lib/modules/ddns.inc:120
-#: ../lib/modules/ddns.inc:356
-#: ../lib/modules/ddns.inc:399
+#: ../lib/modules/ddns.inc:104
+#: ../lib/modules/ddns.inc:118
+#: ../lib/modules/ddns.inc:127
+#: ../lib/modules/ddns.inc:366
+#: ../lib/modules/ddns.inc:409
 msgid "IP address of the DNS server"
 msgstr "DNS服务器IP地址"
 
@@ -4203,21 +4326,21 @@ msgstr "注册服务器的IP地址或域名"
 #: ../lib/modules/ipHost.inc:77
 #: ../lib/modules/ipHost.inc:97
 #: ../lib/modules/ipHost.inc:309
-msgid "IP address(es)"
+msgid "IP addresses"
 msgstr "IP地址"
 
 #: ../lib/modules/fixed_ip.inc:97
 msgid "IP list"
 msgstr "IP列表"
 
-#: ../templates/masscreate.php:264
-#: ../templates/masscreate.php:339
+#: ../templates/masscreate.php:284
+#: ../templates/masscreate.php:359
 msgid "Identifier"
 msgstr "标识"
 
 #: ../lib/modules/sambaSamAccount.inc:220
-#: ../lib/modules/sambaSamAccount.inc:1430
-#: ../lib/modules/sambaSamAccount.inc:1701
+#: ../lib/modules/sambaSamAccount.inc:1457
+#: ../lib/modules/sambaSamAccount.inc:1728
 msgid "Idle time limit"
 msgstr "空闲时间限制"
 
@@ -4259,7 +4382,7 @@ msgstr "密码停用(设置D标志)"
 msgid "If checked then the account will be locked (setting L-Flag). You usually want to use this setting to unlock user accounts which were locked because of failed login attempts."
 msgstr "帐号被锁定(设置L标志).多次登录失败后帐号会被锁定.在此可以解除锁定."
 
-#: ../lib/modules/posixGroup.inc:387
+#: ../lib/modules/posixGroup.inc:397
 msgid "If empty GID number will be generated automaticly depending on your configuration settings."
 msgstr "如果为空,视配置而定,GID号自动产生."
 
@@ -4271,7 +4394,7 @@ msgstr "如果为空,UID号会自动生成."
 msgid "If enabled the user will not be allowed to login after there have been a specified number of consecutive failed login attempts."
 msgstr "此项如果设置，用户在连续特定数量的登录失败后，将不允许再登录。"
 
-#: ../help/help.inc:117
+#: ../help/help.inc:121
 msgid "If enabled then LAM will use user and password that is provided by the web server via HTTP authentication."
 msgstr "如果打开,LAM将使用通过HTTP认证的web服务器提供的用户名和密码."
 
@@ -4303,7 +4426,7 @@ msgstr "如果设为\"true\",则不需要密码."
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr "如果设为\"true\",密码不会过期(设为X标志)."
 
-#: ../lib/modules/zarafaUser.inc:81
+#: ../lib/modules/zarafaUser.inc:82
 msgid "If the mailbox size reaches the soft quota limit, the user will not be able to send email until the size of the mailbox is reduced."
 msgstr "如果邮箱达到软限额极限,用户将不能发送邮件,除非邮箱占用空间减小."
 
@@ -4311,28 +4434,28 @@ msgstr "如果邮箱达到软限额极限,用户将不能发送邮件,除非邮
 msgid "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr "如果留空,LAM会用如下算法:uidNumber*2 + sambaAlgorithmicRidBase."
 
+#: ../lib/modules/passwordSelfReset.inc:122
+msgid "If you select this option then the user is only authenticated by his email address. LAM Pro will not ask for the answer to the security question. Please handle with care."
+msgstr "如果此项选中,用户仅通过email地址进行认证.LAM PRO不会询问安全问题的答案.请谨慎处理."
+
 #: ../lib/modules/sambaSamAccount.inc:273
+#: ../help/help.inc:171
 msgid "If you set this option then the user has to change his password at the next login."
 msgstr "如果您选中此项，用户在下次登录时必须修改密码。"
 
-#: ../lib/modules/phpGroupwareGroup.inc:74
-#: ../lib/modules/phpGroupwareUser.inc:75
-msgid "If you set this to \"true\" then the phpGroupware extension will be added."
-msgstr "如果设为\"true\",则会增加 phpGroupWare 扩展."
-
-#: ../help/help.inc:96
+#: ../help/help.inc:100
 msgid "If you want to change the current preferences password, please enter it here."
 msgstr "在此设置当前管理密码."
 
-#: ../help/help.inc:129
+#: ../help/help.inc:135
 msgid "If you want to change your master configuration password, please enter it here."
 msgstr "在此变更管理配置密码."
 
 #: ../lib/modules/sambaGroupMapping.inc:361
-msgid "If you want to use a well known RID you can selcet a well known group."
-msgstr "如果想用知名的RID,需要选择知名的组。"
+msgid "If you want to use a well known RID you can select a well known group."
+msgstr "如果想用知名的RID,需要选择知名的组。 "
 
-#: ../help/help.inc:106
+#: ../help/help.inc:110
 msgid "If your server runs on another port then add a comma and the port number after the server."
 msgstr "如果服务器运行在其它端口,需要在服务器后加一个逗号和端口号."
 
@@ -4346,11 +4469,6 @@ msgstr "图像不可用"
 msgid "Import"
 msgstr "导入"
 
-#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:64
-#, php-format
-msgid "In order to add these objectClass(es) to this entry, you must specify <b>%s</b> new attributes that this object class requires."
-msgstr "为把这些对象类加入到条目中,您必须指定<b>%s</b> 对象类需要的新属性"
-
 #: ../templates/3rdParty/pla/htdocs/export_form.php:87
 msgid "Include system attributes"
 msgstr "包括系统属性"
@@ -4361,8 +4479,8 @@ msgstr "有关LDAP服务器的信息"
 
 #: ../lib/modules/sambaSamAccount.inc:215
 #: ../lib/modules/sambaSamAccount.inc:338
-#: ../lib/modules/sambaSamAccount.inc:1416
-#: ../lib/modules/sambaSamAccount.inc:1696
+#: ../lib/modules/sambaSamAccount.inc:1443
+#: ../lib/modules/sambaSamAccount.inc:1723
 msgid "Inherit client startup configuration"
 msgstr "继承客户初始配置"
 
@@ -4378,19 +4496,19 @@ msgstr "继承自"
 
 #: ../lib/modules/sambaSamAccount.inc:216
 #: ../lib/modules/sambaSamAccount.inc:341
-#: ../lib/modules/sambaSamAccount.inc:1418
-#: ../lib/modules/sambaSamAccount.inc:1697
+#: ../lib/modules/sambaSamAccount.inc:1445
+#: ../lib/modules/sambaSamAccount.inc:1724
 msgid "Initial program"
 msgstr "初始化程序"
 
 #: ../lib/modules/inetOrgPerson.inc:128
-#: ../lib/modules/inetOrgPerson.inc:275
-#: ../lib/modules/inetOrgPerson.inc:308
-#: ../lib/modules/inetOrgPerson.inc:572
-#: ../lib/modules/inetOrgPerson.inc:705
-#: ../lib/modules/inetOrgPerson.inc:1046
-#: ../lib/modules/inetOrgPerson.inc:1450
-#: ../lib/modules/inetOrgPerson.inc:2040
+#: ../lib/modules/inetOrgPerson.inc:278
+#: ../lib/modules/inetOrgPerson.inc:313
+#: ../lib/modules/inetOrgPerson.inc:588
+#: ../lib/modules/inetOrgPerson.inc:781
+#: ../lib/modules/inetOrgPerson.inc:1228
+#: ../lib/modules/inetOrgPerson.inc:2046
+#: ../lib/modules/inetOrgPerson.inc:2658
 msgid "Initials"
 msgstr "初始化"
 
@@ -4435,16 +4553,16 @@ msgstr "inode软配额包含非法字符,只能使用自然数."
 msgid "Inode soft quota must be smaller than inode hard quota."
 msgstr "inode软配额必须小于硬配额."
 
-#: ../templates/selfService/adminMain.php:493
+#: ../templates/selfService/adminMain.php:516
 msgid "Input fields"
 msgstr "输入框"
 
 #: ../lib/modules/asteriskAccount.inc:146
 #: ../lib/modules/asteriskAccount.inc:263
 #: ../lib/modules/asteriskAccount.inc:339
-#: ../lib/modules/asteriskAccount.inc:455
-#: ../lib/modules/asteriskAccount.inc:769
-#: ../lib/modules/asteriskAccount.inc:1217
+#: ../lib/modules/asteriskAccount.inc:453
+#: ../lib/modules/asteriskAccount.inc:763
+#: ../lib/modules/asteriskAccount.inc:1215
 msgid "Insecure"
 msgstr "不安全"
 
@@ -4464,7 +4582,7 @@ msgstr "在配置路径中插入用户名或组名."
 msgid "Invalid MAC address."
 msgstr "非法的MAC地址"
 
-#: ../templates/massBuildAccounts.php:170
+#: ../templates/massBuildAccounts.php:174
 msgid "Invalid RDN attribute!"
 msgstr "错误的RDN属性!"
 
@@ -4490,7 +4608,7 @@ msgstr "非法的IMAP管理员密码或者发生了其它问题。"
 #: ../lib/modules/kolabUser.inc:214
 #: ../lib/modules/kolabUser.inc:319
 #: ../lib/modules/kolabUser.inc:795
-#: ../lib/modules/kolabUser.inc:907
+#: ../lib/modules/kolabUser.inc:911
 msgid "Invitation policy"
 msgstr "邀请原则"
 
@@ -4506,25 +4624,25 @@ msgstr "伊斯兰堡,卡拉奇"
 msgid "It is not possible to delete all ranges."
 msgstr "不能删除所有范围"
 
-#: ../lib/modules/posixGroup.inc:476
+#: ../lib/modules/posixGroup.inc:486
 #: ../lib/modules/posixAccount.inc:79
 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:70
 #: ../lib/modules/inetOrgPerson.inc:128
-#: ../lib/modules/inetOrgPerson.inc:168
-#: ../lib/modules/inetOrgPerson.inc:259
-#: ../lib/modules/inetOrgPerson.inc:324
-#: ../lib/modules/inetOrgPerson.inc:548
-#: ../lib/modules/inetOrgPerson.inc:589
-#: ../lib/modules/inetOrgPerson.inc:1202
-#: ../lib/modules/inetOrgPerson.inc:1425
-#: ../lib/modules/inetOrgPerson.inc:2047
+#: ../lib/modules/inetOrgPerson.inc:171
+#: ../lib/modules/inetOrgPerson.inc:262
+#: ../lib/modules/inetOrgPerson.inc:329
+#: ../lib/modules/inetOrgPerson.inc:564
+#: ../lib/modules/inetOrgPerson.inc:605
+#: ../lib/modules/inetOrgPerson.inc:1642
+#: ../lib/modules/inetOrgPerson.inc:2021
+#: ../lib/modules/inetOrgPerson.inc:2665
 msgid "Job title"
 msgstr "头衔"
 
-#: ../lib/modules/inetOrgPerson.inc:590
+#: ../lib/modules/inetOrgPerson.inc:606
 msgid "Job title of user: President, department manager, ..."
 msgstr "用户头衔:如总裁,部门经理..."
 
@@ -4558,6 +4676,10 @@ msgstr "跳转到首页"
 msgid "Jump to last page"
 msgstr "跳转到末页"
 
+#: ../lib/modules/heimdalKerberos.inc:51
+msgid "Kerberos"
+msgstr "Kerberos"
+
 #: ../lib/modules/kolabUser.inc:73
 msgid "Kolab"
 msgstr "Kolab"
@@ -4567,13 +4689,13 @@ msgstr "Kolab"
 msgid "LAM configuration"
 msgstr "LAM 配置"
 
-#: ../templates/massBuildAccounts.php:196
+#: ../templates/massBuildAccounts.php:211
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "您的输入检查完毕,即将建立帐号"
 
-#: ../lib/modules/posixGroup.inc:411
+#: ../lib/modules/posixGroup.inc:421
 #: ../lib/modules/posixAccount.inc:343
-#: ../lib/modules/inetOrgPerson.inc:694
+#: ../lib/modules/inetOrgPerson.inc:766
 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个字符以上的密码.不建议使用明文密码."
 
@@ -4585,7 +4707,7 @@ msgstr "LAM 测试"
 msgid "LAM user password"
 msgstr "LAM用户密码"
 
-#: ../templates/massDoUpload.php:87
+#: ../templates/massDoUpload.php:101
 #, php-format
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAM无法建立%s帐号,LDAP发生错误."
@@ -4602,22 +4724,22 @@ msgstr "LAM找不到这个域!"
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAM找不到这个组"
 
-#: ../lib/modules/posixAccount.inc:1913
-#: ../lib/modules/posixAccount.inc:1974
+#: ../lib/modules/posixAccount.inc:1922
+#: ../lib/modules/posixAccount.inc:1983
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAM无法修改 %s组成员"
 
-#: ../help/help.inc:167
+#: ../help/help.inc:175
 msgid "LAM will search for accounts in this part of the LDAP tree."
 msgstr "LAM将在这部分LDAP树搜索帐号."
 
-#: ../help/help.inc:169
+#: ../help/help.inc:177
 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/config/confmodules.php:97
-#: ../templates/config/confmain.php:122
+#: ../templates/config/confmain.php:126
 #: ../templates/config/moduleSettings.php:96
 #: ../templates/config/conftypes.php:115
 msgid "LDAP Account Manager Configuration"
@@ -4631,19 +4753,19 @@ msgstr "LDAP后缀无效!"
 msgid "LDAP entries"
 msgstr "LDAP条目"
 
-#: ../templates/login.php:551
+#: ../templates/login.php:557
 msgid "LDAP error, server says:"
 msgstr "LDAP错误,服务器错误消息:"
 
-#: ../templates/config/confmain.php:358
+#: ../templates/config/confmain.php:362
 msgid "LDAP filter"
 msgstr "LDAP过滤条件"
 
-#: ../lib/modules.inc:1194
+#: ../lib/modules.inc:1233
 msgid "LDAP operation successful."
 msgstr "LDAP操作成功."
 
-#: ../templates/selfService/adminMain.php:362
+#: ../templates/selfService/adminMain.php:373
 msgid "LDAP password"
 msgstr "LDAP 密码"
 
@@ -4651,22 +4773,22 @@ msgstr "LDAP 密码"
 msgid "LDAP said"
 msgstr "LDAP说"
 
-#: ../templates/config/confmain.php:342
-#: ../help/help.inc:112
+#: ../templates/config/confmain.php:346
+#: ../help/help.inc:116
 msgid "LDAP search"
 msgstr "LDAP搜索"
 
-#: ../templates/selfService/adminMain.php:367
-#: ../help/help.inc:170
+#: ../templates/selfService/adminMain.php:378
+#: ../help/help.inc:178
 msgid "LDAP search attribute"
 msgstr "LDAP搜索属性"
 
-#: ../lib/account.inc:681
+#: ../lib/account.inc:684
 msgid "LDAP search failed! Please check your preferences."
 msgstr "LDAP搜索失败，请检查配置。"
 
-#: ../templates/config/confmain.php:236
-#: ../help/help.inc:114
+#: ../templates/config/confmain.php:240
+#: ../help/help.inc:118
 msgid "LDAP search limit"
 msgstr "LDAP搜索限制"
 
@@ -4674,28 +4796,28 @@ msgstr "LDAP搜索限制"
 msgid "LDAP server"
 msgstr "LDAP服务器"
 
-#: ../lib/account.inc:672
+#: ../lib/account.inc:675
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "超过LDAP限制的大小,无法显示所有条目."
 
-#: ../templates/config/confmain.php:354
+#: ../templates/config/confmain.php:358
 #: ../templates/config/conftypes.php:234
-#: ../templates/selfService/adminMain.php:356
+#: ../templates/selfService/adminMain.php:367
 #: ../templates/profedit/profilepage.php:191
-#: ../help/help.inc:67
-#: ../help/help.inc:166
+#: ../help/help.inc:71
+#: ../help/help.inc:174
 msgid "LDAP suffix"
 msgstr "LDAP后缀"
 
-#: ../templates/massDoUpload.php:70
+#: ../templates/massDoUpload.php:71
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAP上传中,请稍等..."
 
-#: ../templates/selfService/adminMain.php:360
+#: ../templates/selfService/adminMain.php:371
 msgid "LDAP user"
 msgstr "LDAP用户"
 
-#: ../help/help.inc:168
+#: ../help/help.inc:176
 msgid "LDAP user and password"
 msgstr "LDAP用户名和密码"
 
@@ -4716,15 +4838,11 @@ msgstr "LDIF导入"
 msgid "LDIF import only supports version 1"
 msgstr "LDIF导入功能只支持版本1"
 
-#: ../lib/types/asteriskExt.inc:93
-msgid "Label"
-msgstr "标签"
-
 #: ../templates/tests/lamdaemonTest.php:183
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemon 服务器和路径"
 
-#: ../templates/config/confmain.php:305
+#: ../templates/config/confmain.php:309
 msgid "Lamdaemon settings"
 msgstr "Lamdaemon设置"
 
@@ -4762,35 +4880,23 @@ msgstr "Lamdaemon: 读取配额"
 msgid "Language"
 msgstr "语言"
 
-#: ../templates/config/confmain.php:461
+#: ../templates/config/confmain.php:478
 msgid "Language is not defined!"
 msgstr "尚未定义语言"
 
-#: ../templates/config/confmain.php:275
+#: ../templates/config/confmain.php:279
 msgid "Language settings"
 msgstr "语言设定"
 
-#: ../lib/modules/phpGroupwareUser.inc:99
-#: ../lib/modules/phpGroupwareUser.inc:174
-#: ../lib/modules/phpGroupwareUser.inc:351
-msgid "Last login"
-msgstr "上次登录"
-
-#: ../lib/modules/phpGroupwareUser.inc:98
-#: ../lib/modules/phpGroupwareUser.inc:181
-#: ../lib/modules/phpGroupwareUser.inc:346
-msgid "Last login from"
-msgstr "上一次登录地"
-
 #: ../lib/types/user.inc:97
 #: ../lib/modules/inetOrgPerson.inc:50
 #: ../lib/modules/inetOrgPerson.inc:122
-#: ../lib/modules/inetOrgPerson.inc:299
-#: ../lib/modules/inetOrgPerson.inc:500
-#: ../lib/modules/inetOrgPerson.inc:597
-#: ../lib/modules/inetOrgPerson.inc:1040
-#: ../lib/modules/inetOrgPerson.inc:1427
-#: ../lib/modules/inetOrgPerson.inc:1889
+#: ../lib/modules/inetOrgPerson.inc:304
+#: ../lib/modules/inetOrgPerson.inc:513
+#: ../lib/modules/inetOrgPerson.inc:613
+#: ../lib/modules/inetOrgPerson.inc:1222
+#: ../lib/modules/inetOrgPerson.inc:2023
+#: ../lib/modules/inetOrgPerson.inc:2500
 msgid "Last name"
 msgstr "姓"
 
@@ -4799,7 +4905,7 @@ msgstr "姓"
 msgid "Last name contains invalid characters or is empty!"
 msgstr "姓包含非法字符或为空!"
 
-#: ../lib/modules/inetOrgPerson.inc:598
+#: ../lib/modules/inetOrgPerson.inc:614
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "用户姓.只允许字符,-和空格."
 
@@ -4807,25 +4913,25 @@ msgstr "用户姓.只允许字符,-和空格."
 #: ../lib/modules/shadowAccount.inc:160
 #: ../lib/modules/shadowAccount.inc:192
 #: ../lib/modules/shadowAccount.inc:354
-#: ../lib/modules/shadowAccount.inc:468
+#: ../lib/modules/shadowAccount.inc:481
 msgid "Last password change"
 msgstr "最后密码变更"
 
 #: ../lib/modules/asteriskAccount.inc:230
 #: ../lib/modules/asteriskAccount.inc:305
 #: ../lib/modules/asteriskAccount.inc:360
-#: ../lib/modules/asteriskAccount.inc:608
-#: ../lib/modules/asteriskAccount.inc:969
-#: ../lib/modules/asteriskAccount.inc:1280
+#: ../lib/modules/asteriskAccount.inc:606
+#: ../lib/modules/asteriskAccount.inc:963
+#: ../lib/modules/asteriskAccount.inc:1278
 msgid "Last qualify milliseconds"
 msgstr "最后的限定毫秒"
 
-#: ../lib/modules/dhcp_settings.inc:130
-#: ../lib/modules/dhcp_settings.inc:173
-#: ../lib/modules/dhcp_settings.inc:187
-#: ../lib/modules/dhcp_settings.inc:216
-#: ../lib/modules/dhcp_settings.inc:526
-#: ../lib/modules/dhcp_settings.inc:619
+#: ../lib/modules/dhcp_settings.inc:132
+#: ../lib/modules/dhcp_settings.inc:184
+#: ../lib/modules/dhcp_settings.inc:198
+#: ../lib/modules/dhcp_settings.inc:227
+#: ../lib/modules/dhcp_settings.inc:537
+#: ../lib/modules/dhcp_settings.inc:630
 msgid "Lease time"
 msgstr "释放时间"
 
@@ -4833,21 +4939,21 @@ msgstr "释放时间"
 msgid "Line"
 msgstr "行"
 
-#: ../templates/3rdParty/pla/htdocs/export_form.php:124
+#: ../templates/3rdParty/pla/htdocs/export_form.php:121
 msgid "Line ends"
 msgstr "行结尾"
 
 #: ../lib/modules/passwordSelfReset.inc:81
-#: ../lib/modules/passwordSelfReset.inc:137
+#: ../lib/modules/passwordSelfReset.inc:171
 msgid "Link text"
 msgstr "链接文本"
 
-#: ../templates/selfService/adminMain.php:308
+#: ../templates/selfService/adminMain.php:313
 msgid "Link to self service login page for your users"
 msgstr "对用户自助服务登录界面的链接."
 
 #: ../templates/config/conftypes.php:249
-#: ../help/help.inc:79
+#: ../help/help.inc:83
 msgid "List attributes"
 msgstr "属性列表"
 
@@ -4873,7 +4979,7 @@ msgstr "列表名已经被使用"
 msgid "List of Samba workstations the user is allowed to login. Empty means every workstation."
 msgstr "允许用户登录的Samba工作站,留空表示所有工作站."
 
-#: ../templates/config/confmain.php:455
+#: ../templates/config/confmain.php:472
 msgid "List of admin users is empty or invalid!"
 msgstr "管理员清单为空或非法."
 
@@ -4890,7 +4996,7 @@ msgstr "不合法编码列表"
 msgid "List of entries to be deleted:"
 msgstr "将被删除的条目列表:"
 
-#: ../templates/config/confmain.php:350
+#: ../templates/config/confmain.php:354
 msgid "List of valid users"
 msgstr "合法用户列表"
 
@@ -4898,8 +5004,8 @@ msgstr "合法用户列表"
 msgid "Listeners"
 msgstr "监听"
 
-#: ../lib/modules.inc:1101
-#: ../help/help.inc:156
+#: ../lib/modules.inc:1126
+#: ../help/help.inc:162
 msgid "Load profile"
 msgstr "调入配置文件"
 
@@ -4923,7 +5029,7 @@ msgstr "正调用导出功能"
 msgid "Loading import"
 msgstr "正调用导入功能"
 
-#: ../templates/3rdParty/pla/lib/QueryRender.php:499
+#: ../templates/3rdParty/pla/lib/QueryRender.php:497
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:233
 msgid "Loading search"
 msgstr "调用搜索"
@@ -4956,13 +5062,14 @@ msgstr "本地组"
 #: ../lib/modules/device.inc:436
 #: ../lib/modules/inetOrgPerson.inc:127
 #: ../lib/modules/inetOrgPerson.inc:141
-#: ../lib/modules/inetOrgPerson.inc:237
-#: ../lib/modules/inetOrgPerson.inc:468
-#: ../lib/modules/inetOrgPerson.inc:515
-#: ../lib/modules/inetOrgPerson.inc:669
-#: ../lib/modules/inetOrgPerson.inc:1087
-#: ../lib/modules/inetOrgPerson.inc:1445
-#: ../lib/modules/inetOrgPerson.inc:1973
+#: ../lib/modules/inetOrgPerson.inc:240
+#: ../lib/modules/inetOrgPerson.inc:481
+#: ../lib/modules/inetOrgPerson.inc:528
+#: ../lib/modules/inetOrgPerson.inc:729
+#: ../lib/modules/inetOrgPerson.inc:733
+#: ../lib/modules/inetOrgPerson.inc:1359
+#: ../lib/modules/inetOrgPerson.inc:2041
+#: ../lib/modules/inetOrgPerson.inc:2591
 msgid "Location"
 msgstr "地点"
 
@@ -4970,10 +5077,10 @@ msgstr "地点"
 msgid "Lock account"
 msgstr "锁定帐号"
 
-#: ../lib/modules/posixGroup.inc:197
+#: ../lib/modules/posixGroup.inc:207
 #: ../lib/modules/posixAccount.inc:257
-#: ../lib/modules/posixAccount.inc:1153
-#: ../lib/modules/inetOrgPerson.inc:1253
+#: ../lib/modules/posixAccount.inc:1156
+#: ../lib/modules/inetOrgPerson.inc:1741
 msgid "Lock password"
 msgstr "锁定密码"
 
@@ -5020,16 +5127,16 @@ msgid "Lockout users after bad logon attempts must be between 0 and 999."
 msgstr "用户锁定前错误的登录次数必须在0－999之间。"
 
 #: ../templates/config/mainmanage.php:230
-#: ../help/help.inc:138
+#: ../help/help.inc:144
 msgid "Log destination"
 msgstr "日志存储位置"
 
 #: ../templates/config/mainmanage.php:216
-#: ../help/help.inc:136
+#: ../help/help.inc:142
 msgid "Log level"
 msgstr "日志等级"
 
-#: ../templates/main_header.php:111
+#: ../templates/main_header.php:113
 #, php-format
 msgid "Logged in as: %s"
 msgstr "以%s 的身份登录. "
@@ -5044,32 +5151,34 @@ msgstr "日志"
 #: ../templates/selfService/selfServiceLogin.php:163
 #: ../templates/selfService/adminLogin.php:64
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:530
-#: ../help/help.inc:52
+#: ../help/help.inc:56
 msgid "Login"
 msgstr "登录"
 
-#: ../templates/selfService/adminMain.php:378
-#: ../help/help.inc:172
+#: ../templates/selfService/adminMain.php:389
+#: ../help/help.inc:180
 msgid "Login attribute label"
 msgstr "登录属性标签"
 
-#: ../templates/selfService/adminMain.php:382
-#: ../help/help.inc:174
+#: ../templates/selfService/adminMain.php:394
+#: ../help/help.inc:182
 msgid "Login caption"
 msgstr "登录标题"
 
-#: ../templates/config/confmain.php:344
-#: ../help/help.inc:110
+#: ../templates/config/confmain.php:348
+#: ../help/help.inc:114
 msgid "Login method"
 msgstr "登录方法"
 
 #: ../lib/types/user.inc:99
+#: ../lib/modules/posixAccount.inc:148
 #: ../lib/modules/posixAccount.inc:243
 #: ../lib/modules/posixAccount.inc:320
 #: ../lib/modules/posixAccount.inc:395
-#: ../lib/modules/posixAccount.inc:1146
-#: ../lib/modules/posixAccount.inc:1383
-#: ../lib/modules/posixAccount.inc:1468
+#: ../lib/modules/posixAccount.inc:1149
+#: ../lib/modules/posixAccount.inc:1389
+#: ../lib/modules/posixAccount.inc:1474
+#: ../lib/modules/posixAccount.inc:2106
 msgid "Login shell"
 msgstr "登录shell"
 
@@ -5089,8 +5198,8 @@ msgstr "密码修改登录"
 #: ../lib/modules/sambaSamAccount.inc:320
 #: ../lib/modules/sambaSamAccount.inc:501
 #: ../lib/modules/sambaSamAccount.inc:579
-#: ../lib/modules/sambaSamAccount.inc:1196
-#: ../lib/modules/sambaSamAccount.inc:1543
+#: ../lib/modules/sambaSamAccount.inc:1220
+#: ../lib/modules/sambaSamAccount.inc:1570
 msgid "Logon hours"
 msgstr "可登录时间"
 
@@ -5100,9 +5209,9 @@ msgstr "可登录时间"
 #: ../lib/modules/sambaSamAccount.inc:289
 #: ../lib/modules/sambaSamAccount.inc:485
 #: ../lib/modules/sambaSamAccount.inc:575
-#: ../lib/modules/sambaSamAccount.inc:1149
-#: ../lib/modules/sambaSamAccount.inc:1519
-#: ../lib/modules/sambaSamAccount.inc:1666
+#: ../lib/modules/sambaSamAccount.inc:1173
+#: ../lib/modules/sambaSamAccount.inc:1546
+#: ../lib/modules/sambaSamAccount.inc:1693
 msgid "Logon script"
 msgstr "登录脚本"
 
@@ -5112,8 +5221,8 @@ msgid "Logon script is invalid!"
 msgstr "登录脚本非法!"
 
 #: ../templates/selfService/selfServiceMain.php:53
-#: ../templates/selfService/selfServiceMain.php:355
-#: ../templates/main_header.php:118
+#: ../templates/selfService/selfServiceMain.php:352
+#: ../templates/main_header.php:120
 msgid "Logout"
 msgstr "退出"
 
@@ -5128,7 +5237,7 @@ msgstr "M-节点 (0x04)"
 #: ../lib/modules/ieee802device.inc:104
 #: ../lib/modules/fixed_ip.inc:90
 #: ../lib/modules/fixed_ip.inc:338
-#: ../lib/modules/fixed_ip.inc:520
+#: ../lib/modules/fixed_ip.inc:522
 msgid "MAC address"
 msgstr "MAC地址"
 
@@ -5138,7 +5247,7 @@ msgstr "MAC地址列表"
 
 #: ../lib/modules/ieee802device.inc:79
 #: ../lib/modules/ieee802device.inc:206
-msgid "MAC address(es)"
+msgid "MAC addresses"
 msgstr "MAC地址"
 
 #: ../lib/modules/sambaSamAccount.inc:550
@@ -5152,7 +5261,7 @@ msgstr "邮件别名"
 
 #: ../lib/modules/imapAccess.inc:90
 #: ../lib/modules/imapAccess.inc:118
-msgid "Mail domain(s)"
+msgid "Mail domains"
 msgstr "邮箱域"
 
 #: ../lib/modules/kolabUser.inc:88
@@ -5173,6 +5282,11 @@ msgstr "邮件限额必须是数字!"
 msgid "Mail routing"
 msgstr "邮件路由"
 
+#: ../lib/modules/passwordSelfReset.inc:1142
+#: ../lib/modules/passwordSelfReset.inc:1183
+msgid "Mail sending failed."
+msgstr "邮件发送失败."
+
 #: ../lib/modules/kolabUser.inc:85
 #: ../lib/modules/inetLocalMailRecipient.inc:73
 #: ../lib/modules/inetLocalMailRecipient.inc:78
@@ -5183,7 +5297,7 @@ msgstr "邮件路由"
 msgid "Mail server"
 msgstr "邮件服务器"
 
-#: ../templates/lists/changePassword.php:434
+#: ../templates/lists/changePassword.php:453
 #, php-format
 msgid "Mail successfully sent to %s."
 msgstr "邮件已经成功发送到%s."
@@ -5191,9 +5305,9 @@ msgstr "邮件已经成功发送到%s."
 #: ../lib/modules/asteriskAccount.inc:150
 #: ../lib/modules/asteriskAccount.inc:265
 #: ../lib/modules/asteriskAccount.inc:340
-#: ../lib/modules/asteriskAccount.inc:463
-#: ../lib/modules/asteriskAccount.inc:778
-#: ../lib/modules/asteriskAccount.inc:1220
+#: ../lib/modules/asteriskAccount.inc:461
+#: ../lib/modules/asteriskAccount.inc:772
+#: ../lib/modules/asteriskAccount.inc:1218
 #: ../lib/modules/asteriskVoicemail.inc:86
 #: ../lib/modules/asteriskVoicemail.inc:129
 #: ../lib/modules/asteriskVoicemail.inc:149
@@ -5244,8 +5358,8 @@ msgstr "邮件转发."
 msgid "Main"
 msgstr "主要设置"
 
-#: ../templates/selfService/adminMain.php:384
-#: ../help/help.inc:176
+#: ../templates/selfService/adminMain.php:400
+#: ../help/help.inc:184
 msgid "Main page caption"
 msgstr "主页标题"
 
@@ -5278,12 +5392,13 @@ msgstr "管理后缀"
 #: ../lib/modules/ipHost.inc:99
 #: ../lib/modules/ipHost.inc:170
 #: ../lib/modules/ipHost.inc:315
-#: ../lib/modules/inetOrgPerson.inc:269
-#: ../lib/modules/inetOrgPerson.inc:348
-#: ../lib/modules/inetOrgPerson.inc:563
-#: ../lib/modules/inetOrgPerson.inc:605
-#: ../lib/modules/inetOrgPerson.inc:1242
-#: ../lib/modules/inetOrgPerson.inc:1429
+#: ../lib/modules/inetOrgPerson.inc:272
+#: ../lib/modules/inetOrgPerson.inc:353
+#: ../lib/modules/inetOrgPerson.inc:579
+#: ../lib/modules/inetOrgPerson.inc:621
+#: ../lib/modules/inetOrgPerson.inc:625
+#: ../lib/modules/inetOrgPerson.inc:1718
+#: ../lib/modules/inetOrgPerson.inc:2025
 msgid "Manager"
 msgstr "管理员"
 
@@ -5336,14 +5451,14 @@ msgstr "标记为删除"
 msgid "Mass delete"
 msgstr "批量删除"
 
-#: ../templates/config/profmanage.php:381
-#: ../templates/selfService/profManage.php:280
-#: ../help/help.inc:130
+#: ../templates/config/profmanage.php:203
+#: ../templates/selfService/profManage.php:163
+#: ../help/help.inc:136
 msgid "Master password"
 msgstr "管理员密码"
 
-#: ../templates/config/profmanage.php:98
-#: ../templates/selfService/profManage.php:87
+#: ../templates/config/profmanage.php:52
+#: ../templates/selfService/profManage.php:40
 msgid "Master password is wrong!"
 msgstr "系统管理员密码错误!"
 
@@ -5364,17 +5479,17 @@ msgstr "匹配规则"
 msgid "Max. file descriptors"
 msgstr "最大的文件描述符"
 
-#: ../lib/modules/posixGroup.inc:307
-#: ../lib/modules/posixGroup.inc:480
-#: ../lib/modules/posixGroup.inc:481
+#: ../lib/modules/posixGroup.inc:317
+#: ../lib/modules/posixGroup.inc:490
+#: ../lib/modules/posixGroup.inc:491
 msgid "Maximum GID number"
 msgstr "最大GID号"
 
-#: ../lib/modules/posixGroup.inc:480
+#: ../lib/modules/posixGroup.inc:490
 msgid "Maximum GID number is invalid or empty!"
 msgstr "最大的GID非法或为空!"
 
-#: ../lib/modules/posixGroup.inc:481
+#: ../lib/modules/posixGroup.inc:491
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "最大GID必须大于最小GID!"
 
@@ -5411,12 +5526,12 @@ msgstr "最大失败次数"
 msgid "Maximum file size"
 msgstr "最大文件大小"
 
-#: ../lib/modules/dhcp_settings.inc:133
-#: ../lib/modules/dhcp_settings.inc:174
-#: ../lib/modules/dhcp_settings.inc:188
-#: ../lib/modules/dhcp_settings.inc:222
-#: ../lib/modules/dhcp_settings.inc:530
-#: ../lib/modules/dhcp_settings.inc:620
+#: ../lib/modules/dhcp_settings.inc:136
+#: ../lib/modules/dhcp_settings.inc:185
+#: ../lib/modules/dhcp_settings.inc:199
+#: ../lib/modules/dhcp_settings.inc:233
+#: ../lib/modules/dhcp_settings.inc:541
+#: ../lib/modules/dhcp_settings.inc:631
 msgid "Maximum lease time"
 msgstr "最大释放时间"
 
@@ -5425,7 +5540,7 @@ msgid "Maximum length"
 msgstr "最大长度"
 
 #: ../lib/lists.inc:864
-#: ../help/help.inc:89
+#: ../help/help.inc:93
 msgid "Maximum list entries"
 msgstr "最大列表条目"
 
@@ -5440,7 +5555,7 @@ msgstr "在中断一个通话之前的非活动秒数最大值"
 #: ../lib/modules/shadowAccount.inc:180
 #: ../lib/modules/shadowAccount.inc:218
 #: ../lib/modules/shadowAccount.inc:329
-#: ../lib/modules/shadowAccount.inc:473
+#: ../lib/modules/shadowAccount.inc:486
 #: ../lib/modules/ppolicy.inc:80
 #: ../lib/modules/ppolicy.inc:136
 #: ../lib/modules/ppolicy.inc:159
@@ -5486,7 +5601,7 @@ msgstr "大西洋地区中部"
 msgid "Midway Island, Samoa"
 msgstr "中途岛,萨摩亚"
 
-#: ../lib/modules/inetOrgPerson.inc:301
+#: ../lib/modules/inetOrgPerson.inc:306
 msgid "Miller"
 msgstr "米勒"
 
@@ -5497,12 +5612,12 @@ msgstr "米勒"
 msgid "Minimal password length"
 msgstr "最短密码长度"
 
-#: ../lib/modules/posixGroup.inc:304
-#: ../lib/modules/posixGroup.inc:479
+#: ../lib/modules/posixGroup.inc:314
+#: ../lib/modules/posixGroup.inc:489
 msgid "Minimum GID number"
 msgstr "最小GID号"
 
-#: ../lib/modules/posixGroup.inc:479
+#: ../lib/modules/posixGroup.inc:489
 msgid "Minimum GID number is invalid or empty!"
 msgstr "最小GID错误或为空"
 
@@ -5519,7 +5634,7 @@ msgid "Minimum UID number is invalid!"
 msgstr "最小UID非法!"
 
 #: ../lib/modules/passwordSelfReset.inc:73
-#: ../lib/modules/passwordSelfReset.inc:135
+#: ../lib/modules/passwordSelfReset.inc:169
 msgid "Minimum answer length"
 msgstr "最短答案的长度"
 
@@ -5541,7 +5656,7 @@ msgstr "最少数字字符数"
 #: ../lib/modules/shadowAccount.inc:176
 #: ../lib/modules/shadowAccount.inc:212
 #: ../lib/modules/shadowAccount.inc:321
-#: ../lib/modules/shadowAccount.inc:472
+#: ../lib/modules/shadowAccount.inc:485
 #: ../lib/modules/ppolicy.inc:76
 #: ../lib/modules/ppolicy.inc:135
 #: ../lib/modules/ppolicy.inc:158
@@ -5584,16 +5699,17 @@ msgstr "取消了增,删,改等修改命令"
 #: ../lib/types/user.inc:160
 #: ../lib/modules/inetOrgPerson.inc:56
 #: ../lib/modules/inetOrgPerson.inc:123
-#: ../lib/modules/inetOrgPerson.inc:253
-#: ../lib/modules/inetOrgPerson.inc:420
-#: ../lib/modules/inetOrgPerson.inc:539
-#: ../lib/modules/inetOrgPerson.inc:633
-#: ../lib/modules/inetOrgPerson.inc:1180
-#: ../lib/modules/inetOrgPerson.inc:1437
+#: ../lib/modules/inetOrgPerson.inc:256
+#: ../lib/modules/inetOrgPerson.inc:425
+#: ../lib/modules/inetOrgPerson.inc:552
+#: ../lib/modules/inetOrgPerson.inc:669
+#: ../lib/modules/inetOrgPerson.inc:673
+#: ../lib/modules/inetOrgPerson.inc:1536
+#: ../lib/modules/inetOrgPerson.inc:2033
 msgid "Mobile number"
 msgstr "手机号码"
 
-#: ../lib/modules/inetOrgPerson.inc:1917
+#: ../lib/modules/inetOrgPerson.inc:2535
 msgid "Mobile telephone number"
 msgstr "手机号码"
 
@@ -5638,21 +5754,21 @@ msgid "Modifying"
 msgstr "修改中"
 
 #: ../templates/config/confmodules.php:167
-#: ../templates/config/confmain.php:200
+#: ../templates/config/confmain.php:204
 #: ../templates/config/moduleSettings.php:166
 #: ../templates/config/conftypes.php:185
-#: ../templates/selfService/adminMain.php:339
+#: ../templates/selfService/adminMain.php:350
 msgid "Module settings"
 msgstr "模块设置"
 
 #: ../templates/config/confmodules.php:163
-#: ../templates/config/confmain.php:196
+#: ../templates/config/confmain.php:200
 #: ../templates/config/moduleSettings.php:162
 #: ../templates/config/conftypes.php:181
 msgid "Modules"
 msgstr "模块"
 
-#: ../lib/modules/sambaSamAccount.inc:1287
+#: ../lib/modules/sambaSamAccount.inc:1311
 msgid "Monday"
 msgstr "星期一"
 
@@ -5661,12 +5777,12 @@ msgid "Mountain Time (US & Canada)"
 msgstr "时区(美国和加拿大)"
 
 #: ../lib/modules/quota.inc:97
-#: ../lib/modules/quota.inc:386
-#: ../lib/modules/quota.inc:492
-#: ../lib/modules/quota.inc:619
+#: ../lib/modules/quota.inc:389
+#: ../lib/modules/quota.inc:495
+#: ../lib/modules/quota.inc:622
 #: ../lib/modules/systemQuotas.inc:90
 #: ../lib/modules/systemQuotas.inc:115
-#: ../lib/modules/systemQuotas.inc:372
+#: ../lib/modules/systemQuotas.inc:375
 msgid "Mountpoint"
 msgstr "挂接点"
 
@@ -5684,6 +5800,7 @@ msgstr "可限制配额设备挂接点"
 #: ../lib/modules/eduPerson.inc:98
 #: ../lib/modules/eduPerson.inc:110
 #: ../lib/modules/eduPerson.inc:126
+#: ../lib/modules/zarafaUser.inc:149
 #: ../lib/modules/sudoRole.inc:89
 #: ../lib/modules/sudoRole.inc:94
 #: ../lib/modules/sudoRole.inc:99
@@ -5694,19 +5811,21 @@ msgid "Multiple values are separated by comma."
 msgstr "用逗号分隔多值."
 
 #: ../lib/modules/device.inc:67
-#: ../lib/modules/inetOrgPerson.inc:610
-#: ../lib/modules/inetOrgPerson.inc:614
-#: ../lib/modules/inetOrgPerson.inc:618
-#: ../lib/modules/inetOrgPerson.inc:630
+#: ../lib/modules/inetOrgPerson.inc:626
 #: ../lib/modules/inetOrgPerson.inc:634
-#: ../lib/modules/inetOrgPerson.inc:638
 #: ../lib/modules/inetOrgPerson.inc:642
-#: ../lib/modules/inetOrgPerson.inc:658
-#: ../lib/modules/inetOrgPerson.inc:670
+#: ../lib/modules/inetOrgPerson.inc:650
+#: ../lib/modules/inetOrgPerson.inc:666
 #: ../lib/modules/inetOrgPerson.inc:674
-#: ../lib/modules/inetOrgPerson.inc:686
+#: ../lib/modules/inetOrgPerson.inc:682
+#: ../lib/modules/inetOrgPerson.inc:690
 #: ../lib/modules/inetOrgPerson.inc:698
-#: ../lib/modules/inetOrgPerson.inc:706
+#: ../lib/modules/inetOrgPerson.inc:718
+#: ../lib/modules/inetOrgPerson.inc:734
+#: ../lib/modules/inetOrgPerson.inc:742
+#: ../lib/modules/inetOrgPerson.inc:758
+#: ../lib/modules/inetOrgPerson.inc:774
+#: ../lib/modules/inetOrgPerson.inc:782
 #: ../lib/modules/systemQuotas.inc:63
 #: ../lib/modules/freeRadius.inc:93
 #: ../lib/modules/groupOfNames.inc:73
@@ -5716,9 +5835,9 @@ msgstr "用逗号分隔多值."
 #: ../lib/modules/asteriskAccount.inc:198
 #: ../lib/modules/asteriskAccount.inc:289
 #: ../lib/modules/asteriskAccount.inc:352
-#: ../lib/modules/asteriskAccount.inc:550
-#: ../lib/modules/asteriskAccount.inc:893
-#: ../lib/modules/asteriskAccount.inc:1256
+#: ../lib/modules/asteriskAccount.inc:548
+#: ../lib/modules/asteriskAccount.inc:887
+#: ../lib/modules/asteriskAccount.inc:1254
 msgid "Music on hold"
 msgstr "彩铃"
 
@@ -5728,25 +5847,25 @@ msgstr "彩铃"
 
 #: ../lib/modules/ipHost.inc:86
 #: ../lib/modules/device.inc:103
-#: ../lib/modules/inetOrgPerson.inc:470
+#: ../lib/modules/inetOrgPerson.inc:483
 msgid "MyCity"
 msgstr "城市"
 
-#: ../lib/modules/inetOrgPerson.inc:382
-#: ../lib/modules/inetOrgPerson.inc:390
+#: ../lib/modules/inetOrgPerson.inc:387
+#: ../lib/modules/inetOrgPerson.inc:395
 msgid "Mycity"
 msgstr "城市"
 
-#: ../lib/modules/inetOrgPerson.inc:366
+#: ../lib/modules/inetOrgPerson.inc:371
 msgid "Mystreetname 42"
 msgstr "街道42号"
 
 #: ../lib/modules/asteriskAccount.inc:154
 #: ../lib/modules/asteriskAccount.inc:267
 #: ../lib/modules/asteriskAccount.inc:341
-#: ../lib/modules/asteriskAccount.inc:470
-#: ../lib/modules/asteriskAccount.inc:791
-#: ../lib/modules/asteriskAccount.inc:1223
+#: ../lib/modules/asteriskAccount.inc:468
+#: ../lib/modules/asteriskAccount.inc:785
+#: ../lib/modules/asteriskAccount.inc:1221
 msgid "NAT"
 msgstr "NAT"
 
@@ -5770,6 +5889,11 @@ msgstr "NIS网络组"
 msgid "NIS object"
 msgstr "NIS 对象"
 
+#: ../lib/types/nisObjectType.inc:144
+#, php-format
+msgid "NIS object count: %s"
+msgstr "NIS 对象总计:%s"
+
 #: ../lib/types/nisObjectType.inc:48
 msgid "NIS object entries"
 msgstr "NIS 对象条目"
@@ -5779,8 +5903,8 @@ msgid "NIS objects"
 msgstr "NIS 对象"
 
 #: ../templates/serverInfo.php:145
-#: ../templates/masscreate.php:260
-#: ../templates/masscreate.php:335
+#: ../templates/masscreate.php:280
+#: ../templates/masscreate.php:355
 #: ../templates/schema/schema.php:266
 #: ../templates/pdfedit/pdfdelete.php:88
 #: ../lib/types/automountType.inc:77
@@ -5806,6 +5930,7 @@ msgstr "NIS 对象"
 #: ../lib/modules/automount.inc:93
 #: ../lib/modules/automount.inc:118
 #: ../lib/modules/automount.inc:190
+#: ../lib/modules/asteriskExtension.inc:808
 #: ../lib/modules/groupOfNames.inc:170
 msgid "Name"
 msgstr "名"
@@ -5814,14 +5939,14 @@ msgstr "名"
 msgid "Name of the address list which should be created."
 msgstr "将要建立的地址列表名"
 
-#: ../help/help.inc:151
+#: ../help/help.inc:157
 msgid "Name under which the profile will be saved. If a profile with the same name exists, it will be overwritten."
 msgstr "将来保存的配置名,如果配置名存在,会被覆盖."
 
-#: ../lib/modules/dhcp_settings.inc:163
-#: ../lib/modules/dhcp_settings.inc:180
-#: ../lib/modules/dhcp_settings.inc:558
-#: ../lib/modules/dhcp_settings.inc:626
+#: ../lib/modules/dhcp_settings.inc:172
+#: ../lib/modules/dhcp_settings.inc:191
+#: ../lib/modules/dhcp_settings.inc:569
+#: ../lib/modules/dhcp_settings.inc:637
 #: ../lib/modules/freeRadius.inc:80
 #: ../lib/modules/freeRadius.inc:116
 #: ../lib/modules/freeRadius.inc:130
@@ -5832,25 +5957,25 @@ msgstr "将来保存的配置名,如果配置名存在,会被覆盖."
 msgid "Net mask"
 msgstr "子网掩码"
 
-#: ../lib/modules/dhcp_settings.inc:142
-#: ../lib/modules/dhcp_settings.inc:177
-#: ../lib/modules/dhcp_settings.inc:191
-#: ../lib/modules/dhcp_settings.inc:240
-#: ../lib/modules/dhcp_settings.inc:538
-#: ../lib/modules/dhcp_settings.inc:623
+#: ../lib/modules/dhcp_settings.inc:148
+#: ../lib/modules/dhcp_settings.inc:188
+#: ../lib/modules/dhcp_settings.inc:202
+#: ../lib/modules/dhcp_settings.inc:251
+#: ../lib/modules/dhcp_settings.inc:549
+#: ../lib/modules/dhcp_settings.inc:634
 msgid "Netbios name servers"
 msgstr "Netbios命名服务器"
 
-#: ../lib/modules/dhcp_settings.inc:145
-#: ../lib/modules/dhcp_settings.inc:178
-#: ../lib/modules/dhcp_settings.inc:193
-#: ../lib/modules/dhcp_settings.inc:246
-#: ../lib/modules/dhcp_settings.inc:548
-#: ../lib/modules/dhcp_settings.inc:624
+#: ../lib/modules/dhcp_settings.inc:152
+#: ../lib/modules/dhcp_settings.inc:189
+#: ../lib/modules/dhcp_settings.inc:204
+#: ../lib/modules/dhcp_settings.inc:257
+#: ../lib/modules/dhcp_settings.inc:559
+#: ../lib/modules/dhcp_settings.inc:635
 msgid "Netbios node type"
 msgstr "Netbios 节点类型"
 
-#: ../lib/modules/authorizedServiceObject.inc:166
+#: ../lib/modules/authorizedServiceObject.inc:167
 msgid "New Authorized Service"
 msgstr "新授权服务"
 
@@ -5880,7 +6005,7 @@ msgstr "新OU建立成功."
 msgid "New SSH public key"
 msgstr "新SSH公钥"
 
-#: ../lib/modules/inetOrgPerson.inc:478
+#: ../lib/modules/inetOrgPerson.inc:491
 msgid "New York"
 msgstr "纽约"
 
@@ -5906,7 +6031,7 @@ msgstr "新自动安装条目"
 msgid "New automount map"
 msgstr "新自动装配图"
 
-#: ../templates/config/profmanage.php:169
+#: ../templates/config/profmanage.php:127
 msgid "New default profile set successfully."
 msgstr "新缺省配置设置成功."
 
@@ -5915,8 +6040,8 @@ msgstr "新缺省配置设置成功."
 msgid "New domain"
 msgstr "新域"
 
-#: ../lib/types/asteriskExt.inc:106
-#: ../lib/types/asteriskExt.inc:139
+#: ../lib/types/asteriskExt.inc:108
+#: ../lib/types/asteriskExt.inc:140
 msgid "New extension"
 msgstr "新扩展"
 
@@ -5958,17 +6083,17 @@ msgid "New object"
 msgstr "新对象"
 
 #: ../templates/ou_edit.php:178
-#: ../help/help.inc:203
+#: ../help/help.inc:211
 msgid "New organisational unit"
 msgstr "新组织单元"
 
-#: ../templates/config/confmain.php:365
-#: ../lib/modules/posixAccount.inc:2070
-#: ../lib/modules/passwordSelfReset.inc:681
+#: ../templates/config/confmain.php:375
+#: ../lib/modules/posixAccount.inc:2081
+#: ../lib/modules/passwordSelfReset.inc:802
 msgid "New password"
 msgstr "新密码"
 
-#: ../templates/config/profmanage.php:159
+#: ../templates/config/profmanage.php:117
 msgid "New password set successfully."
 msgstr "新密码设置成功."
 
@@ -5977,6 +6102,11 @@ msgstr "新密码设置成功."
 msgid "New policy"
 msgstr "新策略"
 
+#: ../templates/config/profmanage.php:242
+#: ../templates/selfService/profManage.php:223
+msgid "New profile name"
+msgstr "新配置文件名"
+
 #: ../lib/modules/range.inc:94
 #: ../lib/modules/range.inc:108
 #: ../lib/modules/range.inc:444
@@ -5987,7 +6117,7 @@ msgstr "新范围"
 msgid "New recipient"
 msgstr "新收信者"
 
-#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:82
+#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:81
 msgid "New required attributes"
 msgstr "新必要属性"
 
@@ -6077,6 +6207,10 @@ msgstr "昵称"
 msgid "No"
 msgstr "否"
 
+#: ../lib/types/asteriskExt.inc:139
+msgid "No Asterisk extensions found."
+msgstr "没有发现Asterisk 扩展."
+
 #: ../lib/types/dhcp.inc:160
 msgid "No DHCPs found!"
 msgstr "没有发现DHCP主机!"
@@ -6090,13 +6224,13 @@ msgstr "未发现 NIS 对象!"
 msgid "No RDN attribute was selected."
 msgstr "没有选中RDN属性"
 
-#: ../lib/modules/sambaSamAccount.inc:1046
+#: ../lib/modules/sambaSamAccount.inc:1060
 #: ../lib/modules/sambaGroupMapping.inc:245
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Samba域,请先建立一个."
 
 #: ../lib/modules/posixAccount.inc:446
-#: ../lib/modules/posixAccount.inc:1048
+#: ../lib/modules/posixAccount.inc:1051
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Unix组,请先建立一个."
 
@@ -6139,15 +6273,11 @@ msgstr "没有发现域!"
 msgid "No entry was selected to delete"
 msgstr "没有选中要删除的条目"
 
-#: ../lib/types/asteriskExt.inc:138
-msgid "No extension(s) found!"
-msgstr "没有发现扩展!"
-
 #: ../lib/modules/inetOrgPerson.inc:80
 msgid "No file selected."
 msgstr "没有选择文件!"
 
-#: ../lib/modules/posixGroup.inc:477
+#: ../lib/modules/posixGroup.inc:487
 #: ../lib/modules/posixAccount.inc:78
 msgid "No free ID-Number!"
 msgstr "没有可用的ID号!"
@@ -6206,7 +6336,7 @@ msgstr "未选择基本模块或选择多于一个!"
 
 #: ../templates/config/confsave.php:53
 #: ../templates/config/confmain.php:54
-#: ../lib/modules/passwordSelfReset.inc:740
+#: ../lib/modules/passwordSelfReset.inc:867
 msgid "No password was entered!"
 msgstr "没有输入密码!"
 
@@ -6226,7 +6356,7 @@ msgstr "没有运行的脚本"
 msgid "No section text specified"
 msgstr "没有指定段文本"
 
-#: ../lib/modules/passwordSelfReset.inc:761
+#: ../lib/modules/passwordSelfReset.inc:889
 msgid "No security answer found."
 msgstr "没有发现安全问题."
 
@@ -6238,7 +6368,7 @@ msgstr "没有服务器设置,请先建立一个."
 msgid "No static text specified"
 msgstr "没有指定静态文本"
 
-#: ../lib/modules/dhcp_settings.inc:272
+#: ../lib/modules/dhcp_settings.inc:283
 msgid "No subnet entered."
 msgstr "没有输入子网掩码!"
 
@@ -6265,12 +6395,12 @@ msgstr "未发现sudo角色!"
 msgid "No users found!"
 msgstr "未发现用户!"
 
-#: ../help/help.inc:64
+#: ../help/help.inc:68
 msgid "Note"
 msgstr "备注"
 
 #: ../templates/3rdParty/pla/htdocs/add_value_form.php:125
-msgid "Note: You may be required to enter new attributes that these objectClass(es) require"
+msgid "Note: You may be required to enter new attributes that these object classes require"
 msgstr "注意:您必须输入这些对象类所需的新属性"
 
 #: ../templates/3rdParty/pla/lib/export_functions.php:450
@@ -6337,8 +6467,8 @@ msgstr "OU无效!"
 msgid "OU is not empty or invalid!"
 msgstr "OU不为空或非法!"
 
-#: ../help/help.inc:203
-#: ../help/help.inc:205
+#: ../help/help.inc:211
+#: ../help/help.inc:213
 msgid "OU-Editor"
 msgstr "OU编辑器"
 
@@ -6348,6 +6478,11 @@ msgstr "OU编辑器"
 msgid "Object classes"
 msgstr "对象类"
 
+#: ../lib/lists.inc:106
+#, php-format
+msgid "Object count: %s"
+msgstr "对象总计: %s"
+
 #: ../templates/schema/schema.php:150
 #: ../templates/schema/schema.php:281
 msgid "Obsolete"
@@ -6363,56 +6498,66 @@ msgid "Off"
 msgstr "关闭"
 
 #: ../lib/modules/inetOrgPerson.inc:127
-#: ../lib/modules/inetOrgPerson.inc:245
-#: ../lib/modules/inetOrgPerson.inc:492
-#: ../lib/modules/inetOrgPerson.inc:527
-#: ../lib/modules/inetOrgPerson.inc:681
-#: ../lib/modules/inetOrgPerson.inc:1153
-#: ../lib/modules/inetOrgPerson.inc:1447
-#: ../lib/modules/inetOrgPerson.inc:1994
+#: ../lib/modules/inetOrgPerson.inc:248
+#: ../lib/modules/inetOrgPerson.inc:505
+#: ../lib/modules/inetOrgPerson.inc:540
+#: ../lib/modules/inetOrgPerson.inc:749
+#: ../lib/modules/inetOrgPerson.inc:1462
+#: ../lib/modules/inetOrgPerson.inc:2043
+#: ../lib/modules/inetOrgPerson.inc:2612
 msgid "Office name"
 msgstr "办公室名"
 
-#: ../templates/lists/changePassword.php:228
-#: ../templates/lists/changePassword.php:264
+#: ../templates/lists/changePassword.php:248
+#: ../templates/lists/changePassword.php:277
 #: ../templates/tests/lamdaemonTest.php:90
 #: ../templates/ou_edit.php:186
 #: ../templates/ou_edit.php:200
-#: ../templates/masscreate.php:195
-#: ../templates/config/profmanage.php:386
+#: ../templates/masscreate.php:197
+#: ../templates/config/profmanage.php:235
+#: ../templates/config/profmanage.php:247
+#: ../templates/config/profmanage.php:256
+#: ../templates/config/profmanage.php:273
+#: ../templates/config/profmanage.php:282
+#: ../templates/config/profmanage.php:284
 #: ../templates/config/mainmanage.php:252
 #: ../templates/config/conflogin.php:158
 #: ../templates/config/conflogin.php:159
 #: ../templates/config/mainlogin.php:155
 #: ../templates/selfService/selfServiceLogin.php:275
-#: ../templates/selfService/profManage.php:285
+#: ../templates/selfService/profManage.php:212
+#: ../templates/selfService/profManage.php:228
+#: ../templates/selfService/profManage.php:241
 #: ../templates/selfService/adminLogin.php:152
 #: ../templates/selfService/adminLogin.php:153
-#: ../templates/selfService/adminMain.php:443
-#: ../templates/selfService/adminMain.php:487
+#: ../templates/selfService/adminMain.php:466
+#: ../templates/selfService/adminMain.php:510
 #: ../templates/pdfedit/pdfmain.php:158
 #: ../templates/profedit/profiledelete.php:91
 #: ../templates/profedit/profilemain.php:157
 #: ../lib/types/automountType.inc:199
 #: ../lib/types/automountType.inc:234
 #: ../lib/types/dhcp.inc:277
+#: ../lib/modules/zarafaContact.inc:401
+#: ../lib/modules/zarafaGroup.inc:457
 #: ../lib/modules/device.inc:297
-#: ../lib/modules/sambaSamAccount.inc:1343
-#: ../lib/modules/sambaSamAccount.inc:1469
-#: ../lib/modules/zarafaUser.inc:875
+#: ../lib/modules/sambaSamAccount.inc:1367
+#: ../lib/modules/sambaSamAccount.inc:1496
+#: ../lib/modules/zarafaUser.inc:918
+#: ../lib/modules/zarafaUser.inc:969
 #: ../lib/modules/nisnetgroup.inc:469
 #: ../lib/modules/nisnetgroup.inc:479
-#: ../lib/modules/asteriskExtension.inc:330
-#: ../lib/modules/aliasEntry.inc:141
-#: ../lib/modules/aliasEntry.inc:161
+#: ../lib/modules/asteriskExtension.inc:469
+#: ../lib/modules/aliasEntry.inc:139
+#: ../lib/modules/aliasEntry.inc:159
 #: ../lib/modules/imapAccess.inc:269
-#: ../lib/modules/passwordSelfReset.inc:595
-#: ../lib/modules/passwordSelfReset.inc:699
+#: ../lib/modules/passwordSelfReset.inc:676
+#: ../lib/modules/passwordSelfReset.inc:823
 #: ../lib/modules/groupOfNames.inc:319
 #: ../lib/modules/groupOfNames.inc:431
 #: ../lib/lists.inc:641
 #: ../lib/lists.inc:714
-#: ../lib/modules.inc:1083
+#: ../lib/modules.inc:1108
 msgid "Ok"
 msgstr "确定"
 
@@ -6432,8 +6577,8 @@ msgstr "On"
 
 #: ../lib/modules/sambaSamAccount.inc:225
 #: ../lib/modules/sambaSamAccount.inc:362
-#: ../lib/modules/sambaSamAccount.inc:1455
-#: ../lib/modules/sambaSamAccount.inc:1735
+#: ../lib/modules/sambaSamAccount.inc:1482
+#: ../lib/modules/sambaSamAccount.inc:1762
 msgid "On broken or timed out connection"
 msgstr "中断或超时连接"
 
@@ -6469,12 +6614,13 @@ msgstr "操作成功. DN  <b>%s</b> 已经建立"
 msgid "Optional attributes"
 msgstr "可选属性"
 
-#: ../templates/lists/changePassword.php:181
+#: ../templates/lists/changePassword.php:217
 #: ../lib/types/sudo.inc:83
 #: ../lib/modules/zarafaDynamicGroup.inc:241
-#: ../lib/modules/zarafaGroup.inc:179
+#: ../lib/modules/zarafaContact.inc:211
+#: ../lib/modules/zarafaGroup.inc:248
 #: ../lib/modules/posixAccount.inc:184
-#: ../lib/modules/zarafaUser.inc:529
+#: ../lib/modules/zarafaUser.inc:572
 #: ../lib/modules/sudoRole.inc:83
 #: ../lib/modules/sudoRole.inc:112
 #: ../lib/modules/sudoRole.inc:164
@@ -6482,7 +6628,7 @@ msgstr "可选属性"
 #: ../lib/modules/sudoRole.inc:187
 #: ../lib/modules/sudoRole.inc:399
 #: ../lib/modules/sudoRole.inc:702
-#: ../lib/modules/asteriskExtension.inc:106
+#: ../lib/modules/asteriskExtension.inc:114
 #: ../lib/modules/asteriskVoicemail.inc:106
 #: ../lib/modules/asteriskVoicemail.inc:116
 #: ../lib/modules/asteriskVoicemail.inc:133
@@ -6514,13 +6660,14 @@ msgstr "排序"
 #: ../lib/modules/eduPerson.inc:217
 #: ../lib/modules/eduPerson.inc:353
 #: ../lib/modules/eduPerson.inc:684
-#: ../lib/modules/inetOrgPerson.inc:165
-#: ../lib/modules/inetOrgPerson.inc:271
-#: ../lib/modules/inetOrgPerson.inc:460
-#: ../lib/modules/inetOrgPerson.inc:566
-#: ../lib/modules/inetOrgPerson.inc:697
-#: ../lib/modules/inetOrgPerson.inc:1232
-#: ../lib/modules/inetOrgPerson.inc:1448
+#: ../lib/modules/inetOrgPerson.inc:168
+#: ../lib/modules/inetOrgPerson.inc:274
+#: ../lib/modules/inetOrgPerson.inc:473
+#: ../lib/modules/inetOrgPerson.inc:582
+#: ../lib/modules/inetOrgPerson.inc:769
+#: ../lib/modules/inetOrgPerson.inc:773
+#: ../lib/modules/inetOrgPerson.inc:1698
+#: ../lib/modules/inetOrgPerson.inc:2044
 msgid "Organisation"
 msgstr "组织"
 
@@ -6537,7 +6684,7 @@ msgstr "组织单元"
 msgid "Organisational units contains an invalid entry."
 msgstr "组织单元中有一个非法条目"
 
-#: ../templates/config/confmain.php:299
+#: ../templates/config/confmain.php:303
 msgid "Other"
 msgstr "其它"
 
@@ -6547,7 +6694,7 @@ msgstr "其它"
 msgid "Output may contain HTML"
 msgstr "输出可以包含HTML语句"
 
-#: ../lib/modules/customScripts.inc:407
+#: ../lib/modules/customScripts.inc:435
 #, php-format
 msgid "Output of command \"%s\" with return code %s"
 msgstr "\"%s\"命令的输出和返回值%s"
@@ -6556,11 +6703,13 @@ msgstr "\"%s\"命令的输出和返回值%s"
 msgid "Overlays"
 msgstr "覆盖物"
 
-#: ../lib/modules/zarafaUser.inc:73
+#: ../lib/modules/zarafaUser.inc:74
 msgid "Override default quota settings."
 msgstr "覆盖缺少的限制设置"
 
-#: ../templates/config/confmain.php:291
+#: ../templates/config/confmain.php:295
+#: ../lib/types/asteriskExt.inc:96
+#: ../lib/types/asteriskExt.inc:153
 msgid "Owner"
 msgstr "拥有者"
 
@@ -6586,7 +6735,7 @@ msgstr "P-节点 (0x02)"
 
 #: ../lib/modules/fixed_ip.inc:87
 #: ../lib/modules/fixed_ip.inc:334
-#: ../lib/modules/fixed_ip.inc:520
+#: ../lib/modules/fixed_ip.inc:522
 msgid "PC name"
 msgstr "PC机器名"
 
@@ -6596,8 +6745,9 @@ msgstr "PC机器名"
 msgid "PDF editor"
 msgstr "PDF编辑器"
 
+#: ../templates/masscreate.php:263
 #: ../lib/lists.inc:619
-#: ../help/help.inc:162
+#: ../help/help.inc:168
 msgid "PDF structure"
 msgstr "PDF架构"
 
@@ -6613,9 +6763,9 @@ msgstr "PDF架构成功保存."
 msgid "PDUs sent"
 msgstr "个PDU被发送"
 
-#: ../lib/modules/zarafaUser.inc:313
-#: ../lib/modules/zarafaUser.inc:603
-#: ../lib/modules/zarafaUser.inc:1308
+#: ../lib/modules/zarafaUser.inc:325
+#: ../lib/modules/zarafaUser.inc:646
+#: ../lib/modules/zarafaUser.inc:1408
 msgid "POP3"
 msgstr "POP3"
 
@@ -6623,16 +6773,16 @@ msgstr "POP3"
 msgid "Pacific Time (US & Canada)"
 msgstr "太平洋时间(美国和加拿大)"
 
-#: ../lib/modules/dhcp_settings.inc:140
+#: ../lib/modules/dhcp_settings.inc:145
 msgid "Packets are sent to the default gateway if the receiver does not reside in the same network. The default gateway routes them to the target network."
 msgstr "如果数据包的接收者不在同一个网络,数据包将会发往缺省网关.缺省网关将数据包转向目标网络."
 
-#: ../templates/selfService/adminMain.php:386
-#: ../help/help.inc:182
+#: ../templates/selfService/adminMain.php:406
+#: ../help/help.inc:190
 msgid "Page header"
 msgstr "页首"
 
-#: ../templates/selfService/adminMain.php:338
+#: ../templates/selfService/adminMain.php:349
 msgid "Page layout"
 msgstr "页布局"
 
@@ -6660,13 +6810,13 @@ msgstr "继承于"
 msgid "Parse error"
 msgstr "解析错误"
 
-#: ../templates/lists/changePassword.php:242
+#: ../templates/lists/changePassword.php:264
 #: ../templates/login.php:301
 #: ../templates/selfService/selfServiceLogin.php:256
 #: ../lib/modules/asteriskAccount.inc:106
-#: ../lib/modules/asteriskAccount.inc:389
-#: ../lib/modules/posixGroup.inc:194
-#: ../lib/modules/posixGroup.inc:474
+#: ../lib/modules/asteriskAccount.inc:387
+#: ../lib/modules/posixGroup.inc:204
+#: ../lib/modules/posixGroup.inc:484
 #: ../lib/modules/sambaSamAccount.inc:400
 #: ../lib/modules/posixAccount.inc:83
 #: ../lib/modules/posixAccount.inc:84
@@ -6674,21 +6824,32 @@ msgstr "解析错误"
 #: ../lib/modules/posixAccount.inc:251
 #: ../lib/modules/posixAccount.inc:322
 #: ../lib/modules/posixAccount.inc:387
-#: ../lib/modules/posixAccount.inc:1150
-#: ../lib/modules/posixAccount.inc:1481
-#: ../lib/modules/inetOrgPerson.inc:1250
+#: ../lib/modules/posixAccount.inc:1153
+#: ../lib/modules/posixAccount.inc:1487
+#: ../lib/modules/posixAccount.inc:1490
+#: ../lib/modules/inetOrgPerson.inc:1738
 #: ../lib/modules/asteriskVoicemail.inc:90
 #: ../lib/modules/asteriskVoicemail.inc:156
-#: ../lib/modules.inc:971
-#: ../help/help.inc:160
+#: ../lib/modules/heimdalKerberos.inc:94
+#: ../lib/modules/heimdalKerberos.inc:146
+#: ../lib/modules/heimdalKerberos.inc:158
+#: ../lib/modules/heimdalKerberos.inc:500
+#: ../lib/modules/heimdalKerberos.inc:503
+#: ../lib/modules.inc:980
+#: ../help/help.inc:166
 msgid "Password"
 msgstr "密码"
 
 #: ../lib/modules/sambaSamAccount.inc:272
-#: ../lib/modules/sambaSamAccount.inc:1088
+#: ../lib/modules/sambaSamAccount.inc:1112
 msgid "Password change at next login"
 msgstr "下次登录时修改密码"
 
+#: ../lib/modules/heimdalKerberos.inc:88
+#: ../lib/modules/heimdalKerberos.inc:162
+msgid "Password change command"
+msgstr "密码修改命令"
+
 #: ../lib/modules/ppolicyUser.inc:52
 #: ../lib/modules/ppolicyUser.inc:67
 #: ../lib/modules/ppolicyUser.inc:121
@@ -6708,7 +6869,7 @@ msgstr "修改密码时需要旧密码"
 msgid "Password check"
 msgstr "密码检查"
 
-#: ../lib/modules/posixGroup.inc:474
+#: ../lib/modules/posixGroup.inc:484
 #: ../lib/modules/sambaSamAccount.inc:97
 #: ../lib/modules/posixAccount.inc:84
 #: ../lib/modules/posixAccount.inc:85
@@ -6718,8 +6879,8 @@ msgstr "密码包括无效字符,合法字符为a-z, A-Z, 0-9 和 #*,.;:_-+!%&/|
 #: ../lib/modules/sambaSamAccount.inc:257
 #: ../lib/modules/sambaSamAccount.inc:260
 #: ../lib/modules/sambaSamAccount.inc:422
-#: ../lib/modules/sambaSamAccount.inc:1078
-#: ../lib/modules/sambaSamAccount.inc:1494
+#: ../lib/modules/sambaSamAccount.inc:1102
+#: ../lib/modules/sambaSamAccount.inc:1521
 msgid "Password does not expire"
 msgstr "密码永不过期"
 
@@ -6730,7 +6891,7 @@ msgstr "密码永不过期"
 #: ../lib/modules/shadowAccount.inc:172
 #: ../lib/modules/shadowAccount.inc:206
 #: ../lib/modules/shadowAccount.inc:313
-#: ../lib/modules/shadowAccount.inc:470
+#: ../lib/modules/shadowAccount.inc:483
 msgid "Password expiration"
 msgstr "密码超期"
 
@@ -6743,13 +6904,13 @@ msgstr "密码超期必须是自然数或-1."
 msgid "Password for voicemail mailbox."
 msgstr "语音邮箱的密码."
 
-#: ../lib/modules/posixGroup.inc:410
-#: ../lib/modules/posixGroup.inc:438
+#: ../lib/modules/posixGroup.inc:420
+#: ../lib/modules/posixGroup.inc:448
 #: ../lib/modules/posixAccount.inc:152
 #: ../lib/modules/posixAccount.inc:186
 #: ../lib/modules/posixAccount.inc:342
-#: ../lib/modules/inetOrgPerson.inc:284
-#: ../lib/modules/inetOrgPerson.inc:693
+#: ../lib/modules/inetOrgPerson.inc:289
+#: ../lib/modules/inetOrgPerson.inc:765
 msgid "Password hash type"
 msgstr "密码哈希类型"
 
@@ -6766,7 +6927,7 @@ msgstr "密码哈希类型"
 msgid "Password history length"
 msgstr "历史密码长度"
 
-#: ../templates/config/confmain.php:332
+#: ../templates/config/confmain.php:336
 msgid "Password mail settings"
 msgstr "密码邮件设置"
 
@@ -6817,7 +6978,7 @@ msgstr "密码策略"
 #: ../lib/modules/ppolicyUser.inc:260
 #: ../lib/modules/ppolicy.inc:54
 #: ../lib/modules/sambaDomain.inc:259
-#: ../help/help.inc:142
+#: ../help/help.inc:148
 msgid "Password policy"
 msgstr "密码策略"
 
@@ -6829,13 +6990,21 @@ msgstr "密码策略"
 msgid "Password quality check"
 msgstr "密码质量检查"
 
+#: ../lib/modules/passwordSelfReset.inc:208
+msgid "Password reset confirmation"
+msgstr "密码重置确认"
+
+#: ../lib/modules/passwordSelfReset.inc:192
+msgid "Password reset notification"
+msgstr "密码重置提示"
+
 #: ../lib/modules/passwordSelfReset.inc:51
-#: ../lib/modules/passwordSelfReset.inc:598
-#: ../lib/modules/passwordSelfReset.inc:702
+#: ../lib/modules/passwordSelfReset.inc:679
+#: ../lib/modules/passwordSelfReset.inc:826
 msgid "Password self reset"
 msgstr "密码复位"
 
-#: ../lib/modules/passwordSelfReset.inc:915
+#: ../lib/modules/passwordSelfReset.inc:1191
 msgid "Password successfully reset."
 msgstr "密码被成功复位."
 
@@ -6845,7 +7014,7 @@ msgstr "密码被成功复位."
 #: ../lib/modules/shadowAccount.inc:168
 #: ../lib/modules/shadowAccount.inc:200
 #: ../lib/modules/shadowAccount.inc:305
-#: ../lib/modules/shadowAccount.inc:469
+#: ../lib/modules/shadowAccount.inc:482
 msgid "Password warning"
 msgstr "密码提醒日期"
 
@@ -6854,10 +7023,10 @@ msgstr "密码提醒日期"
 msgid "Password warning must be are natural number."
 msgstr "密码提醒日期必须是自然数."
 
-#: ../templates/config/confmain.php:488
+#: ../templates/config/confmain.php:505
 #: ../templates/3rdParty/pla/htdocs/password_checker.php:61
-#: ../lib/modules/passwordSelfReset.inc:745
-#: ../lib/modules.inc:1030
+#: ../lib/modules/passwordSelfReset.inc:872
+#: ../lib/modules.inc:1050
 msgid "Passwords are different!"
 msgstr "密码不同!"
 
@@ -6877,12 +7046,12 @@ msgstr "用户配置文件所在路径。"
 msgid "Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $user and $group are replaced with user and group name."
 msgstr "用户配置文件路径. 可以是本地绝对路径或UNC路径(\\\\server\\share).$user和$group会被用户名和组名代替."
 
-#: ../templates/config/confmain.php:282
+#: ../templates/config/confmain.php:286
 msgid "Path to external script"
 msgstr "外部脚本路径"
 
-#: ../lib/modules/ddns.inc:96
-#: ../lib/modules/ddns.inc:345
+#: ../lib/modules/ddns.inc:99
+#: ../lib/modules/ddns.inc:355
 msgid "Path to key for DNS updates"
 msgstr "DNS更新的KEY文件所有路径"
 
@@ -6894,9 +7063,9 @@ msgstr "也要永久删除所有子集?"
 #: ../lib/modules/asteriskAccount.inc:162
 #: ../lib/modules/asteriskAccount.inc:271
 #: ../lib/modules/asteriskAccount.inc:343
-#: ../lib/modules/asteriskAccount.inc:486
-#: ../lib/modules/asteriskAccount.inc:809
-#: ../lib/modules/asteriskAccount.inc:1229
+#: ../lib/modules/asteriskAccount.inc:484
+#: ../lib/modules/asteriskAccount.inc:803
+#: ../lib/modules/asteriskAccount.inc:1227
 msgid "Permit"
 msgstr "允许"
 
@@ -6907,21 +7076,21 @@ msgstr "个人信息"
 #: ../lib/types/user.inc:102
 #: ../lib/types/user.inc:281
 #: ../lib/modules/inetOrgPerson.inc:125
-#: ../lib/modules/inetOrgPerson.inc:2017
-#: ../lib/modules/inetOrgPerson.inc:2024
+#: ../lib/modules/inetOrgPerson.inc:2635
+#: ../lib/modules/inetOrgPerson.inc:2642
 msgid "Photo"
 msgstr "照片"
 
-#: ../lib/modules/inetOrgPerson.inc:1308
+#: ../lib/modules/inetOrgPerson.inc:1798
 msgid "Photo file (JPG format)"
 msgstr "照片文件(JPG格式)"
 
 #: ../lib/modules/asteriskAccount.inc:166
 #: ../lib/modules/asteriskAccount.inc:273
 #: ../lib/modules/asteriskAccount.inc:344
-#: ../lib/modules/asteriskAccount.inc:493
-#: ../lib/modules/asteriskAccount.inc:818
-#: ../lib/modules/asteriskAccount.inc:1232
+#: ../lib/modules/asteriskAccount.inc:491
+#: ../lib/modules/asteriskAccount.inc:812
+#: ../lib/modules/asteriskAccount.inc:1230
 msgid "Pickup group"
 msgstr "接听组"
 
@@ -6933,11 +7102,11 @@ msgstr "您的公钥列表,以逗号分隔."
 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:198
-msgid "Please add at least one member."
-msgstr "至少需要增加一个成员."
+#: ../lib/modules/asteriskExtension.inc:185
+msgid "Please add at least one extension owner."
+msgstr "至少需要增加一个扩展属主."
 
-#: ../lib/modules/sambaSamAccount.inc:1040
+#: ../lib/modules/sambaSamAccount.inc:1050
 msgid "Please check your settings on the Unix page!"
 msgstr "请在UNIX中检查设置"
 
@@ -6945,15 +7114,11 @@ msgstr "请在UNIX中检查设置"
 msgid "Please choose the attribute to get the IMAP user name. The default is \"mail\" but you can also use \"uid\"."
 msgstr "请选择IMAP用户属性。缺省值为\"mail\",也可以使用\"uid\"."
 
-#: ../lib/modules/phpGroupwareUser.inc:134
-msgid "Please enter \"active\" or \"inactive\"."
-msgstr "请输入 \"active\" 或 \"inactive\"."
-
 #: ../lib/modules/sambaSamAccount.inc:98
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "请输入RID或特殊账号名!"
 
-#: ../lib/modules/asteriskAccount.inc:619
+#: ../lib/modules/asteriskAccount.inc:617
 msgid "Please enter a caller ID."
 msgstr "请输入一个拨号ID."
 
@@ -6966,7 +7131,7 @@ msgstr "请输入域名列表，用逗号分隔(比如:\"company.com,example.com
 msgid "Please enter a comma separated list of host names!"
 msgstr "请输入以逗号分隔的主机名!"
 
-#: ../lib/modules/asteriskExtension.inc:191
+#: ../lib/modules/asteriskExtension.inc:177
 msgid "Please enter a common name."
 msgstr "请输入一个一般命名!"
 
@@ -6997,14 +7162,14 @@ msgid "Please enter a name for this policy."
 msgstr "请为这个密码策略输入一个名字."
 
 #: ../templates/lib/141_jquery-validationEngine-lang.php:38
-#: ../lib/modules/zarafaUser.inc:386
-#: ../lib/modules/zarafaUser.inc:387
-#: ../lib/modules/zarafaUser.inc:388
-#: ../lib/modules/zarafaUser.inc:389
-#: ../lib/modules/zarafaUser.inc:390
-#: ../lib/modules/zarafaUser.inc:391
-#: ../lib/modules/zarafaUser.inc:393
-#: ../lib/modules/zarafaUser.inc:394
+#: ../lib/modules/zarafaUser.inc:409
+#: ../lib/modules/zarafaUser.inc:410
+#: ../lib/modules/zarafaUser.inc:411
+#: ../lib/modules/zarafaUser.inc:412
+#: ../lib/modules/zarafaUser.inc:413
+#: ../lib/modules/zarafaUser.inc:414
+#: ../lib/modules/zarafaUser.inc:416
+#: ../lib/modules/zarafaUser.inc:417
 msgid "Please enter a number."
 msgstr "请输入一个数字"
 
@@ -7045,7 +7210,7 @@ msgstr "请为密码历史长度输入一个数值"
 msgid "Please enter a role name."
 msgstr "请输入角色名."
 
-#: ../lib/modules/passwordSelfReset.inc:765
+#: ../lib/modules/passwordSelfReset.inc:893
 msgid "Please enter a security answer."
 msgstr "请输入安全问题."
 
@@ -7065,6 +7230,10 @@ msgstr "请输入用户密码."
 msgid "Please enter a valid DN in the field:"
 msgstr "请输入有效的DN!"
 
+#: ../templates/config/confmain.php:462
+msgid "Please enter a valid bind user."
+msgstr "请输入有效的绑定账号."
+
 #: ../lib/modules/inetOrgPerson.inc:81
 #: ../lib/modules/inetOrgPerson.inc:82
 msgid "Please enter a valid business category!"
@@ -7078,11 +7247,13 @@ msgid "Please enter a valid common name!"
 msgstr "请输入有效的全名!"
 
 #: ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/heimdalKerberos.inc:175
+#: ../lib/modules/heimdalKerberos.inc:176
 msgid "Please enter a valid date in format DD-MM-YYYY."
 msgstr "请输入日期,格式为(DD-MM-YYYY)."
 
-#: ../lib/modules/asteriskAccount.inc:640
-#: ../lib/modules/asteriskAccount.inc:641
+#: ../lib/modules/asteriskAccount.inc:638
+#: ../lib/modules/asteriskAccount.inc:639
 msgid "Please enter a valid default user."
 msgstr "请输入有效的缺省用户."
 
@@ -7097,19 +7268,19 @@ msgstr "请输入有效的盘符."
 
 #: ../lib/modules/zarafaDynamicGroup.inc:174
 #: ../lib/modules/zarafaDynamicGroup.inc:175
-#: ../lib/modules/zarafaGroup.inc:137
-#: ../lib/modules/zarafaGroup.inc:138
+#: ../lib/modules/zarafaGroup.inc:187
+#: ../lib/modules/zarafaGroup.inc:188
 #: ../lib/modules/inetOrgPerson.inc:60
 #: ../lib/modules/inetOrgPerson.inc:61
-#: ../lib/modules/passwordSelfReset.inc:615
-#: ../lib/modules/passwordSelfReset.inc:719
+#: ../lib/modules/passwordSelfReset.inc:696
+#: ../lib/modules/passwordSelfReset.inc:843
 msgid "Please enter a valid email address!"
 msgstr "请输入有效的邮件地址!"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:176
 #: ../lib/modules/zarafaDynamicGroup.inc:177
-#: ../lib/modules/zarafaGroup.inc:139
-#: ../lib/modules/zarafaGroup.inc:140
+#: ../lib/modules/zarafaGroup.inc:189
+#: ../lib/modules/zarafaGroup.inc:190
 msgid "Please enter a valid email alias."
 msgstr "请输入有效的邮件地址."
 
@@ -7124,16 +7295,16 @@ msgid "Please enter a valid fax number!"
 msgstr "请输入有效的传真号!"
 
 #: ../lib/lists.inc:220
-msgid "Please enter a valid filter. Only letters, numbers and \" _*$.-\" are allowed."
-msgstr "请输入合法的过滤器.只允许字母,数字和 \" _*$.-\"."
-
-#: ../lib/modules/asteriskAccount.inc:634
-#: ../lib/modules/asteriskAccount.inc:635
-msgid "Please enter a valid from domain."
-msgstr "请输入有效的来自域."
+msgid "Please enter a valid filter. Only letters, numbers and \" _*$.@-\" are allowed."
+msgstr "请输入合法的过滤器.只允许字母,数字和\" _*$.@-\" ."
 
 #: ../lib/modules/asteriskAccount.inc:632
 #: ../lib/modules/asteriskAccount.inc:633
+msgid "Please enter a valid from domain."
+msgstr "请输入有效的来自域."
+
+#: ../lib/modules/asteriskAccount.inc:630
+#: ../lib/modules/asteriskAccount.inc:631
 msgid "Please enter a valid from user."
 msgstr "请输入有效的来自账号!"
 
@@ -7159,7 +7330,7 @@ msgstr "请输入有效的组列表名."
 msgid "Please enter a valid list of host names."
 msgstr "请输入有效的主机列表."
 
-#: ../lib/modules/authorizedServiceObject.inc:114
+#: ../lib/modules/authorizedServiceObject.inc:115
 msgid "Please enter a valid list of service names."
 msgstr "请输入有效的服务列表名."
 
@@ -7173,8 +7344,8 @@ msgstr "请输入有效的手机号!"
 msgid "Please enter a valid path."
 msgstr "请输入有效的路径."
 
-#: ../lib/modules/asteriskAccount.inc:636
-#: ../lib/modules/asteriskAccount.inc:637
+#: ../lib/modules/asteriskAccount.inc:634
+#: ../lib/modules/asteriskAccount.inc:635
 #: ../lib/modules/zarafaServer.inc:120
 #: ../lib/modules/zarafaServer.inc:121
 #: ../lib/modules/zarafaServer.inc:122
@@ -7226,8 +7397,8 @@ msgstr "请输入有效的街道名!"
 msgid "Please enter a valid telephone number!"
 msgstr "请输入有效的电话号码!"
 
-#: ../lib/modules/posixGroup.inc:576
-#: ../lib/modules/posixAccount.inc:819
+#: ../lib/modules/posixGroup.inc:586
+#: ../lib/modules/posixAccount.inc:822
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "请输入有效值(介于%s和%s之间)!"
@@ -7273,11 +7444,11 @@ msgstr "输入序列名只能使用ASCII字符."
 msgid "Please enter only ASCII characters for the user names."
 msgstr "输入用户名只能使用ASCII字符."
 
-#: ../lib/modules/passwordSelfReset.inc:165
+#: ../lib/modules/passwordSelfReset.inc:234
 msgid "Please enter the DN and password of the administrative password self reset account."
 msgstr "请输入DN和管理员级密码自助复位的帐号的密码."
 
-#: ../lib/modules/ddns.inc:101
+#: ../lib/modules/ddns.inc:105
 msgid "Please enter the IP address of your DNS server."
 msgstr "请输入DNS服务器IP地址"
 
@@ -7285,19 +7456,20 @@ msgstr "请输入DNS服务器IP地址"
 msgid "Please enter the LDAP DN that should be used to reset passwords."
 msgstr "请输入用于复位密码的LDAP DN."
 
-#: ../help/help.inc:113
+#: ../help/help.inc:117
 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/asteriskExtension.inc:180
 #: ../lib/modules/asteriskVoicemail.inc:204
 msgid "Please enter the account context."
 msgstr "请输入账号的语境. "
 
-#: ../lib/modules.inc:864
+#: ../lib/modules.inc:873
 msgid "Please enter the account information on the other pages first."
 msgstr "请先在另一个页面输入帐号信息."
 
-#: ../lib/modules/asteriskAccount.inc:629
+#: ../lib/modules/asteriskAccount.inc:627
 msgid "Please enter the account type."
 msgstr "请输入账号的类型. "
 
@@ -7305,11 +7477,11 @@ msgstr "请输入账号的类型. "
 msgid "Please enter the account's type (e.g. \"friend\")."
 msgstr "请输入账号的类型(比如\"friend\"). "
 
-#: ../lib/modules/asteriskExtension.inc:193
+#: ../lib/modules/asteriskExtension.inc:179
 msgid "Please enter the application data."
 msgstr "请输入应用数据."
 
-#: ../lib/modules/asteriskExtension.inc:192
+#: ../lib/modules/asteriskExtension.inc:178
 msgid "Please enter the application."
 msgstr "请输入应用名."
 
@@ -7317,20 +7489,19 @@ msgstr "请输入应用名."
 msgid "Please enter the automount entry (e.g. \"-fstype=nfs,rw server:/home\")."
 msgstr "请输入自动挂接条目(比如:\"-fstype=nfs,rw server:/home\")"
 
-#: ../help/help.inc:53
+#: ../help/help.inc:57
 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/asteriskAccount.inc:623
-#: ../lib/modules/asteriskExtension.inc:194
+#: ../lib/modules/asteriskAccount.inc:621
 msgid "Please enter the extension context."
 msgstr "请输入扩展的语境."
 
-#: ../lib/modules/asteriskExtension.inc:195
+#: ../lib/modules/asteriskExtension.inc:181
 msgid "Please enter the extension name."
 msgstr "请输入扩展的名字."
 
-#: ../lib/modules/asteriskAccount.inc:626
+#: ../lib/modules/asteriskAccount.inc:624
 msgid "Please enter the host name."
 msgstr "请输入主机名."
 
@@ -7350,7 +7521,7 @@ msgstr "请输入映射条目(比如:\"-fstype=nfs,rw server:/projects\")"
 msgid "Please enter the mapping name for this entry (e.g. auto.home)."
 msgstr "请输入本条目的映射名(比如:auto.home)."
 
-#: ../help/help.inc:131
+#: ../help/help.inc:137
 msgid "Please enter the master configuration password. This is NOT your LDAP password. It is stored in your config.cfg file. If this is the first time you log in, enter \"lam\"."
 msgstr "请输入本系统管理配置密码,不是LDAP密码,存在在config.cfg文件中,如果第一次登录,请输入\"lam\"."
 
@@ -7358,11 +7529,11 @@ msgstr "请输入本系统管理配置密码,不是LDAP密码,存在在config.cf
 msgid "Please enter the master password to change the general preferences:"
 msgstr "更改一般配置,请输入管理密码:"
 
-#: ../help/help.inc:119
+#: ../help/help.inc:125
 msgid "Please enter the name of the new profile and the password to change its settings. Profile names may contain letters, numbers and -/_."
 msgstr "请输入新配置文件名和密码.配置文件名可以包含字符和-/_ ."
 
-#: ../help/help.inc:121
+#: ../help/help.inc:127
 msgid "Please enter the new name of the profile. The name may contain letters, numbers and -/_."
 msgstr "請輸入新的設定檔名稱.可以包含字母,數字和 -/_ ."
 
@@ -7375,7 +7546,7 @@ msgstr "请输入管理DN的密码.请注意密码将在自助服务配置中以
 msgid "Please enter the password which you want to set for this account."
 msgstr "请输入这个帐号的密码."
 
-#: ../help/help.inc:161
+#: ../help/help.inc:167
 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个字符长的随机密码,显示在屏幕上."
 
@@ -7395,7 +7566,7 @@ msgstr "请输入加密连接的端口号"
 msgid "Please enter the possible security questions for the password self reset."
 msgstr "请为密码复位设置安全提问."
 
-#: ../lib/modules/asteriskExtension.inc:196
+#: ../lib/modules/asteriskExtension.inc:183
 msgid "Please enter the priority."
 msgstr "请输入优先级."
 
@@ -7411,7 +7582,7 @@ msgstr "请输入本挂接点的配额设置.语法为:(软块限制},{硬块限
 msgid "Please enter the quota settings for this user. The syntax is: {mount point},{soft block limit},{hard block limit},{soft inode limit},{hard inode limit}."
 msgstr "请输入本用户的配额设置.语法为:{装配点},{软块限制},{硬块限制},{软件节点限制},{硬节点限制}."
 
-#: ../templates/lists/changePassword.php:324
+#: ../templates/lists/changePassword.php:343
 #: ../lib/modules/posixAccount.inc:83
 msgid "Please enter the same password in both password fields."
 msgstr "在两个密码输入框请输入相同的密码."
@@ -7445,19 +7616,19 @@ msgstr "请先填写DHCP设置"
 msgid "Please go back and try again."
 msgstr "请返回重试."
 
-#: ../templates/masscreate.php:232
+#: ../templates/masscreate.php:234
 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格式文件.第一行必须为栏目标识,以下每行表示一个帐号."
 
-#: ../templates/massBuildAccounts.php:210
+#: ../templates/massBuildAccounts.php:233
 msgid "Please provide a file to upload."
 msgstr "请提供上传的文件。"
 
-#: ../lib/modules/inetOrgPerson.inc:654
+#: ../lib/modules/inetOrgPerson.inc:710
 msgid "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr "请选择图像文件上传,必须是JPG格式(.jpg/.jpeg)."
 
-#: ../help/help.inc:137
+#: ../help/help.inc:143
 msgid "Please select your prefered log level. Messages with a lower level will not be logged."
 msgstr "请选择日志等级,在此等级以下的日志不会被记录."
 
@@ -7465,18 +7636,18 @@ msgstr "请选择日志等级,在此等级以下的日志不会被记录."
 msgid "Please set the voicemail password with \"Set password\" before saving."
 msgstr "在保存前请设置语音邮件的密码."
 
-#: ../lib/modules.inc:819
+#: ../lib/modules.inc:822
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "请在页面%s上输入必须的属性."
 
-#: ../templates/config/profmanage.php:186
-#: ../templates/selfService/profManage.php:144
+#: ../templates/config/profmanage.php:191
+#: ../templates/selfService/profManage.php:152
 msgid "Please set up your master configuration file (config/config.cfg) first!"
 msgstr "请先主配置文件(config/config.cfg)!"
 
-#: ../lib/modules/dhcp_settings.inc:507
-#: ../lib/modules/ddns.inc:336
+#: ../lib/modules/dhcp_settings.inc:519
+#: ../lib/modules/ddns.inc:346
 msgid "Please set your LDAP suffix to an LDAP entry with object class \"dhcpServer\"."
 msgstr "请在您的LDAP后缀中设置一个含对象类\"dhcpServer\"."
 
@@ -7484,6 +7655,11 @@ msgstr "请在您的LDAP后缀中设置一个含对象类\"dhcpServer\"."
 msgid "Please wait"
 msgstr "请稍等"
 
+#: ../lib/types/ppolicyType.inc:143
+#, php-format
+msgid "Policy count: %s"
+msgstr "策略总计: %s"
+
 #: ../lib/modules/kolabUser.inc:230
 msgid "Policy list has invalid format!"
 msgstr "策略列表含有非法格式!"
@@ -7491,9 +7667,9 @@ msgstr "策略列表含有非法格式!"
 #: ../lib/modules/asteriskAccount.inc:170
 #: ../lib/modules/asteriskAccount.inc:275
 #: ../lib/modules/asteriskAccount.inc:345
-#: ../lib/modules/asteriskAccount.inc:500
-#: ../lib/modules/asteriskAccount.inc:827
-#: ../lib/modules/asteriskAccount.inc:1235
+#: ../lib/modules/asteriskAccount.inc:498
+#: ../lib/modules/asteriskAccount.inc:821
+#: ../lib/modules/asteriskAccount.inc:1233
 msgid "Port"
 msgstr "端口"
 
@@ -7508,8 +7684,8 @@ msgstr "端口号"
 msgid "Position"
 msgstr "位置"
 
-#: ../templates/masscreate.php:276
-#: ../templates/masscreate.php:351
+#: ../templates/masscreate.php:296
+#: ../templates/masscreate.php:371
 #: ../lib/modules/customScripts.inc:112
 #: ../lib/modules/customScripts.inc:114
 #: ../lib/modules/customScripts.inc:116
@@ -7519,47 +7695,49 @@ msgstr "可能的值"
 
 #: ../lib/modules/inetOrgPerson.inc:125
 #: ../lib/modules/inetOrgPerson.inc:135
-#: ../lib/modules/inetOrgPerson.inc:233
-#: ../lib/modules/inetOrgPerson.inc:396
-#: ../lib/modules/inetOrgPerson.inc:509
-#: ../lib/modules/inetOrgPerson.inc:613
-#: ../lib/modules/inetOrgPerson.inc:1077
-#: ../lib/modules/inetOrgPerson.inc:1431
-#: ../lib/modules/inetOrgPerson.inc:1959
+#: ../lib/modules/inetOrgPerson.inc:236
+#: ../lib/modules/inetOrgPerson.inc:401
+#: ../lib/modules/inetOrgPerson.inc:522
+#: ../lib/modules/inetOrgPerson.inc:637
+#: ../lib/modules/inetOrgPerson.inc:641
+#: ../lib/modules/inetOrgPerson.inc:1307
+#: ../lib/modules/inetOrgPerson.inc:2027
+#: ../lib/modules/inetOrgPerson.inc:2577
 msgid "Post office box"
 msgstr "邮政信箱"
 
 #: ../lib/modules/inetOrgPerson.inc:64
 #: ../lib/modules/inetOrgPerson.inc:124
 #: ../lib/modules/inetOrgPerson.inc:147
-#: ../lib/modules/inetOrgPerson.inc:241
-#: ../lib/modules/inetOrgPerson.inc:380
-#: ../lib/modules/inetOrgPerson.inc:521
-#: ../lib/modules/inetOrgPerson.inc:621
-#: ../lib/modules/inetOrgPerson.inc:1104
-#: ../lib/modules/inetOrgPerson.inc:1433
-#: ../lib/modules/inetOrgPerson.inc:1938
+#: ../lib/modules/inetOrgPerson.inc:244
+#: ../lib/modules/inetOrgPerson.inc:385
+#: ../lib/modules/inetOrgPerson.inc:534
+#: ../lib/modules/inetOrgPerson.inc:653
+#: ../lib/modules/inetOrgPerson.inc:1413
+#: ../lib/modules/inetOrgPerson.inc:2029
+#: ../lib/modules/inetOrgPerson.inc:2556
 msgid "Postal address"
 msgstr "邮政地址"
 
-#: ../lib/modules/inetOrgPerson.inc:622
+#: ../lib/modules/inetOrgPerson.inc:654
 msgid "Postal address, city"
 msgstr "邮政地址,城市"
 
 #: ../lib/modules/inetOrgPerson.inc:68
 #: ../lib/modules/inetOrgPerson.inc:125
 #: ../lib/modules/inetOrgPerson.inc:138
-#: ../lib/modules/inetOrgPerson.inc:235
-#: ../lib/modules/inetOrgPerson.inc:372
-#: ../lib/modules/inetOrgPerson.inc:512
-#: ../lib/modules/inetOrgPerson.inc:617
-#: ../lib/modules/inetOrgPerson.inc:1082
-#: ../lib/modules/inetOrgPerson.inc:1432
-#: ../lib/modules/inetOrgPerson.inc:1952
+#: ../lib/modules/inetOrgPerson.inc:238
+#: ../lib/modules/inetOrgPerson.inc:377
+#: ../lib/modules/inetOrgPerson.inc:525
+#: ../lib/modules/inetOrgPerson.inc:645
+#: ../lib/modules/inetOrgPerson.inc:649
+#: ../lib/modules/inetOrgPerson.inc:1333
+#: ../lib/modules/inetOrgPerson.inc:2028
+#: ../lib/modules/inetOrgPerson.inc:2570
 msgid "Postal code"
 msgstr "邮政编码"
 
-#: ../help/help.inc:83
+#: ../help/help.inc:87
 msgid "Predefined values"
 msgstr "预订值"
 
@@ -7568,7 +7746,7 @@ msgstr "预订值"
 msgid "Prefix for mailboxes"
 msgstr "邮箱前缀"
 
-#: ../lib/modules/inetOrgPerson.inc:326
+#: ../lib/modules/inetOrgPerson.inc:331
 msgid "President"
 msgstr "总裁"
 
@@ -7580,17 +7758,16 @@ msgstr "总裁"
 msgid "Primary affiliation"
 msgstr "主要联系"
 
-#: ../lib/modules/posixGroup.inc:488
 #: ../lib/modules/posixAccount.inc:216
 #: ../lib/modules/posixAccount.inc:298
 #: ../lib/modules/posixAccount.inc:317
 #: ../lib/modules/posixAccount.inc:350
 #: ../lib/modules/posixAccount.inc:379
 #: ../lib/modules/posixAccount.inc:417
-#: ../lib/modules/posixAccount.inc:1103
-#: ../lib/modules/posixAccount.inc:1361
-#: ../lib/modules/posixAccount.inc:1407
-#: ../lib/modules/posixAccount.inc:1465
+#: ../lib/modules/posixAccount.inc:1106
+#: ../lib/modules/posixAccount.inc:1367
+#: ../lib/modules/posixAccount.inc:1413
+#: ../lib/modules/posixAccount.inc:1471
 msgid "Primary group"
 msgstr "主要组"
 
@@ -7616,24 +7793,19 @@ msgstr "主要的名字"
 msgid "Principal name is invalid!"
 msgstr "主要的名字非法!"
 
-#: ../lib/types/asteriskExt.inc:94
-#: ../lib/modules/asteriskExtension.inc:90
-#: ../lib/modules/asteriskExtension.inc:113
-#: ../lib/modules/asteriskExtension.inc:126
-#: ../lib/modules/asteriskExtension.inc:142
-#: ../lib/modules/asteriskExtension.inc:237
-#: ../lib/modules/asteriskExtension.inc:478
+#: ../lib/modules/asteriskExtension.inc:98
+#: ../lib/modules/asteriskExtension.inc:811
 msgid "Priority"
 msgstr "优先级"
 
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1537
 #: ../templates/3rdParty/pla/htdocs/import_form.php:44
-#: ../templates/3rdParty/pla/htdocs/export_form.php:138
+#: ../templates/3rdParty/pla/htdocs/export_form.php:135
 msgid "Proceed"
 msgstr "处理完毕"
 
-#: ../templates/config/profmanage.php:148
-#: ../templates/selfService/profManage.php:127
+#: ../templates/config/profmanage.php:106
+#: ../templates/selfService/profManage.php:85
 msgid "Profile deleted."
 msgstr "配置文件被删除."
 
@@ -7643,43 +7815,47 @@ msgstr "配置文件被删除."
 msgid "Profile editor"
 msgstr "配置文件编辑器"
 
-#: ../templates/config/profmanage.php:52
-#: ../templates/config/profmanage.php:199
-#: ../templates/selfService/profManage.php:38
-#: ../templates/selfService/profManage.php:157
-#: ../help/help.inc:118
-#: ../help/help.inc:120
-#: ../help/help.inc:122
+#: ../templates/config/profmanage.php:138
+#: ../templates/config/profmanage.php:218
+#: ../templates/selfService/profManage.php:101
+#: ../templates/selfService/profManage.php:200
 #: ../help/help.inc:124
 #: ../help/help.inc:126
+#: ../help/help.inc:128
+#: ../help/help.inc:130
+#: ../help/help.inc:132
 msgid "Profile management"
 msgstr "配置文件管理"
 
-#: ../templates/config/profmanage.php:214
-#: ../templates/config/profmanage.php:263
-#: ../templates/selfService/profManage.php:172
-#: ../templates/selfService/profManage.php:225
+#: ../templates/config/profmanage.php:222
+#: ../templates/config/profmanage.php:241
+#: ../templates/config/profmanage.php:253
+#: ../templates/config/profmanage.php:262
+#: ../templates/config/profmanage.php:281
+#: ../templates/selfService/profManage.php:204
+#: ../templates/selfService/profManage.php:218
+#: ../templates/selfService/profManage.php:234
 #: ../templates/profedit/profiledelete.php:85
 #: ../templates/profedit/profilepage.php:175
 #: ../templates/profedit/profilemain.php:174
-#: ../help/help.inc:150
+#: ../help/help.inc:156
 msgid "Profile name"
 msgstr "配置文件名"
 
-#: ../templates/config/profmanage.php:128
-#: ../templates/config/profmanage.php:143
-#: ../templates/selfService/profManage.php:103
-#: ../templates/selfService/profManage.php:118
+#: ../templates/config/profmanage.php:86
+#: ../templates/config/profmanage.php:101
+#: ../templates/selfService/profManage.php:61
+#: ../templates/selfService/profManage.php:76
 msgid "Profile name is invalid!"
 msgstr "配置文件名非法!"
 
-#: ../templates/config/profmanage.php:227
-#: ../templates/config/profmanage.php:321
+#: ../templates/config/profmanage.php:225
+#: ../templates/config/profmanage.php:263
 msgid "Profile password"
 msgstr "配置文件密码"
 
-#: ../templates/config/profmanage.php:126
-#: ../templates/config/profmanage.php:161
+#: ../templates/config/profmanage.php:84
+#: ../templates/config/profmanage.php:119
 msgid "Profile passwords are different or empty!"
 msgstr "配置文件密码不同或为空!"
 
@@ -7691,11 +7867,11 @@ msgstr "配置文件密码不同或为空!"
 #: ../lib/modules/sambaSamAccount.inc:335
 #: ../lib/modules/sambaSamAccount.inc:477
 #: ../lib/modules/sambaSamAccount.inc:573
-#: ../lib/modules/sambaSamAccount.inc:1141
-#: ../lib/modules/sambaSamAccount.inc:1414
-#: ../lib/modules/sambaSamAccount.inc:1515
-#: ../lib/modules/sambaSamAccount.inc:1669
-#: ../lib/modules/sambaSamAccount.inc:1691
+#: ../lib/modules/sambaSamAccount.inc:1165
+#: ../lib/modules/sambaSamAccount.inc:1441
+#: ../lib/modules/sambaSamAccount.inc:1542
+#: ../lib/modules/sambaSamAccount.inc:1696
+#: ../lib/modules/sambaSamAccount.inc:1718
 msgid "Profile path"
 msgstr "配置文件路径"
 
@@ -7719,28 +7895,28 @@ msgstr "公用存储"
 #: ../lib/modules/asteriskAccount.inc:174
 #: ../lib/modules/asteriskAccount.inc:277
 #: ../lib/modules/asteriskAccount.inc:346
-#: ../lib/modules/asteriskAccount.inc:507
-#: ../lib/modules/asteriskAccount.inc:837
-#: ../lib/modules/asteriskAccount.inc:1238
+#: ../lib/modules/asteriskAccount.inc:505
+#: ../lib/modules/asteriskAccount.inc:831
+#: ../lib/modules/asteriskAccount.inc:1236
 msgid "Qualify"
 msgstr "合格"
 
 #: ../lib/modules/passwordSelfReset.inc:61
-#: ../lib/modules/passwordSelfReset.inc:99
-#: ../lib/modules/passwordSelfReset.inc:106
-#: ../lib/modules/passwordSelfReset.inc:119
-#: ../lib/modules/passwordSelfReset.inc:153
-#: ../lib/modules/passwordSelfReset.inc:189
-#: ../lib/modules/passwordSelfReset.inc:298
-#: ../lib/modules/passwordSelfReset.inc:437
-#: ../lib/modules/passwordSelfReset.inc:666
+#: ../lib/modules/passwordSelfReset.inc:131
+#: ../lib/modules/passwordSelfReset.inc:138
+#: ../lib/modules/passwordSelfReset.inc:151
+#: ../lib/modules/passwordSelfReset.inc:222
+#: ../lib/modules/passwordSelfReset.inc:258
+#: ../lib/modules/passwordSelfReset.inc:368
+#: ../lib/modules/passwordSelfReset.inc:511
+#: ../lib/modules/passwordSelfReset.inc:786
 msgid "Question"
 msgstr "提问"
 
 #: ../lib/modules/quota.inc:79
 #: ../lib/modules/quota.inc:92
 #: ../lib/modules/quota.inc:145
-#: ../lib/modules/zarafaUser.inc:459
+#: ../lib/modules/zarafaUser.inc:482
 #: ../lib/modules/systemQuotas.inc:51
 #: ../lib/modules/systemQuotas.inc:61
 #: ../lib/modules/systemQuotas.inc:68
@@ -7751,19 +7927,19 @@ msgstr "提问"
 msgid "Quota"
 msgstr "配额"
 
-#: ../lib/modules/quota.inc:684
+#: ../lib/modules/quota.inc:687
 #, php-format
 msgid "Quota for %s on %s"
 msgstr "%s 在 %s 的硬盘配额:"
 
-#: ../lib/modules/zarafaUser.inc:84
-#: ../lib/modules/zarafaUser.inc:160
-#: ../lib/modules/zarafaUser.inc:237
-#: ../lib/modules/zarafaUser.inc:351
-#: ../lib/modules/zarafaUser.inc:390
-#: ../lib/modules/zarafaUser.inc:494
-#: ../lib/modules/zarafaUser.inc:1195
-#: ../lib/modules/zarafaUser.inc:1291
+#: ../lib/modules/zarafaUser.inc:85
+#: ../lib/modules/zarafaUser.inc:170
+#: ../lib/modules/zarafaUser.inc:249
+#: ../lib/modules/zarafaUser.inc:371
+#: ../lib/modules/zarafaUser.inc:413
+#: ../lib/modules/zarafaUser.inc:517
+#: ../lib/modules/zarafaUser.inc:1286
+#: ../lib/modules/zarafaUser.inc:1388
 msgid "Quota hard limit"
 msgstr "硬限额."
 
@@ -7776,42 +7952,42 @@ msgstr "磁盘配额格式错误!"
 msgid "Quota limit (kB)"
 msgstr "限额(kB)."
 
-#: ../lib/modules/zarafaUser.inc:72
-#: ../lib/modules/zarafaUser.inc:154
-#: ../lib/modules/zarafaUser.inc:211
-#: ../lib/modules/zarafaUser.inc:342
-#: ../lib/modules/zarafaUser.inc:466
-#: ../lib/modules/zarafaUser.inc:1177
-#: ../lib/modules/zarafaUser.inc:1282
+#: ../lib/modules/zarafaUser.inc:73
+#: ../lib/modules/zarafaUser.inc:164
+#: ../lib/modules/zarafaUser.inc:223
+#: ../lib/modules/zarafaUser.inc:362
+#: ../lib/modules/zarafaUser.inc:489
+#: ../lib/modules/zarafaUser.inc:1268
+#: ../lib/modules/zarafaUser.inc:1379
 msgid "Quota override"
 msgstr "限制覆盖"
 
-#: ../lib/modules/zarafaUser.inc:80
-#: ../lib/modules/zarafaUser.inc:158
-#: ../lib/modules/zarafaUser.inc:229
-#: ../lib/modules/zarafaUser.inc:348
-#: ../lib/modules/zarafaUser.inc:388
-#: ../lib/modules/zarafaUser.inc:484
-#: ../lib/modules/zarafaUser.inc:1189
-#: ../lib/modules/zarafaUser.inc:1288
+#: ../lib/modules/zarafaUser.inc:81
+#: ../lib/modules/zarafaUser.inc:168
+#: ../lib/modules/zarafaUser.inc:241
+#: ../lib/modules/zarafaUser.inc:368
+#: ../lib/modules/zarafaUser.inc:411
+#: ../lib/modules/zarafaUser.inc:507
+#: ../lib/modules/zarafaUser.inc:1280
+#: ../lib/modules/zarafaUser.inc:1385
 msgid "Quota soft limit"
 msgstr "软限额"
 
-#: ../lib/modules/zarafaUser.inc:76
-#: ../lib/modules/zarafaUser.inc:156
-#: ../lib/modules/zarafaUser.inc:221
-#: ../lib/modules/zarafaUser.inc:345
-#: ../lib/modules/zarafaUser.inc:386
-#: ../lib/modules/zarafaUser.inc:474
-#: ../lib/modules/zarafaUser.inc:1183
-#: ../lib/modules/zarafaUser.inc:1285
+#: ../lib/modules/zarafaUser.inc:77
+#: ../lib/modules/zarafaUser.inc:166
+#: ../lib/modules/zarafaUser.inc:233
+#: ../lib/modules/zarafaUser.inc:365
+#: ../lib/modules/zarafaUser.inc:409
+#: ../lib/modules/zarafaUser.inc:497
+#: ../lib/modules/zarafaUser.inc:1274
+#: ../lib/modules/zarafaUser.inc:1382
 msgid "Quota warning limit"
 msgstr "限制告警点."
 
-#: ../templates/masscreate.php:300
+#: ../templates/masscreate.php:320
 #: ../templates/profedit/profilepage.php:202
-#: ../lib/modules.inc:926
-#: ../help/help.inc:148
+#: ../lib/modules.inc:935
+#: ../help/help.inc:154
 msgid "RDN identifier"
 msgstr "RDN标志"
 
@@ -7835,18 +8011,18 @@ msgstr "RID设置"
 #: ../lib/modules/asteriskAccount.inc:186
 #: ../lib/modules/asteriskAccount.inc:283
 #: ../lib/modules/asteriskAccount.inc:349
-#: ../lib/modules/asteriskAccount.inc:529
-#: ../lib/modules/asteriskAccount.inc:865
-#: ../lib/modules/asteriskAccount.inc:1247
+#: ../lib/modules/asteriskAccount.inc:527
+#: ../lib/modules/asteriskAccount.inc:859
+#: ../lib/modules/asteriskAccount.inc:1245
 msgid "RTP hold timeout"
 msgstr "RTP保持超时"
 
 #: ../lib/modules/asteriskAccount.inc:182
 #: ../lib/modules/asteriskAccount.inc:281
 #: ../lib/modules/asteriskAccount.inc:348
-#: ../lib/modules/asteriskAccount.inc:522
-#: ../lib/modules/asteriskAccount.inc:855
-#: ../lib/modules/asteriskAccount.inc:1244
+#: ../lib/modules/asteriskAccount.inc:520
+#: ../lib/modules/asteriskAccount.inc:849
+#: ../lib/modules/asteriskAccount.inc:1242
 msgid "RTP timeout"
 msgstr "RTP超时"
 
@@ -7867,11 +8043,11 @@ msgstr "范围到"
 msgid "Ranges"
 msgstr "范围"
 
-#: ../templates/config/confmain.php:288
+#: ../templates/config/confmain.php:292
 msgid "Read"
 msgstr "读"
 
-#: ../templates/config/confmain.php:244
+#: ../templates/config/confmain.php:248
 msgid "Read only"
 msgstr "只读"
 
@@ -7886,6 +8062,7 @@ msgstr "确定删除这些属性的值?"
 #: ../lib/modules/freeRadius.inc:223
 #: ../lib/modules/freeRadius.inc:269
 #: ../lib/modules/freeRadius.inc:622
+#: ../lib/modules/heimdalKerberos.inc:68
 msgid "Realm"
 msgstr "域"
 
@@ -7909,8 +8086,8 @@ msgstr "收件人列表"
 
 #: ../lib/modules/sambaSamAccount.inc:226
 #: ../lib/modules/sambaSamAccount.inc:365
-#: ../lib/modules/sambaSamAccount.inc:1463
-#: ../lib/modules/sambaSamAccount.inc:1743
+#: ../lib/modules/sambaSamAccount.inc:1490
+#: ../lib/modules/sambaSamAccount.inc:1770
 msgid "Reconnect if disconnected"
 msgstr "如果中断重新连接"
 
@@ -7930,20 +8107,14 @@ msgstr "递归删除过程"
 msgid "Recursively copy all children of this object as well."
 msgstr "此对象的所有子集递归拷贝完毕"
 
+#: ../templates/config/profmanage.php:229
+#: ../templates/config/profmanage.php:267
 #: ../templates/config/mainmanage.php:242
-msgid "Reenter new master password"
-msgstr "请重新输入管理密码"
-
-#: ../templates/config/confmain.php:367
-#: ../lib/modules/posixAccount.inc:2073
+#: ../templates/config/confmain.php:377
+#: ../lib/modules/posixAccount.inc:2084
 msgid "Reenter password"
 msgstr "再次输入密码"
 
-#: ../templates/config/profmanage.php:236
-#: ../templates/config/profmanage.php:334
-msgid "Reenter profile password"
-msgstr "再次输入配置文件密码"
-
 #: ../templates/serverInfo.php:185
 msgid "Referrals"
 msgstr "转交"
@@ -7955,7 +8126,7 @@ msgstr "转交"
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:249
 #: ../lib/types/automountType.inc:233
 #: ../lib/types/dhcp.inc:276
-#: ../lib/modules/asteriskExtension.inc:301
+#: ../lib/modules/asteriskExtension.inc:439
 #: ../lib/lists.inc:713
 msgid "Refresh"
 msgstr "刷新"
@@ -7972,44 +8143,44 @@ msgstr "树刷新中"
 #: ../lib/modules/inetOrgPerson.inc:66
 #: ../lib/modules/inetOrgPerson.inc:124
 #: ../lib/modules/inetOrgPerson.inc:150
-#: ../lib/modules/inetOrgPerson.inc:243
-#: ../lib/modules/inetOrgPerson.inc:388
-#: ../lib/modules/inetOrgPerson.inc:524
-#: ../lib/modules/inetOrgPerson.inc:625
-#: ../lib/modules/inetOrgPerson.inc:1132
-#: ../lib/modules/inetOrgPerson.inc:1434
-#: ../lib/modules/inetOrgPerson.inc:1945
+#: ../lib/modules/inetOrgPerson.inc:246
+#: ../lib/modules/inetOrgPerson.inc:393
+#: ../lib/modules/inetOrgPerson.inc:537
+#: ../lib/modules/inetOrgPerson.inc:657
+#: ../lib/modules/inetOrgPerson.inc:1441
+#: ../lib/modules/inetOrgPerson.inc:2030
+#: ../lib/modules/inetOrgPerson.inc:2563
 msgid "Registered address"
 msgstr "注册地址"
 
-#: ../lib/modules/inetOrgPerson.inc:626
+#: ../lib/modules/inetOrgPerson.inc:658
 msgid "Registered address, city"
 msgstr "注册地址,城市"
 
 #: ../lib/modules/asteriskAccount.inc:206
 #: ../lib/modules/asteriskAccount.inc:293
 #: ../lib/modules/asteriskAccount.inc:354
-#: ../lib/modules/asteriskAccount.inc:565
-#: ../lib/modules/asteriskAccount.inc:911
-#: ../lib/modules/asteriskAccount.inc:1262
+#: ../lib/modules/asteriskAccount.inc:563
+#: ../lib/modules/asteriskAccount.inc:905
+#: ../lib/modules/asteriskAccount.inc:1260
 msgid "Registration context"
 msgstr "注册语境"
 
 #: ../lib/modules/asteriskAccount.inc:210
 #: ../lib/modules/asteriskAccount.inc:295
 #: ../lib/modules/asteriskAccount.inc:355
-#: ../lib/modules/asteriskAccount.inc:572
-#: ../lib/modules/asteriskAccount.inc:920
-#: ../lib/modules/asteriskAccount.inc:1265
+#: ../lib/modules/asteriskAccount.inc:570
+#: ../lib/modules/asteriskAccount.inc:914
+#: ../lib/modules/asteriskAccount.inc:1263
 msgid "Registration extension"
 msgstr "注册扩展"
 
 #: ../lib/modules/asteriskAccount.inc:226
 #: ../lib/modules/asteriskAccount.inc:303
 #: ../lib/modules/asteriskAccount.inc:359
-#: ../lib/modules/asteriskAccount.inc:601
-#: ../lib/modules/asteriskAccount.inc:960
-#: ../lib/modules/asteriskAccount.inc:1277
+#: ../lib/modules/asteriskAccount.inc:599
+#: ../lib/modules/asteriskAccount.inc:954
+#: ../lib/modules/asteriskAccount.inc:1275
 msgid "Registration server"
 msgstr "注册服务器"
 
@@ -8023,10 +8194,9 @@ msgstr "重新载入"
 
 #: ../templates/config/confmodules.php:291
 #: ../templates/pdfedit/pdfpage.php:461
-#: ../lib/modules/sambaSamAccount.inc:1382
-#: ../lib/modules/kolabUser.inc:900
-#: ../lib/modules/phpGroupwareUser.inc:259
-#: ../lib/modules/shadowAccount.inc:430
+#: ../lib/modules/sambaSamAccount.inc:1409
+#: ../lib/modules/kolabUser.inc:904
+#: ../lib/modules/shadowAccount.inc:443
 #: ../lib/modules/freeRadius.inc:475
 #: ../lib/modules/sudoRole.inc:266
 #: ../lib/modules/sudoRole.inc:293
@@ -8034,6 +8204,7 @@ msgstr "重新载入"
 #: ../lib/modules/sudoRole.inc:347
 #: ../lib/modules/sudoRole.inc:374
 #: ../lib/modules/sudoRole.inc:401
+#: ../lib/modules/heimdalKerberos.inc:401
 msgid "Remove"
 msgstr "删除"
 
@@ -8041,7 +8212,7 @@ msgstr "删除"
 msgid "Remove Asterisk voicemail extension"
 msgstr "删除Asterisk语音邮件扩展"
 
-#: ../lib/modules/authorizedServiceObject.inc:175
+#: ../lib/modules/authorizedServiceObject.inc:176
 msgid "Remove Authorized Service extension"
 msgstr "删除授权服务扩展"
 
@@ -8057,7 +8228,11 @@ msgstr "删除FreeRadius扩展"
 msgid "Remove IP address extension"
 msgstr "删除 IP 地址扩展"
 
-#: ../lib/modules/sambaSamAccount.inc:1218
+#: ../lib/modules/heimdalKerberos.inc:266
+msgid "Remove Kerberos extension"
+msgstr "删除Kerberos扩展"
+
+#: ../lib/modules/sambaSamAccount.inc:1242
 msgid "Remove Samba 3 extension"
 msgstr "删除 Samba 3 扩展"
 
@@ -8065,8 +8240,9 @@ msgstr "删除 Samba 3 扩展"
 msgid "Remove Shadow account extension"
 msgstr "删除 Shadow 帐号扩展"
 
-#: ../lib/modules/zarafaGroup.inc:206
-#: ../lib/modules/zarafaUser.inc:613
+#: ../lib/modules/zarafaContact.inc:228
+#: ../lib/modules/zarafaGroup.inc:275
+#: ../lib/modules/zarafaUser.inc:656
 #: ../lib/modules/zarafaServer.inc:171
 msgid "Remove Zarafa extension"
 msgstr "删除Zarafa扩展"
@@ -8075,24 +8251,22 @@ msgstr "删除Zarafa扩展"
 msgid "Remove host extension"
 msgstr "删除主机扩展"
 
-#: ../lib/modules/posixGroup.inc:202
-#: ../lib/modules/posixAccount.inc:1158
-#: ../lib/modules/inetOrgPerson.inc:1258
+#: ../lib/modules/posixGroup.inc:212
+#: ../lib/modules/posixAccount.inc:1161
+#: ../lib/modules/inetOrgPerson.inc:1746
 msgid "Remove password"
 msgstr "删除密码"
 
-#: ../lib/modules/passwordSelfReset.inc:207
+#: ../lib/modules/passwordSelfReset.inc:276
 msgid "Remove password self reset extension"
 msgstr "删除密码自助复位扩展"
 
-#: ../lib/modules/phpGroupwareGroup.inc:100
-#: ../lib/modules/phpGroupwareUser.inc:186
-msgid "Remove phpGroupWare extension"
-msgstr "删除 phpGroupWare 扩展"
-
 #: ../templates/3rdParty/pla/htdocs/modify_member_form.php:147
+#: ../lib/modules/zarafaContact.inc:386
+#: ../lib/modules/zarafaGroup.inc:442
 #: ../lib/modules/device.inc:278
-#: ../lib/modules/zarafaUser.inc:860
+#: ../lib/modules/zarafaUser.inc:903
+#: ../lib/modules/inetOrgPerson.inc:1869
 #: ../lib/modules/groupOfNames.inc:300
 #: ../lib/modules/groupOfNames.inc:412
 msgid "Remove selected entries"
@@ -8102,10 +8276,12 @@ msgstr "删除所选条目"
 msgid "Remove this account type"
 msgstr "删除这个帐号类型"
 
-#: ../lib/modules/inetOrgPerson.inc:2014
+#: ../lib/modules/inetOrgPerson.inc:2632
 msgid "Remove/replace photo"
 msgstr "删除/更改照片"
 
+#: ../templates/config/profmanage.php:245
+#: ../templates/selfService/profManage.php:226
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1152
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1153
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1155
@@ -8121,9 +8297,11 @@ msgstr "重命名"
 msgid "Rename <b>%s</b> to a new object."
 msgstr "将<b>%s</b> 重新命名到新的对象"
 
-#: ../templates/config/profmanage.php:259
-#: ../templates/selfService/profManage.php:221
-#: ../help/help.inc:120
+#: ../templates/config/profmanage.php:240
+#: ../templates/config/profmanage.php:246
+#: ../templates/selfService/profManage.php:217
+#: ../templates/selfService/profManage.php:227
+#: ../help/help.inc:126
 msgid "Rename profile"
 msgstr "配置文件重命名"
 
@@ -8136,8 +8314,8 @@ msgstr "重命名操作成功!"
 msgid "Rename this entry"
 msgstr "重命名这个条目"
 
-#: ../templates/config/profmanage.php:134
-#: ../templates/selfService/profManage.php:114
+#: ../templates/config/profmanage.php:92
+#: ../templates/selfService/profManage.php:72
 msgid "Renamed profile."
 msgstr "已更名的配置文件."
 
@@ -8146,23 +8324,37 @@ msgstr "已更名的配置文件."
 msgid "Renaming"
 msgstr "重命名中"
 
-#: ../templates/lists/changePassword.php:250
-#: ../lib/modules/passwordSelfReset.inc:688
-#: ../lib/modules.inc:976
+#: ../lib/modules/heimdalKerberos.inc:84
+#: ../lib/modules/heimdalKerberos.inc:100
+#: ../lib/modules/heimdalKerberos.inc:140
+#: ../lib/modules/heimdalKerberos.inc:157
+#: ../lib/modules/heimdalKerberos.inc:239
+#: ../lib/modules/heimdalKerberos.inc:496
+msgid "Renewable lifetime"
+msgstr "可重建生命周期"
+
+#: ../lib/modules/heimdalKerberos.inc:179
+#: ../lib/modules/heimdalKerberos.inc:180
+msgid "Renewable lifetime must be a number."
+msgstr "可重建寿命必须是数字!"
+
+#: ../templates/lists/changePassword.php:267
+#: ../lib/modules/passwordSelfReset.inc:809
+#: ../lib/modules.inc:985
 msgid "Repeat password"
 msgstr "确认密码"
 
 #: ../lib/modules/posixAccount.inc:75
-#: ../lib/modules/posixAccount.inc:883
+#: ../lib/modules/posixAccount.inc:886
 msgid "Replaced $user or $group in homedir."
 msgstr "在homedir中已更改$user和$group. "
 
-#: ../templates/config/confmain.php:317
-#: ../help/help.inc:199
+#: ../templates/config/confmain.php:321
+#: ../help/help.inc:207
 msgid "Reply-to address"
 msgstr "回复地址"
 
-#: ../templates/config/confmain.php:427
+#: ../templates/config/confmain.php:440
 msgid "Reply-to address for password mails is invalid."
 msgstr "密码邮件的回复地址非法"
 
@@ -8175,24 +8367,24 @@ msgid "Require password change on first login"
 msgstr "第一次登录时需要修改密码"
 
 #: ../templates/3rdParty/pla/lib/PageRender.php:445
-msgid "Required attribute for objectClass(es)"
-msgstr "对象类的必选属性"
+msgid "Required attribute for object classes"
+msgstr "对象类的所需属性"
 
 #: ../templates/schema/schema.php:381
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1567
 msgid "Required attributes"
 msgstr "必选属性"
 
-#: ../lib/modules/sambaSamAccount.inc:1212
+#: ../lib/modules/sambaSamAccount.inc:1236
 msgid "Reset"
 msgstr "复位"
 
-#: ../lib/modules.inc:1079
+#: ../lib/modules.inc:1104
 msgid "Reset changes"
 msgstr "复位设定"
 
 #: ../lib/modules/sambaSamAccount.inc:242
-#: ../lib/modules/sambaSamAccount.inc:1211
+#: ../lib/modules/sambaSamAccount.inc:1235
 msgid "Reset password"
 msgstr "复位密码"
 
@@ -8208,16 +8400,16 @@ msgstr "在锁定后复位时间"
 msgid "Reset time after lockout must be are natural number."
 msgstr "锁定帐号后复位时间必须是自然数."
 
-#: ../lib/modules/zarafaUser.inc:501
+#: ../lib/modules/zarafaUser.inc:524
 msgid "Resource settings"
 msgstr "资源设置"
 
 #: ../lib/modules/asteriskAccount.inc:178
 #: ../lib/modules/asteriskAccount.inc:279
 #: ../lib/modules/asteriskAccount.inc:347
-#: ../lib/modules/asteriskAccount.inc:514
-#: ../lib/modules/asteriskAccount.inc:846
-#: ../lib/modules/asteriskAccount.inc:1241
+#: ../lib/modules/asteriskAccount.inc:512
+#: ../lib/modules/asteriskAccount.inc:840
+#: ../lib/modules/asteriskAccount.inc:1239
 msgid "Restrict caller ID"
 msgstr "受限拨号ID."
 
@@ -8234,16 +8426,16 @@ msgstr "受限拨号ID."
 msgid "Retrieving DN"
 msgstr "获取DN"
 
-#: ../lib/modules/ddns.inc:106
-#: ../lib/modules/ddns.inc:113
-#: ../lib/modules/ddns.inc:134
-#: ../lib/modules/ddns.inc:374
-#: ../lib/modules/ddns.inc:401
+#: ../lib/modules/ddns.inc:112
+#: ../lib/modules/ddns.inc:120
+#: ../lib/modules/ddns.inc:141
+#: ../lib/modules/ddns.inc:384
+#: ../lib/modules/ddns.inc:411
 msgid "Reverse zone names"
 msgstr "反向域名"
 
-#: ../templates/config/confmain.php:284
-#: ../help/help.inc:108
+#: ../templates/config/confmain.php:288
+#: ../help/help.inc:112
 msgid "Rights for the home directory"
 msgstr "个人目录的权限"
 
@@ -8256,19 +8448,19 @@ msgstr "个人目录的权限"
 msgid "Role name"
 msgstr "角色名"
 
-#: ../lib/modules/zarafaUser.inc:506
-#: ../lib/modules/zarafaUser.inc:1199
+#: ../lib/modules/zarafaUser.inc:529
+#: ../lib/modules/zarafaUser.inc:1290
 msgid "Room"
 msgstr "房间"
 
 #: ../lib/modules/inetOrgPerson.inc:126
-#: ../lib/modules/inetOrgPerson.inc:247
-#: ../lib/modules/inetOrgPerson.inc:444
-#: ../lib/modules/inetOrgPerson.inc:530
-#: ../lib/modules/inetOrgPerson.inc:661
-#: ../lib/modules/inetOrgPerson.inc:1158
-#: ../lib/modules/inetOrgPerson.inc:1441
-#: ../lib/modules/inetOrgPerson.inc:1966
+#: ../lib/modules/inetOrgPerson.inc:250
+#: ../lib/modules/inetOrgPerson.inc:457
+#: ../lib/modules/inetOrgPerson.inc:543
+#: ../lib/modules/inetOrgPerson.inc:721
+#: ../lib/modules/inetOrgPerson.inc:1467
+#: ../lib/modules/inetOrgPerson.inc:2037
+#: ../lib/modules/inetOrgPerson.inc:2584
 msgid "Room number"
 msgstr "房间号"
 
@@ -8280,8 +8472,13 @@ msgstr "房间号"
 msgid "Routing address"
 msgstr "邮寄地址"
 
+#: ../lib/modules/asteriskExtension.inc:131
+#: ../lib/modules/asteriskExtension.inc:303
+msgid "Rules"
+msgstr "规则"
+
 #: ../lib/types/sudo.inc:82
-msgid "Run group(s)"
+msgid "Run group"
 msgstr "运行组"
 
 #: ../lib/modules/sudoRole.inc:79
@@ -8338,8 +8535,8 @@ msgstr "SSH公钥"
 
 #: ../lib/modules/ldapPublicKey.inc:81
 #: ../lib/modules/ldapPublicKey.inc:176
-msgid "SSH public key(s)"
-msgstr "SSH 公钥"
+msgid "SSH public keys"
+msgstr "SSH公钥"
 
 #: ../lib/modules/zarafaServer.inc:65
 #: ../lib/modules/zarafaServer.inc:87
@@ -8409,27 +8606,27 @@ msgstr "Samba密码"
 #: ../lib/modules/sambaSamAccount.inc:295
 #: ../lib/modules/sambaSamAccount.inc:493
 #: ../lib/modules/sambaSamAccount.inc:577
-#: ../lib/modules/sambaSamAccount.inc:1152
-#: ../lib/modules/sambaSamAccount.inc:1523
-#: ../lib/modules/sambaSamAccount.inc:1672
+#: ../lib/modules/sambaSamAccount.inc:1176
+#: ../lib/modules/sambaSamAccount.inc:1550
+#: ../lib/modules/sambaSamAccount.inc:1699
 msgid "Samba workstations"
 msgstr "Samba工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:1288
+#: ../lib/modules/sambaSamAccount.inc:1312
 msgid "Saturday"
 msgstr "星期六"
 
 #: ../templates/config/confmodules.php:215
-#: ../templates/config/confmain.php:381
+#: ../templates/config/confmain.php:391
 #: ../templates/config/moduleSettings.php:226
 #: ../templates/config/conftypes.php:277
-#: ../templates/selfService/selfServiceMain.php:352
-#: ../templates/selfService/adminMain.php:543
+#: ../templates/selfService/selfServiceMain.php:349
+#: ../templates/selfService/adminMain.php:566
 #: ../templates/pdfedit/pdfpage.php:583
 #: ../templates/profedit/profilepage.php:227
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1243
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1247
-#: ../lib/modules.inc:1076
+#: ../lib/modules.inc:1101
 msgid "Save"
 msgstr "保存"
 
@@ -8473,23 +8670,23 @@ msgstr "Schema测试"
 msgid "Scoped affiliation"
 msgstr "联系范围"
 
-#: ../help/help.inc:93
+#: ../help/help.inc:97
 msgid "Script path"
 msgstr "脚本路径"
 
-#: ../templates/config/confmain.php:464
+#: ../templates/config/confmain.php:481
 msgid "Script path is invalid!"
 msgstr "脚本路径非法!"
 
-#: ../templates/config/confmain.php:483
+#: ../templates/config/confmain.php:500
 msgid "Script rights are invalid!"
 msgstr "脚本权限非法!"
 
-#: ../templates/config/confmain.php:467
+#: ../templates/config/confmain.php:484
 msgid "Script server is invalid!"
 msgstr "脚本服务器非法!"
 
-#: ../help/help.inc:104
+#: ../help/help.inc:108
 msgid "Script servers"
 msgstr "脚本服务器"
 
@@ -8513,7 +8710,7 @@ msgstr "搜索结果"
 msgid "Search filter"
 msgstr "搜索过滤器"
 
-#: ../templates/3rdParty/pla/lib/QueryRender.php:294
+#: ../templates/3rdParty/pla/lib/QueryRender.php:293
 msgid "Search returned no results"
 msgstr "搜索无结果"
 
@@ -8523,7 +8720,7 @@ msgstr "搜索无结果"
 msgid "Search scope"
 msgstr "搜索范围"
 
-#: ../lib/modules/asteriskExtension.inc:304
+#: ../lib/modules/asteriskExtension.inc:442
 msgid "Search tree suffix for users"
 msgstr "查询用户的树后缀"
 
@@ -8541,29 +8738,29 @@ msgid "Security error: The file being uploaded may be malicious."
 msgstr "安全错误:正在上传的文件可能有错误."
 
 #: ../lib/modules/zarafaGroup.inc:71
-#: ../lib/modules/zarafaGroup.inc:99
-#: ../lib/modules/zarafaGroup.inc:128
-#: ../lib/modules/zarafaGroup.inc:185
-#: ../lib/modules/zarafaGroup.inc:423
+#: ../lib/modules/zarafaGroup.inc:138
+#: ../lib/modules/zarafaGroup.inc:175
+#: ../lib/modules/zarafaGroup.inc:254
+#: ../lib/modules/zarafaGroup.inc:636
 msgid "Security group"
 msgstr "安全组"
 
 #: ../lib/modules/passwordSelfReset.inc:65
-#: ../lib/modules/passwordSelfReset.inc:124
-#: ../lib/modules/passwordSelfReset.inc:148
+#: ../lib/modules/passwordSelfReset.inc:156
+#: ../lib/modules/passwordSelfReset.inc:182
 msgid "Security questions"
 msgstr "安全提问"
 
 #: ../templates/config/mainmanage.php:195
-#: ../templates/config/confmain.php:371
+#: ../templates/config/confmain.php:381
 msgid "Security settings"
 msgstr "安全设定"
 
-#: ../templates/help.php:91
+#: ../templates/help.php:94
 msgid "See also"
 msgstr "同时参考"
 
-#: ../lib/account.inc:675
+#: ../lib/account.inc:678
 msgid "See the manual for instructions to solve this problem."
 msgstr "参考手册来解决本问题."
 
@@ -8593,39 +8790,57 @@ msgstr "选择主机"
 msgid "Select user"
 msgstr "选择用户"
 
-#: ../lib/modules/posixAccount.inc:1202
-#: ../lib/modules/posixAccount.inc:1232
+#: ../lib/modules/posixAccount.inc:1205
+#: ../lib/modules/posixAccount.inc:1235
 #: ../lib/modules/nisnetgroup.inc:374
 msgid "Selected groups"
 msgstr "已选择的组"
 
-#: ../templates/masscreate.php:149
+#: ../templates/masscreate.php:151
 #: ../templates/config/confmodules.php:280
 msgid "Selected modules"
 msgstr "已选择的模块"
 
-#: ../lib/modules/posixGroup.inc:241
-#: ../lib/modules/asteriskExtension.inc:308
+#: ../lib/modules/posixGroup.inc:251
+#: ../lib/modules/asteriskExtension.inc:446
 msgid "Selected users"
 msgstr "已选择的用户"
 
-#: ../templates/selfService/adminMain.php:262
+#: ../templates/selfService/adminMain.php:266
 msgid "Self service configuration"
 msgstr "自助服务配置"
 
-#: ../templates/selfService/adminMain.php:303
+#: ../templates/selfService/adminMain.php:308
 msgid "Self service configuration editor"
 msgstr "自助服务配置编辑器"
 
-#: ../templates/selfService/adminMain.php:308
+#: ../templates/selfService/adminMain.php:313
 msgid "Self service login"
 msgstr "自助服务登录"
 
-#: ../templates/lists/changePassword.php:223
-#: ../templates/lists/changePassword.php:259
+#: ../lib/modules/passwordSelfReset.inc:111
+#: ../lib/modules/passwordSelfReset.inc:200
+msgid "Send confirmation mail"
+msgstr "发送确认邮件"
+
+#: ../lib/modules/passwordSelfReset.inc:93
+#: ../lib/modules/passwordSelfReset.inc:184
+msgid "Send notification mail"
+msgstr "发送提示邮件"
+
+#: ../templates/lists/changePassword.php:241
+#: ../templates/lists/changePassword.php:271
 msgid "Send via mail"
 msgstr "通过邮件发送"
 
+#: ../lib/modules/passwordSelfReset.inc:94
+msgid "Sends a mail to the user to inform him about the password change."
+msgstr "发一封邮件来通知用户有关密码修改事宜."
+
+#: ../lib/modules/passwordSelfReset.inc:112
+msgid "Sends a mail to the user to validate his email address before the password change."
+msgstr "在密码修改前,给用户发一封邮件来确认邮件地址."
+
 #: ../lib/modules/device.inc:58
 #: ../lib/modules/device.inc:89
 #: ../lib/modules/device.inc:114
@@ -8643,16 +8858,16 @@ msgstr "序列号"
 msgid "Server"
 msgstr "服务器"
 
-#: ../templates/config/confmain.php:221
-#: ../templates/selfService/adminMain.php:350
+#: ../templates/config/confmain.php:225
+#: ../templates/selfService/adminMain.php:361
 #: ../lib/modules/imapAccess.inc:69
 #: ../lib/modules/imapAccess.inc:104
-#: ../help/help.inc:54
+#: ../help/help.inc:58
 msgid "Server address"
 msgstr "服务器地址"
 
-#: ../templates/config/confmain.php:414
-#: ../templates/selfService/adminMain.php:104
+#: ../templates/config/confmain.php:424
+#: ../templates/selfService/adminMain.php:108
 msgid "Server address is invalid!"
 msgstr "服务器地址非法!"
 
@@ -8661,7 +8876,7 @@ msgstr "服务器地址非法!"
 msgid "Server information"
 msgstr "服务器信息"
 
-#: ../templates/config/confmain.php:281
+#: ../templates/config/confmain.php:285
 msgid "Server list"
 msgstr "服务器列表"
 
@@ -8669,8 +8884,8 @@ msgstr "服务器列表"
 msgid "Server profile"
 msgstr "服务器设置文件"
 
-#: ../templates/config/confmain.php:250
-#: ../templates/selfService/adminMain.php:370
+#: ../templates/config/confmain.php:254
+#: ../templates/selfService/adminMain.php:381
 msgid "Server settings"
 msgstr "服务器设置"
 
@@ -8683,29 +8898,36 @@ msgstr "服务器统计"
 msgid "Server time"
 msgstr "服务器时间"
 
-#: ../lib/modules/authorizedServiceObject.inc:74
+#: ../lib/modules/authorizedServiceObject.inc:75
 msgid "Service name (e.g. sshd, imap, ftp). Enter one service per entry."
 msgstr "服务名(比如:sshd,imap,ftp).每个条目输入一个服务."
 
 #: ../templates/config/mainmanage.php:193
-#: ../help/help.inc:134
+#: ../help/help.inc:140
 msgid "Session timeout"
 msgstr "会话超时"
 
-#: ../lib/modules/aliasEntry.inc:102
+#: ../lib/modules/aliasEntry.inc:101
 msgid "Set"
 msgstr "设置"
 
-#: ../lib/modules/shadowAccount.inc:424
+#: ../lib/modules/sambaSamAccount.inc:1403
+#: ../lib/modules/shadowAccount.inc:437
+msgid "Set also for Kerberos"
+msgstr "同时也为Kerberos设置"
+
+#: ../lib/modules/shadowAccount.inc:434
+#: ../lib/modules/heimdalKerberos.inc:395
 msgid "Set also for Samba 3"
 msgstr "同时也为Samba 3设置"
 
-#: ../lib/modules/sambaSamAccount.inc:1376
+#: ../lib/modules/sambaSamAccount.inc:1400
+#: ../lib/modules/heimdalKerberos.inc:392
 msgid "Set also for Shadow"
 msgstr "同时也为Shadow设置"
 
-#: ../lib/modules.inc:1083
-#: ../lib/modules.inc:1084
+#: ../lib/modules.inc:1108
+#: ../lib/modules.inc:1109
 msgid "Set password"
 msgstr "设置密码"
 
@@ -8714,16 +8936,18 @@ msgstr "设置密码"
 msgid "Set primary group as memberUid"
 msgstr "为主组设置memberUid"
 
-#: ../templates/config/profmanage.php:317
-#: ../help/help.inc:124
+#: ../templates/config/profmanage.php:261
+#: ../templates/config/profmanage.php:271
+#: ../templates/config/profmanage.php:272
+#: ../help/help.inc:130
 msgid "Set profile password"
 msgstr "设置文件密码"
 
-#: ../lib/modules.inc:1084
+#: ../lib/modules.inc:1109
 msgid "Set random password"
 msgstr "设置随机密码"
 
-#: ../templates/lists/changePassword.php:237
+#: ../templates/lists/changePassword.php:255
 msgid "Set specific password"
 msgstr "设置特定的密码"
 
@@ -8735,7 +8959,7 @@ msgstr "设置搜索条件为0,来获取所有的记录"
 msgid "Set this only if your LDAP schema allows that groups may not have any members (e.g. if you use OpenDJ)."
 msgstr "仅在LDAP模板允许组不含组员时再设置(比如使用OpenDJ)."
 
-#: ../lib/modules/posixGroup.inc:403
+#: ../lib/modules/posixGroup.inc:413
 msgid "Sets the group password."
 msgstr "设置组密码"
 
@@ -8745,17 +8969,17 @@ msgstr "Shadow"
 
 #: ../lib/modules/sambaSamAccount.inc:224
 #: ../lib/modules/sambaSamAccount.inc:359
-#: ../lib/modules/sambaSamAccount.inc:1447
-#: ../lib/modules/sambaSamAccount.inc:1727
+#: ../lib/modules/sambaSamAccount.inc:1474
+#: ../lib/modules/sambaSamAccount.inc:1754
 msgid "Shadowing"
 msgstr "遮蔽化(shadow)"
 
-#: ../lib/modules/zarafaUser.inc:96
-#: ../lib/modules/zarafaUser.inc:164
-#: ../lib/modules/zarafaUser.inc:272
-#: ../lib/modules/zarafaUser.inc:357
-#: ../lib/modules/zarafaUser.inc:543
-#: ../lib/modules/zarafaUser.inc:1233
+#: ../lib/modules/zarafaUser.inc:97
+#: ../lib/modules/zarafaUser.inc:174
+#: ../lib/modules/zarafaUser.inc:284
+#: ../lib/modules/zarafaUser.inc:377
+#: ../lib/modules/zarafaUser.inc:586
+#: ../lib/modules/zarafaUser.inc:1324
 msgid "Shared store only"
 msgstr "仅共享存储"
 
@@ -8763,7 +8987,7 @@ msgstr "仅共享存储"
 msgid "Should DDNS (Dynamic DNS) be activated?"
 msgstr "DDNS(动态DNS)是否已经激活?"
 
-#: ../lib/modules/ddns.inc:91
+#: ../lib/modules/ddns.inc:92
 msgid "Should fix IP addresses be added to the DNS server?"
 msgstr "增加一个固定IP地址到DNS服务器吗?"
 
@@ -8771,7 +8995,7 @@ msgstr "增加一个固定IP地址到DNS服务器吗?"
 msgid "Show"
 msgstr "显示"
 
-#: ../templates/massBuildAccounts.php:201
+#: ../templates/massBuildAccounts.php:216
 msgid "Show LDIF file"
 msgstr "显示LDIF文件"
 
@@ -8784,7 +9008,7 @@ msgstr "显示属性"
 msgid "Show internal attributes"
 msgstr "显示内部属性"
 
-#: ../lib/modules/asteriskExtension.inc:300
+#: ../lib/modules/asteriskExtension.inc:438
 msgid "Show only Asterisk accounts"
 msgstr "只显示 Asterisk 帐号"
 
@@ -8801,14 +9025,14 @@ msgstr "单值"
 msgid "Skip"
 msgstr "跳过"
 
-#: ../lib/modules/quota.inc:620
-#: ../lib/modules/systemQuotas.inc:373
+#: ../lib/modules/quota.inc:623
+#: ../lib/modules/systemQuotas.inc:376
 msgid "Soft block"
 msgstr "软块"
 
 #: ../lib/modules/quota.inc:105
-#: ../lib/modules/quota.inc:388
-#: ../lib/modules/quota.inc:493
+#: ../lib/modules/quota.inc:391
+#: ../lib/modules/quota.inc:496
 #: ../lib/modules/systemQuotas.inc:117
 msgid "Soft block limit"
 msgstr "软块限制"
@@ -8817,8 +9041,8 @@ msgstr "软块限制"
 msgid "Soft block limit."
 msgstr "软块限制."
 
-#: ../lib/modules/quota.inc:622
-#: ../lib/modules/systemQuotas.inc:375
+#: ../lib/modules/quota.inc:625
+#: ../lib/modules/systemQuotas.inc:378
 msgid "Soft inode"
 msgstr "软节点"
 
@@ -8827,8 +9051,8 @@ msgid "Soft inode (files) limit."
 msgstr "软节点限制."
 
 #: ../lib/modules/quota.inc:127
-#: ../lib/modules/quota.inc:392
-#: ../lib/modules/quota.inc:495
+#: ../lib/modules/quota.inc:395
+#: ../lib/modules/quota.inc:498
 #: ../lib/modules/systemQuotas.inc:121
 msgid "Soft inode limit"
 msgstr "软节点限制."
@@ -8842,22 +9066,22 @@ msgstr "有些IMAP服务器在存储邮件时使用前缀(比如:在Cyrus中\"us
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "下面被选中的属性(%s)已经被修改."
 
-#: ../lib/modules.inc:818
+#: ../lib/modules.inc:821
 msgid "Some required information is missing"
 msgstr "缺少一些必要的信息"
 
-#: ../templates/help.php:121
+#: ../templates/help.php:124
 #, php-format
 msgid "Sorry this help id ({bold}%s{endbold}) is not available for this module ({bold}%s{endbold})."
 msgstr "对不起，本模块({bold}%s{endbold}) 尚无帮助说明 (help id {bold}%s{endbold})."
 
-#: ../templates/help.php:135
+#: ../templates/help.php:138
 #, php-format
 msgid "Sorry this help number ({bold}%d{endbold}) is not available."
 msgstr "对不起,本帮助号({bold}%d{endbold})并不存在."
 
 #: ../lib/modules/sambaSamAccount.inc:304
-#: ../lib/modules/sambaSamAccount.inc:1189
+#: ../lib/modules/sambaSamAccount.inc:1213
 msgid "Special user"
 msgstr "特殊用户"
 
@@ -8866,7 +9090,7 @@ msgstr "特殊用户"
 msgid "Specifies a filter that matches the members (e.g. \"(mail=*@zarafa.nl)\")."
 msgstr "指定用户匹配的过滤规则.(比如:\"(mail=*@zarafa.nl)\")."
 
-#: ../help/help.inc:198
+#: ../help/help.inc:206
 msgid "Specifies if the mail should be sent as text or HTML."
 msgstr "指定发送邮件用文本方式还是HTML方式"
 
@@ -8891,14 +9115,20 @@ msgstr "指定用户是否允许修改自己的密码。"
 msgid "Specifies the LDAP base where to search for members (e.g. \"ou=zarafa,dc=company,dc=com\")."
 msgstr "指定LDAP搜索用户的基础DN(比如: \"ou=zarafa,dc=company,dc=com\")."
 
-#: ../lib/modules/zarafaUser.inc:129
+#: ../lib/modules/zarafaContact.inc:86
+#: ../lib/modules/zarafaGroup.inc:88
+#: ../lib/modules/zarafaUser.inc:130
 msgid "Specifies the attribute that should be used to reference the entries. If you would like to reference also groups then this must be set to \"dn\"."
 msgstr "指定引用条目时使用的属性.如果你引用组,这里必须为\"dn\"."
 
-#: ../lib/modules/zarafaUser.inc:105
+#: ../lib/modules/zarafaUser.inc:106
 msgid "Specifies the capacity of this resource."
 msgstr "指定资源容量"
 
+#: ../lib/modules/heimdalKerberos.inc:81
+msgid "Specifies the maximum lifetime of a ticket in days."
+msgstr "指定票证的最大生命周期天数."
+
 #: ../lib/modules/ppolicy.inc:109
 msgid "Specifies the maximum number of seconds before a password is due to expire that expiration warning messages will be returned to a user."
 msgstr "在密码过期前，对用户提示密码过期警告的最长时间（秒数）。"
@@ -8907,6 +9137,10 @@ msgstr "在密码过期前，对用户提示密码过期警告的最长时间（
 msgid "Specifies the maximum number of seconds that a connection can be idle before the session is terminated."
 msgstr "指定在会话中断前,一条连接空闲的最长时间-秒数."
 
+#: ../lib/modules/heimdalKerberos.inc:85
+msgid "Specifies the maximum renewable lifetime of a ticket in days."
+msgstr "指定票证的最大重建生命期天数."
+
 #: ../lib/modules/ppolicy.inc:113
 msgid "Specifies the minimum number of characters that will be accepted in a password."
 msgstr "指定在密码中的字符的最少个数"
@@ -8937,14 +9171,14 @@ msgstr "指定用户的主要关系,要求是公开目录的惯例,比如学生,
 
 #: ../lib/modules/eduPerson.inc:93
 #: ../lib/modules/eduPerson.inc:97
-msgid "Specifies the person's relationship(s) to the institution in broad categories such as student, faculty, staff, alum, etc."
+msgid "Specifies the person's relationships to the institution in broad categories such as student, faculty, staff, alum, etc."
 msgstr "指定用户的关系,要求是公开目录中的惯例,比如学生,教职员工,校友等等."
 
 #: ../lib/modules/asteriskAccount.inc:167
 msgid "Specifies the user's pickup group."
 msgstr "指定用户的接听组."
 
-#: ../lib/modules/zarafaUser.inc:93
+#: ../lib/modules/zarafaUser.inc:94
 msgid "Specifies whether the user is an admin. System administrators may additionally create, modify and delete companies."
 msgstr "指定用户是否是管理员.系统管理员可以建立,修改,删除附加的伙伴."
 
@@ -8967,13 +9201,14 @@ msgstr "开始时间"
 
 #: ../lib/modules/inetOrgPerson.inc:127
 #: ../lib/modules/inetOrgPerson.inc:144
-#: ../lib/modules/inetOrgPerson.inc:239
-#: ../lib/modules/inetOrgPerson.inc:476
-#: ../lib/modules/inetOrgPerson.inc:518
-#: ../lib/modules/inetOrgPerson.inc:673
-#: ../lib/modules/inetOrgPerson.inc:1092
-#: ../lib/modules/inetOrgPerson.inc:1446
-#: ../lib/modules/inetOrgPerson.inc:1980
+#: ../lib/modules/inetOrgPerson.inc:242
+#: ../lib/modules/inetOrgPerson.inc:489
+#: ../lib/modules/inetOrgPerson.inc:531
+#: ../lib/modules/inetOrgPerson.inc:737
+#: ../lib/modules/inetOrgPerson.inc:741
+#: ../lib/modules/inetOrgPerson.inc:1385
+#: ../lib/modules/inetOrgPerson.inc:2042
+#: ../lib/modules/inetOrgPerson.inc:2598
 msgid "State"
 msgstr "地点"
 
@@ -8988,13 +9223,13 @@ msgstr "静态文本"
 msgid "Step %s of %s"
 msgstr "第 %s步,共 %s步"
 
-#: ../lib/modules/inetOrgPerson.inc:295
+#: ../lib/modules/inetOrgPerson.inc:300
 msgid "Steve"
 msgstr "Steve"
 
 #: ../lib/modules/sambaSamAccount.inc:396
 #: ../lib/modules/posixAccount.inc:206
-#: ../lib/modules/inetOrgPerson.inc:1564
+#: ../lib/modules/inetOrgPerson.inc:2165
 #: ../lib/modules/asteriskVoicemail.inc:165
 msgid "Steve Miller"
 msgstr "Steve Miller"
@@ -9010,13 +9245,14 @@ msgstr "Steve,Stevo"
 #: ../lib/modules/inetOrgPerson.inc:62
 #: ../lib/modules/inetOrgPerson.inc:124
 #: ../lib/modules/inetOrgPerson.inc:132
-#: ../lib/modules/inetOrgPerson.inc:231
-#: ../lib/modules/inetOrgPerson.inc:364
-#: ../lib/modules/inetOrgPerson.inc:506
-#: ../lib/modules/inetOrgPerson.inc:609
-#: ../lib/modules/inetOrgPerson.inc:1072
-#: ../lib/modules/inetOrgPerson.inc:1430
-#: ../lib/modules/inetOrgPerson.inc:1931
+#: ../lib/modules/inetOrgPerson.inc:234
+#: ../lib/modules/inetOrgPerson.inc:369
+#: ../lib/modules/inetOrgPerson.inc:519
+#: ../lib/modules/inetOrgPerson.inc:629
+#: ../lib/modules/inetOrgPerson.inc:633
+#: ../lib/modules/inetOrgPerson.inc:1281
+#: ../lib/modules/inetOrgPerson.inc:2026
+#: ../lib/modules/inetOrgPerson.inc:2549
 msgid "Street"
 msgstr "街道"
 
@@ -9040,27 +9276,30 @@ msgstr "Sub (条目的子树)"
 msgid "Subgroups"
 msgstr "分组"
 
-#: ../templates/config/confmain.php:320
-#: ../help/help.inc:190
+#: ../templates/config/confmain.php:324
+#: ../lib/modules/passwordSelfReset.inc:101
+#: ../lib/modules/passwordSelfReset.inc:192
+#: ../lib/modules/passwordSelfReset.inc:208
+#: ../help/help.inc:198
 msgid "Subject"
 msgstr "标题"
 
 #: ../lib/types/dhcp.inc:94
-#: ../lib/modules/dhcp_settings.inc:127
-#: ../lib/modules/dhcp_settings.inc:171
-#: ../lib/modules/dhcp_settings.inc:185
-#: ../lib/modules/dhcp_settings.inc:202
-#: ../lib/modules/dhcp_settings.inc:518
-#: ../lib/modules/dhcp_settings.inc:617
+#: ../lib/modules/dhcp_settings.inc:128
+#: ../lib/modules/dhcp_settings.inc:182
+#: ../lib/modules/dhcp_settings.inc:196
+#: ../lib/modules/dhcp_settings.inc:213
+#: ../lib/modules/dhcp_settings.inc:529
+#: ../lib/modules/dhcp_settings.inc:628
 msgid "Subnet"
 msgstr "子网"
 
-#: ../lib/modules/dhcp_settings.inc:160
-#: ../lib/modules/dhcp_settings.inc:179
-#: ../lib/modules/dhcp_settings.inc:196
-#: ../lib/modules/dhcp_settings.inc:254
-#: ../lib/modules/dhcp_settings.inc:554
-#: ../lib/modules/dhcp_settings.inc:625
+#: ../lib/modules/dhcp_settings.inc:168
+#: ../lib/modules/dhcp_settings.inc:190
+#: ../lib/modules/dhcp_settings.inc:207
+#: ../lib/modules/dhcp_settings.inc:265
+#: ../lib/modules/dhcp_settings.inc:565
+#: ../lib/modules/dhcp_settings.inc:636
 msgid "Subnet mask"
 msgstr "子网掩码"
 
@@ -9084,6 +9323,11 @@ msgstr "成功删除DN %s"
 msgid "Sudo role"
 msgstr "Sudo角色"
 
+#: ../lib/types/sudo.inc:148
+#, php-format
+msgid "Sudo role count: %s"
+msgstr "Sudo角色总计:%s"
+
 #: ../lib/types/sudo.inc:48
 msgid "Sudo role management"
 msgstr "Sudo角色管理"
@@ -9093,11 +9337,11 @@ msgid "Sudo roles"
 msgstr "Sudo角色"
 
 #: ../lib/lists.inc:656
-#: ../lib/modules.inc:908
+#: ../lib/modules.inc:917
 msgid "Suffix"
 msgstr "后缀"
 
-#: ../lib/modules/sambaSamAccount.inc:1288
+#: ../lib/modules/sambaSamAccount.inc:1312
 msgid "Sunday"
 msgstr "星期日"
 
@@ -9105,22 +9349,22 @@ msgstr "星期日"
 msgid "Switch entries"
 msgstr "切换条目"
 
-#: ../templates/lists/changePassword.php:158
+#: ../templates/lists/changePassword.php:165
 #: ../lib/modules/asteriskAccount.inc:89
 #: ../lib/modules/asteriskVoicemail.inc:77
 msgid "Sync Asterisk password with Unix password"
 msgstr "同步Asterisk和Unix的密码"
 
-#: ../templates/lists/changePassword.php:161
+#: ../templates/lists/changePassword.php:168
 msgid "Sync Asterisk voicemail password with Unix password"
 msgstr "同步Asterisk语音邮件和Unix的密码"
 
-#: ../templates/lists/changePassword.php:149
+#: ../templates/lists/changePassword.php:158
 #: ../lib/modules/sambaSamAccount.inc:230
 msgid "Sync Samba LM password with Unix password"
 msgstr "同步 Samba LM 密码和Unix的密码"
 
-#: ../templates/lists/changePassword.php:148
+#: ../templates/lists/changePassword.php:156
 #: ../lib/modules/sambaSamAccount.inc:229
 msgid "Sync Samba NT password with Unix password"
 msgstr "同步Samba NT的密码和 Unix的密码"
@@ -9139,8 +9383,8 @@ msgstr "OID语法"
 msgid "Syntaxes"
 msgstr "语法"
 
-#: ../lib/modules/zarafaUser.inc:560
-#: ../lib/modules/zarafaUser.inc:1224
+#: ../lib/modules/zarafaUser.inc:603
+#: ../lib/modules/zarafaUser.inc:1315
 msgid "System administrator"
 msgstr "系统管理员"
 
@@ -9148,7 +9392,7 @@ msgstr "系统管理员"
 msgid "System logging"
 msgstr "系统日志"
 
-#: ../help/help.inc:56
+#: ../help/help.inc:60
 msgid "TLS cannot be combined with ldaps://."
 msgstr "TLS不能与ldaps://结合"
 
@@ -9156,26 +9400,32 @@ msgstr "TLS不能与ldaps://结合"
 msgid "Target of invitation policy is invalid!"
 msgstr "邀请策略的目标非法 !"
 
-#: ../templates/lists/changePassword.php:204
+#: ../templates/help.php:89
+#: ../lib/modules.inc:614
+msgid "Technical name"
+msgstr "技术名字"
+
+#: ../templates/lists/changePassword.php:207
 #: ../lib/types/user.inc:156
 #: ../lib/modules/inetOrgPerson.inc:52
 #: ../lib/modules/inetOrgPerson.inc:123
 #: ../lib/modules/inetOrgPerson.inc:153
-#: ../lib/modules/inetOrgPerson.inc:249
-#: ../lib/modules/inetOrgPerson.inc:404
-#: ../lib/modules/inetOrgPerson.inc:533
-#: ../lib/modules/inetOrgPerson.inc:629
-#: ../lib/modules/inetOrgPerson.inc:1170
-#: ../lib/modules/inetOrgPerson.inc:1435
-#: ../lib/modules/inetOrgPerson.inc:1903
+#: ../lib/modules/inetOrgPerson.inc:252
+#: ../lib/modules/inetOrgPerson.inc:409
+#: ../lib/modules/inetOrgPerson.inc:546
+#: ../lib/modules/inetOrgPerson.inc:661
+#: ../lib/modules/inetOrgPerson.inc:665
+#: ../lib/modules/inetOrgPerson.inc:1484
+#: ../lib/modules/inetOrgPerson.inc:2031
+#: ../lib/modules/inetOrgPerson.inc:2521
 msgid "Telephone number"
 msgstr "电话号码"
 
-#: ../lib/modules/inetOrgPerson.inc:342
+#: ../lib/modules/inetOrgPerson.inc:347
 msgid "Temp"
 msgstr "临时"
 
-#: ../lib/modules/inetOrgPerson.inc:318
+#: ../lib/modules/inetOrgPerson.inc:323
 msgid "Temp, contract until december"
 msgstr "临时,合同到年底"
 
@@ -9189,7 +9439,7 @@ msgstr "模板"
 
 #: ../lib/modules/sambaSamAccount.inc:368
 #: ../lib/modules/sambaSamAccount.inc:581
-#: ../lib/modules/sambaSamAccount.inc:1201
+#: ../lib/modules/sambaSamAccount.inc:1225
 msgid "Terminal server options"
 msgstr "终端服务选项"
 
@@ -9197,8 +9447,12 @@ msgstr "终端服务选项"
 msgid "Tests"
 msgstr "测试"
 
-#: ../templates/config/confmain.php:329
-#: ../help/help.inc:192
+#: ../templates/config/confmain.php:333
+#: ../lib/modules/passwordSelfReset.inc:105
+#: ../lib/modules/passwordSelfReset.inc:115
+#: ../lib/modules/passwordSelfReset.inc:196
+#: ../lib/modules/passwordSelfReset.inc:212
+#: ../help/help.inc:200
 msgid "Text"
 msgstr "文本"
 
@@ -9214,7 +9468,7 @@ msgstr "用户用来进行机构间认证的\"NetID\".格式是\"user@scope\",
 msgid "The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
 msgstr "用户Cyrus邮件限制(MB),留空意味着不限制."
 
-#: ../lib/modules/dhcp_settings.inc:289
+#: ../lib/modules/dhcp_settings.inc:300
 msgid "The DHCP ranges were changed to fit for the new subnet."
 msgstr "为适应新子网的变化,DHCP范围已经更改."
 
@@ -9231,7 +9485,7 @@ msgstr "代表用户主要组织单元的目录条目的DN."
 msgid "The DNs of the directory entries representing the person's organisational units."
 msgstr "代表用户组织单元的目录条目的DN."
 
-#: ../lib/modules/posixGroup.inc:419
+#: ../lib/modules/posixGroup.inc:429
 msgid "The ID of this group was changed. You can update all user and host entries to the new group ID."
 msgstr "组ID已经改变.你可以更新所有的用户和主机条目到新的组ID."
 
@@ -9250,8 +9504,8 @@ msgstr "IP地址已被使用: "
 
 #: ../lib/modules/ipHost.inc:108
 #: ../lib/modules/ipHost.inc:109
-#: ../lib/modules/asteriskAccount.inc:638
-#: ../lib/modules/asteriskAccount.inc:639
+#: ../lib/modules/asteriskAccount.inc:636
+#: ../lib/modules/asteriskAccount.inc:637
 #: ../lib/modules/ppolicyUser.inc:85
 #: ../lib/modules/range.inc:408
 #: ../lib/modules/range.inc:424
@@ -9265,11 +9519,11 @@ msgstr "IP地址非法 !"
 msgid "The IP address of the PC."
 msgstr "PC机的IP地址."
 
-#: ../lib/modules/dhcp_settings.inc:137
-msgid "The IP address(es) of the DNS servers. Multiple addresses are separated by \",\". Example: 192.168.0.10, 192.168.0.11"
+#: ../lib/modules/dhcp_settings.inc:141
+msgid "The IP addresses of the DNS servers. Multiple addresses are separated by \",\". Example: 192.168.0.10, 192.168.0.11"
 msgstr "DNS服务器IP地址,多地址用\",\"隔离. 例如: 192.168.0.10, 192.168.0.11"
 
-#: ../lib/modules/dhcp_settings.inc:143
+#: ../lib/modules/dhcp_settings.inc:149
 msgid "The IP addresses of the Netbios name servers (e.g. \"123.123.123.123, 123.123.123.124\")."
 msgstr "Netbios命名服务器的IP地址(比如: \"123.123.123.123, 123.123.123.124\")."
 
@@ -9278,12 +9532,16 @@ msgstr "Netbios命名服务器的IP地址(比如: \"123.123.123.123, 123.123.123
 msgid "The IP does not match the subnet."
 msgstr "IP与子网掩码不匹配."
 
+#: ../lib/modules/heimdalKerberos.inc:69
+msgid "The Kerberos realm of this user."
+msgstr "此帐号的Kerberos域"
+
 #: ../lib/modules/fixed_ip.inc:91
 msgid "The MAC address of the PC. Example: 11:22:33:44:55:aa"
 msgstr "PC机的 MAC 地址.比如: 11:22:33:44:55:aa"
 
-#: ../lib/modules/dhcp_settings.inc:282
-#: ../lib/modules/dhcp_settings.inc:283
+#: ../lib/modules/dhcp_settings.inc:293
+#: ../lib/modules/dhcp_settings.inc:294
 msgid "The Netbios server is invalid."
 msgstr "Netbios服务器非法."
 
@@ -9299,7 +9557,7 @@ msgstr "PC机的机器名只能包含 A-Z, a-z 和 0-9."
 msgid "The PC name needs to be at least 2 characters long."
 msgstr "PC机器名的长度最短需要两个字符."
 
-#: ../help/help.inc:163
+#: ../help/help.inc:169
 msgid "The PDF structure defines what information is exported as PDF file and how the pages are structured. You can manage the PDF structures in the PDF editor (under \"Tools\")."
 msgstr "PDF结构定义了输出到PDF文件的信息和页面的结构.可以在PDF编辑器中管理PDF结构(在\"工具\"中)."
 
@@ -9317,7 +9575,7 @@ msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "您的Samba服务器的SID,可以通过使用\"net getlocalsid\"命令获取."
 
 #: ../templates/selfService/selfServiceLogin.php:90
-#: ../templates/selfService/selfServiceMain.php:138
+#: ../templates/selfService/selfServiceMain.php:139
 msgid "The TLS encryption could not be started."
 msgstr "TLS加密失败."
 
@@ -9335,13 +9593,13 @@ msgid "The account context is invalid."
 msgstr "账号语境非法."
 
 #: ../lib/modules/asteriskAccount.inc:103
-#: ../lib/modules/asteriskExtension.inc:83
+#: ../lib/modules/asteriskExtension.inc:91
 #: ../lib/modules/asteriskVoicemail.inc:83
 msgid "The account context stores information about the dial plan."
 msgstr "帐号的语境存储有关拨号模板的信息"
 
-#: ../lib/modules/asteriskAccount.inc:630
-#: ../lib/modules/asteriskAccount.inc:631
+#: ../lib/modules/asteriskAccount.inc:628
+#: ../lib/modules/asteriskAccount.inc:629
 msgid "The account type is invalid."
 msgstr "账号类型非法."
 
@@ -9349,22 +9607,22 @@ msgstr "账号类型非法."
 msgid "The account will be locked after this date."
 msgstr "帐号将在这一天之后锁定."
 
-#: ../help/help.inc:153
+#: ../help/help.inc:159
 msgid "The account will be saved under this LDAP suffix."
 msgstr "帐号将会保存在此后缀下."
 
-#: ../lib/modules/passwordSelfReset.inc:164
+#: ../lib/modules/passwordSelfReset.inc:233
 #, php-format
 msgid "The answer needs to be at least %s characters long."
 msgstr "答案的最短长度为%s个字符."
 
-#: ../lib/modules/passwordSelfReset.inc:773
+#: ../lib/modules/passwordSelfReset.inc:901
 msgid "The answer to the security question is wrong."
 msgstr "安全问题的答案是错误的."
 
-#: ../templates/tests/schemaTest.php:123
+#: ../templates/tests/schemaTest.php:126
 #, php-format
-msgid "The attribute %s is not supported for the object class(es) %s by your LDAP server."
+msgid "The attribute %s is not supported for the object class %s by your LDAP server."
 msgstr "在你的LDAP服务器中%s属性(属于%s对象类)不被支持。"
 
 #: ../templates/3rdParty/pla/lib/import_functions.php:531
@@ -9376,11 +9634,16 @@ msgstr "修改的属性与%s指定的属性不匹配"
 msgid "The attribute value does not exist"
 msgstr "属性值不存在"
 
+#: ../lib/modules/asteriskAccount.inc:618
 #: ../lib/modules/asteriskAccount.inc:620
-#: ../lib/modules/asteriskAccount.inc:622
 msgid "The caller ID format is invalid."
 msgstr "拨号ID格式不合法."
 
+#: ../templates/config/confmain.php:163
+#: ../templates/selfService/adminMain.php:319
+msgid "The config file is not writable."
+msgstr "配置文件不可写."
+
 #: ../templates/3rdParty/pla/htdocs/create.php:29
 #: ../templates/3rdParty/pla/htdocs/copy.php:34
 #: ../templates/3rdParty/pla/htdocs/create_confirm.php:23
@@ -9392,8 +9655,8 @@ msgstr "您指定的容器%s不存在,请重试."
 msgid "The country name of the user."
 msgstr "用户国籍."
 
-#: ../lib/modules/dhcp_settings.inc:280
-#: ../lib/modules/dhcp_settings.inc:281
+#: ../lib/modules/dhcp_settings.inc:291
+#: ../lib/modules/dhcp_settings.inc:292
 msgid "The default gateway is invalid."
 msgstr "缺省网关非法."
 
@@ -9402,13 +9665,13 @@ msgstr "缺省网关非法."
 msgid "The destination entry (%s) already exists."
 msgstr "目标条目(%s)已经存在."
 
-#: ../lib/modules/dhcp_settings.inc:292
-#: ../lib/modules/dhcp_settings.inc:294
+#: ../lib/modules/dhcp_settings.inc:303
+#: ../lib/modules/dhcp_settings.inc:305
 msgid "The domain name includes invalid characters. Valid characters are A-Z, a-z, 0-9, \".\", \"_\",\"-\"."
 msgstr "域名包含非法字符,只能使用A-Z, a-z, 0-9, \".\", \"_\",\"-\"."
 
-#: ../lib/modules/dhcp_settings.inc:291
-#: ../lib/modules/dhcp_settings.inc:293
+#: ../lib/modules/dhcp_settings.inc:302
+#: ../lib/modules/dhcp_settings.inc:304
 msgid "The domain name needs to have at least 3 characters."
 msgstr "域名最少需要3个字符."
 
@@ -9424,7 +9687,7 @@ msgstr "邮件地址非法 !"
 msgid "The ending IP address of the range."
 msgstr "范围的最高IP地址."
 
-#: ../lib/modules/dhcp_settings.inc:284
+#: ../lib/modules/dhcp_settings.inc:295
 msgid "The entered Netbios node type does not exist."
 msgstr "输入的Netbios节点类型不存在."
 
@@ -9447,7 +9710,6 @@ msgstr "条目(%s)不存在."
 msgid "The entry does not exist and will be ignored"
 msgstr "条目不存在,被忽略"
 
-#: ../lib/modules/phpGroupwareUser.inc:135
 #: ../lib/modules/shadowAccount.inc:67
 msgid "The expiration date is invalid."
 msgstr "过期日期非法."
@@ -9457,8 +9719,8 @@ msgstr "过期日期非法."
 msgid "The expiration date must be in format DD.MM.YYYY HH:MM."
 msgstr "过期日期的格式为 DD.MM.YYYY HH:MM."
 
-#: ../lib/modules/asteriskAccount.inc:624
-#: ../lib/modules/asteriskAccount.inc:625
+#: ../lib/modules/asteriskAccount.inc:622
+#: ../lib/modules/asteriskAccount.inc:623
 msgid "The extension context is invalid."
 msgstr "扩展的语境非法."
 
@@ -9479,7 +9741,7 @@ msgid "The file you uploaded is too large. Please check php.ini, upload_max_size
 msgstr "您上传的文件太大,请检查PHP.INI文件中upload_max_size的设置"
 
 #: ../templates/initsuff.php:179
-msgid "The following suffix(es) are missing in LDAP. LAM can create them for you."
+msgid "The following suffixes are missing in LDAP. LAM can create them for you."
 msgstr "LDAP中没有下列后缀,LAM会自动建立."
 
 #: ../lib/modules/sambaSamAccount.inc:109
@@ -9503,7 +9765,7 @@ msgstr "在拷贝源条目时建立的新条目的全DN"
 msgid "The full name is invalid."
 msgstr "全名非法."
 
-#: ../templates/login.php:492
+#: ../templates/login.php:498
 msgid "The given user name matches multiple LDAP entries."
 msgstr "给定的用户名匹配了多条LDAP条目."
 
@@ -9524,25 +9786,25 @@ msgstr "新段的标题最少要有一个字符."
 msgid "The home directory will be connected under this drive letter."
 msgstr "将会从这个驱动器号上连接用户目录。"
 
-#: ../lib/modules/asteriskAccount.inc:627
-#: ../lib/modules/asteriskAccount.inc:628
+#: ../lib/modules/asteriskAccount.inc:625
+#: ../lib/modules/asteriskAccount.inc:626
 msgid "The host name is invalid."
 msgstr "主机名非法"
 
-#: ../lib/modules/inetOrgPerson.inc:706
+#: ../lib/modules/inetOrgPerson.inc:782
 msgid "The initials of the user's first names."
 msgstr "用户名字的初始化值"
 
-#: ../lib/modules/ddns.inc:97
+#: ../lib/modules/ddns.inc:100
 msgid "The key enables the DHCP server to perform DNS updates. The key is generated with \"genDDNSkey\"."
 msgstr "使DHCP服务器能够进行DNS更新的KEY. 产生KEY的命令是 \"genDDNSkey\"."
 
-#: ../lib/modules/dhcp_settings.inc:278
-#: ../lib/modules/dhcp_settings.inc:279
+#: ../lib/modules/dhcp_settings.inc:289
+#: ../lib/modules/dhcp_settings.inc:290
 msgid "The lease time is invalid."
 msgstr "释放时间非法."
 
-#: ../lib/modules/dhcp_settings.inc:131
+#: ../lib/modules/dhcp_settings.inc:133
 msgid "The lease time specifies after how many seconds the client should request a new IP address."
 msgstr "指定客户端必须重新申请新IP地址的释放时间(秒数)."
 
@@ -9569,24 +9831,29 @@ msgstr "日志文件为空或包含非法字符.合法字符为a-z, A-Z, 0-9, /,
 msgid "The login name of your IMAP user who has rights to create/delete mailboxes."
 msgstr "有权限来建立或删除邮箱的IMAP登录名."
 
-#: ../help/help.inc:193
+#: ../help/help.inc:201
 msgid "The mail text of all password mails."
 msgstr "密码邮寄时的邮件文本"
 
+#: ../lib/modules/passwordSelfReset.inc:106
+#: ../lib/modules/passwordSelfReset.inc:116
+msgid "The mail text of the mails."
+msgstr "邮件文本"
+
 #: ../lib/modules/asteriskVoicemail.inc:201
 msgid "The mailbox format is invalid."
 msgstr "邮箱格式不合法."
 
-#: ../lib/modules/dhcp_settings.inc:285
-#: ../lib/modules/dhcp_settings.inc:286
+#: ../lib/modules/dhcp_settings.inc:296
+#: ../lib/modules/dhcp_settings.inc:297
 msgid "The maximum lease time is invalid."
 msgstr "最长释放时间非法."
 
-#: ../lib/modules/dhcp_settings.inc:134
+#: ../lib/modules/dhcp_settings.inc:137
 msgid "The maximum lease time specifies after how many seconds the client must request a new IP address."
 msgstr "指定客户端必须重新申请新IP地址的最长释放时间."
 
-#: ../lib/modules.inc:863
+#: ../lib/modules.inc:872
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "%s模块未启动."
@@ -9595,7 +9862,7 @@ msgstr "%s模块未启动."
 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
+#: ../lib/modules/asteriskExtension.inc:103
 msgid "The name of a command to execute. The available commands may be listed at the Asterisk command line by executing \"core show applications\"."
 msgstr "将要运行的命令的名字.在Asterisk 命令行运行\"core show applications\"将列出所有有效的命令"
 
@@ -9603,7 +9870,7 @@ msgstr "将要运行的命令的名字.在Asterisk 命令行运行\"core show ap
 msgid "The name of the PC."
 msgstr "PC机器名."
 
-#: ../lib/modules/asteriskExtension.inc:87
+#: ../lib/modules/asteriskExtension.inc:95
 msgid "The name of the extension (e.g. voicemail or sip)."
 msgstr "扩展的名字(比如:voicemail 或 sip)."
 
@@ -9611,7 +9878,7 @@ msgstr "扩展的名字(比如:voicemail 或 sip)."
 msgid "The name of the server where the mailbox is located."
 msgstr "邮箱所在服务器名."
 
-#: ../lib/modules/dhcp_settings.inc:128
+#: ../lib/modules/dhcp_settings.inc:129
 msgid "The name of the subnet. Example: 192.168.10.0"
 msgstr "子网名称.比如: 192.168.10.0"
 
@@ -9623,7 +9890,7 @@ msgstr "WINDOWS域名或工作组名."
 msgid "The net mask for the IP address."
 msgstr "IP地址的网络掩码."
 
-#: ../lib/modules/dhcp_settings.inc:164
+#: ../lib/modules/dhcp_settings.inc:173
 msgid "The net mask is derived from the subnet mask. LAM will calculate it automatically."
 msgstr "网络掩码与子网掩码密切相关,LAM将会计算得出."
 
@@ -9632,7 +9899,7 @@ msgstr "网络掩码与子网掩码密切相关,LAM将会计算得出."
 msgid "The net mask is invalid."
 msgstr "子网掩码非法."
 
-#: ../lib/modules.inc:1063
+#: ../lib/modules.inc:1088
 msgid "The new password will be stored in the directory after you save this account."
 msgstr "保存帐号后新密码同时保存到目录服务器."
 
@@ -9640,7 +9907,7 @@ msgstr "保存帐号后新密码同时保存到目录服务器."
 msgid "The number of milliseconds for the last qualify."
 msgstr "上一次合格的微秒数"
 
-#: ../help/help.inc:111
+#: ../help/help.inc:115
 msgid "The number of users who may login to LAM is restricted. This can be either a fixed list of DNs or LAM can search LDAP to find a DN which matches the given user name."
 msgstr "可以登录LAM的用户数量受限,或是DN的固定列表数量受限,还可能是LAM在LDAP中搜索给定用户名的DN数量受限."
 
@@ -9649,12 +9916,12 @@ msgstr "可以登录LAM的用户数量受限,或是DN的固定列表数量受限
 msgid "The object class %s is not supported by your LDAP server."
 msgstr "在你的LDAP服务器中对象类%s不被支持。"
 
-#: ../lib/modules/inetOrgPerson.inc:682
+#: ../lib/modules/inetOrgPerson.inc:750
 msgid "The office name of the user (e.g. YourCompany, Human Resources)."
 msgstr "用户的办公室名(比如:某某公司,人力资源部)"
 
-#: ../templates/selfService/selfServiceMain.php:266
-#: ../lib/modules.inc:1622
+#: ../templates/selfService/selfServiceMain.php:278
+#: ../lib/modules.inc:1672
 msgid "The operation was stopped because of the above errors."
 msgstr "由于发生了以上错误，操作中止."
 
@@ -9677,6 +9944,14 @@ msgstr "此组的拥有者."
 msgid "The pager number has bad format."
 msgstr "呼号的格式不正确."
 
+#: ../lib/modules/heimdalKerberos.inc:91
+msgid "The parameter @@password@@ will be replaced with the new password."
+msgstr "参数 @@password@@ 将会被新密码代替"
+
+#: ../lib/modules/heimdalKerberos.inc:90
+msgid "The parameter @@principal@@ will be replaced with the principal name."
+msgstr "参数 @@principal@@ 会被主要的名字代替."
+
 #: ../templates/config/confsave.php:71
 #: ../templates/config/confmain.php:72
 #: ../templates/config/mainlogin.php:59
@@ -9718,19 +9993,18 @@ msgstr "密码强度不够.最少需要%s个大写字母字符."
 msgid "The password of your IMAP admin user. The login name for the IMAP admin user is stored in the LAM server profile."
 msgstr "IMAP管理员用户的密码.IMAP管理员用户登录名保存在LAM服务器的配置中."
 
-#: ../lib/modules.inc:1025
+#: ../templates/lists/changePassword.php:401
+#: ../lib/modules.inc:1045
 msgid "The password was set to:"
 msgstr "密码被设置为:"
 
-#: ../templates/lists/changePassword.php:382
-msgid "The password(s) were set to:"
-msgstr "密码被设置为:"
-
-#: ../lib/modules/inetOrgPerson.inc:614
+#: ../lib/modules/inetOrgPerson.inc:638
+#: ../lib/modules/inetOrgPerson.inc:642
 msgid "The post office box of the user's address."
 msgstr "用户地址的邮箱."
 
-#: ../lib/modules/inetOrgPerson.inc:618
+#: ../lib/modules/inetOrgPerson.inc:646
+#: ../lib/modules/inetOrgPerson.inc:650
 msgid "The postal code of the user's address."
 msgstr "用户地址的邮政编码"
 
@@ -9746,7 +10020,7 @@ msgstr "该主机所属的主组名."
 msgid "The primary group the user should be member of."
 msgstr "该用户所属的主组名."
 
-#: ../lib/modules/asteriskExtension.inc:91
+#: ../lib/modules/asteriskExtension.inc:99
 msgid "The priority is a sequence number used to order the execution of commands. Commands are executed beginning with the lowest sequence number."
 msgstr "优先级是一个序号,用来表示运行命令的顺序.最小的序号代表的命令会最先运行."
 
@@ -9758,7 +10032,7 @@ msgstr "此范围与其它范围冲突."
 msgid "The range end needs to be greater than the range start."
 msgstr "范围的终止地址需要大于起始地址."
 
-#: ../lib/modules/inetOrgPerson.inc:662
+#: ../lib/modules/inetOrgPerson.inc:722
 msgid "The room number of the employee's office."
 msgstr "雇员办公室房间号码"
 
@@ -9772,9 +10046,10 @@ msgid "The scripts will be run on your web server in the user context of your we
 msgstr "在web服务器中运行的与用户语境相关的脚本(比如:apache/www-data)."
 
 #: ../lib/modules/asteriskAccount.inc:235
+#: ../lib/modules/zarafaGroup.inc:99
 #: ../lib/modules/sambaSamAccount.inc:375
-#: ../lib/modules/zarafaUser.inc:117
-#: ../lib/modules/inetOrgPerson.inc:690
+#: ../lib/modules/zarafaUser.inc:118
+#: ../lib/modules/inetOrgPerson.inc:762
 #: ../lib/modules/freeRadius.inc:105
 msgid "The selected options will not be managed inside LAM. You can use this to reduce the number of displayed input fields."
 msgstr "选中项将不被LAM所管理,可以用此来减少所显示的输入框个数."
@@ -9787,7 +10062,8 @@ msgstr "源DN与目标DN相同"
 msgid "The starting IP address of the range."
 msgstr "范围的起始IP地址."
 
-#: ../lib/modules/inetOrgPerson.inc:674
+#: ../lib/modules/inetOrgPerson.inc:738
+#: ../lib/modules/inetOrgPerson.inc:742
 msgid "The state where the user resides or works."
 msgstr "用户居住或工作地点."
 
@@ -9795,29 +10071,34 @@ msgstr "用户居住或工作地点."
 msgid "The static text must contain at least one character."
 msgstr "静态文本至少包含一个字符."
 
-#: ../lib/modules/inetOrgPerson.inc:610
+#: ../lib/modules/inetOrgPerson.inc:630
+#: ../lib/modules/inetOrgPerson.inc:634
 msgid "The street name of the user's address."
 msgstr "用户地址的街道名"
 
-#: ../help/help.inc:191
+#: ../help/help.inc:199
 msgid "The subject of all password mails."
 msgstr "密码邮件的主题."
 
-#: ../lib/modules/dhcp_settings.inc:273
+#: ../lib/modules/passwordSelfReset.inc:102
+msgid "The subject of the mails."
+msgstr "邮件主题."
+
+#: ../lib/modules/dhcp_settings.inc:284
 msgid "The subnet is already in use."
 msgstr "子网掩码已经被占用."
 
-#: ../lib/modules/dhcp_settings.inc:274
-#: ../lib/modules/dhcp_settings.inc:275
+#: ../lib/modules/dhcp_settings.inc:285
+#: ../lib/modules/dhcp_settings.inc:286
 msgid "The subnet is invalid."
 msgstr "子网非法"
 
-#: ../lib/modules/dhcp_settings.inc:287
-#: ../lib/modules/dhcp_settings.inc:288
+#: ../lib/modules/dhcp_settings.inc:298
+#: ../lib/modules/dhcp_settings.inc:299
 msgid "The subnet mask is invalid."
 msgstr "子网掩码非法"
 
-#: ../lib/modules/dhcp_settings.inc:161
+#: ../lib/modules/dhcp_settings.inc:169
 msgid "The subnet mask of the network."
 msgstr "网络的子网掩码."
 
@@ -9835,11 +10116,11 @@ msgstr "sudo命令以这个用户的身份运行(比如:root)."
 msgid "The url attribute value should begin with file://."
 msgstr "URL属性值必须以file://开始"
 
-#: ../lib/modules/zarafaUser.inc:97
+#: ../lib/modules/zarafaUser.inc:98
 msgid "The user account is non-active and login is disabled."
 msgstr "用户帐号被锁定,不能登录."
 
-#: ../lib/modules/zarafaUser.inc:77
+#: ../lib/modules/zarafaUser.inc:78
 msgid "The user will get warned when his mailbox reaches this limit."
 msgstr "当邮箱到达这个权限值时,用户会收到告警."
 
@@ -9847,34 +10128,45 @@ msgstr "当邮箱到达这个权限值时,用户会收到告警."
 msgid "The user's call groups."
 msgstr "用户呼叫组"
 
-#: ../lib/modules/inetOrgPerson.inc:642
+#: ../lib/modules/inetOrgPerson.inc:686
+#: ../lib/modules/inetOrgPerson.inc:690
 msgid "The user's email address."
 msgstr "用户邮件的地址."
 
-#: ../lib/modules/inetOrgPerson.inc:638
+#: ../lib/modules/inetOrgPerson.inc:678
+#: ../lib/modules/inetOrgPerson.inc:682
 msgid "The user's fax number."
 msgstr "用户的传真号."
 
-#: ../lib/modules/inetOrgPerson.inc:634
+#: ../lib/modules/inetOrgPerson.inc:670
+#: ../lib/modules/inetOrgPerson.inc:674
 msgid "The user's mobile number."
 msgstr "用户的手机号."
 
-#: ../lib/modules/inetOrgPerson.inc:698
+#: ../lib/modules/inetOrgPerson.inc:770
+#: ../lib/modules/inetOrgPerson.inc:774
 msgid "The user's organisation name."
 msgstr "用户的组织名."
 
-#: ../lib/modules/inetOrgPerson.inc:658
+#: ../lib/modules/inetOrgPerson.inc:714
+#: ../lib/modules/inetOrgPerson.inc:718
 msgid "The user's private telephone number."
 msgstr "用户的个人电话号码."
 
-#: ../lib/modules/inetOrgPerson.inc:630
+#: ../lib/modules/inetOrgPerson.inc:662
+#: ../lib/modules/inetOrgPerson.inc:666
 msgid "The user's telephone number."
 msgstr "用户的电话"
 
-#: ../lib/modules/inetOrgPerson.inc:702
+#: ../lib/modules/inetOrgPerson.inc:778
 msgid "The user's unique employee number."
 msgstr "用户的唯一雇员号"
 
+#: ../lib/modules/inetOrgPerson.inc:694
+#: ../lib/modules/inetOrgPerson.inc:698
+msgid "The user's web site (e.g. http://www.company.com)."
+msgstr "用户的web网站(比如,http://www.company.com)."
+
 #: ../lib/modules/sambaSamAccount.inc:112
 msgid "The value for the Samba 3 field \"User can/must change password\" needs to be a number."
 msgstr "Samba 3 的 \"用户可以/必须修改密码\" 的取值必须是一个数字."
@@ -9889,16 +10181,21 @@ msgstr "语音邮件的语境名非法."
 msgid "The were no attributes marked as an RDN attribute."
 msgstr "没有被标记为RDN的属性"
 
-#: ../help/help.inc:196
+#: ../lib/modules/passwordSelfReset.inc:108
+#: ../help/help.inc:204
 msgid "The wildcard for the new password is @@newPassword@@."
 msgstr "新密码的通配符为@@newPassword@@."
 
+#: ../lib/modules/passwordSelfReset.inc:118
+msgid "The wildcard for the reset link is @@resetLink@@."
+msgstr "复位连接的通配符 @@resetLink@@."
+
 #: ../templates/3rdParty/pla/htdocs/modify_member_form.php:60
 #, php-format
 msgid "There are <b>%s</b> members in group <b>%s</b>:"
 msgstr "共有<b>%s</b>个用户中在组<b>%s</b>中:"
 
-#: ../lib/modules/posixGroup.inc:488
+#: ../lib/modules/posixGroup.inc:498
 msgid "There are still users who have this group as their primary group."
 msgstr "仍有用户的主组为本组."
 
@@ -9906,7 +10203,7 @@ msgstr "仍有用户的主组为本组."
 msgid "There can be only one group of this type."
 msgstr "只能有一种本类型组."
 
-#: ../lib/modules/asteriskAccount.inc:621
+#: ../lib/modules/asteriskAccount.inc:619
 msgid "There is already another user with this caller ID."
 msgstr "已经有其他的帐号使用这个拨号ID."
 
@@ -9914,7 +10211,7 @@ msgstr "已经有其他的帐号使用这个拨号ID."
 msgid "There is already another user with this mailbox name."
 msgstr "已经有其他的帐号使用这个邮箱名."
 
-#: ../templates/massDoUpload.php:129
+#: ../templates/massDoUpload.php:226
 msgid "There were errors while uploading:"
 msgstr "上传时发生错误."
 
@@ -9923,7 +10220,7 @@ msgstr "上传时发生错误."
 msgid "There will be %s updates done with this mass update"
 msgstr "在这次批量更新中将有%s个更新"
 
-#: ../lib/modules/posixGroup.inc:407
+#: ../lib/modules/posixGroup.inc:417
 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."
 
@@ -9940,7 +10237,7 @@ msgstr "建立新用户帐号时所使用的最大和最小UID号,UID范围不
 msgid "These entries specify the members of the netgroup. You can limit the set to a host name, a user name, a domain name or any combination of them."
 msgstr "这些条目指定了网络组的成员.您可以指定一个主机名集,或一个用户名集,或一个域名集,或上述的任意组合."
 
-#: ../lib/modules/asteriskExtension.inc:107
+#: ../lib/modules/asteriskExtension.inc:115
 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 帐号或所有用户。在标准用户后缀树以外的后缀树中，查询用户也是可以的。"
 
@@ -9948,7 +10245,7 @@ msgstr "这个选项改变以下其它的扩展属主列表。你可以选择来
 msgid "This GID number is invalid! Please provide either a number or a group name."
 msgstr "GID号非法!请提供新号或组名."
 
-#: ../help/help.inc:183
+#: ../help/help.inc:191
 msgid "This HTML code will be placed on top of all self service pages. E.g. you can use this to place your custom logo. Any HTML code is permitted."
 msgstr "这些HTML代码将显示在自助服务主页的上端,比如可以在此放在贵公司标志,可以输入任何HTML代码."
 
@@ -9976,22 +10273,30 @@ msgstr "必要的属性"
 msgid "This attribute is required for the RDN."
 msgstr "RDN的必要的属性."
 
-#: ../lib/modules/inetOrgPerson.inc:678
+#: ../lib/modules/inetOrgPerson.inc:746
 msgid "This can be used to specify if the user has a car license."
 msgstr "用来指定用户是否拥有汽车执照."
 
-#: ../help/help.inc:125
+#: ../templates/3rdParty/pla/htdocs/add_oclass_form.php:64
+msgid "This change requires to add new attributes."
+msgstr "这次修改需要增加新的属性."
+
+#: ../help/help.inc:131
 msgid "This changes the password of the selected profile."
 msgstr "改变设置文件的密码."
 
-#: ../help/help.inc:127
+#: ../help/help.inc:133
 msgid "This changes the profile which is selected by default at login."
 msgstr "改变缺省登录使用的配置文件."
 
-#: ../templates/massBuildAccounts.php:150
+#: ../templates/massBuildAccounts.php:153
 msgid "This column is defined to include unique entries but duplicates were found:"
 msgstr "本列不能有重复的条目,但发现了下列重复条目:"
 
+#: ../lib/modules/heimdalKerberos.inc:89
+msgid "This command will be called to change the Kerberos password. Usually, it should look similar to \"/usr/sbin/kadmin -K /etc/heimdal/apache.keytab -p admin/admin passwd -p @@password@@ @@principal@@\"."
+msgstr "修改Kerberos密码的命令,很有可能是\"/usr/sbin/kadmin -K /etc/heimdal/apache.keytab -p admin/admin passwd -p @@password@@ @@principal@@\"."
+
 #: ../lib/modules/customScripts.inc:111
 msgid "This custom script setting includes an invalid account type."
 msgstr "自定义脚本设置中包含一个非法的帐号类型."
@@ -10001,15 +10306,15 @@ msgstr "自定义脚本设置中包含一个非法的帐号类型."
 msgid "This custom script setting includes an invalid action type."
 msgstr "自定义脚本设置中包含一个非法的动作类型"
 
-#: ../help/help.inc:92
+#: ../help/help.inc:96
 msgid "This defines the language of the login window and sets this language as the default language. Users can change the language at login."
 msgstr "设置登录语言和默认语言.用户可以在登录时更改."
 
-#: ../help/help.inc:109
+#: ../help/help.inc:113
 msgid "This defines the rights for the home directories which are created by lamdaemon."
 msgstr "设置lamdaemon建立的用户目录的权限."
 
-#: ../lib/modules/asteriskExtension.inc:79
+#: ../lib/modules/asteriskExtension.inc:87
 msgid "This defines what application Asterisk has to start for this user (e.g. SIP/user1)."
 msgstr "定义为这个用户启动的Asterisk 应用(比如:SIP/user1)."
 
@@ -10026,22 +10331,27 @@ msgstr "描述设备所在地点."
 msgid "This describes the location of the host."
 msgstr "描述主机所在地点."
 
-#: ../lib/modules/inetOrgPerson.inc:670
+#: ../lib/modules/inetOrgPerson.inc:730
+#: ../lib/modules/inetOrgPerson.inc:734
 msgid "This describes the location of the user."
 msgstr "描述用户所在地点."
 
-#: ../lib/lamPDF.inc:114
+#: ../lib/lamPDF.inc:118
 msgid "This document was automatically created by LDAP Account Manager"
 msgstr "本文件由本系统自动产生."
 
-#: ../help/help.inc:200
+#: ../help/help.inc:208
 msgid "This email address will be set as reply-to address of all password mails."
 msgstr "这个邮件地址会被设定为密码邮件的发件人地址."
 
-#: ../help/help.inc:189
+#: ../help/help.inc:197
 msgid "This email address will be set as sender address of all password mails. If empty the system default (php.ini) will be used."
 msgstr "这个邮件地址会被设定为密码邮件的发件人地址.如果为空,刚使用phi.ini指定的缺省值."
 
+#: ../lib/modules/passwordSelfReset.inc:98
+msgid "This email address will be set as sender address of the mails. If empty the system default (php.ini) will be used."
+msgstr "这个邮件地址会被设定为邮件的发件人地址.如果为空,刚使用phi.ini指定的缺省值."
+
 #: ../lib/modules/passwordSelfReset.inc:78
 msgid "This enables the password self reset function."
 msgstr "打开密码自助复位功能."
@@ -10091,7 +10401,7 @@ msgstr "这是以逗号分隔的收件人列表."
 msgid "This is a comma separated list of the users public email addresses."
 msgstr "这是逗号分隔的用户公开邮件地址."
 
-#: ../help/help.inc:141
+#: ../help/help.inc:147
 msgid "This is a list of IP addresses from hosts who may access LAM. You can use \"*\" as wildcard (e.g. 192.168.0.*)."
 msgstr "这是可以访问本系统的IP地址列表,你可以使用\"*\" 代表多台主机,(例如192.168.0.*)."
 
@@ -10107,11 +10417,11 @@ msgstr "这是以分号分隔的本组用户列表."
 msgid "This is a list of nick names for this user."
 msgstr "这是该用户的昵称列表."
 
-#: ../help/help.inc:105
+#: ../help/help.inc:109
 msgid "This is a list of the servers where the lamdaemon scripts are stored. LDAP Account Manager will make a SSH connection to the servers with the user name and password provided at login. Multiple servers are separated by semicolons. You can append a descriptive name after a colon."
 msgstr "这是lamdaemon指令所在的服务器列表.本系统将用户登录时提供的用户名和密码,通过SSH连接这台服务器.服务器列表以分号分隔.可以在冒号号添加一些说明."
 
-#: ../help/help.inc:85
+#: ../help/help.inc:89
 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."
 
@@ -10124,7 +10434,7 @@ msgstr "这是一个不能被删除的结构化对象类"
 msgid "This is an optional description for this entry."
 msgstr "可以输入此条目的描述(可选)"
 
-#: ../help/help.inc:171
+#: ../help/help.inc:179
 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这个条件来搜索帐号."
 
@@ -10175,7 +10485,8 @@ msgstr "设备的网卡的IP地址(比如:123.123.123.123)."
 msgid "This is the LDAP DN of the host's manager."
 msgstr "主机管理员的LDAP DB"
 
-#: ../lib/modules/inetOrgPerson.inc:606
+#: ../lib/modules/inetOrgPerson.inc:622
+#: ../lib/modules/inetOrgPerson.inc:626
 msgid "This is the LDAP DN of the user's manager. Use this property to represent hierarchies in your company."
 msgstr "用户管理员的LDAP DN.显示您在公司的阶层."
 
@@ -10187,10 +10498,14 @@ msgstr "网卡的MAC地址(比如:00:01:02:DE:EF:18)."
 msgid "This is the SID of the user's primary Windows group."
 msgstr "用户Windows主组的SID."
 
-#: ../help/help.inc:94
+#: ../help/help.inc:98
 msgid "This is the absolute path to an external script for setting quotas and creating home directories."
 msgstr "这是设置硬盘配额和建立主目录的外部脚本所在的绝对路径."
 
+#: ../lib/modules/heimdalKerberos.inc:95
+msgid "This is the account's Kerberos password."
+msgstr "帐号在Kerberos中的密码."
+
 #: ../lib/modules/sambaSamAccount.inc:240
 msgid "This is the account's Windows password."
 msgstr "帐号在Windows中的密码."
@@ -10207,8 +10522,11 @@ msgstr "本帐号正在使用的帐号策略。"
 msgid "This is the answer to the security question. It allows users to reset their password."
 msgstr "用户的安全提问,用于用户复位密码."
 
+#: ../lib/modules/heimdalKerberos.inc:73
+msgid "This is the date when the account will expire."
+msgstr "这是帐号过期日期"
+
 #: ../lib/modules/sambaSamAccount.inc:324
-#: ../lib/modules/phpGroupwareUser.inc:83
 #: ../lib/modules/shadowAccount.inc:185
 msgid "This is the date when the account will expire. Format: DD-MM-YYYY"
 msgstr "帐号过期日期: DD-MM-YYYY"
@@ -10221,7 +10539,7 @@ msgstr "这是用户更改密码的日期.如果指定了密码最长有效期,
 msgid "This is the group name which will be shown in Windows."
 msgstr "显示在Windows系统中的组名."
 
-#: ../help/help.inc:149
+#: ../help/help.inc:155
 msgid "This is the identifier for the relative DN value. It must be one of the given allowed LDAP attributes (e.g. user accounts usually use \"uid\" while groups use \"cn\")."
 msgstr "RDN值的标志.必须是您LDAP属性中的一个值(比如,用户帐号经常使用\"uid\",而组名经常使用\"cn\"))"
 
@@ -10229,7 +10547,7 @@ msgstr "RDN值的标志.必须是您LDAP属性中的一个值(比如,用户帐
 msgid "This is the label for the link to the password self reset. If empty \"Forgot password?\" will be used."
 msgstr "连接到密码自助复位的标志.留空使用\"密码遗忘?\"."
 
-#: ../help/help.inc:80
+#: ../help/help.inc:84
 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\".用分号隔离多个条目."
 
@@ -10254,7 +10572,7 @@ msgstr "组名."
 msgid "This is the natural name of the host. If empty, the host name will be used."
 msgstr "主机帐号的自然名(natural name).留空使用主机名."
 
-#: ../lib/modules/inetOrgPerson.inc:646
+#: ../lib/modules/inetOrgPerson.inc:702
 msgid "This is the natural name of the user. If empty, the first and last name is used."
 msgstr "用户自然名,留空会使用姓名."
 
@@ -10270,7 +10588,7 @@ msgstr "在帐号被锁定前失败的登录次数(0-999)，0代表不限制。"
 msgid "This is the number of passwords which are saved to prevent that users reuse old passwords."
 msgstr "为防止用户使用旧的密码而保存的历史密码数量."
 
-#: ../help/help.inc:90
+#: ../help/help.inc:94
 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 "显示帐号中的行数，如果搜索到更多的行数会分页显示."
 
@@ -10290,15 +10608,15 @@ msgstr "Windows帐号的关联ID.可以输入一个数字或以下特殊帐号:"
 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."
 
-#: ../help/help.inc:55
+#: ../help/help.inc:59
 msgid "This is the server address of your LDAP server. Use ldap:// for unencrypted LDAP connections or TLS encrypted connections. LDAP+SSL (LDAPS) encrypted connections are specified with ldaps://. The port value is optional."
 msgstr "LDAP服务器地址,使用ldap://的格式用于非加密LDAP连接或TLS加密连接,LDAP+SSL(LDAPS)加密连接使用特殊的ldap://格式.端口号可选."
 
-#: ../help/help.inc:74
+#: ../help/help.inc:78
 msgid "This is the suffix for the LDAP tree viewer."
 msgstr "LDAP树状显示的后缀."
 
-#: ../help/help.inc:68
+#: ../help/help.inc:72
 msgid "This is the suffix of the LDAP tree from where to search for LDAP entries. Only entries in this subtree will be displayed in the account list. When creating a new accont this will be the DN where it is saved."
 msgstr "搜索LDAP时的LDAP树后缀.只有在这个子树下的条目被显示.当建立一个新帐号时,这是新帐号存在的DN位置."
 
@@ -10316,11 +10634,11 @@ msgstr "此别名条件的实际名."
 msgid "This is the time (in minutes) for which the user may not log in after the account was locked. -1 means forever."
 msgstr "用户帐号被锁定后用户不能登录的时间(分钟),-1表示永久."
 
-#: ../help/help.inc:135
+#: ../help/help.inc:141
 msgid "This is the time (in minutes) of inactivity after which a user is automatically logged off."
 msgstr "在自动退出前,用户不活动时间(分钟)."
 
-#: ../help/help.inc:98
+#: ../help/help.inc:102
 msgid "This is the time in minutes which LAM caches its LDAP searches. Shorter times will stress LDAP more but decrease the possibility that changes are not identified."
 msgstr "LAM缓存有效时间(分钟),较短的时间会增加LDAP压力,但减少了数据不一致的可能."
 
@@ -10340,7 +10658,7 @@ msgstr "用户的Windows主要组."
 msgid "This is typically used to allow incoming calls (e.g. from FWD) while having a type=friend entry defined with username and password."
 msgstr "当使用账号和密码定义type=friend时,此项设置用来允许呼入."
 
-#: ../lib/modules/zarafaUser.inc:101
+#: ../lib/modules/zarafaUser.inc:102
 msgid "This is used to mark this account as resource."
 msgstr "用来标识此账号是一个资源"
 
@@ -10372,7 +10690,7 @@ msgstr "允许帐号登录的时间."
 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:197
+#: ../lib/modules/asteriskExtension.inc:184
 msgid "This pair of extension name and priority already exists."
 msgstr "扩展名和优先级的配对已经存在!"
 
@@ -10388,15 +10706,15 @@ msgstr "这里指定断开连接的策略。"
 msgid "This specifies what to do when the client connection is broken."
 msgstr "这里指定客户连接中断的动作。"
 
-#: ../help/help.inc:175
+#: ../help/help.inc:183
 msgid "This text is displayed on top of the self service login page. You can also input HTML code here."
 msgstr "这些文本显示在自助服务登录面的上端.你可以在此输入HTML代码."
 
-#: ../help/help.inc:177
+#: ../help/help.inc:185
 msgid "This text is displayed on top of the self service main page. You can also input HTML code here."
 msgstr "这些文本显示在自助服务主页的上端,可以在此输入HTML代码."
 
-#: ../help/help.inc:173
+#: ../help/help.inc:181
 msgid "This text should shortly describe your selected LDAP search attribute (e.g. email or user name)."
 msgstr "这些文本简短描述了您所选的LDAP搜索属性(比如邮件或用户名)."
 
@@ -10409,15 +10727,17 @@ msgstr "本工具可以让用户自定义PDF页面."
 msgid "This user was not found!"
 msgstr "用户未找到!"
 
-#: ../lib/modules/zarafaUser.inc:392
+#: ../lib/modules/zarafaUser.inc:415
 msgid "This value can only be \"Room\" or \"Equipment\"."
 msgstr "此值只能设为 \"Room\" 或 \"Equipment\"."
 
 #: ../lib/modules/zarafaDynamicGroup.inc:178
 #: ../lib/modules/zarafaDynamicGroup.inc:179
-#: ../lib/modules/zarafaGroup.inc:141
-#: ../lib/modules/zarafaGroup.inc:142
-#: ../lib/modules/zarafaGroup.inc:143
+#: ../lib/modules/zarafaContact.inc:161
+#: ../lib/modules/zarafaContact.inc:162
+#: ../lib/modules/zarafaGroup.inc:191
+#: ../lib/modules/zarafaGroup.inc:192
+#: ../lib/modules/zarafaGroup.inc:193
 #: ../lib/modules/zarafaAddressList.inc:146
 #: ../lib/modules/zarafaAddressList.inc:147
 #: ../lib/modules/sambaSamAccount.inc:102
@@ -10425,26 +10745,26 @@ msgstr "此值只能设为 \"Room\" 或 \"Equipment\"."
 #: ../lib/modules/sambaSamAccount.inc:104
 #: ../lib/modules/sambaSamAccount.inc:105
 #: ../lib/modules/posixAccount.inc:102
-#: ../lib/modules/zarafaUser.inc:399
-#: ../lib/modules/zarafaUser.inc:401
-#: ../lib/modules/zarafaUser.inc:402
-#: ../lib/modules/zarafaUser.inc:403
-#: ../lib/modules/zarafaUser.inc:404
-#: ../lib/modules/zarafaUser.inc:405
+#: ../lib/modules/zarafaUser.inc:422
+#: ../lib/modules/zarafaUser.inc:424
+#: ../lib/modules/zarafaUser.inc:425
+#: ../lib/modules/zarafaUser.inc:426
+#: ../lib/modules/zarafaUser.inc:427
+#: ../lib/modules/zarafaUser.inc:428
 #: ../lib/modules/ppolicyUser.inc:86
 #: ../lib/modules/zarafaServer.inc:126
 msgid "This value can only be \"true\" or \"false\"."
 msgstr "此值只能设为 \"true\" 或 \"false\"."
 
-#: ../lib/modules/zarafaUser.inc:400
+#: ../lib/modules/zarafaUser.inc:423
 msgid "This value can only be \"true\", \"false\" or \"system\"."
 msgstr "此值只能设为\"true\", \"false\" or \"system\"."
 
-#: ../lib/modules/posixGroup.inc:487
+#: ../lib/modules/posixGroup.inc:497
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "此值必须是用分号分开的用户名列表."
 
-#: ../help/help.inc:204
+#: ../help/help.inc:212
 msgid "This will create a new organisational unit under the selected one."
 msgstr "在所选的节点下建立新的组织单元."
 
@@ -10452,20 +10772,20 @@ msgstr "在所选的节点下建立新的组织单元."
 msgid "This will create the user's home directory on the specified server."
 msgstr "将在指定的服务器上建立用户的主目录."
 
-#: ../help/help.inc:206
+#: ../help/help.inc:214
 msgid "This will delete the selected organisational unit. The OU has to be empty."
 msgstr "将删除所选的组织单元.组织单元必须为空."
 
-#: ../help/help.inc:123
+#: ../help/help.inc:129
 msgid "This will delete the selected profile."
 msgstr "将删除所选的配置文件."
 
+#: ../lib/modules/zarafaContact.inc:78
 #: ../lib/modules/eduPerson.inc:130
 #: ../lib/modules/sambaSamAccount.inc:378
-#: ../lib/modules/zarafaUser.inc:121
-#: ../lib/modules/phpGroupwareUser.inc:87
+#: ../lib/modules/zarafaUser.inc:122
 #: ../lib/modules/shadowAccount.inc:189
-#: ../lib/modules/authorizedServiceObject.inc:82
+#: ../lib/modules/authorizedServiceObject.inc:83
 #: ../lib/modules/hostObject.inc:77
 msgid "This will enable the extension automatically if this profile is loaded."
 msgstr "在配置文件调入时，将自动打开扩展项。"
@@ -10474,11 +10794,11 @@ msgstr "在配置文件调入时，将自动打开扩展项。"
 msgid "This will reset the host's password to a default value."
 msgstr "将主机密码复位到缺省值."
 
-#: ../templates/lists/changePassword.php:215
+#: ../templates/lists/changePassword.php:233
 msgid "This will set a random password and display it on the screen or send it to the user via mail."
 msgstr "将会生成一个随机的密码并在屏幕上显示或通过邮件发送给用户."
 
-#: ../help/help.inc:187
+#: ../help/help.inc:195
 msgid "This will set a random password and display it on the screen or send it to the user via mail. Please edit your LAM server profile to setup the mail settings."
 msgstr "将会生成一个随机的密码并在屏幕上显示或通过邮件发送给用户。请编辑LAM服务器配置文件来设定邮件的配置."
 
@@ -10486,11 +10806,25 @@ 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:1287
+#: ../lib/modules/sambaSamAccount.inc:1311
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../lib/modules/sambaSamAccount.inc:1309
+#: ../lib/modules/heimdalKerberos.inc:80
+#: ../lib/modules/heimdalKerberos.inc:99
+#: ../lib/modules/heimdalKerberos.inc:134
+#: ../lib/modules/heimdalKerberos.inc:156
+#: ../lib/modules/heimdalKerberos.inc:228
+#: ../lib/modules/heimdalKerberos.inc:492
+msgid "Ticket lifetime"
+msgstr "票证寿命"
+
+#: ../lib/modules/heimdalKerberos.inc:177
+#: ../lib/modules/heimdalKerberos.inc:178
+msgid "Ticket lifetime must be a number."
+msgstr "票证寿命必须是数字!"
+
+#: ../lib/modules/sambaSamAccount.inc:1333
 msgid "Time"
 msgstr "时间"
 
@@ -10516,7 +10850,7 @@ msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "东京,首尔,大孤,雅库茨克"
 
 #: ../templates/tools.php:63
-#: ../templates/main_header.php:129
+#: ../templates/main_header.php:131
 msgid "Tools"
 msgstr "工具"
 
@@ -10537,31 +10871,31 @@ msgstr "所有条目"
 msgid "Translate GID number to group name"
 msgstr "将GID号改为组名"
 
-#: ../templates/config/confmain.php:230
-#: ../help/help.inc:73
+#: ../templates/config/confmain.php:234
+#: ../help/help.inc:77
 msgid "Tree suffix"
 msgstr "树状结构后缀"
 
-#: ../templates/main_header.php:159
+#: ../templates/main_header.php:161
 msgid "Tree view"
 msgstr "树状结构"
 
-#: ../templates/config/confmain.php:458
+#: ../templates/config/confmain.php:475
 msgid "TreeSuffix is invalid!"
 msgstr "树状结构后缀非法!"
 
-#: ../lib/modules/sambaSamAccount.inc:1287
+#: ../lib/modules/sambaSamAccount.inc:1311
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../templates/selfService/profManage.php:175
+#: ../templates/selfService/profManage.php:207
 #: ../templates/schema/schema.php:346
-#: ../lib/modules/zarafaUser.inc:100
-#: ../lib/modules/zarafaUser.inc:166
-#: ../lib/modules/zarafaUser.inc:245
-#: ../lib/modules/zarafaUser.inc:360
-#: ../lib/modules/zarafaUser.inc:513
-#: ../lib/modules/zarafaUser.inc:1204
+#: ../lib/modules/zarafaUser.inc:101
+#: ../lib/modules/zarafaUser.inc:176
+#: ../lib/modules/zarafaUser.inc:257
+#: ../lib/modules/zarafaUser.inc:380
+#: ../lib/modules/zarafaUser.inc:536
+#: ../lib/modules/zarafaUser.inc:1295
 msgid "Type"
 msgstr "类型"
 
@@ -10586,8 +10920,8 @@ msgstr "UID必须是一个数字,必须在配置文件中所定的UID范围内."
 #: ../lib/modules/posixAccount.inc:334
 #: ../lib/modules/posixAccount.inc:338
 #: ../lib/modules/posixAccount.inc:346
-#: ../lib/modules/posixAccount.inc:1092
-#: ../lib/modules/posixAccount.inc:1462
+#: ../lib/modules/posixAccount.inc:1095
+#: ../lib/modules/posixAccount.inc:1468
 msgid "UID number"
 msgstr "UID编号"
 
@@ -10617,7 +10951,11 @@ msgstr "URL"
 msgid "Unable to change ACL on IMAP server for mailbox deletion."
 msgstr "在邮箱删除时无法改变IMAP服务器的ACL."
 
-#: ../templates/selfService/selfServiceMain.php:269
+#: ../lib/modules/heimdalKerberos.inc:778
+msgid "Unable to change Kerberos password."
+msgstr "无法修改kerberos密码"
+
+#: ../templates/selfService/selfServiceMain.php:281
 msgid "Unable to change your account. Maybe you do not have enough rights to change the settings."
 msgstr "无法改变您的帐号,可以没有足够的权限改变设置."
 
@@ -10627,6 +10965,10 @@ msgstr "无法改变您的帐号,可以没有足够的权限改变设置."
 msgid "Unable to connect to remote server!"
 msgstr "无法连接远端服务器 !"
 
+#: ../templates/massDoUpload.php:161
+msgid "Unable to create ZIP file for PDF export."
+msgstr "无法为PDF导出工作建立ZIP文件."
+
 #: ../lib/modules/imapAccess.inc:156
 msgid "Unable to create mailbox on IMAP server."
 msgstr "无法在IMAP服务器上建立邮箱."
@@ -10639,8 +10981,8 @@ msgstr "无法建立新OU!"
 msgid "Unable to create new automount map."
 msgstr "无法建立新的自动映射"
 
-#: ../templates/config/profmanage.php:122
-#: ../templates/selfService/profManage.php:101
+#: ../templates/config/profmanage.php:80
+#: ../templates/selfService/profManage.php:59
 msgid "Unable to create new profile!"
 msgstr "无法建立新的配置文件!"
 
@@ -10661,38 +11003,38 @@ msgstr "删除条目失败,它不存在!"
 msgid "Unable to delete mailbox from IMAP server."
 msgstr "无法在IMAP服务器上删除邮箱."
 
-#: ../templates/config/profmanage.php:150
-#: ../templates/selfService/profManage.php:129
+#: ../templates/config/profmanage.php:108
+#: ../templates/selfService/profManage.php:87
 #: ../templates/profedit/profilemain.php:99
 msgid "Unable to delete profile!"
 msgstr "无法删除配置文件!"
 
-#: ../lib/modules/posixAccount.inc:1666
 #: ../lib/modules/posixAccount.inc:1675
-#: ../lib/modules/posixAccount.inc:1930
+#: ../lib/modules/posixAccount.inc:1684
+#: ../lib/modules/posixAccount.inc:1939
 #: ../lib/modules/nisnetgroup.inc:535
 msgid "Unable to find group in LDAP."
 msgstr "LDAP中找不到组."
 
-#: ../lib/modules/passwordSelfReset.inc:629
-#: ../lib/modules/passwordSelfReset.inc:733
+#: ../lib/modules/passwordSelfReset.inc:711
+#: ../lib/modules/passwordSelfReset.inc:859
 msgid "Unable to find password security question for this account."
 msgstr "找不到这个帐号的密码安全提问."
 
-#: ../templates/login.php:500
 #: ../templates/login.php:506
+#: ../templates/login.php:512
 msgid "Unable to find the user name in LDAP."
 msgstr "LDAP中找不到用户名."
 
-#: ../lib/modules.inc:1378
-#: ../lib/modules.inc:1382
+#: ../lib/modules.inc:1419
+#: ../lib/modules.inc:1423
 msgid "Unable to load LDAP entry:"
 msgstr "无法调入LDAP条目:"
 
 #: ../lib/profiles.inc:91
 #: ../lib/profiles.inc:95
-#: ../lib/selfService.inc:175
-#: ../lib/selfService.inc:179
+#: ../lib/selfService.inc:180
+#: ../lib/selfService.inc:184
 msgid "Unable to load profile!"
 msgstr "无法调入配置文件!"
 
@@ -10705,13 +11047,13 @@ msgstr "无法在IMAP服务器上找到邮箱."
 msgid "Unable to read file."
 msgstr "无法读入文件"
 
-#: ../templates/lists/changePassword.php:488
+#: ../templates/lists/changePassword.php:513
 msgid "Unable to read sambaSID attribute."
 msgstr "读取sambaSID属性失败."
 
-#: ../lib/modules/passwordSelfReset.inc:892
-#: ../lib/modules/passwordSelfReset.inc:896
-#: ../lib/modules/passwordSelfReset.inc:905
+#: ../lib/modules/passwordSelfReset.inc:1052
+#: ../lib/modules/passwordSelfReset.inc:1056
+#: ../lib/modules/passwordSelfReset.inc:1065
 msgid "Unable to reset password."
 msgstr "不能复位密码"
 
@@ -10727,25 +11069,30 @@ msgstr "无法获取图像"
 msgid "Unable to retrieve schema!"
 msgstr "无法获取schema!"
 
-#: ../templates/selfService/adminMain.php:158
+#: ../templates/selfService/adminMain.php:162
 #: ../templates/profedit/profilepage.php:113
 msgid "Unable to save profile!"
 msgstr "无法存储配置文件!"
 
-#: ../templates/lists/changePassword.php:440
+#: ../templates/lists/changePassword.php:459
 msgid "Unable to send mail!"
 msgstr "无法发送邮件!"
 
-#: ../templates/lists/changePassword.php:483
-#: ../templates/lists/changePassword.php:500
+#: ../templates/lists/changePassword.php:508
+#: ../templates/lists/changePassword.php:525
 msgid "Unable to sync the time when the user can/must change his password because no domain was found."
 msgstr "用户可以/必须修改密码时,因域名未发现而不能同步时间."
 
+#: ../lib/modules/passwordSelfReset.inc:761
+#: ../lib/modules/passwordSelfReset.inc:940
+msgid "Unable to verify your password reset request. Please try again."
+msgstr "无法确认您的密码复位请求,请重试."
+
 #: ../templates/serverInfo.php:291
 msgid "Unbind"
 msgstr "解除绑定"
 
-#: ../lib/modules/posixGroup.inc:290
+#: ../lib/modules/posixGroup.inc:300
 #: ../lib/modules/posixAccount.inc:134
 msgid "Unix"
 msgstr "unix"
@@ -10754,7 +11101,7 @@ msgstr "unix"
 msgid "Unix account"
 msgstr "Unix帐号"
 
-#: ../lib/modules/posixAccount.inc:1201
+#: ../lib/modules/posixAccount.inc:1204
 msgid "Unix groups"
 msgstr "Unix组"
 
@@ -10767,21 +11114,18 @@ msgstr "不明的代表地址:%s"
 msgid "Unkown change type"
 msgstr "未知的改变类型"
 
-#: ../templates/lists/changePassword.php:152
-msgid "Unlock Samba account"
-msgstr "解锁Samba账号."
-
+#: ../templates/lists/changePassword.php:153
 #: ../lib/modules/ppolicyUser.inc:135
 msgid "Unlock account"
 msgstr "解锁账号."
 
-#: ../lib/modules/posixGroup.inc:200
-#: ../lib/modules/posixAccount.inc:1156
-#: ../lib/modules/inetOrgPerson.inc:1256
+#: ../lib/modules/posixGroup.inc:210
+#: ../lib/modules/posixAccount.inc:1159
+#: ../lib/modules/inetOrgPerson.inc:1744
 msgid "Unlock password"
 msgstr "解除密码锁定"
 
-#: ../templates/masscreate.php:98
+#: ../templates/masscreate.php:100
 #: ../templates/config/confmodules.php:367
 msgid "Unsolved dependency:"
 msgstr "未解决的依赖性问题:"
@@ -10790,7 +11134,7 @@ msgstr "未解决的依赖性问题:"
 msgid "Up"
 msgstr "向上"
 
-#: ../templates/lists/changePassword.php:155
+#: ../templates/lists/changePassword.php:162
 msgid "Update Samba password timestamps"
 msgstr "修改 Samba 密码时间戳."
 
@@ -10818,15 +11162,15 @@ msgstr "修改值"
 msgid "Updating object"
 msgstr "对象升级中"
 
-#: ../templates/massBuildAccounts.php:199
+#: ../templates/massBuildAccounts.php:214
 msgid "Upload accounts to LDAP"
 msgstr "上传帐号到LDAP"
 
-#: ../templates/masscreate.php:241
+#: ../templates/masscreate.php:265
 msgid "Upload file and create accounts"
 msgstr "开始上传,建立帐号"
 
-#: ../templates/massDoUpload.php:125
+#: ../templates/massDoUpload.php:222
 #: ../lib/lists.inc:925
 msgid "Upload has finished"
 msgstr "上传完毕"
@@ -10844,8 +11188,8 @@ msgstr "运行时间"
 msgid "Usage"
 msgstr "用法"
 
-#: ../lib/modules/authorizedServiceObject.inc:74
-#: ../lib/modules/authorizedServiceObject.inc:78
+#: ../lib/modules/authorizedServiceObject.inc:75
+#: ../lib/modules/authorizedServiceObject.inc:79
 msgid "Use * for all services."
 msgstr "为所有的服务使用*."
 
@@ -10858,8 +11202,8 @@ msgstr "使用unix的密码"
 #: ../lib/modules/sambaSamAccount.inc:251
 #: ../lib/modules/sambaSamAccount.inc:254
 #: ../lib/modules/sambaSamAccount.inc:414
-#: ../lib/modules/sambaSamAccount.inc:1076
-#: ../lib/modules/sambaSamAccount.inc:1490
+#: ../lib/modules/sambaSamAccount.inc:1100
+#: ../lib/modules/sambaSamAccount.inc:1517
 msgid "Use no password"
 msgstr "无需密码"
 
@@ -10868,14 +11212,15 @@ msgid "Use this to hide the caller ID."
 msgstr "使用此项来隐藏呼叫者ID."
 
 #: ../lib/modules/zarafaDynamicGroup.inc:73
+#: ../lib/modules/zarafaContact.inc:62
 #: ../lib/modules/zarafaGroup.inc:76
 #: ../lib/modules/zarafaAddressList.inc:61
-#: ../lib/modules/zarafaUser.inc:65
+#: ../lib/modules/zarafaUser.inc:66
 msgid "Use this to hide this entry from the address book."
 msgstr "使用此项来隐藏地址簿的条目"
 
 #: ../lib/modules/quota.inc:101
-#: ../lib/modules/quota.inc:387
+#: ../lib/modules/quota.inc:390
 msgid "Used blocks"
 msgstr "已使用的块数"
 
@@ -10900,7 +11245,7 @@ msgid "Used for registration context."
 msgstr "在注册语境中使用"
 
 #: ../lib/modules/quota.inc:123
-#: ../lib/modules/quota.inc:391
+#: ../lib/modules/quota.inc:394
 msgid "Used inodes"
 msgstr "已经使用的节点"
 
@@ -10921,6 +11266,7 @@ msgstr "用来限制SIP通讯的主叫或被叫只能来自于某个IP地址或
 msgid "Used to regularly check that a device is still online."
 msgstr "用来定期检查一个设备是否在线"
 
+#: ../lib/types/sudo.inc:78
 #: ../lib/modules/sambaGroupMapping.inc:69
 #: ../lib/modules/nisnetgroup.inc:210
 #: ../lib/modules/nisnetgroup.inc:583
@@ -10938,22 +11284,27 @@ msgstr "用户帐号(例如 Unix, Samba和Kolab)"
 #: ../lib/modules/asteriskAccount.inc:118
 #: ../lib/modules/asteriskAccount.inc:249
 #: ../lib/modules/asteriskAccount.inc:332
-#: ../lib/modules/asteriskAccount.inc:404
-#: ../lib/modules/asteriskAccount.inc:694
-#: ../lib/modules/asteriskAccount.inc:1196
+#: ../lib/modules/asteriskAccount.inc:402
+#: ../lib/modules/asteriskAccount.inc:688
+#: ../lib/modules/asteriskAccount.inc:1194
 msgid "User agent"
 msgstr "用户代理"
 
 #: ../lib/modules/sambaSamAccount.inc:275
-#: ../lib/modules/sambaSamAccount.inc:1090
+#: ../lib/modules/sambaSamAccount.inc:1114
 msgid "User can change password"
 msgstr "用户可以修改密码"
 
+#: ../lib/types/user.inc:197
+#, php-format
+msgid "User count: %s"
+msgstr "帐号总计: %s"
+
 #: ../lib/modules/posixAccount.inc:376
 msgid "User description. If left empty first and last name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名."
 
-#: ../lib/modules/inetOrgPerson.inc:586
+#: ../lib/modules/inetOrgPerson.inc:602
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名"
 
@@ -10966,11 +11317,17 @@ msgid "User modification"
 msgstr "用户修改"
 
 #: ../lib/modules/sambaSamAccount.inc:277
-#: ../lib/modules/sambaSamAccount.inc:1096
+#: ../lib/modules/sambaSamAccount.inc:1120
+#: ../lib/modules/heimdalKerberos.inc:76
+#: ../lib/modules/heimdalKerberos.inc:128
+#: ../lib/modules/heimdalKerberos.inc:155
+#: ../lib/modules/heimdalKerberos.inc:258
+#: ../lib/modules/heimdalKerberos.inc:352
+#: ../lib/modules/heimdalKerberos.inc:488
 msgid "User must change password"
 msgstr "用户必须修改密码"
 
-#: ../templates/lists/changePassword.php:187
+#: ../templates/lists/changePassword.php:198
 #: ../templates/login.php:272
 #: ../lib/types/alias.inc:91
 #: ../lib/types/user.inc:94
@@ -10994,18 +11351,23 @@ msgstr "用户必须修改密码"
 #: ../lib/modules/posixAccount.inc:196
 #: ../lib/modules/posixAccount.inc:313
 #: ../lib/modules/posixAccount.inc:371
-#: ../lib/modules/posixAccount.inc:1083
-#: ../lib/modules/posixAccount.inc:1460
+#: ../lib/modules/posixAccount.inc:1086
+#: ../lib/modules/posixAccount.inc:1466
 #: ../lib/modules/nisnetgroup.inc:142
 #: ../lib/modules/nisnetgroup.inc:472
 #: ../lib/modules/inetOrgPerson.inc:76
-#: ../lib/modules/inetOrgPerson.inc:578
-#: ../lib/modules/inetOrgPerson.inc:649
-#: ../lib/modules/inetOrgPerson.inc:1033
-#: ../lib/modules/inetOrgPerson.inc:1443
-#: ../lib/modules/inetOrgPerson.inc:1569
-#: ../lib/modules/passwordSelfReset.inc:588
-#: ../lib/modules/passwordSelfReset.inc:657
+#: ../lib/modules/inetOrgPerson.inc:594
+#: ../lib/modules/inetOrgPerson.inc:705
+#: ../lib/modules/inetOrgPerson.inc:1215
+#: ../lib/modules/inetOrgPerson.inc:2039
+#: ../lib/modules/inetOrgPerson.inc:2170
+#: ../lib/modules/passwordSelfReset.inc:669
+#: ../lib/modules/passwordSelfReset.inc:776
+#: ../lib/modules/heimdalKerberos.inc:64
+#: ../lib/modules/heimdalKerberos.inc:115
+#: ../lib/modules/heimdalKerberos.inc:153
+#: ../lib/modules/heimdalKerberos.inc:217
+#: ../lib/modules/heimdalKerberos.inc:480
 msgid "User name"
 msgstr "用户名"
 
@@ -11022,16 +11384,22 @@ msgstr "用户名属性"
 #: ../lib/modules/account.inc:117
 #: ../lib/modules/account.inc:118
 #: ../lib/modules/account.inc:120
+#: ../lib/modules/zarafaContact.inc:159
+#: ../lib/modules/zarafaContact.inc:160
 #: ../lib/modules/uidObject.inc:78
+#: ../lib/modules/zarafaGroup.inc:194
+#: ../lib/modules/zarafaGroup.inc:195
 #: ../lib/modules/posixAccount.inc:88
 #: ../lib/modules/posixAccount.inc:93
-#: ../lib/modules/zarafaUser.inc:397
-#: ../lib/modules/zarafaUser.inc:398
+#: ../lib/modules/zarafaUser.inc:420
+#: ../lib/modules/zarafaUser.inc:421
 #: ../lib/modules/nisnetgroup.inc:142
 #: ../lib/modules/inetOrgPerson.inc:76
 #: ../lib/modules/inetOrgPerson.inc:77
-#: ../lib/modules/passwordSelfReset.inc:611
-#: ../lib/modules/passwordSelfReset.inc:715
+#: ../lib/modules/passwordSelfReset.inc:692
+#: ../lib/modules/passwordSelfReset.inc:839
+#: ../lib/modules/heimdalKerberos.inc:173
+#: ../lib/modules/heimdalKerberos.inc:174
 msgid "User name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !"
 msgstr "用户名包含非法字符,只能使用a-z,A-Z,0-9,和 .-_!"
 
@@ -11040,30 +11408,31 @@ msgid "User name in use. Selected next free user name."
 msgstr "用户名存在,请选择其他的用户名."
 
 #: ../lib/modules/account.inc:95
-#: ../lib/modules/posixAccount.inc:372
-#: ../lib/modules/inetOrgPerson.inc:650
-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/inetOrgPerson.inc:706
+#: ../lib/modules/heimdalKerberos.inc:65
+msgid "User name of the user who should be created. Valid characters are: a-z,A-Z,0-9, @.-_."
+msgstr "将要建立的用户名,可用字符为: a-z,A-Z,0-9, @.-_."
 
-#: ../lib/modules/zarafaUser.inc:112
-#: ../lib/modules/zarafaUser.inc:174
-#: ../lib/modules/zarafaUser.inc:282
-#: ../lib/modules/zarafaUser.inc:372
-#: ../lib/modules/zarafaUser.inc:572
-#: ../lib/modules/zarafaUser.inc:1216
-#: ../lib/modules/zarafaUser.inc:1296
+#: ../lib/modules/posixAccount.inc:372
+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."
+msgstr "将要建立的用户名,可用字符为:a-z,A-Z,0-9, @.-_..如果该组名存在,会在组名末尾增加下一个可以使用的数字。"
+
+#: ../lib/modules/zarafaUser.inc:113
+#: ../lib/modules/zarafaUser.inc:184
+#: ../lib/modules/zarafaUser.inc:294
+#: ../lib/modules/zarafaUser.inc:392
+#: ../lib/modules/zarafaUser.inc:615
+#: ../lib/modules/zarafaUser.inc:1307
+#: ../lib/modules/zarafaUser.inc:1396
 msgid "User server"
 msgstr "用户服务器"
 
-#: ../lib/types/sudo.inc:78
-msgid "User(s)"
-msgstr "用户"
-
 #: ../lib/types/user.inc:53
 #: ../lib/modules/posixAccount.inc:67
 #: ../lib/modules/posixAccount.inc:68
 #: ../lib/modules/posixAccount.inc:71
 #: ../lib/modules/posixAccount.inc:166
+#: ../lib/modules/zarafaUser.inc:158
 #: ../lib/modules/sudoRole.inc:63
 #: ../lib/modules/sudoRole.inc:87
 #: ../lib/modules/sudoRole.inc:134
@@ -11074,15 +11443,17 @@ msgstr "用户"
 msgid "Users"
 msgstr "用户"
 
-#: ../lib/modules/zarafaUser.inc:89
+#: ../lib/modules/zarafaContact.inc:70
+#: ../lib/modules/zarafaGroup.inc:84
+#: ../lib/modules/zarafaUser.inc:90
 msgid "Users or groups that may directly send email as this user."
 msgstr "可以用这个用户直接发送邮件的用户或组."
 
-#: ../lib/modules/posixGroup.inc:395
+#: ../lib/modules/posixGroup.inc:405
 msgid "Users who are member of the current group. Users who have set their primary group to this group will not be shown."
 msgstr "当前组成员,这里不会显示将此组设为主要组的用户"
 
-#: ../lib/modules/posixGroup.inc:399
+#: ../lib/modules/posixGroup.inc:409
 msgid "Users who will become member of the current group. User names are separated by semicolons."
 msgstr "属于当前组的用户,以分号隔开."
 
@@ -11104,7 +11475,7 @@ msgstr "通常,用户不作为memberUid加入主组.如果你的应用程序不
 msgid "VCARD 2.1 Export"
 msgstr "VCARD 2.1 导出"
 
-#: ../help/help.inc:84
+#: ../help/help.inc:88
 msgid "Valid users"
 msgstr "合法用户"
 
@@ -11168,13 +11539,13 @@ msgid "Warning"
 msgstr "警告"
 
 #: ../templates/delete.php:216
-#: ../lib/modules/posixAccount.inc:634
-#: ../lib/modules.inc:1686
+#: ../lib/modules/posixAccount.inc:636
+#: ../lib/modules.inc:1741
 #, php-format
 msgid "Was unable to add attributes to DN: %s."
 msgstr "无法为DN: %s增加属性."
 
-#: ../lib/modules.inc:1656
+#: ../lib/modules.inc:1706
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "无法创建DN: %s."
@@ -11185,26 +11556,40 @@ msgstr "无法创建DN: %s."
 msgid "Was unable to delete DN: %s."
 msgstr "无法删除DN: %s."
 
-#: ../templates/lists/changePassword.php:560
+#: ../templates/lists/changePassword.php:610
 #: ../templates/delete.php:207
-#: ../lib/modules.inc:1674
+#: ../lib/modules.inc:1724
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "无法修改DN: %s的属性"
 
 #: ../templates/delete.php:225
-#: ../lib/modules/posixAccount.inc:647
-#: ../lib/modules.inc:1698
+#: ../lib/modules/posixAccount.inc:649
+#: ../lib/modules.inc:1753
 #, php-format
 msgid "Was unable to remove attributes from DN: %s."
 msgstr "无法删除DN: %s的属性."
 
-#: ../lib/modules.inc:1637
+#: ../lib/modules/asteriskExtension.inc:896
+#: ../lib/modules.inc:1687
 #, php-format
 msgid "Was unable to rename DN: %s."
 msgstr "无法重命名DN: %s."
 
-#: ../lib/modules/sambaSamAccount.inc:1287
+#: ../lib/modules/inetOrgPerson.inc:128
+#: ../lib/modules/inetOrgPerson.inc:162
+#: ../lib/modules/inetOrgPerson.inc:280
+#: ../lib/modules/inetOrgPerson.inc:449
+#: ../lib/modules/inetOrgPerson.inc:561
+#: ../lib/modules/inetOrgPerson.inc:693
+#: ../lib/modules/inetOrgPerson.inc:697
+#: ../lib/modules/inetOrgPerson.inc:1614
+#: ../lib/modules/inetOrgPerson.inc:2047
+#: ../lib/modules/inetOrgPerson.inc:2514
+msgid "Web site"
+msgstr "网站"
+
+#: ../lib/modules/sambaSamAccount.inc:1311
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -11212,7 +11597,7 @@ msgstr "星期三"
 msgid "Western Europe Time, London, Lisbon"
 msgstr "西欧时间,伦敦,里斯本"
 
-#: ../lib/modules/passwordSelfReset.inc:108
+#: ../lib/modules/passwordSelfReset.inc:140
 msgid "What is the name of your favourite pet?"
 msgstr "你最喜欢的宠物名字?"
 
@@ -11220,11 +11605,11 @@ msgstr "你最喜欢的宠物名字?"
 msgid "When performing a recursive copy, only copy those entries which match this filter."
 msgstr "当进行递归拷贝时,只拷贝匹配这些过滤器的条目."
 
-#: ../lib/modules/zarafaUser.inc:85
+#: ../lib/modules/zarafaUser.inc:86
 msgid "When the hard quota limit is reached, email can not be delivered to that user anymore."
 msgstr "如果达到硬限额,用户再也收不到邮件."
 
-#: ../help/help.inc:66
+#: ../help/help.inc:70
 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!"
 
@@ -11234,9 +11619,9 @@ msgstr "帐号所属的windows域"
 
 #: ../lib/modules/sambaSamAccount.inc:193
 #: ../lib/modules/sambaSamAccount.inc:445
-#: ../lib/modules/sambaSamAccount.inc:1173
-#: ../lib/modules/sambaSamAccount.inc:1538
-#: ../lib/modules/sambaSamAccount.inc:1678
+#: ../lib/modules/sambaSamAccount.inc:1197
+#: ../lib/modules/sambaSamAccount.inc:1565
+#: ../lib/modules/sambaSamAccount.inc:1705
 #: ../lib/modules/sambaGroupMapping.inc:278
 #: ../lib/modules/sambaGroupMapping.inc:322
 #: ../lib/modules/sambaGroupMapping.inc:391
@@ -11267,7 +11652,7 @@ msgstr "Windows主组的SID"
 msgid "Windows-Domain name of group."
 msgstr "组的windows域名."
 
-#: ../lib/modules/inetOrgPerson.inc:1196
+#: ../lib/modules/inetOrgPerson.inc:1636
 msgid "Work details"
 msgstr "工作详细信息"
 
@@ -11277,8 +11662,8 @@ msgstr "工作组"
 
 #: ../lib/modules/sambaSamAccount.inc:217
 #: ../lib/modules/sambaSamAccount.inc:344
-#: ../lib/modules/sambaSamAccount.inc:1420
-#: ../lib/modules/sambaSamAccount.inc:1698
+#: ../lib/modules/sambaSamAccount.inc:1447
+#: ../lib/modules/sambaSamAccount.inc:1725
 msgid "Working directory"
 msgstr "工作目录"
 
@@ -11286,16 +11671,16 @@ msgstr "工作目录"
 msgid "Working directory of initial program."
 msgstr "初始化程序的工作目录。"
 
-#: ../templates/config/confmain.php:289
+#: ../templates/config/confmain.php:293
 msgid "Write"
 msgstr "写入"
 
-#: ../templates/config/confmain.php:242
+#: ../templates/config/confmain.php:246
 msgid "Write access"
 msgstr "写权限"
 
-#: ../templates/login.php:488
-#: ../templates/login.php:546
+#: ../templates/login.php:494
+#: ../templates/login.php:552
 #: ../templates/selfService/selfServiceLogin.php:105
 #: ../templates/selfService/selfServiceLogin.php:122
 msgid "Wrong password/user name combination. Please try again."
@@ -11313,7 +11698,7 @@ msgstr "错误的配额类型.配额必须为数字."
 msgid "Yes"
 msgstr "是"
 
-#: ../lib/modules/posixGroup.inc:483
+#: ../lib/modules/posixGroup.inc:493
 msgid "You are using a capital letters. This can cause problems because Windows isn't case-sensitive."
 msgstr "您使用了大写字符,这会造成一些问题,因为windows大小写不敏感."
 
@@ -11326,18 +11711,26 @@ msgstr "您使用了大写字符,这会造成一些问题,因为windows大小写
 msgid "You are using capital letters. This can cause problems because Windows is not case-sensitive."
 msgstr "您正在使用大写字符,这会造成一些问题,因为windows大小写不敏感."
 
-#: ../help/help.inc:100
+#: ../lib/lists.inc:927
+#, php-format
+msgid "You can download your PDF files {link=%s}{color=#d2131a}here{endcolor}{endlink}."
+msgstr "你可以下载你的PDF文件 {link=%s}{color=#d2131a}这里{endcolor}{endlink}."
+
+#: ../help/help.inc:104
 msgid "You can specify if LAM allows full write access, password changes or only read access."
 msgstr "您可以指定LAM是否允许全部权限,只能更改密码,或是只读."
 
 #: ../lib/modules/zarafaDynamicGroup.inc:77
+#: ../lib/modules/zarafaContact.inc:66
 #: ../lib/modules/zarafaGroup.inc:80
 #: ../lib/modules/zarafaAddressList.inc:65
-#: ../lib/modules/zarafaUser.inc:69
+#: ../lib/modules/zarafaUser.inc:70
 msgid "You can use this to temporarily deactivate the Zarafa extension."
 msgstr "可以使用它来临时解除Zarafa扩展项"
 
-#: ../help/help.inc:195
+#: ../lib/modules/passwordSelfReset.inc:107
+#: ../lib/modules/passwordSelfReset.inc:117
+#: ../help/help.inc:203
 msgid "You can use wildcards for LDAP attributes in the form @@attribute@@ (e.g. @@uid@@ for the user name)."
 msgstr "您可以用@@attribute@@的通配符形式代表LDAP属性（比如@@uid@@代表用户名）。"
 
@@ -11346,6 +11739,10 @@ msgstr "您可以用@@attribute@@的通配符形式代表LDAP属性（比如@@ui
 msgid "You can use wildcards in the format $wildcard$ which are replaced by the LDAP attribute with the same name. For multi-value attributes the values will be separated by commas."
 msgstr "可以按照$wildcard$的格式来利用通配符,该内容将会被相同内容的LDAP属性所替代.多值的属性值用逗号隔离."
 
+#: ../lib/modules/zarafaContact.inc:163
+msgid "You cannot add the Zarafa and Zarafa contact extension at the same time."
+msgstr "你可以同时增加 Zarafa 和 Zarafa 联系人扩展."
+
 #: ../templates/3rdParty/pla/htdocs/template_engine.php:52
 msgid "You cannot perform updates while server is in read-only mode"
 msgstr "在服务器只读方式下不能更新"
@@ -11354,6 +11751,10 @@ msgstr "在服务器只读方式下不能更新"
 msgid "You cannot rename an entry which has child entries."
 msgstr "不能为一个有子条目的条目重新命名"
 
+#: ../templates/config/confmain.php:428
+msgid "You cannot use SSL and TLS encryption at the same time. Please use either \"ldaps://\" or TLS."
+msgstr "不能同时使用SSL和TLS加密.请使用\"ldaps://\" 或 TLS."
+
 #: ../templates/3rdParty/pla/htdocs/rename.php:32
 msgid "You did not change the RDN"
 msgstr "您没有对RDN做任何修改."
@@ -11362,8 +11763,8 @@ msgstr "您没有对RDN做任何修改."
 msgid "You do not have the required access rights or the LDAP schema is not published by your server."
 msgstr "您无权访问或LDAP架构未发布到LDAP服务器。"
 
-#: ../lib/modules/dhcp_settings.inc:276
-#: ../lib/modules/dhcp_settings.inc:277
+#: ../lib/modules/dhcp_settings.inc:287
+#: ../lib/modules/dhcp_settings.inc:288
 msgid "You entered one or more invalid DNS servers."
 msgstr "您输入了一个或多个非常的DNS服务器."
 
@@ -11393,7 +11794,7 @@ msgstr "在文本框中必须上传一个文件或提供一种导入方式."
 msgid "You need to add at least one member to this group."
 msgstr "您至少需要为这个组增加一个成员."
 
-#: ../lib/modules/passwordSelfReset.inc:163
+#: ../lib/modules/passwordSelfReset.inc:232
 msgid "You specified an answer but no security question."
 msgstr "您指定了一个没有安全问题的答案."
 
@@ -11403,8 +11804,8 @@ msgid "You will be prompted to confirm this decision"
 msgstr "您将会提示来确认这个操作"
 
 #: ../lib/modules/imapAccess.inc:158
-msgid "Your IMAP domain(s) and email address domain do not match."
-msgstr "您的IMAP域名与邮箱域名不匹配."
+msgid "Your IMAP domains and email address domain do not match."
+msgstr "您的IMAP域名与邮箱域名不匹配. "
 
 #: ../templates/tests/lamdaemonTest.php:226
 #, php-format
@@ -11428,6 +11829,11 @@ msgstr "PHP设置已经关闭了文件上传,请检查PHP.INI ."
 msgid "Your PHP.INI does not have file_uploads = ON. Please enable file uploads in PHP."
 msgstr "您的PHP.INI没有file_uploads = on,在PHP中打开文件上传."
 
+#: ../templates/config/confmain.php:163
+#: ../templates/selfService/adminMain.php:319
+msgid "Your changes cannot be saved until you make the file writable for the webserver user."
+msgstr "你的修改只能在web服务器有权写文件的条件下保存."
+
 #: ../lib/security.inc:145
 msgid "Your session expired, click here to go back to the login page."
 msgstr "超时,请点此外返回到登录界面."
@@ -11442,11 +11848,11 @@ msgstr "超时,请重新登录."
 msgid "Your settings were successfully saved."
 msgstr "设置保存成功."
 
-#: ../lib/modules/inetOrgPerson.inc:462
+#: ../lib/modules/inetOrgPerson.inc:475
 msgid "YourCompany"
 msgstr "您的公司"
 
-#: ../lib/modules/inetOrgPerson.inc:494
+#: ../lib/modules/inetOrgPerson.inc:507
 msgid "YourCompany, Human Resources"
 msgstr "某某公司,人力资源部"
 
@@ -11465,6 +11871,10 @@ msgstr "Zarafa地址列表"
 msgid "Zarafa address lists"
 msgstr "Zarafa地址列表"
 
+#: ../lib/modules/zarafaContact.inc:49
+msgid "Zarafa contact"
+msgstr "Zarafa联系人"
+
 #: ../lib/modules/zarafaDynamicGroup.inc:44
 msgid "Zarafa dynamic group"
 msgstr "Zarafa动态组"
@@ -11474,15 +11884,20 @@ msgstr "Zarafa动态组"
 msgid "Zarafa dynamic groups"
 msgstr "Zarafa动态组"
 
-#: ../lib/modules/ddns.inc:103
-#: ../lib/modules/ddns.inc:112
-#: ../lib/modules/ddns.inc:127
-#: ../lib/modules/ddns.inc:370
-#: ../lib/modules/ddns.inc:400
+#: ../lib/modules/zarafaUser.inc:145
+#: ../lib/modules/zarafaUser.inc:149
+msgid "Zarafa will store the user's archives on these servers."
+msgstr "将在这些服务器上建立用户的归档."
+
+#: ../lib/modules/ddns.inc:108
+#: ../lib/modules/ddns.inc:119
+#: ../lib/modules/ddns.inc:134
+#: ../lib/modules/ddns.inc:380
+#: ../lib/modules/ddns.inc:410
 msgid "Zone names"
 msgstr "区域名"
 
-#: ../lib/modules/ddns.inc:104
+#: ../lib/modules/ddns.inc:109
 msgid "Zone names for the DNS server (e.g. company.local)."
 msgstr "DNS服务器的区域名(比如: company.local)."
 
@@ -11494,11 +11909,6 @@ msgstr "\\\\server\\homes\\smiller"
 msgid "\\\\server\\profiles\\smiller"
 msgstr "\\\\server\\profiles\\smiller"
 
-#: ../lib/modules/phpGroupwareUser.inc:162
-#: ../lib/modules/phpGroupwareUser.inc:333
-msgid "active"
-msgstr "激活"
-
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:2074
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:2077
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:2092
@@ -11507,7 +11917,7 @@ msgid "add value"
 msgstr "增加值"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:107
-#: ../lib/modules/posixGroup.inc:367
+#: ../lib/modules/posixGroup.inc:377
 #: ../lib/modules/zarafaAddressList.inc:95
 #: ../lib/modules/nisnetgroup.inc:104
 #: ../lib/modules/groupOfNames.inc:94
@@ -11549,7 +11959,7 @@ msgstr "company.com"
 msgid "confirm"
 msgstr "确认"
 
-#: ../help/help.inc:78
+#: ../help/help.inc:82
 msgid "dc=yourcompany,dc=com"
 msgstr "dc=yourcompany,dc=com"
 
@@ -11557,7 +11967,7 @@ msgstr "dc=yourcompany,dc=com"
 msgid "default"
 msgstr "缺省"
 
-#: ../templates/3rdParty/pla/lib/QueryRender.php:206
+#: ../templates/3rdParty/pla/lib/QueryRender.php:205
 msgid "delete"
 msgstr "删除"
 
@@ -11565,16 +11975,16 @@ msgstr "删除"
 msgid "delete attribute"
 msgstr "删除属性"
 
-#: ../lib/modules/sambaSamAccount.inc:1441
-#: ../lib/modules/sambaSamAccount.inc:1718
-#: ../lib/modules/zarafaUser.inc:577
-#: ../lib/modules/zarafaUser.inc:1262
-#: ../lib/modules/zarafaUser.inc:1300
+#: ../lib/modules/sambaSamAccount.inc:1468
+#: ../lib/modules/sambaSamAccount.inc:1745
+#: ../lib/modules/zarafaUser.inc:620
+#: ../lib/modules/zarafaUser.inc:1353
+#: ../lib/modules/zarafaUser.inc:1400
 msgid "disabled"
 msgstr "关闭"
 
-#: ../lib/modules/sambaSamAccount.inc:1452
-#: ../lib/modules/sambaSamAccount.inc:1729
+#: ../lib/modules/sambaSamAccount.inc:1479
+#: ../lib/modules/sambaSamAccount.inc:1756
 msgid "disconnect"
 msgstr "中断连接"
 
@@ -11582,17 +11992,17 @@ msgstr "中断连接"
 msgid "download value"
 msgstr "下载值"
 
-#: ../templates/3rdParty/pla/lib/QueryRender.php:207
+#: ../templates/3rdParty/pla/lib/QueryRender.php:206
 msgid "edit"
 msgstr "编辑"
 
-#: ../lib/modules/zarafaUser.inc:577
-#: ../lib/modules/zarafaUser.inc:1257
-#: ../lib/modules/zarafaUser.inc:1300
+#: ../lib/modules/zarafaUser.inc:620
+#: ../lib/modules/zarafaUser.inc:1348
+#: ../lib/modules/zarafaUser.inc:1400
 msgid "enabled"
 msgstr "使能"
 
-#: ../templates/3rdParty/pla/lib/QueryRender.php:483
+#: ../templates/3rdParty/pla/lib/QueryRender.php:481
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:307
 msgid "export"
 msgstr "导出"
@@ -11605,13 +12015,13 @@ msgstr "失败"
 msgid "force"
 msgstr "强制"
 
-#: ../lib/modules/sambaSamAccount.inc:1460
-#: ../lib/modules/sambaSamAccount.inc:1737
+#: ../lib/modules/sambaSamAccount.inc:1487
+#: ../lib/modules/sambaSamAccount.inc:1764
 msgid "from any client"
 msgstr "从任何客户端"
 
-#: ../lib/modules/sambaSamAccount.inc:1461
-#: ../lib/modules/sambaSamAccount.inc:1738
+#: ../lib/modules/sambaSamAccount.inc:1488
+#: ../lib/modules/sambaSamAccount.inc:1765
 msgid "from previous client only"
 msgstr "仅从以前的客户端"
 
@@ -11626,12 +12036,12 @@ msgid "group01;group02"
 msgstr "group01;group02"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:121
-#: ../lib/modules/zarafaGroup.inc:95
+#: ../lib/modules/zarafaGroup.inc:134
 msgid "group1@company.com,group2@company.com"
 msgstr "group1@company.com,group2@company.com"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:115
-#: ../lib/modules/zarafaGroup.inc:89
+#: ../lib/modules/zarafaGroup.inc:128
 msgid "group@company.com"
 msgstr "groupr@company.com"
 
@@ -11644,40 +12054,39 @@ msgstr "提示"
 msgid "hours"
 msgstr "小时"
 
+#: ../lib/modules/inetOrgPerson.inc:451
+msgid "http://www.company.com"
+msgstr "http://www.company.com"
+
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:294
 msgid "import"
 msgstr "导入"
 
-#: ../lib/modules/phpGroupwareUser.inc:162
-#: ../lib/modules/phpGroupwareUser.inc:336
-msgid "inactive"
-msgstr "停用"
-
-#: ../lib/modules/sambaSamAccount.inc:1445
-#: ../lib/modules/sambaSamAccount.inc:1722
+#: ../lib/modules/sambaSamAccount.inc:1472
+#: ../lib/modules/sambaSamAccount.inc:1749
 msgid "input off, notify off"
 msgstr "输入关，提醒关"
 
-#: ../lib/modules/sambaSamAccount.inc:1444
-#: ../lib/modules/sambaSamAccount.inc:1721
+#: ../lib/modules/sambaSamAccount.inc:1471
+#: ../lib/modules/sambaSamAccount.inc:1748
 msgid "input off, notify on"
 msgstr "输入关，提醒开"
 
-#: ../lib/modules/sambaSamAccount.inc:1443
-#: ../lib/modules/sambaSamAccount.inc:1720
+#: ../lib/modules/sambaSamAccount.inc:1470
+#: ../lib/modules/sambaSamAccount.inc:1747
 msgid "input on, notify off"
 msgstr "输入开，提醒关"
 
-#: ../lib/modules/sambaSamAccount.inc:1442
-#: ../lib/modules/sambaSamAccount.inc:1719
+#: ../lib/modules/sambaSamAccount.inc:1469
+#: ../lib/modules/sambaSamAccount.inc:1746
 msgid "input on, notify on"
 msgstr "输入开，提醒开"
 
-#: ../help/help.inc:60
+#: ../help/help.inc:64
 msgid "ldap://localhost:389 connects to localhost using a standard LDAP connection on port 389"
 msgstr "ldap://localhost:389 表示使用标准的LDAP连接端口389连接到localhost."
 
-#: ../help/help.inc:62
+#: ../help/help.inc:66
 msgid "ldaps://ldap.domain.com connects to ldap.domain.com using an encrypted LDAP connection."
 msgstr "连接到ldap.domain.com的ldaps://ldap.domain.com连接使用加密的LDAP连接."
 
@@ -11712,25 +12121,26 @@ msgstr "我的组"
 msgid "new"
 msgstr "新"
 
-#: ../templates/config/confmain.php:225
+#: ../templates/config/confmain.php:229
 #: ../lib/modules/zarafaDynamicGroup.inc:467
 #: ../lib/modules/zarafaDynamicGroup.inc:470
-#: ../lib/modules/zarafaGroup.inc:419
-#: ../lib/modules/zarafaGroup.inc:426
-#: ../lib/modules/zarafaGroup.inc:429
+#: ../lib/modules/zarafaContact.inc:533
+#: ../lib/modules/zarafaGroup.inc:632
+#: ../lib/modules/zarafaGroup.inc:639
+#: ../lib/modules/zarafaGroup.inc:642
 #: ../lib/modules/zarafaAddressList.inc:328
 #: ../lib/modules/zarafaAddressList.inc:331
 #: ../lib/modules/sambaSamAccount.inc:558
-#: ../lib/modules/sambaSamAccount.inc:1686
-#: ../lib/modules/sambaSamAccount.inc:1694
-#: ../lib/modules/sambaSamAccount.inc:1704
-#: ../lib/modules/sambaSamAccount.inc:1709
-#: ../lib/modules/sambaSamAccount.inc:1714
-#: ../lib/modules/zarafaUser.inc:560
-#: ../lib/modules/zarafaUser.inc:1173
-#: ../lib/modules/zarafaUser.inc:1218
-#: ../lib/modules/zarafaUser.inc:1229
-#: ../lib/modules/zarafaUser.inc:1235
+#: ../lib/modules/sambaSamAccount.inc:1713
+#: ../lib/modules/sambaSamAccount.inc:1721
+#: ../lib/modules/sambaSamAccount.inc:1731
+#: ../lib/modules/sambaSamAccount.inc:1736
+#: ../lib/modules/sambaSamAccount.inc:1741
+#: ../lib/modules/zarafaUser.inc:603
+#: ../lib/modules/zarafaUser.inc:1264
+#: ../lib/modules/zarafaUser.inc:1309
+#: ../lib/modules/zarafaUser.inc:1320
+#: ../lib/modules/zarafaUser.inc:1326
 #: ../lib/modules/ppolicy.inc:34
 #: ../lib/modules/ppolicy.inc:467
 #: ../lib/modules/ppolicy.inc:483
@@ -11787,7 +12197,7 @@ msgstr "不可用"
 msgid "not specified"
 msgstr "未指定"
 
-#: ../help/help.inc:72
+#: ../help/help.inc:76
 msgid "ou=People,dc=yourcompany,dc=com will read and store all accounts in this subtree."
 msgstr "ou=People,dc=yourcompany,dc=com 表示将会在此子树下读取和保存所有帐号"
 
@@ -11827,13 +12237,13 @@ msgstr "重命名"
 
 #: ../templates/3rdParty/pla/lib/PageRender.php:445
 #: ../lib/html.inc:554
-#: ../lib/html.inc:1276
-#: ../lib/html.inc:1678
+#: ../lib/html.inc:1304
+#: ../lib/html.inc:1801
 msgid "required"
 msgstr "必选项"
 
-#: ../lib/modules/sambaSamAccount.inc:1453
-#: ../lib/modules/sambaSamAccount.inc:1730
+#: ../lib/modules/sambaSamAccount.inc:1480
+#: ../lib/modules/sambaSamAccount.inc:1757
 msgid "reset"
 msgstr "复位"
 
@@ -11841,15 +12251,16 @@ msgstr "复位"
 msgid "search"
 msgstr "搜索"
 
-#: ../templates/3rdParty/pla/lib/QueryRender.php:474
+#: ../templates/3rdParty/pla/lib/QueryRender.php:472
 msgid "seconds"
 msgstr "秒"
 
-#: ../lib/modules/asteriskAccount.inc:391
-#: ../lib/modules/posixGroup.inc:358
+#: ../lib/modules/asteriskAccount.inc:389
+#: ../lib/modules/posixGroup.inc:368
 #: ../lib/modules/sambaSamAccount.inc:402
 #: ../lib/modules/posixAccount.inc:253
 #: ../lib/modules/asteriskVoicemail.inc:158
+#: ../lib/modules/heimdalKerberos.inc:148
 msgid "secret"
 msgstr "secret"
 
@@ -11859,7 +12270,8 @@ msgstr "选择RDN属性"
 
 #: ../lib/modules/uidObject.inc:62
 #: ../lib/modules/posixAccount.inc:198
-#: ../lib/modules/inetOrgPerson.inc:1571
+#: ../lib/modules/inetOrgPerson.inc:2172
+#: ../lib/modules/heimdalKerberos.inc:117
 #: ../lib/modules/nisMailAlias.inc:91
 msgid "smiller"
 msgstr "smiller"
@@ -11884,11 +12296,11 @@ msgstr "结构"
 msgid "table"
 msgstr "表格"
 
-#: ../lib/modules/asteriskExtension.inc:171
+#: ../lib/modules/asteriskExtension.inc:146
 msgid "test"
 msgstr "测试"
 
-#: ../lib/modules/asteriskExtension.inc:165
+#: ../lib/modules/asteriskExtension.inc:166
 msgid "test-start"
 msgstr "测试-开始"
 
@@ -11897,17 +12309,17 @@ msgid "true"
 msgstr "true"
 
 #: ../lib/modules/ipHost.inc:92
-#: ../lib/modules/inetOrgPerson.inc:350
+#: ../lib/modules/inetOrgPerson.inc:355
 #: ../lib/modules/aliasEntry.inc:64
 msgid "uid=smiller,ou=People,dc=company,dc=com"
 msgstr "uid=smiller,ou=People,dc=company,dc=com"
 
-#: ../lib/modules/posixGroup.inc:352
+#: ../lib/modules/posixGroup.inc:362
 msgid "user01,user02,user03"
 msgstr "user01,user02,user03"
 
 #: ../lib/modules/eduPerson.inc:142
-#: ../lib/modules/inetOrgPerson.inc:438
+#: ../lib/modules/inetOrgPerson.inc:443
 #: ../lib/modules/asteriskVoicemail.inc:171
 msgid "user@company.com"
 msgstr "user@company.com"
@@ -11924,36 +12336,130 @@ msgstr "查看条目"
 msgid "with "
 msgstr "和"
 
-#: ../templates/config/confmain.php:225
+#: ../templates/config/confmain.php:229
 #: ../lib/modules/zarafaDynamicGroup.inc:465
 #: ../lib/modules/zarafaDynamicGroup.inc:472
-#: ../lib/modules/zarafaGroup.inc:421
-#: ../lib/modules/zarafaGroup.inc:424
-#: ../lib/modules/zarafaGroup.inc:431
+#: ../lib/modules/zarafaContact.inc:535
+#: ../lib/modules/zarafaGroup.inc:634
+#: ../lib/modules/zarafaGroup.inc:637
+#: ../lib/modules/zarafaGroup.inc:644
 #: ../lib/modules/zarafaAddressList.inc:326
 #: ../lib/modules/zarafaAddressList.inc:333
 #: ../lib/modules/sambaSamAccount.inc:558
-#: ../lib/modules/sambaSamAccount.inc:1684
-#: ../lib/modules/sambaSamAccount.inc:1692
-#: ../lib/modules/sambaSamAccount.inc:1702
-#: ../lib/modules/sambaSamAccount.inc:1707
-#: ../lib/modules/sambaSamAccount.inc:1712
-#: ../lib/modules/zarafaUser.inc:560
-#: ../lib/modules/zarafaUser.inc:1175
-#: ../lib/modules/zarafaUser.inc:1221
-#: ../lib/modules/zarafaUser.inc:1231
-#: ../lib/modules/zarafaUser.inc:1237
+#: ../lib/modules/sambaSamAccount.inc:1711
+#: ../lib/modules/sambaSamAccount.inc:1719
+#: ../lib/modules/sambaSamAccount.inc:1729
+#: ../lib/modules/sambaSamAccount.inc:1734
+#: ../lib/modules/sambaSamAccount.inc:1739
+#: ../lib/modules/zarafaUser.inc:603
+#: ../lib/modules/zarafaUser.inc:1266
+#: ../lib/modules/zarafaUser.inc:1312
+#: ../lib/modules/zarafaUser.inc:1322
+#: ../lib/modules/zarafaUser.inc:1328
 #: ../lib/modules/ppolicy.inc:35
 #: ../lib/modules/ppolicy.inc:485
 #: ../lib/modules/ppolicy.inc:490
 #: ../lib/modules/ppolicy.inc:493
 #: ../lib/modules/ppolicy.inc:500
-#: ../lib/modules/inetOrgPerson.inc:486
+#: ../lib/modules/inetOrgPerson.inc:499
 #: ../lib/modules/generalInformation.inc:95
 #: ../lib/modules/zarafaServer.inc:327
 msgid "yes"
 msgstr "是"
 
+#~ msgid "%s DHCP(s) found"
+#~ msgstr "发现 %s DHCP"
+#~ msgid "%s NIS object(s) found"
+#~ msgstr "找到 %s 个 NIS 对象"
+#~ msgid "%s address list(s) found"
+#~ msgstr "找到 %s 个地址列表"
+#~ msgid "%s alias(es) found"
+#~ msgstr "找到 %s 个別名"
+#~ msgid "%s automount entry(ies) found"
+#~ msgstr "找到 %s 个自动挂接条目"
+#~ msgid "%s domain(s) found"
+#~ msgstr "找到 %s 个域"
+#~ msgid "%s extension(s) found"
+#~ msgstr "找到 %s 个扩展"
+#~ msgid "%s group(s) found"
+#~ msgstr "找到 %s 个组"
+#~ msgid "%s host(s) found"
+#~ msgstr "找到 %s 个主机"
+#~ msgid "%s object(s) found"
+#~ msgstr "找到 %s 个对象"
+#~ msgid "%s policy(ies) found"
+#~ msgstr "找到 %s 个策略"
+#~ msgid "%s sudo role(s) found"
+#~ msgstr "找到 %s 个sudo角色"
+#~ msgid "%s user(s) found"
+#~ msgstr "找到 %s 个用户"
+#~ msgid "Account status"
+#~ msgstr "帐号状态"
+#~ msgid "Add phpGroupWare extension"
+#~ msgstr "增加 phpGroupWare 扩展"
+#~ msgid "Compress"
+#~ msgstr "压缩"
+#~ msgid "Delete DHCP(s)"
+#~ msgstr "删除DHCP"
+#~ msgid "Delete group(s)"
+#~ msgstr "删除组"
+#~ msgid "Delete host(s)"
+#~ msgstr "删除主机"
+#~ msgid "Delete object"
+#~ msgstr "删除对象"
+#~ msgid "Delete user(s)"
+#~ msgstr "删除用户"
+#~ msgid "Here you can specify if the account is active or inactive."
+#~ msgstr "这里可以指定用户的激活状态."
+#~ msgid "Host(s)"
+#~ msgstr "主机"
+#~ msgid ""
+#~ "If you set this to \"true\" then the phpGroupware extension will be added."
+#~ msgstr "如果设为\"true\",则会增加 phpGroupWare 扩展."
+#~ msgid ""
+#~ "In order to add these objectClass(es) to this entry, you must specify <b>"
+#~ "%s</b> new attributes that this object class requires."
+#~ msgstr "为把这些对象类加入到条目中,您必须指定<b>%s</b> 对象类需要的新属性"
+#~ msgid "Label"
+#~ msgstr "标签"
+#~ msgid "Last login"
+#~ msgstr "上次登录"
+#~ msgid "Last login from"
+#~ msgstr "上一次登录地"
+#~ msgid "No extension(s) found!"
+#~ msgstr "没有发现扩展!"
+#~ msgid "Please enter \"active\" or \"inactive\"."
+#~ msgstr "请输入 \"active\" 或 \"inactive\"."
+#~ msgid "Reenter new master password"
+#~ msgstr "请重新输入管理密码"
+#~ msgid "Reenter profile password"
+#~ msgstr "再次输入配置文件密码"
+#~ msgid "Remove phpGroupWare extension"
+#~ msgstr "删除 phpGroupWare 扩展"
+#~ msgid "Run group(s)"
+#~ msgstr "运行组"
+#~ msgid "SSH public key(s)"
+#~ msgstr "SSH 公钥"
+#~ msgid "The password(s) were set to:"
+#~ msgstr "密码被设置为:"
+#~ msgid "Unlock Samba account"
+#~ msgstr "解锁Samba账号."
+#~ 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。"
+#~ msgid "User(s)"
+#~ msgstr "用户"
+#~ msgid "active"
+#~ msgstr "激活"
+#~ msgid "inactive"
+#~ msgstr "停用"
 #~ msgid "(example: cn=MyNewPerson)"
 #~ msgstr "(例如:cn=MyNewPerson)"
 #~ msgid "(hint: do not include \"ou=\")"
@@ -12000,8 +12506,6 @@ msgstr "是"
 #~ msgstr "删除 %s"
 #~ msgid "Entry %s deleted successfully."
 #~ msgstr "条目%s删除成功"
-#~ msgid "Failed to add the attribute."
-#~ msgstr "新增属性值失败!"
 #~ msgid "File upload failed!"
 #~ msgstr "文件上传失败!"
 #~ msgid "Home directory server"
@@ -12238,8 +12742,6 @@ msgstr "是"
 #~ msgstr "为所选的域建立PDF"
 #~ msgid "Create PDF for selected group(s)"
 #~ msgstr "为所选的组建立PDF"
-#~ msgid "Create PDF for selected host(s)"
-#~ msgstr "为所选的主机建立PDF"
 #~ msgid "Create PDF for selected object(s)"
 #~ msgstr "为所选的对象建立PDF"
 #~ msgid "Create PDF for selected user(s)"