diff --git a/lam/locale/zh_CN/LC_MESSAGES/messages.mo b/lam/locale/zh_CN/LC_MESSAGES/messages.mo
index 2059c93e..61554528 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
old mode 100644
new mode 100755
index 37a8e072..8f7fe61b
--- a/lam/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/lam/locale/zh_CN/LC_MESSAGES/messages.po
@@ -5,45 +5,45 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: LAM 1.3\n"
+"Project-Id-Version: LAM 5.7\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de\n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2016-11-29 08:49+0800\n"
+"PO-Revision-Date: 2017-02-27 08:53+0800\n"
 "Last-Translator: Alan Needham <needham@sina.com>\n"
 "Language-Team: Chinese(Simplified) <needham@sina.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.8.12\n"
 
 #: ../lib/modules/zarafaContact.inc:101 ../lib/modules/zarafaContact.inc:104
 #: ../lib/modules/zarafaContact.inc:107 ../lib/modules/zarafaContact.inc:136
 #: ../lib/modules/zarafaGroup.inc:102 ../lib/modules/zarafaGroup.inc:105
-#: ../lib/modules/zarafaGroup.inc:108 ../lib/modules/zarafaGroup.inc:757
-#: ../lib/modules/zarafaUser.inc:158 ../lib/modules/zarafaUser.inc:161
-#: ../lib/modules/zarafaUser.inc:164 ../lib/modules/zarafaUser.inc:1853
+#: ../lib/modules/zarafaGroup.inc:108 ../lib/modules/zarafaGroup.inc:755
+#: ../lib/modules/zarafaUser.inc:161 ../lib/modules/zarafaUser.inc:164
+#: ../lib/modules/zarafaUser.inc:167 ../lib/modules/zarafaUser.inc:1854
 msgid "\"Send as\" attribute"
 msgstr "\"Send as\"属性"
 
 #: ../lib/modules/zarafaContact.inc:85 ../lib/modules/zarafaContact.inc:167
 #: ../lib/modules/zarafaContact.inc:190 ../lib/modules/zarafaContact.inc:207
 #: ../lib/modules/zarafaContact.inc:253 ../lib/modules/zarafaContact.inc:398
-#: ../lib/modules/zarafaContact.inc:617 ../lib/modules/zarafaGroup.inc:98
+#: ../lib/modules/zarafaContact.inc:615 ../lib/modules/zarafaGroup.inc:98
 #: ../lib/modules/zarafaGroup.inc:171 ../lib/modules/zarafaGroup.inc:189
 #: ../lib/modules/zarafaGroup.inc:205 ../lib/modules/zarafaGroup.inc:248
-#: ../lib/modules/zarafaGroup.inc:405 ../lib/modules/zarafaGroup.inc:629
-#: ../lib/modules/zarafaGroup.inc:777 ../lib/modules/zarafaUser.inc:118
-#: ../lib/modules/zarafaUser.inc:214 ../lib/modules/zarafaUser.inc:374
-#: ../lib/modules/zarafaUser.inc:404 ../lib/modules/zarafaUser.inc:441
-#: ../lib/modules/zarafaUser.inc:487 ../lib/modules/zarafaUser.inc:874
-#: ../lib/modules/zarafaUser.inc:1272 ../lib/modules/zarafaUser.inc:1506
-#: ../lib/modules/zarafaUser.inc:1832
+#: ../lib/modules/zarafaGroup.inc:405 ../lib/modules/zarafaGroup.inc:627
+#: ../lib/modules/zarafaGroup.inc:775 ../lib/modules/zarafaUser.inc:121
+#: ../lib/modules/zarafaUser.inc:217 ../lib/modules/zarafaUser.inc:377
+#: ../lib/modules/zarafaUser.inc:407 ../lib/modules/zarafaUser.inc:444
+#: ../lib/modules/zarafaUser.inc:490 ../lib/modules/zarafaUser.inc:877
+#: ../lib/modules/zarafaUser.inc:1273 ../lib/modules/zarafaUser.inc:1507
+#: ../lib/modules/zarafaUser.inc:1833
 msgid "\"Send as\" privileges"
 msgstr "\"做为..发送\"权限"
 
-#: ../lib/modules/nisnetgroup.inc:134
+#: ../lib/modules/nisnetgroup.inc:137
 msgid "(host1,user1,example.com);(host2,user2,example.com)"
 msgstr "(主机1,用户1,example.com);(主机2,用户2,example.com)"
 
@@ -51,31 +51,40 @@ msgstr "(主机1,用户1,example.com);(主机2,用户2,example.com)"
 msgid "/home/smiller"
 msgstr "/home/smiller"
 
-#: ../lib/modules/inetOrgPerson.inc:428
+#: ../lib/modules/inetOrgPerson.inc:426
 #: ../lib/modules/asteriskVoicemail.inc:186
 msgid "123-123-1234"
 msgstr "123-123-1234"
 
 #: ../lib/modules/windowsUser.inc:623 ../lib/modules/windowsUser.inc:631
-#: ../lib/modules/inetOrgPerson.inc:444
+#: ../lib/modules/inetOrgPerson.inc:442
 msgid "123-123-1235"
 msgstr "123-123-1235"
 
 #: ../lib/modules/windowsUser.inc:599 ../lib/modules/windowsUser.inc:607
-#: ../lib/modules/windowsUser.inc:615 ../lib/modules/inetOrgPerson.inc:452
-#: ../lib/modules/inetOrgPerson.inc:460
+#: ../lib/modules/windowsUser.inc:615 ../lib/modules/inetOrgPerson.inc:450
+#: ../lib/modules/inetOrgPerson.inc:458
 msgid "123-123-1236"
 msgstr "123-123-1236"
 
 #: ../lib/modules/windowsUser.inc:498 ../lib/modules/windowsUser.inc:504
-#: ../lib/modules/inetOrgPerson.inc:436
+#: ../lib/modules/inetOrgPerson.inc:434
 msgid "123-124-1234"
 msgstr "123-124-1234"
 
-#: ../lib/modules/windowsUser.inc:456 ../lib/modules/inetOrgPerson.inc:420
+#: ../lib/modules/windowsUser.inc:456 ../lib/modules/inetOrgPerson.inc:418
 msgid "12345"
 msgstr "12345"
 
+#: ../templates/config/confmain.php:533
+#: ../templates/selfService/adminMain.php:535 ../help/help.inc:282
+msgid "2-factor authentication"
+msgstr "双重认证"
+
+#: ../templates/selfService/adminMain.php:533
+msgid "2-factor authentication requires PHP curl extension."
+msgstr "双重认证需要PHP的curl模块."
+
 #: ../lib/modules/locking389ds.inc:351
 msgid "389ds"
 msgstr "389ds"
@@ -120,30 +129,30 @@ msgstr ""
 msgid "<b>Maximum length:</b> %s characters"
 msgstr "<b>最大长度:</b> %s 字符"
 
-#: ../lib/modules/bindDLZ.inc:499
+#: ../lib/modules/bindDLZ.inc:502
 msgid "A CNAME record allows no other records."
 msgstr "CNAME条目不允许其他的条目"
 
-#: ../lib/modules/bindDLZ.inc:533
+#: ../lib/modules/bindDLZ.inc:536
 msgid "A NS record allows no other records except SOA/MX/A records."
 msgstr "一条NS记录中除了 SOA/MX/A 记录外不允许其他记录"
 
-#: ../lib/modules/bindDLZ.inc:517
+#: ../lib/modules/bindDLZ.inc:520
 msgid "A SOA record allows no other records except NS/MX/A records."
 msgstr "SOA条目除了NS/MX/A条目外不允许其他条目"
 
-#: ../lib/modules/bindDLZ.inc:518
+#: ../lib/modules/bindDLZ.inc:521
 msgid "A SOA record requires that the host name is set to \"@\"."
 msgstr "SOA记录需要主机名前设置\"@\"."
 
 #: ../lib/modules/selfRegistration.inc:737
-#: ../lib/modules/passwordSelfReset.inc:1836
+#: ../lib/modules/passwordSelfReset.inc:1834
 msgid ""
 "A confirmation mail was sent. Please click on the link in the mail to "
 "proceed."
 msgstr "确认邮件已经发送,请点击邮件中的链接来处理."
 
-#: ../lib/modules/device.inc:82
+#: ../lib/modules/device.inc:85
 msgid "A description for this device."
 msgstr "设备描述."
 
@@ -159,19 +168,19 @@ msgstr "在结果中显示的属性列表(以逗号分隔)"
 msgid "A list of options (e.g. !authenticate)."
 msgstr "选项列表(比如:!authenticate)."
 
-#: ../templates/massBuildAccounts.php:134
+#: ../templates/upload/massBuildAccounts.php:145
 msgid "A required column is missing in your CSV file."
 msgstr "您的CSV文件中缺少一个必要的列."
 
-#: ../lib/modules/bindDLZ.inc:172 ../lib/modules/bindDLZ.inc:176
+#: ../lib/modules/bindDLZ.inc:175 ../lib/modules/bindDLZ.inc:179
 msgid "A server name for this service (e.g. \"ldap.example.com.\")."
 msgstr "这个服务的服务器名字(比如 \"ldap.example.com.\")."
 
-#: ../lib/modules/bindDLZ.inc:164 ../lib/modules/bindDLZ.inc:168
+#: ../lib/modules/bindDLZ.inc:167 ../lib/modules/bindDLZ.inc:171
 msgid "A text value for this host."
 msgstr "此主机的文本值"
 
-#: ../lib/modules/kolabUser.inc:133
+#: ../lib/modules/kolabUser.inc:136
 msgid ""
 "A user may define who is allowed to act on behalf of herself. This property "
 "is checked when using the Kolab smtp daemon (Postfix) to send emails."
@@ -195,14 +204,14 @@ msgstr "必须指定一个合法的newrdn属性"
 msgid "A valid newsuperior attribute should be specified"
 msgstr "必须指定一个合法的newsuperior属性"
 
-#: ../lib/modules/bindDLZ.inc:96 ../lib/modules/bindDLZ.inc:105
-#: ../lib/modules/bindDLZ.inc:255 ../lib/modules/bindDLZ.inc:261
-#: ../lib/modules/bindDLZ.inc:479
+#: ../lib/modules/bindDLZ.inc:99 ../lib/modules/bindDLZ.inc:108
+#: ../lib/modules/bindDLZ.inc:258 ../lib/modules/bindDLZ.inc:264
+#: ../lib/modules/bindDLZ.inc:482
 msgid "A/AAAA record"
 msgstr "A/AAAAA条目"
 
-#: ../lib/modules/bindDLZ.inc:418 ../lib/modules/bindDLZ.inc:438
-#: ../lib/modules/bindDLZ.inc:1477
+#: ../lib/modules/bindDLZ.inc:421 ../lib/modules/bindDLZ.inc:441
+#: ../lib/modules/bindDLZ.inc:1478
 msgid "A/AAAA records"
 msgstr "A/AAAAA条目"
 
@@ -210,20 +219,20 @@ msgstr "A/AAAAA条目"
 #: ../lib/modules/asteriskAccount.inc:271
 #: ../lib/modules/asteriskAccount.inc:347
 #: ../lib/modules/asteriskAccount.inc:610
-#: ../lib/modules/asteriskAccount.inc:990
-#: ../lib/modules/asteriskAccount.inc:1246
+#: ../lib/modules/asteriskAccount.inc:988
+#: ../lib/modules/asteriskAccount.inc:1244
 msgid "AMA flags"
 msgstr "AMA标志"
 
-#: ../templates/serverInfo.php:342
+#: ../templates/serverInfo.php:343
 msgid "Abandon"
 msgstr "终止"
 
-#: ../templates/lists/changePassword.php:764
+#: ../templates/lists/changePassword.php:765
 msgid "Aborted password change."
 msgstr "中断密码更改"
 
-#: ../templates/config/confmain.php:276 ../help/help.inc:111
+#: ../templates/config/confmain.php:279 ../help/help.inc:111
 msgid "Access level"
 msgstr "访问级别"
 
@@ -231,16 +240,16 @@ msgstr "访问级别"
 msgid "Account"
 msgstr "帐号"
 
-#: ../templates/massBuildAccounts.php:200 ../lib/modules/kolabGroup.inc:178
-#: ../lib/modules/kolabGroup.inc:180 ../lib/modules/kolabGroup.inc:182
-#: ../lib/modules/kolabGroup.inc:184 ../lib/modules/pykotaPrinter.inc:210
-#: ../lib/modules/pykotaPrinter.inc:212 ../lib/modules/pykotaPrinter.inc:214
-#: ../lib/modules/pykotaPrinter.inc:216 ../lib/modules/pykotaPrinter.inc:218
-#: ../lib/modules/pykotaPrinter.inc:219 ../lib/modules/pykotaPrinter.inc:220
-#: ../lib/modules/mitKerberos.inc:290 ../lib/modules/mitKerberos.inc:291
-#: ../lib/modules/mitKerberos.inc:292 ../lib/modules/mitKerberos.inc:294
-#: ../lib/modules/mitKerberos.inc:296 ../lib/modules/mitKerberos.inc:297
-#: ../lib/modules/zarafaDynamicGroup.inc:197
+#: ../templates/upload/massBuildAccounts.php:211
+#: ../lib/modules/kolabGroup.inc:178 ../lib/modules/kolabGroup.inc:180
+#: ../lib/modules/kolabGroup.inc:182 ../lib/modules/kolabGroup.inc:184
+#: ../lib/modules/pykotaPrinter.inc:210 ../lib/modules/pykotaPrinter.inc:212
+#: ../lib/modules/pykotaPrinter.inc:214 ../lib/modules/pykotaPrinter.inc:216
+#: ../lib/modules/pykotaPrinter.inc:218 ../lib/modules/pykotaPrinter.inc:219
+#: ../lib/modules/pykotaPrinter.inc:220 ../lib/modules/mitKerberos.inc:290
+#: ../lib/modules/mitKerberos.inc:291 ../lib/modules/mitKerberos.inc:292
+#: ../lib/modules/mitKerberos.inc:294 ../lib/modules/mitKerberos.inc:296
+#: ../lib/modules/mitKerberos.inc:297 ../lib/modules/zarafaDynamicGroup.inc:197
 #: ../lib/modules/zarafaDynamicGroup.inc:199
 #: ../lib/modules/zarafaDynamicGroup.inc:201
 #: ../lib/modules/zarafaDynamicGroup.inc:203
@@ -255,9 +264,9 @@ msgstr "帐号"
 #: ../lib/modules/asteriskAccount.inc:573
 #: ../lib/modules/asteriskAccount.inc:575
 #: ../lib/modules/asteriskAccount.inc:577 ../lib/modules/account.inc:125
-#: ../lib/modules/ieee802device.inc:96 ../lib/modules/puppetClient.inc:195
-#: ../lib/modules/puppetClient.inc:197 ../lib/modules/puppetClient.inc:198
+#: ../lib/modules/ieee802device.inc:96 ../lib/modules/puppetClient.inc:198
 #: ../lib/modules/puppetClient.inc:200 ../lib/modules/puppetClient.inc:201
+#: ../lib/modules/puppetClient.inc:203 ../lib/modules/puppetClient.inc:204
 #: ../lib/modules/qmailUser.inc:449 ../lib/modules/qmailUser.inc:451
 #: ../lib/modules/qmailUser.inc:453 ../lib/modules/qmailUser.inc:454
 #: ../lib/modules/qmailUser.inc:455 ../lib/modules/qmailUser.inc:457
@@ -268,12 +277,12 @@ msgstr "帐号"
 #: ../lib/modules/zarafaContact.inc:208 ../lib/modules/zarafaContact.inc:209
 #: ../lib/modules/zarafaContact.inc:210 ../lib/modules/zarafaContact.inc:213
 #: ../lib/modules/zarafaContact.inc:214 ../lib/modules/windowsHost.inc:132
-#: ../lib/modules/posixGroup.inc:666 ../lib/modules/posixGroup.inc:670
-#: ../lib/modules/posixGroup.inc:671 ../lib/modules/zarafaGroup.inc:199
+#: ../lib/modules/posixGroup.inc:664 ../lib/modules/posixGroup.inc:668
+#: ../lib/modules/posixGroup.inc:669 ../lib/modules/zarafaGroup.inc:199
 #: ../lib/modules/zarafaGroup.inc:201 ../lib/modules/zarafaGroup.inc:202
 #: ../lib/modules/zarafaGroup.inc:203 ../lib/modules/zarafaGroup.inc:204
-#: ../lib/modules/zarafaGroup.inc:206 ../lib/modules/device.inc:141
-#: ../lib/modules/device.inc:142 ../lib/modules/dhcp_settings.inc:326
+#: ../lib/modules/zarafaGroup.inc:206 ../lib/modules/device.inc:144
+#: ../lib/modules/device.inc:145 ../lib/modules/dhcp_settings.inc:326
 #: ../lib/modules/dhcp_settings.inc:328 ../lib/modules/dhcp_settings.inc:330
 #: ../lib/modules/dhcp_settings.inc:332 ../lib/modules/dhcp_settings.inc:334
 #: ../lib/modules/dhcp_settings.inc:335 ../lib/modules/dhcp_settings.inc:336
@@ -282,10 +291,10 @@ msgstr "帐号"
 #: ../lib/modules/eduPerson.inc:246 ../lib/modules/eduPerson.inc:248
 #: ../lib/modules/eduPerson.inc:250 ../lib/modules/eduPerson.inc:251
 #: ../lib/modules/eduPerson.inc:252 ../lib/modules/eduPerson.inc:253
-#: ../lib/modules/quota.inc:52 ../lib/modules/quota.inc:54
-#: ../lib/modules/quota.inc:56 ../lib/modules/quota.inc:58
-#: ../lib/modules/quota.inc:60 ../lib/modules/quota.inc:62
-#: ../lib/modules/quota.inc:63 ../lib/modules/zarafaAddressList.inc:170
+#: ../lib/modules/quota.inc:55 ../lib/modules/quota.inc:57
+#: ../lib/modules/quota.inc:59 ../lib/modules/quota.inc:61
+#: ../lib/modules/quota.inc:63 ../lib/modules/quota.inc:65
+#: ../lib/modules/quota.inc:66 ../lib/modules/zarafaAddressList.inc:170
 #: ../lib/modules/zarafaAddressList.inc:171
 #: ../lib/modules/zarafaAddressList.inc:172 ../lib/modules/pykotaGroup.inc:198
 #: ../lib/modules/pykotaGroup.inc:200 ../lib/modules/pykotaGroup.inc:202
@@ -312,29 +321,29 @@ msgstr "帐号"
 #: ../lib/modules/posixAccount.inc:123 ../lib/modules/posixAccount.inc:124
 #: ../lib/modules/posixAccount.inc:126 ../lib/modules/posixAccount.inc:127
 #: ../lib/modules/posixAccount.inc:128 ../lib/modules/posixAccount.inc:130
-#: ../lib/modules/zarafaUser.inc:431 ../lib/modules/zarafaUser.inc:433
-#: ../lib/modules/zarafaUser.inc:435 ../lib/modules/zarafaUser.inc:436
-#: ../lib/modules/zarafaUser.inc:438 ../lib/modules/zarafaUser.inc:440
-#: ../lib/modules/zarafaUser.inc:442 ../lib/modules/zarafaUser.inc:443
-#: ../lib/modules/zarafaUser.inc:444 ../lib/modules/zarafaUser.inc:445
-#: ../lib/modules/zarafaUser.inc:446 ../lib/modules/zarafaUser.inc:447
-#: ../lib/modules/zarafaUser.inc:448 ../lib/modules/zarafaUser.inc:449
-#: ../lib/modules/ppolicyUser.inc:102 ../lib/modules/bindDLZ.inc:478
-#: ../lib/modules/bindDLZ.inc:480 ../lib/modules/bindDLZ.inc:482
-#: ../lib/modules/bindDLZ.inc:484 ../lib/modules/bindDLZ.inc:486
-#: ../lib/modules/bindDLZ.inc:488 ../lib/modules/bindDLZ.inc:490
-#: ../lib/modules/bindDLZ.inc:492 ../lib/modules/bindDLZ.inc:494
-#: ../lib/modules/bindDLZ.inc:496 ../lib/modules/bindDLZ.inc:498
+#: ../lib/modules/zarafaUser.inc:434 ../lib/modules/zarafaUser.inc:436
+#: ../lib/modules/zarafaUser.inc:438 ../lib/modules/zarafaUser.inc:439
+#: ../lib/modules/zarafaUser.inc:441 ../lib/modules/zarafaUser.inc:443
+#: ../lib/modules/zarafaUser.inc:445 ../lib/modules/zarafaUser.inc:446
+#: ../lib/modules/zarafaUser.inc:447 ../lib/modules/zarafaUser.inc:448
+#: ../lib/modules/zarafaUser.inc:449 ../lib/modules/zarafaUser.inc:450
+#: ../lib/modules/zarafaUser.inc:451 ../lib/modules/zarafaUser.inc:452
+#: ../lib/modules/ppolicyUser.inc:102 ../lib/modules/bindDLZ.inc:481
+#: ../lib/modules/bindDLZ.inc:483 ../lib/modules/bindDLZ.inc:485
+#: ../lib/modules/bindDLZ.inc:487 ../lib/modules/bindDLZ.inc:489
+#: ../lib/modules/bindDLZ.inc:491 ../lib/modules/bindDLZ.inc:493
+#: ../lib/modules/bindDLZ.inc:495 ../lib/modules/bindDLZ.inc:497
 #: ../lib/modules/bindDLZ.inc:499 ../lib/modules/bindDLZ.inc:501
-#: ../lib/modules/bindDLZ.inc:503 ../lib/modules/bindDLZ.inc:505
-#: ../lib/modules/bindDLZ.inc:507 ../lib/modules/bindDLZ.inc:509
-#: ../lib/modules/bindDLZ.inc:511 ../lib/modules/bindDLZ.inc:513
-#: ../lib/modules/bindDLZ.inc:515 ../lib/modules/bindDLZ.inc:516
-#: ../lib/modules/bindDLZ.inc:517 ../lib/modules/bindDLZ.inc:518
-#: ../lib/modules/bindDLZ.inc:520 ../lib/modules/bindDLZ.inc:522
-#: ../lib/modules/bindDLZ.inc:524 ../lib/modules/bindDLZ.inc:526
-#: ../lib/modules/bindDLZ.inc:528 ../lib/modules/bindDLZ.inc:530
-#: ../lib/modules/bindDLZ.inc:532 ../lib/modules/bindDLZ.inc:533
+#: ../lib/modules/bindDLZ.inc:502 ../lib/modules/bindDLZ.inc:504
+#: ../lib/modules/bindDLZ.inc:506 ../lib/modules/bindDLZ.inc:508
+#: ../lib/modules/bindDLZ.inc:510 ../lib/modules/bindDLZ.inc:512
+#: ../lib/modules/bindDLZ.inc:514 ../lib/modules/bindDLZ.inc:516
+#: ../lib/modules/bindDLZ.inc:518 ../lib/modules/bindDLZ.inc:519
+#: ../lib/modules/bindDLZ.inc:520 ../lib/modules/bindDLZ.inc:521
+#: ../lib/modules/bindDLZ.inc:523 ../lib/modules/bindDLZ.inc:525
+#: ../lib/modules/bindDLZ.inc:527 ../lib/modules/bindDLZ.inc:529
+#: ../lib/modules/bindDLZ.inc:531 ../lib/modules/bindDLZ.inc:533
+#: ../lib/modules/bindDLZ.inc:535 ../lib/modules/bindDLZ.inc:536
 #: ../lib/modules/windowsUser.inc:951 ../lib/modules/windowsUser.inc:953
 #: ../lib/modules/windowsUser.inc:955 ../lib/modules/windowsUser.inc:957
 #: ../lib/modules/windowsUser.inc:959 ../lib/modules/windowsUser.inc:961
@@ -350,37 +359,37 @@ msgstr "帐号"
 #: ../lib/modules/windowsUser.inc:1000 ../lib/modules/windowsUser.inc:1001
 #: ../lib/modules/windowsUser.inc:2120 ../lib/modules/windowsUser.inc:2129
 #: ../lib/modules/windowsUser.inc:2150 ../lib/modules/windowsUser.inc:2161
-#: ../lib/modules/windowsUser.inc:2219 ../lib/modules/kolabUser.inc:246
-#: ../lib/modules/kolabUser.inc:248 ../lib/modules/kolabUser.inc:250
-#: ../lib/modules/kolabUser.inc:252 ../lib/modules/kolabUser.inc:254
-#: ../lib/modules/kolabUser.inc:256 ../lib/modules/kolabUser.inc:258
+#: ../lib/modules/windowsUser.inc:2219 ../lib/modules/kolabUser.inc:249
+#: ../lib/modules/kolabUser.inc:251 ../lib/modules/kolabUser.inc:253
+#: ../lib/modules/kolabUser.inc:255 ../lib/modules/kolabUser.inc:257
+#: ../lib/modules/kolabUser.inc:259 ../lib/modules/kolabUser.inc:261
 #: ../lib/modules/ddns.inc:152 ../lib/modules/nisObject.inc:124
-#: ../lib/modules/sambaGroupMapping.inc:604
-#: ../lib/modules/sambaGroupMapping.inc:605 ../lib/modules/pykotaUser.inc:312
-#: ../lib/modules/pykotaUser.inc:314 ../lib/modules/pykotaUser.inc:316
-#: ../lib/modules/pykotaUser.inc:318 ../lib/modules/pykotaUser.inc:320
+#: ../lib/modules/sambaGroupMapping.inc:602
+#: ../lib/modules/sambaGroupMapping.inc:603 ../lib/modules/pykotaUser.inc:315
+#: ../lib/modules/pykotaUser.inc:317 ../lib/modules/pykotaUser.inc:319
 #: ../lib/modules/pykotaUser.inc:321 ../lib/modules/pykotaUser.inc:323
-#: ../lib/modules/pykotaUser.inc:325 ../lib/modules/shadowAccount.inc:58
+#: ../lib/modules/pykotaUser.inc:324 ../lib/modules/pykotaUser.inc:326
+#: ../lib/modules/pykotaUser.inc:328 ../lib/modules/shadowAccount.inc:58
 #: ../lib/modules/shadowAccount.inc:60 ../lib/modules/shadowAccount.inc:62
 #: ../lib/modules/shadowAccount.inc:64 ../lib/modules/shadowAccount.inc:66
 #: ../lib/modules/shadowAccount.inc:67 ../lib/modules/automount.inc:115
 #: ../lib/modules/sambaDomain.inc:209 ../lib/modules/sambaDomain.inc:211
 #: ../lib/modules/sambaDomain.inc:213 ../lib/modules/sambaDomain.inc:215
 #: ../lib/modules/sambaDomain.inc:217 ../lib/modules/sambaDomain.inc:219
-#: ../lib/modules/inetOrgPerson.inc:67 ../lib/modules/inetOrgPerson.inc:69
-#: ../lib/modules/inetOrgPerson.inc:71 ../lib/modules/inetOrgPerson.inc:73
-#: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:77
-#: ../lib/modules/inetOrgPerson.inc:79 ../lib/modules/inetOrgPerson.inc:82
-#: ../lib/modules/inetOrgPerson.inc:84 ../lib/modules/inetOrgPerson.inc:86
-#: ../lib/modules/inetOrgPerson.inc:88 ../lib/modules/inetOrgPerson.inc:90
-#: ../lib/modules/inetOrgPerson.inc:92 ../lib/modules/inetOrgPerson.inc:94
-#: ../lib/modules/inetOrgPerson.inc:96 ../lib/modules/inetOrgPerson.inc:98
-#: ../lib/modules/inetOrgPerson.inc:99 ../lib/modules/inetOrgPerson.inc:100
-#: ../lib/modules/inetOrgPerson.inc:106 ../lib/modules/inetOrgPerson.inc:107
-#: ../lib/modules/inetOrgPerson.inc:108 ../lib/modules/systemQuotas.inc:98
-#: ../lib/modules/systemQuotas.inc:100 ../lib/modules/systemQuotas.inc:102
-#: ../lib/modules/systemQuotas.inc:104 ../lib/modules/systemQuotas.inc:106
-#: ../lib/modules/systemQuotas.inc:108 ../lib/modules/systemQuotas.inc:110
+#: ../lib/modules/inetOrgPerson.inc:65 ../lib/modules/inetOrgPerson.inc:67
+#: ../lib/modules/inetOrgPerson.inc:69 ../lib/modules/inetOrgPerson.inc:71
+#: ../lib/modules/inetOrgPerson.inc:73 ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/inetOrgPerson.inc:77 ../lib/modules/inetOrgPerson.inc:80
+#: ../lib/modules/inetOrgPerson.inc:82 ../lib/modules/inetOrgPerson.inc:84
+#: ../lib/modules/inetOrgPerson.inc:86 ../lib/modules/inetOrgPerson.inc:88
+#: ../lib/modules/inetOrgPerson.inc:90 ../lib/modules/inetOrgPerson.inc:92
+#: ../lib/modules/inetOrgPerson.inc:94 ../lib/modules/inetOrgPerson.inc:96
+#: ../lib/modules/inetOrgPerson.inc:97 ../lib/modules/inetOrgPerson.inc:98
+#: ../lib/modules/inetOrgPerson.inc:104 ../lib/modules/inetOrgPerson.inc:105
+#: ../lib/modules/inetOrgPerson.inc:106 ../lib/modules/systemQuotas.inc:101
+#: ../lib/modules/systemQuotas.inc:103 ../lib/modules/systemQuotas.inc:105
+#: ../lib/modules/systemQuotas.inc:107 ../lib/modules/systemQuotas.inc:109
+#: ../lib/modules/systemQuotas.inc:111 ../lib/modules/systemQuotas.inc:113
 #: ../lib/modules/freeRadius.inc:330 ../lib/modules/freeRadius.inc:332
 #: ../lib/modules/freeRadius.inc:334 ../lib/modules/freeRadius.inc:336
 #: ../lib/modules/freeRadius.inc:338 ../lib/modules/freeRadius.inc:340
@@ -421,9 +430,9 @@ msgstr "帐号"
 #: ../lib/modules/heimdalKerberos.inc:258
 #: ../lib/modules/heimdalKerberos.inc:260
 #: ../lib/modules/pykotaBillingCode.inc:128
-#: ../lib/modules/pykotaBillingCode.inc:130 ../lib/modules/windowsGroup.inc:291
-#: ../lib/modules/windowsGroup.inc:293 ../lib/modules/windowsGroup.inc:294
-#: ../lib/modules/windowsGroup.inc:295 ../lib/modules/windowsGroup.inc:297
+#: ../lib/modules/pykotaBillingCode.inc:130 ../lib/modules/windowsGroup.inc:294
+#: ../lib/modules/windowsGroup.inc:296 ../lib/modules/windowsGroup.inc:297
+#: ../lib/modules/windowsGroup.inc:298 ../lib/modules/windowsGroup.inc:300
 #: ../lib/modules/nisMailAlias.inc:126 ../lib/modules/nisMailAlias.inc:128
 #: ../lib/modules/hostObject.inc:111
 #, php-format
@@ -436,19 +445,19 @@ msgstr "帐号 %s:"
 #: ../lib/modules/asteriskAccount.inc:267
 #: ../lib/modules/asteriskAccount.inc:311
 #: ../lib/modules/asteriskAccount.inc:593
-#: ../lib/modules/asteriskAccount.inc:986
-#: ../lib/modules/asteriskExtension.inc:98
-#: ../lib/modules/asteriskExtension.inc:129
-#: ../lib/modules/asteriskExtension.inc:136
-#: ../lib/modules/asteriskExtension.inc:152
-#: ../lib/modules/asteriskExtension.inc:306
+#: ../lib/modules/asteriskAccount.inc:984
+#: ../lib/modules/asteriskExtension.inc:100
+#: ../lib/modules/asteriskExtension.inc:131
+#: ../lib/modules/asteriskExtension.inc:138
+#: ../lib/modules/asteriskExtension.inc:154
+#: ../lib/modules/asteriskExtension.inc:308
 #: ../lib/modules/asteriskExtension.inc:815
 #: ../lib/modules/asteriskVoicemail.inc:91
 #: ../lib/modules/asteriskVoicemail.inc:127
 #: ../lib/modules/asteriskVoicemail.inc:137
 #: ../lib/modules/asteriskVoicemail.inc:151
 #: ../lib/modules/asteriskVoicemail.inc:247
-#: ../lib/modules/asteriskVoicemail.inc:373
+#: ../lib/modules/asteriskVoicemail.inc:371
 msgid "Account context"
 msgstr "帐号语境"
 
@@ -460,7 +469,7 @@ msgstr "帐号建立"
 msgid "Account creation confirmation"
 msgstr "建立帐号确认"
 
-#: ../templates/masscreate.php:124
+#: ../templates/upload/masscreate.php:149
 msgid "Account creation via file upload"
 msgstr "通过上传文件建立帐号"
 
@@ -468,7 +477,7 @@ msgstr "通过上传文件建立帐号"
 msgid "Account deactivated"
 msgstr "帐号已停用"
 
-#: ../templates/lists/changePassword.php:279
+#: ../templates/lists/changePassword.php:280
 msgid "Account details"
 msgstr "帐号详细信息"
 
@@ -480,24 +489,24 @@ msgstr "帐号过期"
 #: ../lib/types/user.inc:108 ../lib/modules/mitKerberos.inc:124
 #: ../lib/modules/mitKerberos.inc:218 ../lib/modules/mitKerberos.inc:251
 #: ../lib/modules/mitKerberos.inc:385 ../lib/modules/mitKerberos.inc:635
-#: ../lib/modules/mitKerberos.inc:797 ../lib/modules/sambaSamAccount.inc:346
+#: ../lib/modules/mitKerberos.inc:795 ../lib/modules/sambaSamAccount.inc:346
 #: ../lib/modules/sambaSamAccount.inc:470
 #: ../lib/modules/sambaSamAccount.inc:1141
 #: ../lib/modules/sambaSamAccount.inc:1394
 #: ../lib/modules/sambaSamAccount.inc:1687 ../lib/modules/windowsUser.inc:282
 #: ../lib/modules/windowsUser.inc:286 ../lib/modules/windowsUser.inc:536
 #: ../lib/modules/windowsUser.inc:844 ../lib/modules/windowsUser.inc:1196
-#: ../lib/modules/windowsUser.inc:1569 ../lib/modules/windowsUser.inc:2473
-#: ../lib/modules/windowsUser.inc:2630 ../lib/modules/shadowAccount.inc:128
+#: ../lib/modules/windowsUser.inc:1569 ../lib/modules/windowsUser.inc:2471
+#: ../lib/modules/windowsUser.inc:2628 ../lib/modules/shadowAccount.inc:128
 #: ../lib/modules/shadowAccount.inc:170 ../lib/modules/shadowAccount.inc:193
 #: ../lib/modules/shadowAccount.inc:233 ../lib/modules/shadowAccount.inc:352
-#: ../lib/modules/shadowAccount.inc:462 ../lib/modules/shadowAccount.inc:569
+#: ../lib/modules/shadowAccount.inc:462 ../lib/modules/shadowAccount.inc:567
 #: ../lib/modules/heimdalKerberos.inc:102
 #: ../lib/modules/heimdalKerberos.inc:187
 #: ../lib/modules/heimdalKerberos.inc:219
 #: ../lib/modules/heimdalKerberos.inc:321
 #: ../lib/modules/heimdalKerberos.inc:544
-#: ../lib/modules/heimdalKerberos.inc:693
+#: ../lib/modules/heimdalKerberos.inc:691
 msgid "Account expiration date"
 msgstr "帐号过期日期"
 
@@ -515,7 +524,7 @@ msgstr "帐号停用(inactive)"
 #: ../lib/modules/sambaSamAccount.inc:1097
 #: ../lib/modules/sambaSamAccount.inc:1683 ../lib/modules/windowsUser.inc:210
 #: ../lib/modules/windowsUser.inc:520 ../lib/modules/windowsUser.inc:834
-#: ../lib/modules/windowsUser.inc:1188 ../lib/modules/windowsUser.inc:2467
+#: ../lib/modules/windowsUser.inc:1188 ../lib/modules/windowsUser.inc:2465
 msgid "Account is deactivated"
 msgstr "帐号已经停用"
 
@@ -525,35 +534,36 @@ msgstr "帐号已经停用"
 msgid "Account is locked"
 msgstr "帐号锁定"
 
-#: ../templates/lists/changePassword.php:433 ../lib/modules/locking389ds.inc:58
+#: ../templates/lists/changePassword.php:434 ../lib/modules/locking389ds.inc:58
 msgid "Account locking"
 msgstr "帐号锁定"
 
-#: ../templates/delete.php:104
+#: ../templates/delete.php:110
 msgid "Account name:"
 msgstr "帐号名"
 
 #: ../lib/types/user.inc:331 ../lib/types/user.inc:787
 #: ../lib/types/user.inc:998 ../lib/modules/qmailUser.inc:211
 #: ../lib/modules/qmailUser.inc:283 ../lib/modules/qmailUser.inc:402
-#: ../lib/modules/qmailUser.inc:619 ../lib/modules/qmailUser.inc:1128
+#: ../lib/modules/qmailUser.inc:619 ../lib/modules/qmailUser.inc:1126
 msgid "Account status"
 msgstr "帐号状态"
 
-#: ../templates/masscreate.php:151 ../lib/modules/asteriskAccount.inc:119
+#: ../templates/upload/masscreate.php:176
+#: ../lib/modules/asteriskAccount.inc:119
 #: ../lib/modules/asteriskAccount.inc:256
 #: ../lib/modules/asteriskAccount.inc:269
 #: ../lib/modules/asteriskAccount.inc:331
 #: ../lib/modules/asteriskAccount.inc:595
-#: ../lib/modules/asteriskAccount.inc:988 ../lib/modules/customFields.inc:528
+#: ../lib/modules/asteriskAccount.inc:986 ../lib/modules/customFields.inc:528
 #: ../lib/modules/customFields.inc:570
 msgid "Account type"
 msgstr "帐号类型"
 
-#: ../templates/config/confmodules.php:174 ../templates/config/jobList.php:158
-#: ../templates/config/jobs.php:161 ../templates/config/confmain.php:215
-#: ../templates/config/moduleSettings.php:173
-#: ../templates/config/conftypes.php:192
+#: ../templates/config/confmodules.php:184 ../templates/config/jobList.php:158
+#: ../templates/config/jobs.php:161 ../templates/config/confmain.php:218
+#: ../templates/config/moduleSettings.php:178
+#: ../templates/config/conftypes.php:211
 msgid "Account types"
 msgstr "帐号类型"
 
@@ -570,17 +580,17 @@ msgstr ""
 "LDAP条目类型中的帐号类型定义必须是可管理的（比如user和group),帐号模块定义中的"
 "属性（例如 UNIX 和SAMBA）必须是可编辑的。"
 
-#: ../lib/modules.inc:1345
+#: ../lib/modules.inc:1353
 msgid "Account was created successfully."
 msgstr "新增帐号成功"
 
-#: ../templates/lists/changePassword.php:794
-#: ../templates/lists/changePassword.php:901
-#: ../templates/lists/changePassword.php:951 ../lib/modules.inc:1348
+#: ../templates/lists/changePassword.php:795
+#: ../templates/lists/changePassword.php:902
+#: ../templates/lists/changePassword.php:952 ../lib/modules.inc:1356
 msgid "Account was modified successfully."
 msgstr "帐号修改成功"
 
-#: ../lib/passwordExpirationJob.inc:472 ../help/help.inc:350
+#: ../lib/passwordExpirationJob.inc:472 ../help/help.inc:362
 msgid "Action"
 msgstr "功能"
 
@@ -588,7 +598,7 @@ msgstr "功能"
 msgid "Action type"
 msgstr "动作类型"
 
-#: ../templates/lists/changePassword.php:429 ../lib/types/user.inc:449
+#: ../templates/lists/changePassword.php:430 ../lib/types/user.inc:449
 msgid "Activate"
 msgstr "激活的"
 
@@ -596,8 +606,8 @@ msgstr "激活的"
 msgid "Activate DynDNS"
 msgstr "活动的动态DNS"
 
-#: ../templates/config/confmain.php:255
-#: ../templates/selfService/adminMain.php:423
+#: ../templates/config/confmain.php:258
+#: ../templates/selfService/adminMain.php:439
 msgid "Activate TLS"
 msgstr "激活TLS"
 
@@ -633,32 +643,32 @@ msgstr "激活这个选项将会删除用户的主目录."
 #: ../lib/modules/zarafaDynamicGroup.inc:144
 #: ../lib/modules/zarafaDynamicGroup.inc:168
 #: ../lib/modules/zarafaDynamicGroup.inc:281
-#: ../lib/modules/zarafaDynamicGroup.inc:442 ../lib/modules/qmailUser.inc:41
+#: ../lib/modules/zarafaDynamicGroup.inc:440 ../lib/modules/qmailUser.inc:41
 #: ../lib/modules/qmailUser.inc:285 ../lib/modules/zarafaContact.inc:81
 #: ../lib/modules/zarafaContact.inc:173 ../lib/modules/zarafaContact.inc:281
 #: ../lib/modules/zarafaGroup.inc:94 ../lib/modules/zarafaGroup.inc:137
 #: ../lib/modules/zarafaGroup.inc:178 ../lib/modules/zarafaGroup.inc:292
-#: ../lib/modules/zarafaGroup.inc:639 ../lib/modules/zarafaAddressList.inc:71
+#: ../lib/modules/zarafaGroup.inc:637 ../lib/modules/zarafaAddressList.inc:71
 #: ../lib/modules/zarafaAddressList.inc:120
 #: ../lib/modules/zarafaAddressList.inc:142
 #: ../lib/modules/zarafaAddressList.inc:222
-#: ../lib/modules/zarafaAddressList.inc:341 ../lib/modules/zarafaUser.inc:98
-#: ../lib/modules/zarafaUser.inc:273 ../lib/modules/zarafaUser.inc:623
-#: ../lib/modules/zarafaUser.inc:1840 ../lib/modules/fixed_ip.inc:114
-#: ../lib/modules/fixed_ip.inc:438 ../lib/modules/fixed_ip.inc:744
+#: ../lib/modules/zarafaAddressList.inc:339 ../lib/modules/zarafaUser.inc:101
+#: ../lib/modules/zarafaUser.inc:276 ../lib/modules/zarafaUser.inc:626
+#: ../lib/modules/zarafaUser.inc:1841 ../lib/modules/fixed_ip.inc:117
+#: ../lib/modules/fixed_ip.inc:441 ../lib/modules/fixed_ip.inc:745
 msgid "Active"
 msgstr "激活"
 
-#: ../templates/config/conftypes.php:245
+#: ../templates/config/conftypes.php:264
 msgid "Active account types"
 msgstr "激活帐号类型"
 
-#: ../templates/serverInfo.php:307 ../templates/serverInfo.php:384
-#: ../templates/multiEdit.php:130 ../templates/config/profmanage.php:258
-#: ../templates/config/conftypes.php:235
+#: ../templates/serverInfo.php:308 ../templates/serverInfo.php:385
+#: ../templates/multiEdit.php:153 ../templates/config/profmanage.php:258
+#: ../templates/config/conftypes.php:254
 #: ../templates/selfService/profManage.php:208
-#: ../templates/pdfedit/pdfpage.php:600 ../templates/pdfedit/pdfpage.php:610
-#: ../templates/pdfedit/pdfpage.php:620 ../templates/pdfedit/pdfpage.php:634
+#: ../templates/pdfedit/pdfpage.php:616 ../templates/pdfedit/pdfpage.php:626
+#: ../templates/pdfedit/pdfpage.php:636 ../templates/pdfedit/pdfpage.php:651
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1206
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1210
 #: ../templates/3rdParty/pla/htdocs/add_attr_form.php:78
@@ -666,27 +676,27 @@ msgstr "激活帐号类型"
 #: ../lib/modules/pykotaPrinter.inc:269 ../lib/modules/pykotaPrinter.inc:430
 #: ../lib/modules/nisMailAliasUser.inc:162
 #: ../lib/modules/nisMailAliasUser.inc:201
-#: ../lib/modules/nisMailAliasUser.inc:387 ../lib/modules/zarafaContact.inc:433
-#: ../lib/modules/zarafaGroup.inc:443 ../lib/modules/device.inc:253
-#: ../lib/modules/nisNetGroupHost.inc:133 ../lib/modules/zarafaUser.inc:917
-#: ../lib/modules/zarafaUser.inc:1503 ../lib/modules/zarafaUser.inc:1534
-#: ../lib/modules/bindDLZ.inc:675 ../lib/modules/bindDLZ.inc:767
-#: ../lib/modules/bindDLZ.inc:847 ../lib/modules/bindDLZ.inc:951
-#: ../lib/modules/bindDLZ.inc:1067 ../lib/modules/bindDLZ.inc:1179
-#: ../lib/modules/bindDLZ.inc:1275 ../lib/modules/bindDLZ.inc:1389
-#: ../lib/modules/kolabUser.inc:802 ../lib/modules/kolabUser.inc:850
+#: ../lib/modules/nisMailAliasUser.inc:396 ../lib/modules/zarafaContact.inc:433
+#: ../lib/modules/zarafaGroup.inc:443 ../lib/modules/device.inc:256
+#: ../lib/modules/nisNetGroupHost.inc:136 ../lib/modules/zarafaUser.inc:920
+#: ../lib/modules/zarafaUser.inc:1504 ../lib/modules/zarafaUser.inc:1535
+#: ../lib/modules/bindDLZ.inc:678 ../lib/modules/bindDLZ.inc:770
+#: ../lib/modules/bindDLZ.inc:850 ../lib/modules/bindDLZ.inc:954
+#: ../lib/modules/bindDLZ.inc:1070 ../lib/modules/bindDLZ.inc:1182
+#: ../lib/modules/bindDLZ.inc:1278 ../lib/modules/bindDLZ.inc:1392
+#: ../lib/modules/kolabUser.inc:803 ../lib/modules/kolabUser.inc:851
 #: ../lib/modules/sambaGroupMapping.inc:392
-#: ../lib/modules/sambaGroupMapping.inc:489 ../lib/modules/pykotaUser.inc:377
-#: ../lib/modules/ldapPublicKey.inc:362 ../lib/modules/ldapPublicKey.inc:371
-#: ../lib/modules/nisNetGroupUser.inc:213 ../lib/modules/nisnetgroup.inc:282
-#: ../lib/modules/inetOrgPerson.inc:1800 ../lib/modules/sudoRole.inc:321
+#: ../lib/modules/sambaGroupMapping.inc:489 ../lib/modules/pykotaUser.inc:380
+#: ../lib/modules/ldapPublicKey.inc:363 ../lib/modules/ldapPublicKey.inc:372
+#: ../lib/modules/nisNetGroupUser.inc:216 ../lib/modules/nisnetgroup.inc:285
+#: ../lib/modules/inetOrgPerson.inc:1798 ../lib/modules/sudoRole.inc:321
 #: ../lib/modules/sudoRole.inc:348 ../lib/modules/sudoRole.inc:375
 #: ../lib/modules/sudoRole.inc:402 ../lib/modules/sudoRole.inc:429
-#: ../lib/modules/sudoRole.inc:456 ../lib/modules/customFields.inc:1088
-#: ../lib/modules/customFields.inc:2188 ../lib/modules/customFields.inc:2205
-#: ../lib/modules/qmailGroup.inc:822 ../lib/modules/organizationalRole.inc:323
-#: ../lib/modules/fixed_ip.inc:586 ../lib/modules/windowsGroup.inc:686
-#: ../lib/modules/groupOfNames.inc:382 ../lib/modules/groupOfNames.inc:537
+#: ../lib/modules/sudoRole.inc:456 ../lib/modules/customFields.inc:1086
+#: ../lib/modules/customFields.inc:2186 ../lib/modules/customFields.inc:2203
+#: ../lib/modules/qmailGroup.inc:822 ../lib/modules/organizationalRole.inc:326
+#: ../lib/modules/fixed_ip.inc:589 ../lib/modules/windowsGroup.inc:689
+#: ../lib/modules/groupOfNames.inc:385 ../lib/modules/groupOfNames.inc:540
 msgid "Add"
 msgstr "增加"
 
@@ -719,19 +729,19 @@ msgid "Add Kerberos extension"
 msgstr "增加 Kerberos 扩展"
 
 #: ../lib/modules/kolabGroup.inc:121 ../lib/modules/kolabGroup.inc:133
-#: ../lib/modules/kolabGroup.inc:220 ../lib/modules/kolabUser.inc:394
+#: ../lib/modules/kolabGroup.inc:220 ../lib/modules/kolabUser.inc:397
 msgid "Add Kolab extension"
 msgstr "增加 Kolab 扩展"
 
-#: ../lib/modules/puppetClient.inc:235
+#: ../lib/modules/puppetClient.inc:238
 msgid "Add Puppet extension"
 msgstr "增加 Puppet 扩展"
 
-#: ../lib/modules/pykotaGroup.inc:245 ../lib/modules/pykotaUser.inc:425
+#: ../lib/modules/pykotaGroup.inc:245 ../lib/modules/pykotaUser.inc:428
 msgid "Add PyKota extension"
 msgstr "增加  PyKota  扩展"
 
-#: ../lib/modules/ldapPublicKey.inc:159
+#: ../lib/modules/ldapPublicKey.inc:162
 msgid "Add SSH public key extension"
 msgstr "增加SSH公钥扩展"
 
@@ -753,13 +763,13 @@ msgid "Add Zarafa contact extension"
 msgstr "增加Zarafa联系人扩展"
 
 #: ../lib/modules/zarafaContact.inc:116 ../lib/modules/zarafaContact.inc:117
-#: ../lib/modules/zarafaGroup.inc:302 ../lib/modules/zarafaUser.inc:181
-#: ../lib/modules/zarafaUser.inc:182 ../lib/modules/zarafaUser.inc:197
-#: ../lib/modules/zarafaUser.inc:462 ../lib/modules/zarafaServer.inc:237
+#: ../lib/modules/zarafaGroup.inc:302 ../lib/modules/zarafaUser.inc:184
+#: ../lib/modules/zarafaUser.inc:185 ../lib/modules/zarafaUser.inc:200
+#: ../lib/modules/zarafaUser.inc:465 ../lib/modules/zarafaServer.inc:237
 msgid "Add Zarafa extension"
 msgstr "增加Zarafa扩展"
 
-#: ../lib/modules/inetOrgPerson.inc:880 ../lib/modules/inetOrgPerson.inc:3710
+#: ../lib/modules/inetOrgPerson.inc:878 ../lib/modules/inetOrgPerson.inc:3690
 msgid "Add addressbook (ou=addressbook)"
 msgstr "增加通讯录(ou=addressbook)"
 
@@ -776,26 +786,26 @@ msgstr "增加所有"
 msgid "Add an additional value to attribute"
 msgstr "给属性新增一个值."
 
-#: ../lib/modules/asteriskExtension.inc:350
+#: ../lib/modules/asteriskExtension.inc:352
 msgid "Add another rule"
 msgstr "增加另外一个规则"
 
-#: ../lib/modules/inetOrgPerson.inc:1835
-#: ../lib/modules/organizationalRole.inc:328
-#: ../lib/modules/groupOfNames.inc:387 ../lib/modules/groupOfNames.inc:542
+#: ../lib/modules/inetOrgPerson.inc:1833
+#: ../lib/modules/organizationalRole.inc:331
+#: ../lib/modules/groupOfNames.inc:390 ../lib/modules/groupOfNames.inc:545
 msgid "Add entries"
 msgstr "增加条目"
 
 #: ../lib/modules/zarafaContact.inc:472 ../lib/modules/zarafaGroup.inc:482
-#: ../lib/modules/device.inc:296 ../lib/modules/zarafaUser.inc:961
+#: ../lib/modules/device.inc:299 ../lib/modules/zarafaUser.inc:964
 #: ../lib/modules/sambaGroupMapping.inc:504 ../lib/modules/qmailGroup.inc:858
-#: ../lib/modules/organizationalRole.inc:339
-#: ../lib/modules/windowsGroup.inc:729 ../lib/modules/groupOfNames.inc:398
-#: ../lib/modules/groupOfNames.inc:553
+#: ../lib/modules/organizationalRole.inc:342
+#: ../lib/modules/windowsGroup.inc:732 ../lib/modules/groupOfNames.inc:401
+#: ../lib/modules/groupOfNames.inc:556
 msgid "Add entries of this type:"
 msgstr "增加类型条目"
 
-#: ../lib/modules/fixed_ip.inc:544
+#: ../lib/modules/fixed_ip.inc:547
 msgid "Add existing host"
 msgstr "增加已有主机"
 
@@ -811,7 +821,7 @@ msgstr "为DNS增加一个固定的IP地址"
 msgid "Add host extension"
 msgstr "增加 host 扩展"
 
-#: ../templates/selfService/adminMain.php:621 ../help/help.inc:270
+#: ../templates/selfService/adminMain.php:674 ../help/help.inc:270
 msgid "Add input field"
 msgstr "增加输入栏目"
 
@@ -823,11 +833,11 @@ msgstr "新增工作"
 msgid "Add mail routing extension"
 msgstr "增加邮件路由扩展"
 
-#: ../templates/multiEdit.php:152
+#: ../templates/multiEdit.php:175
 msgid "Add more fields"
 msgstr "增加更多的域"
 
-#: ../lib/modules/customFields.inc:3150
+#: ../lib/modules/customFields.inc:3148
 msgid "Add more mapping fields"
 msgstr "增加更多的映射域"
 
@@ -853,11 +863,11 @@ msgstr "给对象新增属性"
 msgid "Add new binary attribute"
 msgstr "新增binary属性."
 
-#: ../lib/modules/customFields.inc:1087 ../lib/modules/customFields.inc:1088
+#: ../lib/modules/customFields.inc:1085 ../lib/modules/customFields.inc:1086
 msgid "Add new field"
 msgstr "增加新域"
 
-#: ../templates/selfService/adminMain.php:613 ../help/help.inc:268
+#: ../templates/selfService/adminMain.php:666 ../help/help.inc:268
 msgid "Add new group"
 msgstr "新增组"
 
@@ -880,8 +890,8 @@ msgstr "增加密码自助复位扩展"
 
 #: ../lib/modules/windowsUser.inc:294 ../lib/modules/windowsUser.inc:390
 #: ../lib/modules/windowsUser.inc:1267 ../lib/modules/windowsUser.inc:1765
-#: ../lib/modules/inetOrgPerson.inc:775 ../lib/modules/inetOrgPerson.inc:1676
-#: ../lib/modules/inetOrgPerson.inc:1759 ../lib/modules/inetOrgPerson.inc:2738
+#: ../lib/modules/inetOrgPerson.inc:773 ../lib/modules/inetOrgPerson.inc:1674
+#: ../lib/modules/inetOrgPerson.inc:1757 ../lib/modules/inetOrgPerson.inc:2734
 msgid "Add photo"
 msgstr "新增照片"
 
@@ -900,7 +910,7 @@ msgstr "增加qmail扩展"
 msgid "Add selected"
 msgstr "增加被选项"
 
-#: ../lib/modules/nisMailAliasUser.inc:374
+#: ../lib/modules/nisMailAliasUser.inc:383
 msgid "Add to existing alias"
 msgstr "加入到已有别名中"
 
@@ -908,7 +918,7 @@ msgstr "加入到已有别名中"
 msgid "Add value"
 msgstr "增加值"
 
-#: ../lib/modules/posixGroup.inc:924
+#: ../lib/modules/posixGroup.inc:922
 msgid "Added users"
 msgstr "增加的用户"
 
@@ -916,16 +926,16 @@ msgstr "增加的用户"
 msgid "Adding"
 msgstr "添加中"
 
-#: ../lib/modules/range.inc:136
+#: ../lib/modules/range.inc:139
 msgid "Adding the range failed because errors occured."
 msgstr "因为发生了错误致使增加范围失败"
 
-#: ../templates/selfService/adminMain.php:517 ../help/help.inc:274
+#: ../templates/selfService/adminMain.php:570 ../help/help.inc:274
 msgid "Additional CSS links"
 msgstr "附加的CSS连接"
 
-#: ../templates/config/conftypes.php:302
-#: ../templates/selfService/adminMain.php:447 ../help/help.inc:172
+#: ../templates/config/conftypes.php:313
+#: ../templates/selfService/adminMain.php:463 ../help/help.inc:172
 #: ../help/help.inc:278
 msgid "Additional LDAP filter"
 msgstr "附加的LDAP过滤表达式"
@@ -939,11 +949,11 @@ msgstr "本条目的附加邮件地址"
 #: ../lib/modules/posixAccount.inc:245 ../lib/modules/posixAccount.inc:356
 #: ../lib/modules/posixAccount.inc:411 ../lib/modules/posixAccount.inc:489
 #: ../lib/modules/posixAccount.inc:1438 ../lib/modules/posixAccount.inc:1729
-#: ../lib/modules/posixAccount.inc:1846
+#: ../lib/modules/posixAccount.inc:1844
 msgid "Additional groups"
 msgstr "附加组"
 
-#: ../lib/modules/windowsGroup.inc:125
+#: ../lib/modules/windowsGroup.inc:128
 msgid "Additional notes to describe this entry."
 msgstr "描述这个条目的附加备注"
 
@@ -951,11 +961,11 @@ msgstr "描述这个条目的附加备注"
 msgid "Additional options"
 msgstr "附加选项"
 
-#: ../templates/massDoUpload.php:160
+#: ../lib/upload.inc:234
 msgid "Additional tasks for module:"
 msgstr "模块的附加任务："
 
-#: ../lib/modules/windowsUser.inc:1092 ../lib/modules/inetOrgPerson.inc:1300
+#: ../lib/modules/windowsUser.inc:1092 ../lib/modules/inetOrgPerson.inc:1298
 msgid "Address"
 msgstr "地址"
 
@@ -974,7 +984,7 @@ msgid ""
 "structure the input fields."
 msgstr "为自助服务选项列表新增组元素.利用它建立输入栏目."
 
-#: ../lib/modules/range.inc:114
+#: ../lib/modules/range.inc:117
 msgid "Adds a new range pool."
 msgstr "增加一个新范围的地址池."
 
@@ -982,19 +992,19 @@ msgstr "增加一个新范围的地址池."
 msgid "Adds a new self service option to the selected group element."
 msgstr "为选定的组元素增加新的自助服务选项."
 
-#: ../lib/modules/inetOrgPerson.inc:881
+#: ../lib/modules/inetOrgPerson.inc:879
 msgid "Adds an \"ou=addressbook\" subentry to each user."
 msgstr "给每一个用户增加\"ou=addressbook\"子条目."
 
-#: ../lib/modules/range.inc:110
+#: ../lib/modules/range.inc:113
 msgid "Adds input fields for a new IP range."
 msgstr "为新IP范围增加输入域"
 
-#: ../lib/modules/pykotaUser.inc:153
+#: ../lib/modules/pykotaUser.inc:156
 msgid "Adds the amount to the user's balance. You can also specify a comment."
 msgstr "增加用户账目的总和,可以输入一条备注."
 
-#: ../lib/modules/kolabUser.inc:171
+#: ../lib/modules/kolabUser.inc:174
 msgid "Adds the object class \"mailrecipient\" to all user accounts."
 msgstr "为所有的用户账号增加目标类 \"mailrecipient\" "
 
@@ -1002,53 +1012,52 @@ msgstr "为所有的用户账号增加目标类 \"mailrecipient\" "
 msgid "Adds this Kolab extension."
 msgstr "增加 这个 Kolab 扩展"
 
-#: ../lib/modules/zarafaUser.inc:122 ../lib/modules/zarafaUser.inc:283
-#: ../lib/modules/zarafaUser.inc:389 ../lib/modules/zarafaUser.inc:633
-#: ../lib/modules/zarafaUser.inc:1300 ../lib/modules/zarafaUser.inc:1842
+#: ../lib/modules/zarafaUser.inc:125 ../lib/modules/zarafaUser.inc:286
+#: ../lib/modules/zarafaUser.inc:392 ../lib/modules/zarafaUser.inc:636
+#: ../lib/modules/zarafaUser.inc:1301 ../lib/modules/zarafaUser.inc:1843
 msgid "Admin"
 msgstr "管理"
 
 #: ../lib/modules/selfRegistration.inc:61
 #: ../lib/modules/selfRegistration.inc:204
 #: ../lib/modules/passwordSelfReset.inc:108
-#: ../lib/modules/passwordSelfReset.inc:658
+#: ../lib/modules/passwordSelfReset.inc:656
 msgid "Admin DN"
 msgstr "管理DN"
 
-#: ../lib/modules/bindDLZ.inc:231 ../lib/modules/bindDLZ.inc:351
-#: ../lib/modules/bindDLZ.inc:428 ../lib/modules/bindDLZ.inc:529
-#: ../lib/modules/bindDLZ.inc:1051 ../lib/modules/bindDLZ.inc:1553
+#: ../lib/modules/bindDLZ.inc:234 ../lib/modules/bindDLZ.inc:354
+#: ../lib/modules/bindDLZ.inc:431 ../lib/modules/bindDLZ.inc:532
+#: ../lib/modules/bindDLZ.inc:1054 ../lib/modules/bindDLZ.inc:1554
 msgid "Admin email"
 msgstr "管理员邮件"
 
 #: ../lib/modules/selfRegistration.inc:65
 #: ../lib/modules/selfRegistration.inc:209 ../lib/modules/imapAccess.inc:483
 #: ../lib/modules/passwordSelfReset.inc:112
-#: ../lib/modules/passwordSelfReset.inc:662
+#: ../lib/modules/passwordSelfReset.inc:660
 msgid "Admin password"
 msgstr "管理密码"
 
 #: ../lib/modules/windowsUser.inc:704 ../lib/modules/windowsUser.inc:712
-#: ../lib/modules/windowsUser.inc:720 ../lib/modules/inetOrgPerson.inc:380
-#: ../lib/modules/inetOrgPerson.inc:502 ../lib/modules/inetOrgPerson.inc:510
+#: ../lib/modules/windowsUser.inc:720 ../lib/modules/inetOrgPerson.inc:378
+#: ../lib/modules/inetOrgPerson.inc:500 ../lib/modules/inetOrgPerson.inc:508
 msgid "Administration"
 msgstr "管理者"
 
 #: ../lib/modules/posixGroup.inc:469 ../lib/modules/pykotaGroup.inc:168
-#: ../lib/modules/nisnetgroup.inc:122 ../lib/modules/organizationalRole.inc:125
-#: ../lib/modules/groupOfNames.inc:137
+#: ../lib/modules/nisnetgroup.inc:125 ../lib/modules/organizationalRole.inc:128
+#: ../lib/modules/groupOfNames.inc:140
 msgid "Administrators group"
 msgstr "管理员组"
 
-#: ../templates/config/confmain.php:293 ../templates/config/conftypes.php:348
-#: ../lib/modules/posixAccount.inc:1995 ../lib/modules/windowsUser.inc:3242
-#: ../lib/modules/inetOrgPerson.inc:3757
+#: ../templates/config/confmain.php:296 ../lib/modules/posixAccount.inc:1993
+#: ../lib/modules/windowsUser.inc:3240 ../lib/modules/inetOrgPerson.inc:3737
 msgid "Advanced options"
 msgstr "高级选项"
 
 #: ../lib/modules/eduPerson.inc:105 ../lib/modules/eduPerson.inc:109
 #: ../lib/modules/eduPerson.inc:181 ../lib/modules/eduPerson.inc:225
-#: ../lib/modules/eduPerson.inc:328 ../lib/modules/eduPerson.inc:562
+#: ../lib/modules/eduPerson.inc:328 ../lib/modules/eduPerson.inc:560
 msgid "Affiliations"
 msgstr "联系"
 
@@ -1075,16 +1084,16 @@ msgid "Alias is empty or invalid!"
 msgstr "别名为空或错误."
 
 #: ../lib/types/mailAlias.inc:91 ../lib/modules/nisMailAliasUser.inc:96
-#: ../lib/modules/nisMailAliasUser.inc:364 ../lib/modules/bindDLZ.inc:135
-#: ../lib/modules/bindDLZ.inc:268 ../lib/modules/bindDLZ.inc:419
-#: ../lib/modules/bindDLZ.inc:497 ../lib/modules/bindDLZ.inc:836
-#: ../lib/modules/bindDLZ.inc:1538 ../lib/modules/nisMailAlias.inc:81
+#: ../lib/modules/nisMailAliasUser.inc:373 ../lib/modules/bindDLZ.inc:138
+#: ../lib/modules/bindDLZ.inc:271 ../lib/modules/bindDLZ.inc:422
+#: ../lib/modules/bindDLZ.inc:500 ../lib/modules/bindDLZ.inc:839
+#: ../lib/modules/bindDLZ.inc:1539 ../lib/modules/nisMailAlias.inc:81
 #: ../lib/modules/nisMailAlias.inc:101 ../lib/modules/nisMailAlias.inc:115
-#: ../lib/modules/nisMailAlias.inc:163 ../lib/modules/nisMailAlias.inc:475
+#: ../lib/modules/nisMailAlias.inc:163 ../lib/modules/nisMailAlias.inc:473
 msgid "Alias name"
 msgstr "别名"
 
-#: ../lib/modules/bindDLZ.inc:834
+#: ../lib/modules/bindDLZ.inc:837
 msgid "Alias name (\"CNAME\" record)"
 msgstr "别名(\"CNAME\"条目)"
 
@@ -1098,8 +1107,8 @@ msgstr "别名非法."
 
 #: ../lib/modules/nisMailAliasUser.inc:100
 #: ../lib/modules/nisMailAliasUser.inc:110
-#: ../lib/modules/nisMailAliasUser.inc:382
-#: ../lib/modules/nisMailAliasUser.inc:542
+#: ../lib/modules/nisMailAliasUser.inc:391
+#: ../lib/modules/nisMailAliasUser.inc:549
 msgid "Alias names"
 msgstr "别名"
 
@@ -1113,7 +1122,7 @@ msgstr "带用户邮件地址的别名."
 msgid "Alias names with user name"
 msgstr "带用户名的别名."
 
-#: ../lib/modules/bindDLZ.inc:420 ../lib/modules/bindDLZ.inc:1539
+#: ../lib/modules/bindDLZ.inc:423 ../lib/modules/bindDLZ.inc:1540
 msgid "Alias timeout"
 msgstr "别名超时"
 
@@ -1121,35 +1130,35 @@ msgstr "别名超时"
 #: ../lib/modules/uidObject.inc:59 ../lib/modules/aliasEntry.inc:61
 #: ../lib/modules/aliasEntry.inc:69 ../lib/modules/aliasEntry.inc:77
 #: ../lib/modules/aliasEntry.inc:98 ../lib/modules/aliasEntry.inc:107
-#: ../lib/modules/aliasEntry.inc:231
+#: ../lib/modules/aliasEntry.inc:229
 msgid "Aliased entry"
 msgstr "已有别名条目"
 
-#: ../templates/schema/schema.php:226 ../lib/types/alias.inc:53
+#: ../templates/schema/schema.php:227 ../lib/types/alias.inc:53
 msgid "Aliases"
 msgstr "别名"
 
 #: ../lib/modules/nisMailAliasUser.inc:169
-#: ../lib/modules/nisMailAliasUser.inc:570
+#: ../lib/modules/nisMailAliasUser.inc:577
 msgid "Aliases for email"
 msgstr "邮件的别名"
 
 #: ../lib/modules/nisMailAliasUser.inc:139
-#: ../lib/modules/nisMailAliasUser.inc:568
+#: ../lib/modules/nisMailAliasUser.inc:575
 msgid "Aliases for user name"
 msgstr "用户名的别名"
 
-#: ../lib/lists.inc:720
+#: ../lib/lists.inc:722
 #, php-format
 msgid "All accounts (%s)"
 msgstr "所有帐号 %s:"
 
-#: ../templates/selfService/selfServiceMain.php:433
-#: ../templates/initsuff.php:162
+#: ../templates/selfService/selfServiceMain.php:442
+#: ../templates/initsuff.php:163
 msgid "All changes were successful."
 msgstr "修改成功."
 
-#: ../lib/lists.inc:719
+#: ../lib/lists.inc:721
 #, php-format
 msgid "All selected accounts (%s)"
 msgstr "所有选中的帐号(%s)"
@@ -1158,44 +1167,44 @@ msgstr "所有选中的帐号(%s)"
 msgid "Allow"
 msgstr "允许"
 
-#: ../templates/config/confmain.php:439 ../help/help.inc:297
+#: ../templates/config/confmain.php:442 ../help/help.inc:309
 msgid "Allow alternate address"
 msgstr "允许另外的地址"
 
 #: ../lib/modules/passwordSelfReset.inc:168
 #: ../lib/modules/passwordSelfReset.inc:299
-#: ../lib/modules/passwordSelfReset.inc:669
+#: ../lib/modules/passwordSelfReset.inc:667
 msgid "Allow custom security questions"
 msgstr "允许自定义安全问题"
 
 #: ../lib/modules/sambaDomain.inc:117 ../lib/modules/sambaDomain.inc:194
-#: ../lib/modules/sambaDomain.inc:308 ../lib/modules/sambaDomain.inc:627
+#: ../lib/modules/sambaDomain.inc:308 ../lib/modules/sambaDomain.inc:625
 msgid "Allow machine password changes"
 msgstr "允许改变主机密码"
 
 #: ../lib/modules/customFields.inc:148 ../lib/modules/customFields.inc:152
-#: ../lib/modules/customFields.inc:3336
+#: ../lib/modules/customFields.inc:3334
 msgid "Allow multiple values"
 msgstr "允许多值"
 
 #: ../lib/types/ppolicyType.inc:90 ../lib/modules/ppolicy.inc:132
 #: ../lib/modules/ppolicy.inc:155 ../lib/modules/ppolicy.inc:289
-#: ../lib/modules/ppolicy.inc:506
+#: ../lib/modules/ppolicy.inc:504
 msgid "Allow password change"
 msgstr "允许改变密码"
 
-#: ../templates/config/confmain.php:386 ../help/help.inc:206
+#: ../templates/config/confmain.php:389 ../help/help.inc:206
 msgid "Allow setting specific passwords"
 msgstr "允许设置自己的密码"
 
 #: ../lib/modules/sambaSamAccount.inc:230
 #: ../lib/modules/sambaSamAccount.inc:352
 #: ../lib/modules/sambaSamAccount.inc:1445
-#: ../lib/modules/sambaSamAccount.inc:1930
+#: ../lib/modules/sambaSamAccount.inc:1928
 msgid "Allow terminal server login"
 msgstr "允许终端服务登录"
 
-#: ../templates/config/confmain.php:394 ../help/help.inc:208
+#: ../templates/config/confmain.php:397 ../help/help.inc:208
 msgid "Allow to display password on screen"
 msgstr "允许在屏幕上显示密码"
 
@@ -1203,7 +1212,7 @@ msgstr "允许在屏幕上显示密码"
 msgid "Allow to enter custom security questions."
 msgstr "允许输入自定义安全问题"
 
-#: ../templates/selfService/adminMain.php:579
+#: ../templates/selfService/adminMain.php:632
 msgid "Allow user input for this field."
 msgstr "允许用户在此域输入。"
 
@@ -1211,8 +1220,8 @@ msgstr "允许用户在此域输入。"
 #: ../lib/modules/asteriskAccount.inc:289
 #: ../lib/modules/asteriskAccount.inc:479
 #: ../lib/modules/asteriskAccount.inc:713
-#: ../lib/modules/asteriskAccount.inc:1008
-#: ../lib/modules/asteriskAccount.inc:1282
+#: ../lib/modules/asteriskAccount.inc:1006
+#: ../lib/modules/asteriskAccount.inc:1280
 msgid "Allowed codec"
 msgstr "允许的编码"
 
@@ -1228,34 +1237,34 @@ msgstr "允许主机（自助服务）"
 #: ../lib/modules/kolabGroup.inc:95 ../lib/modules/kolabGroup.inc:99
 #: ../lib/modules/kolabGroup.inc:141 ../lib/modules/kolabGroup.inc:164
 #: ../lib/modules/kolabGroup.inc:181 ../lib/modules/kolabGroup.inc:205
-#: ../lib/modules/kolabGroup.inc:401 ../lib/modules/kolabUser.inc:152
-#: ../lib/modules/kolabUser.inc:156 ../lib/modules/kolabUser.inc:217
-#: ../lib/modules/kolabUser.inc:235 ../lib/modules/kolabUser.inc:253
-#: ../lib/modules/kolabUser.inc:381 ../lib/modules/kolabUser.inc:733
+#: ../lib/modules/kolabGroup.inc:399 ../lib/modules/kolabUser.inc:155
+#: ../lib/modules/kolabUser.inc:159 ../lib/modules/kolabUser.inc:220
+#: ../lib/modules/kolabUser.inc:238 ../lib/modules/kolabUser.inc:256
+#: ../lib/modules/kolabUser.inc:384 ../lib/modules/kolabUser.inc:734
 #: ../lib/modules/kolabSharedFolder.inc:120
 #: ../lib/modules/kolabSharedFolder.inc:124
 #: ../lib/modules/kolabSharedFolder.inc:208
 #: ../lib/modules/kolabSharedFolder.inc:234
 #: ../lib/modules/kolabSharedFolder.inc:250
 #: ../lib/modules/kolabSharedFolder.inc:307
-#: ../lib/modules/kolabSharedFolder.inc:524
+#: ../lib/modules/kolabSharedFolder.inc:522
 msgid "Allowed recipients"
 msgstr "允许的接收者"
 
 #: ../lib/modules/kolabGroup.inc:104 ../lib/modules/kolabGroup.inc:108
 #: ../lib/modules/kolabGroup.inc:147 ../lib/modules/kolabGroup.inc:165
 #: ../lib/modules/kolabGroup.inc:183 ../lib/modules/kolabGroup.inc:207
-#: ../lib/modules/kolabGroup.inc:402 ../lib/modules/kolabUser.inc:161
-#: ../lib/modules/kolabUser.inc:165 ../lib/modules/kolabUser.inc:223
-#: ../lib/modules/kolabUser.inc:236 ../lib/modules/kolabUser.inc:255
-#: ../lib/modules/kolabUser.inc:383 ../lib/modules/kolabUser.inc:734
+#: ../lib/modules/kolabGroup.inc:400 ../lib/modules/kolabUser.inc:164
+#: ../lib/modules/kolabUser.inc:168 ../lib/modules/kolabUser.inc:226
+#: ../lib/modules/kolabUser.inc:239 ../lib/modules/kolabUser.inc:258
+#: ../lib/modules/kolabUser.inc:386 ../lib/modules/kolabUser.inc:735
 #: ../lib/modules/kolabSharedFolder.inc:129
 #: ../lib/modules/kolabSharedFolder.inc:133
 #: ../lib/modules/kolabSharedFolder.inc:214
 #: ../lib/modules/kolabSharedFolder.inc:235
 #: ../lib/modules/kolabSharedFolder.inc:252
 #: ../lib/modules/kolabSharedFolder.inc:309
-#: ../lib/modules/kolabSharedFolder.inc:525
+#: ../lib/modules/kolabSharedFolder.inc:523
 msgid "Allowed senders"
 msgstr "允许的发送者"
 
@@ -1280,31 +1289,31 @@ msgstr "这个列表允许多选."
 msgid "Allows to set a specific password via input field."
 msgstr "允许在输入框设置密码。"
 
-#: ../templates/lists/changePassword.php:347
-#: ../templates/lists/changePassword.php:385 ../lib/modules/qmailUser.inc:203
+#: ../templates/lists/changePassword.php:348
+#: ../templates/lists/changePassword.php:386 ../lib/modules/qmailUser.inc:203
 #: ../lib/modules/qmailUser.inc:271 ../lib/modules/qmailUser.inc:400
 #: ../lib/modules/qmailUser.inc:450 ../lib/modules/qmailUser.inc:530
-#: ../lib/modules/qmailUser.inc:1111 ../lib/modules/qmailGroup.inc:131
+#: ../lib/modules/qmailUser.inc:1109 ../lib/modules/qmailGroup.inc:131
 #: ../lib/modules/qmailGroup.inc:135 ../lib/modules/qmailGroup.inc:247
 #: ../lib/modules/qmailGroup.inc:370 ../lib/modules/qmailGroup.inc:422
-#: ../lib/modules/qmailGroup.inc:484 ../lib/modules/qmailGroup.inc:1007
+#: ../lib/modules/qmailGroup.inc:484 ../lib/modules/qmailGroup.inc:1005
 msgid "Alternate address"
 msgstr "变更地址"
 
-#: ../lib/modules.inc:1103 ../lib/modules.inc:1202 ../help/help.inc:252
+#: ../lib/modules.inc:1111 ../lib/modules.inc:1210 ../help/help.inc:252
 msgid "Alternate recipient"
 msgstr "另外的接收者"
 
-#: ../lib/modules/kolabUser.inc:50
+#: ../lib/modules/kolabUser.inc:53
 msgid "Always accept"
 msgstr "总会接受"
 
-#: ../lib/modules/kolabUser.inc:51
+#: ../lib/modules/kolabUser.inc:54
 msgid "Always reject"
 msgstr "总是拒绝"
 
-#: ../lib/modules/pykotaUser.inc:372 ../lib/modules/pykotaUser.inc:597
-#: ../lib/modules/pykotaUser.inc:910 ../lib/modules/pykotaUser.inc:970
+#: ../lib/modules/pykotaUser.inc:375 ../lib/modules/pykotaUser.inc:600
+#: ../lib/modules/pykotaUser.inc:911 ../lib/modules/pykotaUser.inc:971
 msgid "Amount"
 msgstr "总额"
 
@@ -1330,13 +1339,13 @@ msgstr "这个名字的 sudo 角色已经存在, 请选择另外一个名字."
 #: ../lib/modules/passwordSelfReset.inc:323
 #: ../lib/modules/passwordSelfReset.inc:327
 #: ../lib/modules/passwordSelfReset.inc:330
-#: ../lib/modules/passwordSelfReset.inc:506
-#: ../lib/modules/passwordSelfReset.inc:509
-#: ../lib/modules/passwordSelfReset.inc:512
+#: ../lib/modules/passwordSelfReset.inc:504
+#: ../lib/modules/passwordSelfReset.inc:507
+#: ../lib/modules/passwordSelfReset.inc:510
+#: ../lib/modules/passwordSelfReset.inc:819
+#: ../lib/modules/passwordSelfReset.inc:820
 #: ../lib/modules/passwordSelfReset.inc:821
-#: ../lib/modules/passwordSelfReset.inc:822
-#: ../lib/modules/passwordSelfReset.inc:823
-#: ../lib/modules/passwordSelfReset.inc:1264
+#: ../lib/modules/passwordSelfReset.inc:1262
 msgid "Answer"
 msgstr "回答"
 
@@ -1348,8 +1357,8 @@ msgstr "其他的手机号."
 msgid "Any secondary pager numbers."
 msgstr "其他的传呼号."
 
-#: ../lib/modules/kolabUser.inc:331 ../lib/modules/kolabUser.inc:719
-#: ../lib/modules/kolabUser.inc:825 ../lib/modules/kolabUser.inc:828
+#: ../lib/modules/kolabUser.inc:334 ../lib/modules/kolabUser.inc:720
+#: ../lib/modules/kolabUser.inc:826 ../lib/modules/kolabUser.inc:829
 msgid "Anyone"
 msgstr "任何人"
 
@@ -1357,33 +1366,33 @@ msgstr "任何人"
 msgid "Appearance"
 msgstr "外观"
 
-#: ../lib/modules/asteriskExtension.inc:110
-#: ../lib/modules/asteriskExtension.inc:165
-#: ../lib/modules/asteriskExtension.inc:366
+#: ../lib/modules/asteriskExtension.inc:112
+#: ../lib/modules/asteriskExtension.inc:167
+#: ../lib/modules/asteriskExtension.inc:368
 #: ../lib/modules/asteriskExtension.inc:823
 msgid "Application"
 msgstr "应用"
 
-#: ../lib/modules/asteriskExtension.inc:94
-#: ../lib/modules/asteriskExtension.inc:172
-#: ../lib/modules/asteriskExtension.inc:374
+#: ../lib/modules/asteriskExtension.inc:96
+#: ../lib/modules/asteriskExtension.inc:174
+#: ../lib/modules/asteriskExtension.inc:376
 #: ../lib/modules/asteriskExtension.inc:824
 msgid "Application data"
 msgstr "应用数据"
 
-#: ../templates/multiEdit.php:170
+#: ../templates/multiEdit.php:193
 msgid "Apply changes"
 msgstr "应用更改"
 
-#: ../lib/modules/zarafaUser.inc:173 ../lib/modules/zarafaUser.inc:177
-#: ../lib/modules/zarafaUser.inc:335 ../lib/modules/zarafaUser.inc:401
-#: ../lib/modules/zarafaUser.inc:583 ../lib/modules/zarafaUser.inc:1005
-#: ../lib/modules/zarafaUser.inc:1274 ../lib/modules/zarafaUser.inc:1358
-#: ../lib/modules/zarafaUser.inc:1844
+#: ../lib/modules/zarafaUser.inc:176 ../lib/modules/zarafaUser.inc:180
+#: ../lib/modules/zarafaUser.inc:338 ../lib/modules/zarafaUser.inc:404
+#: ../lib/modules/zarafaUser.inc:586 ../lib/modules/zarafaUser.inc:1008
+#: ../lib/modules/zarafaUser.inc:1275 ../lib/modules/zarafaUser.inc:1359
+#: ../lib/modules/zarafaUser.inc:1845
 msgid "Archive servers"
 msgstr "归档服务器"
 
-#: ../lib/modules/zarafaUser.inc:581
+#: ../lib/modules/zarafaUser.inc:584
 msgid "Archiving"
 msgstr "正在归档中"
 
@@ -1402,7 +1411,7 @@ msgstr "问"
 
 #: ../lib/modules/eduPerson.inc:142 ../lib/modules/eduPerson.inc:146
 #: ../lib/modules/eduPerson.inc:218 ../lib/modules/eduPerson.inc:234
-#: ../lib/modules/eduPerson.inc:352 ../lib/modules/eduPerson.inc:567
+#: ../lib/modules/eduPerson.inc:352 ../lib/modules/eduPerson.inc:565
 msgid "Assurance profiles"
 msgstr "断言配置"
 
@@ -1420,7 +1429,7 @@ msgstr "Asterisk"
 msgid "Asterisk AMA (Automated Message Accounting) flags."
 msgstr "Asterisk AMA(自动消息账号)标志"
 
-#: ../lib/modules/asteriskExtension.inc:79
+#: ../lib/modules/asteriskExtension.inc:81
 msgid "Asterisk extension"
 msgstr "Asterisk 扩展"
 
@@ -1434,7 +1443,7 @@ msgstr "Asterisk 扩展条目"
 
 #: ../lib/modules/asteriskAccount.inc:123
 #: ../lib/modules/asteriskAccount.inc:249
-#: ../lib/modules/asteriskAccount.inc:1236
+#: ../lib/modules/asteriskAccount.inc:1234
 msgid "Asterisk realm"
 msgstr "Asterisk域"
 
@@ -1464,8 +1473,8 @@ msgstr "属性"
 msgid "Attribute doesn't exist"
 msgstr "属性不存在"
 
-#: ../templates/multiEdit.php:123 ../lib/modules/customFields.inc:92
-#: ../lib/modules/customFields.inc:1065 ../lib/modules/customFields.inc:1734
+#: ../templates/multiEdit.php:146 ../lib/modules/customFields.inc:92
+#: ../lib/modules/customFields.inc:1063 ../lib/modules/customFields.inc:1732
 msgid "Attribute name"
 msgstr "属性名"
 
@@ -1477,7 +1486,7 @@ msgstr "属性不可用"
 msgid "Attribute not valid"
 msgstr "属性不合法"
 
-#: ../templates/schema/schema.php:69 ../templates/schema/schema.php:70
+#: ../templates/schema/schema.php:70 ../templates/schema/schema.php:71
 msgid "Attribute types"
 msgstr "属性类型"
 
@@ -1497,7 +1506,7 @@ msgstr ""
 msgid "Authentication user for outbound proxies."
 msgstr "边界代理的认证用户"
 
-#: ../lib/modules/bindDLZ.inc:1020
+#: ../lib/modules/bindDLZ.inc:1023
 msgid "Authoritative information (\"SOA\" record)"
 msgstr "认证信息 (\"SOA\" 记录)"
 
@@ -1508,7 +1517,7 @@ msgstr "认证信息 (\"SOA\" 记录)"
 #: ../lib/modules/authorizedServiceObject.inc:112
 #: ../lib/modules/authorizedServiceObject.inc:116
 #: ../lib/modules/authorizedServiceObject.inc:168
-#: ../lib/modules/authorizedServiceObject.inc:232
+#: ../lib/modules/authorizedServiceObject.inc:230
 msgid "Authorized Services"
 msgstr "授权的服务"
 
@@ -1516,11 +1525,11 @@ msgstr "授权的服务"
 msgid "Authorized services are invalid."
 msgstr "授权服务不合法"
 
-#: ../lib/modules/customFields.inc:156 ../lib/modules/customFields.inc:1953
+#: ../lib/modules/customFields.inc:156 ../lib/modules/customFields.inc:1951
 msgid "Auto-completion"
 msgstr "自动填充"
 
-#: ../lib/modules/bindDLZ.inc:239 ../lib/modules/bindDLZ.inc:2536
+#: ../lib/modules/bindDLZ.inc:242 ../lib/modules/bindDLZ.inc:2537
 msgid "Automatic PTR changes"
 msgstr "自动 PTR 修改"
 
@@ -1529,21 +1538,21 @@ msgid "Automatical scripts"
 msgstr "自动脚本"
 
 #: ../lib/modules/kolabGroup.inc:117 ../lib/modules/kolabGroup.inc:127
-#: ../lib/modules/puppetClient.inc:113 ../lib/modules/puppetClient.inc:170
+#: ../lib/modules/puppetClient.inc:116 ../lib/modules/puppetClient.inc:173
 #: ../lib/modules/qmailUser.inc:131 ../lib/modules/qmailUser.inc:263
-#: ../lib/modules/zarafaContact.inc:93 ../lib/modules/zarafaContact.inc:635
+#: ../lib/modules/zarafaContact.inc:93 ../lib/modules/zarafaContact.inc:633
 #: ../lib/modules/posixGroup.inc:411 ../lib/modules/posixGroup.inc:538
 #: ../lib/modules/eduPerson.inc:150 ../lib/modules/eduPerson.inc:155
 #: ../lib/modules/pykotaGroup.inc:129 ../lib/modules/pykotaGroup.inc:140
 #: ../lib/modules/sambaSamAccount.inc:165
 #: ../lib/modules/sambaSamAccount.inc:403 ../lib/modules/posixAccount.inc:373
-#: ../lib/modules/posixAccount.inc:1776 ../lib/modules/zarafaUser.inc:150
-#: ../lib/modules/zarafaUser.inc:1344 ../lib/modules/pykotaUser.inc:160
-#: ../lib/modules/pykotaUser.inc:173 ../lib/modules/shadowAccount.inc:106
-#: ../lib/modules/shadowAccount.inc:197 ../lib/modules/ldapPublicKey.inc:95
-#: ../lib/modules/ldapPublicKey.inc:101
+#: ../lib/modules/posixAccount.inc:1776 ../lib/modules/zarafaUser.inc:153
+#: ../lib/modules/zarafaUser.inc:1345 ../lib/modules/pykotaUser.inc:163
+#: ../lib/modules/pykotaUser.inc:176 ../lib/modules/shadowAccount.inc:106
+#: ../lib/modules/shadowAccount.inc:197 ../lib/modules/ldapPublicKey.inc:98
+#: ../lib/modules/ldapPublicKey.inc:104
 #: ../lib/modules/inetLocalMailRecipient.inc:96
-#: ../lib/modules/customFields.inc:861 ../lib/modules/qmailGroup.inc:101
+#: ../lib/modules/customFields.inc:859 ../lib/modules/qmailGroup.inc:101
 #: ../lib/modules/qmailGroup.inc:232
 #: ../lib/modules/authorizedServiceObject.inc:89
 #: ../lib/modules/authorizedServiceObject.inc:117
@@ -1553,7 +1562,7 @@ msgstr "自动脚本"
 msgid "Automatically add this extension"
 msgstr "自动增加这个扩展项"
 
-#: ../lib/modules/bindDLZ.inc:240
+#: ../lib/modules/bindDLZ.inc:243
 msgid ""
 "Automatically adds and removes PTR entries when A/AAAA records are created "
 "or deleted."
@@ -1566,7 +1575,7 @@ msgstr "自动挂接条目"
 #: ../lib/types/automountType.inc:87 ../lib/modules/automount.inc:50
 #: ../lib/modules/automount.inc:68 ../lib/modules/automount.inc:88
 #: ../lib/modules/automount.inc:104 ../lib/modules/automount.inc:114
-#: ../lib/modules/automount.inc:131 ../lib/modules/automount.inc:185
+#: ../lib/modules/automount.inc:131 ../lib/modules/automount.inc:183
 msgid "Automount entry"
 msgstr "自动安装条目"
 
@@ -1576,7 +1585,7 @@ msgid ""
 "allowed."
 msgstr "自动挂接条目包含非法字符,只能使用 ASCII 字符."
 
-#: ../lib/types/automountType.inc:215
+#: ../lib/types/automountType.inc:192
 #, php-format
 msgid "Automount entry count: %s"
 msgstr "自动安装条目总计:%s"
@@ -1587,11 +1596,11 @@ msgstr "自动回复"
 
 #: ../lib/modules/qmailUser.inc:116 ../lib/modules/qmailUser.inc:239
 #: ../lib/modules/qmailUser.inc:350 ../lib/modules/qmailUser.inc:424
-#: ../lib/modules/qmailUser.inc:649 ../lib/modules/qmailUser.inc:1118
+#: ../lib/modules/qmailUser.inc:649 ../lib/modules/qmailUser.inc:1116
 msgid "Autoreply text"
 msgstr "自动回复文本"
 
-#: ../templates/config/conftypes.php:227 ../lib/modules/customScripts.inc:61
+#: ../templates/config/conftypes.php:246 ../lib/modules/customScripts.inc:61
 msgid "Available account types"
 msgstr "有效的帐号类型"
 
@@ -1600,8 +1609,8 @@ msgid "Available actions"
 msgstr "可选动作"
 
 #: ../lib/modules/posixAccount.inc:1561 ../lib/modules/posixAccount.inc:1594
-#: ../lib/modules/windowsUser.inc:1686 ../lib/modules/nisnetgroup.inc:386
-#: ../lib/modules/groupOfNamesUser.inc:133 ../lib/modules/windowsGroup.inc:523
+#: ../lib/modules/windowsUser.inc:1686 ../lib/modules/nisnetgroup.inc:389
+#: ../lib/modules/groupOfNamesUser.inc:133 ../lib/modules/windowsGroup.inc:526
 msgid "Available groups"
 msgstr "可选组"
 
@@ -1609,7 +1618,7 @@ msgstr "可选组"
 msgid "Available members"
 msgstr "可用的用户"
 
-#: ../templates/config/confmodules.php:308
+#: ../templates/config/confmodules.php:314
 msgid "Available modules"
 msgstr "可选模块"
 
@@ -1617,7 +1626,7 @@ msgstr "可选模块"
 msgid "Available roles"
 msgstr "可选角色"
 
-#: ../lib/modules/posixGroup.inc:299 ../lib/modules/asteriskExtension.inc:463
+#: ../lib/modules/posixGroup.inc:299 ../lib/modules/asteriskExtension.inc:465
 msgid "Available users"
 msgstr "可选用户"
 
@@ -1630,26 +1639,27 @@ msgid "B-Node (0x01)"
 msgstr "B-节点 (0x01)"
 
 #: ../lib/passwordExpirationJob.inc:84 ../lib/passwordExpirationJob.inc:137
-#: ../help/help.inc:342
+#: ../help/help.inc:354
 msgid "BCC address"
 msgstr "秘密抄送地址"
 
-#: ../templates/config/jobList.php:241 ../templates/massBuildAccounts.php:276
+#: ../templates/config/jobList.php:241
+#: ../templates/upload/massBuildAccounts.php:286
 #: ../lib/modules/zarafaContact.inc:479 ../lib/modules/posixGroup.inc:357
-#: ../lib/modules/zarafaGroup.inc:489 ../lib/modules/device.inc:303
+#: ../lib/modules/zarafaGroup.inc:489 ../lib/modules/device.inc:306
 #: ../lib/modules/sambaSamAccount.inc:1309
 #: ../lib/modules/sambaSamAccount.inc:1587 ../lib/modules/posixAccount.inc:1634
-#: ../lib/modules/posixAccount.inc:1708 ../lib/modules/zarafaUser.inc:968
-#: ../lib/modules/zarafaUser.inc:1017 ../lib/modules/windowsUser.inc:1729
+#: ../lib/modules/posixAccount.inc:1708 ../lib/modules/zarafaUser.inc:971
+#: ../lib/modules/zarafaUser.inc:1020 ../lib/modules/windowsUser.inc:1729
 #: ../lib/modules/windowsUser.inc:1766 ../lib/modules/sambaGroupMapping.inc:511
-#: ../lib/modules/pykotaUser.inc:618 ../lib/modules/pykotaUser.inc:675
-#: ../lib/modules/nisnetgroup.inc:400 ../lib/modules/inetOrgPerson.inc:1760
-#: ../lib/modules/inetOrgPerson.inc:1836 ../lib/modules/inetOrgPerson.inc:1926
-#: ../lib/modules/qmailGroup.inc:865 ../lib/modules/organizationalRole.inc:395
-#: ../lib/modules/organizationalRole.inc:457
-#: ../lib/modules/windowsGroup.inc:569 ../lib/modules/windowsGroup.inc:736
-#: ../lib/modules/windowsGroup.inc:793 ../lib/modules/groupOfNames.inc:455
-#: ../lib/modules/groupOfNames.inc:609 ../lib/modules/groupOfNames.inc:679
+#: ../lib/modules/pykotaUser.inc:621 ../lib/modules/pykotaUser.inc:678
+#: ../lib/modules/nisnetgroup.inc:403 ../lib/modules/inetOrgPerson.inc:1758
+#: ../lib/modules/inetOrgPerson.inc:1834 ../lib/modules/inetOrgPerson.inc:1924
+#: ../lib/modules/qmailGroup.inc:865 ../lib/modules/organizationalRole.inc:398
+#: ../lib/modules/organizationalRole.inc:460
+#: ../lib/modules/windowsGroup.inc:572 ../lib/modules/windowsGroup.inc:739
+#: ../lib/modules/windowsGroup.inc:796 ../lib/modules/groupOfNames.inc:458
+#: ../lib/modules/groupOfNames.inc:612 ../lib/modules/groupOfNames.inc:682
 msgid "Back"
 msgstr "返回"
 
@@ -1697,7 +1707,7 @@ msgstr "返回到域列表"
 msgid "Back to extensions list"
 msgstr "返回到扩展列表"
 
-#: ../templates/lists/userlink.php:63 ../lib/types/gon.inc:44
+#: ../templates/lists/userlink.php:64 ../lib/types/gon.inc:44
 #: ../lib/types/zarafaDynamicGroupType.inc:44 ../lib/types/group.inc:45
 #: ../lib/types/netgroup.inc:44
 msgid "Back to group list"
@@ -1707,12 +1717,12 @@ msgstr "返回到组列表"
 msgid "Back to host list"
 msgstr "返回到主机列表"
 
-#: ../templates/delete.php:299
+#: ../templates/delete.php:307
 msgid "Back to list"
 msgstr "返回列表"
 
 #: ../templates/config/index.php:145 ../templates/config/conflogin.php:207
-#: ../templates/config/mainlogin.php:184
+#: ../templates/config/mainlogin.php:198
 #: ../templates/selfService/selfServiceSP.php:141
 #: ../templates/selfService/adminLogin.php:196
 msgid "Back to login"
@@ -1755,19 +1765,19 @@ msgstr "返回视图列表"
 msgid "Back up"
 msgstr "备份"
 
-#: ../templates/serverInfo.php:163
+#: ../templates/serverInfo.php:164
 msgid "Backends"
 msgstr "后端"
 
-#: ../templates/lists/changePassword.php:290
+#: ../templates/lists/changePassword.php:291
 #: ../lib/modules/passwordSelfReset.inc:92
 #: ../lib/modules/passwordSelfReset.inc:238
 #: ../lib/modules/passwordSelfReset.inc:256
 #: ../lib/modules/passwordSelfReset.inc:266
 #: ../lib/modules/passwordSelfReset.inc:306
 #: ../lib/modules/passwordSelfReset.inc:368
-#: ../lib/modules/passwordSelfReset.inc:515
-#: ../lib/modules/passwordSelfReset.inc:846
+#: ../lib/modules/passwordSelfReset.inc:513
+#: ../lib/modules/passwordSelfReset.inc:844
 msgid "Backup email"
 msgstr "备份邮件"
 
@@ -1782,22 +1792,22 @@ msgid "Backup script"
 msgstr "备份脚本"
 
 #: ../lib/types/pykotaBillingCodeType.inc:93 ../lib/modules/pykotaGroup.inc:62
-#: ../lib/modules/pykotaUser.inc:62 ../lib/modules/pykotaUser.inc:132
-#: ../lib/modules/pykotaUser.inc:170 ../lib/modules/pykotaUser.inc:241
-#: ../lib/modules/pykotaUser.inc:262 ../lib/modules/pykotaUser.inc:322
-#: ../lib/modules/pykotaUser.inc:365 ../lib/modules/pykotaUser.inc:903
-#: ../lib/modules/pykotaUser.inc:953 ../lib/modules/pykotaBillingCode.inc:85
+#: ../lib/modules/pykotaUser.inc:65 ../lib/modules/pykotaUser.inc:135
+#: ../lib/modules/pykotaUser.inc:173 ../lib/modules/pykotaUser.inc:244
+#: ../lib/modules/pykotaUser.inc:265 ../lib/modules/pykotaUser.inc:325
+#: ../lib/modules/pykotaUser.inc:368 ../lib/modules/pykotaUser.inc:904
+#: ../lib/modules/pykotaUser.inc:954 ../lib/modules/pykotaBillingCode.inc:85
 #: ../lib/modules/pykotaBillingCode.inc:117
 #: ../lib/modules/pykotaBillingCode.inc:143
-#: ../lib/modules/pykotaBillingCode.inc:266
+#: ../lib/modules/pykotaBillingCode.inc:264
 msgid "Balance"
 msgstr "账目"
 
-#: ../lib/modules/pykotaUser.inc:281
+#: ../lib/modules/pykotaUser.inc:284
 msgid "Balance (read-only)"
 msgstr "账目(只读)"
 
-#: ../lib/modules/pykotaUser.inc:136 ../lib/modules/pykotaUser.inc:247
+#: ../lib/modules/pykotaUser.inc:139 ../lib/modules/pykotaUser.inc:250
 msgid "Balance comment"
 msgstr "账目备注"
 
@@ -1809,14 +1819,14 @@ msgstr "账目备注"
 #: ../lib/modules/zarafaDynamicGroup.inc:170
 #: ../lib/modules/zarafaDynamicGroup.inc:198
 #: ../lib/modules/zarafaDynamicGroup.inc:231
-#: ../lib/modules/zarafaDynamicGroup.inc:435
+#: ../lib/modules/zarafaDynamicGroup.inc:433
 #: ../lib/modules/zarafaAddressList.inc:75
 #: ../lib/modules/zarafaAddressList.inc:89
 #: ../lib/modules/zarafaAddressList.inc:128
 #: ../lib/modules/zarafaAddressList.inc:144
 #: ../lib/modules/zarafaAddressList.inc:169
 #: ../lib/modules/zarafaAddressList.inc:198
-#: ../lib/modules/zarafaAddressList.inc:335
+#: ../lib/modules/zarafaAddressList.inc:333
 msgid "Base"
 msgstr "基本DN"
 
@@ -1831,21 +1841,22 @@ msgstr "Base (只有基本DN)"
 msgid "Base DN"
 msgstr "基本DN"
 
-#: ../templates/config/confmodules.php:224 ../help/help.inc:146
+#: ../templates/config/confmain.php:547
+#: ../templates/selfService/adminMain.php:519 ../help/help.inc:284
+msgid "Base URL"
+msgstr "基本URL"
+
+#: ../templates/config/confmodules.php:231 ../help/help.inc:146
 msgid "Base module"
 msgstr "基本模块"
 
-#: ../templates/pdfedit/pdfpage.php:445
-msgid "Beginning"
-msgstr "开始"
-
 #: ../lib/types/pykotaBillingCodeType.inc:91
 #: ../lib/modules/pykotaBillingCode.inc:77
 #: ../lib/modules/pykotaBillingCode.inc:115
 #: ../lib/modules/pykotaBillingCode.inc:127
 #: ../lib/modules/pykotaBillingCode.inc:129
 #: ../lib/modules/pykotaBillingCode.inc:141
-#: ../lib/modules/pykotaBillingCode.inc:264
+#: ../lib/modules/pykotaBillingCode.inc:262
 msgid "Billing code"
 msgstr "账单号"
 
@@ -1885,7 +1896,7 @@ msgstr "账单号"
 msgid "Binary value"
 msgstr "二进制值"
 
-#: ../templates/serverInfo.php:286 ../templates/serverInfo.php:375
+#: ../templates/serverInfo.php:287 ../templates/serverInfo.php:376
 msgid "Bind"
 msgstr "绑定"
 
@@ -1897,11 +1908,11 @@ msgstr "绑定 DNS"
 msgid "Bind DNS entries"
 msgstr "绑定DNS条目"
 
-#: ../templates/config/jobs.php:233 ../templates/config/confmain.php:521
+#: ../templates/config/jobs.php:233 ../templates/config/confmain.php:524
 msgid "Bind password"
 msgstr "绑定密码"
 
-#: ../templates/config/jobs.php:228 ../templates/config/confmain.php:519
+#: ../templates/config/jobs.php:228 ../templates/config/confmain.php:522
 msgid "Bind user"
 msgstr "绑定用户"
 
@@ -1909,46 +1920,46 @@ msgstr "绑定用户"
 msgid "Bind user and password"
 msgstr "绑定用户名和密码"
 
-#: ../lib/modules/quota.inc:53 ../lib/modules/systemQuotas.inc:101
+#: ../lib/modules/quota.inc:56 ../lib/modules/systemQuotas.inc:104
 msgid "Block hard quota"
 msgstr "块数硬性限额"
 
-#: ../lib/modules/quota.inc:53 ../lib/modules/quota.inc:54
-#: ../lib/modules/systemQuotas.inc:101 ../lib/modules/systemQuotas.inc:102
+#: ../lib/modules/quota.inc:56 ../lib/modules/quota.inc:57
+#: ../lib/modules/systemQuotas.inc:104 ../lib/modules/systemQuotas.inc:105
 msgid ""
 "Block hard quota contains invalid characters. Only natural numbers are "
 "allowed."
 msgstr "块数硬性限额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:59 ../lib/modules/systemQuotas.inc:107
+#: ../lib/modules/quota.inc:62 ../lib/modules/systemQuotas.inc:110
 msgid "Block quota"
 msgstr "块数限额"
 
-#: ../lib/modules/quota.inc:51 ../lib/modules/systemQuotas.inc:99
+#: ../lib/modules/quota.inc:54 ../lib/modules/systemQuotas.inc:102
 msgid "Block soft quota"
 msgstr "块数软性限额"
 
-#: ../lib/modules/quota.inc:51 ../lib/modules/quota.inc:52
-#: ../lib/modules/systemQuotas.inc:99 ../lib/modules/systemQuotas.inc:100
+#: ../lib/modules/quota.inc:54 ../lib/modules/quota.inc:55
+#: ../lib/modules/systemQuotas.inc:102 ../lib/modules/systemQuotas.inc:103
 msgid ""
 "Block soft quota contains invalid characters. Only natural numbers are "
 "allowed."
 msgstr "块数软性限额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:59 ../lib/modules/quota.inc:60
-#: ../lib/modules/systemQuotas.inc:107 ../lib/modules/systemQuotas.inc:108
+#: ../lib/modules/quota.inc:62 ../lib/modules/quota.inc:63
+#: ../lib/modules/systemQuotas.inc:110 ../lib/modules/systemQuotas.inc:111
 msgid "Block soft quota must be smaller than block hard quota."
 msgstr "块数软性限额必须小于硬性限额."
 
-#: ../templates/lists/changePassword.php:339
-#: ../templates/config/confmain.php:399
+#: ../templates/lists/changePassword.php:340
+#: ../templates/config/confmain.php:402
 msgid "Both"
 msgstr "两个都"
 
 #: ../lib/modules/qmailGroup.inc:72 ../lib/modules/qmailGroup.inc:143
 #: ../lib/modules/qmailGroup.inc:147 ../lib/modules/qmailGroup.inc:263
 #: ../lib/modules/qmailGroup.inc:375 ../lib/modules/qmailGroup.inc:431
-#: ../lib/modules/qmailGroup.inc:522 ../lib/modules/qmailGroup.inc:1009
+#: ../lib/modules/qmailGroup.inc:522 ../lib/modules/qmailGroup.inc:1007
 msgid "Bounce admin email"
 msgstr "反弹管理邮件"
 
@@ -1975,19 +1986,19 @@ msgstr "块更新以下DN"
 #: ../lib/modules/windowsUser.inc:314 ../lib/modules/windowsUser.inc:318
 #: ../lib/modules/windowsUser.inc:702 ../lib/modules/windowsUser.inc:771
 #: ../lib/modules/windowsUser.inc:880 ../lib/modules/windowsUser.inc:999
-#: ../lib/modules/windowsUser.inc:1141 ../lib/modules/windowsUser.inc:2458
-#: ../lib/modules/windowsUser.inc:3225 ../lib/modules/inetOrgPerson.inc:105
-#: ../lib/modules/inetOrgPerson.inc:164 ../lib/modules/inetOrgPerson.inc:238
-#: ../lib/modules/inetOrgPerson.inc:378 ../lib/modules/inetOrgPerson.inc:619
-#: ../lib/modules/inetOrgPerson.inc:791 ../lib/modules/inetOrgPerson.inc:795
-#: ../lib/modules/inetOrgPerson.inc:1562 ../lib/modules/inetOrgPerson.inc:1565
-#: ../lib/modules/inetOrgPerson.inc:2000 ../lib/modules/inetOrgPerson.inc:2712
-#: ../lib/modules/inetOrgPerson.inc:3680 ../lib/modules/inetOrgPerson.inc:3725
+#: ../lib/modules/windowsUser.inc:1141 ../lib/modules/windowsUser.inc:2456
+#: ../lib/modules/windowsUser.inc:3223 ../lib/modules/inetOrgPerson.inc:103
+#: ../lib/modules/inetOrgPerson.inc:162 ../lib/modules/inetOrgPerson.inc:236
+#: ../lib/modules/inetOrgPerson.inc:376 ../lib/modules/inetOrgPerson.inc:617
+#: ../lib/modules/inetOrgPerson.inc:789 ../lib/modules/inetOrgPerson.inc:793
+#: ../lib/modules/inetOrgPerson.inc:1560 ../lib/modules/inetOrgPerson.inc:1563
+#: ../lib/modules/inetOrgPerson.inc:1996 ../lib/modules/inetOrgPerson.inc:2708
+#: ../lib/modules/inetOrgPerson.inc:3660 ../lib/modules/inetOrgPerson.inc:3705
 msgid "Business category"
 msgstr "商业种类"
 
 #: ../lib/modules/windowsUser.inc:315 ../lib/modules/windowsUser.inc:319
-#: ../lib/modules/inetOrgPerson.inc:792 ../lib/modules/inetOrgPerson.inc:796
+#: ../lib/modules/inetOrgPerson.inc:790 ../lib/modules/inetOrgPerson.inc:794
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "商业种类(比如:行政部门,IT服务部门,管理部门,...)"
 
@@ -2022,25 +2033,25 @@ msgstr ""
 "缺省情况下,LAM显示运行命令及其输出.如果您想隐藏命令而仅显示输出,请激活这个选"
 "项."
 
-#: ../templates/serverInfo.php:253 ../templates/serverInfo.php:259
+#: ../templates/serverInfo.php:254 ../templates/serverInfo.php:260
 msgid "Bytes sent"
 msgstr "字节已发送"
 
 #: ../lib/passwordExpirationJob.inc:83 ../lib/passwordExpirationJob.inc:131
-#: ../help/help.inc:338
+#: ../help/help.inc:350
 msgid "CC address"
 msgstr "抄送地址"
 
-#: ../lib/modules/bindDLZ.inc:268 ../lib/modules/bindDLZ.inc:274
-#: ../lib/modules/bindDLZ.inc:481 ../lib/modules/bindDLZ.inc:497
+#: ../lib/modules/bindDLZ.inc:271 ../lib/modules/bindDLZ.inc:277
+#: ../lib/modules/bindDLZ.inc:484 ../lib/modules/bindDLZ.inc:500
 msgid "CNAME record"
 msgstr "CNAME条目"
 
-#: ../lib/modules/bindDLZ.inc:439
+#: ../lib/modules/bindDLZ.inc:442
 msgid "CNAME records"
 msgstr "CNAME条目"
 
-#: ../templates/masscreate.php:253
+#: ../templates/upload/masscreate.php:279
 msgid "CSV file"
 msgstr "CSV 文件"
 
@@ -2052,8 +2063,8 @@ msgstr "缓存超时"
 #: ../lib/modules/asteriskAccount.inc:272
 #: ../lib/modules/asteriskAccount.inc:355
 #: ../lib/modules/asteriskAccount.inc:615
-#: ../lib/modules/asteriskAccount.inc:991
-#: ../lib/modules/asteriskAccount.inc:1248
+#: ../lib/modules/asteriskAccount.inc:989
+#: ../lib/modules/asteriskAccount.inc:1246
 msgid "Call groups"
 msgstr "呼叫组"
 
@@ -2061,7 +2072,7 @@ msgstr "呼叫组"
 #: ../lib/modules/asteriskAccount.inc:266
 #: ../lib/modules/asteriskAccount.inc:304
 #: ../lib/modules/asteriskAccount.inc:589
-#: ../lib/modules/asteriskAccount.inc:985
+#: ../lib/modules/asteriskAccount.inc:983
 msgid "Caller ID"
 msgstr "拨号 ID号"
 
@@ -2082,77 +2093,79 @@ msgstr "可以置空"
 #: ../lib/modules/asteriskAccount.inc:294
 #: ../lib/modules/asteriskAccount.inc:515
 #: ../lib/modules/asteriskAccount.inc:741
-#: ../lib/modules/asteriskAccount.inc:1013
-#: ../lib/modules/asteriskAccount.inc:1292
+#: ../lib/modules/asteriskAccount.inc:1011
+#: ../lib/modules/asteriskAccount.inc:1290
 msgid "Can call forward"
 msgstr "可能呼叫转移"
 
-#: ../templates/lists/changePassword.php:353
-#: ../templates/lists/changePassword.php:392
-#: ../templates/lists/changePassword.php:445
-#: ../templates/lists/changePassword.php:481 ../templates/ou_edit.php:125
+#: ../templates/lists/changePassword.php:354
+#: ../templates/lists/changePassword.php:393
+#: ../templates/lists/changePassword.php:446
+#: ../templates/lists/changePassword.php:482 ../templates/ou_edit.php:135
 #: ../templates/config/profmanage.php:260
 #: ../templates/config/profmanage.php:272
 #: ../templates/config/profmanage.php:281
 #: ../templates/config/profmanage.php:299
 #: ../templates/config/profmanage.php:310
 #: ../templates/config/mainmanage.php:487
-#: ../templates/config/confmodules.php:239 ../templates/config/jobList.php:254
+#: ../templates/config/confmodules.php:246 ../templates/config/jobList.php:254
 #: ../templates/config/jobs.php:359 ../templates/config/jobs.php:403
-#: ../templates/config/confmain.php:548
-#: ../templates/config/moduleSettings.php:253
-#: ../templates/config/conftypes.php:375
+#: ../templates/config/confmain.php:583
+#: ../templates/config/moduleSettings.php:261
+#: ../templates/config/conftypes.php:390
 #: ../templates/selfService/profManage.php:210
 #: ../templates/selfService/profManage.php:227
 #: ../templates/selfService/profManage.php:242
-#: ../templates/selfService/adminMain.php:738
-#: ../templates/pdfedit/pdfpage.php:642 ../templates/pdfedit/pdfmain.php:215
-#: ../templates/pdfedit/pdfmain.php:222 ../templates/pdfedit/pdfmain.php:228
-#: ../templates/delete.php:129 ../templates/profedit/profilepage.php:246
-#: ../templates/profedit/profilemain.php:204
-#: ../templates/profedit/profilemain.php:210
-#: ../templates/profedit/profilemain.php:216
+#: ../templates/selfService/selfService2Factor.php:207
+#: ../templates/selfService/adminMain.php:791
+#: ../templates/pdfedit/pdfpage.php:660 ../templates/pdfedit/pdfmain.php:260
+#: ../templates/pdfedit/pdfmain.php:267 ../templates/pdfedit/pdfmain.php:273
+#: ../templates/delete.php:135 ../templates/profedit/profilepage.php:258
+#: ../templates/profedit/profilemain.php:245
+#: ../templates/profedit/profilemain.php:251
+#: ../templates/profedit/profilemain.php:257
 #: ../templates/3rdParty/pla/htdocs/update_confirm.php:197
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:83
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:136
 #: ../templates/3rdParty/pla/htdocs/create_confirm.php:121
 #: ../templates/3rdParty/pla/htdocs/mass_delete.php:119
-#: ../templates/initsuff.php:195 ../lib/types/automountType.inc:234
-#: ../lib/types/user.inc:329 ../lib/types/bind.inc:175
-#: ../lib/modules/locking389ds.inc:160 ../lib/modules/kolabGroup.inc:294
-#: ../lib/modules/pykotaPrinter.inc:431 ../lib/modules/mitKerberos.inc:693
-#: ../lib/modules/qmailUser.inc:928 ../lib/modules/zarafaContact.inc:434
-#: ../lib/modules/windowsHost.inc:226 ../lib/modules/zarafaGroup.inc:444
-#: ../lib/modules/device.inc:254 ../lib/modules/sambaSamAccount.inc:1381
+#: ../templates/initsuff.php:196 ../templates/login2Factor.php:220
+#: ../lib/types/automountType.inc:211 ../lib/types/user.inc:329
+#: ../lib/types/bind.inc:152 ../lib/modules/locking389ds.inc:160
+#: ../lib/modules/kolabGroup.inc:294 ../lib/modules/pykotaPrinter.inc:431
+#: ../lib/modules/mitKerberos.inc:693 ../lib/modules/qmailUser.inc:928
+#: ../lib/modules/zarafaContact.inc:434 ../lib/modules/windowsHost.inc:226
+#: ../lib/modules/zarafaGroup.inc:444 ../lib/modules/device.inc:257
+#: ../lib/modules/sambaSamAccount.inc:1381
 #: ../lib/modules/sambaSamAccount.inc:1427
-#: ../lib/modules/sambaSamAccount.inc:1513 ../lib/modules/zarafaUser.inc:918
+#: ../lib/modules/sambaSamAccount.inc:1513 ../lib/modules/zarafaUser.inc:921
 #: ../lib/modules/windowsUser.inc:1601 ../lib/modules/windowsUser.inc:1864
-#: ../lib/modules/kolabUser.inc:520 ../lib/modules/sambaGroupMapping.inc:490
+#: ../lib/modules/kolabUser.inc:523 ../lib/modules/sambaGroupMapping.inc:490
 #: ../lib/modules/shadowAccount.inc:490 ../lib/modules/shadowAccount.inc:543
-#: ../lib/modules/nisnetgroup.inc:490 ../lib/modules/inetOrgPerson.inc:1801
+#: ../lib/modules/nisnetgroup.inc:493 ../lib/modules/inetOrgPerson.inc:1799
 #: ../lib/modules/freeRadius.inc:566 ../lib/modules/kolabSharedFolder.inc:434
-#: ../lib/modules/customFields.inc:1089 ../lib/modules/aliasEntry.inc:147
+#: ../lib/modules/customFields.inc:1087 ../lib/modules/aliasEntry.inc:147
 #: ../lib/modules/aliasEntry.inc:167 ../lib/modules/qmailGroup.inc:823
-#: ../lib/modules/organizationalRole.inc:324 ../lib/modules/fixed_ip.inc:587
-#: ../lib/modules/heimdalKerberos.inc:603 ../lib/modules/windowsGroup.inc:626
-#: ../lib/modules/windowsGroup.inc:687 ../lib/modules/groupOfNames.inc:383
-#: ../lib/modules/groupOfNames.inc:538 ../lib/modules/nisMailAlias.inc:385
-#: ../lib/lists.inc:729 ../lib/lists.inc:811 ../lib/modules.inc:1254
+#: ../lib/modules/organizationalRole.inc:327 ../lib/modules/fixed_ip.inc:590
+#: ../lib/modules/heimdalKerberos.inc:603 ../lib/modules/windowsGroup.inc:629
+#: ../lib/modules/windowsGroup.inc:690 ../lib/modules/groupOfNames.inc:386
+#: ../lib/modules/groupOfNames.inc:541 ../lib/modules/nisMailAlias.inc:385
+#: ../lib/lists.inc:731 ../lib/lists.inc:812 ../lib/modules.inc:1262
 msgid "Cancel"
 msgstr "取消"
 
-#: ../templates/login.php:588 ../templates/login.php:647
-#: ../templates/login.php:652 ../templates/config/jobs.php:517
-#: ../templates/selfService/selfServiceLogin.php:149
-#: ../templates/selfService/selfServiceLogin.php:201
-#: ../templates/selfService/selfServiceLogin.php:207
-#: ../templates/selfService/selfServiceMain.php:179
-#: ../templates/selfService/selfServiceMain.php:200
+#: ../templates/login.php:597 ../templates/login.php:668
+#: ../templates/login.php:673 ../templates/config/jobs.php:517
+#: ../templates/selfService/selfServiceLogin.php:158
+#: ../templates/selfService/selfServiceLogin.php:217
+#: ../templates/selfService/selfServiceLogin.php:223
+#: ../templates/selfService/selfServiceMain.php:188
+#: ../templates/selfService/selfServiceMain.php:209
 #: ../lib/modules/selfRegistration.inc:805
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "无法连接指定的LDAP服务器,请再试一次."
 
-#: ../templates/login.php:321 ../lib/config.inc:2228
+#: ../templates/login.php:321 ../lib/config.inc:2371
 msgid "Cannot open config file!"
 msgstr "无法打开配置文件!"
 
@@ -2160,16 +2173,16 @@ msgstr "无法打开配置文件!"
 msgid "Cannot update quota."
 msgstr "不能修改配额"
 
-#: ../lib/config.inc:2240 ../lib/config.inc:2248
+#: ../lib/config.inc:2383 ../lib/config.inc:2391
 msgid ""
 "Cannot write certificate file. Please check the permissions of config/"
 "serverCerts.pem."
 msgstr "不能写入证书文件. 请检查config/serverCerts.pem的权限."
 
-#: ../lib/modules/zarafaUser.inc:134 ../lib/modules/zarafaUser.inc:265
-#: ../lib/modules/zarafaUser.inc:383 ../lib/modules/zarafaUser.inc:437
-#: ../lib/modules/zarafaUser.inc:574 ../lib/modules/zarafaUser.inc:1270
-#: ../lib/modules/zarafaUser.inc:1838
+#: ../lib/modules/zarafaUser.inc:137 ../lib/modules/zarafaUser.inc:268
+#: ../lib/modules/zarafaUser.inc:386 ../lib/modules/zarafaUser.inc:440
+#: ../lib/modules/zarafaUser.inc:577 ../lib/modules/zarafaUser.inc:1271
+#: ../lib/modules/zarafaUser.inc:1839
 msgid "Capacity"
 msgstr "容量"
 
@@ -2179,52 +2192,57 @@ msgstr "容量"
 msgid "Captcha"
 msgstr "Captcha"
 
-#: ../templates/selfService/adminMain.php:518
+#: ../templates/config/confmain.php:555
+#: ../templates/selfService/adminMain.php:527 ../help/help.inc:290
+msgid "Caption"
+msgstr "标题"
+
+#: ../templates/selfService/adminMain.php:571
 msgid "Captions and labels"
 msgstr "标题和标签"
 
 #: ../lib/modules/windowsUser.inc:302 ../lib/modules/windowsUser.inc:678
 #: ../lib/modules/windowsUser.inc:871 ../lib/modules/windowsUser.inc:1132
-#: ../lib/modules/windowsUser.inc:2455 ../lib/modules/windowsUser.inc:3222
-#: ../lib/modules/inetOrgPerson.inc:163 ../lib/modules/inetOrgPerson.inc:540
-#: ../lib/modules/inetOrgPerson.inc:613 ../lib/modules/inetOrgPerson.inc:815
-#: ../lib/modules/inetOrgPerson.inc:1535 ../lib/modules/inetOrgPerson.inc:1538
-#: ../lib/modules/inetOrgPerson.inc:2002 ../lib/modules/inetOrgPerson.inc:2690
-#: ../lib/modules/inetOrgPerson.inc:3676 ../lib/modules/inetOrgPerson.inc:3724
+#: ../lib/modules/windowsUser.inc:2453 ../lib/modules/windowsUser.inc:3220
+#: ../lib/modules/inetOrgPerson.inc:161 ../lib/modules/inetOrgPerson.inc:538
+#: ../lib/modules/inetOrgPerson.inc:611 ../lib/modules/inetOrgPerson.inc:813
+#: ../lib/modules/inetOrgPerson.inc:1533 ../lib/modules/inetOrgPerson.inc:1536
+#: ../lib/modules/inetOrgPerson.inc:1998 ../lib/modules/inetOrgPerson.inc:2686
+#: ../lib/modules/inetOrgPerson.inc:3656 ../lib/modules/inetOrgPerson.inc:3704
 msgid "Car license"
 msgstr "汽车执照"
 
-#: ../templates/selfService/adminMain.php:536
+#: ../templates/selfService/adminMain.php:589
 #: ../lib/modules/locking389ds.inc:83 ../lib/modules/locking389ds.inc:156
 #: ../lib/modules/mitKerberos.inc:377 ../lib/modules/mitKerberos.inc:388
 #: ../lib/modules/mitKerberos.inc:689 ../lib/modules/qmailUser.inc:671
 #: ../lib/modules/qmailUser.inc:924 ../lib/modules/zarafaContact.inc:256
 #: ../lib/modules/windowsHost.inc:155 ../lib/modules/windowsHost.inc:225
-#: ../lib/modules/zarafaGroup.inc:251 ../lib/modules/device.inc:181
+#: ../lib/modules/zarafaGroup.inc:251 ../lib/modules/device.inc:184
 #: ../lib/modules/sambaSamAccount.inc:1144
-#: ../lib/modules/sambaSamAccount.inc:1423 ../lib/modules/zarafaUser.inc:490
-#: ../lib/modules/zarafaUser.inc:586 ../lib/modules/windowsUser.inc:1161
+#: ../lib/modules/sambaSamAccount.inc:1423 ../lib/modules/zarafaUser.inc:493
+#: ../lib/modules/zarafaUser.inc:589 ../lib/modules/windowsUser.inc:1161
 #: ../lib/modules/windowsUser.inc:1200 ../lib/modules/windowsUser.inc:1597
 #: ../lib/modules/windowsUser.inc:1860 ../lib/modules/shadowAccount.inc:355
 #: ../lib/modules/shadowAccount.inc:368 ../lib/modules/shadowAccount.inc:486
-#: ../lib/modules/shadowAccount.inc:539 ../lib/modules/inetOrgPerson.inc:1622
+#: ../lib/modules/shadowAccount.inc:539 ../lib/modules/inetOrgPerson.inc:1620
 #: ../lib/modules/freeRadius.inc:383 ../lib/modules/freeRadius.inc:562
-#: ../lib/modules/asteriskExtension.inc:236 ../lib/modules/aliasEntry.inc:100
-#: ../lib/modules/qmailGroup.inc:572 ../lib/modules/organizationalRole.inc:195
+#: ../lib/modules/asteriskExtension.inc:238 ../lib/modules/aliasEntry.inc:100
+#: ../lib/modules/qmailGroup.inc:572 ../lib/modules/organizationalRole.inc:198
 #: ../lib/modules/passwordSelfReset.inc:361
 #: ../lib/modules/heimdalKerberos.inc:324
 #: ../lib/modules/heimdalKerberos.inc:335
-#: ../lib/modules/heimdalKerberos.inc:599 ../lib/modules/windowsGroup.inc:368
-#: ../lib/modules/windowsGroup.inc:625 ../lib/modules/groupOfNames.inc:243
-#: ../lib/modules/groupOfNames.inc:251
+#: ../lib/modules/heimdalKerberos.inc:599 ../lib/modules/windowsGroup.inc:371
+#: ../lib/modules/windowsGroup.inc:628 ../lib/modules/groupOfNames.inc:246
+#: ../lib/modules/groupOfNames.inc:254
 msgid "Change"
 msgstr "更改"
 
-#: ../templates/lists/changePassword.php:227
+#: ../templates/lists/changePassword.php:228
 msgid "Change Asterisk password"
 msgstr "更改 Asterisk 密码"
 
-#: ../templates/lists/changePassword.php:230
+#: ../templates/lists/changePassword.php:231
 msgid "Change Asterisk voicemail password"
 msgstr "更改 Asterisk 语音邮件密码"
 
@@ -2232,24 +2250,24 @@ msgstr "更改 Asterisk 语音邮件密码"
 msgid "Change GID number of users and hosts"
 msgstr "更改用户和主机的GID号"
 
-#: ../templates/lists/changePassword.php:233
-#: ../templates/lists/changePassword.php:236
+#: ../templates/lists/changePassword.php:234
+#: ../templates/lists/changePassword.php:237
 msgid "Change Kerberos password"
 msgstr "更改 Kerberos 密码"
 
-#: ../templates/lists/changePassword.php:220
+#: ../templates/lists/changePassword.php:221
 msgid "Change Samba LM password"
 msgstr "更改 Samba LM 密码"
 
-#: ../templates/lists/changePassword.php:218
+#: ../templates/lists/changePassword.php:219
 msgid "Change Samba NT password"
 msgstr "更改 Samba NT 密码"
 
-#: ../templates/lists/changePassword.php:212
+#: ../templates/lists/changePassword.php:213
 msgid "Change Unix password"
 msgstr "更改 Unix 密码"
 
-#: ../templates/lists/changePassword.php:239
+#: ../templates/lists/changePassword.php:240
 msgid "Change Windows password"
 msgstr "更改Windows 密码"
 
@@ -2262,11 +2280,11 @@ msgstr "改变帐号状态"
 msgid "Change default profile"
 msgstr "更改缺省的配置文件"
 
-#: ../templates/selfService/adminMain.php:597
+#: ../templates/selfService/adminMain.php:650
 msgid "Change field label."
 msgstr "修改域标识"
 
-#: ../lib/lists.inc:811
+#: ../lib/lists.inc:812
 msgid "Change list settings"
 msgstr "改变列表设置"
 
@@ -2274,26 +2292,26 @@ msgstr "改变列表设置"
 msgid "Change master password"
 msgstr "更改管理员密码"
 
-#: ../templates/lists/changePassword.php:215
-#: ../templates/lists/changePassword.php:260
-#: ../templates/lists/changePassword.php:350
-#: ../templates/lists/changePassword.php:352
-#: ../templates/lists/changePassword.php:389
-#: ../templates/lists/changePassword.php:391 ../lib/types/user.inc:742
+#: ../templates/lists/changePassword.php:216
+#: ../templates/lists/changePassword.php:261
+#: ../templates/lists/changePassword.php:351
+#: ../templates/lists/changePassword.php:353
+#: ../templates/lists/changePassword.php:390
+#: ../templates/lists/changePassword.php:392 ../lib/types/user.inc:742
 #: ../help/help.inc:105
 msgid "Change password"
 msgstr "更改密码"
 
-#: ../templates/lists/changePassword.php:267
 #: ../templates/lists/changePassword.php:268
+#: ../templates/lists/changePassword.php:269
 msgid "Change password now?"
 msgstr "现在更改密码?"
 
-#: ../templates/config/confmain.php:273
+#: ../templates/config/confmain.php:276
 msgid "Change passwords"
 msgstr "更改密码 "
 
-#: ../lib/lists.inc:812
+#: ../lib/lists.inc:813
 msgid "Change settings"
 msgstr "修改设置"
 
@@ -2311,11 +2329,11 @@ msgstr "Charlie"
 msgid "Check home directories"
 msgstr "检查主目录"
 
-#: ../templates/tests/index.php:54 ../lib/tools/tests.inc:112
+#: ../templates/tests/index.php:55 ../lib/tools/tests.inc:113
 msgid "Check if quotas and homedirectories can be managed."
 msgstr "请检查是否可能管理限额和主目录"
 
-#: ../templates/tests/index.php:60 ../lib/tools/tests.inc:118
+#: ../templates/tests/index.php:61 ../lib/tools/tests.inc:119
 msgid ""
 "Check if the LDAP schema fits the requirements of the selected account "
 "modules."
@@ -2325,17 +2343,17 @@ msgstr "检查LDAP的架构是否符合选中的帐号模块需求"
 msgid "Check password"
 msgstr "检查密码"
 
-#: ../templates/tests/lamdaemonTest.php:87
+#: ../templates/tests/lamdaemonTest.php:88
 msgid "Check quotas"
 msgstr "检查限额"
 
-#: ../templates/masscreate.php:247
+#: ../templates/upload/masscreate.php:273
 msgid ""
 "Check your input carefully. LAM will only do some basic checks on the upload "
 "data."
 msgstr "请仔细检查输入,上传前程序仅做基本检查."
 
-#: ../lib/modules/customFields.inc:2895
+#: ../lib/modules/customFields.inc:2893
 msgid "Checkbox"
 msgstr "复选框"
 
@@ -2357,23 +2375,23 @@ msgstr ""
 "选择IMAP管理密码的输入方法。可以使用与LAM登录相同的密码，也可以在需要时再输"
 "入。"
 
-#: ../lib/modules/puppetClient.inc:97 ../lib/modules/puppetClient.inc:101
-#: ../lib/modules/puppetClient.inc:149 ../lib/modules/puppetClient.inc:165
-#: ../lib/modules/puppetClient.inc:178 ../lib/modules/puppetClient.inc:280
-#: ../lib/modules/puppetClient.inc:283 ../lib/modules/puppetClient.inc:411
+#: ../lib/modules/puppetClient.inc:100 ../lib/modules/puppetClient.inc:104
+#: ../lib/modules/puppetClient.inc:152 ../lib/modules/puppetClient.inc:168
+#: ../lib/modules/puppetClient.inc:181 ../lib/modules/puppetClient.inc:283
+#: ../lib/modules/puppetClient.inc:286 ../lib/modules/puppetClient.inc:412
 msgid "Classes"
 msgstr "类"
 
-#: ../lib/modules/qmailUser.inc:1230 ../lib/modules/windowsUser.inc:3544
-#: ../lib/modules/shadowAccount.inc:903 ../lib/modules/freeRadius.inc:824
+#: ../lib/modules/qmailUser.inc:1228 ../lib/modules/windowsUser.inc:3542
+#: ../lib/modules/shadowAccount.inc:901 ../lib/modules/freeRadius.inc:822
 msgid "Cleanup expired user accounts"
 msgstr "清理过期用户账号."
 
-#: ../lib/lists.inc:389
+#: ../lib/lists.inc:391
 msgid "Clear filter"
 msgstr "清除过滤表达式"
 
-#: ../lib/config.inc:322
+#: ../lib/config.inc:325
 msgid "Click here if you are not directed to the next page."
 msgstr "如果没有自动跳转到下一页请点此处."
 
@@ -2392,11 +2410,11 @@ msgstr "点击在缩略图与原来的大小间切换"
 #: ../lib/modules/sambaSamAccount.inc:242
 #: ../lib/modules/sambaSamAccount.inc:379
 #: ../lib/modules/sambaSamAccount.inc:1481
-#: ../lib/modules/sambaSamAccount.inc:1958
+#: ../lib/modules/sambaSamAccount.inc:1956
 msgid "Client printer is default"
 msgstr "缺省为客户打印机"
 
-#: ../templates/schema/schema.php:199
+#: ../templates/schema/schema.php:200
 msgid "Collective"
 msgstr "集合(Collective)"
 
@@ -2404,8 +2422,8 @@ msgstr "集合(Collective)"
 msgid "Color laser printer"
 msgstr "彩色打印机"
 
-#: ../templates/masscreate.php:284 ../lib/modules/customFields.inc:132
-#: ../lib/modules/customFields.inc:2739
+#: ../templates/upload/masscreate.php:310 ../lib/modules/customFields.inc:132
+#: ../lib/modules/customFields.inc:2737
 msgid "Columns"
 msgstr "列"
 
@@ -2426,16 +2444,16 @@ msgstr "命令"
 #: ../lib/modules/sudoRole.inc:82 ../lib/modules/sudoRole.inc:108
 #: ../lib/modules/sudoRole.inc:171 ../lib/modules/sudoRole.inc:218
 #: ../lib/modules/sudoRole.inc:230 ../lib/modules/sudoRole.inc:370
-#: ../lib/modules/sudoRole.inc:757
+#: ../lib/modules/sudoRole.inc:755
 msgid "Commands"
 msgstr "命令"
 
-#: ../lib/modules/pykotaUser.inc:375 ../lib/modules/pykotaUser.inc:599
-#: ../lib/modules/pykotaUser.inc:911 ../lib/modules/pykotaUser.inc:971
+#: ../lib/modules/pykotaUser.inc:378 ../lib/modules/pykotaUser.inc:602
+#: ../lib/modules/pykotaUser.inc:912 ../lib/modules/pykotaUser.inc:972
 msgid "Comment"
 msgstr "备注"
 
-#: ../lib/modules/pykotaUser.inc:137
+#: ../lib/modules/pykotaUser.inc:140
 msgid "Comment for initial balance."
 msgstr "初使化账目的备注"
 
@@ -2450,34 +2468,34 @@ msgstr "普通的例子是 \"@givenname@%sn%\" 或 \"%givenname%.%sn%\"."
 #: ../templates/config/mainmanage.php:379 ../lib/types/host.inc:92
 #: ../lib/types/user.inc:91 ../lib/modules/pykotaGroup.inc:113
 #: ../lib/modules/pykotaGroup.inc:157 ../lib/modules/pykotaGroup.inc:185
-#: ../lib/modules/pykotaGroup.inc:469 ../lib/modules/posixAccount.inc:129
+#: ../lib/modules/pykotaGroup.inc:467 ../lib/modules/posixAccount.inc:129
 #: ../lib/modules/posixAccount.inc:188 ../lib/modules/posixAccount.inc:289
 #: ../lib/modules/posixAccount.inc:362 ../lib/modules/posixAccount.inc:493
 #: ../lib/modules/posixAccount.inc:519 ../lib/modules/posixAccount.inc:1414
-#: ../lib/modules/posixAccount.inc:1848 ../lib/modules/posixAccount.inc:2766
+#: ../lib/modules/posixAccount.inc:1846 ../lib/modules/posixAccount.inc:2764
 #: ../lib/modules/windowsUser.inc:118 ../lib/modules/windowsUser.inc:424
 #: ../lib/modules/windowsUser.inc:741 ../lib/modules/windowsUser.inc:816
 #: ../lib/modules/windowsUser.inc:952 ../lib/modules/windowsUser.inc:1087
-#: ../lib/modules/windowsUser.inc:2426 ../lib/modules/pykotaUser.inc:108
-#: ../lib/modules/pykotaUser.inc:199 ../lib/modules/pykotaUser.inc:271
-#: ../lib/modules/pykotaUser.inc:405 ../lib/modules/pykotaUser.inc:891
-#: ../lib/modules/inetOrgPerson.inc:95 ../lib/modules/inetOrgPerson.inc:175
-#: ../lib/modules/inetOrgPerson.inc:645 ../lib/modules/inetOrgPerson.inc:767
-#: ../lib/modules/inetOrgPerson.inc:1278 ../lib/modules/inetOrgPerson.inc:1281
-#: ../lib/modules/inetOrgPerson.inc:1997 ../lib/modules/inetOrgPerson.inc:2134
-#: ../lib/modules/inetOrgPerson.inc:3734
-#: ../lib/modules/asteriskExtension.inc:118
+#: ../lib/modules/windowsUser.inc:2424 ../lib/modules/pykotaUser.inc:111
+#: ../lib/modules/pykotaUser.inc:202 ../lib/modules/pykotaUser.inc:274
+#: ../lib/modules/pykotaUser.inc:408 ../lib/modules/pykotaUser.inc:892
+#: ../lib/modules/inetOrgPerson.inc:93 ../lib/modules/inetOrgPerson.inc:173
+#: ../lib/modules/inetOrgPerson.inc:643 ../lib/modules/inetOrgPerson.inc:765
+#: ../lib/modules/inetOrgPerson.inc:1276 ../lib/modules/inetOrgPerson.inc:1279
+#: ../lib/modules/inetOrgPerson.inc:1993 ../lib/modules/inetOrgPerson.inc:2130
+#: ../lib/modules/inetOrgPerson.inc:3714
+#: ../lib/modules/asteriskExtension.inc:120
 msgid "Common name"
 msgstr "全名"
 
-#: ../lib/modules/asteriskExtension.inc:119
+#: ../lib/modules/asteriskExtension.inc:121
 msgid "Common name of the Asterisk extension."
 msgstr "Asterisk 扩展的一般命名"
 
 #: ../lib/types/user.inc:92 ../lib/modules/windowsUser.inc:350
 #: ../lib/modules/windowsUser.inc:637 ../lib/modules/windowsUser.inc:753
 #: ../lib/modules/windowsUser.inc:895 ../lib/modules/windowsUser.inc:1144
-#: ../lib/modules/windowsUser.inc:2444 ../lib/modules/windowsUser.inc:3226
+#: ../lib/modules/windowsUser.inc:2442 ../lib/modules/windowsUser.inc:3224
 msgid "Company"
 msgstr "公司"
 
@@ -2485,7 +2503,7 @@ msgstr "公司"
 msgid "Company Licence"
 msgstr "公司许可"
 
-#: ../templates/serverInfo.php:335 ../templates/serverInfo.php:396
+#: ../templates/serverInfo.php:336 ../templates/serverInfo.php:397
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1168
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1172
 #: ../templates/3rdParty/pla/htdocs/compare_form.php:33
@@ -2514,11 +2532,11 @@ msgstr "与另外一个条目进行比较"
 msgid "Comparing the following DNs"
 msgstr "比较如下DN条目"
 
-#: ../templates/serverInfo.php:284 ../templates/serverInfo.php:371
+#: ../templates/serverInfo.php:285 ../templates/serverInfo.php:372
 msgid "Completed"
 msgstr "完成"
 
-#: ../templates/serverInfo.php:114
+#: ../templates/serverInfo.php:115
 msgid "Config suffix"
 msgstr "配置后缀"
 
@@ -2529,13 +2547,13 @@ msgstr "配置总览"
 #: ../lib/modules/qmailUser.inc:126 ../lib/modules/qmailUser.inc:179
 #: ../lib/modules/qmailUser.inc:259 ../lib/modules/qmailUser.inc:392
 #: ../lib/modules/qmailUser.inc:439 ../lib/modules/qmailUser.inc:629
-#: ../lib/modules/qmailUser.inc:1150
+#: ../lib/modules/qmailUser.inc:1148
 msgid "Configuration type"
 msgstr "配置类型"
 
 #: ../lib/modules/qmailGroup.inc:96 ../lib/modules/qmailGroup.inc:228
 #: ../lib/modules/qmailGroup.inc:361 ../lib/modules/qmailGroup.inc:411
-#: ../lib/modules/qmailGroup.inc:623 ../lib/modules/qmailGroup.inc:1031
+#: ../lib/modules/qmailGroup.inc:623 ../lib/modules/qmailGroup.inc:1029
 msgid "Confirm sender"
 msgstr "确认发送者"
 
@@ -2546,7 +2564,7 @@ msgstr "确认邮件的设置"
 #: ../lib/modules/qmailGroup.inc:74 ../lib/modules/qmailGroup.inc:103
 #: ../lib/modules/qmailGroup.inc:152 ../lib/modules/qmailGroup.inc:271
 #: ../lib/modules/qmailGroup.inc:378 ../lib/modules/qmailGroup.inc:591
-#: ../lib/modules/qmailGroup.inc:1010
+#: ../lib/modules/qmailGroup.inc:1008
 msgid "Confirmation text"
 msgstr "确认文本"
 
@@ -2557,45 +2575,45 @@ msgid ""
 msgstr ""
 "在确认发送者时使用的确认文本。可以使用 qmail 回复中的通常的%HEADER%等标签"
 
-#: ../templates/config/confmodules.php:423
+#: ../templates/config/confmodules.php:431
 msgid "Conflicting module:"
 msgstr "冲突的模块:"
 
 #: ../lib/modules/sambaSamAccount.inc:240
 #: ../lib/modules/sambaSamAccount.inc:373
 #: ../lib/modules/sambaSamAccount.inc:1477
-#: ../lib/modules/sambaSamAccount.inc:1948
+#: ../lib/modules/sambaSamAccount.inc:1946
 msgid "Connect client drives"
 msgstr "连接客户驱动器"
 
 #: ../lib/modules/sambaSamAccount.inc:241
 #: ../lib/modules/sambaSamAccount.inc:376
 #: ../lib/modules/sambaSamAccount.inc:1479
-#: ../lib/modules/sambaSamAccount.inc:1953
+#: ../lib/modules/sambaSamAccount.inc:1951
 msgid "Connect client printers"
 msgstr "连接客户打印机"
 
-#: ../templates/serverInfo.php:230
+#: ../templates/serverInfo.php:231
 msgid "Connection statistics"
 msgstr "连接统计"
 
 #: ../lib/types/oracleContextType.inc:78 ../lib/modules/oracleService.inc:65
 #: ../lib/modules/oracleService.inc:85 ../lib/modules/oracleService.inc:99
-#: ../lib/modules/oracleService.inc:123 ../lib/modules/oracleService.inc:174
+#: ../lib/modules/oracleService.inc:123 ../lib/modules/oracleService.inc:172
 msgid "Connection string"
 msgstr "连接字符串"
 
 #: ../lib/modules/sambaSamAccount.inc:237
 #: ../lib/modules/sambaSamAccount.inc:1465
-#: ../lib/modules/sambaSamAccount.inc:1941
+#: ../lib/modules/sambaSamAccount.inc:1939
 msgid "Connection time limit"
 msgstr "连接时间限制"
 
-#: ../lib/modules/bindDLZ.inc:232
+#: ../lib/modules/bindDLZ.inc:235
 msgid "Contact address for this zone (e.g. \"root.example.com.\")."
 msgstr "这个域的联系邮箱(比如 \"root.example.com.\")."
 
-#: ../lib/modules/windowsUser.inc:1100 ../lib/modules/inetOrgPerson.inc:1458
+#: ../lib/modules/windowsUser.inc:1100 ../lib/modules/inetOrgPerson.inc:1456
 msgid "Contact data"
 msgstr "联系数据"
 
@@ -2689,25 +2707,25 @@ msgstr "不能更改文件名"
 msgid "Could not rename the entry."
 msgstr "不能重命名条目."
 
-#: ../templates/pdfedit/pdfpage.php:121
+#: ../templates/pdfedit/pdfpage.php:139
 msgid "Could not save PDF structure, access denied."
 msgstr "无法保存PDF结构,存取拒绝."
 
-#: ../templates/pdfedit/pdfmain.php:187
-#: ../templates/profedit/profilemain.php:173
+#: ../templates/pdfedit/pdfmain.php:234
+#: ../templates/profedit/profilemain.php:216
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1185
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1189
-#: ../templates/initsuff.php:194 ../lib/modules/nisMailAliasUser.inc:366
+#: ../templates/initsuff.php:195 ../lib/modules/nisMailAliasUser.inc:375
 #: ../lib/modules/sambaSamAccount.inc:1566 ../lib/modules/posixAccount.inc:1687
 msgid "Create"
 msgstr "建立"
 
-#: ../lib/lists.inc:515 ../lib/lists.inc:704 ../lib/modules.inc:1379
+#: ../lib/lists.inc:517 ../lib/lists.inc:706 ../lib/modules.inc:1387
 #: ../help/help.inc:238
 msgid "Create PDF file"
 msgstr "建立PDF文件"
 
-#: ../templates/massDoUpload.php:202 ../templates/masscreate.php:264
+#: ../templates/upload/masscreate.php:290 ../lib/upload.inc:197
 msgid "Create PDF files"
 msgstr "建立PDF文件"
 
@@ -2717,11 +2735,11 @@ msgstr "建立PDF文件"
 msgid "Create a child entry"
 msgstr "新建子条目"
 
-#: ../templates/pdfedit/pdfmain.php:180
+#: ../templates/pdfedit/pdfmain.php:227
 msgid "Create a new PDF structure"
 msgstr "建立新的PDF架构"
 
-#: ../templates/profedit/profilemain.php:161
+#: ../templates/profedit/profilemain.php:204
 msgid "Create a new profile"
 msgstr "建立新的配置文件"
 
@@ -2810,7 +2828,7 @@ msgstr "建立另外一个用户"
 msgid "Create another view"
 msgstr "建立另外一个视图"
 
-#: ../lib/lists.inc:709
+#: ../lib/lists.inc:711
 msgid "Create for"
 msgstr "建立"
 
@@ -2850,7 +2868,7 @@ msgstr "对立对象"
 msgid "Created by"
 msgstr "创建者:"
 
-#: ../lib/types/automountType.inc:274
+#: ../lib/types/automountType.inc:251
 msgid "Created new automount map."
 msgstr "建立新的自动挂接映射."
 
@@ -2859,7 +2877,7 @@ msgstr "建立新的自动挂接映射."
 msgid "Created new profile."
 msgstr "新增配置文件"
 
-#: ../lib/types/bind.inc:241
+#: ../lib/types/bind.inc:218
 msgid "Created new zone."
 msgstr "新增域"
 
@@ -2869,7 +2887,7 @@ msgid ""
 "object classes and attributes."
 msgstr "为给定的帐号类型建立新组。组建立一个对象类和属性的容器。"
 
-#: ../lib/tools/fileUpload.inc:53
+#: ../lib/tools/fileUpload.inc:54
 msgid "Creates accounts by uploading a CSV formated file."
 msgstr "上传一个CSV格式文件批量建立帐号"
 
@@ -2886,11 +2904,11 @@ msgstr "创建时间"
 msgid "Cron configuration"
 msgstr "Cron 配置"
 
-#: ../lib/modules/pykotaUser.inc:133
+#: ../lib/modules/pykotaUser.inc:136
 msgid "Current account balance for the user."
 msgstr "为用户建立账单"
 
-#: ../templates/serverInfo.php:232 ../templates/serverInfo.php:237
+#: ../templates/serverInfo.php:233 ../templates/serverInfo.php:238
 msgid "Current connections"
 msgstr "当前连接"
 
@@ -2903,7 +2921,7 @@ msgstr "当前 <b>%s</b>个属性 <b>%s</b>值的列表: "
 msgid "Current usage (kB)"
 msgstr "当前使用量(kB)"
 
-#: ../lib/modules/customFields.inc:1102 ../lib/modules/customFields.inc:1444
+#: ../lib/modules/customFields.inc:1100 ../lib/modules/customFields.inc:1442
 msgid "Custom fields"
 msgstr "自定义域"
 
@@ -2911,7 +2929,7 @@ msgstr "自定义域"
 msgid "Custom icon"
 msgstr "自定义图标"
 
-#: ../templates/config/conftypes.php:328 ../lib/modules/customFields.inc:172
+#: ../templates/config/conftypes.php:304 ../lib/modules/customFields.inc:172
 #: ../help/help.inc:182
 msgid "Custom label"
 msgstr "自定义标签"
@@ -2957,7 +2975,7 @@ msgstr "DHCP总计: %s"
 msgid "DHCP settings"
 msgstr "DHCP 设置"
 
-#: ../templates/delete.php:105
+#: ../templates/delete.php:111
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:734
 #: ../templates/3rdParty/pla/lib/PageRender.php:110
 #: ../templates/3rdParty/pla/htdocs/compare.php:52
@@ -2965,8 +2983,8 @@ msgstr "DHCP 设置"
 #: ../templates/3rdParty/pla/htdocs/create.php:92
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:35
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:112
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:57 ../lib/modules.inc:416
-#: ../lib/modules.inc:2013
+#: ../templates/3rdParty/pla/htdocs/mass_delete.php:57 ../lib/modules.inc:426
+#: ../lib/modules.inc:2021
 msgid "DN"
 msgstr "DN"
 
@@ -2976,11 +2994,11 @@ msgstr "DN"
 msgid "DN does not exist"
 msgstr "DN不存在"
 
-#: ../templates/masscreate.php:288
+#: ../templates/upload/masscreate.php:314
 msgid "DN settings"
 msgstr "DN 设置"
 
-#: ../templates/masscreate.php:317 ../help/help.inc:228
+#: ../templates/upload/masscreate.php:343 ../help/help.inc:228
 msgid "DN suffix"
 msgstr "DN 后缀"
 
@@ -2990,7 +3008,7 @@ msgstr "存储Radius配置模板的DN"
 
 #: ../lib/modules/dhcp_settings.inc:216 ../lib/modules/dhcp_settings.inc:231
 #: ../lib/modules/dhcp_settings.inc:273 ../lib/modules/dhcp_settings.inc:579
-#: ../lib/modules/dhcp_settings.inc:680
+#: ../lib/modules/dhcp_settings.inc:678
 msgid "DNS"
 msgstr "DNS"
 
@@ -2998,16 +3016,16 @@ msgstr "DNS"
 msgid "DNS (Domain Name System)"
 msgstr "DNS(域名解析系统)"
 
-#: ../lib/modules/bindDLZ.inc:74
+#: ../lib/modules/bindDLZ.inc:77
 msgid "DNS entry"
 msgstr "DNS条目"
 
-#: ../lib/types/bind.inc:159
+#: ../lib/types/bind.inc:136
 #, php-format
 msgid "DNS entry count: %s"
 msgstr "DNS条目总数: %s"
 
-#: ../lib/modules/asteriskExtension.inc:115
+#: ../lib/modules/asteriskExtension.inc:117
 msgid "DNs of the extension owners"
 msgstr "扩展属主的DN名"
 
@@ -3018,12 +3036,12 @@ msgstr "DSML V.1 导出"
 #: ../lib/modules/asteriskAccount.inc:273
 #: ../lib/modules/asteriskAccount.inc:362
 #: ../lib/modules/asteriskAccount.inc:627
-#: ../lib/modules/asteriskAccount.inc:1250
+#: ../lib/modules/asteriskAccount.inc:1248
 msgid "DTFM flags"
 msgstr "DTFM标志"
 
 #: ../lib/modules/asteriskAccount.inc:139
-#: ../lib/modules/asteriskAccount.inc:992
+#: ../lib/modules/asteriskAccount.inc:990
 msgid "DTMF mode"
 msgstr "DTMF模式"
 
@@ -3043,7 +3061,7 @@ msgstr "数据库"
 msgid "Database connection ok."
 msgstr "数据库连接成功."
 
-#: ../lib/types/oracleContextType.inc:186
+#: ../lib/types/oracleContextType.inc:167
 #, php-format
 msgid "Database count: %s"
 msgstr "数据库总计: %s"
@@ -3076,9 +3094,9 @@ msgstr "数据库用户"
 msgid "Database user and password"
 msgstr "数据库用户名和密码"
 
-#: ../lib/modules/pykotaUser.inc:595 ../lib/modules/pykotaUser.inc:646
-#: ../lib/modules/pykotaUser.inc:909 ../lib/modules/pykotaUser.inc:969
-#: ../lib/modules/pykotaUser.inc:993
+#: ../lib/modules/pykotaUser.inc:598 ../lib/modules/pykotaUser.inc:649
+#: ../lib/modules/pykotaUser.inc:910 ../lib/modules/pykotaUser.inc:970
+#: ../lib/modules/pykotaUser.inc:994
 msgid "Date"
 msgstr "日期"
 
@@ -3097,7 +3115,7 @@ msgid ""
 "expiration. If set value must be >0."
 msgstr "在密码过期前提醒用户的天数,若设其值,必大于0."
 
-#: ../templates/lists/changePassword.php:469 ../lib/types/user.inc:410
+#: ../templates/lists/changePassword.php:470 ../lib/types/user.inc:410
 msgid "Deactivate"
 msgstr "非激活的"
 
@@ -3122,12 +3140,12 @@ msgstr "缺省 (\\r\\n)"
 
 #: ../lib/modules/dhcp_settings.inc:170 ../lib/modules/dhcp_settings.inc:217
 #: ../lib/modules/dhcp_settings.inc:232 ../lib/modules/dhcp_settings.inc:279
-#: ../lib/modules/dhcp_settings.inc:581 ../lib/modules/dhcp_settings.inc:681
+#: ../lib/modules/dhcp_settings.inc:581 ../lib/modules/dhcp_settings.inc:679
 msgid "Default gateway"
 msgstr "缺省网关"
 
-#: ../templates/config/confmain.php:313
-#: ../templates/selfService/adminMain.php:460 ../help/help.inc:99
+#: ../templates/config/confmain.php:316
+#: ../templates/selfService/adminMain.php:476 ../help/help.inc:99
 msgid "Default language"
 msgstr "缺省语言"
 
@@ -3135,12 +3153,12 @@ msgstr "缺省语言"
 msgid "Default method to output a random password."
 msgstr "输出随机密码的缺省方法"
 
-#: ../templates/config/confmain.php:401 ../help/help.inc:210
+#: ../templates/config/confmain.php:404 ../help/help.inc:210
 msgid "Default password output"
 msgstr "默认密码输出"
 
-#: ../lib/modules/ppolicyUser.inc:64 ../lib/modules/ppolicyUser.inc:531
-#: ../lib/modules/ppolicyUser.inc:561
+#: ../lib/modules/ppolicyUser.inc:64 ../lib/modules/ppolicyUser.inc:529
+#: ../lib/modules/ppolicyUser.inc:559
 msgid "Default password policy"
 msgstr "默认密码策略"
 
@@ -3148,13 +3166,14 @@ msgstr "默认密码策略"
 #: ../lib/modules/asteriskAccount.inc:296
 #: ../lib/modules/asteriskAccount.inc:530
 #: ../lib/modules/asteriskAccount.inc:750
-#: ../lib/modules/asteriskAccount.inc:1015
-#: ../lib/modules/asteriskAccount.inc:1296
+#: ../lib/modules/asteriskAccount.inc:1013
+#: ../lib/modules/asteriskAccount.inc:1294
 msgid "Default user"
 msgstr "缺省用户"
 
-#: ../templates/masscreate.php:306 ../templates/masscreate.php:380
-#: ../lib/modules/customFields.inc:128 ../lib/modules/customFields.inc:2921
+#: ../templates/upload/masscreate.php:332
+#: ../templates/upload/masscreate.php:406 ../lib/modules/customFields.inc:128
+#: ../lib/modules/customFields.inc:2919
 msgid "Default value"
 msgstr "缺省值"
 
@@ -3180,24 +3199,24 @@ msgid ""
 msgstr "为此端检查消息等待信号(MWI)来定义邮箱"
 
 #: ../lib/passwordExpirationJob.inc:464 ../lib/passwordExpirationJob.inc:511
-#: ../help/help.inc:346
+#: ../help/help.inc:358
 msgid "Delay"
 msgstr "延期"
 
-#: ../help/help.inc:347
+#: ../help/help.inc:359
 msgid "Delay this action by a number of days after account expiry."
 msgstr "帐号过期后功能延期的天数"
 
-#: ../lib/types/kolabSharedFolderType.inc:91 ../lib/modules/kolabUser.inc:116
-#: ../lib/modules/kolabUser.inc:132 ../lib/modules/kolabUser.inc:136
-#: ../lib/modules/kolabUser.inc:211 ../lib/modules/kolabUser.inc:234
-#: ../lib/modules/kolabUser.inc:359 ../lib/modules/kolabUser.inc:732
-#: ../lib/modules/kolabUser.inc:804 ../lib/modules/kolabSharedFolder.inc:138
+#: ../lib/types/kolabSharedFolderType.inc:91 ../lib/modules/kolabUser.inc:119
+#: ../lib/modules/kolabUser.inc:135 ../lib/modules/kolabUser.inc:139
+#: ../lib/modules/kolabUser.inc:214 ../lib/modules/kolabUser.inc:237
+#: ../lib/modules/kolabUser.inc:362 ../lib/modules/kolabUser.inc:733
+#: ../lib/modules/kolabUser.inc:805 ../lib/modules/kolabSharedFolder.inc:138
 #: ../lib/modules/kolabSharedFolder.inc:142
 #: ../lib/modules/kolabSharedFolder.inc:226
 #: ../lib/modules/kolabSharedFolder.inc:237
 #: ../lib/modules/kolabSharedFolder.inc:320
-#: ../lib/modules/kolabSharedFolder.inc:527
+#: ../lib/modules/kolabSharedFolder.inc:525
 msgid "Delegates"
 msgstr "代理(Delegates)"
 
@@ -3209,26 +3228,26 @@ msgstr ""
 "在使用共享文件夹时允许使用委托. 在 Kolab smtp 服务器(Postfix)时会使用这个属"
 "性."
 
-#: ../templates/serverInfo.php:321 ../templates/serverInfo.php:390
-#: ../templates/multiEdit.php:130 ../templates/ou_edit.php:124
+#: ../templates/serverInfo.php:322 ../templates/serverInfo.php:391
+#: ../templates/multiEdit.php:153 ../templates/ou_edit.php:134
 #: ../templates/config/profmanage.php:279
 #: ../templates/selfService/profManage.php:240
-#: ../templates/pdfedit/pdfmain.php:214 ../templates/pdfedit/pdfmain.php:215
-#: ../templates/pdfedit/pdfmain.php:248 ../templates/delete.php:128
-#: ../templates/profedit/profilemain.php:203
-#: ../templates/profedit/profilemain.php:204
+#: ../templates/pdfedit/pdfmain.php:259 ../templates/pdfedit/pdfmain.php:260
+#: ../templates/pdfedit/pdfmain.php:293 ../templates/delete.php:134
+#: ../templates/profedit/profilemain.php:244
+#: ../templates/profedit/profilemain.php:245
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:33
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:124
 #: ../lib/passwordExpirationJob.inc:469 ../lib/modules/pykotaPrinter.inc:281
-#: ../lib/modules/nisNetGroupHost.inc:107
+#: ../lib/modules/nisNetGroupHost.inc:110
 #: ../lib/modules/sambaSamAccount.inc:1559 ../lib/modules/posixAccount.inc:1680
-#: ../lib/modules/zarafaUser.inc:1475 ../lib/modules/zarafaUser.inc:1526
-#: ../lib/modules/bindDLZ.inc:1062 ../lib/modules/bindDLZ.inc:1383
-#: ../lib/modules/kolabUser.inc:794 ../lib/modules/sambaGroupMapping.inc:405
-#: ../lib/modules/ldapPublicKey.inc:357 ../lib/modules/nisNetGroupUser.inc:187
-#: ../lib/modules/nisnetgroup.inc:253 ../lib/modules/inetOrgPerson.inc:2902
-#: ../lib/modules/customFields.inc:2183 ../lib/modules/customFields.inc:3675
-#: ../lib/lists.inc:509
+#: ../lib/modules/zarafaUser.inc:1476 ../lib/modules/zarafaUser.inc:1527
+#: ../lib/modules/bindDLZ.inc:1065 ../lib/modules/bindDLZ.inc:1386
+#: ../lib/modules/kolabUser.inc:795 ../lib/modules/sambaGroupMapping.inc:405
+#: ../lib/modules/ldapPublicKey.inc:358 ../lib/modules/nisNetGroupUser.inc:190
+#: ../lib/modules/nisnetgroup.inc:256 ../lib/modules/inetOrgPerson.inc:2904
+#: ../lib/modules/customFields.inc:2181 ../lib/modules/customFields.inc:3673
+#: ../lib/lists.inc:511
 msgid "Delete"
 msgstr "删除"
 
@@ -3267,16 +3286,16 @@ msgstr "删除主目录"
 msgid "Delete mailbox"
 msgstr "删除邮箱"
 
-#: ../templates/ou_edit.php:204 ../help/help.inc:303
+#: ../templates/ou_edit.php:216 ../help/help.inc:315
 msgid "Delete organisational unit"
 msgstr "删除组织单元"
 
 #: ../templates/3rdParty/pla/lib/functions.php:2014
-#: ../lib/modules/windowsUser.inc:1270 ../lib/modules/inetOrgPerson.inc:1679
+#: ../lib/modules/windowsUser.inc:1270 ../lib/modules/inetOrgPerson.inc:1677
 msgid "Delete photo"
 msgstr "删除照片"
 
-#: ../lib/modules/range.inc:556
+#: ../lib/modules/range.inc:559
 msgid "Delete pool"
 msgstr "删除地址池"
 
@@ -3287,13 +3306,13 @@ msgstr "删除地址池"
 msgid "Delete profile"
 msgstr "删除配置文件"
 
-#: ../lib/modules/range.inc:105 ../lib/modules/range.inc:137
-#: ../lib/modules/range.inc:532 ../lib/modules/range.inc:607
+#: ../lib/modules/range.inc:108 ../lib/modules/range.inc:140
+#: ../lib/modules/range.inc:535 ../lib/modules/range.inc:610
 msgid "Delete range"
 msgstr "删除范围"
 
-#: ../lib/modules/asteriskExtension.inc:316
-#: ../lib/modules/asteriskExtension.inc:339
+#: ../lib/modules/asteriskExtension.inc:318
+#: ../lib/modules/asteriskExtension.inc:341
 msgid "Delete rule"
 msgstr "删除规则"
 
@@ -3301,7 +3320,7 @@ msgstr "删除规则"
 msgid "Delete selected DHCP entries"
 msgstr "删除所选DHCP条目"
 
-#: ../lib/types/bind.inc:162
+#: ../lib/types/bind.inc:139
 msgid "Delete selected DNS entries"
 msgstr "删除所选DHCP条目"
 
@@ -3317,7 +3336,7 @@ msgstr "删除选中的地址列表"
 msgid "Delete selected aliases"
 msgstr "删除选中的别名"
 
-#: ../lib/types/automountType.inc:218
+#: ../lib/types/automountType.inc:195
 msgid "Delete selected automount entries"
 msgstr "删除选中的自动挂接条目"
 
@@ -3325,7 +3344,7 @@ msgstr "删除选中的自动挂接条目"
 msgid "Delete selected billing codes"
 msgstr "删除选中的账单号"
 
-#: ../lib/types/oracleContextType.inc:189
+#: ../lib/types/oracleContextType.inc:170
 msgid "Delete selected database entries"
 msgstr "删除所选数据库条目"
 
@@ -3346,7 +3365,7 @@ msgstr "删除已选择的组"
 msgid "Delete selected hosts"
 msgstr "删除选中的主机"
 
-#: ../lib/lists.inc:115
+#: ../lib/lists.inc:117
 msgid "Delete selected objects"
 msgstr "删除选中的对象"
 
@@ -3406,20 +3425,20 @@ msgstr "删除所有包括%s接收者的别名条目"
 msgid "Deleted"
 msgstr "已删除"
 
-#: ../templates/delete.php:282
+#: ../templates/delete.php:290
 #, php-format
 msgid "Deleted DN: %s"
 msgstr "删除的DN: %s"
 
-#: ../templates/pdfedit/pdfmain.php:93
+#: ../templates/pdfedit/pdfmain.php:110
 msgid "Deleted PDF structure."
 msgstr "删除的PDF结构."
 
-#: ../templates/profedit/profilemain.php:108
+#: ../templates/profedit/profilemain.php:127
 msgid "Deleted profile."
 msgstr "已删除的配置文件."
 
-#: ../lib/modules/range.inc:106
+#: ../lib/modules/range.inc:109
 msgid "Deletes an IP range."
 msgstr "删除一个IP范围"
 
@@ -3441,24 +3460,24 @@ msgstr "正在删除对象"
 #: ../lib/modules/qmailUser.inc:124 ../lib/modules/qmailUser.inc:255
 #: ../lib/modules/qmailUser.inc:382 ../lib/modules/qmailUser.inc:436
 #: ../lib/modules/qmailUser.inc:668 ../lib/modules/qmailUser.inc:907
-#: ../lib/modules/qmailUser.inc:1142
+#: ../lib/modules/qmailUser.inc:1140
 msgid "Deletion date"
 msgstr "删除日期"
 
-#: ../lib/lists.inc:1089
+#: ../lib/lists.inc:1075
 msgid "Deletion was successful."
 msgstr "删除操作成功."
 
 #: ../lib/modules/qmailUser.inc:215 ../lib/modules/qmailUser.inc:290
 #: ../lib/modules/qmailUser.inc:403 ../lib/modules/qmailUser.inc:639
-#: ../lib/modules/qmailUser.inc:1135
+#: ../lib/modules/qmailUser.inc:1133
 msgid "Delivery mode"
 msgstr "分发模式"
 
 #: ../lib/modules/qmailUser.inc:122 ../lib/modules/qmailUser.inc:175
 #: ../lib/modules/qmailUser.inc:251 ../lib/modules/qmailUser.inc:374
 #: ../lib/modules/qmailUser.inc:433 ../lib/modules/qmailUser.inc:658
-#: ../lib/modules/qmailUser.inc:1121
+#: ../lib/modules/qmailUser.inc:1119
 msgid "Delivery program"
 msgstr "分发程序"
 
@@ -3466,31 +3485,31 @@ msgstr "分发程序"
 #: ../lib/modules/asteriskAccount.inc:280
 #: ../lib/modules/asteriskAccount.inc:414
 #: ../lib/modules/asteriskAccount.inc:674
-#: ../lib/modules/asteriskAccount.inc:999
-#: ../lib/modules/asteriskAccount.inc:1264 ../lib/modules/dhcp_settings.inc:109
+#: ../lib/modules/asteriskAccount.inc:997
+#: ../lib/modules/asteriskAccount.inc:1262 ../lib/modules/dhcp_settings.inc:109
 msgid "Deny"
 msgstr "拒绝"
 
-#: ../lib/modules/pykotaGroup.inc:65 ../lib/modules/pykotaUser.inc:65
+#: ../lib/modules/pykotaGroup.inc:65 ../lib/modules/pykotaUser.inc:68
 msgid "Deny printing"
 msgstr "阻止打印"
 
 #: ../lib/types/user.inc:93 ../lib/modules/windowsUser.inc:322
 #: ../lib/modules/windowsUser.inc:326 ../lib/modules/windowsUser.inc:710
 #: ../lib/modules/windowsUser.inc:756 ../lib/modules/windowsUser.inc:883
-#: ../lib/modules/windowsUser.inc:1147 ../lib/modules/windowsUser.inc:2459
-#: ../lib/modules/windowsUser.inc:3227 ../lib/modules/inetOrgPerson.inc:165
-#: ../lib/modules/inetOrgPerson.inc:223 ../lib/modules/inetOrgPerson.inc:500
-#: ../lib/modules/inetOrgPerson.inc:622 ../lib/modules/inetOrgPerson.inc:827
-#: ../lib/modules/inetOrgPerson.inc:831 ../lib/modules/inetOrgPerson.inc:1570
-#: ../lib/modules/inetOrgPerson.inc:1573 ../lib/modules/inetOrgPerson.inc:2012
-#: ../lib/modules/inetOrgPerson.inc:2751 ../lib/modules/inetOrgPerson.inc:3682
-#: ../lib/modules/inetOrgPerson.inc:3726
+#: ../lib/modules/windowsUser.inc:1147 ../lib/modules/windowsUser.inc:2457
+#: ../lib/modules/windowsUser.inc:3225 ../lib/modules/inetOrgPerson.inc:163
+#: ../lib/modules/inetOrgPerson.inc:221 ../lib/modules/inetOrgPerson.inc:498
+#: ../lib/modules/inetOrgPerson.inc:620 ../lib/modules/inetOrgPerson.inc:825
+#: ../lib/modules/inetOrgPerson.inc:829 ../lib/modules/inetOrgPerson.inc:1568
+#: ../lib/modules/inetOrgPerson.inc:1571 ../lib/modules/inetOrgPerson.inc:2008
+#: ../lib/modules/inetOrgPerson.inc:2747 ../lib/modules/inetOrgPerson.inc:3662
+#: ../lib/modules/inetOrgPerson.inc:3706
 msgid "Department"
 msgstr "部门"
 
 #: ../lib/modules/kolabGroup.inc:105 ../lib/modules/kolabGroup.inc:109
-#: ../lib/modules/kolabUser.inc:162 ../lib/modules/kolabUser.inc:166
+#: ../lib/modules/kolabUser.inc:165 ../lib/modules/kolabUser.inc:169
 #: ../lib/modules/kolabSharedFolder.inc:130
 #: ../lib/modules/kolabSharedFolder.inc:134
 msgid ""
@@ -3501,7 +3520,7 @@ msgstr ""
 "\"）。"
 
 #: ../lib/modules/kolabGroup.inc:96 ../lib/modules/kolabGroup.inc:100
-#: ../lib/modules/kolabUser.inc:153 ../lib/modules/kolabUser.inc:157
+#: ../lib/modules/kolabUser.inc:156 ../lib/modules/kolabUser.inc:160
 #: ../lib/modules/kolabSharedFolder.inc:121
 #: ../lib/modules/kolabSharedFolder.inc:125
 msgid ""
@@ -3511,8 +3530,8 @@ msgstr ""
 "描述是否允许SMTP接收这个地址发来的邮件(比如: \"domain.tld\" 或 \"-"
 "user@domain.tld\")."
 
-#: ../templates/schema/schema.php:89 ../templates/schema/schema.php:143
-#: ../templates/schema/schema.php:346
+#: ../templates/schema/schema.php:90 ../templates/schema/schema.php:144
+#: ../templates/schema/schema.php:347
 #: ../templates/3rdParty/pla/lib/functions.php:1898
 #: ../templates/3rdParty/pla/lib/functions.php:1902
 #: ../templates/3rdParty/pla/htdocs/add_value_form.php:139
@@ -3524,66 +3543,66 @@ msgstr ""
 #: ../lib/types/dhcp.inc:96 ../lib/types/netgroup.inc:92
 #: ../lib/modules/pykotaPrinter.inc:99 ../lib/modules/pykotaPrinter.inc:153
 #: ../lib/modules/pykotaPrinter.inc:194 ../lib/modules/pykotaPrinter.inc:248
-#: ../lib/modules/pykotaPrinter.inc:588 ../lib/modules/account.inc:82
+#: ../lib/modules/pykotaPrinter.inc:586 ../lib/modules/account.inc:82
 #: ../lib/modules/account.inc:95 ../lib/modules/account.inc:105
 #: ../lib/modules/account.inc:113 ../lib/modules/account.inc:218
-#: ../lib/modules/account.inc:230 ../lib/modules/windowsHost.inc:78
+#: ../lib/modules/account.inc:228 ../lib/modules/windowsHost.inc:78
 #: ../lib/modules/windowsHost.inc:101 ../lib/modules/windowsHost.inc:120
-#: ../lib/modules/windowsHost.inc:143 ../lib/modules/windowsHost.inc:292
+#: ../lib/modules/windowsHost.inc:143 ../lib/modules/windowsHost.inc:290
 #: ../lib/modules/posixGroup.inc:198 ../lib/modules/posixGroup.inc:426
-#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixGroup.inc:626
-#: ../lib/modules/device.inc:81 ../lib/modules/device.inc:115
-#: ../lib/modules/device.inc:130 ../lib/modules/device.inc:173
-#: ../lib/modules/device.inc:412 ../lib/modules/dhcp_settings.inc:202
+#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixGroup.inc:624
+#: ../lib/modules/device.inc:84 ../lib/modules/device.inc:118
+#: ../lib/modules/device.inc:133 ../lib/modules/device.inc:176
+#: ../lib/modules/device.inc:413 ../lib/modules/dhcp_settings.inc:202
 #: ../lib/modules/dhcp_settings.inc:222 ../lib/modules/dhcp_settings.inc:312
-#: ../lib/modules/dhcp_settings.inc:622 ../lib/modules/dhcp_settings.inc:686
+#: ../lib/modules/dhcp_settings.inc:622 ../lib/modules/dhcp_settings.inc:684
 #: ../lib/modules/pykotaGroup.inc:117 ../lib/modules/pykotaGroup.inc:166
 #: ../lib/modules/pykotaGroup.inc:188 ../lib/modules/pykotaGroup.inc:233
-#: ../lib/modules/pykotaGroup.inc:471 ../lib/modules/posixAccount.inc:515
+#: ../lib/modules/pykotaGroup.inc:469 ../lib/modules/posixAccount.inc:515
 #: ../lib/modules/windowsUser.inc:134 ../lib/modules/windowsUser.inc:442
 #: ../lib/modules/windowsUser.inc:817 ../lib/modules/windowsUser.inc:1090
-#: ../lib/modules/windowsUser.inc:2428 ../lib/modules/nisObject.inc:73
+#: ../lib/modules/windowsUser.inc:2426 ../lib/modules/nisObject.inc:73
 #: ../lib/modules/nisObject.inc:103 ../lib/modules/nisObject.inc:114
-#: ../lib/modules/nisObject.inc:155 ../lib/modules/nisObject.inc:215
+#: ../lib/modules/nisObject.inc:155 ../lib/modules/nisObject.inc:213
 #: ../lib/modules/sambaGroupMapping.inc:114
-#: ../lib/modules/sambaGroupMapping.inc:543 ../lib/modules/pykotaUser.inc:120
-#: ../lib/modules/pykotaUser.inc:226 ../lib/modules/pykotaUser.inc:277
-#: ../lib/modules/pykotaUser.inc:413 ../lib/modules/pykotaUser.inc:895
+#: ../lib/modules/sambaGroupMapping.inc:541 ../lib/modules/pykotaUser.inc:123
+#: ../lib/modules/pykotaUser.inc:229 ../lib/modules/pykotaUser.inc:280
+#: ../lib/modules/pykotaUser.inc:416 ../lib/modules/pykotaUser.inc:896
 #: ../lib/modules/automount.inc:72 ../lib/modules/automount.inc:95
 #: ../lib/modules/automount.inc:105 ../lib/modules/automount.inc:132
-#: ../lib/modules/automount.inc:186 ../lib/modules/nisnetgroup.inc:87
-#: ../lib/modules/nisnetgroup.inc:140 ../lib/modules/nisnetgroup.inc:199
-#: ../lib/modules/nisnetgroup.inc:580 ../lib/modules/inetOrgPerson.inc:166
-#: ../lib/modules/inetOrgPerson.inc:181 ../lib/modules/inetOrgPerson.inc:338
-#: ../lib/modules/inetOrgPerson.inc:559 ../lib/modules/inetOrgPerson.inc:652
-#: ../lib/modules/inetOrgPerson.inc:1288 ../lib/modules/inetOrgPerson.inc:1291
-#: ../lib/modules/inetOrgPerson.inc:1982 ../lib/modules/inetOrgPerson.inc:2843
-#: ../lib/modules/inetOrgPerson.inc:3642 ../lib/modules/inetOrgPerson.inc:3714
+#: ../lib/modules/automount.inc:184 ../lib/modules/nisnetgroup.inc:90
+#: ../lib/modules/nisnetgroup.inc:143 ../lib/modules/nisnetgroup.inc:202
+#: ../lib/modules/nisnetgroup.inc:581 ../lib/modules/inetOrgPerson.inc:164
+#: ../lib/modules/inetOrgPerson.inc:179 ../lib/modules/inetOrgPerson.inc:336
+#: ../lib/modules/inetOrgPerson.inc:557 ../lib/modules/inetOrgPerson.inc:650
+#: ../lib/modules/inetOrgPerson.inc:1286 ../lib/modules/inetOrgPerson.inc:1289
+#: ../lib/modules/inetOrgPerson.inc:1978 ../lib/modules/inetOrgPerson.inc:2845
+#: ../lib/modules/inetOrgPerson.inc:3622 ../lib/modules/inetOrgPerson.inc:3694
 #: ../lib/modules/sudoRole.inc:70 ../lib/modules/sudoRole.inc:153
 #: ../lib/modules/sudoRole.inc:215 ../lib/modules/sudoRole.inc:305
-#: ../lib/modules/sudoRole.inc:754 ../lib/modules/nsview.inc:66
+#: ../lib/modules/sudoRole.inc:752 ../lib/modules/nsview.inc:66
 #: ../lib/modules/nsview.inc:79 ../lib/modules/nsview.inc:99
-#: ../lib/modules/nsview.inc:128 ../lib/modules/nsview.inc:165
+#: ../lib/modules/nsview.inc:128 ../lib/modules/nsview.inc:163
 #: ../lib/modules/oracleService.inc:69 ../lib/modules/oracleService.inc:92
 #: ../lib/modules/oracleService.inc:100 ../lib/modules/oracleService.inc:122
-#: ../lib/modules/oracleService.inc:175
-#: ../lib/modules/organizationalRole.inc:89
-#: ../lib/modules/organizationalRole.inc:123
-#: ../lib/modules/organizationalRole.inc:141
-#: ../lib/modules/organizationalRole.inc:163
-#: ../lib/modules/organizationalRole.inc:189
-#: ../lib/modules/organizationalRole.inc:506 ../lib/modules/fixed_ip.inc:110
-#: ../lib/modules/fixed_ip.inc:433 ../lib/modules/fixed_ip.inc:745
+#: ../lib/modules/oracleService.inc:173
+#: ../lib/modules/organizationalRole.inc:92
+#: ../lib/modules/organizationalRole.inc:126
+#: ../lib/modules/organizationalRole.inc:144
+#: ../lib/modules/organizationalRole.inc:166
+#: ../lib/modules/organizationalRole.inc:192
+#: ../lib/modules/organizationalRole.inc:507 ../lib/modules/fixed_ip.inc:113
+#: ../lib/modules/fixed_ip.inc:436 ../lib/modules/fixed_ip.inc:746
 #: ../lib/modules/pykotaBillingCode.inc:81
 #: ../lib/modules/pykotaBillingCode.inc:109
 #: ../lib/modules/pykotaBillingCode.inc:116
 #: ../lib/modules/pykotaBillingCode.inc:159
-#: ../lib/modules/pykotaBillingCode.inc:265 ../lib/modules/windowsGroup.inc:120
-#: ../lib/modules/windowsGroup.inc:189 ../lib/modules/windowsGroup.inc:264
-#: ../lib/modules/windowsGroup.inc:308 ../lib/modules/windowsGroup.inc:912
-#: ../lib/modules/groupOfNames.inc:89 ../lib/modules/groupOfNames.inc:135
-#: ../lib/modules/groupOfNames.inc:171 ../lib/modules/groupOfNames.inc:201
-#: ../lib/modules/groupOfNames.inc:237 ../lib/modules/groupOfNames.inc:749
+#: ../lib/modules/pykotaBillingCode.inc:263 ../lib/modules/windowsGroup.inc:123
+#: ../lib/modules/windowsGroup.inc:192 ../lib/modules/windowsGroup.inc:267
+#: ../lib/modules/windowsGroup.inc:311 ../lib/modules/windowsGroup.inc:913
+#: ../lib/modules/groupOfNames.inc:92 ../lib/modules/groupOfNames.inc:138
+#: ../lib/modules/groupOfNames.inc:174 ../lib/modules/groupOfNames.inc:204
+#: ../lib/modules/groupOfNames.inc:240 ../lib/modules/groupOfNames.inc:750
 msgid "Description"
 msgstr "描述"
 
@@ -3592,7 +3611,7 @@ msgstr "描述"
 msgid "Destination DN"
 msgstr "目标DN"
 
-#: ../lib/modules/device.inc:45
+#: ../lib/modules/device.inc:48
 msgid "Device"
 msgstr "设备"
 
@@ -3601,6 +3620,11 @@ msgstr "设备"
 msgid "Disable LM hashes"
 msgstr "屏蔽LM哈希方法"
 
+#: ../templates/config/confmain.php:553
+#: ../templates/selfService/adminMain.php:525 ../help/help.inc:286
+msgid "Disable certificate check"
+msgstr "关闭证书检查"
+
 #: ../lib/modules/ddns.inc:89 ../lib/modules/ddns.inc:370
 msgid "Disable client updates"
 msgstr "禁止客户端更新"
@@ -3639,7 +3663,7 @@ msgstr "不允许基于TGT的票据"
 msgid "Disallow all tickets"
 msgstr "不允许所有的编码"
 
-#: ../templates/config/conftypes.php:345 ../help/help.inc:180
+#: ../templates/config/conftypes.php:363 ../help/help.inc:180
 msgid "Disallow delete"
 msgstr "不允许删除"
 
@@ -3681,19 +3705,19 @@ msgstr "不允许用户到用户认证."
 #: ../lib/modules/asteriskAccount.inc:288
 #: ../lib/modules/asteriskAccount.inc:472
 #: ../lib/modules/asteriskAccount.inc:709
-#: ../lib/modules/asteriskAccount.inc:1007
-#: ../lib/modules/asteriskAccount.inc:1280
+#: ../lib/modules/asteriskAccount.inc:1005
+#: ../lib/modules/asteriskAccount.inc:1278
 msgid "Disallowed codec"
 msgstr "不允许的编码"
 
 #: ../lib/modules/sambaDomain.inc:113 ../lib/modules/sambaDomain.inc:193
-#: ../lib/modules/sambaDomain.inc:299 ../lib/modules/sambaDomain.inc:622
+#: ../lib/modules/sambaDomain.inc:299 ../lib/modules/sambaDomain.inc:620
 msgid "Disconnect users outside logon hours"
 msgstr "切断连接前用户登录小时数"
 
 #: ../lib/modules/sambaSamAccount.inc:238
 #: ../lib/modules/sambaSamAccount.inc:1469
-#: ../lib/modules/sambaSamAccount.inc:1942
+#: ../lib/modules/sambaSamAccount.inc:1940
 msgid "Disconnection time limit"
 msgstr "断开连接时间限制"
 
@@ -3702,11 +3726,11 @@ msgid "Disconnects users if they are logged in outside logon hours."
 msgstr "如果用户登录限制时间到则断开连接."
 
 #: ../templates/3rdParty/pla/lib/QueryRender.php:95
-#: ../lib/modules/zarafaGroup.inc:121 ../lib/modules/zarafaGroup.inc:768
-#: ../lib/modules/zarafaUser.inc:189 ../lib/modules/zarafaUser.inc:1861
-#: ../lib/modules/organizationalRole.inc:106
-#: ../lib/modules/organizationalRole.inc:153
-#: ../lib/modules/groupOfNames.inc:118 ../lib/modules/groupOfNames.inc:189
+#: ../lib/modules/zarafaGroup.inc:121 ../lib/modules/zarafaGroup.inc:766
+#: ../lib/modules/zarafaUser.inc:192 ../lib/modules/zarafaUser.inc:1862
+#: ../lib/modules/organizationalRole.inc:109
+#: ../lib/modules/organizationalRole.inc:156
+#: ../lib/modules/groupOfNames.inc:121 ../lib/modules/groupOfNames.inc:192
 msgid "Display format"
 msgstr "显示格式"
 
@@ -3714,26 +3738,26 @@ msgstr "显示格式"
 msgid "Display multiple groups as accordion"
 msgstr "将多个组显示成堆叠式"
 
-#: ../templates/config/confmain.php:284 ../lib/types/group.inc:107
+#: ../templates/config/confmain.php:287 ../lib/types/group.inc:107
 #: ../lib/types/user.inc:94 ../lib/modules/sambaSamAccount.inc:111
 #: ../lib/modules/sambaSamAccount.inc:210
 #: ../lib/modules/sambaSamAccount.inc:259
 #: ../lib/modules/sambaSamAccount.inc:426
 #: ../lib/modules/sambaSamAccount.inc:1088
 #: ../lib/modules/sambaSamAccount.inc:1679
-#: ../lib/modules/sambaSamAccount.inc:1914 ../lib/modules/windowsUser.inc:138
+#: ../lib/modules/sambaSamAccount.inc:1912 ../lib/modules/windowsUser.inc:138
 #: ../lib/modules/windowsUser.inc:430 ../lib/modules/windowsUser.inc:742
 #: ../lib/modules/windowsUser.inc:818 ../lib/modules/windowsUser.inc:956
-#: ../lib/modules/windowsUser.inc:1088 ../lib/modules/windowsUser.inc:2429
+#: ../lib/modules/windowsUser.inc:1088 ../lib/modules/windowsUser.inc:2427
 #: ../lib/modules/sambaGroupMapping.inc:112
 #: ../lib/modules/sambaGroupMapping.inc:146
 #: ../lib/modules/sambaGroupMapping.inc:359
-#: ../lib/modules/sambaGroupMapping.inc:541 ../help/help.inc:190
+#: ../lib/modules/sambaGroupMapping.inc:539 ../help/help.inc:190
 msgid "Display name"
 msgstr "显示名"
 
-#: ../templates/lists/changePassword.php:329
-#: ../templates/config/confmain.php:397
+#: ../templates/lists/changePassword.php:330
+#: ../templates/config/confmain.php:400
 msgid "Display on screen"
 msgstr "屏幕显示"
 
@@ -3741,38 +3765,38 @@ msgstr "屏幕显示"
 msgid "Display the created entry"
 msgstr "显示创建的条目"
 
-#: ../lib/modules.inc:511
+#: ../lib/modules.inc:521
 msgid ""
 "Displayed account numbers start at \"0\". Add 2 to get the row in your "
 "spreadsheet."
 msgstr "显示的帐号数以\"0\"开始,加2才是您的电子表格的行数."
 
-#: ../lib/modules/windowsGroup.inc:63
+#: ../lib/modules/windowsGroup.inc:66
 msgid "Distribution"
 msgstr "分发"
 
-#: ../lib/modules/posixAccount.inc:456 ../lib/modules/posixAccount.inc:1992
+#: ../lib/modules/posixAccount.inc:456 ../lib/modules/posixAccount.inc:1990
 msgid "Do not add object class"
 msgstr "不要增加对象类"
 
 #: ../lib/modules/passwordSelfReset.inc:144
-#: ../lib/modules/passwordSelfReset.inc:687
+#: ../lib/modules/passwordSelfReset.inc:685
 msgid "Do not ask security question"
 msgstr "不需要安全提问"
 
-#: ../templates/ou_edit.php:116
+#: ../templates/ou_edit.php:126
 msgid "Do you really want to delete this OU?"
 msgstr "确认删除这个OU?"
 
-#: ../templates/pdfedit/pdfmain.php:358
+#: ../templates/pdfedit/pdfmain.php:408
 msgid "Do you really want to delete this PDF structure?"
 msgstr "确认删除这个PDF结构?"
 
-#: ../templates/profedit/profilemain.php:326
+#: ../templates/profedit/profilemain.php:370
 msgid "Do you really want to delete this profile?"
 msgstr "确认删除这个配置文件?"
 
-#: ../lib/modules/kolabGroup.inc:285 ../lib/modules/kolabUser.inc:515
+#: ../lib/modules/kolabGroup.inc:285 ../lib/modules/kolabUser.inc:518
 #: ../lib/modules/kolabSharedFolder.inc:425
 msgid "Do you really want to mark this account for deletion?"
 msgstr "确认将此帐号打上删除标记?"
@@ -3781,7 +3805,7 @@ msgstr "确认将此帐号打上删除标记?"
 msgid "Do you really want to post to this mailinglist?"
 msgstr "确认发送到这个邮件列表?"
 
-#: ../templates/delete.php:99
+#: ../templates/delete.php:105
 msgid "Do you really want to remove the following accounts?"
 msgstr "确认删除下列帐号?"
 
@@ -3800,11 +3824,11 @@ msgstr "确认如下更改?"
 #: ../lib/modules/sambaSamAccount.inc:1232
 #: ../lib/modules/sambaSamAccount.inc:1722
 #: ../lib/modules/sambaSamAccount.inc:1744
-#: ../lib/modules/sambaSamAccount.inc:1920 ../lib/modules/windowsUser.inc:126
-#: ../lib/modules/windowsUser.inc:2517 ../lib/modules/sambaGroupMapping.inc:158
+#: ../lib/modules/sambaSamAccount.inc:1918 ../lib/modules/windowsUser.inc:126
+#: ../lib/modules/windowsUser.inc:2515 ../lib/modules/sambaGroupMapping.inc:158
 #: ../lib/modules/sambaGroupMapping.inc:386
-#: ../lib/modules/sambaGroupMapping.inc:577 ../lib/modules/nisnetgroup.inc:223
-#: ../lib/modules/nisnetgroup.inc:587
+#: ../lib/modules/sambaGroupMapping.inc:575 ../lib/modules/nisnetgroup.inc:226
+#: ../lib/modules/nisnetgroup.inc:588
 msgid "Domain"
 msgstr "域"
 
@@ -3815,12 +3839,12 @@ msgstr "域KRBTGT"
 #: ../lib/types/smbDomain.inc:91 ../lib/modules/sambaDomain.inc:81
 #: ../lib/modules/sambaDomain.inc:151 ../lib/modules/sambaDomain.inc:185
 #: ../lib/modules/sambaDomain.inc:256 ../lib/modules/sambaDomain.inc:261
-#: ../lib/modules/sambaDomain.inc:601
+#: ../lib/modules/sambaDomain.inc:599
 msgid "Domain SID"
 msgstr "域SID"
 
-#: ../lib/modules/sambaGroupMapping.inc:125 ../lib/modules/windowsGroup.inc:184
-#: ../lib/modules/windowsGroup.inc:191 ../lib/modules/windowsGroup.inc:197
+#: ../lib/modules/sambaGroupMapping.inc:125 ../lib/modules/windowsGroup.inc:187
+#: ../lib/modules/windowsGroup.inc:194 ../lib/modules/windowsGroup.inc:200
 msgid "Domain administrators"
 msgstr "域管理员"
 
@@ -3865,26 +3889,26 @@ msgstr "域内组"
 msgid "Domain guests"
 msgstr "域内来宾"
 
-#: ../lib/modules/windowsGroup.inc:66
+#: ../lib/modules/windowsGroup.inc:69
 msgid "Domain local"
 msgstr "本地域"
 
 #: ../lib/types/smbDomain.inc:92 ../lib/modules/dhcp_settings.inc:150
 #: ../lib/modules/dhcp_settings.inc:213 ../lib/modules/dhcp_settings.inc:228
 #: ../lib/modules/dhcp_settings.inc:255 ../lib/modules/dhcp_settings.inc:569
-#: ../lib/modules/dhcp_settings.inc:677 ../lib/modules/nisNetGroupHost.inc:100
-#: ../lib/modules/nisNetGroupHost.inc:219
-#: ../lib/modules/nisNetGroupHost.inc:263 ../lib/modules/nisNetGroupUser.inc:95
-#: ../lib/modules/nisNetGroupUser.inc:180
-#: ../lib/modules/nisNetGroupUser.inc:437
-#: ../lib/modules/nisNetGroupUser.inc:481 ../lib/modules/nisnetgroup.inc:154
+#: ../lib/modules/dhcp_settings.inc:675 ../lib/modules/nisNetGroupHost.inc:103
+#: ../lib/modules/nisNetGroupHost.inc:222
+#: ../lib/modules/nisNetGroupHost.inc:264 ../lib/modules/nisNetGroupUser.inc:98
+#: ../lib/modules/nisNetGroupUser.inc:183
+#: ../lib/modules/nisNetGroupUser.inc:440
+#: ../lib/modules/nisNetGroupUser.inc:482 ../lib/modules/nisnetgroup.inc:157
 #: ../lib/modules/sambaDomain.inc:77 ../lib/modules/sambaDomain.inc:144
 #: ../lib/modules/sambaDomain.inc:184 ../lib/modules/sambaDomain.inc:241
-#: ../lib/modules/sambaDomain.inc:246 ../lib/modules/sambaDomain.inc:600
+#: ../lib/modules/sambaDomain.inc:246 ../lib/modules/sambaDomain.inc:598
 msgid "Domain name"
 msgstr "域名"
 
-#: ../lib/modules/nisNetGroupUser.inc:95 ../lib/modules/nisnetgroup.inc:154
+#: ../lib/modules/nisNetGroupUser.inc:98 ../lib/modules/nisnetgroup.inc:157
 #: ../lib/modules/sambaDomain.inc:208 ../lib/modules/sambaDomain.inc:209
 msgid "Domain name is invalid!"
 msgstr "域名非法!"
@@ -3900,17 +3924,17 @@ msgid "Domain schema admins"
 msgstr "域架构管理员"
 
 #: ../lib/modules/sambaSamAccount.inc:406
-#: ../lib/modules/sambaSamAccount.inc:2276
+#: ../lib/modules/sambaSamAccount.inc:2274
 msgid "Domain suffix"
 msgstr "域后缀"
 
 #: ../lib/modules/sambaSamAccount.inc:79
-#: ../lib/modules/sambaSamAccount.inc:2183
+#: ../lib/modules/sambaSamAccount.inc:2181
 #: ../lib/modules/sambaGroupMapping.inc:61
 msgid "Domain users"
 msgstr "域内用户"
 
-#: ../lib/modules/windowsUser.inc:255 ../lib/modules/windowsUser.inc:3201
+#: ../lib/modules/windowsUser.inc:255 ../lib/modules/windowsUser.inc:3199
 msgid "Domains"
 msgstr "域"
 
@@ -3918,7 +3942,7 @@ msgstr "域"
 msgid "Don't stop on errors"
 msgstr "发生错误时不停止"
 
-#: ../templates/pdfedit/pdfpage.php:479
+#: ../templates/pdfedit/pdfpage.php:494
 msgid "Down"
 msgstr "向下"
 
@@ -3926,19 +3950,19 @@ msgstr "向下"
 msgid "Download CA certificates"
 msgstr "下载 CA 证书"
 
-#: ../templates/masscreate.php:256
+#: ../templates/upload/masscreate.php:282
 msgid "Download sample CSV file"
 msgstr "下载CSV示例文件"
 
-#: ../templates/multiEdit.php:166
+#: ../templates/multiEdit.php:189
 msgid "Dry run"
 msgstr "排练"
 
-#: ../templates/multiEdit.php:442
+#: ../templates/multiEdit.php:465
 msgid "Dry run finished."
 msgstr "排练结束."
 
-#: ../templates/serverInfo.php:124
+#: ../templates/serverInfo.php:125
 msgid "Dynamic subtrees"
 msgstr "动态子树"
 
@@ -3952,15 +3976,15 @@ msgid ""
 "description."
 msgstr "每一行代表一个LDAP属性. 请参考语法手册."
 
-#: ../templates/pdfedit/pdfmain.php:211
-#: ../templates/profedit/profilemain.php:200
+#: ../templates/pdfedit/pdfmain.php:256
+#: ../templates/profedit/profilemain.php:241
 #: ../lib/modules/sambaSamAccount.inc:1237
-#: ../lib/modules/sambaSamAccount.inc:1242 ../lib/modules/windowsGroup.inc:390
-#: ../lib/modules/windowsGroup.inc:417 ../lib/lists.inc:503
+#: ../lib/modules/sambaSamAccount.inc:1242 ../lib/modules/windowsGroup.inc:393
+#: ../lib/modules/windowsGroup.inc:420 ../lib/lists.inc:505
 msgid "Edit"
 msgstr "编辑"
 
-#: ../lib/modules.inc:1387
+#: ../lib/modules.inc:1395
 msgid "Edit again"
 msgstr "再次编辑"
 
@@ -3984,7 +4008,7 @@ msgstr "编辑自动服务功能"
 msgid "Edit server profiles"
 msgstr "编辑服务器配置文件"
 
-#: ../lib/modules/nisnetgroup.inc:208
+#: ../lib/modules/nisnetgroup.inc:211
 msgid "Edit subgroups"
 msgstr "编辑分组"
 
@@ -3996,21 +4020,21 @@ msgstr "编辑工作站"
 #: ../lib/types/zarafaDynamicGroupType.inc:92 ../lib/types/user.inc:103
 #: ../lib/modules/zarafaDynamicGroup.inc:243
 #: ../lib/modules/zarafaDynamicGroup.inc:248 ../lib/modules/zarafaGroup.inc:219
-#: ../lib/modules/zarafaGroup.inc:226 ../lib/modules/passwordSelfReset.inc:640
+#: ../lib/modules/zarafaGroup.inc:226 ../lib/modules/passwordSelfReset.inc:638
 #: ../lib/modules/nisMailAlias.inc:344
 msgid "Email"
 msgstr "电子邮件"
 
-#: ../lib/modules/selfRegistration.inc:523 ../lib/modules/inetOrgPerson.inc:81
+#: ../lib/modules/selfRegistration.inc:523 ../lib/modules/inetOrgPerson.inc:79
 #, php-format
 msgid "Email \"%s\" already in use."
 msgstr "邮件 \"%s\" 已经被使用"
 
-#: ../templates/lists/changePassword.php:287 ../lib/modules/kolabGroup.inc:87
+#: ../templates/lists/changePassword.php:288 ../lib/modules/kolabGroup.inc:87
 #: ../lib/modules/kolabGroup.inc:91 ../lib/modules/kolabGroup.inc:155
 #: ../lib/modules/kolabGroup.inc:168 ../lib/modules/kolabGroup.inc:177
 #: ../lib/modules/kolabGroup.inc:179 ../lib/modules/kolabGroup.inc:202
-#: ../lib/modules/kolabGroup.inc:400 ../lib/modules/selfRegistration.inc:421
+#: ../lib/modules/kolabGroup.inc:398 ../lib/modules/selfRegistration.inc:421
 #: ../lib/modules/selfRegistration.inc:515
 #: ../lib/modules/selfRegistration.inc:522
 #: ../lib/modules/zarafaDynamicGroup.inc:67
@@ -4018,46 +4042,46 @@ msgstr "邮件 \"%s\" 已经被使用"
 #: ../lib/modules/zarafaDynamicGroup.inc:124
 #: ../lib/modules/zarafaDynamicGroup.inc:166
 #: ../lib/modules/zarafaDynamicGroup.inc:200
-#: ../lib/modules/zarafaDynamicGroup.inc:434 ../lib/modules/qmailUser.inc:199
+#: ../lib/modules/zarafaDynamicGroup.inc:432 ../lib/modules/qmailUser.inc:199
 #: ../lib/modules/qmailUser.inc:299 ../lib/modules/qmailUser.inc:406
 #: ../lib/modules/qmailUser.inc:448 ../lib/modules/qmailUser.inc:502
-#: ../lib/modules/qmailUser.inc:1110 ../lib/modules/zarafaGroup.inc:74
+#: ../lib/modules/qmailUser.inc:1108 ../lib/modules/zarafaGroup.inc:74
 #: ../lib/modules/zarafaGroup.inc:75 ../lib/modules/zarafaGroup.inc:153
 #: ../lib/modules/zarafaGroup.inc:183 ../lib/modules/zarafaGroup.inc:198
-#: ../lib/modules/zarafaGroup.inc:627 ../lib/modules/windowsUser.inc:154
+#: ../lib/modules/zarafaGroup.inc:625 ../lib/modules/windowsUser.inc:154
 #: ../lib/modules/windowsUser.inc:484 ../lib/modules/windowsUser.inc:743
 #: ../lib/modules/windowsUser.inc:822 ../lib/modules/windowsUser.inc:978
-#: ../lib/modules/windowsUser.inc:1101 ../lib/modules/windowsUser.inc:2433
-#: ../lib/modules/pykotaUser.inc:116 ../lib/modules/pykotaUser.inc:218
-#: ../lib/modules/pykotaUser.inc:274 ../lib/modules/pykotaUser.inc:319
-#: ../lib/modules/pykotaUser.inc:409 ../lib/modules/pykotaUser.inc:893
-#: ../lib/modules/inetOrgPerson.inc:80 ../lib/modules/inetOrgPerson.inc:81
-#: ../lib/modules/inetOrgPerson.inc:160 ../lib/modules/inetOrgPerson.inc:217
-#: ../lib/modules/inetOrgPerson.inc:466 ../lib/modules/inetOrgPerson.inc:604
-#: ../lib/modules/inetOrgPerson.inc:748 ../lib/modules/inetOrgPerson.inc:752
-#: ../lib/modules/inetOrgPerson.inc:1503 ../lib/modules/inetOrgPerson.inc:1506
-#: ../lib/modules/inetOrgPerson.inc:1996 ../lib/modules/inetOrgPerson.inc:2525
-#: ../lib/modules/inetOrgPerson.inc:3672 ../lib/modules/inetOrgPerson.inc:3722
+#: ../lib/modules/windowsUser.inc:1101 ../lib/modules/windowsUser.inc:2431
+#: ../lib/modules/pykotaUser.inc:119 ../lib/modules/pykotaUser.inc:221
+#: ../lib/modules/pykotaUser.inc:277 ../lib/modules/pykotaUser.inc:322
+#: ../lib/modules/pykotaUser.inc:412 ../lib/modules/pykotaUser.inc:894
+#: ../lib/modules/inetOrgPerson.inc:78 ../lib/modules/inetOrgPerson.inc:79
+#: ../lib/modules/inetOrgPerson.inc:158 ../lib/modules/inetOrgPerson.inc:215
+#: ../lib/modules/inetOrgPerson.inc:464 ../lib/modules/inetOrgPerson.inc:602
+#: ../lib/modules/inetOrgPerson.inc:746 ../lib/modules/inetOrgPerson.inc:750
+#: ../lib/modules/inetOrgPerson.inc:1501 ../lib/modules/inetOrgPerson.inc:1504
+#: ../lib/modules/inetOrgPerson.inc:1992 ../lib/modules/inetOrgPerson.inc:2521
+#: ../lib/modules/inetOrgPerson.inc:3652 ../lib/modules/inetOrgPerson.inc:3702
 #: ../lib/modules/kolabSharedFolder.inc:116
 #: ../lib/modules/kolabSharedFolder.inc:181
 #: ../lib/modules/kolabSharedFolder.inc:239
 #: ../lib/modules/kolabSharedFolder.inc:259
 #: ../lib/modules/kolabSharedFolder.inc:281
-#: ../lib/modules/kolabSharedFolder.inc:521
+#: ../lib/modules/kolabSharedFolder.inc:519
 #: ../lib/modules/asteriskVoicemail.inc:107
 #: ../lib/modules/asteriskVoicemail.inc:140
 #: ../lib/modules/asteriskVoicemail.inc:178
 #: ../lib/modules/asteriskVoicemail.inc:254
-#: ../lib/modules/asteriskVoicemail.inc:377 ../lib/modules/qmailGroup.inc:123
+#: ../lib/modules/asteriskVoicemail.inc:375 ../lib/modules/qmailGroup.inc:123
 #: ../lib/modules/qmailGroup.inc:127 ../lib/modules/qmailGroup.inc:240
 #: ../lib/modules/qmailGroup.inc:371 ../lib/modules/qmailGroup.inc:420
-#: ../lib/modules/qmailGroup.inc:457 ../lib/modules/qmailGroup.inc:1006
-#: ../lib/modules/imapAccess.inc:231 ../lib/modules/passwordSelfReset.inc:1051
-#: ../lib/modules/passwordSelfReset.inc:1242
-#: ../lib/modules/windowsGroup.inc:128 ../lib/modules/windowsGroup.inc:171
-#: ../lib/modules/windowsGroup.inc:225 ../lib/modules/windowsGroup.inc:272
-#: ../lib/modules/windowsGroup.inc:292 ../lib/modules/windowsGroup.inc:310
-#: ../lib/modules/windowsGroup.inc:914
+#: ../lib/modules/qmailGroup.inc:457 ../lib/modules/qmailGroup.inc:1004
+#: ../lib/modules/imapAccess.inc:231 ../lib/modules/passwordSelfReset.inc:1049
+#: ../lib/modules/passwordSelfReset.inc:1240
+#: ../lib/modules/windowsGroup.inc:131 ../lib/modules/windowsGroup.inc:174
+#: ../lib/modules/windowsGroup.inc:228 ../lib/modules/windowsGroup.inc:275
+#: ../lib/modules/windowsGroup.inc:295 ../lib/modules/windowsGroup.inc:313
+#: ../lib/modules/windowsGroup.inc:915
 msgid "Email address"
 msgstr "电子邮件地址"
 
@@ -4081,33 +4105,33 @@ msgstr "这个地址列表的邮件地址"
 msgid "Email addresses that moderate this list (e.g. approve mails)."
 msgstr "主持此列表的电子邮件地址（例如，批准邮件）。"
 
-#: ../lib/modules/zarafaContact.inc:89 ../lib/modules/zarafaUser.inc:138
+#: ../lib/modules/zarafaContact.inc:89 ../lib/modules/zarafaUser.inc:141
 #: ../lib/modules/windowsUser.inc:243 ../lib/modules/windowsUser.inc:247
 #: ../lib/modules/windowsUser.inc:490 ../lib/modules/windowsUser.inc:744
 #: ../lib/modules/windowsUser.inc:823 ../lib/modules/windowsUser.inc:980
-#: ../lib/modules/windowsUser.inc:1102 ../lib/modules/windowsUser.inc:2434
-#: ../lib/modules/kolabUser.inc:140 ../lib/modules/kolabSharedFolder.inc:146
+#: ../lib/modules/windowsUser.inc:1102 ../lib/modules/windowsUser.inc:2432
+#: ../lib/modules/kolabUser.inc:143 ../lib/modules/kolabSharedFolder.inc:146
 msgid "Email alias"
 msgstr "电子邮件别名"
 
-#: ../lib/modules/zarafaContact.inc:90 ../lib/modules/zarafaUser.inc:139
+#: ../lib/modules/zarafaContact.inc:90 ../lib/modules/zarafaUser.inc:142
 #: ../lib/modules/windowsUser.inc:244 ../lib/modules/windowsUser.inc:248
-#: ../lib/modules/kolabUser.inc:141 ../lib/modules/kolabSharedFolder.inc:147
+#: ../lib/modules/kolabUser.inc:144 ../lib/modules/kolabSharedFolder.inc:147
 msgid "Email alias for this account."
 msgstr "此帐号的电子邮件别名"
 
 #: ../lib/modules/zarafaContact.inc:205 ../lib/modules/zarafaContact.inc:206
-#: ../lib/modules/zarafaUser.inc:439 ../lib/modules/zarafaUser.inc:440
+#: ../lib/modules/zarafaUser.inc:442 ../lib/modules/zarafaUser.inc:443
 #: ../lib/modules/windowsUser.inc:980 ../lib/modules/windowsUser.inc:981
-#: ../lib/modules/kolabUser.inc:247 ../lib/modules/kolabSharedFolder.inc:254
+#: ../lib/modules/kolabUser.inc:250 ../lib/modules/kolabSharedFolder.inc:254
 msgid "Email alias is invalid!"
 msgstr "电子邮件别名非法!"
 
-#: ../lib/modules/kolabUser.inc:144 ../lib/modules/kolabSharedFolder.inc:150
+#: ../lib/modules/kolabUser.inc:147 ../lib/modules/kolabSharedFolder.inc:150
 msgid "Email alias list"
 msgstr "电子邮件别名列表"
 
-#: ../lib/modules/kolabUser.inc:248 ../lib/modules/kolabSharedFolder.inc:255
+#: ../lib/modules/kolabUser.inc:251 ../lib/modules/kolabSharedFolder.inc:255
 msgid "Email alias list has invalid format!"
 msgstr "电子邮件别名列表格式非法!"
 
@@ -4118,21 +4142,21 @@ msgstr "电子邮件别名列表格式非法!"
 #: ../lib/modules/zarafaDynamicGroup.inc:130
 #: ../lib/modules/zarafaDynamicGroup.inc:167
 #: ../lib/modules/zarafaDynamicGroup.inc:258
-#: ../lib/modules/zarafaDynamicGroup.inc:437
+#: ../lib/modules/zarafaDynamicGroup.inc:435
 #: ../lib/modules/zarafaContact.inc:153 ../lib/modules/zarafaContact.inc:193
-#: ../lib/modules/zarafaContact.inc:234 ../lib/modules/zarafaContact.inc:618
+#: ../lib/modules/zarafaContact.inc:234 ../lib/modules/zarafaContact.inc:616
 #: ../lib/modules/zarafaGroup.inc:78 ../lib/modules/zarafaGroup.inc:82
 #: ../lib/modules/zarafaGroup.inc:145 ../lib/modules/zarafaGroup.inc:180
-#: ../lib/modules/zarafaGroup.inc:237 ../lib/modules/zarafaGroup.inc:628
-#: ../lib/modules/zarafaUser.inc:206 ../lib/modules/zarafaUser.inc:392
-#: ../lib/modules/zarafaUser.inc:407 ../lib/modules/zarafaUser.inc:467
-#: ../lib/modules/zarafaUser.inc:1273 ../lib/modules/zarafaUser.inc:1537
-#: ../lib/modules/zarafaUser.inc:1850 ../lib/modules/kolabUser.inc:205
-#: ../lib/modules/kolabUser.inc:233 ../lib/modules/kolabUser.inc:351
-#: ../lib/modules/kolabUser.inc:731 ../lib/modules/kolabSharedFolder.inc:220
+#: ../lib/modules/zarafaGroup.inc:237 ../lib/modules/zarafaGroup.inc:626
+#: ../lib/modules/zarafaUser.inc:209 ../lib/modules/zarafaUser.inc:395
+#: ../lib/modules/zarafaUser.inc:410 ../lib/modules/zarafaUser.inc:470
+#: ../lib/modules/zarafaUser.inc:1274 ../lib/modules/zarafaUser.inc:1538
+#: ../lib/modules/zarafaUser.inc:1851 ../lib/modules/kolabUser.inc:208
+#: ../lib/modules/kolabUser.inc:236 ../lib/modules/kolabUser.inc:354
+#: ../lib/modules/kolabUser.inc:732 ../lib/modules/kolabSharedFolder.inc:220
 #: ../lib/modules/kolabSharedFolder.inc:236
 #: ../lib/modules/kolabSharedFolder.inc:312
-#: ../lib/modules/kolabSharedFolder.inc:526
+#: ../lib/modules/kolabSharedFolder.inc:524
 msgid "Email aliases"
 msgstr "电子邮件别名"
 
@@ -4142,41 +4166,41 @@ msgstr "邮件格式"
 
 #: ../lib/types/user.inc:95 ../lib/modules/windowsUser.inc:306
 #: ../lib/modules/windowsUser.inc:686 ../lib/modules/windowsUser.inc:874
-#: ../lib/modules/windowsUser.inc:1135 ../lib/modules/windowsUser.inc:2456
-#: ../lib/modules/windowsUser.inc:3223 ../lib/modules/inetOrgPerson.inc:354
-#: ../lib/modules/inetOrgPerson.inc:634 ../lib/modules/inetOrgPerson.inc:860
-#: ../lib/modules/inetOrgPerson.inc:1544 ../lib/modules/inetOrgPerson.inc:1547
-#: ../lib/modules/inetOrgPerson.inc:2007 ../lib/modules/inetOrgPerson.inc:3690
-#: ../lib/modules/inetOrgPerson.inc:3728
-#: ../lib/modules/passwordSelfReset.inc:643
-#: ../lib/modules/passwordSelfReset.inc:1057
-#: ../lib/modules/passwordSelfReset.inc:1246
+#: ../lib/modules/windowsUser.inc:1135 ../lib/modules/windowsUser.inc:2454
+#: ../lib/modules/windowsUser.inc:3221 ../lib/modules/inetOrgPerson.inc:352
+#: ../lib/modules/inetOrgPerson.inc:632 ../lib/modules/inetOrgPerson.inc:858
+#: ../lib/modules/inetOrgPerson.inc:1542 ../lib/modules/inetOrgPerson.inc:1545
+#: ../lib/modules/inetOrgPerson.inc:2003 ../lib/modules/inetOrgPerson.inc:3670
+#: ../lib/modules/inetOrgPerson.inc:3708
+#: ../lib/modules/passwordSelfReset.inc:641
+#: ../lib/modules/passwordSelfReset.inc:1055
+#: ../lib/modules/passwordSelfReset.inc:1244
 msgid "Employee number"
 msgstr "雇员号"
 
 #: ../lib/modules/windowsUser.inc:310 ../lib/modules/windowsUser.inc:694
 #: ../lib/modules/windowsUser.inc:768 ../lib/modules/windowsUser.inc:877
 #: ../lib/modules/windowsUser.inc:997 ../lib/modules/windowsUser.inc:1138
-#: ../lib/modules/windowsUser.inc:2457 ../lib/modules/windowsUser.inc:3224
-#: ../lib/modules/inetOrgPerson.inc:93 ../lib/modules/inetOrgPerson.inc:235
-#: ../lib/modules/inetOrgPerson.inc:362 ../lib/modules/inetOrgPerson.inc:616
-#: ../lib/modules/inetOrgPerson.inc:672 ../lib/modules/inetOrgPerson.inc:1553
-#: ../lib/modules/inetOrgPerson.inc:1556 ../lib/modules/inetOrgPerson.inc:2005
-#: ../lib/modules/inetOrgPerson.inc:3678 ../lib/modules/inetOrgPerson.inc:3724
+#: ../lib/modules/windowsUser.inc:2455 ../lib/modules/windowsUser.inc:3222
+#: ../lib/modules/inetOrgPerson.inc:91 ../lib/modules/inetOrgPerson.inc:233
+#: ../lib/modules/inetOrgPerson.inc:360 ../lib/modules/inetOrgPerson.inc:614
+#: ../lib/modules/inetOrgPerson.inc:670 ../lib/modules/inetOrgPerson.inc:1551
+#: ../lib/modules/inetOrgPerson.inc:1554 ../lib/modules/inetOrgPerson.inc:2001
+#: ../lib/modules/inetOrgPerson.inc:3658 ../lib/modules/inetOrgPerson.inc:3704
 msgid "Employee type"
 msgstr "雇员类型"
 
-#: ../lib/modules/windowsUser.inc:311 ../lib/modules/inetOrgPerson.inc:673
+#: ../lib/modules/windowsUser.inc:311 ../lib/modules/inetOrgPerson.inc:671
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇员类型: 承包商,雇员,实习生,临时工,外部员工,..."
 
-#: ../templates/lists/changePassword.php:538
-#: ../templates/lists/changePassword.php:545 ../templates/login.php:562
+#: ../templates/lists/changePassword.php:539
+#: ../templates/lists/changePassword.php:546 ../templates/login.php:571
 msgid "Empty password submitted. Please try again."
 msgstr "提交了空密码,请重试."
 
 #: ../lib/modules/passwordSelfReset.inc:100
-#: ../lib/modules/passwordSelfReset.inc:630
+#: ../lib/modules/passwordSelfReset.inc:628
 msgid "Enable password self reset link"
 msgstr "打开密码自助复位链接"
 
@@ -4188,7 +4212,7 @@ msgstr "打开自助注册链接"
 #: ../lib/modules/freeRadius.inc:116 ../lib/modules/freeRadius.inc:162
 #: ../lib/modules/freeRadius.inc:238 ../lib/modules/freeRadius.inc:273
 #: ../lib/modules/freeRadius.inc:320 ../lib/modules/freeRadius.inc:415
-#: ../lib/modules/freeRadius.inc:709
+#: ../lib/modules/freeRadius.inc:707
 msgid "Enabled"
 msgstr "开启"
 
@@ -4216,7 +4240,7 @@ msgstr ""
 "打开密码质量（比如密码长度）检查。如果设置为“强制”，则必须在LAM的服务器配置中"
 "关闭密码哈希，才能用LAM更改密码。"
 
-#: ../templates/multiEdit.php:317
+#: ../templates/multiEdit.php:340
 #: ../templates/3rdParty/pla/lib/export_functions.php:160
 msgid "Encountered an error while performing search."
 msgstr "检索时发生错误."
@@ -4241,11 +4265,15 @@ msgid ""
 "PHP MCrypt extension."
 msgstr "类似密码等在会话中对加密敏感的数据.这项功能需要PHP MCrypt扩展."
 
-#: ../lib/modules/puppetClient.inc:125 ../lib/modules/puppetClient.inc:553
+#: ../templates/pdfedit/pdfpage.php:601
+msgid "End"
+msgstr "结束"
+
+#: ../lib/modules/puppetClient.inc:128 ../lib/modules/puppetClient.inc:554
 msgid "Enforce classes"
 msgstr "强制类"
 
-#: ../templates/selfService/adminMain.php:464 ../help/help.inc:103
+#: ../templates/selfService/adminMain.php:480 ../help/help.inc:103
 msgid "Enforce language"
 msgstr "强制语言"
 
@@ -4269,7 +4297,7 @@ msgstr "输入想增加的值:"
 
 #: ../lib/modules/eduPerson.inc:118 ../lib/modules/eduPerson.inc:122
 #: ../lib/modules/eduPerson.inc:194 ../lib/modules/eduPerson.inc:231
-#: ../lib/modules/eduPerson.inc:344 ../lib/modules/eduPerson.inc:563
+#: ../lib/modules/eduPerson.inc:344 ../lib/modules/eduPerson.inc:561
 msgid "Entitlements"
 msgstr "授权"
 
@@ -4277,7 +4305,7 @@ msgstr "授权"
 msgid "Entries found"
 msgstr "个条目被发现"
 
-#: ../templates/serverInfo.php:269
+#: ../templates/serverInfo.php:270
 msgid "Entries sent"
 msgstr "条已经被发送"
 
@@ -4299,22 +4327,22 @@ msgstr "条目建立"
 #: ../templates/3rdParty/pla/htdocs/mass_edit.php:27
 #: ../templates/3rdParty/pla/htdocs/rdelete.php:24
 #: ../templates/3rdParty/pla/htdocs/rdelete.php:56
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:33 ../lib/account.inc:815
+#: ../templates/3rdParty/pla/htdocs/mass_delete.php:33 ../lib/account.inc:821
 msgid "Entry does not exist"
 msgstr "条目不存在"
 
-#: ../lib/modules/puppetClient.inc:85 ../lib/modules/puppetClient.inc:89
-#: ../lib/modules/puppetClient.inc:137 ../lib/modules/puppetClient.inc:163
-#: ../lib/modules/puppetClient.inc:171 ../lib/modules/puppetClient.inc:251
-#: ../lib/modules/puppetClient.inc:408
+#: ../lib/modules/puppetClient.inc:88 ../lib/modules/puppetClient.inc:92
+#: ../lib/modules/puppetClient.inc:140 ../lib/modules/puppetClient.inc:166
+#: ../lib/modules/puppetClient.inc:174 ../lib/modules/puppetClient.inc:254
+#: ../lib/modules/puppetClient.inc:409
 msgid "Environment"
 msgstr "环境"
 
-#: ../templates/schema/schema.php:166
+#: ../templates/schema/schema.php:167
 msgid "Equality"
 msgstr "相等"
 
-#: ../lib/modules/zarafaUser.inc:558 ../lib/modules/zarafaUser.inc:1287
+#: ../lib/modules/zarafaUser.inc:561 ../lib/modules/zarafaUser.inc:1288
 msgid "Equipment"
 msgstr "设备"
 
@@ -4334,16 +4362,16 @@ msgstr "错误"
 msgid "Error number"
 msgstr "错误号"
 
-#: ../lib/modules/mitKerberos.inc:1192 ../lib/modules/heimdalKerberos.inc:1052
+#: ../lib/modules/mitKerberos.inc:1190 ../lib/modules/heimdalKerberos.inc:1050
 msgid "Error while changing Kerberos password."
 msgstr "在修改Kerberos密码时发生错误."
 
-#: ../templates/delete.php:290
+#: ../templates/delete.php:298
 #, php-format
 msgid "Error while deleting DN: %s"
 msgstr "删除DN: %s时发生错误"
 
-#: ../templates/login.php:236 ../templates/selfService/selfServiceLogin.php:307
+#: ../templates/login.php:236 ../templates/selfService/selfServiceLogin.php:323
 #: ../lib/env.inc:245
 msgid "Evaluation Licence"
 msgstr "评估版许可"
@@ -4357,12 +4385,13 @@ msgstr "每个帐号类型都需要一个基本模块,这个模块提供一个
 #: ../lib/modules/customScripts.inc:67 ../lib/modules/customScripts.inc:80
 #: ../lib/modules/selfRegistration.inc:82 ../lib/modules/zarafaContact.inc:103
 #: ../lib/modules/zarafaGroup.inc:104 ../lib/modules/dhcp_settings.inc:566
-#: ../lib/modules/zarafaUser.inc:160 ../help/help.inc:74 ../help/help.inc:80
+#: ../lib/modules/zarafaUser.inc:163 ../help/help.inc:74 ../help/help.inc:80
 #: ../help/help.inc:90 ../help/help.inc:95 ../help/help.inc:119
 msgid "Example"
 msgstr "示例"
 
-#: ../templates/masscreate.php:302 ../templates/masscreate.php:376
+#: ../templates/upload/masscreate.php:328
+#: ../templates/upload/masscreate.php:402
 msgid "Example value"
 msgstr "示例值"
 
@@ -4370,11 +4399,11 @@ msgstr "示例值"
 msgid "Examples"
 msgstr "示例"
 
-#: ../templates/config/confmain.php:357
+#: ../templates/config/confmain.php:360
 msgid "Execute"
 msgstr "运行"
 
-#: ../templates/tests/lamdaemonTest.php:269
+#: ../templates/tests/lamdaemonTest.php:271
 msgid "Execute lamdaemon"
 msgstr "运行 lamdaemon"
 
@@ -4385,13 +4414,13 @@ msgstr "已有服务器配置"
 #: ../lib/env.inc:162 ../lib/modules/freeRadius.inc:108
 #: ../lib/modules/freeRadius.inc:222 ../lib/modules/freeRadius.inc:267
 #: ../lib/modules/freeRadius.inc:314 ../lib/modules/freeRadius.inc:520
-#: ../lib/modules/freeRadius.inc:702
+#: ../lib/modules/freeRadius.inc:700
 msgid "Expiration date"
 msgstr "过期时间"
 
-#: ../lib/modules/bindDLZ.inc:211 ../lib/modules/bindDLZ.inc:314
-#: ../lib/modules/bindDLZ.inc:426 ../lib/modules/bindDLZ.inc:519
-#: ../lib/modules/bindDLZ.inc:1022 ../lib/modules/bindDLZ.inc:1551
+#: ../lib/modules/bindDLZ.inc:214 ../lib/modules/bindDLZ.inc:317
+#: ../lib/modules/bindDLZ.inc:429 ../lib/modules/bindDLZ.inc:522
+#: ../lib/modules/bindDLZ.inc:1025 ../lib/modules/bindDLZ.inc:1552
 msgid "Expiration time"
 msgstr "过期时间"
 
@@ -4399,8 +4428,8 @@ msgstr "过期时间"
 #: ../lib/modules/asteriskAccount.inc:291
 #: ../lib/modules/asteriskAccount.inc:494
 #: ../lib/modules/asteriskAccount.inc:721
-#: ../lib/modules/asteriskAccount.inc:1010
-#: ../lib/modules/asteriskAccount.inc:1286
+#: ../lib/modules/asteriskAccount.inc:1008
+#: ../lib/modules/asteriskAccount.inc:1284
 msgid "Expiration timestamp"
 msgstr "过期时间戳"
 
@@ -4410,11 +4439,11 @@ msgstr "过期时间戳(\"regseconds\"选项)"
 
 #: ../lib/types/ppolicyType.inc:86 ../lib/modules/ppolicy.inc:116
 #: ../lib/modules/ppolicy.inc:148 ../lib/modules/ppolicy.inc:174
-#: ../lib/modules/ppolicy.inc:212 ../lib/modules/ppolicy.inc:480
+#: ../lib/modules/ppolicy.inc:212 ../lib/modules/ppolicy.inc:478
 msgid "Expire warning"
 msgstr "密码过期告警"
 
-#: ../templates/config/mainlogin.php:138
+#: ../templates/config/mainlogin.php:143
 msgid "Expired licence"
 msgstr "过期许可"
 
@@ -4428,7 +4457,7 @@ msgstr "过期许可"
 msgid "Export"
 msgstr "导出"
 
-#: ../templates/pdfedit/pdfmain.php:226 ../templates/pdfedit/pdfmain.php:227
+#: ../templates/pdfedit/pdfmain.php:271 ../templates/pdfedit/pdfmain.php:272
 #: ../help/help.inc:250
 msgid "Export PDF structure"
 msgstr "导出PDF结构"
@@ -4437,8 +4466,8 @@ msgstr "导出PDF结构"
 msgid "Export format"
 msgstr "导出格式"
 
-#: ../templates/profedit/profilemain.php:214
-#: ../templates/profedit/profilemain.php:215 ../help/help.inc:232
+#: ../templates/profedit/profilemain.php:255
+#: ../templates/profedit/profilemain.php:256 ../help/help.inc:232
 msgid "Export profile"
 msgstr "导出配置文件"
 
@@ -4447,12 +4476,12 @@ msgstr "导出配置文件"
 msgid "Export subtree"
 msgstr "导出子树"
 
-#: ../templates/pdfedit/pdfmain.php:121
-#: ../templates/profedit/profilemain.php:137
+#: ../templates/pdfedit/pdfmain.php:488
+#: ../templates/profedit/profilemain.php:449
 msgid "Export successful"
 msgstr "导出成功."
 
-#: ../templates/serverInfo.php:349
+#: ../templates/serverInfo.php:350
 msgid "Extended"
 msgstr "扩展"
 
@@ -4462,25 +4491,25 @@ msgid "Extension count: %s"
 msgstr "扩展总计:%s"
 
 #: ../lib/types/asteriskExt.inc:94 ../lib/types/asteriskExt.inc:158
-#: ../lib/modules/asteriskExtension.inc:102
-#: ../lib/modules/asteriskExtension.inc:137
-#: ../lib/modules/asteriskExtension.inc:145
-#: ../lib/modules/asteriskExtension.inc:289
-#: ../lib/modules/asteriskExtension.inc:293
+#: ../lib/modules/asteriskExtension.inc:104
+#: ../lib/modules/asteriskExtension.inc:139
+#: ../lib/modules/asteriskExtension.inc:147
+#: ../lib/modules/asteriskExtension.inc:291
+#: ../lib/modules/asteriskExtension.inc:295
 #: ../lib/modules/asteriskExtension.inc:816
 msgid "Extension name"
 msgstr "扩展名"
 
-#: ../lib/modules/asteriskExtension.inc:114
-#: ../lib/modules/asteriskExtension.inc:138
-#: ../lib/modules/asteriskExtension.inc:159
-#: ../lib/modules/asteriskExtension.inc:233
-#: ../lib/modules/asteriskExtension.inc:481
+#: ../lib/modules/asteriskExtension.inc:116
+#: ../lib/modules/asteriskExtension.inc:140
+#: ../lib/modules/asteriskExtension.inc:161
+#: ../lib/modules/asteriskExtension.inc:235
+#: ../lib/modules/asteriskExtension.inc:483
 #: ../lib/modules/asteriskExtension.inc:817
 msgid "Extension owners"
 msgstr "扩展属主"
 
-#: ../lib/modules/asteriskExtension.inc:190
+#: ../lib/modules/asteriskExtension.inc:192
 msgid "Extension with this name already exists."
 msgstr "扩展名已经存在!"
 
@@ -4491,49 +4520,47 @@ msgstr "失败"
 
 #: ../lib/modules/mitKerberos.inc:128 ../lib/modules/mitKerberos.inc:252
 #: ../lib/modules/mitKerberos.inc:298 ../lib/modules/mitKerberos.inc:345
-#: ../lib/modules/mitKerberos.inc:782
+#: ../lib/modules/mitKerberos.inc:780
 msgid "Failed logins"
 msgstr "登录失败."
 
-#: ../templates/initsuff.php:156
+#: ../lib/profiles.inc:199 ../lib/profiles.inc:209 ../lib/profiles.inc:222
+#: ../lib/profiles.inc:231 ../lib/pdfstruct.inc:215 ../lib/pdfstruct.inc:225
+#: ../lib/pdfstruct.inc:238 ../lib/pdfstruct.inc:247
+msgid "Failed to copy"
+msgstr "拷贝失败!"
+
+#: ../templates/initsuff.php:157
 msgid "Failed to create entry!"
 msgstr "新增条目失败!"
 
-#: ../lib/profiles.inc:190 ../lib/pdfstruct.inc:224
-msgid "Failed to export!"
-msgstr "导出失败!"
-
-#: ../lib/profiles.inc:197 ../lib/pdfstruct.inc:231
-msgid "Failed to import!"
-msgstr "导入失败!"
-
-#: ../lib/modules/range.inc:121 ../lib/modules/range.inc:567
+#: ../lib/modules/range.inc:124 ../lib/modules/range.inc:570
 msgid "Failover peer"
 msgstr "失效恢复节点"
 
 #: ../lib/types/ppolicyType.inc:85 ../lib/modules/ppolicy.inc:112
 #: ../lib/modules/ppolicy.inc:153 ../lib/modules/ppolicy.inc:173
-#: ../lib/modules/ppolicy.inc:276 ../lib/modules/ppolicy.inc:479
+#: ../lib/modules/ppolicy.inc:276 ../lib/modules/ppolicy.inc:477
 msgid "Failure count interval"
 msgstr "失败记录间隔"
 
 #: ../lib/modules/windowsUser.inc:194 ../lib/modules/windowsUser.inc:597
 #: ../lib/modules/windowsUser.inc:850 ../lib/modules/windowsUser.inc:917
 #: ../lib/modules/windowsUser.inc:964 ../lib/modules/windowsUser.inc:1121
-#: ../lib/modules/windowsUser.inc:2443 ../lib/modules/windowsUser.inc:2613
-#: ../lib/modules/windowsUser.inc:3210 ../lib/modules/inetOrgPerson.inc:76
-#: ../lib/modules/inetOrgPerson.inc:161 ../lib/modules/inetOrgPerson.inc:214
-#: ../lib/modules/inetOrgPerson.inc:450 ../lib/modules/inetOrgPerson.inc:598
-#: ../lib/modules/inetOrgPerson.inc:732 ../lib/modules/inetOrgPerson.inc:736
-#: ../lib/modules/inetOrgPerson.inc:1487 ../lib/modules/inetOrgPerson.inc:1490
-#: ../lib/modules/inetOrgPerson.inc:1998 ../lib/modules/inetOrgPerson.inc:2580
-#: ../lib/modules/inetOrgPerson.inc:3668 ../lib/modules/inetOrgPerson.inc:3721
+#: ../lib/modules/windowsUser.inc:2441 ../lib/modules/windowsUser.inc:2611
+#: ../lib/modules/windowsUser.inc:3208 ../lib/modules/inetOrgPerson.inc:74
+#: ../lib/modules/inetOrgPerson.inc:159 ../lib/modules/inetOrgPerson.inc:212
+#: ../lib/modules/inetOrgPerson.inc:448 ../lib/modules/inetOrgPerson.inc:596
+#: ../lib/modules/inetOrgPerson.inc:730 ../lib/modules/inetOrgPerson.inc:734
+#: ../lib/modules/inetOrgPerson.inc:1485 ../lib/modules/inetOrgPerson.inc:1488
+#: ../lib/modules/inetOrgPerson.inc:1994 ../lib/modules/inetOrgPerson.inc:2576
+#: ../lib/modules/inetOrgPerson.inc:3648 ../lib/modules/inetOrgPerson.inc:3701
 msgid "Fax number"
 msgstr "传真号"
 
-#: ../lib/modules/zarafaUser.inc:169 ../lib/modules/zarafaUser.inc:398
-#: ../lib/modules/zarafaUser.inc:669 ../lib/modules/zarafaUser.inc:1326
-#: ../lib/modules/zarafaUser.inc:1368 ../lib/modules/zarafaUser.inc:1848
+#: ../lib/modules/zarafaUser.inc:172 ../lib/modules/zarafaUser.inc:401
+#: ../lib/modules/zarafaUser.inc:672 ../lib/modules/zarafaUser.inc:1327
+#: ../lib/modules/zarafaUser.inc:1369 ../lib/modules/zarafaUser.inc:1849
 msgid "Features"
 msgstr "功能"
 
@@ -4544,15 +4571,15 @@ msgstr "功能"
 msgid "File"
 msgstr "文件"
 
-#: ../lib/pdfstruct.inc:282
+#: ../lib/pdfstruct.inc:293
 msgid "File does not exist."
 msgstr "文件不存在"
 
-#: ../lib/modules/customFields.inc:164 ../lib/modules/customFields.inc:3507
+#: ../lib/modules/customFields.inc:164 ../lib/modules/customFields.inc:3505
 msgid "File extension"
 msgstr "文件扩展名"
 
-#: ../lib/modules/windowsUser.inc:1005 ../lib/modules/inetOrgPerson.inc:104
+#: ../lib/modules/windowsUser.inc:1005 ../lib/modules/inetOrgPerson.inc:102
 #, php-format
 msgid "File is too large. Maximum allowed size is %s kB."
 msgstr "文件太大，最大字节数不能超过 %s kB."
@@ -4573,13 +4600,13 @@ msgstr ""
 
 #: ../lib/modules/zarafaServer.inc:76 ../lib/modules/zarafaServer.inc:112
 #: ../lib/modules/zarafaServer.inc:137 ../lib/modules/zarafaServer.inc:177
-#: ../lib/modules/zarafaServer.inc:219 ../lib/modules/zarafaServer.inc:359
+#: ../lib/modules/zarafaServer.inc:219 ../lib/modules/zarafaServer.inc:357
 msgid "File path"
 msgstr "文件路径"
 
-#: ../templates/masscreate.php:243 ../lib/tools/fileUpload.inc:44
-#: ../lib/modules/ldapPublicKey.inc:91 ../lib/modules/customFields.inc:3493
-#: ../lib/lists.inc:796
+#: ../templates/upload/masscreate.php:269 ../lib/tools/fileUpload.inc:45
+#: ../lib/modules/ldapPublicKey.inc:94 ../lib/modules/customFields.inc:3491
+#: ../lib/lists.inc:797
 msgid "File upload"
 msgstr "文件上传"
 
@@ -4591,29 +4618,29 @@ msgstr "文件上传"
 #: ../lib/modules/zarafaDynamicGroup.inc:158
 #: ../lib/modules/zarafaDynamicGroup.inc:171
 #: ../lib/modules/zarafaDynamicGroup.inc:239
-#: ../lib/modules/zarafaDynamicGroup.inc:436
+#: ../lib/modules/zarafaDynamicGroup.inc:434
 #: ../lib/modules/zarafaContact.inc:97 ../lib/modules/posixGroup.inc:337
-#: ../lib/modules/posixGroup.inc:529 ../lib/modules/nisNetGroupHost.inc:117
+#: ../lib/modules/posixGroup.inc:529 ../lib/modules/nisNetGroupHost.inc:120
 #: ../lib/modules/zarafaAddressList.inc:79
 #: ../lib/modules/zarafaAddressList.inc:134
 #: ../lib/modules/zarafaAddressList.inc:145
 #: ../lib/modules/zarafaAddressList.inc:206
-#: ../lib/modules/zarafaAddressList.inc:336 ../lib/modules/zarafaUser.inc:154
+#: ../lib/modules/zarafaAddressList.inc:334 ../lib/modules/zarafaUser.inc:157
 #: ../lib/modules/sambaGroupMapping.inc:170
 #: ../lib/modules/sambaGroupMapping.inc:483
-#: ../lib/modules/nisNetGroupUser.inc:197 ../lib/modules/nisnetgroup.inc:104
-#: ../lib/modules/nisnetgroup.inc:477 ../lib/modules/groupOfNamesUser.inc:170
+#: ../lib/modules/nisNetGroupUser.inc:200 ../lib/modules/nisnetgroup.inc:107
+#: ../lib/modules/nisnetgroup.inc:480 ../lib/modules/groupOfNamesUser.inc:170
 #: ../lib/modules/nsview.inc:65 ../lib/modules/nsview.inc:75
 #: ../lib/modules/nsview.inc:93 ../lib/modules/nsview.inc:112
-#: ../lib/modules/nsview.inc:126 ../lib/modules/nsview.inc:164
-#: ../lib/modules/organizationalRole.inc:101
-#: ../lib/modules/organizationalRole.inc:288
-#: ../lib/modules/organizationalRole.inc:378
-#: ../lib/modules/windowsGroup.inc:655 ../lib/modules/groupOfNames.inc:113
-#: ../lib/modules/groupOfNames.inc:347 ../lib/modules/groupOfNames.inc:437
-#: ../lib/modules/groupOfNames.inc:502 ../lib/modules/groupOfNames.inc:592
+#: ../lib/modules/nsview.inc:126 ../lib/modules/nsview.inc:162
+#: ../lib/modules/organizationalRole.inc:104
+#: ../lib/modules/organizationalRole.inc:291
+#: ../lib/modules/organizationalRole.inc:381
+#: ../lib/modules/windowsGroup.inc:658 ../lib/modules/groupOfNames.inc:116
+#: ../lib/modules/groupOfNames.inc:350 ../lib/modules/groupOfNames.inc:440
+#: ../lib/modules/groupOfNames.inc:505 ../lib/modules/groupOfNames.inc:595
 #: ../lib/modules/nisMailAlias.inc:93 ../lib/modules/nisMailAlias.inc:373
-#: ../lib/lists.inc:384 ../help/help.inc:170
+#: ../lib/lists.inc:386 ../help/help.inc:170
 msgid "Filter"
 msgstr "过滤器"
 
@@ -4621,7 +4648,7 @@ msgstr "过滤器"
 msgid "Filter performed"
 msgstr "进行过滤"
 
-#: ../templates/multiEdit.php:519
+#: ../templates/multiEdit.php:542
 msgid "Finished all operations."
 msgstr "完成所有操作."
 
@@ -4629,21 +4656,21 @@ msgstr "完成所有操作."
 #: ../lib/modules/selfRegistration.inc:223 ../lib/modules/windowsUser.inc:142
 #: ../lib/modules/windowsUser.inc:412 ../lib/modules/windowsUser.inc:819
 #: ../lib/modules/windowsUser.inc:958 ../lib/modules/windowsUser.inc:1085
-#: ../lib/modules/windowsUser.inc:2430 ../lib/modules/inetOrgPerson.inc:66
-#: ../lib/modules/inetOrgPerson.inc:159 ../lib/modules/inetOrgPerson.inc:315
-#: ../lib/modules/inetOrgPerson.inc:555 ../lib/modules/inetOrgPerson.inc:664
-#: ../lib/modules/inetOrgPerson.inc:1251 ../lib/modules/inetOrgPerson.inc:1254
-#: ../lib/modules/inetOrgPerson.inc:1984 ../lib/modules/inetOrgPerson.inc:2503
-#: ../lib/modules/inetOrgPerson.inc:3715
+#: ../lib/modules/windowsUser.inc:2428 ../lib/modules/inetOrgPerson.inc:64
+#: ../lib/modules/inetOrgPerson.inc:157 ../lib/modules/inetOrgPerson.inc:313
+#: ../lib/modules/inetOrgPerson.inc:553 ../lib/modules/inetOrgPerson.inc:662
+#: ../lib/modules/inetOrgPerson.inc:1249 ../lib/modules/inetOrgPerson.inc:1252
+#: ../lib/modules/inetOrgPerson.inc:1980 ../lib/modules/inetOrgPerson.inc:2499
+#: ../lib/modules/inetOrgPerson.inc:3695
 msgid "First name"
 msgstr "名字"
 
 #: ../lib/modules/windowsUser.inc:958 ../lib/modules/windowsUser.inc:959
-#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:67
+#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:65
 msgid "First name contains invalid characters!"
 msgstr "名字包含非法字符"
 
-#: ../lib/modules/windowsUser.inc:143 ../lib/modules/inetOrgPerson.inc:665
+#: ../lib/modules/windowsUser.inc:143 ../lib/modules/inetOrgPerson.inc:663
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "用户名字只允许字母,-和空格"
 
@@ -4651,42 +4678,42 @@ msgstr "用户名字只允许字母,-和空格"
 msgid "Fix IP addresses"
 msgstr "固定IP地址"
 
-#: ../templates/config/confmain.php:491
+#: ../templates/config/confmain.php:494
 msgid "Fixed list"
 msgstr "固定列表"
 
-#: ../lib/modules/posixGroup.inc:567 ../lib/modules/posixAccount.inc:1888
+#: ../lib/modules/posixGroup.inc:567 ../lib/modules/posixAccount.inc:1886
 msgid "Fixed range"
 msgstr "固定的范围"
 
-#: ../templates/pdfedit/pdfpage.php:465
+#: ../templates/pdfedit/pdfpage.php:480
 msgid "Folding marks"
 msgstr "折叠记号"
 
-#: ../templates/config/confmain.php:287
-#: ../templates/selfService/adminMain.php:434 ../help/help.inc:85
+#: ../templates/config/confmain.php:290
+#: ../templates/selfService/adminMain.php:450 ../help/help.inc:85
 msgid "Follow referrals"
 msgstr "追随引荐的服务器"
 
-#: ../lib/modules/kolabUser.inc:125
+#: ../lib/modules/kolabUser.inc:128
 msgid "For automatic invitation handling."
 msgstr "自动处理邀请."
 
-#: ../lib/modules/nisnetgroup.inc:101
+#: ../lib/modules/nisnetgroup.inc:104
 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:242 ../lib/modules/mitKerberos.inc:183
+#: ../templates/lists/changePassword.php:243 ../lib/modules/mitKerberos.inc:183
 #: ../lib/modules/mitKerberos.inc:417 ../lib/modules/shadowAccount.inc:370
 #: ../lib/modules/heimdalKerberos.inc:127
-#: ../lib/modules/heimdalKerberos.inc:348 ../lib/modules.inc:1086
+#: ../lib/modules/heimdalKerberos.inc:348 ../lib/modules.inc:1094
 #: ../help/help.inc:244
 msgid "Force password change"
 msgstr "强制改变密码"
 
-#: ../templates/config/confmain.php:411 ../help/help.inc:212
+#: ../templates/config/confmain.php:414 ../help/help.inc:212
 msgid "Force password change by default"
 msgstr "缺省强制修改密码"
 
@@ -4694,17 +4721,17 @@ msgstr "缺省强制修改密码"
 msgid "Force sync with group of names"
 msgstr "强制同步组名"
 
-#: ../lib/modules/passwordSelfReset.inc:984
+#: ../lib/modules/passwordSelfReset.inc:982
 msgid "Forgot password?"
 msgstr "忘记密码?"
 
-#: ../templates/3rdParty/pla/lib/QueryRender.php:484 ../help/help.inc:290
+#: ../templates/3rdParty/pla/lib/QueryRender.php:484 ../help/help.inc:302
 msgid "Format"
 msgstr "格式"
 
 #: ../lib/modules/qmailUser.inc:207 ../lib/modules/qmailUser.inc:277
 #: ../lib/modules/qmailUser.inc:401 ../lib/modules/qmailUser.inc:452
-#: ../lib/modules/qmailUser.inc:556 ../lib/modules/qmailUser.inc:1112
+#: ../lib/modules/qmailUser.inc:556 ../lib/modules/qmailUser.inc:1110
 msgid "Forwarding address"
 msgstr "转发地址"
 
@@ -4712,11 +4739,11 @@ msgstr "转发地址"
 msgid "Forwards all incoming messages for this user to this address."
 msgstr "把这个用户的所有来信转发到这个地址."
 
-#: ../lib/modules/pykotaGroup.inc:64 ../lib/modules/pykotaUser.inc:64
+#: ../lib/modules/pykotaGroup.inc:64 ../lib/modules/pykotaUser.inc:67
 msgid "Free printing"
 msgstr "自由打印"
 
-#: ../lib/modules/freeRadius.inc:77 ../lib/modules/freeRadius.inc:824
+#: ../lib/modules/freeRadius.inc:77 ../lib/modules/freeRadius.inc:822
 msgid "FreeRadius"
 msgstr "FreeRadius"
 
@@ -4724,17 +4751,17 @@ msgstr "FreeRadius"
 msgid "Friday"
 msgstr "星期五"
 
-#: ../templates/config/confmain.php:420 ../lib/passwordExpirationJob.inc:81
+#: ../templates/config/confmain.php:423 ../lib/passwordExpirationJob.inc:81
 #: ../lib/passwordExpirationJob.inc:119 ../lib/modules/selfRegistration.inc:90
 #: ../lib/modules/selfRegistration.inc:235
 #: ../lib/modules/passwordSelfReset.inc:120
-#: ../lib/modules/passwordSelfReset.inc:679
-#: ../lib/modules/passwordSelfReset.inc:699 ../help/help.inc:284
-#: ../help/help.inc:316
+#: ../lib/modules/passwordSelfReset.inc:677
+#: ../lib/modules/passwordSelfReset.inc:697 ../help/help.inc:296
+#: ../help/help.inc:328
 msgid "From address"
 msgstr "收件人地址"
 
-#: ../templates/config/confmain.php:623
+#: ../templates/config/confmain.php:660
 msgid "From address for password mails is invalid."
 msgstr "密码邮件的发件人地址非法"
 
@@ -4742,8 +4769,8 @@ msgstr "密码邮件的发件人地址非法"
 #: ../lib/modules/asteriskAccount.inc:275
 #: ../lib/modules/asteriskAccount.inc:377
 #: ../lib/modules/asteriskAccount.inc:636
-#: ../lib/modules/asteriskAccount.inc:994
-#: ../lib/modules/asteriskAccount.inc:1254
+#: ../lib/modules/asteriskAccount.inc:992
+#: ../lib/modules/asteriskAccount.inc:1252
 msgid "From domain"
 msgstr "来自域"
 
@@ -4755,8 +4782,8 @@ msgstr "此帐号的来自域设置"
 #: ../lib/modules/asteriskAccount.inc:274
 #: ../lib/modules/asteriskAccount.inc:370
 #: ../lib/modules/asteriskAccount.inc:632
-#: ../lib/modules/asteriskAccount.inc:993
-#: ../lib/modules/asteriskAccount.inc:1252
+#: ../lib/modules/asteriskAccount.inc:991
+#: ../lib/modules/asteriskAccount.inc:1250
 msgid "From user"
 msgstr "来自用户"
 
@@ -4768,17 +4795,17 @@ msgstr "此帐号的来自用户设置"
 #: ../lib/modules/asteriskAccount.inc:276
 #: ../lib/modules/asteriskAccount.inc:384
 #: ../lib/modules/asteriskAccount.inc:640
-#: ../lib/modules/asteriskAccount.inc:995
-#: ../lib/modules/asteriskAccount.inc:1256
+#: ../lib/modules/asteriskAccount.inc:993
+#: ../lib/modules/asteriskAccount.inc:1254
 msgid "Full contact"
 msgstr "联系人全称"
 
-#: ../templates/lists/changePassword.php:285
+#: ../templates/lists/changePassword.php:286
 #: ../lib/modules/asteriskVoicemail.inc:103
 #: ../lib/modules/asteriskVoicemail.inc:139
 #: ../lib/modules/asteriskVoicemail.inc:172
 #: ../lib/modules/asteriskVoicemail.inc:252
-#: ../lib/modules/asteriskVoicemail.inc:374
+#: ../lib/modules/asteriskVoicemail.inc:372
 msgid "Full name"
 msgstr "全名"
 
@@ -4791,7 +4818,7 @@ msgstr "Asterisk语音邮箱的全名."
 msgid "Function"
 msgstr "功能"
 
-#: ../lib/modules/windowsUser.inc:462 ../lib/modules/inetOrgPerson.inc:396
+#: ../lib/modules/windowsUser.inc:462 ../lib/modules/inetOrgPerson.inc:394
 msgid "GB-12345"
 msgstr "GB-12345"
 
@@ -4802,18 +4829,18 @@ msgstr "GID生成器"
 #: ../lib/types/host.inc:96 ../lib/types/group.inc:108 ../lib/types/user.inc:97
 #: ../lib/modules/qmailUser.inc:114 ../lib/modules/qmailUser.inc:235
 #: ../lib/modules/qmailUser.inc:341 ../lib/modules/qmailUser.inc:421
-#: ../lib/modules/qmailUser.inc:591 ../lib/modules/qmailUser.inc:1114
+#: ../lib/modules/qmailUser.inc:591 ../lib/modules/qmailUser.inc:1112
 #: ../lib/modules/posixGroup.inc:188 ../lib/modules/posixGroup.inc:416
 #: ../lib/modules/posixGroup.inc:432 ../lib/modules/posixGroup.inc:476
-#: ../lib/modules/posixGroup.inc:496 ../lib/modules/posixGroup.inc:625
-#: ../lib/modules/posixGroup.inc:659 ../lib/modules/posixAccount.inc:125
-#: ../lib/modules/posixAccount.inc:354 ../lib/modules/posixAccount.inc:1850
+#: ../lib/modules/posixGroup.inc:496 ../lib/modules/posixGroup.inc:623
+#: ../lib/modules/posixGroup.inc:657 ../lib/modules/posixAccount.inc:125
+#: ../lib/modules/posixAccount.inc:354 ../lib/modules/posixAccount.inc:1848
 #: ../lib/modules/sambaGroupMapping.inc:110
-#: ../lib/modules/sambaGroupMapping.inc:539
+#: ../lib/modules/sambaGroupMapping.inc:537
 msgid "GID number"
 msgstr "GID编号"
 
-#: ../lib/modules/posixGroup.inc:659
+#: ../lib/modules/posixGroup.inc:657
 msgid ""
 "GID number has changed. Please select checkbox to change GID number of users "
 "and hosts."
@@ -4828,7 +4855,7 @@ msgstr ""
 "GID已经更改,要保持文件属性一,你必须以root身份运行以下命令: 'find / -gid %s -"
 "uid %s -exec chgrp %s {} \\;'"
 
-#: ../lib/modules/posixGroup.inc:666
+#: ../lib/modules/posixGroup.inc:664
 msgid "GID number has to be a numeric value!"
 msgstr "GID号必须使用数字"
 
@@ -4839,7 +4866,7 @@ msgstr "GID号已经被使用"
 #: ../lib/modules/posixAccount.inc:297 ../lib/modules/posixAccount.inc:339
 #: ../lib/modules/posixAccount.inc:365 ../lib/modules/posixAccount.inc:465
 #: ../lib/modules/posixAccount.inc:507 ../lib/modules/posixAccount.inc:1425
-#: ../lib/modules/posixAccount.inc:1853 ../lib/modules/posixAccount.inc:1976
+#: ../lib/modules/posixAccount.inc:1851 ../lib/modules/posixAccount.inc:1974
 msgid "Gecos"
 msgstr "备注(Gecos)"
 
@@ -4852,16 +4879,16 @@ msgid "General information"
 msgstr "一般信息"
 
 #: ../templates/config/mainmanage.php:286
-#: ../templates/config/confmodules.php:170 ../templates/config/jobList.php:154
-#: ../templates/config/jobs.php:157 ../templates/config/confmain.php:211
-#: ../templates/config/moduleSettings.php:169
-#: ../templates/config/conftypes.php:188
-#: ../templates/selfService/adminMain.php:405
-#: ../templates/profedit/profilepage.php:220
+#: ../templates/config/confmodules.php:180 ../templates/config/jobList.php:154
+#: ../templates/config/jobs.php:157 ../templates/config/confmain.php:214
+#: ../templates/config/moduleSettings.php:174
+#: ../templates/config/conftypes.php:207
+#: ../templates/selfService/adminMain.php:421
+#: ../templates/profedit/profilepage.php:232
 msgid "General settings"
 msgstr "通用设置"
 
-#: ../templates/lists/changePassword.php:317 ../help/help.inc:282
+#: ../templates/lists/changePassword.php:318 ../help/help.inc:294
 msgid "Generate random password"
 msgstr "生成随机密码"
 
@@ -4870,17 +4897,17 @@ msgstr "生成随机密码"
 msgid "Generic Error"
 msgstr "一般性错误"
 
-#: ../lib/modules/windowsGroup.inc:67
+#: ../lib/modules/windowsGroup.inc:70
 msgid "Global"
 msgstr "全球"
 
-#: ../templates/pdfedit/pdfmain.php:328
-#: ../templates/profedit/profilemain.php:295
+#: ../templates/pdfedit/pdfmain.php:378
+#: ../templates/profedit/profilemain.php:339
 msgid "Global templates"
 msgstr "全局模板"
 
-#: ../templates/schema/schema.php:128 ../templates/schema/schema.php:265
-#: ../templates/schema/schema.php:296 ../templates/schema/schema.php:321
+#: ../templates/schema/schema.php:129 ../templates/schema/schema.php:266
+#: ../templates/schema/schema.php:297 ../templates/schema/schema.php:322
 msgid "Go"
 msgstr "开始"
 
@@ -4901,36 +4928,37 @@ msgstr "Google reCAPTCHA"
 
 #: ../lib/types/ppolicyType.inc:82 ../lib/modules/ppolicy.inc:100
 #: ../lib/modules/ppolicy.inc:149 ../lib/modules/ppolicy.inc:170
-#: ../lib/modules/ppolicy.inc:219 ../lib/modules/ppolicy.inc:476
+#: ../lib/modules/ppolicy.inc:219 ../lib/modules/ppolicy.inc:474
 msgid "Grace authentication limit"
 msgstr "缓期认证限制"
 
-#: ../lib/modules/quota.inc:125 ../lib/modules/quota.inc:403
+#: ../lib/modules/quota.inc:128 ../lib/modules/quota.inc:406
 msgid "Grace block period"
 msgstr "块限制宽限周期"
 
-#: ../lib/modules/quota.inc:126
+#: ../lib/modules/quota.inc:129
 msgid ""
 "Grace block period. Most filesystems use a fixed maximum value of 7 days."
 msgstr "块限制宽限周期,大部分文件系统都使用最大值7天."
 
-#: ../lib/modules/quota.inc:148
+#: ../lib/modules/quota.inc:151
 msgid ""
 "Grace inode (files) period. Most filesystems use a fixed maximum value of 7 "
 "days."
 msgstr "节点限制的宽限期,大部分文件系统都使用最大值7天."
 
-#: ../lib/modules/quota.inc:147 ../lib/modules/quota.inc:407
+#: ../lib/modules/quota.inc:150 ../lib/modules/quota.inc:410
 msgid "Grace inode period"
 msgstr "节点限制宽限期"
 
-#: ../templates/config/confmain.php:362
-#: ../templates/selfService/adminMain.php:660
-#: ../lib/modules/nisNetGroupHost.inc:98 ../lib/modules/nisNetGroupHost.inc:217
-#: ../lib/modules/nisNetGroupHost.inc:261
-#: ../lib/modules/nisNetGroupUser.inc:178
-#: ../lib/modules/nisNetGroupUser.inc:435
-#: ../lib/modules/nisNetGroupUser.inc:479
+#: ../templates/config/confmain.php:365
+#: ../templates/selfService/adminMain.php:713
+#: ../lib/modules/nisNetGroupHost.inc:101
+#: ../lib/modules/nisNetGroupHost.inc:220
+#: ../lib/modules/nisNetGroupHost.inc:262
+#: ../lib/modules/nisNetGroupUser.inc:181
+#: ../lib/modules/nisNetGroupUser.inc:438
+#: ../lib/modules/nisNetGroupUser.inc:480
 msgid "Group"
 msgstr "组"
 
@@ -4945,7 +4973,7 @@ msgid "Group count: %s"
 msgstr "帐号总计:%s"
 
 #: ../lib/types/group.inc:106 ../lib/modules/posixGroup.inc:467
-#: ../lib/modules/nisnetgroup.inc:120
+#: ../lib/modules/nisnetgroup.inc:123
 msgid "Group description"
 msgstr "组说明"
 
@@ -4966,11 +4994,11 @@ msgstr "组成员DN"
 #: ../lib/types/group.inc:110 ../lib/modules/pykotaPrinter.inc:119
 #: ../lib/modules/pykotaPrinter.inc:123 ../lib/modules/pykotaPrinter.inc:186
 #: ../lib/modules/pykotaPrinter.inc:199 ../lib/modules/pykotaPrinter.inc:265
-#: ../lib/modules/pykotaPrinter.inc:610 ../lib/modules/posixGroup.inc:219
+#: ../lib/modules/pykotaPrinter.inc:608 ../lib/modules/posixGroup.inc:219
 #: ../lib/modules/posixGroup.inc:295 ../lib/modules/posixGroup.inc:419
 #: ../lib/modules/posixGroup.inc:446 ../lib/modules/posixGroup.inc:484
-#: ../lib/modules/posixGroup.inc:488 ../lib/modules/posixGroup.inc:623
-#: ../lib/modules/posixGroup.inc:636 ../lib/modules/windowsGroup.inc:388
+#: ../lib/modules/posixGroup.inc:488 ../lib/modules/posixGroup.inc:621
+#: ../lib/modules/posixGroup.inc:634 ../lib/modules/windowsGroup.inc:391
 msgid "Group members"
 msgstr "组成员"
 
@@ -4986,24 +5014,24 @@ msgstr "组成员(包括主组)"
 #: ../lib/modules/zarafaDynamicGroup.inc:195
 #: ../lib/modules/zarafaDynamicGroup.inc:196
 #: ../lib/modules/zarafaDynamicGroup.inc:220
-#: ../lib/modules/zarafaDynamicGroup.inc:433 ../lib/modules/posixGroup.inc:178
+#: ../lib/modules/zarafaDynamicGroup.inc:431 ../lib/modules/posixGroup.inc:178
 #: ../lib/modules/posixGroup.inc:423 ../lib/modules/posixGroup.inc:455
-#: ../lib/modules/posixGroup.inc:504 ../lib/modules/posixGroup.inc:624
-#: ../lib/modules/posixGroup.inc:667 ../lib/modules/posixGroup.inc:668
-#: ../lib/modules/posixGroup.inc:669 ../lib/modules/pykotaGroup.inc:197
+#: ../lib/modules/posixGroup.inc:504 ../lib/modules/posixGroup.inc:622
+#: ../lib/modules/posixGroup.inc:665 ../lib/modules/posixGroup.inc:666
+#: ../lib/modules/posixGroup.inc:667 ../lib/modules/pykotaGroup.inc:197
 #: ../lib/modules/pykotaGroup.inc:199 ../lib/modules/pykotaGroup.inc:218
-#: ../lib/modules/nisnetgroup.inc:83 ../lib/modules/nisnetgroup.inc:112
-#: ../lib/modules/nisnetgroup.inc:139 ../lib/modules/nisnetgroup.inc:151
-#: ../lib/modules/nisnetgroup.inc:193 ../lib/modules/nisnetgroup.inc:579
-#: ../lib/modules/organizationalRole.inc:85
-#: ../lib/modules/organizationalRole.inc:114
-#: ../lib/modules/organizationalRole.inc:137
-#: ../lib/modules/organizationalRole.inc:505
-#: ../lib/modules/windowsGroup.inc:116 ../lib/modules/windowsGroup.inc:182
-#: ../lib/modules/windowsGroup.inc:263 ../lib/modules/windowsGroup.inc:290
-#: ../lib/modules/windowsGroup.inc:307 ../lib/modules/windowsGroup.inc:911
-#: ../lib/modules/groupOfNames.inc:85 ../lib/modules/groupOfNames.inc:126
-#: ../lib/modules/groupOfNames.inc:167 ../lib/modules/groupOfNames.inc:748
+#: ../lib/modules/nisnetgroup.inc:86 ../lib/modules/nisnetgroup.inc:115
+#: ../lib/modules/nisnetgroup.inc:142 ../lib/modules/nisnetgroup.inc:154
+#: ../lib/modules/nisnetgroup.inc:196 ../lib/modules/nisnetgroup.inc:580
+#: ../lib/modules/organizationalRole.inc:88
+#: ../lib/modules/organizationalRole.inc:117
+#: ../lib/modules/organizationalRole.inc:140
+#: ../lib/modules/organizationalRole.inc:506
+#: ../lib/modules/windowsGroup.inc:119 ../lib/modules/windowsGroup.inc:185
+#: ../lib/modules/windowsGroup.inc:266 ../lib/modules/windowsGroup.inc:293
+#: ../lib/modules/windowsGroup.inc:310 ../lib/modules/windowsGroup.inc:912
+#: ../lib/modules/groupOfNames.inc:88 ../lib/modules/groupOfNames.inc:129
+#: ../lib/modules/groupOfNames.inc:170 ../lib/modules/groupOfNames.inc:749
 msgid "Group name"
 msgstr "组名"
 
@@ -5017,21 +5045,21 @@ msgid "Group name already in use."
 msgstr "组名已经被使用"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:196
-#: ../lib/modules/zarafaDynamicGroup.inc:197 ../lib/modules/posixGroup.inc:669
-#: ../lib/modules/posixGroup.inc:670 ../lib/modules/pykotaGroup.inc:197
+#: ../lib/modules/zarafaDynamicGroup.inc:197 ../lib/modules/posixGroup.inc:667
+#: ../lib/modules/posixGroup.inc:668 ../lib/modules/pykotaGroup.inc:197
 #: ../lib/modules/pykotaGroup.inc:198 ../lib/modules/pykotaGroup.inc:201
-#: ../lib/modules/pykotaGroup.inc:202 ../lib/modules/nisnetgroup.inc:151
-#: ../lib/modules/windowsGroup.inc:290 ../lib/modules/windowsGroup.inc:291
+#: ../lib/modules/pykotaGroup.inc:202 ../lib/modules/nisnetgroup.inc:154
+#: ../lib/modules/windowsGroup.inc:293 ../lib/modules/windowsGroup.inc:294
 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/windowsGroup.inc:157
+#: ../lib/modules/windowsGroup.inc:160
 msgid "Group name for NIS."
 msgstr "NIS的组名"
 
-#: ../lib/modules/posixGroup.inc:668
+#: ../lib/modules/posixGroup.inc:666
 msgid "Group name in use. Selected next free group name."
 msgstr "组名已被使用,请选择可用的组名."
 
@@ -5057,7 +5085,7 @@ msgstr "在PyKota中使用的组名"
 #: ../lib/modules/freeRadius.inc:100 ../lib/modules/freeRadius.inc:104
 #: ../lib/modules/freeRadius.inc:150 ../lib/modules/freeRadius.inc:198
 #: ../lib/modules/freeRadius.inc:264 ../lib/modules/freeRadius.inc:312
-#: ../lib/modules/freeRadius.inc:359 ../lib/modules/freeRadius.inc:698
+#: ../lib/modules/freeRadius.inc:359 ../lib/modules/freeRadius.inc:696
 msgid "Group names"
 msgstr "组名"
 
@@ -5065,7 +5093,7 @@ msgstr "组名"
 msgid "Group of members"
 msgstr "组成员"
 
-#: ../lib/modules/groupOfNames.inc:65
+#: ../lib/modules/groupOfNames.inc:68
 msgid "Group of names"
 msgstr "组名"
 
@@ -5081,39 +5109,39 @@ msgstr "组的唯一名"
 msgid "Group password"
 msgstr "组密码"
 
-#: ../lib/modules/windowsGroup.inc:148 ../lib/modules/windowsGroup.inc:201
-#: ../lib/modules/windowsGroup.inc:269 ../lib/modules/windowsGroup.inc:345
-#: ../lib/modules/windowsGroup.inc:941
+#: ../lib/modules/windowsGroup.inc:151 ../lib/modules/windowsGroup.inc:204
+#: ../lib/modules/windowsGroup.inc:272 ../lib/modules/windowsGroup.inc:348
+#: ../lib/modules/windowsGroup.inc:942
 msgid "Group scope"
 msgstr "组范围"
 
-#: ../lib/modules/sambaGroupMapping.inc:382 ../lib/modules/windowsGroup.inc:144
-#: ../lib/modules/windowsGroup.inc:209 ../lib/modules/windowsGroup.inc:268
-#: ../lib/modules/windowsGroup.inc:348 ../lib/modules/windowsGroup.inc:942
+#: ../lib/modules/sambaGroupMapping.inc:382 ../lib/modules/windowsGroup.inc:147
+#: ../lib/modules/windowsGroup.inc:212 ../lib/modules/windowsGroup.inc:271
+#: ../lib/modules/windowsGroup.inc:351 ../lib/modules/windowsGroup.inc:943
 msgid "Group type"
 msgstr "组类型"
 
 #: ../lib/types/group.inc:67 ../lib/modules/posixGroup.inc:565
-#: ../lib/modules/zarafaGroup.inc:746 ../lib/modules/windowsUser.inc:233
+#: ../lib/modules/zarafaGroup.inc:744 ../lib/modules/windowsUser.inc:233
 #: ../lib/modules/windowsUser.inc:236 ../lib/modules/windowsUser.inc:582
 #: ../lib/modules/windowsUser.inc:840 ../lib/modules/windowsUser.inc:1276
-#: ../lib/modules/windowsUser.inc:1683 ../lib/modules/windowsUser.inc:2492
-#: ../lib/modules/windowsUser.inc:2524
+#: ../lib/modules/windowsUser.inc:1683 ../lib/modules/windowsUser.inc:2490
+#: ../lib/modules/windowsUser.inc:2522
 #: ../lib/modules/generalInformation.inc:112
-#: ../lib/modules/windowsGroup.inc:520
+#: ../lib/modules/windowsGroup.inc:523
 msgid "Groups"
 msgstr "组"
 
 #: ../lib/types/gon.inc:66 ../lib/modules/posixAccount.inc:305
 #: ../lib/modules/posixAccount.inc:368 ../lib/modules/posixAccount.inc:1591
-#: ../lib/modules/posixAccount.inc:1740 ../lib/modules/posixAccount.inc:1863
-#: ../lib/modules/posixAccount.inc:1981 ../lib/modules/groupOfNamesUser.inc:54
+#: ../lib/modules/posixAccount.inc:1740 ../lib/modules/posixAccount.inc:1861
+#: ../lib/modules/posixAccount.inc:1979 ../lib/modules/groupOfNamesUser.inc:54
 #: ../lib/modules/groupOfNamesUser.inc:56
 #: ../lib/modules/groupOfNamesUser.inc:60
 #: ../lib/modules/groupOfNamesUser.inc:64
 #: ../lib/modules/groupOfNamesUser.inc:71
 #: ../lib/modules/groupOfNamesUser.inc:334
-#: ../lib/modules/groupOfNamesUser.inc:373
+#: ../lib/modules/groupOfNamesUser.inc:371
 msgid "Groups of names"
 msgstr "组名"
 
@@ -5121,44 +5149,44 @@ msgstr "组名"
 msgid "H-Node (0x08)"
 msgstr "H-节点 (0x08)"
 
-#: ../templates/config/confmain.php:433 ../lib/passwordExpirationJob.inc:86
+#: ../templates/config/confmain.php:436 ../lib/passwordExpirationJob.inc:86
 #: ../lib/modules/selfRegistration.inc:241
-#: ../lib/modules/passwordSelfReset.inc:683
-#: ../lib/modules/passwordSelfReset.inc:703 ../help/help.inc:293
+#: ../lib/modules/passwordSelfReset.inc:681
+#: ../lib/modules/passwordSelfReset.inc:701 ../help/help.inc:305
 msgid "HTML format"
 msgstr "HTML格式"
 
-#: ../templates/config/confmain.php:525
-#: ../templates/selfService/adminMain.php:449 ../help/help.inc:128
+#: ../templates/config/confmain.php:528
+#: ../templates/selfService/adminMain.php:465 ../help/help.inc:128
 msgid "HTTP authentication"
 msgstr "HTTP认证"
 
 #: ../lib/modules/zarafaServer.inc:68 ../lib/modules/zarafaServer.inc:100
 #: ../lib/modules/zarafaServer.inc:135 ../lib/modules/zarafaServer.inc:173
-#: ../lib/modules/zarafaServer.inc:195 ../lib/modules/zarafaServer.inc:357
+#: ../lib/modules/zarafaServer.inc:195 ../lib/modules/zarafaServer.inc:355
 msgid "HTTP port"
 msgstr "HTTP端口"
 
-#: ../lib/modules/quota.inc:635 ../lib/modules/systemQuotas.inc:388
+#: ../lib/modules/quota.inc:636 ../lib/modules/systemQuotas.inc:389
 msgid "Hard block"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:119 ../lib/modules/quota.inc:120
-#: ../lib/modules/quota.inc:402 ../lib/modules/quota.inc:508
-#: ../lib/modules/systemQuotas.inc:126
+#: ../lib/modules/quota.inc:122 ../lib/modules/quota.inc:123
+#: ../lib/modules/quota.inc:405 ../lib/modules/quota.inc:511
+#: ../lib/modules/systemQuotas.inc:129
 msgid "Hard block limit"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:637 ../lib/modules/systemQuotas.inc:390
+#: ../lib/modules/quota.inc:638 ../lib/modules/systemQuotas.inc:391
 msgid "Hard inode"
 msgstr "节点的硬性限制"
 
-#: ../lib/modules/quota.inc:142
+#: ../lib/modules/quota.inc:145
 msgid "Hard inode (files) limit"
 msgstr "节点的硬性限制"
 
-#: ../lib/modules/quota.inc:141 ../lib/modules/quota.inc:406
-#: ../lib/modules/quota.inc:510 ../lib/modules/systemQuotas.inc:130
+#: ../lib/modules/quota.inc:144 ../lib/modules/quota.inc:409
+#: ../lib/modules/quota.inc:513 ../lib/modules/systemQuotas.inc:133
 msgid "Hard inode limit"
 msgstr "节点硬性限制"
 
@@ -5169,12 +5197,12 @@ msgstr "有子条目"
 #: ../lib/modules/selfRegistration.inc:106
 #: ../lib/modules/selfRegistration.inc:229
 #: ../lib/modules/passwordSelfReset.inc:160
-#: ../lib/modules/passwordSelfReset.inc:709
+#: ../lib/modules/passwordSelfReset.inc:707
 msgid "Header"
 msgstr "标题"
 
-#: ../templates/pdfedit/pdfpage.php:456 ../templates/pdfedit/pdfpage.php:595
-#: ../templates/pdfedit/pdfpage.php:602
+#: ../templates/pdfedit/pdfpage.php:471 ../templates/pdfedit/pdfpage.php:611
+#: ../templates/pdfedit/pdfpage.php:618
 msgid "Headline"
 msgstr "标题"
 
@@ -5182,15 +5210,15 @@ msgstr "标题"
 msgid "Heimdal Kerberos password change command"
 msgstr "Heimdal Kerberos密码修改命令"
 
-#: ../templates/main_header.php:140 ../lib/modules.inc:676
+#: ../templates/main_header.php:138 ../lib/modules.inc:689
 msgid "Help"
 msgstr "帮助"
 
-#: ../lib/modules/customFields.inc:96 ../lib/modules/customFields.inc:1740
+#: ../lib/modules/customFields.inc:96 ../lib/modules/customFields.inc:1738
 msgid "Help text"
 msgstr "帮助文本"
 
-#: ../lib/tools/schemaBrowser.inc:53
+#: ../lib/tools/schemaBrowser.inc:54
 msgid "Here you can browse LDAP object classes and attributes."
 msgstr "这是你可浏览的LDAP对象类和属性."
 
@@ -5198,11 +5226,11 @@ msgstr "这是你可浏览的LDAP对象类和属性."
 msgid "Here you can change the settings for the terminal server access."
 msgstr "这里可以改变终端服务访问的设置。"
 
-#: ../lib/selfService.inc:400
+#: ../lib/selfService.inc:410
 msgid "Here you can change your personal settings."
 msgstr "这里您可以修改用户设置."
 
-#: ../templates/masscreate.php:129
+#: ../templates/upload/masscreate.php:154
 msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr "您可以上传CSV文件来建立多个帐号"
 
@@ -5210,8 +5238,8 @@ msgstr "您可以上传CSV文件来建立多个帐号"
 msgid "Here you can enter a description for this DHCP entry."
 msgstr "可以输入此DHCP条目的描述"
 
-#: ../lib/modules/nisnetgroup.inc:88 ../lib/modules/organizationalRole.inc:90
-#: ../lib/modules/groupOfNames.inc:90
+#: ../lib/modules/nisnetgroup.inc:91 ../lib/modules/organizationalRole.inc:93
+#: ../lib/modules/groupOfNames.inc:93
 msgid "Here you can enter a description for this group."
 msgstr "在这输入组的描述."
 
@@ -5220,10 +5248,10 @@ msgid "Here you can enter a description for this role."
 msgstr "在这输入这个角色的描述."
 
 #: ../lib/modules/pykotaPrinter.inc:129 ../lib/modules/zarafaContact.inc:98
-#: ../lib/modules/posixGroup.inc:530 ../lib/modules/zarafaUser.inc:155
-#: ../lib/modules/sambaGroupMapping.inc:171 ../lib/modules/nisnetgroup.inc:105
-#: ../lib/modules/organizationalRole.inc:102
-#: ../lib/modules/groupOfNames.inc:114 ../lib/modules/nisMailAlias.inc:94
+#: ../lib/modules/posixGroup.inc:530 ../lib/modules/zarafaUser.inc:158
+#: ../lib/modules/sambaGroupMapping.inc:171 ../lib/modules/nisnetgroup.inc:108
+#: ../lib/modules/organizationalRole.inc:105
+#: ../lib/modules/groupOfNames.inc:117 ../lib/modules/nisMailAlias.inc:94
 msgid ""
 "Here you can enter a filter value. Only entries which contain the filter "
 "text will be shown."
@@ -5235,7 +5263,7 @@ msgid ""
 "are separated by commas."
 msgstr "您可以在此输入附加的组成员,组名以逗号分隔."
 
-#: ../lib/modules/nisNetGroupUser.inc:77
+#: ../lib/modules/nisNetGroupUser.inc:80
 msgid ""
 "Here you can enter a list of net groups. Group blocks are separated by comma "
 "in format GROUP#HOST#DOMAIN. Host and domain are optional."
@@ -5248,7 +5276,7 @@ msgid ""
 "Here you can enter a list of roles. The role names are separated by commas."
 msgstr "您可以在此输入角色列表,以逗号分隔."
 
-#: ../lib/modules/device.inc:66
+#: ../lib/modules/device.inc:69
 msgid "Here you can enter a serial number for this device."
 msgstr "在这输入这个设备的序列号."
 
@@ -5273,11 +5301,11 @@ msgstr ""
 "在这输入一个或多个对象类(以逗号分隔),这将可以增加或删除这些对象类的组属性."
 
 #: ../lib/modules/windowsUser.inc:323 ../lib/modules/windowsUser.inc:327
-#: ../lib/modules/inetOrgPerson.inc:828 ../lib/modules/inetOrgPerson.inc:832
+#: ../lib/modules/inetOrgPerson.inc:826 ../lib/modules/inetOrgPerson.inc:830
 msgid "Here you can enter the user's department."
 msgstr "这里可以输入用户的部门."
 
-#: ../lib/modules/zarafaUser.inc:170
+#: ../lib/modules/zarafaUser.inc:173
 msgid "Here you can explicitly enable and disable Zarafa features."
 msgstr "你可以在这里打开或关闭Zarafa功能."
 
@@ -5327,7 +5355,7 @@ msgstr ""
 "您可以指定一个帐号配置文件做为缺省的配置文件,缺省的配置文件会自动做为新帐号的"
 "配置文件."
 
-#: ../lib/tools/profileEditor.inc:53
+#: ../lib/tools/profileEditor.inc:54
 msgid "Here you can manage your account profiles."
 msgstr "您可以管理您的帐号配置文件."
 
@@ -5390,7 +5418,7 @@ msgid ""
 "classes are: lowercase, uppercase, numeric and symbols."
 msgstr "在此指定用户密码的最小需求.字符类别包括:小写,大写,数字和标点符号."
 
-#: ../lib/modules/nisnetgroup.inc:92
+#: ../lib/modules/nisnetgroup.inc:95
 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."
@@ -5421,7 +5449,7 @@ msgid ""
 "Here you can specify the minimum number of characters for a user password."
 msgstr "在此指定用户密码的最小长度."
 
-#: ../templates/lists/changePassword.php:365
+#: ../templates/lists/changePassword.php:366
 msgid "Here you can specify the new password yourself."
 msgstr "这里可以设置自己的新密码。"
 
@@ -5429,7 +5457,7 @@ msgstr "这里可以设置自己的新密码。"
 msgid "Here you can specify the shadowing mode."
 msgstr "这里可以指定遮蔽(shadow)模型。"
 
-#: ../lib/tools/tests.inc:53
+#: ../lib/tools/tests.inc:54
 msgid "Here you can test if certain LAM features work on your installation."
 msgstr "测试您安装的LAM功能是否正确."
 
@@ -5437,27 +5465,27 @@ msgstr "测试您安装的LAM功能是否正确."
 msgid "Here you can upload a new file."
 msgstr "您可以上传一个新的文件. "
 
-#: ../templates/config/conftypes.php:311
+#: ../templates/config/conftypes.php:348
 #: ../lib/types/zarafaAddressListType.inc:95
 #: ../lib/types/zarafaDynamicGroupType.inc:96
 #: ../lib/modules/zarafaDynamicGroup.inc:79
 #: ../lib/modules/zarafaDynamicGroup.inc:136
 #: ../lib/modules/zarafaDynamicGroup.inc:169
 #: ../lib/modules/zarafaDynamicGroup.inc:273
-#: ../lib/modules/zarafaDynamicGroup.inc:447
+#: ../lib/modules/zarafaDynamicGroup.inc:445
 #: ../lib/modules/zarafaContact.inc:77 ../lib/modules/zarafaContact.inc:181
 #: ../lib/modules/zarafaContact.inc:189 ../lib/modules/zarafaContact.inc:274
-#: ../lib/modules/zarafaContact.inc:624 ../lib/modules/zarafaGroup.inc:90
+#: ../lib/modules/zarafaContact.inc:622 ../lib/modules/zarafaGroup.inc:90
 #: ../lib/modules/zarafaGroup.inc:129 ../lib/modules/zarafaGroup.inc:179
-#: ../lib/modules/zarafaGroup.inc:284 ../lib/modules/zarafaGroup.inc:644
+#: ../lib/modules/zarafaGroup.inc:284 ../lib/modules/zarafaGroup.inc:642
 #: ../lib/modules/zarafaAddressList.inc:67
 #: ../lib/modules/zarafaAddressList.inc:112
 #: ../lib/modules/zarafaAddressList.inc:143
 #: ../lib/modules/zarafaAddressList.inc:214
-#: ../lib/modules/zarafaAddressList.inc:346 ../lib/modules/zarafaUser.inc:94
-#: ../lib/modules/zarafaUser.inc:310 ../lib/modules/zarafaUser.inc:359
-#: ../lib/modules/zarafaUser.inc:386 ../lib/modules/zarafaUser.inc:606
-#: ../lib/modules/zarafaUser.inc:1312 ../help/help.inc:176
+#: ../lib/modules/zarafaAddressList.inc:344 ../lib/modules/zarafaUser.inc:97
+#: ../lib/modules/zarafaUser.inc:313 ../lib/modules/zarafaUser.inc:362
+#: ../lib/modules/zarafaUser.inc:389 ../lib/modules/zarafaUser.inc:609
+#: ../lib/modules/zarafaUser.inc:1313 ../help/help.inc:176
 msgid "Hidden"
 msgstr "隐藏"
 
@@ -5470,28 +5498,28 @@ msgstr ""
 "员。这是非常有用的,"
 
 #: ../lib/modules/nisMailAliasUser.inc:104
-#: ../lib/modules/nisMailAliasUser.inc:564
+#: ../lib/modules/nisMailAliasUser.inc:571
 #: ../lib/modules/asteriskAccount.inc:243
-#: ../lib/modules/asteriskAccount.inc:1240 ../lib/modules/qmailUser.inc:102
+#: ../lib/modules/asteriskAccount.inc:1238 ../lib/modules/qmailUser.inc:102
 #: ../lib/modules/qmailUser.inc:195 ../lib/modules/zarafaGroup.inc:113
-#: ../lib/modules/zarafaGroup.inc:773 ../lib/modules/sambaSamAccount.inc:400
+#: ../lib/modules/zarafaGroup.inc:771 ../lib/modules/sambaSamAccount.inc:400
 #: ../lib/modules/sambaSamAccount.inc:1881 ../lib/modules/posixAccount.inc:382
-#: ../lib/modules/posixAccount.inc:1972 ../lib/modules/zarafaUser.inc:146
-#: ../lib/modules/zarafaUser.inc:1820 ../lib/modules/windowsUser.inc:251
-#: ../lib/modules/windowsUser.inc:3205 ../lib/modules/inetOrgPerson.inc:835
-#: ../lib/modules/inetOrgPerson.inc:3638 ../lib/modules/freeRadius.inc:128
+#: ../lib/modules/posixAccount.inc:1970 ../lib/modules/zarafaUser.inc:149
+#: ../lib/modules/zarafaUser.inc:1821 ../lib/modules/windowsUser.inc:251
+#: ../lib/modules/windowsUser.inc:3203 ../lib/modules/inetOrgPerson.inc:833
+#: ../lib/modules/inetOrgPerson.inc:3618 ../lib/modules/freeRadius.inc:128
 #: ../lib/modules/freeRadius.inc:301 ../lib/modules/zarafaServer.inc:88
 #: ../lib/modules/zarafaServer.inc:159 ../lib/modules/qmailGroup.inc:68
-#: ../lib/modules/qmailGroup.inc:119 ../lib/modules/organizationalRole.inc:81
-#: ../lib/modules/organizationalRole.inc:159
+#: ../lib/modules/qmailGroup.inc:119 ../lib/modules/organizationalRole.inc:84
+#: ../lib/modules/organizationalRole.inc:162
 #: ../lib/modules/passwordSelfReset.inc:164
-#: ../lib/modules/passwordSelfReset.inc:302 ../lib/modules/windowsGroup.inc:112
-#: ../lib/modules/windowsGroup.inc:167 ../lib/modules/groupOfNames.inc:81
-#: ../lib/modules/groupOfNames.inc:195
+#: ../lib/modules/passwordSelfReset.inc:302 ../lib/modules/windowsGroup.inc:115
+#: ../lib/modules/windowsGroup.inc:170 ../lib/modules/groupOfNames.inc:84
+#: ../lib/modules/groupOfNames.inc:198
 msgid "Hidden options"
 msgstr "隐藏的选项"
 
-#: ../templates/config/confmain.php:452
+#: ../templates/config/confmain.php:455
 msgid "Hidden tools"
 msgstr "隐藏的工具"
 
@@ -5520,7 +5548,7 @@ msgstr "隐藏/显示目录树"
 msgid "Hint"
 msgstr "提示"
 
-#: ../templates/masscreate.php:249
+#: ../templates/upload/masscreate.php:275
 msgid ""
 "Hint: Format all cells as text in your spreadsheet program and turn off auto "
 "correction."
@@ -5548,17 +5576,17 @@ msgstr "按住CTRL键可以多选角色."
 #: ../lib/types/user.inc:99 ../lib/modules/sambaSamAccount.inc:231
 #: ../lib/modules/sambaSamAccount.inc:355
 #: ../lib/modules/sambaSamAccount.inc:1447
-#: ../lib/modules/sambaSamAccount.inc:1931 ../lib/modules/posixAccount.inc:100
+#: ../lib/modules/sambaSamAccount.inc:1929 ../lib/modules/posixAccount.inc:100
 #: ../lib/modules/posixAccount.inc:101 ../lib/modules/posixAccount.inc:103
 #: ../lib/modules/posixAccount.inc:251 ../lib/modules/posixAccount.inc:357
 #: ../lib/modules/posixAccount.inc:415 ../lib/modules/posixAccount.inc:419
 #: ../lib/modules/posixAccount.inc:423 ../lib/modules/posixAccount.inc:473
 #: ../lib/modules/posixAccount.inc:1444 ../lib/modules/posixAccount.inc:1647
-#: ../lib/modules/posixAccount.inc:1747 ../lib/modules/posixAccount.inc:1851
+#: ../lib/modules/posixAccount.inc:1747 ../lib/modules/posixAccount.inc:1849
 #: ../lib/modules/windowsUser.inc:262 ../lib/modules/windowsUser.inc:576
 #: ../lib/modules/windowsUser.inc:747 ../lib/modules/windowsUser.inc:843
 #: ../lib/modules/windowsUser.inc:989 ../lib/modules/windowsUser.inc:1232
-#: ../lib/modules/windowsUser.inc:2486
+#: ../lib/modules/windowsUser.inc:2484
 msgid "Home directory"
 msgstr "个人目录"
 
@@ -5578,10 +5606,10 @@ msgstr ""
 #: ../lib/modules/sambaSamAccount.inc:1455
 #: ../lib/modules/sambaSamAccount.inc:1698
 #: ../lib/modules/sambaSamAccount.inc:1886
-#: ../lib/modules/sambaSamAccount.inc:1916
-#: ../lib/modules/sambaSamAccount.inc:1932 ../lib/modules/windowsUser.inc:259
+#: ../lib/modules/sambaSamAccount.inc:1914
+#: ../lib/modules/sambaSamAccount.inc:1930 ../lib/modules/windowsUser.inc:259
 #: ../lib/modules/windowsUser.inc:570 ../lib/modules/windowsUser.inc:842
-#: ../lib/modules/windowsUser.inc:1230 ../lib/modules/windowsUser.inc:2487
+#: ../lib/modules/windowsUser.inc:1230 ../lib/modules/windowsUser.inc:2485
 msgid "Home drive"
 msgstr "个人驱动器"
 
@@ -5592,7 +5620,7 @@ msgstr "个人驱动器"
 #: ../lib/modules/sambaSamAccount.inc:1163
 #: ../lib/modules/sambaSamAccount.inc:1702
 #: ../lib/modules/sambaSamAccount.inc:1888
-#: ../lib/modules/sambaSamAccount.inc:1915
+#: ../lib/modules/sambaSamAccount.inc:1913
 msgid "Home path"
 msgstr "个人目录路径"
 
@@ -5600,16 +5628,16 @@ msgstr "个人目录路径"
 msgid "Home path is invalid."
 msgstr "个人目录路径无效"
 
-#: ../lib/modules/zarafaUser.inc:143
+#: ../lib/modules/zarafaUser.inc:146
 msgid "Home server for the user."
 msgstr "用户的宿主服务器."
 
-#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:163
-#: ../lib/modules/inetOrgPerson.inc:434 ../lib/modules/inetOrgPerson.inc:592
-#: ../lib/modules/inetOrgPerson.inc:779 ../lib/modules/inetOrgPerson.inc:783
-#: ../lib/modules/inetOrgPerson.inc:1471 ../lib/modules/inetOrgPerson.inc:1474
-#: ../lib/modules/inetOrgPerson.inc:1993 ../lib/modules/inetOrgPerson.inc:2558
-#: ../lib/modules/inetOrgPerson.inc:3664 ../lib/modules/inetOrgPerson.inc:3720
+#: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:161
+#: ../lib/modules/inetOrgPerson.inc:432 ../lib/modules/inetOrgPerson.inc:590
+#: ../lib/modules/inetOrgPerson.inc:777 ../lib/modules/inetOrgPerson.inc:781
+#: ../lib/modules/inetOrgPerson.inc:1469 ../lib/modules/inetOrgPerson.inc:1472
+#: ../lib/modules/inetOrgPerson.inc:1989 ../lib/modules/inetOrgPerson.inc:2554
+#: ../lib/modules/inetOrgPerson.inc:3644 ../lib/modules/inetOrgPerson.inc:3700
 msgid "Home telephone number"
 msgstr "宅电"
 
@@ -5623,8 +5651,8 @@ msgstr "个人目录包含非法字符"
 #: ../lib/modules/asteriskAccount.inc:268
 #: ../lib/modules/asteriskAccount.inc:318
 #: ../lib/modules/asteriskAccount.inc:591
-#: ../lib/modules/asteriskAccount.inc:987 ../lib/modules/nisnetgroup.inc:217
-#: ../lib/modules/nisnetgroup.inc:585 ../lib/modules/fixed_ip.inc:580
+#: ../lib/modules/asteriskAccount.inc:985 ../lib/modules/nisnetgroup.inc:220
+#: ../lib/modules/nisnetgroup.inc:586 ../lib/modules/fixed_ip.inc:583
 #: ../lib/modules/hostObject.inc:145
 msgid "Host"
 msgstr "主机"
@@ -5648,7 +5676,7 @@ msgid "Host description. If left empty host name will be used."
 msgstr "主机描述.如果留空会使用主机名."
 
 #: ../lib/modules/hostObject.inc:91 ../lib/modules/hostObject.inc:98
-#: ../lib/modules/hostObject.inc:205
+#: ../lib/modules/hostObject.inc:203
 msgid "Host list"
 msgstr "主机列表"
 
@@ -5656,22 +5684,22 @@ msgstr "主机列表"
 #: ../lib/modules/account.inc:91 ../lib/modules/account.inc:212
 #: ../lib/modules/windowsHost.inc:74 ../lib/modules/windowsHost.inc:94
 #: ../lib/modules/windowsHost.inc:119 ../lib/modules/windowsHost.inc:131
-#: ../lib/modules/windowsHost.inc:142 ../lib/modules/windowsHost.inc:291
+#: ../lib/modules/windowsHost.inc:142 ../lib/modules/windowsHost.inc:289
 #: ../lib/modules/posixAccount.inc:115 ../lib/modules/posixAccount.inc:116
 #: ../lib/modules/posixAccount.inc:118 ../lib/modules/posixAccount.inc:316
 #: ../lib/modules/posixAccount.inc:347 ../lib/modules/posixAccount.inc:503
-#: ../lib/modules/posixAccount.inc:1407 ../lib/modules/posixAccount.inc:1837
-#: ../lib/modules/bindDLZ.inc:88 ../lib/modules/bindDLZ.inc:147
-#: ../lib/modules/bindDLZ.inc:151 ../lib/modules/bindDLZ.inc:247
-#: ../lib/modules/bindDLZ.inc:301 ../lib/modules/bindDLZ.inc:417
-#: ../lib/modules/bindDLZ.inc:477 ../lib/modules/bindDLZ.inc:504
-#: ../lib/modules/bindDLZ.inc:549 ../lib/modules/bindDLZ.inc:553
-#: ../lib/modules/bindDLZ.inc:757 ../lib/modules/bindDLZ.inc:1474
-#: ../lib/modules/bindDLZ.inc:1498 ../lib/modules/nisNetGroupUser.inc:94
-#: ../lib/modules/nisNetGroupUser.inc:179
-#: ../lib/modules/nisNetGroupUser.inc:436
-#: ../lib/modules/nisNetGroupUser.inc:480 ../lib/modules/nisnetgroup.inc:153
-#: ../lib/modules/nisnetgroup.inc:481
+#: ../lib/modules/posixAccount.inc:1407 ../lib/modules/posixAccount.inc:1835
+#: ../lib/modules/bindDLZ.inc:91 ../lib/modules/bindDLZ.inc:150
+#: ../lib/modules/bindDLZ.inc:154 ../lib/modules/bindDLZ.inc:250
+#: ../lib/modules/bindDLZ.inc:304 ../lib/modules/bindDLZ.inc:420
+#: ../lib/modules/bindDLZ.inc:480 ../lib/modules/bindDLZ.inc:507
+#: ../lib/modules/bindDLZ.inc:552 ../lib/modules/bindDLZ.inc:556
+#: ../lib/modules/bindDLZ.inc:760 ../lib/modules/bindDLZ.inc:1475
+#: ../lib/modules/bindDLZ.inc:1499 ../lib/modules/nisNetGroupUser.inc:97
+#: ../lib/modules/nisNetGroupUser.inc:182
+#: ../lib/modules/nisNetGroupUser.inc:439
+#: ../lib/modules/nisNetGroupUser.inc:481 ../lib/modules/nisnetgroup.inc:156
+#: ../lib/modules/nisnetgroup.inc:484
 msgid "Host name"
 msgstr "主机名"
 
@@ -5681,7 +5709,7 @@ msgstr "主机名已经存在!"
 
 #: ../lib/modules/windowsHost.inc:131 ../lib/modules/windowsHost.inc:132
 #: ../lib/modules/posixAccount.inc:116 ../lib/modules/posixAccount.inc:120
-#: ../lib/modules/nisNetGroupUser.inc:94 ../lib/modules/nisnetgroup.inc:153
+#: ../lib/modules/nisNetGroupUser.inc:97 ../lib/modules/nisnetgroup.inc:156
 msgid ""
 "Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
@@ -5707,11 +5735,11 @@ msgstr ""
 
 #: ../lib/types/host.inc:53 ../lib/modules/posixAccount.inc:95
 #: ../lib/modules/posixAccount.inc:96 ../lib/modules/posixAccount.inc:98
-#: ../lib/modules/posixAccount.inc:1929 ../lib/modules/sudoRole.inc:78
+#: ../lib/modules/posixAccount.inc:1927 ../lib/modules/sudoRole.inc:78
 #: ../lib/modules/sudoRole.inc:103 ../lib/modules/sudoRole.inc:165
 #: ../lib/modules/sudoRole.inc:217 ../lib/modules/sudoRole.inc:229
-#: ../lib/modules/sudoRole.inc:343 ../lib/modules/sudoRole.inc:756
-#: ../lib/modules/fixed_ip.inc:80 ../lib/modules/hostObject.inc:69
+#: ../lib/modules/sudoRole.inc:343 ../lib/modules/sudoRole.inc:754
+#: ../lib/modules/fixed_ip.inc:83 ../lib/modules/hostObject.inc:69
 #: ../lib/modules/hostObject.inc:79
 msgid "Hosts"
 msgstr "主机"
@@ -5720,21 +5748,21 @@ msgstr "主机"
 msgid "I am out of office."
 msgstr "我辞职了."
 
-#: ../lib/modules/zarafaContact.inc:212 ../lib/modules/posixGroup.inc:662
+#: ../lib/modules/zarafaContact.inc:212 ../lib/modules/posixGroup.inc:660
 #: ../lib/modules/posixAccount.inc:106 ../lib/modules/posixAccount.inc:1139
 msgid "ID is already in use"
 msgstr "ID已经被使用"
 
-#: ../lib/modules/posixGroup.inc:660 ../lib/modules/posixGroup.inc:661
-#: ../lib/modules/posixGroup.inc:662 ../lib/modules/posixGroup.inc:786
+#: ../lib/modules/posixGroup.inc:658 ../lib/modules/posixGroup.inc:659
+#: ../lib/modules/posixGroup.inc:660 ../lib/modules/posixGroup.inc:784
 #: ../lib/modules/posixAccount.inc:104 ../lib/modules/posixAccount.inc:105
 #: ../lib/modules/posixAccount.inc:106 ../lib/modules/posixAccount.inc:1130
 #: ../lib/modules/posixAccount.inc:1135 ../lib/modules/posixAccount.inc:1139
 msgid "ID-Number"
 msgstr "ID号"
 
-#: ../lib/modules/zarafaUser.inc:319 ../lib/modules/zarafaUser.inc:673
-#: ../lib/modules/zarafaUser.inc:1372
+#: ../lib/modules/zarafaUser.inc:322 ../lib/modules/zarafaUser.inc:676
+#: ../lib/modules/zarafaUser.inc:1373
 msgid "IMAP"
 msgstr "IMAP"
 
@@ -5752,21 +5780,21 @@ msgstr "输入IMAP 密码"
 #: ../lib/modules/asteriskAccount.inc:295
 #: ../lib/modules/asteriskAccount.inc:522
 #: ../lib/modules/asteriskAccount.inc:746
-#: ../lib/modules/asteriskAccount.inc:1014
-#: ../lib/modules/asteriskAccount.inc:1294 ../lib/modules/bindDLZ.inc:92
-#: ../lib/modules/bindDLZ.inc:96 ../lib/modules/bindDLZ.inc:255
-#: ../lib/modules/bindDLZ.inc:495 ../lib/modules/bindDLZ.inc:652
-#: ../lib/modules/bindDLZ.inc:1479 ../lib/modules/freeRadius.inc:88
+#: ../lib/modules/asteriskAccount.inc:1012
+#: ../lib/modules/asteriskAccount.inc:1292 ../lib/modules/bindDLZ.inc:95
+#: ../lib/modules/bindDLZ.inc:99 ../lib/modules/bindDLZ.inc:258
+#: ../lib/modules/bindDLZ.inc:498 ../lib/modules/bindDLZ.inc:655
+#: ../lib/modules/bindDLZ.inc:1480 ../lib/modules/freeRadius.inc:88
 #: ../lib/modules/freeRadius.inc:206 ../lib/modules/freeRadius.inc:255
 #: ../lib/modules/freeRadius.inc:306 ../lib/modules/freeRadius.inc:363
-#: ../lib/modules/freeRadius.inc:695 ../lib/modules/fixed_ip.inc:106
-#: ../lib/modules/fixed_ip.inc:421 ../lib/modules/fixed_ip.inc:742
+#: ../lib/modules/freeRadius.inc:693 ../lib/modules/fixed_ip.inc:109
+#: ../lib/modules/fixed_ip.inc:424 ../lib/modules/fixed_ip.inc:743
 msgid "IP address"
 msgstr "IP地址"
 
 #: ../lib/modules/ddns.inc:98 ../lib/modules/ddns.inc:112
 #: ../lib/modules/ddns.inc:121 ../lib/modules/ddns.inc:381
-#: ../lib/modules/ddns.inc:425
+#: ../lib/modules/ddns.inc:423
 msgid "IP address of the DNS server"
 msgstr "DNS服务器IP地址"
 
@@ -5779,15 +5807,15 @@ msgid "IP address or domain name of the registration server."
 msgstr "注册服务器的IP地址或域名"
 
 #: ../lib/modules/ipHost.inc:69 ../lib/modules/ipHost.inc:88
-#: ../lib/modules/ipHost.inc:110 ../lib/modules/ipHost.inc:303
+#: ../lib/modules/ipHost.inc:110 ../lib/modules/ipHost.inc:301
 msgid "IP addresses"
 msgstr "IP地址"
 
-#: ../lib/modules/bindDLZ.inc:649
+#: ../lib/modules/bindDLZ.inc:652
 msgid "IP addresses (\"A/AAAA\" records)"
 msgstr "IP地址 (\"A/AAAA\" 记录)"
 
-#: ../lib/modules/fixed_ip.inc:119
+#: ../lib/modules/fixed_ip.inc:122
 msgid "IP list"
 msgstr "IP列表"
 
@@ -5800,24 +5828,25 @@ msgid "Icon"
 msgstr "图标"
 
 #: ../lib/modules/passwordSelfReset.inc:148
-#: ../lib/modules/passwordSelfReset.inc:646
+#: ../lib/modules/passwordSelfReset.inc:644
 msgid "Identification method"
 msgstr "标识方法"
 
-#: ../templates/masscreate.php:298 ../templates/masscreate.php:372
+#: ../templates/upload/masscreate.php:324
+#: ../templates/upload/masscreate.php:398
 msgid "Identifier"
 msgstr "标识"
 
 #: ../lib/modules/sambaSamAccount.inc:239
 #: ../lib/modules/sambaSamAccount.inc:1473
-#: ../lib/modules/sambaSamAccount.inc:1943
+#: ../lib/modules/sambaSamAccount.inc:1941
 msgid "Idle time limit"
 msgstr "空闲时间限制"
 
 #: ../lib/modules/freeRadius.inc:112 ../lib/modules/freeRadius.inc:153
 #: ../lib/modules/freeRadius.inc:230 ../lib/modules/freeRadius.inc:270
 #: ../lib/modules/freeRadius.inc:316 ../lib/modules/freeRadius.inc:371
-#: ../lib/modules/freeRadius.inc:699
+#: ../lib/modules/freeRadius.inc:697
 msgid "Idle timeout"
 msgstr "空闲超时"
 
@@ -5861,6 +5890,12 @@ msgstr "如果选中,密码不会过期."
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "密码不过期.(设置X标志)"
 
+#: ../help/help.inc:293
+msgid ""
+"If checked then also users who did not setup a second factor are able to "
+"login."
+msgstr "如果选中，则没有设置双重认证的用户也可以登录."
+
 #: ../lib/modules/windowsUser.inc:214
 msgid ""
 "If checked then the account is locked. You may only unlock accounts but not "
@@ -5943,7 +5978,7 @@ msgstr ""
 "如果指定了注册语境,Asterisk将为一个特定端在注册或注销时,动态地建立或销毁NoOP"
 "优先级1扩展."
 
-#: ../lib/modules/puppetClient.inc:126
+#: ../lib/modules/puppetClient.inc:129
 msgid "If set then only these classes are allowed. One class per line."
 msgstr "如果设置，则仅允许这些类。 每行一个类。"
 
@@ -5978,7 +6013,7 @@ msgid ""
 "If the LDAP attribute has no value then the checkbox is set to this value."
 msgstr "如果LDAP属性值为空,则此复选框被设为此值."
 
-#: ../lib/modules/zarafaUser.inc:111
+#: ../lib/modules/zarafaUser.inc:114
 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."
@@ -6126,7 +6161,7 @@ msgid ""
 "after the server."
 msgstr "如果服务器运行在其它端口,需要在服务器后加一个逗号和端口号."
 
-#: ../lib/modules/windowsUser.inc:386 ../lib/modules/inetOrgPerson.inc:876
+#: ../lib/modules/windowsUser.inc:386 ../lib/modules/inetOrgPerson.inc:874
 msgid "Image cropping"
 msgstr "图片裁剪"
 
@@ -6140,7 +6175,7 @@ msgstr "图像不可用"
 msgid "Import"
 msgstr "导入"
 
-#: ../templates/pdfedit/pdfmain.php:220 ../templates/pdfedit/pdfmain.php:221
+#: ../templates/pdfedit/pdfmain.php:265 ../templates/pdfedit/pdfmain.php:266
 #: ../help/help.inc:248
 msgid "Import PDF structures"
 msgstr "导入PDF架构"
@@ -6149,13 +6184,13 @@ msgstr "导入PDF架构"
 msgid "Import from server"
 msgstr "从服务器导入"
 
-#: ../templates/profedit/profilemain.php:208
-#: ../templates/profedit/profilemain.php:209 ../help/help.inc:230
+#: ../templates/profedit/profilemain.php:249
+#: ../templates/profedit/profilemain.php:250 ../help/help.inc:230
 msgid "Import profiles"
 msgstr "导出配置文件"
 
-#: ../templates/pdfedit/pdfmain.php:113
-#: ../templates/profedit/profilemain.php:129
+#: ../templates/pdfedit/pdfmain.php:446
+#: ../templates/profedit/profilemain.php:407
 msgid "Import successful"
 msgstr "导入成功!"
 
@@ -6173,7 +6208,7 @@ msgid ""
 "quota or account balance."
 msgstr "In passthrough 模式， 用户可以自由打印，不论他们的限额和帐目余额如何."
 
-#: ../lib/modules/fixed_ip.inc:115
+#: ../lib/modules/fixed_ip.inc:118
 msgid "Inactive hosts will not be able to get an address from the DHCP server."
 msgstr "非激活的主机不会从DHCP服务器获取到地址."
 
@@ -6181,22 +6216,22 @@ msgstr "非激活的主机不会从DHCP服务器获取到地址."
 msgid "Include system attributes"
 msgstr "包括系统属性"
 
-#: ../lib/tools/serverInfo.inc:53
+#: ../lib/tools/serverInfo.inc:54
 msgid "Information about the LDAP server."
 msgstr "有关LDAP服务器的信息"
 
 #: ../lib/modules/sambaSamAccount.inc:234
 #: ../lib/modules/sambaSamAccount.inc:361
 #: ../lib/modules/sambaSamAccount.inc:1459
-#: ../lib/modules/sambaSamAccount.inc:1938
+#: ../lib/modules/sambaSamAccount.inc:1936
 msgid "Inherit client startup configuration"
 msgstr "继承客户初始配置"
 
-#: ../templates/schema/schema.php:396 ../templates/schema/schema.php:417
+#: ../templates/schema/schema.php:397 ../templates/schema/schema.php:418
 msgid "Inherited from"
 msgstr "继承自"
 
-#: ../templates/schema/schema.php:157 ../templates/schema/schema.php:353
+#: ../templates/schema/schema.php:158 ../templates/schema/schema.php:354
 msgid "Inherits from"
 msgstr "继承自"
 
@@ -6204,64 +6239,64 @@ msgstr "继承自"
 msgid "Initial folders"
 msgstr "初始化文件夹"
 
-#: ../lib/modules/pykotaUser.inc:249
+#: ../lib/modules/pykotaUser.inc:252
 msgid "Initial payment"
 msgstr "初始化账单"
 
 #: ../lib/modules/sambaSamAccount.inc:235
 #: ../lib/modules/sambaSamAccount.inc:364
 #: ../lib/modules/sambaSamAccount.inc:1461
-#: ../lib/modules/sambaSamAccount.inc:1939
+#: ../lib/modules/sambaSamAccount.inc:1937
 msgid "Initial program"
 msgstr "初始化程序"
 
 #: ../lib/modules/windowsUser.inc:146 ../lib/modules/windowsUser.inc:436
 #: ../lib/modules/windowsUser.inc:820 ../lib/modules/windowsUser.inc:1089
-#: ../lib/modules/windowsUser.inc:2431 ../lib/modules/inetOrgPerson.inc:165
-#: ../lib/modules/inetOrgPerson.inc:178 ../lib/modules/inetOrgPerson.inc:330
-#: ../lib/modules/inetOrgPerson.inc:637 ../lib/modules/inetOrgPerson.inc:864
-#: ../lib/modules/inetOrgPerson.inc:1268 ../lib/modules/inetOrgPerson.inc:1271
-#: ../lib/modules/inetOrgPerson.inc:2010 ../lib/modules/inetOrgPerson.inc:2762
-#: ../lib/modules/inetOrgPerson.inc:3692 ../lib/modules/inetOrgPerson.inc:3728
+#: ../lib/modules/windowsUser.inc:2429 ../lib/modules/inetOrgPerson.inc:163
+#: ../lib/modules/inetOrgPerson.inc:176 ../lib/modules/inetOrgPerson.inc:328
+#: ../lib/modules/inetOrgPerson.inc:635 ../lib/modules/inetOrgPerson.inc:862
+#: ../lib/modules/inetOrgPerson.inc:1266 ../lib/modules/inetOrgPerson.inc:1269
+#: ../lib/modules/inetOrgPerson.inc:2006 ../lib/modules/inetOrgPerson.inc:2758
+#: ../lib/modules/inetOrgPerson.inc:3672 ../lib/modules/inetOrgPerson.inc:3708
 msgid "Initials"
 msgstr "初始化"
 
-#: ../templates/serverInfo.php:282 ../templates/serverInfo.php:368
+#: ../templates/serverInfo.php:283 ../templates/serverInfo.php:369
 msgid "Initiated"
 msgstr "初始化完毕"
 
-#: ../lib/modules/quota.inc:57 ../lib/modules/systemQuotas.inc:105
+#: ../lib/modules/quota.inc:60 ../lib/modules/systemQuotas.inc:108
 msgid "Inode hard quota"
 msgstr "inode硬配额"
 
-#: ../lib/modules/quota.inc:57 ../lib/modules/quota.inc:58
-#: ../lib/modules/systemQuotas.inc:105 ../lib/modules/systemQuotas.inc:106
+#: ../lib/modules/quota.inc:60 ../lib/modules/quota.inc:61
+#: ../lib/modules/systemQuotas.inc:108 ../lib/modules/systemQuotas.inc:109
 msgid ""
 "Inode hard quota contains invalid characters. Only natural numbers are "
 "allowed."
 msgstr "inode硬配额包含非法字符,只允许使用自然数."
 
-#: ../lib/modules/quota.inc:61 ../lib/modules/systemQuotas.inc:109
+#: ../lib/modules/quota.inc:64 ../lib/modules/systemQuotas.inc:112
 msgid "Inode quota"
 msgstr "inode配额"
 
-#: ../lib/modules/quota.inc:55 ../lib/modules/systemQuotas.inc:103
+#: ../lib/modules/quota.inc:58 ../lib/modules/systemQuotas.inc:106
 msgid "Inode soft quota"
 msgstr "inode软配额"
 
-#: ../lib/modules/quota.inc:55 ../lib/modules/quota.inc:56
-#: ../lib/modules/systemQuotas.inc:103 ../lib/modules/systemQuotas.inc:104
+#: ../lib/modules/quota.inc:58 ../lib/modules/quota.inc:59
+#: ../lib/modules/systemQuotas.inc:106 ../lib/modules/systemQuotas.inc:107
 msgid ""
 "Inode soft quota contains invalid characters. Only natural numbers are "
 "allowed."
 msgstr "inode软配额包含非法字符,只能使用自然数."
 
-#: ../lib/modules/quota.inc:61 ../lib/modules/quota.inc:62
-#: ../lib/modules/systemQuotas.inc:109 ../lib/modules/systemQuotas.inc:110
+#: ../lib/modules/quota.inc:64 ../lib/modules/quota.inc:65
+#: ../lib/modules/systemQuotas.inc:112 ../lib/modules/systemQuotas.inc:113
 msgid "Inode soft quota must be smaller than inode hard quota."
 msgstr "inode软配额必须小于硬配额."
 
-#: ../templates/selfService/adminMain.php:675
+#: ../templates/selfService/adminMain.php:728
 msgid "Input fields"
 msgstr "输入框"
 
@@ -6269,8 +6304,8 @@ msgstr "输入框"
 #: ../lib/modules/asteriskAccount.inc:277
 #: ../lib/modules/asteriskAccount.inc:391
 #: ../lib/modules/asteriskAccount.inc:652
-#: ../lib/modules/asteriskAccount.inc:996
-#: ../lib/modules/asteriskAccount.inc:1258
+#: ../lib/modules/asteriskAccount.inc:994
+#: ../lib/modules/asteriskAccount.inc:1256
 msgid "Insecure"
 msgstr "不安全"
 
@@ -6286,11 +6321,11 @@ msgstr "在登录脚本中插入用户名或组名."
 msgid "Inserted user or group name in profile path."
 msgstr "在配置路径中插入用户名或组名."
 
-#: ../lib/modules/fixed_ip.inc:475
+#: ../lib/modules/fixed_ip.inc:478
 msgid "Invalid MAC address."
 msgstr "非法的MAC地址"
 
-#: ../templates/massBuildAccounts.php:200
+#: ../templates/upload/massBuildAccounts.php:211
 msgid "Invalid RDN attribute!"
 msgstr "错误的RDN属性!"
 
@@ -6298,7 +6333,7 @@ msgstr "错误的RDN属性!"
 msgid "Invalid RDN value"
 msgstr "非法的RDN值"
 
-#: ../lib/modules/fixed_ip.inc:484
+#: ../lib/modules/fixed_ip.inc:487
 msgid "Invalid description."
 msgstr "非法的描述"
 
@@ -6310,7 +6345,7 @@ msgstr "无效的条目"
 msgid "Invalid format for the specification of additional attributes."
 msgstr "不符合附加属性规范的格式"
 
-#: ../templates/config/mainlogin.php:135 ../lib/env.inc:152
+#: ../templates/config/mainlogin.php:140 ../lib/env.inc:152
 msgid "Invalid licence"
 msgstr "无效的许可"
 
@@ -6318,8 +6353,8 @@ msgstr "无效的许可"
 msgid "Invalid password for IMAP admin or other problem occured."
 msgstr "非法的IMAP管理员密码或者发生了其它问题。"
 
-#: ../lib/modules/ldapPublicKey.inc:655 ../lib/modules/inetOrgPerson.inc:3423
-#: ../lib/modules/customFields.inc:1427
+#: ../lib/modules/ldapPublicKey.inc:656 ../lib/modules/inetOrgPerson.inc:3425
+#: ../lib/modules/customFields.inc:1425
 msgid "Invalid request"
 msgstr "无效请求"
 
@@ -6327,28 +6362,28 @@ msgstr "无效请求"
 msgid "Invalid server name. Please enter \"server\" or \"server:port\"."
 msgstr "不合法的服务器名. 请输入 \"服务器名\" or \"服务器名:端口\"."
 
-#: ../lib/modules/passwordSelfReset.inc:1118
-#: ../lib/modules/passwordSelfReset.inc:1359
+#: ../lib/modules/passwordSelfReset.inc:1116
+#: ../lib/modules/passwordSelfReset.inc:1357
 #, php-format
 msgid "Invalid value in field \"%s\"."
 msgstr "在\"%s\"域有非法字符."
 
-#: ../lib/modules/kolabUser.inc:117 ../lib/modules/kolabUser.inc:124
-#: ../lib/modules/kolabUser.inc:186 ../lib/modules/kolabUser.inc:230
-#: ../lib/modules/kolabUser.inc:315 ../lib/modules/kolabUser.inc:717
-#: ../lib/modules/kolabUser.inc:852
+#: ../lib/modules/kolabUser.inc:120 ../lib/modules/kolabUser.inc:127
+#: ../lib/modules/kolabUser.inc:189 ../lib/modules/kolabUser.inc:233
+#: ../lib/modules/kolabUser.inc:318 ../lib/modules/kolabUser.inc:718
+#: ../lib/modules/kolabUser.inc:853
 msgid "Invitation policy"
 msgstr "邀请原则"
 
-#: ../lib/modules/kolabUser.inc:128
+#: ../lib/modules/kolabUser.inc:131
 msgid "Invitation policy list"
 msgstr "邀请原则列表"
 
-#: ../lib/modules/range.inc:137
+#: ../lib/modules/range.inc:140
 msgid "It is not possible to delete all ranges."
 msgstr "不能删除所有范围"
 
-#: ../lib/modules/posixGroup.inc:660 ../lib/modules/posixAccount.inc:105
+#: ../lib/modules/posixGroup.inc:658 ../lib/modules/posixAccount.inc:105
 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 "
@@ -6358,73 +6393,73 @@ msgstr ""
 "请把最大UID设得高一点."
 
 #: ../templates/config/jobList.php:194 ../templates/config/jobs.php:362
-#: ../lib/modules/pykotaUser.inc:284 ../lib/modules/pykotaUser.inc:387
-#: ../lib/modules/pykotaUser.inc:1013
+#: ../lib/modules/pykotaUser.inc:287 ../lib/modules/pykotaUser.inc:390
+#: ../lib/modules/pykotaUser.inc:1014
 msgid "Job history"
 msgstr "任务经历"
 
-#: ../lib/modules/pykotaUser.inc:156 ../lib/modules/pykotaUser.inc:289
-#: ../lib/modules/pykotaUser.inc:295 ../lib/modules/pykotaUser.inc:327
+#: ../lib/modules/pykotaUser.inc:159 ../lib/modules/pykotaUser.inc:292
+#: ../lib/modules/pykotaUser.inc:298 ../lib/modules/pykotaUser.inc:330
 msgid "Job suffix"
 msgstr "任务后缀"
 
 #: ../lib/types/user.inc:113 ../lib/modules/windowsUser.inc:298
 #: ../lib/modules/windowsUser.inc:670 ../lib/modules/windowsUser.inc:765
 #: ../lib/modules/windowsUser.inc:868 ../lib/modules/windowsUser.inc:995
-#: ../lib/modules/windowsUser.inc:1129 ../lib/modules/windowsUser.inc:2454
-#: ../lib/modules/windowsUser.inc:3221 ../lib/modules/inetOrgPerson.inc:91
-#: ../lib/modules/inetOrgPerson.inc:165 ../lib/modules/inetOrgPerson.inc:232
-#: ../lib/modules/inetOrgPerson.inc:346 ../lib/modules/inetOrgPerson.inc:610
-#: ../lib/modules/inetOrgPerson.inc:656 ../lib/modules/inetOrgPerson.inc:660
-#: ../lib/modules/inetOrgPerson.inc:1527 ../lib/modules/inetOrgPerson.inc:1530
-#: ../lib/modules/inetOrgPerson.inc:1983 ../lib/modules/inetOrgPerson.inc:2773
-#: ../lib/modules/inetOrgPerson.inc:3674 ../lib/modules/inetOrgPerson.inc:3723
+#: ../lib/modules/windowsUser.inc:1129 ../lib/modules/windowsUser.inc:2452
+#: ../lib/modules/windowsUser.inc:3219 ../lib/modules/inetOrgPerson.inc:89
+#: ../lib/modules/inetOrgPerson.inc:163 ../lib/modules/inetOrgPerson.inc:230
+#: ../lib/modules/inetOrgPerson.inc:344 ../lib/modules/inetOrgPerson.inc:608
+#: ../lib/modules/inetOrgPerson.inc:654 ../lib/modules/inetOrgPerson.inc:658
+#: ../lib/modules/inetOrgPerson.inc:1525 ../lib/modules/inetOrgPerson.inc:1528
+#: ../lib/modules/inetOrgPerson.inc:1979 ../lib/modules/inetOrgPerson.inc:2769
+#: ../lib/modules/inetOrgPerson.inc:3654 ../lib/modules/inetOrgPerson.inc:3703
 msgid "Job title"
 msgstr "头衔"
 
-#: ../lib/modules/windowsUser.inc:299 ../lib/modules/inetOrgPerson.inc:657
-#: ../lib/modules/inetOrgPerson.inc:661
+#: ../lib/modules/windowsUser.inc:299 ../lib/modules/inetOrgPerson.inc:655
+#: ../lib/modules/inetOrgPerson.inc:659
 msgid "Job title of user: President, department manager, ..."
 msgstr "用户头衔:如总裁,部门经理..."
 
-#: ../templates/config/confmodules.php:187 ../templates/config/jobList.php:171
+#: ../templates/config/confmodules.php:197 ../templates/config/jobList.php:171
 #: ../templates/config/jobs.php:174 ../templates/config/jobs.php:356
-#: ../templates/config/confmain.php:228
-#: ../templates/config/moduleSettings.php:186
-#: ../templates/config/conftypes.php:205
+#: ../templates/config/confmain.php:231
+#: ../templates/config/moduleSettings.php:191
+#: ../templates/config/conftypes.php:224
 msgid "Jobs"
 msgstr "工作"
 
-#: ../lib/lists.inc:297
+#: ../lib/lists.inc:299
 msgid "Jump 10 pages backward"
 msgstr "向后跳转10页"
 
-#: ../lib/lists.inc:322
+#: ../lib/lists.inc:324
 msgid "Jump 10 pages forward"
 msgstr "向前跳转10页"
 
-#: ../templates/schema/schema.php:255
+#: ../templates/schema/schema.php:256
 msgid "Jump to a matching rule"
 msgstr "选择一个匹配规则"
 
-#: ../templates/schema/schema.php:114
+#: ../templates/schema/schema.php:115
 msgid "Jump to an attribute type"
 msgstr "选择一个属性类型"
 
-#: ../templates/schema/schema.php:308 ../templates/schema/schema.php:358
-#: ../templates/schema/schema.php:373
+#: ../templates/schema/schema.php:309 ../templates/schema/schema.php:359
+#: ../templates/schema/schema.php:374
 msgid "Jump to an object class"
 msgstr "选择一个对象类"
 
-#: ../lib/lists.inc:292
+#: ../lib/lists.inc:294
 msgid "Jump to first page"
 msgstr "跳转到首页"
 
-#: ../lib/lists.inc:327
+#: ../lib/lists.inc:329
 msgid "Jump to last page"
 msgstr "跳转到末页"
 
-#: ../lib/modules/posixAccount.inc:400 ../lib/modules/inetOrgPerson.inc:841
+#: ../lib/modules/posixAccount.inc:400 ../lib/modules/inetOrgPerson.inc:839
 msgid "K5KEY is only needed if you use Kerberos with smbk5pwd."
 msgstr "如果在smbk5pwd中使用Kerberos，则需要K5KEY"
 
@@ -6432,7 +6467,7 @@ msgstr "如果在smbk5pwd中使用Kerberos，则需要K5KEY"
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: ../lib/modules/kolabGroup.inc:74 ../lib/modules/kolabUser.inc:80
+#: ../lib/modules/kolabGroup.inc:74 ../lib/modules/kolabUser.inc:83
 msgid "Kolab"
 msgstr "Kolab"
 
@@ -6476,12 +6511,12 @@ msgstr ""
 msgid "LAM configuration"
 msgstr "LAM 配置"
 
-#: ../templates/massBuildAccounts.php:238
+#: ../templates/upload/massBuildAccounts.php:248
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "您的输入检查完毕,即将建立帐号"
 
 #: ../lib/modules/posixGroup.inc:501 ../lib/modules/posixAccount.inc:399
-#: ../lib/modules/inetOrgPerson.inc:840 ../lib/modules/customFields.inc:141
+#: ../lib/modules/inetOrgPerson.inc:838 ../lib/modules/customFields.inc:141
 msgid ""
 "LAM supports CRYPT, CRYPT-SHA512, SHA, SSHA, MD5 and SMD5 to generate the "
 "hash value of passwords. SSHA and CRYPT are the most common but CRYPT does "
@@ -6492,7 +6527,7 @@ msgstr ""
 "值.SSHA 和 CRYPT是最常用的,但CRYPT 不支持8个字符以上的密码.不建议使用明文密"
 "码."
 
-#: ../templates/tests/index.php:50
+#: ../templates/tests/index.php:51
 msgid "LAM tests"
 msgstr "LAM 测试"
 
@@ -6500,12 +6535,12 @@ msgstr "LAM 测试"
 msgid "LAM user password"
 msgstr "LAM用户密码"
 
-#: ../templates/massDoUpload.php:132
+#: ../lib/upload.inc:150
 #, php-format
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAM无法建立%s帐号,LDAP发生错误."
 
-#: ../lib/modules/sambaGroupMapping.inc:604
+#: ../lib/modules/sambaGroupMapping.inc:602
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "LAM找不到这个Samba域!"
 
@@ -6517,14 +6552,14 @@ msgstr "LAM找不到这个域!"
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAM找不到这个组"
 
-#: ../lib/modules/posixAccount.inc:2487 ../lib/modules/posixAccount.inc:2548
-#: ../lib/modules/windowsUser.inc:2372 ../lib/modules/nisNetGroupUser.inc:598
-#: ../lib/modules/groupOfNamesUser.inc:467
+#: ../lib/modules/posixAccount.inc:2485 ../lib/modules/posixAccount.inc:2546
+#: ../lib/modules/windowsUser.inc:2372 ../lib/modules/nisNetGroupUser.inc:599
+#: ../lib/modules/groupOfNamesUser.inc:465
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAM无法修改 %s组成员"
 
-#: ../lib/modules/organizationalRoleUser.inc:399
+#: ../lib/modules/organizationalRoleUser.inc:397
 #, php-format
 msgid "LAM was unable to modify memberships for role: %s"
 msgstr "LAM无法修改 %s角色成员"
@@ -6569,10 +6604,10 @@ msgstr "LDAP"
 msgid "LDAP + program"
 msgstr "LDAP + 程序"
 
-#: ../templates/config/confmodules.php:102 ../templates/config/jobList.php:88
-#: ../templates/config/jobs.php:87 ../templates/config/confmain.php:132
-#: ../templates/config/moduleSettings.php:101
-#: ../templates/config/conftypes.php:120
+#: ../templates/config/confmodules.php:112 ../templates/config/jobList.php:88
+#: ../templates/config/jobs.php:87 ../templates/config/confmain.php:135
+#: ../templates/config/moduleSettings.php:106
+#: ../templates/config/conftypes.php:139
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP帐号管理配置"
 
@@ -6580,7 +6615,7 @@ msgstr "LDAP帐号管理配置"
 msgid "LDAP DN of default PPolicy password policy entry."
 msgstr "默认的Ppolicy密码策略条目的LDAP DN"
 
-#: ../templates/multiEdit.php:203 ../templates/config/conftypes.php:420
+#: ../templates/multiEdit.php:226 ../templates/config/conftypes.php:431
 msgid "LDAP Suffix is invalid!"
 msgstr "LDAP后缀无效!"
 
@@ -6588,7 +6623,7 @@ msgstr "LDAP后缀无效!"
 msgid "LDAP connection ok."
 msgstr "LDAP连接成功."
 
-#: ../templates/serverInfo.php:182
+#: ../templates/serverInfo.php:183
 msgid "LDAP entries"
 msgstr "LDAP条目"
 
@@ -6604,12 +6639,12 @@ msgstr "这个列表中的用户的LDAP条目"
 msgid "LDAP entries that moderate this list (e.g. approve mails)."
 msgstr "主持这个列表(比如批准邮件)的LDAP条目"
 
-#: ../templates/login.php:662 ../lib/account.inc:1321
+#: ../templates/login.php:683 ../lib/account.inc:1327
 msgid "LDAP error, server says:"
 msgstr "LDAP错误,服务器错误消息:"
 
-#: ../templates/multiEdit.php:119 ../templates/config/confmain.php:515
-#: ../help/help.inc:309
+#: ../templates/multiEdit.php:142 ../templates/config/confmain.php:518
+#: ../help/help.inc:321
 msgid "LDAP filter"
 msgstr "LDAP过滤条件"
 
@@ -6629,11 +6664,11 @@ msgstr ""
 "指定列表用户的LDAP过滤表达式(比如\"((objectclass=qmailUser)"
 "(employeeType=accountant))\")."
 
-#: ../lib/modules.inc:1366
+#: ../lib/modules.inc:1374
 msgid "LDAP operation successful."
 msgstr "LDAP操作成功."
 
-#: ../templates/selfService/adminMain.php:439
+#: ../templates/selfService/adminMain.php:455
 msgid "LDAP password"
 msgstr "LDAP 密码"
 
@@ -6641,43 +6676,43 @@ msgstr "LDAP 密码"
 msgid "LDAP said"
 msgstr "LDAP说"
 
-#: ../templates/config/confmain.php:492 ../help/help.inc:124
+#: ../templates/config/confmain.php:495 ../help/help.inc:124
 msgid "LDAP search"
 msgstr "LDAP搜索"
 
-#: ../templates/selfService/adminMain.php:431 ../help/help.inc:260
+#: ../templates/selfService/adminMain.php:447 ../help/help.inc:260
 msgid "LDAP search attribute"
 msgstr "LDAP搜索属性"
 
-#: ../lib/account.inc:871
+#: ../lib/account.inc:877
 msgid "LDAP search failed! Please check your preferences."
 msgstr "LDAP搜索失败，请检查配置。"
 
-#: ../templates/config/confmain.php:265 ../help/help.inc:126
+#: ../templates/config/confmain.php:268 ../help/help.inc:126
 msgid "LDAP search limit"
 msgstr "LDAP搜索限制"
 
-#: ../templates/login.php:473
+#: ../templates/login.php:482
 msgid "LDAP server"
 msgstr "LDAP服务器"
 
-#: ../lib/account.inc:862
+#: ../lib/account.inc:868
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "超过LDAP限制的大小,无法显示所有条目."
 
-#: ../templates/multiEdit.php:86 ../templates/config/confmain.php:511
-#: ../templates/config/conftypes.php:265
-#: ../templates/selfService/adminMain.php:425
-#: ../templates/profedit/profilepage.php:207 ../help/help.inc:71
-#: ../help/help.inc:256 ../help/help.inc:307
+#: ../templates/multiEdit.php:105 ../templates/config/confmain.php:514
+#: ../templates/config/conftypes.php:284
+#: ../templates/selfService/adminMain.php:441
+#: ../templates/profedit/profilepage.php:219 ../help/help.inc:71
+#: ../help/help.inc:256 ../help/help.inc:319
 msgid "LDAP suffix"
 msgstr "LDAP后缀"
 
-#: ../templates/massDoUpload.php:86
+#: ../lib/upload.inc:194
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAP上传中,请稍等..."
 
-#: ../templates/selfService/adminMain.php:436
+#: ../templates/selfService/adminMain.php:452
 msgid "LDAP user"
 msgstr "LDAP用户"
 
@@ -6685,7 +6720,7 @@ msgstr "LDAP用户"
 msgid "LDAP user and password"
 msgstr "LDAP用户名和密码"
 
-#: ../templates/serverInfo.php:109
+#: ../templates/serverInfo.php:110
 msgid "LDAP version"
 msgstr "LDAP版本"
 
@@ -6697,7 +6732,7 @@ msgstr "基于nsview的LDAP视图"
 msgid "LDIF Export"
 msgstr "LDIF导出"
 
-#: ../templates/multiEdit.php:448
+#: ../templates/multiEdit.php:471
 msgid "LDIF file"
 msgstr "LDIF文件"
 
@@ -6710,72 +6745,74 @@ msgstr "LDIF导入"
 msgid "LDIF import only supports version 1"
 msgstr "LDIF导入功能只支持版本1"
 
+#: ../templates/config/confmain.php:550
+#: ../templates/selfService/adminMain.php:522
 #: ../lib/modules/customFields.inc:88 ../lib/modules/customFields.inc:517
-#: ../lib/modules/customFields.inc:1056 ../lib/modules/customFields.inc:1729
-#: ../lib/modules/customFields.inc:3137
+#: ../lib/modules/customFields.inc:1054 ../lib/modules/customFields.inc:1727
+#: ../lib/modules/customFields.inc:3135 ../help/help.inc:288
 msgid "Label"
 msgstr "标签"
 
-#: ../templates/tests/lamdaemonTest.php:201
+#: ../templates/tests/lamdaemonTest.php:202
 msgid ""
 "Lamdaemon path does not end with \".pl\". Did you enter the full path to the "
 "script?"
 msgstr "lamdaemon 路径没有以 \".pl\"结尾,你需要输入这个脚本的全路径吗?"
 
-#: ../templates/tests/lamdaemonTest.php:185
+#: ../templates/tests/lamdaemonTest.php:186
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemon 服务器和路径"
 
-#: ../templates/config/confmain.php:372
+#: ../templates/config/confmain.php:375
 msgid "Lamdaemon settings"
 msgstr "Lamdaemon设置"
 
-#: ../templates/tests/lamdaemonTest.php:135
+#: ../templates/tests/lamdaemonTest.php:136
 msgid "Lamdaemon successfully run."
 msgstr "Lamdaemon成功执行."
 
-#: ../templates/tests/index.php:52 ../templates/tests/lamdaemonTest.php:52
-#: ../lib/tools/tests.inc:110
+#: ../templates/tests/index.php:53 ../templates/tests/lamdaemonTest.php:53
+#: ../lib/tools/tests.inc:111
 msgid "Lamdaemon test"
 msgstr "Lamdaemon测试"
 
-#: ../templates/tests/lamdaemonTest.php:288
+#: ../templates/tests/lamdaemonTest.php:290
 msgid "Lamdaemon test finished."
 msgstr "Lamdaemon 测试结束."
 
-#: ../templates/tests/lamdaemonTest.php:273
+#: ../templates/tests/lamdaemonTest.php:275
 msgid "Lamdaemon version"
 msgstr "Lamdaemon版本"
 
-#: ../templates/tests/lamdaemonTest.php:281
+#: ../templates/tests/lamdaemonTest.php:283
 msgid "Lamdaemon: Quota module installed"
 msgstr "Lamdaemon: 配额模块已安装."
 
-#: ../templates/tests/lamdaemonTest.php:278
+#: ../templates/tests/lamdaemonTest.php:280
 msgid "Lamdaemon: check NSS LDAP"
 msgstr "Lamdaemon: 检查 NSS LDAP"
 
-#: ../templates/tests/lamdaemonTest.php:283
+#: ../templates/tests/lamdaemonTest.php:285
 msgid "Lamdaemon: read quotas"
 msgstr "Lamdaemon: 读取配额"
 
-#: ../templates/login.php:409 ../templates/selfService/selfServiceLogin.php:360
+#: ../templates/login.php:417 ../templates/selfService/selfServiceLogin.php:375
 msgid "Language"
 msgstr "语言"
 
-#: ../templates/config/confmain.php:673
+#: ../templates/config/confmain.php:710
 msgid "Language is not defined!"
 msgstr "尚未定义语言"
 
-#: ../templates/config/confmain.php:333
+#: ../templates/config/confmain.php:336
 msgid "Language settings"
 msgstr "语言设定"
 
 #: ../lib/modules/mitKerberos.inc:144 ../lib/modules/mitKerberos.inc:256
-#: ../lib/modules/mitKerberos.inc:404 ../lib/modules/mitKerberos.inc:805
+#: ../lib/modules/mitKerberos.inc:404 ../lib/modules/mitKerberos.inc:803
 #: ../lib/modules/windowsUser.inc:278 ../lib/modules/windowsUser.inc:865
-#: ../lib/modules/windowsUser.inc:1211 ../lib/modules/windowsUser.inc:2503
-#: ../lib/modules/windowsUser.inc:3219
+#: ../lib/modules/windowsUser.inc:1211 ../lib/modules/windowsUser.inc:2501
+#: ../lib/modules/windowsUser.inc:3217
 msgid "Last login"
 msgstr "上次登录"
 
@@ -6783,37 +6820,37 @@ msgstr "上次登录"
 #: ../lib/modules/selfRegistration.inc:224 ../lib/modules/windowsUser.inc:178
 #: ../lib/modules/windowsUser.inc:418 ../lib/modules/windowsUser.inc:828
 #: ../lib/modules/windowsUser.inc:960 ../lib/modules/windowsUser.inc:1086
-#: ../lib/modules/windowsUser.inc:2439 ../lib/modules/inetOrgPerson.inc:68
-#: ../lib/modules/inetOrgPerson.inc:159 ../lib/modules/inetOrgPerson.inc:321
-#: ../lib/modules/inetOrgPerson.inc:556 ../lib/modules/inetOrgPerson.inc:668
-#: ../lib/modules/inetOrgPerson.inc:1259 ../lib/modules/inetOrgPerson.inc:1262
-#: ../lib/modules/inetOrgPerson.inc:1985 ../lib/modules/inetOrgPerson.inc:2514
-#: ../lib/modules/inetOrgPerson.inc:3715
+#: ../lib/modules/windowsUser.inc:2437 ../lib/modules/inetOrgPerson.inc:66
+#: ../lib/modules/inetOrgPerson.inc:157 ../lib/modules/inetOrgPerson.inc:319
+#: ../lib/modules/inetOrgPerson.inc:554 ../lib/modules/inetOrgPerson.inc:666
+#: ../lib/modules/inetOrgPerson.inc:1257 ../lib/modules/inetOrgPerson.inc:1260
+#: ../lib/modules/inetOrgPerson.inc:1981 ../lib/modules/inetOrgPerson.inc:2510
+#: ../lib/modules/inetOrgPerson.inc:3695
 msgid "Last name"
 msgstr "姓"
 
 #: ../lib/modules/windowsUser.inc:960 ../lib/modules/windowsUser.inc:961
-#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:69
+#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:67
 msgid "Last name contains invalid characters or is empty!"
 msgstr "姓包含非法字符或为空!"
 
-#: ../lib/modules/windowsUser.inc:179 ../lib/modules/inetOrgPerson.inc:669
+#: ../lib/modules/windowsUser.inc:179 ../lib/modules/inetOrgPerson.inc:667
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "用户姓.只允许字符,-和空格."
 
 #: ../lib/modules/mitKerberos.inc:140 ../lib/modules/mitKerberos.inc:255
-#: ../lib/modules/mitKerberos.inc:396 ../lib/modules/mitKerberos.inc:801
+#: ../lib/modules/mitKerberos.inc:396 ../lib/modules/mitKerberos.inc:799
 #: ../lib/modules/sambaSamAccount.inc:397
 #: ../lib/modules/sambaSamAccount.inc:1114
 #: ../lib/modules/sambaSamAccount.inc:1894
-#: ../lib/modules/sambaSamAccount.inc:2332 ../lib/modules/ppolicyUser.inc:92
-#: ../lib/modules/ppolicyUser.inc:141 ../lib/modules/ppolicyUser.inc:399
+#: ../lib/modules/sambaSamAccount.inc:2330 ../lib/modules/ppolicyUser.inc:92
+#: ../lib/modules/ppolicyUser.inc:141 ../lib/modules/ppolicyUser.inc:397
 #: ../lib/modules/windowsUser.inc:274 ../lib/modules/windowsUser.inc:862
-#: ../lib/modules/windowsUser.inc:1205 ../lib/modules/windowsUser.inc:2501
-#: ../lib/modules/windowsUser.inc:2625 ../lib/modules/windowsUser.inc:3218
+#: ../lib/modules/windowsUser.inc:1205 ../lib/modules/windowsUser.inc:2499
+#: ../lib/modules/windowsUser.inc:2623 ../lib/modules/windowsUser.inc:3216
 #: ../lib/modules/shadowAccount.inc:167 ../lib/modules/shadowAccount.inc:201
 #: ../lib/modules/shadowAccount.inc:365 ../lib/modules/shadowAccount.inc:530
-#: ../lib/modules/shadowAccount.inc:568 ../lib/modules/shadowAccount.inc:761
+#: ../lib/modules/shadowAccount.inc:566 ../lib/modules/shadowAccount.inc:759
 msgid "Last password change"
 msgstr "最后密码变更"
 
@@ -6826,14 +6863,14 @@ msgstr "最后密码变更(只读)"
 #: ../lib/modules/asteriskAccount.inc:298
 #: ../lib/modules/asteriskAccount.inc:544
 #: ../lib/modules/asteriskAccount.inc:758
-#: ../lib/modules/asteriskAccount.inc:1017
-#: ../lib/modules/asteriskAccount.inc:1300
+#: ../lib/modules/asteriskAccount.inc:1015
+#: ../lib/modules/asteriskAccount.inc:1298
 msgid "Last qualify milliseconds"
 msgstr "最后的限定毫秒"
 
 #: ../lib/modules/dhcp_settings.inc:158 ../lib/modules/dhcp_settings.inc:214
 #: ../lib/modules/dhcp_settings.inc:229 ../lib/modules/dhcp_settings.inc:261
-#: ../lib/modules/dhcp_settings.inc:571 ../lib/modules/dhcp_settings.inc:678
+#: ../lib/modules/dhcp_settings.inc:571 ../lib/modules/dhcp_settings.inc:676
 msgid "Lease time"
 msgstr "释放时间"
 
@@ -6848,10 +6885,10 @@ msgstr "许可数据"
 
 #: ../lib/modules/pykotaGroup.inc:125 ../lib/modules/pykotaGroup.inc:135
 #: ../lib/modules/pykotaGroup.inc:173 ../lib/modules/pykotaGroup.inc:182
-#: ../lib/modules/pykotaGroup.inc:227 ../lib/modules/pykotaGroup.inc:477
-#: ../lib/modules/pykotaUser.inc:128 ../lib/modules/pykotaUser.inc:166
-#: ../lib/modules/pykotaUser.inc:233 ../lib/modules/pykotaUser.inc:261
-#: ../lib/modules/pykotaUser.inc:397 ../lib/modules/pykotaUser.inc:901
+#: ../lib/modules/pykotaGroup.inc:227 ../lib/modules/pykotaGroup.inc:475
+#: ../lib/modules/pykotaUser.inc:131 ../lib/modules/pykotaUser.inc:169
+#: ../lib/modules/pykotaUser.inc:236 ../lib/modules/pykotaUser.inc:264
+#: ../lib/modules/pykotaUser.inc:400 ../lib/modules/pykotaUser.inc:902
 msgid "Limit type"
 msgstr "限制类型"
 
@@ -6866,19 +6903,19 @@ msgstr "行结尾"
 #: ../lib/modules/selfRegistration.inc:57
 #: ../lib/modules/selfRegistration.inc:202
 #: ../lib/modules/passwordSelfReset.inc:104
-#: ../lib/modules/passwordSelfReset.inc:656
+#: ../lib/modules/passwordSelfReset.inc:654
 msgid "Link text"
 msgstr "链接文本"
 
-#: ../templates/selfService/adminMain.php:366
+#: ../templates/selfService/adminMain.php:382
 msgid "Link to self service login page for your users"
 msgstr "对用户自助服务登录界面的链接."
 
-#: ../templates/config/conftypes.php:276 ../help/help.inc:87
+#: ../templates/config/conftypes.php:295 ../help/help.inc:87
 msgid "List attributes"
 msgstr "属性列表"
 
-#: ../templates/config/conftypes.php:428
+#: ../templates/config/conftypes.php:439
 msgid "List attributes are invalid!"
 msgstr "属性列表非法!"
 
@@ -6888,7 +6925,7 @@ msgstr "属性列表非法!"
 #: ../lib/modules/zarafaAddressList.inc:141
 #: ../lib/modules/zarafaAddressList.inc:168
 #: ../lib/modules/zarafaAddressList.inc:187
-#: ../lib/modules/zarafaAddressList.inc:334
+#: ../lib/modules/zarafaAddressList.inc:332
 msgid "List name"
 msgstr "列表名"
 
@@ -6902,7 +6939,7 @@ msgid ""
 "workstation."
 msgstr "允许用户登录的Samba工作站,留空表示所有工作站."
 
-#: ../templates/config/confmain.php:667
+#: ../templates/config/confmain.php:704
 msgid "List of admin users is empty or invalid!"
 msgstr "管理员清单为空或非法."
 
@@ -6919,15 +6956,15 @@ msgstr "不合法编码列表"
 msgid "List of entries to be deleted:"
 msgstr "将被删除的条目列表:"
 
-#: ../templates/config/confmain.php:507
+#: ../templates/config/confmain.php:510
 msgid "List of valid users"
 msgstr "合法用户列表"
 
-#: ../templates/serverInfo.php:152
+#: ../templates/serverInfo.php:153
 msgid "Listeners"
 msgstr "监听"
 
-#: ../lib/modules.inc:1266 ../help/help.inc:236
+#: ../lib/modules.inc:1274 ../help/help.inc:236
 msgid "Load profile"
 msgstr "调入配置文件"
 
@@ -6964,7 +7001,7 @@ msgstr "本机邮件"
 #: ../lib/modules/inetLocalMailRecipient.inc:87
 #: ../lib/modules/inetLocalMailRecipient.inc:118
 #: ../lib/modules/inetLocalMailRecipient.inc:132
-#: ../lib/modules/inetLocalMailRecipient.inc:355
+#: ../lib/modules/inetLocalMailRecipient.inc:353
 msgid "Local address list"
 msgstr "本机邮递列表"
 
@@ -6975,28 +7012,28 @@ msgstr "本地组"
 #: ../lib/modules/sambaGroupMapping.inc:115
 #: ../lib/modules/sambaGroupMapping.inc:166
 #: ../lib/modules/sambaGroupMapping.inc:388
-#: ../lib/modules/sambaGroupMapping.inc:556
+#: ../lib/modules/sambaGroupMapping.inc:554
 msgid "Local members"
 msgstr "本地成员"
 
 #: ../lib/types/host.inc:97 ../lib/modules/ipHost.inc:73
 #: ../lib/modules/ipHost.inc:97 ../lib/modules/ipHost.inc:113
-#: ../lib/modules/ipHost.inc:140 ../lib/modules/ipHost.inc:304
+#: ../lib/modules/ipHost.inc:140 ../lib/modules/ipHost.inc:302
 #: ../lib/modules/windowsHost.inc:82 ../lib/modules/windowsHost.inc:106
 #: ../lib/modules/windowsHost.inc:121 ../lib/modules/windowsHost.inc:144
-#: ../lib/modules/windowsHost.inc:293 ../lib/modules/device.inc:77
-#: ../lib/modules/device.inc:109 ../lib/modules/device.inc:129
-#: ../lib/modules/device.inc:178 ../lib/modules/device.inc:410
+#: ../lib/modules/windowsHost.inc:291 ../lib/modules/device.inc:80
+#: ../lib/modules/device.inc:112 ../lib/modules/device.inc:132
+#: ../lib/modules/device.inc:181 ../lib/modules/device.inc:411
 #: ../lib/modules/windowsUser.inc:150 ../lib/modules/windowsUser.inc:466
 #: ../lib/modules/windowsUser.inc:821 ../lib/modules/windowsUser.inc:921
-#: ../lib/modules/windowsUser.inc:1096 ../lib/modules/windowsUser.inc:2432
-#: ../lib/modules/windowsUser.inc:2620 ../lib/modules/inetOrgPerson.inc:164
-#: ../lib/modules/inetOrgPerson.inc:193 ../lib/modules/inetOrgPerson.inc:524
-#: ../lib/modules/inetOrgPerson.inc:571 ../lib/modules/inetOrgPerson.inc:799
-#: ../lib/modules/inetOrgPerson.inc:803 ../lib/modules/inetOrgPerson.inc:1333
-#: ../lib/modules/inetOrgPerson.inc:1336 ../lib/modules/inetOrgPerson.inc:2006
-#: ../lib/modules/inetOrgPerson.inc:2668 ../lib/modules/inetOrgPerson.inc:3650
-#: ../lib/modules/inetOrgPerson.inc:3717
+#: ../lib/modules/windowsUser.inc:1096 ../lib/modules/windowsUser.inc:2430
+#: ../lib/modules/windowsUser.inc:2618 ../lib/modules/inetOrgPerson.inc:162
+#: ../lib/modules/inetOrgPerson.inc:191 ../lib/modules/inetOrgPerson.inc:522
+#: ../lib/modules/inetOrgPerson.inc:569 ../lib/modules/inetOrgPerson.inc:797
+#: ../lib/modules/inetOrgPerson.inc:801 ../lib/modules/inetOrgPerson.inc:1331
+#: ../lib/modules/inetOrgPerson.inc:1334 ../lib/modules/inetOrgPerson.inc:2002
+#: ../lib/modules/inetOrgPerson.inc:2664 ../lib/modules/inetOrgPerson.inc:3630
+#: ../lib/modules/inetOrgPerson.inc:3697
 msgid "Location"
 msgstr "地点"
 
@@ -7008,18 +7045,18 @@ msgstr "新别名的存放位置."
 msgid "Lock"
 msgstr "锁"
 
-#: ../templates/lists/changePassword.php:454
-#: ../templates/lists/changePassword.php:478
-#: ../templates/lists/changePassword.php:480 ../lib/modules/ppolicyUser.inc:155
+#: ../templates/lists/changePassword.php:455
+#: ../templates/lists/changePassword.php:479
+#: ../templates/lists/changePassword.php:481 ../lib/modules/ppolicyUser.inc:155
 msgid "Lock account"
 msgstr "锁定帐号"
 
-#: ../templates/lists/changePassword.php:270
+#: ../templates/lists/changePassword.php:271
 msgid "Lock account?"
 msgstr "锁定帐号?"
 
 #: ../lib/modules/posixGroup.inc:205 ../lib/modules/posixAccount.inc:279
-#: ../lib/modules/posixAccount.inc:1484 ../lib/modules/inetOrgPerson.inc:1648
+#: ../lib/modules/posixAccount.inc:1484 ../lib/modules/inetOrgPerson.inc:1646
 msgid "Lock password"
 msgstr "锁定密码"
 
@@ -7034,10 +7071,10 @@ msgstr "已锁定直到"
 
 #: ../lib/types/ppolicyType.inc:83 ../lib/modules/ppolicy.inc:104
 #: ../lib/modules/ppolicy.inc:151 ../lib/modules/ppolicy.inc:171
-#: ../lib/modules/ppolicy.inc:261 ../lib/modules/ppolicy.inc:477
+#: ../lib/modules/ppolicy.inc:261 ../lib/modules/ppolicy.inc:475
 #: ../lib/modules/sambaDomain.inc:133 ../lib/modules/sambaDomain.inc:198
 #: ../lib/modules/sambaDomain.inc:223 ../lib/modules/sambaDomain.inc:340
-#: ../lib/modules/sambaDomain.inc:611
+#: ../lib/modules/sambaDomain.inc:609
 msgid "Lockout duration"
 msgstr "帐号锁定期"
 
@@ -7051,13 +7088,13 @@ msgstr "锁定的时间"
 
 #: ../lib/types/ppolicyType.inc:88 ../lib/modules/ppolicy.inc:124
 #: ../lib/modules/ppolicy.inc:150 ../lib/modules/ppolicy.inc:255
-#: ../lib/modules/ppolicy.inc:496
+#: ../lib/modules/ppolicy.inc:494
 msgid "Lockout users"
 msgstr "锁定的用户"
 
 #: ../lib/modules/sambaDomain.inc:121 ../lib/modules/sambaDomain.inc:195
 #: ../lib/modules/sambaDomain.inc:225 ../lib/modules/sambaDomain.inc:316
-#: ../lib/modules/sambaDomain.inc:608
+#: ../lib/modules/sambaDomain.inc:606
 msgid "Lockout users after bad logon attempts"
 msgstr "在多次错误登录后锁定用户."
 
@@ -7073,11 +7110,11 @@ msgstr "日志存储位置"
 msgid "Log level"
 msgstr "日志等级"
 
-#: ../templates/multiEdit.php:453
+#: ../templates/multiEdit.php:476
 msgid "Log output"
 msgstr "日志输出"
 
-#: ../templates/main_header.php:128
+#: ../templates/main_header.php:126
 #, php-format
 msgid "Logged in as: %s"
 msgstr "以%s 的身份登录. "
@@ -7086,55 +7123,57 @@ msgstr "以%s 的身份登录. "
 msgid "Logging"
 msgstr "日志"
 
-#: ../templates/login.php:446 ../templates/config/conflogin.php:64
-#: ../templates/config/mainlogin.php:75
-#: ../templates/selfService/selfServiceLogin.php:240
-#: ../templates/selfService/selfServiceLogin.php:379
+#: ../templates/login.php:454 ../templates/config/conflogin.php:64
+#: ../templates/config/mainlogin.php:76
+#: ../templates/selfService/selfServiceLogin.php:256
+#: ../templates/selfService/selfServiceLogin.php:394
 #: ../templates/selfService/adminLogin.php:65
-#: ../templates/3rdParty/pla/lib/HTMLTree.php:530 ../help/help.inc:56
+#: ../templates/selfService/selfService2Factor.php:129
+#: ../templates/3rdParty/pla/lib/HTMLTree.php:530
+#: ../templates/login2Factor.php:127 ../help/help.inc:56
 msgid "Login"
 msgstr "登录"
 
-#: ../templates/selfService/adminMain.php:490 ../help/help.inc:262
+#: ../templates/selfService/adminMain.php:543 ../help/help.inc:262
 msgid "Login attribute label"
 msgstr "登录属性标签"
 
-#: ../templates/selfService/adminMain.php:499 ../help/help.inc:264
+#: ../templates/selfService/adminMain.php:552 ../help/help.inc:264
 msgid "Login caption"
 msgstr "登录标题"
 
-#: ../templates/config/confmain.php:494 ../help/help.inc:122
+#: ../templates/config/confmain.php:497 ../help/help.inc:122
 msgid "Login method"
 msgstr "登录方法"
 
 #: ../lib/types/user.inc:102 ../lib/modules/posixAccount.inc:189
 #: ../lib/modules/posixAccount.inc:265 ../lib/modules/posixAccount.inc:358
 #: ../lib/modules/posixAccount.inc:485 ../lib/modules/posixAccount.inc:1477
-#: ../lib/modules/posixAccount.inc:1749 ../lib/modules/posixAccount.inc:1852
-#: ../lib/modules/posixAccount.inc:2779
+#: ../lib/modules/posixAccount.inc:1749 ../lib/modules/posixAccount.inc:1850
+#: ../lib/modules/posixAccount.inc:2777
 msgid "Login shell"
 msgstr "登录shell"
 
 #: ../lib/modules/posixAccount.inc:199 ../lib/modules/posixAccount.inc:435
-#: ../lib/modules/posixAccount.inc:1968
+#: ../lib/modules/posixAccount.inc:1966
 msgid "Login shells"
 msgstr "登录shells"
 
-#: ../templates/pdfedit/pdfpage.php:457
+#: ../templates/pdfedit/pdfpage.php:472
 msgid "Logo"
 msgstr "标志"
 
-#: ../lib/pdfstruct.inc:300
+#: ../lib/pdfstruct.inc:312
 msgid "Logo file deleted."
 msgstr "徽标文件已删除."
 
-#: ../lib/pdfstruct.inc:292
+#: ../lib/pdfstruct.inc:304
 #, php-format
 msgid "Logo is still in use by PDF structure \"%s\" in account type \"%s\"."
 msgstr "标识用于在PDF结构\"%s\"中 ,属于账号类型 \"%s\"."
 
 #: ../lib/modules/sambaDomain.inc:109 ../lib/modules/sambaDomain.inc:192
-#: ../lib/modules/sambaDomain.inc:290 ../lib/modules/sambaDomain.inc:617
+#: ../lib/modules/sambaDomain.inc:290 ../lib/modules/sambaDomain.inc:615
 msgid "Logon for password change"
 msgstr "密码修改登录"
 
@@ -7156,10 +7195,10 @@ msgstr "可登录时间"
 #: ../lib/modules/sambaSamAccount.inc:1189
 #: ../lib/modules/sambaSamAccount.inc:1710
 #: ../lib/modules/sambaSamAccount.inc:1892
-#: ../lib/modules/sambaSamAccount.inc:1917 ../lib/modules/windowsUser.inc:226
+#: ../lib/modules/sambaSamAccount.inc:1915 ../lib/modules/windowsUser.inc:226
 #: ../lib/modules/windowsUser.inc:564 ../lib/modules/windowsUser.inc:745
 #: ../lib/modules/windowsUser.inc:838 ../lib/modules/windowsUser.inc:984
-#: ../lib/modules/windowsUser.inc:1220 ../lib/modules/windowsUser.inc:2485
+#: ../lib/modules/windowsUser.inc:1220 ../lib/modules/windowsUser.inc:2483
 msgid "Logon script"
 msgstr "登录脚本"
 
@@ -7169,9 +7208,9 @@ msgstr "登录脚本"
 msgid "Logon script is invalid!"
 msgstr "登录脚本非法!"
 
-#: ../templates/selfService/selfServiceMain.php:66
-#: ../templates/selfService/selfServiceMain.php:476
-#: ../templates/main_header.php:135
+#: ../templates/selfService/selfServiceMain.php:70
+#: ../templates/selfService/selfServiceMain.php:485
+#: ../templates/main_header.php:133
 msgid "Logout"
 msgstr "退出"
 
@@ -7181,8 +7220,8 @@ msgstr "M-节点 (0x04)"
 
 #: ../lib/types/dhcp.inc:96 ../lib/modules/ieee802device.inc:58
 #: ../lib/modules/ieee802device.inc:68 ../lib/modules/ieee802device.inc:79
-#: ../lib/modules/ieee802device.inc:106 ../lib/modules/fixed_ip.inc:102
-#: ../lib/modules/fixed_ip.inc:429 ../lib/modules/fixed_ip.inc:743
+#: ../lib/modules/ieee802device.inc:106 ../lib/modules/fixed_ip.inc:105
+#: ../lib/modules/fixed_ip.inc:432 ../lib/modules/fixed_ip.inc:744
 msgid "MAC address"
 msgstr "MAC地址"
 
@@ -7190,7 +7229,7 @@ msgstr "MAC地址"
 msgid "MAC address list"
 msgstr "MAC地址列表"
 
-#: ../lib/modules/ieee802device.inc:86 ../lib/modules/ieee802device.inc:165
+#: ../lib/modules/ieee802device.inc:86 ../lib/modules/ieee802device.inc:163
 msgid "MAC addresses"
 msgstr "MAC地址"
 
@@ -7198,21 +7237,21 @@ msgstr "MAC地址"
 msgid "MIT Kerberos password change command"
 msgstr "MIT Kerberos 密码修改命令"
 
-#: ../lib/modules/bindDLZ.inc:110 ../lib/modules/bindDLZ.inc:281
-#: ../lib/modules/bindDLZ.inc:287 ../lib/modules/bindDLZ.inc:294
-#: ../lib/modules/bindDLZ.inc:483 ../lib/modules/bindDLZ.inc:502
+#: ../lib/modules/bindDLZ.inc:113 ../lib/modules/bindDLZ.inc:284
+#: ../lib/modules/bindDLZ.inc:290 ../lib/modules/bindDLZ.inc:297
+#: ../lib/modules/bindDLZ.inc:486 ../lib/modules/bindDLZ.inc:505
 msgid "MX record"
 msgstr "MX记录"
 
-#: ../lib/modules/bindDLZ.inc:421 ../lib/modules/bindDLZ.inc:440
-#: ../lib/modules/bindDLZ.inc:1515
+#: ../lib/modules/bindDLZ.inc:424 ../lib/modules/bindDLZ.inc:443
+#: ../lib/modules/bindDLZ.inc:1516
 msgid "MX records"
 msgstr "MX记录"
 
 #: ../lib/modules/posixGroup.inc:546 ../lib/modules/posixGroup.inc:570
 #: ../lib/modules/posixGroup.inc:599 ../lib/modules/posixAccount.inc:452
-#: ../lib/modules/posixAccount.inc:1891 ../lib/modules/posixAccount.inc:1920
-#: ../lib/modules/posixAccount.inc:1957
+#: ../lib/modules/posixAccount.inc:1889 ../lib/modules/posixAccount.inc:1918
+#: ../lib/modules/posixAccount.inc:1955
 msgid "Magic number"
 msgstr "魔法号"
 
@@ -7237,30 +7276,30 @@ msgstr "邮件路由"
 
 #: ../lib/modules/selfRegistration.inc:721
 #: ../lib/modules/selfRegistration.inc:741
-#: ../lib/modules/passwordSelfReset.inc:1792
-#: ../lib/modules/passwordSelfReset.inc:1807
-#: ../lib/modules/passwordSelfReset.inc:1840
+#: ../lib/modules/passwordSelfReset.inc:1790
+#: ../lib/modules/passwordSelfReset.inc:1805
+#: ../lib/modules/passwordSelfReset.inc:1838
 msgid "Mail sending failed."
 msgstr "邮件发送失败."
 
-#: ../lib/modules/bindDLZ.inc:139 ../lib/modules/bindDLZ.inc:143
-#: ../lib/modules/bindDLZ.inc:281 ../lib/modules/bindDLZ.inc:500
-#: ../lib/modules/bindDLZ.inc:917 ../lib/modules/bindDLZ.inc:1517
-#: ../lib/modules/kolabUser.inc:98 ../lib/modules/kolabSharedFolder.inc:98
+#: ../lib/modules/bindDLZ.inc:142 ../lib/modules/bindDLZ.inc:146
+#: ../lib/modules/bindDLZ.inc:284 ../lib/modules/bindDLZ.inc:503
+#: ../lib/modules/bindDLZ.inc:920 ../lib/modules/bindDLZ.inc:1518
+#: ../lib/modules/kolabUser.inc:101 ../lib/modules/kolabSharedFolder.inc:98
 #: ../lib/modules/inetLocalMailRecipient.inc:91
 #: ../lib/modules/inetLocalMailRecipient.inc:97
 #: ../lib/modules/inetLocalMailRecipient.inc:124
 #: ../lib/modules/inetLocalMailRecipient.inc:133
 #: ../lib/modules/inetLocalMailRecipient.inc:177
-#: ../lib/modules/inetLocalMailRecipient.inc:356
+#: ../lib/modules/inetLocalMailRecipient.inc:354
 msgid "Mail server"
 msgstr "邮件服务器"
 
-#: ../lib/modules/bindDLZ.inc:914
+#: ../lib/modules/bindDLZ.inc:917
 msgid "Mail servers (\"MX\" records)"
 msgstr "邮件服务 (\"MX\" 记录)"
 
-#: ../lib/account.inc:1129
+#: ../lib/account.inc:1135
 #, php-format
 msgid "Mail successfully sent to %s."
 msgstr "邮件已经成功发送到%s."
@@ -7269,13 +7308,13 @@ msgstr "邮件已经成功发送到%s."
 #: ../lib/modules/asteriskAccount.inc:278
 #: ../lib/modules/asteriskAccount.inc:399
 #: ../lib/modules/asteriskAccount.inc:657
-#: ../lib/modules/asteriskAccount.inc:997
-#: ../lib/modules/asteriskAccount.inc:1260
+#: ../lib/modules/asteriskAccount.inc:995
+#: ../lib/modules/asteriskAccount.inc:1258
 #: ../lib/modules/asteriskVoicemail.inc:95
 #: ../lib/modules/asteriskVoicemail.inc:138
 #: ../lib/modules/asteriskVoicemail.inc:158
 #: ../lib/modules/asteriskVoicemail.inc:245
-#: ../lib/modules/asteriskVoicemail.inc:372 ../lib/modules/imapAccess.inc:68
+#: ../lib/modules/asteriskVoicemail.inc:370 ../lib/modules/imapAccess.inc:68
 #: ../lib/modules/imapAccess.inc:111 ../lib/modules/imapAccess.inc:242
 msgid "Mailbox"
 msgstr "邮箱"
@@ -7288,32 +7327,32 @@ msgstr "在IMAP服务器上这个邮箱已经存在。"
 msgid "Mailbox does not exist on IMAP server."
 msgstr "在IMAP服务器上不存在这个邮箱。"
 
-#: ../lib/modules/kolabUser.inc:148 ../lib/modules/kolabUser.inc:192
-#: ../lib/modules/kolabUser.inc:231 ../lib/modules/kolabUser.inc:297
-#: ../lib/modules/kolabUser.inc:300 ../lib/modules/kolabUser.inc:706
+#: ../lib/modules/kolabUser.inc:151 ../lib/modules/kolabUser.inc:195
+#: ../lib/modules/kolabUser.inc:234 ../lib/modules/kolabUser.inc:300
+#: ../lib/modules/kolabUser.inc:303 ../lib/modules/kolabUser.inc:707
 #: ../lib/modules/kolabSharedFolder.inc:154
 #: ../lib/modules/kolabSharedFolder.inc:188
 #: ../lib/modules/kolabSharedFolder.inc:238
 #: ../lib/modules/kolabSharedFolder.inc:284
 #: ../lib/modules/kolabSharedFolder.inc:287
-#: ../lib/modules/kolabSharedFolder.inc:522
+#: ../lib/modules/kolabSharedFolder.inc:520
 msgid "Mailbox home server"
 msgstr "邮件宿主服务器"
 
-#: ../lib/modules/kolabUser.inc:251
+#: ../lib/modules/kolabUser.inc:254
 msgid "Mailbox home server name is empty!"
 msgstr "邮件宿主服务器为空 !"
 
-#: ../lib/modules/kolabUser.inc:249 ../lib/modules/kolabUser.inc:250
+#: ../lib/modules/kolabUser.inc:252 ../lib/modules/kolabUser.inc:253
 #: ../lib/modules/kolabSharedFolder.inc:257
 #: ../lib/modules/kolabSharedFolder.inc:258
 msgid "Mailbox home server name is invalid!"
 msgstr "邮件宿主服务器非法!"
 
-#: ../lib/modules/kolabUser.inc:99 ../lib/modules/kolabUser.inc:174
-#: ../lib/modules/kolabUser.inc:199 ../lib/modules/kolabUser.inc:232
-#: ../lib/modules/kolabUser.inc:257 ../lib/modules/kolabUser.inc:310
-#: ../lib/modules/kolabUser.inc:739
+#: ../lib/modules/kolabUser.inc:102 ../lib/modules/kolabUser.inc:177
+#: ../lib/modules/kolabUser.inc:202 ../lib/modules/kolabUser.inc:235
+#: ../lib/modules/kolabUser.inc:260 ../lib/modules/kolabUser.inc:313
+#: ../lib/modules/kolabUser.inc:740
 msgid "Mailbox quota"
 msgstr "邮箱限额"
 
@@ -7325,11 +7364,11 @@ msgstr "邮件别名(例如:NIS邮件别名)"
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "邮件转发."
 
-#: ../templates/pdfedit/pdfpage.php:371 ../templates/pdfedit/pdfpage.php:683
+#: ../templates/pdfedit/pdfpage.php:386 ../templates/pdfedit/pdfpage.php:702
 msgid "Main"
 msgstr "主要设置"
 
-#: ../templates/selfService/adminMain.php:505 ../help/help.inc:266
+#: ../templates/selfService/adminMain.php:558 ../help/help.inc:266
 msgid "Main page caption"
 msgstr "主页标题"
 
@@ -7337,23 +7376,23 @@ msgstr "主页标题"
 msgid "Make sure your filter (above) will select all child records."
 msgstr "确认您的上述过滤器将选定所有的子记录"
 
-#: ../lib/modules/inetOrgPerson.inc:1605
+#: ../lib/modules/inetOrgPerson.inc:1603
 msgid "Manage"
 msgstr "管理"
 
-#: ../templates/pdfedit/pdfmain.php:195
+#: ../templates/pdfedit/pdfmain.php:240
 msgid "Manage existing PDF structures"
 msgstr "管理已有的PDF架构"
 
-#: ../templates/profedit/profilemain.php:180
+#: ../templates/profedit/profilemain.php:223
 msgid "Manage existing profiles"
 msgstr "管理已有的设置"
 
-#: ../templates/pdfedit/pdfmain.php:237
+#: ../templates/pdfedit/pdfmain.php:282
 msgid "Manage logos"
 msgstr "管理徽标"
 
-#: ../lib/modules/kolabUser.inc:112 ../lib/modules/kolabUser.inc:170
+#: ../lib/modules/kolabUser.inc:115 ../lib/modules/kolabUser.inc:173
 msgid "Manage object class \"mailrecipient\""
 msgstr "管理目标类\"mailrecipient\""
 
@@ -7371,39 +7410,39 @@ msgstr "管理服务器设置"
 
 #: ../lib/modules/windowsHost.inc:86 ../lib/modules/windowsHost.inc:112
 #: ../lib/modules/windowsHost.inc:122 ../lib/modules/windowsHost.inc:146
-#: ../lib/modules/windowsHost.inc:298 ../lib/modules/windowsGroup.inc:152
-#: ../lib/modules/windowsGroup.inc:173 ../lib/modules/windowsGroup.inc:233
-#: ../lib/modules/windowsGroup.inc:275 ../lib/modules/windowsGroup.inc:359
-#: ../lib/modules/windowsGroup.inc:947
+#: ../lib/modules/windowsHost.inc:296 ../lib/modules/windowsGroup.inc:155
+#: ../lib/modules/windowsGroup.inc:176 ../lib/modules/windowsGroup.inc:236
+#: ../lib/modules/windowsGroup.inc:278 ../lib/modules/windowsGroup.inc:362
+#: ../lib/modules/windowsGroup.inc:948
 msgid "Managed by"
 msgstr "管理:"
 
-#: ../templates/serverInfo.php:105
+#: ../templates/serverInfo.php:106
 msgid "Managed suffixes"
 msgstr "管理后缀"
 
 #: ../lib/types/user.inc:104 ../lib/modules/ipHost.inc:77
 #: ../lib/modules/ipHost.inc:103 ../lib/modules/ipHost.inc:114
-#: ../lib/modules/ipHost.inc:164 ../lib/modules/ipHost.inc:305
+#: ../lib/modules/ipHost.inc:164 ../lib/modules/ipHost.inc:303
 #: ../lib/modules/windowsUser.inc:346 ../lib/modules/windowsUser.inc:734
 #: ../lib/modules/windowsUser.inc:892 ../lib/modules/windowsUser.inc:1156
-#: ../lib/modules/windowsUser.inc:2462 ../lib/modules/windowsUser.inc:3230
-#: ../lib/modules/inetOrgPerson.inc:370 ../lib/modules/inetOrgPerson.inc:625
-#: ../lib/modules/inetOrgPerson.inc:676 ../lib/modules/inetOrgPerson.inc:680
-#: ../lib/modules/inetOrgPerson.inc:1617 ../lib/modules/inetOrgPerson.inc:1986
-#: ../lib/modules/inetOrgPerson.inc:3684 ../lib/modules/inetOrgPerson.inc:3726
+#: ../lib/modules/windowsUser.inc:2460 ../lib/modules/windowsUser.inc:3228
+#: ../lib/modules/inetOrgPerson.inc:368 ../lib/modules/inetOrgPerson.inc:623
+#: ../lib/modules/inetOrgPerson.inc:674 ../lib/modules/inetOrgPerson.inc:678
+#: ../lib/modules/inetOrgPerson.inc:1615 ../lib/modules/inetOrgPerson.inc:1982
+#: ../lib/modules/inetOrgPerson.inc:3664 ../lib/modules/inetOrgPerson.inc:3706
 msgid "Manager"
 msgstr "管理员"
 
-#: ../lib/tools/ouEditor.inc:53
+#: ../lib/tools/ouEditor.inc:54
 msgid "Manages OU objects in your LDAP tree."
 msgstr "管理LDAP树OU对象."
 
-#: ../lib/modules/kolabUser.inc:52
+#: ../lib/modules/kolabUser.inc:55
 msgid "Manual"
 msgstr "手动"
 
-#: ../lib/modules/kolabUser.inc:54
+#: ../lib/modules/kolabUser.inc:57
 msgid "Manual if conflicts"
 msgstr "如果冲突使用手动"
 
@@ -7414,7 +7453,7 @@ msgstr "手动脚本"
 #: ../lib/types/nisObjectType.inc:78 ../lib/modules/nisObject.inc:65
 #: ../lib/modules/nisObject.inc:96 ../lib/modules/nisObject.inc:112
 #: ../lib/modules/nisObject.inc:123 ../lib/modules/nisObject.inc:149
-#: ../lib/modules/nisObject.inc:213
+#: ../lib/modules/nisObject.inc:211
 msgid "Mapping entry"
 msgstr "映射条目"
 
@@ -7425,18 +7464,18 @@ msgstr "映射条目包含非法字符,只能使用 ASCII 字符."
 
 #: ../lib/types/nisObjectType.inc:79 ../lib/modules/nisObject.inc:69
 #: ../lib/modules/nisObject.inc:89 ../lib/modules/nisObject.inc:113
-#: ../lib/modules/nisObject.inc:143 ../lib/modules/nisObject.inc:214
+#: ../lib/modules/nisObject.inc:143 ../lib/modules/nisObject.inc:212
 msgid "Mapping name"
 msgstr "映射的名字"
 
 #: ../lib/modules/kolabGroup.inc:213 ../lib/modules/kolabGroup.inc:293
-#: ../lib/modules/kolabUser.inc:388 ../lib/modules/kolabUser.inc:519
+#: ../lib/modules/kolabUser.inc:391 ../lib/modules/kolabUser.inc:522
 #: ../lib/modules/kolabSharedFolder.inc:345
 #: ../lib/modules/kolabSharedFolder.inc:433
 msgid "Mark account for deletion"
 msgstr "将此帐号标记为删除"
 
-#: ../lib/modules/kolabGroup.inc:113 ../lib/modules/kolabUser.inc:178
+#: ../lib/modules/kolabGroup.inc:113 ../lib/modules/kolabUser.inc:181
 #: ../lib/modules/kolabSharedFolder.inc:166
 msgid "Mark for deletion"
 msgstr "标记为删除"
@@ -7445,19 +7484,19 @@ msgstr "标记为删除"
 msgid "Mass delete"
 msgstr "批量删除"
 
-#: ../templates/config/profmanage.php:317 ../templates/config/mainlogin.php:164
+#: ../templates/config/profmanage.php:317 ../templates/config/mainlogin.php:169
 #: ../templates/selfService/profManage.php:250
-#: ../templates/pdfedit/pdfmain.php:295 ../templates/pdfedit/pdfmain.php:343
-#: ../templates/profedit/profilemain.php:262
-#: ../templates/profedit/profilemain.php:311 ../help/help.inc:144
+#: ../templates/pdfedit/pdfmain.php:347 ../templates/pdfedit/pdfmain.php:390
+#: ../templates/profedit/profilemain.php:308
+#: ../templates/profedit/profilemain.php:351 ../help/help.inc:144
 msgid "Master password"
 msgstr "管理员密码"
 
 #: ../templates/config/profmanage.php:54
 #: ../templates/selfService/profManage.php:40
-#: ../templates/pdfedit/pdfmain.php:110 ../templates/pdfedit/pdfmain.php:118
-#: ../templates/profedit/profilemain.php:126
-#: ../templates/profedit/profilemain.php:134
+#: ../templates/pdfedit/pdfmain.php:134 ../templates/pdfedit/pdfmain.php:157
+#: ../templates/profedit/profilemain.php:150
+#: ../templates/profedit/profilemain.php:171
 msgid "Master password is wrong!"
 msgstr "系统管理员密码错误!"
 
@@ -7465,34 +7504,34 @@ msgstr "系统管理员密码错误!"
 msgid "Master passwords are different or empty!"
 msgstr "管理员密码不同或为空!"
 
-#: ../templates/schema/schema.php:268
+#: ../templates/schema/schema.php:269
 msgid "Matching rule OID"
 msgstr "匹配规则OID"
 
-#: ../templates/schema/schema.php:77 ../templates/schema/schema.php:78
+#: ../templates/schema/schema.php:78 ../templates/schema/schema.php:79
 msgid "Matching rules"
 msgstr "匹配规则"
 
-#: ../templates/serverInfo.php:173
+#: ../templates/serverInfo.php:174
 msgid "Max. file descriptors"
 msgstr "最大的文件描述符"
 
-#: ../lib/modules/posixGroup.inc:590 ../lib/modules/posixGroup.inc:664
-#: ../lib/modules/posixGroup.inc:665
+#: ../lib/modules/posixGroup.inc:590 ../lib/modules/posixGroup.inc:662
+#: ../lib/modules/posixGroup.inc:663
 msgid "Maximum GID number"
 msgstr "最大GID号"
 
-#: ../lib/modules/posixGroup.inc:664
+#: ../lib/modules/posixGroup.inc:662
 msgid "Maximum GID number is invalid or empty!"
 msgstr "最大的GID非法或为空!"
 
-#: ../lib/modules/posixGroup.inc:665
+#: ../lib/modules/posixGroup.inc:663
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "最大GID必须大于最小GID!"
 
 #: ../lib/modules/posixAccount.inc:94 ../lib/modules/posixAccount.inc:96
 #: ../lib/modules/posixAccount.inc:97 ../lib/modules/posixAccount.inc:98
-#: ../lib/modules/posixAccount.inc:1917 ../lib/modules/posixAccount.inc:1954
+#: ../lib/modules/posixAccount.inc:1915 ../lib/modules/posixAccount.inc:1952
 msgid "Maximum UID number"
 msgstr "最大UID号"
 
@@ -7506,48 +7545,48 @@ msgstr "最大UID号必须大于最小UID号!"
 
 #: ../lib/types/ppolicyType.inc:84 ../lib/modules/ppolicy.inc:108
 #: ../lib/modules/ppolicy.inc:152 ../lib/modules/ppolicy.inc:172
-#: ../lib/modules/ppolicy.inc:268 ../lib/modules/ppolicy.inc:478
+#: ../lib/modules/ppolicy.inc:268 ../lib/modules/ppolicy.inc:476
 msgid "Maximum failure count"
 msgstr "最大失败次数"
 
 #: ../templates/3rdParty/pla/htdocs/add_attr_form.php:128
 #: ../templates/3rdParty/pla/htdocs/import_form.php:36
-#: ../lib/modules/customFields.inc:160 ../lib/modules/customFields.inc:3512
+#: ../lib/modules/customFields.inc:160 ../lib/modules/customFields.inc:3510
 msgid "Maximum file size"
 msgstr "最大文件大小"
 
-#: ../lib/modules/windowsUser.inc:3240 ../lib/modules/inetOrgPerson.inc:2449
-#: ../lib/modules/inetOrgPerson.inc:2474 ../lib/modules/inetOrgPerson.inc:3755
+#: ../lib/modules/windowsUser.inc:3238 ../lib/modules/inetOrgPerson.inc:2445
+#: ../lib/modules/inetOrgPerson.inc:2470 ../lib/modules/inetOrgPerson.inc:3735
 msgid "Maximum file size (kB)"
 msgstr "最大文件大小(kB)"
 
-#: ../lib/modules/customFields.inc:3544
+#: ../lib/modules/customFields.inc:3542
 msgid "Maximum file size must be a number. Please enter 0 for no limit."
 msgstr "文件大小的最大值必须是一个数字. 输入0表示无限制."
 
-#: ../lib/modules/windowsUser.inc:3238 ../lib/modules/inetOrgPerson.inc:2446
-#: ../lib/modules/inetOrgPerson.inc:2471 ../lib/modules/inetOrgPerson.inc:3753
+#: ../lib/modules/windowsUser.inc:3236 ../lib/modules/inetOrgPerson.inc:2442
+#: ../lib/modules/inetOrgPerson.inc:2467 ../lib/modules/inetOrgPerson.inc:3733
 msgid "Maximum height (px)"
 msgstr "最大高度(px)"
 
 #: ../lib/types/pykotaPrinterType.inc:95 ../lib/modules/pykotaPrinter.inc:103
 #: ../lib/modules/pykotaPrinter.inc:135 ../lib/modules/pykotaPrinter.inc:159
 #: ../lib/modules/pykotaPrinter.inc:195 ../lib/modules/pykotaPrinter.inc:213
-#: ../lib/modules/pykotaPrinter.inc:233 ../lib/modules/pykotaPrinter.inc:589
+#: ../lib/modules/pykotaPrinter.inc:233 ../lib/modules/pykotaPrinter.inc:587
 msgid "Maximum job size"
 msgstr "最大的任务量"
 
 #: ../lib/modules/dhcp_settings.inc:162 ../lib/modules/dhcp_settings.inc:215
 #: ../lib/modules/dhcp_settings.inc:230 ../lib/modules/dhcp_settings.inc:267
-#: ../lib/modules/dhcp_settings.inc:575 ../lib/modules/dhcp_settings.inc:679
+#: ../lib/modules/dhcp_settings.inc:575 ../lib/modules/dhcp_settings.inc:677
 msgid "Maximum lease time"
 msgstr "最大释放时间"
 
-#: ../templates/schema/schema.php:214
+#: ../templates/schema/schema.php:215
 msgid "Maximum length"
 msgstr "最大长度"
 
-#: ../lib/lists.inc:1031 ../help/help.inc:97
+#: ../lib/lists.inc:1017 ../help/help.inc:97
 msgid "Maximum list entries"
 msgstr "最大列表条目"
 
@@ -7560,101 +7599,101 @@ msgstr "在中断一个通话之前的非活动秒数最大值"
 #: ../lib/modules/shadowAccount.inc:65 ../lib/modules/shadowAccount.inc:123
 #: ../lib/modules/shadowAccount.inc:172 ../lib/modules/shadowAccount.inc:189
 #: ../lib/modules/shadowAccount.inc:227 ../lib/modules/shadowAccount.inc:340
-#: ../lib/modules/shadowAccount.inc:573 ../lib/modules/ppolicy.inc:88
+#: ../lib/modules/shadowAccount.inc:571 ../lib/modules/ppolicy.inc:88
 #: ../lib/modules/ppolicy.inc:144 ../lib/modules/ppolicy.inc:167
 #: ../lib/modules/ppolicy.inc:168 ../lib/modules/ppolicy.inc:205
-#: ../lib/modules/ppolicy.inc:474 ../lib/modules/sambaDomain.inc:129
+#: ../lib/modules/ppolicy.inc:472 ../lib/modules/sambaDomain.inc:129
 #: ../lib/modules/sambaDomain.inc:197 ../lib/modules/sambaDomain.inc:220
 #: ../lib/modules/sambaDomain.inc:222 ../lib/modules/sambaDomain.inc:332
-#: ../lib/modules/sambaDomain.inc:610
+#: ../lib/modules/sambaDomain.inc:608
 msgid "Maximum password age"
 msgstr "密码最长生命"
 
-#: ../lib/modules/windowsUser.inc:3237 ../lib/modules/inetOrgPerson.inc:2444
-#: ../lib/modules/inetOrgPerson.inc:2468 ../lib/modules/inetOrgPerson.inc:3752
+#: ../lib/modules/windowsUser.inc:3235 ../lib/modules/inetOrgPerson.inc:2440
+#: ../lib/modules/inetOrgPerson.inc:2464 ../lib/modules/inetOrgPerson.inc:3732
 msgid "Maximum width (px)"
 msgstr "最大宽度（px）"
 
 #: ../lib/modules/qmailGroup.inc:80 ../lib/modules/qmailGroup.inc:204
 #: ../lib/modules/qmailGroup.inc:208 ../lib/modules/qmailGroup.inc:337
 #: ../lib/modules/qmailGroup.inc:402 ../lib/modules/qmailGroup.inc:425
-#: ../lib/modules/qmailGroup.inc:514 ../lib/modules/qmailGroup.inc:1013
+#: ../lib/modules/qmailGroup.inc:514 ../lib/modules/qmailGroup.inc:1011
 msgid "Member email addresses"
 msgstr "用户邮件的地址."
 
 #: ../lib/modules/qmailGroup.inc:78 ../lib/modules/qmailGroup.inc:156
 #: ../lib/modules/qmailGroup.inc:160 ../lib/modules/qmailGroup.inc:279
 #: ../lib/modules/qmailGroup.inc:381 ../lib/modules/qmailGroup.inc:516
-#: ../lib/modules/qmailGroup.inc:783 ../lib/modules/qmailGroup.inc:1012
+#: ../lib/modules/qmailGroup.inc:783 ../lib/modules/qmailGroup.inc:1010
 msgid "Member entries"
 msgstr "用户条目"
 
 #: ../lib/modules/qmailGroup.inc:82 ../lib/modules/qmailGroup.inc:180
 #: ../lib/modules/qmailGroup.inc:184 ../lib/modules/qmailGroup.inc:303
 #: ../lib/modules/qmailGroup.inc:390 ../lib/modules/qmailGroup.inc:515
-#: ../lib/modules/qmailGroup.inc:1014
+#: ../lib/modules/qmailGroup.inc:1012
 msgid "Member filter"
 msgstr "用户过滤表达式"
 
-#: ../lib/modules/windowsGroup.inc:136 ../lib/modules/windowsGroup.inc:267
-#: ../lib/modules/windowsGroup.inc:416 ../lib/modules/windowsGroup.inc:971
+#: ../lib/modules/windowsGroup.inc:139 ../lib/modules/windowsGroup.inc:270
+#: ../lib/modules/windowsGroup.inc:419 ../lib/modules/windowsGroup.inc:972
 msgid "Member of"
 msgstr "成员"
 
-#: ../lib/types/netgroup.inc:94 ../lib/modules/nisnetgroup.inc:95
-#: ../lib/modules/nisnetgroup.inc:99 ../lib/modules/nisnetgroup.inc:132
-#: ../lib/modules/nisnetgroup.inc:142 ../lib/modules/nisnetgroup.inc:286
-#: ../lib/modules/nisnetgroup.inc:583 ../lib/modules/organizationalRole.inc:93
-#: ../lib/modules/organizationalRole.inc:97
-#: ../lib/modules/organizationalRole.inc:130
-#: ../lib/modules/organizationalRole.inc:138
-#: ../lib/modules/organizationalRole.inc:193
-#: ../lib/modules/organizationalRole.inc:347
-#: ../lib/modules/organizationalRole.inc:514
-#: ../lib/modules/windowsGroup.inc:132 ../lib/modules/windowsGroup.inc:140
-#: ../lib/modules/windowsGroup.inc:217 ../lib/modules/windowsGroup.inc:266
-#: ../lib/modules/windowsGroup.inc:956 ../lib/modules/groupOfNames.inc:101
-#: ../lib/modules/groupOfNames.inc:105 ../lib/modules/groupOfNames.inc:151
-#: ../lib/modules/groupOfNames.inc:159 ../lib/modules/groupOfNames.inc:168
-#: ../lib/modules/groupOfNames.inc:249 ../lib/modules/groupOfNames.inc:561
-#: ../lib/modules/groupOfNames.inc:772
+#: ../lib/types/netgroup.inc:94 ../lib/modules/nisnetgroup.inc:98
+#: ../lib/modules/nisnetgroup.inc:102 ../lib/modules/nisnetgroup.inc:135
+#: ../lib/modules/nisnetgroup.inc:145 ../lib/modules/nisnetgroup.inc:289
+#: ../lib/modules/nisnetgroup.inc:584 ../lib/modules/organizationalRole.inc:96
+#: ../lib/modules/organizationalRole.inc:100
+#: ../lib/modules/organizationalRole.inc:133
+#: ../lib/modules/organizationalRole.inc:141
+#: ../lib/modules/organizationalRole.inc:196
+#: ../lib/modules/organizationalRole.inc:350
+#: ../lib/modules/organizationalRole.inc:515
+#: ../lib/modules/windowsGroup.inc:135 ../lib/modules/windowsGroup.inc:143
+#: ../lib/modules/windowsGroup.inc:220 ../lib/modules/windowsGroup.inc:269
+#: ../lib/modules/windowsGroup.inc:957 ../lib/modules/groupOfNames.inc:104
+#: ../lib/modules/groupOfNames.inc:108 ../lib/modules/groupOfNames.inc:154
+#: ../lib/modules/groupOfNames.inc:162 ../lib/modules/groupOfNames.inc:171
+#: ../lib/modules/groupOfNames.inc:252 ../lib/modules/groupOfNames.inc:564
+#: ../lib/modules/groupOfNames.inc:773
 msgid "Members"
 msgstr "组成员"
 
-#: ../lib/modules/groupOfNames.inc:109 ../lib/modules/groupOfNames.inc:180
+#: ../lib/modules/groupOfNames.inc:112 ../lib/modules/groupOfNames.inc:183
 msgid "Members are optional"
 msgstr "组员是可选的"
 
 #: ../lib/modules/qmailGroup.inc:94 ../lib/modules/qmailGroup.inc:196
 #: ../lib/modules/qmailGroup.inc:319 ../lib/modules/qmailGroup.inc:396
-#: ../lib/modules/qmailGroup.inc:617 ../lib/modules/qmailGroup.inc:1025
+#: ../lib/modules/qmailGroup.inc:617 ../lib/modules/qmailGroup.inc:1023
 msgid "Members only"
 msgstr "仅成员"
 
-#: ../lib/modules/nisNetGroupHost.inc:64 ../lib/modules/nisNetGroupUser.inc:83
+#: ../lib/modules/nisNetGroupHost.inc:67 ../lib/modules/nisNetGroupUser.inc:86
 msgid "Memberships"
 msgstr "成员"
 
 #: ../lib/modules/qmailUser.inc:108 ../lib/modules/qmailUser.inc:143
 #: ../lib/modules/qmailUser.inc:223 ../lib/modules/qmailUser.inc:316
 #: ../lib/modules/qmailUser.inc:412 ../lib/modules/qmailUser.inc:696
-#: ../lib/modules/qmailUser.inc:1116
+#: ../lib/modules/qmailUser.inc:1114
 msgid "Message count limit"
 msgstr "信息总和的限制"
 
 #: ../lib/modules/qmailUser.inc:110 ../lib/modules/qmailUser.inc:153
 #: ../lib/modules/qmailUser.inc:227 ../lib/modules/qmailUser.inc:324
 #: ../lib/modules/qmailUser.inc:415 ../lib/modules/qmailUser.inc:707
-#: ../lib/modules/qmailUser.inc:1117
+#: ../lib/modules/qmailUser.inc:1115
 msgid "Message size limit"
 msgstr "邮件大小限制"
 
 #: ../lib/modules/qmailUser.inc:120 ../lib/modules/qmailUser.inc:171
 #: ../lib/modules/qmailUser.inc:247 ../lib/modules/qmailUser.inc:366
 #: ../lib/modules/qmailUser.inc:430 ../lib/modules/qmailUser.inc:611
-#: ../lib/modules/qmailUser.inc:1120 ../lib/modules/qmailGroup.inc:139
+#: ../lib/modules/qmailUser.inc:1118 ../lib/modules/qmailGroup.inc:139
 #: ../lib/modules/qmailGroup.inc:254 ../lib/modules/qmailGroup.inc:372
-#: ../lib/modules/qmailGroup.inc:508 ../lib/modules/qmailGroup.inc:1008
+#: ../lib/modules/qmailGroup.inc:508 ../lib/modules/qmailGroup.inc:1006
 msgid "Message store"
 msgstr "邮件存储"
 
@@ -7662,25 +7701,25 @@ msgstr "邮件存储"
 msgid "Messages"
 msgstr "消息"
 
-#: ../lib/modules/windowsUser.inc:420 ../lib/modules/inetOrgPerson.inc:323
+#: ../lib/modules/windowsUser.inc:420 ../lib/modules/inetOrgPerson.inc:321
 msgid "Miller"
 msgstr "米勒"
 
 #: ../lib/modules/sambaDomain.inc:101 ../lib/modules/sambaDomain.inc:190
-#: ../lib/modules/sambaDomain.inc:276 ../lib/modules/sambaDomain.inc:606
+#: ../lib/modules/sambaDomain.inc:276 ../lib/modules/sambaDomain.inc:604
 msgid "Minimal password length"
 msgstr "最短密码长度"
 
-#: ../lib/modules/posixGroup.inc:587 ../lib/modules/posixGroup.inc:663
+#: ../lib/modules/posixGroup.inc:587 ../lib/modules/posixGroup.inc:661
 msgid "Minimum GID number"
 msgstr "最小GID号"
 
-#: ../lib/modules/posixGroup.inc:663
+#: ../lib/modules/posixGroup.inc:661
 msgid "Minimum GID number is invalid or empty!"
 msgstr "最小GID错误或为空"
 
 #: ../lib/modules/posixAccount.inc:93 ../lib/modules/posixAccount.inc:95
-#: ../lib/modules/posixAccount.inc:1914 ../lib/modules/posixAccount.inc:1951
+#: ../lib/modules/posixAccount.inc:1912 ../lib/modules/posixAccount.inc:1949
 msgid "Minimum UID number"
 msgstr "最小UID号"
 
@@ -7689,7 +7728,7 @@ msgid "Minimum UID number is invalid!"
 msgstr "最小UID非法!"
 
 #: ../lib/modules/passwordSelfReset.inc:96
-#: ../lib/modules/passwordSelfReset.inc:654
+#: ../lib/modules/passwordSelfReset.inc:652
 msgid "Minimum answer length"
 msgstr "最短答案的长度"
 
@@ -7708,19 +7747,19 @@ msgstr "最少数字字符数"
 #: ../lib/types/ppolicyType.inc:78 ../lib/modules/shadowAccount.inc:57
 #: ../lib/modules/shadowAccount.inc:118 ../lib/modules/shadowAccount.inc:171
 #: ../lib/modules/shadowAccount.inc:185 ../lib/modules/shadowAccount.inc:221
-#: ../lib/modules/shadowAccount.inc:332 ../lib/modules/shadowAccount.inc:572
+#: ../lib/modules/shadowAccount.inc:332 ../lib/modules/shadowAccount.inc:570
 #: ../lib/modules/ppolicy.inc:84 ../lib/modules/ppolicy.inc:143
 #: ../lib/modules/ppolicy.inc:166 ../lib/modules/ppolicy.inc:198
-#: ../lib/modules/ppolicy.inc:473 ../lib/modules/sambaDomain.inc:125
+#: ../lib/modules/ppolicy.inc:471 ../lib/modules/sambaDomain.inc:125
 #: ../lib/modules/sambaDomain.inc:196 ../lib/modules/sambaDomain.inc:221
-#: ../lib/modules/sambaDomain.inc:324 ../lib/modules/sambaDomain.inc:609
+#: ../lib/modules/sambaDomain.inc:324 ../lib/modules/sambaDomain.inc:607
 msgid "Minimum password age"
 msgstr "密码最短生命"
 
 #: ../templates/config/mainmanage.php:403 ../lib/types/ppolicyType.inc:87
 #: ../lib/modules/ppolicy.inc:120 ../lib/modules/ppolicy.inc:147
 #: ../lib/modules/ppolicy.inc:175 ../lib/modules/ppolicy.inc:247
-#: ../lib/modules/ppolicy.inc:481
+#: ../lib/modules/ppolicy.inc:479
 msgid "Minimum password length"
 msgstr "最短密码长度"
 
@@ -7728,9 +7767,9 @@ msgstr "最短密码长度"
 msgid "Minimum symbolic characters"
 msgstr "最少标点符号字符数"
 
-#: ../lib/modules/bindDLZ.inc:223 ../lib/modules/bindDLZ.inc:326
-#: ../lib/modules/bindDLZ.inc:427 ../lib/modules/bindDLZ.inc:525
-#: ../lib/modules/bindDLZ.inc:1030 ../lib/modules/bindDLZ.inc:1552
+#: ../lib/modules/bindDLZ.inc:226 ../lib/modules/bindDLZ.inc:329
+#: ../lib/modules/bindDLZ.inc:430 ../lib/modules/bindDLZ.inc:528
+#: ../lib/modules/bindDLZ.inc:1033 ../lib/modules/bindDLZ.inc:1553
 msgid "Minimum time"
 msgstr "最小时间"
 
@@ -7748,42 +7787,42 @@ msgstr "取消了增,删,改等修改命令"
 
 #: ../lib/modules/windowsUser.inc:366 ../lib/modules/windowsUser.inc:621
 #: ../lib/modules/windowsUser.inc:904 ../lib/modules/windowsUser.inc:972
-#: ../lib/modules/windowsUser.inc:1109 ../lib/modules/windowsUser.inc:2447
-#: ../lib/modules/windowsUser.inc:3211
+#: ../lib/modules/windowsUser.inc:1109 ../lib/modules/windowsUser.inc:2445
+#: ../lib/modules/windowsUser.inc:3209
 msgid "Mobile"
 msgstr "手机号码"
 
-#: ../lib/types/user.inc:219 ../lib/modules/inetOrgPerson.inc:74
-#: ../lib/modules/inetOrgPerson.inc:160 ../lib/modules/inetOrgPerson.inc:442
-#: ../lib/modules/inetOrgPerson.inc:595 ../lib/modules/inetOrgPerson.inc:724
-#: ../lib/modules/inetOrgPerson.inc:728 ../lib/modules/inetOrgPerson.inc:1479
-#: ../lib/modules/inetOrgPerson.inc:1482 ../lib/modules/inetOrgPerson.inc:1994
-#: ../lib/modules/inetOrgPerson.inc:3666 ../lib/modules/inetOrgPerson.inc:3721
+#: ../lib/types/user.inc:219 ../lib/modules/inetOrgPerson.inc:72
+#: ../lib/modules/inetOrgPerson.inc:158 ../lib/modules/inetOrgPerson.inc:440
+#: ../lib/modules/inetOrgPerson.inc:593 ../lib/modules/inetOrgPerson.inc:722
+#: ../lib/modules/inetOrgPerson.inc:726 ../lib/modules/inetOrgPerson.inc:1477
+#: ../lib/modules/inetOrgPerson.inc:1480 ../lib/modules/inetOrgPerson.inc:1990
+#: ../lib/modules/inetOrgPerson.inc:3646 ../lib/modules/inetOrgPerson.inc:3701
 msgid "Mobile number"
 msgstr "手机号码"
 
-#: ../lib/modules/inetOrgPerson.inc:2569
+#: ../lib/modules/inetOrgPerson.inc:2565
 msgid "Mobile telephone number"
 msgstr "手机号码"
 
 #: ../lib/modules/qmailGroup.inc:86 ../lib/modules/qmailGroup.inc:212
 #: ../lib/modules/qmailGroup.inc:216 ../lib/modules/qmailGroup.inc:345
 #: ../lib/modules/qmailGroup.inc:405 ../lib/modules/qmailGroup.inc:427
-#: ../lib/modules/qmailGroup.inc:517 ../lib/modules/qmailGroup.inc:1016
+#: ../lib/modules/qmailGroup.inc:517 ../lib/modules/qmailGroup.inc:1014
 msgid "Moderator email addresses"
 msgstr "主持用户的邮件地址"
 
 #: ../lib/modules/qmailGroup.inc:84 ../lib/modules/qmailGroup.inc:164
 #: ../lib/modules/qmailGroup.inc:168 ../lib/modules/qmailGroup.inc:287
 #: ../lib/modules/qmailGroup.inc:384 ../lib/modules/qmailGroup.inc:518
-#: ../lib/modules/qmailGroup.inc:786 ../lib/modules/qmailGroup.inc:1015
+#: ../lib/modules/qmailGroup.inc:786 ../lib/modules/qmailGroup.inc:1013
 msgid "Moderator entries"
 msgstr "主持条目"
 
 #: ../lib/modules/qmailGroup.inc:76 ../lib/modules/qmailGroup.inc:106
 #: ../lib/modules/qmailGroup.inc:200 ../lib/modules/qmailGroup.inc:329
 #: ../lib/modules/qmailGroup.inc:399 ../lib/modules/qmailGroup.inc:603
-#: ../lib/modules/qmailGroup.inc:1011
+#: ../lib/modules/qmailGroup.inc:1009
 msgid "Moderator text"
 msgstr "主持文本"
 
@@ -7810,12 +7849,12 @@ msgstr "修改时间"
 msgid "Modified by"
 msgstr "修改者"
 
-#: ../templates/serverInfo.php:314 ../templates/serverInfo.php:387
-#: ../templates/multiEdit.php:130
+#: ../templates/serverInfo.php:315 ../templates/serverInfo.php:388
+#: ../templates/multiEdit.php:153
 msgid "Modify"
 msgstr "修改"
 
-#: ../templates/serverInfo.php:328 ../templates/serverInfo.php:393
+#: ../templates/serverInfo.php:329 ../templates/serverInfo.php:394
 msgid "Modify RDN"
 msgstr "修改RDN"
 
@@ -7833,18 +7872,18 @@ msgstr "修改组号"
 msgid "Modifying"
 msgstr "修改中"
 
-#: ../templates/config/confmodules.php:182 ../templates/config/jobList.php:166
-#: ../templates/config/jobs.php:169 ../templates/config/confmain.php:223
-#: ../templates/config/moduleSettings.php:181
-#: ../templates/config/conftypes.php:200
-#: ../templates/selfService/adminMain.php:407
+#: ../templates/config/confmodules.php:192 ../templates/config/jobList.php:166
+#: ../templates/config/jobs.php:169 ../templates/config/confmain.php:226
+#: ../templates/config/moduleSettings.php:186
+#: ../templates/config/conftypes.php:219
+#: ../templates/selfService/adminMain.php:423
 msgid "Module settings"
 msgstr "模块设置"
 
-#: ../templates/config/confmodules.php:178 ../templates/config/jobList.php:162
-#: ../templates/config/jobs.php:165 ../templates/config/confmain.php:219
-#: ../templates/config/moduleSettings.php:177
-#: ../templates/config/conftypes.php:196
+#: ../templates/config/confmodules.php:188 ../templates/config/jobList.php:162
+#: ../templates/config/jobs.php:165 ../templates/config/confmain.php:222
+#: ../templates/config/moduleSettings.php:182
+#: ../templates/config/conftypes.php:215
 msgid "Modules"
 msgstr "模块"
 
@@ -7852,18 +7891,18 @@ msgstr "模块"
 msgid "Monday"
 msgstr "星期一"
 
-#: ../lib/modules/quota.inc:105 ../lib/modules/quota.inc:399
-#: ../lib/modules/quota.inc:506 ../lib/modules/quota.inc:633
-#: ../lib/modules/systemQuotas.inc:97 ../lib/modules/systemQuotas.inc:122
-#: ../lib/modules/systemQuotas.inc:386
+#: ../lib/modules/quota.inc:108 ../lib/modules/quota.inc:402
+#: ../lib/modules/quota.inc:509 ../lib/modules/quota.inc:634
+#: ../lib/modules/systemQuotas.inc:100 ../lib/modules/systemQuotas.inc:125
+#: ../lib/modules/systemQuotas.inc:387
 msgid "Mountpoint"
 msgstr "挂接点"
 
-#: ../lib/modules/systemQuotas.inc:97 ../lib/modules/systemQuotas.inc:98
+#: ../lib/modules/systemQuotas.inc:100 ../lib/modules/systemQuotas.inc:101
 msgid "Mountpoint contains invalid characters."
 msgstr "装配点包含非法字符"
 
-#: ../lib/modules/quota.inc:106
+#: ../lib/modules/quota.inc:109
 msgid "Mountpoint of device with enabled quotas."
 msgstr "可限制配额设备挂接点"
 
@@ -7879,15 +7918,15 @@ msgstr "向下移动"
 msgid "Move up"
 msgstr "向上移动"
 
-#: ../templates/multiEdit.php:82 ../lib/tools/multiEdit.inc:44
+#: ../templates/multiEdit.php:101 ../lib/tools/multiEdit.inc:45
 msgid "Multi edit"
 msgstr "多次编辑"
 
-#: ../lib/modules/customFields.inc:1946 ../lib/modules/customFields.inc:3517
+#: ../lib/modules/customFields.inc:1944 ../lib/modules/customFields.inc:3515
 msgid "Multi value"
 msgstr "多值"
 
-#: ../lib/modules/customFields.inc:3358
+#: ../lib/modules/customFields.inc:3356
 msgid "Multi-select fields must not contain empty values."
 msgstr "多选域不能包含空值."
 
@@ -7895,7 +7934,7 @@ msgstr "多选域不能包含空值."
 #: ../lib/modules/zarafaDynamicGroup.inc:76 ../lib/modules/zarafaGroup.inc:83
 #: ../lib/modules/eduPerson.inc:98 ../lib/modules/eduPerson.inc:111
 #: ../lib/modules/eduPerson.inc:123 ../lib/modules/eduPerson.inc:139
-#: ../lib/modules/eduPerson.inc:147 ../lib/modules/zarafaUser.inc:178
+#: ../lib/modules/eduPerson.inc:147 ../lib/modules/zarafaUser.inc:181
 #: ../lib/modules/sudoRole.inc:100 ../lib/modules/sudoRole.inc:105
 #: ../lib/modules/sudoRole.inc:110 ../lib/modules/sudoRole.inc:115
 #: ../lib/modules/sudoRole.inc:120 ../lib/modules/sudoRole.inc:125
@@ -7904,34 +7943,34 @@ msgstr "用逗号分隔多值."
 
 #: ../lib/modules/kolabGroup.inc:92 ../lib/modules/kolabGroup.inc:101
 #: ../lib/modules/kolabGroup.inc:110 ../lib/modules/nisMailAliasUser.inc:81
-#: ../lib/modules/nisMailAliasUser.inc:89 ../lib/modules/puppetClient.inc:90
-#: ../lib/modules/puppetClient.inc:102 ../lib/modules/puppetClient.inc:110
-#: ../lib/modules/device.inc:74 ../lib/modules/bindDLZ.inc:98
-#: ../lib/modules/bindDLZ.inc:107 ../lib/modules/bindDLZ.inc:112
-#: ../lib/modules/bindDLZ.inc:117 ../lib/modules/bindDLZ.inc:122
-#: ../lib/modules/bindDLZ.inc:127 ../lib/modules/bindDLZ.inc:132
-#: ../lib/modules/bindDLZ.inc:144 ../lib/modules/bindDLZ.inc:152
-#: ../lib/modules/bindDLZ.inc:160 ../lib/modules/bindDLZ.inc:168
-#: ../lib/modules/bindDLZ.inc:176 ../lib/modules/bindDLZ.inc:184
-#: ../lib/modules/bindDLZ.inc:192 ../lib/modules/bindDLZ.inc:200
-#: ../lib/modules/bindDLZ.inc:208 ../lib/modules/windowsUser.inc:163
+#: ../lib/modules/nisMailAliasUser.inc:89 ../lib/modules/puppetClient.inc:93
+#: ../lib/modules/puppetClient.inc:105 ../lib/modules/puppetClient.inc:113
+#: ../lib/modules/device.inc:77 ../lib/modules/bindDLZ.inc:101
+#: ../lib/modules/bindDLZ.inc:110 ../lib/modules/bindDLZ.inc:115
+#: ../lib/modules/bindDLZ.inc:120 ../lib/modules/bindDLZ.inc:125
+#: ../lib/modules/bindDLZ.inc:130 ../lib/modules/bindDLZ.inc:135
+#: ../lib/modules/bindDLZ.inc:147 ../lib/modules/bindDLZ.inc:155
+#: ../lib/modules/bindDLZ.inc:163 ../lib/modules/bindDLZ.inc:171
+#: ../lib/modules/bindDLZ.inc:179 ../lib/modules/bindDLZ.inc:187
+#: ../lib/modules/bindDLZ.inc:195 ../lib/modules/bindDLZ.inc:203
+#: ../lib/modules/bindDLZ.inc:211 ../lib/modules/windowsUser.inc:163
 #: ../lib/modules/windowsUser.inc:203 ../lib/modules/windowsUser.inc:237
 #: ../lib/modules/windowsUser.inc:248 ../lib/modules/windowsUser.inc:319
 #: ../lib/modules/windowsUser.inc:327 ../lib/modules/windowsUser.inc:335
 #: ../lib/modules/windowsUser.inc:343 ../lib/modules/windowsUser.inc:363
 #: ../lib/modules/windowsUser.inc:375 ../lib/modules/windowsUser.inc:383
-#: ../lib/modules/kolabUser.inc:158 ../lib/modules/kolabUser.inc:167
-#: ../lib/modules/inetOrgPerson.inc:661 ../lib/modules/inetOrgPerson.inc:681
-#: ../lib/modules/inetOrgPerson.inc:689 ../lib/modules/inetOrgPerson.inc:697
-#: ../lib/modules/inetOrgPerson.inc:705 ../lib/modules/inetOrgPerson.inc:721
-#: ../lib/modules/inetOrgPerson.inc:729 ../lib/modules/inetOrgPerson.inc:737
-#: ../lib/modules/inetOrgPerson.inc:745 ../lib/modules/inetOrgPerson.inc:753
-#: ../lib/modules/inetOrgPerson.inc:764 ../lib/modules/inetOrgPerson.inc:784
-#: ../lib/modules/inetOrgPerson.inc:796 ../lib/modules/inetOrgPerson.inc:804
-#: ../lib/modules/inetOrgPerson.inc:812 ../lib/modules/inetOrgPerson.inc:824
-#: ../lib/modules/inetOrgPerson.inc:832 ../lib/modules/inetOrgPerson.inc:849
-#: ../lib/modules/inetOrgPerson.inc:857 ../lib/modules/inetOrgPerson.inc:865
-#: ../lib/modules/systemQuotas.inc:70 ../lib/modules/freeRadius.inc:105
+#: ../lib/modules/kolabUser.inc:161 ../lib/modules/kolabUser.inc:170
+#: ../lib/modules/inetOrgPerson.inc:659 ../lib/modules/inetOrgPerson.inc:679
+#: ../lib/modules/inetOrgPerson.inc:687 ../lib/modules/inetOrgPerson.inc:695
+#: ../lib/modules/inetOrgPerson.inc:703 ../lib/modules/inetOrgPerson.inc:719
+#: ../lib/modules/inetOrgPerson.inc:727 ../lib/modules/inetOrgPerson.inc:735
+#: ../lib/modules/inetOrgPerson.inc:743 ../lib/modules/inetOrgPerson.inc:751
+#: ../lib/modules/inetOrgPerson.inc:762 ../lib/modules/inetOrgPerson.inc:782
+#: ../lib/modules/inetOrgPerson.inc:794 ../lib/modules/inetOrgPerson.inc:802
+#: ../lib/modules/inetOrgPerson.inc:810 ../lib/modules/inetOrgPerson.inc:822
+#: ../lib/modules/inetOrgPerson.inc:830 ../lib/modules/inetOrgPerson.inc:847
+#: ../lib/modules/inetOrgPerson.inc:855 ../lib/modules/inetOrgPerson.inc:863
+#: ../lib/modules/systemQuotas.inc:73 ../lib/modules/freeRadius.inc:105
 #: ../lib/modules/kolabSharedFolder.inc:126
 #: ../lib/modules/kolabSharedFolder.inc:135 ../lib/modules/qmailGroup.inc:128
 #: ../lib/modules/qmailGroup.inc:136 ../lib/modules/qmailGroup.inc:149
@@ -7939,7 +7978,7 @@ msgstr "用逗号分隔多值."
 #: ../lib/modules/qmailGroup.inc:177 ../lib/modules/qmailGroup.inc:185
 #: ../lib/modules/qmailGroup.inc:193 ../lib/modules/qmailGroup.inc:209
 #: ../lib/modules/qmailGroup.inc:217 ../lib/modules/qmailGroup.inc:225
-#: ../lib/modules/groupOfNames.inc:98
+#: ../lib/modules/groupOfNames.inc:101
 msgid "Multiple values are separated by semicolon."
 msgstr "用逗号分隔多值."
 
@@ -7947,8 +7986,8 @@ msgstr "用逗号分隔多值."
 #: ../lib/modules/asteriskAccount.inc:290
 #: ../lib/modules/asteriskAccount.inc:486
 #: ../lib/modules/asteriskAccount.inc:717
-#: ../lib/modules/asteriskAccount.inc:1009
-#: ../lib/modules/asteriskAccount.inc:1284
+#: ../lib/modules/asteriskAccount.inc:1007
+#: ../lib/modules/asteriskAccount.inc:1282
 msgid "Music on hold"
 msgstr "彩铃"
 
@@ -7957,9 +7996,9 @@ msgid "Music to play on hold."
 msgstr "彩铃"
 
 #: ../lib/modules/ipHost.inc:99 ../lib/modules/windowsHost.inc:108
-#: ../lib/modules/device.inc:111 ../lib/modules/windowsUser.inc:468
-#: ../lib/modules/inetOrgPerson.inc:404 ../lib/modules/inetOrgPerson.inc:412
-#: ../lib/modules/inetOrgPerson.inc:526
+#: ../lib/modules/device.inc:114 ../lib/modules/windowsUser.inc:468
+#: ../lib/modules/inetOrgPerson.inc:402 ../lib/modules/inetOrgPerson.inc:410
+#: ../lib/modules/inetOrgPerson.inc:524
 msgid "MyCity"
 msgstr "城市"
 
@@ -7967,7 +8006,7 @@ msgstr "城市"
 msgid "MySQL"
 msgstr "MYSQL"
 
-#: ../lib/modules/windowsUser.inc:450 ../lib/modules/inetOrgPerson.inc:388
+#: ../lib/modules/windowsUser.inc:450 ../lib/modules/inetOrgPerson.inc:386
 msgid "Mystreetname 42"
 msgstr "街道42号"
 
@@ -7975,8 +8014,8 @@ msgstr "街道42号"
 #: ../lib/modules/asteriskAccount.inc:279
 #: ../lib/modules/asteriskAccount.inc:406
 #: ../lib/modules/asteriskAccount.inc:669
-#: ../lib/modules/asteriskAccount.inc:998
-#: ../lib/modules/asteriskAccount.inc:1262
+#: ../lib/modules/asteriskAccount.inc:996
+#: ../lib/modules/asteriskAccount.inc:1260
 msgid "NAT"
 msgstr "NAT"
 
@@ -7984,47 +8023,47 @@ msgstr "NAT"
 msgid "NAT setting for this account."
 msgstr "此帐号的NAT设置"
 
-#: ../lib/modules/windowsUser.inc:1236 ../lib/modules/windowsGroup.inc:377
+#: ../lib/modules/windowsUser.inc:1236 ../lib/modules/windowsGroup.inc:380
 msgid "NIS"
 msgstr "NIS"
 
 #: ../lib/modules/windowsUser.inc:270 ../lib/modules/windowsUser.inc:662
 #: ../lib/modules/windowsUser.inc:749 ../lib/modules/windowsUser.inc:859
-#: ../lib/modules/windowsUser.inc:1241 ../lib/modules/windowsUser.inc:2453
-#: ../lib/modules/windowsUser.inc:3217 ../lib/modules/windowsGroup.inc:160
-#: ../lib/modules/windowsGroup.inc:175 ../lib/modules/windowsGroup.inc:249
-#: ../lib/modules/windowsGroup.inc:257 ../lib/modules/windowsGroup.inc:281
-#: ../lib/modules/windowsGroup.inc:382 ../lib/modules/windowsGroup.inc:916
+#: ../lib/modules/windowsUser.inc:1241 ../lib/modules/windowsUser.inc:2451
+#: ../lib/modules/windowsUser.inc:3215 ../lib/modules/windowsGroup.inc:163
+#: ../lib/modules/windowsGroup.inc:178 ../lib/modules/windowsGroup.inc:252
+#: ../lib/modules/windowsGroup.inc:260 ../lib/modules/windowsGroup.inc:284
+#: ../lib/modules/windowsGroup.inc:385 ../lib/modules/windowsGroup.inc:917
 msgid "NIS domain"
 msgstr "NIS域"
 
-#: ../lib/modules/windowsUser.inc:271 ../lib/modules/windowsGroup.inc:161
+#: ../lib/modules/windowsUser.inc:271 ../lib/modules/windowsGroup.inc:164
 msgid "NIS domain name."
 msgstr "NIS 域名"
 
 #: ../lib/modules/windowsUser.inc:266 ../lib/modules/windowsUser.inc:654
 #: ../lib/modules/windowsUser.inc:856 ../lib/modules/windowsUser.inc:991
-#: ../lib/modules/windowsUser.inc:1238 ../lib/modules/windowsUser.inc:2452
-#: ../lib/modules/windowsUser.inc:3216 ../lib/modules/windowsGroup.inc:156
-#: ../lib/modules/windowsGroup.inc:174 ../lib/modules/windowsGroup.inc:241
-#: ../lib/modules/windowsGroup.inc:278 ../lib/modules/windowsGroup.inc:296
-#: ../lib/modules/windowsGroup.inc:379 ../lib/modules/windowsGroup.inc:915
+#: ../lib/modules/windowsUser.inc:1238 ../lib/modules/windowsUser.inc:2450
+#: ../lib/modules/windowsUser.inc:3214 ../lib/modules/windowsGroup.inc:159
+#: ../lib/modules/windowsGroup.inc:177 ../lib/modules/windowsGroup.inc:244
+#: ../lib/modules/windowsGroup.inc:281 ../lib/modules/windowsGroup.inc:299
+#: ../lib/modules/windowsGroup.inc:382 ../lib/modules/windowsGroup.inc:916
 msgid "NIS name"
 msgstr "NIS名"
 
 #: ../lib/modules/windowsUser.inc:991 ../lib/modules/windowsUser.inc:992
-#: ../lib/modules/windowsGroup.inc:296 ../lib/modules/windowsGroup.inc:297
+#: ../lib/modules/windowsGroup.inc:299 ../lib/modules/windowsGroup.inc:300
 msgid ""
 "NIS name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
 msgstr "NIS名包含非法字符,合法字符包括 a-z, A-Z, 0-9 和 .-_!"
 
-#: ../lib/modules/nisnetgroup.inc:67
+#: ../lib/modules/nisnetgroup.inc:70
 msgid "NIS net group"
 msgstr "NIS网络组"
 
-#: ../lib/modules/nisNetGroupUser.inc:70 ../lib/modules/nisNetGroupUser.inc:72
-#: ../lib/modules/nisNetGroupUser.inc:76
+#: ../lib/modules/nisNetGroupUser.inc:73 ../lib/modules/nisNetGroupUser.inc:75
+#: ../lib/modules/nisNetGroupUser.inc:79
 msgid "NIS net groups"
 msgstr "NIS网络组"
 
@@ -8053,44 +8092,44 @@ msgstr "NIS 对象条目"
 msgid "NIS objects"
 msgstr "NIS 对象"
 
-#: ../lib/modules/bindDLZ.inc:120 ../lib/modules/bindDLZ.inc:364
-#: ../lib/modules/bindDLZ.inc:370 ../lib/modules/bindDLZ.inc:489
+#: ../lib/modules/bindDLZ.inc:123 ../lib/modules/bindDLZ.inc:367
+#: ../lib/modules/bindDLZ.inc:373 ../lib/modules/bindDLZ.inc:492
 msgid "NS record"
 msgstr "NS条目"
 
-#: ../templates/serverInfo.php:147 ../templates/masscreate.php:294
-#: ../templates/masscreate.php:368 ../templates/config/jobList.php:216
-#: ../templates/schema/schema.php:268 ../lib/types/automountType.inc:86
-#: ../lib/types/automountType.inc:249 ../lib/types/nsviewType.inc:77
+#: ../templates/serverInfo.php:148 ../templates/config/jobList.php:216
+#: ../templates/schema/schema.php:269 ../templates/upload/masscreate.php:320
+#: ../templates/upload/masscreate.php:394 ../lib/types/automountType.inc:86
+#: ../lib/types/automountType.inc:226 ../lib/types/nsviewType.inc:77
 #: ../lib/types/oracleContextType.inc:77 ../lib/types/ppolicyType.inc:77
-#: ../lib/types/bind.inc:190 ../lib/modules/device.inc:61
-#: ../lib/modules/device.inc:89 ../lib/modules/device.inc:120
-#: ../lib/modules/device.inc:170 ../lib/modules/device.inc:409
-#: ../lib/modules/range.inc:117 ../lib/modules/range.inc:138
-#: ../lib/modules/range.inc:553 ../lib/modules/nisObject.inc:61
+#: ../lib/types/bind.inc:167 ../lib/modules/device.inc:64
+#: ../lib/modules/device.inc:92 ../lib/modules/device.inc:123
+#: ../lib/modules/device.inc:173 ../lib/modules/device.inc:410
+#: ../lib/modules/range.inc:120 ../lib/modules/range.inc:141
+#: ../lib/modules/range.inc:556 ../lib/modules/nisObject.inc:61
 #: ../lib/modules/nisObject.inc:81 ../lib/modules/nisObject.inc:111
-#: ../lib/modules/nisObject.inc:137 ../lib/modules/nisObject.inc:212
+#: ../lib/modules/nisObject.inc:137 ../lib/modules/nisObject.inc:210
 #: ../lib/modules/ppolicy.inc:80 ../lib/modules/ppolicy.inc:142
 #: ../lib/modules/ppolicy.inc:165 ../lib/modules/ppolicy.inc:190
-#: ../lib/modules/ppolicy.inc:472 ../lib/modules/automount.inc:64
+#: ../lib/modules/ppolicy.inc:470 ../lib/modules/automount.inc:64
 #: ../lib/modules/automount.inc:80 ../lib/modules/automount.inc:103
-#: ../lib/modules/automount.inc:128 ../lib/modules/automount.inc:184
+#: ../lib/modules/automount.inc:128 ../lib/modules/automount.inc:182
 #: ../lib/modules/kolabSharedFolder.inc:112
 #: ../lib/modules/kolabSharedFolder.inc:174
 #: ../lib/modules/kolabSharedFolder.inc:233
 #: ../lib/modules/kolabSharedFolder.inc:261
 #: ../lib/modules/kolabSharedFolder.inc:279
-#: ../lib/modules/kolabSharedFolder.inc:520
+#: ../lib/modules/kolabSharedFolder.inc:518
 #: ../lib/modules/asteriskExtension.inc:822 ../lib/modules/nsview.inc:64
 #: ../lib/modules/nsview.inc:71 ../lib/modules/nsview.inc:87
 #: ../lib/modules/nsview.inc:110 ../lib/modules/nsview.inc:124
-#: ../lib/modules/nsview.inc:163 ../lib/modules/oracleService.inc:61
+#: ../lib/modules/nsview.inc:161 ../lib/modules/oracleService.inc:61
 #: ../lib/modules/oracleService.inc:77 ../lib/modules/oracleService.inc:98
-#: ../lib/modules/oracleService.inc:121 ../lib/modules/oracleService.inc:173
-#: ../lib/modules/customFields.inc:84 ../lib/modules/customFields.inc:1046
-#: ../lib/modules/customFields.inc:1712
-#: ../lib/modules/organizationalRole.inc:186
-#: ../lib/modules/groupOfNames.inc:234
+#: ../lib/modules/oracleService.inc:121 ../lib/modules/oracleService.inc:171
+#: ../lib/modules/customFields.inc:84 ../lib/modules/customFields.inc:1044
+#: ../lib/modules/customFields.inc:1710
+#: ../lib/modules/organizationalRole.inc:189
+#: ../lib/modules/groupOfNames.inc:237
 msgid "Name"
 msgstr "名"
 
@@ -8102,17 +8141,17 @@ msgstr "新别名条目的名字"
 msgid "Name of the address list which should be created."
 msgstr "将要建立的地址列表名"
 
-#: ../lib/modules/bindDLZ.inc:155 ../lib/modules/bindDLZ.inc:159
-#: ../lib/modules/bindDLZ.inc:364 ../lib/modules/bindDLZ.inc:506
-#: ../lib/modules/bindDLZ.inc:1169
+#: ../lib/modules/bindDLZ.inc:158 ../lib/modules/bindDLZ.inc:162
+#: ../lib/modules/bindDLZ.inc:367 ../lib/modules/bindDLZ.inc:509
+#: ../lib/modules/bindDLZ.inc:1172
 msgid "Name server"
 msgstr "DNS服务器"
 
-#: ../lib/modules/bindDLZ.inc:431 ../lib/modules/bindDLZ.inc:1569
+#: ../lib/modules/bindDLZ.inc:434 ../lib/modules/bindDLZ.inc:1570
 msgid "Name servers"
 msgstr "域名服务器"
 
-#: ../lib/modules/bindDLZ.inc:1167
+#: ../lib/modules/bindDLZ.inc:1170
 msgid "Name servers (\"NS\" records)"
 msgstr "DNS服务器 (\"NS\" 记录)"
 
@@ -8127,23 +8166,23 @@ msgid "Named object"
 msgstr "已命名对象"
 
 #: ../lib/modules/dhcp_settings.inc:198 ../lib/modules/dhcp_settings.inc:221
-#: ../lib/modules/dhcp_settings.inc:612 ../lib/modules/dhcp_settings.inc:688
+#: ../lib/modules/dhcp_settings.inc:612 ../lib/modules/dhcp_settings.inc:686
 #: ../lib/modules/freeRadius.inc:92 ../lib/modules/freeRadius.inc:134
 #: ../lib/modules/freeRadius.inc:214 ../lib/modules/freeRadius.inc:258
 #: ../lib/modules/freeRadius.inc:308 ../lib/modules/freeRadius.inc:367
-#: ../lib/modules/freeRadius.inc:696
+#: ../lib/modules/freeRadius.inc:694
 msgid "Net mask"
 msgstr "子网掩码"
 
 #: ../lib/modules/dhcp_settings.inc:174 ../lib/modules/dhcp_settings.inc:218
 #: ../lib/modules/dhcp_settings.inc:233 ../lib/modules/dhcp_settings.inc:285
-#: ../lib/modules/dhcp_settings.inc:583 ../lib/modules/dhcp_settings.inc:682
+#: ../lib/modules/dhcp_settings.inc:583 ../lib/modules/dhcp_settings.inc:680
 msgid "Netbios name servers"
 msgstr "Netbios命名服务器"
 
 #: ../lib/modules/dhcp_settings.inc:178 ../lib/modules/dhcp_settings.inc:219
 #: ../lib/modules/dhcp_settings.inc:235 ../lib/modules/dhcp_settings.inc:291
-#: ../lib/modules/dhcp_settings.inc:593 ../lib/modules/dhcp_settings.inc:683
+#: ../lib/modules/dhcp_settings.inc:593 ../lib/modules/dhcp_settings.inc:681
 msgid "Netbios node type"
 msgstr "Netbios 节点类型"
 
@@ -8151,7 +8190,7 @@ msgstr "Netbios 节点类型"
 msgid "New DHCP"
 msgstr "新DHCP"
 
-#: ../lib/types/bind.inc:100 ../lib/types/bind.inc:161
+#: ../lib/types/bind.inc:100 ../lib/types/bind.inc:138
 msgid "New DNS entry"
 msgstr "新DNS条目"
 
@@ -8159,11 +8198,11 @@ msgstr "新DNS条目"
 msgid "New NIS object"
 msgstr "新 NIS 对象"
 
-#: ../templates/ou_edit.php:81
+#: ../templates/ou_edit.php:91
 msgid "New OU created successfully."
 msgstr "新OU建立成功."
 
-#: ../lib/modules/windowsUser.inc:474 ../lib/modules/inetOrgPerson.inc:534
+#: ../lib/modules/windowsUser.inc:474 ../lib/modules/inetOrgPerson.inc:532
 msgid "New York"
 msgstr "纽约"
 
@@ -8177,11 +8216,11 @@ msgstr "新地址列表"
 msgid "New alias"
 msgstr "新别名"
 
-#: ../lib/types/automountType.inc:110 ../lib/types/automountType.inc:217
+#: ../lib/types/automountType.inc:110 ../lib/types/automountType.inc:194
 msgid "New automount entry"
 msgstr "新自动安装条目"
 
-#: ../lib/types/automountType.inc:233 ../lib/types/automountType.inc:234
+#: ../lib/types/automountType.inc:210 ../lib/types/automountType.inc:211
 msgid "New automount map"
 msgstr "新自动装配图"
 
@@ -8191,7 +8230,7 @@ msgid "New billing code"
 msgstr "新账单号"
 
 #: ../lib/types/oracleContextType.inc:101
-#: ../lib/types/oracleContextType.inc:188
+#: ../lib/types/oracleContextType.inc:169
 msgid "New database entry"
 msgstr "新数据库条目"
 
@@ -8207,7 +8246,7 @@ msgstr "新域"
 msgid "New extension"
 msgstr "新扩展"
 
-#: ../templates/pdfedit/pdfpage.php:624
+#: ../templates/pdfedit/pdfpage.php:641
 msgid "New field"
 msgstr "新字段"
 
@@ -8235,17 +8274,17 @@ msgstr "新管理员密码"
 msgid "New master password set successfully."
 msgstr "新管理员密码设置成功."
 
-#: ../lib/lists.inc:114
+#: ../lib/lists.inc:116
 msgid "New object"
 msgstr "新对象"
 
-#: ../templates/ou_edit.php:190 ../help/help.inc:301
+#: ../templates/ou_edit.php:202 ../help/help.inc:313
 msgid "New organisational unit"
 msgstr "新组织单元"
 
-#: ../templates/config/confmain.php:528 ../lib/modules/sambaSamAccount.inc:2313
-#: ../lib/modules/posixAccount.inc:2746 ../lib/modules/windowsUser.inc:2597
-#: ../lib/modules/passwordSelfReset.inc:1279
+#: ../templates/config/confmain.php:563 ../lib/modules/sambaSamAccount.inc:2311
+#: ../lib/modules/posixAccount.inc:2744 ../lib/modules/windowsUser.inc:2595
+#: ../lib/modules/passwordSelfReset.inc:1277
 msgid "New password"
 msgstr "新密码"
 
@@ -8257,7 +8296,7 @@ msgstr "新密码设置成功."
 msgid "New policy"
 msgstr "新策略"
 
-#: ../lib/modules/range.inc:113 ../lib/modules/range.inc:627
+#: ../lib/modules/range.inc:116 ../lib/modules/range.inc:630
 msgid "New pool"
 msgstr "新地址池"
 
@@ -8271,8 +8310,8 @@ msgstr "新打印机"
 msgid "New profile name"
 msgstr "新配置文件名"
 
-#: ../lib/modules/range.inc:109 ../lib/modules/range.inc:136
-#: ../lib/modules/range.inc:542 ../lib/modules/range.inc:616
+#: ../lib/modules/range.inc:112 ../lib/modules/range.inc:139
+#: ../lib/modules/range.inc:545 ../lib/modules/range.inc:619
 msgid "New range"
 msgstr "新范围"
 
@@ -8288,7 +8327,7 @@ msgstr "新必要属性"
 msgid "New role"
 msgstr "新角色"
 
-#: ../templates/pdfedit/pdfpage.php:592
+#: ../templates/pdfedit/pdfpage.php:608
 msgid "New section"
 msgstr "新节"
 
@@ -8305,7 +8344,7 @@ msgstr "新sudo角色"
 msgid "New user"
 msgstr "新用户"
 
-#: ../lib/modules/inetOrgPerson.inc:1917
+#: ../lib/modules/inetOrgPerson.inc:1915
 msgid "New user certificate"
 msgstr "新用户认证"
 
@@ -8318,13 +8357,13 @@ msgstr "新值"
 msgid "New view"
 msgstr "新视图"
 
-#: ../lib/types/bind.inc:174 ../lib/types/bind.inc:175
+#: ../lib/types/bind.inc:151 ../lib/types/bind.inc:152
 msgid "New zone"
 msgstr "新域"
 
 #: ../lib/modules/sambaDomain.inc:85 ../lib/modules/sambaDomain.inc:165
 #: ../lib/modules/sambaDomain.inc:186 ../lib/modules/sambaDomain.inc:361
-#: ../lib/modules/sambaDomain.inc:602
+#: ../lib/modules/sambaDomain.inc:600
 msgid "Next RID"
 msgstr "下一个RID"
 
@@ -8346,7 +8385,7 @@ msgstr "建立用户帐号使用的下一个RID(Winbind)."
 
 #: ../lib/modules/sambaDomain.inc:93 ../lib/modules/sambaDomain.inc:177
 #: ../lib/modules/sambaDomain.inc:188 ../lib/modules/sambaDomain.inc:377
-#: ../lib/modules/sambaDomain.inc:604
+#: ../lib/modules/sambaDomain.inc:602
 msgid "Next group RID"
 msgstr "下一个组的RID"
 
@@ -8356,7 +8395,7 @@ msgstr "下一个组的RID不是数字!"
 
 #: ../lib/modules/sambaDomain.inc:89 ../lib/modules/sambaDomain.inc:171
 #: ../lib/modules/sambaDomain.inc:187 ../lib/modules/sambaDomain.inc:369
-#: ../lib/modules/sambaDomain.inc:603
+#: ../lib/modules/sambaDomain.inc:601
 msgid "Next user RID"
 msgstr "下一个用户的RID"
 
@@ -8366,21 +8405,21 @@ msgstr "下一个用户的RID不是数字!"
 
 #: ../lib/modules/eduPerson.inc:101 ../lib/modules/eduPerson.inc:188
 #: ../lib/modules/eduPerson.inc:226 ../lib/modules/eduPerson.inc:342
-#: ../lib/modules/eduPerson.inc:561
+#: ../lib/modules/eduPerson.inc:559
 msgid "Nick names"
 msgstr "昵称"
 
-#: ../templates/schema/schema.php:153 ../templates/schema/schema.php:195
-#: ../templates/schema/schema.php:200 ../templates/schema/schema.php:205
-#: ../templates/pdfedit/pdfpage.php:464 ../lib/modules/pykotaPrinter.inc:52
+#: ../templates/schema/schema.php:154 ../templates/schema/schema.php:196
+#: ../templates/schema/schema.php:201 ../templates/schema/schema.php:206
+#: ../templates/pdfedit/pdfpage.php:479 ../lib/modules/pykotaPrinter.inc:52
 #: ../lib/modules/pykotaPrinter.inc:168 ../lib/modules/pykotaPrinter.inc:169
 #: ../lib/modules/pykotaPrinter.inc:170 ../lib/modules/freeRadius.inc:161
-#: ../lib/modules/freeRadius.inc:414 ../lib/modules/freeRadius.inc:707
+#: ../lib/modules/freeRadius.inc:414 ../lib/modules/freeRadius.inc:705
 #: ../lib/modules/qmailGroup.inc:321 ../lib/modules/qmailGroup.inc:322
 #: ../lib/modules/qmailGroup.inc:323 ../lib/modules/qmailGroup.inc:363
 #: ../lib/modules/qmailGroup.inc:364 ../lib/modules/qmailGroup.inc:365
-#: ../lib/modules/qmailGroup.inc:977 ../lib/modules/qmailGroup.inc:1021
-#: ../lib/modules/qmailGroup.inc:1027 ../lib/modules/imapAccess.inc:468
+#: ../lib/modules/qmailGroup.inc:977 ../lib/modules/qmailGroup.inc:1019
+#: ../lib/modules/qmailGroup.inc:1025 ../lib/modules/imapAccess.inc:468
 msgid "No"
 msgstr "否"
 
@@ -8392,7 +8431,7 @@ msgstr "没有发现Asterisk 扩展."
 msgid "No DHCPs found!"
 msgstr "没有发现DHCP主机!"
 
-#: ../lib/types/bind.inc:160
+#: ../lib/types/bind.inc:137
 msgid "No DNS entries found!"
 msgstr "未发现DNS条目!"
 
@@ -8426,7 +8465,7 @@ msgstr "没有发现地址列表!"
 msgid "No aliases found!"
 msgstr "没有发现别名!"
 
-#: ../lib/types/automountType.inc:216
+#: ../lib/types/automountType.inc:193
 msgid "No automount entries found!"
 msgstr "未发现自动挂接条目!"
 
@@ -8438,7 +8477,7 @@ msgstr "没有发现账单号!"
 msgid "No binary data available"
 msgstr "没有可用的二进制数据"
 
-#: ../templates/initsuff.php:168
+#: ../templates/initsuff.php:169
 msgid "No changes were made."
 msgstr "未做任何修改."
 
@@ -8447,16 +8486,16 @@ msgstr "未做任何修改."
 msgid "No current value for attribute <b>%s</b>."
 msgstr "属性<b>%s</b>没有当前值."
 
-#: ../lib/types/oracleContextType.inc:187
+#: ../lib/types/oracleContextType.inc:168
 msgid "No database entries found!"
 msgstr "未发现数据库条目!"
 
-#: ../templates/login.php:110
+#: ../templates/login.php:112
 msgid ""
 "No default profile set. Please set it in the server profile configuration."
 msgstr "没有指定缺省的配置文件. 请在服务器配置中指定."
 
-#: ../templates/schema/schema.php:144
+#: ../templates/schema/schema.php:145
 msgid "No description"
 msgstr "没有描述"
 
@@ -8464,7 +8503,7 @@ msgstr "没有描述"
 msgid "No domains found!"
 msgstr "没有发现域!"
 
-#: ../lib/modules/passwordSelfReset.inc:1792
+#: ../lib/modules/passwordSelfReset.inc:1790
 msgid "No email address found."
 msgstr "没有发现邮件地址. "
 
@@ -8473,14 +8512,14 @@ msgstr "没有发现邮件地址. "
 msgid "No entry was selected to delete"
 msgstr "没有选中要删除的条目"
 
-#: ../lib/modules/ldapPublicKey.inc:582 ../lib/modules/inetOrgPerson.inc:3357
-#: ../lib/modules/customFields.inc:3858
+#: ../lib/modules/ldapPublicKey.inc:583 ../lib/modules/inetOrgPerson.inc:3359
+#: ../lib/modules/customFields.inc:3856
 msgid "No file received."
 msgstr "没有收到文件."
 
 #: ../templates/config/mainmanage.php:169 ../lib/modules/windowsUser.inc:1002
-#: ../lib/modules/ldapPublicKey.inc:128 ../lib/modules/inetOrgPerson.inc:101
-#: ../lib/modules/customFields.inc:3793
+#: ../lib/modules/ldapPublicKey.inc:131 ../lib/modules/inetOrgPerson.inc:99
+#: ../lib/modules/customFields.inc:3791
 msgid "No file selected."
 msgstr "没有选择文件!"
 
@@ -8488,7 +8527,7 @@ msgstr "没有选择文件!"
 msgid "No forwarding"
 msgstr "不能转发"
 
-#: ../lib/modules/posixGroup.inc:661 ../lib/modules/posixAccount.inc:104
+#: ../lib/modules/posixGroup.inc:659 ../lib/modules/posixAccount.inc:104
 msgid "No free ID-Number!"
 msgstr "没有可用的ID号!"
 
@@ -8513,12 +8552,12 @@ msgstr "没有导入的来源"
 msgid "No internal attributes"
 msgstr "没有内部属性"
 
-#: ../templates/tests/lamdaemonTest.php:195
+#: ../templates/tests/lamdaemonTest.php:196
 msgid "No lamdaemon path set, please update your LAM configuration settings."
 msgstr "没有设定lamdaemon路径设置,请更改LAM配置."
 
-#: ../templates/tests/lamdaemonTest.php:97
-#: ../templates/tests/lamdaemonTest.php:190
+#: ../templates/tests/lamdaemonTest.php:98
+#: ../templates/tests/lamdaemonTest.php:191
 msgid "No lamdaemon server set, please update your LAM configuration settings."
 msgstr "没有设置lamdaemon服务器,请先设置LAM配置."
 
@@ -8530,7 +8569,7 @@ msgstr "没有本地发送"
 msgid "No logging"
 msgstr "无日志"
 
-#: ../templates/pdfedit/pdfpage.php:433
+#: ../templates/pdfedit/pdfpage.php:448
 msgid "No logo"
 msgstr "无标志"
 
@@ -8538,20 +8577,20 @@ msgstr "无标志"
 msgid "No new attributes available for this entry"
 msgstr "本条目没有新的可用属性"
 
-#: ../templates/config/conftypes.php:338 ../help/help.inc:178
+#: ../templates/config/conftypes.php:356 ../help/help.inc:178
 msgid "No new entries"
 msgstr "没有新条目"
 
-#: ../templates/multiEdit.php:320 ../lib/lists.inc:113
+#: ../templates/multiEdit.php:343 ../lib/lists.inc:115
 msgid "No objects found!"
 msgstr "未发现对象!"
 
-#: ../templates/config/confmodules.php:435
+#: ../templates/config/confmodules.php:443
 msgid "No or more than one base module selected!"
 msgstr "未选择基本模块或选择多于一个!"
 
-#: ../templates/config/confsave.php:53 ../templates/config/confmain.php:55
-#: ../lib/modules/passwordSelfReset.inc:1405
+#: ../templates/config/confsave.php:53 ../templates/config/confmain.php:58
+#: ../lib/modules/passwordSelfReset.inc:1403
 msgid "No password was entered!"
 msgstr "没有输入密码!"
 
@@ -8563,7 +8602,7 @@ msgstr "没有发现策略!"
 msgid "No printers found!"
 msgstr "未发现打印机!"
 
-#: ../templates/tests/schemaTest.php:70
+#: ../templates/tests/schemaTest.php:73
 msgid "No problems found."
 msgstr "未发现问题!"
 
@@ -8575,7 +8614,7 @@ msgstr "未发现配置文件"
 msgid "No program delivery"
 msgstr "没有程序发送"
 
-#: ../lib/modules/pykotaGroup.inc:63 ../lib/modules/pykotaUser.inc:63
+#: ../lib/modules/pykotaGroup.inc:63 ../lib/modules/pykotaUser.inc:66
 msgid "No quota"
 msgstr "无限额"
 
@@ -8587,11 +8626,11 @@ msgstr "未发现角色!"
 msgid "No scripts to run."
 msgstr "没有运行的脚本"
 
-#: ../templates/pdfedit/pdfpage.php:141
+#: ../templates/pdfedit/pdfpage.php:159
 msgid "No section text specified"
 msgstr "没有指定段文本"
 
-#: ../lib/modules/passwordSelfReset.inc:1442
+#: ../lib/modules/passwordSelfReset.inc:1440
 msgid "No security answer found."
 msgstr "没有发现安全问题."
 
@@ -8603,7 +8642,7 @@ msgstr "没有服务器设置,请先建立一个."
 msgid "No shared folders found!"
 msgstr "未发现共享文件夹!"
 
-#: ../templates/pdfedit/pdfpage.php:129
+#: ../templates/pdfedit/pdfpage.php:147
 msgid "No static text specified"
 msgstr "没有指定静态文本"
 
@@ -8621,7 +8660,7 @@ msgstr "没有这个条目"
 msgid "No such entry."
 msgstr "没有这个条目."
 
-#: ../templates/schema/schema.php:438
+#: ../templates/schema/schema.php:439
 #, php-format
 msgid "No such schema item: \"%s\""
 msgstr "没有这个schema项:\"%s\""
@@ -8642,19 +8681,20 @@ msgstr "没有发现视图"
 msgid "Non-standard (\\n)"
 msgstr "非标准 (\\n)"
 
-#: ../lib/modules/qmailUser.inc:58
+#: ../templates/config/confmain.php:535
+#: ../templates/selfService/adminMain.php:507 ../lib/modules/qmailUser.inc:58
 msgid "None"
 msgstr "无"
 
 #: ../lib/modules/sudoRole.inc:133 ../lib/modules/sudoRole.inc:195
 #: ../lib/modules/sudoRole.inc:222 ../lib/modules/sudoRole.inc:281
-#: ../lib/modules/sudoRole.inc:481 ../lib/modules/sudoRole.inc:771
+#: ../lib/modules/sudoRole.inc:481 ../lib/modules/sudoRole.inc:769
 msgid "Not after"
 msgstr "有效终止日期"
 
 #: ../lib/modules/sudoRole.inc:128 ../lib/modules/sudoRole.inc:201
 #: ../lib/modules/sudoRole.inc:223 ../lib/modules/sudoRole.inc:283
-#: ../lib/modules/sudoRole.inc:474 ../lib/modules/sudoRole.inc:766
+#: ../lib/modules/sudoRole.inc:474 ../lib/modules/sudoRole.inc:764
 msgid "Not before"
 msgstr "在此之前"
 
@@ -8668,9 +8708,9 @@ msgid ""
 "require"
 msgstr "注意:您必须输入这些对象类所需的新属性"
 
-#: ../lib/modules/windowsGroup.inc:124 ../lib/modules/windowsGroup.inc:195
-#: ../lib/modules/windowsGroup.inc:265 ../lib/modules/windowsGroup.inc:356
-#: ../lib/modules/windowsGroup.inc:913
+#: ../lib/modules/windowsGroup.inc:127 ../lib/modules/windowsGroup.inc:198
+#: ../lib/modules/windowsGroup.inc:268 ../lib/modules/windowsGroup.inc:359
+#: ../lib/modules/windowsGroup.inc:914
 msgid "Notes"
 msgstr "备注"
 
@@ -8683,16 +8723,16 @@ msgid "Notice"
 msgstr "注意"
 
 #: ../lib/passwordExpirationJob.inc:88 ../lib/passwordExpirationJob.inc:141
-#: ../help/help.inc:334
+#: ../help/help.inc:346
 msgid "Notification period"
 msgstr "提示周期"
 
-#: ../lib/modules/locking389ds.inc:351 ../lib/modules/ppolicyUser.inc:520
-#: ../lib/modules/windowsUser.inc:3401 ../lib/modules/shadowAccount.inc:800
+#: ../lib/modules/locking389ds.inc:351 ../lib/modules/ppolicyUser.inc:518
+#: ../lib/modules/windowsUser.inc:3399 ../lib/modules/shadowAccount.inc:798
 msgid "Notify users about password expiration"
 msgstr "提示用户密码过期"
 
-#: ../templates/delete.php:110
+#: ../templates/delete.php:116
 msgid "Number of child entries"
 msgstr "子条目的数量"
 
@@ -8755,35 +8795,35 @@ msgstr "允许用户再次修改密码的秒数."
 msgid "Number of seconds after which the user must change his password."
 msgstr "多後之後使用者必須更改密碼.(密碼到期),以秒為單位"
 
-#: ../templates/schema/schema.php:147 ../templates/schema/schema.php:344
+#: ../templates/schema/schema.php:148 ../templates/schema/schema.php:345
 msgid "OID"
 msgstr "OID"
 
-#: ../templates/ou_edit.php:87
+#: ../templates/ou_edit.php:97
 msgid "OU already exists!"
 msgstr "OU已经存在!"
 
-#: ../templates/ou_edit.php:98
+#: ../templates/ou_edit.php:108
 msgid "OU deleted successfully."
 msgstr "OU删除成功."
 
-#: ../templates/ou_edit.php:157 ../lib/tools/ouEditor.inc:44
+#: ../templates/ou_edit.php:167 ../lib/tools/ouEditor.inc:45
 msgid "OU editor"
 msgstr "OU编辑器"
 
-#: ../templates/ou_edit.php:91
+#: ../templates/ou_edit.php:101
 msgid "OU is invalid!"
 msgstr "OU无效!"
 
-#: ../templates/ou_edit.php:136
+#: ../templates/ou_edit.php:146
 msgid "OU is not empty or invalid!"
 msgstr "OU不为空或非法!"
 
-#: ../help/help.inc:301 ../help/help.inc:303
+#: ../help/help.inc:313 ../help/help.inc:315
 msgid "OU-Editor"
 msgstr "OU编辑器"
 
-#: ../templates/schema/schema.php:65 ../templates/schema/schema.php:66
+#: ../templates/schema/schema.php:66 ../templates/schema/schema.php:67
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1324
 #: ../lib/modules/selfRegistration.inc:74
 #: ../lib/modules/selfRegistration.inc:219 ../lib/modules/customFields.inc:80
@@ -8791,79 +8831,78 @@ msgstr "OU编辑器"
 msgid "Object classes"
 msgstr "对象类"
 
-#: ../lib/lists.inc:112
+#: ../lib/lists.inc:114
 #, php-format
 msgid "Object count: %s"
 msgstr "对象总计: %s"
 
-#: ../templates/schema/schema.php:152 ../templates/schema/schema.php:283
+#: ../templates/schema/schema.php:153 ../templates/schema/schema.php:284
 msgid "Obsolete"
 msgstr "已过时的"
 
 #: ../lib/modules/sambaDomain.inc:289 ../lib/modules/sambaDomain.inc:298
-#: ../lib/modules/sambaDomain.inc:307 ../lib/modules/sambaDomain.inc:615
-#: ../lib/modules/sambaDomain.inc:620 ../lib/modules/sambaDomain.inc:625
+#: ../lib/modules/sambaDomain.inc:307 ../lib/modules/sambaDomain.inc:613
+#: ../lib/modules/sambaDomain.inc:618 ../lib/modules/sambaDomain.inc:623
 msgid "Off"
 msgstr "关闭"
 
 #: ../lib/modules/windowsUser.inc:166 ../lib/modules/windowsUser.inc:478
 #: ../lib/modules/windowsUser.inc:825 ../lib/modules/windowsUser.inc:915
-#: ../lib/modules/windowsUser.inc:1098 ../lib/modules/windowsUser.inc:2436
-#: ../lib/modules/windowsUser.inc:2611 ../lib/modules/inetOrgPerson.inc:164
-#: ../lib/modules/inetOrgPerson.inc:205 ../lib/modules/inetOrgPerson.inc:548
-#: ../lib/modules/inetOrgPerson.inc:583 ../lib/modules/inetOrgPerson.inc:819
-#: ../lib/modules/inetOrgPerson.inc:823 ../lib/modules/inetOrgPerson.inc:1439
-#: ../lib/modules/inetOrgPerson.inc:1442 ../lib/modules/inetOrgPerson.inc:2004
-#: ../lib/modules/inetOrgPerson.inc:2701 ../lib/modules/inetOrgPerson.inc:3658
-#: ../lib/modules/inetOrgPerson.inc:3719
+#: ../lib/modules/windowsUser.inc:1098 ../lib/modules/windowsUser.inc:2434
+#: ../lib/modules/windowsUser.inc:2609 ../lib/modules/inetOrgPerson.inc:162
+#: ../lib/modules/inetOrgPerson.inc:203 ../lib/modules/inetOrgPerson.inc:546
+#: ../lib/modules/inetOrgPerson.inc:581 ../lib/modules/inetOrgPerson.inc:817
+#: ../lib/modules/inetOrgPerson.inc:821 ../lib/modules/inetOrgPerson.inc:1437
+#: ../lib/modules/inetOrgPerson.inc:1440 ../lib/modules/inetOrgPerson.inc:2000
+#: ../lib/modules/inetOrgPerson.inc:2697 ../lib/modules/inetOrgPerson.inc:3638
+#: ../lib/modules/inetOrgPerson.inc:3699
 msgid "Office name"
 msgstr "办公室名"
 
-#: ../templates/lists/changePassword.php:353
-#: ../templates/lists/changePassword.php:392
-#: ../templates/lists/changePassword.php:445
-#: ../templates/lists/changePassword.php:481
-#: ../templates/tests/lamdaemonTest.php:92 ../templates/ou_edit.php:198
-#: ../templates/ou_edit.php:212 ../templates/masscreate.php:210
-#: ../templates/config/profmanage.php:260
+#: ../templates/lists/changePassword.php:354
+#: ../templates/lists/changePassword.php:393
+#: ../templates/lists/changePassword.php:446
+#: ../templates/lists/changePassword.php:482
+#: ../templates/tests/lamdaemonTest.php:93 ../templates/ou_edit.php:210
+#: ../templates/ou_edit.php:224 ../templates/config/profmanage.php:260
 #: ../templates/config/profmanage.php:272
 #: ../templates/config/profmanage.php:281
 #: ../templates/config/profmanage.php:299
 #: ../templates/config/profmanage.php:308
 #: ../templates/config/profmanage.php:310
 #: ../templates/config/mainmanage.php:486 ../templates/config/jobList.php:230
-#: ../templates/config/conflogin.php:182 ../templates/config/mainlogin.php:171
+#: ../templates/config/conflogin.php:182 ../templates/config/mainlogin.php:182
 #: ../templates/selfService/profManage.php:210
 #: ../templates/selfService/profManage.php:227
 #: ../templates/selfService/profManage.php:242
 #: ../templates/selfService/adminLogin.php:171
-#: ../templates/selfService/adminMain.php:616
 #: ../templates/selfService/adminMain.php:669
-#: ../templates/pdfedit/pdfmain.php:215 ../templates/pdfedit/pdfmain.php:222
-#: ../templates/pdfedit/pdfmain.php:228
-#: ../templates/profedit/profilemain.php:204
-#: ../templates/profedit/profilemain.php:210
-#: ../templates/profedit/profilemain.php:216 ../lib/types/automountType.inc:234
-#: ../lib/types/user.inc:329 ../lib/types/bind.inc:175
+#: ../templates/selfService/adminMain.php:722
+#: ../templates/upload/masscreate.php:235 ../templates/pdfedit/pdfmain.php:260
+#: ../templates/pdfedit/pdfmain.php:267 ../templates/pdfedit/pdfmain.php:273
+#: ../templates/profedit/profilemain.php:245
+#: ../templates/profedit/profilemain.php:251
+#: ../templates/profedit/profilemain.php:257 ../lib/types/automountType.inc:211
+#: ../lib/types/user.inc:329 ../lib/types/bind.inc:152
 #: ../lib/modules/selfRegistration.inc:477 ../lib/modules/zarafaContact.inc:476
-#: ../lib/modules/zarafaGroup.inc:486 ../lib/modules/device.inc:300
+#: ../lib/modules/zarafaGroup.inc:486 ../lib/modules/device.inc:303
 #: ../lib/modules/sambaSamAccount.inc:1380
-#: ../lib/modules/sambaSamAccount.inc:1512 ../lib/modules/zarafaUser.inc:965
-#: ../lib/modules/zarafaUser.inc:1016 ../lib/modules/sambaGroupMapping.inc:508
-#: ../lib/modules/nisnetgroup.inc:479 ../lib/modules/nisnetgroup.inc:489
-#: ../lib/modules/asteriskExtension.inc:484 ../lib/modules/aliasEntry.inc:146
+#: ../lib/modules/sambaSamAccount.inc:1512 ../lib/modules/zarafaUser.inc:968
+#: ../lib/modules/zarafaUser.inc:1019 ../lib/modules/sambaGroupMapping.inc:508
+#: ../lib/modules/nisnetgroup.inc:482 ../lib/modules/nisnetgroup.inc:492
+#: ../lib/modules/asteriskExtension.inc:486 ../lib/modules/aliasEntry.inc:146
 #: ../lib/modules/aliasEntry.inc:166 ../lib/modules/qmailGroup.inc:862
-#: ../lib/modules/imapAccess.inc:295 ../lib/modules/organizationalRole.inc:343
-#: ../lib/modules/passwordSelfReset.inc:1075
-#: ../lib/modules/passwordSelfReset.inc:1312
-#: ../lib/modules/windowsGroup.inc:733 ../lib/modules/groupOfNames.inc:402
-#: ../lib/modules/groupOfNames.inc:557 ../lib/modules/nisMailAlias.inc:375
-#: ../lib/modules/nisMailAlias.inc:384 ../lib/lists.inc:728
-#: ../lib/lists.inc:811 ../lib/modules.inc:1253
+#: ../lib/modules/imapAccess.inc:295 ../lib/modules/organizationalRole.inc:346
+#: ../lib/modules/passwordSelfReset.inc:1073
+#: ../lib/modules/passwordSelfReset.inc:1310
+#: ../lib/modules/windowsGroup.inc:736 ../lib/modules/groupOfNames.inc:405
+#: ../lib/modules/groupOfNames.inc:560 ../lib/modules/nisMailAlias.inc:375
+#: ../lib/modules/nisMailAlias.inc:384 ../lib/lists.inc:730
+#: ../lib/lists.inc:812 ../lib/modules.inc:1261
 msgid "Ok"
 msgstr "确定"
 
-#: ../lib/modules/posixAccount.inc:2742
+#: ../lib/modules/posixAccount.inc:2740
 msgid "Old password"
 msgstr "旧密码"
 
@@ -8873,15 +8912,15 @@ msgid "Old value"
 msgstr "旧值"
 
 #: ../lib/modules/sambaDomain.inc:289 ../lib/modules/sambaDomain.inc:298
-#: ../lib/modules/sambaDomain.inc:307 ../lib/modules/sambaDomain.inc:616
-#: ../lib/modules/sambaDomain.inc:621 ../lib/modules/sambaDomain.inc:626
+#: ../lib/modules/sambaDomain.inc:307 ../lib/modules/sambaDomain.inc:614
+#: ../lib/modules/sambaDomain.inc:619 ../lib/modules/sambaDomain.inc:624
 msgid "On"
 msgstr "On"
 
 #: ../lib/modules/sambaSamAccount.inc:244
 #: ../lib/modules/sambaSamAccount.inc:385
 #: ../lib/modules/sambaSamAccount.inc:1498
-#: ../lib/modules/sambaSamAccount.inc:1977
+#: ../lib/modules/sambaSamAccount.inc:1975
 msgid "On broken or timed out connection"
 msgstr "中断或超时连接"
 
@@ -8890,7 +8929,7 @@ msgstr "中断或超时连接"
 msgid "One (one level beneath base)"
 msgstr "One (基类下第一层)"
 
-#: ../lib/modules/range.inc:135 ../lib/modules/fixed_ip.inc:127
+#: ../lib/modules/range.inc:138 ../lib/modules/fixed_ip.inc:130
 msgid "One or more errors occured. The invalid fields are marked."
 msgstr "发生了错误,非法域已经被标记."
 
@@ -8900,7 +8939,7 @@ msgstr "发生了错误,非法域已经被标记."
 msgid "Operation not successful. DN <b>%s</b> has not been created."
 msgstr "操作不成功,DN <b>%s</b>没有建立"
 
-#: ../templates/serverInfo.php:277 ../templates/serverInfo.php:367
+#: ../templates/serverInfo.php:278 ../templates/serverInfo.php:368
 msgid "Operation statistics"
 msgstr "操作统计"
 
@@ -8910,34 +8949,39 @@ msgstr "操作统计"
 msgid "Operation successful. DN <b>%s</b> has been created."
 msgstr "操作成功. DN  <b>%s</b> 已经建立"
 
-#: ../templates/multiEdit.php:121 ../help/help.inc:311
+#: ../templates/multiEdit.php:144 ../help/help.inc:323
 msgid "Operations"
 msgstr "操作者"
 
-#: ../templates/schema/schema.php:384
+#: ../templates/config/confmain.php:552
+#: ../templates/selfService/adminMain.php:524 ../help/help.inc:292
+msgid "Optional"
+msgstr "可选的"
+
+#: ../templates/schema/schema.php:385
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1575
 msgid "Optional attributes"
 msgstr "可选属性"
 
-#: ../lib/modules/fixed_ip.inc:111
+#: ../lib/modules/fixed_ip.inc:114
 msgid "Optional description for the PC."
 msgstr "PC的描述(可选)"
 
 #: ../lib/types/sudo.inc:83 ../lib/modules/mitKerberos.inc:408
 #: ../lib/modules/zarafaDynamicGroup.inc:267
 #: ../lib/modules/zarafaContact.inc:268 ../lib/modules/zarafaGroup.inc:268
-#: ../lib/modules/posixAccount.inc:1965 ../lib/modules/zarafaUser.inc:600
-#: ../lib/modules/kolabUser.inc:379 ../lib/modules/sudoRole.inc:94
+#: ../lib/modules/posixAccount.inc:1963 ../lib/modules/zarafaUser.inc:603
+#: ../lib/modules/kolabUser.inc:382 ../lib/modules/sudoRole.inc:94
 #: ../lib/modules/sudoRole.inc:123 ../lib/modules/sudoRole.inc:189
 #: ../lib/modules/sudoRole.inc:221 ../lib/modules/sudoRole.inc:233
-#: ../lib/modules/sudoRole.inc:451 ../lib/modules/sudoRole.inc:760
-#: ../lib/modules/asteriskExtension.inc:122
+#: ../lib/modules/sudoRole.inc:451 ../lib/modules/sudoRole.inc:758
+#: ../lib/modules/asteriskExtension.inc:124
 #: ../lib/modules/asteriskVoicemail.inc:115
 #: ../lib/modules/asteriskVoicemail.inc:125
 #: ../lib/modules/asteriskVoicemail.inc:142
 #: ../lib/modules/asteriskVoicemail.inc:190
 #: ../lib/modules/asteriskVoicemail.inc:258
-#: ../lib/modules/asteriskVoicemail.inc:378 ../lib/modules/qmailGroup.inc:611
+#: ../lib/modules/asteriskVoicemail.inc:376 ../lib/modules/qmailGroup.inc:611
 #: ../lib/modules/heimdalKerberos.inc:339
 msgid "Options"
 msgstr "选项"
@@ -8964,7 +9008,7 @@ msgstr "Oracle数据库"
 
 #: ../lib/modules/sudoRole.inc:138 ../lib/modules/sudoRole.inc:207
 #: ../lib/modules/sudoRole.inc:224 ../lib/modules/sudoRole.inc:285
-#: ../lib/modules/sudoRole.inc:484 ../lib/modules/sudoRole.inc:761
+#: ../lib/modules/sudoRole.inc:484 ../lib/modules/sudoRole.inc:759
 msgid "Order"
 msgstr "排序"
 
@@ -8972,43 +9016,43 @@ msgstr "排序"
 msgid "Order by"
 msgstr "排序列"
 
-#: ../templates/schema/schema.php:171
+#: ../templates/schema/schema.php:172
 msgid "Ordering"
 msgstr "排序"
 
 #: ../lib/types/user.inc:105 ../lib/modules/eduPerson.inc:126
 #: ../lib/modules/eduPerson.inc:200 ../lib/modules/eduPerson.inc:227
 #: ../lib/modules/eduPerson.inc:245 ../lib/modules/eduPerson.inc:346
-#: ../lib/modules/eduPerson.inc:564 ../lib/modules/windowsUser.inc:338
+#: ../lib/modules/eduPerson.inc:562 ../lib/modules/windowsUser.inc:338
 #: ../lib/modules/windowsUser.inc:342 ../lib/modules/windowsUser.inc:726
 #: ../lib/modules/windowsUser.inc:762 ../lib/modules/windowsUser.inc:889
-#: ../lib/modules/windowsUser.inc:1153 ../lib/modules/windowsUser.inc:2461
-#: ../lib/modules/windowsUser.inc:3229 ../lib/modules/inetOrgPerson.inc:229
-#: ../lib/modules/inetOrgPerson.inc:516 ../lib/modules/inetOrgPerson.inc:628
-#: ../lib/modules/inetOrgPerson.inc:852 ../lib/modules/inetOrgPerson.inc:856
-#: ../lib/modules/inetOrgPerson.inc:1588 ../lib/modules/inetOrgPerson.inc:1591
-#: ../lib/modules/inetOrgPerson.inc:2009 ../lib/modules/inetOrgPerson.inc:3688
-#: ../lib/modules/inetOrgPerson.inc:3727
+#: ../lib/modules/windowsUser.inc:1153 ../lib/modules/windowsUser.inc:2459
+#: ../lib/modules/windowsUser.inc:3227 ../lib/modules/inetOrgPerson.inc:227
+#: ../lib/modules/inetOrgPerson.inc:514 ../lib/modules/inetOrgPerson.inc:626
+#: ../lib/modules/inetOrgPerson.inc:850 ../lib/modules/inetOrgPerson.inc:854
+#: ../lib/modules/inetOrgPerson.inc:1586 ../lib/modules/inetOrgPerson.inc:1589
+#: ../lib/modules/inetOrgPerson.inc:2005 ../lib/modules/inetOrgPerson.inc:3668
+#: ../lib/modules/inetOrgPerson.inc:3707
 msgid "Organisation"
 msgstr "组织"
 
 #: ../lib/types/user.inc:106 ../lib/modules/windowsUser.inc:330
 #: ../lib/modules/windowsUser.inc:334 ../lib/modules/windowsUser.inc:718
 #: ../lib/modules/windowsUser.inc:759 ../lib/modules/windowsUser.inc:886
-#: ../lib/modules/windowsUser.inc:1150 ../lib/modules/windowsUser.inc:2460
-#: ../lib/modules/windowsUser.inc:3228 ../lib/modules/inetOrgPerson.inc:166
-#: ../lib/modules/inetOrgPerson.inc:226 ../lib/modules/inetOrgPerson.inc:508
-#: ../lib/modules/inetOrgPerson.inc:631 ../lib/modules/inetOrgPerson.inc:844
-#: ../lib/modules/inetOrgPerson.inc:848 ../lib/modules/inetOrgPerson.inc:1579
-#: ../lib/modules/inetOrgPerson.inc:1582 ../lib/modules/inetOrgPerson.inc:2008
-#: ../lib/modules/inetOrgPerson.inc:2831 ../lib/modules/inetOrgPerson.inc:3686
-#: ../lib/modules/inetOrgPerson.inc:3727
+#: ../lib/modules/windowsUser.inc:1150 ../lib/modules/windowsUser.inc:2458
+#: ../lib/modules/windowsUser.inc:3226 ../lib/modules/inetOrgPerson.inc:164
+#: ../lib/modules/inetOrgPerson.inc:224 ../lib/modules/inetOrgPerson.inc:506
+#: ../lib/modules/inetOrgPerson.inc:629 ../lib/modules/inetOrgPerson.inc:842
+#: ../lib/modules/inetOrgPerson.inc:846 ../lib/modules/inetOrgPerson.inc:1577
+#: ../lib/modules/inetOrgPerson.inc:1580 ../lib/modules/inetOrgPerson.inc:2004
+#: ../lib/modules/inetOrgPerson.inc:2833 ../lib/modules/inetOrgPerson.inc:3666
+#: ../lib/modules/inetOrgPerson.inc:3707
 msgid "Organisational unit"
 msgstr "组织单元"
 
 #: ../lib/modules/eduPerson.inc:134 ../lib/modules/eduPerson.inc:138
 #: ../lib/modules/eduPerson.inc:212 ../lib/modules/eduPerson.inc:228
-#: ../lib/modules/eduPerson.inc:350 ../lib/modules/eduPerson.inc:566
+#: ../lib/modules/eduPerson.inc:350 ../lib/modules/eduPerson.inc:564
 msgid "Organisational units"
 msgstr "组织单元"
 
@@ -9016,34 +9060,34 @@ msgstr "组织单元"
 msgid "Organisational units contains an invalid entry."
 msgstr "组织单元中有一个非法条目"
 
-#: ../templates/multiEdit.php:102 ../templates/config/confmain.php:366
+#: ../templates/multiEdit.php:125 ../templates/config/confmain.php:369
 msgid "Other"
 msgstr "其它"
 
 #: ../lib/modules/windowsUser.inc:370 ../lib/modules/windowsUser.inc:374
 #: ../lib/modules/windowsUser.inc:629 ../lib/modules/windowsUser.inc:907
 #: ../lib/modules/windowsUser.inc:974 ../lib/modules/windowsUser.inc:1112
-#: ../lib/modules/windowsUser.inc:2448 ../lib/modules/windowsUser.inc:3212
+#: ../lib/modules/windowsUser.inc:2446 ../lib/modules/windowsUser.inc:3210
 msgid "Other mobiles"
 msgstr "其他手机号码"
 
 #: ../lib/modules/windowsUser.inc:358 ../lib/modules/windowsUser.inc:362
 #: ../lib/modules/windowsUser.inc:613 ../lib/modules/windowsUser.inc:901
 #: ../lib/modules/windowsUser.inc:970 ../lib/modules/windowsUser.inc:1118
-#: ../lib/modules/windowsUser.inc:2446 ../lib/modules/windowsUser.inc:3214
+#: ../lib/modules/windowsUser.inc:2444 ../lib/modules/windowsUser.inc:3212
 msgid "Other pagers"
 msgstr "其他页"
 
 #: ../lib/modules/windowsUser.inc:158 ../lib/modules/windowsUser.inc:162
 #: ../lib/modules/windowsUser.inc:502 ../lib/modules/windowsUser.inc:824
 #: ../lib/modules/windowsUser.inc:966 ../lib/modules/windowsUser.inc:1107
-#: ../lib/modules/windowsUser.inc:2435
+#: ../lib/modules/windowsUser.inc:2433
 msgid "Other telephone numbers"
 msgstr "其它的电话号码"
 
 #: ../lib/modules/windowsUser.inc:198 ../lib/modules/windowsUser.inc:202
 #: ../lib/modules/windowsUser.inc:514 ../lib/modules/windowsUser.inc:832
-#: ../lib/modules/windowsUser.inc:1124 ../lib/modules/windowsUser.inc:2450
+#: ../lib/modules/windowsUser.inc:1124 ../lib/modules/windowsUser.inc:2448
 msgid "Other web sites"
 msgstr "其他web网站"
 
@@ -9057,40 +9101,40 @@ msgstr "输出可以包含HTML语句"
 msgid "Output of command \"%s\" with return code %s"
 msgstr "\"%s\"命令的输出和返回值%s"
 
-#: ../lib/modules/pykotaUser.inc:144 ../lib/modules/pykotaUser.inc:171
-#: ../lib/modules/pykotaUser.inc:253 ../lib/modules/pykotaUser.inc:263
-#: ../lib/modules/pykotaUser.inc:324 ../lib/modules/pykotaUser.inc:402
-#: ../lib/modules/pykotaUser.inc:902
+#: ../lib/modules/pykotaUser.inc:147 ../lib/modules/pykotaUser.inc:174
+#: ../lib/modules/pykotaUser.inc:256 ../lib/modules/pykotaUser.inc:266
+#: ../lib/modules/pykotaUser.inc:327 ../lib/modules/pykotaUser.inc:405
+#: ../lib/modules/pykotaUser.inc:903
 msgid "Overcharge factor"
 msgstr "过载因子"
 
-#: ../lib/modules/pykotaUser.inc:145
+#: ../lib/modules/pykotaUser.inc:148
 msgid ""
 "Overcharge factor that is applied when computing the cost of a print job. "
 "The number of pages is not changed."
 msgstr "过载因子用于记录打印机工作的耗材. 页数不变."
 
-#: ../templates/serverInfo.php:168
+#: ../templates/serverInfo.php:169
 msgid "Overlays"
 msgstr "覆盖物"
 
-#: ../lib/modules/zarafaUser.inc:103
+#: ../lib/modules/zarafaUser.inc:106
 msgid "Override default quota settings."
 msgstr "覆盖缺少的限制设置"
 
-#: ../templates/config/confmain.php:358 ../lib/types/asteriskExt.inc:96
+#: ../templates/config/confmain.php:361 ../lib/types/asteriskExt.inc:96
 #: ../lib/types/asteriskExt.inc:158
 msgid "Owner"
 msgstr "拥有者"
 
-#: ../lib/types/gon.inc:108 ../lib/modules/device.inc:69
-#: ../lib/modules/device.inc:73 ../lib/modules/device.inc:103
-#: ../lib/modules/device.inc:128 ../lib/modules/device.inc:180
-#: ../lib/modules/device.inc:415 ../lib/modules/groupOfNames.inc:93
-#: ../lib/modules/groupOfNames.inc:97 ../lib/modules/groupOfNames.inc:143
-#: ../lib/modules/groupOfNames.inc:174 ../lib/modules/groupOfNames.inc:199
-#: ../lib/modules/groupOfNames.inc:242 ../lib/modules/groupOfNames.inc:406
-#: ../lib/modules/groupOfNames.inc:757
+#: ../lib/types/gon.inc:108 ../lib/modules/device.inc:72
+#: ../lib/modules/device.inc:76 ../lib/modules/device.inc:106
+#: ../lib/modules/device.inc:131 ../lib/modules/device.inc:183
+#: ../lib/modules/device.inc:416 ../lib/modules/groupOfNames.inc:96
+#: ../lib/modules/groupOfNames.inc:100 ../lib/modules/groupOfNames.inc:146
+#: ../lib/modules/groupOfNames.inc:177 ../lib/modules/groupOfNames.inc:202
+#: ../lib/modules/groupOfNames.inc:245 ../lib/modules/groupOfNames.inc:409
+#: ../lib/modules/groupOfNames.inc:758
 msgid "Owners"
 msgstr "拥有者"
 
@@ -9098,8 +9142,8 @@ msgstr "拥有者"
 msgid "P-Node (0x02)"
 msgstr "P-节点 (0x02)"
 
-#: ../lib/modules/fixed_ip.inc:98 ../lib/modules/fixed_ip.inc:425
-#: ../lib/modules/fixed_ip.inc:741
+#: ../lib/modules/fixed_ip.inc:101 ../lib/modules/fixed_ip.inc:428
+#: ../lib/modules/fixed_ip.inc:742
 msgid "PC name"
 msgstr "PC机器名"
 
@@ -9107,29 +9151,29 @@ msgstr "PC机器名"
 msgid "PC01"
 msgstr "PC01"
 
-#: ../templates/pdfedit/pdfpage.php:449 ../templates/pdfedit/pdfmain.php:88
-#: ../lib/tools/pdfEdit.inc:44
+#: ../templates/pdfedit/pdfpage.php:464 ../templates/pdfedit/pdfmain.php:105
+#: ../lib/tools/pdfEdit.inc:45
 msgid "PDF editor"
 msgstr "PDF编辑器"
 
-#: ../templates/masscreate.php:275 ../templates/pdfedit/pdfmain.php:316
-#: ../lib/lists.inc:706 ../help/help.inc:242
+#: ../templates/upload/masscreate.php:301 ../lib/lists.inc:708
+#: ../help/help.inc:242
 msgid "PDF structure"
 msgstr "PDF架构"
 
-#: ../templates/pdfedit/pdfpage.php:112
+#: ../templates/pdfedit/pdfpage.php:130
 msgid "PDF structure name not valid"
 msgstr "PDF架构名无效"
 
-#: ../templates/pdfedit/pdfmain.php:173
+#: ../templates/pdfedit/pdfmain.php:220
 msgid "PDF structure was successfully saved."
 msgstr "PDF架构成功保存."
 
-#: ../templates/pdfedit/pdfmain.php:282
+#: ../templates/pdfedit/pdfmain.php:334
 msgid "PDF structures"
 msgstr "PDF架构"
 
-#: ../templates/serverInfo.php:264
+#: ../templates/serverInfo.php:265
 msgid "PDUs sent"
 msgstr "个PDU被发送"
 
@@ -9141,24 +9185,29 @@ msgstr "PHP错误报告"
 msgid "PHP system setting"
 msgstr "PHP系统设置"
 
-#: ../lib/modules/zarafaUser.inc:326 ../lib/modules/zarafaUser.inc:676
-#: ../lib/modules/zarafaUser.inc:1375
+#: ../templates/selfService/selfService2Factor.php:61
+#: ../templates/login2Factor.php:69
+msgid "PIN+Token"
+msgstr "PIN+令牌"
+
+#: ../lib/modules/zarafaUser.inc:329 ../lib/modules/zarafaUser.inc:679
+#: ../lib/modules/zarafaUser.inc:1376
 msgid "POP3"
 msgstr "POP3"
 
-#: ../templates/lists/changePassword.php:425
-#: ../templates/lists/changePassword.php:465 ../lib/types/user.inc:406
-#: ../lib/types/user.inc:445 ../lib/modules/ppolicyUser.inc:520
+#: ../templates/lists/changePassword.php:426
+#: ../templates/lists/changePassword.php:466 ../lib/types/user.inc:406
+#: ../lib/types/user.inc:445 ../lib/modules/ppolicyUser.inc:518
 msgid "PPolicy"
 msgstr "P策略"
 
-#: ../lib/modules/bindDLZ.inc:115 ../lib/modules/bindDLZ.inc:301
-#: ../lib/modules/bindDLZ.inc:307 ../lib/modules/bindDLZ.inc:485
+#: ../lib/modules/bindDLZ.inc:118 ../lib/modules/bindDLZ.inc:304
+#: ../lib/modules/bindDLZ.inc:310 ../lib/modules/bindDLZ.inc:488
 msgid "PTR record"
 msgstr "PTR记录"
 
-#: ../lib/modules/bindDLZ.inc:422 ../lib/modules/bindDLZ.inc:441
-#: ../lib/modules/bindDLZ.inc:1496
+#: ../lib/modules/bindDLZ.inc:425 ../lib/modules/bindDLZ.inc:444
+#: ../lib/modules/bindDLZ.inc:1497
 msgid "PTR records"
 msgstr "PTR记录"
 
@@ -9174,37 +9223,37 @@ msgstr ""
 #: ../lib/modules/pykotaBillingCode.inc:89
 #: ../lib/modules/pykotaBillingCode.inc:118
 #: ../lib/modules/pykotaBillingCode.inc:151
-#: ../lib/modules/pykotaBillingCode.inc:267
+#: ../lib/modules/pykotaBillingCode.inc:265
 msgid "Page count"
 msgstr "页数总和"
 
-#: ../templates/selfService/adminMain.php:511 ../help/help.inc:272
+#: ../templates/selfService/adminMain.php:564 ../help/help.inc:272
 msgid "Page header"
 msgstr "页首"
 
-#: ../templates/selfService/adminMain.php:406
+#: ../templates/selfService/adminMain.php:422
 msgid "Page layout"
 msgstr "页布局"
 
-#: ../templates/config/confmain.php:290 ../help/help.inc:186
+#: ../templates/config/confmain.php:293 ../help/help.inc:186
 msgid "Paged results"
 msgstr "分页结果"
 
 #: ../lib/modules/windowsUser.inc:354 ../lib/modules/windowsUser.inc:605
 #: ../lib/modules/windowsUser.inc:898 ../lib/modules/windowsUser.inc:968
-#: ../lib/modules/windowsUser.inc:1115 ../lib/modules/windowsUser.inc:2445
-#: ../lib/modules/windowsUser.inc:3213 ../lib/modules/inetOrgPerson.inc:78
-#: ../lib/modules/inetOrgPerson.inc:163 ../lib/modules/inetOrgPerson.inc:458
-#: ../lib/modules/inetOrgPerson.inc:601 ../lib/modules/inetOrgPerson.inc:740
-#: ../lib/modules/inetOrgPerson.inc:744 ../lib/modules/inetOrgPerson.inc:1495
-#: ../lib/modules/inetOrgPerson.inc:1498 ../lib/modules/inetOrgPerson.inc:1995
-#: ../lib/modules/inetOrgPerson.inc:2591 ../lib/modules/inetOrgPerson.inc:3670
-#: ../lib/modules/inetOrgPerson.inc:3722
+#: ../lib/modules/windowsUser.inc:1115 ../lib/modules/windowsUser.inc:2443
+#: ../lib/modules/windowsUser.inc:3211 ../lib/modules/inetOrgPerson.inc:76
+#: ../lib/modules/inetOrgPerson.inc:161 ../lib/modules/inetOrgPerson.inc:456
+#: ../lib/modules/inetOrgPerson.inc:599 ../lib/modules/inetOrgPerson.inc:738
+#: ../lib/modules/inetOrgPerson.inc:742 ../lib/modules/inetOrgPerson.inc:1493
+#: ../lib/modules/inetOrgPerson.inc:1496 ../lib/modules/inetOrgPerson.inc:1991
+#: ../lib/modules/inetOrgPerson.inc:2587 ../lib/modules/inetOrgPerson.inc:3650
+#: ../lib/modules/inetOrgPerson.inc:3702
 #: ../lib/modules/asteriskVoicemail.inc:111
 #: ../lib/modules/asteriskVoicemail.inc:141
 #: ../lib/modules/asteriskVoicemail.inc:184
 #: ../lib/modules/asteriskVoicemail.inc:256
-#: ../lib/modules/asteriskVoicemail.inc:376
+#: ../lib/modules/asteriskVoicemail.inc:374
 msgid "Pager"
 msgstr "呼号"
 
@@ -9216,17 +9265,17 @@ msgstr "Asterisk语音邮件的呼号"
 msgid "Parent DN"
 msgstr "父DN"
 
-#: ../lib/modules/puppetClient.inc:93 ../lib/modules/puppetClient.inc:143
-#: ../lib/modules/puppetClient.inc:164 ../lib/modules/puppetClient.inc:277
-#: ../lib/modules/puppetClient.inc:409 ../lib/modules/puppetClient.inc:452
+#: ../lib/modules/puppetClient.inc:96 ../lib/modules/puppetClient.inc:146
+#: ../lib/modules/puppetClient.inc:167 ../lib/modules/puppetClient.inc:280
+#: ../lib/modules/puppetClient.inc:410 ../lib/modules/puppetClient.inc:453
 msgid "Parent node"
 msgstr "父节点"
 
-#: ../lib/modules/puppetClient.inc:201
+#: ../lib/modules/puppetClient.inc:204
 msgid "Parent node not found."
 msgstr "没有发现父节点."
 
-#: ../templates/schema/schema.php:366
+#: ../templates/schema/schema.php:367
 msgid "Parent to"
 msgstr "继承于"
 
@@ -9240,43 +9289,43 @@ msgstr "部分锁定"
 
 #: ../lib/modules/pykotaPrinter.inc:107 ../lib/modules/pykotaPrinter.inc:166
 #: ../lib/modules/pykotaPrinter.inc:196 ../lib/modules/pykotaPrinter.inc:243
-#: ../lib/modules/pykotaPrinter.inc:598
+#: ../lib/modules/pykotaPrinter.inc:596
 msgid "Passthrough"
 msgstr "Passthrough"
 
-#: ../templates/lists/changePassword.php:371 ../templates/login.php:391
-#: ../templates/selfService/selfServiceLogin.php:339 ../lib/selfService.inc:406
+#: ../templates/lists/changePassword.php:372 ../templates/login.php:399
+#: ../templates/selfService/selfServiceLogin.php:355 ../lib/selfService.inc:416
 #: ../lib/modules/mitKerberos.inc:156 ../lib/modules/mitKerberos.inc:242
-#: ../lib/modules/mitKerberos.inc:257 ../lib/modules/mitKerberos.inc:809
-#: ../lib/modules/mitKerberos.inc:812 ../lib/modules/selfRegistration.inc:428
+#: ../lib/modules/mitKerberos.inc:257 ../lib/modules/mitKerberos.inc:807
+#: ../lib/modules/mitKerberos.inc:810 ../lib/modules/selfRegistration.inc:428
 #: ../lib/modules/selfRegistration.inc:582
 #: ../lib/modules/selfRegistration.inc:585
 #: ../lib/modules/selfRegistration.inc:588
 #: ../lib/modules/asteriskAccount.inc:115
 #: ../lib/modules/asteriskAccount.inc:325 ../lib/modules/posixGroup.inc:202
-#: ../lib/modules/posixGroup.inc:658 ../lib/modules/sambaSamAccount.inc:105
+#: ../lib/modules/posixGroup.inc:656 ../lib/modules/sambaSamAccount.inc:105
 #: ../lib/modules/sambaSamAccount.inc:106
 #: ../lib/modules/sambaSamAccount.inc:251
 #: ../lib/modules/sambaSamAccount.inc:432 ../lib/modules/posixAccount.inc:109
 #: ../lib/modules/posixAccount.inc:110 ../lib/modules/posixAccount.inc:187
 #: ../lib/modules/posixAccount.inc:273 ../lib/modules/posixAccount.inc:359
 #: ../lib/modules/posixAccount.inc:477 ../lib/modules/posixAccount.inc:1481
-#: ../lib/modules/posixAccount.inc:1866 ../lib/modules/posixAccount.inc:1869
+#: ../lib/modules/posixAccount.inc:1864 ../lib/modules/posixAccount.inc:1867
 #: ../lib/modules/windowsUser.inc:239 ../lib/modules/windowsUser.inc:406
 #: ../lib/modules/windowsUser.inc:841 ../lib/modules/windowsUser.inc:924
 #: ../lib/modules/windowsUser.inc:986 ../lib/modules/windowsUser.inc:987
-#: ../lib/modules/windowsUser.inc:2495 ../lib/modules/windowsUser.inc:2498
-#: ../lib/modules/inetOrgPerson.inc:646 ../lib/modules/inetOrgPerson.inc:868
-#: ../lib/modules/inetOrgPerson.inc:1645 ../lib/modules/inetOrgPerson.inc:2014
-#: ../lib/modules/inetOrgPerson.inc:2017 ../lib/modules/inetOrgPerson.inc:2151
-#: ../lib/modules/inetOrgPerson.inc:3729
+#: ../lib/modules/windowsUser.inc:2493 ../lib/modules/windowsUser.inc:2496
+#: ../lib/modules/inetOrgPerson.inc:644 ../lib/modules/inetOrgPerson.inc:866
+#: ../lib/modules/inetOrgPerson.inc:1643 ../lib/modules/inetOrgPerson.inc:2010
+#: ../lib/modules/inetOrgPerson.inc:2013 ../lib/modules/inetOrgPerson.inc:2147
+#: ../lib/modules/inetOrgPerson.inc:3709
 #: ../lib/modules/asteriskVoicemail.inc:99
 #: ../lib/modules/asteriskVoicemail.inc:165
-#: ../lib/modules/customFields.inc:2560 ../lib/modules/heimdalKerberos.inc:124
+#: ../lib/modules/customFields.inc:2558 ../lib/modules/heimdalKerberos.inc:124
 #: ../lib/modules/heimdalKerberos.inc:211
 #: ../lib/modules/heimdalKerberos.inc:223
-#: ../lib/modules/heimdalKerberos.inc:709
-#: ../lib/modules/heimdalKerberos.inc:712 ../lib/modules.inc:1067
+#: ../lib/modules/heimdalKerberos.inc:707
+#: ../lib/modules/heimdalKerberos.inc:710 ../lib/modules.inc:1075
 #: ../help/help.inc:240
 msgid "Password"
 msgstr "密码"
@@ -9284,7 +9333,7 @@ msgstr "密码"
 #: ../lib/modules/sambaSamAccount.inc:295
 #: ../lib/modules/sambaSamAccount.inc:1105 ../lib/modules/windowsUser.inc:230
 #: ../lib/modules/windowsUser.inc:550 ../lib/modules/windowsUser.inc:839
-#: ../lib/modules/windowsUser.inc:2483
+#: ../lib/modules/windowsUser.inc:2481
 msgid "Password change at next login"
 msgstr "下次登录时修改密码"
 
@@ -9294,7 +9343,7 @@ msgstr "下次登录时修改密码"
 msgid "Password change command"
 msgstr "密码修改命令"
 
-#: ../templates/lists/changePassword.php:303
+#: ../templates/lists/changePassword.php:304
 msgid "Password change options"
 msgstr "密码修改选项"
 
@@ -9305,7 +9354,7 @@ msgstr "需要修改密码"
 
 #: ../lib/types/ppolicyType.inc:91 ../lib/modules/ppolicy.inc:136
 #: ../lib/modules/ppolicy.inc:156 ../lib/modules/ppolicy.inc:295
-#: ../lib/modules/ppolicy.inc:511
+#: ../lib/modules/ppolicy.inc:509
 msgid "Password change requires old password"
 msgstr "修改密码时需要旧密码"
 
@@ -9324,10 +9373,10 @@ msgid "Password check"
 msgstr "密码检查"
 
 #: ../lib/modules/mitKerberos.inc:297 ../lib/modules/selfRegistration.inc:585
-#: ../lib/modules/posixGroup.inc:658 ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/posixGroup.inc:656 ../lib/modules/sambaSamAccount.inc:106
 #: ../lib/modules/sambaSamAccount.inc:107 ../lib/modules/posixAccount.inc:110
 #: ../lib/modules/posixAccount.inc:111 ../lib/modules/windowsUser.inc:987
-#: ../lib/modules/inetOrgPerson.inc:107
+#: ../lib/modules/inetOrgPerson.inc:105
 msgid "Password contains invalid characters. Valid characters are:"
 msgstr "密码名包含非法字符,只能使用:"
 
@@ -9337,7 +9386,7 @@ msgstr "密码名包含非法字符,只能使用:"
 #: ../lib/modules/sambaSamAccount.inc:1095
 #: ../lib/modules/sambaSamAccount.inc:1685 ../lib/modules/windowsUser.inc:216
 #: ../lib/modules/windowsUser.inc:528 ../lib/modules/windowsUser.inc:835
-#: ../lib/modules/windowsUser.inc:1191 ../lib/modules/windowsUser.inc:2472
+#: ../lib/modules/windowsUser.inc:1191 ../lib/modules/windowsUser.inc:2470
 msgid "Password does not expire"
 msgstr "密码永不过期"
 
@@ -9345,7 +9394,7 @@ msgstr "密码永不过期"
 #: ../lib/modules/locking389ds.inc:115 ../lib/modules/shadowAccount.inc:61
 #: ../lib/modules/shadowAccount.inc:113 ../lib/modules/shadowAccount.inc:181
 #: ../lib/modules/shadowAccount.inc:215 ../lib/modules/shadowAccount.inc:324
-#: ../lib/modules/shadowAccount.inc:571
+#: ../lib/modules/shadowAccount.inc:569
 msgid "Password expiration"
 msgstr "密码超期"
 
@@ -9353,7 +9402,7 @@ msgstr "密码超期"
 msgid "Password expiration must be are natural number or -1."
 msgstr "密码超期必须是自然数或-1."
 
-#: ../templates/selfService/adminMain.php:495 ../help/help.inc:276
+#: ../templates/selfService/adminMain.php:548 ../help/help.inc:276
 msgid "Password field label"
 msgstr "密码文本框标签"
 
@@ -9363,27 +9412,27 @@ msgstr "语音邮箱的密码."
 
 #: ../lib/modules/posixGroup.inc:500 ../lib/modules/posixGroup.inc:610
 #: ../lib/modules/posixAccount.inc:197 ../lib/modules/posixAccount.inc:398
-#: ../lib/modules/posixAccount.inc:1967 ../lib/modules/inetOrgPerson.inc:839
-#: ../lib/modules/inetOrgPerson.inc:3633 ../lib/modules/customFields.inc:140
-#: ../lib/modules/customFields.inc:2574
+#: ../lib/modules/posixAccount.inc:1965 ../lib/modules/inetOrgPerson.inc:837
+#: ../lib/modules/inetOrgPerson.inc:3613 ../lib/modules/customFields.inc:140
+#: ../lib/modules/customFields.inc:2572
 msgid "Password hash type"
 msgstr "密码哈希类型"
 
 #: ../lib/modules/sambaSamAccount.inc:409
 #: ../lib/modules/sambaSamAccount.inc:1867
-#: ../lib/modules/sambaSamAccount.inc:2285
+#: ../lib/modules/sambaSamAccount.inc:2283
 msgid "Password history"
 msgstr "密码历史"
 
 #: ../lib/types/ppolicyType.inc:80 ../lib/modules/ppolicy.inc:92
 #: ../lib/modules/ppolicy.inc:145 ../lib/modules/ppolicy.inc:169
-#: ../lib/modules/ppolicy.inc:227 ../lib/modules/ppolicy.inc:475
+#: ../lib/modules/ppolicy.inc:227 ../lib/modules/ppolicy.inc:473
 #: ../lib/modules/sambaDomain.inc:105 ../lib/modules/sambaDomain.inc:191
-#: ../lib/modules/sambaDomain.inc:283 ../lib/modules/sambaDomain.inc:607
+#: ../lib/modules/sambaDomain.inc:283 ../lib/modules/sambaDomain.inc:605
 msgid "Password history length"
 msgstr "历史密码长度"
 
-#: ../templates/config/confmain.php:444
+#: ../templates/config/confmain.php:447
 msgid "Password mail settings"
 msgstr "密码邮件设置"
 
@@ -9430,7 +9479,7 @@ msgstr "密码策略"
 #: ../lib/types/user.inc:979 ../lib/modules/ppolicyUser.inc:45
 #: ../lib/modules/ppolicyUser.inc:56 ../lib/modules/ppolicyUser.inc:72
 #: ../lib/modules/ppolicyUser.inc:88 ../lib/modules/ppolicyUser.inc:128
-#: ../lib/modules/ppolicyUser.inc:263 ../lib/modules/ppolicyUser.inc:297
+#: ../lib/modules/ppolicyUser.inc:263 ../lib/modules/ppolicyUser.inc:295
 #: ../lib/modules/ppolicy.inc:62 ../lib/modules/sambaDomain.inc:266
 #: ../help/help.inc:156
 msgid "Password policy"
@@ -9438,29 +9487,29 @@ msgstr "密码策略"
 
 #: ../lib/types/ppolicyType.inc:81 ../lib/modules/ppolicy.inc:96
 #: ../lib/modules/ppolicy.inc:146 ../lib/modules/ppolicy.inc:239
-#: ../lib/modules/ppolicy.inc:491
+#: ../lib/modules/ppolicy.inc:489
 msgid "Password quality check"
 msgstr "密码质量检查"
 
-#: ../lib/modules/passwordSelfReset.inc:681
+#: ../lib/modules/passwordSelfReset.inc:679
 msgid "Password reset confirmation"
 msgstr "密码重置确认"
 
-#: ../lib/modules/passwordSelfReset.inc:701
+#: ../lib/modules/passwordSelfReset.inc:699
 msgid "Password reset notification"
 msgstr "密码重置提示"
 
-#: ../templates/config/confmain.php:413
+#: ../templates/config/confmain.php:416
 msgid "Password reset page settings"
 msgstr "密码重置页面设置"
 
 #: ../lib/modules/passwordSelfReset.inc:66
-#: ../lib/modules/passwordSelfReset.inc:1029
-#: ../lib/modules/passwordSelfReset.inc:1212
+#: ../lib/modules/passwordSelfReset.inc:1027
+#: ../lib/modules/passwordSelfReset.inc:1210
 msgid "Password self reset"
 msgstr "密码复位"
 
-#: ../lib/modules/passwordSelfReset.inc:1853
+#: ../lib/modules/passwordSelfReset.inc:1851
 msgid "Password successfully reset."
 msgstr "密码被成功复位."
 
@@ -9471,7 +9520,7 @@ msgstr "用来解锁SSH密钥文件的密码"
 #: ../lib/modules/shadowAccount.inc:63 ../lib/modules/shadowAccount.inc:108
 #: ../lib/modules/shadowAccount.inc:168 ../lib/modules/shadowAccount.inc:177
 #: ../lib/modules/shadowAccount.inc:209 ../lib/modules/shadowAccount.inc:316
-#: ../lib/modules/shadowAccount.inc:570
+#: ../lib/modules/shadowAccount.inc:568
 msgid "Password warning"
 msgstr "密码提醒日期"
 
@@ -9479,9 +9528,9 @@ msgstr "密码提醒日期"
 msgid "Password warning must be are natural number."
 msgstr "密码提醒日期必须是自然数."
 
-#: ../templates/config/confmain.php:717
+#: ../templates/config/confmain.php:763
 #: ../templates/3rdParty/pla/htdocs/password_checker.php:61
-#: ../lib/modules/passwordSelfReset.inc:1410 ../lib/modules.inc:1157
+#: ../lib/modules/passwordSelfReset.inc:1408 ../lib/modules.inc:1165
 msgid "Passwords are different!"
 msgstr "密码不同!"
 
@@ -9522,7 +9571,7 @@ msgstr ""
 "连接到lamdaemon服务器的SSH密钥文件存放路径。如果设置为空，将使用登录到LAM的用"
 "户密码来认证。"
 
-#: ../templates/config/confmain.php:342
+#: ../templates/config/confmain.php:345
 msgid "Path to external script"
 msgstr "外部脚本路径"
 
@@ -9540,26 +9589,26 @@ msgstr "邮件系统中用于发信人确认和主持的maildir/mbox的路径."
 msgid "Path to the maildir/mbox on the mail system."
 msgstr "邮件系统的maildir/mbox的路径."
 
-#: ../lib/modules/pykotaUser.inc:152 ../lib/modules/pykotaUser.inc:326
-#: ../lib/modules/pykotaUser.inc:369
+#: ../lib/modules/pykotaUser.inc:155 ../lib/modules/pykotaUser.inc:329
+#: ../lib/modules/pykotaUser.inc:372
 msgid "Payment"
 msgstr "付款"
 
-#: ../lib/modules/pykotaUser.inc:148
+#: ../lib/modules/pykotaUser.inc:151
 msgid "Payment and job history"
 msgstr "付款和任务记录"
 
-#: ../lib/modules/pykotaUser.inc:149
+#: ../lib/modules/pykotaUser.inc:152
 msgid "Payment and job history for this user."
 msgstr "本用户的付费和任务列表."
 
-#: ../lib/modules/pykotaUser.inc:265 ../lib/modules/pykotaUser.inc:283
-#: ../lib/modules/pykotaUser.inc:384 ../lib/modules/pykotaUser.inc:591
-#: ../lib/modules/pykotaUser.inc:985
+#: ../lib/modules/pykotaUser.inc:268 ../lib/modules/pykotaUser.inc:286
+#: ../lib/modules/pykotaUser.inc:387 ../lib/modules/pykotaUser.inc:594
+#: ../lib/modules/pykotaUser.inc:986
 msgid "Payment history"
 msgstr "付费列表"
 
-#: ../lib/tools/multiEdit.inc:53
+#: ../lib/tools/multiEdit.inc:54
 msgid "Performs modifications on multiple LDAP entries."
 msgstr "修改多条LDAP条目时."
 
@@ -9572,33 +9621,33 @@ msgstr "也要永久删除所有子集?"
 #: ../lib/modules/asteriskAccount.inc:281
 #: ../lib/modules/asteriskAccount.inc:422
 #: ../lib/modules/asteriskAccount.inc:678
-#: ../lib/modules/asteriskAccount.inc:1000
-#: ../lib/modules/asteriskAccount.inc:1266
+#: ../lib/modules/asteriskAccount.inc:998
+#: ../lib/modules/asteriskAccount.inc:1264
 msgid "Permit"
 msgstr "允许"
 
-#: ../lib/modules/inetOrgPerson.inc:132
+#: ../lib/modules/inetOrgPerson.inc:130
 msgid "Personal"
 msgstr "个人信息"
 
-#: ../lib/selfService.inc:402
+#: ../lib/selfService.inc:412
 msgid "Personal data"
 msgstr "个人数据"
 
 #: ../lib/types/user.inc:101 ../lib/types/user.inc:689
-#: ../lib/modules/windowsUser.inc:3220 ../lib/modules/windowsUser.inc:3233
-#: ../lib/modules/inetOrgPerson.inc:162 ../lib/modules/inetOrgPerson.inc:2440
-#: ../lib/modules/inetOrgPerson.inc:2734 ../lib/modules/inetOrgPerson.inc:2740
-#: ../lib/modules/inetOrgPerson.inc:3698 ../lib/modules/inetOrgPerson.inc:3729
-#: ../lib/modules/inetOrgPerson.inc:3748
+#: ../lib/modules/windowsUser.inc:3218 ../lib/modules/windowsUser.inc:3231
+#: ../lib/modules/inetOrgPerson.inc:160 ../lib/modules/inetOrgPerson.inc:2436
+#: ../lib/modules/inetOrgPerson.inc:2730 ../lib/modules/inetOrgPerson.inc:2736
+#: ../lib/modules/inetOrgPerson.inc:3678 ../lib/modules/inetOrgPerson.inc:3709
+#: ../lib/modules/inetOrgPerson.inc:3728
 msgid "Photo"
 msgstr "照片"
 
-#: ../lib/modules/windowsUser.inc:1761 ../lib/modules/inetOrgPerson.inc:1755
+#: ../lib/modules/windowsUser.inc:1761 ../lib/modules/inetOrgPerson.inc:1753
 msgid "Photo file"
 msgstr "照片文件"
 
-#: ../lib/modules/windowsUser.inc:1759 ../lib/modules/inetOrgPerson.inc:1753
+#: ../lib/modules/windowsUser.inc:1759 ../lib/modules/inetOrgPerson.inc:1751
 msgid "Photo file (JPG format)"
 msgstr "照片文件(JPG格式)"
 
@@ -9606,12 +9655,12 @@ msgstr "照片文件(JPG格式)"
 #: ../lib/modules/asteriskAccount.inc:282
 #: ../lib/modules/asteriskAccount.inc:429
 #: ../lib/modules/asteriskAccount.inc:682
-#: ../lib/modules/asteriskAccount.inc:1001
-#: ../lib/modules/asteriskAccount.inc:1268
+#: ../lib/modules/asteriskAccount.inc:999
+#: ../lib/modules/asteriskAccount.inc:1266
 msgid "Pickup group"
 msgstr "接听组"
 
-#: ../lib/modules/ldapPublicKey.inc:88
+#: ../lib/modules/ldapPublicKey.inc:91
 msgid "Please a comma separated list of your public SSH keys."
 msgstr "您的公钥列表,以逗号分隔."
 
@@ -9625,7 +9674,7 @@ msgid ""
 "Otherwise, the output is treated as plain text."
 msgstr "如果你的脚本中会生成HTML输出,请激活这个选项.如果不激活,输出为文本文件."
 
-#: ../lib/modules/asteriskExtension.inc:193
+#: ../lib/modules/asteriskExtension.inc:195
 msgid "Please add at least one extension owner."
 msgstr "至少需要增加一个扩展属主."
 
@@ -9655,7 +9704,7 @@ msgstr ""
 "请选择获取IMAP用户名的属性。缺省值为\"mail\",也可以使用\"uid\" 或者"
 "\"userPrincipalName\"."
 
-#: ../lib/modules/passwordSelfReset.inc:685
+#: ../lib/modules/passwordSelfReset.inc:683
 msgid "Please click here to continue: @@resetLink@@"
 msgstr "请点击这儿继续: @@resetLink@@"
 
@@ -9667,7 +9716,7 @@ msgstr "点击以锁定/解锁此账号."
 msgid "Please create a profile by clicking on the link below."
 msgstr "请点击如下链接来建立配置文件。"
 
-#: ../lib/lists.inc:1098
+#: ../lib/lists.inc:1084
 msgid ""
 "Please do not edit multiple accounts in parallel in multiple browser tabs."
 msgstr "请不要在多个浏览器标签页上并行编辑多个账号."
@@ -9676,6 +9725,10 @@ msgstr "请不要在多个浏览器标签页上并行编辑多个账号."
 msgid "Please enter \"Yes\" or \"No\"."
 msgstr "请输入 \"Yes\" 或 \"No\"."
 
+#: ../templates/selfService/adminMain.php:246
+msgid "Please enter a 2-factor base URL."
+msgstr "请输入双重认证的基本URL"
+
 #: ../lib/modules/sambaSamAccount.inc:108
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "请输入RID或特殊账号名!"
@@ -9697,7 +9750,7 @@ msgstr ""
 msgid "Please enter a comma separated list of host names!"
 msgstr "请输入以逗号分隔的主机名!"
 
-#: ../lib/modules/asteriskExtension.inc:185
+#: ../lib/modules/asteriskExtension.inc:187
 msgid "Please enter a common name."
 msgstr "请输入一个一般命名!"
 
@@ -9720,7 +9773,7 @@ msgstr "输入此域的描述标签."
 msgid "Please enter a descriptive name for this entry."
 msgstr "输入此条目的描述"
 
-#: ../lib/modules/windowsGroup.inc:121
+#: ../lib/modules/windowsGroup.inc:124
 msgid "Please enter a descriptive text for this group."
 msgstr "输入此组的描述信息"
 
@@ -9732,8 +9785,8 @@ msgstr "输入此主机的描述信息"
 msgid "Please enter a descriptive text for this user."
 msgstr "输入此用户的描述信息."
 
-#: ../lib/modules/organizationalRole.inc:173
-#: ../lib/modules/groupOfNames.inc:211
+#: ../lib/modules/organizationalRole.inc:176
+#: ../lib/modules/groupOfNames.inc:214
 msgid "Please enter a group name!"
 msgstr "请输入组名!"
 
@@ -9751,7 +9804,7 @@ msgstr "请为新账号输入一个对象类列表."
 msgid "Please enter a mailbox."
 msgstr "请输入一个邮箱."
 
-#: ../lib/modules/device.inc:62
+#: ../lib/modules/device.inc:65
 msgid "Please enter a name for this device."
 msgstr "请输入设备名"
 
@@ -9771,11 +9824,11 @@ msgstr "请输入视图的名字"
 msgid "Please enter a name."
 msgstr "请输入一个名字"
 
-#: ../lib/modules/customFields.inc:2764
+#: ../lib/modules/customFields.inc:2762
 msgid "Please enter a natural number for column count."
 msgstr "请为列的数量输入一个自然数。"
 
-#: ../lib/modules/customFields.inc:2774
+#: ../lib/modules/customFields.inc:2772
 msgid "Please enter a natural number for row count."
 msgstr "请为行的数量输入一个自然数."
 
@@ -9802,14 +9855,14 @@ msgstr "请输入磁盘限额"
 #: ../templates/lib/141_jquery-validationEngine-lang.php:54
 #: ../templates/lib/141_jquery-validationEngine-lang.php:58
 #: ../lib/passwordExpirationJob.inc:141 ../lib/passwordExpirationJob.inc:511
-#: ../lib/modules/mitKerberos.inc:298 ../lib/modules/zarafaUser.inc:430
-#: ../lib/modules/zarafaUser.inc:431 ../lib/modules/zarafaUser.inc:432
-#: ../lib/modules/zarafaUser.inc:433 ../lib/modules/zarafaUser.inc:434
-#: ../lib/modules/zarafaUser.inc:435 ../lib/modules/zarafaUser.inc:437
-#: ../lib/modules/zarafaUser.inc:438 ../lib/modules/bindDLZ.inc:476
-#: ../lib/modules/windowsUser.inc:993 ../lib/modules/kolabUser.inc:257
-#: ../lib/modules/kolabUser.inc:258 ../lib/modules/inetOrgPerson.inc:2468
-#: ../lib/modules/inetOrgPerson.inc:2471 ../lib/modules/inetOrgPerson.inc:2474
+#: ../lib/modules/mitKerberos.inc:298 ../lib/modules/zarafaUser.inc:433
+#: ../lib/modules/zarafaUser.inc:434 ../lib/modules/zarafaUser.inc:435
+#: ../lib/modules/zarafaUser.inc:436 ../lib/modules/zarafaUser.inc:437
+#: ../lib/modules/zarafaUser.inc:438 ../lib/modules/zarafaUser.inc:440
+#: ../lib/modules/zarafaUser.inc:441 ../lib/modules/bindDLZ.inc:479
+#: ../lib/modules/windowsUser.inc:993 ../lib/modules/kolabUser.inc:260
+#: ../lib/modules/kolabUser.inc:261 ../lib/modules/inetOrgPerson.inc:2464
+#: ../lib/modules/inetOrgPerson.inc:2467 ../lib/modules/inetOrgPerson.inc:2470
 #: ../lib/modules/sudoRole.inc:285 ../lib/modules/sudoRole.inc:286
 msgid "Please enter a number."
 msgstr "请输入一个数字"
@@ -9846,7 +9899,7 @@ msgstr "请为密码最小长度输入一个数值"
 msgid "Please enter a numeric value for the password history length."
 msgstr "请为密码历史长度输入一个数值"
 
-#: ../lib/modules/range.inc:138
+#: ../lib/modules/range.inc:141
 msgid "Please enter a pool name."
 msgstr "请输入地址池名."
 
@@ -9854,7 +9907,7 @@ msgstr "请输入地址池名."
 msgid "Please enter a role name."
 msgstr "请输入角色名."
 
-#: ../lib/modules/passwordSelfReset.inc:1446
+#: ../lib/modules/passwordSelfReset.inc:1444
 msgid "Please enter a security answer."
 msgstr "请输入安全问题."
 
@@ -9880,7 +9933,7 @@ msgstr "请这个域输入一个唯一的名字."
 msgid "Please enter a unique name for this password policy."
 msgstr "请为这个密码策略输入一个唯一的名字"
 
-#: ../lib/modules/kolabUser.inc:274 ../lib/modules/kolabUser.inc:280
+#: ../lib/modules/kolabUser.inc:277 ../lib/modules/kolabUser.inc:283
 msgid "Please enter a user password."
 msgstr "请输入用户密码."
 
@@ -9889,21 +9942,21 @@ msgstr "请输入用户密码."
 msgid "Please enter a valid DN in the field:"
 msgstr "请输入有效的DN!"
 
-#: ../lib/types/bind.inc:206
+#: ../lib/types/bind.inc:183
 msgid "Please enter a valid DNS name."
 msgstr "请输入有效的DNS名称!"
 
-#: ../lib/modules/customFields.inc:1194 ../lib/modules/customFields.inc:1770
+#: ../lib/modules/customFields.inc:1192 ../lib/modules/customFields.inc:1768
 msgid ""
 "Please enter a valid LDAP attribute name. Allowed characters are a-z, 0-9, _ "
 "and -."
 msgstr "请输入合法的LDAP属性名,只能使用 a-z,0-9,_和-."
 
-#: ../templates/selfService/adminMain.php:225
+#: ../templates/selfService/adminMain.php:236
 msgid "Please enter a valid LDAP suffix."
 msgstr "请输入有效的LDAP后缀."
 
-#: ../templates/selfService/adminMain.php:229
+#: ../templates/selfService/adminMain.php:240
 msgid ""
 "Please enter a valid LDAP user if you want to use it for all operations."
 msgstr "请为所有的操作输入一个合法的LDAP帐号."
@@ -9912,22 +9965,22 @@ msgstr "请为所有的操作输入一个合法的LDAP帐号."
 msgid "Please enter a valid account status."
 msgstr "请输入有效的用户状态."
 
-#: ../lib/modules/bindDLZ.inc:529 ../lib/modules/bindDLZ.inc:530
+#: ../lib/modules/bindDLZ.inc:532 ../lib/modules/bindDLZ.inc:533
 msgid "Please enter a valid admin email address."
 msgstr "请输入有效的管理员邮件地址!"
 
-#: ../templates/config/confmain.php:657
+#: ../templates/config/confmain.php:694
 msgid "Please enter a valid bind user."
 msgstr "请输入有效的绑定账号."
 
 #: ../lib/modules/windowsUser.inc:999 ../lib/modules/windowsUser.inc:1000
-#: ../lib/modules/inetOrgPerson.inc:105 ../lib/modules/inetOrgPerson.inc:106
+#: ../lib/modules/inetOrgPerson.inc:103 ../lib/modules/inetOrgPerson.inc:104
 msgid "Please enter a valid business category!"
 msgstr "请输入有效的商业种类!"
 
 #: ../lib/modules/posixAccount.inc:129 ../lib/modules/posixAccount.inc:130
 #: ../lib/modules/windowsUser.inc:952 ../lib/modules/windowsUser.inc:953
-#: ../lib/modules/inetOrgPerson.inc:95 ../lib/modules/inetOrgPerson.inc:96
+#: ../lib/modules/inetOrgPerson.inc:93 ../lib/modules/inetOrgPerson.inc:94
 msgid "Please enter a valid common name!"
 msgstr "请输入有效的全名!"
 
@@ -9989,8 +10042,8 @@ msgstr "请输入有效的盘符."
 #: ../lib/modules/qmailUser.inc:453 ../lib/modules/qmailUser.inc:487
 #: ../lib/modules/zarafaGroup.inc:198 ../lib/modules/zarafaGroup.inc:199
 #: ../lib/modules/windowsUser.inc:978 ../lib/modules/windowsUser.inc:979
-#: ../lib/modules/pykotaUser.inc:319 ../lib/modules/pykotaUser.inc:320
-#: ../lib/modules/inetOrgPerson.inc:80 ../lib/modules/inetOrgPerson.inc:82
+#: ../lib/modules/pykotaUser.inc:322 ../lib/modules/pykotaUser.inc:323
+#: ../lib/modules/inetOrgPerson.inc:78 ../lib/modules/inetOrgPerson.inc:80
 #: ../lib/modules/kolabSharedFolder.inc:259
 #: ../lib/modules/kolabSharedFolder.inc:260 ../lib/modules/qmailGroup.inc:420
 #: ../lib/modules/qmailGroup.inc:421 ../lib/modules/qmailGroup.inc:422
@@ -10000,10 +10053,10 @@ msgstr "请输入有效的盘符."
 #: ../lib/modules/qmailGroup.inc:430 ../lib/modules/qmailGroup.inc:431
 #: ../lib/modules/qmailGroup.inc:432 ../lib/modules/passwordSelfReset.inc:279
 #: ../lib/modules/passwordSelfReset.inc:280
-#: ../lib/modules/passwordSelfReset.inc:1104
-#: ../lib/modules/passwordSelfReset.inc:1345
-#: ../lib/modules/windowsGroup.inc:292 ../lib/modules/windowsGroup.inc:293
-#: ../lib/modules.inc:1202
+#: ../lib/modules/passwordSelfReset.inc:1102
+#: ../lib/modules/passwordSelfReset.inc:1343
+#: ../lib/modules/windowsGroup.inc:295 ../lib/modules/windowsGroup.inc:296
+#: ../lib/modules.inc:1210
 msgid "Please enter a valid email address!"
 msgstr "请输入有效的邮件地址!"
 
@@ -10013,18 +10066,18 @@ msgstr "请输入有效的邮件地址!"
 msgid "Please enter a valid email alias."
 msgstr "请输入有效的邮件地址."
 
-#: ../lib/modules/passwordSelfReset.inc:1111
-#: ../lib/modules/passwordSelfReset.inc:1352
+#: ../lib/modules/passwordSelfReset.inc:1109
+#: ../lib/modules/passwordSelfReset.inc:1350
 msgid "Please enter a valid employee number."
 msgstr "请输入有效的员工号."
 
 #: ../lib/modules/windowsUser.inc:997 ../lib/modules/windowsUser.inc:998
-#: ../lib/modules/inetOrgPerson.inc:93 ../lib/modules/inetOrgPerson.inc:94
+#: ../lib/modules/inetOrgPerson.inc:91 ../lib/modules/inetOrgPerson.inc:92
 msgid "Please enter a valid employee type!"
 msgstr "请输入有效的雇员类别!"
 
 #: ../lib/modules/windowsUser.inc:964 ../lib/modules/windowsUser.inc:965
-#: ../lib/modules/inetOrgPerson.inc:76 ../lib/modules/inetOrgPerson.inc:77
+#: ../lib/modules/inetOrgPerson.inc:74 ../lib/modules/inetOrgPerson.inc:75
 msgid "Please enter a valid fax number!"
 msgstr "请输入有效的传真号!"
 
@@ -10034,7 +10087,7 @@ msgid ""
 "are allowed."
 msgstr "请输入合法的域名.只允许字母,数字和下划线."
 
-#: ../lib/lists.inc:229
+#: ../lib/lists.inc:231
 msgid ""
 "Please enter a valid filter. Only letters, numbers and \" _*$.@-\" are "
 "allowed."
@@ -10059,20 +10112,20 @@ msgstr "请输入有效的来自账号!"
 msgid "Please enter a valid group name!"
 msgstr "请输入有效的组名!"
 
-#: ../lib/modules/windowsGroup.inc:294
+#: ../lib/modules/windowsGroup.inc:297
 msgid "Please enter a valid group scope."
 msgstr "请输入有效的组范围."
 
-#: ../lib/modules/windowsGroup.inc:295
+#: ../lib/modules/windowsGroup.inc:298
 msgid "Please enter a valid group type."
 msgstr "请输入有效的组类型."
 
-#: ../lib/modules/pykotaUser.inc:327
+#: ../lib/modules/pykotaUser.inc:330
 msgid "Please enter a valid job suffix."
 msgstr "请输入有效的任务后缀!"
 
 #: ../lib/modules/windowsUser.inc:995 ../lib/modules/windowsUser.inc:996
-#: ../lib/modules/inetOrgPerson.inc:91 ../lib/modules/inetOrgPerson.inc:92
+#: ../lib/modules/inetOrgPerson.inc:89 ../lib/modules/inetOrgPerson.inc:90
 msgid "Please enter a valid job title!"
 msgstr "请输入有效的头衔!"
 
@@ -10081,7 +10134,7 @@ msgstr "请输入有效的头衔!"
 msgid "Please enter a valid last name."
 msgstr "请输入有效的姓!"
 
-#: ../lib/modules/pykotaGroup.inc:205 ../lib/modules/pykotaUser.inc:321
+#: ../lib/modules/pykotaGroup.inc:205 ../lib/modules/pykotaUser.inc:324
 msgid "Please enter a valid limit type."
 msgstr "请输入有效的限制类型."
 
@@ -10101,15 +10154,15 @@ msgstr "请输入有效的主机列表."
 msgid "Please enter a valid list of service names."
 msgstr "请输入有效的服务列表名."
 
-#: ../lib/modules/inetOrgPerson.inc:74 ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:73
 msgid "Please enter a valid mobile number!"
 msgstr "请输入有效的手机号!"
 
 #: ../lib/modules/pykotaPrinter.inc:215 ../lib/modules/pykotaPrinter.inc:216
 #: ../lib/modules/pykotaPrinter.inc:217 ../lib/modules/pykotaPrinter.inc:218
-#: ../lib/modules/pykotaUser.inc:322 ../lib/modules/pykotaUser.inc:323
-#: ../lib/modules/pykotaUser.inc:324 ../lib/modules/pykotaUser.inc:325
-#: ../lib/modules/pykotaUser.inc:326
+#: ../lib/modules/pykotaUser.inc:325 ../lib/modules/pykotaUser.inc:326
+#: ../lib/modules/pykotaUser.inc:327 ../lib/modules/pykotaUser.inc:328
+#: ../lib/modules/pykotaUser.inc:329
 msgid "Please enter a valid number (e.g. \"1.5\")."
 msgstr "请输入有效的数字 (比如 \"1.5\")."
 
@@ -10136,12 +10189,12 @@ msgstr "请输入有效的路径."
 msgid "Please enter a valid port number."
 msgstr "请输入有效的端口号!"
 
-#: ../lib/modules/inetOrgPerson.inc:85 ../lib/modules/inetOrgPerson.inc:86
+#: ../lib/modules/inetOrgPerson.inc:83 ../lib/modules/inetOrgPerson.inc:84
 msgid "Please enter a valid postal address!"
 msgstr "请输入有效的邮政地址."
 
 #: ../lib/modules/windowsUser.inc:976 ../lib/modules/windowsUser.inc:977
-#: ../lib/modules/inetOrgPerson.inc:89 ../lib/modules/inetOrgPerson.inc:90
+#: ../lib/modules/inetOrgPerson.inc:87 ../lib/modules/inetOrgPerson.inc:88
 msgid "Please enter a valid postal code!"
 msgstr "请输入有效的邮政编码!"
 
@@ -10154,13 +10207,13 @@ msgid "Please enter a valid realm."
 msgstr "请输入有效的域."
 
 #: ../lib/modules/kolabGroup.inc:181 ../lib/modules/kolabGroup.inc:182
-#: ../lib/modules/kolabUser.inc:253 ../lib/modules/kolabUser.inc:254
+#: ../lib/modules/kolabUser.inc:256 ../lib/modules/kolabUser.inc:257
 #: ../lib/modules/kolabSharedFolder.inc:250
 #: ../lib/modules/kolabSharedFolder.inc:251
 msgid "Please enter a valid recipient expression."
 msgstr "请输入有效的接收者表达式。"
 
-#: ../lib/modules/inetOrgPerson.inc:87 ../lib/modules/inetOrgPerson.inc:88
+#: ../lib/modules/inetOrgPerson.inc:85 ../lib/modules/inetOrgPerson.inc:86
 msgid "Please enter a valid registered address."
 msgstr "请输入有效的注册地址!"
 
@@ -10169,7 +10222,7 @@ msgid "Please enter a valid scoped affiliation."
 msgstr "请输入有效的有限联系."
 
 #: ../lib/modules/kolabGroup.inc:183 ../lib/modules/kolabGroup.inc:184
-#: ../lib/modules/kolabUser.inc:255 ../lib/modules/kolabUser.inc:256
+#: ../lib/modules/kolabUser.inc:258 ../lib/modules/kolabUser.inc:259
 #: ../lib/modules/kolabSharedFolder.inc:252
 #: ../lib/modules/kolabSharedFolder.inc:253
 msgid "Please enter a valid sender expression."
@@ -10180,7 +10233,7 @@ msgstr "请输入有效的发送者表达式."
 msgid "Please enter a valid server name where the mailboxes reside."
 msgstr "输入正确的即将建立邮箱的邮件服务器."
 
-#: ../lib/modules/inetOrgPerson.inc:83 ../lib/modules/inetOrgPerson.inc:84
+#: ../lib/modules/inetOrgPerson.inc:81 ../lib/modules/inetOrgPerson.inc:82
 msgid "Please enter a valid street name!"
 msgstr "请输入有效的街道名!"
 
@@ -10190,36 +10243,36 @@ msgstr "请输入有效的街道名!"
 #: ../lib/modules/windowsUser.inc:970 ../lib/modules/windowsUser.inc:971
 #: ../lib/modules/windowsUser.inc:972 ../lib/modules/windowsUser.inc:973
 #: ../lib/modules/windowsUser.inc:974 ../lib/modules/windowsUser.inc:975
+#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:69
 #: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:71
-#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:73
-#: ../lib/modules/inetOrgPerson.inc:78 ../lib/modules/inetOrgPerson.inc:79
+#: ../lib/modules/inetOrgPerson.inc:76 ../lib/modules/inetOrgPerson.inc:77
 msgid "Please enter a valid telephone number!"
 msgstr "请输入有效的电话号码!"
 
-#: ../lib/modules/passwordSelfReset.inc:1125
-#: ../lib/modules/passwordSelfReset.inc:1366
+#: ../lib/modules/passwordSelfReset.inc:1123
+#: ../lib/modules/passwordSelfReset.inc:1364
 msgid "Please enter a valid user name or email address."
 msgstr "请输入有效的用户名或邮件地址."
 
-#: ../lib/modules/posixGroup.inc:786 ../lib/modules/posixAccount.inc:1130
+#: ../lib/modules/posixGroup.inc:784 ../lib/modules/posixAccount.inc:1130
 #: ../lib/modules/posixAccount.inc:1135
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "请输入有效值(介于%s和%s之间)!"
 
-#: ../lib/modules/customFields.inc:2940
+#: ../lib/modules/customFields.inc:2938
 msgid "Please enter a value for status \"checked\"."
 msgstr "请为状态\"选中\"输入一个值."
 
-#: ../lib/modules/customFields.inc:2947
+#: ../lib/modules/customFields.inc:2945
 msgid "Please enter a value for status \"unchecked\"."
 msgstr "请为状态\"未选中\"输入一个值."
 
-#: ../templates/multiEdit.php:144
+#: ../templates/multiEdit.php:167
 msgid "Please enter a value to add."
 msgstr "请输入一个值加上去."
 
-#: ../templates/multiEdit.php:147
+#: ../templates/multiEdit.php:170
 msgid "Please enter a value to modify."
 msgstr "请输入修改后的值."
 
@@ -10231,17 +10284,17 @@ msgstr "请为这个账号输入一个别名."
 msgid "Please enter an alias name."
 msgstr "请输入有效的别名!"
 
-#: ../lib/modules/kolabUser.inc:286 ../lib/modules/imapAccess.inc:204
+#: ../lib/modules/kolabUser.inc:289 ../lib/modules/imapAccess.inc:204
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "请在本页面输入邮件地址:%s"
 
-#: ../lib/modules/pykotaUser.inc:353
+#: ../lib/modules/pykotaUser.inc:356
 #, php-format
 msgid "Please enter an user name on this page: %s"
 msgstr "请在本页面输入用户名:%s"
 
-#: ../lib/modules/range.inc:139
+#: ../lib/modules/range.inc:142
 #, php-format
 msgid "Please enter at least one range for pool \"%s\"."
 msgstr "请为 \"%s\".地址池至少输入一个地址范围."
@@ -10271,7 +10324,7 @@ msgstr "输入运行的组只能使用ASCII字符."
 msgid "Please enter only ASCII characters for the run users."
 msgstr "输入运行用户只能使用ASCII字符."
 
-#: ../lib/modules/device.inc:140 ../lib/modules/device.inc:141
+#: ../lib/modules/device.inc:143 ../lib/modules/device.inc:144
 msgid "Please enter only ASCII characters for the serial number."
 msgstr "输入序列名只能使用ASCII字符."
 
@@ -10306,7 +10359,7 @@ msgid ""
 "Please enter the DN of the LDAP entry with object class \"sambaUnixIdPool\"."
 msgstr "请输入目标类为\"sambaUnixIdPool\"的 LDAP 条目的DN"
 
-#: ../lib/modules/bindDLZ.inc:93 ../lib/modules/bindDLZ.inc:97
+#: ../lib/modules/bindDLZ.inc:96 ../lib/modules/bindDLZ.inc:100
 msgid "Please enter the IP address for this entry."
 msgstr "请为这个条目输入IP地址"
 
@@ -10335,7 +10388,7 @@ msgstr ""
 "请输入LAM开始搜索用户的LDAP后缀.所给用户名经LDAP过滤器后需要精确匹配到一个DN."
 "\"%USER%\"将在登录页替换为用户名."
 
-#: ../lib/modules/pykotaUser.inc:157
+#: ../lib/modules/pykotaUser.inc:160
 msgid ""
 "Please enter the LDAP suffix where the PyKota job entries are stored "
 "(configuration option \"jobbase\")."
@@ -10346,12 +10399,12 @@ msgid ""
 "Please enter the LDAP suffix where your Samba domain entries are stored."
 msgstr "请输入保存Samba域名录的LDAP后缀)."
 
-#: ../lib/modules/asteriskExtension.inc:188
+#: ../lib/modules/asteriskExtension.inc:190
 #: ../lib/modules/asteriskVoicemail.inc:214
 msgid "Please enter the account context."
 msgstr "请输入账号的语境. "
 
-#: ../lib/modules.inc:946
+#: ../lib/modules.inc:954
 msgid "Please enter the account information on the other pages first."
 msgstr "请先在另一个页面输入帐号信息."
 
@@ -10363,11 +10416,11 @@ msgstr "请输入账号的类型. "
 msgid "Please enter the account's type (e.g. \"friend\")."
 msgstr "请输入账号的类型(比如\"friend\"). "
 
-#: ../lib/modules/asteriskExtension.inc:187
+#: ../lib/modules/asteriskExtension.inc:189
 msgid "Please enter the application data."
 msgstr "请输入应用数据."
 
-#: ../lib/modules/asteriskExtension.inc:186
+#: ../lib/modules/asteriskExtension.inc:188
 msgid "Please enter the application."
 msgstr "请输入应用名."
 
@@ -10402,7 +10455,7 @@ msgstr ""
 "请输入连接字符串(比如:\"(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=server)"
 "(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=db.example.com)))\")."
 
-#: ../lib/modules/puppetClient.inc:86 ../lib/modules/puppetClient.inc:90
+#: ../lib/modules/puppetClient.inc:89 ../lib/modules/puppetClient.inc:93
 msgid "Please enter the environment name for this node (e.g. production)."
 msgstr "请为本节点输入环境名(比如:production)."
 
@@ -10410,11 +10463,11 @@ msgstr "请为本节点输入环境名(比如:production)."
 msgid "Please enter the extension context."
 msgstr "请输入扩展的语境."
 
-#: ../lib/modules/asteriskExtension.inc:189
+#: ../lib/modules/asteriskExtension.inc:191
 msgid "Please enter the extension name."
 msgstr "请输入扩展的名字."
 
-#: ../lib/modules/windowsGroup.inc:117
+#: ../lib/modules/windowsGroup.inc:120
 msgid "Please enter the group name."
 msgstr "请输入组名."
 
@@ -10457,7 +10510,7 @@ msgstr ""
 "请输入本系统管理配置密码,不是LDAP密码,存在在config.cfg文件中,如果第一次登录,"
 "请输入\"lam\"."
 
-#: ../templates/config/mainlogin.php:151
+#: ../templates/config/mainlogin.php:157
 msgid "Please enter the master password to change the general preferences:"
 msgstr "更改一般配置,请输入管理密码:"
 
@@ -10477,7 +10530,7 @@ msgid ""
 "numbers and -/_."
 msgstr "請輸入新的設定檔名稱.可以包含字母,數字和 -/_ ."
 
-#: ../help/help.inc:335
+#: ../help/help.inc:347
 msgid ""
 "Please enter the number of days before password expiration to send out the "
 "email."
@@ -10491,7 +10544,7 @@ msgid ""
 msgstr "请输入管理DN的密码.请注意密码将在自助服务配置中以明文存放."
 
 #: ../lib/modules/asteriskAccount.inc:116 ../lib/modules/posixAccount.inc:478
-#: ../lib/modules/windowsUser.inc:240 ../lib/modules/inetOrgPerson.inc:869
+#: ../lib/modules/windowsUser.inc:240 ../lib/modules/inetOrgPerson.inc:867
 msgid "Please enter the password which you want to set for this account."
 msgstr "请输入这个帐号的密码."
 
@@ -10519,7 +10572,7 @@ msgid ""
 "Please enter the possible security questions for the password self reset."
 msgstr "请为密码复位设置安全提问."
 
-#: ../lib/modules/asteriskExtension.inc:191
+#: ../lib/modules/asteriskExtension.inc:193
 msgid "Please enter the priority."
 msgstr "请输入优先级."
 
@@ -10527,7 +10580,7 @@ msgstr "请输入优先级."
 msgid "Please enter the quota limit of this mailbox in kilobytes."
 msgstr "请输入邮箱的限额(kB)"
 
-#: ../lib/modules/quota.inc:154
+#: ../lib/modules/quota.inc:157
 msgid ""
 "Please enter the quota settings for this mount point. The syntax is: {soft "
 "block limit},{hard block limit},{soft inode limit},{hard inode limit}"
@@ -10535,7 +10588,7 @@ msgstr ""
 "请输入本挂接点的配额设置.语法为:(软块限制},{硬块限制},{软件节点限制},{硬节点"
 "限制}."
 
-#: ../lib/modules/systemQuotas.inc:69
+#: ../lib/modules/systemQuotas.inc:72
 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}."
@@ -10556,10 +10609,10 @@ msgstr ""
 "请输入正则表达式 (比如:\"/^[0-9a-zA-Z]+$/\")来校验这个域 .语法的描述 <a href="
 "\"%s\">看这里</a>."
 
-#: ../templates/lists/changePassword.php:550
+#: ../templates/lists/changePassword.php:551
 #: ../lib/modules/selfRegistration.inc:582
 #: ../lib/modules/sambaSamAccount.inc:105 ../lib/modules/posixAccount.inc:109
-#: ../lib/modules/windowsUser.inc:986 ../lib/modules/customFields.inc:2661
+#: ../lib/modules/windowsUser.inc:986 ../lib/modules/customFields.inc:2659
 msgid "Please enter the same password in both password fields."
 msgstr "在两个密码输入框请输入相同的密码."
 
@@ -10583,7 +10636,7 @@ msgstr "请输入连接数据库使用的用户名和密码."
 msgid "Please enter the user's name."
 msgstr "请输入用户名."
 
-#: ../lib/modules/puppetClient.inc:106 ../lib/modules/puppetClient.inc:110
+#: ../lib/modules/puppetClient.inc:109 ../lib/modules/puppetClient.inc:113
 msgid ""
 "Please enter your Puppet variables for this node (e.g. config_exim=true)."
 msgstr "请为本节点输入您的Puppet变量(比如:config_exim=true)."
@@ -10602,11 +10655,11 @@ msgstr "请输入主配置密码来修改用户自助服务配置文件."
 msgid "Please enter your password to change the server preferences:"
 msgstr "改变服务器配置,请输入密码:"
 
-#: ../lib/modules/ldapPublicKey.inc:84
+#: ../lib/modules/ldapPublicKey.inc:87
 msgid "Please enter your public SSH key."
 msgstr "请输入您的SSH公钥."
 
-#: ../lib/modules/range.inc:489 ../lib/modules/fixed_ip.inc:404
+#: ../lib/modules/range.inc:492 ../lib/modules/fixed_ip.inc:407
 msgid "Please fill out the DHCP settings first."
 msgstr "请先填写DHCP设置"
 
@@ -10622,23 +10675,23 @@ msgstr "请安装并激活被支持的PDO扩展."
 msgid "Please install and activate the PDO extension for PHP."
 msgstr "请安装并激活PHP中的PDO扩展模块."
 
-#: ../templates/masscreate.php:246
+#: ../templates/upload/masscreate.php:272
 msgid ""
 "Please provide a CSV formated file with your account data. The cells in the "
 "first row must be filled with the column identifiers. The following rows "
 "represent one account for each row."
 msgstr "请提供帐号数据CSV格式文件.第一行必须为栏目标识,以下每行表示一个帐号."
 
-#: ../lib/config.inc:2365
+#: ../lib/config.inc:2508
 msgid "Please provide a file in DER or PEM format."
 msgstr "请提供 DER 或 PEM 格式的文件。"
 
-#: ../templates/massBuildAccounts.php:255
+#: ../templates/upload/massBuildAccounts.php:265
 msgid "Please provide a file to upload."
 msgstr "请提供上传的文件。"
 
 #: ../lib/modules/windowsUser.inc:295 ../lib/modules/windowsUser.inc:391
-#: ../lib/modules/inetOrgPerson.inc:776
+#: ../lib/modules/inetOrgPerson.inc:774
 msgid ""
 "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr "请选择图像文件上传,必须是JPG格式(.jpg/.jpeg)."
@@ -10647,7 +10700,7 @@ msgstr "请选择图像文件上传,必须是JPG格式(.jpg/.jpeg)."
 msgid "Please select the field type (e.g. text field)."
 msgstr "请输入域的类型(比如:文本框). "
 
-#: ../help/help.inc:308
+#: ../help/help.inc:320
 msgid "Please select the suffix where changes should be done."
 msgstr "请选择修改的后缀"
 
@@ -10677,7 +10730,7 @@ msgstr "请选择日志等级,在此等级以下的日志不会被记录."
 msgid "Please set the voicemail password with \"Set password\" before saving."
 msgstr "在保存前请设置语音邮件的密码."
 
-#: ../lib/modules.inc:895
+#: ../lib/modules.inc:903
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "请在页面%s上输入必须的属性."
@@ -10694,11 +10747,11 @@ msgid ""
 msgstr ""
 "请设置LDAP后缀为一个目标类为\"dhcpService\" 或者 \"dhcpServer\"的 LDAP 条目."
 
-#: ../templates/config/mainlogin.php:135 ../templates/config/mainlogin.php:138
+#: ../templates/config/mainlogin.php:140 ../templates/config/mainlogin.php:143
 msgid "Please setup your licence data."
 msgstr "请设置您的许可数据."
 
-#: ../templates/multiEdit.php:218
+#: ../templates/multiEdit.php:241
 msgid "Please specify at least one operation."
 msgstr "请至少指定一个操作"
 
@@ -10706,7 +10759,7 @@ msgstr "请至少指定一个操作"
 msgid "Please specify how your users need to identify themselves."
 msgstr "请指定你的用户需要怎样标识自己."
 
-#: ../lib/modules/windowsGroup.inc:149
+#: ../lib/modules/windowsGroup.inc:152
 msgid "Please specify the group scope."
 msgstr "请指定组的范围"
 
@@ -10716,7 +10769,7 @@ msgid ""
 "descriptive label that is displayed to the user."
 msgstr "请指定这个域的可能的值.每个值有一个显示给用户的描述标签."
 
-#: ../help/help.inc:312
+#: ../help/help.inc:324
 msgid ""
 "Please specify which attributes should be changed. The modify operation will "
 "also add an value if the attribute does not yet exist. To delete all values "
@@ -10725,7 +10778,7 @@ msgstr ""
 "请指定要改变的属性. 当属性不存在的时候,这个修改操作也会增加新的属性. 要删除一"
 "个属性,请保留空白."
 
-#: ../lib/modules/windowsUser.inc:1003 ../lib/modules/inetOrgPerson.inc:102
+#: ../lib/modules/windowsUser.inc:1003 ../lib/modules/inetOrgPerson.inc:100
 msgid "Please upload a .jpg/.jpeg file."
 msgstr "请上传 .jpg/.jpeg文件. "
 
@@ -10738,11 +10791,11 @@ msgstr "请稍等"
 msgid "Policy count: %s"
 msgstr "策略总计: %s"
 
-#: ../lib/modules/kolabUser.inc:246
+#: ../lib/modules/kolabUser.inc:249
 msgid "Policy list has invalid format!"
 msgstr "策略列表含有非法格式!"
 
-#: ../lib/modules/range.inc:550
+#: ../lib/modules/range.inc:553
 msgid "Pools"
 msgstr "地址池"
 
@@ -10750,11 +10803,11 @@ msgstr "地址池"
 #: ../lib/modules/asteriskAccount.inc:283
 #: ../lib/modules/asteriskAccount.inc:436
 #: ../lib/modules/asteriskAccount.inc:686
-#: ../lib/modules/asteriskAccount.inc:1002
-#: ../lib/modules/asteriskAccount.inc:1270 ../lib/modules/bindDLZ.inc:195
-#: ../lib/modules/bindDLZ.inc:199 ../lib/modules/bindDLZ.inc:399
-#: ../lib/modules/bindDLZ.inc:512 ../lib/modules/bindDLZ.inc:1365
-#: ../lib/modules/bindDLZ.inc:1604
+#: ../lib/modules/asteriskAccount.inc:1000
+#: ../lib/modules/asteriskAccount.inc:1268 ../lib/modules/bindDLZ.inc:198
+#: ../lib/modules/bindDLZ.inc:202 ../lib/modules/bindDLZ.inc:402
+#: ../lib/modules/bindDLZ.inc:515 ../lib/modules/bindDLZ.inc:1368
+#: ../lib/modules/bindDLZ.inc:1605
 msgid "Port"
 msgstr "端口"
 
@@ -10762,22 +10815,22 @@ msgstr "端口"
 msgid "Port number."
 msgstr "端口号"
 
-#: ../templates/pdfedit/pdfpage.php:596 ../templates/pdfedit/pdfpage.php:606
-#: ../templates/pdfedit/pdfpage.php:616 ../templates/pdfedit/pdfpage.php:631
+#: ../templates/pdfedit/pdfpage.php:612 ../templates/pdfedit/pdfpage.php:622
+#: ../templates/pdfedit/pdfpage.php:632 ../templates/pdfedit/pdfpage.php:648
 msgid "Position"
 msgstr "位置"
 
-#: ../templates/masscreate.php:310 ../templates/masscreate.php:384
-#: ../lib/modules/customScripts.inc:125 ../lib/modules/customScripts.inc:127
-#: ../lib/modules/customScripts.inc:129
-#: ../lib/modules/sambaGroupMapping.inc:605
+#: ../templates/upload/masscreate.php:336
+#: ../templates/upload/masscreate.php:410 ../lib/modules/customScripts.inc:125
+#: ../lib/modules/customScripts.inc:127 ../lib/modules/customScripts.inc:129
+#: ../lib/modules/sambaGroupMapping.inc:603
 msgid "Possible values"
 msgstr "可能的值"
 
 #: ../lib/modules/pykotaPrinter.inc:130 ../lib/modules/posixGroup.inc:531
 #: ../lib/modules/sambaGroupMapping.inc:172
-#: ../lib/modules/organizationalRole.inc:103
-#: ../lib/modules/groupOfNames.inc:115
+#: ../lib/modules/organizationalRole.inc:106
+#: ../lib/modules/groupOfNames.inc:118
 msgid ""
 "Possible wildcards are: \"*\" = any character, \"^\" = line start, \"$\" = "
 "line end"
@@ -10785,49 +10838,49 @@ msgstr "可能的通配符是: \"*\" = 任意字符, \"^\" = 行的开头, \"$\"
 
 #: ../lib/modules/windowsUser.inc:174 ../lib/modules/windowsUser.inc:454
 #: ../lib/modules/windowsUser.inc:827 ../lib/modules/windowsUser.inc:922
-#: ../lib/modules/windowsUser.inc:1094 ../lib/modules/windowsUser.inc:2438
-#: ../lib/modules/windowsUser.inc:2621 ../lib/modules/inetOrgPerson.inc:162
-#: ../lib/modules/inetOrgPerson.inc:187 ../lib/modules/inetOrgPerson.inc:418
-#: ../lib/modules/inetOrgPerson.inc:565 ../lib/modules/inetOrgPerson.inc:692
-#: ../lib/modules/inetOrgPerson.inc:696 ../lib/modules/inetOrgPerson.inc:1315
-#: ../lib/modules/inetOrgPerson.inc:1318 ../lib/modules/inetOrgPerson.inc:1988
-#: ../lib/modules/inetOrgPerson.inc:2646 ../lib/modules/inetOrgPerson.inc:3646
-#: ../lib/modules/inetOrgPerson.inc:3716
+#: ../lib/modules/windowsUser.inc:1094 ../lib/modules/windowsUser.inc:2436
+#: ../lib/modules/windowsUser.inc:2619 ../lib/modules/inetOrgPerson.inc:160
+#: ../lib/modules/inetOrgPerson.inc:185 ../lib/modules/inetOrgPerson.inc:416
+#: ../lib/modules/inetOrgPerson.inc:563 ../lib/modules/inetOrgPerson.inc:690
+#: ../lib/modules/inetOrgPerson.inc:694 ../lib/modules/inetOrgPerson.inc:1313
+#: ../lib/modules/inetOrgPerson.inc:1316 ../lib/modules/inetOrgPerson.inc:1984
+#: ../lib/modules/inetOrgPerson.inc:2642 ../lib/modules/inetOrgPerson.inc:3626
+#: ../lib/modules/inetOrgPerson.inc:3696
 msgid "Post office box"
 msgstr "邮政信箱"
 
-#: ../lib/modules/inetOrgPerson.inc:85 ../lib/modules/inetOrgPerson.inc:161
-#: ../lib/modules/inetOrgPerson.inc:199 ../lib/modules/inetOrgPerson.inc:402
-#: ../lib/modules/inetOrgPerson.inc:577 ../lib/modules/inetOrgPerson.inc:708
-#: ../lib/modules/inetOrgPerson.inc:1359 ../lib/modules/inetOrgPerson.inc:1990
-#: ../lib/modules/inetOrgPerson.inc:2613 ../lib/modules/inetOrgPerson.inc:3654
-#: ../lib/modules/inetOrgPerson.inc:3718
+#: ../lib/modules/inetOrgPerson.inc:83 ../lib/modules/inetOrgPerson.inc:159
+#: ../lib/modules/inetOrgPerson.inc:197 ../lib/modules/inetOrgPerson.inc:400
+#: ../lib/modules/inetOrgPerson.inc:575 ../lib/modules/inetOrgPerson.inc:706
+#: ../lib/modules/inetOrgPerson.inc:1357 ../lib/modules/inetOrgPerson.inc:1986
+#: ../lib/modules/inetOrgPerson.inc:2609 ../lib/modules/inetOrgPerson.inc:3634
+#: ../lib/modules/inetOrgPerson.inc:3698
 msgid "Postal address"
 msgstr "邮政地址"
 
-#: ../lib/modules/inetOrgPerson.inc:709
+#: ../lib/modules/inetOrgPerson.inc:707
 msgid "Postal address, city"
 msgstr "邮政地址,城市"
 
 #: ../lib/modules/windowsUser.inc:170 ../lib/modules/windowsUser.inc:460
 #: ../lib/modules/windowsUser.inc:826 ../lib/modules/windowsUser.inc:923
 #: ../lib/modules/windowsUser.inc:976 ../lib/modules/windowsUser.inc:1095
-#: ../lib/modules/windowsUser.inc:2437 ../lib/modules/windowsUser.inc:2622
-#: ../lib/modules/inetOrgPerson.inc:89 ../lib/modules/inetOrgPerson.inc:162
-#: ../lib/modules/inetOrgPerson.inc:190 ../lib/modules/inetOrgPerson.inc:394
-#: ../lib/modules/inetOrgPerson.inc:568 ../lib/modules/inetOrgPerson.inc:700
-#: ../lib/modules/inetOrgPerson.inc:704 ../lib/modules/inetOrgPerson.inc:1324
-#: ../lib/modules/inetOrgPerson.inc:1327 ../lib/modules/inetOrgPerson.inc:1989
-#: ../lib/modules/inetOrgPerson.inc:2635 ../lib/modules/inetOrgPerson.inc:3648
-#: ../lib/modules/inetOrgPerson.inc:3716
+#: ../lib/modules/windowsUser.inc:2435 ../lib/modules/windowsUser.inc:2620
+#: ../lib/modules/inetOrgPerson.inc:87 ../lib/modules/inetOrgPerson.inc:160
+#: ../lib/modules/inetOrgPerson.inc:188 ../lib/modules/inetOrgPerson.inc:392
+#: ../lib/modules/inetOrgPerson.inc:566 ../lib/modules/inetOrgPerson.inc:698
+#: ../lib/modules/inetOrgPerson.inc:702 ../lib/modules/inetOrgPerson.inc:1322
+#: ../lib/modules/inetOrgPerson.inc:1325 ../lib/modules/inetOrgPerson.inc:1985
+#: ../lib/modules/inetOrgPerson.inc:2631 ../lib/modules/inetOrgPerson.inc:3628
+#: ../lib/modules/inetOrgPerson.inc:3696
 msgid "Postal code"
 msgstr "邮政编码"
 
-#: ../lib/modules/puppetClient.inc:117
+#: ../lib/modules/puppetClient.inc:120
 msgid "Predefined classes"
 msgstr "预定义类"
 
-#: ../lib/modules/puppetClient.inc:121 ../lib/modules/puppetClient.inc:552
+#: ../lib/modules/puppetClient.inc:124 ../lib/modules/puppetClient.inc:553
 msgid "Predefined environments"
 msgstr "预定义环境"
 
@@ -10840,9 +10893,9 @@ msgstr "预定义服务"
 msgid "Predefined values"
 msgstr "预订值"
 
-#: ../lib/modules/bindDLZ.inc:203 ../lib/modules/bindDLZ.inc:207
-#: ../lib/modules/bindDLZ.inc:287 ../lib/modules/bindDLZ.inc:502
-#: ../lib/modules/bindDLZ.inc:923 ../lib/modules/bindDLZ.inc:1518
+#: ../lib/modules/bindDLZ.inc:206 ../lib/modules/bindDLZ.inc:210
+#: ../lib/modules/bindDLZ.inc:290 ../lib/modules/bindDLZ.inc:505
+#: ../lib/modules/bindDLZ.inc:926 ../lib/modules/bindDLZ.inc:1519
 msgid "Preference"
 msgstr "优先"
 
@@ -10850,31 +10903,31 @@ msgstr "优先"
 msgid "Prefix for mailboxes"
 msgstr "邮箱前缀"
 
-#: ../lib/modules/windowsUser.inc:672 ../lib/modules/inetOrgPerson.inc:348
+#: ../lib/modules/windowsUser.inc:672 ../lib/modules/inetOrgPerson.inc:346
 msgid "President"
 msgstr "总裁"
 
-#: ../lib/modules/pykotaUser.inc:650 ../lib/modules/pykotaUser.inc:995
+#: ../lib/modules/pykotaUser.inc:653 ../lib/modules/pykotaUser.inc:996
 msgid "Price"
 msgstr "价格"
 
 #: ../lib/types/pykotaPrinterType.inc:94 ../lib/modules/pykotaPrinter.inc:111
 #: ../lib/modules/pykotaPrinter.inc:174 ../lib/modules/pykotaPrinter.inc:197
 #: ../lib/modules/pykotaPrinter.inc:215 ../lib/modules/pykotaPrinter.inc:235
-#: ../lib/modules/pykotaPrinter.inc:590
+#: ../lib/modules/pykotaPrinter.inc:588
 msgid "Price per job"
 msgstr "每任务价格"
 
 #: ../lib/types/pykotaPrinterType.inc:93 ../lib/modules/pykotaPrinter.inc:115
 #: ../lib/modules/pykotaPrinter.inc:180 ../lib/modules/pykotaPrinter.inc:198
 #: ../lib/modules/pykotaPrinter.inc:217 ../lib/modules/pykotaPrinter.inc:237
-#: ../lib/modules/pykotaPrinter.inc:591
+#: ../lib/modules/pykotaPrinter.inc:589
 msgid "Price per page"
 msgstr "每页价格"
 
 #: ../lib/modules/eduPerson.inc:88 ../lib/modules/eduPerson.inc:168
 #: ../lib/modules/eduPerson.inc:229 ../lib/modules/eduPerson.inc:283
-#: ../lib/modules/eduPerson.inc:558
+#: ../lib/modules/eduPerson.inc:556
 msgid "Primary affiliation"
 msgstr "主要联系"
 
@@ -10882,29 +10935,29 @@ msgstr "主要联系"
 #: ../lib/modules/posixAccount.inc:355 ../lib/modules/posixAccount.inc:407
 #: ../lib/modules/posixAccount.inc:469 ../lib/modules/posixAccount.inc:511
 #: ../lib/modules/posixAccount.inc:1431 ../lib/modules/posixAccount.inc:1727
-#: ../lib/modules/posixAccount.inc:1773 ../lib/modules/posixAccount.inc:1845
+#: ../lib/modules/posixAccount.inc:1773 ../lib/modules/posixAccount.inc:1843
 msgid "Primary group"
 msgstr "主要组"
 
-#: ../lib/modules/bindDLZ.inc:236
+#: ../lib/modules/bindDLZ.inc:239
 msgid "Primary master DNS server for this zone (e.g. \"ns1.example.com.\")."
 msgstr "这个域的主DNS服务器(比如 \"ns1.example.com.\")."
 
-#: ../lib/modules/bindDLZ.inc:235 ../lib/modules/bindDLZ.inc:345
-#: ../lib/modules/bindDLZ.inc:429 ../lib/modules/bindDLZ.inc:531
-#: ../lib/modules/bindDLZ.inc:1047 ../lib/modules/bindDLZ.inc:1554
+#: ../lib/modules/bindDLZ.inc:238 ../lib/modules/bindDLZ.inc:348
+#: ../lib/modules/bindDLZ.inc:432 ../lib/modules/bindDLZ.inc:534
+#: ../lib/modules/bindDLZ.inc:1050 ../lib/modules/bindDLZ.inc:1555
 msgid "Primary name server"
 msgstr "主DNS服务器"
 
 #: ../lib/modules/eduPerson.inc:130 ../lib/modules/eduPerson.inc:206
 #: ../lib/modules/eduPerson.inc:232 ../lib/modules/eduPerson.inc:247
-#: ../lib/modules/eduPerson.inc:348 ../lib/modules/eduPerson.inc:565
+#: ../lib/modules/eduPerson.inc:348 ../lib/modules/eduPerson.inc:563
 msgid "Primary organisational unit"
 msgstr "主要组织单元"
 
 #: ../lib/modules/eduPerson.inc:114 ../lib/modules/eduPerson.inc:161
 #: ../lib/modules/eduPerson.inc:230 ../lib/modules/eduPerson.inc:277
-#: ../lib/modules/eduPerson.inc:560
+#: ../lib/modules/eduPerson.inc:558
 msgid "Principal name"
 msgstr "主要的名字"
 
@@ -10912,7 +10965,7 @@ msgstr "主要的名字"
 msgid "Principal name is invalid!"
 msgstr "主要的名字非法!"
 
-#: ../lib/modules/pykotaUser.inc:648 ../lib/modules/pykotaUser.inc:994
+#: ../lib/modules/pykotaUser.inc:651 ../lib/modules/pykotaUser.inc:995
 msgid "Printer"
 msgstr "打印机"
 
@@ -10926,14 +10979,14 @@ msgid "Printer description."
 msgstr "打印机描述"
 
 #: ../lib/modules/pykotaPrinter.inc:200 ../lib/modules/pykotaPrinter.inc:258
-#: ../lib/modules/pykotaPrinter.inc:624
+#: ../lib/modules/pykotaPrinter.inc:622
 msgid "Printer groups"
 msgstr "打印机组"
 
 #: ../lib/types/pykotaPrinterType.inc:91 ../lib/modules/pykotaPrinter.inc:95
 #: ../lib/modules/pykotaPrinter.inc:146 ../lib/modules/pykotaPrinter.inc:193
 #: ../lib/modules/pykotaPrinter.inc:209 ../lib/modules/pykotaPrinter.inc:211
-#: ../lib/modules/pykotaPrinter.inc:231 ../lib/modules/pykotaPrinter.inc:587
+#: ../lib/modules/pykotaPrinter.inc:231 ../lib/modules/pykotaPrinter.inc:585
 #: ../lib/modules/pykotaBillingCode.inc:101
 msgid "Printer name"
 msgstr "打印机名"
@@ -10958,10 +11011,10 @@ msgstr "将要建立这台打印机的打印机名,可用字符为: a-z, A-Z, 0-
 msgid "Printers"
 msgstr "打印机"
 
-#: ../lib/modules/bindDLZ.inc:179 ../lib/modules/bindDLZ.inc:183
-#: ../lib/modules/bindDLZ.inc:389 ../lib/modules/bindDLZ.inc:508
-#: ../lib/modules/bindDLZ.inc:1355 ../lib/modules/bindDLZ.inc:1602
-#: ../lib/modules/asteriskExtension.inc:106
+#: ../lib/modules/bindDLZ.inc:182 ../lib/modules/bindDLZ.inc:186
+#: ../lib/modules/bindDLZ.inc:392 ../lib/modules/bindDLZ.inc:511
+#: ../lib/modules/bindDLZ.inc:1358 ../lib/modules/bindDLZ.inc:1603
+#: ../lib/modules/asteriskExtension.inc:108
 #: ../lib/modules/asteriskExtension.inc:825
 msgid "Priority"
 msgstr "优先级"
@@ -10975,7 +11028,7 @@ msgstr "处理完毕"
 #: ../lib/modules/freeRadius.inc:124 ../lib/modules/freeRadius.inc:172
 #: ../lib/modules/freeRadius.inc:247 ../lib/modules/freeRadius.inc:276
 #: ../lib/modules/freeRadius.inc:318 ../lib/modules/freeRadius.inc:400
-#: ../lib/modules/freeRadius.inc:700
+#: ../lib/modules/freeRadius.inc:698
 msgid "Profile"
 msgstr "配置"
 
@@ -10988,8 +11041,8 @@ msgstr "配置DN"
 msgid "Profile deleted."
 msgstr "配置文件被删除."
 
-#: ../templates/profedit/profilepage.php:187
-#: ../templates/profedit/profilemain.php:99 ../lib/tools/profileEditor.inc:44
+#: ../templates/profedit/profilepage.php:200
+#: ../templates/profedit/profilemain.php:117 ../lib/tools/profileEditor.inc:45
 msgid "Profile editor"
 msgstr "配置文件编辑器"
 
@@ -11010,21 +11063,20 @@ msgstr "配置文件管理"
 #: ../templates/selfService/profManage.php:202
 #: ../templates/selfService/profManage.php:217
 #: ../templates/selfService/profManage.php:235
-#: ../templates/profedit/profilepage.php:191
-#: ../templates/profedit/profilemain.php:283
-#: ../templates/profedit/profilemain.php:328 ../help/help.inc:226
+#: ../templates/profedit/profilepage.php:204
+#: ../templates/profedit/profilemain.php:372 ../help/help.inc:226
 msgid "Profile name"
 msgstr "配置文件名"
 
 #: ../templates/config/profmanage.php:98 ../templates/config/profmanage.php:130
 #: ../templates/config/profmanage.php:141
 #: ../templates/selfService/profManage.php:61
-#: ../templates/selfService/profManage.php:76 ../lib/config.inc:178
+#: ../templates/selfService/profManage.php:76 ../lib/config.inc:181
 msgid "Profile name is invalid!"
 msgstr "配置文件名非法!"
 
 #: ../templates/config/profmanage.php:233
-#: ../templates/config/profmanage.php:288
+#: ../templates/config/profmanage.php:288 ../templates/config/confmain.php:562
 msgid "Profile password"
 msgstr "配置文件密码"
 
@@ -11043,11 +11095,11 @@ msgstr "配置文件密码不同或为空!"
 #: ../lib/modules/sambaSamAccount.inc:1526
 #: ../lib/modules/sambaSamAccount.inc:1706
 #: ../lib/modules/sambaSamAccount.inc:1890
-#: ../lib/modules/sambaSamAccount.inc:1918
-#: ../lib/modules/sambaSamAccount.inc:1933 ../lib/modules/windowsUser.inc:222
+#: ../lib/modules/sambaSamAccount.inc:1916
+#: ../lib/modules/sambaSamAccount.inc:1931 ../lib/modules/windowsUser.inc:222
 #: ../lib/modules/windowsUser.inc:558 ../lib/modules/windowsUser.inc:746
 #: ../lib/modules/windowsUser.inc:837 ../lib/modules/windowsUser.inc:982
-#: ../lib/modules/windowsUser.inc:1218 ../lib/modules/windowsUser.inc:2484
+#: ../lib/modules/windowsUser.inc:1218 ../lib/modules/windowsUser.inc:2482
 msgid "Profile path"
 msgstr "配置文件路径"
 
@@ -11056,11 +11108,11 @@ msgstr "配置文件路径"
 msgid "Profile path is invalid!"
 msgstr "配置文件路径非法!"
 
-#: ../templates/profedit/profilemain.php:154
+#: ../templates/profedit/profilemain.php:197
 msgid "Profile was saved."
 msgstr "配置文件已保存."
 
-#: ../templates/profedit/profilemain.php:249
+#: ../templates/profedit/profilemain.php:295
 msgid "Profiles"
 msgstr "配置文件"
 
@@ -11068,35 +11120,40 @@ msgstr "配置文件"
 msgid "Program to execute for all incoming mails."
 msgstr "所有收件要运行的程序."
 
-#: ../templates/multiEdit.php:236
+#: ../templates/multiEdit.php:259
 msgid "Progress"
 msgstr "处理"
 
+#: ../templates/config/confmain.php:538
+#: ../templates/selfService/adminMain.php:510
+msgid "Provider"
+msgstr "提供者"
+
 #: ../lib/modules/zarafaServer.inc:84 ../lib/modules/zarafaServer.inc:128
 #: ../lib/modules/zarafaServer.inc:141 ../lib/modules/zarafaServer.inc:163
-#: ../lib/modules/zarafaServer.inc:212 ../lib/modules/zarafaServer.inc:360
+#: ../lib/modules/zarafaServer.inc:212 ../lib/modules/zarafaServer.inc:358
 msgid "Proxy URL"
 msgstr "代理URL"
 
 #: ../lib/types/user.inc:107 ../lib/modules/windowsUser.inc:378
 #: ../lib/modules/windowsUser.inc:382 ../lib/modules/windowsUser.inc:589
 #: ../lib/modules/windowsUser.inc:847 ../lib/modules/windowsUser.inc:1104
-#: ../lib/modules/windowsUser.inc:2449 ../lib/modules/windowsUser.inc:3209
+#: ../lib/modules/windowsUser.inc:2447 ../lib/modules/windowsUser.inc:3207
 msgid "Proxy-Addresses"
 msgstr "代理地址"
 
 #: ../lib/modules/zarafaServer.inc:80 ../lib/modules/zarafaServer.inc:118
 #: ../lib/modules/zarafaServer.inc:138 ../lib/modules/zarafaServer.inc:225
-#: ../lib/modules/zarafaServer.inc:365
+#: ../lib/modules/zarafaServer.inc:363
 msgid "Public store"
 msgstr "公用存储"
 
-#: ../lib/modules/puppetClient.inc:75
+#: ../lib/modules/puppetClient.inc:78
 msgid "Puppet"
 msgstr "Puppet"
 
 #: ../lib/modules/pykotaPrinter.inc:79 ../lib/modules/pykotaGroup.inc:93
-#: ../lib/modules/pykotaUser.inc:93 ../lib/modules/pykotaBillingCode.inc:61
+#: ../lib/modules/pykotaUser.inc:96 ../lib/modules/pykotaBillingCode.inc:61
 msgid "PyKota"
 msgstr "PyKota"
 
@@ -11106,7 +11163,7 @@ msgstr "PyKota 账单号"
 
 #: ../lib/modules/pykotaGroup.inc:121 ../lib/modules/pykotaGroup.inc:148
 #: ../lib/modules/pykotaGroup.inc:181 ../lib/modules/pykotaGroup.inc:201
-#: ../lib/modules/pykotaGroup.inc:203 ../lib/modules/pykotaGroup.inc:470
+#: ../lib/modules/pykotaGroup.inc:203 ../lib/modules/pykotaGroup.inc:468
 msgid "PyKota group name"
 msgstr "PyKota 组名"
 
@@ -11114,9 +11171,9 @@ msgstr "PyKota 组名"
 msgid "PyKota printers"
 msgstr "PyKota打印机"
 
-#: ../lib/modules/pykotaUser.inc:124 ../lib/modules/pykotaUser.inc:190
-#: ../lib/modules/pykotaUser.inc:260 ../lib/modules/pykotaUser.inc:315
-#: ../lib/modules/pykotaUser.inc:317 ../lib/modules/pykotaUser.inc:894
+#: ../lib/modules/pykotaUser.inc:127 ../lib/modules/pykotaUser.inc:193
+#: ../lib/modules/pykotaUser.inc:263 ../lib/modules/pykotaUser.inc:318
+#: ../lib/modules/pykotaUser.inc:320 ../lib/modules/pykotaUser.inc:895
 msgid "PyKota user name"
 msgstr "PyKota 用户名"
 
@@ -11124,11 +11181,11 @@ msgstr "PyKota 用户名"
 msgid "Pykota group name"
 msgstr "PyKota 组名"
 
-#: ../lib/modules/pykotaUser.inc:359
+#: ../lib/modules/pykotaUser.inc:362
 msgid "Pykota user name"
 msgstr "PyKota 用户名"
 
-#: ../lib/modules/qmailUser.inc:87 ../lib/modules/qmailUser.inc:1230
+#: ../lib/modules/qmailUser.inc:87 ../lib/modules/qmailUser.inc:1228
 #: ../lib/modules/qmailGroup.inc:56
 msgid "Qmail"
 msgstr "Qmail"
@@ -11137,8 +11194,8 @@ msgstr "Qmail"
 #: ../lib/modules/asteriskAccount.inc:284
 #: ../lib/modules/asteriskAccount.inc:443
 #: ../lib/modules/asteriskAccount.inc:691
-#: ../lib/modules/asteriskAccount.inc:1003
-#: ../lib/modules/asteriskAccount.inc:1272
+#: ../lib/modules/asteriskAccount.inc:1001
+#: ../lib/modules/asteriskAccount.inc:1270
 msgid "Qualify"
 msgstr "合格"
 
@@ -11158,41 +11215,41 @@ msgstr "合格"
 #: ../lib/modules/passwordSelfReset.inc:323
 #: ../lib/modules/passwordSelfReset.inc:327
 #: ../lib/modules/passwordSelfReset.inc:330
+#: ../lib/modules/passwordSelfReset.inc:499
+#: ../lib/modules/passwordSelfReset.inc:500
 #: ../lib/modules/passwordSelfReset.inc:501
-#: ../lib/modules/passwordSelfReset.inc:502
-#: ../lib/modules/passwordSelfReset.inc:503
+#: ../lib/modules/passwordSelfReset.inc:788
+#: ../lib/modules/passwordSelfReset.inc:789
 #: ../lib/modules/passwordSelfReset.inc:790
-#: ../lib/modules/passwordSelfReset.inc:791
-#: ../lib/modules/passwordSelfReset.inc:792
-#: ../lib/modules/passwordSelfReset.inc:1262
+#: ../lib/modules/passwordSelfReset.inc:1260
 msgid "Question"
 msgstr "提问"
 
-#: ../lib/modules/qmailUser.inc:678 ../lib/modules/quota.inc:87
-#: ../lib/modules/quota.inc:100 ../lib/modules/quota.inc:153
+#: ../lib/modules/qmailUser.inc:678 ../lib/modules/quota.inc:90
+#: ../lib/modules/quota.inc:103 ../lib/modules/quota.inc:156
 #: ../lib/modules/pykotaGroup.inc:61 ../lib/modules/pykotaGroup.inc:175
-#: ../lib/modules/pykotaGroup.inc:176 ../lib/modules/zarafaUser.inc:510
-#: ../lib/modules/pykotaUser.inc:61 ../lib/modules/pykotaUser.inc:235
-#: ../lib/modules/pykotaUser.inc:236 ../lib/modules/systemQuotas.inc:58
-#: ../lib/modules/systemQuotas.inc:68 ../lib/modules/systemQuotas.inc:75
-#: ../lib/modules/systemQuotas.inc:81 ../lib/modules/systemQuotas.inc:88
+#: ../lib/modules/pykotaGroup.inc:176 ../lib/modules/zarafaUser.inc:513
+#: ../lib/modules/pykotaUser.inc:64 ../lib/modules/pykotaUser.inc:238
+#: ../lib/modules/pykotaUser.inc:239 ../lib/modules/systemQuotas.inc:61
+#: ../lib/modules/systemQuotas.inc:71 ../lib/modules/systemQuotas.inc:78
+#: ../lib/modules/systemQuotas.inc:84 ../lib/modules/systemQuotas.inc:91
 #: ../lib/modules/imapAccess.inc:114 ../lib/modules/imapAccess.inc:138
 msgid "Quota"
 msgstr "配额"
 
-#: ../lib/modules/quota.inc:704
+#: ../lib/modules/quota.inc:705
 #, php-format
 msgid "Quota for %s on %s"
 msgstr "%s 在 %s 的硬盘配额:"
 
-#: ../lib/modules/zarafaUser.inc:114 ../lib/modules/zarafaUser.inc:248
-#: ../lib/modules/zarafaUser.inc:371 ../lib/modules/zarafaUser.inc:434
-#: ../lib/modules/zarafaUser.inc:545 ../lib/modules/zarafaUser.inc:1269
-#: ../lib/modules/zarafaUser.inc:1355 ../lib/modules/zarafaUser.inc:1830
+#: ../lib/modules/zarafaUser.inc:117 ../lib/modules/zarafaUser.inc:251
+#: ../lib/modules/zarafaUser.inc:374 ../lib/modules/zarafaUser.inc:437
+#: ../lib/modules/zarafaUser.inc:548 ../lib/modules/zarafaUser.inc:1270
+#: ../lib/modules/zarafaUser.inc:1356 ../lib/modules/zarafaUser.inc:1831
 msgid "Quota hard limit"
 msgstr "硬限额."
 
-#: ../lib/modules/quota.inc:63
+#: ../lib/modules/quota.inc:66
 msgid "Quota has wrong format!"
 msgstr "磁盘配额格式错误!"
 
@@ -11200,37 +11257,38 @@ msgstr "磁盘配额格式错误!"
 msgid "Quota limit (kB)"
 msgstr "限额(kB)."
 
-#: ../lib/modules/zarafaUser.inc:102 ../lib/modules/zarafaUser.inc:222
-#: ../lib/modules/zarafaUser.inc:362 ../lib/modules/zarafaUser.inc:517
-#: ../lib/modules/zarafaUser.inc:1280 ../lib/modules/zarafaUser.inc:1346
-#: ../lib/modules/zarafaUser.inc:1824
+#: ../lib/modules/zarafaUser.inc:105 ../lib/modules/zarafaUser.inc:225
+#: ../lib/modules/zarafaUser.inc:365 ../lib/modules/zarafaUser.inc:520
+#: ../lib/modules/zarafaUser.inc:1281 ../lib/modules/zarafaUser.inc:1347
+#: ../lib/modules/zarafaUser.inc:1825
 msgid "Quota override"
 msgstr "限制覆盖"
 
 #: ../lib/modules/qmailUser.inc:106 ../lib/modules/qmailUser.inc:133
 #: ../lib/modules/qmailUser.inc:219 ../lib/modules/qmailUser.inc:308
 #: ../lib/modules/qmailUser.inc:409 ../lib/modules/qmailUser.inc:685
-#: ../lib/modules/qmailUser.inc:1115
+#: ../lib/modules/qmailUser.inc:1113
 msgid "Quota size"
 msgstr "限制大小"
 
-#: ../lib/modules/zarafaUser.inc:110 ../lib/modules/zarafaUser.inc:240
-#: ../lib/modules/zarafaUser.inc:368 ../lib/modules/zarafaUser.inc:432
-#: ../lib/modules/zarafaUser.inc:535 ../lib/modules/zarafaUser.inc:1268
-#: ../lib/modules/zarafaUser.inc:1352 ../lib/modules/zarafaUser.inc:1828
+#: ../lib/modules/zarafaUser.inc:113 ../lib/modules/zarafaUser.inc:243
+#: ../lib/modules/zarafaUser.inc:371 ../lib/modules/zarafaUser.inc:435
+#: ../lib/modules/zarafaUser.inc:538 ../lib/modules/zarafaUser.inc:1269
+#: ../lib/modules/zarafaUser.inc:1353 ../lib/modules/zarafaUser.inc:1829
 msgid "Quota soft limit"
 msgstr "软限额"
 
-#: ../lib/modules/zarafaUser.inc:106 ../lib/modules/zarafaUser.inc:232
-#: ../lib/modules/zarafaUser.inc:365 ../lib/modules/zarafaUser.inc:430
-#: ../lib/modules/zarafaUser.inc:525 ../lib/modules/zarafaUser.inc:1267
-#: ../lib/modules/zarafaUser.inc:1349 ../lib/modules/zarafaUser.inc:1826
+#: ../lib/modules/zarafaUser.inc:109 ../lib/modules/zarafaUser.inc:235
+#: ../lib/modules/zarafaUser.inc:368 ../lib/modules/zarafaUser.inc:433
+#: ../lib/modules/zarafaUser.inc:528 ../lib/modules/zarafaUser.inc:1268
+#: ../lib/modules/zarafaUser.inc:1350 ../lib/modules/zarafaUser.inc:1827
 msgid "Quota warning limit"
 msgstr "限制告警点."
 
-#: ../templates/masscreate.php:334 ../templates/profedit/profilepage.php:218
+#: ../templates/upload/masscreate.php:360
+#: ../templates/profedit/profilepage.php:230
 #: ../lib/modules/selfRegistration.inc:98
-#: ../lib/modules/selfRegistration.inc:215 ../lib/modules.inc:1022
+#: ../lib/modules/selfRegistration.inc:215 ../lib/modules.inc:1030
 #: ../help/help.inc:224
 msgid "RDN identifier"
 msgstr "RDN标志"
@@ -11241,7 +11299,7 @@ msgstr "RID (Windows UID)"
 
 #: ../lib/modules/sambaDomain.inc:97 ../lib/modules/sambaDomain.inc:158
 #: ../lib/modules/sambaDomain.inc:189 ../lib/modules/sambaDomain.inc:383
-#: ../lib/modules/sambaDomain.inc:389 ../lib/modules/sambaDomain.inc:605
+#: ../lib/modules/sambaDomain.inc:389 ../lib/modules/sambaDomain.inc:603
 msgid "RID base"
 msgstr "RID 基类"
 
@@ -11253,8 +11311,8 @@ msgstr "RID设置"
 #: ../lib/modules/asteriskAccount.inc:287
 #: ../lib/modules/asteriskAccount.inc:465
 #: ../lib/modules/asteriskAccount.inc:704
-#: ../lib/modules/asteriskAccount.inc:1006
-#: ../lib/modules/asteriskAccount.inc:1278
+#: ../lib/modules/asteriskAccount.inc:1004
+#: ../lib/modules/asteriskAccount.inc:1276
 msgid "RTP hold timeout"
 msgstr "RTP保持超时"
 
@@ -11262,12 +11320,12 @@ msgstr "RTP保持超时"
 #: ../lib/modules/asteriskAccount.inc:286
 #: ../lib/modules/asteriskAccount.inc:458
 #: ../lib/modules/asteriskAccount.inc:699
-#: ../lib/modules/asteriskAccount.inc:1005
-#: ../lib/modules/asteriskAccount.inc:1276
+#: ../lib/modules/asteriskAccount.inc:1003
+#: ../lib/modules/asteriskAccount.inc:1274
 msgid "RTP timeout"
 msgstr "RTP超时"
 
-#: ../lib/modules/customFields.inc:3105
+#: ../lib/modules/customFields.inc:3103
 msgid "Radio buttons"
 msgstr "单选按钮"
 
@@ -11275,32 +11333,32 @@ msgstr "单选按钮"
 msgid "Radius profile for this user."
 msgstr "该用户的Radius配置"
 
-#: ../lib/modules/range.inc:97 ../lib/modules/range.inc:514
-#: ../lib/modules/range.inc:574
+#: ../lib/modules/range.inc:100 ../lib/modules/range.inc:517
+#: ../lib/modules/range.inc:577
 msgid "Range from"
 msgstr "范围起始自"
 
-#: ../lib/modules/range.inc:101 ../lib/modules/range.inc:527
-#: ../lib/modules/range.inc:576
+#: ../lib/modules/range.inc:104 ../lib/modules/range.inc:530
+#: ../lib/modules/range.inc:579
 msgid "Range to"
 msgstr "范围到"
 
-#: ../lib/types/dhcp.inc:95 ../lib/modules/range.inc:79
-#: ../lib/modules/range.inc:127 ../lib/modules/range.inc:772
+#: ../lib/types/dhcp.inc:95 ../lib/modules/range.inc:82
+#: ../lib/modules/range.inc:130 ../lib/modules/range.inc:773
 msgid "Ranges"
 msgstr "范围"
 
-#: ../templates/config/confmain.php:355
+#: ../templates/config/confmain.php:358
 msgid "Read"
 msgstr "读"
 
-#: ../templates/config/confmain.php:274 ../templates/config/conftypes.php:318
-#: ../lib/modules/customFields.inc:104 ../lib/modules/customFields.inc:1746
+#: ../templates/config/confmain.php:277 ../templates/config/conftypes.php:338
+#: ../lib/modules/customFields.inc:104 ../lib/modules/customFields.inc:1744
 #: ../help/help.inc:184
 msgid "Read-only"
 msgstr "只读"
 
-#: ../lib/modules/inetOrgPerson.inc:3712
+#: ../lib/modules/inetOrgPerson.inc:3692
 msgid "Read-only fields"
 msgstr "只读域"
 
@@ -11318,7 +11376,7 @@ msgstr "确定删除这些属性的值?"
 #: ../lib/modules/mitKerberos.inc:194 ../lib/modules/freeRadius.inc:96
 #: ../lib/modules/freeRadius.inc:142 ../lib/modules/freeRadius.inc:190
 #: ../lib/modules/freeRadius.inc:261 ../lib/modules/freeRadius.inc:310
-#: ../lib/modules/freeRadius.inc:355 ../lib/modules/freeRadius.inc:697
+#: ../lib/modules/freeRadius.inc:355 ../lib/modules/freeRadius.inc:695
 #: ../lib/modules/heimdalKerberos.inc:98 ../lib/modules/heimdalKerberos.inc:157
 #: ../lib/modules/heimdalKerberos.inc:163
 msgid "Realm"
@@ -11334,7 +11392,7 @@ msgstr "接收者非法!"
 
 #: ../lib/types/mailAlias.inc:92 ../lib/modules/nisMailAlias.inc:89
 #: ../lib/modules/nisMailAlias.inc:108 ../lib/modules/nisMailAlias.inc:116
-#: ../lib/modules/nisMailAlias.inc:476
+#: ../lib/modules/nisMailAlias.inc:474
 msgid "Recipient list"
 msgstr "收件人列表"
 
@@ -11346,7 +11404,7 @@ msgstr "收件人"
 #: ../lib/modules/sambaSamAccount.inc:245
 #: ../lib/modules/sambaSamAccount.inc:388
 #: ../lib/modules/sambaSamAccount.inc:1506
-#: ../lib/modules/sambaSamAccount.inc:1985
+#: ../lib/modules/sambaSamAccount.inc:1983
 msgid "Reconnect if disconnected"
 msgstr "如果中断重新连接"
 
@@ -11368,14 +11426,14 @@ msgstr "此对象的所有子集递归拷贝完毕"
 
 #: ../templates/config/profmanage.php:237
 #: ../templates/config/profmanage.php:292
-#: ../templates/config/mainmanage.php:476 ../templates/config/confmain.php:530
+#: ../templates/config/mainmanage.php:476 ../templates/config/confmain.php:565
 #: ../lib/modules/selfRegistration.inc:436
-#: ../lib/modules/sambaSamAccount.inc:2316 ../lib/modules/posixAccount.inc:2749
-#: ../lib/modules/windowsUser.inc:2601
+#: ../lib/modules/sambaSamAccount.inc:2314 ../lib/modules/posixAccount.inc:2747
+#: ../lib/modules/windowsUser.inc:2599
 msgid "Reenter password"
 msgstr "再次输入密码"
 
-#: ../templates/serverInfo.php:187
+#: ../templates/serverInfo.php:188
 msgid "Referrals"
 msgstr "转交"
 
@@ -11384,7 +11442,7 @@ msgstr "转交"
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1054
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1055
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:249
-#: ../lib/modules/asteriskExtension.inc:454 ../lib/lists.inc:807
+#: ../lib/modules/asteriskExtension.inc:456 ../lib/lists.inc:808
 msgid "Refresh"
 msgstr "刷新"
 
@@ -11393,9 +11451,9 @@ msgstr "刷新"
 msgid "Refresh this entry"
 msgstr "刷新本条目"
 
-#: ../lib/modules/bindDLZ.inc:215 ../lib/modules/bindDLZ.inc:320
-#: ../lib/modules/bindDLZ.inc:424 ../lib/modules/bindDLZ.inc:521
-#: ../lib/modules/bindDLZ.inc:1026 ../lib/modules/bindDLZ.inc:1549
+#: ../lib/modules/bindDLZ.inc:218 ../lib/modules/bindDLZ.inc:323
+#: ../lib/modules/bindDLZ.inc:427 ../lib/modules/bindDLZ.inc:524
+#: ../lib/modules/bindDLZ.inc:1029 ../lib/modules/bindDLZ.inc:1550
 msgid "Refresh time"
 msgstr "刷新时间"
 
@@ -11407,16 +11465,16 @@ msgstr "树刷新中"
 msgid "Register new account"
 msgstr "注册新帐号"
 
-#: ../lib/modules/inetOrgPerson.inc:87 ../lib/modules/inetOrgPerson.inc:161
-#: ../lib/modules/inetOrgPerson.inc:202 ../lib/modules/inetOrgPerson.inc:410
-#: ../lib/modules/inetOrgPerson.inc:580 ../lib/modules/inetOrgPerson.inc:712
-#: ../lib/modules/inetOrgPerson.inc:1403 ../lib/modules/inetOrgPerson.inc:1991
-#: ../lib/modules/inetOrgPerson.inc:2624 ../lib/modules/inetOrgPerson.inc:3656
-#: ../lib/modules/inetOrgPerson.inc:3718
+#: ../lib/modules/inetOrgPerson.inc:85 ../lib/modules/inetOrgPerson.inc:159
+#: ../lib/modules/inetOrgPerson.inc:200 ../lib/modules/inetOrgPerson.inc:408
+#: ../lib/modules/inetOrgPerson.inc:578 ../lib/modules/inetOrgPerson.inc:710
+#: ../lib/modules/inetOrgPerson.inc:1401 ../lib/modules/inetOrgPerson.inc:1987
+#: ../lib/modules/inetOrgPerson.inc:2620 ../lib/modules/inetOrgPerson.inc:3636
+#: ../lib/modules/inetOrgPerson.inc:3698
 msgid "Registered address"
 msgstr "注册地址"
 
-#: ../lib/modules/inetOrgPerson.inc:713
+#: ../lib/modules/inetOrgPerson.inc:711
 msgid "Registered address, city"
 msgstr "注册地址,城市"
 
@@ -11424,8 +11482,8 @@ msgstr "注册地址,城市"
 #: ../lib/modules/asteriskAccount.inc:292
 #: ../lib/modules/asteriskAccount.inc:501
 #: ../lib/modules/asteriskAccount.inc:725
-#: ../lib/modules/asteriskAccount.inc:1011
-#: ../lib/modules/asteriskAccount.inc:1288
+#: ../lib/modules/asteriskAccount.inc:1009
+#: ../lib/modules/asteriskAccount.inc:1286
 msgid "Registration context"
 msgstr "注册语境"
 
@@ -11433,8 +11491,8 @@ msgstr "注册语境"
 #: ../lib/modules/asteriskAccount.inc:293
 #: ../lib/modules/asteriskAccount.inc:508
 #: ../lib/modules/asteriskAccount.inc:729
-#: ../lib/modules/asteriskAccount.inc:1012
-#: ../lib/modules/asteriskAccount.inc:1290
+#: ../lib/modules/asteriskAccount.inc:1010
+#: ../lib/modules/asteriskAccount.inc:1288
 msgid "Registration extension"
 msgstr "注册扩展"
 
@@ -11442,12 +11500,12 @@ msgstr "注册扩展"
 #: ../lib/modules/asteriskAccount.inc:297
 #: ../lib/modules/asteriskAccount.inc:537
 #: ../lib/modules/asteriskAccount.inc:754
-#: ../lib/modules/asteriskAccount.inc:1016
-#: ../lib/modules/asteriskAccount.inc:1298
+#: ../lib/modules/asteriskAccount.inc:1014
+#: ../lib/modules/asteriskAccount.inc:1296
 msgid "Registration server"
 msgstr "注册服务器"
 
-#: ../lib/modules/kolabUser.inc:53
+#: ../lib/modules/kolabUser.inc:56
 msgid "Reject if conflicts"
 msgstr "如果冲突会被拒绝"
 
@@ -11455,20 +11513,20 @@ msgstr "如果冲突会被拒绝"
 msgid "Reloading"
 msgstr "重新载入"
 
-#: ../templates/login.php:440
+#: ../templates/login.php:448
 msgid "Remember user name"
 msgstr "记住用户的名字"
 
-#: ../templates/pdfedit/pdfpage.php:481 ../lib/modules/locking389ds.inc:158
+#: ../templates/pdfedit/pdfpage.php:496 ../lib/modules/locking389ds.inc:158
 #: ../lib/modules/mitKerberos.inc:691 ../lib/modules/qmailUser.inc:926
 #: ../lib/modules/windowsHost.inc:158 ../lib/modules/sambaSamAccount.inc:1425
 #: ../lib/modules/windowsUser.inc:1599 ../lib/modules/windowsUser.inc:1862
-#: ../lib/modules/kolabUser.inc:838 ../lib/modules/shadowAccount.inc:488
+#: ../lib/modules/kolabUser.inc:839 ../lib/modules/shadowAccount.inc:488
 #: ../lib/modules/shadowAccount.inc:541 ../lib/modules/freeRadius.inc:564
 #: ../lib/modules/sudoRole.inc:318 ../lib/modules/sudoRole.inc:345
 #: ../lib/modules/sudoRole.inc:372 ../lib/modules/sudoRole.inc:399
 #: ../lib/modules/sudoRole.inc:426 ../lib/modules/sudoRole.inc:453
-#: ../lib/modules/heimdalKerberos.inc:601 ../lib/modules/windowsGroup.inc:371
+#: ../lib/modules/heimdalKerberos.inc:601 ../lib/modules/windowsGroup.inc:374
 msgid "Remove"
 msgstr "删除"
 
@@ -11496,15 +11554,15 @@ msgstr "删除 IP 地址扩展"
 msgid "Remove Kerberos extension"
 msgstr "删除Kerberos扩展"
 
-#: ../lib/modules/puppetClient.inc:289
+#: ../lib/modules/puppetClient.inc:292
 msgid "Remove Puppet extension"
 msgstr "删除Puppet扩展"
 
-#: ../lib/modules/pykotaGroup.inc:238 ../lib/modules/pykotaUser.inc:418
+#: ../lib/modules/pykotaGroup.inc:238 ../lib/modules/pykotaUser.inc:421
 msgid "Remove PyKota extension"
 msgstr "删除PyKota扩展"
 
-#: ../lib/modules/ldapPublicKey.inc:154
+#: ../lib/modules/ldapPublicKey.inc:157
 msgid "Remove SSH public key extension"
 msgstr "删除SSH公钥扩展"
 
@@ -11522,7 +11580,7 @@ msgid "Remove Unix extension"
 msgstr "删除 Unix 扩展"
 
 #: ../lib/modules/zarafaContact.inc:285 ../lib/modules/zarafaGroup.inc:297
-#: ../lib/modules/zarafaUser.inc:686 ../lib/modules/zarafaServer.inc:232
+#: ../lib/modules/zarafaUser.inc:689 ../lib/modules/zarafaServer.inc:232
 msgid "Remove Zarafa extension"
 msgstr "删除Zarafa扩展"
 
@@ -11547,7 +11605,7 @@ msgid "Remove mail routing extension"
 msgstr "删除邮件路由扩展"
 
 #: ../lib/modules/posixGroup.inc:210 ../lib/modules/posixAccount.inc:1489
-#: ../lib/modules/inetOrgPerson.inc:1653
+#: ../lib/modules/inetOrgPerson.inc:1651
 msgid "Remove password"
 msgstr "删除密码"
 
@@ -11561,15 +11619,15 @@ msgstr "删除Qmail扩展"
 
 #: ../templates/3rdParty/pla/htdocs/modify_member_form.php:147
 #: ../lib/modules/zarafaContact.inc:461 ../lib/modules/zarafaGroup.inc:471
-#: ../lib/modules/device.inc:281 ../lib/modules/zarafaUser.inc:950
-#: ../lib/modules/inetOrgPerson.inc:1828 ../lib/modules/qmailGroup.inc:850
-#: ../lib/modules/organizationalRole.inc:389
-#: ../lib/modules/windowsGroup.inc:714 ../lib/modules/groupOfNames.inc:448
-#: ../lib/modules/groupOfNames.inc:603
+#: ../lib/modules/device.inc:284 ../lib/modules/zarafaUser.inc:953
+#: ../lib/modules/inetOrgPerson.inc:1826 ../lib/modules/qmailGroup.inc:850
+#: ../lib/modules/organizationalRole.inc:392
+#: ../lib/modules/windowsGroup.inc:717 ../lib/modules/groupOfNames.inc:451
+#: ../lib/modules/groupOfNames.inc:606
 msgid "Remove selected entries"
 msgstr "删除所选条目"
 
-#: ../templates/config/conftypes.php:261
+#: ../templates/config/conftypes.php:280
 msgid "Remove this account type"
 msgstr "删除这个帐号类型"
 
@@ -11578,11 +11636,11 @@ msgstr "删除这个帐号类型"
 msgid "Remove user from alias entry."
 msgstr "从别名条目删除用户。"
 
-#: ../lib/modules/inetOrgPerson.inc:2731
+#: ../lib/modules/inetOrgPerson.inc:2727
 msgid "Remove/replace photo"
 msgstr "删除/更改照片"
 
-#: ../lib/modules/posixGroup.inc:928
+#: ../lib/modules/posixGroup.inc:926
 msgid "Removed users"
 msgstr "已删除的用户"
 
@@ -11631,13 +11689,13 @@ msgstr "重命名中"
 
 #: ../lib/modules/mitKerberos.inc:132 ../lib/modules/mitKerberos.inc:196
 #: ../lib/modules/mitKerberos.inc:236 ../lib/modules/mitKerberos.inc:253
-#: ../lib/modules/mitKerberos.inc:366 ../lib/modules/mitKerberos.inc:785
+#: ../lib/modules/mitKerberos.inc:366 ../lib/modules/mitKerberos.inc:783
 #: ../lib/modules/heimdalKerberos.inc:114
 #: ../lib/modules/heimdalKerberos.inc:165
 #: ../lib/modules/heimdalKerberos.inc:205
 #: ../lib/modules/heimdalKerberos.inc:222
 #: ../lib/modules/heimdalKerberos.inc:313
-#: ../lib/modules/heimdalKerberos.inc:705
+#: ../lib/modules/heimdalKerberos.inc:703
 msgid "Renewable lifetime"
 msgstr "可重建生命周期"
 
@@ -11647,8 +11705,8 @@ msgstr "可重建生命周期"
 msgid "Renewable lifetime must be a number."
 msgstr "可重建寿命必须是数字!"
 
-#: ../templates/lists/changePassword.php:374
-#: ../lib/modules/passwordSelfReset.inc:1287 ../lib/modules.inc:1072
+#: ../templates/lists/changePassword.php:375
+#: ../lib/modules/passwordSelfReset.inc:1285 ../lib/modules.inc:1080
 msgid "Repeat password"
 msgstr "确认密码"
 
@@ -11656,25 +11714,25 @@ msgstr "确认密码"
 msgid "Replaced $user or $group in homedir."
 msgstr "在homedir中已更改$user和$group. "
 
-#: ../templates/config/confmain.php:423 ../lib/passwordExpirationJob.inc:82
-#: ../lib/passwordExpirationJob.inc:125 ../help/help.inc:295
-#: ../help/help.inc:320
+#: ../templates/config/confmain.php:426 ../lib/passwordExpirationJob.inc:82
+#: ../lib/passwordExpirationJob.inc:125 ../help/help.inc:307
+#: ../help/help.inc:332
 msgid "Reply-to address"
 msgstr "回复地址"
 
-#: ../templates/config/confmain.php:626
+#: ../templates/config/confmain.php:663
 msgid "Reply-to address for password mails is invalid."
 msgstr "密码邮件的回复地址非法"
 
 #: ../lib/types/ppolicyType.inc:89 ../lib/modules/ppolicy.inc:128
 #: ../lib/modules/ppolicy.inc:154 ../lib/modules/ppolicy.inc:283
-#: ../lib/modules/ppolicy.inc:501
+#: ../lib/modules/ppolicy.inc:499
 msgid "Require password change on first login"
 msgstr "第一次登录时需要修改密码"
 
 #: ../lib/modules/windowsUser.inc:219 ../lib/modules/windowsUser.inc:542
 #: ../lib/modules/windowsUser.inc:836 ../lib/modules/windowsUser.inc:1194
-#: ../lib/modules/windowsUser.inc:2478
+#: ../lib/modules/windowsUser.inc:2476
 msgid "Require smartcard"
 msgstr "需要智能卡"
 
@@ -11682,7 +11740,7 @@ msgstr "需要智能卡"
 msgid "Required attribute for object classes"
 msgstr "对象类的所需属性"
 
-#: ../templates/schema/schema.php:383
+#: ../templates/schema/schema.php:384
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1567
 msgid "Required attributes"
 msgstr "必选属性"
@@ -11703,7 +11761,7 @@ msgstr "需要预认证"
 msgid "Reset"
 msgstr "复位"
 
-#: ../lib/modules.inc:1244
+#: ../lib/modules.inc:1252
 msgid "Reset changes"
 msgstr "复位设定"
 
@@ -11714,7 +11772,7 @@ msgstr "复位密码"
 
 #: ../lib/modules/sambaDomain.inc:137 ../lib/modules/sambaDomain.inc:199
 #: ../lib/modules/sambaDomain.inc:224 ../lib/modules/sambaDomain.inc:348
-#: ../lib/modules/sambaDomain.inc:612
+#: ../lib/modules/sambaDomain.inc:610
 msgid "Reset time after lockout"
 msgstr "在锁定后复位时间"
 
@@ -11726,7 +11784,7 @@ msgstr "锁定帐号后复位时间必须是自然数."
 msgid "Resets the billing code's balance and page counter to 0."
 msgstr "重置账单余额和打印数量为0"
 
-#: ../lib/modules/zarafaUser.inc:552
+#: ../lib/modules/zarafaUser.inc:555
 msgid "Resource settings"
 msgstr "资源设置"
 
@@ -11734,8 +11792,8 @@ msgstr "资源设置"
 #: ../lib/modules/asteriskAccount.inc:285
 #: ../lib/modules/asteriskAccount.inc:450
 #: ../lib/modules/asteriskAccount.inc:695
-#: ../lib/modules/asteriskAccount.inc:1004
-#: ../lib/modules/asteriskAccount.inc:1274
+#: ../lib/modules/asteriskAccount.inc:1002
+#: ../lib/modules/asteriskAccount.inc:1272
 msgid "Restrict caller ID"
 msgstr "受限拨号ID."
 
@@ -11760,27 +11818,27 @@ msgstr "获取DN"
 msgid "Retry count"
 msgstr "重试次数"
 
-#: ../lib/modules/bindDLZ.inc:219 ../lib/modules/bindDLZ.inc:332
-#: ../lib/modules/bindDLZ.inc:425 ../lib/modules/bindDLZ.inc:523
-#: ../lib/modules/bindDLZ.inc:1037 ../lib/modules/bindDLZ.inc:1550
+#: ../lib/modules/bindDLZ.inc:222 ../lib/modules/bindDLZ.inc:335
+#: ../lib/modules/bindDLZ.inc:428 ../lib/modules/bindDLZ.inc:526
+#: ../lib/modules/bindDLZ.inc:1040 ../lib/modules/bindDLZ.inc:1551
 msgid "Retry time"
 msgstr "重试时间"
 
-#: ../lib/modules/bindDLZ.inc:755
+#: ../lib/modules/bindDLZ.inc:758
 msgid "Reverse DNS entries (\"PTR\" records)"
 msgstr "反DNS条目Reverse DNS entries (\"PTR\" 记录)"
 
 #: ../lib/modules/ddns.inc:106 ../lib/modules/ddns.inc:114
 #: ../lib/modules/ddns.inc:135 ../lib/modules/ddns.inc:397
-#: ../lib/modules/ddns.inc:427
+#: ../lib/modules/ddns.inc:425
 msgid "Reverse zone name"
 msgstr "反向区域名"
 
-#: ../templates/config/confmain.php:351 ../help/help.inc:120
+#: ../templates/config/confmain.php:354 ../help/help.inc:120
 msgid "Rights for the home directory"
 msgstr "个人目录的权限"
 
-#: ../lib/modules/organizationalRole.inc:65
+#: ../lib/modules/organizationalRole.inc:68
 msgid "Role"
 msgstr "角色"
 
@@ -11796,7 +11854,7 @@ msgstr "角色成员DN"
 #: ../lib/types/gon.inc:112 ../lib/types/group.inc:117 ../lib/types/sudo.inc:77
 #: ../lib/modules/sudoRole.inc:66 ../lib/modules/sudoRole.inc:146
 #: ../lib/modules/sudoRole.inc:214 ../lib/modules/sudoRole.inc:299
-#: ../lib/modules/sudoRole.inc:753
+#: ../lib/modules/sudoRole.inc:751
 msgid "Role name"
 msgstr "角色名"
 
@@ -11807,20 +11865,20 @@ msgstr "角色名"
 #: ../lib/modules/organizationalRoleUser.inc:64
 #: ../lib/modules/organizationalRoleUser.inc:71
 #: ../lib/modules/organizationalRoleUser.inc:270
-#: ../lib/modules/organizationalRoleUser.inc:308
+#: ../lib/modules/organizationalRoleUser.inc:306
 msgid "Roles"
 msgstr "角色"
 
-#: ../lib/modules/zarafaUser.inc:557 ../lib/modules/zarafaUser.inc:1284
+#: ../lib/modules/zarafaUser.inc:560 ../lib/modules/zarafaUser.inc:1285
 msgid "Room"
 msgstr "房间"
 
-#: ../lib/modules/inetOrgPerson.inc:163 ../lib/modules/inetOrgPerson.inc:208
-#: ../lib/modules/inetOrgPerson.inc:492 ../lib/modules/inetOrgPerson.inc:586
-#: ../lib/modules/inetOrgPerson.inc:787 ../lib/modules/inetOrgPerson.inc:1447
-#: ../lib/modules/inetOrgPerson.inc:1450 ../lib/modules/inetOrgPerson.inc:1999
-#: ../lib/modules/inetOrgPerson.inc:2657 ../lib/modules/inetOrgPerson.inc:3660
-#: ../lib/modules/inetOrgPerson.inc:3719
+#: ../lib/modules/inetOrgPerson.inc:161 ../lib/modules/inetOrgPerson.inc:206
+#: ../lib/modules/inetOrgPerson.inc:490 ../lib/modules/inetOrgPerson.inc:584
+#: ../lib/modules/inetOrgPerson.inc:785 ../lib/modules/inetOrgPerson.inc:1445
+#: ../lib/modules/inetOrgPerson.inc:1448 ../lib/modules/inetOrgPerson.inc:1995
+#: ../lib/modules/inetOrgPerson.inc:2653 ../lib/modules/inetOrgPerson.inc:3640
+#: ../lib/modules/inetOrgPerson.inc:3699
 msgid "Room number"
 msgstr "房间号"
 
@@ -11828,16 +11886,16 @@ msgstr "房间号"
 #: ../lib/modules/inetLocalMailRecipient.inc:112
 #: ../lib/modules/inetLocalMailRecipient.inc:131
 #: ../lib/modules/inetLocalMailRecipient.inc:175
-#: ../lib/modules/inetLocalMailRecipient.inc:354
+#: ../lib/modules/inetLocalMailRecipient.inc:352
 msgid "Routing address"
 msgstr "邮寄地址"
 
-#: ../lib/modules/customFields.inc:136 ../lib/modules/customFields.inc:2745
+#: ../lib/modules/customFields.inc:136 ../lib/modules/customFields.inc:2743
 msgid "Rows"
 msgstr "行"
 
-#: ../lib/modules/asteriskExtension.inc:139
-#: ../lib/modules/asteriskExtension.inc:311
+#: ../lib/modules/asteriskExtension.inc:141
+#: ../lib/modules/asteriskExtension.inc:313
 msgid "Rules"
 msgstr "规则"
 
@@ -11852,7 +11910,7 @@ msgstr "运行组"
 #: ../lib/modules/sudoRole.inc:90 ../lib/modules/sudoRole.inc:118
 #: ../lib/modules/sudoRole.inc:183 ../lib/modules/sudoRole.inc:220
 #: ../lib/modules/sudoRole.inc:232 ../lib/modules/sudoRole.inc:424
-#: ../lib/modules/sudoRole.inc:759
+#: ../lib/modules/sudoRole.inc:757
 msgid "Run groups"
 msgstr "运行组"
 
@@ -11863,7 +11921,7 @@ msgstr "运行用户"
 #: ../lib/modules/sudoRole.inc:86 ../lib/modules/sudoRole.inc:113
 #: ../lib/modules/sudoRole.inc:177 ../lib/modules/sudoRole.inc:219
 #: ../lib/modules/sudoRole.inc:231 ../lib/modules/sudoRole.inc:397
-#: ../lib/modules/sudoRole.inc:758
+#: ../lib/modules/sudoRole.inc:756
 msgid "Run users"
 msgstr "运行用户"
 
@@ -11871,7 +11929,7 @@ msgstr "运行用户"
 msgid "S.M."
 msgstr "S.M."
 
-#: ../templates/serverInfo.php:129
+#: ../templates/serverInfo.php:130
 msgid "SASL mechanisms"
 msgstr "SASL机制"
 
@@ -11883,18 +11941,18 @@ msgstr "实时端的SIP URI"
 msgid "SIP user agent identification."
 msgstr "SIP用户代理标识"
 
-#: ../lib/modules/bindDLZ.inc:314 ../lib/modules/bindDLZ.inc:320
-#: ../lib/modules/bindDLZ.inc:326 ../lib/modules/bindDLZ.inc:332
-#: ../lib/modules/bindDLZ.inc:338 ../lib/modules/bindDLZ.inc:345
-#: ../lib/modules/bindDLZ.inc:351 ../lib/modules/bindDLZ.inc:357
-#: ../lib/modules/bindDLZ.inc:423 ../lib/modules/bindDLZ.inc:424
-#: ../lib/modules/bindDLZ.inc:425 ../lib/modules/bindDLZ.inc:426
-#: ../lib/modules/bindDLZ.inc:427 ../lib/modules/bindDLZ.inc:428
-#: ../lib/modules/bindDLZ.inc:429 ../lib/modules/bindDLZ.inc:430
-#: ../lib/modules/bindDLZ.inc:487 ../lib/modules/bindDLZ.inc:519
-#: ../lib/modules/bindDLZ.inc:521 ../lib/modules/bindDLZ.inc:523
-#: ../lib/modules/bindDLZ.inc:525 ../lib/modules/bindDLZ.inc:527
-#: ../lib/modules/bindDLZ.inc:529
+#: ../lib/modules/bindDLZ.inc:317 ../lib/modules/bindDLZ.inc:323
+#: ../lib/modules/bindDLZ.inc:329 ../lib/modules/bindDLZ.inc:335
+#: ../lib/modules/bindDLZ.inc:341 ../lib/modules/bindDLZ.inc:348
+#: ../lib/modules/bindDLZ.inc:354 ../lib/modules/bindDLZ.inc:360
+#: ../lib/modules/bindDLZ.inc:426 ../lib/modules/bindDLZ.inc:427
+#: ../lib/modules/bindDLZ.inc:428 ../lib/modules/bindDLZ.inc:429
+#: ../lib/modules/bindDLZ.inc:430 ../lib/modules/bindDLZ.inc:431
+#: ../lib/modules/bindDLZ.inc:432 ../lib/modules/bindDLZ.inc:433
+#: ../lib/modules/bindDLZ.inc:490 ../lib/modules/bindDLZ.inc:522
+#: ../lib/modules/bindDLZ.inc:524 ../lib/modules/bindDLZ.inc:526
+#: ../lib/modules/bindDLZ.inc:528 ../lib/modules/bindDLZ.inc:530
+#: ../lib/modules/bindDLZ.inc:532
 msgid "SOA record"
 msgstr "SOA记录"
 
@@ -11902,42 +11960,42 @@ msgstr "SOA记录"
 msgid "SQLite"
 msgstr "SQLite"
 
-#: ../lib/modules/bindDLZ.inc:130 ../lib/modules/bindDLZ.inc:389
-#: ../lib/modules/bindDLZ.inc:394 ../lib/modules/bindDLZ.inc:399
-#: ../lib/modules/bindDLZ.inc:404 ../lib/modules/bindDLZ.inc:409
-#: ../lib/modules/bindDLZ.inc:493
+#: ../lib/modules/bindDLZ.inc:133 ../lib/modules/bindDLZ.inc:392
+#: ../lib/modules/bindDLZ.inc:397 ../lib/modules/bindDLZ.inc:402
+#: ../lib/modules/bindDLZ.inc:407 ../lib/modules/bindDLZ.inc:412
+#: ../lib/modules/bindDLZ.inc:496
 msgid "SRV record"
 msgstr "SRV 条目"
 
-#: ../lib/modules/bindDLZ.inc:433 ../lib/modules/bindDLZ.inc:443
-#: ../lib/modules/bindDLZ.inc:1600
+#: ../lib/modules/bindDLZ.inc:436 ../lib/modules/bindDLZ.inc:446
+#: ../lib/modules/bindDLZ.inc:1601
 msgid "SRV records"
 msgstr "SRV 记录"
 
-#: ../templates/tests/lamdaemonTest.php:248
+#: ../templates/tests/lamdaemonTest.php:250
 msgid "SSH connection"
 msgstr "SSH连接"
 
-#: ../templates/tests/lamdaemonTest.php:256
+#: ../templates/tests/lamdaemonTest.php:258
 msgid "SSH connection established."
 msgstr "SSH连接已经建立."
 
-#: ../templates/config/confmain.php:345 ../help/help.inc:216
+#: ../templates/config/confmain.php:348 ../help/help.inc:216
 msgid "SSH key file"
 msgstr "SSH密钥文件"
 
-#: ../templates/config/confmain.php:346 ../help/help.inc:218
+#: ../templates/config/confmain.php:349 ../help/help.inc:218
 msgid "SSH key password"
 msgstr "SSH密钥密码"
 
-#: ../lib/modules/ldapPublicKey.inc:73 ../lib/modules/ldapPublicKey.inc:83
-#: ../lib/modules/ldapPublicKey.inc:87 ../lib/modules/ldapPublicKey.inc:107
-#: ../lib/modules/ldapPublicKey.inc:140
+#: ../lib/modules/ldapPublicKey.inc:76 ../lib/modules/ldapPublicKey.inc:86
+#: ../lib/modules/ldapPublicKey.inc:90 ../lib/modules/ldapPublicKey.inc:110
+#: ../lib/modules/ldapPublicKey.inc:143
 msgid "SSH public key"
 msgstr "SSH公钥"
 
-#: ../lib/modules/ldapPublicKey.inc:114 ../lib/modules/ldapPublicKey.inc:118
-#: ../lib/modules/ldapPublicKey.inc:290 ../lib/modules/ldapPublicKey.inc:332
+#: ../lib/modules/ldapPublicKey.inc:117 ../lib/modules/ldapPublicKey.inc:121
+#: ../lib/modules/ldapPublicKey.inc:291 ../lib/modules/ldapPublicKey.inc:333
 msgid "SSH public keys"
 msgstr "SSH公钥"
 
@@ -11951,12 +12009,12 @@ msgstr "SSL 数字证书"
 
 #: ../lib/modules/zarafaServer.inc:72 ../lib/modules/zarafaServer.inc:106
 #: ../lib/modules/zarafaServer.inc:136 ../lib/modules/zarafaServer.inc:175
-#: ../lib/modules/zarafaServer.inc:203 ../lib/modules/zarafaServer.inc:358
+#: ../lib/modules/zarafaServer.inc:203 ../lib/modules/zarafaServer.inc:356
 msgid "SSL port"
 msgstr "SSL端口"
 
-#: ../templates/lists/changePassword.php:421
-#: ../templates/lists/changePassword.php:461
+#: ../templates/lists/changePassword.php:422
+#: ../templates/lists/changePassword.php:462
 msgid "Samba"
 msgstr "Samba"
 
@@ -11975,14 +12033,14 @@ msgstr "Samba 3 域SID非法!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 域条目"
 
-#: ../lib/modules/posixGroup.inc:568 ../lib/modules/posixAccount.inc:1889
+#: ../lib/modules/posixGroup.inc:568 ../lib/modules/posixAccount.inc:1887
 msgid "Samba ID pool"
 msgstr "Samba ID 池"
 
 #: ../lib/modules/posixGroup.inc:521 ../lib/modules/posixGroup.inc:593
-#: ../lib/modules/posixGroup.inc:673 ../lib/modules/posixAccount.inc:131
-#: ../lib/modules/posixAccount.inc:444 ../lib/modules/posixAccount.inc:1908
-#: ../lib/modules/posixAccount.inc:1945
+#: ../lib/modules/posixGroup.inc:671 ../lib/modules/posixAccount.inc:131
+#: ../lib/modules/posixAccount.inc:444 ../lib/modules/posixAccount.inc:1906
+#: ../lib/modules/posixAccount.inc:1943
 msgid "Samba ID pool DN"
 msgstr "Samba ID 池的DN"
 
@@ -12017,7 +12075,7 @@ msgstr "Samba 域"
 #: ../lib/modules/sambaGroupMapping.inc:113
 #: ../lib/modules/sambaGroupMapping.inc:135
 #: ../lib/modules/sambaGroupMapping.inc:162
-#: ../lib/modules/sambaGroupMapping.inc:542
+#: ../lib/modules/sambaGroupMapping.inc:540
 msgid "Samba group type"
 msgstr "Samba 组类型"
 
@@ -12033,7 +12091,7 @@ msgstr "Samba密码"
 #: ../lib/modules/sambaSamAccount.inc:1192
 #: ../lib/modules/sambaSamAccount.inc:1714
 #: ../lib/modules/sambaSamAccount.inc:1896
-#: ../lib/modules/sambaSamAccount.inc:1919
+#: ../lib/modules/sambaSamAccount.inc:1917
 msgid "Samba workstations"
 msgstr "Samba工作站"
 
@@ -12041,18 +12099,18 @@ msgstr "Samba工作站"
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../templates/config/confmodules.php:236 ../templates/config/jobList.php:251
-#: ../templates/config/jobs.php:400 ../templates/config/confmain.php:545
-#: ../templates/config/moduleSettings.php:250
-#: ../templates/config/conftypes.php:372
-#: ../templates/selfService/selfServiceMain.php:473
-#: ../templates/selfService/adminMain.php:735
-#: ../templates/pdfedit/pdfpage.php:640
-#: ../templates/profedit/profilepage.php:243
+#: ../templates/config/confmodules.php:243 ../templates/config/jobList.php:251
+#: ../templates/config/jobs.php:400 ../templates/config/confmain.php:580
+#: ../templates/config/moduleSettings.php:258
+#: ../templates/config/conftypes.php:387
+#: ../templates/selfService/selfServiceMain.php:482
+#: ../templates/selfService/adminMain.php:788
+#: ../templates/pdfedit/pdfpage.php:658
+#: ../templates/profedit/profilepage.php:255
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1243
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1247
-#: ../lib/modules/inetOrgPerson.inc:2898 ../lib/modules/customFields.inc:3669
-#: ../lib/modules.inc:1238
+#: ../lib/modules/inetOrgPerson.inc:2900 ../lib/modules/customFields.inc:3667
+#: ../lib/modules.inc:1246
 msgid "Save"
 msgstr "保存"
 
@@ -12074,22 +12132,22 @@ msgstr "保存为文件"
 msgid "Save changes"
 msgstr "保存更改"
 
-#: ../lib/tools/schemaBrowser.inc:44
+#: ../lib/tools/schemaBrowser.inc:45
 msgid "Schema browser"
 msgstr "Schema浏览器"
 
-#: ../templates/serverInfo.php:119
+#: ../templates/serverInfo.php:120
 msgid "Schema suffix"
 msgstr "Schema 后缀"
 
-#: ../templates/tests/schemaTest.php:55 ../templates/tests/index.php:58
-#: ../lib/tools/tests.inc:116
+#: ../templates/tests/schemaTest.php:56 ../templates/tests/index.php:59
+#: ../lib/tools/tests.inc:117
 msgid "Schema test"
 msgstr "Schema测试"
 
 #: ../lib/modules/eduPerson.inc:92 ../lib/modules/eduPerson.inc:96
 #: ../lib/modules/eduPerson.inc:175 ../lib/modules/eduPerson.inc:233
-#: ../lib/modules/eduPerson.inc:285 ../lib/modules/eduPerson.inc:559
+#: ../lib/modules/eduPerson.inc:285 ../lib/modules/eduPerson.inc:557
 msgid "Scoped affiliations"
 msgstr "作用域关系"
 
@@ -12097,15 +12155,15 @@ msgstr "作用域关系"
 msgid "Script path"
 msgstr "脚本路径"
 
-#: ../templates/config/confmain.php:677
+#: ../templates/config/confmain.php:714
 msgid "Script path is invalid!"
 msgstr "脚本路径非法!"
 
-#: ../templates/config/confmain.php:696
+#: ../templates/config/confmain.php:733
 msgid "Script rights are invalid!"
 msgstr "脚本权限非法!"
 
-#: ../templates/config/confmain.php:680
+#: ../templates/config/confmain.php:717
 msgid "Script server is invalid!"
 msgstr "脚本服务器非法!"
 
@@ -12113,7 +12171,7 @@ msgstr "脚本服务器非法!"
 msgid "Script servers"
 msgstr "脚本服务器"
 
-#: ../templates/serverInfo.php:300 ../templates/serverInfo.php:380
+#: ../templates/serverInfo.php:301 ../templates/serverInfo.php:381
 #: ../templates/3rdParty/pla/lib/QueryRender.php:75
 #: ../templates/3rdParty/pla/lib/QueryRender.php:180
 #: ../templates/3rdParty/pla/lib/ds_ldap_pla.php:619
@@ -12142,15 +12200,15 @@ msgstr "搜索无结果"
 msgid "Search scope"
 msgstr "搜索范围"
 
-#: ../lib/modules/asteriskExtension.inc:457
+#: ../lib/modules/asteriskExtension.inc:459
 msgid "Search tree suffix for users"
 msgstr "查询用户的树后缀"
 
-#: ../templates/pdfedit/pdfpage.php:612
+#: ../templates/pdfedit/pdfpage.php:628
 msgid "Section"
 msgstr "节"
 
-#: ../lib/modules/windowsGroup.inc:62
+#: ../lib/modules/windowsGroup.inc:65
 msgid "Security"
 msgstr "安全"
 
@@ -12165,11 +12223,11 @@ msgstr "安全错误:正在上传的文件可能有错误."
 
 #: ../lib/modules/zarafaGroup.inc:86 ../lib/modules/zarafaGroup.inc:161
 #: ../lib/modules/zarafaGroup.inc:186 ../lib/modules/zarafaGroup.inc:275
-#: ../lib/modules/zarafaGroup.inc:634
+#: ../lib/modules/zarafaGroup.inc:632
 msgid "Security group"
 msgstr "安全组"
 
-#: ../lib/modules/windowsGroup.inc:145
+#: ../lib/modules/windowsGroup.inc:148
 msgid ""
 "Security groups are used for permission management and distribution groups "
 "as email lists."
@@ -12177,11 +12235,11 @@ msgstr "安全组用于权限管理,分发组用于email用户列表."
 
 #: ../lib/modules/passwordSelfReset.inc:84
 #: ../lib/modules/passwordSelfReset.inc:295
-#: ../lib/modules/passwordSelfReset.inc:667
+#: ../lib/modules/passwordSelfReset.inc:665
 msgid "Security questions"
 msgstr "安全提问"
 
-#: ../templates/config/mainmanage.php:312 ../templates/config/confmain.php:535
+#: ../templates/config/mainmanage.php:312 ../templates/config/confmain.php:570
 msgid "Security settings"
 msgstr "安全设定"
 
@@ -12189,7 +12247,7 @@ msgstr "安全设定"
 msgid "See also"
 msgstr "同时参考"
 
-#: ../lib/account.inc:865
+#: ../lib/account.inc:871
 msgid "See the manual for instructions to solve this problem."
 msgstr "参考手册来解决本问题."
 
@@ -12201,7 +12259,7 @@ msgstr "为新建处理选择模板"
 msgid "Select a template to edit the entry"
 msgstr "为编辑这个条目选择模板"
 
-#: ../lib/lists.inc:359 ../lib/lists.inc:486
+#: ../lib/lists.inc:361 ../lib/lists.inc:488
 msgid "Select all"
 msgstr "全选"
 
@@ -12209,11 +12267,11 @@ msgstr "全选"
 msgid "Select an LDIF file"
 msgstr "选择LDIF文件"
 
-#: ../lib/modules/nisnetgroup.inc:240 ../lib/modules/nisnetgroup.inc:269
+#: ../lib/modules/nisnetgroup.inc:243 ../lib/modules/nisnetgroup.inc:272
 msgid "Select host"
 msgstr "选择主机"
 
-#: ../lib/modules/customFields.inc:3322
+#: ../lib/modules/customFields.inc:3320
 msgid "Select list"
 msgstr "选项列表"
 
@@ -12225,18 +12283,19 @@ msgstr "选择邮件"
 msgid "Select one or more alias entries from the list to add the recipient."
 msgstr "从列表中选择一个或多个别名条目加入到接收列表中."
 
-#: ../lib/modules/nisnetgroup.inc:246 ../lib/modules/nisnetgroup.inc:275
+#: ../lib/modules/nisnetgroup.inc:249 ../lib/modules/nisnetgroup.inc:278
 #: ../lib/modules/nisMailAlias.inc:195 ../lib/modules/nisMailAlias.inc:216
 msgid "Select user"
 msgstr "选择用户"
 
 #: ../lib/modules/posixAccount.inc:1559 ../lib/modules/posixAccount.inc:1592
-#: ../lib/modules/windowsUser.inc:1684 ../lib/modules/nisnetgroup.inc:384
-#: ../lib/modules/groupOfNamesUser.inc:131 ../lib/modules/windowsGroup.inc:521
+#: ../lib/modules/windowsUser.inc:1684 ../lib/modules/nisnetgroup.inc:387
+#: ../lib/modules/groupOfNamesUser.inc:131 ../lib/modules/windowsGroup.inc:524
 msgid "Selected groups"
 msgstr "已选择的组"
 
-#: ../templates/masscreate.php:158 ../templates/config/confmodules.php:306
+#: ../templates/config/confmodules.php:312
+#: ../templates/upload/masscreate.php:183
 msgid "Selected modules"
 msgstr "已选择的模块"
 
@@ -12244,47 +12303,47 @@ msgstr "已选择的模块"
 msgid "Selected roles"
 msgstr "已选中的角色"
 
-#: ../lib/modules/posixGroup.inc:297 ../lib/modules/asteriskExtension.inc:461
+#: ../lib/modules/posixGroup.inc:297 ../lib/modules/asteriskExtension.inc:463
 msgid "Selected users"
 msgstr "已选择的用户"
 
-#: ../templates/selfService/adminMain.php:308
+#: ../templates/selfService/adminMain.php:324
 msgid "Self service configuration"
 msgstr "自助服务配置"
 
-#: ../templates/selfService/adminMain.php:361
+#: ../templates/selfService/adminMain.php:377
 msgid "Self service configuration editor"
 msgstr "自助服务配置编辑器"
 
-#: ../templates/selfService/adminMain.php:367
+#: ../templates/selfService/adminMain.php:383
 msgid "Self service login"
 msgstr "自助服务登录"
 
-#: ../lib/modules/passwordSelfReset.inc:644
+#: ../lib/modules/passwordSelfReset.inc:642
 msgid "Self service login attribute"
 msgstr "自助服务登录属性"
 
-#: ../templates/selfService/adminMain.php:353
+#: ../templates/selfService/adminMain.php:369
 msgid "Self service profile"
 msgstr "自助服务配置"
 
 #: ../lib/modules/passwordSelfReset.inc:134
-#: ../lib/modules/passwordSelfReset.inc:673
+#: ../lib/modules/passwordSelfReset.inc:671
 msgid "Send confirmation mail"
 msgstr "发送确认邮件"
 
 #: ../lib/modules/passwordSelfReset.inc:116
-#: ../lib/modules/passwordSelfReset.inc:693
+#: ../lib/modules/passwordSelfReset.inc:691
 msgid "Send notification mail"
 msgstr "发送提示邮件"
 
-#: ../lib/modules/inetOrgPerson.inc:473 ../lib/modules/inetOrgPerson.inc:756
+#: ../lib/modules/inetOrgPerson.inc:471 ../lib/modules/inetOrgPerson.inc:754
 msgid "Send password via mail"
 msgstr "通过邮件发送密码"
 
-#: ../templates/lists/changePassword.php:333
-#: ../templates/lists/changePassword.php:379
-#: ../templates/config/confmain.php:398 ../lib/modules.inc:1090
+#: ../templates/lists/changePassword.php:334
+#: ../templates/lists/changePassword.php:380
+#: ../templates/config/confmain.php:401 ../lib/modules.inc:1098
 #: ../help/help.inc:246
 msgid "Send via mail"
 msgstr "通过邮件发送"
@@ -12292,21 +12351,21 @@ msgstr "通过邮件发送"
 #: ../lib/modules/qmailGroup.inc:90 ../lib/modules/qmailGroup.inc:220
 #: ../lib/modules/qmailGroup.inc:224 ../lib/modules/qmailGroup.inc:353
 #: ../lib/modules/qmailGroup.inc:408 ../lib/modules/qmailGroup.inc:429
-#: ../lib/modules/qmailGroup.inc:519 ../lib/modules/qmailGroup.inc:1018
+#: ../lib/modules/qmailGroup.inc:519 ../lib/modules/qmailGroup.inc:1016
 msgid "Sender email addresses"
 msgstr "发信人的邮件地址"
 
 #: ../lib/modules/qmailGroup.inc:88 ../lib/modules/qmailGroup.inc:172
 #: ../lib/modules/qmailGroup.inc:176 ../lib/modules/qmailGroup.inc:295
 #: ../lib/modules/qmailGroup.inc:387 ../lib/modules/qmailGroup.inc:521
-#: ../lib/modules/qmailGroup.inc:790 ../lib/modules/qmailGroup.inc:1017
+#: ../lib/modules/qmailGroup.inc:790 ../lib/modules/qmailGroup.inc:1015
 msgid "Sender entries"
 msgstr "发送者条目"
 
 #: ../lib/modules/qmailGroup.inc:92 ../lib/modules/qmailGroup.inc:188
 #: ../lib/modules/qmailGroup.inc:192 ../lib/modules/qmailGroup.inc:311
 #: ../lib/modules/qmailGroup.inc:393 ../lib/modules/qmailGroup.inc:520
-#: ../lib/modules/qmailGroup.inc:1019
+#: ../lib/modules/qmailGroup.inc:1017
 msgid "Sender filter"
 msgstr "发送者过滤表达式"
 
@@ -12326,76 +12385,78 @@ msgid ""
 "new password."
 msgstr "当用户设置新密码时同时发送旧密码."
 
-#: ../lib/modules/inetOrgPerson.inc:757 ../help/help.inc:247
+#: ../lib/modules/inetOrgPerson.inc:755 ../help/help.inc:247
 msgid ""
 "Sends the password to the user via mail. Please edit your LAM server profile "
 "to setup the mail settings."
 msgstr "把密码通过邮件发送给用户。请编辑LAM服务器配置文件来设定邮件的配置."
 
-#: ../templates/config/mainmanage.php:375 ../lib/env.inc:157
-#: ../lib/modules/device.inc:65 ../lib/modules/device.inc:97
-#: ../lib/modules/device.inc:127 ../lib/modules/device.inc:175
-#: ../lib/modules/device.inc:411 ../lib/modules/bindDLZ.inc:227
-#: ../lib/modules/bindDLZ.inc:357 ../lib/modules/bindDLZ.inc:423
-#: ../lib/modules/bindDLZ.inc:527 ../lib/modules/bindDLZ.inc:1055
-#: ../lib/modules/bindDLZ.inc:1548
+#: ../templates/config/mainmanage.php:375
+#: ../templates/selfService/selfService2Factor.php:193
+#: ../templates/login2Factor.php:206 ../lib/env.inc:157
+#: ../lib/modules/device.inc:68 ../lib/modules/device.inc:100
+#: ../lib/modules/device.inc:130 ../lib/modules/device.inc:178
+#: ../lib/modules/device.inc:412 ../lib/modules/bindDLZ.inc:230
+#: ../lib/modules/bindDLZ.inc:360 ../lib/modules/bindDLZ.inc:426
+#: ../lib/modules/bindDLZ.inc:530 ../lib/modules/bindDLZ.inc:1058
+#: ../lib/modules/bindDLZ.inc:1549
 msgid "Serial number"
 msgstr "序列号"
 
-#: ../templates/tests/lamdaemonTest.php:72
+#: ../templates/tests/lamdaemonTest.php:73
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:166
 #: ../templates/3rdParty/pla/htdocs/import.php:47
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:110
 #: ../templates/3rdParty/pla/htdocs/create_confirm.php:54
 #: ../templates/3rdParty/pla/htdocs/export_form.php:56
-#: ../lib/modules/kolabGroup.inc:289 ../lib/modules/bindDLZ.inc:171
-#: ../lib/modules/bindDLZ.inc:175 ../lib/modules/bindDLZ.inc:404
-#: ../lib/modules/bindDLZ.inc:514 ../lib/modules/bindDLZ.inc:1373
-#: ../lib/modules/bindDLZ.inc:1605 ../lib/modules/kolabSharedFolder.inc:429
+#: ../lib/modules/kolabGroup.inc:289 ../lib/modules/bindDLZ.inc:174
+#: ../lib/modules/bindDLZ.inc:178 ../lib/modules/bindDLZ.inc:407
+#: ../lib/modules/bindDLZ.inc:517 ../lib/modules/bindDLZ.inc:1376
+#: ../lib/modules/bindDLZ.inc:1606 ../lib/modules/kolabSharedFolder.inc:429
 msgid "Server"
 msgstr "服务器"
 
-#: ../templates/config/confmain.php:250
-#: ../templates/selfService/adminMain.php:418 ../lib/modules/qmailUser.inc:118
+#: ../templates/config/confmain.php:253
+#: ../templates/selfService/adminMain.php:434 ../lib/modules/qmailUser.inc:118
 #: ../lib/modules/qmailUser.inc:163 ../lib/modules/qmailUser.inc:243
 #: ../lib/modules/qmailUser.inc:358 ../lib/modules/qmailUser.inc:427
-#: ../lib/modules/qmailUser.inc:602 ../lib/modules/qmailUser.inc:1119
+#: ../lib/modules/qmailUser.inc:602 ../lib/modules/qmailUser.inc:1117
 #: ../lib/modules/imapAccess.inc:82 ../lib/modules/imapAccess.inc:464
 #: ../help/help.inc:58
 msgid "Server address"
 msgstr "服务器地址"
 
-#: ../templates/config/confmain.php:578
-#: ../templates/selfService/adminMain.php:221
+#: ../templates/config/confmain.php:615
+#: ../templates/selfService/adminMain.php:232
 msgid "Server address is invalid!"
 msgstr "服务器地址非法!"
 
-#: ../templates/serverInfo.php:103 ../lib/tools/serverInfo.inc:44
+#: ../templates/serverInfo.php:104 ../lib/tools/serverInfo.inc:45
 msgid "Server information"
 msgstr "服务器信息"
 
-#: ../templates/config/confmain.php:341
+#: ../templates/config/confmain.php:344
 msgid "Server list"
 msgstr "服务器列表"
 
-#: ../templates/login.php:481 ../templates/config/confmodules.php:142
+#: ../templates/login.php:490 ../templates/config/confmodules.php:152
 #: ../templates/config/jobList.php:130 ../templates/config/jobs.php:129
-#: ../templates/config/confmain.php:172
-#: ../templates/config/moduleSettings.php:141
-#: ../templates/config/conftypes.php:160 ../lib/modules/imapAccess.inc:477
+#: ../templates/config/confmain.php:175
+#: ../templates/config/moduleSettings.php:146
+#: ../templates/config/conftypes.php:179 ../lib/modules/imapAccess.inc:477
 msgid "Server profile"
 msgstr "服务器设置文件"
 
-#: ../templates/config/confmain.php:297
-#: ../templates/selfService/adminMain.php:481
+#: ../templates/config/confmain.php:300
+#: ../templates/selfService/adminMain.php:497
 msgid "Server settings"
 msgstr "服务器设置"
 
-#: ../templates/serverInfo.php:180
+#: ../templates/serverInfo.php:181
 msgid "Server statistics"
 msgstr "服务器统计"
 
-#: ../templates/serverInfo.php:205 ../templates/serverInfo.php:211
+#: ../templates/serverInfo.php:206 ../templates/serverInfo.php:212
 msgid "Server time"
 msgstr "服务器时间"
 
@@ -12407,7 +12468,7 @@ msgstr "服务器"
 msgid "Service name (e.g. sshd, imap, ftp). Enter one service per entry."
 msgstr "服务名(比如:sshd,imap,ftp).每个条目输入一个服务."
 
-#: ../lib/modules/bindDLZ.inc:1347
+#: ../lib/modules/bindDLZ.inc:1350
 msgid "Services (\"SRV\" records)"
 msgstr "服务 (\"SRV\" 记录)"
 
@@ -12443,11 +12504,11 @@ msgstr "同时也为Shadow设置"
 msgid "Set also for Windows"
 msgstr "同时也为Windows设置"
 
-#: ../lib/modules.inc:1251 ../lib/modules.inc:1253
+#: ../lib/modules.inc:1259 ../lib/modules.inc:1261
 msgid "Set password"
 msgstr "设置密码"
 
-#: ../lib/modules/posixAccount.inc:386 ../lib/modules/posixAccount.inc:1989
+#: ../lib/modules/posixAccount.inc:386 ../lib/modules/posixAccount.inc:1987
 msgid "Set primary group as memberUid"
 msgstr "为主组设置memberUid"
 
@@ -12457,11 +12518,11 @@ msgstr "为主组设置memberUid"
 msgid "Set profile password"
 msgstr "设置文件密码"
 
-#: ../lib/modules.inc:1254
+#: ../lib/modules.inc:1262
 msgid "Set random password"
 msgstr "设置随机密码"
 
-#: ../templates/lists/changePassword.php:362
+#: ../templates/lists/changePassword.php:363
 msgid "Set specific password"
 msgstr "设置特定的密码"
 
@@ -12469,11 +12530,11 @@ msgstr "设置特定的密码"
 msgid "Set the search results to 0 to retrieve all available records."
 msgstr "设置搜索条件为0,来获取所有的记录"
 
-#: ../templates/selfService/adminMain.php:583
+#: ../templates/selfService/adminMain.php:636
 msgid "Set this field read-only."
 msgstr "将此域设为只读。"
 
-#: ../lib/modules/groupOfNames.inc:110
+#: ../lib/modules/groupOfNames.inc:113
 msgid ""
 "Set this only if your LDAP schema allows that groups may not have any "
 "members (e.g. if you use OpenDJ)."
@@ -12489,7 +12550,7 @@ msgstr "设置连接到当前用户的别名."
 msgid "Sets the alias names linked to the user's email address."
 msgstr "设置连接到用户邮件地址的别名。"
 
-#: ../lib/modules/bindDLZ.inc:224
+#: ../lib/modules/bindDLZ.inc:227
 msgid ""
 "Sets the default timeout (in seconds) for entries without explicit timeout "
 "value."
@@ -12503,7 +12564,7 @@ msgstr "设置发送模式(比如 关闭邮件转发)."
 msgid "Sets the group password."
 msgstr "设置组密码"
 
-#: ../lib/modules/bindDLZ.inc:204 ../lib/modules/bindDLZ.inc:208
+#: ../lib/modules/bindDLZ.inc:207 ../lib/modules/bindDLZ.inc:211
 msgid ""
 "Sets the preference for the mail server. Lower values have higher priority."
 msgstr "设置邮件服务器的优先级,越小的值具备更高的优先级."
@@ -12512,15 +12573,15 @@ msgstr "设置邮件服务器的优先级,越小的值具备更高的优先级."
 msgid "Sets this account type to read-only."
 msgstr "将此账号类型设为只读。"
 
-#: ../lib/modules/shadowAccount.inc:91 ../lib/modules/shadowAccount.inc:800
-#: ../lib/modules/shadowAccount.inc:903
+#: ../lib/modules/shadowAccount.inc:91 ../lib/modules/shadowAccount.inc:798
+#: ../lib/modules/shadowAccount.inc:901
 msgid "Shadow"
 msgstr "Shadow"
 
 #: ../lib/modules/sambaSamAccount.inc:243
 #: ../lib/modules/sambaSamAccount.inc:382
 #: ../lib/modules/sambaSamAccount.inc:1490
-#: ../lib/modules/sambaSamAccount.inc:1969
+#: ../lib/modules/sambaSamAccount.inc:1967
 msgid "Shadowing"
 msgstr "遮蔽化(shadow)"
 
@@ -12533,9 +12594,9 @@ msgstr "共享文件夹总计:%s"
 msgid "Shared mail folder"
 msgstr "共享邮件文件夹"
 
-#: ../lib/modules/zarafaUser.inc:126 ../lib/modules/zarafaUser.inc:293
-#: ../lib/modules/zarafaUser.inc:377 ../lib/modules/zarafaUser.inc:614
-#: ../lib/modules/zarafaUser.inc:1306 ../lib/modules/zarafaUser.inc:1834
+#: ../lib/modules/zarafaUser.inc:129 ../lib/modules/zarafaUser.inc:296
+#: ../lib/modules/zarafaUser.inc:380 ../lib/modules/zarafaUser.inc:617
+#: ../lib/modules/zarafaUser.inc:1307 ../lib/modules/zarafaUser.inc:1835
 msgid "Shared store only"
 msgstr "仅共享存储"
 
@@ -12551,7 +12612,7 @@ msgstr "增加一个固定IP地址到DNS服务器吗?"
 msgid "Show"
 msgstr "显示"
 
-#: ../templates/massBuildAccounts.php:242
+#: ../templates/upload/massBuildAccounts.php:252
 msgid "Show LDIF file"
 msgstr "显示LDIF文件"
 
@@ -12564,12 +12625,12 @@ msgstr "显示帐号状态"
 msgid "Show attributes"
 msgstr "显示属性"
 
-#: ../lib/modules/customFields.inc:108 ../lib/modules/customFields.inc:1929
+#: ../lib/modules/customFields.inc:108 ../lib/modules/customFields.inc:1927
 msgid "Show calendar"
 msgstr "显示日历"
 
-#: ../lib/modules/organizationalRole.inc:198
-#: ../lib/modules/windowsGroup.inc:393 ../lib/modules/groupOfNames.inc:254
+#: ../lib/modules/organizationalRole.inc:201
+#: ../lib/modules/windowsGroup.inc:396 ../lib/modules/groupOfNames.inc:257
 msgid "Show effective members"
 msgstr "显示受影响的用户"
 
@@ -12577,7 +12638,7 @@ msgstr "显示受影响的用户"
 msgid "Show internal attributes"
 msgstr "显示内部属性"
 
-#: ../lib/modules/asteriskExtension.inc:453
+#: ../lib/modules/asteriskExtension.inc:455
 msgid "Show only Asterisk accounts"
 msgstr "只显示 Asterisk 帐号"
 
@@ -12589,11 +12650,11 @@ msgstr "主组用户显示为普通组用户"
 msgid "Single Machine Licence"
 msgstr "单机许可"
 
-#: ../templates/schema/schema.php:194
+#: ../templates/schema/schema.php:195
 msgid "Single valued"
 msgstr "单值"
 
-#: ../lib/modules/pykotaUser.inc:652 ../lib/modules/pykotaUser.inc:996
+#: ../lib/modules/pykotaUser.inc:655 ../lib/modules/pykotaUser.inc:997
 msgid "Size"
 msgstr "大小"
 
@@ -12606,29 +12667,29 @@ msgstr "单封邮件的大小限额(字节数).更大的邮件会被退回."
 msgid "Skip"
 msgstr "跳过"
 
-#: ../lib/modules/quota.inc:634 ../lib/modules/systemQuotas.inc:387
+#: ../lib/modules/quota.inc:635 ../lib/modules/systemQuotas.inc:388
 msgid "Soft block"
 msgstr "软块"
 
-#: ../lib/modules/quota.inc:113 ../lib/modules/quota.inc:401
-#: ../lib/modules/quota.inc:507 ../lib/modules/systemQuotas.inc:124
+#: ../lib/modules/quota.inc:116 ../lib/modules/quota.inc:404
+#: ../lib/modules/quota.inc:510 ../lib/modules/systemQuotas.inc:127
 msgid "Soft block limit"
 msgstr "软块限制"
 
-#: ../lib/modules/quota.inc:114
+#: ../lib/modules/quota.inc:117
 msgid "Soft block limit."
 msgstr "软块限制."
 
-#: ../lib/modules/quota.inc:636 ../lib/modules/systemQuotas.inc:389
+#: ../lib/modules/quota.inc:637 ../lib/modules/systemQuotas.inc:390
 msgid "Soft inode"
 msgstr "软节点"
 
-#: ../lib/modules/quota.inc:136
+#: ../lib/modules/quota.inc:139
 msgid "Soft inode (files) limit."
 msgstr "软节点限制."
 
-#: ../lib/modules/quota.inc:135 ../lib/modules/quota.inc:405
-#: ../lib/modules/quota.inc:509 ../lib/modules/systemQuotas.inc:128
+#: ../lib/modules/quota.inc:138 ../lib/modules/quota.inc:408
+#: ../lib/modules/quota.inc:512 ../lib/modules/systemQuotas.inc:131
 msgid "Soft inode limit"
 msgstr "软节点限制."
 
@@ -12645,7 +12706,7 @@ msgstr ""
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "下面被选中的属性(%s)已经被修改."
 
-#: ../lib/modules.inc:894
+#: ../lib/modules.inc:902
 msgid "Some required information is missing"
 msgstr "缺少一些必要的信息"
 
@@ -12673,15 +12734,15 @@ msgid ""
 "Specifies a filter that matches the members (e.g. \"(mail=*@zarafa.nl)\")."
 msgstr "指定用户匹配的过滤规则.(比如:\"(mail=*@zarafa.nl)\")."
 
-#: ../lib/modules/zarafaGroup.inc:122 ../lib/modules/zarafaUser.inc:190
+#: ../lib/modules/zarafaGroup.inc:122 ../lib/modules/zarafaUser.inc:193
 msgid "Specifies how \"Send as\" privileges are displayed."
 msgstr "指定如何显示\"Send as\"权限"
 
-#: ../lib/modules/groupOfNames.inc:119
+#: ../lib/modules/groupOfNames.inc:122
 msgid "Specifies how members and owners are displayed."
 msgstr "设置显示用户和属主的数量"
 
-#: ../lib/modules/organizationalRole.inc:107
+#: ../lib/modules/organizationalRole.inc:110
 msgid "Specifies how members are displayed."
 msgstr "设置成员显示方法"
 
@@ -12692,13 +12753,13 @@ msgid ""
 msgstr ""
 "指定LAM是否自动追随引荐的LDAP服务器.如果在LDAP目录中使用了引荐功能请打开此项."
 
-#: ../help/help.inc:298
+#: ../help/help.inc:310
 msgid ""
 "Specifies if password mails may be sent to mail addresses other than the "
 "user's LDAP mail address."
 msgstr "指定密码邮件是否发送到邮箱地址而不是用户LDAP中的邮箱地址."
 
-#: ../help/help.inc:294
+#: ../help/help.inc:306
 msgid "Specifies if the mail should be sent as text or HTML."
 msgstr "指定发送邮件用文本方式还是HTML方式"
 
@@ -12750,13 +12811,13 @@ msgid "Specifies the allowed file extension. This is checked at upload time."
 msgstr "指定允许的文件扩展名. 会在上传的时候检查."
 
 #: ../lib/modules/zarafaContact.inc:102 ../lib/modules/zarafaGroup.inc:103
-#: ../lib/modules/zarafaUser.inc:159
+#: ../lib/modules/zarafaUser.inc:162
 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:135
+#: ../lib/modules/zarafaUser.inc:138
 msgid "Specifies the capacity of this resource."
 msgstr "指定资源容量"
 
@@ -12843,18 +12904,18 @@ msgid ""
 "such as student, faculty, staff, alum, etc."
 msgstr "指定用户的关系,要求是公开目录中的惯例,比如学生,教职员工,校友等等."
 
-#: ../lib/modules/bindDLZ.inc:180 ../lib/modules/bindDLZ.inc:184
+#: ../lib/modules/bindDLZ.inc:183 ../lib/modules/bindDLZ.inc:187
 msgid ""
 "Specifies the priority of this entry (lower value means more preferred)."
 msgstr "指定这个条目的优先级（值越低，优先权越高）"
 
-#: ../lib/modules/pykotaGroup.inc:126 ../lib/modules/pykotaUser.inc:129
+#: ../lib/modules/pykotaGroup.inc:126 ../lib/modules/pykotaUser.inc:132
 msgid ""
 "Specifies the type of limit for printing if any. Please note that in "
 "contrast to \"Free printing\" the option \"No quota\" includes accounting."
 msgstr "指定打印机限制类型. 请注意 \"Free printing\"和 \"No quota\" 的区别"
 
-#: ../lib/modules/bindDLZ.inc:196 ../lib/modules/bindDLZ.inc:200
+#: ../lib/modules/bindDLZ.inc:199 ../lib/modules/bindDLZ.inc:203
 msgid "Specifies the used port for this entry."
 msgstr "指定这个条目的使用的端口"
 
@@ -12862,11 +12923,11 @@ msgstr "指定这个条目的使用的端口"
 msgid "Specifies the user's pickup group."
 msgstr "指定用户的接听组."
 
-#: ../lib/modules/bindDLZ.inc:188 ../lib/modules/bindDLZ.inc:192
+#: ../lib/modules/bindDLZ.inc:191 ../lib/modules/bindDLZ.inc:195
 msgid "Specifies the weight of this entry (relative value)."
 msgstr "指定这个条目的权重（相对值）"
 
-#: ../lib/modules/zarafaUser.inc:123
+#: ../lib/modules/zarafaUser.inc:126
 msgid ""
 "Specifies whether the user is an admin. System administrators may "
 "additionally create, modify and delete companies."
@@ -12888,24 +12949,24 @@ msgstr "指定属性和属性值"
 msgid "Standard LDAP search filter. Example: (&(sn=Smith)(givenName=David))"
 msgstr "标准的LDAP搜索表达式,比如 (&(sn=Smith)(givenName=David))"
 
-#: ../templates/serverInfo.php:193 ../templates/serverInfo.php:199
+#: ../templates/serverInfo.php:194 ../templates/serverInfo.php:200
 msgid "Start time"
 msgstr "开始时间"
 
 #: ../lib/modules/windowsUser.inc:182 ../lib/modules/windowsUser.inc:472
 #: ../lib/modules/windowsUser.inc:829 ../lib/modules/windowsUser.inc:920
-#: ../lib/modules/windowsUser.inc:1097 ../lib/modules/windowsUser.inc:2440
-#: ../lib/modules/windowsUser.inc:2619 ../lib/modules/inetOrgPerson.inc:164
-#: ../lib/modules/inetOrgPerson.inc:196 ../lib/modules/inetOrgPerson.inc:532
-#: ../lib/modules/inetOrgPerson.inc:574 ../lib/modules/inetOrgPerson.inc:807
-#: ../lib/modules/inetOrgPerson.inc:811 ../lib/modules/inetOrgPerson.inc:1342
-#: ../lib/modules/inetOrgPerson.inc:1345 ../lib/modules/inetOrgPerson.inc:2003
-#: ../lib/modules/inetOrgPerson.inc:2679 ../lib/modules/inetOrgPerson.inc:3652
-#: ../lib/modules/inetOrgPerson.inc:3717
+#: ../lib/modules/windowsUser.inc:1097 ../lib/modules/windowsUser.inc:2438
+#: ../lib/modules/windowsUser.inc:2617 ../lib/modules/inetOrgPerson.inc:162
+#: ../lib/modules/inetOrgPerson.inc:194 ../lib/modules/inetOrgPerson.inc:530
+#: ../lib/modules/inetOrgPerson.inc:572 ../lib/modules/inetOrgPerson.inc:805
+#: ../lib/modules/inetOrgPerson.inc:809 ../lib/modules/inetOrgPerson.inc:1340
+#: ../lib/modules/inetOrgPerson.inc:1343 ../lib/modules/inetOrgPerson.inc:1999
+#: ../lib/modules/inetOrgPerson.inc:2675 ../lib/modules/inetOrgPerson.inc:3632
+#: ../lib/modules/inetOrgPerson.inc:3697
 msgid "State"
 msgstr "地点"
 
-#: ../templates/pdfedit/pdfpage.php:542 ../templates/pdfedit/pdfpage.php:544
+#: ../templates/pdfedit/pdfpage.php:557 ../templates/pdfedit/pdfpage.php:559
 msgid "Static text"
 msgstr "静态文本"
 
@@ -12915,13 +12976,13 @@ msgstr "静态文本"
 msgid "Step %s of %s"
 msgstr "第 %s步,共 %s步"
 
-#: ../lib/modules/windowsUser.inc:414 ../lib/modules/inetOrgPerson.inc:317
+#: ../lib/modules/windowsUser.inc:414 ../lib/modules/inetOrgPerson.inc:315
 msgid "Steve"
 msgstr "Steve"
 
 #: ../lib/modules/sambaSamAccount.inc:428 ../lib/modules/posixAccount.inc:291
 #: ../lib/modules/windowsUser.inc:426 ../lib/modules/windowsUser.inc:432
-#: ../lib/modules/pykotaUser.inc:201 ../lib/modules/inetOrgPerson.inc:2136
+#: ../lib/modules/pykotaUser.inc:204 ../lib/modules/inetOrgPerson.inc:2132
 #: ../lib/modules/asteriskVoicemail.inc:174
 msgid "Steve Miller"
 msgstr "Steve Miller"
@@ -12943,18 +13004,18 @@ msgstr "可以将密码存放在服务器配置文件中,但不推荐这么做."
 #: ../lib/types/user.inc:111 ../lib/modules/windowsUser.inc:186
 #: ../lib/modules/windowsUser.inc:448 ../lib/modules/windowsUser.inc:830
 #: ../lib/modules/windowsUser.inc:919 ../lib/modules/windowsUser.inc:1093
-#: ../lib/modules/windowsUser.inc:2441 ../lib/modules/windowsUser.inc:2618
-#: ../lib/modules/inetOrgPerson.inc:83 ../lib/modules/inetOrgPerson.inc:161
-#: ../lib/modules/inetOrgPerson.inc:184 ../lib/modules/inetOrgPerson.inc:386
-#: ../lib/modules/inetOrgPerson.inc:562 ../lib/modules/inetOrgPerson.inc:684
-#: ../lib/modules/inetOrgPerson.inc:688 ../lib/modules/inetOrgPerson.inc:1306
-#: ../lib/modules/inetOrgPerson.inc:1309 ../lib/modules/inetOrgPerson.inc:1987
-#: ../lib/modules/inetOrgPerson.inc:2602 ../lib/modules/inetOrgPerson.inc:3644
-#: ../lib/modules/inetOrgPerson.inc:3714
+#: ../lib/modules/windowsUser.inc:2439 ../lib/modules/windowsUser.inc:2616
+#: ../lib/modules/inetOrgPerson.inc:81 ../lib/modules/inetOrgPerson.inc:159
+#: ../lib/modules/inetOrgPerson.inc:182 ../lib/modules/inetOrgPerson.inc:384
+#: ../lib/modules/inetOrgPerson.inc:560 ../lib/modules/inetOrgPerson.inc:682
+#: ../lib/modules/inetOrgPerson.inc:686 ../lib/modules/inetOrgPerson.inc:1304
+#: ../lib/modules/inetOrgPerson.inc:1307 ../lib/modules/inetOrgPerson.inc:1983
+#: ../lib/modules/inetOrgPerson.inc:2598 ../lib/modules/inetOrgPerson.inc:3624
+#: ../lib/modules/inetOrgPerson.inc:3694
 msgid "Street"
 msgstr "街道"
 
-#: ../templates/pdfedit/pdfpage.php:453 ../templates/pdfedit/pdfmain.php:360
+#: ../templates/pdfedit/pdfpage.php:468 ../templates/pdfedit/pdfmain.php:410
 msgid "Structure name"
 msgstr "结构名"
 
@@ -12963,37 +13024,42 @@ msgstr "结构名"
 msgid "Sub (entire subtree)"
 msgstr "Sub (条目的子树)"
 
-#: ../lib/types/netgroup.inc:93 ../lib/modules/nisnetgroup.inc:91
-#: ../lib/modules/nisnetgroup.inc:126 ../lib/modules/nisnetgroup.inc:141
-#: ../lib/modules/nisnetgroup.inc:209 ../lib/modules/nisnetgroup.inc:383
-#: ../lib/modules/nisnetgroup.inc:581
+#: ../lib/types/netgroup.inc:93 ../lib/modules/nisnetgroup.inc:94
+#: ../lib/modules/nisnetgroup.inc:129 ../lib/modules/nisnetgroup.inc:144
+#: ../lib/modules/nisnetgroup.inc:212 ../lib/modules/nisnetgroup.inc:386
+#: ../lib/modules/nisnetgroup.inc:582
 msgid "Subgroups"
 msgstr "分组"
 
-#: ../templates/config/confmain.php:426 ../lib/passwordExpirationJob.inc:85
+#: ../templates/config/confmain.php:429 ../lib/passwordExpirationJob.inc:85
 #: ../lib/modules/selfRegistration.inc:94
 #: ../lib/modules/selfRegistration.inc:237
 #: ../lib/modules/passwordSelfReset.inc:124
-#: ../lib/modules/passwordSelfReset.inc:681
-#: ../lib/modules/passwordSelfReset.inc:701 ../help/help.inc:286
-#: ../help/help.inc:324
+#: ../lib/modules/passwordSelfReset.inc:679
+#: ../lib/modules/passwordSelfReset.inc:699 ../help/help.inc:298
+#: ../help/help.inc:336
 msgid "Subject"
 msgstr "标题"
 
+#: ../templates/selfService/selfService2Factor.php:203
+#: ../templates/login2Factor.php:216
+msgid "Submit"
+msgstr "提交"
+
 #: ../lib/types/dhcp.inc:94 ../lib/modules/dhcp_settings.inc:154
 #: ../lib/modules/dhcp_settings.inc:212 ../lib/modules/dhcp_settings.inc:227
 #: ../lib/modules/dhcp_settings.inc:247 ../lib/modules/dhcp_settings.inc:563
-#: ../lib/modules/dhcp_settings.inc:687
+#: ../lib/modules/dhcp_settings.inc:685
 msgid "Subnet"
 msgstr "子网"
 
 #: ../lib/modules/dhcp_settings.inc:194 ../lib/modules/dhcp_settings.inc:220
 #: ../lib/modules/dhcp_settings.inc:238 ../lib/modules/dhcp_settings.inc:305
-#: ../lib/modules/dhcp_settings.inc:608 ../lib/modules/dhcp_settings.inc:684
+#: ../lib/modules/dhcp_settings.inc:608 ../lib/modules/dhcp_settings.inc:682
 msgid "Subnet mask"
 msgstr "子网掩码"
 
-#: ../templates/schema/schema.php:176
+#: ../templates/schema/schema.php:177
 msgid "Substring Rule"
 msgstr "子字符串规则"
 
@@ -13031,7 +13097,7 @@ msgid "Sudo roles with higher order numbers are used if multiple roles match."
 msgstr "如果多角色匹配，就使用更高排序的Sudo角色"
 
 #: ../lib/modules/nisMailAliasUser.inc:92
-#: ../lib/modules/nisMailAliasUser.inc:362 ../lib/modules.inc:1006
+#: ../lib/modules/nisMailAliasUser.inc:368 ../lib/modules.inc:1014
 msgid "Suffix"
 msgstr "后缀"
 
@@ -13039,8 +13105,8 @@ msgstr "后缀"
 msgid "Suffix for GID/group name check"
 msgstr "GID/组名的后缀检查"
 
-#: ../lib/modules/posixAccount.inc:431 ../lib/modules/posixAccount.inc:1923
-#: ../lib/modules/posixAccount.inc:1960
+#: ../lib/modules/posixAccount.inc:431 ../lib/modules/posixAccount.inc:1921
+#: ../lib/modules/posixAccount.inc:1958
 msgid "Suffix for UID/user name check"
 msgstr "UID/用户名的后缀检查"
 
@@ -13053,7 +13119,7 @@ msgstr "新用户的后缀"
 msgid "Sunday"
 msgstr "星期日"
 
-#: ../templates/selfService/adminMain.php:592
+#: ../templates/selfService/adminMain.php:645
 msgid "Switch back to default label."
 msgstr "换回到缺省值."
 
@@ -13075,7 +13141,7 @@ msgid "Sync MIT Kerberos password with Unix password"
 msgstr "MIT Kerberos 密码与Unix的密码同步"
 
 #: ../lib/modules/passwordSelfReset.inc:152
-#: ../lib/modules/passwordSelfReset.inc:671
+#: ../lib/modules/passwordSelfReset.inc:669
 msgid "Sync Samba 3 password"
 msgstr "同步 Samba 3 密码"
 
@@ -13091,7 +13157,7 @@ msgstr "同步Samba NT的密码和 Unix的密码"
 msgid "Sync Unix password with Windows password"
 msgstr "用windows密码同步Unix密码"
 
-#: ../lib/modules/customFields.inc:1116
+#: ../lib/modules/customFields.inc:1114
 msgid "Sync fields with page layout"
 msgstr "页面布局的同步域"
 
@@ -13100,20 +13166,20 @@ msgstr "页面布局的同步域"
 msgid "Sync from %s"
 msgstr "从%s同步"
 
-#: ../templates/schema/schema.php:181
+#: ../templates/schema/schema.php:182
 #: ../templates/3rdParty/pla/htdocs/add_value_form.php:142
 msgid "Syntax"
 msgstr "语法"
 
-#: ../templates/schema/schema.php:89
+#: ../templates/schema/schema.php:90
 msgid "Syntax OID"
 msgstr "OID语法"
 
-#: ../templates/schema/schema.php:73 ../templates/schema/schema.php:74
+#: ../templates/schema/schema.php:74 ../templates/schema/schema.php:75
 msgid "Syntaxes"
 msgstr "语法"
 
-#: ../lib/modules/zarafaUser.inc:632 ../lib/modules/zarafaUser.inc:1297
+#: ../lib/modules/zarafaUser.inc:635 ../lib/modules/zarafaUser.inc:1298
 msgid "System administrator"
 msgstr "系统管理员"
 
@@ -13125,18 +13191,18 @@ msgstr "系统日志"
 msgid "TLS cannot be combined with ldaps://."
 msgstr "TLS不能与ldaps://结合"
 
-#: ../lib/modules/bindDLZ.inc:125 ../lib/modules/bindDLZ.inc:377
-#: ../lib/modules/bindDLZ.inc:382 ../lib/modules/bindDLZ.inc:491
+#: ../lib/modules/bindDLZ.inc:128 ../lib/modules/bindDLZ.inc:380
+#: ../lib/modules/bindDLZ.inc:385 ../lib/modules/bindDLZ.inc:494
 msgid "TXT record"
 msgstr "TXT记录"
 
-#: ../lib/modules/bindDLZ.inc:432 ../lib/modules/bindDLZ.inc:442
-#: ../lib/modules/bindDLZ.inc:1574
+#: ../lib/modules/bindDLZ.inc:435 ../lib/modules/bindDLZ.inc:445
+#: ../lib/modules/bindDLZ.inc:1575
 msgid "TXT records"
 msgstr "TXT记录"
 
 #: ../lib/passwordExpirationJob.inc:482 ../lib/passwordExpirationJob.inc:516
-#: ../help/help.inc:354
+#: ../help/help.inc:366
 msgid "Target DN"
 msgstr "目标DN"
 
@@ -13145,44 +13211,44 @@ msgstr "目标DN"
 #: ../lib/modules/kolabSharedFolder.inc:240
 #: ../lib/modules/kolabSharedFolder.inc:262
 #: ../lib/modules/kolabSharedFolder.inc:292
-#: ../lib/modules/kolabSharedFolder.inc:523
+#: ../lib/modules/kolabSharedFolder.inc:521
 msgid "Target IMAP folder"
 msgstr "目标IMAP文件夹"
 
-#: ../lib/modules/kolabUser.inc:245
+#: ../lib/modules/kolabUser.inc:248
 msgid "Target of invitation policy is invalid!"
 msgstr "邀请策略的目标非法 !"
 
-#: ../templates/pdfedit/pdfmain.php:323
-#: ../templates/profedit/profilemain.php:290
+#: ../templates/pdfedit/pdfmain.php:367
+#: ../templates/profedit/profilemain.php:328
 msgid "Target server profile"
 msgstr "目标服务器设置"
 
-#: ../templates/help.php:88 ../lib/modules.inc:669
+#: ../templates/help.php:88 ../lib/modules.inc:682
 msgid "Technical name"
 msgstr "技术名字"
 
-#: ../templates/lists/changePassword.php:293 ../lib/types/user.inc:112
+#: ../templates/lists/changePassword.php:294 ../lib/types/user.inc:112
 #: ../lib/types/user.inc:215 ../lib/modules/windowsUser.inc:190
 #: ../lib/modules/windowsUser.inc:496 ../lib/modules/windowsUser.inc:831
 #: ../lib/modules/windowsUser.inc:916 ../lib/modules/windowsUser.inc:962
-#: ../lib/modules/windowsUser.inc:1106 ../lib/modules/windowsUser.inc:2442
-#: ../lib/modules/windowsUser.inc:2612 ../lib/modules/inetOrgPerson.inc:70
-#: ../lib/modules/inetOrgPerson.inc:160 ../lib/modules/inetOrgPerson.inc:211
-#: ../lib/modules/inetOrgPerson.inc:426 ../lib/modules/inetOrgPerson.inc:589
-#: ../lib/modules/inetOrgPerson.inc:716 ../lib/modules/inetOrgPerson.inc:720
-#: ../lib/modules/inetOrgPerson.inc:1463 ../lib/modules/inetOrgPerson.inc:1466
-#: ../lib/modules/inetOrgPerson.inc:1992 ../lib/modules/inetOrgPerson.inc:2547
-#: ../lib/modules/inetOrgPerson.inc:3662 ../lib/modules/inetOrgPerson.inc:3720
+#: ../lib/modules/windowsUser.inc:1106 ../lib/modules/windowsUser.inc:2440
+#: ../lib/modules/windowsUser.inc:2610 ../lib/modules/inetOrgPerson.inc:68
+#: ../lib/modules/inetOrgPerson.inc:158 ../lib/modules/inetOrgPerson.inc:209
+#: ../lib/modules/inetOrgPerson.inc:424 ../lib/modules/inetOrgPerson.inc:587
+#: ../lib/modules/inetOrgPerson.inc:714 ../lib/modules/inetOrgPerson.inc:718
+#: ../lib/modules/inetOrgPerson.inc:1461 ../lib/modules/inetOrgPerson.inc:1464
+#: ../lib/modules/inetOrgPerson.inc:1988 ../lib/modules/inetOrgPerson.inc:2543
+#: ../lib/modules/inetOrgPerson.inc:3642 ../lib/modules/inetOrgPerson.inc:3700
 msgid "Telephone number"
 msgstr "电话号码"
 
-#: ../lib/modules/windowsUser.inc:696 ../lib/modules/inetOrgPerson.inc:364
+#: ../lib/modules/windowsUser.inc:696 ../lib/modules/inetOrgPerson.inc:362
 msgid "Temp"
 msgstr "临时"
 
-#: ../lib/modules/windowsUser.inc:444 ../lib/modules/pykotaUser.inc:228
-#: ../lib/modules/inetOrgPerson.inc:340
+#: ../lib/modules/windowsUser.inc:444 ../lib/modules/pykotaUser.inc:231
+#: ../lib/modules/inetOrgPerson.inc:338
 msgid "Temp, contract till December"
 msgstr "临时, 合同到12月份"
 
@@ -13205,32 +13271,32 @@ msgstr "终端服务选项"
 msgid "Test settings"
 msgstr "测试设置"
 
-#: ../lib/tools/tests.inc:44
+#: ../lib/tools/tests.inc:45
 msgid "Tests"
 msgstr "测试"
 
-#: ../templates/config/confmain.php:441 ../lib/passwordExpirationJob.inc:87
+#: ../templates/config/confmain.php:444 ../lib/passwordExpirationJob.inc:87
 #: ../lib/modules/selfRegistration.inc:69
-#: ../lib/modules/selfRegistration.inc:244 ../lib/modules/bindDLZ.inc:163
-#: ../lib/modules/bindDLZ.inc:167 ../lib/modules/bindDLZ.inc:377
-#: ../lib/modules/bindDLZ.inc:1245 ../lib/modules/bindDLZ.inc:1576
+#: ../lib/modules/selfRegistration.inc:244 ../lib/modules/bindDLZ.inc:166
+#: ../lib/modules/bindDLZ.inc:170 ../lib/modules/bindDLZ.inc:380
+#: ../lib/modules/bindDLZ.inc:1248 ../lib/modules/bindDLZ.inc:1577
 #: ../lib/modules/passwordSelfReset.inc:128
 #: ../lib/modules/passwordSelfReset.inc:138
-#: ../lib/modules/passwordSelfReset.inc:685
-#: ../lib/modules/passwordSelfReset.inc:705 ../help/help.inc:288
-#: ../help/help.inc:328
+#: ../lib/modules/passwordSelfReset.inc:683
+#: ../lib/modules/passwordSelfReset.inc:703 ../help/help.inc:300
+#: ../help/help.inc:340
 msgid "Text"
 msgstr "文本"
 
-#: ../lib/modules/bindDLZ.inc:1242
+#: ../lib/modules/bindDLZ.inc:1245
 msgid "Text (\"TXT\" records)"
 msgstr "文本(\"TXT\" 记录)"
 
-#: ../lib/modules/customFields.inc:2725
+#: ../lib/modules/customFields.inc:2723
 msgid "Text area"
 msgstr "文本区"
 
-#: ../templates/pdfedit/pdfpage.php:621 ../lib/modules/customFields.inc:1914
+#: ../templates/pdfedit/pdfpage.php:637 ../lib/modules/customFields.inc:1912
 msgid "Text field"
 msgstr "输入框"
 
@@ -13275,31 +13341,31 @@ msgid "The IMAP admin password is empty."
 msgstr "IMAP管理密码为空"
 
 #: ../templates/config/mainmanage.php:108
-#: ../templates/config/mainmanage.php:130 ../lib/modules/bindDLZ.inc:495
-#: ../lib/modules/bindDLZ.inc:496
+#: ../templates/config/mainmanage.php:130 ../lib/modules/bindDLZ.inc:498
+#: ../lib/modules/bindDLZ.inc:499
 #, php-format
 msgid "The IP address %s is invalid!"
 msgstr "IP地址 %s非法 !"
 
-#: ../lib/modules/fixed_ip.inc:498
+#: ../lib/modules/fixed_ip.inc:501
 msgid "The IP address does not match the subnet."
 msgstr "IP地址与子网不匹配."
 
-#: ../lib/modules/fixed_ip.inc:501
+#: ../lib/modules/fixed_ip.inc:504
 msgid "The IP address is already in use."
 msgstr "IP地址已被使用: "
 
 #: ../lib/modules/ipHost.inc:123 ../lib/modules/ipHost.inc:124
 #: ../lib/modules/asteriskAccount.inc:574
 #: ../lib/modules/asteriskAccount.inc:575 ../lib/modules/ppolicyUser.inc:101
-#: ../lib/modules/range.inc:505 ../lib/modules/range.inc:522
-#: ../lib/modules/range.inc:582 ../lib/modules/range.inc:599
+#: ../lib/modules/range.inc:508 ../lib/modules/range.inc:525
+#: ../lib/modules/range.inc:585 ../lib/modules/range.inc:602
 #: ../lib/modules/freeRadius.inc:329 ../lib/modules/freeRadius.inc:330
-#: ../lib/modules/fixed_ip.inc:493
+#: ../lib/modules/fixed_ip.inc:496
 msgid "The IP address is invalid."
 msgstr "IP地址非法 !"
 
-#: ../lib/modules/fixed_ip.inc:107
+#: ../lib/modules/fixed_ip.inc:110
 msgid "The IP address of the PC."
 msgstr "PC机的IP地址."
 
@@ -13315,8 +13381,8 @@ msgid ""
 "123.123.123.124\")."
 msgstr "Netbios命名服务器的IP地址(比如: \"123.123.123.123, 123.123.123.124\")."
 
-#: ../lib/modules/range.inc:509 ../lib/modules/range.inc:524
-#: ../lib/modules/range.inc:588 ../lib/modules/range.inc:602
+#: ../lib/modules/range.inc:512 ../lib/modules/range.inc:527
+#: ../lib/modules/range.inc:591 ../lib/modules/range.inc:605
 msgid "The IP does not match the subnet."
 msgstr "IP与子网掩码不匹配."
 
@@ -13328,7 +13394,7 @@ msgstr "此帐号的Kerberos域"
 msgid "The Kerberos realm of this user."
 msgstr "此帐号的Kerberos域"
 
-#: ../lib/modules/fixed_ip.inc:103
+#: ../lib/modules/fixed_ip.inc:106
 msgid "The MAC address of the PC. Example: 11:22:33:44:55:aa"
 msgstr "PC机的 MAC 地址.比如: 11:22:33:44:55:aa"
 
@@ -13336,15 +13402,15 @@ msgstr "PC机的 MAC 地址.比如: 11:22:33:44:55:aa"
 msgid "The Netbios server is invalid."
 msgstr "Netbios服务器非法."
 
-#: ../lib/modules/fixed_ip.inc:456
+#: ../lib/modules/fixed_ip.inc:459
 msgid "The PC name may not be longer than 20 characters."
 msgstr "PC机器名的长度不能超过20个字符."
 
-#: ../lib/modules/fixed_ip.inc:465
+#: ../lib/modules/fixed_ip.inc:468
 msgid "The PC name may only contain A-Z, a-z and 0-9."
 msgstr "PC机的机器名只能包含 A-Z, a-z 和 0-9."
 
-#: ../lib/modules/fixed_ip.inc:459
+#: ../lib/modules/fixed_ip.inc:462
 msgid "The PC name needs to be at least 2 characters long."
 msgstr "PC机器名的长度最短需要两个字符."
 
@@ -13371,8 +13437,8 @@ msgstr "此帐号的Radius域"
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "您的Samba服务器的SID,可以通过使用\"net getlocalsid\"命令获取."
 
-#: ../templates/selfService/selfServiceLogin.php:149
-#: ../templates/selfService/selfServiceMain.php:179
+#: ../templates/selfService/selfServiceLogin.php:158
+#: ../templates/selfService/selfServiceMain.php:188
 msgid "The TLS encryption could not be started."
 msgstr "TLS加密失败."
 
@@ -13395,7 +13461,7 @@ msgid "The account context is invalid."
 msgstr "账号语境非法."
 
 #: ../lib/modules/asteriskAccount.inc:112
-#: ../lib/modules/asteriskExtension.inc:99
+#: ../lib/modules/asteriskExtension.inc:101
 #: ../lib/modules/asteriskVoicemail.inc:92
 msgid "The account context stores information about the dial plan."
 msgstr "帐号的语境存储有关拨号模板的信息"
@@ -13413,12 +13479,12 @@ msgstr "帐号将在这一天之后锁定."
 msgid "The account will be saved under this LDAP suffix."
 msgstr "帐号将会保存在此后缀下."
 
-#: ../lib/modules/bindDLZ.inc:497 ../lib/modules/bindDLZ.inc:498
+#: ../lib/modules/bindDLZ.inc:500 ../lib/modules/bindDLZ.inc:501
 #, php-format
 msgid "The alias name \"%s\" is invalid."
 msgstr "别名 \"%s\"非法."
 
-#: ../lib/modules/bindDLZ.inc:136
+#: ../lib/modules/bindDLZ.inc:139
 msgid "The alias name for this entry."
 msgstr "此条目的别名"
 
@@ -13427,11 +13493,11 @@ msgstr "此条目的别名"
 msgid "The answer needs to be at least %s characters long."
 msgstr "答案的最短长度为%s个字符."
 
-#: ../lib/modules/passwordSelfReset.inc:1454
+#: ../lib/modules/passwordSelfReset.inc:1452
 msgid "The answer to the security question is wrong."
 msgstr "安全问题的答案是错误的."
 
-#: ../templates/tests/schemaTest.php:128
+#: ../templates/tests/schemaTest.php:131
 #, php-format
 msgid ""
 "The attribute %s is not supported for the object class %s by your LDAP "
@@ -13456,16 +13522,16 @@ msgstr "拨号ID格式不合法."
 msgid "The captcha was wrong."
 msgstr "验证码错误."
 
-#: ../lib/modules/puppetClient.inc:198
+#: ../lib/modules/puppetClient.inc:201
 msgid "The class names contain invalid values."
 msgstr "类的名字包含非法值."
 
-#: ../lib/modules/puppetClient.inc:196 ../lib/modules/puppetClient.inc:197
+#: ../lib/modules/puppetClient.inc:199 ../lib/modules/puppetClient.inc:200
 msgid "The class names may only contain ASCII characters."
 msgstr "类名仅包含ASCII字符."
 
-#: ../templates/config/confmain.php:181
-#: ../templates/selfService/adminMain.php:376
+#: ../templates/config/confmain.php:184
+#: ../templates/selfService/adminMain.php:392
 msgid "The config file is not writable."
 msgstr "配置文件不可写."
 
@@ -13504,7 +13570,7 @@ msgstr "域名的子网掩码."
 msgid "The email address is invalid."
 msgstr "邮件地址非法 !"
 
-#: ../lib/modules/range.inc:102
+#: ../lib/modules/range.inc:105
 msgid "The ending IP address of the range."
 msgstr "范围的最高IP地址."
 
@@ -13531,11 +13597,11 @@ msgstr "条目(%s)不存在."
 msgid "The entry does not exist and will be ignored"
 msgstr "条目不存在,被忽略"
 
-#: ../lib/modules/puppetClient.inc:194 ../lib/modules/puppetClient.inc:195
+#: ../lib/modules/puppetClient.inc:197 ../lib/modules/puppetClient.inc:198
 msgid "The environment name may only contain ASCII characters."
 msgstr "环境名仅包含ASCII字符."
 
-#: ../help/help.inc:331
+#: ../help/help.inc:343
 msgid ""
 "The expiration date can be added with @@EXPIRE_DATE_DDMMYYYY@@ or "
 "@@EXPIRE_DATE_YYYYMMDD@@."
@@ -13551,12 +13617,12 @@ msgstr "过期日期非法."
 msgid "The expiration date must be in format DD.MM.YYYY HH:MM."
 msgstr "过期日期的格式为 DD.MM.YYYY HH:MM."
 
-#: ../lib/modules/bindDLZ.inc:519 ../lib/modules/bindDLZ.inc:520
+#: ../lib/modules/bindDLZ.inc:522 ../lib/modules/bindDLZ.inc:523
 #, php-format
 msgid "The expiration time \"%s\" must be a number."
 msgstr "过期时间 \"%s\" 必须是数字!"
 
-#: ../help/help.inc:355
+#: ../help/help.inc:367
 msgid "The expired accounts will be moved to this DN."
 msgstr "过期帐号将移动到这个DN."
 
@@ -13565,11 +13631,11 @@ msgstr "过期帐号将移动到这个DN."
 msgid "The extension context is invalid."
 msgstr "扩展的语境非法."
 
-#: ../lib/pdfstruct.inc:262
+#: ../lib/pdfstruct.inc:273
 msgid "The file must not exeed 2000x300px."
 msgstr "文件不能超过 2000x300像素."
 
-#: ../lib/pdfstruct.inc:249
+#: ../lib/pdfstruct.inc:260
 msgid "The file name must end with \".png\" or \".jpg\"."
 msgstr "文件必须以\".png\" 或 \".jpg\"结尾."
 
@@ -13607,7 +13673,7 @@ msgstr "服务器上共享文件夹所在位置(比如 user/myfolder@example.com
 msgid "The folder's email address."
 msgstr "文件夹的邮件地址."
 
-#: ../templates/initsuff.php:184
+#: ../templates/initsuff.php:185
 msgid ""
 "The following suffixes are missing in LDAP. LAM can create them for you."
 msgstr "LDAP中没有下列后缀,LAM会自动建立."
@@ -13635,7 +13701,7 @@ msgstr "在拷贝源条目时建立的新条目的全DN"
 msgid "The full name is invalid."
 msgstr "全名非法."
 
-#: ../templates/login.php:602
+#: ../templates/login.php:611
 msgid "The given user name matches multiple LDAP entries."
 msgstr "给定的用户名匹配了多条LDAP条目."
 
@@ -13645,7 +13711,7 @@ msgid ""
 "password may be used to login."
 msgstr "缓期认证限量指定了密码过期后还能认证的次数。"
 
-#: ../lib/modules/windowsGroup.inc:153
+#: ../lib/modules/windowsGroup.inc:156
 msgid "The group is managed by this contact person."
 msgstr "本组的管理者是这位联系人."
 
@@ -13657,7 +13723,7 @@ msgstr "此帐号的组名"
 msgid "The groups for this account. You can insert a group name or DN."
 msgstr "本帐号的所属组,您可以输入一个组名或DN名."
 
-#: ../templates/pdfedit/pdfpage.php:141
+#: ../templates/pdfedit/pdfpage.php:159
 msgid "The headline for a new section must contain at least one character."
 msgstr "新段的标题最少要有一个字符."
 
@@ -13669,24 +13735,24 @@ msgstr "将会从这个驱动器号上连接用户目录。"
 msgid "The host is managed by this contact person."
 msgstr "这台主机的管理者是这位联系人."
 
-#: ../lib/modules/bindDLZ.inc:504 ../lib/modules/bindDLZ.inc:505
-#: ../lib/modules/bindDLZ.inc:531 ../lib/modules/bindDLZ.inc:532
+#: ../lib/modules/bindDLZ.inc:507 ../lib/modules/bindDLZ.inc:508
+#: ../lib/modules/bindDLZ.inc:534 ../lib/modules/bindDLZ.inc:535
 #, php-format
 msgid "The host name \"%s\" is invalid."
 msgstr "主机名 \"%s\" 非法"
 
-#: ../lib/modules/bindDLZ.inc:89 ../lib/modules/bindDLZ.inc:148
-#: ../lib/modules/bindDLZ.inc:152
+#: ../lib/modules/bindDLZ.inc:92 ../lib/modules/bindDLZ.inc:151
+#: ../lib/modules/bindDLZ.inc:155
 msgid "The host name for this entry."
 msgstr "此条目的主机名"
 
 #: ../lib/modules/asteriskAccount.inc:563
-#: ../lib/modules/asteriskAccount.inc:564 ../lib/modules/bindDLZ.inc:477
-#: ../lib/modules/bindDLZ.inc:478
+#: ../lib/modules/asteriskAccount.inc:564 ../lib/modules/bindDLZ.inc:480
+#: ../lib/modules/bindDLZ.inc:481
 msgid "The host name is invalid."
 msgstr "主机名非法"
 
-#: ../lib/modules/windowsUser.inc:147 ../lib/modules/inetOrgPerson.inc:865
+#: ../lib/modules/windowsUser.inc:147 ../lib/modules/inetOrgPerson.inc:863
 msgid "The initials of the user's first names."
 msgstr "用户名字的初始化值"
 
@@ -13710,7 +13776,7 @@ msgstr "指定客户端必须重新申请新IP地址的释放时间(秒数)."
 msgid "The list of commands which may be run."
 msgstr "可以运行的命令列表"
 
-#: ../lib/modules/puppetClient.inc:98 ../lib/modules/puppetClient.inc:102
+#: ../lib/modules/puppetClient.inc:101 ../lib/modules/puppetClient.inc:105
 msgid "The list of configured Puppet classes for this node (e.g. ntp)."
 msgstr "这个节点的配置好的Puppet类列表(比如：ntp)."
 
@@ -13718,7 +13784,7 @@ msgstr "这个节点的配置好的Puppet类列表(比如：ntp)."
 msgid "The list of hosts from which the user may run the commands."
 msgstr "用户可以运行命令的主机列表."
 
-#: ../lib/modules/customFields.inc:3190
+#: ../lib/modules/customFields.inc:3188
 msgid "The list of labels contains duplicates."
 msgstr "这个标签列表包含重复值."
 
@@ -13726,7 +13792,7 @@ msgstr "这个标签列表包含重复值."
 msgid "The list of users who own this sudo role and may run the commands."
 msgstr "具备sudo角色并可以运行命令的用户列表."
 
-#: ../lib/modules/customFields.inc:3187
+#: ../lib/modules/customFields.inc:3185
 msgid "The list of values contains duplicates."
 msgstr "这个值列表包含重复值."
 
@@ -13736,7 +13802,7 @@ msgstr "用户列表的另一个地址."
 
 #: ../lib/modules/kolabGroup.inc:88 ../lib/modules/kolabGroup.inc:92
 #: ../lib/modules/qmailGroup.inc:124 ../lib/modules/qmailGroup.inc:128
-#: ../lib/modules/windowsGroup.inc:129
+#: ../lib/modules/windowsGroup.inc:132
 msgid "The list's email address."
 msgstr "用户列表的邮件地址."
 
@@ -13755,7 +13821,7 @@ msgid ""
 "The login name of your IMAP user who has rights to create/delete mailboxes."
 msgstr "有权限来建立或删除邮箱的IMAP登录名."
 
-#: ../lib/modules/bindDLZ.inc:140 ../lib/modules/bindDLZ.inc:144
+#: ../lib/modules/bindDLZ.inc:143 ../lib/modules/bindDLZ.inc:147
 msgid "The mail server for this entry."
 msgstr "此条目的邮件服务器."
 
@@ -13768,11 +13834,11 @@ msgid ""
 "The mail text for confirmation mails must include the wildcard @@resetLink@@."
 msgstr "确认信的文本必须包含通配符 @@resetLink@@."
 
-#: ../help/help.inc:329
+#: ../help/help.inc:341
 msgid "The mail text of all mails."
 msgstr "所有邮件的文本"
 
-#: ../help/help.inc:289
+#: ../help/help.inc:301
 msgid "The mail text of all password mails."
 msgstr "密码邮寄时的邮件文本"
 
@@ -13800,7 +13866,7 @@ msgid ""
 "request a new IP address."
 msgstr "指定客户端必须重新申请新IP地址的最长释放时间."
 
-#: ../lib/modules/kolabUser.inc:175
+#: ../lib/modules/kolabUser.inc:178
 msgid "The maximum mailbox size in MB."
 msgstr "最大邮箱空间(MB)."
 
@@ -13814,17 +13880,17 @@ msgid ""
 "unlimited."
 msgstr "此打印机每项任务最大的用纸页数, 0意味着不限制."
 
-#: ../lib/modules/bindDLZ.inc:525 ../lib/modules/bindDLZ.inc:526
+#: ../lib/modules/bindDLZ.inc:528 ../lib/modules/bindDLZ.inc:529
 #, php-format
 msgid "The minimum time \"%s\" must be a number."
 msgstr "最短时间 \"%s\"  必须是数字!"
 
-#: ../lib/modules.inc:945
+#: ../lib/modules.inc:953
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "%s模块未准备好."
 
-#: ../templates/pdfedit/pdfpage.php:112
+#: ../templates/pdfedit/pdfpage.php:130
 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','_','-'."
@@ -13832,7 +13898,7 @@ msgstr ""
 "您提供的PDF架构名非法,一个合法的命令由下列字符组成: 'a-z','A-"
 "Z','0-9','_','-'."
 
-#: ../lib/modules/asteriskExtension.inc:111
+#: ../lib/modules/asteriskExtension.inc:113
 msgid ""
 "The name of a command to execute. The available commands may be listed at "
 "the Asterisk command line by executing \"core show applications\"."
@@ -13840,15 +13906,15 @@ msgstr ""
 "将要运行的命令的名字.在Asterisk 命令行运行\"core show applications\"将列出所"
 "有有效的命令"
 
-#: ../lib/modules/fixed_ip.inc:99
+#: ../lib/modules/fixed_ip.inc:102
 msgid "The name of the PC."
 msgstr "PC机器名."
 
-#: ../lib/modules/asteriskExtension.inc:103
+#: ../lib/modules/asteriskExtension.inc:105
 msgid "The name of the extension (e.g. voicemail or sip)."
 msgstr "扩展的名字(比如:voicemail 或 sip)."
 
-#: ../lib/modules/kolabUser.inc:149 ../lib/modules/kolabSharedFolder.inc:155
+#: ../lib/modules/kolabUser.inc:152 ../lib/modules/kolabSharedFolder.inc:155
 msgid "The name of the server where the mailbox is located."
 msgstr "邮箱所在服务器名."
 
@@ -13860,12 +13926,12 @@ msgstr "子网名称.比如: 192.168.10.0"
 msgid "The name of your Windows domain or workgroup."
 msgstr "WINDOWS域名或工作组名."
 
-#: ../lib/modules/bindDLZ.inc:506 ../lib/modules/bindDLZ.inc:507
+#: ../lib/modules/bindDLZ.inc:509 ../lib/modules/bindDLZ.inc:510
 #, php-format
 msgid "The name server \"%s\" is invalid."
 msgstr "DNS服务器 \"%s\"非法."
 
-#: ../lib/modules/bindDLZ.inc:156 ../lib/modules/bindDLZ.inc:160
+#: ../lib/modules/bindDLZ.inc:159 ../lib/modules/bindDLZ.inc:163
 msgid "The name server for this zone."
 msgstr "此域的域名服务器"
 
@@ -13883,7 +13949,7 @@ msgstr "网络掩码与子网掩码密切相关,LAM将会计算得出."
 msgid "The net mask is invalid."
 msgstr "子网掩码非法."
 
-#: ../lib/modules.inc:1209
+#: ../lib/modules.inc:1217
 msgid ""
 "The new password will be stored in the directory after you save this account."
 msgstr "保存帐号后新密码同时保存到目录服务器."
@@ -13892,7 +13958,7 @@ msgstr "保存帐号后新密码同时保存到目录服务器."
 msgid "The number of milliseconds for the last qualify."
 msgstr "上一次合格的微秒数"
 
-#: ../lib/modules/bindDLZ.inc:516
+#: ../lib/modules/bindDLZ.inc:519
 msgid "The number of priority, weight, port and server entries must be equal."
 msgstr "优先级,权重,端口号等数字跟服务器的配置必须一致."
 
@@ -13909,17 +13975,17 @@ msgstr ""
 "可以登录LAM的用户数量受限,或是DN的固定列表数量受限,还可能是LAM在LDAP中搜索给"
 "定用户名的DN数量受限."
 
-#: ../templates/tests/schemaTest.php:114
+#: ../templates/tests/schemaTest.php:117
 #, php-format
 msgid "The object class %s is not supported by your LDAP server."
 msgstr "在你的LDAP服务器中对象类%s不被支持。"
 
-#: ../lib/modules/windowsUser.inc:167 ../lib/modules/inetOrgPerson.inc:820
-#: ../lib/modules/inetOrgPerson.inc:824
+#: ../lib/modules/windowsUser.inc:167 ../lib/modules/inetOrgPerson.inc:818
+#: ../lib/modules/inetOrgPerson.inc:822
 msgid "The office name of the user (e.g. YourCompany, Human Resources)."
 msgstr "用户的办公室名(比如:某某公司,人力资源部)"
 
-#: ../templates/selfService/selfServiceMain.php:396 ../lib/modules.inc:1845
+#: ../templates/selfService/selfServiceMain.php:405 ../lib/modules.inc:1853
 msgid "The operation was stopped because of the above errors."
 msgstr "由于发生了以上错误，操作中止."
 
@@ -13928,11 +13994,11 @@ msgstr "由于发生了以上错误，操作中止."
 msgid "The options have bad format."
 msgstr "选项的格式不正确."
 
-#: ../lib/modules/device.inc:70 ../lib/modules/device.inc:74
+#: ../lib/modules/device.inc:73 ../lib/modules/device.inc:77
 msgid "The owners of this device."
 msgstr "设备所有者"
 
-#: ../lib/modules/groupOfNames.inc:94 ../lib/modules/groupOfNames.inc:98
+#: ../lib/modules/groupOfNames.inc:97 ../lib/modules/groupOfNames.inc:101
 msgid "The owners of this group."
 msgstr "此组的拥有者."
 
@@ -13949,7 +14015,7 @@ msgstr "参数 @@password@@ 将会被新密码代替"
 msgid "The parameter @@principal@@ will be replaced with the principal name."
 msgstr "参数 @@principal@@ 会被主要的名字代替."
 
-#: ../templates/config/confsave.php:71 ../templates/config/confmain.php:73
+#: ../templates/config/confsave.php:71 ../templates/config/confmain.php:76
 #: ../templates/config/mainlogin.php:65
 #: ../templates/selfService/adminLogin.php:55
 msgid "The password is invalid! Please try again."
@@ -14024,34 +14090,34 @@ msgid ""
 "is stored in the LAM server profile."
 msgstr "IMAP管理员用户的密码.IMAP管理员用户登录名保存在LAM服务器的配置中."
 
-#: ../templates/lists/changePassword.php:659 ../lib/modules.inc:1152
+#: ../templates/lists/changePassword.php:660 ../lib/modules.inc:1160
 msgid "The password was set to:"
 msgstr "密码被设置为:"
 
-#: ../lib/modules/range.inc:122
+#: ../lib/modules/range.inc:125
 msgid "The pool's failover peer."
 msgstr "地址池的失效恢复节点"
 
-#: ../lib/modules/range.inc:118
+#: ../lib/modules/range.inc:121
 msgid "The pool's name."
 msgstr "地址池名"
 
-#: ../lib/modules/bindDLZ.inc:512 ../lib/modules/bindDLZ.inc:513
+#: ../lib/modules/bindDLZ.inc:515 ../lib/modules/bindDLZ.inc:516
 #, php-format
 msgid "The port \"%s\" is invalid."
 msgstr "端口 \"%s\" 非法"
 
-#: ../lib/modules/windowsUser.inc:175 ../lib/modules/inetOrgPerson.inc:693
-#: ../lib/modules/inetOrgPerson.inc:697
+#: ../lib/modules/windowsUser.inc:175 ../lib/modules/inetOrgPerson.inc:691
+#: ../lib/modules/inetOrgPerson.inc:695
 msgid "The post office box of the user's address."
 msgstr "用户地址的邮箱."
 
-#: ../lib/modules/windowsUser.inc:171 ../lib/modules/inetOrgPerson.inc:701
-#: ../lib/modules/inetOrgPerson.inc:705
+#: ../lib/modules/windowsUser.inc:171 ../lib/modules/inetOrgPerson.inc:699
+#: ../lib/modules/inetOrgPerson.inc:703
 msgid "The postal code of the user's address."
 msgstr "用户地址的邮政编码"
 
-#: ../lib/modules/bindDLZ.inc:502 ../lib/modules/bindDLZ.inc:503
+#: ../lib/modules/bindDLZ.inc:505 ../lib/modules/bindDLZ.inc:506
 #, php-format
 msgid "The preference \"%s\" must be a number."
 msgstr "此项 \"%s\" 必须是数字!"
@@ -14078,37 +14144,37 @@ msgstr "该主机所属的主组名."
 msgid "The primary group the user should be member of."
 msgstr "该用户所属的主组名."
 
-#: ../lib/modules/bindDLZ.inc:508 ../lib/modules/bindDLZ.inc:509
+#: ../lib/modules/bindDLZ.inc:511 ../lib/modules/bindDLZ.inc:512
 #, php-format
 msgid "The priority \"%s\" is invalid."
 msgstr "优先级 \"%s\" 非法"
 
-#: ../lib/modules/asteriskExtension.inc:107
+#: ../lib/modules/asteriskExtension.inc:109
 msgid ""
 "The priority is a sequence number used to order the execution of commands. "
 "Commands are executed beginning with the lowest sequence number."
 msgstr ""
 "优先级是一个序号,用来表示运行命令的顺序.最小的序号代表的命令会最先运行."
 
-#: ../lib/modules/range.inc:511 ../lib/modules/range.inc:591
+#: ../lib/modules/range.inc:514 ../lib/modules/range.inc:594
 msgid "The range conflicts with another range."
 msgstr "此范围与其它范围冲突."
 
-#: ../lib/modules/range.inc:507 ../lib/modules/range.inc:585
+#: ../lib/modules/range.inc:510 ../lib/modules/range.inc:588
 msgid "The range end needs to be greater than the range start."
 msgstr "范围的终止地址需要大于起始地址."
 
-#: ../lib/modules/bindDLZ.inc:521 ../lib/modules/bindDLZ.inc:522
+#: ../lib/modules/bindDLZ.inc:524 ../lib/modules/bindDLZ.inc:525
 #, php-format
 msgid "The refresh time \"%s\" must be a number."
 msgstr "刷新时间 \"%s\" 必须是数字!"
 
-#: ../lib/modules/bindDLZ.inc:523 ../lib/modules/bindDLZ.inc:524
+#: ../lib/modules/bindDLZ.inc:526 ../lib/modules/bindDLZ.inc:527
 #, php-format
 msgid "The retry time \"%s\" must be a number."
 msgstr "重试时间 \"%s\"必须是数字!"
 
-#: ../lib/modules/inetOrgPerson.inc:788
+#: ../lib/modules/inetOrgPerson.inc:786
 msgid "The room number of the employee's office."
 msgstr "雇员办公室房间号码"
 
@@ -14125,28 +14191,28 @@ msgstr "在web服务器中运行的与用户语境相关的脚本(比如:apache/
 #: ../lib/modules/nisMailAliasUser.inc:105
 #: ../lib/modules/asteriskAccount.inc:244 ../lib/modules/qmailUser.inc:196
 #: ../lib/modules/zarafaGroup.inc:114 ../lib/modules/sambaSamAccount.inc:401
-#: ../lib/modules/posixAccount.inc:383 ../lib/modules/zarafaUser.inc:147
-#: ../lib/modules/windowsUser.inc:252 ../lib/modules/inetOrgPerson.inc:836
+#: ../lib/modules/posixAccount.inc:383 ../lib/modules/zarafaUser.inc:150
+#: ../lib/modules/windowsUser.inc:252 ../lib/modules/inetOrgPerson.inc:834
 #: ../lib/modules/freeRadius.inc:129 ../lib/modules/zarafaServer.inc:89
-#: ../lib/modules/qmailGroup.inc:120 ../lib/modules/organizationalRole.inc:82
-#: ../lib/modules/passwordSelfReset.inc:165 ../lib/modules/windowsGroup.inc:113
-#: ../lib/modules/groupOfNames.inc:82
+#: ../lib/modules/qmailGroup.inc:120 ../lib/modules/organizationalRole.inc:85
+#: ../lib/modules/passwordSelfReset.inc:165 ../lib/modules/windowsGroup.inc:116
+#: ../lib/modules/groupOfNames.inc:85
 msgid ""
 "The selected options will not be managed inside LAM. You can use this to "
 "reduce the number of displayed input fields."
 msgstr "选中项将不被LAM所管理,可以用此来减少所显示的输入框个数."
 
-#: ../lib/modules/bindDLZ.inc:527 ../lib/modules/bindDLZ.inc:528
+#: ../lib/modules/bindDLZ.inc:530 ../lib/modules/bindDLZ.inc:531
 #, php-format
 msgid "The serial number \"%s\" must be a number."
 msgstr "序列号 \"%s\"必须是数字!"
 
-#: ../lib/modules/bindDLZ.inc:228
+#: ../lib/modules/bindDLZ.inc:231
 msgid "The serial number should be updated after each zone change."
 msgstr "在每次更改后,序列号应该更新"
 
-#: ../lib/modules/bindDLZ.inc:500 ../lib/modules/bindDLZ.inc:501
-#: ../lib/modules/bindDLZ.inc:514 ../lib/modules/bindDLZ.inc:515
+#: ../lib/modules/bindDLZ.inc:503 ../lib/modules/bindDLZ.inc:504
+#: ../lib/modules/bindDLZ.inc:517 ../lib/modules/bindDLZ.inc:518
 #, php-format
 msgid "The server name \"%s\" is invalid."
 msgstr "服务器名 \"%s\"非法"
@@ -14155,29 +14221,29 @@ msgstr "服务器名 \"%s\"非法"
 msgid "The source and destination DN are the same."
 msgstr "源DN与目标DN相同"
 
-#: ../lib/modules/range.inc:98
+#: ../lib/modules/range.inc:101
 msgid "The starting IP address of the range."
 msgstr "范围的起始IP地址."
 
-#: ../lib/modules/windowsUser.inc:183 ../lib/modules/inetOrgPerson.inc:808
-#: ../lib/modules/inetOrgPerson.inc:812
+#: ../lib/modules/windowsUser.inc:183 ../lib/modules/inetOrgPerson.inc:806
+#: ../lib/modules/inetOrgPerson.inc:810
 msgid "The state where the user resides or works."
 msgstr "用户居住或工作地点."
 
-#: ../templates/pdfedit/pdfpage.php:129
+#: ../templates/pdfedit/pdfpage.php:147
 msgid "The static text must contain at least one character."
 msgstr "静态文本至少包含一个字符."
 
-#: ../lib/modules/windowsUser.inc:187 ../lib/modules/inetOrgPerson.inc:685
-#: ../lib/modules/inetOrgPerson.inc:689
+#: ../lib/modules/windowsUser.inc:187 ../lib/modules/inetOrgPerson.inc:683
+#: ../lib/modules/inetOrgPerson.inc:687
 msgid "The street name of the user's address."
 msgstr "用户地址的街道名"
 
-#: ../help/help.inc:325
+#: ../help/help.inc:337
 msgid "The subject of all mails."
 msgstr "所有邮件的主题."
 
-#: ../help/help.inc:287
+#: ../help/help.inc:299
 msgid "The subject of all password mails."
 msgstr "密码邮件的主题."
 
@@ -14218,56 +14284,56 @@ msgstr "sudo命令以这些组员的身份运行."
 msgid "The sudo commands may be run as these users (e.g. root)."
 msgstr "sudo命令以这个用户的身份运行(比如:root)."
 
-#: ../lib/modules/bindDLZ.inc:220
+#: ../lib/modules/bindDLZ.inc:223
 msgid ""
 "The time (in seconds) a secondary server should wait before retrying a zone "
 "refresh."
 msgstr "辅助服务器在重试区域更新前要等待的时间(秒)"
 
-#: ../lib/modules/bindDLZ.inc:216
+#: ../lib/modules/bindDLZ.inc:219
 msgid ""
 "The time (in seconds) that a secondary server should wait before checking "
 "for zone updates."
 msgstr "辅助服务器在检查域更新前等待的时间(秒)"
 
-#: ../lib/modules/bindDLZ.inc:212
+#: ../lib/modules/bindDLZ.inc:215
 msgid ""
 "The time (in seconds) that zone data is kept on a secondary server without "
 "receiving a zone refresh."
 msgstr "如果更新消息,域数据在辅助服务器中保留的时间(秒)"
 
-#: ../lib/modules/bindDLZ.inc:479 ../lib/modules/bindDLZ.inc:480
-#: ../lib/modules/bindDLZ.inc:481 ../lib/modules/bindDLZ.inc:482
-#: ../lib/modules/bindDLZ.inc:483 ../lib/modules/bindDLZ.inc:484
-#: ../lib/modules/bindDLZ.inc:485 ../lib/modules/bindDLZ.inc:486
-#: ../lib/modules/bindDLZ.inc:487 ../lib/modules/bindDLZ.inc:488
-#: ../lib/modules/bindDLZ.inc:489 ../lib/modules/bindDLZ.inc:490
-#: ../lib/modules/bindDLZ.inc:491 ../lib/modules/bindDLZ.inc:492
-#: ../lib/modules/bindDLZ.inc:493 ../lib/modules/bindDLZ.inc:494
+#: ../lib/modules/bindDLZ.inc:482 ../lib/modules/bindDLZ.inc:483
+#: ../lib/modules/bindDLZ.inc:484 ../lib/modules/bindDLZ.inc:485
+#: ../lib/modules/bindDLZ.inc:486 ../lib/modules/bindDLZ.inc:487
+#: ../lib/modules/bindDLZ.inc:488 ../lib/modules/bindDLZ.inc:489
+#: ../lib/modules/bindDLZ.inc:490 ../lib/modules/bindDLZ.inc:491
+#: ../lib/modules/bindDLZ.inc:492 ../lib/modules/bindDLZ.inc:493
+#: ../lib/modules/bindDLZ.inc:494 ../lib/modules/bindDLZ.inc:495
+#: ../lib/modules/bindDLZ.inc:496 ../lib/modules/bindDLZ.inc:497
 #, php-format
 msgid "The timeout \"%s\" must be a number."
 msgstr "超时时间 \"%s\"必须是数字!"
 
-#: ../lib/modules/bindDLZ.inc:102 ../lib/modules/bindDLZ.inc:106
-#: ../lib/modules/bindDLZ.inc:111 ../lib/modules/bindDLZ.inc:116
-#: ../lib/modules/bindDLZ.inc:121 ../lib/modules/bindDLZ.inc:126
-#: ../lib/modules/bindDLZ.inc:131
+#: ../lib/modules/bindDLZ.inc:105 ../lib/modules/bindDLZ.inc:109
+#: ../lib/modules/bindDLZ.inc:114 ../lib/modules/bindDLZ.inc:119
+#: ../lib/modules/bindDLZ.inc:124 ../lib/modules/bindDLZ.inc:129
+#: ../lib/modules/bindDLZ.inc:134
 msgid ""
 "The timeout specifies how long (in seconds) a record can be cached by "
 "caching DNS servers."
 msgstr "在缓冲服务器中指定一条缓冲记录可以保留的时间(秒)"
 
-#: ../lib/modules/customFields.inc:3778 ../lib/modules/customFields.inc:3865
+#: ../lib/modules/customFields.inc:3776 ../lib/modules/customFields.inc:3863
 #, php-format
 msgid "The uploaded file does not have the correct file extension (%s)."
 msgstr "上传文件没有正确的扩展名 (%s)."
 
-#: ../lib/modules/customFields.inc:3774 ../lib/modules/customFields.inc:3861
+#: ../lib/modules/customFields.inc:3772 ../lib/modules/customFields.inc:3859
 #, php-format
 msgid "The uploaded file is too large (> %s bytes)."
 msgstr "上传的文件太大了 (> %s 字节)."
 
-#: ../lib/modules/ldapPublicKey.inc:129
+#: ../lib/modules/ldapPublicKey.inc:132
 msgid "The uploaded file seems to be no valid public key."
 msgstr "上传的文件似乎没有有效的公钥."
 
@@ -14275,7 +14341,7 @@ msgstr "上传的文件似乎没有有效的公钥."
 msgid "The url attribute value should begin with file://."
 msgstr "URL属性值必须以file://开始"
 
-#: ../lib/modules/zarafaUser.inc:127
+#: ../lib/modules/zarafaUser.inc:130
 msgid "The user account is non-active and login is disabled."
 msgstr "用户帐号被锁定,不能登录."
 
@@ -14283,7 +14349,7 @@ msgstr "用户帐号被锁定,不能登录."
 msgid "The user must log on using a smart card."
 msgstr "用户必须使用智能卡登录."
 
-#: ../lib/modules/zarafaUser.inc:107
+#: ../lib/modules/zarafaUser.inc:110
 msgid "The user will get warned when his mailbox reaches this limit."
 msgstr "当邮箱到达这个权限值时,用户会收到告警."
 
@@ -14296,51 +14362,51 @@ msgid "The user's call groups."
 msgstr "用户呼叫组"
 
 #: ../lib/modules/qmailUser.inc:200 ../lib/modules/windowsUser.inc:155
-#: ../lib/modules/pykotaUser.inc:117 ../lib/modules/inetOrgPerson.inc:749
-#: ../lib/modules/inetOrgPerson.inc:753
+#: ../lib/modules/pykotaUser.inc:120 ../lib/modules/inetOrgPerson.inc:747
+#: ../lib/modules/inetOrgPerson.inc:751
 msgid "The user's email address."
 msgstr "用户邮件的地址."
 
-#: ../lib/modules/windowsUser.inc:195 ../lib/modules/inetOrgPerson.inc:733
-#: ../lib/modules/inetOrgPerson.inc:737
+#: ../lib/modules/windowsUser.inc:195 ../lib/modules/inetOrgPerson.inc:731
+#: ../lib/modules/inetOrgPerson.inc:735
 msgid "The user's fax number."
 msgstr "用户的传真号."
 
-#: ../lib/modules/windowsUser.inc:367 ../lib/modules/inetOrgPerson.inc:725
-#: ../lib/modules/inetOrgPerson.inc:729
+#: ../lib/modules/windowsUser.inc:367 ../lib/modules/inetOrgPerson.inc:723
+#: ../lib/modules/inetOrgPerson.inc:727
 msgid "The user's mobile number."
 msgstr "用户的手机号."
 
 #: ../lib/modules/windowsUser.inc:339 ../lib/modules/windowsUser.inc:343
-#: ../lib/modules/inetOrgPerson.inc:853 ../lib/modules/inetOrgPerson.inc:857
+#: ../lib/modules/inetOrgPerson.inc:851 ../lib/modules/inetOrgPerson.inc:855
 msgid "The user's organisation name."
 msgstr "用户的组织名."
 
 #: ../lib/modules/windowsUser.inc:331 ../lib/modules/windowsUser.inc:335
-#: ../lib/modules/inetOrgPerson.inc:845 ../lib/modules/inetOrgPerson.inc:849
+#: ../lib/modules/inetOrgPerson.inc:843 ../lib/modules/inetOrgPerson.inc:847
 msgid "The user's organisational unit."
 msgstr "用户的组织单元."
 
-#: ../lib/modules/windowsUser.inc:355 ../lib/modules/inetOrgPerson.inc:741
-#: ../lib/modules/inetOrgPerson.inc:745
+#: ../lib/modules/windowsUser.inc:355 ../lib/modules/inetOrgPerson.inc:739
+#: ../lib/modules/inetOrgPerson.inc:743
 msgid "The user's pager number."
 msgstr "用户的传呼号."
 
-#: ../lib/modules/inetOrgPerson.inc:780 ../lib/modules/inetOrgPerson.inc:784
+#: ../lib/modules/inetOrgPerson.inc:778 ../lib/modules/inetOrgPerson.inc:782
 msgid "The user's private telephone number."
 msgstr "用户的个人电话号码."
 
-#: ../lib/modules/windowsUser.inc:191 ../lib/modules/inetOrgPerson.inc:717
-#: ../lib/modules/inetOrgPerson.inc:721
+#: ../lib/modules/windowsUser.inc:191 ../lib/modules/inetOrgPerson.inc:715
+#: ../lib/modules/inetOrgPerson.inc:719
 msgid "The user's telephone number."
 msgstr "用户的电话"
 
-#: ../lib/modules/windowsUser.inc:307 ../lib/modules/inetOrgPerson.inc:861
+#: ../lib/modules/windowsUser.inc:307 ../lib/modules/inetOrgPerson.inc:859
 msgid "The user's unique employee number."
 msgstr "用户的唯一雇员号"
 
-#: ../lib/modules/windowsUser.inc:207 ../lib/modules/inetOrgPerson.inc:760
-#: ../lib/modules/inetOrgPerson.inc:764
+#: ../lib/modules/windowsUser.inc:207 ../lib/modules/inetOrgPerson.inc:758
+#: ../lib/modules/inetOrgPerson.inc:762
 msgid "The user's web site (e.g. http://www.company.com)."
 msgstr "用户的web网站(比如,http://www.company.com)."
 
@@ -14350,7 +14416,7 @@ msgid ""
 "be a number."
 msgstr "Samba 3 的 \"用户可以/必须修改密码\" 的取值必须是一个数字."
 
-#: ../lib/modules/puppetClient.inc:199 ../lib/modules/puppetClient.inc:200
+#: ../lib/modules/puppetClient.inc:202 ../lib/modules/puppetClient.inc:203
 msgid "The variables may only contain ASCII characters."
 msgstr "变量仅能包含ASCII字符."
 
@@ -14359,7 +14425,7 @@ msgstr "变量仅能包含ASCII字符."
 msgid "The voicemail context name is invalid."
 msgstr "语音邮件的语境名非法."
 
-#: ../lib/modules/bindDLZ.inc:510 ../lib/modules/bindDLZ.inc:511
+#: ../lib/modules/bindDLZ.inc:513 ../lib/modules/bindDLZ.inc:514
 #, php-format
 msgid "The weight \"%s\" is invalid."
 msgstr "权重 \"%s\" 非法"
@@ -14373,7 +14439,7 @@ msgstr "没有被标记为RDN的属性"
 msgid "The wildcard for the account creation link is @@creationLink@@."
 msgstr "账号建立连接的通配符 @@resetLink@@."
 
-#: ../lib/modules/passwordSelfReset.inc:131 ../help/help.inc:292
+#: ../lib/modules/passwordSelfReset.inc:131 ../help/help.inc:304
 msgid "The wildcard for the new password is @@newPassword@@."
 msgstr "新密码的通配符为@@newPassword@@."
 
@@ -14386,11 +14452,11 @@ msgstr "复位连接的通配符 @@resetLink@@."
 msgid "There are <b>%s</b> members in group <b>%s</b>:"
 msgstr "共有<b>%s</b>个用户中在组<b>%s</b>中:"
 
-#: ../lib/modules/posixGroup.inc:672 ../lib/modules/sambaGroupMapping.inc:606
+#: ../lib/modules/posixGroup.inc:670 ../lib/modules/sambaGroupMapping.inc:604
 msgid "There are still users who have this group as their primary group."
 msgstr "仍有用户的主组为本组."
 
-#: ../lib/modules/sambaGroupMapping.inc:603
+#: ../lib/modules/sambaGroupMapping.inc:601
 msgid "There can be only one group of this type."
 msgstr "只能有一种本类型组."
 
@@ -14402,7 +14468,7 @@ msgstr "已经有其他的帐号使用这个拨号ID."
 msgid "There is already another user with this mailbox name."
 msgstr "已经有其他的帐号使用这个邮箱名."
 
-#: ../templates/massDoUpload.php:259
+#: ../lib/upload.inc:196
 msgid "There were errors while uploading:"
 msgstr "上传时发生错误."
 
@@ -14436,17 +14502,17 @@ msgstr ""
 "建立新用户帐号时所使用的最大和最小UID号,UID范围不能与机器ID号一致.新帐号使用"
 "已用最大号加1."
 
-#: ../lib/modules/inetOrgPerson.inc:873
+#: ../lib/modules/inetOrgPerson.inc:871
 msgid "These are the user's certificates."
 msgstr "这是用户的证书."
 
-#: ../lib/modules/puppetClient.inc:118
+#: ../lib/modules/puppetClient.inc:121
 msgid ""
 "These classes will be available as autocompletion hints when adding new "
 "classes."
 msgstr "在增加类时，这些类是自动完成的提示选项。"
 
-#: ../lib/modules/nisnetgroup.inc:96 ../lib/modules/nisnetgroup.inc:100
+#: ../lib/modules/nisnetgroup.inc:99 ../lib/modules/nisnetgroup.inc:103
 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."
@@ -14454,13 +14520,13 @@ msgstr ""
 "这些条目指定了网络组的成员.您可以指定一个主机名集,或一个用户名集,或一个域名"
 "集,或上述的任意组合."
 
-#: ../lib/modules/puppetClient.inc:122
+#: ../lib/modules/puppetClient.inc:125
 msgid ""
 "These environments will be available as autocompletion hints when setting "
 "the environment."
 msgstr "在设置变量时，这些变量是自动完成的提示选项。"
 
-#: ../lib/modules/asteriskExtension.inc:123
+#: ../lib/modules/asteriskExtension.inc:125
 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 "
@@ -14490,11 +14556,11 @@ msgstr ""
 msgid "This MAC address is already in use."
 msgstr "MAC地址已被使用: "
 
-#: ../lib/modules/fixed_ip.inc:462
+#: ../lib/modules/fixed_ip.inc:465
 msgid "This PC name already exists."
 msgstr "PC机器名已经存在!"
 
-#: ../lib/modules/kolabGroup.inc:197 ../lib/modules/kolabUser.inc:292
+#: ../lib/modules/kolabGroup.inc:197 ../lib/modules/kolabUser.inc:295
 #: ../lib/modules/kolabSharedFolder.inc:274
 msgid "This account is marked for deletion."
 msgstr "本帐号标记为删除."
@@ -14517,7 +14583,7 @@ msgstr "必要的属性"
 msgid "This attribute is required for the RDN."
 msgstr "RDN的必要的属性."
 
-#: ../lib/modules/windowsUser.inc:303 ../lib/modules/inetOrgPerson.inc:816
+#: ../lib/modules/windowsUser.inc:303 ../lib/modules/inetOrgPerson.inc:814
 msgid "This can be used to specify if the user has a car license."
 msgstr "用来指定用户是否拥有汽车执照."
 
@@ -14533,7 +14599,7 @@ msgstr "改变设置文件的密码."
 msgid "This changes the profile which is selected by default at login."
 msgstr "改变缺省登录使用的配置文件."
 
-#: ../templates/massBuildAccounts.php:176
+#: ../templates/upload/massBuildAccounts.php:187
 msgid ""
 "This column is defined to include unique entries but duplicates were found:"
 msgstr "本列不能有重复的条目,但发现了下列重复条目:"
@@ -14576,7 +14642,7 @@ msgid ""
 "lamdaemon."
 msgstr "设置lamdaemon建立的用户目录的权限."
 
-#: ../lib/modules/asteriskExtension.inc:95
+#: ../lib/modules/asteriskExtension.inc:97
 msgid ""
 "This defines what application Asterisk has to start for this user (e.g. SIP/"
 "user1)."
@@ -14587,7 +14653,7 @@ msgstr "定义为这个用户启动的Asterisk 应用(比如:SIP/user1)."
 msgid "This deletion request also includes %s child entries."
 msgstr "这次删除请求包括了%s个子条目"
 
-#: ../lib/modules/device.inc:78
+#: ../lib/modules/device.inc:81
 msgid "This describes the location of the device."
 msgstr "描述设备所在地点."
 
@@ -14595,8 +14661,8 @@ msgstr "描述设备所在地点."
 msgid "This describes the location of the host."
 msgstr "描述主机所在地点."
 
-#: ../lib/modules/windowsUser.inc:151 ../lib/modules/inetOrgPerson.inc:800
-#: ../lib/modules/inetOrgPerson.inc:804
+#: ../lib/modules/windowsUser.inc:151 ../lib/modules/inetOrgPerson.inc:798
+#: ../lib/modules/inetOrgPerson.inc:802
 msgid "This describes the location of the user."
 msgstr "描述用户所在地点."
 
@@ -14604,24 +14670,24 @@ msgstr "描述用户所在地点."
 msgid "This document was automatically created by LDAP Account Manager"
 msgstr "本文件由本系统自动产生."
 
-#: ../help/help.inc:343
+#: ../help/help.inc:355
 msgid "This email address will be set as BCC address of all mails."
 msgstr "这个邮件地址会被设定为所有邮件的秘密抄送地址."
 
-#: ../help/help.inc:339
+#: ../help/help.inc:351
 msgid "This email address will be set as CC address of all mails."
 msgstr "这个邮件地址会被设定为所有邮件的抄送地址."
 
-#: ../help/help.inc:321
+#: ../help/help.inc:333
 msgid "This email address will be set as reply-to address of all mails."
 msgstr "这个邮件地址会被设定为所有邮件的回复地址."
 
-#: ../help/help.inc:296
+#: ../help/help.inc:308
 msgid ""
 "This email address will be set as reply-to address of all password mails."
 msgstr "这个邮件地址会被设定为密码邮件的发件人地址."
 
-#: ../help/help.inc:317
+#: ../help/help.inc:329
 msgid ""
 "This email address will be set as sender address of all mails. If empty the "
 "system default (php.ini) will be used."
@@ -14629,7 +14695,7 @@ msgstr ""
 "这个邮件地址会被设定为所有邮件的发件人地址.如果为空,则使用phi.ini指定的缺省"
 "值."
 
-#: ../help/help.inc:285
+#: ../help/help.inc:297
 msgid ""
 "This email address will be set as sender address of all password mails. If "
 "empty the system default (php.ini) will be used."
@@ -14685,15 +14751,15 @@ msgstr "这是以逗号分隔的IP地址列表."
 msgid "This is a comma separated list of MAC addresses."
 msgstr "这是以逗号分隔的MAC地址列表."
 
-#: ../lib/modules/kolabUser.inc:137 ../lib/modules/kolabSharedFolder.inc:143
+#: ../lib/modules/kolabUser.inc:140 ../lib/modules/kolabSharedFolder.inc:143
 msgid "This is a comma separated list of delegates."
 msgstr "这是以逗号分隔的代表列表."
 
-#: ../lib/modules/kolabUser.inc:145 ../lib/modules/kolabSharedFolder.inc:151
+#: ../lib/modules/kolabUser.inc:148 ../lib/modules/kolabSharedFolder.inc:151
 msgid "This is a comma separated list of eMail aliases."
 msgstr "这是以逗号分隔的电子邮件别名列表."
 
-#: ../lib/modules/kolabUser.inc:129
+#: ../lib/modules/kolabUser.inc:132
 msgid "This is a comma separated list of invitation policies."
 msgstr "这是逗号分隔的约会策略列表."
 
@@ -14720,17 +14786,17 @@ msgid ""
 msgstr ""
 "这是一个用户可以输入的附加属性列表.请注意用户名,密码和邮箱地址是强制性的."
 
-#: ../lib/modules/windowsGroup.inc:137
+#: ../lib/modules/windowsGroup.inc:140
 msgid "This is a list of groups this group is member of."
 msgstr "这是该组属于哪些组的列表."
 
-#: ../lib/modules/organizationalRole.inc:94 ../lib/modules/windowsGroup.inc:133
-#: ../lib/modules/groupOfNames.inc:102
+#: ../lib/modules/organizationalRole.inc:97 ../lib/modules/windowsGroup.inc:136
+#: ../lib/modules/groupOfNames.inc:105
 msgid "This is a list of members of this group."
 msgstr "这是该组用户列表."
 
-#: ../lib/modules/organizationalRole.inc:98 ../lib/modules/windowsGroup.inc:141
-#: ../lib/modules/groupOfNames.inc:106
+#: ../lib/modules/organizationalRole.inc:101
+#: ../lib/modules/windowsGroup.inc:144 ../lib/modules/groupOfNames.inc:109
 msgid ""
 "This is a list of members of this group. Multiple members are separated by "
 "semicolons."
@@ -14788,12 +14854,12 @@ msgstr ""
 
 #: ../lib/passwordExpirationJob.inc:516
 #: ../lib/modules/zarafaDynamicGroup.inc:199 ../lib/modules/ipHost.inc:125
-#: ../lib/modules/posixGroup.inc:673 ../lib/modules/posixGroup.inc:674
-#: ../lib/modules/device.inc:142 ../lib/modules/eduPerson.inc:246
+#: ../lib/modules/posixGroup.inc:671 ../lib/modules/posixGroup.inc:672
+#: ../lib/modules/device.inc:145 ../lib/modules/eduPerson.inc:246
 #: ../lib/modules/eduPerson.inc:248 ../lib/modules/zarafaAddressList.inc:170
 #: ../lib/modules/posixAccount.inc:131 ../lib/modules/posixAccount.inc:132
-#: ../lib/modules/ppolicyUser.inc:561 ../lib/modules/windowsUser.inc:1001
-#: ../lib/modules/inetOrgPerson.inc:100 ../lib/modules/freeRadius.inc:342
+#: ../lib/modules/ppolicyUser.inc:559 ../lib/modules/windowsUser.inc:1001
+#: ../lib/modules/inetOrgPerson.inc:98 ../lib/modules/freeRadius.inc:342
 #: ../lib/modules/aliasEntry.inc:86 ../lib/modules/qmailGroup.inc:433
 #: ../lib/modules/qmailGroup.inc:434 ../lib/modules/qmailGroup.inc:435
 msgid "This is not a valid DN!"
@@ -14803,7 +14869,7 @@ msgstr "不是一个有效的DN!"
 msgid "This is not a valid RID number!"
 msgstr "不是一个有效的RID号!"
 
-#: ../lib/modules/sambaGroupMapping.inc:605
+#: ../lib/modules/sambaGroupMapping.inc:603
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不是一个有效的Samba 3 组类型!"
 
@@ -14850,8 +14916,8 @@ msgstr "设备的网卡的IP地址(比如:123.123.123.123)."
 msgid "This is the LDAP DN of the host's manager."
 msgstr "主机管理员的LDAP DB"
 
-#: ../lib/modules/windowsUser.inc:347 ../lib/modules/inetOrgPerson.inc:677
-#: ../lib/modules/inetOrgPerson.inc:681
+#: ../lib/modules/windowsUser.inc:347 ../lib/modules/inetOrgPerson.inc:675
+#: ../lib/modules/inetOrgPerson.inc:679
 msgid ""
 "This is the LDAP DN of the user's manager. Use this property to represent "
 "hierarchies in your company."
@@ -15001,8 +15067,8 @@ msgstr "用户的邮箱限额的大小(字节数)."
 msgid "This is the minimum length for answers to the security question."
 msgstr "安全问题的答案的最小长度."
 
-#: ../lib/modules/nisnetgroup.inc:84 ../lib/modules/organizationalRole.inc:86
-#: ../lib/modules/groupOfNames.inc:86
+#: ../lib/modules/nisnetgroup.inc:87 ../lib/modules/organizationalRole.inc:89
+#: ../lib/modules/groupOfNames.inc:89
 msgid "This is the name of this group."
 msgstr "组名."
 
@@ -15011,11 +15077,11 @@ msgid ""
 "This is the natural name of the host. If empty, the host name will be used."
 msgstr "主机帐号的自然名(natural name).留空使用主机名."
 
-#: ../lib/modules/pykotaUser.inc:109
+#: ../lib/modules/pykotaUser.inc:112
 msgid "This is the natural name of the user."
 msgstr "用户原名."
 
-#: ../lib/modules/inetOrgPerson.inc:768
+#: ../lib/modules/inetOrgPerson.inc:766
 msgid ""
 "This is the natural name of the user. If empty, the first and last name is "
 "used."
@@ -15139,7 +15205,7 @@ msgstr "这是Samba服务器的时区.LAM用此信息显示正确的登录时间
 msgid "This is the user's primary Windows group."
 msgstr "用户的Windows主要组."
 
-#: ../lib/modules/puppetClient.inc:94
+#: ../lib/modules/puppetClient.inc:97
 msgid ""
 "This is this node's parent. All classes and variables are inherited from "
 "this node."
@@ -15151,12 +15217,12 @@ msgid ""
 "a type=friend entry defined with username and password."
 msgstr "当使用账号和密码定义type=friend时,此项设置用来允许呼入."
 
-#: ../lib/modules/zarafaUser.inc:131
+#: ../lib/modules/zarafaUser.inc:134
 msgid "This is used to mark this account as resource."
 msgstr "用来标识此账号是一个资源"
 
-#: ../lib/modules/qmailUser.inc:1239 ../lib/modules/windowsUser.inc:3553
-#: ../lib/modules/shadowAccount.inc:912 ../lib/modules/freeRadius.inc:833
+#: ../lib/modules/qmailUser.inc:1237 ../lib/modules/windowsUser.inc:3551
+#: ../lib/modules/shadowAccount.inc:910 ../lib/modules/freeRadius.inc:831
 msgid "This job deletes or moves user accounts when they expire."
 msgstr "这项工作会删除或移动过期账号"
 
@@ -15178,7 +15244,7 @@ msgstr "邮件地址已被使用: "
 msgid "This mailbox will be created/deleted."
 msgstr "这个邮箱将会被建立或删除."
 
-#: ../lib/modules.inc:1270
+#: ../lib/modules.inc:1278
 msgid "This may overwrite existing values with profile data. Continue?"
 msgstr "将覆盖已有值,继续?"
 
@@ -15194,7 +15260,7 @@ msgid ""
 "address if empty."
 msgstr "显示的名字是登录页面上的服务器名字。如果为空则为服务器地址。"
 
-#: ../templates/schema/schema.php:350
+#: ../templates/schema/schema.php:351
 msgid "This object class is obsolete."
 msgstr "这个对象类是陈旧的."
 
@@ -15219,7 +15285,7 @@ msgstr ""
 "帐号可以登录的时间.格式与LDAP属性一致.使用168位代理24*7,168位以21个16进制字节"
 "表示.第一位代表GMT时间星期天0:00-0.59."
 
-#: ../lib/modules/asteriskExtension.inc:192
+#: ../lib/modules/asteriskExtension.inc:194
 msgid "This pair of extension name and priority already exists."
 msgstr "扩展名和优先级的配对已经存在!"
 
@@ -15233,7 +15299,7 @@ msgstr "这里指定断开连接的策略。"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:96
 #: ../lib/modules/zarafaContact.inc:113 ../lib/modules/zarafaGroup.inc:118
-#: ../lib/modules/zarafaAddressList.inc:84 ../lib/modules/zarafaUser.inc:186
+#: ../lib/modules/zarafaAddressList.inc:84 ../lib/modules/zarafaUser.inc:189
 #: ../lib/modules/zarafaServer.inc:93
 msgid ""
 "This specifies the used Zarafa LDAP schema. Select LDAP for e.g. OpenLDAP, "
@@ -15249,6 +15315,12 @@ msgstr ""
 msgid "This specifies what to do when the client connection is broken."
 msgstr "这里指定客户连接中断的动作。"
 
+#: ../help/help.inc:291
+msgid ""
+"This text is displayed on top of the 2-factor page. You can also input HTML "
+"code here."
+msgstr "这些文本显示在双重认证页面的上端.你可以在此输入HTML代码."
+
 #: ../help/help.inc:265
 msgid ""
 "This text is displayed on top of the self service login page. You can also "
@@ -15284,12 +15356,12 @@ msgid ""
 "is set to autoreply."
 msgstr "如果发送模式设置了自动回复,将为所有来信发送如下回复."
 
-#: ../lib/tools/pdfEdit.inc:53
+#: ../lib/tools/pdfEdit.inc:54
 msgid "This tool allows you to customize the PDF pages."
 msgstr "本工具可以让用户自定义PDF页面."
 
-#: ../templates/lists/changePassword.php:50
-#: ../templates/lists/changePassword.php:247
+#: ../templates/lists/changePassword.php:51
+#: ../templates/lists/changePassword.php:248
 msgid "This user is not supported or was not found."
 msgstr "用户不支持或未找到."
 
@@ -15297,11 +15369,11 @@ msgstr "用户不支持或未找到."
 msgid "This user name is only used for old Windows versions (e.g. NT4, W98)."
 msgstr "这个用户名仅在老Windows版本（比如NT4,W98)中使用."
 
-#: ../templates/lists/userlink.php:61
+#: ../templates/lists/userlink.php:62
 msgid "This user was not found!"
 msgstr "用户未找到!"
 
-#: ../lib/modules/zarafaUser.inc:436
+#: ../lib/modules/zarafaUser.inc:439
 msgid "This value can only be \"Room\" or \"Equipment\"."
 msgstr "此值只能设为 \"Room\" 或 \"Equipment\"."
 
@@ -15315,23 +15387,23 @@ msgstr "此值只能设为 \"Room\" 或 \"Equipment\"."
 #: ../lib/modules/sambaSamAccount.inc:113
 #: ../lib/modules/sambaSamAccount.inc:114
 #: ../lib/modules/sambaSamAccount.inc:115 ../lib/modules/posixAccount.inc:128
-#: ../lib/modules/zarafaUser.inc:443 ../lib/modules/zarafaUser.inc:445
-#: ../lib/modules/zarafaUser.inc:446 ../lib/modules/zarafaUser.inc:447
-#: ../lib/modules/zarafaUser.inc:448 ../lib/modules/zarafaUser.inc:449
-#: ../lib/modules/ppolicyUser.inc:102 ../lib/modules/inetOrgPerson.inc:108
+#: ../lib/modules/zarafaUser.inc:446 ../lib/modules/zarafaUser.inc:448
+#: ../lib/modules/zarafaUser.inc:449 ../lib/modules/zarafaUser.inc:450
+#: ../lib/modules/zarafaUser.inc:451 ../lib/modules/zarafaUser.inc:452
+#: ../lib/modules/ppolicyUser.inc:102 ../lib/modules/inetOrgPerson.inc:106
 #: ../lib/modules/freeRadius.inc:341 ../lib/modules/zarafaServer.inc:179
 msgid "This value can only be \"true\" or \"false\"."
 msgstr "此值只能设为 \"true\" 或 \"false\"."
 
-#: ../lib/modules/zarafaUser.inc:444
+#: ../lib/modules/zarafaUser.inc:447
 msgid "This value can only be \"true\", \"false\" or \"system\"."
 msgstr "此值只能设为\"true\", \"false\" or \"system\"."
 
-#: ../lib/modules/posixGroup.inc:671
+#: ../lib/modules/posixGroup.inc:669
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "此值必须是用分号分开的用户名列表."
 
-#: ../help/help.inc:302
+#: ../help/help.inc:314
 msgid "This will create a new organisational unit under the selected one."
 msgstr "在所选的节点下建立新的组织单元."
 
@@ -15339,7 +15411,7 @@ msgstr "在所选的节点下建立新的组织单元."
 msgid "This will create the user's home directory on the specified server."
 msgstr "将在指定的服务器上建立用户的主目录."
 
-#: ../help/help.inc:304
+#: ../help/help.inc:316
 msgid ""
 "This will delete the selected organisational unit. The OU has to be empty."
 msgstr "将删除所选的组织单元.组织单元必须为空."
@@ -15348,13 +15420,19 @@ msgstr "将删除所选的组织单元.组织单元必须为空."
 msgid "This will delete the selected profile."
 msgstr "将删除所选的配置文件."
 
-#: ../lib/modules/kolabGroup.inc:118 ../lib/modules/puppetClient.inc:114
+#: ../help/help.inc:287
+msgid ""
+"This will disable the check of the SSL certificates for the 2-factor "
+"authentication service. Not recommended for production usage."
+msgstr "这将关闭双重认证服务的SSL证书检查.在生产环境中不建议使用."
+
+#: ../lib/modules/kolabGroup.inc:118 ../lib/modules/puppetClient.inc:117
 #: ../lib/modules/qmailUser.inc:264 ../lib/modules/zarafaContact.inc:94
 #: ../lib/modules/posixGroup.inc:539 ../lib/modules/eduPerson.inc:151
 #: ../lib/modules/pykotaGroup.inc:130 ../lib/modules/sambaSamAccount.inc:404
-#: ../lib/modules/posixAccount.inc:374 ../lib/modules/zarafaUser.inc:151
-#: ../lib/modules/pykotaUser.inc:161 ../lib/modules/shadowAccount.inc:198
-#: ../lib/modules/ldapPublicKey.inc:96 ../lib/modules/qmailGroup.inc:233
+#: ../lib/modules/posixAccount.inc:374 ../lib/modules/zarafaUser.inc:154
+#: ../lib/modules/pykotaUser.inc:164 ../lib/modules/shadowAccount.inc:198
+#: ../lib/modules/ldapPublicKey.inc:99 ../lib/modules/qmailGroup.inc:233
 #: ../lib/modules/authorizedServiceObject.inc:90
 #: ../lib/modules/passwordSelfReset.inc:157 ../lib/modules/hostObject.inc:84
 msgid "This will enable the extension automatically if this profile is loaded."
@@ -15379,13 +15457,13 @@ msgstr "这不会为此账号增加posixAccount对象类."
 msgid "This will reset the host's password to a default value."
 msgstr "将主机密码复位到缺省值."
 
-#: ../templates/lists/changePassword.php:320
+#: ../templates/lists/changePassword.php:321
 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:283
+#: ../help/help.inc:295
 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 "
@@ -15394,7 +15472,7 @@ msgstr ""
 "将会生成一个随机的密码并在屏幕上显示或通过邮件发送给用户。请编辑LAM服务器配置"
 "文件来设定邮件的配置."
 
-#: ../lib/modules/kolabGroup.inc:114 ../lib/modules/kolabUser.inc:179
+#: ../lib/modules/kolabGroup.inc:114 ../lib/modules/kolabUser.inc:182
 #: ../lib/modules/kolabSharedFolder.inc:167
 msgid ""
 "This will set a special flag on the account which tells Kolabd to remove it. "
@@ -15415,13 +15493,13 @@ msgstr "星期四"
 
 #: ../lib/modules/mitKerberos.inc:136 ../lib/modules/mitKerberos.inc:195
 #: ../lib/modules/mitKerberos.inc:230 ../lib/modules/mitKerberos.inc:254
-#: ../lib/modules/mitKerberos.inc:355 ../lib/modules/mitKerberos.inc:789
+#: ../lib/modules/mitKerberos.inc:355 ../lib/modules/mitKerberos.inc:787
 #: ../lib/modules/heimdalKerberos.inc:110
 #: ../lib/modules/heimdalKerberos.inc:164
 #: ../lib/modules/heimdalKerberos.inc:199
 #: ../lib/modules/heimdalKerberos.inc:221
 #: ../lib/modules/heimdalKerberos.inc:302
-#: ../lib/modules/heimdalKerberos.inc:701
+#: ../lib/modules/heimdalKerberos.inc:699
 msgid "Ticket lifetime"
 msgstr "票证寿命"
 
@@ -15447,40 +15525,40 @@ msgstr "用户上次登录时间."
 msgid "Time of user's last password change."
 msgstr "用户上次修改密码时间."
 
-#: ../templates/config/confmain.php:332
-#: ../templates/selfService/adminMain.php:479
+#: ../templates/config/confmain.php:335
+#: ../templates/selfService/adminMain.php:495
 #: ../lib/modules/sambaSamAccount.inc:349 ../help/help.inc:107
 msgid "Time zone"
 msgstr "时区"
 
-#: ../lib/modules/bindDLZ.inc:101 ../lib/modules/bindDLZ.inc:105
-#: ../lib/modules/bindDLZ.inc:110 ../lib/modules/bindDLZ.inc:115
-#: ../lib/modules/bindDLZ.inc:120 ../lib/modules/bindDLZ.inc:125
-#: ../lib/modules/bindDLZ.inc:130 ../lib/modules/bindDLZ.inc:261
-#: ../lib/modules/bindDLZ.inc:274 ../lib/modules/bindDLZ.inc:294
-#: ../lib/modules/bindDLZ.inc:307 ../lib/modules/bindDLZ.inc:338
-#: ../lib/modules/bindDLZ.inc:370 ../lib/modules/bindDLZ.inc:382
-#: ../lib/modules/bindDLZ.inc:409 ../lib/modules/bindDLZ.inc:430
-#: ../lib/modules/bindDLZ.inc:476 ../lib/modules/bindDLZ.inc:479
-#: ../lib/modules/bindDLZ.inc:481 ../lib/modules/bindDLZ.inc:483
-#: ../lib/modules/bindDLZ.inc:485 ../lib/modules/bindDLZ.inc:487
-#: ../lib/modules/bindDLZ.inc:489 ../lib/modules/bindDLZ.inc:491
-#: ../lib/modules/bindDLZ.inc:493 ../lib/modules/bindDLZ.inc:658
-#: ../lib/modules/bindDLZ.inc:761 ../lib/modules/bindDLZ.inc:840
-#: ../lib/modules/bindDLZ.inc:929 ../lib/modules/bindDLZ.inc:1041
-#: ../lib/modules/bindDLZ.inc:1173 ../lib/modules/bindDLZ.inc:1251
-#: ../lib/modules/bindDLZ.inc:1377 ../lib/modules/bindDLZ.inc:1480
-#: ../lib/modules/bindDLZ.inc:1499 ../lib/modules/bindDLZ.inc:1519
-#: ../lib/modules/bindDLZ.inc:1555 ../lib/modules/bindDLZ.inc:1577
-#: ../lib/modules/bindDLZ.inc:1606
+#: ../lib/modules/bindDLZ.inc:104 ../lib/modules/bindDLZ.inc:108
+#: ../lib/modules/bindDLZ.inc:113 ../lib/modules/bindDLZ.inc:118
+#: ../lib/modules/bindDLZ.inc:123 ../lib/modules/bindDLZ.inc:128
+#: ../lib/modules/bindDLZ.inc:133 ../lib/modules/bindDLZ.inc:264
+#: ../lib/modules/bindDLZ.inc:277 ../lib/modules/bindDLZ.inc:297
+#: ../lib/modules/bindDLZ.inc:310 ../lib/modules/bindDLZ.inc:341
+#: ../lib/modules/bindDLZ.inc:373 ../lib/modules/bindDLZ.inc:385
+#: ../lib/modules/bindDLZ.inc:412 ../lib/modules/bindDLZ.inc:433
+#: ../lib/modules/bindDLZ.inc:479 ../lib/modules/bindDLZ.inc:482
+#: ../lib/modules/bindDLZ.inc:484 ../lib/modules/bindDLZ.inc:486
+#: ../lib/modules/bindDLZ.inc:488 ../lib/modules/bindDLZ.inc:490
+#: ../lib/modules/bindDLZ.inc:492 ../lib/modules/bindDLZ.inc:494
+#: ../lib/modules/bindDLZ.inc:496 ../lib/modules/bindDLZ.inc:661
+#: ../lib/modules/bindDLZ.inc:764 ../lib/modules/bindDLZ.inc:843
+#: ../lib/modules/bindDLZ.inc:932 ../lib/modules/bindDLZ.inc:1044
+#: ../lib/modules/bindDLZ.inc:1176 ../lib/modules/bindDLZ.inc:1254
+#: ../lib/modules/bindDLZ.inc:1380 ../lib/modules/bindDLZ.inc:1481
+#: ../lib/modules/bindDLZ.inc:1500 ../lib/modules/bindDLZ.inc:1520
+#: ../lib/modules/bindDLZ.inc:1556 ../lib/modules/bindDLZ.inc:1578
+#: ../lib/modules/bindDLZ.inc:1607
 msgid "Timeout"
 msgstr "超时"
 
-#: ../lib/modules/bindDLZ.inc:437
+#: ../lib/modules/bindDLZ.inc:440
 msgid "Timeouts"
 msgstr "超时"
 
-#: ../lib/modules/pykotaUser.inc:654 ../lib/modules/pykotaUser.inc:997
+#: ../lib/modules/pykotaUser.inc:657 ../lib/modules/pykotaUser.inc:998
 msgid "Title"
 msgstr "标题"
 
@@ -15492,19 +15570,19 @@ msgstr "到"
 msgid "To disable login use /bin/false."
 msgstr "使用/bin/false来禁止登录"
 
-#: ../templates/config/confmain.php:483
+#: ../templates/config/confmain.php:486
 msgid "Tool settings"
 msgstr "工具设置"
 
-#: ../templates/tools.php:63 ../templates/main_header.php:147
+#: ../templates/tools.php:64 ../templates/main_header.php:145
 msgid "Tools"
 msgstr "工具"
 
-#: ../templates/serverInfo.php:357
+#: ../templates/serverInfo.php:358
 msgid "Total"
 msgstr "共"
 
-#: ../templates/serverInfo.php:242 ../templates/serverInfo.php:247
+#: ../templates/serverInfo.php:243 ../templates/serverInfo.php:248
 msgid "Total connections"
 msgstr "所有连接数"
 
@@ -15512,17 +15590,17 @@ msgstr "所有连接数"
 msgid "Total entries"
 msgstr "所有条目"
 
-#: ../lib/modules/pykotaUser.inc:141
+#: ../lib/modules/pykotaUser.inc:144
 msgid "Total money paid by the user."
 msgstr "用户付款总额."
 
-#: ../lib/modules/pykotaUser.inc:140 ../lib/modules/pykotaUser.inc:264
-#: ../lib/modules/pykotaUser.inc:586 ../lib/modules/pykotaUser.inc:904
-#: ../lib/modules/pykotaUser.inc:961
+#: ../lib/modules/pykotaUser.inc:143 ../lib/modules/pykotaUser.inc:267
+#: ../lib/modules/pykotaUser.inc:589 ../lib/modules/pykotaUser.inc:905
+#: ../lib/modules/pykotaUser.inc:962
 msgid "Total paid"
 msgstr "总额"
 
-#: ../lib/modules/pykotaUser.inc:282
+#: ../lib/modules/pykotaUser.inc:285
 msgid "Total paid (read-only)"
 msgstr "支付总额(只读)"
 
@@ -15530,15 +15608,15 @@ msgstr "支付总额(只读)"
 msgid "Translate GID number to group name"
 msgstr "将GID号改为组名"
 
-#: ../templates/config/confmain.php:259 ../help/help.inc:77
+#: ../templates/config/confmain.php:262 ../help/help.inc:77
 msgid "Tree suffix"
 msgstr "树状结构后缀"
 
-#: ../templates/multiEdit.php:96 ../templates/main_header.php:178
+#: ../templates/multiEdit.php:119 ../templates/main_header.php:176
 msgid "Tree view"
 msgstr "树状结构"
 
-#: ../templates/config/confmain.php:670
+#: ../templates/config/confmain.php:707
 msgid "TreeSuffix is invalid!"
 msgstr "树状结构后缀非法!"
 
@@ -15546,17 +15624,17 @@ msgstr "树状结构后缀非法!"
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../templates/multiEdit.php:122 ../templates/selfService/profManage.php:205
-#: ../templates/schema/schema.php:348 ../lib/env.inc:155
-#: ../lib/modules/zarafaUser.inc:130 ../lib/modules/zarafaUser.inc:256
-#: ../lib/modules/zarafaUser.inc:380 ../lib/modules/zarafaUser.inc:564
-#: ../lib/modules/zarafaUser.inc:1289 ../lib/modules/zarafaUser.inc:1836
+#: ../templates/multiEdit.php:145 ../templates/selfService/profManage.php:205
+#: ../templates/schema/schema.php:349 ../lib/env.inc:155
+#: ../lib/modules/zarafaUser.inc:133 ../lib/modules/zarafaUser.inc:259
+#: ../lib/modules/zarafaUser.inc:383 ../lib/modules/zarafaUser.inc:567
+#: ../lib/modules/zarafaUser.inc:1290 ../lib/modules/zarafaUser.inc:1837
 #: ../lib/modules/kolabSharedFolder.inc:162
 #: ../lib/modules/kolabSharedFolder.inc:201
 #: ../lib/modules/kolabSharedFolder.inc:241
 #: ../lib/modules/kolabSharedFolder.inc:302
-#: ../lib/modules/kolabSharedFolder.inc:534 ../lib/modules/customFields.inc:100
-#: ../lib/modules/customFields.inc:1075 ../lib/modules/customFields.inc:1726
+#: ../lib/modules/kolabSharedFolder.inc:532 ../lib/modules/customFields.inc:100
+#: ../lib/modules/customFields.inc:1073 ../lib/modules/customFields.inc:1724
 msgid "Type"
 msgstr "类型"
 
@@ -15564,8 +15642,8 @@ msgstr "类型"
 msgid "UID"
 msgstr "UID"
 
-#: ../lib/modules/posixAccount.inc:439 ../lib/modules/posixAccount.inc:1893
-#: ../lib/modules/posixAccount.inc:1930
+#: ../lib/modules/posixAccount.inc:439 ../lib/modules/posixAccount.inc:1891
+#: ../lib/modules/posixAccount.inc:1928
 msgid "UID generator"
 msgstr "UID生成器"
 
@@ -15586,15 +15664,15 @@ msgstr "UID必须是一个数字,必须在配置文件中所定的UID范围内."
 #: ../lib/types/host.inc:95 ../lib/types/user.inc:115
 #: ../lib/modules/qmailUser.inc:112 ../lib/modules/qmailUser.inc:231
 #: ../lib/modules/qmailUser.inc:332 ../lib/modules/qmailUser.inc:418
-#: ../lib/modules/qmailUser.inc:580 ../lib/modules/qmailUser.inc:1113
+#: ../lib/modules/qmailUser.inc:580 ../lib/modules/qmailUser.inc:1111
 #: ../lib/modules/zarafaContact.inc:120 ../lib/modules/zarafaContact.inc:161
 #: ../lib/modules/zarafaContact.inc:196 ../lib/modules/zarafaContact.inc:211
 #: ../lib/modules/zarafaContact.inc:212 ../lib/modules/zarafaContact.inc:230
-#: ../lib/modules/zarafaContact.inc:616 ../lib/modules/posixAccount.inc:108
+#: ../lib/modules/zarafaContact.inc:614 ../lib/modules/posixAccount.inc:108
 #: ../lib/modules/posixAccount.inc:232 ../lib/modules/posixAccount.inc:324
 #: ../lib/modules/posixAccount.inc:353 ../lib/modules/posixAccount.inc:390
 #: ../lib/modules/posixAccount.inc:394 ../lib/modules/posixAccount.inc:403
-#: ../lib/modules/posixAccount.inc:1418 ../lib/modules/posixAccount.inc:1849
+#: ../lib/modules/posixAccount.inc:1418 ../lib/modules/posixAccount.inc:1847
 msgid "UID number"
 msgstr "UID编号"
 
@@ -15638,8 +15716,12 @@ msgstr "表示指定资源的权限集的URI(或是URN,或是URL)"
 msgid "URL"
 msgstr "URL"
 
-#: ../lib/modules/bindDLZ.inc:1703 ../lib/modules/bindDLZ.inc:1712
-#: ../lib/modules/bindDLZ.inc:1745 ../lib/modules/bindDLZ.inc:2337
+#: ../help/help.inc:285
+msgid "URL of external 2-factor authentication service."
+msgstr "外部双重认证服务的URL"
+
+#: ../lib/modules/bindDLZ.inc:1704 ../lib/modules/bindDLZ.inc:1713
+#: ../lib/modules/bindDLZ.inc:1746 ../lib/modules/bindDLZ.inc:2338
 msgid "Unable to add DNS record."
 msgstr "无法加入DNS条目:"
 
@@ -15647,23 +15729,23 @@ msgstr "无法加入DNS条目:"
 msgid "Unable to change ACL on IMAP server for mailbox deletion."
 msgstr "在邮箱删除时无法改变IMAP服务器的ACL."
 
-#: ../lib/modules/mitKerberos.inc:1174 ../lib/modules/mitKerberos.inc:1178
-#: ../lib/modules/heimdalKerberos.inc:1038
+#: ../lib/modules/mitKerberos.inc:1172 ../lib/modules/mitKerberos.inc:1176
+#: ../lib/modules/heimdalKerberos.inc:1036
 msgid "Unable to change Kerberos password."
 msgstr "无法修改kerberos密码"
 
-#: ../lib/modules/windowsUser.inc:2740 ../lib/modules/windowsUser.inc:2789
-#: ../lib/modules/windowsUser.inc:2815
+#: ../lib/modules/windowsUser.inc:2738 ../lib/modules/windowsUser.inc:2787
+#: ../lib/modules/windowsUser.inc:2813
 msgid "Unable to change password."
 msgstr "无法修改密码"
 
-#: ../templates/selfService/selfServiceMain.php:403
+#: ../templates/selfService/selfServiceMain.php:412
 msgid ""
 "Unable to change your account. Maybe you do not have enough rights to change "
 "the settings."
 msgstr "无法改变您的帐号,可以没有足够的权限改变设置."
 
-#: ../templates/selfService/selfServiceMain.php:400
+#: ../templates/selfService/selfServiceMain.php:409
 msgid ""
 "Unable to change your account. Your changes might violate the password "
 "policy."
@@ -15677,7 +15759,7 @@ msgstr "无法连接到数据库."
 msgid "Unable to connect to remote server!"
 msgstr "无法连接远端服务器 !"
 
-#: ../templates/massDoUpload.php:193
+#: ../lib/upload.inc:270
 msgid "Unable to create ZIP file for PDF export."
 msgstr "无法为PDF导出工作建立ZIP文件."
 
@@ -15691,36 +15773,36 @@ msgstr "无法建立新账号."
 msgid "Unable to create mailbox on IMAP server."
 msgstr "无法在IMAP服务器上建立邮箱."
 
-#: ../templates/ou_edit.php:84
+#: ../templates/ou_edit.php:94
 msgid "Unable to create new OU!"
 msgstr "无法建立新OU!"
 
-#: ../lib/types/automountType.inc:271
+#: ../lib/types/automountType.inc:248
 msgid "Unable to create new automount map."
 msgstr "无法建立新的自动映射"
 
-#: ../templates/selfService/profManage.php:59 ../lib/config.inc:197
+#: ../templates/selfService/profManage.php:59 ../lib/config.inc:200
 msgid "Unable to create new profile!"
 msgstr "无法建立新的配置文件!"
 
-#: ../lib/types/bind.inc:216
+#: ../lib/types/bind.inc:193
 msgid "Unable to create new zone."
 msgstr "无法建立新域!"
 
-#: ../lib/modules/bindDLZ.inc:1682
+#: ../lib/modules/bindDLZ.inc:1683
 #, php-format
 msgid "Unable to delete DNS record \"%s\"."
 msgstr "无法删除DNS记录: \"%s\"."
 
-#: ../lib/modules/bindDLZ.inc:1691 ../lib/modules/bindDLZ.inc:1741
+#: ../lib/modules/bindDLZ.inc:1692 ../lib/modules/bindDLZ.inc:1742
 msgid "Unable to delete DNS record."
 msgstr "无法删除DNS记录."
 
-#: ../templates/ou_edit.php:101
+#: ../templates/ou_edit.php:111
 msgid "Unable to delete OU!"
 msgstr "无法删除OU!"
 
-#: ../templates/pdfedit/pdfmain.php:98
+#: ../templates/pdfedit/pdfmain.php:115
 msgid "Unable to delete PDF structure!"
 msgstr "无法删除PDF结构!"
 
@@ -15729,7 +15811,7 @@ msgstr "无法删除PDF结构!"
 msgid "Unable to delete entry, it does not exist"
 msgstr "删除条目失败,它不存在!"
 
-#: ../lib/pdfstruct.inc:291 ../lib/pdfstruct.inc:303
+#: ../lib/pdfstruct.inc:303 ../lib/pdfstruct.inc:315
 msgid "Unable to delete logo file."
 msgstr "无法删除徽标文件!"
 
@@ -15739,8 +15821,8 @@ msgstr "无法在IMAP服务器上删除邮箱."
 
 #: ../templates/config/profmanage.php:116
 #: ../templates/selfService/profManage.php:87
-#: ../templates/profedit/profilemain.php:113 ../lib/config.inc:210
-#: ../lib/config.inc:222 ../lib/config.inc:229 ../lib/config.inc:237
+#: ../templates/profedit/profilemain.php:132 ../lib/config.inc:213
+#: ../lib/config.inc:225 ../lib/config.inc:232 ../lib/config.inc:240
 msgid "Unable to delete profile!"
 msgstr "无法删除配置文件!"
 
@@ -15749,31 +15831,31 @@ msgstr "无法删除配置文件!"
 msgid "Unable to find a printer with name \"%s\"."
 msgstr "找不到打印机:  \"%s\""
 
-#: ../lib/modules/posixAccount.inc:2211 ../lib/modules/posixAccount.inc:2220
-#: ../lib/modules/posixAccount.inc:2504 ../lib/modules/nisNetGroupUser.inc:519
-#: ../lib/modules/nisnetgroup.inc:543 ../lib/modules/groupOfNamesUser.inc:401
+#: ../lib/modules/posixAccount.inc:2209 ../lib/modules/posixAccount.inc:2218
+#: ../lib/modules/posixAccount.inc:2502 ../lib/modules/nisNetGroupUser.inc:520
+#: ../lib/modules/nisnetgroup.inc:546 ../lib/modules/groupOfNamesUser.inc:399
 msgid "Unable to find group in LDAP."
 msgstr "LDAP中找不到组."
 
-#: ../lib/modules/passwordSelfReset.inc:1166
+#: ../lib/modules/passwordSelfReset.inc:1164
 msgid "Unable to find password security answer for this account."
 msgstr "找不到这个帐号的密码安全提问."
 
-#: ../lib/modules/passwordSelfReset.inc:1150
-#: ../lib/modules/passwordSelfReset.inc:1397
+#: ../lib/modules/passwordSelfReset.inc:1148
+#: ../lib/modules/passwordSelfReset.inc:1395
 msgid "Unable to find password security question for this account."
 msgstr "找不到这个帐号的密码安全提问."
 
-#: ../lib/modules/organizationalRoleUser.inc:336
+#: ../lib/modules/organizationalRoleUser.inc:334
 msgid "Unable to find role in LDAP."
 msgstr "LDAP中找不到角色."
 
-#: ../templates/login.php:610 ../templates/login.php:616
+#: ../templates/login.php:619 ../templates/login.php:625
 msgid "Unable to find the user name in LDAP."
 msgstr "LDAP中找不到用户名."
 
-#: ../lib/modules/passwordSelfReset.inc:1137
-#: ../lib/modules/passwordSelfReset.inc:1486
+#: ../lib/modules/passwordSelfReset.inc:1135
+#: ../lib/modules/passwordSelfReset.inc:1484
 msgid "Unable to find user account."
 msgstr "找不到用户账号."
 
@@ -15781,7 +15863,7 @@ msgstr "找不到用户账号."
 msgid "Unable to import server certificate. Please use the upload function."
 msgstr "不能导入服务器证书. 请使用上传功能."
 
-#: ../lib/modules.inc:1563 ../lib/modules.inc:1567
+#: ../lib/modules.inc:1571 ../lib/modules.inc:1575
 msgid "Unable to load LDAP entry:"
 msgstr "无法调入LDAP条目:"
 
@@ -15790,8 +15872,8 @@ msgstr "无法调入LDAP条目:"
 msgid "Unable to load key %s."
 msgstr "无法读入密钥%s"
 
-#: ../lib/profiles.inc:98 ../lib/profiles.inc:102 ../lib/selfService.inc:196
-#: ../lib/selfService.inc:200
+#: ../lib/profiles.inc:104 ../lib/profiles.inc:108 ../lib/selfService.inc:199
+#: ../lib/selfService.inc:203
 msgid "Unable to load profile!"
 msgstr "无法调入配置文件!"
 
@@ -15803,7 +15885,7 @@ msgstr "无法在IMAP服务器上找到邮箱."
 msgid "Unable to login to remote server!"
 msgstr "无法连接到远端服务器 !"
 
-#: ../lib/modules/windowsUser.inc:1004 ../lib/modules/inetOrgPerson.inc:103
+#: ../lib/modules/windowsUser.inc:1004 ../lib/modules/inetOrgPerson.inc:101
 msgid "Unable to process this file."
 msgstr "无法处理文件"
 
@@ -15821,10 +15903,10 @@ msgstr "无法读入文件"
 msgid "Unable to register your new account. Please try again."
 msgstr "无法注册新帐号, 请重试."
 
-#: ../lib/modules/passwordSelfReset.inc:1686
-#: ../lib/modules/passwordSelfReset.inc:1695
-#: ../lib/modules/passwordSelfReset.inc:1701
-#: ../lib/modules/passwordSelfReset.inc:1710
+#: ../lib/modules/passwordSelfReset.inc:1684
+#: ../lib/modules/passwordSelfReset.inc:1693
+#: ../lib/modules/passwordSelfReset.inc:1699
+#: ../lib/modules/passwordSelfReset.inc:1708
 msgid "Unable to reset password."
 msgstr "不能复位密码"
 
@@ -15832,32 +15914,40 @@ msgstr "不能复位密码"
 msgid "Unable to retrieve image"
 msgstr "无法获取图像"
 
-#: ../templates/tests/schemaTest.php:61 ../templates/schema/schema.php:93
-#: ../templates/schema/schema.php:111 ../templates/schema/schema.php:272
-#: ../templates/schema/schema.php:306
+#: ../templates/tests/schemaTest.php:62 ../templates/schema/schema.php:94
+#: ../templates/schema/schema.php:112 ../templates/schema/schema.php:273
+#: ../templates/schema/schema.php:307
 msgid "Unable to retrieve schema!"
 msgstr "无法获取schema!"
 
-#: ../templates/selfService/adminMain.php:255
-#: ../templates/profedit/profilepage.php:128
+#: ../templates/selfService/adminMain.php:271
+#: ../templates/profedit/profilepage.php:144
 msgid "Unable to save profile!"
 msgstr "无法存储配置文件!"
 
-#: ../lib/account.inc:1097 ../lib/account.inc:1135
+#: ../lib/account.inc:1103 ../lib/account.inc:1141
 msgid "Unable to send mail!"
 msgstr "无法发送邮件!"
 
-#: ../lib/modules/bindDLZ.inc:1732
+#: ../templates/login.php:334 ../templates/selfService/selfServiceLogin.php:129
+msgid "Unable to start 2-factor authentication because no tokens were found."
+msgstr "因为没有找到令牌,所以无法开启双重认证."
+
+#: ../templates/login.php:330 ../templates/selfService/selfServiceLogin.php:126
+msgid "Unable to start 2-factor authentication."
+msgstr "无法开始双重认证."
+
+#: ../lib/modules/bindDLZ.inc:1733
 #, php-format
 msgid "Unable to update DNS record \"%s\"."
 msgstr "无法更新DNS记录:  \"%s\""
 
-#: ../lib/pdfstruct.inc:249 ../lib/pdfstruct.inc:259 ../lib/pdfstruct.inc:262
+#: ../lib/pdfstruct.inc:260 ../lib/pdfstruct.inc:270 ../lib/pdfstruct.inc:273
 msgid "Unable to upload logo file."
 msgstr "无法上传徽标文件!"
 
-#: ../lib/modules/passwordSelfReset.inc:1221
-#: ../lib/modules/passwordSelfReset.inc:1498
+#: ../lib/modules/passwordSelfReset.inc:1219
+#: ../lib/modules/passwordSelfReset.inc:1496
 msgid "Unable to verify your password reset request. Please try again."
 msgstr "无法确认您的密码复位请求,请重试."
 
@@ -15865,37 +15955,37 @@ msgstr "无法确认您的密码复位请求,请重试."
 msgid "Unable to verify your user creation request. Please try again."
 msgstr "无法确认您的用户建立请求,请重试."
 
-#: ../templates/serverInfo.php:293
+#: ../templates/serverInfo.php:294
 msgid "Unbind"
 msgstr "解除绑定"
 
-#: ../lib/modules/windowsGroup.inc:68
+#: ../lib/modules/windowsGroup.inc:71
 msgid "Universal"
 msgstr "通用的"
 
-#: ../templates/lists/changePassword.php:417
-#: ../templates/lists/changePassword.php:457 ../lib/types/user.inc:284
+#: ../templates/lists/changePassword.php:418
+#: ../templates/lists/changePassword.php:458 ../lib/types/user.inc:284
 #: ../lib/types/user.inc:398 ../lib/types/user.inc:437
 #: ../lib/types/user.inc:963 ../lib/modules/posixGroup.inc:388
 #: ../lib/modules/posixAccount.inc:169
 msgid "Unix"
 msgstr "unix"
 
-#: ../templates/tests/lamdaemonTest.php:216
+#: ../templates/tests/lamdaemonTest.php:218
 msgid "Unix account"
 msgstr "Unix帐号"
 
-#: ../lib/modules/posixAccount.inc:1551 ../lib/modules/posixAccount.inc:1983
+#: ../lib/modules/posixAccount.inc:1551 ../lib/modules/posixAccount.inc:1981
 msgid "Unix groups"
 msgstr "Unix组"
 
 #: ../lib/modules/dhcp_settings.inc:206 ../lib/modules/dhcp_settings.inc:223
 #: ../lib/modules/dhcp_settings.inc:299 ../lib/modules/dhcp_settings.inc:604
-#: ../lib/modules/dhcp_settings.inc:685
+#: ../lib/modules/dhcp_settings.inc:683
 msgid "Unknown clients"
 msgstr "未知的客户端"
 
-#: ../lib/modules/kolabUser.inc:252 ../lib/modules/kolabSharedFolder.inc:256
+#: ../lib/modules/kolabUser.inc:255 ../lib/modules/kolabSharedFolder.inc:256
 #, php-format
 msgid "Unknown delegate address: %s"
 msgstr "不明的代表地址:%s"
@@ -15909,19 +15999,19 @@ msgstr "未知的改变类型"
 msgid "Unlock"
 msgstr "解锁"
 
-#: ../templates/lists/changePassword.php:209
-#: ../templates/lists/changePassword.php:414
-#: ../templates/lists/changePassword.php:442
-#: ../templates/lists/changePassword.php:444 ../lib/modules/ppolicyUser.inc:151
+#: ../templates/lists/changePassword.php:210
+#: ../templates/lists/changePassword.php:415
+#: ../templates/lists/changePassword.php:443
+#: ../templates/lists/changePassword.php:445 ../lib/modules/ppolicyUser.inc:151
 msgid "Unlock account"
 msgstr "解锁账号."
 
-#: ../templates/lists/changePassword.php:269
+#: ../templates/lists/changePassword.php:270
 msgid "Unlock account?"
 msgstr "解锁账号?"
 
 #: ../lib/modules/posixGroup.inc:208 ../lib/modules/posixAccount.inc:1487
-#: ../lib/modules/inetOrgPerson.inc:1651
+#: ../lib/modules/inetOrgPerson.inc:1649
 msgid "Unlock password"
 msgstr "解除密码锁定"
 
@@ -15929,15 +16019,16 @@ msgstr "解除密码锁定"
 msgid "Unlocked"
 msgstr "解锁"
 
-#: ../templates/masscreate.php:106 ../templates/config/confmodules.php:415
+#: ../templates/config/confmodules.php:423
+#: ../templates/upload/masscreate.php:131
 msgid "Unsolved dependency:"
 msgstr "未解决的依赖性问题:"
 
-#: ../templates/pdfedit/pdfpage.php:477
+#: ../templates/pdfedit/pdfpage.php:492
 msgid "Up"
 msgstr "向上"
 
-#: ../templates/lists/changePassword.php:224
+#: ../templates/lists/changePassword.php:225
 msgid "Update Samba password timestamp"
 msgstr "修改 Samba 密码时间戳。"
 
@@ -15964,8 +16055,8 @@ msgstr "修改值"
 msgid "Updating object"
 msgstr "对象升级中"
 
-#: ../templates/config/mainmanage.php:351 ../templates/pdfedit/pdfmain.php:252
-#: ../lib/modules/ldapPublicKey.inc:147 ../lib/modules/inetOrgPerson.inc:1921
+#: ../templates/config/mainmanage.php:351 ../templates/pdfedit/pdfmain.php:297
+#: ../lib/modules/ldapPublicKey.inc:150 ../lib/modules/inetOrgPerson.inc:1919
 msgid "Upload"
 msgstr "上传"
 
@@ -15973,45 +16064,45 @@ msgstr "上传"
 msgid "Upload CA certificate in DER/PEM format."
 msgstr "上传DEF/PEM格式的CA证书"
 
-#: ../lib/modules/ldapPublicKey.inc:92
+#: ../lib/modules/ldapPublicKey.inc:95
 msgid "Upload a file with one or more keys. Each line contains one key."
 msgstr "上传包含一个或多个密钥的文件. 一行一个密钥."
 
-#: ../templates/massBuildAccounts.php:241
+#: ../templates/upload/massBuildAccounts.php:251
 msgid "Upload accounts to LDAP"
 msgstr "上传帐号到LDAP"
 
-#: ../lib/modules/ldapPublicKey.inc:143 ../lib/modules/customFields.inc:168
-#: ../lib/modules/customFields.inc:3641
+#: ../lib/modules/ldapPublicKey.inc:146 ../lib/modules/customFields.inc:168
+#: ../lib/modules/customFields.inc:3639
 msgid "Upload file"
 msgstr "上传文件"
 
-#: ../templates/masscreate.php:277
+#: ../templates/upload/masscreate.php:303
 msgid "Upload file and create accounts"
 msgstr "开始上传,建立帐号"
 
-#: ../templates/massDoUpload.php:255 ../lib/lists.inc:1092
+#: ../lib/upload.inc:195 ../lib/lists.inc:1078
 msgid "Upload has finished"
 msgstr "上传完毕"
 
-#: ../lib/modules.inc:512
+#: ../lib/modules.inc:522
 #, php-format
 msgid "Upload was stopped after errors in %s module!"
 msgstr "因为在%s模块中有错,上传停止."
 
-#: ../lib/modules/windowsUser.inc:387 ../lib/modules/inetOrgPerson.inc:877
+#: ../lib/modules/windowsUser.inc:387 ../lib/modules/inetOrgPerson.inc:875
 msgid "Uploaded images will be cropped to these maximum values."
 msgstr "上传的图片将被裁剪到这些最大值"
 
-#: ../lib/pdfstruct.inc:256
+#: ../lib/pdfstruct.inc:267
 msgid "Uploaded logo file."
 msgstr "上传徽标文件"
 
-#: ../templates/serverInfo.php:222
+#: ../templates/serverInfo.php:223
 msgid "Uptime"
 msgstr "运行时间"
 
-#: ../templates/schema/schema.php:209
+#: ../templates/schema/schema.php:210
 msgid "Usage"
 msgstr "用法"
 
@@ -16026,7 +16117,7 @@ msgstr "为所有的服务使用*."
 msgid "Use Unix password"
 msgstr "使用unix的密码"
 
-#: ../templates/selfService/adminMain.php:444 ../help/help.inc:280
+#: ../templates/selfService/adminMain.php:460 ../help/help.inc:280
 msgid "Use for all operations"
 msgstr "用于所有操作"
 
@@ -16044,7 +16135,7 @@ msgid ""
 "\"."
 msgstr "使用\"smtp:user@domain.com\"格式来输入附加的邮件地址."
 
-#: ../help/help.inc:310
+#: ../help/help.inc:322
 msgid ""
 "Use this to enter an additional LDAP filter (e.g. \"(cn!=admin)\") to reduce "
 "the number of entries to modify."
@@ -16075,10 +16166,16 @@ msgstr "使用此项来隐藏呼叫者ID."
 
 #: ../lib/modules/zarafaDynamicGroup.inc:80 ../lib/modules/zarafaContact.inc:78
 #: ../lib/modules/zarafaGroup.inc:91 ../lib/modules/zarafaAddressList.inc:68
-#: ../lib/modules/zarafaUser.inc:95
+#: ../lib/modules/zarafaUser.inc:98
 msgid "Use this to hide this entry from the address book."
 msgstr "使用此项来隐藏地址簿的条目"
 
+#: ../help/help.inc:289
+msgid ""
+"Use this to overwrite the default label for the 2-factor input field. "
+"Default is \"PIN+Token\"."
+msgstr "使用这个来覆盖双重认证输入框的缺省标签.缺省值是\"PIN+Token\"."
+
 #: ../lib/modules/imapAccess.inc:121
 msgid ""
 "Use this to provide a list of folders (e.g. Trash) to add for new accounts."
@@ -16099,19 +16196,19 @@ msgstr "使用$uid$ 这样的通配符,表示当前LAM管理用户的LDAP属性.
 msgid "Used balance for the billing code."
 msgstr "帐单号的使用额度"
 
-#: ../lib/modules/quota.inc:109 ../lib/modules/quota.inc:400
+#: ../lib/modules/quota.inc:112 ../lib/modules/quota.inc:403
 msgid "Used blocks"
 msgstr "已使用的块数"
 
-#: ../lib/modules/quota.inc:110
+#: ../lib/modules/quota.inc:113
 msgid "Used blocks. 1000 blocks are usually 1MB"
 msgstr "已经使用的块数,1000块约等于1MB"
 
-#: ../templates/schema/schema.php:268
+#: ../templates/schema/schema.php:269
 msgid "Used by attributes"
 msgstr "被属性使用"
 
-#: ../templates/schema/schema.php:237
+#: ../templates/schema/schema.php:238
 msgid "Used by object classes"
 msgstr "被对象类使用"
 
@@ -16123,11 +16220,11 @@ msgstr "用来从UID/GID计算RID,不确定的话请不用修改."
 msgid "Used for registration context."
 msgstr "在注册语境中使用"
 
-#: ../lib/modules/quota.inc:131 ../lib/modules/quota.inc:404
+#: ../lib/modules/quota.inc:134 ../lib/modules/quota.inc:407
 msgid "Used inodes"
 msgstr "已经使用的节点"
 
-#: ../lib/modules/quota.inc:132
+#: ../lib/modules/quota.inc:135
 msgid "Used inodes (files)"
 msgstr "已经使用的节点(文件)"
 
@@ -16145,8 +16242,8 @@ msgstr "用来限制SIP通讯的主叫或被叫只能来自于某个IP地址或
 msgid "Used to regularly check that a device is still online."
 msgstr "用来定期检查一个设备是否在线"
 
-#: ../lib/types/sudo.inc:78 ../lib/modules/nisnetgroup.inc:220
-#: ../lib/modules/nisnetgroup.inc:586 ../lib/modules/nisMailAlias.inc:350
+#: ../lib/types/sudo.inc:78 ../lib/modules/nisnetgroup.inc:223
+#: ../lib/modules/nisnetgroup.inc:587 ../lib/modules/nisMailAlias.inc:350
 msgid "User"
 msgstr "用户"
 
@@ -16158,8 +16255,8 @@ msgstr "用户帐号(例如 Unix, Samba和Kolab)"
 #: ../lib/modules/asteriskAccount.inc:270
 #: ../lib/modules/asteriskAccount.inc:340
 #: ../lib/modules/asteriskAccount.inc:598
-#: ../lib/modules/asteriskAccount.inc:989
-#: ../lib/modules/asteriskAccount.inc:1244
+#: ../lib/modules/asteriskAccount.inc:987
+#: ../lib/modules/asteriskAccount.inc:1242
 msgid "User agent"
 msgstr "用户代理"
 
@@ -16168,9 +16265,9 @@ msgstr "用户代理"
 msgid "User can change password"
 msgstr "用户可以修改密码"
 
-#: ../lib/modules/inetOrgPerson.inc:166 ../lib/modules/inetOrgPerson.inc:872
-#: ../lib/modules/inetOrgPerson.inc:1596 ../lib/modules/inetOrgPerson.inc:2800
-#: ../lib/modules/inetOrgPerson.inc:3696
+#: ../lib/modules/inetOrgPerson.inc:164 ../lib/modules/inetOrgPerson.inc:870
+#: ../lib/modules/inetOrgPerson.inc:1594 ../lib/modules/inetOrgPerson.inc:2796
+#: ../lib/modules/inetOrgPerson.inc:3676
 msgid "User certificates"
 msgstr "用户数字证书"
 
@@ -16179,7 +16276,7 @@ msgstr "用户数字证书"
 msgid "User count: %s"
 msgstr "帐号总计: %s"
 
-#: ../lib/modules/pykotaUser.inc:121
+#: ../lib/modules/pykotaUser.inc:124
 msgid "User description."
 msgstr "用户描述"
 
@@ -16187,7 +16284,7 @@ msgstr "用户描述"
 msgid "User description. If left empty first and last name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名."
 
-#: ../lib/modules/inetOrgPerson.inc:653
+#: ../lib/modules/inetOrgPerson.inc:651
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名"
 
@@ -16195,83 +16292,84 @@ msgstr "用户描述,如果留空将会使用用户姓名"
 msgid "User description. If left empty user name will be used."
 msgstr "用户的描述,如果留空将会使用用户名."
 
-#: ../templates/schema/schema.php:204
+#: ../templates/schema/schema.php:205
 msgid "User modification"
 msgstr "用户修改"
 
 #: ../lib/modules/mitKerberos.inc:224 ../lib/modules/mitKerberos.inc:250
 #: ../lib/modules/mitKerberos.inc:374 ../lib/modules/mitKerberos.inc:640
-#: ../lib/modules/mitKerberos.inc:793 ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/mitKerberos.inc:791 ../lib/modules/sambaSamAccount.inc:300
 #: ../lib/modules/sambaSamAccount.inc:1125 ../lib/modules/windowsUser.inc:1185
 #: ../lib/modules/heimdalKerberos.inc:106
 #: ../lib/modules/heimdalKerberos.inc:193
 #: ../lib/modules/heimdalKerberos.inc:220
 #: ../lib/modules/heimdalKerberos.inc:332
 #: ../lib/modules/heimdalKerberos.inc:549
-#: ../lib/modules/heimdalKerberos.inc:697
+#: ../lib/modules/heimdalKerberos.inc:695
 msgid "User must change password"
 msgstr "用户必须修改密码"
 
-#: ../templates/lists/changePassword.php:280 ../templates/login.php:346
-#: ../templates/config/confmain.php:344 ../lib/types/alias.inc:91
+#: ../templates/lists/changePassword.php:281 ../templates/login.php:354
+#: ../templates/config/confmain.php:347 ../lib/types/alias.inc:91
 #: ../lib/types/user.inc:114 ../lib/types/user.inc:116
-#: ../lib/selfService.inc:398 ../lib/modules/mitKerberos.inc:116
+#: ../lib/selfService.inc:408 ../lib/modules/mitKerberos.inc:116
 #: ../lib/modules/mitKerberos.inc:211 ../lib/modules/mitKerberos.inc:249
-#: ../lib/modules/mitKerberos.inc:343 ../lib/modules/mitKerberos.inc:780
+#: ../lib/modules/mitKerberos.inc:343 ../lib/modules/mitKerberos.inc:778
 #: ../lib/modules/selfRegistration.inc:414
 #: ../lib/modules/selfRegistration.inc:501
 #: ../lib/modules/selfRegistration.inc:508 ../lib/modules/account.inc:85
 #: ../lib/modules/account.inc:101 ../lib/modules/account.inc:124
 #: ../lib/modules/account.inc:126 ../lib/modules/account.inc:127
-#: ../lib/modules/account.inc:210 ../lib/modules/account.inc:231
-#: ../lib/modules/account.inc:255 ../lib/modules/uidObject.inc:45
+#: ../lib/modules/account.inc:210 ../lib/modules/account.inc:229
+#: ../lib/modules/account.inc:253 ../lib/modules/uidObject.inc:45
 #: ../lib/modules/uidObject.inc:67 ../lib/modules/uidObject.inc:76
 #: ../lib/modules/uidObject.inc:85 ../lib/modules/uidObject.inc:100
-#: ../lib/modules/uidObject.inc:164 ../lib/modules/nisNetGroupHost.inc:76
-#: ../lib/modules/nisNetGroupHost.inc:99 ../lib/modules/nisNetGroupHost.inc:218
-#: ../lib/modules/nisNetGroupHost.inc:262 ../lib/modules/posixAccount.inc:113
+#: ../lib/modules/uidObject.inc:162 ../lib/modules/nisNetGroupHost.inc:79
+#: ../lib/modules/nisNetGroupHost.inc:102
+#: ../lib/modules/nisNetGroupHost.inc:221
+#: ../lib/modules/nisNetGroupHost.inc:263 ../lib/modules/posixAccount.inc:113
 #: ../lib/modules/posixAccount.inc:114 ../lib/modules/posixAccount.inc:117
 #: ../lib/modules/posixAccount.inc:224 ../lib/modules/posixAccount.inc:350
 #: ../lib/modules/posixAccount.inc:461 ../lib/modules/posixAccount.inc:1405
-#: ../lib/modules/posixAccount.inc:1835 ../lib/modules/windowsUser.inc:122
+#: ../lib/modules/posixAccount.inc:1833 ../lib/modules/windowsUser.inc:122
 #: ../lib/modules/windowsUser.inc:398 ../lib/modules/windowsUser.inc:815
 #: ../lib/modules/windowsUser.inc:950 ../lib/modules/windowsUser.inc:1074
-#: ../lib/modules/windowsUser.inc:2425 ../lib/modules/pykotaUser.inc:112
-#: ../lib/modules/pykotaUser.inc:208 ../lib/modules/pykotaUser.inc:268
-#: ../lib/modules/pykotaUser.inc:311 ../lib/modules/pykotaUser.inc:313
-#: ../lib/modules/pykotaUser.inc:340 ../lib/modules/pykotaUser.inc:892
-#: ../lib/modules/nisnetgroup.inc:152 ../lib/modules/nisnetgroup.inc:482
-#: ../lib/modules/inetOrgPerson.inc:97 ../lib/modules/inetOrgPerson.inc:166
-#: ../lib/modules/inetOrgPerson.inc:643 ../lib/modules/inetOrgPerson.inc:771
-#: ../lib/modules/inetOrgPerson.inc:1242 ../lib/modules/inetOrgPerson.inc:1245
-#: ../lib/modules/inetOrgPerson.inc:2001 ../lib/modules/inetOrgPerson.inc:2142
-#: ../lib/modules/inetOrgPerson.inc:2855 ../lib/modules/inetOrgPerson.inc:3704
-#: ../lib/modules/inetOrgPerson.inc:3733
-#: ../lib/modules/passwordSelfReset.inc:639
-#: ../lib/modules/passwordSelfReset.inc:1045
-#: ../lib/modules/passwordSelfReset.inc:1238
+#: ../lib/modules/windowsUser.inc:2423 ../lib/modules/pykotaUser.inc:115
+#: ../lib/modules/pykotaUser.inc:211 ../lib/modules/pykotaUser.inc:271
+#: ../lib/modules/pykotaUser.inc:314 ../lib/modules/pykotaUser.inc:316
+#: ../lib/modules/pykotaUser.inc:343 ../lib/modules/pykotaUser.inc:893
+#: ../lib/modules/nisnetgroup.inc:155 ../lib/modules/nisnetgroup.inc:485
+#: ../lib/modules/inetOrgPerson.inc:95 ../lib/modules/inetOrgPerson.inc:164
+#: ../lib/modules/inetOrgPerson.inc:641 ../lib/modules/inetOrgPerson.inc:769
+#: ../lib/modules/inetOrgPerson.inc:1240 ../lib/modules/inetOrgPerson.inc:1243
+#: ../lib/modules/inetOrgPerson.inc:1997 ../lib/modules/inetOrgPerson.inc:2138
+#: ../lib/modules/inetOrgPerson.inc:2857 ../lib/modules/inetOrgPerson.inc:3684
+#: ../lib/modules/inetOrgPerson.inc:3713
+#: ../lib/modules/passwordSelfReset.inc:637
+#: ../lib/modules/passwordSelfReset.inc:1043
+#: ../lib/modules/passwordSelfReset.inc:1236
 #: ../lib/modules/heimdalKerberos.inc:94 ../lib/modules/heimdalKerberos.inc:180
 #: ../lib/modules/heimdalKerberos.inc:218
 #: ../lib/modules/heimdalKerberos.inc:293
-#: ../lib/modules/heimdalKerberos.inc:690 ../help/help.inc:214
+#: ../lib/modules/heimdalKerberos.inc:688 ../help/help.inc:214
 msgid "User name"
 msgstr "用户名"
 
 #: ../lib/modules/windowsUser.inc:130 ../lib/modules/windowsUser.inc:645
 #: ../lib/modules/windowsUser.inc:853 ../lib/modules/windowsUser.inc:954
-#: ../lib/modules/windowsUser.inc:1083 ../lib/modules/windowsUser.inc:2427
-#: ../lib/modules/windowsUser.inc:3215
+#: ../lib/modules/windowsUser.inc:1083 ../lib/modules/windowsUser.inc:2425
+#: ../lib/modules/windowsUser.inc:3213
 msgid "User name (pre W2K)"
 msgstr "用户名(W2K以前)"
 
 #: ../lib/modules/selfRegistration.inc:508 ../lib/modules/posixAccount.inc:121
-#: ../lib/modules/pykotaUser.inc:313 ../lib/modules/pykotaUser.inc:314
-#: ../lib/modules/pykotaUser.inc:317 ../lib/modules/pykotaUser.inc:318
-#: ../lib/modules/inetOrgPerson.inc:99
+#: ../lib/modules/pykotaUser.inc:316 ../lib/modules/pykotaUser.inc:317
+#: ../lib/modules/pykotaUser.inc:320 ../lib/modules/pykotaUser.inc:321
+#: ../lib/modules/inetOrgPerson.inc:97
 msgid "User name already exists!"
 msgstr "用户名已经存在!"
 
-#: ../lib/modules/passwordSelfReset.inc:641
+#: ../lib/modules/passwordSelfReset.inc:639
 msgid "User name and email address"
 msgstr "用户名和用户的电子邮件地址"
 
@@ -16284,17 +16382,17 @@ msgstr "用户名属性"
 #: ../lib/modules/account.inc:125 ../lib/modules/account.inc:127
 #: ../lib/modules/zarafaContact.inc:207 ../lib/modules/zarafaContact.inc:208
 #: ../lib/modules/uidObject.inc:85 ../lib/modules/zarafaGroup.inc:205
-#: ../lib/modules/zarafaGroup.inc:206 ../lib/modules/nisNetGroupHost.inc:76
+#: ../lib/modules/zarafaGroup.inc:206 ../lib/modules/nisNetGroupHost.inc:79
 #: ../lib/modules/posixAccount.inc:114 ../lib/modules/posixAccount.inc:119
-#: ../lib/modules/zarafaUser.inc:441 ../lib/modules/zarafaUser.inc:442
+#: ../lib/modules/zarafaUser.inc:444 ../lib/modules/zarafaUser.inc:445
 #: ../lib/modules/windowsUser.inc:950 ../lib/modules/windowsUser.inc:951
 #: ../lib/modules/windowsUser.inc:954 ../lib/modules/windowsUser.inc:955
-#: ../lib/modules/pykotaUser.inc:311 ../lib/modules/pykotaUser.inc:312
-#: ../lib/modules/pykotaUser.inc:315 ../lib/modules/pykotaUser.inc:316
-#: ../lib/modules/nisnetgroup.inc:152 ../lib/modules/inetOrgPerson.inc:97
-#: ../lib/modules/inetOrgPerson.inc:98
-#: ../lib/modules/passwordSelfReset.inc:1097
-#: ../lib/modules/passwordSelfReset.inc:1338
+#: ../lib/modules/pykotaUser.inc:314 ../lib/modules/pykotaUser.inc:315
+#: ../lib/modules/pykotaUser.inc:318 ../lib/modules/pykotaUser.inc:319
+#: ../lib/modules/nisnetgroup.inc:155 ../lib/modules/inetOrgPerson.inc:95
+#: ../lib/modules/inetOrgPerson.inc:96
+#: ../lib/modules/passwordSelfReset.inc:1095
+#: ../lib/modules/passwordSelfReset.inc:1336
 #: ../lib/modules/heimdalKerberos.inc:253
 #: ../lib/modules/heimdalKerberos.inc:254
 msgid ""
@@ -16317,7 +16415,7 @@ msgid "User name in use. Selected next free user name."
 msgstr "用户名存在,请选择其他的用户名."
 
 #: ../lib/modules/mitKerberos.inc:117 ../lib/modules/account.inc:102
-#: ../lib/modules/pykotaUser.inc:113 ../lib/modules/inetOrgPerson.inc:772
+#: ../lib/modules/pykotaUser.inc:116 ../lib/modules/inetOrgPerson.inc:770
 #: ../lib/modules/heimdalKerberos.inc:95
 msgid ""
 "User name of the user who should be created. Valid characters are: a-z,A-"
@@ -16333,17 +16431,17 @@ msgstr ""
 "将要建立的用户名,可用字符为:a-z,A-Z,0-9, @.-_..如果该组名存在,会在组名末尾增"
 "加下一个可以使用的数字。"
 
-#: ../lib/modules/passwordSelfReset.inc:642
-#: ../lib/modules/passwordSelfReset.inc:1069
-#: ../lib/modules/passwordSelfReset.inc:1254
+#: ../lib/modules/passwordSelfReset.inc:640
+#: ../lib/modules/passwordSelfReset.inc:1067
+#: ../lib/modules/passwordSelfReset.inc:1252
 msgid "User name or email address"
 msgstr "用户名或用户邮件地址."
 
-#: ../lib/modules/posixAccount.inc:377 ../lib/modules/posixAccount.inc:1994
+#: ../lib/modules/posixAccount.inc:377 ../lib/modules/posixAccount.inc:1992
 msgid "User name suggestion"
 msgstr "用户名建议"
 
-#: ../lib/modules/pykotaUser.inc:125
+#: ../lib/modules/pykotaUser.inc:128
 msgid "User name that is used for PyKota."
 msgstr "在PyKota中使用的用户名"
 
@@ -16355,25 +16453,25 @@ msgstr "用户配置文件"
 msgid "User self registration"
 msgstr "用户自注册"
 
-#: ../lib/modules/zarafaUser.inc:142 ../lib/modules/zarafaUser.inc:303
-#: ../lib/modules/zarafaUser.inc:395 ../lib/modules/zarafaUser.inc:645
-#: ../lib/modules/zarafaUser.inc:1271 ../lib/modules/zarafaUser.inc:1363
-#: ../lib/modules/zarafaUser.inc:1846
+#: ../lib/modules/zarafaUser.inc:145 ../lib/modules/zarafaUser.inc:306
+#: ../lib/modules/zarafaUser.inc:398 ../lib/modules/zarafaUser.inc:648
+#: ../lib/modules/zarafaUser.inc:1272 ../lib/modules/zarafaUser.inc:1364
+#: ../lib/modules/zarafaUser.inc:1847
 msgid "User server"
 msgstr "用户服务器"
 
 #: ../lib/types/user.inc:53 ../lib/modules/posixAccount.inc:93
 #: ../lib/modules/posixAccount.inc:94 ../lib/modules/posixAccount.inc:97
-#: ../lib/modules/posixAccount.inc:1886 ../lib/modules/zarafaUser.inc:1818
+#: ../lib/modules/posixAccount.inc:1884 ../lib/modules/zarafaUser.inc:1819
 #: ../lib/modules/sudoRole.inc:74 ../lib/modules/sudoRole.inc:98
 #: ../lib/modules/sudoRole.inc:159 ../lib/modules/sudoRole.inc:216
 #: ../lib/modules/sudoRole.inc:228 ../lib/modules/sudoRole.inc:316
-#: ../lib/modules/sudoRole.inc:755
+#: ../lib/modules/sudoRole.inc:753
 msgid "Users"
 msgstr "用户"
 
 #: ../lib/modules/zarafaContact.inc:86 ../lib/modules/zarafaGroup.inc:99
-#: ../lib/modules/zarafaUser.inc:119
+#: ../lib/modules/zarafaUser.inc:122
 msgid "Users or groups that may directly send email as this user."
 msgstr "可以用这个用户直接发送邮件的用户或组."
 
@@ -16389,12 +16487,12 @@ msgid ""
 "by semicolons."
 msgstr "属于当前组的用户,以分号隔开."
 
-#: ../templates/tests/lamdaemonTest.php:207
+#: ../templates/tests/lamdaemonTest.php:208
 #, php-format
 msgid "Using %s as lamdaemon remote server."
 msgstr "使用%s做为lamdeamon的远程服务器."
 
-#: ../templates/tests/lamdaemonTest.php:230
+#: ../templates/tests/lamdaemonTest.php:232
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "使用%s连接远程服务器."
@@ -16424,27 +16522,27 @@ msgstr "合法用户"
 msgid "Validate server certificate"
 msgstr "校验服务器数字证书."
 
-#: ../lib/modules/customFields.inc:112 ../lib/modules/customFields.inc:1935
+#: ../lib/modules/customFields.inc:112 ../lib/modules/customFields.inc:1933
 msgid "Validation expression"
 msgstr "合法性检查表达式"
 
-#: ../lib/modules/customFields.inc:116 ../lib/modules/customFields.inc:1940
+#: ../lib/modules/customFields.inc:116 ../lib/modules/customFields.inc:1938
 msgid "Validation message"
 msgstr "合法性检查消息"
 
-#: ../templates/multiEdit.php:124 ../lib/modules/customFields.inc:3136
+#: ../templates/multiEdit.php:147 ../lib/modules/customFields.inc:3134
 msgid "Value"
 msgstr "值"
 
-#: ../lib/modules/customFields.inc:120 ../lib/modules/customFields.inc:2909
+#: ../lib/modules/customFields.inc:120 ../lib/modules/customFields.inc:2907
 msgid "Value for \"checked\""
 msgstr "\"选定\"时的值"
 
-#: ../lib/modules/customFields.inc:124 ../lib/modules/customFields.inc:2915
+#: ../lib/modules/customFields.inc:124 ../lib/modules/customFields.inc:2913
 msgid "Value for \"unchecked\""
 msgstr "\"未选定\"时的值"
 
-#: ../lib/modules/customFields.inc:144 ../lib/modules/customFields.inc:3132
+#: ../lib/modules/customFields.inc:144 ../lib/modules/customFields.inc:3130
 msgid "Value mapping"
 msgstr "值映射"
 
@@ -16452,18 +16550,18 @@ msgstr "值映射"
 msgid "Value to delete does not exist in DN"
 msgstr "DN中被删除值不存在"
 
-#: ../lib/modules/puppetClient.inc:105 ../lib/modules/puppetClient.inc:109
-#: ../lib/modules/puppetClient.inc:156 ../lib/modules/puppetClient.inc:166
-#: ../lib/modules/puppetClient.inc:179 ../lib/modules/puppetClient.inc:286
-#: ../lib/modules/puppetClient.inc:420
+#: ../lib/modules/puppetClient.inc:108 ../lib/modules/puppetClient.inc:112
+#: ../lib/modules/puppetClient.inc:159 ../lib/modules/puppetClient.inc:169
+#: ../lib/modules/puppetClient.inc:182 ../lib/modules/puppetClient.inc:289
+#: ../lib/modules/puppetClient.inc:421
 msgid "Variables"
 msgstr "变量"
 
-#: ../templates/serverInfo.php:134
+#: ../templates/serverInfo.php:135
 msgid "Vendor name"
 msgstr "生产商"
 
-#: ../templates/serverInfo.php:140
+#: ../templates/serverInfo.php:141
 msgid "Vendor version"
 msgstr "生产商版本"
 
@@ -16505,7 +16603,7 @@ msgstr "视图"
 #: ../lib/modules/asteriskVoicemail.inc:143
 #: ../lib/modules/asteriskVoicemail.inc:196
 #: ../lib/modules/asteriskVoicemail.inc:260
-#: ../lib/modules/asteriskVoicemail.inc:375
+#: ../lib/modules/asteriskVoicemail.inc:373
 msgid "Voicemail context"
 msgstr "语音邮件的语境."
 
@@ -16513,7 +16611,7 @@ msgstr "语音邮件的语境."
 msgid "Voicemail mailbox for this account."
 msgstr "此帐号的语音邮箱."
 
-#: ../templates/login.php:510
+#: ../templates/login.php:519
 msgid "Want more features? Get LAM Pro!"
 msgstr "需要更多的功能吗? 参见LAM专业版! "
 
@@ -16522,75 +16620,75 @@ msgstr "需要更多的功能吗? 参见LAM专业版! "
 msgid "Warning"
 msgstr "警告"
 
-#: ../templates/delete.php:243 ../lib/modules/nisMailAliasUser.inc:505
+#: ../templates/delete.php:251 ../lib/modules/nisMailAliasUser.inc:514
 #: ../lib/modules/posixAccount.inc:871
 #: ../lib/modules/organizationalRoleUser.inc:201
 #: ../lib/modules/organizationalRoleUser.inc:218
 #: ../lib/modules/windowsUser.inc:1912 ../lib/modules/groupOfNamesUser.inc:227
-#: ../lib/modules/groupOfNamesUser.inc:274 ../lib/modules/windowsGroup.inc:1062
-#: ../lib/modules.inc:1942
+#: ../lib/modules/groupOfNamesUser.inc:274 ../lib/modules/windowsGroup.inc:1063
+#: ../lib/modules.inc:1950
 #, php-format
 msgid "Was unable to add attributes to DN: %s."
 msgstr "无法为DN: %s增加属性."
 
-#: ../lib/modules/nisMailAliasUser.inc:494 ../lib/modules/range.inc:665
-#: ../lib/modules/inetOrgPerson.inc:1011 ../lib/modules/inetOrgPerson.inc:2406
-#: ../lib/modules.inc:1905
+#: ../lib/modules/nisMailAliasUser.inc:503 ../lib/modules/range.inc:668
+#: ../lib/modules/inetOrgPerson.inc:1009 ../lib/modules/inetOrgPerson.inc:2402
+#: ../lib/modules.inc:1913
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "无法创建DN: %s."
 
-#: ../lib/account.inc:830 ../lib/account.inc:840
-#: ../lib/modules/nisMailAliasUser.inc:471 ../lib/modules/range.inc:732
+#: ../lib/account.inc:836 ../lib/account.inc:846
+#: ../lib/modules/nisMailAliasUser.inc:480 ../lib/modules/range.inc:735
 #, php-format
 msgid "Was unable to delete DN: %s."
 msgstr "无法删除DN: %s."
 
-#: ../templates/lists/changePassword.php:799
-#: ../templates/lists/changePassword.php:892
-#: ../templates/lists/changePassword.php:942 ../templates/delete.php:234
+#: ../templates/lists/changePassword.php:800
+#: ../templates/lists/changePassword.php:893
+#: ../templates/lists/changePassword.php:943 ../templates/delete.php:242
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "无法修改DN: %s的属性"
 
 #: ../lib/modules/posixAccount.inc:855 ../lib/modules/windowsUser.inc:1938
-#: ../lib/modules/windowsUser.inc:2395 ../lib/modules/range.inc:709
-#: ../lib/modules/nisNetGroupUser.inc:351
-#: ../lib/modules/nisNetGroupUser.inc:368
-#: ../lib/modules/nisNetGroupUser.inc:405
-#: ../lib/modules/nisNetGroupUser.inc:417
-#: ../lib/modules/nisNetGroupUser.inc:584
-#: ../lib/modules/groupOfNamesUser.inc:259 ../lib/modules.inc:1924
+#: ../lib/modules/windowsUser.inc:2395 ../lib/modules/range.inc:712
+#: ../lib/modules/nisNetGroupUser.inc:354
+#: ../lib/modules/nisNetGroupUser.inc:371
+#: ../lib/modules/nisNetGroupUser.inc:408
+#: ../lib/modules/nisNetGroupUser.inc:420
+#: ../lib/modules/nisNetGroupUser.inc:585
+#: ../lib/modules/groupOfNamesUser.inc:259 ../lib/modules.inc:1932
 #, php-format
 msgid "Was unable to modify attributes of DN: %s."
 msgstr "不能修改DN: %s的属性"
 
-#: ../templates/delete.php:252 ../lib/modules/nisMailAliasUser.inc:482
+#: ../templates/delete.php:260 ../lib/modules/nisMailAliasUser.inc:491
 #: ../lib/modules/posixAccount.inc:888
 #: ../lib/modules/organizationalRoleUser.inc:206
 #: ../lib/modules/organizationalRoleUser.inc:229
 #: ../lib/modules/windowsUser.inc:1925 ../lib/modules/groupOfNamesUser.inc:232
-#: ../lib/modules/groupOfNamesUser.inc:288 ../lib/modules/windowsGroup.inc:1075
-#: ../lib/modules.inc:1955
+#: ../lib/modules/groupOfNamesUser.inc:288 ../lib/modules/windowsGroup.inc:1076
+#: ../lib/modules.inc:1963
 #, php-format
 msgid "Was unable to remove attributes from DN: %s."
 msgstr "无法删除DN: %s的属性."
 
-#: ../lib/modules/asteriskExtension.inc:906 ../lib/modules.inc:1885
+#: ../lib/modules/asteriskExtension.inc:906 ../lib/modules.inc:1893
 #, php-format
 msgid "Was unable to rename DN: %s."
 msgstr "无法重命名DN: %s."
 
 #: ../lib/modules/windowsUser.inc:206 ../lib/modules/windowsUser.inc:508
 #: ../lib/modules/windowsUser.inc:833 ../lib/modules/windowsUser.inc:918
-#: ../lib/modules/windowsUser.inc:1123 ../lib/modules/windowsUser.inc:2451
-#: ../lib/modules/windowsUser.inc:2614 ../lib/modules/inetOrgPerson.inc:165
-#: ../lib/modules/inetOrgPerson.inc:220 ../lib/modules/inetOrgPerson.inc:484
-#: ../lib/modules/inetOrgPerson.inc:607 ../lib/modules/inetOrgPerson.inc:759
-#: ../lib/modules/inetOrgPerson.inc:763 ../lib/modules/inetOrgPerson.inc:1511
-#: ../lib/modules/inetOrgPerson.inc:1514 ../lib/modules/inetOrgPerson.inc:2011
-#: ../lib/modules/inetOrgPerson.inc:2536 ../lib/modules/inetOrgPerson.inc:3694
-#: ../lib/modules/inetOrgPerson.inc:3723
+#: ../lib/modules/windowsUser.inc:1123 ../lib/modules/windowsUser.inc:2449
+#: ../lib/modules/windowsUser.inc:2612 ../lib/modules/inetOrgPerson.inc:163
+#: ../lib/modules/inetOrgPerson.inc:218 ../lib/modules/inetOrgPerson.inc:482
+#: ../lib/modules/inetOrgPerson.inc:605 ../lib/modules/inetOrgPerson.inc:757
+#: ../lib/modules/inetOrgPerson.inc:761 ../lib/modules/inetOrgPerson.inc:1509
+#: ../lib/modules/inetOrgPerson.inc:1512 ../lib/modules/inetOrgPerson.inc:2007
+#: ../lib/modules/inetOrgPerson.inc:2532 ../lib/modules/inetOrgPerson.inc:3674
+#: ../lib/modules/inetOrgPerson.inc:3703
 msgid "Web site"
 msgstr "网站"
 
@@ -16598,13 +16696,13 @@ msgstr "网站"
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../lib/modules/bindDLZ.inc:187 ../lib/modules/bindDLZ.inc:191
-#: ../lib/modules/bindDLZ.inc:394 ../lib/modules/bindDLZ.inc:510
-#: ../lib/modules/bindDLZ.inc:1360 ../lib/modules/bindDLZ.inc:1603
+#: ../lib/modules/bindDLZ.inc:190 ../lib/modules/bindDLZ.inc:194
+#: ../lib/modules/bindDLZ.inc:397 ../lib/modules/bindDLZ.inc:513
+#: ../lib/modules/bindDLZ.inc:1363 ../lib/modules/bindDLZ.inc:1604
 msgid "Weight"
 msgstr "权重"
 
-#: ../lib/selfService.inc:397
+#: ../lib/selfService.inc:407
 msgid "Welcome to LAM self service. Please enter your user name and password."
 msgstr "欢迎来到LAM自助服务.请输入用户名和密码."
 
@@ -16620,7 +16718,7 @@ msgid ""
 "filter."
 msgstr "当进行递归拷贝时,只拷贝匹配这些过滤器的条目."
 
-#: ../lib/modules/zarafaUser.inc:115
+#: ../lib/modules/zarafaUser.inc:118
 msgid ""
 "When the hard quota limit is reached, email can not be delivered to that "
 "user anymore."
@@ -16632,23 +16730,23 @@ msgid ""
 "in your certificate!"
 msgstr "当使用ldaps://或TLS协议时确认在证书中使用相同的ip/domain!"
 
-#: ../templates/lists/changePassword.php:437
-#: ../templates/lists/changePassword.php:473 ../lib/types/user.inc:308
+#: ../templates/lists/changePassword.php:438
+#: ../templates/lists/changePassword.php:474 ../lib/types/user.inc:308
 #: ../lib/types/user.inc:414 ../lib/types/user.inc:453
 #: ../lib/types/user.inc:987 ../lib/modules/windowsHost.inc:64
-#: ../lib/modules/windowsUser.inc:101 ../lib/modules/windowsUser.inc:3401
-#: ../lib/modules/windowsUser.inc:3544 ../lib/modules/windowsGroup.inc:101
+#: ../lib/modules/windowsUser.inc:101 ../lib/modules/windowsUser.inc:3399
+#: ../lib/modules/windowsUser.inc:3542 ../lib/modules/windowsGroup.inc:104
 msgid "Windows"
 msgstr "Windows"
 
-#: ../lib/modules/posixGroup.inc:569 ../lib/modules/posixAccount.inc:1890
+#: ../lib/modules/posixGroup.inc:569 ../lib/modules/posixAccount.inc:1888
 msgid "Windows domain info"
 msgstr "Windows域信息"
 
 #: ../lib/modules/posixGroup.inc:525 ../lib/modules/posixGroup.inc:596
-#: ../lib/modules/posixGroup.inc:674 ../lib/modules/posixAccount.inc:132
-#: ../lib/modules/posixAccount.inc:448 ../lib/modules/posixAccount.inc:1911
-#: ../lib/modules/posixAccount.inc:1948
+#: ../lib/modules/posixGroup.inc:672 ../lib/modules/posixAccount.inc:132
+#: ../lib/modules/posixAccount.inc:448 ../lib/modules/posixAccount.inc:1909
+#: ../lib/modules/posixAccount.inc:1946
 msgid "Windows domain info DN"
 msgstr "Windows域信息DN"
 
@@ -16660,10 +16758,10 @@ msgstr "帐号所属的windows域"
 #: ../lib/modules/sambaSamAccount.inc:477
 #: ../lib/modules/sambaSamAccount.inc:1213
 #: ../lib/modules/sambaSamAccount.inc:1729
-#: ../lib/modules/sambaSamAccount.inc:1921
+#: ../lib/modules/sambaSamAccount.inc:1919
 #: ../lib/modules/sambaGroupMapping.inc:111
 #: ../lib/modules/sambaGroupMapping.inc:374
-#: ../lib/modules/sambaGroupMapping.inc:540
+#: ../lib/modules/sambaGroupMapping.inc:538
 msgid "Windows group"
 msgstr "Windows组"
 
@@ -16696,7 +16794,7 @@ msgstr "Windows主组的SID"
 msgid "Windows-Domain name of group."
 msgstr "组的windows域名."
 
-#: ../lib/modules/windowsUser.inc:1127 ../lib/modules/inetOrgPerson.inc:1522
+#: ../lib/modules/windowsUser.inc:1127 ../lib/modules/inetOrgPerson.inc:1520
 msgid "Work details"
 msgstr "工作详细信息"
 
@@ -16707,7 +16805,7 @@ msgstr "工作组"
 #: ../lib/modules/sambaSamAccount.inc:236
 #: ../lib/modules/sambaSamAccount.inc:367
 #: ../lib/modules/sambaSamAccount.inc:1463
-#: ../lib/modules/sambaSamAccount.inc:1940
+#: ../lib/modules/sambaSamAccount.inc:1938
 msgid "Working directory"
 msgstr "工作目录"
 
@@ -16715,17 +16813,17 @@ msgstr "工作目录"
 msgid "Working directory of initial program."
 msgstr "初始化程序的工作目录。"
 
-#: ../templates/config/confmain.php:356
+#: ../templates/config/confmain.php:359
 msgid "Write"
 msgstr "写入"
 
-#: ../templates/config/confmain.php:272
+#: ../templates/config/confmain.php:275
 msgid "Write access"
 msgstr "写权限"
 
-#: ../templates/login.php:598 ../templates/login.php:657
-#: ../templates/selfService/selfServiceLogin.php:168
-#: ../templates/selfService/selfServiceLogin.php:196
+#: ../templates/login.php:607 ../templates/login.php:678
+#: ../templates/selfService/selfServiceLogin.php:177
+#: ../templates/selfService/selfServiceLogin.php:212
 msgid "Wrong password/user name combination. Please try again."
 msgstr "错误的密码和用户组合,请重试!"
 
@@ -16733,49 +16831,53 @@ msgstr "错误的密码和用户组合,请重试!"
 msgid "Wrong quota format. Quota must be numeric."
 msgstr "错误的配额类型.配额必须为数字."
 
-#: ../templates/schema/schema.php:153 ../templates/schema/schema.php:195
-#: ../templates/schema/schema.php:200 ../templates/schema/schema.php:205
-#: ../templates/pdfedit/pdfpage.php:464 ../lib/modules/pykotaPrinter.inc:51
+#: ../templates/schema/schema.php:154 ../templates/schema/schema.php:196
+#: ../templates/schema/schema.php:201 ../templates/schema/schema.php:206
+#: ../templates/pdfedit/pdfpage.php:479 ../lib/modules/pykotaPrinter.inc:51
 #: ../lib/modules/pykotaPrinter.inc:170 ../lib/modules/freeRadius.inc:161
-#: ../lib/modules/freeRadius.inc:414 ../lib/modules/freeRadius.inc:705
+#: ../lib/modules/freeRadius.inc:414 ../lib/modules/freeRadius.inc:703
 #: ../lib/modules/qmailGroup.inc:322 ../lib/modules/qmailGroup.inc:364
 #: ../lib/modules/qmailGroup.inc:977 ../lib/modules/qmailGroup.inc:978
-#: ../lib/modules/qmailGroup.inc:1023 ../lib/modules/qmailGroup.inc:1029
+#: ../lib/modules/qmailGroup.inc:1021 ../lib/modules/qmailGroup.inc:1027
 #: ../lib/modules/imapAccess.inc:468
 msgid "Yes"
 msgstr "是"
 
-#: ../lib/modules/sambaSamAccount.inc:2483
+#: ../lib/modules/sambaSamAccount.inc:2481
 msgid "You are not yet allowed to change your password."
 msgstr "不允许修改密码."
 
-#: ../templates/lists/changePassword.php:556
-#: ../templates/lists/changePassword.php:566
-#: ../lib/modules/sambaSamAccount.inc:2446
-#: ../lib/modules/sambaSamAccount.inc:2540 ../lib/modules/ppolicyUser.inc:348
-#: ../lib/modules/ppolicyUser.inc:428
+#: ../templates/lists/changePassword.php:557
+#: ../templates/lists/changePassword.php:567
+#: ../lib/modules/sambaSamAccount.inc:2444
+#: ../lib/modules/sambaSamAccount.inc:2538 ../lib/modules/ppolicyUser.inc:346
+#: ../lib/modules/ppolicyUser.inc:426
 msgid "You are reusing an old password. Please choose a different password."
 msgstr "重复使用了旧密码. 请输入与原来密码不同的新密码. "
 
-#: ../lib/modules/account.inc:126 ../lib/modules/posixGroup.inc:667
+#: ../lib/modules/account.inc:126 ../lib/modules/posixGroup.inc:665
 #: ../lib/modules/posixAccount.inc:113 ../lib/modules/posixAccount.inc:115
 msgid ""
 "You are using capital letters. This can cause problems because Windows is "
 "not case-sensitive."
 msgstr "您正在使用大写字符,这会造成一些问题,因为windows大小写不敏感."
 
-#: ../help/help.inc:351
+#: ../help/help.inc:363
 msgid "You can delete or move expired accounts."
 msgstr "您可以删除和移走过期的账号"
 
-#: ../lib/lists.inc:1094
+#: ../lib/lists.inc:1080
 #, php-format
 msgid ""
 "You can download your PDF files {link=%s}{color=#d2131a}here{endcolor}"
 "{endlink}."
 msgstr "你可以下载你的PDF文件 {link=%s}{color=#d2131a}这里{endcolor}{endlink}."
 
-#: ../templates/initsuff.php:185
+#: ../help/help.inc:283
+msgid "You can enable 2-factor authentication here (e.g. via mobile device)."
+msgstr "在此打开双重认证（比如通过移动设备）"
+
+#: ../templates/initsuff.php:186
 msgid ""
 "You can setup the LDAP suffixes for all account types in your LAM server "
 "profile on tab \"Account types\"."
@@ -16796,13 +16898,13 @@ msgstr "你可以使用掩码@@LOGIN_DN@@来替代登录到LAM的用户的DN"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:84 ../lib/modules/zarafaContact.inc:82
 #: ../lib/modules/zarafaGroup.inc:95 ../lib/modules/zarafaAddressList.inc:72
-#: ../lib/modules/zarafaUser.inc:99
+#: ../lib/modules/zarafaUser.inc:102
 msgid "You can use this to temporarily deactivate the Zarafa extension."
 msgstr "可以使用它来临时解除Zarafa扩展项"
 
 #: ../lib/modules/passwordSelfReset.inc:130
-#: ../lib/modules/passwordSelfReset.inc:140 ../help/help.inc:291
-#: ../help/help.inc:330
+#: ../lib/modules/passwordSelfReset.inc:140 ../help/help.inc:303
+#: ../help/help.inc:342
 msgid ""
 "You can use wildcards for LDAP attributes in the form @@attribute@@ (e.g. "
 "@@uid@@ for the user name)."
@@ -16831,7 +16933,7 @@ msgstr "在服务器只读方式下不能更新"
 msgid "You cannot rename an entry which has child entries."
 msgstr "不能为一个有子条目的条目重新命名"
 
-#: ../templates/config/confmain.php:583
+#: ../templates/config/confmain.php:620
 msgid ""
 "You cannot use SSL and TLS encryption at the same time. Please use either "
 "\"ldaps://\" or TLS."
@@ -16841,7 +16943,7 @@ msgstr "不能同时使用SSL和TLS加密.请使用\"ldaps://\" 或 TLS."
 msgid "You did not change the RDN"
 msgstr "您没有对RDN做任何修改."
 
-#: ../templates/tests/schemaTest.php:61
+#: ../templates/tests/schemaTest.php:62
 msgid ""
 "You do not have the required access rights or the LDAP schema is not "
 "published by your server."
@@ -16887,7 +16989,7 @@ msgstr "你可能想用 %s来代替%s."
 msgid "You must either upload a file or provide an import in the text box."
 msgstr "在文本框中必须上传一个文件或提供一种导入方式."
 
-#: ../lib/modules/groupOfNames.inc:212 ../lib/modules/groupOfNames.inc:213
+#: ../lib/modules/groupOfNames.inc:215 ../lib/modules/groupOfNames.inc:216
 msgid "You need to add at least one member to this group."
 msgstr "您至少需要为这个组增加一个成员."
 
@@ -16904,7 +17006,7 @@ msgstr "您将会提示来确认这个操作"
 msgid "Your IMAP domains and email address domain do not match."
 msgstr "您的IMAP域名与邮箱域名不匹配. "
 
-#: ../templates/tests/lamdaemonTest.php:235 ../lib/lamdaemon.inc:102
+#: ../templates/tests/lamdaemonTest.php:237 ../lib/lamdaemon.inc:102
 #, php-format
 msgid ""
 "Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"
@@ -16926,14 +17028,14 @@ msgid ""
 "PHP."
 msgstr "您的PHP.INI没有file_uploads = on,在PHP中打开文件上传."
 
-#: ../templates/config/confmain.php:181
-#: ../templates/selfService/adminMain.php:376
+#: ../templates/config/confmain.php:184
+#: ../templates/selfService/adminMain.php:392
 msgid ""
 "Your changes cannot be saved until you make the file writable for the "
 "webserver user."
 msgstr "你的修改只能在web服务器有权写文件的条件下保存."
 
-#: ../templates/login.php:514
+#: ../templates/login.php:523
 #, php-format
 msgid "Your licence expires on %s."
 msgstr "您的许可证将在%s过期."
@@ -16950,14 +17052,14 @@ msgid ""
 "your user data."
 msgstr "你的新账号已经成功建立.请返回后登录并修改用户数据."
 
-#: ../lib/account.inc:1319 ../lib/modules/windowsUser.inc:2737
-#: ../lib/modules/windowsUser.inc:2812
+#: ../lib/account.inc:1325 ../lib/modules/windowsUser.inc:2735
+#: ../lib/modules/windowsUser.inc:2810
 msgid ""
 "Your password does not meet the password strength qualifications. Please "
 "retry with another one."
 msgstr "密码达不到强度要求，请重试。"
 
-#: ../lib/modules/passwordSelfReset.inc:705
+#: ../lib/modules/passwordSelfReset.inc:703
 msgid "Your password was changed to @@newPassword@@."
 msgstr "新密码为@@newPassword@@."
 
@@ -16965,7 +17067,7 @@ msgstr "新密码为@@newPassword@@."
 msgid "Your session expired, click here to go back to the login page."
 msgstr "超时,请点此外返回到登录界面."
 
-#: ../templates/login.php:307 ../templates/selfService/selfServiceLogin.php:119
+#: ../templates/login.php:307 ../templates/selfService/selfServiceLogin.php:122
 msgid "Your session expired, please log in again."
 msgstr "超时,请重新登录."
 
@@ -16975,11 +17077,11 @@ msgid "Your settings were successfully saved."
 msgstr "设置保存成功."
 
 #: ../lib/modules/windowsUser.inc:480 ../lib/modules/windowsUser.inc:728
-#: ../lib/modules/inetOrgPerson.inc:518 ../lib/modules/inetOrgPerson.inc:550
+#: ../lib/modules/inetOrgPerson.inc:516 ../lib/modules/inetOrgPerson.inc:548
 msgid "YourCompany"
 msgstr "您的公司"
 
-#: ../lib/modules/zarafaGroup.inc:61 ../lib/modules/zarafaUser.inc:75
+#: ../lib/modules/zarafaGroup.inc:61 ../lib/modules/zarafaUser.inc:78
 #: ../lib/modules/zarafaServer.inc:56
 msgid "Zarafa"
 msgstr "Zarafa"
@@ -17009,21 +17111,21 @@ msgstr "Zarafa动态组"
 #: ../lib/modules/zarafaDynamicGroup.inc:95
 #: ../lib/modules/zarafaDynamicGroup.inc:183
 #: ../lib/modules/zarafaContact.inc:112 ../lib/modules/zarafaContact.inc:133
-#: ../lib/modules/zarafaGroup.inc:117 ../lib/modules/zarafaGroup.inc:754
+#: ../lib/modules/zarafaGroup.inc:117 ../lib/modules/zarafaGroup.inc:752
 #: ../lib/modules/zarafaAddressList.inc:83
-#: ../lib/modules/zarafaAddressList.inc:156 ../lib/modules/zarafaUser.inc:185
-#: ../lib/modules/zarafaUser.inc:416 ../lib/modules/zarafaUser.inc:1812
+#: ../lib/modules/zarafaAddressList.inc:156 ../lib/modules/zarafaUser.inc:188
+#: ../lib/modules/zarafaUser.inc:419 ../lib/modules/zarafaUser.inc:1813
 #: ../lib/modules/zarafaServer.inc:92 ../lib/modules/zarafaServer.inc:153
 msgid "Zarafa schema"
 msgstr "Zarafa架构"
 
-#: ../lib/modules/zarafaUser.inc:174 ../lib/modules/zarafaUser.inc:178
+#: ../lib/modules/zarafaUser.inc:177 ../lib/modules/zarafaUser.inc:181
 msgid "Zarafa will store the user's archives on these servers."
 msgstr "将在这些服务器上建立用户的归档."
 
 #: ../lib/types/bind.inc:78 ../lib/modules/ddns.inc:102
 #: ../lib/modules/ddns.inc:113 ../lib/modules/ddns.inc:128
-#: ../lib/modules/ddns.inc:394 ../lib/modules/ddns.inc:426
+#: ../lib/modules/ddns.inc:394 ../lib/modules/ddns.inc:424
 msgid "Zone name"
 msgstr "区域名"
 
@@ -17048,9 +17150,9 @@ msgstr "增加值"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:118 ../lib/modules/posixGroup.inc:457
 #: ../lib/modules/zarafaAddressList.inc:106 ../lib/modules/pykotaGroup.inc:150
-#: ../lib/modules/pykotaGroup.inc:159 ../lib/modules/nisnetgroup.inc:114
-#: ../lib/modules/organizationalRole.inc:116
-#: ../lib/modules/windowsGroup.inc:243 ../lib/modules/groupOfNames.inc:128
+#: ../lib/modules/pykotaGroup.inc:159 ../lib/modules/nisnetgroup.inc:117
+#: ../lib/modules/organizationalRole.inc:119
+#: ../lib/modules/windowsGroup.inc:246 ../lib/modules/groupOfNames.inc:131
 msgid "adminstrators"
 msgstr "管理员"
 
@@ -17081,11 +17183,11 @@ msgstr "浏览"
 msgid "bytes"
 msgstr "子节"
 
-#: ../templates/schema/schema.php:220
+#: ../templates/schema/schema.php:221
 msgid "character"
 msgstr "字符"
 
-#: ../templates/schema/schema.php:219
+#: ../templates/schema/schema.php:220
 msgid "characters"
 msgstr "字符"
 
@@ -17115,17 +17217,17 @@ msgid "delete attribute"
 msgstr "删除属性"
 
 #: ../lib/modules/sambaSamAccount.inc:1484
-#: ../lib/modules/sambaSamAccount.inc:1960 ../lib/modules/zarafaUser.inc:650
-#: ../lib/modules/zarafaUser.inc:1323 ../lib/modules/zarafaUser.inc:1367
+#: ../lib/modules/sambaSamAccount.inc:1958 ../lib/modules/zarafaUser.inc:653
+#: ../lib/modules/zarafaUser.inc:1324 ../lib/modules/zarafaUser.inc:1368
 msgid "disabled"
 msgstr "关闭"
 
 #: ../lib/modules/sambaSamAccount.inc:1495
-#: ../lib/modules/sambaSamAccount.inc:1971
+#: ../lib/modules/sambaSamAccount.inc:1969
 msgid "disconnect"
 msgstr "中断连接"
 
-#: ../lib/modules/windowsUser.inc:664 ../lib/modules/windowsGroup.inc:251
+#: ../lib/modules/windowsUser.inc:664 ../lib/modules/windowsGroup.inc:254
 msgid "domain"
 msgstr "域"
 
@@ -17137,8 +17239,8 @@ msgstr "下载值"
 msgid "edit"
 msgstr "编辑"
 
-#: ../lib/modules/zarafaUser.inc:650 ../lib/modules/zarafaUser.inc:1318
-#: ../lib/modules/zarafaUser.inc:1367
+#: ../lib/modules/zarafaUser.inc:653 ../lib/modules/zarafaUser.inc:1319
+#: ../lib/modules/zarafaUser.inc:1368
 msgid "enabled"
 msgstr "使能"
 
@@ -17156,17 +17258,17 @@ msgid "force"
 msgstr "强制"
 
 #: ../lib/modules/sambaSamAccount.inc:1503
-#: ../lib/modules/sambaSamAccount.inc:1979
+#: ../lib/modules/sambaSamAccount.inc:1977
 msgid "from any client"
 msgstr "从任何客户端"
 
 #: ../lib/modules/sambaSamAccount.inc:1504
-#: ../lib/modules/sambaSamAccount.inc:1980
+#: ../lib/modules/sambaSamAccount.inc:1978
 msgid "from previous client only"
 msgstr "仅从以前的客户端"
 
 #: ../lib/modules/posixAccount.inc:247 ../lib/modules/posixAccount.inc:307
-#: ../lib/modules/nisnetgroup.inc:128 ../lib/modules/groupOfNamesUser.inc:73
+#: ../lib/modules/nisnetgroup.inc:131 ../lib/modules/groupOfNamesUser.inc:73
 msgid "group01,group02"
 msgstr "group01,group02"
 
@@ -17179,7 +17281,7 @@ msgid "group1@company.com,group2@company.com"
 msgstr "group1@company.com,group2@company.com"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:126 ../lib/modules/zarafaGroup.inc:155
-#: ../lib/modules/windowsGroup.inc:227
+#: ../lib/modules/windowsGroup.inc:230
 msgid "group@company.com"
 msgstr "groupr@company.com"
 
@@ -17187,12 +17289,12 @@ msgstr "groupr@company.com"
 msgid "hint"
 msgstr "提示"
 
-#: ../lib/modules/quota.inc:198 ../lib/modules/quota.inc:200
+#: ../lib/modules/quota.inc:201 ../lib/modules/quota.inc:203
 msgid "hours"
 msgstr "小时"
 
 #: ../lib/modules/windowsUser.inc:510 ../lib/modules/windowsUser.inc:516
-#: ../lib/modules/inetOrgPerson.inc:486
+#: ../lib/modules/inetOrgPerson.inc:484
 msgid "http://www.company.com"
 msgstr "http://www.company.com"
 
@@ -17201,22 +17303,22 @@ msgid "import"
 msgstr "导入"
 
 #: ../lib/modules/sambaSamAccount.inc:1488
-#: ../lib/modules/sambaSamAccount.inc:1964
+#: ../lib/modules/sambaSamAccount.inc:1962
 msgid "input off, notify off"
 msgstr "输入关，提醒关"
 
 #: ../lib/modules/sambaSamAccount.inc:1487
-#: ../lib/modules/sambaSamAccount.inc:1963
+#: ../lib/modules/sambaSamAccount.inc:1961
 msgid "input off, notify on"
 msgstr "输入关，提醒开"
 
 #: ../lib/modules/sambaSamAccount.inc:1486
-#: ../lib/modules/sambaSamAccount.inc:1962
+#: ../lib/modules/sambaSamAccount.inc:1960
 msgid "input on, notify off"
 msgstr "输入开，提醒关"
 
 #: ../lib/modules/sambaSamAccount.inc:1485
-#: ../lib/modules/sambaSamAccount.inc:1961
+#: ../lib/modules/sambaSamAccount.inc:1959
 msgid "input on, notify on"
 msgstr "输入开，提醒开"
 
@@ -17263,37 +17365,37 @@ msgstr "我的组"
 msgid "new"
 msgstr "新"
 
-#: ../templates/config/confmain.php:254
-#: ../lib/modules/zarafaDynamicGroup.inc:440
-#: ../lib/modules/zarafaDynamicGroup.inc:443
-#: ../lib/modules/zarafaContact.inc:620 ../lib/modules/zarafaGroup.inc:630
-#: ../lib/modules/zarafaGroup.inc:637 ../lib/modules/zarafaGroup.inc:640
-#: ../lib/modules/zarafaAddressList.inc:339
-#: ../lib/modules/zarafaAddressList.inc:342
+#: ../templates/config/confmain.php:257
+#: ../lib/modules/zarafaDynamicGroup.inc:438
+#: ../lib/modules/zarafaDynamicGroup.inc:441
+#: ../lib/modules/zarafaContact.inc:618 ../lib/modules/zarafaGroup.inc:628
+#: ../lib/modules/zarafaGroup.inc:635 ../lib/modules/zarafaGroup.inc:638
+#: ../lib/modules/zarafaAddressList.inc:337
+#: ../lib/modules/zarafaAddressList.inc:340
 #: ../lib/modules/sambaSamAccount.inc:1865
 #: ../lib/modules/sambaSamAccount.inc:1873
-#: ../lib/modules/sambaSamAccount.inc:1928
-#: ../lib/modules/sambaSamAccount.inc:1936
-#: ../lib/modules/sambaSamAccount.inc:1946
-#: ../lib/modules/sambaSamAccount.inc:1951
-#: ../lib/modules/sambaSamAccount.inc:1956
-#: ../lib/modules/sambaSamAccount.inc:2283 ../lib/modules/zarafaUser.inc:632
-#: ../lib/modules/zarafaUser.inc:1276 ../lib/modules/zarafaUser.inc:1291
-#: ../lib/modules/zarafaUser.inc:1302 ../lib/modules/zarafaUser.inc:1308
+#: ../lib/modules/sambaSamAccount.inc:1926
+#: ../lib/modules/sambaSamAccount.inc:1934
+#: ../lib/modules/sambaSamAccount.inc:1944
+#: ../lib/modules/sambaSamAccount.inc:1949
+#: ../lib/modules/sambaSamAccount.inc:1954
+#: ../lib/modules/sambaSamAccount.inc:2281 ../lib/modules/zarafaUser.inc:635
+#: ../lib/modules/zarafaUser.inc:1277 ../lib/modules/zarafaUser.inc:1292
+#: ../lib/modules/zarafaUser.inc:1303 ../lib/modules/zarafaUser.inc:1309
 #: ../lib/modules/windowsUser.inc:522 ../lib/modules/windowsUser.inc:523
 #: ../lib/modules/windowsUser.inc:524 ../lib/modules/windowsUser.inc:530
 #: ../lib/modules/windowsUser.inc:531 ../lib/modules/windowsUser.inc:532
 #: ../lib/modules/windowsUser.inc:544 ../lib/modules/windowsUser.inc:545
 #: ../lib/modules/windowsUser.inc:546 ../lib/modules/windowsUser.inc:552
 #: ../lib/modules/windowsUser.inc:553 ../lib/modules/windowsUser.inc:554
-#: ../lib/modules/windowsUser.inc:1961 ../lib/modules/windowsUser.inc:2463
-#: ../lib/modules/windowsUser.inc:2468 ../lib/modules/windowsUser.inc:2474
-#: ../lib/modules/windowsUser.inc:2479 ../lib/modules/ppolicy.inc:35
-#: ../lib/modules/ppolicy.inc:482 ../lib/modules/ppolicy.inc:492
-#: ../lib/modules/ppolicy.inc:497 ../lib/modules/ppolicy.inc:504
-#: ../lib/modules/ppolicy.inc:507 ../lib/modules/generalInformation.inc:102
-#: ../lib/modules/zarafaServer.inc:361 ../lib/modules/customFields.inc:3067
-#: ../lib/modules/fixed_ip.inc:753
+#: ../lib/modules/windowsUser.inc:1961 ../lib/modules/windowsUser.inc:2461
+#: ../lib/modules/windowsUser.inc:2466 ../lib/modules/windowsUser.inc:2472
+#: ../lib/modules/windowsUser.inc:2477 ../lib/modules/ppolicy.inc:35
+#: ../lib/modules/ppolicy.inc:480 ../lib/modules/ppolicy.inc:490
+#: ../lib/modules/ppolicy.inc:495 ../lib/modules/ppolicy.inc:502
+#: ../lib/modules/ppolicy.inc:505 ../lib/modules/generalInformation.inc:102
+#: ../lib/modules/zarafaServer.inc:359 ../lib/modules/customFields.inc:3065
+#: ../lib/modules/fixed_ip.inc:754
 msgid "no"
 msgstr "否"
 
@@ -17313,10 +17415,10 @@ msgstr "本条目没有新的可用属性"
 msgid "no new binary attributes available for this entry"
 msgstr "本条目没有新的可用二进制属性"
 
-#: ../templates/schema/schema.php:160 ../templates/schema/schema.php:229
-#: ../templates/schema/schema.php:240 ../templates/schema/schema.php:289
-#: ../templates/schema/schema.php:355 ../templates/schema/schema.php:370
-#: ../templates/schema/schema.php:404 ../templates/schema/schema.php:426
+#: ../templates/schema/schema.php:161 ../templates/schema/schema.php:230
+#: ../templates/schema/schema.php:241 ../templates/schema/schema.php:290
+#: ../templates/schema/schema.php:356 ../templates/schema/schema.php:371
+#: ../templates/schema/schema.php:405 ../templates/schema/schema.php:427
 #: ../templates/3rdParty/pla/lib/functions.php:2612
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1573
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1581
@@ -17327,12 +17429,12 @@ msgstr "空"
 msgid "none, remove value"
 msgstr "空,删除值"
 
-#: ../templates/schema/schema.php:216
+#: ../templates/schema/schema.php:217
 msgid "not applicable"
 msgstr "不可用"
 
-#: ../templates/schema/schema.php:167 ../templates/schema/schema.php:172
-#: ../templates/schema/schema.php:177 ../templates/schema/schema.php:210
+#: ../templates/schema/schema.php:168 ../templates/schema/schema.php:173
+#: ../templates/schema/schema.php:178 ../templates/schema/schema.php:211
 msgid "not specified"
 msgstr "未指定"
 
@@ -17371,6 +17473,11 @@ msgstr "printer01"
 msgid "printergroup1"
 msgstr "printergroup1"
 
+#: ../templates/config/confmain.php:536
+#: ../templates/selfService/adminMain.php:508
+msgid "privacyIDEA"
+msgstr "privacyIDEA"
+
 #: ../lib/modules/selfRegistration.inc:252
 msgid "reCAPTCHA secret key"
 msgstr "reCAPTCHA密钥"
@@ -17397,7 +17504,7 @@ msgid "required"
 msgstr "必选项"
 
 #: ../lib/modules/sambaSamAccount.inc:1496
-#: ../lib/modules/sambaSamAccount.inc:1972
+#: ../lib/modules/sambaSamAccount.inc:1970
 msgid "reset"
 msgstr "复位"
 
@@ -17416,7 +17523,7 @@ msgstr "秒"
 #: ../lib/modules/mitKerberos.inc:244 ../lib/modules/asteriskAccount.inc:327
 #: ../lib/modules/posixGroup.inc:440 ../lib/modules/sambaSamAccount.inc:434
 #: ../lib/modules/posixAccount.inc:275 ../lib/modules/windowsUser.inc:408
-#: ../lib/modules/inetOrgPerson.inc:2153
+#: ../lib/modules/inetOrgPerson.inc:2149
 #: ../lib/modules/asteriskVoicemail.inc:167
 #: ../lib/modules/heimdalKerberos.inc:213
 msgid "secret"
@@ -17429,8 +17536,8 @@ msgstr "选择RDN属性"
 #: ../lib/modules/mitKerberos.inc:213 ../lib/modules/uidObject.inc:69
 #: ../lib/modules/posixAccount.inc:226 ../lib/modules/windowsUser.inc:400
 #: ../lib/modules/windowsUser.inc:647 ../lib/modules/windowsUser.inc:656
-#: ../lib/modules/pykotaUser.inc:192 ../lib/modules/pykotaUser.inc:210
-#: ../lib/modules/inetOrgPerson.inc:2144 ../lib/modules/heimdalKerberos.inc:182
+#: ../lib/modules/pykotaUser.inc:195 ../lib/modules/pykotaUser.inc:213
+#: ../lib/modules/inetOrgPerson.inc:2140 ../lib/modules/heimdalKerberos.inc:182
 #: ../lib/modules/nisMailAlias.inc:110
 msgid "smiller"
 msgstr "smiller"
@@ -17447,7 +17554,7 @@ msgstr "smiller@yourdomain.org"
 msgid "smtp:user@example.com"
 msgstr "smtp:user@domain.com"
 
-#: ../lib/modules/ldapPublicKey.inc:109
+#: ../lib/modules/ldapPublicKey.inc:112
 msgid "ssh-dss 234234 user@host"
 msgstr "ssh-dss 234234 user@host"
 
@@ -17459,11 +17566,11 @@ msgstr "结构"
 msgid "table"
 msgstr "表格"
 
-#: ../lib/modules/asteriskExtension.inc:154
+#: ../lib/modules/asteriskExtension.inc:156
 msgid "test"
 msgstr "测试"
 
-#: ../lib/modules/asteriskExtension.inc:174
+#: ../lib/modules/asteriskExtension.inc:176
 msgid "test-start"
 msgstr "测试-开始"
 
@@ -17472,7 +17579,7 @@ msgid "true"
 msgstr "true"
 
 #: ../lib/modules/ipHost.inc:105 ../lib/modules/windowsUser.inc:736
-#: ../lib/modules/inetOrgPerson.inc:372 ../lib/modules/aliasEntry.inc:71
+#: ../lib/modules/inetOrgPerson.inc:370 ../lib/modules/aliasEntry.inc:71
 #: ../lib/modules/qmailGroup.inc:281 ../lib/modules/qmailGroup.inc:289
 #: ../lib/modules/qmailGroup.inc:297
 msgid "uid=smiller,ou=People,dc=company,dc=com"
@@ -17493,7 +17600,7 @@ msgstr "user01,user02,user03"
 #: ../lib/modules/qmailUser.inc:273 ../lib/modules/qmailUser.inc:279
 #: ../lib/modules/qmailUser.inc:301 ../lib/modules/eduPerson.inc:163
 #: ../lib/modules/windowsUser.inc:486 ../lib/modules/windowsUser.inc:492
-#: ../lib/modules/pykotaUser.inc:220 ../lib/modules/inetOrgPerson.inc:468
+#: ../lib/modules/pykotaUser.inc:223 ../lib/modules/inetOrgPerson.inc:466
 #: ../lib/modules/kolabSharedFolder.inc:183
 #: ../lib/modules/asteriskVoicemail.inc:180 ../lib/modules/qmailGroup.inc:339
 #: ../lib/modules/qmailGroup.inc:347 ../lib/modules/qmailGroup.inc:355
@@ -17512,46 +17619,52 @@ msgstr "查看条目"
 msgid "with "
 msgstr "和"
 
-#: ../templates/config/confmain.php:254
-#: ../lib/modules/zarafaDynamicGroup.inc:438
-#: ../lib/modules/zarafaDynamicGroup.inc:445
-#: ../lib/modules/zarafaContact.inc:622 ../lib/modules/zarafaGroup.inc:632
-#: ../lib/modules/zarafaGroup.inc:635 ../lib/modules/zarafaGroup.inc:642
-#: ../lib/modules/zarafaAddressList.inc:337
-#: ../lib/modules/zarafaAddressList.inc:344
+#: ../templates/config/confmain.php:257
+#: ../lib/modules/zarafaDynamicGroup.inc:436
+#: ../lib/modules/zarafaDynamicGroup.inc:443
+#: ../lib/modules/zarafaContact.inc:620 ../lib/modules/zarafaGroup.inc:630
+#: ../lib/modules/zarafaGroup.inc:633 ../lib/modules/zarafaGroup.inc:640
+#: ../lib/modules/zarafaAddressList.inc:335
+#: ../lib/modules/zarafaAddressList.inc:342
 #: ../lib/modules/sambaSamAccount.inc:1873
-#: ../lib/modules/sambaSamAccount.inc:1926
-#: ../lib/modules/sambaSamAccount.inc:1934
-#: ../lib/modules/sambaSamAccount.inc:1944
-#: ../lib/modules/sambaSamAccount.inc:1949
-#: ../lib/modules/sambaSamAccount.inc:1954 ../lib/modules/zarafaUser.inc:632
-#: ../lib/modules/zarafaUser.inc:1278 ../lib/modules/zarafaUser.inc:1294
-#: ../lib/modules/zarafaUser.inc:1304 ../lib/modules/zarafaUser.inc:1310
+#: ../lib/modules/sambaSamAccount.inc:1924
+#: ../lib/modules/sambaSamAccount.inc:1932
+#: ../lib/modules/sambaSamAccount.inc:1942
+#: ../lib/modules/sambaSamAccount.inc:1947
+#: ../lib/modules/sambaSamAccount.inc:1952 ../lib/modules/zarafaUser.inc:635
+#: ../lib/modules/zarafaUser.inc:1279 ../lib/modules/zarafaUser.inc:1295
+#: ../lib/modules/zarafaUser.inc:1305 ../lib/modules/zarafaUser.inc:1311
 #: ../lib/modules/windowsUser.inc:524 ../lib/modules/windowsUser.inc:532
 #: ../lib/modules/windowsUser.inc:546 ../lib/modules/windowsUser.inc:554
 #: ../lib/modules/windowsUser.inc:680 ../lib/modules/windowsUser.inc:1961
-#: ../lib/modules/windowsUser.inc:2349 ../lib/modules/windowsUser.inc:2465
-#: ../lib/modules/windowsUser.inc:2470 ../lib/modules/windowsUser.inc:2476
-#: ../lib/modules/windowsUser.inc:2481 ../lib/modules/ppolicy.inc:36
-#: ../lib/modules/ppolicy.inc:494 ../lib/modules/ppolicy.inc:499
-#: ../lib/modules/ppolicy.inc:502 ../lib/modules/ppolicy.inc:509
-#: ../lib/modules/inetOrgPerson.inc:542
+#: ../lib/modules/windowsUser.inc:2349 ../lib/modules/windowsUser.inc:2463
+#: ../lib/modules/windowsUser.inc:2468 ../lib/modules/windowsUser.inc:2474
+#: ../lib/modules/windowsUser.inc:2479 ../lib/modules/ppolicy.inc:36
+#: ../lib/modules/ppolicy.inc:492 ../lib/modules/ppolicy.inc:497
+#: ../lib/modules/ppolicy.inc:500 ../lib/modules/ppolicy.inc:507
+#: ../lib/modules/inetOrgPerson.inc:540
 #: ../lib/modules/generalInformation.inc:104
-#: ../lib/modules/zarafaServer.inc:363 ../lib/modules/customFields.inc:3067
-#: ../lib/modules/fixed_ip.inc:751
+#: ../lib/modules/zarafaServer.inc:361 ../lib/modules/customFields.inc:3065
+#: ../lib/modules/fixed_ip.inc:752
 msgid "yes"
 msgstr "是"
 
 #: ../lib/modules/sambaSamAccount.inc:1863
-#: ../lib/modules/sambaSamAccount.inc:2281
+#: ../lib/modules/sambaSamAccount.inc:2279
 msgid "yes - ordered ascending"
 msgstr "是-升序"
 
 #: ../lib/modules/sambaSamAccount.inc:1864
-#: ../lib/modules/sambaSamAccount.inc:2282
+#: ../lib/modules/sambaSamAccount.inc:2280
 msgid "yes - ordered descending"
 msgstr "是-降序"
 
+#~ msgid "Beginning"
+#~ msgstr "开始"
+
+#~ msgid "Failed to import!"
+#~ msgstr "导入失败!"
+
 #~ msgid ""
 #~ "$user and $group will be replaced with user name and primary group name."
 #~ msgstr "$usert和$group会被用户名或主要组名替代 "