diff --git a/lam/locale/zh_CN/LC_MESSAGES/messages.mo b/lam/locale/zh_CN/LC_MESSAGES/messages.mo
index 14e33538..9bff0062 100644
Binary files a/lam/locale/zh_CN/LC_MESSAGES/messages.mo and b/lam/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/lam/locale/zh_CN/LC_MESSAGES/messages.po b/lam/locale/zh_CN/LC_MESSAGES/messages.po
index 62182ca6..61184aac 100644
--- a/lam/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/lam/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: LAM 1.3\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de\n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2008-01-11 09:23+0800\n"
+"PO-Revision-Date: 2008-04-14 16:36+0800\n"
 "Last-Translator: Alan Needham <needham@sina.com>\n"
 "Language-Team: Chinese(Simplified) <needham@sina.com>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../lib/modules/posixAccount.inc:375
+#: ../lib/modules/posixAccount.inc:385
 msgid "$user and $group are replaced with user name or primary group name."
 msgstr "$usert和$group会被用户名或主要组名替代"
 
@@ -32,7 +32,8 @@ msgstr "找到 %s 个別名"
 msgid "%s domain(s) found"
 msgstr "找到 %s 个 Samba 域"
 
-#: ../lib/types/group.inc:120
+#: ../lib/types/gon.inc:110
+#: ../lib/types/group.inc:122
 #, php-format
 msgid "%s group(s) found"
 msgstr "找到 %s 个组"
@@ -68,27 +69,27 @@ msgstr "(本条目没有新的可用属性)"
 msgid "(no new binary attributes available for this entry)"
 msgstr "(本条目没有新的可用binary属性)"
 
-#: ../lib/modules/posixAccount.inc:226
+#: ../lib/modules/posixAccount.inc:232
 msgid "/home/smiller"
 msgstr "/home/smiller"
 
-#: ../lib/modules/inetOrgPerson.inc:251
+#: ../lib/modules/inetOrgPerson.inc:265
 msgid "123-123-1234"
 msgstr "123-123-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:263
+#: ../lib/modules/inetOrgPerson.inc:277
 msgid "123-123-1235"
 msgstr "123-123-1235"
 
-#: ../lib/modules/inetOrgPerson.inc:269
+#: ../lib/modules/inetOrgPerson.inc:283
 msgid "123-123-1236"
 msgstr "123-123-1236"
 
-#: ../lib/modules/inetOrgPerson.inc:257
+#: ../lib/modules/inetOrgPerson.inc:271
 msgid "123-124-1234"
 msgstr "123-124-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:245
+#: ../lib/modules/inetOrgPerson.inc:259
 msgid "12345"
 msgstr "12345"
 
@@ -96,20 +97,11 @@ msgstr "12345"
 msgid "A required column is missing in your CSV file."
 msgstr "您的CSV文件中缺少一个必要的列."
 
-#: ../lib/modules/kolabUser.inc:135
+#: ../lib/modules/kolabUser.inc:154
 msgid "A user may define who is allowed to act on behalf of herself. This property is checked when using the Kolab smtp daemon (Postfix) to send emails."
 msgstr "使用者可以同意由某人来代表自己，在 Kolab smtp 服务器(Postfix)发送电子邮件时会检查这个属性."
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:76
-#: ../lib/modules/neofonieInetOrgPerson.inc:124
-#: ../lib/modules/neofonieInetOrgPerson.inc:178
-#: ../lib/modules/neofonieInetOrgPerson.inc:227
-#: ../lib/modules/neofonieInetOrgPerson.inc:600
-#: ../lib/modules/neofonieInetOrgPerson.inc:724
-msgid "AIM account"
-msgstr "AIM帐号"
-
-#: ../lib/modules/sambaSamAccount.inc:492
+#: ../lib/modules/sambaSamAccount.inc:494
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "阿布达比, 马斯凯特, 巴库"
 
@@ -117,16 +109,16 @@ msgstr "阿布达比, 马斯凯特, 巴库"
 msgid "Access level"
 msgstr "访问级别"
 
-#: ../lib/modules/account.inc:56
+#: ../lib/modules/account.inc:58
 msgid "Account"
 msgstr "帐号"
 
 #: ../templates/massBuildAccounts.php:170
-#: ../lib/modules/account.inc:134
-#: ../lib/modules/ieee802device.inc:87
-#: ../lib/modules/posixGroup.inc:469
-#: ../lib/modules/posixGroup.inc:473
-#: ../lib/modules/posixGroup.inc:474
+#: ../lib/modules/account.inc:136
+#: ../lib/modules/ieee802device.inc:89
+#: ../lib/modules/posixGroup.inc:477
+#: ../lib/modules/posixGroup.inc:481
+#: ../lib/modules/posixGroup.inc:482
 #: ../lib/modules/quota.inc:46
 #: ../lib/modules/quota.inc:48
 #: ../lib/modules/quota.inc:50
@@ -134,8 +126,6 @@ msgstr "帐号"
 #: ../lib/modules/quota.inc:54
 #: ../lib/modules/quota.inc:56
 #: ../lib/modules/quota.inc:57
-#: ../lib/modules/neofonieInetOrgPerson.inc:32
-#: ../lib/modules/neofonieInetOrgPerson.inc:33
 #: ../lib/modules/sambaAccount.inc:63
 #: ../lib/modules/sambaAccount.inc:66
 #: ../lib/modules/sambaAccount.inc:69
@@ -184,27 +174,29 @@ msgstr "帐号"
 #: ../lib/modules/posixAccount.inc:90
 #: ../lib/modules/posixAccount.inc:91
 #: ../lib/modules/posixAccount.inc:93
-#: ../lib/modules/kolabUser.inc:227
-#: ../lib/modules/kolabUser.inc:229
-#: ../lib/modules/kolabUser.inc:231
-#: ../lib/modules/kolabUser.inc:233
-#: ../lib/modules/kolabUser.inc:235
-#: ../lib/modules/kolabUser.inc:237
-#: ../lib/modules/kolabUser.inc:239
-#: ../lib/modules/sambaGroupMapping.inc:396
-#: ../lib/modules/sambaGroupMapping.inc:397
+#: ../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/phpGroupwareUser.inc:124
+#: ../lib/modules/phpGroupwareUser.inc:125
+#: ../lib/modules/sambaGroupMapping.inc:398
+#: ../lib/modules/sambaGroupMapping.inc:399
 #: ../lib/modules/shadowAccount.inc:47
 #: ../lib/modules/shadowAccount.inc:49
 #: ../lib/modules/shadowAccount.inc:51
 #: ../lib/modules/shadowAccount.inc:53
 #: ../lib/modules/shadowAccount.inc:55
 #: ../lib/modules/shadowAccount.inc:56
-#: ../lib/modules/sambaDomain.inc:187
 #: ../lib/modules/sambaDomain.inc:189
 #: ../lib/modules/sambaDomain.inc:191
 #: ../lib/modules/sambaDomain.inc:193
 #: ../lib/modules/sambaDomain.inc:195
 #: ../lib/modules/sambaDomain.inc:197
+#: ../lib/modules/sambaDomain.inc:199
 #: ../lib/modules/inetOrgPerson.inc:72
 #: ../lib/modules/inetOrgPerson.inc:74
 #: ../lib/modules/inetOrgPerson.inc:76
@@ -224,11 +216,11 @@ msgstr "帐号"
 #: ../lib/modules/inetOrgPerson.inc:102
 #: ../lib/modules/inetOrgPerson.inc:105
 #: ../lib/modules/inetOrgPerson.inc:108
-#: ../lib/modules/inetLocalMailRecipient.inc:123
 #: ../lib/modules/inetLocalMailRecipient.inc:125
 #: ../lib/modules/inetLocalMailRecipient.inc:127
-#: ../lib/modules/nisMailAlias.inc:104
+#: ../lib/modules/inetLocalMailRecipient.inc:129
 #: ../lib/modules/nisMailAlias.inc:106
+#: ../lib/modules/nisMailAlias.inc:108
 #, php-format
 msgid "Account %s:"
 msgstr "帐号 %s:"
@@ -237,7 +229,7 @@ msgstr "帐号 %s:"
 msgid "Account creation via file upload"
 msgstr "通过上传文件建立帐号"
 
-#: ../lib/modules/posixAccount.inc:382
+#: ../lib/modules/posixAccount.inc:392
 msgid "Account deactivated"
 msgstr "帐号已停用"
 
@@ -245,42 +237,47 @@ msgstr "帐号已停用"
 msgid "Account details"
 msgstr "帐号详细信息"
 
-#: ../lib/modules/sambaSamAccount.inc:275
-#: ../lib/modules/sambaSamAccount.inc:395
-#: ../lib/modules/sambaSamAccount.inc:1042
-#: ../lib/modules/sambaSamAccount.inc:1275
-#: ../lib/modules/sambaSamAccount.inc:1465
-#: ../lib/modules/shadowAccount.inc:107
-#: ../lib/modules/shadowAccount.inc:172
-#: ../lib/modules/shadowAccount.inc:204
-#: ../lib/modules/shadowAccount.inc:292
-#: ../lib/modules/shadowAccount.inc:337
+#: ../lib/modules/sambaSamAccount.inc:277
+#: ../lib/modules/sambaSamAccount.inc:397
+#: ../lib/modules/sambaSamAccount.inc:1028
+#: ../lib/modules/sambaSamAccount.inc:1261
+#: ../lib/modules/sambaSamAccount.inc:1451
+#: ../lib/modules/phpGroupwareUser.inc:82
+#: ../lib/modules/phpGroupwareUser.inc:111
+#: ../lib/modules/phpGroupwareUser.inc:142
+#: ../lib/modules/phpGroupwareUser.inc:225
+#: ../lib/modules/phpGroupwareUser.inc:378
+#: ../lib/modules/shadowAccount.inc:109
+#: ../lib/modules/shadowAccount.inc:174
+#: ../lib/modules/shadowAccount.inc:206
+#: ../lib/modules/shadowAccount.inc:294
+#: ../lib/modules/shadowAccount.inc:339
 msgid "Account expiration date"
 msgstr "帐号过期日期"
 
-#: ../lib/modules/shadowAccount.inc:365
+#: ../lib/modules/shadowAccount.inc:367
 msgid "Account inactive"
 msgstr "帐号停用(inactive)"
 
-#: ../lib/modules/sambaAccount.inc:140
-#: ../lib/modules/sambaAccount.inc:257
-#: ../lib/modules/sambaAccount.inc:369
-#: ../lib/modules/sambaAccount.inc:372
-#: ../lib/modules/sambaAccount.inc:760
-#: ../lib/modules/sambaSamAccount.inc:218
-#: ../lib/modules/sambaSamAccount.inc:224
-#: ../lib/modules/sambaSamAccount.inc:373
-#: ../lib/modules/sambaSamAccount.inc:985
-#: ../lib/modules/sambaSamAccount.inc:1453
+#: ../lib/modules/sambaAccount.inc:142
+#: ../lib/modules/sambaAccount.inc:259
+#: ../lib/modules/sambaAccount.inc:371
+#: ../lib/modules/sambaAccount.inc:374
+#: ../lib/modules/sambaAccount.inc:762
+#: ../lib/modules/sambaSamAccount.inc:220
+#: ../lib/modules/sambaSamAccount.inc:226
+#: ../lib/modules/sambaSamAccount.inc:375
+#: ../lib/modules/sambaSamAccount.inc:971
+#: ../lib/modules/sambaSamAccount.inc:1439
 msgid "Account is deactivated"
 msgstr "帐号已经停用"
 
-#: ../lib/modules/sambaSamAccount.inc:221
-#: ../lib/modules/sambaSamAccount.inc:993
+#: ../lib/modules/sambaSamAccount.inc:223
+#: ../lib/modules/sambaSamAccount.inc:979
 msgid "Account is locked"
 msgstr "帐号锁定"
 
-#: ../help/help.inc:137
+#: ../help/help.inc:139
 msgid "Account lists - Filters"
 msgstr "帐号清单 － 过滤器"
 
@@ -288,8 +285,20 @@ msgstr "帐号清单 － 过滤器"
 msgid "Account name:"
 msgstr "帐号名"
 
+#: ../lib/modules/phpGroupwareUser.inc:78
+#: ../lib/modules/phpGroupwareUser.inc:104
+#: ../lib/modules/phpGroupwareUser.inc:149
+#: ../lib/modules/phpGroupwareUser.inc:373
+msgid "Account status"
+msgstr "帐号状态"
+
+#: ../lib/modules/kolabUser.inc:134
+#: ../lib/modules/kolabUser.inc:141
+msgid "Account suffix"
+msgstr "帐号后缀"
+
 #: ../templates/pdfedit/pdfdelete.php:87
-#: ../lib/modules/groupOfNames.inc:223
+#: ../lib/modules/groupOfNames.inc:225
 msgid "Account type"
 msgstr "帐号类型"
 
@@ -306,36 +315,36 @@ msgstr "帐号类型和模块"
 msgid "Account types define which sorts of LDAP entries (e.g. users and groups) should be managed. The account modules define which properties (e.g. Unix and Samba) can be edited."
 msgstr "LDAP条目类型中的帐号类型定义必须是可管理的（比如user和group),帐号模块定义中的属性（例如 UNIX 和SAMBA）必须是可编辑的。"
 
-#: ../lib/modules.inc:1063
+#: ../lib/modules.inc:1205
 msgid "Account was created successfully."
 msgstr "新增帐号成功"
 
-#: ../templates/lists/changePassword.php:352
-#: ../lib/modules.inc:1066
+#: ../templates/lists/changePassword.php:358
+#: ../lib/modules.inc:1208
 msgid "Account was modified successfully."
 msgstr "帐号修改成功"
 
-#: ../lib/modules/sambaSamAccount.inc:282
+#: ../lib/modules/sambaSamAccount.inc:284
 msgid "Activate this checkbox to allow this user to use the terminal service."
 msgstr "激活这个选项允许用户使用终端服务。"
 
-#: ../lib/modules/sambaSamAccount.inc:303
+#: ../lib/modules/sambaSamAccount.inc:305
 msgid "Activate this checkbox to connect drives from the client machine."
 msgstr "激活这个选项将从客户机上连接驱动器。"
 
-#: ../lib/modules/sambaSamAccount.inc:306
+#: ../lib/modules/sambaSamAccount.inc:308
 msgid "Activate this checkbox to connect printers from the client machine."
 msgstr "激活这个选项将从客户机上连接打印机。"
 
-#: ../lib/modules/sambaSamAccount.inc:291
+#: ../lib/modules/sambaSamAccount.inc:293
 msgid "Activate this checkbox to inherit the initial program and working directory from the client machine."
 msgstr "激活这个选项将从客户机上继承初始化程序和工作目录。"
 
-#: ../lib/modules/sambaSamAccount.inc:309
+#: ../lib/modules/sambaSamAccount.inc:311
 msgid "Activate this checkbox to set the client's printer as default printer."
 msgstr "激活这个选项将会设置客户打印机为缺省打印机。"
 
-#: ../lib/modules/posixAccount.inc:354
+#: ../lib/modules/posixAccount.inc:364
 msgid "Activating this checkbox will remove the user's home directory."
 msgstr "激活这个选项将会删除用户的主目录."
 
@@ -349,35 +358,35 @@ msgstr "激活帐号类型"
 #: ../templates/tree/add_attr_form.php:130
 #: ../templates/tree/add_attr_form.php:162
 #: ../templates/config/conftypes.php:180
-#: ../templates/pdfedit/pdfpage.php:730
-#: ../lib/modules/ieee802device.inc:109
-#: ../lib/modules/neofonieInetOrgPerson.inc:432
-#: ../lib/modules/kolabUser.inc:351
-#: ../lib/modules/kolabUser.inc:368
-#: ../lib/modules/kolabUser.inc:394
-#: ../lib/modules/ldapPublicKey.inc:103
-#: ../lib/modules/inetLocalMailRecipient.inc:165
-#: ../lib/modules/groupOfNames.inc:166
-#: ../lib/modules/groupOfNames.inc:308
-#: ../lib/modules/nisMailAlias.inc:152
+#: ../templates/pdfedit/pdfpage.php:574
+#: ../templates/pdfedit/pdfpage.php:591
+#: ../templates/pdfedit/pdfpage.php:621
+#: ../templates/pdfedit/pdfpage.php:659
+#: ../lib/modules/ieee802device.inc:111
+#: ../lib/modules/kolabUser.inc:370
+#: ../lib/modules/kolabUser.inc:387
+#: ../lib/modules/kolabUser.inc:413
+#: ../lib/modules/kolabUser.inc:878
+#: ../lib/modules/kolabUser.inc:918
+#: ../lib/modules/ldapPublicKey.inc:105
+#: ../lib/modules/inetLocalMailRecipient.inc:167
+#: ../lib/modules/groupOfNames.inc:168
+#: ../lib/modules/groupOfNames.inc:310
+#: ../lib/modules/nisMailAlias.inc:154
 msgid "Add"
 msgstr "增加"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:344
-msgid "Add Neofonie attributes"
-msgstr "新增Neofonie属性"
-
-#: ../lib/modules/sambaSamAccount.inc:1152
+#: ../lib/modules/sambaSamAccount.inc:1138
 #: ../lib/modules/sambaGroupMapping.inc:239
 msgid "Add Samba 3 account"
 msgstr "增加Samba3帐号"
 
-#: ../lib/modules/groupOfNames.inc:340
+#: ../lib/modules/groupOfNames.inc:342
 msgid "Add entries of this type:"
 msgstr "增加类型条目"
 
 #: ../templates/selfService/adminMain.php:483
-#: ../help/help.inc:171
+#: ../help/help.inc:173
 msgid "Add input field"
 msgstr "增加输入栏目"
 
@@ -394,38 +403,43 @@ msgid "Add new binary attribute"
 msgstr "新增binary属性."
 
 #: ../templates/selfService/adminMain.php:466
-#: ../help/help.inc:169
+#: ../help/help.inc:171
 msgid "Add new group"
 msgstr "新增组"
 
-#: ../lib/modules/inetOrgPerson.inc:420
-#: ../lib/modules/inetOrgPerson.inc:840
-#: ../lib/modules/inetOrgPerson.inc:925
-#: ../lib/modules/inetOrgPerson.inc:1335
+#: ../lib/modules/inetOrgPerson.inc:462
+#: ../lib/modules/inetOrgPerson.inc:939
+#: ../lib/modules/inetOrgPerson.inc:1030
+#: ../lib/modules/inetOrgPerson.inc:1492
 msgid "Add photo"
 msgstr "新增照片"
 
+#: ../lib/modules/phpGroupwareGroup.inc:73
+#: ../lib/modules/phpGroupwareGroup.inc:83
+#: ../lib/modules/phpGroupwareGroup.inc:106
+#: ../lib/modules/phpGroupwareUser.inc:74
+#: ../lib/modules/phpGroupwareUser.inc:97
+#: ../lib/modules/phpGroupwareUser.inc:183
+msgid "Add phpGroupWare extension"
+msgstr "增加 phpGroupWare 扩展"
+
 #: ../templates/config/profmanage.php:163
 #: ../templates/selfService/profManage.php:138
 #: ../help/help.inc:113
 msgid "Add profile"
 msgstr "增加配置文件"
 
-#: ../templates/pdfedit/pdfpage.php:659
-msgid "Add section or static text"
-msgstr "增加节或静态文本"
-
 #: ../templates/tree/add_value.php:97
 msgid "Adding attribute failed!"
 msgstr "增加属性失败！"
 
-#: ../lib/modules/posixAccount.inc:218
-#: ../lib/modules/posixAccount.inc:345
-#: ../lib/modules/posixAccount.inc:390
-#: ../lib/modules/posixAccount.inc:970
-#: ../lib/modules/posixAccount.inc:1063
-#: ../lib/modules/posixAccount.inc:1135
-#: ../lib/modules/posixAccount.inc:1195
+#: ../lib/modules/posixAccount.inc:224
+#: ../lib/modules/posixAccount.inc:355
+#: ../lib/modules/posixAccount.inc:400
+#: ../lib/modules/posixAccount.inc:995
+#: ../lib/modules/posixAccount.inc:1088
+#: ../lib/modules/posixAccount.inc:1160
+#: ../lib/modules/posixAccount.inc:1220
 msgid "Additional groups"
 msgstr "附加组"
 
@@ -433,37 +447,37 @@ msgstr "附加组"
 msgid "Additional tasks for module:"
 msgstr "模块的附加任务："
 
-#: ../help/help.inc:170
+#: ../help/help.inc:172
 msgid "Adds a new group element to the list of self service options. Use this to structure the input fields."
 msgstr "为自助服务选项列表新增组元素.利用它建立输入栏目."
 
-#: ../help/help.inc:172
+#: ../help/help.inc:174
 msgid "Adds a new self service option to the selected group element."
 msgstr "为选定的组元素增加新的自助服务选项."
 
-#: ../lib/modules/inetOrgPerson.inc:221
+#: ../lib/modules/inetOrgPerson.inc:235
 msgid "Administration"
 msgstr "管理者"
 
-#: ../lib/modules/posixGroup.inc:356
-#: ../lib/modules/groupOfNames.inc:91
+#: ../lib/modules/posixGroup.inc:364
+#: ../lib/modules/groupOfNames.inc:93
 msgid "Administrators group"
 msgstr "管理员组"
 
-#: ../lib/modules/sambaSamAccount.inc:479
+#: ../lib/modules/sambaSamAccount.inc:481
 msgid "Alaska"
 msgstr "阿拉斯加"
 
-#: ../lib/modules/sambaDomain.inc:196
-#: ../lib/modules/sambaDomain.inc:197
+#: ../lib/modules/sambaDomain.inc:198
+#: ../lib/modules/sambaDomain.inc:199
 msgid "Algorithmic RID base is not a number!"
 msgstr "RID算法的基数不是一个数字!"
 
 #: ../lib/types/mailAlias.inc:82
-#: ../lib/modules/nisMailAlias.inc:65
-#: ../lib/modules/nisMailAlias.inc:80
-#: ../lib/modules/nisMailAlias.inc:137
-#: ../lib/modules/nisMailAlias.inc:274
+#: ../lib/modules/nisMailAlias.inc:67
+#: ../lib/modules/nisMailAlias.inc:82
+#: ../lib/modules/nisMailAlias.inc:139
+#: ../lib/modules/nisMailAlias.inc:276
 msgid "Alias name"
 msgstr "别名"
 
@@ -476,12 +490,12 @@ msgstr "别名"
 msgid "All accounts (%s)"
 msgstr "所有帐号 %s:"
 
-#: ../templates/selfService/selfServiceMain.php:145
+#: ../templates/selfService/selfServiceMain.php:146
 #: ../templates/initsuff.php:160
 msgid "All changes were successful."
 msgstr "修改成功."
 
-#: ../help/help.inc:178
+#: ../help/help.inc:180
 msgid "All following lines form the mail body."
 msgstr "邮件主体的所有行"
 
@@ -490,32 +504,32 @@ msgstr "邮件主体的所有行"
 msgid "All selected accounts (%s)"
 msgstr "所有选中的帐号(%s)"
 
-#: ../lib/modules/sambaDomain.inc:108
-#: ../lib/modules/sambaDomain.inc:297
-#: ../lib/modules/sambaDomain.inc:667
+#: ../lib/modules/sambaDomain.inc:110
+#: ../lib/modules/sambaDomain.inc:299
+#: ../lib/modules/sambaDomain.inc:669
 msgid "Allow machine password changes"
 msgstr "允许改变主机密码"
 
-#: ../lib/modules/sambaSamAccount.inc:281
-#: ../lib/modules/sambaSamAccount.inc:1318
-#: ../lib/modules/sambaSamAccount.inc:1682
+#: ../lib/modules/sambaSamAccount.inc:283
+#: ../lib/modules/sambaSamAccount.inc:1304
+#: ../lib/modules/sambaSamAccount.inc:1668
 msgid "Allow terminal server login"
 msgstr "允许终端服务登录"
 
-#: ../templates/config/mainmanage.php:181
+#: ../templates/config/mainmanage.php:188
 #: ../lib/types/user.inc:86
 #: ../help/help.inc:135
 msgid "Allowed hosts"
 msgstr "允许的主机"
 
-#: ../lib/modules/sambaAccount.inc:865
-#: ../lib/modules/sambaAccount.inc:866
-#: ../lib/modules/sambaSamAccount.inc:1175
-#: ../lib/modules/sambaSamAccount.inc:1176
+#: ../lib/modules/sambaAccount.inc:867
+#: ../lib/modules/sambaAccount.inc:868
+#: ../lib/modules/sambaSamAccount.inc:1161
+#: ../lib/modules/sambaSamAccount.inc:1162
 msgid "Allowed workstations"
 msgstr "允许的工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:494
+#: ../lib/modules/sambaSamAccount.inc:496
 msgid "Almaty, Dhaka, Colombo"
 msgstr "阿尔迈迪，达卡，科伦坡"
 
@@ -532,8 +546,9 @@ msgstr "总是拒绝"
 msgid "An attribute (%s) was modified and is highlighted below."
 msgstr "下面高亮的属性(%s)已经被修改."
 
-#: ../lib/modules/kolabUser.inc:333
-#: ../lib/modules/kolabUser.inc:778
+#: ../lib/modules/kolabUser.inc:352
+#: ../lib/modules/kolabUser.inc:797
+#: ../lib/modules/kolabUser.inc:899
 msgid "Anyone"
 msgstr "任何人"
 
@@ -541,7 +556,7 @@ msgstr "任何人"
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "确认永久删除这个对象?"
 
-#: ../lib/modules/sambaSamAccount.inc:484
+#: ../lib/modules/sambaSamAccount.inc:486
 msgid "Atlantic time (Canada), Caracas"
 msgstr "大西洋时间(加拿大),卡拉卡斯"
 
@@ -554,19 +569,15 @@ msgstr "属性"
 msgid "Attribute types"
 msgstr "属性类型"
 
-#: ../lib/modules/sambaSamAccount.inc:500
+#: ../lib/modules/sambaSamAccount.inc:502
 msgid "Auckland, Fiji, Kamchatka"
 msgstr "奥克兰,斐济,堪察加"
 
-#: ../templates/pdfedit/pdfpage.php:608
-msgid "Available PDF fields"
-msgstr "有效的PDF栏目"
-
 #: ../templates/config/conftypes.php:173
 msgid "Available account types"
 msgstr "有效的帐号类型"
 
-#: ../lib/modules/posixAccount.inc:1075
+#: ../lib/modules/posixAccount.inc:1100
 msgid "Available groups"
 msgstr "可选组"
 
@@ -574,32 +585,32 @@ msgstr "可选组"
 msgid "Available modules"
 msgstr "可选模块"
 
-#: ../lib/modules/posixGroup.inc:238
+#: ../lib/modules/posixGroup.inc:246
 msgid "Available users"
 msgstr "可选用户"
 
-#: ../lib/modules/sambaAccount.inc:871
-#: ../lib/modules/sambaSamAccount.inc:1181
+#: ../lib/modules/sambaAccount.inc:873
+#: ../lib/modules/sambaSamAccount.inc:1167
 msgid "Available workstations"
 msgstr "可选工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:487
+#: ../lib/modules/sambaSamAccount.inc:489
 msgid "Azores, Cape Verde Islands"
 msgstr "亚速尔,维德角岛"
 
 #: ../templates/tree/update_confirm.php:255
-#: ../lib/modules/posixGroup.inc:244
-#: ../lib/modules/posixGroup.inc:267
-#: ../lib/modules/sambaAccount.inc:876
-#: ../lib/modules/sambaSamAccount.inc:1185
-#: ../lib/modules/posixAccount.inc:1081
-#: ../lib/modules/inetOrgPerson.inc:926
-#: ../lib/modules/groupOfNames.inc:350
+#: ../lib/modules/posixGroup.inc:252
+#: ../lib/modules/posixGroup.inc:275
+#: ../lib/modules/sambaAccount.inc:878
+#: ../lib/modules/sambaSamAccount.inc:1171
+#: ../lib/modules/posixAccount.inc:1106
+#: ../lib/modules/inetOrgPerson.inc:1031
+#: ../lib/modules/groupOfNames.inc:352
 msgid "Back"
 msgstr "返回"
 
 #: ../templates/config/index.php:114
-#: ../templates/config/confmain.php:602
+#: ../templates/config/confmain.php:605
 #: ../templates/config/conflogin.php:153
 #: ../templates/config/mainlogin.php:138
 #: ../templates/selfService/adminLogin.php:150
@@ -615,11 +626,11 @@ msgstr "返回到OU编辑器"
 
 #: ../templates/pdfedit/pdfdelete.php:67
 #: ../templates/pdfedit/pdfdelete.php:75
-#: ../templates/pdfedit/pdfpage.php:120
+#: ../templates/pdfedit/pdfpage.php:106
 msgid "Back to PDF Editor"
 msgstr "返回到PDF编辑器"
 
-#: ../lib/modules.inc:1074
+#: ../lib/modules.inc:1216
 msgid "Back to account list"
 msgstr "返回到帐号列表"
 
@@ -631,8 +642,8 @@ msgstr "返回到组列表"
 msgid "Back to list"
 msgstr "返回列表"
 
-#: ../templates/config/mainmanage.php:134
-#: ../templates/config/mainmanage.php:336
+#: ../templates/config/mainmanage.php:141
+#: ../templates/config/mainmanage.php:384
 msgid "Back to login"
 msgstr "返回到登录界面"
 
@@ -647,11 +658,11 @@ msgstr "返回到配置文件编辑器"
 msgid "Back to profile login"
 msgstr "返回到配置文件登录"
 
-#: ../lib/modules/sambaSamAccount.inc:491
+#: ../lib/modules/sambaSamAccount.inc:493
 msgid "Baghdad, Riyadh, Moscow"
 msgstr "巴格达,利雅得,莫斯科"
 
-#: ../lib/modules/sambaSamAccount.inc:495
+#: ../lib/modules/sambaSamAccount.inc:497
 msgid "Bangkok, Hanoi, Jakarta"
 msgstr "曼谷,河内,安卡拉"
 
@@ -668,11 +679,11 @@ msgstr "基本DN"
 msgid "Base module"
 msgstr "基本模块"
 
-#: ../templates/pdfedit/pdfpage.php:462
+#: ../templates/pdfedit/pdfpage.php:406
 msgid "Beginning"
 msgstr "开始"
 
-#: ../lib/modules/sambaSamAccount.inc:496
+#: ../lib/modules/sambaSamAccount.inc:498
 msgid "Beijing, Perth, Singapore"
 msgstr "北京,佩斯,新加坡"
 
@@ -681,14 +692,6 @@ msgstr "北京,佩斯,新加坡"
 msgid "Binary value"
 msgstr "二进制值"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:106
-#: ../lib/modules/neofonieInetOrgPerson.inc:174
-#: ../lib/modules/neofonieInetOrgPerson.inc:329
-#: ../lib/modules/neofonieInetOrgPerson.inc:510
-#: ../lib/modules/neofonieInetOrgPerson.inc:598
-msgid "Birth date"
-msgstr "生日"
-
 #: ../lib/modules/quota.inc:47
 msgid "Block hard quota"
 msgstr "块数硬性限额"
@@ -716,7 +719,7 @@ msgstr "块数软性限额包含非法字符,只能使用自然数."
 msgid "Block soft quota must be smaller than block hard quota."
 msgstr "块数软性限额必须小于硬性限额."
 
-#: ../lib/modules/sambaSamAccount.inc:485
+#: ../lib/modules/sambaSamAccount.inc:487
 msgid "Brazil, Buenos Aires"
 msgstr "巴西,布宜诺斯艾利斯"
 
@@ -725,14 +728,14 @@ msgid "Builtin group"
 msgstr "内置组"
 
 #: ../lib/modules/inetOrgPerson.inc:107
-#: ../lib/modules/inetOrgPerson.inc:219
-#: ../lib/modules/inetOrgPerson.inc:432
-#: ../lib/modules/inetOrgPerson.inc:793
-#: ../lib/modules/inetOrgPerson.inc:956
+#: ../lib/modules/inetOrgPerson.inc:233
+#: ../lib/modules/inetOrgPerson.inc:474
+#: ../lib/modules/inetOrgPerson.inc:892
+#: ../lib/modules/inetOrgPerson.inc:1061
 msgid "Business category"
 msgstr "商业种类"
 
-#: ../lib/modules/inetOrgPerson.inc:433
+#: ../lib/modules/inetOrgPerson.inc:475
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "商业种类(比如:行政部门,IT服务部门,管理部门,...)"
 
@@ -745,25 +748,25 @@ msgstr "CSV 文件:"
 msgid "Cache timeout"
 msgstr "缓存超时"
 
-#: ../templates/config/confmain.php:498
+#: ../templates/config/confmain.php:497
 msgid "Cache timeout is invalid!"
 msgstr "缓存超时非法"
 
-#: ../lib/modules/sambaAccount.inc:384
-#: ../lib/modules/sambaAccount.inc:387
-#: ../lib/modules/sambaAccount.inc:390
-#: ../lib/modules/sambaAccount.inc:396
-#: ../lib/modules/sambaAccount.inc:408
-#: ../lib/modules/sambaSamAccount.inc:236
-#: ../lib/modules/sambaSamAccount.inc:239
-#: ../lib/modules/sambaSamAccount.inc:242
-#: ../lib/modules/sambaSamAccount.inc:248
-#: ../lib/modules/posixAccount.inc:391
-#: ../lib/modules/sambaGroupMapping.inc:325
-#: ../lib/modules/shadowAccount.inc:157
-#: ../lib/modules/shadowAccount.inc:161
-#: ../lib/modules/shadowAccount.inc:165
-#: ../lib/modules/shadowAccount.inc:169
+#: ../lib/modules/sambaAccount.inc:386
+#: ../lib/modules/sambaAccount.inc:389
+#: ../lib/modules/sambaAccount.inc:392
+#: ../lib/modules/sambaAccount.inc:398
+#: ../lib/modules/sambaAccount.inc:410
+#: ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/posixAccount.inc:401
+#: ../lib/modules/sambaGroupMapping.inc:327
+#: ../lib/modules/shadowAccount.inc:159
+#: ../lib/modules/shadowAccount.inc:163
+#: ../lib/modules/shadowAccount.inc:167
+#: ../lib/modules/shadowAccount.inc:171
 msgid "Can be left empty."
 msgstr "可以置空"
 
@@ -776,38 +779,38 @@ msgstr "可以置空"
 #: ../templates/config/conftypes.php:239
 #: ../templates/selfService/adminMain.php:547
 #: ../templates/pdfedit/pdfdelete.php:97
-#: ../templates/pdfedit/pdfpage.php:778
+#: ../templates/pdfedit/pdfpage.php:705
 #: ../templates/pdfedit/pdfmain.php:156
 #: ../templates/delete.php:117
 #: ../templates/profedit/profiledelete.php:86
 #: ../templates/profedit/profilepage.php:262
 #: ../templates/profedit/profilemain.php:169
 #: ../templates/initsuff.php:193
-#: ../lib/modules/neofonieInetOrgPerson.inc:540
-#: ../lib/modules/sambaSamAccount.inc:1250
-#: ../lib/modules/sambaSamAccount.inc:1298
-#: ../lib/modules/sambaSamAccount.inc:1421
-#: ../lib/modules/posixAccount.inc:1110
-#: ../lib/modules/kolabUser.inc:570
-#: ../lib/modules/shadowAccount.inc:350
-#: ../lib/modules/inetOrgPerson.inc:889
-#: ../lib/modules/groupOfNames.inc:229
-#: ../lib/modules/groupOfNames.inc:256
-#: ../lib/modules/groupOfNames.inc:309
+#: ../lib/modules/sambaSamAccount.inc:1236
+#: ../lib/modules/sambaSamAccount.inc:1284
+#: ../lib/modules/sambaSamAccount.inc:1407
+#: ../lib/modules/posixAccount.inc:1135
+#: ../lib/modules/kolabUser.inc:589
+#: ../lib/modules/phpGroupwareUser.inc:248
+#: ../lib/modules/shadowAccount.inc:352
+#: ../lib/modules/inetOrgPerson.inc:994
+#: ../lib/modules/groupOfNames.inc:231
+#: ../lib/modules/groupOfNames.inc:258
+#: ../lib/modules/groupOfNames.inc:311
 #: ../lib/lists.inc:669
 #: ../lib/lists.inc:900
 msgid "Cancel"
 msgstr "取消"
 
-#: ../templates/login.php:419
-#: ../templates/login.php:424
+#: ../templates/login.php:430
+#: ../templates/login.php:435
 #: ../templates/selfService/selfServiceLogin.php:105
 #: ../templates/selfService/selfServiceLogin.php:109
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "无法连接指定的LDAP服务器,请再试一次."
 
 #: ../lib/config.inc:392
-#: ../lib/config.inc:990
+#: ../lib/config.inc:1016
 msgid "Cannot open config file!"
 msgstr "无法打开配置文件!"
 
@@ -815,37 +818,40 @@ msgstr "无法打开配置文件!"
 msgid "Captions and labels"
 msgstr "标题和标签"
 
-#: ../lib/modules/sambaSamAccount.inc:489
+#: ../lib/modules/inetOrgPerson.inc:155
+#: ../lib/modules/inetOrgPerson.inc:311
+#: ../lib/modules/inetOrgPerson.inc:486
+#: ../lib/modules/inetOrgPerson.inc:878
+#: ../lib/modules/inetOrgPerson.inc:1063
+#: ../lib/modules/inetOrgPerson.inc:1453
+msgid "Car license"
+msgstr "汽车执照"
+
+#: ../lib/modules/sambaSamAccount.inc:491
 msgid "Central Europe Time, Paris, Berlin"
 msgstr "欧洲中央时间,巴黎,柏林"
 
-#: ../lib/modules/sambaSamAccount.inc:482
+#: ../lib/modules/sambaSamAccount.inc:484
 msgid "Central Time (US & Canada), Mexico City"
 msgstr "中央时间(美国和加拿大),墨西哥市 "
 
 #: ../templates/selfService/adminMain.php:409
-#: ../templates/pdfedit/pdfpage.php:504
-#: ../templates/pdfedit/pdfpage.php:510
-#: ../lib/modules/neofonieInetOrgPerson.inc:248
-#: ../lib/modules/neofonieInetOrgPerson.inc:260
-#: ../lib/modules/neofonieInetOrgPerson.inc:288
-#: ../lib/modules/neofonieInetOrgPerson.inc:300
-#: ../lib/modules/neofonieInetOrgPerson.inc:312
-#: ../lib/modules/neofonieInetOrgPerson.inc:322
-#: ../lib/modules/neofonieInetOrgPerson.inc:332
-#: ../lib/modules/neofonieInetOrgPerson.inc:536
-#: ../lib/modules/sambaSamAccount.inc:1011
-#: ../lib/modules/sambaSamAccount.inc:1028
-#: ../lib/modules/sambaSamAccount.inc:1045
-#: ../lib/modules/sambaSamAccount.inc:1294
-#: ../lib/modules/shadowAccount.inc:295
-#: ../lib/modules/shadowAccount.inc:346
-#: ../lib/modules/groupOfNames.inc:155
-#: ../lib/modules/groupOfNames.inc:172
+#: ../templates/pdfedit/pdfpage.php:453
+#: ../templates/pdfedit/pdfpage.php:459
+#: ../lib/modules/sambaSamAccount.inc:997
+#: ../lib/modules/sambaSamAccount.inc:1014
+#: ../lib/modules/sambaSamAccount.inc:1031
+#: ../lib/modules/sambaSamAccount.inc:1280
+#: ../lib/modules/phpGroupwareUser.inc:145
+#: ../lib/modules/phpGroupwareUser.inc:244
+#: ../lib/modules/shadowAccount.inc:297
+#: ../lib/modules/shadowAccount.inc:348
+#: ../lib/modules/groupOfNames.inc:157
+#: ../lib/modules/groupOfNames.inc:174
 msgid "Change"
 msgstr "更改"
 
-#: ../lib/modules/posixGroup.inc:196
+#: ../lib/modules/posixGroup.inc:198
 msgid "Change GID number of users and hosts"
 msgstr "更改用户和主机的GID号"
 
@@ -858,7 +864,7 @@ msgstr "更改缺省的配置文件"
 msgid "Change list settings"
 msgstr "改变列表设置"
 
-#: ../templates/config/mainmanage.php:290
+#: ../templates/config/mainmanage.php:338
 #: ../help/help.inc:123
 msgid "Change master password"
 msgstr "更改管理员密码"
@@ -866,10 +872,10 @@ msgstr "更改管理员密码"
 #: ../templates/lists/changePassword.php:113
 #: ../templates/lists/changePassword.php:185
 #: ../templates/lists/changePassword.php:212
-#: ../lib/types/user.inc:229
-#: ../lib/modules/posixGroup.inc:186
-#: ../lib/modules/posixAccount.inc:1016
-#: ../lib/modules/inetOrgPerson.inc:697
+#: ../lib/types/user.inc:236
+#: ../lib/modules/posixGroup.inc:188
+#: ../lib/modules/posixAccount.inc:1041
+#: ../lib/modules/inetOrgPerson.inc:765
 #: ../help/help.inc:99
 msgid "Change password"
 msgstr "更改密码"
@@ -879,7 +885,7 @@ msgstr "更改密码"
 msgid "Change passwords"
 msgstr "更改密码 "
 
-#: ../templates/login.php:344
+#: ../templates/login.php:356
 msgid "Change profile"
 msgstr "改变配置文件"
 
@@ -892,7 +898,7 @@ msgstr "修改设置"
 msgid "Change suffix"
 msgstr "更改后缀"
 
-#: ../lib/modules/posixAccount.inc:841
+#: ../lib/modules/posixAccount.inc:860
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "值已改变,因为只能使用ASCII字符."
 
@@ -904,6 +910,10 @@ msgstr "请检查是否可能管理限额和主目录"
 msgid "Check if the LDAP schema fits the requirements of the selected account modules."
 msgstr "检查LDAP的架构是否符合选中的帐号模块需求"
 
+#: ../templates/tests/lamdaemonTest.php:98
+msgid "Check quotas"
+msgstr "检查限额"
+
 #: ../templates/masscreate.php:128
 msgid "Check your input carefully. LAM will only do some basic checks on the upload data."
 msgstr "请仔细检查输入,上传前程序仅做基本检查."
@@ -921,9 +931,9 @@ msgstr "选择一个模板"
 msgid "Click here if you are not directed to the next page."
 msgstr "如果没有自动跳转到下一页请点此处."
 
-#: ../lib/modules/sambaSamAccount.inc:308
-#: ../lib/modules/sambaSamAccount.inc:1384
-#: ../lib/modules/sambaSamAccount.inc:1710
+#: ../lib/modules/sambaSamAccount.inc:310
+#: ../lib/modules/sambaSamAccount.inc:1370
+#: ../lib/modules/sambaSamAccount.inc:1696
 msgid "Client printer is default"
 msgstr "缺省为客户打印机"
 
@@ -935,18 +945,8 @@ msgstr "集合(Collective)"
 msgid "Columns:"
 msgstr "列:"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:82
-#: ../lib/modules/neofonieInetOrgPerson.inc:134
-#: ../lib/modules/neofonieInetOrgPerson.inc:179
-#: ../lib/modules/neofonieInetOrgPerson.inc:245
-#: ../lib/modules/neofonieInetOrgPerson.inc:386
-#: ../lib/modules/neofonieInetOrgPerson.inc:623
-#: ../lib/modules/neofonieInetOrgPerson.inc:740
-msgid "ComBots IDs"
-msgstr "ComBots ID号"
-
-#: ../lib/modules/sambaAccount.inc:396
-#: ../lib/modules/sambaSamAccount.inc:248
+#: ../lib/modules/sambaAccount.inc:398
+#: ../lib/modules/sambaSamAccount.inc:250
 msgid "Comma separated list of Samba workstations the user is allowed to login. Empty means every workstation."
 msgstr "用户可以登录的Samba工作站,用逗号分隔,空值表示所有工作站."
 
@@ -955,16 +955,16 @@ msgid "Commit"
 msgstr "提交"
 
 #: ../lib/modules/posixAccount.inc:92
-#: ../lib/modules/posixAccount.inc:199
-#: ../lib/modules/posixAccount.inc:394
-#: ../lib/modules/posixAccount.inc:416
-#: ../lib/modules/posixAccount.inc:943
-#: ../lib/modules/posixAccount.inc:1190
+#: ../lib/modules/posixAccount.inc:205
+#: ../lib/modules/posixAccount.inc:404
+#: ../lib/modules/posixAccount.inc:426
+#: ../lib/modules/posixAccount.inc:968
+#: ../lib/modules/posixAccount.inc:1215
 #: ../lib/modules/inetOrgPerson.inc:97
-#: ../lib/modules/inetOrgPerson.inc:290
-#: ../lib/modules/inetOrgPerson.inc:404
-#: ../lib/modules/inetOrgPerson.inc:665
-#: ../lib/modules/inetOrgPerson.inc:954
+#: ../lib/modules/inetOrgPerson.inc:328
+#: ../lib/modules/inetOrgPerson.inc:446
+#: ../lib/modules/inetOrgPerson.inc:733
+#: ../lib/modules/inetOrgPerson.inc:1059
 msgid "Common name"
 msgstr "全名"
 
@@ -994,20 +994,20 @@ msgstr "配置向导"
 msgid "Conflicting module:"
 msgstr "冲突的模块:"
 
-#: ../lib/modules/sambaSamAccount.inc:302
-#: ../lib/modules/sambaSamAccount.inc:1374
-#: ../lib/modules/sambaSamAccount.inc:1700
+#: ../lib/modules/sambaSamAccount.inc:304
+#: ../lib/modules/sambaSamAccount.inc:1360
+#: ../lib/modules/sambaSamAccount.inc:1686
 msgid "Connect client drives"
 msgstr "连接客户驱动器"
 
-#: ../lib/modules/sambaSamAccount.inc:305
-#: ../lib/modules/sambaSamAccount.inc:1379
-#: ../lib/modules/sambaSamAccount.inc:1705
+#: ../lib/modules/sambaSamAccount.inc:307
+#: ../lib/modules/sambaSamAccount.inc:1365
+#: ../lib/modules/sambaSamAccount.inc:1691
 msgid "Connect client printers"
 msgstr "连接客户打印机"
 
-#: ../lib/modules/sambaSamAccount.inc:1359
-#: ../lib/modules/sambaSamAccount.inc:1693
+#: ../lib/modules/sambaSamAccount.inc:1345
+#: ../lib/modules/sambaSamAccount.inc:1679
 msgid "Connection time limit"
 msgstr "连接时间限制"
 
@@ -1029,20 +1029,20 @@ msgstr "无法执行ldap_modify命令"
 msgid "Could not rename file!"
 msgstr "不能更改文件名"
 
-#: ../templates/pdfedit/pdfpage.php:117
+#: ../templates/pdfedit/pdfpage.php:103
 msgid "Could not save PDF profile, access denied."
 msgstr "无法保存PDF文件,存取拒绝."
 
-#: ../lib/modules/kolabUser.inc:87
-#: ../lib/modules/kolabUser.inc:150
-#: ../lib/modules/kolabUser.inc:179
-#: ../lib/modules/kolabUser.inc:293
-#: ../lib/modules/kolabUser.inc:754
+#: ../lib/modules/kolabUser.inc:89
+#: ../lib/modules/kolabUser.inc:169
+#: ../lib/modules/kolabUser.inc:198
+#: ../lib/modules/kolabUser.inc:312
+#: ../lib/modules/kolabUser.inc:773
 msgid "Country"
 msgstr "国家"
 
-#: ../lib/modules/kolabUser.inc:230
-#: ../lib/modules/kolabUser.inc:231
+#: ../lib/modules/kolabUser.inc:249
+#: ../lib/modules/kolabUser.inc:250
 msgid "Country name is invalid!"
 msgstr "国家名称非法!"
 
@@ -1059,8 +1059,8 @@ msgstr "对立对象"
 
 #: ../lib/lists.inc:471
 #: ../lib/lists.inc:633
-#: ../lib/modules.inc:1081
-#: ../help/help.inc:152
+#: ../lib/modules.inc:1223
+#: ../help/help.inc:154
 msgid "Create PDF file"
 msgstr "建立PDF文件"
 
@@ -1072,7 +1072,8 @@ msgstr "为所有别名建立PDF"
 msgid "Create PDF for all domains"
 msgstr "为所有域建立PDF"
 
-#: ../lib/types/group.inc:125
+#: ../lib/types/gon.inc:115
+#: ../lib/types/group.inc:127
 msgid "Create PDF for all groups"
 msgstr "为所有组建立PDF"
 
@@ -1096,7 +1097,8 @@ msgstr "为所选的别名建立PDF"
 msgid "Create PDF for selected domain(s)"
 msgstr "为所选的域建立PDF"
 
-#: ../lib/types/group.inc:124
+#: ../lib/types/gon.inc:114
+#: ../lib/types/group.inc:126
 msgid "Create PDF for selected group(s)"
 msgstr "为所选的组建立PDF"
 
@@ -1120,7 +1122,7 @@ msgstr "为此范围建立新的PDF架构:"
 msgid "Create a new profile"
 msgstr "建立新的配置文件"
 
-#: ../lib/modules.inc:1073
+#: ../lib/modules.inc:1215
 msgid "Create another account"
 msgstr "建立另外一个帐号"
 
@@ -1128,8 +1130,8 @@ msgstr "建立另外一个帐号"
 msgid "Create for"
 msgstr "建立"
 
-#: ../lib/modules/posixAccount.inc:231
-#: ../lib/modules/posixAccount.inc:986
+#: ../lib/modules/posixAccount.inc:237
+#: ../lib/modules/posixAccount.inc:1011
 msgid "Create home directory"
 msgstr "建立主目录"
 
@@ -1158,14 +1160,6 @@ msgstr "上传一个CSV格式文件批量建立帐号"
 msgid "Current list of values for attribute:"
 msgstr "当前属性所有值: "
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:94
-#: ../lib/modules/neofonieInetOrgPerson.inc:154
-#: ../lib/modules/neofonieInetOrgPerson.inc:285
-#: ../lib/modules/neofonieInetOrgPerson.inc:398
-#: ../lib/modules/neofonieInetOrgPerson.inc:605
-msgid "Current projects"
-msgstr "当前工程"
-
 #: ../templates/tree/templates/templates.inc:51
 msgid "Custom"
 msgstr "自定义"
@@ -1178,8 +1172,8 @@ msgstr "自定义"
 #: ../templates/tree/delete_form.php:77
 #: ../templates/tree/delete_form.php:151
 #: ../templates/delete.php:95
-#: ../lib/modules.inc:1162
-#: ../lib/modules.inc:1602
+#: ../lib/modules.inc:1308
+#: ../lib/modules.inc:1748
 msgid "DN"
 msgstr "DN"
 
@@ -1188,7 +1182,7 @@ msgid "DN settings"
 msgstr "DN 设置"
 
 #: ../templates/masscreate.php:154
-#: ../help/help.inc:146
+#: ../help/help.inc:148
 msgid "DN suffix"
 msgstr "DN 后缀"
 
@@ -1201,21 +1195,17 @@ msgstr "DSML输出 %s"
 msgid "Data field for RDN is empty!"
 msgstr "RDN数据文件是空的"
 
-#: ../lib/modules/sambaAccount.inc:376
-#: ../lib/modules/sambaSamAccount.inc:228
+#: ../lib/modules/sambaAccount.inc:378
+#: ../lib/modules/sambaSamAccount.inc:230
 msgid "Date after the user is able to change his password. Format: DD-MM-YYYY"
 msgstr "在这个日期后,用户才可以修改密码,格式:DD-MM-YYYY"
 
-#: ../lib/modules/sambaAccount.inc:378
-#: ../lib/modules/sambaSamAccount.inc:230
+#: ../lib/modules/sambaAccount.inc:380
+#: ../lib/modules/sambaSamAccount.inc:232
 msgid "Date after the user must change his password. Format: DD-MM-YYYY"
 msgstr "在这个日期之前,用户必须修改密码,格式:DD-MM-YYYY"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:104
-msgid "Date when the employee was initially employed."
-msgstr "雇员被雇用日期"
-
-#: ../lib/modules/shadowAccount.inc:157
+#: ../lib/modules/shadowAccount.inc:159
 msgid "Days before password is to expire that user is warned of pending password expiration. If set value must be >0."
 msgstr "在密码过期前提醒用户的天数,若设其值,必大于0."
 
@@ -1225,23 +1215,25 @@ msgid "Default language"
 msgstr "缺省语言"
 
 #: ../templates/masscreate.php:163
-#: ../templates/masscreate.php:326
+#: ../templates/masscreate.php:325
 msgid "Default value"
 msgstr "缺省值"
 
-#: ../lib/modules/sambaDomain.inc:109
+#: ../lib/modules/sambaDomain.inc:111
 msgid "Defines if workstations may change their passwords."
 msgstr "定义工作站是否更改密码."
 
-#: ../lib/modules/kolabUser.inc:134
-#: ../lib/modules/kolabUser.inc:138
-#: ../lib/modules/kolabUser.inc:198
-#: ../lib/modules/kolabUser.inc:397
-#: ../lib/modules/kolabUser.inc:792
+#: ../lib/modules/kolabUser.inc:128
+#: ../lib/modules/kolabUser.inc:153
+#: ../lib/modules/kolabUser.inc:157
+#: ../lib/modules/kolabUser.inc:217
+#: ../lib/modules/kolabUser.inc:416
+#: ../lib/modules/kolabUser.inc:811
+#: ../lib/modules/kolabUser.inc:881
 msgid "Delegates"
 msgstr "代理(Delegates)"
 
-#: ../lib/modules/kolabUser.inc:235
+#: ../lib/modules/kolabUser.inc:254
 msgid "Delegates has invalid format!"
 msgstr "代理(Delegates)格式错误"
 
@@ -1251,6 +1243,7 @@ msgstr "代理(Delegates)格式错误"
 #: ../templates/pdfedit/pdfdelete.php:96
 #: ../templates/delete.php:116
 #: ../lib/tree.inc:1178
+#: ../lib/modules/kolabUser.inc:872
 #: ../lib/lists.inc:467
 msgid "Delete"
 msgstr "删除"
@@ -1260,7 +1253,7 @@ msgstr "删除"
 msgid "Delete %s"
 msgstr "删除 %s"
 
-#: ../lib/modules/kolabUser.inc:406
+#: ../lib/modules/kolabUser.inc:425
 msgid "Delete Kolab account"
 msgstr "删除Kolab帐号"
 
@@ -1282,11 +1275,12 @@ msgstr "删除全部 %s 个对象"
 msgid "Delete domain(s)"
 msgstr "删除域"
 
-#: ../lib/types/group.inc:123
+#: ../lib/types/gon.inc:113
+#: ../lib/types/group.inc:125
 msgid "Delete group(s)"
 msgstr "删除组"
 
-#: ../lib/modules/posixAccount.inc:1035
+#: ../lib/modules/posixAccount.inc:1060
 msgid "Delete home directory"
 msgstr "删除主目录"
 
@@ -1304,11 +1298,11 @@ msgid "Delete operation canceled."
 msgstr "取消删除动作"
 
 #: ../templates/ou_edit.php:183
-#: ../help/help.inc:186
+#: ../help/help.inc:188
 msgid "Delete organizational unit"
 msgstr "删除组织单元"
 
-#: ../lib/modules/inetOrgPerson.inc:843
+#: ../lib/modules/inetOrgPerson.inc:942
 msgid "Delete photo"
 msgstr "删除照片"
 
@@ -1352,70 +1346,62 @@ msgstr "正在删除%s"
 msgid "Deleting. Please stand by ..."
 msgstr "正在删除,请稍等..."
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:88
-#: ../lib/modules/neofonieInetOrgPerson.inc:110
-#: ../lib/modules/neofonieInetOrgPerson.inc:144
-#: ../lib/modules/neofonieInetOrgPerson.inc:267
-#: ../lib/modules/neofonieInetOrgPerson.inc:608
-msgid "Department"
-msgstr "部门"
-
 #: ../templates/tree/add_value_form.php:186
 #: ../templates/schema/schema.php:94
 #: ../templates/schema/schema.php:148
 #: ../templates/schema/schema.php:351
 #: ../lib/types/user.inc:92
-#: ../lib/modules/account.inc:86
-#: ../lib/modules/account.inc:96
-#: ../lib/modules/account.inc:120
-#: ../lib/modules/account.inc:224
-#: ../lib/modules/account.inc:238
-#: ../lib/modules/posixGroup.inc:162
-#: ../lib/modules/posixGroup.inc:382
-#: ../lib/modules/posixGroup.inc:444
-#: ../lib/modules/sambaAccount.inc:896
-#: ../lib/modules/posixAccount.inc:304
-#: ../lib/modules/posixAccount.inc:412
-#: ../lib/modules/sambaGroupMapping.inc:347
-#: ../lib/modules/inetOrgPerson.inc:195
-#: ../lib/modules/inetOrgPerson.inc:348
-#: ../lib/modules/inetOrgPerson.inc:673
-#: ../lib/modules/inetOrgPerson.inc:938
-#: ../lib/modules/groupOfNames.inc:62
-#: ../lib/modules/groupOfNames.inc:89
-#: ../lib/modules/groupOfNames.inc:141
-#: ../lib/modules/groupOfNames.inc:441
+#: ../lib/modules/account.inc:88
+#: ../lib/modules/account.inc:98
+#: ../lib/modules/account.inc:122
+#: ../lib/modules/account.inc:226
+#: ../lib/modules/account.inc:240
+#: ../lib/modules/posixGroup.inc:164
+#: ../lib/modules/posixGroup.inc:390
+#: ../lib/modules/posixGroup.inc:452
+#: ../lib/modules/sambaAccount.inc:898
+#: ../lib/modules/posixAccount.inc:310
+#: ../lib/modules/posixAccount.inc:422
+#: ../lib/modules/sambaGroupMapping.inc:349
+#: ../lib/modules/inetOrgPerson.inc:209
+#: ../lib/modules/inetOrgPerson.inc:390
+#: ../lib/modules/inetOrgPerson.inc:741
+#: ../lib/modules/inetOrgPerson.inc:1043
+#: ../lib/modules/groupOfNames.inc:64
+#: ../lib/modules/groupOfNames.inc:91
+#: ../lib/modules/groupOfNames.inc:143
+#: ../lib/modules/groupOfNames.inc:443
 msgid "Description"
 msgstr "描述"
 
-#: ../lib/modules/sambaDomain.inc:104
-#: ../lib/modules/sambaDomain.inc:286
-#: ../lib/modules/sambaDomain.inc:662
+#: ../lib/modules/sambaDomain.inc:106
+#: ../lib/modules/sambaDomain.inc:288
+#: ../lib/modules/sambaDomain.inc:664
 msgid "Disconnect users outside logon hours"
 msgstr "切断连接前用户登录小时数"
 
-#: ../lib/modules/sambaSamAccount.inc:1364
-#: ../lib/modules/sambaSamAccount.inc:1694
+#: ../lib/modules/sambaSamAccount.inc:1350
+#: ../lib/modules/sambaSamAccount.inc:1680
 msgid "Disconnection time limit"
 msgstr "断开连接时间限制"
 
-#: ../lib/modules/sambaDomain.inc:105
+#: ../lib/modules/sambaDomain.inc:107
 msgid "Disconnects users if they are logged in outside logon hours."
 msgstr "如果用户登录限制时间到则断开连接."
 
 #: ../lib/modules/sambaAccount.inc:78
-#: ../lib/modules/sambaAccount.inc:221
-#: ../lib/modules/sambaAccount.inc:342
-#: ../lib/modules/sambaAccount.inc:726
-#: ../lib/modules/sambaAccount.inc:889
+#: ../lib/modules/sambaAccount.inc:223
+#: ../lib/modules/sambaAccount.inc:344
+#: ../lib/modules/sambaAccount.inc:728
+#: ../lib/modules/sambaAccount.inc:891
 #: ../lib/modules/sambaSamAccount.inc:98
-#: ../lib/modules/sambaSamAccount.inc:191
-#: ../lib/modules/sambaSamAccount.inc:337
-#: ../lib/modules/sambaSamAccount.inc:957
-#: ../lib/modules/sambaSamAccount.inc:1651
+#: ../lib/modules/sambaSamAccount.inc:193
+#: ../lib/modules/sambaSamAccount.inc:339
+#: ../lib/modules/sambaSamAccount.inc:943
+#: ../lib/modules/sambaSamAccount.inc:1637
 #: ../lib/modules/sambaGroupMapping.inc:197
-#: ../lib/modules/sambaGroupMapping.inc:312
-#: ../lib/modules/sambaGroupMapping.inc:345
+#: ../lib/modules/sambaGroupMapping.inc:314
+#: ../lib/modules/sambaGroupMapping.inc:347
 msgid "Display name"
 msgstr "显示名"
 
@@ -1435,7 +1421,7 @@ msgstr "确认删除这个PDF结构?"
 msgid "Do you really want to delete this profile?"
 msgstr "确认删除这个配置文件?"
 
-#: ../lib/modules/kolabUser.inc:565
+#: ../lib/modules/kolabUser.inc:584
 msgid "Do you really want to mark this account for deletion?"
 msgstr "确认将此帐号打上删除标记?"
 
@@ -1447,44 +1433,44 @@ msgstr "确认删除下列帐号?"
 msgid "Do you want to make these changes?"
 msgstr "确认如下更改?"
 
-#: ../lib/modules/sambaAccount.inc:179
-#: ../lib/modules/sambaAccount.inc:323
-#: ../lib/modules/sambaAccount.inc:333
-#: ../lib/modules/sambaAccount.inc:407
-#: ../lib/modules/sambaAccount.inc:837
-#: ../lib/modules/sambaAccount.inc:895
-#: ../lib/modules/sambaSamAccount.inc:266
-#: ../lib/modules/sambaSamAccount.inc:330
-#: ../lib/modules/sambaSamAccount.inc:456
-#: ../lib/modules/sambaSamAccount.inc:1126
-#: ../lib/modules/sambaSamAccount.inc:1513
-#: ../lib/modules/sambaSamAccount.inc:1543
-#: ../lib/modules/sambaSamAccount.inc:1669
+#: ../lib/modules/sambaAccount.inc:181
+#: ../lib/modules/sambaAccount.inc:325
+#: ../lib/modules/sambaAccount.inc:335
+#: ../lib/modules/sambaAccount.inc:409
+#: ../lib/modules/sambaAccount.inc:839
+#: ../lib/modules/sambaAccount.inc:897
+#: ../lib/modules/sambaSamAccount.inc:268
+#: ../lib/modules/sambaSamAccount.inc:332
+#: ../lib/modules/sambaSamAccount.inc:458
+#: ../lib/modules/sambaSamAccount.inc:1112
+#: ../lib/modules/sambaSamAccount.inc:1499
+#: ../lib/modules/sambaSamAccount.inc:1529
+#: ../lib/modules/sambaSamAccount.inc:1655
 #: ../lib/modules/sambaGroupMapping.inc:68
 #: ../lib/modules/sambaGroupMapping.inc:232
-#: ../lib/modules/sambaGroupMapping.inc:324
-#: ../lib/modules/sambaGroupMapping.inc:367
+#: ../lib/modules/sambaGroupMapping.inc:326
+#: ../lib/modules/sambaGroupMapping.inc:369
 msgid "Domain"
 msgstr "域"
 
 #: ../lib/types/smbDomain.inc:82
-#: ../lib/modules/sambaDomain.inc:72
-#: ../lib/modules/sambaDomain.inc:142
-#: ../lib/modules/sambaDomain.inc:229
-#: ../lib/modules/sambaDomain.inc:235
-#: ../lib/modules/sambaDomain.inc:634
+#: ../lib/modules/sambaDomain.inc:74
+#: ../lib/modules/sambaDomain.inc:144
+#: ../lib/modules/sambaDomain.inc:231
+#: ../lib/modules/sambaDomain.inc:237
+#: ../lib/modules/sambaDomain.inc:636
 msgid "Domain SID"
 msgstr "域SID"
 
-#: ../lib/modules/sambaGroupMapping.inc:291
+#: ../lib/modules/sambaGroupMapping.inc:293
 msgid "Domain administrators"
 msgstr "域管理员"
 
 #: ../lib/modules/sambaAccount.inc:48
-#: ../lib/modules/sambaAccount.inc:318
+#: ../lib/modules/sambaAccount.inc:320
 #: ../lib/modules/sambaSamAccount.inc:69
 #: ../lib/modules/sambaGroupMapping.inc:55
-#: ../lib/modules/sambaGroupMapping.inc:297
+#: ../lib/modules/sambaGroupMapping.inc:299
 msgid "Domain admins"
 msgstr "域管理员"
 
@@ -1495,9 +1481,9 @@ msgid "Domain certificate admins"
 msgstr "域认证管理员"
 
 #: ../lib/modules/sambaAccount.inc:49
-#: ../lib/modules/sambaAccount.inc:568
+#: ../lib/modules/sambaAccount.inc:570
 #: ../lib/modules/sambaSamAccount.inc:70
-#: ../lib/modules/sambaSamAccount.inc:662
+#: ../lib/modules/sambaSamAccount.inc:646
 #: ../lib/modules/sambaGroupMapping.inc:58
 msgid "Domain computers"
 msgstr "域内计算机"
@@ -1527,11 +1513,11 @@ msgstr "域内来宾"
 
 #: ../lib/types/smbDomain.inc:83
 #: ../lib/modules/sambaAccount.inc:72
-#: ../lib/modules/sambaDomain.inc:68
-#: ../lib/modules/sambaDomain.inc:135
-#: ../lib/modules/sambaDomain.inc:216
-#: ../lib/modules/sambaDomain.inc:222
-#: ../lib/modules/sambaDomain.inc:631
+#: ../lib/modules/sambaDomain.inc:70
+#: ../lib/modules/sambaDomain.inc:137
+#: ../lib/modules/sambaDomain.inc:218
+#: ../lib/modules/sambaDomain.inc:224
+#: ../lib/modules/sambaDomain.inc:633
 msgid "Domain name"
 msgstr "域名"
 
@@ -1540,8 +1526,8 @@ msgstr "域名"
 msgid "Domain name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and -."
 msgstr "域名包含非法字符,只能使用 a-z, A-Z, 0-9 和 -"
 
-#: ../lib/modules/sambaDomain.inc:186
-#: ../lib/modules/sambaDomain.inc:187
+#: ../lib/modules/sambaDomain.inc:188
+#: ../lib/modules/sambaDomain.inc:189
 msgid "Domain name is invalid!"
 msgstr "域名非法!"
 
@@ -1559,7 +1545,7 @@ msgstr "域架构管理员"
 
 #: ../lib/modules/sambaAccount.inc:48
 #: ../lib/modules/sambaSamAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:1995
+#: ../lib/modules/sambaSamAccount.inc:1981
 #: ../lib/modules/sambaGroupMapping.inc:56
 msgid "Domain users"
 msgstr "域内用户"
@@ -1568,15 +1554,15 @@ msgstr "域内用户"
 msgid "Donate"
 msgstr "捐赠"
 
-#: ../templates/pdfedit/pdfpage.php:475
+#: ../templates/pdfedit/pdfpage.php:420
 msgid "Down"
 msgstr "向下"
 
-#: ../templates/masscreate.php:281
+#: ../templates/masscreate.php:280
 msgid "Download sample CSV file"
 msgstr "下载CSV示例文件"
 
-#: ../lib/modules/sambaAccount.inc:381
+#: ../lib/modules/sambaAccount.inc:383
 msgid "Drive letter assigned on windows workstations as homedirectory."
 msgstr "Windows分配给用户个人目录的网络驱动器号."
 
@@ -1584,46 +1570,46 @@ msgstr "Windows分配给用户个人目录的网络驱动器号."
 msgid "E-Mail"
 msgstr "电子邮件"
 
-#: ../lib/modules/kolabUser.inc:142
+#: ../lib/modules/kolabUser.inc:161
 msgid "EMail alias"
 msgstr "电子邮件别名"
 
-#: ../lib/modules/kolabUser.inc:143
+#: ../lib/modules/kolabUser.inc:162
 msgid "EMail alias for this account."
 msgstr "此帐号的电子邮件别名"
 
-#: ../lib/modules/kolabUser.inc:228
+#: ../lib/modules/kolabUser.inc:247
 msgid "EMail alias is invalid!"
 msgstr "电子邮件别名非法!"
 
-#: ../lib/modules/kolabUser.inc:146
+#: ../lib/modules/kolabUser.inc:165
 msgid "EMail alias list"
 msgstr "电子邮件别名列表"
 
-#: ../lib/modules/kolabUser.inc:229
+#: ../lib/modules/kolabUser.inc:248
 msgid "EMail alias list has invalid format!"
 msgstr "电子邮件别名列表格式非法!"
 
-#: ../lib/modules/kolabUser.inc:192
-#: ../lib/modules/kolabUser.inc:371
-#: ../lib/modules/kolabUser.inc:788
+#: ../lib/modules/kolabUser.inc:211
+#: ../lib/modules/kolabUser.inc:390
+#: ../lib/modules/kolabUser.inc:807
 msgid "EMail aliases"
 msgstr "电子邮件别名"
 
-#: ../lib/modules/sambaSamAccount.inc:498
+#: ../lib/modules/sambaSamAccount.inc:500
 msgid "East Australian Standard, Guam"
 msgstr "澳东标准时间,关岛"
 
-#: ../lib/modules/sambaSamAccount.inc:490
+#: ../lib/modules/sambaSamAccount.inc:492
 msgid "Eastern Europe Time, South Africa"
 msgstr "东欧时间,南非"
 
-#: ../lib/modules/sambaSamAccount.inc:483
+#: ../lib/modules/sambaSamAccount.inc:485
 msgid "Eastern Time (US & Canada), Bogota"
 msgstr "美国东部时间(美国和加拿大),波哥大"
 
-#: ../lib/modules/sambaSamAccount.inc:1133
-#: ../lib/modules/sambaSamAccount.inc:1137
+#: ../lib/modules/sambaSamAccount.inc:1119
+#: ../lib/modules/sambaSamAccount.inc:1123
 #: ../lib/lists.inc:462
 msgid "Edit"
 msgstr "编辑"
@@ -1641,11 +1627,11 @@ msgstr "编辑帐号类型"
 msgid "Edit general settings"
 msgstr "编辑通用设置"
 
-#: ../lib/modules/posixAccount.inc:971
+#: ../lib/modules/posixAccount.inc:996
 msgid "Edit groups"
 msgstr "编辑组"
 
-#: ../lib/modules/posixGroup.inc:167
+#: ../lib/modules/posixGroup.inc:169
 msgid "Edit members"
 msgstr "编辑成员"
 
@@ -1665,43 +1651,27 @@ msgstr "编辑自动服务功能"
 msgid "Edit server profiles"
 msgstr "编辑服务器配置文件"
 
-#: ../lib/modules/sambaAccount.inc:796
-#: ../lib/modules/sambaSamAccount.inc:1085
+#: ../lib/modules/sambaAccount.inc:798
+#: ../lib/modules/sambaSamAccount.inc:1071
 msgid "Edit workstations"
 msgstr "编辑工作站"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:100
-#: ../lib/modules/neofonieInetOrgPerson.inc:164
-#: ../lib/modules/neofonieInetOrgPerson.inc:309
-#: ../lib/modules/neofonieInetOrgPerson.inc:410
-#: ../lib/modules/neofonieInetOrgPerson.inc:615
-msgid "Employee skills"
-msgstr "雇员技能"
-
 #: ../lib/modules/inetOrgPerson.inc:95
-#: ../lib/modules/inetOrgPerson.inc:160
-#: ../lib/modules/inetOrgPerson.inc:207
-#: ../lib/modules/inetOrgPerson.inc:364
-#: ../lib/modules/inetOrgPerson.inc:786
-#: ../lib/modules/inetOrgPerson.inc:943
+#: ../lib/modules/inetOrgPerson.inc:172
+#: ../lib/modules/inetOrgPerson.inc:221
+#: ../lib/modules/inetOrgPerson.inc:406
+#: ../lib/modules/inetOrgPerson.inc:885
+#: ../lib/modules/inetOrgPerson.inc:1048
 msgid "Employee type"
 msgstr "雇员类型"
 
-#: ../lib/modules/inetOrgPerson.inc:365
+#: ../lib/modules/inetOrgPerson.inc:407
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇员类型: 承包商,雇员,实习生,临时工,外部员工,..."
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:103
-#: ../lib/modules/neofonieInetOrgPerson.inc:169
-#: ../lib/modules/neofonieInetOrgPerson.inc:319
-#: ../lib/modules/neofonieInetOrgPerson.inc:505
-#: ../lib/modules/neofonieInetOrgPerson.inc:620
-msgid "Employment date"
-msgstr "雇用日期"
-
 #: ../templates/lists/changePassword.php:249
 #: ../templates/lists/changePassword.php:255
-#: ../templates/login.php:386
+#: ../templates/login.php:398
 msgid "Empty password submitted. Please try again."
 msgstr "提交了空密码,请重试."
 
@@ -1709,7 +1679,7 @@ msgstr "提交了空密码,请重试."
 msgid "Encountered an error while performing search."
 msgstr "检索时发生错误."
 
-#: ../lib/modules/sambaSamAccount.inc:476
+#: ../lib/modules/sambaSamAccount.inc:478
 msgid "Eniwetok, Kwajalein"
 msgstr "埃尼威托克,瓜加林"
 
@@ -1735,7 +1705,7 @@ msgstr "条目%s删除成功"
 msgid "Equality"
 msgstr "相等"
 
-#: ../templates/config/mainmanage.php:208
+#: ../templates/config/mainmanage.php:256
 msgid "Error"
 msgstr "错误"
 
@@ -1757,7 +1727,7 @@ msgid "Example"
 msgstr "示例"
 
 #: ../templates/masscreate.php:162
-#: ../templates/masscreate.php:322
+#: ../templates/masscreate.php:321
 msgid "Example value"
 msgstr "示例值"
 
@@ -1769,7 +1739,7 @@ msgstr "示例"
 msgid "Execute"
 msgstr "运行"
 
-#: ../templates/tests/lamdaemonTest.php:231
+#: ../templates/tests/lamdaemonTest.php:292
 msgid "Execute lamdaemon"
 msgstr "运行 lamdaemon"
 
@@ -1799,25 +1769,25 @@ msgid "Failed to delete entry %s"
 msgstr "删除 %s 条目失败!"
 
 #: ../lib/modules/inetOrgPerson.inc:83
-#: ../lib/modules/inetOrgPerson.inc:150
-#: ../lib/modules/inetOrgPerson.inc:267
-#: ../lib/modules/inetOrgPerson.inc:396
-#: ../lib/modules/inetOrgPerson.inc:397
-#: ../lib/modules/inetOrgPerson.inc:762
-#: ../lib/modules/inetOrgPerson.inc:952
-#: ../lib/modules/inetOrgPerson.inc:1264
+#: ../lib/modules/inetOrgPerson.inc:153
+#: ../lib/modules/inetOrgPerson.inc:281
+#: ../lib/modules/inetOrgPerson.inc:438
+#: ../lib/modules/inetOrgPerson.inc:439
+#: ../lib/modules/inetOrgPerson.inc:854
+#: ../lib/modules/inetOrgPerson.inc:1057
+#: ../lib/modules/inetOrgPerson.inc:1389
 msgid "Fax number"
 msgstr "传真号"
 
-#: ../templates/config/mainmanage.php:281
+#: ../templates/config/mainmanage.php:329
 msgid "File"
 msgstr "文件"
 
-#: ../lib/modules/sambaSamAccount.inc:242
+#: ../lib/modules/sambaSamAccount.inc:244
 msgid "File name and path relative to netlogon-share which should be executed on logon. $user and $group are replaced with user and group name."
 msgstr "用户登录时自动运行的文件名和网络登录共享相对路径,$user和$group会被用户名和组名替换"
 
-#: ../lib/modules/sambaAccount.inc:390
+#: ../lib/modules/sambaAccount.inc:392
 msgid "File name and path relative to the netlogon-share which should be executed on logon. $user and $group are replaced with user and group name."
 msgstr "用户登录时自行运行的文件名和网络登录共享相对路径,$user和$group会被用户名和组名替换."
 
@@ -1836,12 +1806,12 @@ msgstr "过滤器"
 
 #: ../lib/types/user.inc:87
 #: ../lib/modules/inetOrgPerson.inc:73
-#: ../lib/modules/inetOrgPerson.inc:148
-#: ../lib/modules/inetOrgPerson.inc:182
-#: ../lib/modules/inetOrgPerson.inc:356
-#: ../lib/modules/inetOrgPerson.inc:650
-#: ../lib/modules/inetOrgPerson.inc:941
-#: ../lib/modules/inetOrgPerson.inc:1216
+#: ../lib/modules/inetOrgPerson.inc:151
+#: ../lib/modules/inetOrgPerson.inc:196
+#: ../lib/modules/inetOrgPerson.inc:398
+#: ../lib/modules/inetOrgPerson.inc:718
+#: ../lib/modules/inetOrgPerson.inc:1046
+#: ../lib/modules/inetOrgPerson.inc:1341
 msgid "First name"
 msgstr "名字"
 
@@ -1850,32 +1820,34 @@ msgstr "名字"
 msgid "First name contains invalid characters!"
 msgstr "名字包含非法字符"
 
-#: ../lib/modules/inetOrgPerson.inc:357
+#: ../lib/modules/inetOrgPerson.inc:399
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "用户名字只允许字母,-和空格"
 
-#: ../lib/modules/kolabUser.inc:127
+#: ../lib/modules/kolabUser.inc:146
 msgid "For automatic invitation handling."
 msgstr "自动处理邀请."
 
-#: ../help/help.inc:176
+#: ../help/help.inc:178
 msgid "Format"
 msgstr "格式"
 
-#: ../lib/modules/kolabUser.inc:91
-#: ../lib/modules/kolabUser.inc:158
-#: ../lib/modules/kolabUser.inc:204
-#: ../lib/modules/kolabUser.inc:316
-#: ../lib/modules/kolabUser.inc:766
+#: ../lib/modules/kolabUser.inc:93
+#: ../lib/modules/kolabUser.inc:127
+#: ../lib/modules/kolabUser.inc:177
+#: ../lib/modules/kolabUser.inc:223
+#: ../lib/modules/kolabUser.inc:335
+#: ../lib/modules/kolabUser.inc:785
+#: ../lib/modules/kolabUser.inc:837
 msgid "Free/Busy interval"
 msgstr "空闲/忙碌 间隔"
 
-#: ../lib/modules/kolabUser.inc:236
-#: ../lib/modules/kolabUser.inc:237
+#: ../lib/modules/kolabUser.inc:255
+#: ../lib/modules/kolabUser.inc:256
 msgid "Free/Busy interval must be a number!"
 msgstr "空闲/忙碌间隔必须是一个数字!"
 
-#: ../lib/modules/sambaSamAccount.inc:1203
+#: ../lib/modules/sambaSamAccount.inc:1189
 msgid "Friday"
 msgstr "星期五"
 
@@ -1883,26 +1855,26 @@ msgstr "星期五"
 msgid "Full name"
 msgstr "全名"
 
-#: ../lib/modules/inetOrgPerson.inc:233
+#: ../lib/modules/inetOrgPerson.inc:247
 msgid "GB-12345"
 msgstr "GB-12345"
 
 #: ../lib/types/host.inc:87
 #: ../lib/types/group.inc:84
 #: ../lib/types/user.inc:84
-#: ../lib/modules/posixGroup.inc:158
-#: ../lib/modules/posixGroup.inc:348
-#: ../lib/modules/posixGroup.inc:378
-#: ../lib/modules/posixGroup.inc:398
-#: ../lib/modules/posixGroup.inc:442
-#: ../lib/modules/posixGroup.inc:462
+#: ../lib/modules/posixGroup.inc:160
+#: ../lib/modules/posixGroup.inc:356
+#: ../lib/modules/posixGroup.inc:386
+#: ../lib/modules/posixGroup.inc:406
+#: ../lib/modules/posixGroup.inc:450
+#: ../lib/modules/posixGroup.inc:470
 #: ../lib/modules/posixAccount.inc:88
-#: ../lib/modules/posixAccount.inc:1192
-#: ../lib/modules/sambaGroupMapping.inc:343
+#: ../lib/modules/posixAccount.inc:1217
+#: ../lib/modules/sambaGroupMapping.inc:345
 msgid "GID number"
 msgstr "GID编号"
 
-#: ../lib/modules/posixGroup.inc:462
+#: ../lib/modules/posixGroup.inc:470
 msgid "GID number has changed. Please select checkbox to change GID number of users and hosts."
 msgstr "GID的编号已经更改,请点击选择框来改变用户GID号"
 
@@ -1911,25 +1883,25 @@ msgstr "GID的编号已经更改,请点击选择框来改变用户GID号"
 msgid "GID number has changed. To keep file ownership you have to run the following command as root: 'find / -gid %s -uid %s -exec chgrp %s {} \\;'"
 msgstr "GID已经更改,要保持文件属性一,你必须以root身份运行以下命令: 'find / -gid %s -uid %s -exec chgrp %s {} \\;'"
 
-#: ../lib/modules/posixGroup.inc:469
+#: ../lib/modules/posixGroup.inc:477
 msgid "GID number has to be a numeric value!"
 msgstr "GID号必须使用数字"
 
-#: ../lib/modules/posixAccount.inc:260
-#: ../lib/modules/posixAccount.inc:292
-#: ../lib/modules/posixAccount.inc:366
-#: ../lib/modules/posixAccount.inc:404
-#: ../lib/modules/posixAccount.inc:955
-#: ../lib/modules/posixAccount.inc:1193
+#: ../lib/modules/posixAccount.inc:266
+#: ../lib/modules/posixAccount.inc:298
+#: ../lib/modules/posixAccount.inc:376
+#: ../lib/modules/posixAccount.inc:414
+#: ../lib/modules/posixAccount.inc:980
+#: ../lib/modules/posixAccount.inc:1218
 msgid "Gecos"
 msgstr "备注(Gecos)"
 
 #: ../templates/lists/changePassword.php:170
-#: ../help/help.inc:173
+#: ../help/help.inc:175
 msgid "Generate random password"
 msgstr "生成随机密码"
 
-#: ../lib/modules/kolabUser.inc:181
+#: ../lib/modules/kolabUser.inc:200
 msgid "Germany"
 msgstr "德国"
 
@@ -1940,21 +1912,21 @@ msgstr "德国"
 msgid "Go"
 msgstr "开始"
 
-#: ../lib/modules/quota.inc:110
-#: ../lib/modules/quota.inc:358
+#: ../lib/modules/quota.inc:112
+#: ../lib/modules/quota.inc:360
 msgid "Grace block period"
 msgstr "块限制宽限周期"
 
-#: ../lib/modules/quota.inc:111
+#: ../lib/modules/quota.inc:113
 msgid "Grace block period. Most filesystems use a fixed maximum value of 7 days."
 msgstr "块限制宽限周期,大部分文件系统都使用最大值7天."
 
-#: ../lib/modules/quota.inc:133
+#: ../lib/modules/quota.inc:135
 msgid "Grace inode (files) period. Most filesystems use a fixed maximum value of 7 days."
 msgstr "节点限制的宽限期,大部分文件系统都使用最大值7天."
 
-#: ../lib/modules/quota.inc:132
-#: ../lib/modules/quota.inc:362
+#: ../lib/modules/quota.inc:134
+#: ../lib/modules/quota.inc:364
 msgid "Grace inode period"
 msgstr "节点限制宽限期"
 
@@ -1963,74 +1935,78 @@ msgstr "节点限制宽限期"
 msgid "Group"
 msgstr "组"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:161
-msgid "Group 1, Group 2"
-msgstr "组1,组2"
-
 #: ../lib/types/group.inc:54
 msgid "Group accounts (e.g. Unix and Samba)"
 msgstr "组帐号(比如unix和samba)"
 
 #: ../lib/types/group.inc:87
-#: ../lib/modules/posixGroup.inc:354
+#: ../lib/modules/posixGroup.inc:362
 msgid "Group description"
 msgstr "组说明"
 
-#: ../lib/modules/posixGroup.inc:383
+#: ../lib/modules/posixGroup.inc:391
 msgid "Group description. If left empty group name will be used."
 msgstr "组说明,若空则会使用组名来替代."
 
+#: ../lib/types/gon.inc:83
+#: ../lib/types/gon.inc:84
 #: ../lib/types/group.inc:86
 msgid "Group member DNs"
 msgstr "组成员DN"
 
 #: ../lib/types/group.inc:85
-#: ../lib/modules/posixGroup.inc:166
-#: ../lib/modules/posixGroup.inc:226
-#: ../lib/modules/posixGroup.inc:360
-#: ../lib/modules/posixGroup.inc:386
-#: ../lib/modules/posixGroup.inc:390
-#: ../lib/modules/posixGroup.inc:443
+#: ../lib/modules/posixGroup.inc:168
+#: ../lib/modules/posixGroup.inc:234
+#: ../lib/modules/posixGroup.inc:368
+#: ../lib/modules/posixGroup.inc:394
+#: ../lib/modules/posixGroup.inc:398
+#: ../lib/modules/posixGroup.inc:451
 msgid "Group members"
 msgstr "组成员"
 
+#: ../lib/types/gon.inc:82
 #: ../lib/types/group.inc:83
-#: ../lib/modules/posixGroup.inc:154
-#: ../lib/modules/posixGroup.inc:340
-#: ../lib/modules/posixGroup.inc:374
-#: ../lib/modules/posixGroup.inc:441
-#: ../lib/modules/posixGroup.inc:470
-#: ../lib/modules/posixGroup.inc:471
-#: ../lib/modules/posixGroup.inc:472
-#: ../lib/modules/groupOfNames.inc:58
-#: ../lib/modules/groupOfNames.inc:82
-#: ../lib/modules/groupOfNames.inc:437
+#: ../lib/modules/posixGroup.inc:156
+#: ../lib/modules/posixGroup.inc:348
+#: ../lib/modules/posixGroup.inc:382
+#: ../lib/modules/posixGroup.inc:449
+#: ../lib/modules/posixGroup.inc:478
+#: ../lib/modules/posixGroup.inc:479
+#: ../lib/modules/posixGroup.inc:480
+#: ../lib/modules/groupOfNames.inc:60
+#: ../lib/modules/groupOfNames.inc:84
+#: ../lib/modules/groupOfNames.inc:439
 msgid "Group name"
 msgstr "组名"
 
-#: ../lib/modules/posixGroup.inc:472
-#: ../lib/modules/posixGroup.inc:473
+#: ../lib/modules/posixGroup.inc:480
+#: ../lib/modules/posixGroup.inc:481
 msgid "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !"
 msgstr "组名包含非法字符,可用字符为: a-z, A-Z, 0-9,及 -或_ !"
 
-#: ../lib/modules/posixGroup.inc:471
+#: ../lib/modules/posixGroup.inc:479
 msgid "Group name in use. Selected next free group name."
 msgstr "组名已被使用,请选择可用的组名."
 
-#: ../lib/modules/posixGroup.inc:375
+#: ../lib/modules/posixGroup.inc:383
 msgid "Group name of the group which should be created. Valid characters are: a-z, A-Z, 0-9 and .-_ . LAM does not allow a number as first character because groupadd also does not allow it. If group name is already used group name will be expanded with a number. The next free number will be used."
 msgstr "将要建立的组名,可用字符为:a-z,A-Z,0-9,.-_ .因为groupadd不允许以数字开头的组名,所以本系统也不允许.如果该组名存在,会在组名末尾增加下一个可以使用的数字。"
 
-#: ../lib/modules/groupOfNames.inc:42
+#: ../lib/types/gon.inc:44
+#: ../lib/modules/groupOfNames.inc:44
 msgid "Group of names"
 msgstr "组名"
 
-#: ../lib/modules/groupOfUniqueNames.inc:40
+#: ../lib/types/gon.inc:53
+msgid "Group of names accounts"
+msgstr "帐号的组名"
+
+#: ../lib/modules/groupOfUniqueNames.inc:42
 msgid "Group of unique names"
 msgstr "组的唯一名"
 
-#: ../lib/modules/posixGroup.inc:366
-#: ../lib/modules/posixGroup.inc:394
+#: ../lib/modules/posixGroup.inc:374
+#: ../lib/modules/posixGroup.inc:402
 msgid "Group password"
 msgstr "组密码"
 
@@ -2039,40 +2015,42 @@ msgid "Group type"
 msgstr "组类型"
 
 #: ../lib/types/group.inc:45
-#: ../lib/modules/posixGroup.inc:304
+#: ../lib/modules/posixGroup.inc:312
 msgid "Groups"
 msgstr "组"
 
-#: ../lib/modules/quota.inc:551
+#: ../lib/modules/quota.inc:553
 msgid "Hard block"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:104
-#: ../lib/modules/quota.inc:105
-#: ../lib/modules/quota.inc:357
-#: ../lib/modules/quota.inc:442
+#: ../lib/modules/quota.inc:106
+#: ../lib/modules/quota.inc:107
+#: ../lib/modules/quota.inc:359
+#: ../lib/modules/quota.inc:444
 msgid "Hard block limit"
 msgstr "块的硬性限制"
 
-#: ../lib/modules/quota.inc:553
+#: ../lib/modules/quota.inc:555
 msgid "Hard inode"
 msgstr "节点的硬性限制"
 
-#: ../lib/modules/quota.inc:127
+#: ../lib/modules/quota.inc:129
 msgid "Hard inode (files) limit"
 msgstr "节点的硬性限制"
 
-#: ../lib/modules/quota.inc:126
-#: ../lib/modules/quota.inc:361
-#: ../lib/modules/quota.inc:444
+#: ../lib/modules/quota.inc:128
+#: ../lib/modules/quota.inc:363
+#: ../lib/modules/quota.inc:446
 msgid "Hard inode limit"
 msgstr "节点硬性限制"
 
-#: ../lib/modules/sambaSamAccount.inc:478
+#: ../lib/modules/sambaSamAccount.inc:480
 msgid "Hawaii"
 msgstr "夏威夷"
 
-#: ../templates/pdfedit/pdfpage.php:422
+#: ../templates/pdfedit/pdfpage.php:396
+#: ../templates/pdfedit/pdfpage.php:565
+#: ../templates/pdfedit/pdfpage.php:579
 msgid "Headline"
 msgstr "标题"
 
@@ -2081,18 +2059,19 @@ msgstr "标题"
 #: ../templates/ou_edit.php:192
 #: ../templates/masscreate.php:157
 #: ../templates/masscreate.php:170
-#: ../templates/masscreate.php:309
+#: ../templates/masscreate.php:308
 #: ../templates/config/profmanage.php:174
 #: ../templates/config/profmanage.php:226
 #: ../templates/config/profmanage.php:256
 #: ../templates/config/profmanage.php:290
 #: ../templates/config/profmanage.php:335
 #: ../templates/config/profmanage.php:359
-#: ../templates/config/mainmanage.php:173
-#: ../templates/config/mainmanage.php:190
-#: ../templates/config/mainmanage.php:225
-#: ../templates/config/mainmanage.php:241
-#: ../templates/config/mainmanage.php:305
+#: ../templates/config/mainmanage.php:180
+#: ../templates/config/mainmanage.php:197
+#: ../templates/config/mainmanage.php:236
+#: ../templates/config/mainmanage.php:273
+#: ../templates/config/mainmanage.php:289
+#: ../templates/config/mainmanage.php:353
 #: ../templates/config/confmodules.php:123
 #: ../templates/config/confmain.php:154
 #: ../templates/config/confmain.php:168
@@ -2124,15 +2103,15 @@ msgstr "标题"
 #: ../templates/selfService/adminMain.php:388
 #: ../templates/selfService/adminMain.php:472
 #: ../templates/selfService/adminMain.php:506
-#: ../templates/pdfedit/pdfpage.php:755
+#: ../templates/pdfedit/pdfpage.php:682
 #: ../templates/profedit/profilepage.php:198
 #: ../templates/profedit/profilepage.php:218
 #: ../templates/profedit/profilepage.php:255
 #: ../lib/lists.inc:385
-#: ../lib/modules.inc:693
-#: ../lib/modules.inc:1026
-#: ../lib/modules.inc:1082
-#: ../lib/modules.inc:1195
+#: ../lib/modules.inc:831
+#: ../lib/modules.inc:1168
+#: ../lib/modules.inc:1224
+#: ../lib/modules.inc:1341
 msgid "Help"
 msgstr "帮助"
 
@@ -2144,7 +2123,7 @@ msgstr "这是可能的列的列表,红色的列必须包含在CSV文件中,在
 msgid "Here you can browse LDAP object classes and attributes."
 msgstr "这是你可浏览的LDAP对象类和属性."
 
-#: ../lib/modules/sambaSamAccount.inc:321
+#: ../lib/modules/sambaSamAccount.inc:323
 msgid "Here you can change the settings for the terminal server access."
 msgstr "这里可以改变终端服务访问的设置。"
 
@@ -2152,19 +2131,19 @@ msgstr "这里可以改变终端服务访问的设置。"
 msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr "您可以上传CSV文件来建立多个帐号"
 
-#: ../lib/modules/groupOfNames.inc:63
+#: ../lib/modules/groupOfNames.inc:65
 msgid "Here you can enter a description for this group."
 msgstr "在这输入组的描述."
 
-#: ../lib/modules/posixAccount.inc:346
+#: ../lib/modules/posixAccount.inc:356
 msgid "Here you can enter a list of additional group memberships. The group names are separated by commas."
 msgstr "您可以在此输入附加的组成员,组名以逗号分隔."
 
-#: ../help/help.inc:138
+#: ../help/help.inc:140
 msgid "Here you can input small filter expressions (e.g. 'value' or 'v*'). LAM will filter case-insensitive."
 msgstr "在此输入简单的过滤语法(例如'value'或'v*'),系统在过滤时不分大小写."
 
-#: ../help/help.inc:151
+#: ../help/help.inc:153
 msgid "Here you can load an account profile to set default settings for your account. The \"default\" profile is automatically loaded for new accounts."
 msgstr "您可以指定一个帐号配置文件做为缺省的配置文件,缺省的配置文件会自动做为新帐号的配置文件."
 
@@ -2172,7 +2151,7 @@ msgstr "您可以指定一个帐号配置文件做为缺省的配置文件,缺
 msgid "Here you can manage your account profiles."
 msgstr "您可以管理您的帐号配置文件."
 
-#: ../help/help.inc:153
+#: ../help/help.inc:155
 msgid "Here you can select a PDF structure and export the account to a PDF file."
 msgstr "您可以选择一个PDF结构,您可以在此選擇一個PDF架構,然後將帳號滙出成PDF檔."
 
@@ -2184,7 +2163,15 @@ msgstr "您在此选择系统日志的存入位置,系统日志记录可以记
 msgid "Here you can select which plugins you want to use for account management."
 msgstr "在此您可以选择一些选择帐号管理的插件"
 
-#: ../lib/modules/sambaDomain.inc:93
+#: ../lib/modules/phpGroupwareUser.inc:79
+msgid "Here you can specify if the account is active or inactive."
+msgstr "这里可以指定用户的激活状态."
+
+#: ../help/help.inc:138
+msgid "Here you can specify minimum requirements for passwords. The character classes are: lowercase, uppercase, numeric and symbols."
+msgstr "在此指定用户密码的最小需求.字符类别包括:小写,大写,数字和标点符号."
+
+#: ../lib/modules/sambaDomain.inc:95
 msgid "Here you can specify the minimum number of characters for a user password."
 msgstr "在此指定用户密码的最小长度."
 
@@ -2192,7 +2179,7 @@ msgstr "在此指定用户密码的最小长度."
 msgid "Here you can specify the new password yourself."
 msgstr "这里可以设置自己的新密码。"
 
-#: ../lib/modules/sambaSamAccount.inc:312
+#: ../lib/modules/sambaSamAccount.inc:314
 msgid "Here you can specify the shadowing mode."
 msgstr "这里可以指定遮蔽(shadow)模型。"
 
@@ -2212,27 +2199,27 @@ msgstr "提示:将电子表格的格式设定为文字,然后关闭自动更正
 msgid "Hint: To delete an attribute, empty the text field and click save."
 msgstr "提示:要删除一个属性,先清空文本区然后保存."
 
-#: ../lib/modules/posixAccount.inc:391
+#: ../lib/modules/posixAccount.inc:401
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr "按住CTRL键可以多选组."
 
 #: ../lib/types/user.inc:89
-#: ../lib/modules/sambaSamAccount.inc:284
-#: ../lib/modules/sambaSamAccount.inc:1323
-#: ../lib/modules/sambaSamAccount.inc:1683
+#: ../lib/modules/sambaSamAccount.inc:286
+#: ../lib/modules/sambaSamAccount.inc:1309
+#: ../lib/modules/sambaSamAccount.inc:1669
 #: ../lib/modules/posixAccount.inc:63
 #: ../lib/modules/posixAccount.inc:64
 #: ../lib/modules/posixAccount.inc:66
 #: ../lib/modules/posixAccount.inc:94
-#: ../lib/modules/posixAccount.inc:224
-#: ../lib/modules/posixAccount.inc:349
-#: ../lib/modules/posixAccount.inc:353
-#: ../lib/modules/posixAccount.inc:357
-#: ../lib/modules/posixAccount.inc:374
-#: ../lib/modules/posixAccount.inc:766
-#: ../lib/modules/posixAccount.inc:974
-#: ../lib/modules/posixAccount.inc:1141
-#: ../lib/modules/posixAccount.inc:1196
+#: ../lib/modules/posixAccount.inc:230
+#: ../lib/modules/posixAccount.inc:359
+#: ../lib/modules/posixAccount.inc:363
+#: ../lib/modules/posixAccount.inc:367
+#: ../lib/modules/posixAccount.inc:384
+#: ../lib/modules/posixAccount.inc:785
+#: ../lib/modules/posixAccount.inc:999
+#: ../lib/modules/posixAccount.inc:1166
+#: ../lib/modules/posixAccount.inc:1221
 msgid "Home directory"
 msgstr "个人目录"
 
@@ -2241,35 +2228,35 @@ msgstr "个人目录"
 msgid "Home directory changed. To keep home directory you have to run the following command as root: 'mv %s %s'"
 msgstr "使用者目录已经改变,要操持一致需要在系统以ROOT用户运行如下命令:'mv %s %s'"
 
-#: ../lib/modules/sambaAccount.inc:148
-#: ../lib/modules/sambaAccount.inc:279
-#: ../lib/modules/sambaAccount.inc:380
-#: ../lib/modules/sambaAccount.inc:783
-#: ../lib/modules/sambaAccount.inc:891
-#: ../lib/modules/sambaSamAccount.inc:232
-#: ../lib/modules/sambaSamAccount.inc:402
-#: ../lib/modules/sambaSamAccount.inc:1056
-#: ../lib/modules/sambaSamAccount.inc:1334
-#: ../lib/modules/sambaSamAccount.inc:1478
-#: ../lib/modules/sambaSamAccount.inc:1657
-#: ../lib/modules/sambaSamAccount.inc:1684
+#: ../lib/modules/sambaAccount.inc:150
+#: ../lib/modules/sambaAccount.inc:281
+#: ../lib/modules/sambaAccount.inc:382
+#: ../lib/modules/sambaAccount.inc:785
+#: ../lib/modules/sambaAccount.inc:893
+#: ../lib/modules/sambaSamAccount.inc:234
+#: ../lib/modules/sambaSamAccount.inc:404
+#: ../lib/modules/sambaSamAccount.inc:1042
+#: ../lib/modules/sambaSamAccount.inc:1320
+#: ../lib/modules/sambaSamAccount.inc:1464
+#: ../lib/modules/sambaSamAccount.inc:1643
+#: ../lib/modules/sambaSamAccount.inc:1670
 msgid "Home drive"
 msgstr "个人驱动器"
 
 #: ../lib/modules/sambaAccount.inc:61
 #: ../lib/modules/sambaAccount.inc:62
-#: ../lib/modules/sambaAccount.inc:154
-#: ../lib/modules/sambaAccount.inc:285
-#: ../lib/modules/sambaAccount.inc:383
-#: ../lib/modules/sambaAccount.inc:786
-#: ../lib/modules/sambaAccount.inc:890
+#: ../lib/modules/sambaAccount.inc:156
+#: ../lib/modules/sambaAccount.inc:287
+#: ../lib/modules/sambaAccount.inc:385
+#: ../lib/modules/sambaAccount.inc:788
+#: ../lib/modules/sambaAccount.inc:892
 #: ../lib/modules/sambaSamAccount.inc:81
 #: ../lib/modules/sambaSamAccount.inc:82
-#: ../lib/modules/sambaSamAccount.inc:235
-#: ../lib/modules/sambaSamAccount.inc:408
-#: ../lib/modules/sambaSamAccount.inc:1064
-#: ../lib/modules/sambaSamAccount.inc:1484
-#: ../lib/modules/sambaSamAccount.inc:1654
+#: ../lib/modules/sambaSamAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:410
+#: ../lib/modules/sambaSamAccount.inc:1050
+#: ../lib/modules/sambaSamAccount.inc:1470
+#: ../lib/modules/sambaSamAccount.inc:1640
 msgid "Home path"
 msgstr "个人目录路径"
 
@@ -2280,12 +2267,12 @@ msgid "Home path is invalid."
 msgstr "个人目录路径无效"
 
 #: ../lib/modules/inetOrgPerson.inc:79
-#: ../lib/modules/inetOrgPerson.inc:152
-#: ../lib/modules/inetOrgPerson.inc:255
-#: ../lib/modules/inetOrgPerson.inc:424
-#: ../lib/modules/inetOrgPerson.inc:748
-#: ../lib/modules/inetOrgPerson.inc:950
-#: ../lib/modules/inetOrgPerson.inc:1248
+#: ../lib/modules/inetOrgPerson.inc:155
+#: ../lib/modules/inetOrgPerson.inc:269
+#: ../lib/modules/inetOrgPerson.inc:466
+#: ../lib/modules/inetOrgPerson.inc:840
+#: ../lib/modules/inetOrgPerson.inc:1055
+#: ../lib/modules/inetOrgPerson.inc:1373
 msgid "Home telephone number"
 msgstr "宅电"
 
@@ -2302,24 +2289,24 @@ msgstr "主机帐号(比如 Samba)"
 msgid "Host description"
 msgstr "主机描述"
 
-#: ../lib/modules/account.inc:87
-#: ../lib/modules/posixAccount.inc:405
-#: ../lib/modules/posixAccount.inc:413
+#: ../lib/modules/account.inc:89
+#: ../lib/modules/posixAccount.inc:415
+#: ../lib/modules/posixAccount.inc:423
 msgid "Host description. If left empty host name will be used."
 msgstr "主机描述.如果留空会使用主机名."
 
-#: ../lib/modules/account.inc:106
+#: ../lib/modules/account.inc:108
 msgid "Host list"
 msgstr "主机列表"
 
 #: ../lib/types/host.inc:82
 #: ../lib/types/host.inc:83
-#: ../lib/modules/account.inc:82
+#: ../lib/modules/account.inc:84
 #: ../lib/modules/posixAccount.inc:78
 #: ../lib/modules/posixAccount.inc:79
 #: ../lib/modules/posixAccount.inc:81
-#: ../lib/modules/posixAccount.inc:271
-#: ../lib/modules/posixAccount.inc:400
+#: ../lib/modules/posixAccount.inc:277
+#: ../lib/modules/posixAccount.inc:410
 msgid "Host name"
 msgstr "主机名"
 
@@ -2339,8 +2326,8 @@ msgstr "主机名包含无效字符,可用字符为 a-z, A-Z, 0-9 和 .-_ ! 主
 msgid "Host name in use. Selected next free host name."
 msgstr "主机名已被使用, 请选择其它的主机名."
 
-#: ../lib/modules/account.inc:83
-#: ../lib/modules/posixAccount.inc:401
+#: ../lib/modules/account.inc:85
+#: ../lib/modules/posixAccount.inc:411
 msgid "Host name of the host which should be created. Valid characters are: a-z,A-Z,0-9, .-_$. LAM does not allow a number as first character because useradd also does not allow it. Host names are always ending with $. If last character is not $ it will be added. If host name is already used host name will be expanded with a number. The next free number will be used."
 msgstr "将要建立的主机名.合法字符为:a-z,A-Z,0-9,_$.因为useradd不允许第一个字符为数字,所以LAM也不允许.主机名总是以$结尾.如果最后一个字符不是$,会自动填加.如果主机名已经存在,会在主机名后自动增加下一个可用的数字."
 
@@ -2348,7 +2335,7 @@ msgstr "将要建立的主机名.合法字符为:a-z,A-Z,0-9,_$.因为useradd不
 #: ../lib/modules/posixAccount.inc:58
 #: ../lib/modules/posixAccount.inc:59
 #: ../lib/modules/posixAccount.inc:61
-#: ../lib/modules/posixAccount.inc:167
+#: ../lib/modules/posixAccount.inc:166
 msgid "Hosts"
 msgstr "主机"
 
@@ -2356,112 +2343,113 @@ msgstr "主机"
 msgid "I am sure"
 msgstr "确认"
 
-#: ../lib/modules/posixGroup.inc:465
-#: ../lib/modules/posixGroup.inc:573
+#: ../lib/modules/posixGroup.inc:473
+#: ../lib/modules/posixGroup.inc:581
 #: ../lib/modules/posixAccount.inc:69
-#: ../lib/modules/posixAccount.inc:748
+#: ../lib/modules/posixAccount.inc:767
 msgid "ID is already in use"
 msgstr "ID已经被使用"
 
-#: ../lib/modules/posixGroup.inc:463
-#: ../lib/modules/posixGroup.inc:464
-#: ../lib/modules/posixGroup.inc:465
-#: ../lib/modules/posixGroup.inc:565
+#: ../lib/modules/posixGroup.inc:471
+#: ../lib/modules/posixGroup.inc:472
+#: ../lib/modules/posixGroup.inc:473
 #: ../lib/modules/posixGroup.inc:573
+#: ../lib/modules/posixGroup.inc:581
 #: ../lib/modules/posixAccount.inc:67
 #: ../lib/modules/posixAccount.inc:68
 #: ../lib/modules/posixAccount.inc:69
-#: ../lib/modules/posixAccount.inc:744
-#: ../lib/modules/posixAccount.inc:748
+#: ../lib/modules/posixAccount.inc:763
+#: ../lib/modules/posixAccount.inc:767
 msgid "ID-Number"
 msgstr "ID号"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:146
-msgid "IT"
-msgstr "IT"
-
 #: ../templates/masscreate.php:161
 #: ../templates/masscreate.php:174
-#: ../templates/masscreate.php:314
+#: ../templates/masscreate.php:313
 msgid "Identifier"
 msgstr "标识"
 
-#: ../lib/modules/sambaSamAccount.inc:1369
-#: ../lib/modules/sambaSamAccount.inc:1695
+#: ../lib/modules/sambaSamAccount.inc:1355
+#: ../lib/modules/sambaSamAccount.inc:1681
 msgid "Idle time limit"
 msgstr "空闲时间限制"
 
-#: ../lib/modules/sambaAccount.inc:352
-#: ../lib/modules/sambaSamAccount.inc:201
+#: ../lib/modules/sambaAccount.inc:354
+#: ../lib/modules/sambaSamAccount.inc:203
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "如果选中将使用UNIX密码作为SAMBA密码."
 
-#: ../lib/modules/posixAccount.inc:383
+#: ../lib/modules/posixAccount.inc:393
 msgid "If checked account will be deactivated by putting a \"!\" before the encrypted password."
 msgstr "在密码前加\"!\",此帐号会被停用."
 
-#: ../lib/modules/sambaAccount.inc:370
+#: ../lib/modules/sambaAccount.inc:372
 msgid "If checked account will be deactivated. (Setting D-Flag)"
 msgstr "如果选中,帐号会停用(设定D标志)"
 
-#: ../lib/modules/sambaAccount.inc:358
-#: ../lib/modules/sambaSamAccount.inc:207
+#: ../lib/modules/sambaAccount.inc:360
+#: ../lib/modules/sambaSamAccount.inc:209
 msgid "If checked no password will be used."
 msgstr "如果选中,不需要密码."
 
-#: ../lib/modules/sambaAccount.inc:364
-#: ../lib/modules/sambaSamAccount.inc:213
+#: ../lib/modules/sambaAccount.inc:366
+#: ../lib/modules/sambaSamAccount.inc:215
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "密码不过期.(设置X标志)"
 
-#: ../lib/modules/sambaSamAccount.inc:219
+#: ../lib/modules/sambaSamAccount.inc:221
 msgid "If checked then the account will be deactivated. (Setting D-Flag)"
 msgstr "密码停用(设置D标志)"
 
-#: ../lib/modules/sambaSamAccount.inc:222
+#: ../lib/modules/sambaSamAccount.inc:224
 msgid "If checked then the account will be locked (setting L-Flag). You usually want to use this setting to unlock user accounts which were locked because of failed login attempts."
 msgstr "帐号被锁定(设置L标志).多次登录失败后帐号会被锁定.在此可以解除锁定."
 
-#: ../lib/modules/posixGroup.inc:379
+#: ../lib/modules/posixGroup.inc:387
 msgid "If empty GID number will be generated automaticly depending on your configuration settings."
 msgstr "如果为空,视配置而定,GID号自动产生."
 
-#: ../lib/modules/posixAccount.inc:338
+#: ../lib/modules/posixAccount.inc:348
 msgid "If empty UID number will be generated automaticly."
 msgstr "如果为空,UID号会自动生成."
 
-#: ../lib/modules/sambaDomain.inc:101
+#: ../lib/modules/sambaDomain.inc:103
 msgid "If set then users need to login to change their password."
 msgstr "如果设置,用户需要密码才能登录."
 
-#: ../lib/modules/sambaAccount.inc:355
-#: ../lib/modules/sambaSamAccount.inc:204
+#: ../lib/modules/sambaAccount.inc:357
+#: ../lib/modules/sambaSamAccount.inc:206
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr "如果设为\"true\",会用UNIX用户密码做为SAMBA密码."
 
-#: ../lib/modules/sambaAccount.inc:373
-#: ../lib/modules/sambaSamAccount.inc:225
+#: ../lib/modules/sambaAccount.inc:375
+#: ../lib/modules/sambaSamAccount.inc:227
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr "如果设为\"true\",帐号会被停用(设置D标志)."
 
-#: ../lib/modules/sambaAccount.inc:361
-#: ../lib/modules/sambaSamAccount.inc:210
+#: ../lib/modules/sambaAccount.inc:363
+#: ../lib/modules/sambaSamAccount.inc:212
 msgid "If set to \"true\" no password will be used."
 msgstr "如果设为\"true\",则不需要密码."
 
-#: ../lib/modules/sambaAccount.inc:367
-#: ../lib/modules/sambaSamAccount.inc:216
+#: ../lib/modules/sambaAccount.inc:369
+#: ../lib/modules/sambaSamAccount.inc:218
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr "如果设为\"true\",密码不会过期(设为X标志)."
 
-#: ../help/help.inc:175
+#: ../help/help.inc:177
 msgid "If you decide to send the password via mail then the mail template \"config/passwordMailTemplate.txt\" will be used."
 msgstr "如果您决定通过邮件发送密码，将会使用\"config/passwordMailTemplate.txt\"邮件模板。"
 
-#: ../lib/modules/sambaSamAccount.inc:261
+#: ../lib/modules/sambaSamAccount.inc:263
 msgid "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr "如果留空,LAM会用如下算法:uidNumber*2 + sambaAlgorithmicRidBase."
 
+#: ../lib/modules/phpGroupwareGroup.inc:74
+#: ../lib/modules/phpGroupwareUser.inc:75
+msgid "If you set this to \"true\" then the phpGroupware extension will be added."
+msgstr "如果设为\"true\",则会增加 phpGroupWare 扩展."
+
 #: ../help/help.inc:100
 msgid "If you want to change the current preferences password, please enter it here."
 msgstr "在此设置当前管理密码."
@@ -2470,12 +2458,12 @@ msgstr "在此设置当前管理密码."
 msgid "If you want to change your master configuration password, please enter it here."
 msgstr "在此变更管理配置密码."
 
-#: ../lib/modules/sambaAccount.inc:405
+#: ../lib/modules/sambaAccount.inc:407
 msgid "If you want to create domain administrators or other special users use this option."
 msgstr "使用这个选项,建立域管理员或其它特殊帐号."
 
-#: ../lib/modules/sambaAccount.inc:399
-#: ../lib/modules/sambaGroupMapping.inc:317
+#: ../lib/modules/sambaAccount.inc:401
+#: ../lib/modules/sambaGroupMapping.inc:319
 msgid "If you want to use a well known RID you can selcet a well known group."
 msgstr "如果想用知名的RID,需要选择知名的组。"
 
@@ -2483,9 +2471,9 @@ msgstr "如果想用知名的RID,需要选择知名的组。"
 msgid "Include system attributes"
 msgstr "包括系统属性"
 
-#: ../lib/modules/sambaSamAccount.inc:290
-#: ../lib/modules/sambaSamAccount.inc:1344
-#: ../lib/modules/sambaSamAccount.inc:1690
+#: ../lib/modules/sambaSamAccount.inc:292
+#: ../lib/modules/sambaSamAccount.inc:1330
+#: ../lib/modules/sambaSamAccount.inc:1676
 msgid "Inherit client startup configuration"
 msgstr "继承客户初始配置"
 
@@ -2499,9 +2487,9 @@ msgstr "继承自"
 msgid "Inherits from"
 msgstr "继承自"
 
-#: ../lib/modules/sambaSamAccount.inc:293
-#: ../lib/modules/sambaSamAccount.inc:1349
-#: ../lib/modules/sambaSamAccount.inc:1691
+#: ../lib/modules/sambaSamAccount.inc:295
+#: ../lib/modules/sambaSamAccount.inc:1335
+#: ../lib/modules/sambaSamAccount.inc:1677
 msgid "Initial program"
 msgstr "初始化程序"
 
@@ -2561,57 +2549,38 @@ msgstr "错误的RDN属性!"
 msgid "Invalid account"
 msgstr "无效的帐号"
 
-#: ../lib/modules/kolabUser.inc:126
-#: ../lib/modules/kolabUser.inc:173
-#: ../lib/modules/kolabUser.inc:354
-#: ../lib/modules/kolabUser.inc:778
+#: ../lib/modules/kolabUser.inc:129
+#: ../lib/modules/kolabUser.inc:145
+#: ../lib/modules/kolabUser.inc:192
+#: ../lib/modules/kolabUser.inc:373
+#: ../lib/modules/kolabUser.inc:797
+#: ../lib/modules/kolabUser.inc:920
 msgid "Invitation policy"
 msgstr "邀请原则"
 
-#: ../lib/modules/kolabUser.inc:130
+#: ../lib/modules/kolabUser.inc:149
 msgid "Invitation policy list"
 msgstr "邀请原则列表"
 
-#: ../lib/modules/sambaSamAccount.inc:493
+#: ../lib/modules/sambaSamAccount.inc:495
 msgid "Islamabad, Karachi"
 msgstr "伊斯兰堡,卡拉奇"
 
-#: ../lib/modules/posixGroup.inc:463
+#: ../lib/modules/posixGroup.inc:471
 #: ../lib/modules/posixAccount.inc:68
 msgid "It is possible that this ID-number is reused. This can cause several problems because files with old permissions might still exist. To avoid this warning set maxUID to a higher value."
 msgstr "UID可能被重用,因为旧的权限有可能仍然存在,所以会带来一些问题.要避免本警告消息,请把最大UID设得高一点."
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:85
-#: ../lib/modules/neofonieInetOrgPerson.inc:139
-#: ../lib/modules/neofonieInetOrgPerson.inc:179
-#: ../lib/modules/neofonieInetOrgPerson.inc:257
-#: ../lib/modules/neofonieInetOrgPerson.inc:392
-#: ../lib/modules/neofonieInetOrgPerson.inc:627
-#: ../lib/modules/neofonieInetOrgPerson.inc:748
-msgid "Jabber IDs"
-msgstr "Jabber ID号"
-
-#: ../lib/modules/neofonieInetOrgPerson.inc:91
-#: ../lib/modules/neofonieInetOrgPerson.inc:149
-#: ../lib/modules/neofonieInetOrgPerson.inc:275
-#: ../lib/modules/neofonieInetOrgPerson.inc:618
-msgid "Job position"
-msgstr "工作岗位"
-
-#: ../lib/modules/neofonieInetOrgPerson.inc:92
-msgid "Job position of this user (e.g. developer, temp, ...)."
-msgstr "用户岗位(比如:开发人员,临时工,...)"
-
 #: ../lib/modules/inetOrgPerson.inc:93
-#: ../lib/modules/inetOrgPerson.inc:156
-#: ../lib/modules/inetOrgPerson.inc:201
-#: ../lib/modules/inetOrgPerson.inc:352
-#: ../lib/modules/inetOrgPerson.inc:779
-#: ../lib/modules/inetOrgPerson.inc:940
+#: ../lib/modules/inetOrgPerson.inc:168
+#: ../lib/modules/inetOrgPerson.inc:215
+#: ../lib/modules/inetOrgPerson.inc:394
+#: ../lib/modules/inetOrgPerson.inc:871
+#: ../lib/modules/inetOrgPerson.inc:1045
 msgid "Job title"
 msgstr "职称"
 
-#: ../lib/modules/inetOrgPerson.inc:353
+#: ../lib/modules/inetOrgPerson.inc:395
 msgid "Job title of user: President, department manager, ..."
 msgstr "用户职称:如总裁,部门经理..."
 
@@ -2629,7 +2598,7 @@ msgstr "选择一个属性类型"
 msgid "Jump to an object class"
 msgstr "选择一个目标类"
 
-#: ../lib/modules/kolabUser.inc:70
+#: ../lib/modules/kolabUser.inc:72
 msgid "Kolab"
 msgstr "Kolab"
 
@@ -2638,7 +2607,7 @@ msgstr "Kolab"
 msgid "LAM can recursively delete this entry and all of its children. See below for a list of all the entries that this action will delete. Do you want to do this?"
 msgstr "LAM会递归删除本条目及所有子条目,下面列表中所有条目都会被删除,确定吗?"
 
-#: ../templates/login.php:200
+#: ../templates/login.php:212
 #: ../templates/config/index.php:61
 msgid "LAM configuration"
 msgstr "LAM 配置"
@@ -2647,8 +2616,8 @@ msgstr "LAM 配置"
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "您的输入检查完毕,即将建立帐号"
 
-#: ../lib/modules/posixGroup.inc:403
-#: ../lib/modules/posixAccount.inc:334
+#: ../lib/modules/posixGroup.inc:411
+#: ../lib/modules/posixAccount.inc:344
 msgid "LAM supports CRYPT, SHA, SSHA, MD5 and SMD5 to generate the hash value of passwords. SSHA and CRYPT are the most common but CRYPT does not support passwords greater than 8 letters. We do not recommend to use plain text passwords."
 msgstr "系统支持CRYPT, SHA, SSHA, MD5 和 SMD5等HASH算法,用来产生密码的HASH值.SSHA 和 CRYPT是最常用的,但CRYPT 不支持8个字符以上的密码.不建议使用明文密码."
 
@@ -2662,7 +2631,7 @@ msgstr "LAM 测试"
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAM无法建立%s帐号,LDAP发生错误."
 
-#: ../lib/modules/sambaGroupMapping.inc:396
+#: ../lib/modules/sambaGroupMapping.inc:398
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "系统找不到这个Samba域!"
 
@@ -2674,16 +2643,16 @@ msgstr "LAM找不到这个域!"
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAM找不到这个组"
 
-#: ../lib/modules/posixAccount.inc:1575
+#: ../lib/modules/posixAccount.inc:1613
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAM无法修改 %s组成员"
 
-#: ../help/help.inc:158
+#: ../help/help.inc:160
 msgid "LAM will search for accounts in this part of the LDAP tree."
 msgstr "LAM将在这部分LDAP树搜索帐号."
 
-#: ../help/help.inc:160
+#: ../help/help.inc:162
 msgid "LAM will use this LDAP DN and password to search for accounts. It is sufficient to specify an account with read rights. If nothing is inserted then LAM will try to connect anonymously."
 msgstr "LAM将会这个使用 LDAP DN 和密码搜索帐号.这个帐号需要有读权限.如果留空,LAM将匿名登录LDAP."
 
@@ -2693,12 +2662,16 @@ msgstr "LDAP"
 
 #: ../templates/config/confmodules.php:76
 #: ../templates/config/confmain.php:121
-#: ../templates/config/confmain.php:594
+#: ../templates/config/confmain.php:597
 #: ../templates/config/conftypes.php:154
 #: ../templates/selfService/adminMain.php:107
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP帐号管理配置"
 
+#: ../lib/modules/kolabUser.inc:142
+msgid "LDAP DN (e.g. dc=company,dc=com) of accounts. This is used to find possible delegation candidates."
+msgstr "帐号的LDAP DN(比如: dc=complay,dc=com).用来查找可能的委托候选人."
+
 #: ../lib/lists.inc:854
 msgid "LDAP Search failed! Please check your preferences."
 msgstr "LDAP搜索失败,请检查配置."
@@ -2707,11 +2680,11 @@ msgstr "LDAP搜索失败,请检查配置."
 msgid "LDAP Suffix is invalid!"
 msgstr "LDAP后缀无效!"
 
-#: ../templates/login.php:434
+#: ../templates/login.php:445
 msgid "LDAP error, server says:"
 msgstr "LDAP错误,服务器错误消息:"
 
-#: ../lib/modules.inc:1068
+#: ../lib/modules.inc:1210
 msgid "LDAP operation successful."
 msgstr "LDAP操作成功."
 
@@ -2720,15 +2693,15 @@ msgid "LDAP password"
 msgstr "LDAP 密码"
 
 #: ../templates/selfService/adminMain.php:324
-#: ../help/help.inc:161
+#: ../help/help.inc:163
 msgid "LDAP search attribute"
 msgstr "LDAP搜索属性"
 
-#: ../templates/login.php:318
+#: ../templates/login.php:330
 msgid "LDAP server"
 msgstr "LDAP服务器"
 
-#: ../lib/types/group.inc:239
+#: ../lib/types/group.inc:240
 #: ../lib/lists.inc:837
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "超过LDAP限制的大小,无法显示所有条目."
@@ -2737,7 +2710,7 @@ msgstr "超过LDAP限制的大小,无法显示所有条目."
 #: ../templates/selfService/adminMain.php:283
 #: ../templates/profedit/profilepage.php:183
 #: ../help/help.inc:71
-#: ../help/help.inc:157
+#: ../help/help.inc:159
 msgid "LDAP suffix"
 msgstr "LDAP后缀"
 
@@ -2753,7 +2726,7 @@ msgstr "LDAP上传中,请稍等..."
 msgid "LDAP user"
 msgstr "LDAP用户"
 
-#: ../help/help.inc:159
+#: ../help/help.inc:161
 msgid "LDAP user and password"
 msgstr "LDAP用户名和密码"
 
@@ -2762,36 +2735,37 @@ msgstr "LDAP用户名和密码"
 msgid "LDIF Export for: %s"
 msgstr "输出到LDIF文件名:%s"
 
-#: ../templates/tests/lamdaemonTest.php:144
+#: ../templates/tests/lamdaemonTest.php:205
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemon 服务器和路径"
 
-#: ../templates/tests/lamdaemonTest.php:105
+#: ../templates/tests/lamdaemonTest.php:169
 msgid "Lamdaemon successfully run."
 msgstr "Lamdaemon成功执行."
 
 #: ../templates/tests/index.php:58
 #: ../templates/tests/lamdaemonTest.php:55
+#: ../templates/tests/lamdaemonTest.php:76
 msgid "Lamdaemon test"
 msgstr "Lamdaemon测试"
 
-#: ../templates/tests/lamdaemonTest.php:238
+#: ../templates/tests/lamdaemonTest.php:300
 msgid "Lamdaemon test finished."
 msgstr "Lamdaemon 测试结束."
 
-#: ../templates/tests/lamdaemonTest.php:232
+#: ../templates/tests/lamdaemonTest.php:294
 msgid "Lamdaemon: Quota module installed"
 msgstr "Lamdaemon: 配额模块已安装."
 
-#: ../templates/tests/lamdaemonTest.php:233
+#: ../templates/tests/lamdaemonTest.php:295
 msgid "Lamdaemon: read quotas"
 msgstr "Lamdaemon: 读取配额"
 
-#: ../templates/login.php:267
+#: ../templates/login.php:279
 msgid "Language"
 msgstr "语言"
 
-#: ../templates/config/confmain.php:517
+#: ../templates/config/confmain.php:516
 msgid "Language is not defined!"
 msgstr "尚未定义语言"
 
@@ -2799,14 +2773,24 @@ msgstr "尚未定义语言"
 msgid "Language settings"
 msgstr "语言设定"
 
+#: ../lib/modules/phpGroupwareUser.inc:160
+#: ../lib/modules/phpGroupwareUser.inc:386
+msgid "Last login"
+msgstr "上次登录"
+
+#: ../lib/modules/phpGroupwareUser.inc:168
+#: ../lib/modules/phpGroupwareUser.inc:381
+msgid "Last login from"
+msgstr "上一次登录地"
+
 #: ../lib/types/user.inc:88
 #: ../lib/modules/inetOrgPerson.inc:75
-#: ../lib/modules/inetOrgPerson.inc:148
-#: ../lib/modules/inetOrgPerson.inc:188
-#: ../lib/modules/inetOrgPerson.inc:360
-#: ../lib/modules/inetOrgPerson.inc:657
-#: ../lib/modules/inetOrgPerson.inc:942
-#: ../lib/modules/inetOrgPerson.inc:1224
+#: ../lib/modules/inetOrgPerson.inc:151
+#: ../lib/modules/inetOrgPerson.inc:202
+#: ../lib/modules/inetOrgPerson.inc:402
+#: ../lib/modules/inetOrgPerson.inc:725
+#: ../lib/modules/inetOrgPerson.inc:1047
+#: ../lib/modules/inetOrgPerson.inc:1349
 msgid "Last name"
 msgstr "姓"
 
@@ -2815,11 +2799,11 @@ msgstr "姓"
 msgid "Last name contains invalid characters or is empty!"
 msgstr "姓包含非法字符或为空!"
 
-#: ../lib/modules/inetOrgPerson.inc:361
+#: ../lib/modules/inetOrgPerson.inc:403
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "用户姓.只允许字符,-和空格."
 
-#: ../lib/modules/shadowAccount.inc:363
+#: ../lib/modules/shadowAccount.inc:365
 msgid "Last password change"
 msgstr "最后密码变更"
 
@@ -2840,20 +2824,12 @@ msgstr "属性列表"
 msgid "List attributes are invalid!"
 msgstr "属性列表非法!"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:83
-msgid "List of ComBots IDs."
-msgstr "ComBots ID号列表"
-
-#: ../lib/modules/neofonieInetOrgPerson.inc:86
-msgid "List of Jabber IDs."
-msgstr "Jabber ID号列表."
-
-#: ../lib/modules/sambaAccount.inc:393
-#: ../lib/modules/sambaSamAccount.inc:245
+#: ../lib/modules/sambaAccount.inc:395
+#: ../lib/modules/sambaSamAccount.inc:247
 msgid "List of Samba workstations the user is allowed to login. Empty means every workstation."
 msgstr "允许用户登录的Samba工作站,留空表示所有工作站."
 
-#: ../templates/config/confmain.php:511
+#: ../templates/config/confmain.php:510
 msgid "List of admin users is empty or invalid!"
 msgstr "管理员清单为空或非法."
 
@@ -2861,35 +2837,23 @@ msgstr "管理员清单为空或非法."
 msgid "List of entries to be deleted:"
 msgstr "将被删除的条目列表:"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:98
-msgid "List of project groups of this user."
-msgstr "用户工程组列表"
-
-#: ../lib/modules/neofonieInetOrgPerson.inc:95
-msgid "List of projects the user is working on."
-msgstr "用户当前工程列表"
-
-#: ../lib/modules/neofonieInetOrgPerson.inc:101
-msgid "List of special skills that the user has."
-msgstr "用户技能列表"
-
 #: ../templates/config/confmain.php:418
 msgid "List of valid users"
 msgstr "合法用户列表"
 
-#: ../lib/modules.inc:1024
-#: ../help/help.inc:150
+#: ../lib/modules.inc:1166
+#: ../help/help.inc:152
 msgid "Load profile"
 msgstr "调入配置文件"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:63
-#: ../lib/modules/inetLocalMailRecipient.inc:156
+#: ../lib/modules/inetLocalMailRecipient.inc:65
+#: ../lib/modules/inetLocalMailRecipient.inc:158
 msgid "Local address"
 msgstr "本机邮件"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:67
-#: ../lib/modules/inetLocalMailRecipient.inc:100
-#: ../lib/modules/inetLocalMailRecipient.inc:314
+#: ../lib/modules/inetLocalMailRecipient.inc:69
+#: ../lib/modules/inetLocalMailRecipient.inc:102
+#: ../lib/modules/inetLocalMailRecipient.inc:316
 msgid "Local address list"
 msgstr "本机邮递列表"
 
@@ -2897,52 +2861,62 @@ msgstr "本机邮递列表"
 msgid "Local group"
 msgstr "本地组"
 
-#: ../lib/modules/posixGroup.inc:176
-#: ../lib/modules/posixAccount.inc:252
-#: ../lib/modules/posixAccount.inc:1007
+#: ../lib/modules/inetOrgPerson.inc:156
+#: ../lib/modules/inetOrgPerson.inc:160
+#: ../lib/modules/inetOrgPerson.inc:299
+#: ../lib/modules/inetOrgPerson.inc:478
+#: ../lib/modules/inetOrgPerson.inc:795
+#: ../lib/modules/inetOrgPerson.inc:1064
+#: ../lib/modules/inetOrgPerson.inc:1437
+msgid "Location"
+msgstr "地点"
+
+#: ../lib/modules/posixGroup.inc:178
+#: ../lib/modules/posixAccount.inc:258
+#: ../lib/modules/posixAccount.inc:1032
 msgid "Lock password"
 msgstr "锁定密码"
 
-#: ../lib/modules/sambaDomain.inc:124
-#: ../lib/modules/sambaDomain.inc:201
-#: ../lib/modules/sambaDomain.inc:335
-#: ../lib/modules/sambaDomain.inc:679
+#: ../lib/modules/sambaDomain.inc:126
+#: ../lib/modules/sambaDomain.inc:203
+#: ../lib/modules/sambaDomain.inc:337
+#: ../lib/modules/sambaDomain.inc:681
 msgid "Lockout duration"
 msgstr "帐号锁定期"
 
-#: ../lib/modules/sambaDomain.inc:201
+#: ../lib/modules/sambaDomain.inc:203
 msgid "Lockout duration must be are natural number."
 msgstr "帐号锁定期必须是自然数."
 
-#: ../lib/modules/sambaDomain.inc:112
-#: ../lib/modules/sambaDomain.inc:203
-#: ../lib/modules/sambaDomain.inc:308
-#: ../lib/modules/sambaDomain.inc:670
+#: ../lib/modules/sambaDomain.inc:114
+#: ../lib/modules/sambaDomain.inc:205
+#: ../lib/modules/sambaDomain.inc:310
+#: ../lib/modules/sambaDomain.inc:672
 msgid "Lockout users after bad logon attempts"
 msgstr "在多次错误登录后锁定用户."
 
-#: ../lib/modules/sambaDomain.inc:203
+#: ../lib/modules/sambaDomain.inc:205
 msgid "Lockout users after bad logon attempts must be between 0 and 999."
 msgstr "用户锁定前错误的登录次数必须在0－999之间。"
 
-#: ../templates/config/mainmanage.php:234
+#: ../templates/config/mainmanage.php:282
 #: ../help/help.inc:133
 msgid "Log destination"
 msgstr "日志存储位置"
 
-#: ../templates/config/mainmanage.php:205
+#: ../templates/config/mainmanage.php:253
 #: ../help/help.inc:131
 msgid "Log level"
 msgstr "日志等级"
 
-#: ../templates/config/mainmanage.php:199
+#: ../templates/config/mainmanage.php:247
 msgid "Logging"
 msgstr "日志"
 
-#: ../templates/login.php:293
+#: ../templates/login.php:305
 #: ../templates/config/conflogin.php:59
 #: ../templates/config/mainlogin.php:67
-#: ../templates/selfService/selfServiceLogin.php:130
+#: ../templates/selfService/selfServiceLogin.php:129
 #: ../templates/selfService/adminLogin.php:61
 #: ../templates/selfService/adminMain.php:255
 #: ../help/help.inc:57
@@ -2950,57 +2924,57 @@ msgid "Login"
 msgstr "登录"
 
 #: ../templates/selfService/adminMain.php:352
-#: ../help/help.inc:163
+#: ../help/help.inc:165
 msgid "Login attribute label"
 msgstr "登录属性标签"
 
 #: ../templates/selfService/adminMain.php:367
-#: ../help/help.inc:165
+#: ../help/help.inc:167
 msgid "Login caption"
 msgstr "登录标题"
 
 #: ../lib/types/user.inc:90
-#: ../lib/modules/posixAccount.inc:238
-#: ../lib/modules/posixAccount.inc:386
-#: ../lib/modules/posixAccount.inc:995
-#: ../lib/modules/posixAccount.inc:1146
-#: ../lib/modules/posixAccount.inc:1197
+#: ../lib/modules/posixAccount.inc:244
+#: ../lib/modules/posixAccount.inc:396
+#: ../lib/modules/posixAccount.inc:1020
+#: ../lib/modules/posixAccount.inc:1171
+#: ../lib/modules/posixAccount.inc:1222
 msgid "Login shell"
 msgstr "登录shell"
 
-#: ../templates/pdfedit/pdfpage.php:433
+#: ../templates/pdfedit/pdfpage.php:399
 msgid "Logo"
 msgstr "标志"
 
-#: ../lib/modules/sambaDomain.inc:100
-#: ../lib/modules/sambaDomain.inc:275
-#: ../lib/modules/sambaDomain.inc:657
+#: ../lib/modules/sambaDomain.inc:102
+#: ../lib/modules/sambaDomain.inc:277
+#: ../lib/modules/sambaDomain.inc:659
 msgid "Logon for password change"
 msgstr "密码修改登录"
 
 #: ../lib/modules/sambaSamAccount.inc:108
-#: ../lib/modules/sambaSamAccount.inc:269
-#: ../lib/modules/sambaSamAccount.inc:272
-#: ../lib/modules/sambaSamAccount.inc:446
-#: ../lib/modules/sambaSamAccount.inc:1132
-#: ../lib/modules/sambaSamAccount.inc:1530
+#: ../lib/modules/sambaSamAccount.inc:271
+#: ../lib/modules/sambaSamAccount.inc:274
+#: ../lib/modules/sambaSamAccount.inc:448
+#: ../lib/modules/sambaSamAccount.inc:1118
+#: ../lib/modules/sambaSamAccount.inc:1516
 msgid "Logon hours"
 msgstr "可登录时间"
 
 #: ../lib/modules/sambaAccount.inc:67
 #: ../lib/modules/sambaAccount.inc:68
-#: ../lib/modules/sambaAccount.inc:166
-#: ../lib/modules/sambaAccount.inc:297
-#: ../lib/modules/sambaAccount.inc:389
-#: ../lib/modules/sambaAccount.inc:792
-#: ../lib/modules/sambaAccount.inc:892
+#: ../lib/modules/sambaAccount.inc:168
+#: ../lib/modules/sambaAccount.inc:299
+#: ../lib/modules/sambaAccount.inc:391
+#: ../lib/modules/sambaAccount.inc:794
+#: ../lib/modules/sambaAccount.inc:894
 #: ../lib/modules/sambaSamAccount.inc:87
 #: ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:241
-#: ../lib/modules/sambaSamAccount.inc:420
-#: ../lib/modules/sambaSamAccount.inc:1080
-#: ../lib/modules/sambaSamAccount.inc:1496
-#: ../lib/modules/sambaSamAccount.inc:1660
+#: ../lib/modules/sambaSamAccount.inc:243
+#: ../lib/modules/sambaSamAccount.inc:422
+#: ../lib/modules/sambaSamAccount.inc:1066
+#: ../lib/modules/sambaSamAccount.inc:1482
+#: ../lib/modules/sambaSamAccount.inc:1646
 msgid "Logon script"
 msgstr "登录脚本"
 
@@ -3017,75 +2991,75 @@ msgstr "登录脚本非法!"
 msgid "Logout"
 msgstr "退出"
 
-#: ../lib/modules/ieee802device.inc:49
-#: ../lib/modules/ieee802device.inc:59
-#: ../lib/modules/ieee802device.inc:70
-#: ../lib/modules/ieee802device.inc:100
+#: ../lib/modules/ieee802device.inc:51
+#: ../lib/modules/ieee802device.inc:61
+#: ../lib/modules/ieee802device.inc:72
+#: ../lib/modules/ieee802device.inc:102
 msgid "MAC address"
 msgstr "MAC地址"
 
-#: ../lib/modules/ieee802device.inc:63
+#: ../lib/modules/ieee802device.inc:65
 msgid "MAC address list"
 msgstr "MAC地址列表"
 
-#: ../lib/modules/ieee802device.inc:195
+#: ../lib/modules/ieee802device.inc:197
 msgid "MAC address(es)"
 msgstr "MAC地址"
 
-#: ../lib/modules/sambaSamAccount.inc:499
+#: ../lib/modules/sambaSamAccount.inc:501
 msgid "Magadan, Solomon Islands"
 msgstr "马加丹,所罗门群岛"
 
 #: ../lib/types/mailAlias.inc:44
-#: ../lib/modules/nisMailAlias.inc:53
+#: ../lib/modules/nisMailAlias.inc:55
 msgid "Mail aliases"
 msgstr "邮件别名"
 
-#: ../lib/modules/kolabUser.inc:95
-#: ../lib/modules/kolabUser.inc:162
-#: ../lib/modules/kolabUser.inc:210
-#: ../lib/modules/kolabUser.inc:311
-#: ../lib/modules/kolabUser.inc:762
+#: ../lib/modules/kolabUser.inc:97
+#: ../lib/modules/kolabUser.inc:181
+#: ../lib/modules/kolabUser.inc:229
+#: ../lib/modules/kolabUser.inc:330
+#: ../lib/modules/kolabUser.inc:781
 msgid "Mail quota"
 msgstr "邮件限额"
 
-#: ../lib/modules/kolabUser.inc:238
-#: ../lib/modules/kolabUser.inc:239
+#: ../lib/modules/kolabUser.inc:257
+#: ../lib/modules/kolabUser.inc:258
 msgid "Mail quota must be a number!"
 msgstr "邮件限额必须是数字!"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:49
+#: ../lib/modules/inetLocalMailRecipient.inc:51
 msgid "Mail routing"
 msgstr "邮件路由"
 
-#: ../lib/modules/kolabUser.inc:83
-#: ../lib/modules/inetLocalMailRecipient.inc:71
-#: ../lib/modules/inetLocalMailRecipient.inc:77
-#: ../lib/modules/inetLocalMailRecipient.inc:106
-#: ../lib/modules/inetLocalMailRecipient.inc:148
-#: ../lib/modules/inetLocalMailRecipient.inc:317
+#: ../lib/modules/kolabUser.inc:85
+#: ../lib/modules/inetLocalMailRecipient.inc:73
+#: ../lib/modules/inetLocalMailRecipient.inc:79
+#: ../lib/modules/inetLocalMailRecipient.inc:108
+#: ../lib/modules/inetLocalMailRecipient.inc:150
+#: ../lib/modules/inetLocalMailRecipient.inc:319
 msgid "Mail server"
 msgstr "邮件服务器"
 
-#: ../templates/lists/changePassword.php:313
+#: ../templates/lists/changePassword.php:319
 #, php-format
 msgid "Mail successfully sent to %s."
 msgstr "邮件已经成功发送到%s."
 
-#: ../lib/modules/kolabUser.inc:154
-#: ../lib/modules/kolabUser.inc:185
-#: ../lib/modules/kolabUser.inc:299
-#: ../lib/modules/kolabUser.inc:305
-#: ../lib/modules/kolabUser.inc:758
+#: ../lib/modules/kolabUser.inc:173
+#: ../lib/modules/kolabUser.inc:204
+#: ../lib/modules/kolabUser.inc:318
+#: ../lib/modules/kolabUser.inc:324
+#: ../lib/modules/kolabUser.inc:777
 msgid "Mailbox home server"
 msgstr "邮件宿主服务器"
 
-#: ../lib/modules/kolabUser.inc:234
+#: ../lib/modules/kolabUser.inc:253
 msgid "Mailbox home server name is empty!"
 msgstr "邮件宿主服务器为空 !"
 
-#: ../lib/modules/kolabUser.inc:232
-#: ../lib/modules/kolabUser.inc:233
+#: ../lib/modules/kolabUser.inc:251
+#: ../lib/modules/kolabUser.inc:252
 msgid "Mailbox home server name is invalid!"
 msgstr "邮件宿主服务器非法!"
 
@@ -3093,16 +3067,16 @@ msgstr "邮件宿主服务器非法!"
 msgid "Mailing aliases (e.g. NIS mail aliases)"
 msgstr "邮件别名(例如:NIS邮件别名)"
 
-#: ../lib/modules/nisMailAlias.inc:66
+#: ../lib/modules/nisMailAlias.inc:68
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "邮件转发."
 
-#: ../templates/pdfedit/pdfpage.php:622
+#: ../templates/pdfedit/pdfpage.php:645
 msgid "Main"
 msgstr "主要设置"
 
 #: ../templates/selfService/adminMain.php:382
-#: ../help/help.inc:167
+#: ../help/help.inc:169
 msgid "Main page caption"
 msgstr "主页标题"
 
@@ -3114,10 +3088,10 @@ msgstr "管理自助服务设置"
 msgid "Manage server profiles"
 msgstr "管理服务器设置"
 
-#: ../lib/modules/inetOrgPerson.inc:213
-#: ../lib/modules/inetOrgPerson.inc:368
-#: ../lib/modules/inetOrgPerson.inc:822
-#: ../lib/modules/inetOrgPerson.inc:944
+#: ../lib/modules/inetOrgPerson.inc:227
+#: ../lib/modules/inetOrgPerson.inc:410
+#: ../lib/modules/inetOrgPerson.inc:921
+#: ../lib/modules/inetOrgPerson.inc:1049
 msgid "Manager"
 msgstr "管理员"
 
@@ -3133,12 +3107,12 @@ msgstr "手动"
 msgid "Manual if conflicts"
 msgstr "如果冲突使用手动"
 
-#: ../lib/modules/kolabUser.inc:403
-#: ../lib/modules/kolabUser.inc:569
+#: ../lib/modules/kolabUser.inc:422
+#: ../lib/modules/kolabUser.inc:588
 msgid "Mark account for deletion"
 msgstr "将此帐号标记为删除"
 
-#: ../lib/modules/kolabUser.inc:166
+#: ../lib/modules/kolabUser.inc:185
 msgid "Mark for deletion"
 msgstr "标记为删除"
 
@@ -3166,17 +3140,17 @@ msgstr "匹配规则OID"
 msgid "Matching rules"
 msgstr "匹配规则"
 
-#: ../lib/modules/posixGroup.inc:307
-#: ../lib/modules/posixGroup.inc:467
-#: ../lib/modules/posixGroup.inc:468
+#: ../lib/modules/posixGroup.inc:315
+#: ../lib/modules/posixGroup.inc:475
+#: ../lib/modules/posixGroup.inc:476
 msgid "Maximum GID number"
 msgstr "最大GID号"
 
-#: ../lib/modules/posixGroup.inc:467
+#: ../lib/modules/posixGroup.inc:475
 msgid "Maximum GID number is invalid or empty!"
 msgstr "最大的GID非法或为空!"
 
-#: ../lib/modules/posixGroup.inc:468
+#: ../lib/modules/posixGroup.inc:476
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "最大GID必须大于最小GID!"
 
@@ -3184,8 +3158,8 @@ msgstr "最大GID必须大于最小GID!"
 #: ../lib/modules/posixAccount.inc:59
 #: ../lib/modules/posixAccount.inc:60
 #: ../lib/modules/posixAccount.inc:61
-#: ../lib/modules/posixAccount.inc:161
-#: ../lib/modules/posixAccount.inc:170
+#: ../lib/modules/posixAccount.inc:160
+#: ../lib/modules/posixAccount.inc:169
 msgid "Maximum UID number"
 msgstr "最大UID号"
 
@@ -3216,57 +3190,57 @@ msgstr "最大列表条目"
 
 #: ../lib/modules/shadowAccount.inc:48
 #: ../lib/modules/shadowAccount.inc:54
-#: ../lib/modules/shadowAccount.inc:102
-#: ../lib/modules/shadowAccount.inc:168
-#: ../lib/modules/shadowAccount.inc:198
-#: ../lib/modules/shadowAccount.inc:281
-#: ../lib/modules/sambaDomain.inc:120
-#: ../lib/modules/sambaDomain.inc:198
+#: ../lib/modules/shadowAccount.inc:104
+#: ../lib/modules/shadowAccount.inc:170
+#: ../lib/modules/shadowAccount.inc:200
+#: ../lib/modules/shadowAccount.inc:283
+#: ../lib/modules/sambaDomain.inc:122
 #: ../lib/modules/sambaDomain.inc:200
-#: ../lib/modules/sambaDomain.inc:326
-#: ../lib/modules/sambaDomain.inc:676
+#: ../lib/modules/sambaDomain.inc:202
+#: ../lib/modules/sambaDomain.inc:328
+#: ../lib/modules/sambaDomain.inc:678
 msgid "Maximum password age"
 msgstr "密码最长生命"
 
-#: ../lib/modules/groupOfNames.inc:70
-#: ../lib/modules/groupOfNames.inc:74
-#: ../lib/modules/groupOfNames.inc:101
-#: ../lib/modules/groupOfNames.inc:171
-#: ../lib/modules/groupOfNames.inc:449
+#: ../lib/modules/groupOfNames.inc:72
+#: ../lib/modules/groupOfNames.inc:76
+#: ../lib/modules/groupOfNames.inc:103
+#: ../lib/modules/groupOfNames.inc:173
+#: ../lib/modules/groupOfNames.inc:451
 msgid "Members"
 msgstr "组成员"
 
-#: ../lib/modules/sambaSamAccount.inc:486
+#: ../lib/modules/sambaSamAccount.inc:488
 msgid "Mid-Atlantic"
 msgstr "大西洋地区中部"
 
-#: ../lib/modules/sambaSamAccount.inc:477
+#: ../lib/modules/sambaSamAccount.inc:479
 msgid "Midway Island, Samoa"
 msgstr "中途岛,萨摩亚"
 
-#: ../lib/modules/inetOrgPerson.inc:190
+#: ../lib/modules/inetOrgPerson.inc:204
 msgid "Miller"
 msgstr "米勒"
 
-#: ../lib/modules/sambaDomain.inc:92
-#: ../lib/modules/sambaDomain.inc:253
-#: ../lib/modules/sambaDomain.inc:649
+#: ../lib/modules/sambaDomain.inc:94
+#: ../lib/modules/sambaDomain.inc:255
+#: ../lib/modules/sambaDomain.inc:651
 msgid "Minimal password length"
 msgstr "最短密码长度"
 
-#: ../lib/modules/posixGroup.inc:304
-#: ../lib/modules/posixGroup.inc:466
+#: ../lib/modules/posixGroup.inc:312
+#: ../lib/modules/posixGroup.inc:474
 msgid "Minimum GID number"
 msgstr "最小GID号"
 
-#: ../lib/modules/posixGroup.inc:466
+#: ../lib/modules/posixGroup.inc:474
 msgid "Minimum GID number is invalid or empty!"
 msgstr "最小GID错误或为空"
 
 #: ../lib/modules/posixAccount.inc:56
 #: ../lib/modules/posixAccount.inc:58
-#: ../lib/modules/posixAccount.inc:158
-#: ../lib/modules/posixAccount.inc:167
+#: ../lib/modules/posixAccount.inc:157
+#: ../lib/modules/posixAccount.inc:166
 msgid "Minimum UID number"
 msgstr "最小UID号"
 
@@ -3275,29 +3249,53 @@ msgstr "最小UID号"
 msgid "Minimum UID number is invalid!"
 msgstr "最小UID非法!"
 
+#: ../templates/config/mainmanage.php:216
+msgid "Minimum character classes"
+msgstr "最少字符类别"
+
+#: ../templates/config/mainmanage.php:212
+msgid "Minimum lowercase characters"
+msgstr "最少小写字母字符数"
+
+#: ../templates/config/mainmanage.php:214
+msgid "Minimum numeric characters"
+msgstr "最少数字字符数"
+
 #: ../lib/modules/shadowAccount.inc:46
-#: ../lib/modules/shadowAccount.inc:97
-#: ../lib/modules/shadowAccount.inc:164
-#: ../lib/modules/shadowAccount.inc:192
-#: ../lib/modules/shadowAccount.inc:276
-#: ../lib/modules/sambaDomain.inc:116
-#: ../lib/modules/sambaDomain.inc:199
-#: ../lib/modules/sambaDomain.inc:317
-#: ../lib/modules/sambaDomain.inc:673
+#: ../lib/modules/shadowAccount.inc:99
+#: ../lib/modules/shadowAccount.inc:166
+#: ../lib/modules/shadowAccount.inc:194
+#: ../lib/modules/shadowAccount.inc:278
+#: ../lib/modules/sambaDomain.inc:118
+#: ../lib/modules/sambaDomain.inc:201
+#: ../lib/modules/sambaDomain.inc:319
+#: ../lib/modules/sambaDomain.inc:675
 msgid "Minimum password age"
 msgstr "密码最短生命"
 
+#: ../templates/config/mainmanage.php:211
+msgid "Minimum password length"
+msgstr "最短密码长度"
+
+#: ../templates/config/mainmanage.php:215
+msgid "Minimum symbolic characters"
+msgstr "最少标点符号字符数"
+
+#: ../templates/config/mainmanage.php:213
+msgid "Minimum uppercase characters"
+msgstr "最少的大字字母字符数"
+
 #: ../lib/modules/inetOrgPerson.inc:81
-#: ../lib/modules/inetOrgPerson.inc:149
-#: ../lib/modules/inetOrgPerson.inc:261
-#: ../lib/modules/inetOrgPerson.inc:392
-#: ../lib/modules/inetOrgPerson.inc:393
-#: ../lib/modules/inetOrgPerson.inc:755
-#: ../lib/modules/inetOrgPerson.inc:951
+#: ../lib/modules/inetOrgPerson.inc:152
+#: ../lib/modules/inetOrgPerson.inc:275
+#: ../lib/modules/inetOrgPerson.inc:434
+#: ../lib/modules/inetOrgPerson.inc:435
+#: ../lib/modules/inetOrgPerson.inc:847
+#: ../lib/modules/inetOrgPerson.inc:1056
 msgid "Mobile number"
 msgstr "手机号码"
 
-#: ../lib/modules/inetOrgPerson.inc:1256
+#: ../lib/modules/inetOrgPerson.inc:1381
 msgid "Mobile telephone number"
 msgstr "手机号码"
 
@@ -3309,30 +3307,34 @@ msgstr "模式"
 msgid "Module selection"
 msgstr "模块选择"
 
-#: ../lib/modules/sambaSamAccount.inc:1202
+#: ../lib/modules/sambaSamAccount.inc:1188
 msgid "Monday"
 msgstr "星期一"
 
-#: ../lib/modules/sambaSamAccount.inc:481
+#: ../lib/modules/sambaSamAccount.inc:483
 msgid "Mountain Time (US & Canada)"
 msgstr "时区(美国和加拿大)"
 
-#: ../lib/modules/quota.inc:90
-#: ../lib/modules/quota.inc:354
-#: ../lib/modules/quota.inc:440
-#: ../lib/modules/quota.inc:549
+#: ../lib/modules/quota.inc:92
+#: ../lib/modules/quota.inc:356
+#: ../lib/modules/quota.inc:442
+#: ../lib/modules/quota.inc:551
 msgid "Mountpoint"
 msgstr "挂接点"
 
-#: ../lib/modules/quota.inc:91
+#: ../lib/modules/quota.inc:93
 msgid "Mountpoint of device with enabled quotas."
 msgstr "可限制配额设备挂接点"
 
-#: ../lib/modules/inetOrgPerson.inc:239
+#: ../lib/modules/inetOrgPerson.inc:301
+msgid "MyCity"
+msgstr "城市"
+
+#: ../lib/modules/inetOrgPerson.inc:253
 msgid "Mycity"
 msgstr "城市"
 
-#: ../lib/modules/inetOrgPerson.inc:227
+#: ../lib/modules/inetOrgPerson.inc:241
 msgid "Mystreetname 42"
 msgstr "街道42号"
 
@@ -3342,16 +3344,15 @@ msgstr "街道42号"
 #: ../templates/pdfedit/pdfdelete.php:62
 #: ../templates/pdfedit/pdfdelete.php:65
 #: ../templates/pdfedit/pdfdelete.php:90
-#: ../templates/pdfedit/pdfpage.php:674
-#: ../lib/modules/groupOfNames.inc:136
+#: ../lib/modules/groupOfNames.inc:138
 msgid "Name"
 msgstr "名"
 
-#: ../help/help.inc:145
+#: ../help/help.inc:147
 msgid "Name under which the profile will be saved. If a profile with the same name exists, it will be overwritten."
 msgstr "将来保存的配置名,如果配置名存在,会被覆盖."
 
-#: ../lib/modules/ieee802device.inc:107
+#: ../lib/modules/ieee802device.inc:109
 msgid "New MAC address"
 msgstr "新MAC地址"
 
@@ -3359,10 +3360,14 @@ msgstr "新MAC地址"
 msgid "New OU created successfully."
 msgstr "新OU建立成功."
 
-#: ../lib/modules/ldapPublicKey.inc:101
+#: ../lib/modules/ldapPublicKey.inc:103
 msgid "New SSH public key"
 msgstr "新SSH公钥"
 
+#: ../lib/modules/inetOrgPerson.inc:307
+msgid "New York"
+msgstr "纽约"
+
 #: ../lib/types/mailAlias.inc:110
 msgid "New alias"
 msgstr "新别名"
@@ -3375,7 +3380,12 @@ msgstr "新缺省配置设置成功."
 msgid "New domain"
 msgstr "新域"
 
-#: ../lib/types/group.inc:122
+#: ../templates/pdfedit/pdfpage.php:636
+msgid "New field"
+msgstr "新字段"
+
+#: ../lib/types/gon.inc:112
+#: ../lib/types/group.inc:124
 msgid "New group"
 msgstr "新组"
 
@@ -3383,11 +3393,11 @@ msgstr "新组"
 msgid "New host"
 msgstr "新主机"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:163
+#: ../lib/modules/inetLocalMailRecipient.inc:165
 msgid "New local address"
 msgstr "新本地邮件地址"
 
-#: ../templates/config/mainmanage.php:297
+#: ../templates/config/mainmanage.php:345
 msgid "New master password"
 msgstr "新管理员密码"
 
@@ -3401,16 +3411,16 @@ msgstr "新对象"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:47
 #: ../templates/ou_edit.php:168
-#: ../help/help.inc:184
+#: ../help/help.inc:186
 msgid "New organizational unit"
 msgstr "新组织单元"
 
-#: ../lib/modules/groupOfNames.inc:250
+#: ../lib/modules/groupOfNames.inc:252
 msgid "New owner"
 msgstr "新拥有者"
 
 #: ../templates/config/confmain.php:431
-#: ../lib/modules/posixAccount.inc:1702
+#: ../lib/modules/posixAccount.inc:1740
 msgid "New password"
 msgstr "新密码"
 
@@ -3418,7 +3428,7 @@ msgstr "新密码"
 msgid "New password set successfully."
 msgstr "新密码设置成功."
 
-#: ../lib/modules/nisMailAlias.inc:150
+#: ../lib/modules/nisMailAlias.inc:152
 msgid "New recipient"
 msgstr "新收信者"
 
@@ -3426,6 +3436,10 @@ msgstr "新收信者"
 msgid "New required attributes:"
 msgstr "新必要属性"
 
+#: ../templates/pdfedit/pdfpage.php:553
+msgid "New section"
+msgstr "新节"
+
 #: ../lib/types/user.inc:128
 msgid "New user"
 msgstr "新用户"
@@ -3440,51 +3454,51 @@ msgstr "新值"
 msgid "Next"
 msgstr "下一步"
 
-#: ../lib/modules/sambaDomain.inc:76
-#: ../lib/modules/sambaDomain.inc:156
-#: ../lib/modules/sambaDomain.inc:357
-#: ../lib/modules/sambaDomain.inc:637
+#: ../lib/modules/sambaDomain.inc:78
+#: ../lib/modules/sambaDomain.inc:158
+#: ../lib/modules/sambaDomain.inc:359
+#: ../lib/modules/sambaDomain.inc:639
 msgid "Next RID"
 msgstr "下一个RID"
 
-#: ../lib/modules/sambaDomain.inc:190
-#: ../lib/modules/sambaDomain.inc:191
+#: ../lib/modules/sambaDomain.inc:192
+#: ../lib/modules/sambaDomain.inc:193
 msgid "Next RID is not a number!"
 msgstr "下一个RID不是一个数字!"
 
-#: ../lib/modules/sambaDomain.inc:77
+#: ../lib/modules/sambaDomain.inc:79
 msgid "Next RID to use when creating accounts (only used by Winbind)."
 msgstr "建立帐号时使用的下一下RID(Winbind)."
 
-#: ../lib/modules/sambaDomain.inc:85
+#: ../lib/modules/sambaDomain.inc:87
 msgid "Next RID to use when creating group accounts (only used by Winbind)."
 msgstr "建立组帐号时使用的下一下RID(Winbind)."
 
-#: ../lib/modules/sambaDomain.inc:81
+#: ../lib/modules/sambaDomain.inc:83
 msgid "Next RID to use when creating user accounts (only used by Winbind)."
 msgstr "建立用户帐号使用的下一个RID(Winbind)."
 
-#: ../lib/modules/sambaDomain.inc:84
-#: ../lib/modules/sambaDomain.inc:168
-#: ../lib/modules/sambaDomain.inc:367
-#: ../lib/modules/sambaDomain.inc:643
+#: ../lib/modules/sambaDomain.inc:86
+#: ../lib/modules/sambaDomain.inc:170
+#: ../lib/modules/sambaDomain.inc:369
+#: ../lib/modules/sambaDomain.inc:645
 msgid "Next group RID"
 msgstr "下一个组的RID"
 
-#: ../lib/modules/sambaDomain.inc:194
-#: ../lib/modules/sambaDomain.inc:195
+#: ../lib/modules/sambaDomain.inc:196
+#: ../lib/modules/sambaDomain.inc:197
 msgid "Next group RID is not a number!"
 msgstr "下一个组的RID不是数字!"
 
-#: ../lib/modules/sambaDomain.inc:80
-#: ../lib/modules/sambaDomain.inc:162
-#: ../lib/modules/sambaDomain.inc:362
-#: ../lib/modules/sambaDomain.inc:640
+#: ../lib/modules/sambaDomain.inc:82
+#: ../lib/modules/sambaDomain.inc:164
+#: ../lib/modules/sambaDomain.inc:364
+#: ../lib/modules/sambaDomain.inc:642
 msgid "Next user RID"
 msgstr "下一个用户的RID"
 
-#: ../lib/modules/sambaDomain.inc:192
-#: ../lib/modules/sambaDomain.inc:193
+#: ../lib/modules/sambaDomain.inc:194
+#: ../lib/modules/sambaDomain.inc:195
 msgid "Next user RID is not a number!"
 msgstr "下一个用户的RID不是数字!"
 
@@ -3495,18 +3509,18 @@ msgstr "下一个用户的RID不是数字!"
 msgid "No"
 msgstr "否"
 
-#: ../lib/modules/sambaSamAccount.inc:523
-#: ../lib/modules/sambaSamAccount.inc:611
-#: ../lib/modules/sambaSamAccount.inc:932
+#: ../lib/modules/sambaSamAccount.inc:525
+#: ../lib/modules/sambaSamAccount.inc:593
+#: ../lib/modules/sambaSamAccount.inc:918
 #: ../lib/modules/sambaGroupMapping.inc:89
 #: ../lib/modules/sambaGroupMapping.inc:180
-#: ../lib/modules/sambaGroupMapping.inc:427
+#: ../lib/modules/sambaGroupMapping.inc:429
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Samba域,请先建立一个."
 
-#: ../lib/modules/posixAccount.inc:438
-#: ../lib/modules/posixAccount.inc:632
-#: ../lib/modules/posixAccount.inc:929
+#: ../lib/modules/posixAccount.inc:448
+#: ../lib/modules/posixAccount.inc:651
+#: ../lib/modules/posixAccount.inc:954
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "在LDAP中没有发现Unix组,请先建立一个."
 
@@ -3530,12 +3544,13 @@ msgstr "没有发现域!"
 msgid "No file selected."
 msgstr "没有选择文件!"
 
-#: ../lib/modules/posixGroup.inc:464
+#: ../lib/modules/posixGroup.inc:472
 #: ../lib/modules/posixAccount.inc:67
 msgid "No free ID-Number!"
 msgstr "没有可用的ID号!"
 
-#: ../lib/types/group.inc:121
+#: ../lib/types/gon.inc:111
+#: ../lib/types/group.inc:123
 msgid "No groups found!"
 msgstr "没有发现组!"
 
@@ -3547,19 +3562,20 @@ msgstr "没有发现主机!"
 msgid "No internal attributes"
 msgstr "没有内部属性"
 
-#: ../templates/tests/lamdaemonTest.php:151
+#: ../templates/tests/lamdaemonTest.php:212
 msgid "No lamdaemon path set, please update your LAM configuration settings."
 msgstr "没有设定lamdaemon路径设置,请更改LAM配置."
 
-#: ../templates/tests/lamdaemonTest.php:147
+#: ../templates/tests/lamdaemonTest.php:113
+#: ../templates/tests/lamdaemonTest.php:208
 msgid "No lamdaemon server set, please update your LAM configuration settings."
 msgstr "没有设置lamdaemon服务器,请先设置LAM配置."
 
-#: ../templates/config/mainmanage.php:253
+#: ../templates/config/mainmanage.php:301
 msgid "No logging"
 msgstr "无日志"
 
-#: ../templates/pdfedit/pdfpage.php:396
+#: ../templates/pdfedit/pdfpage.php:371
 msgid "No logo"
 msgstr "无标志"
 
@@ -3579,7 +3595,7 @@ msgstr "没有输入密码!"
 msgid "No problems found."
 msgstr "未发现问题!"
 
-#: ../templates/pdfedit/pdfpage.php:128
+#: ../templates/pdfedit/pdfpage.php:126
 msgid "No section text specified"
 msgstr "没有指定段文本"
 
@@ -3587,7 +3603,7 @@ msgstr "没有指定段文本"
 msgid "No server profiles found. Please create one."
 msgstr "没有服务器设置,请先建立一个."
 
-#: ../templates/pdfedit/pdfpage.php:132
+#: ../templates/pdfedit/pdfpage.php:114
 msgid "No static text specified"
 msgstr "没有指定静态文本"
 
@@ -3612,7 +3628,7 @@ msgstr "备注"
 msgid "Note: You will get an \"inappropriate matching\" error if you have not setup an EQUALITY rule on your LDAP server for this attribute."
 msgstr "注意:如果在LDAP中没有为这个发生设置EQUALITY规则,会产生\"inappropriate matching\"错误."
 
-#: ../templates/config/mainmanage.php:208
+#: ../templates/config/mainmanage.php:256
 msgid "Notice"
 msgstr "注意"
 
@@ -3620,27 +3636,27 @@ msgstr "注意"
 msgid "Number of child entries"
 msgstr "子条目的数量"
 
-#: ../lib/modules/shadowAccount.inc:161
+#: ../lib/modules/shadowAccount.inc:163
 msgid "Number of days a user can login even his password has expired. -1=always."
 msgstr "用户密码过期后允许登录的天数,-1为不限制."
 
-#: ../lib/modules/shadowAccount.inc:165
+#: ../lib/modules/shadowAccount.inc:167
 msgid "Number of days a user has to wait until he is allowed to change his password again. If set value must be >0."
 msgstr "允许用户修改密码的最短间隔天数,如果设置一定要大于0."
 
-#: ../lib/modules/shadowAccount.inc:169
+#: ../lib/modules/shadowAccount.inc:171
 msgid "Number of days after a user has to change his password again. If set value must be >0."
 msgstr "用户必须再次修改密码的天数.如果设置一定要大于0."
 
-#: ../lib/modules/sambaDomain.inc:129
+#: ../lib/modules/sambaDomain.inc:131
 msgid "Number of minutes after which the bad logon attempts are reset."
 msgstr "重置错误登录次数的分钟数."
 
-#: ../lib/modules/sambaDomain.inc:117
+#: ../lib/modules/sambaDomain.inc:119
 msgid "Number of seconds after the user is allowed to change his password again."
 msgstr "允许用户再次修改密码的秒数."
 
-#: ../lib/modules/sambaDomain.inc:121
+#: ../lib/modules/sambaDomain.inc:123
 msgid "Number of seconds after which the user must change his password."
 msgstr "多後之後使用者必須更改密碼.(密碼到期),以秒為單位"
 
@@ -3670,8 +3686,8 @@ msgstr "OU无效!"
 msgid "OU is not empty or invalid!"
 msgstr "OU不为空或非法!"
 
-#: ../help/help.inc:184
 #: ../help/help.inc:186
+#: ../help/help.inc:188
 msgid "OU-Editor"
 msgstr "OU编辑器"
 
@@ -3686,20 +3702,30 @@ msgstr "对象类"
 msgid "Obsolete"
 msgstr "已过时的"
 
-#: ../lib/modules/sambaDomain.inc:277
-#: ../lib/modules/sambaDomain.inc:288
-#: ../lib/modules/sambaDomain.inc:299
-#: ../lib/modules/sambaDomain.inc:655
-#: ../lib/modules/sambaDomain.inc:660
-#: ../lib/modules/sambaDomain.inc:665
+#: ../lib/modules/sambaDomain.inc:279
+#: ../lib/modules/sambaDomain.inc:290
+#: ../lib/modules/sambaDomain.inc:301
+#: ../lib/modules/sambaDomain.inc:657
+#: ../lib/modules/sambaDomain.inc:662
+#: ../lib/modules/sambaDomain.inc:667
 msgid "Off"
 msgstr "关闭"
 
+#: ../lib/modules/inetOrgPerson.inc:156
+#: ../lib/modules/inetOrgPerson.inc:317
+#: ../lib/modules/inetOrgPerson.inc:490
+#: ../lib/modules/inetOrgPerson.inc:816
+#: ../lib/modules/inetOrgPerson.inc:1066
+#: ../lib/modules/inetOrgPerson.inc:1461
+msgid "Office name"
+msgstr "办公室名"
+
 #: ../templates/tree/export_form.php:165
+#: ../templates/tests/lamdaemonTest.php:108
 #: ../templates/ou_edit.php:200
 #: ../templates/masscreate.php:110
 #: ../templates/config/profmanage.php:354
-#: ../templates/config/mainmanage.php:326
+#: ../templates/config/mainmanage.php:374
 #: ../templates/config/confmodules.php:110
 #: ../templates/config/confmodules.php:113
 #: ../templates/config/confmain.php:454
@@ -3707,7 +3733,7 @@ msgstr "关闭"
 #: ../templates/config/conflogin.php:125
 #: ../templates/config/conflogin.php:126
 #: ../templates/config/mainlogin.php:118
-#: ../templates/selfService/selfServiceLogin.php:204
+#: ../templates/selfService/selfServiceLogin.php:203
 #: ../templates/selfService/profManage.php:254
 #: ../templates/selfService/adminLogin.php:122
 #: ../templates/selfService/adminLogin.php:123
@@ -3717,15 +3743,14 @@ msgstr "关闭"
 #: ../templates/pdfedit/pdfmain.php:155
 #: ../templates/profedit/profiledelete.php:85
 #: ../templates/profedit/profilemain.php:168
-#: ../lib/modules/posixGroup.inc:266
-#: ../lib/modules/neofonieInetOrgPerson.inc:448
-#: ../lib/modules/sambaSamAccount.inc:1249
-#: ../lib/modules/sambaSamAccount.inc:1420
-#: ../lib/modules/posixAccount.inc:1109
-#: ../lib/modules/inetOrgPerson.inc:888
-#: ../lib/modules/groupOfNames.inc:228
-#: ../lib/modules/groupOfNames.inc:255
-#: ../lib/modules/groupOfNames.inc:342
+#: ../lib/modules/posixGroup.inc:274
+#: ../lib/modules/sambaSamAccount.inc:1235
+#: ../lib/modules/sambaSamAccount.inc:1406
+#: ../lib/modules/posixAccount.inc:1134
+#: ../lib/modules/inetOrgPerson.inc:993
+#: ../lib/modules/groupOfNames.inc:230
+#: ../lib/modules/groupOfNames.inc:257
+#: ../lib/modules/groupOfNames.inc:344
 #: ../lib/lists.inc:668
 #: ../lib/lists.inc:899
 msgid "Ok"
@@ -3735,18 +3760,18 @@ msgstr "确定"
 msgid "Old value"
 msgstr "旧值"
 
-#: ../lib/modules/sambaDomain.inc:277
-#: ../lib/modules/sambaDomain.inc:288
-#: ../lib/modules/sambaDomain.inc:299
-#: ../lib/modules/sambaDomain.inc:656
-#: ../lib/modules/sambaDomain.inc:661
-#: ../lib/modules/sambaDomain.inc:666
+#: ../lib/modules/sambaDomain.inc:279
+#: ../lib/modules/sambaDomain.inc:290
+#: ../lib/modules/sambaDomain.inc:301
+#: ../lib/modules/sambaDomain.inc:658
+#: ../lib/modules/sambaDomain.inc:663
+#: ../lib/modules/sambaDomain.inc:668
 msgid "On"
 msgstr "On"
 
-#: ../lib/modules/sambaSamAccount.inc:314
-#: ../lib/modules/sambaSamAccount.inc:1405
-#: ../lib/modules/sambaSamAccount.inc:1729
+#: ../lib/modules/sambaSamAccount.inc:316
+#: ../lib/modules/sambaSamAccount.inc:1391
+#: ../lib/modules/sambaSamAccount.inc:1715
 msgid "On broken or timed out connection"
 msgstr "中断或超时连接"
 
@@ -3780,11 +3805,12 @@ msgid "Other"
 msgstr "其它"
 
 #: ../templates/config/confmain.php:387
-#: ../lib/modules/groupOfNames.inc:66
-#: ../lib/modules/groupOfNames.inc:95
-#: ../lib/modules/groupOfNames.inc:147
-#: ../lib/modules/groupOfNames.inc:165
-#: ../lib/modules/groupOfNames.inc:445
+#: ../lib/types/gon.inc:85
+#: ../lib/modules/groupOfNames.inc:68
+#: ../lib/modules/groupOfNames.inc:97
+#: ../lib/modules/groupOfNames.inc:149
+#: ../lib/modules/groupOfNames.inc:167
+#: ../lib/modules/groupOfNames.inc:447
 msgid "Owner"
 msgstr "拥有者"
 
@@ -3792,12 +3818,11 @@ msgstr "拥有者"
 msgid "PDF editor"
 msgstr "PDF编辑器"
 
-#: ../templates/pdfedit/pdfpage.php:458
 #: ../lib/lists.inc:640
 msgid "PDF structure"
 msgstr "PDF架构"
 
-#: ../templates/pdfedit/pdfpage.php:114
+#: ../templates/pdfedit/pdfpage.php:100
 msgid "PDF structure was successfully saved."
 msgstr "PDF架构成功保存."
 
@@ -3805,55 +3830,51 @@ msgstr "PDF架构成功保存."
 msgid "PDF structures"
 msgstr "PDF架构"
 
-#: ../templates/pdfedit/pdfpage.php:109
+#: ../templates/pdfedit/pdfpage.php:95
 msgid "PDF-structure name not valid"
 msgstr "PDF架构名无效"
 
-#: ../lib/modules/sambaSamAccount.inc:480
+#: ../lib/modules/sambaSamAccount.inc:482
 msgid "Pacific Time (US & Canada)"
 msgstr "太平洋时间(美国和加拿大)"
 
-#: ../templates/pdfedit/pdfpage.php:417
-msgid "Page settings"
-msgstr "页面设置"
-
 #: ../templates/schema/schema.php:371
 msgid "Parent to"
 msgstr "继承于"
 
 #: ../templates/lists/changePassword.php:196
-#: ../templates/login.php:257
-#: ../templates/selfService/selfServiceLogin.php:190
-#: ../lib/modules/posixGroup.inc:171
-#: ../lib/modules/posixGroup.inc:183
-#: ../lib/modules/posixGroup.inc:257
-#: ../lib/modules/posixGroup.inc:460
-#: ../lib/modules/posixGroup.inc:461
+#: ../templates/login.php:269
+#: ../templates/selfService/selfServiceLogin.php:189
+#: ../lib/modules/posixGroup.inc:173
+#: ../lib/modules/posixGroup.inc:185
+#: ../lib/modules/posixGroup.inc:265
+#: ../lib/modules/posixGroup.inc:468
+#: ../lib/modules/posixGroup.inc:469
 #: ../lib/modules/sambaAccount.inc:74
 #: ../lib/modules/sambaAccount.inc:75
-#: ../lib/modules/sambaAccount.inc:227
+#: ../lib/modules/sambaAccount.inc:229
 #: ../lib/modules/sambaSamAccount.inc:92
 #: ../lib/modules/sambaSamAccount.inc:93
-#: ../lib/modules/sambaSamAccount.inc:343
+#: ../lib/modules/sambaSamAccount.inc:345
 #: ../lib/modules/posixAccount.inc:72
 #: ../lib/modules/posixAccount.inc:73
-#: ../lib/modules/posixAccount.inc:134
-#: ../lib/modules/posixAccount.inc:246
-#: ../lib/modules/posixAccount.inc:378
-#: ../lib/modules/posixAccount.inc:1002
-#: ../lib/modules/posixAccount.inc:1013
-#: ../lib/modules/posixAccount.inc:1094
-#: ../lib/modules/posixAccount.inc:1200
+#: ../lib/modules/posixAccount.inc:136
+#: ../lib/modules/posixAccount.inc:252
+#: ../lib/modules/posixAccount.inc:388
+#: ../lib/modules/posixAccount.inc:1027
+#: ../lib/modules/posixAccount.inc:1038
+#: ../lib/modules/posixAccount.inc:1119
+#: ../lib/modules/posixAccount.inc:1225
 #: ../lib/modules/inetOrgPerson.inc:103
 #: ../lib/modules/inetOrgPerson.inc:104
-#: ../lib/modules/inetOrgPerson.inc:416
-#: ../lib/modules/inetOrgPerson.inc:685
-#: ../lib/modules/inetOrgPerson.inc:696
-#: ../lib/modules/inetOrgPerson.inc:879
+#: ../lib/modules/inetOrgPerson.inc:458
+#: ../lib/modules/inetOrgPerson.inc:753
+#: ../lib/modules/inetOrgPerson.inc:764
+#: ../lib/modules/inetOrgPerson.inc:984
 msgid "Password"
 msgstr "密码"
 
-#: ../lib/modules/posixGroup.inc:461
+#: ../lib/modules/posixGroup.inc:469
 #: ../lib/modules/sambaAccount.inc:75
 #: ../lib/modules/sambaAccount.inc:76
 #: ../lib/modules/sambaSamAccount.inc:93
@@ -3865,25 +3886,25 @@ msgstr "密码"
 msgid "Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!%&/|?{[()]}=@$ !"
 msgstr "密码包括无效字符,合法字符为a-z, A-Z, 0-9 和 #*,.;:_-+!%&/|?{[()]}=@$ !"
 
-#: ../lib/modules/sambaAccount.inc:134
-#: ../lib/modules/sambaAccount.inc:249
-#: ../lib/modules/sambaAccount.inc:363
-#: ../lib/modules/sambaAccount.inc:366
-#: ../lib/modules/sambaAccount.inc:757
-#: ../lib/modules/sambaSamAccount.inc:212
-#: ../lib/modules/sambaSamAccount.inc:215
-#: ../lib/modules/sambaSamAccount.inc:365
-#: ../lib/modules/sambaSamAccount.inc:981
-#: ../lib/modules/sambaSamAccount.inc:1459
+#: ../lib/modules/sambaAccount.inc:136
+#: ../lib/modules/sambaAccount.inc:251
+#: ../lib/modules/sambaAccount.inc:365
+#: ../lib/modules/sambaAccount.inc:368
+#: ../lib/modules/sambaAccount.inc:759
+#: ../lib/modules/sambaSamAccount.inc:214
+#: ../lib/modules/sambaSamAccount.inc:217
+#: ../lib/modules/sambaSamAccount.inc:367
+#: ../lib/modules/sambaSamAccount.inc:967
+#: ../lib/modules/sambaSamAccount.inc:1445
 msgid "Password does not expire"
 msgstr "密码永不过期"
 
 #: ../lib/modules/shadowAccount.inc:50
-#: ../lib/modules/shadowAccount.inc:92
-#: ../lib/modules/shadowAccount.inc:160
-#: ../lib/modules/shadowAccount.inc:186
-#: ../lib/modules/shadowAccount.inc:271
-#: ../lib/modules/shadowAccount.inc:366
+#: ../lib/modules/shadowAccount.inc:94
+#: ../lib/modules/shadowAccount.inc:162
+#: ../lib/modules/shadowAccount.inc:188
+#: ../lib/modules/shadowAccount.inc:273
+#: ../lib/modules/shadowAccount.inc:368
 msgid "Password expiration"
 msgstr "密码超期"
 
@@ -3892,44 +3913,49 @@ msgstr "密码超期"
 msgid "Password expiration must be are natural number or -1."
 msgstr "密码超期必须是自然数或-1."
 
-#: ../lib/modules/posixGroup.inc:402
-#: ../lib/modules/posixGroup.inc:421
-#: ../lib/modules/posixAccount.inc:138
-#: ../lib/modules/posixAccount.inc:176
-#: ../lib/modules/posixAccount.inc:333
+#: ../lib/modules/posixGroup.inc:410
+#: ../lib/modules/posixGroup.inc:429
+#: ../lib/modules/posixAccount.inc:140
+#: ../lib/modules/posixAccount.inc:175
+#: ../lib/modules/posixAccount.inc:343
 msgid "Password hash type"
 msgstr "密码哈希类型"
 
-#: ../lib/modules/sambaDomain.inc:96
-#: ../lib/modules/sambaDomain.inc:264
-#: ../lib/modules/sambaDomain.inc:652
+#: ../lib/modules/sambaDomain.inc:98
+#: ../lib/modules/sambaDomain.inc:266
+#: ../lib/modules/sambaDomain.inc:654
 msgid "Password history length"
 msgstr "历史密码长度"
 
 #: ../lib/modules/shadowAccount.inc:48
 #: ../lib/modules/shadowAccount.inc:49
-#: ../lib/modules/sambaDomain.inc:200
+#: ../lib/modules/sambaDomain.inc:202
 msgid "Password maximum age must be are natural number."
 msgstr "密码最长生命期必须是自然数."
 
 #: ../lib/modules/shadowAccount.inc:54
 #: ../lib/modules/shadowAccount.inc:55
-#: ../lib/modules/sambaDomain.inc:198
+#: ../lib/modules/sambaDomain.inc:200
 msgid "Password maximum age must be bigger as password minimum age."
 msgstr "密码最长生命期必须小于最短生命期."
 
 #: ../lib/modules/shadowAccount.inc:46
 #: ../lib/modules/shadowAccount.inc:47
-#: ../lib/modules/sambaDomain.inc:199
+#: ../lib/modules/sambaDomain.inc:201
 msgid "Password minimum age must be are natural number."
 msgstr "密码最短生命期必须是自然数."
 
+#: ../templates/config/mainmanage.php:206
+#: ../help/help.inc:137
+msgid "Password policy"
+msgstr "密码策略"
+
 #: ../lib/modules/shadowAccount.inc:52
-#: ../lib/modules/shadowAccount.inc:87
-#: ../lib/modules/shadowAccount.inc:156
-#: ../lib/modules/shadowAccount.inc:180
-#: ../lib/modules/shadowAccount.inc:266
-#: ../lib/modules/shadowAccount.inc:364
+#: ../lib/modules/shadowAccount.inc:89
+#: ../lib/modules/shadowAccount.inc:158
+#: ../lib/modules/shadowAccount.inc:182
+#: ../lib/modules/shadowAccount.inc:268
+#: ../lib/modules/shadowAccount.inc:366
 msgid "Password warning"
 msgstr "密码提醒日期"
 
@@ -3938,16 +3964,16 @@ msgstr "密码提醒日期"
 msgid "Password warning must be are natural number."
 msgstr "密码提醒日期必须是自然数."
 
-#: ../templates/config/confmain.php:544
+#: ../templates/config/confmain.php:543
 msgid "Passwords are different!"
 msgstr "密码不同!"
 
-#: ../lib/modules/sambaSamAccount.inc:288
+#: ../lib/modules/sambaSamAccount.inc:290
 msgid "Path of the user profile."
 msgstr "用户配置文件所在路径。"
 
-#: ../lib/modules/sambaAccount.inc:387
-#: ../lib/modules/sambaSamAccount.inc:239
+#: ../lib/modules/sambaAccount.inc:389
+#: ../lib/modules/sambaSamAccount.inc:241
 msgid "Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $user and $group are replaced with user and group name."
 msgstr "用户配置文件路径. 可以是本地绝对路径或UNC路径(\\\\server\\share).$user和$group会被用户名和组名代替."
 
@@ -3959,25 +3985,25 @@ msgstr "外部脚本路径"
 msgid "Permanently delete all children, too?"
 msgstr "也要永久删除所有子集?"
 
-#: ../lib/modules/inetOrgPerson.inc:123
+#: ../lib/modules/inetOrgPerson.inc:125
 msgid "Personal"
 msgstr "个人信息"
 
 #: ../lib/types/user.inc:93
 #: ../lib/types/user.inc:211
-#: ../lib/modules/inetOrgPerson.inc:151
-#: ../lib/modules/inetOrgPerson.inc:838
-#: ../lib/modules/inetOrgPerson.inc:1316
-#: ../lib/modules/inetOrgPerson.inc:1319
-#: ../lib/modules/inetOrgPerson.inc:1333
+#: ../lib/modules/inetOrgPerson.inc:154
+#: ../lib/modules/inetOrgPerson.inc:937
+#: ../lib/modules/inetOrgPerson.inc:1473
+#: ../lib/modules/inetOrgPerson.inc:1476
+#: ../lib/modules/inetOrgPerson.inc:1490
 msgid "Photo"
 msgstr "照片"
 
-#: ../lib/modules/inetOrgPerson.inc:919
+#: ../lib/modules/inetOrgPerson.inc:1024
 msgid "Photo file (JPG format)"
 msgstr "照片文件(JPG格式)"
 
-#: ../lib/modules/ldapPublicKey.inc:65
+#: ../lib/modules/ldapPublicKey.inc:67
 msgid "Please a comma separated list of your public SSH keys."
 msgstr "您的公钥列表,以逗号分隔."
 
@@ -3985,11 +4011,15 @@ msgstr "您的公钥列表,以逗号分隔."
 msgid "Please confirm:"
 msgstr "请确认:"
 
+#: ../lib/modules/phpGroupwareUser.inc:124
+msgid "Please enter \"active\" or \"inactive\"."
+msgstr "请输入 \"active\" 或 \"inactive\"."
+
 #: ../lib/modules/sambaSamAccount.inc:95
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "请输入RID或特殊账号名!"
 
-#: ../lib/modules/inetOrgPerson.inc:413
+#: ../lib/modules/inetOrgPerson.inc:455
 msgid "Please enter a comma separated list of host names where this user is allowed to log in. If you enable host restrictions for your servers then \"*\" means every host and an empty field means no host."
 msgstr "请输入允许用户登录的主机名(以逗号分隔).如果已经启用主机限制,\"*\"号代表所有主机,留空意味没有主机."
 
@@ -4000,12 +4030,12 @@ msgstr "请输入允许用户登录的主机名(以逗号分隔).如果已经启
 msgid "Please enter a comma separated list of host names!"
 msgstr "请输入以逗号分隔的主机名!"
 
-#: ../lib/modules/groupOfNames.inc:118
+#: ../lib/modules/groupOfNames.inc:120
 msgid "Please enter a group name!"
 msgstr "请输入组名!"
 
-#: ../lib/modules/kolabUser.inc:272
-#: ../lib/modules/kolabUser.inc:277
+#: ../lib/modules/kolabUser.inc:291
+#: ../lib/modules/kolabUser.inc:296
 #, php-format
 msgid "Please enter a user password on this page: %s"
 msgstr "请在此页输入用户密码: %s"
@@ -4022,11 +4052,6 @@ msgstr "请输入有效的商业种类!"
 msgid "Please enter a valid common name!"
 msgstr "请输入有效的全名!"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:32
-#: ../lib/modules/neofonieInetOrgPerson.inc:33
-msgid "Please enter a valid date (format DD.MM.YYYY)!"
-msgstr "请输入合法的日期,格式为(DD-MM-YYYY)."
-
 #: ../lib/modules/sambaAccount.inc:83
 #: ../lib/modules/sambaAccount.inc:84
 #: ../lib/modules/sambaSamAccount.inc:103
@@ -4106,18 +4131,18 @@ msgstr "请输入有效的街道名!"
 msgid "Please enter a valid telephone number!"
 msgstr "请输入有效的电话号码!"
 
-#: ../lib/modules/posixGroup.inc:565
-#: ../lib/modules/posixAccount.inc:744
+#: ../lib/modules/posixGroup.inc:573
+#: ../lib/modules/posixAccount.inc:763
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "请输入有效值(介于%s和%s之间)!"
 
-#: ../lib/modules/kolabUser.inc:282
+#: ../lib/modules/kolabUser.inc:301
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "请在本页面输入邮件地址:%s"
 
-#: ../lib/modules.inc:946
+#: ../lib/modules.inc:1088
 msgid "Please enter the account information on the other pages first."
 msgstr "请先在另一个页面输入帐号信息."
 
@@ -4141,16 +4166,16 @@ msgstr "请输入新配置文件名和密码.配置文件名可以包含字符
 msgid "Please enter the new name of the profile. The name may contain letters, numbers and -/_."
 msgstr "請輸入新的設定檔名稱.可以包含字母,數字和 -/_ ."
 
-#: ../lib/modules/posixAccount.inc:379
-#: ../lib/modules/inetOrgPerson.inc:417
+#: ../lib/modules/posixAccount.inc:389
+#: ../lib/modules/inetOrgPerson.inc:459
 msgid "Please enter the password which you want to set for this account."
 msgstr "请输入这个帐号的密码."
 
-#: ../lib/modules/posixAccount.inc:350
+#: ../lib/modules/posixAccount.inc:360
 msgid "Please enter the path to the user's home directory."
 msgstr "请输入用户主目录路径."
 
-#: ../lib/modules/quota.inc:139
+#: ../lib/modules/quota.inc:141
 msgid "Please enter the quota settings for this mount point. The syntax is: {soft block limit},{hard block limit},{soft inode limit},{hard inode limit}"
 msgstr "请输入本挂接点的配额设置.语法为:(软块限制},{硬块限制},{软件节点限制},{硬节点限制}."
 
@@ -4160,13 +4185,13 @@ msgid "Please enter the same password in both password fields."
 msgstr "在两个密码输入框请输入相同的密码."
 
 #: ../templates/lists/changePassword.php:259
-#: ../lib/modules/posixGroup.inc:460
+#: ../lib/modules/posixGroup.inc:468
 #: ../lib/modules/sambaAccount.inc:74
 #: ../lib/modules/sambaSamAccount.inc:92
 msgid "Please enter the same password in both password-fields."
 msgstr "请在两个密码输入框输入相同的密码."
 
-#: ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/sambaSamAccount.inc:302
 msgid "Please enter the time limit in minutes. 0 means unlimited."
 msgstr "请输入时间限制（分钟）。0代表不限制。"
 
@@ -4178,11 +4203,11 @@ msgstr "改变自助服务配置文件,请输入管理密码:"
 msgid "Please enter your password to change the server preferences:"
 msgstr "改变服务器配置,请输入密码:"
 
-#: ../lib/modules/ldapPublicKey.inc:61
+#: ../lib/modules/ldapPublicKey.inc:63
 msgid "Please enter your public SSH key."
 msgstr "请输入您的SSH公钥."
 
-#: ../templates/tests/lamdaemonTest.php:198
+#: ../templates/tests/lamdaemonTest.php:259
 msgid "Please install the SSH2 module for PHP and activate it in your php.ini!"
 msgstr "请在PHP中安装SSH2模块并在php.ini中启用!"
 
@@ -4190,7 +4215,7 @@ msgstr "请在PHP中安装SSH2模块并在php.ini中启用!"
 msgid "Please provide a CSV formated file with your account data. The cells in the first row must be filled with the column identifiers. The following rows represent one account for each row."
 msgstr "请提供帐号数据CSV格式文件.第一行必须为栏目标识,以下每行表示一个帐号."
 
-#: ../lib/modules/inetOrgPerson.inc:421
+#: ../lib/modules/inetOrgPerson.inc:463
 msgid "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr "请选择图像文件上传,必须是JPG格式(.jpg/.jpeg)."
 
@@ -4202,11 +4227,11 @@ msgstr "请选择帐号类型:"
 msgid "Please select your prefered log level. Messages with a lower level will not be logged."
 msgstr "请选择日志等级,在此等级以下的日志不会被记录."
 
-#: ../templates/login.php:230
+#: ../templates/login.php:242
 msgid "Please select your user name and enter your password to log in."
 msgstr "请输入用户名和密码登录."
 
-#: ../lib/modules.inc:901
+#: ../lib/modules.inc:1043
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "请在页面%s上输入必须的属性."
@@ -4216,52 +4241,55 @@ msgstr "请在页面%s上输入必须的属性."
 msgid "Please set up your master configuration file (config/config.cfg) first!"
 msgstr "请先主配置文件(config/config.cfg)!"
 
-#: ../lib/modules/kolabUser.inc:227
+#: ../lib/modules/kolabUser.inc:246
 msgid "Policy list has invalid format!"
 msgstr "策略列表含有非法格式!"
 
-#: ../templates/pdfedit/pdfpage.php:717
+#: ../templates/pdfedit/pdfpage.php:568
+#: ../templates/pdfedit/pdfpage.php:585
+#: ../templates/pdfedit/pdfpage.php:615
+#: ../templates/pdfedit/pdfpage.php:655
 msgid "Position"
 msgstr "位置"
 
 #: ../templates/masscreate.php:175
-#: ../templates/masscreate.php:318
-#: ../lib/modules/sambaGroupMapping.inc:397
+#: ../templates/masscreate.php:317
+#: ../lib/modules/sambaGroupMapping.inc:399
 msgid "Possible values"
 msgstr "可能的值"
 
-#: ../lib/modules/inetOrgPerson.inc:151
-#: ../lib/modules/inetOrgPerson.inc:243
-#: ../lib/modules/inetOrgPerson.inc:376
-#: ../lib/modules/inetOrgPerson.inc:377
-#: ../lib/modules/inetOrgPerson.inc:713
-#: ../lib/modules/inetOrgPerson.inc:946
-#: ../lib/modules/inetOrgPerson.inc:1296
+#: ../lib/modules/inetOrgPerson.inc:154
+#: ../lib/modules/inetOrgPerson.inc:257
+#: ../lib/modules/inetOrgPerson.inc:418
+#: ../lib/modules/inetOrgPerson.inc:419
+#: ../lib/modules/inetOrgPerson.inc:781
+#: ../lib/modules/inetOrgPerson.inc:1051
+#: ../lib/modules/inetOrgPerson.inc:1421
 msgid "Post office box"
 msgstr "邮政信箱"
 
 #: ../lib/modules/inetOrgPerson.inc:89
-#: ../lib/modules/inetOrgPerson.inc:150
-#: ../lib/modules/inetOrgPerson.inc:237
-#: ../lib/modules/inetOrgPerson.inc:384
-#: ../lib/modules/inetOrgPerson.inc:727
-#: ../lib/modules/inetOrgPerson.inc:948
-#: ../lib/modules/inetOrgPerson.inc:1280
+#: ../lib/modules/inetOrgPerson.inc:153
+#: ../lib/modules/inetOrgPerson.inc:251
+#: ../lib/modules/inetOrgPerson.inc:426
+#: ../lib/modules/inetOrgPerson.inc:809
+#: ../lib/modules/inetOrgPerson.inc:1053
+#: ../lib/modules/inetOrgPerson.inc:1405
 msgid "Postal address"
 msgstr "邮政地址"
 
-#: ../lib/modules/inetOrgPerson.inc:385
+#: ../lib/modules/inetOrgPerson.inc:427
 msgid "Postal address, city"
 msgstr "邮政地址,城市"
 
 #: ../lib/modules/inetOrgPerson.inc:91
-#: ../lib/modules/inetOrgPerson.inc:151
-#: ../lib/modules/inetOrgPerson.inc:231
-#: ../lib/modules/inetOrgPerson.inc:380
-#: ../lib/modules/inetOrgPerson.inc:381
-#: ../lib/modules/inetOrgPerson.inc:720
-#: ../lib/modules/inetOrgPerson.inc:947
-#: ../lib/modules/inetOrgPerson.inc:1288
+#: ../lib/modules/inetOrgPerson.inc:154
+#: ../lib/modules/inetOrgPerson.inc:245
+#: ../lib/modules/inetOrgPerson.inc:422
+#: ../lib/modules/inetOrgPerson.inc:423
+#: ../lib/modules/inetOrgPerson.inc:788
+#: ../lib/modules/inetOrgPerson.inc:1052
+#: ../lib/modules/inetOrgPerson.inc:1413
 msgid "Postal code"
 msgstr "邮政编码"
 
@@ -4269,24 +4297,24 @@ msgstr "邮政编码"
 msgid "Predefined values"
 msgstr "预订值"
 
-#: ../lib/modules/inetOrgPerson.inc:203
+#: ../lib/modules/inetOrgPerson.inc:217
 msgid "President"
 msgstr "总裁"
 
-#: ../lib/modules/posixGroup.inc:475
-#: ../lib/modules/posixAccount.inc:211
-#: ../lib/modules/posixAccount.inc:285
-#: ../lib/modules/posixAccount.inc:341
-#: ../lib/modules/posixAccount.inc:370
-#: ../lib/modules/posixAccount.inc:408
-#: ../lib/modules/posixAccount.inc:964
-#: ../lib/modules/posixAccount.inc:1130
-#: ../lib/modules/posixAccount.inc:1153
-#: ../lib/modules/posixAccount.inc:1194
+#: ../lib/modules/posixGroup.inc:483
+#: ../lib/modules/posixAccount.inc:217
+#: ../lib/modules/posixAccount.inc:291
+#: ../lib/modules/posixAccount.inc:351
+#: ../lib/modules/posixAccount.inc:380
+#: ../lib/modules/posixAccount.inc:418
+#: ../lib/modules/posixAccount.inc:989
+#: ../lib/modules/posixAccount.inc:1155
+#: ../lib/modules/posixAccount.inc:1178
+#: ../lib/modules/posixAccount.inc:1219
 msgid "Primary group"
 msgstr "主要组"
 
-#: ../lib/modules/inetOrgPerson.inc:425
+#: ../lib/modules/inetOrgPerson.inc:467
 msgid "Private telephone number"
 msgstr "个人电话号码"
 
@@ -4316,7 +4344,7 @@ msgstr "配置文件管理"
 #: ../templates/selfService/profManage.php:142
 #: ../templates/selfService/profManage.php:193
 #: ../templates/profedit/profilepage.php:250
-#: ../help/help.inc:144
+#: ../help/help.inc:146
 msgid "Profile name"
 msgstr "配置文件名"
 
@@ -4339,21 +4367,21 @@ msgstr "配置文件密码不同或为空!"
 
 #: ../lib/modules/sambaAccount.inc:64
 #: ../lib/modules/sambaAccount.inc:65
-#: ../lib/modules/sambaAccount.inc:160
-#: ../lib/modules/sambaAccount.inc:291
-#: ../lib/modules/sambaAccount.inc:386
-#: ../lib/modules/sambaAccount.inc:789
-#: ../lib/modules/sambaAccount.inc:893
+#: ../lib/modules/sambaAccount.inc:162
+#: ../lib/modules/sambaAccount.inc:293
+#: ../lib/modules/sambaAccount.inc:388
+#: ../lib/modules/sambaAccount.inc:791
+#: ../lib/modules/sambaAccount.inc:895
 #: ../lib/modules/sambaSamAccount.inc:84
 #: ../lib/modules/sambaSamAccount.inc:85
-#: ../lib/modules/sambaSamAccount.inc:238
-#: ../lib/modules/sambaSamAccount.inc:287
-#: ../lib/modules/sambaSamAccount.inc:414
-#: ../lib/modules/sambaSamAccount.inc:1072
-#: ../lib/modules/sambaSamAccount.inc:1339
-#: ../lib/modules/sambaSamAccount.inc:1490
-#: ../lib/modules/sambaSamAccount.inc:1663
-#: ../lib/modules/sambaSamAccount.inc:1685
+#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:289
+#: ../lib/modules/sambaSamAccount.inc:416
+#: ../lib/modules/sambaSamAccount.inc:1058
+#: ../lib/modules/sambaSamAccount.inc:1325
+#: ../lib/modules/sambaSamAccount.inc:1476
+#: ../lib/modules/sambaSamAccount.inc:1649
+#: ../lib/modules/sambaSamAccount.inc:1671
 msgid "Profile path"
 msgstr "配置文件路径"
 
@@ -4367,33 +4395,12 @@ msgstr "配置文件路径非法!"
 msgid "Profile was saved."
 msgstr "配置文件已保存."
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:156
-msgid "Project 1, Project 2"
-msgstr "工程1,工程2"
-
-#: ../lib/modules/neofonieInetOrgPerson.inc:97
-#: ../lib/modules/neofonieInetOrgPerson.inc:159
-#: ../lib/modules/neofonieInetOrgPerson.inc:297
-#: ../lib/modules/neofonieInetOrgPerson.inc:404
-#: ../lib/modules/neofonieInetOrgPerson.inc:611
-msgid "Project groups"
-msgstr "工程组"
-
-#: ../lib/modules/neofonieInetOrgPerson.inc:79
-#: ../lib/modules/neofonieInetOrgPerson.inc:129
-#: ../lib/modules/neofonieInetOrgPerson.inc:178
-#: ../lib/modules/neofonieInetOrgPerson.inc:235
-#: ../lib/modules/neofonieInetOrgPerson.inc:602
-#: ../lib/modules/neofonieInetOrgPerson.inc:732
-msgid "Quake ID"
-msgstr "Quake ID号"
-
-#: ../lib/modules/quota.inc:72
-#: ../lib/modules/quota.inc:138
+#: ../lib/modules/quota.inc:74
+#: ../lib/modules/quota.inc:140
 msgid "Quota"
 msgstr "配额"
 
-#: ../lib/modules/quota.inc:606
+#: ../lib/modules/quota.inc:608
 #, php-format
 msgid "Quota for %s on %s"
 msgstr "%s 在 %s 的硬盘配额:"
@@ -4408,8 +4415,8 @@ msgstr "RDN"
 
 #: ../templates/masscreate.php:167
 #: ../templates/profedit/profilepage.php:203
-#: ../lib/modules.inc:1184
-#: ../help/help.inc:142
+#: ../lib/modules.inc:1330
+#: ../help/help.inc:144
 msgid "RDN identifier"
 msgstr "RDN标志"
 
@@ -4417,11 +4424,11 @@ msgstr "RDN标志"
 msgid "RID (Windows UID)"
 msgstr "RID (Windows UID)"
 
-#: ../lib/modules/sambaDomain.inc:88
-#: ../lib/modules/sambaDomain.inc:149
-#: ../lib/modules/sambaDomain.inc:374
-#: ../lib/modules/sambaDomain.inc:380
-#: ../lib/modules/sambaDomain.inc:646
+#: ../lib/modules/sambaDomain.inc:90
+#: ../lib/modules/sambaDomain.inc:151
+#: ../lib/modules/sambaDomain.inc:376
+#: ../lib/modules/sambaDomain.inc:382
+#: ../lib/modules/sambaDomain.inc:648
 msgid "RID base"
 msgstr "RID 基类"
 
@@ -4442,21 +4449,21 @@ msgstr "确认增加新的OU?"
 msgid "Really delete attribute?"
 msgstr "确定删除属性?"
 
-#: ../lib/modules/nisMailAlias.inc:69
-#: ../lib/modules/nisMailAlias.inc:143
+#: ../lib/modules/nisMailAlias.inc:71
+#: ../lib/modules/nisMailAlias.inc:145
 msgid "Recipient"
 msgstr "收件人"
 
 #: ../lib/types/mailAlias.inc:83
-#: ../lib/modules/nisMailAlias.inc:73
-#: ../lib/modules/nisMailAlias.inc:87
-#: ../lib/modules/nisMailAlias.inc:277
+#: ../lib/modules/nisMailAlias.inc:75
+#: ../lib/modules/nisMailAlias.inc:89
+#: ../lib/modules/nisMailAlias.inc:279
 msgid "Recipient list"
 msgstr "收件人列表"
 
-#: ../lib/modules/sambaSamAccount.inc:317
-#: ../lib/modules/sambaSamAccount.inc:1414
-#: ../lib/modules/sambaSamAccount.inc:1737
+#: ../lib/modules/sambaSamAccount.inc:319
+#: ../lib/modules/sambaSamAccount.inc:1400
+#: ../lib/modules/sambaSamAccount.inc:1723
 msgid "Reconnect if disconnected"
 msgstr "如果中断重新连接"
 
@@ -4464,12 +4471,12 @@ msgstr "如果中断重新连接"
 msgid "Recursive delete progress"
 msgstr "递归删除过程"
 
-#: ../templates/config/mainmanage.php:313
+#: ../templates/config/mainmanage.php:361
 msgid "Reenter new master password"
 msgstr "请重新输入管理密码"
 
 #: ../templates/config/confmain.php:441
-#: ../lib/modules/posixAccount.inc:1704
+#: ../lib/modules/posixAccount.inc:1742
 msgid "Reenter password"
 msgstr "再次输入密码"
 
@@ -4493,28 +4500,33 @@ msgstr "如果冲突会被拒绝"
 msgid "Relative distinguished name"
 msgstr "相对区别名称(RDN)"
 
-#: ../templates/pdfedit/pdfpage.php:480
-#: ../lib/modules/ieee802device.inc:102
-#: ../lib/modules/neofonieInetOrgPerson.inc:439
-#: ../lib/modules/neofonieInetOrgPerson.inc:538
-#: ../lib/modules/sambaSamAccount.inc:1296
-#: ../lib/modules/kolabUser.inc:343
+#: ../templates/pdfedit/pdfpage.php:425
+#: ../lib/modules/ieee802device.inc:104
+#: ../lib/modules/sambaSamAccount.inc:1282
 #: ../lib/modules/kolabUser.inc:362
-#: ../lib/modules/kolabUser.inc:388
-#: ../lib/modules/shadowAccount.inc:348
-#: ../lib/modules/ldapPublicKey.inc:96
-#: ../lib/modules/inetLocalMailRecipient.inc:158
-#: ../lib/modules/groupOfNames.inc:156
-#: ../lib/modules/nisMailAlias.inc:145
+#: ../lib/modules/kolabUser.inc:381
+#: ../lib/modules/kolabUser.inc:407
+#: ../lib/modules/kolabUser.inc:910
+#: ../lib/modules/phpGroupwareUser.inc:246
+#: ../lib/modules/shadowAccount.inc:350
+#: ../lib/modules/ldapPublicKey.inc:98
+#: ../lib/modules/inetLocalMailRecipient.inc:160
+#: ../lib/modules/groupOfNames.inc:158
+#: ../lib/modules/nisMailAlias.inc:147
 msgid "Remove"
 msgstr "删除"
 
-#: ../lib/modules/posixGroup.inc:190
-#: ../lib/modules/posixAccount.inc:1020
+#: ../lib/modules/posixGroup.inc:192
+#: ../lib/modules/posixAccount.inc:1045
 msgid "Remove password"
 msgstr "删除密码"
 
-#: ../lib/modules/groupOfNames.inc:326
+#: ../lib/modules/phpGroupwareGroup.inc:101
+#: ../lib/modules/phpGroupwareUser.inc:178
+msgid "Remove phpGroupWare extension"
+msgstr "删除 phpGroupWare 扩展"
+
+#: ../lib/modules/groupOfNames.inc:328
 msgid "Remove selected entries"
 msgstr "删除所选条目"
 
@@ -4522,7 +4534,7 @@ msgstr "删除所选条目"
 msgid "Remove this account type"
 msgstr "删除这个帐号类型"
 
-#: ../lib/modules/inetOrgPerson.inc:1324
+#: ../lib/modules/inetOrgPerson.inc:1481
 msgid "Remove/replace photo"
 msgstr "删除/更改照片"
 
@@ -4538,17 +4550,17 @@ msgid "Renamed profile."
 msgstr "已更名的配置文件."
 
 #: ../templates/lists/changePassword.php:204
-#: ../lib/modules/posixGroup.inc:261
-#: ../lib/modules/sambaAccount.inc:746
-#: ../lib/modules/sambaSamAccount.inc:968
-#: ../lib/modules/posixAccount.inc:1098
-#: ../lib/modules/inetOrgPerson.inc:689
-#: ../lib/modules/inetOrgPerson.inc:883
+#: ../lib/modules/posixGroup.inc:269
+#: ../lib/modules/sambaAccount.inc:748
+#: ../lib/modules/sambaSamAccount.inc:954
+#: ../lib/modules/posixAccount.inc:1123
+#: ../lib/modules/inetOrgPerson.inc:757
+#: ../lib/modules/inetOrgPerson.inc:988
 msgid "Repeat password"
 msgstr "确认密码"
 
 #: ../lib/modules/posixAccount.inc:64
-#: ../lib/modules/posixAccount.inc:766
+#: ../lib/modules/posixAccount.inc:785
 msgid "Replaced $user or $group in homedir."
 msgstr "在homedir中已更改$user和$group. "
 
@@ -4563,30 +4575,30 @@ msgid "Required attributes"
 msgstr "必选属性"
 
 #: ../templates/profedit/profilepage.php:260
-#: ../lib/modules/sambaAccount.inc:843
-#: ../lib/modules/sambaSamAccount.inc:1145
+#: ../lib/modules/sambaAccount.inc:845
+#: ../lib/modules/sambaSamAccount.inc:1131
 msgid "Reset"
 msgstr "复位"
 
-#: ../lib/modules.inc:1007
+#: ../lib/modules.inc:1149
 msgid "Reset changes"
 msgstr "复位设定"
 
-#: ../lib/modules/sambaAccount.inc:348
-#: ../lib/modules/sambaAccount.inc:842
-#: ../lib/modules/sambaSamAccount.inc:197
-#: ../lib/modules/sambaSamAccount.inc:1144
+#: ../lib/modules/sambaAccount.inc:350
+#: ../lib/modules/sambaAccount.inc:844
+#: ../lib/modules/sambaSamAccount.inc:199
+#: ../lib/modules/sambaSamAccount.inc:1130
 msgid "Reset password"
 msgstr "复位密码"
 
-#: ../lib/modules/sambaDomain.inc:128
-#: ../lib/modules/sambaDomain.inc:202
-#: ../lib/modules/sambaDomain.inc:344
-#: ../lib/modules/sambaDomain.inc:682
+#: ../lib/modules/sambaDomain.inc:130
+#: ../lib/modules/sambaDomain.inc:204
+#: ../lib/modules/sambaDomain.inc:346
+#: ../lib/modules/sambaDomain.inc:684
 msgid "Reset time after lockout"
 msgstr "在锁定后复位时间"
 
-#: ../lib/modules/sambaDomain.inc:202
+#: ../lib/modules/sambaDomain.inc:204
 msgid "Reset time after lockout must be are natural number."
 msgstr "锁定帐号后复位时间必须是自然数."
 
@@ -4595,61 +4607,61 @@ msgstr "锁定帐号后复位时间必须是自然数."
 msgid "Rights for the home directory"
 msgstr "个人目录的权限"
 
-#: ../lib/modules/inetOrgPerson.inc:152
-#: ../lib/modules/inetOrgPerson.inc:279
-#: ../lib/modules/inetOrgPerson.inc:428
-#: ../lib/modules/inetOrgPerson.inc:734
-#: ../lib/modules/inetOrgPerson.inc:955
-#: ../lib/modules/inetOrgPerson.inc:1304
+#: ../lib/modules/inetOrgPerson.inc:155
+#: ../lib/modules/inetOrgPerson.inc:293
+#: ../lib/modules/inetOrgPerson.inc:470
+#: ../lib/modules/inetOrgPerson.inc:823
+#: ../lib/modules/inetOrgPerson.inc:1060
+#: ../lib/modules/inetOrgPerson.inc:1429
 msgid "Room number"
 msgstr "房间号"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:59
-#: ../lib/modules/inetLocalMailRecipient.inc:94
-#: ../lib/modules/inetLocalMailRecipient.inc:141
-#: ../lib/modules/inetLocalMailRecipient.inc:311
+#: ../lib/modules/inetLocalMailRecipient.inc:61
+#: ../lib/modules/inetLocalMailRecipient.inc:96
+#: ../lib/modules/inetLocalMailRecipient.inc:143
+#: ../lib/modules/inetLocalMailRecipient.inc:313
 msgid "Routing address"
 msgstr "邮寄地址"
 
-#: ../templates/tests/lamdaemonTest.php:208
+#: ../templates/tests/lamdaemonTest.php:269
 msgid "SSH connection"
 msgstr "SSH连接"
 
-#: ../templates/tests/lamdaemonTest.php:219
+#: ../templates/tests/lamdaemonTest.php:280
 msgid "SSH connection could be established."
 msgstr "SSH连接可以建立."
 
-#: ../lib/modules/ldapPublicKey.inc:50
-#: ../lib/modules/ldapPublicKey.inc:60
-#: ../lib/modules/ldapPublicKey.inc:64
-#: ../lib/modules/ldapPublicKey.inc:72
-#: ../lib/modules/ldapPublicKey.inc:94
+#: ../lib/modules/ldapPublicKey.inc:52
+#: ../lib/modules/ldapPublicKey.inc:62
+#: ../lib/modules/ldapPublicKey.inc:66
+#: ../lib/modules/ldapPublicKey.inc:74
+#: ../lib/modules/ldapPublicKey.inc:96
 msgid "SSH public key"
 msgstr "SSH公钥"
 
-#: ../lib/modules/ldapPublicKey.inc:165
+#: ../lib/modules/ldapPublicKey.inc:167
 msgid "SSH public key(s)"
 msgstr "SSH 公钥"
 
-#: ../templates/tests/lamdaemonTest.php:191
+#: ../templates/tests/lamdaemonTest.php:252
 msgid "SSH2 module"
 msgstr "SSH2模块"
 
-#: ../templates/tests/lamdaemonTest.php:194
+#: ../templates/tests/lamdaemonTest.php:255
 msgid "SSH2 module is installed."
 msgstr "SSH2模块已安装."
 
-#: ../lib/modules/sambaAccount.inc:107
+#: ../lib/modules/sambaAccount.inc:109
 msgid "Samba 2"
 msgstr "Samba 2"
 
-#: ../lib/modules/sambaSamAccount.inc:129
-#: ../lib/modules/sambaGroupMapping.inc:257
+#: ../lib/modules/sambaSamAccount.inc:131
+#: ../lib/modules/sambaGroupMapping.inc:259
 msgid "Samba 3"
 msgstr "Samba 3"
 
-#: ../lib/modules/sambaDomain.inc:188
-#: ../lib/modules/sambaDomain.inc:189
+#: ../lib/modules/sambaDomain.inc:190
+#: ../lib/modules/sambaDomain.inc:191
 msgid "Samba 3 domain SID is invalid!"
 msgstr "Samba 3 域SID非法!"
 
@@ -4657,27 +4669,27 @@ msgstr "Samba 3 域SID非法!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 域条目"
 
-#: ../lib/modules/sambaSamAccount.inc:259
-#: ../lib/modules/sambaSamAccount.inc:263
-#: ../lib/modules/sambaSamAccount.inc:439
-#: ../lib/modules/sambaSamAccount.inc:463
+#: ../lib/modules/sambaSamAccount.inc:261
+#: ../lib/modules/sambaSamAccount.inc:265
+#: ../lib/modules/sambaSamAccount.inc:441
+#: ../lib/modules/sambaSamAccount.inc:465
 msgid "Samba RID"
 msgstr "Samba RID"
 
-#: ../lib/modules/sambaGroupMapping.inc:295
-#: ../lib/modules/sambaGroupMapping.inc:320
+#: ../lib/modules/sambaGroupMapping.inc:297
+#: ../lib/modules/sambaGroupMapping.inc:322
 msgid "Samba RID number"
 msgstr "Samba RID号"
 
-#: ../lib/modules/sambaGroupMapping.inc:289
+#: ../lib/modules/sambaGroupMapping.inc:291
 msgid "Samba display name"
 msgstr "Samba 显示名"
 
-#: ../lib/modules/sambaDomain.inc:49
+#: ../lib/modules/sambaDomain.inc:51
 msgid "Samba domain"
 msgstr "Samba 域"
 
-#: ../lib/modules/sambaGroupMapping.inc:281
+#: ../lib/modules/sambaGroupMapping.inc:283
 msgid "Samba domain name"
 msgstr "Samba 域名"
 
@@ -4685,46 +4697,46 @@ msgstr "Samba 域名"
 msgid "Samba domains"
 msgstr "Samba 域"
 
-#: ../lib/modules/sambaGroupMapping.inc:301
-#: ../lib/modules/sambaGroupMapping.inc:328
-#: ../lib/modules/sambaGroupMapping.inc:346
+#: ../lib/modules/sambaGroupMapping.inc:303
+#: ../lib/modules/sambaGroupMapping.inc:330
+#: ../lib/modules/sambaGroupMapping.inc:348
 msgid "Samba group type"
 msgstr "Samba 组类型"
 
-#: ../lib/modules/sambaAccount.inc:345
-#: ../lib/modules/sambaAccount.inc:743
-#: ../lib/modules/sambaSamAccount.inc:194
-#: ../lib/modules/sambaSamAccount.inc:964
+#: ../lib/modules/sambaAccount.inc:347
+#: ../lib/modules/sambaAccount.inc:745
+#: ../lib/modules/sambaSamAccount.inc:196
+#: ../lib/modules/sambaSamAccount.inc:950
 msgid "Samba password"
 msgstr "Samba密码"
 
 #: ../lib/modules/sambaAccount.inc:70
-#: ../lib/modules/sambaAccount.inc:172
-#: ../lib/modules/sambaAccount.inc:303
-#: ../lib/modules/sambaAccount.inc:392
-#: ../lib/modules/sambaAccount.inc:395
-#: ../lib/modules/sambaAccount.inc:795
-#: ../lib/modules/sambaAccount.inc:894
+#: ../lib/modules/sambaAccount.inc:174
+#: ../lib/modules/sambaAccount.inc:305
+#: ../lib/modules/sambaAccount.inc:394
+#: ../lib/modules/sambaAccount.inc:397
+#: ../lib/modules/sambaAccount.inc:797
+#: ../lib/modules/sambaAccount.inc:896
 #: ../lib/modules/sambaSamAccount.inc:90
-#: ../lib/modules/sambaSamAccount.inc:244
-#: ../lib/modules/sambaSamAccount.inc:247
-#: ../lib/modules/sambaSamAccount.inc:426
-#: ../lib/modules/sambaSamAccount.inc:1084
-#: ../lib/modules/sambaSamAccount.inc:1502
-#: ../lib/modules/sambaSamAccount.inc:1666
+#: ../lib/modules/sambaSamAccount.inc:246
+#: ../lib/modules/sambaSamAccount.inc:249
+#: ../lib/modules/sambaSamAccount.inc:428
+#: ../lib/modules/sambaSamAccount.inc:1070
+#: ../lib/modules/sambaSamAccount.inc:1488
+#: ../lib/modules/sambaSamAccount.inc:1652
 msgid "Samba workstations"
 msgstr "Samba工作站"
 
-#: ../lib/modules/sambaSamAccount.inc:1203
+#: ../lib/modules/sambaSamAccount.inc:1189
 msgid "Saturday"
 msgstr "星期六"
 
 #: ../templates/tree/edit.php:512
 #: ../templates/selfService/selfServiceMain.php:230
-#: ../templates/pdfedit/pdfpage.php:741
-#: ../templates/pdfedit/pdfpage.php:775
+#: ../templates/pdfedit/pdfpage.php:668
+#: ../templates/pdfedit/pdfpage.php:702
 #: ../templates/profedit/profilepage.php:258
-#: ../lib/modules.inc:1004
+#: ../lib/modules.inc:1146
 msgid "Save"
 msgstr "保存"
 
@@ -4750,15 +4762,15 @@ msgstr "范围"
 msgid "Script path"
 msgstr "脚本路径"
 
-#: ../templates/config/confmain.php:520
+#: ../templates/config/confmain.php:519
 msgid "Script path is invalid!"
 msgstr "脚本路径非法!"
 
-#: ../templates/config/confmain.php:539
+#: ../templates/config/confmain.php:538
 msgid "Script rights are invalid!"
 msgstr "脚本权限非法!"
 
-#: ../templates/config/confmain.php:523
+#: ../templates/config/confmain.php:522
 msgid "Script server is invalid!"
 msgstr "脚本服务器非法!"
 
@@ -4782,21 +4794,21 @@ msgstr "搜索过滤器"
 msgid "Search scope"
 msgstr "搜索范围"
 
-#: ../templates/pdfedit/pdfpage.php:666
+#: ../templates/pdfedit/pdfpage.php:560
 msgid "Section"
 msgstr "节"
 
-#: ../templates/config/mainmanage.php:146
+#: ../templates/config/mainmanage.php:153
 #: ../templates/config/confmain.php:413
 msgid "Security settings"
 msgstr "安全设定"
 
-#: ../lib/types/group.inc:239
+#: ../lib/types/group.inc:240
 #: ../lib/lists.inc:837
 msgid "See README.openldap.txt to solve this problem."
 msgstr "参考README.openldap.txt解决本问题."
 
-#: ../templates/help.php:107
+#: ../templates/help.php:91
 msgid "See also"
 msgstr "同时参考"
 
@@ -4808,7 +4820,7 @@ msgstr "为新建处理选择模板"
 msgid "Select all"
 msgstr "全选"
 
-#: ../lib/modules/posixAccount.inc:1065
+#: ../lib/modules/posixAccount.inc:1090
 msgid "Selected groups"
 msgstr "已选择的组"
 
@@ -4816,7 +4828,7 @@ msgstr "已选择的组"
 msgid "Selected modules"
 msgstr "已选择的模块"
 
-#: ../lib/modules/posixGroup.inc:228
+#: ../lib/modules/posixGroup.inc:236
 msgid "Selected users"
 msgstr "已选择的用户"
 
@@ -4828,13 +4840,17 @@ msgstr "自助服务配置"
 msgid "Self service configuration editor"
 msgstr "自助服务配置编辑器"
 
+#: ../templates/tests/lamdaemonTest.php:80
+msgid "Server"
+msgstr "服务器"
+
 #: ../templates/config/confmain.php:148
 #: ../templates/selfService/adminMain.php:267
 #: ../help/help.inc:59
 msgid "Server address"
 msgstr "服务器地址"
 
-#: ../templates/config/confmain.php:495
+#: ../templates/config/confmain.php:494
 #: ../templates/selfService/adminMain.php:60
 msgid "Server address is invalid!"
 msgstr "服务器地址非法!"
@@ -4843,7 +4859,7 @@ msgstr "服务器地址非法!"
 msgid "Server list"
 msgstr "服务器列表"
 
-#: ../templates/login.php:326
+#: ../templates/login.php:338
 msgid "Server profile"
 msgstr "服务器设置文件"
 
@@ -4852,22 +4868,27 @@ msgstr "服务器设置文件"
 msgid "Server settings"
 msgstr "服务器设置"
 
-#: ../templates/config/mainmanage.php:152
+#: ../templates/config/mainmanage.php:159
 #: ../help/help.inc:129
 msgid "Session timeout"
 msgstr "会话超时"
 
-#: ../lib/modules/posixGroup.inc:172
-#: ../lib/modules/posixAccount.inc:1003
+#: ../lib/modules/posixGroup.inc:174
+#: ../lib/modules/posixAccount.inc:1028
 msgid "Set password"
 msgstr "设置密码"
 
+#: ../lib/modules/posixAccount.inc:183
+#: ../lib/modules/posixAccount.inc:331
+msgid "Set primary group as memberUid"
+msgstr "为主组设置memberUid"
+
 #: ../templates/config/profmanage.php:279
 #: ../help/help.inc:119
 msgid "Set profile password"
 msgstr "设置文件密码"
 
-#: ../lib/modules/posixAccount.inc:1112
+#: ../lib/modules/posixAccount.inc:1137
 msgid "Set random password"
 msgstr "设置随机密码"
 
@@ -4875,17 +4896,17 @@ msgstr "设置随机密码"
 msgid "Set specific password"
 msgstr "设置特定的密码"
 
-#: ../lib/modules/posixGroup.inc:395
+#: ../lib/modules/posixGroup.inc:403
 msgid "Sets the group password."
 msgstr "设置组密码"
 
-#: ../lib/modules/shadowAccount.inc:71
+#: ../lib/modules/shadowAccount.inc:73
 msgid "Shadow"
 msgstr "Shadow"
 
-#: ../lib/modules/sambaSamAccount.inc:311
-#: ../lib/modules/sambaSamAccount.inc:1396
-#: ../lib/modules/sambaSamAccount.inc:1721
+#: ../lib/modules/sambaSamAccount.inc:313
+#: ../lib/modules/sambaSamAccount.inc:1382
+#: ../lib/modules/sambaSamAccount.inc:1707
 msgid "Shadowing"
 msgstr "遮蔽化(shadow)"
 
@@ -4897,7 +4918,7 @@ msgstr "显示LDIF文件"
 msgid "Show internal attributes"
 msgstr "显示内部属性"
 
-#: ../lib/types/group.inc:261
+#: ../lib/types/group.inc:262
 msgid "Show primary group members as normal group members"
 msgstr "主组用户显示为普通组用户"
 
@@ -4905,31 +4926,31 @@ msgstr "主组用户显示为普通组用户"
 msgid "Single valued"
 msgstr "单值"
 
-#: ../lib/modules/quota.inc:550
+#: ../lib/modules/quota.inc:552
 msgid "Soft block"
 msgstr "软块"
 
-#: ../lib/modules/quota.inc:98
-#: ../lib/modules/quota.inc:356
-#: ../lib/modules/quota.inc:441
+#: ../lib/modules/quota.inc:100
+#: ../lib/modules/quota.inc:358
+#: ../lib/modules/quota.inc:443
 msgid "Soft block limit"
 msgstr "软块限制"
 
-#: ../lib/modules/quota.inc:99
+#: ../lib/modules/quota.inc:101
 msgid "Soft block limit."
 msgstr "软块限制."
 
-#: ../lib/modules/quota.inc:552
+#: ../lib/modules/quota.inc:554
 msgid "Soft inode"
 msgstr "软节点"
 
-#: ../lib/modules/quota.inc:121
+#: ../lib/modules/quota.inc:123
 msgid "Soft inode (files) limit."
 msgstr "软节点限制."
 
-#: ../lib/modules/quota.inc:120
-#: ../lib/modules/quota.inc:360
-#: ../lib/modules/quota.inc:443
+#: ../lib/modules/quota.inc:122
+#: ../lib/modules/quota.inc:362
+#: ../lib/modules/quota.inc:445
 msgid "Soft inode limit"
 msgstr "软节点限制."
 
@@ -4938,31 +4959,40 @@ msgstr "软节点限制."
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "下面被选中的属性(%s)已经被修改."
 
-#: ../lib/modules.inc:900
+#: ../lib/modules.inc:1042
 msgid "Some required information is missing"
 msgstr "缺少一些必要的信息"
 
-#: ../templates/help.php:138
+#: ../templates/help.php:121
 #, php-format
 msgid "Sorry this help id ({bold}%s{endbold}) is not available for this module ({bold}%s{endbold})."
 msgstr "对不起，本模块({bold}%s{endbold}) 尚无帮助说明 (help id {bold}%s{endbold})."
 
-#: ../templates/help.php:152
+#: ../templates/help.php:135
 #, php-format
 msgid "Sorry this help number ({bold}%d{endbold}) is not available."
 msgstr "对不起,本帮助号({bold}%d{endbold})并不存在."
 
-#: ../lib/modules/sambaAccount.inc:316
-#: ../lib/modules/sambaAccount.inc:404
-#: ../lib/modules/sambaAccount.inc:833
-#: ../lib/modules/sambaSamAccount.inc:256
-#: ../lib/modules/sambaSamAccount.inc:1121
+#: ../lib/modules/sambaAccount.inc:318
+#: ../lib/modules/sambaAccount.inc:406
+#: ../lib/modules/sambaAccount.inc:835
+#: ../lib/modules/sambaSamAccount.inc:258
+#: ../lib/modules/sambaSamAccount.inc:1107
 msgid "Special user"
 msgstr "特殊用户"
 
-#: ../templates/pdfedit/pdfpage.php:544
-#: ../templates/pdfedit/pdfpage.php:550
-#: ../templates/pdfedit/pdfpage.php:700
+#: ../lib/modules/inetOrgPerson.inc:156
+#: ../lib/modules/inetOrgPerson.inc:164
+#: ../lib/modules/inetOrgPerson.inc:305
+#: ../lib/modules/inetOrgPerson.inc:482
+#: ../lib/modules/inetOrgPerson.inc:802
+#: ../lib/modules/inetOrgPerson.inc:1065
+#: ../lib/modules/inetOrgPerson.inc:1445
+msgid "State"
+msgstr "地点"
+
+#: ../templates/pdfedit/pdfpage.php:493
+#: ../templates/pdfedit/pdfpage.php:497
 msgid "Static text"
 msgstr "静态文本"
 
@@ -4974,33 +5004,33 @@ msgstr "步骤1/2:名称和对象类"
 msgid "Step 2 of 2: Specify attributes and values"
 msgstr "步骤2/2:指定的属性和属性值"
 
-#: ../lib/modules/inetOrgPerson.inc:184
+#: ../lib/modules/inetOrgPerson.inc:198
 msgid "Steve"
 msgstr "Steve"
 
-#: ../lib/modules/sambaAccount.inc:223
-#: ../lib/modules/sambaSamAccount.inc:339
-#: ../lib/modules/posixAccount.inc:201
-#: ../lib/modules/inetOrgPerson.inc:292
+#: ../lib/modules/sambaAccount.inc:225
+#: ../lib/modules/sambaSamAccount.inc:341
+#: ../lib/modules/posixAccount.inc:207
+#: ../lib/modules/inetOrgPerson.inc:330
 msgid "Steve Miller"
 msgstr "Steve Miller"
 
-#: ../lib/modules/posixAccount.inc:262
+#: ../lib/modules/posixAccount.inc:268
 msgid "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 msgstr "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 
 #: ../lib/modules/inetOrgPerson.inc:87
-#: ../lib/modules/inetOrgPerson.inc:150
-#: ../lib/modules/inetOrgPerson.inc:225
-#: ../lib/modules/inetOrgPerson.inc:372
-#: ../lib/modules/inetOrgPerson.inc:373
-#: ../lib/modules/inetOrgPerson.inc:706
-#: ../lib/modules/inetOrgPerson.inc:945
-#: ../lib/modules/inetOrgPerson.inc:1272
+#: ../lib/modules/inetOrgPerson.inc:153
+#: ../lib/modules/inetOrgPerson.inc:239
+#: ../lib/modules/inetOrgPerson.inc:414
+#: ../lib/modules/inetOrgPerson.inc:415
+#: ../lib/modules/inetOrgPerson.inc:774
+#: ../lib/modules/inetOrgPerson.inc:1050
+#: ../lib/modules/inetOrgPerson.inc:1397
 msgid "Street"
 msgstr "街道"
 
-#: ../templates/pdfedit/pdfpage.php:749
+#: ../templates/pdfedit/pdfpage.php:676
 msgid "Structure name"
 msgstr "结构名"
 
@@ -5017,26 +5047,26 @@ msgstr "子字符串规则"
 msgid "Success"
 msgstr "成功"
 
-#: ../templates/tests/lamdaemonTest.php:95
+#: ../templates/tests/lamdaemonTest.php:159
 msgid "Sudo is not setup correctly!"
 msgstr "Sudo的设置不正确 !"
 
 #: ../lib/lists.inc:689
-#: ../lib/modules.inc:1166
+#: ../lib/modules.inc:1312
 msgid "Suffix"
 msgstr "后缀"
 
-#: ../lib/modules/sambaSamAccount.inc:1203
+#: ../lib/modules/sambaSamAccount.inc:1189
 msgid "Sunday"
 msgstr "星期日"
 
 #: ../templates/lists/changePassword.php:95
-#: ../lib/modules/sambaSamAccount.inc:186
+#: ../lib/modules/sambaSamAccount.inc:188
 msgid "Sync Samba LM password with Unix password"
 msgstr "同步 Samba LM 密码和Unix的密码"
 
 #: ../templates/lists/changePassword.php:94
-#: ../lib/modules/sambaSamAccount.inc:185
+#: ../lib/modules/sambaSamAccount.inc:187
 msgid "Sync Samba NT password with Unix password"
 msgstr "同步Samba NT的密码和 Unix的密码"
 
@@ -5054,32 +5084,31 @@ msgstr "OID语法"
 msgid "Syntaxes"
 msgstr "语法"
 
-#: ../templates/config/mainmanage.php:266
+#: ../templates/config/mainmanage.php:314
 msgid "System logging"
 msgstr "系统日志"
 
-#: ../lib/modules/kolabUser.inc:226
+#: ../lib/modules/kolabUser.inc:245
 msgid "Target of invitation policy is invalid!"
 msgstr "邀请策略的目标非法 !"
 
 #: ../templates/lists/changePassword.php:157
 #: ../lib/modules/inetOrgPerson.inc:77
-#: ../lib/modules/inetOrgPerson.inc:149
-#: ../lib/modules/inetOrgPerson.inc:249
-#: ../lib/modules/inetOrgPerson.inc:388
-#: ../lib/modules/inetOrgPerson.inc:389
-#: ../lib/modules/inetOrgPerson.inc:741
-#: ../lib/modules/inetOrgPerson.inc:949
-#: ../lib/modules/inetOrgPerson.inc:1240
+#: ../lib/modules/inetOrgPerson.inc:152
+#: ../lib/modules/inetOrgPerson.inc:263
+#: ../lib/modules/inetOrgPerson.inc:430
+#: ../lib/modules/inetOrgPerson.inc:431
+#: ../lib/modules/inetOrgPerson.inc:833
+#: ../lib/modules/inetOrgPerson.inc:1054
+#: ../lib/modules/inetOrgPerson.inc:1365
 msgid "Telephone number"
 msgstr "电话号码"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:151
-#: ../lib/modules/inetOrgPerson.inc:209
+#: ../lib/modules/inetOrgPerson.inc:223
 msgid "Temp"
 msgstr "临时"
 
-#: ../lib/modules/inetOrgPerson.inc:197
+#: ../lib/modules/inetOrgPerson.inc:211
 msgid "Temp, contract until december"
 msgstr "临时,合同到年底"
 
@@ -5087,8 +5116,8 @@ msgstr "临时,合同到年底"
 msgid "Template"
 msgstr "模板"
 
-#: ../lib/modules/sambaSamAccount.inc:320
-#: ../lib/modules/sambaSamAccount.inc:1136
+#: ../lib/modules/sambaSamAccount.inc:322
+#: ../lib/modules/sambaSamAccount.inc:1122
 msgid "Terminal server options"
 msgstr "终端服务选项"
 
@@ -5096,11 +5125,15 @@ msgstr "终端服务选项"
 msgid "Tests"
 msgstr "测试"
 
+#: ../templates/pdfedit/pdfpage.php:607
+msgid "Text field"
+msgstr "输入框"
+
 #: ../help/help.inc:103
 msgid "Text for user PDF"
 msgstr "用户PDF的文本"
 
-#: ../lib/modules/kolabUser.inc:163
+#: ../lib/modules/kolabUser.inc:182
 msgid "The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
 msgstr "用户Cyrus邮件限制(MB),留空意味着不限制."
 
@@ -5109,7 +5142,7 @@ msgstr "用户Cyrus邮件限制(MB),留空意味着不限制."
 msgid "The IP address %s is invalid!"
 msgstr "IP地址 %s非法 !"
 
-#: ../lib/modules/sambaDomain.inc:73
+#: ../lib/modules/sambaDomain.inc:75
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "您的Samba服务器的SID,可以通过使用\"net getlocalsid\"命令获取."
 
@@ -5117,7 +5150,7 @@ msgstr "您的Samba服务器的SID,可以通过使用\"net getlocalsid\"命令
 msgid "The UID ranges for users and hosts overlap! This is a problem because LAM uses the highest UID in use + 1 for new accounts. Please set the minimum UID to equal values or use independent ranges."
 msgstr "用户UID范围与主机帐号重叠,因为LAM用户使用最高UID+1做为新帐号的UID.请将最小的UID设为相等或使用独立的范围."
 
-#: ../help/help.inc:147
+#: ../help/help.inc:149
 msgid "The account will be saved under this LDAP suffix."
 msgstr "帐号将会保存在此后缀下."
 
@@ -5131,19 +5164,16 @@ msgstr "在你的LDAP服务器中%s属性(属于%s对象类)不被支持。"
 msgid "The container you specified (%s) does not exist. Please try again."
 msgstr "您指定的容器%s不存在,请重试."
 
-#: ../lib/modules/kolabUser.inc:151
+#: ../lib/modules/kolabUser.inc:170
 msgid "The country name of the user."
 msgstr "用户国籍."
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:89
-msgid "The department where the employee is employed."
-msgstr "雇员所在部门"
-
+#: ../lib/modules/phpGroupwareUser.inc:125
 #: ../lib/modules/shadowAccount.inc:56
 msgid "The expiration date is invalid."
 msgstr "过期日期非法."
 
-#: ../help/help.inc:177
+#: ../help/help.inc:179
 msgid "The first line is the subject."
 msgstr "第一行是对象。"
 
@@ -5156,11 +5186,11 @@ msgstr "LDAP中没有下列后缀,LAM会自动建立."
 msgid "The format of the logon hours field is invalid!"
 msgstr "登录时间列的格式非法!"
 
-#: ../templates/pdfedit/pdfpage.php:128
+#: ../templates/pdfedit/pdfpage.php:126
 msgid "The headline for a new section must contain at least one character."
 msgstr "新段的标题最少要有一个字符."
 
-#: ../lib/modules/sambaSamAccount.inc:233
+#: ../lib/modules/sambaSamAccount.inc:235
 msgid "The home directory will be connected under this drive letter."
 msgstr "将会从这个驱动器号上连接用户目录。"
 
@@ -5168,20 +5198,20 @@ msgstr "将会从这个驱动器号上连接用户目录。"
 msgid "The log file is empty or contains invalid characters! Valid characters are: a-z, A-Z, 0-9, /, \\, ., :, _ and -."
 msgstr "日志文件为空或包含非法字符.合法字符为a-z, A-Z, 0-9, /, \\, ., :, _和-."
 
-#: ../lib/modules.inc:945
+#: ../lib/modules.inc:1087
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "%s模块未启动."
 
-#: ../templates/pdfedit/pdfpage.php:109
+#: ../templates/pdfedit/pdfpage.php:95
 msgid "The name for that PDF-structure you submitted is not valid. A valid name must constist at least of one of the following characters 'a-z','A-Z','0-9','_','-','.'."
 msgstr "您提供的PDF架构名非法,合法字符为a-z,A-Z,0-9,_,- ."
 
-#: ../lib/modules/kolabUser.inc:155
+#: ../lib/modules/kolabUser.inc:174
 msgid "The name of the server where the mailbox is located."
 msgstr "邮箱所在服务器名."
 
-#: ../lib/modules/sambaDomain.inc:69
+#: ../lib/modules/sambaDomain.inc:71
 msgid "The name of your Windows domain or workgroup."
 msgstr "WINDOWS域名或工作组名."
 
@@ -5190,7 +5220,11 @@ msgstr "WINDOWS域名或工作组名."
 msgid "The object class %s is not supported by your LDAP server."
 msgstr "在你的LDAP服务器中对象类%s不被支持。"
 
-#: ../lib/modules/groupOfNames.inc:67
+#: ../lib/modules/inetOrgPerson.inc:491
+msgid "The office name of the user (e.g. YourCompany, Human Resources)."
+msgstr "用户的办公室名(比如:某某公司,人力资源部)"
+
+#: ../lib/modules/groupOfNames.inc:69
 msgid "The owner of this group."
 msgstr "此组的拥有者."
 
@@ -5200,47 +5234,77 @@ msgstr "此组的拥有者."
 msgid "The password is invalid! Please try again."
 msgstr "密码无效,请重试!"
 
-#: ../templates/lists/changePassword.php:320
+#: ../lib/security.inc:226
+#, php-format
+msgid "The password is too short. You have to enter at least %s characters."
+msgstr "密码太短,至少需要%s个字符."
+
+#: ../lib/security.inc:278
+#, php-format
+msgid "The password is too weak. You have to enter at least %s different character classes (upper/lower case, numbers and symbols)."
+msgstr "密码弱度不够.最少需要输入%s个字符类别(大/小写,数字和符号)."
+
+#: ../lib/security.inc:249
+#, php-format
+msgid "The password is too weak. You have to enter at least %s lower case characters."
+msgstr "密码强度不够,最少需要%s个小写字母."
+
+#: ../lib/security.inc:257
+#, php-format
+msgid "The password is too weak. You have to enter at least %s numeric characters."
+msgstr "密码强度不够,最少需要%s个数字字符."
+
+#: ../lib/security.inc:261
+#, php-format
+msgid "The password is too weak. You have to enter at least %s symbolic characters."
+msgstr "密码强度不够.最少需要%s个标点符号字符."
+
+#: ../lib/security.inc:253
+#, php-format
+msgid "The password is too weak. You have to enter at least %s upper case characters."
+msgstr "密码强度不够.最少需要%s个大写字母字符."
+
+#: ../templates/lists/changePassword.php:326
 msgid "The password(s) were set to:"
 msgstr "密码被设置为:"
 
-#: ../lib/modules/posixAccount.inc:342
+#: ../lib/modules/posixAccount.inc:352
 msgid "The primary group for this account. You can insert a GID number or a group name."
 msgstr "本帐号的主组名,您可以输入一个GID号或组名."
 
-#: ../lib/modules/posixAccount.inc:409
+#: ../lib/modules/posixAccount.inc:419
 msgid "The primary group the host should be member of."
 msgstr "该主机所属的主组名."
 
-#: ../lib/modules/posixAccount.inc:371
+#: ../lib/modules/posixAccount.inc:381
 msgid "The primary group the user should be member of."
 msgstr "该用户所属的主组名."
 
-#: ../lib/modules/inetOrgPerson.inc:429
+#: ../lib/modules/inetOrgPerson.inc:471
 msgid "The room number of the employee's office."
 msgstr "雇员办公室房间号码"
 
-#: ../templates/pdfedit/pdfpage.php:132
+#: ../lib/modules/inetOrgPerson.inc:483
+msgid "The state where the user resides or works."
+msgstr "用户居住或工作地点."
+
+#: ../templates/pdfedit/pdfpage.php:114
 msgid "The static text must contain at least one character."
 msgstr "静态文本至少包含一个字符."
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:107
-msgid "The user's birth date."
-msgstr "用户生日"
-
-#: ../help/help.inc:180
-msgid "The wildcard for the new password is @@newPasssword@@."
+#: ../help/help.inc:182
+msgid "The wildcard for the new password is @@newPassword@@."
 msgstr "新密码的通配符为@@newPassword@@."
 
 #: ../templates/tree/add_oclass_form.php:125
 msgid "There are new required attributes which need to be set."
 msgstr "必须设置的新属性"
 
-#: ../lib/modules/posixGroup.inc:475
+#: ../lib/modules/posixGroup.inc:483
 msgid "There are still users who have this group as their primary group."
 msgstr "仍有用户的主组为本组."
 
-#: ../lib/modules/sambaGroupMapping.inc:395
+#: ../lib/modules/sambaGroupMapping.inc:397
 msgid "There can be only one group of this type."
 msgstr "只能有一种本类型组."
 
@@ -5248,15 +5312,15 @@ msgstr "只能有一种本类型组."
 msgid "There were errors while uploading:"
 msgstr "上传时发生错误."
 
-#: ../lib/modules/posixGroup.inc:399
+#: ../lib/modules/posixGroup.inc:407
 msgid "These are the minimum and maximum numbers to use for group IDs when creating new group accounts. New group accounts will always get the highest number in use plus one."
 msgstr "新建立新组帐号时,最大和最小的GID号.新组号自动在已用最大号加1."
 
-#: ../lib/modules/posixAccount.inc:330
+#: ../lib/modules/posixAccount.inc:340
 msgid "These are the minimum and maximum numbers to use for machine IDs when creating new accounts for Samba hosts. The range should be different from that of users. New host accounts will always get the highest number in use plus one."
 msgstr "为Samba主机增加新帐号时,最大和最小的机器ID号,必须不同于用户的范围,新主机帐号将使用最大号加1."
 
-#: ../lib/modules/posixAccount.inc:326
+#: ../lib/modules/posixAccount.inc:336
 msgid "These are the minimum and maximum numbers to use for user IDs when creating new user accounts. The range should be different from that of machines. New user accounts will always get the highest number in use plus one."
 msgstr "建立新用户帐号时所使用的最大和最小UID号,UID范围不能与机器ID号一致.新帐号使用已用最大号加1."
 
@@ -5264,14 +5328,18 @@ msgstr "建立新用户帐号时所使用的最大和最小UID号,UID范围不
 msgid "This GID number is invalid! Please provide either a number or a group name."
 msgstr "GID号非法!请提供新号或组名."
 
-#: ../lib/modules/kolabUser.inc:288
+#: ../lib/modules/kolabUser.inc:307
 msgid "This account is marked for deletion."
 msgstr "本帐号标记为删除."
 
-#: ../lib/modules/sambaSamAccount.inc:257
+#: ../lib/modules/sambaSamAccount.inc:259
 msgid "This allows you to define this account as a special user like administrator or guest."
 msgstr "您可以指定本帐号为特殊帐号,比如管理员或来宾."
 
+#: ../lib/modules/inetOrgPerson.inc:487
+msgid "This can be used to specify if the user has a car license."
+msgstr "用来指定用户是否拥有汽车执照."
+
 #: ../help/help.inc:120
 msgid "This changes the password of the selected profile."
 msgstr "改变设置文件的密码."
@@ -5292,6 +5360,10 @@ msgstr "设置登录语言和默认语言.用户可以在登录时更改."
 msgid "This defines the rights for the home directories which are created by lamdaemon."
 msgstr "设置lamdaemon建立的用户目录的权限."
 
+#: ../lib/modules/inetOrgPerson.inc:479
+msgid "This describes the location of the user."
+msgstr "描述用户所在地点."
+
 #: ../lib/lamPDF.inc:126
 msgid "This document was automatically created by LDAP Account Manager"
 msgstr "本文件由本系统自动产生."
@@ -5309,27 +5381,27 @@ msgstr "本条目是一个包含%s 子条目的子树的根."
 msgid "This gecos value is invalid!"
 msgstr "备注值非法!"
 
-#: ../lib/modules/ieee802device.inc:64
+#: ../lib/modules/ieee802device.inc:66
 msgid "This is a comma separated list of MAC addresses."
 msgstr "这是以逗号分隔的MAC地址列表."
 
-#: ../lib/modules/kolabUser.inc:139
+#: ../lib/modules/kolabUser.inc:158
 msgid "This is a comma separated list of delegates."
 msgstr "这是以逗号分隔的代表列表."
 
-#: ../lib/modules/kolabUser.inc:147
+#: ../lib/modules/kolabUser.inc:166
 msgid "This is a comma separated list of eMail aliases."
 msgstr "这是以逗号分隔的电子邮件别名列表."
 
-#: ../lib/modules/kolabUser.inc:131
+#: ../lib/modules/kolabUser.inc:150
 msgid "This is a comma separated list of invitation policies."
 msgstr "这是逗号分隔的约会策略列表."
 
-#: ../lib/modules/nisMailAlias.inc:74
+#: ../lib/modules/nisMailAlias.inc:76
 msgid "This is a comma separated list of recipients."
 msgstr "这是以逗号分隔的收件人列表."
 
-#: ../lib/modules/inetLocalMailRecipient.inc:68
+#: ../lib/modules/inetLocalMailRecipient.inc:70
 msgid "This is a comma separated list of the users public email addresses."
 msgstr "这是逗号分隔的用户公开邮件地址."
 
@@ -5337,11 +5409,11 @@ msgstr "这是逗号分隔的用户公开邮件地址."
 msgid "This is a list of IP addresses from hosts who may access LAM. You can use \"*\" as wildcard (e.g. 192.168.0.*)."
 msgstr "这是可以访问本系统的IP地址列表,你可以使用\"*\" 代表多台主机,(例如192.168.0.*)."
 
-#: ../lib/modules/groupOfNames.inc:71
+#: ../lib/modules/groupOfNames.inc:73
 msgid "This is a list of members of this group."
 msgstr "这是该组用户列表."
 
-#: ../lib/modules/groupOfNames.inc:75
+#: ../lib/modules/groupOfNames.inc:77
 msgid "This is a list of members of this group. Multiple members are separated by semicolons."
 msgstr "这是以分号分隔的本组用户列表."
 
@@ -5353,11 +5425,11 @@ msgstr "这是lamdaemon指令所在的服务器列表.本系统将用户登录
 msgid "This is a list of valid DN entries of all users that are allowed to login to LDAP Account Manager. Please enter one DN per line."
 msgstr "这是允许登录本系统的DN列表,每行输入一个DN."
 
-#: ../templates/masscreate.php:228
+#: ../templates/masscreate.php:227
 msgid "This is an example how it would look in your spreadsheet program before you convert to CSV:"
 msgstr "电子表格未存成CSV格式的样例:"
 
-#: ../help/help.inc:162
+#: ../help/help.inc:164
 msgid "This is needed to find the LDAP DNs of your user accounts. E.g. if you use \"uid\" and your user inputs \"miller\" then LAM will search for an account with uid=miller."
 msgstr "用于搜索用户帐号的LDAP DN.比如您输入\"uid\" 而用户输入\"miller\" ,系统会使用uid=miller这个条件来搜索帐号."
 
@@ -5369,31 +5441,31 @@ msgstr "不是一个有效的DN!"
 msgid "This is not a valid RID number!"
 msgstr "不是一个有效的RID号!"
 
-#: ../lib/modules/sambaGroupMapping.inc:397
+#: ../lib/modules/sambaGroupMapping.inc:399
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不是一个有效的Samba 3 组类型!"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:64
+#: ../lib/modules/inetLocalMailRecipient.inc:66
 msgid "This is one of the users public email addresses."
 msgstr "用户公开邮件地址之一."
 
-#: ../lib/modules/nisMailAlias.inc:70
+#: ../lib/modules/nisMailAlias.inc:72
 msgid "This is one recipient for this alias."
 msgstr "这个别名的一个收件人."
 
-#: ../lib/modules/inetOrgPerson.inc:369
+#: ../lib/modules/inetOrgPerson.inc:411
 msgid "This is the LDAP DN of the user's manager. Use this property to represent hierarchies in your company."
 msgstr "用户管理员的LDAP DN.显示您在公司的阶层."
 
-#: ../lib/modules/ieee802device.inc:60
+#: ../lib/modules/ieee802device.inc:62
 msgid "This is the MAC address of the network card of the device (e.g. 00:01:02:DE:EF:18)."
 msgstr "网卡的MAC地址(比如:00:01:02:DE:EF:18)."
 
-#: ../lib/modules/sambaAccount.inc:402
+#: ../lib/modules/sambaAccount.inc:404
 msgid "This is the RID of the user's primary Windows group."
 msgstr "用户主Windows组的RID号."
 
-#: ../lib/modules/sambaSamAccount.inc:254
+#: ../lib/modules/sambaSamAccount.inc:256
 msgid "This is the SID of the user's primary Windows group."
 msgstr "用户Windows主组的SID."
 
@@ -5401,26 +5473,27 @@ msgstr "用户Windows主组的SID."
 msgid "This is the absolute path to an external script for setting quotas and creating home directories."
 msgstr "这是设置硬盘配额和建立主目录的外部脚本所在的绝对路径."
 
-#: ../lib/modules/sambaAccount.inc:346
-#: ../lib/modules/sambaSamAccount.inc:195
+#: ../lib/modules/sambaAccount.inc:348
+#: ../lib/modules/sambaSamAccount.inc:197
 msgid "This is the account's Windows password."
 msgstr "帐号在Windows中的密码."
 
-#: ../lib/modules/sambaAccount.inc:343
-#: ../lib/modules/sambaSamAccount.inc:192
+#: ../lib/modules/sambaAccount.inc:345
+#: ../lib/modules/sambaSamAccount.inc:194
 msgid "This is the account's full name on Windows systems."
 msgstr "用户在Windows系统中的全名."
 
-#: ../lib/modules/sambaSamAccount.inc:276
-#: ../lib/modules/shadowAccount.inc:173
+#: ../lib/modules/sambaSamAccount.inc:278
+#: ../lib/modules/phpGroupwareUser.inc:83
+#: ../lib/modules/shadowAccount.inc:175
 msgid "This is the date when the account will expire. Format: DD-MM-YYYY"
 msgstr "帐号过期日期: DD-MM-YYYY"
 
-#: ../lib/modules/sambaGroupMapping.inc:313
+#: ../lib/modules/sambaGroupMapping.inc:315
 msgid "This is the group name which will be shown in Windows."
 msgstr "显示在Windows系统中的组名."
 
-#: ../help/help.inc:143
+#: ../help/help.inc:145
 msgid "This is the identifier for the relative DN value. It must be one of the given allowed LDAP attributes (e.g. user accounts usually use \"uid\" while groups use \"cn\")."
 msgstr "RDN值的标志.必须是您LDAP属性中的一个值(比如,用户帐号经常使用\"uid\",而组名经常使用\"cn\"))"
 
@@ -5428,31 +5501,31 @@ msgstr "RDN值的标志.必须是您LDAP属性中的一个值(比如,用户帐
 msgid "This is the list of attributes to show in the account list. The entries can either be predefined values, \"#attribute\", or individual ones, \"attribute:description\". Several entries are separated by semicolons."
 msgstr "帐号列表所显示的属性列表.可以是预定义值\"#attribute\",或者独立的值,\"attribute:description\".用分号隔离多个条目."
 
-#: ../lib/modules/inetLocalMailRecipient.inc:72
+#: ../lib/modules/inetLocalMailRecipient.inc:74
 msgid "This is the mail server for the user."
 msgstr "用户的邮件服务器."
 
-#: ../lib/modules/groupOfNames.inc:59
+#: ../lib/modules/groupOfNames.inc:61
 msgid "This is the name of this group."
 msgstr "组名."
 
-#: ../lib/modules/posixAccount.inc:417
+#: ../lib/modules/posixAccount.inc:427
 msgid "This is the natural name of the host. If empty, the host name will be used."
 msgstr "主机帐号的自然名(natural name).留空使用主机名."
 
-#: ../lib/modules/inetOrgPerson.inc:405
+#: ../lib/modules/inetOrgPerson.inc:447
 msgid "This is the natural name of the user. If empty, the first and last name is used."
 msgstr "用户自然名,留空会使用姓名."
 
-#: ../lib/modules/posixAccount.inc:395
+#: ../lib/modules/posixAccount.inc:405
 msgid "This is the natural name of the user. If empty, the first and last name or user name is used."
 msgstr "用户的自然名.留空会使用姓名."
 
-#: ../lib/modules/sambaDomain.inc:113
-msgid "This is the number of bad logon attempts (0 - 999) before the accounts is deactivated. 0 means unlimited attempts."
+#: ../lib/modules/sambaDomain.inc:115
+msgid "This is the number of bad logon attempts (0 - 999) before the account is deactivated. 0 means unlimited attempts."
 msgstr "在帐号被锁定前失败的登录次数(0-999)，0代表不限制。"
 
-#: ../lib/modules/sambaDomain.inc:97
+#: ../lib/modules/sambaDomain.inc:99
 msgid "This is the number of passwords which are saved to prevent that users reuse old passwords."
 msgstr "为防止用户使用旧的密码而保存的历史密码数量."
 
@@ -5460,19 +5533,19 @@ msgstr "为防止用户使用旧的密码而保存的历史密码数量."
 msgid "This is the number of rows to show in the account list. If more entries are found the list will be split into several pages."
 msgstr "显示帐号中的行数，如果搜索到更多的行数会分页显示."
 
-#: ../lib/modules/sambaSamAccount.inc:285
+#: ../lib/modules/sambaSamAccount.inc:287
 msgid "This is the path to the user's home directory."
 msgstr "这是用户的主目录路径."
 
-#: ../lib/modules/sambaGroupMapping.inc:321
+#: ../lib/modules/sambaGroupMapping.inc:323
 msgid "This is the relative ID (similar to UID on Unix) for Windows accounts. If you leave this empty LAM will calculate the RID from the UID. This can be either a number or the name of a special group:"
 msgstr "Windows帐号的关联ID(有点象Unix中的UID).留空系统会从UID计算RID.可以是一个数字或一个特殊组名."
 
-#: ../lib/modules/sambaSamAccount.inc:260
+#: ../lib/modules/sambaSamAccount.inc:262
 msgid "This is the relative ID number for your Windows account. You can either enter a number or one of these special accounts: "
 msgstr "Windows帐号的关联ID.可以输入一个数字或以下特殊帐号:"
 
-#: ../lib/modules/sambaSamAccount.inc:264
+#: ../lib/modules/sambaSamAccount.inc:266
 msgid "This is the relative ID number for your host account. If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr "主机帐号的关联ID号.留空系统使用:uidNumber*2 + sambaAlgorithmicRidBase."
 
@@ -5488,11 +5561,11 @@ msgstr "LDAP树状显示的后缀."
 msgid "This is the suffix of the LDAP tree from where to search for LDAP entries. Only entries in this subtree will be displayed in the account list. When creating a new accont this will be the DN where it is saved."
 msgstr "搜索LDAP时的LDAP树后缀.只有在这个子树下的条目被显示.当建立一个新帐号时,这是新帐号存在的DN位置."
 
-#: ../lib/modules/inetLocalMailRecipient.inc:60
+#: ../lib/modules/inetLocalMailRecipient.inc:62
 msgid "This is the target email address for the user's mails."
 msgstr "用户邮件的最终地址."
 
-#: ../lib/modules/sambaDomain.inc:125
+#: ../lib/modules/sambaDomain.inc:127
 msgid "This is the time (in minutes) for which the user may not log in after the account was locked. -1 means forever."
 msgstr "用户帐号被锁定后用户不能登录的时间(分钟),-1表示永久."
 
@@ -5504,27 +5577,15 @@ msgstr "在自动退出前,用户不活动时间(分钟)."
 msgid "This is the time in minutes which LAM caches its LDAP searches. Shorter times will stress LDAP more but decrease the possibility that changes are not identified."
 msgstr "LAM缓存有效时间(分钟),较短的时间会增加LDAP压力,但减少了数据不一致的可能."
 
-#: ../lib/modules/kolabUser.inc:159
+#: ../lib/modules/kolabUser.inc:178
 msgid "This is the time limit (in days) for other users who want to check future appointments. If you leave this blank the default (60 days) will be set."
 msgstr "其它用户检查未来约会的天数.如果留空,默认值为60天."
 
-#: ../lib/modules/sambaSamAccount.inc:279
+#: ../lib/modules/sambaSamAccount.inc:281
 msgid "This is the time zone of your Samba server. LAM needs this information to display the logon hours correctly."
 msgstr "这是Samba服务器的时区.LAM用此信息显示正确的登录时间."
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:77
-msgid "This is the user's AIM account name"
-msgstr "用户AIM帐号名"
-
-#: ../lib/modules/neofonieInetOrgPerson.inc:80
-msgid "This is the user's Quake ID."
-msgstr "这是用的Quake ID."
-
-#: ../lib/modules/neofonieInetOrgPerson.inc:74
-msgid "This is the user's login name for the wiki."
-msgstr "这是wiki系统中用户的登录名."
-
-#: ../lib/modules/sambaSamAccount.inc:251
+#: ../lib/modules/sambaSamAccount.inc:253
 msgid "This is the user's primary Windows group."
 msgstr "用户的Windows主要组."
 
@@ -5532,7 +5593,7 @@ msgstr "用户的Windows主要组."
 msgid "This login shell is invalid!"
 msgstr "登录shell非法!"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:231
+#: ../lib/modules/inetLocalMailRecipient.inc:233
 msgid "This mail address is already in use:"
 msgstr "邮件地址已被使用: "
 
@@ -5540,35 +5601,35 @@ msgstr "邮件地址已被使用: "
 msgid "This object class is obsolete."
 msgstr "这个对象类是陈旧的."
 
-#: ../lib/modules/sambaSamAccount.inc:270
+#: ../lib/modules/sambaSamAccount.inc:272
 msgid "This option defines the allowed logon hours for this account."
 msgstr "允许帐号登录的时间."
 
-#: ../lib/modules/sambaSamAccount.inc:273
+#: ../lib/modules/sambaSamAccount.inc:275
 msgid "This option defines the allowed logon hours for this account. The format is the same as for the LDAP attribute. The 24*7 hours are represented as 168 bit which are saved as 21 hex (21*8 = 168) values. The first bit represents Sunday 0:00 - 0:59 in GMT."
 msgstr "帐号可以登录的时间.格式与LDAP属性一致.使用168位代理24*7,168位以21个16进制字节表示.第一位代表GMT时间星期天0:00-0.59."
 
-#: ../lib/modules/sambaSamAccount.inc:294
+#: ../lib/modules/sambaSamAccount.inc:296
 msgid "This program is run after the login."
 msgstr "登录后运行的程序。"
 
-#: ../lib/modules/sambaSamAccount.inc:318
+#: ../lib/modules/sambaSamAccount.inc:320
 msgid "This specifies the reconnect policy."
 msgstr "这里指定断开连接的策略。"
 
-#: ../lib/modules/sambaSamAccount.inc:315
+#: ../lib/modules/sambaSamAccount.inc:317
 msgid "This specifies what to do when the client connection is broken."
 msgstr "这里指定客户连接中断的动作。"
 
-#: ../help/help.inc:166
+#: ../help/help.inc:168
 msgid "This text is displayed on top of the self service login page. You can also input HTML code here."
 msgstr "这些文本显示在自助服务登录面的上端.你可以在此输入HTML代码."
 
-#: ../help/help.inc:168
+#: ../help/help.inc:170
 msgid "This text is displayed on top of the self service main page. You can also input HTML code here."
 msgstr "这些文本显示在自助服务主页的上端,可以在此输入HTML代码."
 
-#: ../help/help.inc:164
+#: ../help/help.inc:166
 msgid "This text should shortly describe your selected LDAP search attribute (e.g. email or user name)."
 msgstr "这些文本简短描述了您所选的LDAP搜索属性(比如邮件或用户名)."
 
@@ -5600,19 +5661,19 @@ msgstr "此值只能设为 \\\"true\\\" 或 \\\"false\\\"!"
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"."
 msgstr "此值只能设为 \\\"true\\\" 或 \\\"false\\\"."
 
-#: ../lib/modules/posixGroup.inc:474
+#: ../lib/modules/posixGroup.inc:482
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "此值必须是用分号分开的用户名列表."
 
-#: ../help/help.inc:185
+#: ../help/help.inc:187
 msgid "This will create a new organizational unit under the selected one."
 msgstr "在所选的节点下建立新的组织单元."
 
-#: ../lib/modules/posixAccount.inc:358
+#: ../lib/modules/posixAccount.inc:368
 msgid "This will create the user's home directory on the specified server."
 msgstr "将在指定的服务器上建立用户的主目录."
 
-#: ../help/help.inc:187
+#: ../help/help.inc:189
 msgid "This will delete the selected organizational unit. The OU has to be empty."
 msgstr "将删除所选的组织单元.组织单元必须为空."
 
@@ -5620,47 +5681,47 @@ msgstr "将删除所选的组织单元.组织单元必须为空."
 msgid "This will delete the selected profile."
 msgstr "将删除所选的配置文件."
 
-#: ../lib/modules/sambaAccount.inc:349
-#: ../lib/modules/sambaSamAccount.inc:198
+#: ../lib/modules/sambaAccount.inc:351
+#: ../lib/modules/sambaSamAccount.inc:200
 msgid "This will reset the host's password to a default value."
 msgstr "将主机密码复位到缺省值."
 
 #: ../templates/lists/changePassword.php:171
-#: ../help/help.inc:174
+#: ../help/help.inc:176
 msgid "This will set a random password and display it on the screen or send it the user via mail."
 msgstr "将会生成一个随机的密码并在屏幕上显示或通过邮件发送给用户。"
 
-#: ../lib/modules/kolabUser.inc:167
+#: ../lib/modules/kolabUser.inc:186
 msgid "This will set a special flag on the account which tells Kolabd to remove it. Use this to cleanly delete Kolab accounts (e.g. this removes mail boxes)."
 msgstr "将为用户设定特殊的标记,以通知Kolabd删除帐号.用来完全删除Kolab帐号(比如删除邮箱)."
 
-#: ../lib/modules/sambaSamAccount.inc:1202
+#: ../lib/modules/sambaSamAccount.inc:1188
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../lib/modules/sambaSamAccount.inc:1243
+#: ../lib/modules/sambaSamAccount.inc:1229
 msgid "Time"
 msgstr "时间"
 
-#: ../lib/modules/sambaSamAccount.inc:299
+#: ../lib/modules/sambaSamAccount.inc:301
 msgid "Time limit"
 msgstr "时间限制"
 
-#: ../lib/modules/sambaSamAccount.inc:278
-#: ../lib/modules/sambaSamAccount.inc:473
+#: ../lib/modules/sambaSamAccount.inc:280
+#: ../lib/modules/sambaSamAccount.inc:475
 msgid "Time zone"
 msgstr "时区"
 
-#: ../templates/tests/lamdaemonTest.php:83
+#: ../templates/tests/lamdaemonTest.php:147
 #: ../lib/lamdaemon.inc:121
 msgid "Timeout while executing lamdaemon commands!"
 msgstr "运行lamdaemon命令超时!"
 
-#: ../lib/modules/posixAccount.inc:387
+#: ../lib/modules/posixAccount.inc:397
 msgid "To disable login use /bin/false. The list of shells is read from lam/config/shells"
 msgstr "使用/bin/false来禁止用户登录.shells列表来自/lam/config/shells."
 
-#: ../lib/modules/sambaSamAccount.inc:497
+#: ../lib/modules/sambaSamAccount.inc:499
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "东京,首尔,大孤,雅库茨克"
 
@@ -5673,7 +5734,7 @@ msgstr "工具"
 msgid "Total entries"
 msgstr "所有条目"
 
-#: ../lib/types/user.inc:241
+#: ../lib/types/user.inc:249
 msgid "Translate GID number to group name"
 msgstr "将GID号改为组名"
 
@@ -5686,11 +5747,11 @@ msgstr "树状结构后缀"
 msgid "Tree view"
 msgstr "树状结构"
 
-#: ../templates/config/confmain.php:514
+#: ../templates/config/confmain.php:513
 msgid "TreeSuffix is invalid!"
 msgstr "树状结构后缀非法!"
 
-#: ../lib/modules/sambaSamAccount.inc:1202
+#: ../lib/modules/sambaSamAccount.inc:1188
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -5714,13 +5775,13 @@ msgstr "UID必须是一个数字,必须在配置文件中所定的UID范围内."
 #: ../lib/types/host.inc:86
 #: ../lib/types/user.inc:83
 #: ../lib/modules/posixAccount.inc:71
-#: ../lib/modules/posixAccount.inc:205
-#: ../lib/modules/posixAccount.inc:279
-#: ../lib/modules/posixAccount.inc:325
-#: ../lib/modules/posixAccount.inc:329
-#: ../lib/modules/posixAccount.inc:337
-#: ../lib/modules/posixAccount.inc:949
-#: ../lib/modules/posixAccount.inc:1191
+#: ../lib/modules/posixAccount.inc:211
+#: ../lib/modules/posixAccount.inc:285
+#: ../lib/modules/posixAccount.inc:335
+#: ../lib/modules/posixAccount.inc:339
+#: ../lib/modules/posixAccount.inc:347
+#: ../lib/modules/posixAccount.inc:974
+#: ../lib/modules/posixAccount.inc:1216
 msgid "UID number"
 msgstr "UID编号"
 
@@ -5733,16 +5794,16 @@ msgstr "UID号已经改变.为保持文件属主,必须用root身份运行如下
 msgid "UID ranges for Unix accounts"
 msgstr "Unix帐号的UID范围"
 
-#: ../lib/modules/sambaAccount.inc:384
-#: ../lib/modules/sambaSamAccount.inc:236
+#: ../lib/modules/sambaAccount.inc:386
+#: ../lib/modules/sambaSamAccount.inc:238
 msgid "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced with user and group name."
 msgstr "用户主目录(\\\\server\\share).$user和$group会使用用户和组名来替代."
 
-#: ../templates/selfService/selfServiceMain.php:135
+#: ../templates/selfService/selfServiceMain.php:136
 msgid "Unable to change your account. Maybe you do not have enough rights to change the settings."
 msgstr "无法改变您的帐号,可以没有足够的权限改变设置."
 
-#: ../templates/tests/lamdaemonTest.php:223
+#: ../templates/tests/lamdaemonTest.php:284
 #: ../lib/lamdaemon.inc:134
 #: ../lib/lamdaemon.inc:139
 msgid "Unable to connect to remote server!"
@@ -5771,13 +5832,13 @@ msgstr "无法删除PDF结构!"
 msgid "Unable to delete profile!"
 msgstr "无法删除配置文件!"
 
-#: ../lib/modules/posixAccount.inc:1370
-#: ../lib/modules/posixAccount.inc:1592
+#: ../lib/modules/posixAccount.inc:1395
+#: ../lib/modules/posixAccount.inc:1630
 msgid "Unable to find group in LDAP."
 msgstr "LDAP中找不到组."
 
-#: ../lib/modules.inc:1294
-#: ../lib/modules.inc:1298
+#: ../lib/modules.inc:1440
+#: ../lib/modules.inc:1444
 msgid "Unable to load LDAP entry:"
 msgstr "无法调入LDAP条目:"
 
@@ -5805,24 +5866,24 @@ msgstr "无法获取schema!"
 msgid "Unable to save profile!"
 msgstr "无法存储配置文件!"
 
-#: ../templates/lists/changePassword.php:316
+#: ../templates/lists/changePassword.php:322
 msgid "Unable to send mail!"
 msgstr "无法发送邮件!"
 
-#: ../lib/modules/posixGroup.inc:290
-#: ../lib/modules/posixAccount.inc:120
+#: ../lib/modules/posixGroup.inc:298
+#: ../lib/modules/posixAccount.inc:122
 msgid "Unix"
 msgstr "unix"
 
-#: ../templates/tests/lamdaemonTest.php:164
+#: ../templates/tests/lamdaemonTest.php:225
 msgid "Unix account"
 msgstr "Unix帐号"
 
 #: ../lib/modules/inetOrgPerson.inc:71
-#: ../lib/modules/inetOrgPerson.inc:310
-#: ../lib/modules/inetOrgPerson.inc:412
-#: ../lib/modules/inetOrgPerson.inc:803
-#: ../lib/modules/inetOrgPerson.inc:939
+#: ../lib/modules/inetOrgPerson.inc:348
+#: ../lib/modules/inetOrgPerson.inc:454
+#: ../lib/modules/inetOrgPerson.inc:902
+#: ../lib/modules/inetOrgPerson.inc:1044
 msgid "Unix workstations"
 msgstr "unix工作站"
 
@@ -5831,12 +5892,12 @@ msgstr "unix工作站"
 msgid "Unix workstations are invalid!"
 msgstr "unix工作站无效!"
 
-#: ../templates/tests/lamdaemonTest.php:98
+#: ../templates/tests/lamdaemonTest.php:162
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../lib/modules/posixGroup.inc:179
-#: ../lib/modules/posixAccount.inc:1010
+#: ../lib/modules/posixGroup.inc:181
+#: ../lib/modules/posixAccount.inc:1035
 msgid "Unlock password"
 msgstr "解除密码锁定"
 
@@ -5844,7 +5905,7 @@ msgstr "解除密码锁定"
 msgid "Unsolved dependency:"
 msgstr "未解决的依赖性问题:"
 
-#: ../templates/pdfedit/pdfpage.php:470
+#: ../templates/pdfedit/pdfpage.php:415
 msgid "Up"
 msgstr "向上"
 
@@ -5865,43 +5926,38 @@ msgstr "因为在%s模块中有错,上传停止."
 msgid "Usage"
 msgstr "用法"
 
-#: ../lib/modules/sambaAccount.inc:122
-#: ../lib/modules/sambaAccount.inc:233
-#: ../lib/modules/sambaAccount.inc:351
-#: ../lib/modules/sambaAccount.inc:354
-#: ../lib/modules/sambaAccount.inc:750
-#: ../lib/modules/sambaSamAccount.inc:200
-#: ../lib/modules/sambaSamAccount.inc:203
-#: ../lib/modules/sambaSamAccount.inc:349
-#: ../lib/modules/sambaSamAccount.inc:972
-#: ../lib/modules/sambaSamAccount.inc:1441
+#: ../lib/modules/sambaAccount.inc:124
+#: ../lib/modules/sambaAccount.inc:235
+#: ../lib/modules/sambaAccount.inc:353
+#: ../lib/modules/sambaAccount.inc:356
+#: ../lib/modules/sambaAccount.inc:752
+#: ../lib/modules/sambaSamAccount.inc:202
+#: ../lib/modules/sambaSamAccount.inc:205
+#: ../lib/modules/sambaSamAccount.inc:351
+#: ../lib/modules/sambaSamAccount.inc:958
+#: ../lib/modules/sambaSamAccount.inc:1427
 msgid "Use Unix password"
 msgstr "使用unix的密码"
 
-#: ../templates/pdfedit/pdfpage.php:428
-#: ../templates/pdfedit/pdfpage.php:441
-msgid "Use default"
-msgstr "使用缺省值"
-
-#: ../lib/modules/sambaAccount.inc:128
-#: ../lib/modules/sambaAccount.inc:241
-#: ../lib/modules/sambaAccount.inc:357
-#: ../lib/modules/sambaAccount.inc:360
-#: ../lib/modules/sambaAccount.inc:754
-#: ../lib/modules/sambaSamAccount.inc:206
-#: ../lib/modules/sambaSamAccount.inc:209
-#: ../lib/modules/sambaSamAccount.inc:357
-#: ../lib/modules/sambaSamAccount.inc:977
-#: ../lib/modules/sambaSamAccount.inc:1447
+#: ../lib/modules/sambaAccount.inc:130
+#: ../lib/modules/sambaAccount.inc:243
+#: ../lib/modules/sambaAccount.inc:359
+#: ../lib/modules/sambaAccount.inc:362
+#: ../lib/modules/sambaAccount.inc:756
+#: ../lib/modules/sambaSamAccount.inc:208
+#: ../lib/modules/sambaSamAccount.inc:211
+#: ../lib/modules/sambaSamAccount.inc:359
+#: ../lib/modules/sambaSamAccount.inc:963
+#: ../lib/modules/sambaSamAccount.inc:1433
 msgid "Use no password"
 msgstr "无需密码"
 
-#: ../lib/modules/quota.inc:94
-#: ../lib/modules/quota.inc:355
+#: ../lib/modules/quota.inc:96
+#: ../lib/modules/quota.inc:357
 msgid "Used blocks"
 msgstr "已使用的块数"
 
-#: ../lib/modules/quota.inc:95
+#: ../lib/modules/quota.inc:97
 msgid "Used blocks. 1000 blocks are usually 1MB"
 msgstr "已经使用的块数,1000块约等于1MB"
 
@@ -5913,16 +5969,16 @@ msgstr "被属性使用"
 msgid "Used by object classes"
 msgstr "被对象类使用"
 
-#: ../lib/modules/sambaDomain.inc:89
+#: ../lib/modules/sambaDomain.inc:91
 msgid "Used for calculating RIDs from UID/GID. Do not change if unsure."
 msgstr "用来从UID/GID计算RID,不确定的话请不用修改."
 
-#: ../lib/modules/quota.inc:116
-#: ../lib/modules/quota.inc:359
+#: ../lib/modules/quota.inc:118
+#: ../lib/modules/quota.inc:361
 msgid "Used inodes"
 msgstr "已经使用的节点"
 
-#: ../lib/modules/quota.inc:117
+#: ../lib/modules/quota.inc:119
 msgid "Used inodes (files)"
 msgstr "已经使用的节点(文件)"
 
@@ -5938,25 +5994,25 @@ msgstr "用户ID"
 msgid "User accounts (e.g. Unix, Samba and Kolab)"
 msgstr "用户帐号(例如 Unix, Samba和Kolab)"
 
-#: ../lib/modules/sambaAccount.inc:265
-#: ../lib/modules/sambaAccount.inc:375
-#: ../lib/modules/sambaAccount.inc:766
-#: ../lib/modules/sambaSamAccount.inc:227
-#: ../lib/modules/sambaSamAccount.inc:381
-#: ../lib/modules/sambaSamAccount.inc:1008
-#: ../lib/modules/sambaSamAccount.inc:1265
+#: ../lib/modules/sambaAccount.inc:267
+#: ../lib/modules/sambaAccount.inc:377
+#: ../lib/modules/sambaAccount.inc:768
+#: ../lib/modules/sambaSamAccount.inc:229
+#: ../lib/modules/sambaSamAccount.inc:383
+#: ../lib/modules/sambaSamAccount.inc:994
+#: ../lib/modules/sambaSamAccount.inc:1251
 msgid "User can change password"
 msgstr "用户可以修改密码"
 
-#: ../lib/modules/posixAccount.inc:367
+#: ../lib/modules/posixAccount.inc:377
 msgid "User description. If left empty first and last name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名."
 
-#: ../lib/modules/inetOrgPerson.inc:349
+#: ../lib/modules/inetOrgPerson.inc:391
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "用户描述,如果留空将会使用用户姓名"
 
-#: ../lib/modules/account.inc:97
+#: ../lib/modules/account.inc:99
 msgid "User description. If left empty user name will be used."
 msgstr "用户的描述,如果留空将会使用用户名."
 
@@ -5964,38 +6020,38 @@ msgstr "用户的描述,如果留空将会使用用户名."
 msgid "User modification"
 msgstr "用户修改"
 
-#: ../lib/modules/sambaAccount.inc:272
-#: ../lib/modules/sambaAccount.inc:377
-#: ../lib/modules/sambaAccount.inc:774
-#: ../lib/modules/sambaSamAccount.inc:229
-#: ../lib/modules/sambaSamAccount.inc:388
-#: ../lib/modules/sambaSamAccount.inc:1025
-#: ../lib/modules/sambaSamAccount.inc:1270
+#: ../lib/modules/sambaAccount.inc:274
+#: ../lib/modules/sambaAccount.inc:379
+#: ../lib/modules/sambaAccount.inc:776
+#: ../lib/modules/sambaSamAccount.inc:231
+#: ../lib/modules/sambaSamAccount.inc:390
+#: ../lib/modules/sambaSamAccount.inc:1011
+#: ../lib/modules/sambaSamAccount.inc:1256
 msgid "User must change password"
 msgstr "用户必须修改密码"
 
 #: ../templates/lists/changePassword.php:130
-#: ../templates/login.php:236
+#: ../templates/login.php:248
 #: ../lib/types/user.inc:85
-#: ../lib/modules/account.inc:92
-#: ../lib/modules/account.inc:113
-#: ../lib/modules/account.inc:133
+#: ../lib/modules/account.inc:94
+#: ../lib/modules/account.inc:115
 #: ../lib/modules/account.inc:135
-#: ../lib/modules/account.inc:136
-#: ../lib/modules/account.inc:218
-#: ../lib/modules/account.inc:239
+#: ../lib/modules/account.inc:137
+#: ../lib/modules/account.inc:138
+#: ../lib/modules/account.inc:220
+#: ../lib/modules/account.inc:241
 #: ../lib/modules/posixAccount.inc:76
 #: ../lib/modules/posixAccount.inc:77
 #: ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:191
-#: ../lib/modules/posixAccount.inc:362
-#: ../lib/modules/posixAccount.inc:937
-#: ../lib/modules/posixAccount.inc:1189
+#: ../lib/modules/posixAccount.inc:197
+#: ../lib/modules/posixAccount.inc:372
+#: ../lib/modules/posixAccount.inc:962
+#: ../lib/modules/posixAccount.inc:1214
 #: ../lib/modules/inetOrgPerson.inc:99
-#: ../lib/modules/inetOrgPerson.inc:297
-#: ../lib/modules/inetOrgPerson.inc:408
-#: ../lib/modules/inetOrgPerson.inc:642
-#: ../lib/modules/inetOrgPerson.inc:957
+#: ../lib/modules/inetOrgPerson.inc:335
+#: ../lib/modules/inetOrgPerson.inc:450
+#: ../lib/modules/inetOrgPerson.inc:710
+#: ../lib/modules/inetOrgPerson.inc:1062
 msgid "User name"
 msgstr "用户名"
 
@@ -6004,9 +6060,9 @@ msgstr "用户名"
 msgid "User name already exists!"
 msgstr "用户名已经存在!"
 
-#: ../lib/modules/account.inc:133
-#: ../lib/modules/account.inc:134
+#: ../lib/modules/account.inc:135
 #: ../lib/modules/account.inc:136
+#: ../lib/modules/account.inc:138
 #: ../lib/modules/posixAccount.inc:77
 #: ../lib/modules/posixAccount.inc:82
 #: ../lib/modules/inetOrgPerson.inc:99
@@ -6018,9 +6074,9 @@ msgstr "用户名包含非法字符,只能使用a-z,A-Z,0-9,和 .-_!"
 msgid "User name in use. Selected next free user name."
 msgstr "用户名存在,请选择其他的用户名."
 
-#: ../lib/modules/account.inc:93
-#: ../lib/modules/posixAccount.inc:363
-#: ../lib/modules/inetOrgPerson.inc:409
+#: ../lib/modules/account.inc:95
+#: ../lib/modules/posixAccount.inc:373
+#: ../lib/modules/inetOrgPerson.inc:451
 msgid "User name of the user who should be created. Valid characters are: a-z,A-Z,0-9, .-_. LAM does not allow a number as first character because useradd also does not allow it. If user name is already used user name will be expanded with a number. The next free number will be used. Warning: Older systems have problems with user names longer than 8 characters. You can not log in to Windows if user name is longer than 16 characters."
 msgstr "将要建立的用户名,合法字符为:a-z,A-Z,,0-9.-_. 系统和useradd命令一样都不允许以数字开头的帐号。如果用户名已经存在,系统会在用户名后面增加一个数字.警告:超过8个字符的帐号在旧的系统中会产生问题,如果超过16个字符,无法登录windows。"
 
@@ -6028,24 +6084,24 @@ msgstr "将要建立的用户名,合法字符为:a-z,A-Z,,0-9.-_. 系统和usera
 #: ../lib/modules/posixAccount.inc:56
 #: ../lib/modules/posixAccount.inc:57
 #: ../lib/modules/posixAccount.inc:60
-#: ../lib/modules/posixAccount.inc:158
+#: ../lib/modules/posixAccount.inc:157
 msgid "Users"
 msgstr "用户"
 
-#: ../lib/modules/posixGroup.inc:387
+#: ../lib/modules/posixGroup.inc:395
 msgid "Users who are member of the current group. Users who have set their primary group to this group will not be shown."
 msgstr "当前组成员,这里不会显示将此组设为主要组的用户"
 
-#: ../lib/modules/posixGroup.inc:391
+#: ../lib/modules/posixGroup.inc:399
 msgid "Users who will become member of the current group. User names are separated by semicolons."
 msgstr "属于当前组的用户,以分号隔开."
 
-#: ../templates/tests/lamdaemonTest.php:156
+#: ../templates/tests/lamdaemonTest.php:217
 #, php-format
 msgid "Using %s as lamdaemon remote server."
 msgstr "使用%s做为lamdeamon的远程服务器."
 
-#: ../templates/tests/lamdaemonTest.php:177
+#: ../templates/tests/lamdaemonTest.php:238
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "使用%s连接远程服务器."
@@ -6054,25 +6110,29 @@ msgstr "使用%s连接远程服务器."
 msgid "Using template:"
 msgstr "使用模板:"
 
+#: ../lib/modules/posixAccount.inc:332
+msgid "Usually, users are not added to groups as memberUid if they have this group as primary group. If your application ignores primary groups then you can select this option to override this behaviour."
+msgstr "通常,用户不作为memberUid加入主组.如果你的应用程序不支持主组,你可以选择此项修改原来的选项."
+
 #: ../help/help.inc:88
 msgid "Valid users"
 msgstr "合法用户"
 
-#: ../templates/login.php:195
+#: ../templates/login.php:207
 msgid "Want more features? Get LAM Pro!"
 msgstr "需要更多的功能吗? 参见系统专业版! "
 
-#: ../templates/config/mainmanage.php:208
+#: ../templates/config/mainmanage.php:256
 msgid "Warning"
 msgstr "警告"
 
 #: ../templates/delete.php:204
-#: ../lib/modules.inc:1559
+#: ../lib/modules.inc:1705
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "无法为DN: %s增加属性."
 
-#: ../lib/modules.inc:1530
+#: ../lib/modules.inc:1676
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "无法创建DN: %s."
@@ -6088,32 +6148,35 @@ msgstr "无法删除DN: %s."
 #: ../templates/tree/add_oclass.php:93
 #: ../templates/tree/add_oclass_form.php:162
 #: ../templates/delete.php:196
-#: ../lib/modules.inc:1547
+#: ../lib/modules.inc:1693
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "无法修改DN: %s的属性"
 
-#: ../templates/lists/changePassword.php:346
+#: ../templates/lists/changePassword.php:352
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "无法修改DN: %s的属性"
 
 #: ../templates/delete.php:212
-#: ../lib/modules.inc:1571
+#: ../lib/modules/phpGroupwareGroup.inc:173
+#: ../lib/modules/phpGroupwareUser.inc:333
+#: ../lib/modules/phpGroupwareUser.inc:353
+#: ../lib/modules.inc:1717
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "无法删除DN: %s的属性."
 
-#: ../lib/modules.inc:1517
+#: ../lib/modules.inc:1663
 #, php-format
 msgid "Was unable to rename DN: %s."
 msgstr "无法重命名DN: %s."
 
-#: ../lib/modules/sambaSamAccount.inc:1202
+#: ../lib/modules/sambaSamAccount.inc:1188
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../lib/modules/sambaSamAccount.inc:488
+#: ../lib/modules/sambaSamAccount.inc:490
 msgid "Western Europe Time, London, Lisbon"
 msgstr "西欧时间,伦敦,里斯本"
 
@@ -6121,65 +6184,58 @@ msgstr "西欧时间,伦敦,里斯本"
 msgid "When using ldaps:// be sure to use exactly the same IP/domain name as in your certificate!"
 msgstr "当使用ldaps://时必须使用和您的证书相同的ip/domain!"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:73
-#: ../lib/modules/neofonieInetOrgPerson.inc:119
-#: ../lib/modules/neofonieInetOrgPerson.inc:219
-#: ../lib/modules/neofonieInetOrgPerson.inc:596
-msgid "Wiki name"
-msgstr "wiki名"
-
-#: ../lib/modules/sambaAccount.inc:408
-#: ../lib/modules/sambaSamAccount.inc:267
+#: ../lib/modules/sambaAccount.inc:410
+#: ../lib/modules/sambaSamAccount.inc:269
 msgid "Windows domain name of account."
 msgstr "帐号所属的windows域"
 
-#: ../lib/modules/sambaAccount.inc:309
-#: ../lib/modules/sambaAccount.inc:818
-#: ../lib/modules/sambaSamAccount.inc:432
-#: ../lib/modules/sambaSamAccount.inc:1102
-#: ../lib/modules/sambaSamAccount.inc:1524
-#: ../lib/modules/sambaSamAccount.inc:1672
+#: ../lib/modules/sambaAccount.inc:311
+#: ../lib/modules/sambaAccount.inc:820
+#: ../lib/modules/sambaSamAccount.inc:434
+#: ../lib/modules/sambaSamAccount.inc:1088
+#: ../lib/modules/sambaSamAccount.inc:1510
+#: ../lib/modules/sambaSamAccount.inc:1658
 #: ../lib/modules/sambaGroupMapping.inc:217
-#: ../lib/modules/sambaGroupMapping.inc:344
+#: ../lib/modules/sambaGroupMapping.inc:346
 msgid "Windows group"
 msgstr "Windows组"
 
-#: ../lib/modules/sambaAccount.inc:401
+#: ../lib/modules/sambaAccount.inc:403
 msgid "Windows group RID"
 msgstr "Windows组的RID"
 
-#: ../lib/modules/sambaAccount.inc:398
-#: ../lib/modules/sambaGroupMapping.inc:316
+#: ../lib/modules/sambaAccount.inc:400
+#: ../lib/modules/sambaGroupMapping.inc:318
 msgid "Windows group name"
 msgstr "Windows组名"
 
-#: ../lib/modules/sambaGroupMapping.inc:329
+#: ../lib/modules/sambaGroupMapping.inc:331
 msgid "Windows group type."
 msgstr "Windows组类型"
 
-#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/sambaSamAccount.inc:252
 msgid "Windows primary group"
 msgstr "Windows主组"
 
-#: ../lib/modules/sambaSamAccount.inc:253
+#: ../lib/modules/sambaSamAccount.inc:255
 msgid "Windows primary group SID"
 msgstr "Windows主组的SID"
 
-#: ../lib/modules/sambaGroupMapping.inc:325
+#: ../lib/modules/sambaGroupMapping.inc:327
 msgid "Windows-Domain name of group."
 msgstr "组的windows域名."
 
-#: ../lib/modules/sambaDomain.inc:137
+#: ../lib/modules/sambaDomain.inc:139
 msgid "Workgroup"
 msgstr "工作组"
 
-#: ../lib/modules/sambaSamAccount.inc:296
-#: ../lib/modules/sambaSamAccount.inc:1354
-#: ../lib/modules/sambaSamAccount.inc:1692
+#: ../lib/modules/sambaSamAccount.inc:298
+#: ../lib/modules/sambaSamAccount.inc:1340
+#: ../lib/modules/sambaSamAccount.inc:1678
 msgid "Working directory"
 msgstr "工作目录"
 
-#: ../lib/modules/sambaSamAccount.inc:297
+#: ../lib/modules/sambaSamAccount.inc:299
 msgid "Working directory of initial program."
 msgstr "初始化程序的工作目录。"
 
@@ -6192,7 +6248,7 @@ msgstr "写入"
 msgid "Write access"
 msgstr "写权限"
 
-#: ../templates/login.php:429
+#: ../templates/login.php:440
 #: ../templates/selfService/selfServiceLogin.php:89
 #: ../templates/selfService/selfServiceLogin.php:101
 msgid "Wrong password/user name combination. Please try again."
@@ -6205,17 +6261,17 @@ msgstr "错误的密码和用户组合,请重试!"
 msgid "Yes"
 msgstr "是"
 
-#: ../lib/modules/posixGroup.inc:470
+#: ../lib/modules/posixGroup.inc:478
 msgid "You are using a capital letters. This can cause problems because Windows isn't case-sensitive."
 msgstr "您使用了大写字符,这会造成一些问题,因为windows大小写不敏感."
 
-#: ../lib/modules/account.inc:135
+#: ../lib/modules/account.inc:137
 #: ../lib/modules/posixAccount.inc:76
 #: ../lib/modules/posixAccount.inc:78
 msgid "You are using a capital letters. This can cause problems because windows isn't case-sensitive."
 msgstr "您使用了大写字符,这会造成一些问题,因为windows大小写不敏感."
 
-#: ../help/help.inc:179
+#: ../help/help.inc:181
 msgid "You can use wildcards for LDAP attributes in the form @@attribute@@ (e.g. @@uid@@ for the user name)."
 msgstr "您可以用@@attribute@@的通配符形式代表LDAP属性（比如@@uid@@代表用户名）。"
 
@@ -6231,7 +6287,7 @@ msgstr "您无权访问或LDAP架构未发布到LDAP服务器。"
 msgid "You have been logged off from LDAP Account Manager."
 msgstr "您已经从系统退出"
 
-#: ../templates/lists/changePassword.php:277
+#: ../templates/lists/changePassword.php:283
 msgid "You have to activate the \"I am sure\" checkbox."
 msgstr "您必须激活\"我确认\"选项。"
 
@@ -6248,12 +6304,12 @@ msgstr "%s是必填项目."
 msgid "You made no changes."
 msgstr "您没有做任何修改."
 
-#: ../lib/modules/groupOfNames.inc:119
-#: ../lib/modules/groupOfNames.inc:120
+#: ../lib/modules/groupOfNames.inc:121
+#: ../lib/modules/groupOfNames.inc:122
 msgid "You need to add at least one member to this group."
 msgstr "您至少需要为这个组增加一个成员."
 
-#: ../templates/tests/lamdaemonTest.php:181
+#: ../templates/tests/lamdaemonTest.php:242
 #, php-format
 msgid "Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"
 msgstr "系统管理者(%s)必须有一个合法的UNIX帐号才能运行lamdaemon !"
@@ -6271,37 +6327,46 @@ msgstr "PHP设置已经关闭了文件上传,请检查PHP.INI ."
 msgid "Your session expired, click here to go back to the login page."
 msgstr "超时,请点此外返回到登录界面."
 
-#: ../templates/login.php:216
+#: ../templates/login.php:228
 msgid "Your session expired, please log in again."
 msgstr "超时,请重新登录."
 
-#: ../templates/config/mainmanage.php:132
+#: ../templates/config/mainmanage.php:139
 #: ../templates/selfService/adminMain.php:113
 #: ../lib/config.inc:389
 msgid "Your settings were successfully saved."
 msgstr "设置保存成功."
 
+#: ../lib/modules/inetOrgPerson.inc:319
+msgid "YourCompany, Human Resources"
+msgstr "某某公司,人力资源部"
+
 #: ../templates/tree/update_confirm.php:192
 #: ../templates/tree/update_confirm.php:204
 msgid "[attribute deleted]"
 msgstr "[删除属性]"
 
-#: ../lib/modules/sambaAccount.inc:287
-#: ../lib/modules/sambaSamAccount.inc:410
+#: ../lib/modules/sambaAccount.inc:289
+#: ../lib/modules/sambaSamAccount.inc:412
 msgid "\\\\server\\homes\\smiller"
 msgstr "\\\\server\\homes\\smiller"
 
-#: ../lib/modules/sambaAccount.inc:293
-#: ../lib/modules/sambaSamAccount.inc:416
+#: ../lib/modules/sambaAccount.inc:295
+#: ../lib/modules/sambaSamAccount.inc:418
 msgid "\\\\server\\profiles\\smiller"
 msgstr "\\\\server\\profiles\\smiller"
 
+#: ../lib/modules/phpGroupwareUser.inc:151
+#: ../lib/modules/phpGroupwareUser.inc:368
+msgid "active"
+msgstr "激活"
+
 #: ../templates/tree/edit.php:494
 msgid "add value"
 msgstr "增加值"
 
-#: ../lib/modules/posixGroup.inc:342
-#: ../lib/modules/groupOfNames.inc:84
+#: ../lib/modules/posixGroup.inc:350
+#: ../lib/modules/groupOfNames.inc:86
 msgid "adminstrators"
 msgstr "管理员"
 
@@ -6321,13 +6386,13 @@ msgstr "dc=yourcompany,dc=com"
 msgid "delete attribute"
 msgstr "删除属性"
 
-#: ../lib/modules/sambaSamAccount.inc:1389
-#: ../lib/modules/sambaSamAccount.inc:1712
+#: ../lib/modules/sambaSamAccount.inc:1375
+#: ../lib/modules/sambaSamAccount.inc:1698
 msgid "disabled"
 msgstr "关闭"
 
-#: ../lib/modules/sambaSamAccount.inc:1401
-#: ../lib/modules/sambaSamAccount.inc:1723
+#: ../lib/modules/sambaSamAccount.inc:1387
+#: ../lib/modules/sambaSamAccount.inc:1709
 msgid "disconnect"
 msgstr "中断连接"
 
@@ -6346,13 +6411,13 @@ msgstr "下载值"
 
 #: ../templates/lists/changePassword.php:148
 #: ../lib/modules/inetOrgPerson.inc:85
-#: ../lib/modules/inetOrgPerson.inc:149
-#: ../lib/modules/inetOrgPerson.inc:273
-#: ../lib/modules/inetOrgPerson.inc:400
-#: ../lib/modules/inetOrgPerson.inc:401
-#: ../lib/modules/inetOrgPerson.inc:769
-#: ../lib/modules/inetOrgPerson.inc:953
-#: ../lib/modules/inetOrgPerson.inc:1232
+#: ../lib/modules/inetOrgPerson.inc:152
+#: ../lib/modules/inetOrgPerson.inc:287
+#: ../lib/modules/inetOrgPerson.inc:442
+#: ../lib/modules/inetOrgPerson.inc:443
+#: ../lib/modules/inetOrgPerson.inc:861
+#: ../lib/modules/inetOrgPerson.inc:1058
+#: ../lib/modules/inetOrgPerson.inc:1357
 msgid "eMail address"
 msgstr "电子邮件地址"
 
@@ -6360,42 +6425,47 @@ msgstr "电子邮件地址"
 msgid "false"
 msgstr "失败"
 
-#: ../lib/modules/sambaSamAccount.inc:1410
-#: ../lib/modules/sambaSamAccount.inc:1731
+#: ../lib/modules/sambaSamAccount.inc:1396
+#: ../lib/modules/sambaSamAccount.inc:1717
 msgid "from any client"
 msgstr "从任何客户端"
 
-#: ../lib/modules/sambaSamAccount.inc:1411
-#: ../lib/modules/sambaSamAccount.inc:1732
+#: ../lib/modules/sambaSamAccount.inc:1397
+#: ../lib/modules/sambaSamAccount.inc:1718
 msgid "from previous client only"
 msgstr "仅从以前的客户端"
 
-#: ../lib/modules/posixAccount.inc:220
+#: ../lib/modules/posixAccount.inc:226
 msgid "group01,group02"
 msgstr "group01,group02"
 
-#: ../lib/modules/quota.inc:178
 #: ../lib/modules/quota.inc:180
+#: ../lib/modules/quota.inc:182
 msgid "hours"
 msgstr "小时"
 
-#: ../lib/modules/sambaSamAccount.inc:1393
-#: ../lib/modules/sambaSamAccount.inc:1716
+#: ../lib/modules/phpGroupwareUser.inc:151
+#: ../lib/modules/phpGroupwareUser.inc:371
+msgid "inactive"
+msgstr "停用"
+
+#: ../lib/modules/sambaSamAccount.inc:1379
+#: ../lib/modules/sambaSamAccount.inc:1702
 msgid "input off, notify off"
 msgstr "输入关，提醒关"
 
-#: ../lib/modules/sambaSamAccount.inc:1392
-#: ../lib/modules/sambaSamAccount.inc:1715
+#: ../lib/modules/sambaSamAccount.inc:1378
+#: ../lib/modules/sambaSamAccount.inc:1701
 msgid "input off, notify on"
 msgstr "输入关，提醒开"
 
-#: ../lib/modules/sambaSamAccount.inc:1391
-#: ../lib/modules/sambaSamAccount.inc:1714
+#: ../lib/modules/sambaSamAccount.inc:1377
+#: ../lib/modules/sambaSamAccount.inc:1700
 msgid "input on, notify off"
 msgstr "输入开，提醒关"
 
-#: ../lib/modules/sambaSamAccount.inc:1390
-#: ../lib/modules/sambaSamAccount.inc:1713
+#: ../lib/modules/sambaSamAccount.inc:1376
+#: ../lib/modules/sambaSamAccount.inc:1699
 msgid "input on, notify on"
 msgstr "输入开，提醒开"
 
@@ -6411,30 +6481,30 @@ msgstr "ldap://localhost:389 表示使用标准的LDAP连接端口389连接到lo
 msgid "ldaps://141.40.146.133 connects to 141.40.146.133 using an encrypted LDAP connection."
 msgstr "ldaps://141.40.146.133 表示 使用加密的LDAP连接到141.40.146.133"
 
-#: ../lib/modules/posixAccount.inc:287
+#: ../lib/modules/posixAccount.inc:293
 msgid "machines"
 msgstr "机器"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:108
+#: ../lib/modules/inetLocalMailRecipient.inc:110
 msgid "mail.yourdomain.org"
 msgstr "mail.yourdomain.org"
 
-#: ../lib/modules/sambaAccount.inc:325
-#: ../lib/modules/sambaAccount.inc:335
-#: ../lib/modules/sambaSamAccount.inc:333
-#: ../lib/modules/sambaSamAccount.inc:459
+#: ../lib/modules/sambaAccount.inc:327
+#: ../lib/modules/sambaAccount.inc:337
+#: ../lib/modules/sambaSamAccount.inc:335
+#: ../lib/modules/sambaSamAccount.inc:461
 msgid "mydomain"
 msgstr "我的域"
 
-#: ../lib/modules/sambaSamAccount.inc:434
+#: ../lib/modules/sambaSamAccount.inc:436
 msgid "mygroup"
 msgstr "我的组"
 
-#: ../lib/modules/sambaSamAccount.inc:1680
-#: ../lib/modules/sambaSamAccount.inc:1688
-#: ../lib/modules/sambaSamAccount.inc:1698
-#: ../lib/modules/sambaSamAccount.inc:1703
-#: ../lib/modules/sambaSamAccount.inc:1708
+#: ../lib/modules/sambaSamAccount.inc:1666
+#: ../lib/modules/sambaSamAccount.inc:1674
+#: ../lib/modules/sambaSamAccount.inc:1684
+#: ../lib/modules/sambaSamAccount.inc:1689
+#: ../lib/modules/sambaSamAccount.inc:1694
 msgid "no"
 msgstr "否"
 
@@ -6474,38 +6544,34 @@ msgstr "ou=People,dc=yourcompany,dc=com 表示将会在此子树下读取和保
 msgid "ou=accounts,dc=yourdomain,dc=org"
 msgstr "ou=accounts,dc=yourdomain,dc=org"
 
-#: ../lib/modules/posixAccount.inc:273
+#: ../lib/modules/posixAccount.inc:279
 msgid "pc01$"
 msgstr "pc01$"
 
-#: ../lib/modules/posixAccount.inc:294
+#: ../lib/modules/posixAccount.inc:300
 msgid "pc01,Room 2.34"
 msgstr "pc01,Room 2.34"
 
-#: ../lib/modules/inetOrgPerson.inc:312
+#: ../lib/modules/inetOrgPerson.inc:350
 msgid "pc01,pc02"
 msgstr "pc01,pc02"
 
 #: ../templates/tree/edit.php:246
 #: ../templates/config/confmain.php:466
 #: ../templates/selfService/adminMain.php:554
-#: ../lib/modules.inc:992
+#: ../lib/modules.inc:1134
 msgid "required"
 msgstr "必选项"
 
-#: ../templates/config/confmain.php:467
-msgid "required for Samba 3 accounts"
-msgstr "Samba3帐号的必选项"
-
-#: ../lib/modules/sambaSamAccount.inc:1402
-#: ../lib/modules/sambaSamAccount.inc:1724
+#: ../lib/modules/sambaSamAccount.inc:1388
+#: ../lib/modules/sambaSamAccount.inc:1710
 msgid "reset"
 msgstr "复位"
 
-#: ../lib/modules/posixGroup.inc:368
-#: ../lib/modules/sambaAccount.inc:229
-#: ../lib/modules/sambaSamAccount.inc:345
-#: ../lib/modules/posixAccount.inc:248
+#: ../lib/modules/posixGroup.inc:376
+#: ../lib/modules/sambaAccount.inc:231
+#: ../lib/modules/sambaSamAccount.inc:347
+#: ../lib/modules/posixAccount.inc:254
 msgid "secret"
 msgstr "secret"
 
@@ -6513,21 +6579,21 @@ msgstr "secret"
 msgid "send via mail"
 msgstr "通过邮件发送"
 
-#: ../lib/modules/posixAccount.inc:193
-#: ../lib/modules/inetOrgPerson.inc:299
-#: ../lib/modules/nisMailAlias.inc:89
+#: ../lib/modules/posixAccount.inc:199
+#: ../lib/modules/inetOrgPerson.inc:337
+#: ../lib/modules/nisMailAlias.inc:91
 msgid "smiller"
 msgstr "smiller"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:96
+#: ../lib/modules/inetLocalMailRecipient.inc:98
 msgid "smiller@otherdomain.org"
 msgstr "smiller@otherdomain.org"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:102
+#: ../lib/modules/inetLocalMailRecipient.inc:104
 msgid "smiller@yourdomain.org"
 msgstr "smiller@yourdomain.org"
 
-#: ../lib/modules/ldapPublicKey.inc:74
+#: ../lib/modules/ldapPublicKey.inc:76
 msgid "ssh-dss 234234 user@host"
 msgstr "ssh-dss 234234 user@host"
 
@@ -6539,30 +6605,99 @@ msgstr "结构"
 msgid "true"
 msgstr "true"
 
-#: ../lib/modules/inetOrgPerson.inc:215
+#: ../lib/modules/inetOrgPerson.inc:229
 msgid "uid=smiller,ou=People,dc=company,dc=com"
 msgstr "uid=smiller,ou=People,dc=company,dc=com"
 
-#: ../lib/modules/posixGroup.inc:362
+#: ../lib/modules/posixGroup.inc:370
 msgid "user01,user02,user03"
 msgstr "user01,user02,user03"
 
-#: ../lib/modules/inetOrgPerson.inc:275
+#: ../lib/modules/inetOrgPerson.inc:289
 msgid "user@company.com"
 msgstr "user@company.com"
 
-#: ../lib/modules/posixAccount.inc:213
+#: ../lib/modules/posixAccount.inc:219
 msgid "users"
 msgstr "用户"
 
-#: ../lib/modules/sambaSamAccount.inc:1678
-#: ../lib/modules/sambaSamAccount.inc:1686
-#: ../lib/modules/sambaSamAccount.inc:1696
-#: ../lib/modules/sambaSamAccount.inc:1701
-#: ../lib/modules/sambaSamAccount.inc:1706
+#: ../lib/modules/sambaSamAccount.inc:1664
+#: ../lib/modules/sambaSamAccount.inc:1672
+#: ../lib/modules/sambaSamAccount.inc:1682
+#: ../lib/modules/sambaSamAccount.inc:1687
+#: ../lib/modules/sambaSamAccount.inc:1692
+#: ../lib/modules/inetOrgPerson.inc:313
 msgid "yes"
 msgstr "是"
 
+#~ msgid "AIM account"
+#~ msgstr "AIM帐号"
+#~ msgid "Add Neofonie attributes"
+#~ msgstr "新增Neofonie属性"
+#~ msgid "Add section or static text"
+#~ msgstr "增加节或静态文本"
+#~ msgid "Available PDF fields"
+#~ msgstr "有效的PDF栏目"
+#~ msgid "Birth date"
+#~ msgstr "生日"
+#~ msgid "ComBots IDs"
+#~ msgstr "ComBots ID号"
+#~ msgid "Current projects"
+#~ msgstr "当前工程"
+#~ msgid "Date when the employee was initially employed."
+#~ msgstr "雇员被雇用日期"
+#~ msgid "Department"
+#~ msgstr "部门"
+#~ msgid "Employee skills"
+#~ msgstr "雇员技能"
+#~ msgid "Employment date"
+#~ msgstr "雇用日期"
+#~ msgid "Group 1, Group 2"
+#~ msgstr "组1,组2"
+#~ msgid "IT"
+#~ msgstr "IT"
+#~ msgid "Jabber IDs"
+#~ msgstr "Jabber ID号"
+#~ msgid "Job position"
+#~ msgstr "工作岗位"
+#~ msgid "Job position of this user (e.g. developer, temp, ...)."
+#~ msgstr "用户岗位(比如:开发人员,临时工,...)"
+#~ msgid "List of ComBots IDs."
+#~ msgstr "ComBots ID号列表"
+#~ msgid "List of Jabber IDs."
+#~ msgstr "Jabber ID号列表."
+#~ msgid "List of project groups of this user."
+#~ msgstr "用户工程组列表"
+#~ msgid "List of projects the user is working on."
+#~ msgstr "用户当前工程列表"
+#~ msgid "List of special skills that the user has."
+#~ msgstr "用户技能列表"
+#~ msgid "Page settings"
+#~ msgstr "页面设置"
+#~ msgid "Please enter a valid date (format DD.MM.YYYY)!"
+#~ msgstr "请输入合法的日期,格式为(DD-MM-YYYY)."
+#~ msgid "Project 1, Project 2"
+#~ msgstr "工程1,工程2"
+#~ msgid "Project groups"
+#~ msgstr "工程组"
+#~ msgid "Quake ID"
+#~ msgstr "Quake ID号"
+#~ msgid "The department where the employee is employed."
+#~ msgstr "雇员所在部门"
+#~ msgid "The user's birth date."
+#~ msgstr "用户生日"
+#~ msgid "This is the user's AIM account name"
+#~ msgstr "用户AIM帐号名"
+#~ msgid "This is the user's Quake ID."
+#~ msgstr "这是用的Quake ID."
+#~ msgid "This is the user's login name for the wiki."
+#~ msgstr "这是wiki系统中用户的登录名."
+#~ msgid "Use default"
+#~ msgstr "使用缺省值"
+#~ msgid "Wiki name"
+#~ msgstr "wiki名"
+#~ msgid "required for Samba 3 accounts"
+#~ msgstr "Samba3帐号的必选项"
 #~ msgid "Apply"
 #~ msgstr "应用"
 #~ msgid "Create account"