diff --git a/lam/locale/ja_JP/LC_MESSAGES/messages.mo b/lam/locale/ja_JP/LC_MESSAGES/messages.mo
index ce6ea147..f7b5b579 100644
Binary files a/lam/locale/ja_JP/LC_MESSAGES/messages.mo and b/lam/locale/ja_JP/LC_MESSAGES/messages.mo differ
diff --git a/lam/locale/ja_JP/LC_MESSAGES/messages.po b/lam/locale/ja_JP/LC_MESSAGES/messages.po
index e4ce590a..8214d4d6 100644
--- a/lam/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/lam/locale/ja_JP/LC_MESSAGES/messages.po
@@ -5,17 +5,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: LAM 2.1.0\n"
+"Project-Id-Version: LAM 2.3.0\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de \n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2008-01-18 06:34+0900\n"
+"PO-Revision-Date: 2008-04-18 06:32+0900\n"
 "Last-Translator: Yasuhiro Magara <gama@users.sourceforge.jp>\n"
 "Language-Team: Japanese <gama@users.sourceforge.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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 ""
 "$user と $group はユーザ名またはプライマリグループ名に置き換えられます。"
@@ -30,7 +30,7 @@ msgstr "%s個の別名が見つかりました"
 msgid "%s domain(s) found"
 msgstr "%s個のドメインが見つかりました"
 
-#: ../lib/types/group.inc:120
+#: ../lib/types/gon.inc:110 ../lib/types/group.inc:122
 #, php-format
 msgid "%s group(s) found"
 msgstr "%s個のグループが見つかりました"
@@ -66,27 +66,27 @@ msgstr "(このエントリに対して有効な新しい属性はありませ
 msgid "(no new binary attributes available for this entry)"
 msgstr "(このエントリに対して有効な新しいバイナリ属性はありません)"
 
-#: ../lib/modules/posixAccount.inc:226
+#: ../lib/modules/posixAccount.inc:232
 msgid "/home/smiller"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:251
+#: ../lib/modules/inetOrgPerson.inc:265
 msgid "123-123-1234"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:263
+#: ../lib/modules/inetOrgPerson.inc:277
 msgid "123-123-1235"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:269
+#: ../lib/modules/inetOrgPerson.inc:283
 msgid "123-123-1236"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:257
+#: ../lib/modules/inetOrgPerson.inc:271
 msgid "123-124-1234"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:245
+#: ../lib/modules/inetOrgPerson.inc:259
 msgid "12345"
 msgstr ""
 
@@ -94,7 +94,7 @@ msgstr ""
 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."
@@ -102,16 +102,7 @@ msgstr ""
 "ユーザは自身の代理人を指定できます。この属性はemailの送信に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 ""
 
@@ -119,31 +110,29 @@ 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
+#: ../templates/massBuildAccounts.php:170 ../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 ../lib/modules/quota.inc:52
 #: ../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 ../lib/modules/sambaAccount.inc:71
-#: ../lib/modules/sambaAccount.inc:73 ../lib/modules/sambaAccount.inc:76
-#: ../lib/modules/sambaAccount.inc:77 ../lib/modules/sambaAccount.inc:79
-#: ../lib/modules/sambaAccount.inc:80 ../lib/modules/sambaAccount.inc:81
-#: ../lib/modules/sambaAccount.inc:82 ../lib/modules/sambaAccount.inc:83
-#: ../lib/modules/sambaAccount.inc:84 ../lib/modules/sambaAccount.inc:85
-#: ../lib/modules/sambaAccount.inc:86 ../lib/modules/sambaAccount.inc:87
-#: ../lib/modules/sambaSamAccount.inc:83 ../lib/modules/sambaSamAccount.inc:86
-#: ../lib/modules/sambaSamAccount.inc:89 ../lib/modules/sambaSamAccount.inc:91
-#: ../lib/modules/sambaSamAccount.inc:94 ../lib/modules/sambaSamAccount.inc:95
-#: ../lib/modules/sambaSamAccount.inc:96 ../lib/modules/sambaSamAccount.inc:97
-#: ../lib/modules/sambaSamAccount.inc:99
+#: ../lib/modules/quota.inc:57 ../lib/modules/sambaAccount.inc:63
+#: ../lib/modules/sambaAccount.inc:66 ../lib/modules/sambaAccount.inc:69
+#: ../lib/modules/sambaAccount.inc:71 ../lib/modules/sambaAccount.inc:73
+#: ../lib/modules/sambaAccount.inc:76 ../lib/modules/sambaAccount.inc:77
+#: ../lib/modules/sambaAccount.inc:79 ../lib/modules/sambaAccount.inc:80
+#: ../lib/modules/sambaAccount.inc:81 ../lib/modules/sambaAccount.inc:82
+#: ../lib/modules/sambaAccount.inc:83 ../lib/modules/sambaAccount.inc:84
+#: ../lib/modules/sambaAccount.inc:85 ../lib/modules/sambaAccount.inc:86
+#: ../lib/modules/sambaAccount.inc:87 ../lib/modules/sambaSamAccount.inc:83
+#: ../lib/modules/sambaSamAccount.inc:86 ../lib/modules/sambaSamAccount.inc:89
+#: ../lib/modules/sambaSamAccount.inc:91 ../lib/modules/sambaSamAccount.inc:94
+#: ../lib/modules/sambaSamAccount.inc:95 ../lib/modules/sambaSamAccount.inc:96
+#: ../lib/modules/sambaSamAccount.inc:97 ../lib/modules/sambaSamAccount.inc:99
 #: ../lib/modules/sambaSamAccount.inc:100
 #: ../lib/modules/sambaSamAccount.inc:101
 #: ../lib/modules/sambaSamAccount.inc:102
@@ -160,17 +149,19 @@ msgstr "アカウント"
 #: ../lib/modules/posixAccount.inc:86 ../lib/modules/posixAccount.inc:87
 #: ../lib/modules/posixAccount.inc:89 ../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: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 ../lib/modules/inetOrgPerson.inc:78
 #: ../lib/modules/inetOrgPerson.inc:80 ../lib/modules/inetOrgPerson.inc:82
@@ -181,19 +172,19 @@ msgstr "アカウント"
 #: ../lib/modules/inetOrgPerson.inc:100 ../lib/modules/inetOrgPerson.inc:101
 #: ../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/nisMailAlias.inc:106
+#: ../lib/modules/inetLocalMailRecipient.inc:129
+#: ../lib/modules/nisMailAlias.inc:106 ../lib/modules/nisMailAlias.inc:108
 #, php-format
 msgid "Account %s:"
-msgstr "アカウント %s"
+msgstr "アカウント %s:"
 
 #: ../templates/masscreate.php:86
 msgid "Account creation via file upload"
 msgstr "ファイルアップロードによるアカウント作成"
 
-#: ../lib/modules/posixAccount.inc:382
+#: ../lib/modules/posixAccount.inc:392
 msgid "Account deactivated"
 msgstr "アカウントが無効化されました"
 
@@ -201,37 +192,42 @@ 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 "アカウントが無効です"
 
-#: ../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 "無効なアカウント"
+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 "アカウント一覧 - フィルター"
 
@@ -239,7 +235,18 @@ msgstr "アカウント一覧 - フィルター"
 msgid "Account name:"
 msgstr "アカウント名:"
 
-#: ../templates/pdfedit/pdfdelete.php:87 ../lib/modules/groupOfNames.inc:223
+#: ../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:225
 msgid "Account type"
 msgstr "アカウント種別"
 
@@ -261,33 +268,33 @@ msgstr ""
 "義します。アカウントモジュールは、編集対象となるプロパティ(e.g. 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."
@@ -295,13 +302,13 @@ 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 ""
 "このチェックボックスを有効にした場合、ユーザのホームディレクトリを削除しま"
@@ -316,31 +323,28 @@ msgstr "有効なアカウント種別"
 #: ../templates/tree/add_oclass_form.php:144
 #: ../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/config/conftypes.php:180 ../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 "Samba 3アカウントの追加"
 
-#: ../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
+#: ../templates/selfService/adminMain.php:483 ../help/help.inc:173
 msgid "Add input field"
 msgstr "入力フィールドの追加"
 
@@ -355,32 +359,37 @@ msgstr "新しい属性の追加"
 msgid "Add new binary attribute"
 msgstr "新しいバイナリ属性の追加"
 
-#: ../templates/selfService/adminMain.php:466 ../help/help.inc:169
+#: ../templates/selfService/adminMain.php:466 ../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 "追加のグループ"
 
@@ -388,7 +397,7 @@ 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."
@@ -396,29 +405,29 @@ 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/types/mailAlias.inc:82 ../lib/modules/nisMailAlias.inc:67
+#: ../lib/modules/nisMailAlias.inc:82 ../lib/modules/nisMailAlias.inc:139
+#: ../lib/modules/nisMailAlias.inc:276
 msgid "Alias name"
 msgstr "別名"
 
@@ -431,12 +440,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 "後に続く全ての行はメール本文になります。"
 
@@ -445,29 +454,29 @@ 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 ../lib/types/user.inc:86
+#: ../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 ""
 
@@ -484,7 +493,8 @@ 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 "誰か"
 
@@ -492,7 +502,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 ""
 
@@ -504,19 +514,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 "有効なグループ"
 
@@ -524,27 +530,27 @@ 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
+#: ../templates/tree/update_confirm.php:255 ../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/index.php:114 ../templates/config/confmain.php:605
 #: ../templates/config/conflogin.php:153 ../templates/config/mainlogin.php:138
 #: ../templates/selfService/adminLogin.php:150
 #: ../templates/selfService/adminMain.php:114 ../templates/logout.php:78
@@ -556,11 +562,11 @@ msgid "Back to OU-Editor"
 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 "アカウント一覧に戻る"
 
@@ -572,8 +578,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 "ログインに戻る"
 
@@ -588,11 +594,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 ""
 
@@ -608,11 +614,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 "Beijing(北京), Perth, Singapore"
 
@@ -620,14 +626,6 @@ msgstr "Beijing(北京), Perth, Singapore"
 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 "ブロック・ハードクオータ"
@@ -660,7 +658,7 @@ msgstr ""
 "ブロック・ソフトクオータはブロック・ハードクオータより小さくなくてはなりませ"
 "ん。"
 
-#: ../lib/modules/sambaSamAccount.inc:485
+#: ../lib/modules/sambaSamAccount.inc:487
 msgid "Brazil, Buenos Aires"
 msgstr ""
 
@@ -668,13 +666,13 @@ msgstr ""
 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:107 ../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サービス, マネージャー, ...)"
 
@@ -686,19 +684,19 @@ 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 "省略可"
 
@@ -707,30 +705,30 @@ msgstr "省略可"
 #: ../templates/ou_edit.php:110 ../templates/config/confmodules.php:116
 #: ../templates/config/confmain.php:457 ../templates/config/conftypes.php:239
 #: ../templates/selfService/adminMain.php:547
-#: ../templates/pdfedit/pdfdelete.php:97 ../templates/pdfedit/pdfpage.php:778
+#: ../templates/pdfedit/pdfdelete.php:97 ../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/lists.inc:669
+#: ../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:392 ../lib/config.inc:1016
 msgid "Cannot open config file!"
 msgstr "configファイルをオープンできません!"
 
@@ -738,34 +736,34 @@ msgstr "configファイルをオープンできません!"
 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番号を変更"
 
@@ -777,15 +775,15 @@ msgstr "デフォルト・プロファイルの変更"
 msgid "Change list settings"
 msgstr "リスト設定の変更"
 
-#: ../templates/config/mainmanage.php:290 ../help/help.inc:123
+#: ../templates/config/mainmanage.php:338 ../help/help.inc:123
 msgid "Change master password"
 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 ../help/help.inc:99
+#: ../templates/lists/changePassword.php:212 ../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 "パスワードの変更"
 
@@ -793,7 +791,7 @@ msgstr "パスワードの変更"
 msgid "Change passwords"
 msgstr "パスワードの変更"
 
-#: ../templates/login.php:344
+#: ../templates/login.php:356
 msgid "Change profile"
 msgstr "プロファイルの変更"
 
@@ -805,7 +803,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文字だけが有効なため、%s の値を変更しました。"
 
@@ -817,7 +815,13 @@ msgstr "quotaおよびホームディレクトリが管理可能な場合にチ
 msgid ""
 "Check if the LDAP schema fits the requirements of the selected account "
 "modules."
-msgstr "選択したアカウントモジュールの要件にLDAPスキーマが適合するか確認してください。"
+msgstr ""
+"選択したアカウントモジュールの要件にLDAPスキーマが適合するか確認してくださ"
+"い。"
+
+#: ../templates/tests/lamdaemonTest.php:98
+msgid "Check quotas"
+msgstr "クオータをチェック"
 
 #: ../templates/masscreate.php:128
 msgid ""
@@ -839,9 +843,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 "クライアントプリンタをデフォルトにする"
 
@@ -853,17 +857,7 @@ msgstr "集合属性"
 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 ""
-
-#: ../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."
@@ -875,12 +869,12 @@ msgstr ""
 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/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/posixAccount.inc:92 ../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:328
+#: ../lib/modules/inetOrgPerson.inc:446 ../lib/modules/inetOrgPerson.inc:733
+#: ../lib/modules/inetOrgPerson.inc:1059
 msgid "Common name"
 msgstr "氏名(common name)"
 
@@ -900,20 +894,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 "接続時間の制限"
 
@@ -935,17 +929,17 @@ 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 "国名が正しくありません!"
 
@@ -960,8 +954,8 @@ msgstr "作成"
 msgid "Create Object"
 msgstr "オブジェクト作成"
 
-#: ../lib/lists.inc:471 ../lib/lists.inc:633 ../lib/modules.inc:1081
-#: ../help/help.inc:152
+#: ../lib/lists.inc:471 ../lib/lists.inc:633 ../lib/modules.inc:1223
+#: ../help/help.inc:154
 msgid "Create PDF file"
 msgstr "PDFファイル作成"
 
@@ -973,7 +967,7 @@ 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ファイル作成"
 
@@ -997,7 +991,7 @@ 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ファイル作成"
 
@@ -1021,7 +1015,7 @@ msgstr "スコープに対する新しいPDF構成を作成:"
 msgid "Create a new profile"
 msgstr "新しいプロファイルの作成"
 
-#: ../lib/modules.inc:1073
+#: ../lib/modules.inc:1215
 msgid "Create another account"
 msgstr "他のアカウントを作成"
 
@@ -1029,7 +1023,7 @@ 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 "ホームディレクトリを作成"
 
@@ -1053,14 +1047,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 "カスタム"
@@ -1070,7 +1056,7 @@ msgstr "カスタム"
 #: ../templates/tree/update_confirm.php:79
 #: ../templates/tree/add_attr_form.php:73 ../templates/tree/delete_form.php:77
 #: ../templates/tree/delete_form.php:151 ../templates/delete.php:95
-#: ../lib/modules.inc:1162 ../lib/modules.inc:1602
+#: ../lib/modules.inc:1308 ../lib/modules.inc:1748
 msgid "DN"
 msgstr ""
 
@@ -1078,7 +1064,7 @@ msgstr ""
 msgid "DN settings"
 msgstr "DN設定"
 
-#: ../templates/masscreate.php:154 ../help/help.inc:146
+#: ../templates/masscreate.php:154 ../help/help.inc:148
 msgid "DN suffix"
 msgstr "DNサフィックス"
 
@@ -1091,19 +1077,15 @@ 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."
@@ -1115,27 +1097,29 @@ msgstr ""
 msgid "Default language"
 msgstr "規定の言語"
 
-#: ../templates/masscreate.php:163 ../templates/masscreate.php:326
+#: ../templates/masscreate.php:163 ../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 "代理人"
 
-#: ../lib/modules/kolabUser.inc:235
+#: ../lib/modules/kolabUser.inc:254
 msgid "Delegates has invalid format!"
 msgstr "代理人の形式が正しくありません。"
 
 #: ../templates/tree/edit.php:115 ../templates/tree/delete_form.php:159
 #: ../templates/ou_edit.php:109 ../templates/pdfedit/pdfdelete.php:96
-#: ../templates/delete.php:116 ../lib/tree.inc:1178 ../lib/lists.inc:467
+#: ../templates/delete.php:116 ../lib/tree.inc:1178
+#: ../lib/modules/kolabUser.inc:872 ../lib/lists.inc:467
 msgid "Delete"
 msgstr "削除"
 
@@ -1144,7 +1128,7 @@ msgstr "削除"
 msgid "Delete %s"
 msgstr "%s を削除"
 
-#: ../lib/modules/kolabUser.inc:406
+#: ../lib/modules/kolabUser.inc:425
 msgid "Delete Kolab account"
 msgstr "Kolabアカウントを削除"
 
@@ -1165,11 +1149,11 @@ 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 "ホームディレクトリを削除"
 
@@ -1186,11 +1170,11 @@ msgstr "オブジェクトを削除"
 msgid "Delete operation canceled."
 msgstr "削除操作がキャンセルされました。"
 
-#: ../templates/ou_edit.php:183 ../help/help.inc:186
+#: ../templates/ou_edit.php:183 ../help/help.inc:188
 msgid "Delete organizational unit"
 msgstr "organizational unitを削除"
 
-#: ../lib/modules/inetOrgPerson.inc:843
+#: ../lib/modules/inetOrgPerson.inc:942
 msgid "Delete photo"
 msgstr "写真を削除"
 
@@ -1232,54 +1216,46 @@ 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/types/user.inc:92 ../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/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/sambaAccount.inc:78 ../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: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 "表示名"
 
@@ -1303,7 +1279,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 "本当にこのアカウントを削除しますか?"
 
@@ -1315,37 +1291,37 @@ 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/types/smbDomain.inc:82 ../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 "ドメイン管理者(Domain administrator)"
 
-#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaAccount.inc:318
+#: ../lib/modules/sambaAccount.inc:48 ../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 "ドメイン管理者(Domain Admins)"
 
@@ -1354,9 +1330,9 @@ msgstr "ドメイン管理者(Domain Admins)"
 msgid "Domain certificate admins"
 msgstr "ドメイン証明書管理者(Domain Certificate Admins)"
 
-#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:568
+#: ../lib/modules/sambaAccount.inc:49 ../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 "ドメインコンピュータ(Domain Computers)"
@@ -1382,9 +1358,9 @@ msgid "Domain guests"
 msgstr "ドメインゲスト(Domain Guests)"
 
 #: ../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 "ドメイン名"
 
@@ -1396,7 +1372,7 @@ 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 "ドメイン名が正しくありません!"
 
@@ -1411,7 +1387,7 @@ msgid "Domain schema admins"
 msgstr "ドメインスキーマ管理者(Domain Schema Admins)"
 
 #: ../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 "ドメインユーザ(Domain Users)"
@@ -1420,15 +1396,15 @@ msgstr "ドメインユーザ(Domain Users)"
 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 ワークステーションのホームディレクトリとして割り当てられたドライブ文"
@@ -1438,45 +1414,45 @@ msgstr ""
 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/lists.inc:462
+#: ../lib/modules/sambaSamAccount.inc:1119
+#: ../lib/modules/sambaSamAccount.inc:1123 ../lib/lists.inc:462
 msgid "Edit"
 msgstr "編集"
 
@@ -1492,11 +1468,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 "メンバーの編集"
 
@@ -1516,38 +1492,22 @@ 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:95 ../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/lists/changePassword.php:255 ../templates/login.php:398
 msgid "Empty password submitted. Please try again."
 msgstr "パスワードが空です。やり直してください。"
 
@@ -1555,7 +1515,7 @@ msgstr "パスワードが空です。やり直してください。"
 msgid "Encountered an error while performing search."
 msgstr "検索実行中にエラーが発生しました。"
 
-#: ../lib/modules/sambaSamAccount.inc:476
+#: ../lib/modules/sambaSamAccount.inc:478
 msgid "Eniwetok, Kwajalein"
 msgstr ""
 
@@ -1581,7 +1541,7 @@ msgstr "エントリ %s は削除されました。"
 msgid "Equality"
 msgstr "照合規則"
 
-#: ../templates/config/mainmanage.php:208
+#: ../templates/config/mainmanage.php:256
 msgid "Error"
 msgstr "エラー"
 
@@ -1603,7 +1563,7 @@ msgstr ""
 msgid "Example"
 msgstr "例"
 
-#: ../templates/masscreate.php:162 ../templates/masscreate.php:322
+#: ../templates/masscreate.php:162 ../templates/masscreate.php:321
 msgid "Example value"
 msgstr "例"
 
@@ -1615,7 +1575,7 @@ msgstr "例"
 msgid "Execute"
 msgstr "実行"
 
-#: ../templates/tests/lamdaemonTest.php:231
+#: ../templates/tests/lamdaemonTest.php:292
 msgid "Execute lamdaemon"
 msgstr "lamdaemonを実行"
 
@@ -1642,18 +1602,18 @@ msgstr "エントリ作成に失敗しました!"
 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:83 ../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."
@@ -1661,7 +1621,7 @@ 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."
@@ -1682,9 +1642,9 @@ msgid "Filter"
 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 "(姓でない)名"
 
@@ -1692,29 +1652,30 @@ 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 "Free/Busyインターバル"
 
-#: ../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 "Free/Busyインターバルは数でなくてはなりません!"
 
-#: ../lib/modules/sambaSamAccount.inc:1203
+#: ../lib/modules/sambaSamAccount.inc:1189
 msgid "Friday"
 msgstr "金曜日"
 
@@ -1722,20 +1683,20 @@ msgstr "金曜日"
 msgid "Full name"
 msgstr "フルネーム"
 
-#: ../lib/modules/inetOrgPerson.inc:233
+#: ../lib/modules/inetOrgPerson.inc:247
 msgid "GB-12345"
 msgstr ""
 
 #: ../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/posixAccount.inc:88 ../lib/modules/posixAccount.inc:1192
-#: ../lib/modules/sambaGroupMapping.inc:343
+#: ../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: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."
@@ -1753,21 +1714,21 @@ msgstr ""
 "のコマンドを実行しなければなりません: '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 ""
 
-#: ../templates/lists/changePassword.php:170 ../help/help.inc:173
+#: ../templates/lists/changePassword.php:170 ../help/help.inc:175
 msgid "Generate random password"
 msgstr "ランダムなパスワードを生成"
 
-#: ../lib/modules/kolabUser.inc:181
+#: ../lib/modules/kolabUser.inc:200
 msgid "Germany"
 msgstr "日本"
 
@@ -1776,18 +1737,18 @@ 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."
@@ -1795,7 +1756,7 @@ msgstr ""
 "iノード(ファイル)クオータの猶予期間。 ほとんどのファイルシステムは、最大値で"
 "ある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 "iノードクオータの猶予期間"
 
@@ -1804,43 +1765,39 @@ msgstr "iノードクオータの猶予期間"
 msgid "Group"
 msgstr "グループ"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:161
-msgid "Group 1, Group 2"
-msgstr ""
-
 #: ../lib/types/group.inc:54
 msgid "Group accounts (e.g. Unix and Samba)"
 msgstr "グループアカウント(e.g. Unix および Samba)"
 
-#: ../lib/types/group.inc:87 ../lib/modules/posixGroup.inc:354
+#: ../lib/types/group.inc:87 ../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/group.inc:86
+#: ../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/types/group.inc:85 ../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/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/types/gon.inc:82 ../lib/types/group.inc:83
+#: ../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 .-_ !"
@@ -1848,11 +1805,11 @@ 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 "
@@ -1865,15 +1822,19 @@ msgstr ""
 "が既に使われていたならば、グループ名に番号が付加されます。この場合、空いてい"
 "る次の番号が使われます。"
 
-#: ../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 "uniqueな名前のグループ"
 
-#: ../lib/modules/posixGroup.inc:366 ../lib/modules/posixGroup.inc:394
+#: ../lib/modules/posixGroup.inc:374 ../lib/modules/posixGroup.inc:402
 msgid "Group password"
 msgstr "グループパスワード"
 
@@ -1881,54 +1842,56 @@ msgstr "グループパスワード"
 msgid "Group type"
 msgstr "グループのタイプ"
 
-#: ../lib/types/group.inc:45 ../lib/modules/posixGroup.inc:304
+#: ../lib/types/group.inc:45 ../lib/modules/posixGroup.inc:312
 msgid "Groups"
 msgstr "グループ"
 
-#: ../lib/modules/quota.inc:551
+#: ../lib/modules/quota.inc:553
 msgid "Hard block"
 msgstr "ハードblock"
 
-#: ../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 "ハードinode"
 
-#: ../lib/modules/quota.inc:127
+#: ../lib/modules/quota.inc:129
 msgid "Hard inode (files) limit"
 msgstr "ハードinode(ファイル)制限"
 
-#: ../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 "ハードinode制限"
 
-#: ../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 "見出し"
 
 #: ../templates/lists/changePassword.php:182 ../templates/ou_edit.php:177
 #: ../templates/ou_edit.php:192 ../templates/masscreate.php:157
-#: ../templates/masscreate.php:170 ../templates/masscreate.php:309
+#: ../templates/masscreate.php:170 ../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
 #: ../templates/config/confmain.php:190 ../templates/config/confmain.php:225
@@ -1953,12 +1916,12 @@ 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 "ヘルプ"
 
@@ -1974,7 +1937,7 @@ msgstr ""
 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 "ターミナルサーバーへのアクセス設定を変更できます。"
 
@@ -1983,11 +1946,11 @@ 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."
@@ -1995,7 +1958,7 @@ 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."
@@ -2003,7 +1966,7 @@ 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."
@@ -2016,7 +1979,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 ""
@@ -2038,7 +2001,17 @@ 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 "パスワードの要求水準を設定します。文字クラスは lowercase, uppercase, numeric, symbols です。"
+
+#: ../lib/modules/sambaDomain.inc:95
 msgid ""
 "Here you can specify the minimum number of characters for a user password."
 msgstr "ユーザーパスワードの最低文字数を設定します。"
@@ -2047,7 +2020,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 "ここではshadowingモードを記述できます。"
 
@@ -2072,20 +2045,20 @@ 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/posixAccount.inc:63
+#: ../lib/types/user.inc:89 ../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:94 ../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 "ホームディレクトリ"
 
@@ -2098,28 +2071,28 @@ 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/sambaSamAccount.inc:81
+#: ../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 "ホームパス"
 
@@ -2128,10 +2101,10 @@ msgstr "ホームパス"
 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:79 ../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 "自宅電話番号"
 
@@ -2147,19 +2120,19 @@ msgstr "ホストアカウント(e.g. 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/posixAccount.inc:78
+#: ../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 "ホスト名"
 
@@ -2186,7 +2159,7 @@ msgstr ""
 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 "
@@ -2202,7 +2175,7 @@ msgstr ""
 
 #: ../lib/types/host.inc:44 ../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 "ホスト"
 
@@ -2210,65 +2183,59 @@ msgstr "ホスト"
 msgid "I am sure"
 msgstr "確認"
 
-#: ../lib/modules/posixGroup.inc:465 ../lib/modules/posixGroup.inc:573
-#: ../lib/modules/posixAccount.inc:69 ../lib/modules/posixAccount.inc:748
+#: ../lib/modules/posixGroup.inc:473 ../lib/modules/posixGroup.inc:581
+#: ../lib/modules/posixAccount.inc:69 ../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:573 ../lib/modules/posixAccount.inc:67
+#: ../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 ""
-
 #: ../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 ""
-"チェックした場合、暗号化パスワードの前に\"!\"が挿入され、アカウントは無効化さ"
-"れます。"
+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 "
@@ -2278,51 +2245,58 @@ msgstr ""
 "す。通常はログイン失敗によってロックされたユーザーのアカウントをアンロックし"
 "たい場合に使用します。"
 
-#: ../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-フラグをセット)"
+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\"が使用されます。"
+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."
@@ -2335,7 +2309,7 @@ msgid ""
 "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."
@@ -2343,8 +2317,8 @@ 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(well known RID)を使いたいのであれば、よく知られた"
@@ -2354,9 +2328,9 @@ msgstr ""
 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 "クライアントのスタートアップ構成を継承する"
 
@@ -2368,9 +2342,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 "初期プログラム"
 
@@ -2431,20 +2405,21 @@ 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/posixAccount.inc:68
+#: ../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 "
@@ -2454,34 +2429,13 @@ msgstr ""
 "在するかも知れないため、これはいくつかの問題を引き起こすかもしれません。この"
 "警告を防ぐには、maxUIDをより大きな値に設定してください。"
 
-#: ../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 ""
-
-#: ../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:93 ../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 "ユーザの役職: 社長、部長、..."
 
@@ -2498,7 +2452,7 @@ msgstr "属性タイプへジャンプ"
 msgid "Jump to an object class"
 msgstr "オブジェクトクラスへジャンプ"
 
-#: ../lib/modules/kolabUser.inc:70
+#: ../lib/modules/kolabUser.inc:72
 msgid "Kolab"
 msgstr ""
 
@@ -2512,7 +2466,7 @@ msgstr ""
 "LAMはこのエントリおよび全ての子を再帰的に削除します。この操作が削除する全ての"
 "エントリのリストは下に表示されています。実行してもよろしいですか?"
 
-#: ../templates/login.php:200 ../templates/config/index.php:61
+#: ../templates/login.php:212 ../templates/config/index.php:61
 msgid "LAM configuration"
 msgstr "LAM構成設定"
 
@@ -2521,7 +2475,7 @@ msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr ""
 "LAMは入力内容をチェックしました。アカウントを作成する準備ができました。"
 
-#: ../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 "
@@ -2541,7 +2495,7 @@ msgstr ""
 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 "LAMは、この名前のSamba 3ドメインを見つけられませんでした。"
 
@@ -2553,16 +2507,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 "
@@ -2576,11 +2530,17 @@ msgid "LDAP"
 msgstr ""
 
 #: ../templates/config/confmodules.php:76 ../templates/config/confmain.php:121
-#: ../templates/config/confmain.php:594 ../templates/config/conftypes.php:154
+#: ../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 ""
+
 #: ../lib/lists.inc:854
 msgid "LDAP Search failed! Please check your preferences."
 msgstr "LDAP検索に失敗しました! プリファレンスを確認してください。"
@@ -2589,11 +2549,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操作が完了しました。"
 
@@ -2601,22 +2561,22 @@ msgstr "LDAP操作が完了しました。"
 msgid "LDAP password"
 msgstr "LDAPパスワード"
 
-#: ../templates/selfService/adminMain.php:324 ../help/help.inc:161
+#: ../templates/selfService/adminMain.php:324 ../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/lists.inc:837
+#: ../lib/types/group.inc:240 ../lib/lists.inc:837
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "LDAPのサイズ制限を越えました。一部のエントリのみを表示します。"
 
 #: ../templates/config/conftypes.php:200
 #: ../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サフィックス"
 
@@ -2632,7 +2592,7 @@ msgstr "LDAPアップロード中です。お待ちください。"
 msgid "LDAP user"
 msgstr "LDAPユーザー"
 
-#: ../help/help.inc:159
+#: ../help/help.inc:161
 msgid "LDAP user and password"
 msgstr "LDAPユーザーとパスワード"
 
@@ -2641,35 +2601,36 @@ 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 "言語が未定されていません!"
 
@@ -2677,10 +2638,20 @@ 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 "姓"
 
@@ -2688,11 +2659,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 "パスワード最終変更時刻"
 
@@ -2712,15 +2683,7 @@ 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."
@@ -2728,7 +2691,7 @@ msgstr ""
 "ユーザがログインできるSambaワークステーションのリスト。未記入はすべてのワーク"
 "ステーションを意味します。"
 
-#: ../templates/config/confmain.php:511
+#: ../templates/config/confmain.php:510
 msgid "List of admin users is empty or invalid!"
 msgstr "管理者(admin users)のリストが空または正しくありません!"
 
@@ -2736,34 +2699,22 @@ msgstr "管理者(admin users)のリストが空または正しくありませ
 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 "ローカルアドレス一覧"
 
@@ -2771,93 +2722,100 @@ 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 ../help/help.inc:133
+#: ../templates/config/mainmanage.php:282 ../help/help.inc:133
 msgid "Log destination"
 msgstr "ログ出力先"
 
-#: ../templates/config/mainmanage.php:205 ../help/help.inc:131
+#: ../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/config/conflogin.php:59
+#: ../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
 msgid "Login"
 msgstr "ログイン"
 
-#: ../templates/selfService/adminMain.php:352 ../help/help.inc:163
+#: ../templates/selfService/adminMain.php:352 ../help/help.inc:165
 msgid "Login attribute label"
 msgstr "ログイン属性ラベル"
 
-#: ../templates/selfService/adminMain.php:367 ../help/help.inc:165
+#: ../templates/selfService/adminMain.php:367 ../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/types/user.inc:90 ../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 "ログインシェル"
 
-#: ../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/sambaSamAccount.inc:87
+#: ../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 "ログオンスクリプト"
 
@@ -2871,66 +2829,66 @@ 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/types/mailAlias.inc:44 ../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 "メールボックス・ホーム・サーバ名が正しくありません!"
 
@@ -2938,15 +2896,15 @@ msgstr "メールボックス・ホーム・サーバ名が正しくありませ
 msgid "Mailing aliases (e.g. NIS mail aliases)"
 msgstr "電子メールエイリアス(e.g. NIS mail aliases)"
 
-#: ../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
+#: ../templates/selfService/adminMain.php:382 ../help/help.inc:169
 msgid "Main page caption"
 msgstr "メインページの説明文"
 
@@ -2958,8 +2916,8 @@ 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 "管理者"
 
@@ -2975,11 +2933,11 @@ 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 "削除対象としてマーク"
 
@@ -3005,22 +2963,22 @@ 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番号の最大値は最小値よりも大きくなくてはなりません。"
 
 #: ../lib/modules/posixAccount.inc:57 ../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番号の最大値"
 
@@ -3046,47 +3004,47 @@ msgid "Maximum list entries"
 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/sambaDomain.inc:200 ../lib/modules/sambaDomain.inc:326
-#: ../lib/modules/sambaDomain.inc:676
+#: ../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:202 ../lib/modules/sambaDomain.inc:328
+#: ../lib/modules/sambaDomain.inc:678
 msgid "Maximum password age"
 msgstr "パスワード期限(age)の最大値"
 
-#: ../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番号の最小値"
 
@@ -3094,22 +3052,46 @@ msgstr "UID番号の最小値"
 msgid "Minimum UID number is invalid!"
 msgstr "UID番号の最小値が不正です!"
 
-#: ../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
+#: ../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: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 "パスワード期限(age)の最小値"
 
-#: ../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
+#: ../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: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 "携帯電話番号"
 
@@ -3121,28 +3103,32 @@ 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 "quotaが有効になったデバイスのマウントポイント。"
 
-#: ../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番地"
 
@@ -3150,11 +3136,11 @@ msgstr "わたしの町42番地"
 #: ../templates/tree/templates/creation/new_ou_template.php:104
 #: ../templates/schema/schema.php:273 ../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."
@@ -3162,7 +3148,7 @@ msgstr ""
 "プロファイルがセーブされる名前。もしも同じ名前のプロファイルがある場合は上書"
 "きされます。"
 
-#: ../lib/modules/ieee802device.inc:107
+#: ../lib/modules/ieee802device.inc:109
 msgid "New MAC address"
 msgstr "新しいMACアドレス"
 
@@ -3170,10 +3156,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 "新しい別名"
@@ -3186,7 +3176,11 @@ 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 "新しいグループ"
 
@@ -3194,11 +3188,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 "新しいマスタパスワード"
 
@@ -3211,15 +3205,15 @@ msgid "New object"
 msgstr "新しいオブジェクト"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:47
-#: ../templates/ou_edit.php:168 ../help/help.inc:184
+#: ../templates/ou_edit.php:168 ../help/help.inc:186
 msgid "New organizational unit"
 msgstr "新しい organizational unit"
 
-#: ../lib/modules/groupOfNames.inc:250
+#: ../lib/modules/groupOfNames.inc:252
 msgid "New owner"
 msgstr "新しい所有者"
 
-#: ../templates/config/confmain.php:431 ../lib/modules/posixAccount.inc:1702
+#: ../templates/config/confmain.php:431 ../lib/modules/posixAccount.inc:1740
 msgid "New password"
 msgstr "新しいパスワード"
 
@@ -3227,7 +3221,7 @@ msgstr "新しいパスワード"
 msgid "New password set successfully."
 msgstr "新しいパスワードが正しく設定されました。"
 
-#: ../lib/modules/nisMailAlias.inc:150
+#: ../lib/modules/nisMailAlias.inc:152
 msgid "New recipient"
 msgstr "新しい受信者"
 
@@ -3235,6 +3229,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 "新しいユーザ"
@@ -3249,42 +3247,42 @@ 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が番号ではありません!"
 
@@ -3293,17 +3291,17 @@ 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 "Samba 3グループがLDAPに存在しません。最初に一個作成してください。"
 
-#: ../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 "unixグループがLDAPに存在しません。最初に一個作成してください。"
 
@@ -3327,11 +3325,11 @@ msgstr "ドメインが見つかりません!"
 msgid "No file selected."
 msgstr "ファイルが選択されていません。"
 
-#: ../lib/modules/posixGroup.inc:464 ../lib/modules/posixAccount.inc:67
+#: ../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 "グループが見つかりません!"
 
@@ -3343,19 +3341,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 "ロゴがありません"
 
@@ -3375,7 +3374,7 @@ msgstr "パスワードが入力されていません!"
 msgid "No problems found."
 msgstr "問題は発見されませんでした。"
 
-#: ../templates/pdfedit/pdfpage.php:128
+#: ../templates/pdfedit/pdfpage.php:126
 msgid "No section text specified"
 msgstr "セクションテキストが指定されていません!"
 
@@ -3383,7 +3382,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 "静的テキストが指定されていません!"
 
@@ -3412,7 +3411,7 @@ msgstr ""
 "注意: この属性に対するあなたのLDAPサーバ上における比較ルールをセットしない場"
 "合、\"inappropriate matching\"エラーを受け取るでしょう。"
 
-#: ../templates/config/mainmanage.php:208
+#: ../templates/config/mainmanage.php:256
 msgid "Notice"
 msgstr "注"
 
@@ -3420,12 +3419,12 @@ 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."
@@ -3433,7 +3432,7 @@ 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."
@@ -3441,16 +3440,16 @@ 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 "ユーザがパスワード変更を強制されるまでの秒数。"
 
@@ -3478,7 +3477,7 @@ msgstr "OU が正しくありません!"
 msgid "OU is not empty or invalid!"
 msgstr "OU が空白でないか不正!"
 
-#: ../help/help.inc:184 ../help/help.inc:186
+#: ../help/help.inc:186 ../help/help.inc:188
 msgid "OU-Editor"
 msgstr "OUエディタ"
 
@@ -3491,21 +3490,28 @@ 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 ""
 
-#: ../templates/tree/export_form.php:165 ../templates/ou_edit.php:200
+#: ../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 ../templates/config/conftypes.php:238
 #: ../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
@@ -3514,13 +3520,12 @@ msgstr ""
 #: ../templates/selfService/adminMain.php:544
 #: ../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/lists.inc:668
+#: ../templates/profedit/profilemain.php:168 ../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"
 msgstr ""
@@ -3529,15 +3534,15 @@ 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 ""
 
-#: ../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 "破棄された、またはタイムアウトした接続"
 
@@ -3570,9 +3575,10 @@ msgstr ""
 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
+#: ../templates/config/confmain.php:387 ../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 "所有者"
 
@@ -3580,11 +3586,11 @@ msgstr "所有者"
 msgid "PDF editor"
 msgstr "PDFエディタ"
 
-#: ../templates/pdfedit/pdfpage.php:458 ../lib/lists.inc:640
+#: ../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構成を保存しました。"
 
@@ -3592,41 +3598,37 @@ 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 ../lib/modules/sambaAccount.inc:74
-#: ../lib/modules/sambaAccount.inc:75 ../lib/modules/sambaAccount.inc:227
+#: ../templates/lists/changePassword.php:196 ../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:229
 #: ../lib/modules/sambaSamAccount.inc:92 ../lib/modules/sambaSamAccount.inc:93
-#: ../lib/modules/sambaSamAccount.inc:343 ../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/sambaSamAccount.inc:345 ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:73 ../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/sambaAccount.inc:75
+#: ../lib/modules/posixGroup.inc:469 ../lib/modules/sambaAccount.inc:75
 #: ../lib/modules/sambaAccount.inc:76 ../lib/modules/sambaSamAccount.inc:93
 #: ../lib/modules/sambaSamAccount.inc:94 ../lib/modules/posixAccount.inc:73
 #: ../lib/modules/posixAccount.inc:74 ../lib/modules/inetOrgPerson.inc:104
@@ -3638,19 +3640,19 @@ 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:50 ../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 "パスワード有効期限"
 
@@ -3658,35 +3660,39 @@ 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 "パスワード寿命の最小値は自然数でなければなりません。"
 
-#: ../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
+#: ../templates/config/mainmanage.php:206 ../help/help.inc:137
+msgid "Password policy"
+msgstr "パスワードポリシー"
+
+#: ../lib/modules/shadowAccount.inc:52 ../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 "パスワード警告"
 
@@ -3694,15 +3700,15 @@ 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."
@@ -3718,22 +3724,22 @@ 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 "カンマで区切られたSSH公開鍵のリストを入力してください!"
 
@@ -3741,11 +3747,15 @@ msgstr "カンマで区切られたSSH公開鍵のリストを入力してくだ
 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 "
@@ -3760,11 +3770,11 @@ 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"
@@ -3778,11 +3788,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
 #: ../lib/modules/sambaSamAccount.inc:104
@@ -3848,17 +3853,17 @@ msgstr "正しい町名(street name)を入力してください!"
 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 "最初に、他のページでアカウント情報を入力してください。"
 
@@ -3903,15 +3908,15 @@ 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}"
@@ -3923,12 +3928,12 @@ msgstr ""
 msgid "Please enter the same password in both password fields."
 msgstr "両方のパスワードフィールドに同じパスワードを入力してください。"
 
-#: ../templates/lists/changePassword.php:259 ../lib/modules/posixGroup.inc:460
+#: ../templates/lists/changePassword.php:259 ../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 "2つのパスワードフィールドに同じパスワードを入力してください。"
 
-#: ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/sambaSamAccount.inc:302
 msgid "Please enter the time limit in minutes. 0 means unlimited."
 msgstr "制限時間を分単位で入力してください。0は無制限を意味します。"
 
@@ -3944,11 +3949,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で有効化してください。"
 
@@ -3962,7 +3967,7 @@ msgstr ""
 "子が記入されていなくてはなりません。後に続く行は、各々の行が一つのアカウント"
 "になります。"
 
-#: ../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 ""
@@ -3981,11 +3986,11 @@ 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 の必須属性を全て設定してください。"
@@ -3995,41 +4000,42 @@ 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:175 ../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:89 ../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:91 ../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 "郵便番号"
 
@@ -4037,19 +4043,19 @@ 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 "私用の電話番号"
 
@@ -4075,7 +4081,7 @@ msgstr "プロファイル管理"
 #: ../templates/config/profmanage.php:219
 #: ../templates/selfService/profManage.php:142
 #: ../templates/selfService/profManage.php:193
-#: ../templates/profedit/profilepage.php:250 ../help/help.inc:144
+#: ../templates/profedit/profilepage.php:250 ../help/help.inc:146
 msgid "Profile name"
 msgstr "プロファイル名"
 
@@ -4097,18 +4103,18 @@ msgid "Profile passwords are different or empty!"
 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/sambaSamAccount.inc:84
+#: ../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 "プロファイルパス"
 
@@ -4121,32 +4127,11 @@ msgstr "プロファイルパスが正しくありません!"
 msgid "Profile was saved."
 msgstr "プロファイルがセーブされました。"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:156
-msgid "Project 1, Project 2"
-msgstr ""
-
-#: ../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 ""
-
-#: ../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 におけるQuota"
@@ -4160,7 +4145,7 @@ msgid "RDN"
 msgstr ""
 
 #: ../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識別子"
 
@@ -4168,9 +4153,9 @@ 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 ""
 
@@ -4190,18 +4175,18 @@ 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/types/mailAlias.inc:83 ../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 "切断された場合は再接続してください"
 
@@ -4209,11 +4194,11 @@ 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
+#: ../templates/config/confmain.php:441 ../lib/modules/posixAccount.inc:1742
 msgid "Reenter password"
 msgstr "パスワード再入力"
 
@@ -4235,22 +4220,26 @@ msgstr "競合の場合に拒否"
 msgid "Relative distinguished name"
 msgstr "相対識別名"
 
-#: ../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
-#: ../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
+#: ../templates/pdfedit/pdfpage.php:425 ../lib/modules/ieee802device.inc:104
+#: ../lib/modules/sambaSamAccount.inc:1282 ../lib/modules/kolabUser.inc:362
+#: ../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 "選択したエントリを削除"
 
@@ -4258,7 +4247,7 @@ msgstr "選択したエントリを削除"
 msgid "Remove this account type"
 msgstr "このアカウントタイプを削除:"
 
-#: ../lib/modules/inetOrgPerson.inc:1324
+#: ../lib/modules/inetOrgPerson.inc:1481
 msgid "Remove/replace photo"
 msgstr "写真の削除/差し替え"
 
@@ -4272,14 +4261,14 @@ msgstr "プロファイル名変更"
 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
+#: ../templates/lists/changePassword.php:204 ../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:64 ../lib/modules/posixAccount.inc:785
 msgid "Replaced $user or $group in homedir."
 msgstr "$user または $group をホームディレクトリに置き換えました。"
 
@@ -4294,26 +4283,26 @@ 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 "ロックアウト解除時間は自然数でなければなりません。"
 
@@ -4321,55 +4310,55 @@ 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が不正です!"
 
@@ -4377,27 +4366,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ドメイン名"
 
@@ -4405,39 +4394,39 @@ 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/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/sambaAccount.inc:70 ../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: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/profedit/profilepage.php:258 ../lib/modules.inc:1004
+#: ../templates/pdfedit/pdfpage.php:668 ../templates/pdfedit/pdfpage.php:702
+#: ../templates/profedit/profilepage.php:258 ../lib/modules.inc:1146
 msgid "Save"
 msgstr "保存"
 
@@ -4461,15 +4450,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 "スクリプトサーバが無効です!"
 
@@ -4491,19 +4480,19 @@ 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/confmain.php:413
+#: ../templates/config/mainmanage.php:153 ../templates/config/confmain.php:413
 msgid "Security settings"
 msgstr "セキュリティ設定"
 
-#: ../lib/types/group.inc:239 ../lib/lists.inc:837
+#: ../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 "参照"
 
@@ -4515,7 +4504,7 @@ msgstr "生成処理に対するテンプレートを選んでください"
 msgid "Select all"
 msgstr "すべてを選択"
 
-#: ../lib/modules/posixAccount.inc:1065
+#: ../lib/modules/posixAccount.inc:1090
 msgid "Selected groups"
 msgstr "選択されたグループ"
 
@@ -4523,7 +4512,7 @@ msgstr "選択されたグループ"
 msgid "Selected modules"
 msgstr "選択されたモジュール"
 
-#: ../lib/modules/posixGroup.inc:228
+#: ../lib/modules/posixGroup.inc:236
 msgid "Selected users"
 msgstr "選択されたユーザ"
 
@@ -4535,12 +4524,16 @@ 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 "サーバアドレス"
+msgstr "サーバーアドレス"
 
-#: ../templates/config/confmain.php:495
+#: ../templates/config/confmain.php:494
 #: ../templates/selfService/adminMain.php:60
 msgid "Server address is invalid!"
 msgstr "サーバーアドレスが正しくありません!"
@@ -4549,7 +4542,7 @@ msgstr "サーバーアドレスが正しくありません!"
 msgid "Server list"
 msgstr "サーバー覧"
 
-#: ../templates/login.php:326
+#: ../templates/login.php:338
 msgid "Server profile"
 msgstr "サーバー プロファイル"
 
@@ -4558,19 +4551,23 @@ msgstr "サーバー プロファイル"
 msgid "Server settings"
 msgstr "サーバー設定"
 
-#: ../templates/config/mainmanage.php:152 ../help/help.inc:129
+#: ../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 "ランダムなパスワードを設定"
 
@@ -4578,17 +4575,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 ""
 
-#: ../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 ""
 
@@ -4600,7 +4597,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 "通常のグループメンバーとしてプライマリグループのメンバーを表示"
 
@@ -4608,29 +4605,29 @@ 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 "ソフトinode"
 
-#: ../lib/modules/quota.inc:121
+#: ../lib/modules/quota.inc:123
 msgid "Soft inode (files) limit."
 msgstr "ソフトinode(ファイル)制限。"
 
-#: ../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 "ソフトinode制限"
 
@@ -4639,11 +4636,11 @@ msgstr "ソフトinode制限"
 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 "
@@ -4652,19 +4649,25 @@ msgstr ""
 "このヘルプID({bold}%s{endbold})は、このモジュール({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 "静的テキスト"
 
@@ -4676,27 +4679,27 @@ msgstr "Step 1 of 2: 名前とオブジェクトクラス"
 msgid "Step 2 of 2: Specify attributes and values"
 msgstr "Step 2 of 2: 属性と値の記入"
 
-#: ../lib/modules/inetOrgPerson.inc:184
+#: ../lib/modules/inetOrgPerson.inc:198
 msgid "Steve"
 msgstr "スティーブ"
 
-#: ../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 "スティーブ ミラー"
 
-#: ../lib/modules/posixAccount.inc:262
+#: ../lib/modules/posixAccount.inc:268
 msgid "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 msgstr "スティーブ ミラー, 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:87 ../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 "構成名"
 
@@ -4712,25 +4715,25 @@ 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/lists.inc:689 ../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パスワードと同期します。"
 
@@ -4746,28 +4749,27 @@ msgstr ""
 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:77 ../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 "臨時雇用、12月までの契約"
 
@@ -4775,8 +4777,8 @@ msgstr "臨時雇用、12月までの契約"
 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 "ターミナルサーバオプション"
 
@@ -4784,11 +4786,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単位)。未入力の場合は無制限。"
@@ -4798,7 +4804,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\" で取得してください。"
 
@@ -4812,7 +4818,7 @@ msgstr ""
 "てるため、これは問題です。UIDの最小値を適切に変更するか、独立した範囲を指定し"
 "てください。"
 
-#: ../help/help.inc:147
+#: ../help/help.inc:149
 msgid "The account will be saved under this LDAP suffix."
 msgstr "新しいアカウントはこのLDAPサフィックスの下に保存されます。"
 
@@ -4821,26 +4827,24 @@ msgstr "新しいアカウントはこのLDAPサフィックスの下に保存
 msgid ""
 "The attribute %s is not supported for the object class(es) %s by your LDAP "
 "server."
-msgstr "このLDAPサーバでは、属性 %s はオブジェクトクラス %s に対してサポートされていません。"
+msgstr ""
+"このLDAPサーバでは、属性 %s はオブジェクトクラス %s に対してサポートされてい"
+"ません。"
 
 #: ../templates/tree/templates/creation/custom.php:99
 #, php-format
 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/shadowAccount.inc:56
+#: ../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 "先頭の行は件名です。"
 
@@ -4854,11 +4858,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 "ホームディレクトリはこのドライブ文字の下に接続されます。"
 
@@ -4870,12 +4874,12 @@ 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-"
@@ -4884,11 +4888,11 @@ 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のドメイン又はワークグループ名。"
 
@@ -4897,7 +4901,11 @@ msgstr "Windowsのドメイン又はワークグループ名。"
 msgid "The object class %s is not supported by your LDAP server."
 msgstr "オブジェクトクラス %s はこのLDAPサーバでサポートされていません。"
 
-#: ../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 "このグループの所有者。"
 
@@ -4906,11 +4914,49 @@ 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."
@@ -4918,27 +4964,27 @@ 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
+#: ../help/help.inc:182
 msgid "The wildcard for the new password is @@newPasssword@@."
 msgstr "新しいパスワードに対応するワイルドカードは @@newPasssword@@ です。"
 
@@ -4946,11 +4992,11 @@ msgstr "新しいパスワードに対応するワイルドカードは @@newPas
 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 "このタイプのグループを一つだけ指定できます。"
 
@@ -4958,7 +5004,7 @@ 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 "
@@ -4967,7 +5013,7 @@ msgstr ""
 "新しいグループアカウントを作成する際に使われるグループIDの最小値と最大値。新"
 "しいグループアカウントには、使用中の番号の最大値+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 "
@@ -4978,7 +5024,7 @@ msgstr ""
 "囲はユーザアカウントのものと異なるようにしなくてはなりません。新しいホストア"
 "カウントには、使用中の番号の最大値+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 "
@@ -4995,11 +5041,11 @@ 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."
@@ -5007,6 +5053,10 @@ msgstr ""
 "このアカウントをadministratorやguest等の特殊ユーザとして定義する事を可能にし"
 "ます。"
 
+#: ../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 "選択されたプロファイルのパスワードを変更します。"
@@ -5035,6 +5085,10 @@ msgid ""
 "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 "この文書はLDAP Account Managerによって自動的に生成されました。"
@@ -5052,27 +5106,27 @@ msgstr "このエントリは %s エントリを含むサブツリーのルー
 msgid "This gecos value is invalid!"
 msgstr "gecosの値が正しくありません!"
 
-#: ../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 "ユーザの公開メールアドレスのカンマで区切られたリスト。"
 
@@ -5084,11 +5138,11 @@ msgstr ""
 "LAMへのアクセスを許可するホストの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."
@@ -5115,14 +5169,14 @@ msgstr ""
 "LDAP Account Manager にログイン可能なすべてのユーザの有効なDNエントリの一覧で"
 "す。各行毎に1個の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 "
@@ -5140,19 +5194,19 @@ 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 "この別名に対する1名の受信者。"
 
-#: ../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."
@@ -5160,17 +5214,17 @@ 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アドレスです(例 0: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です。"
 
@@ -5182,23 +5236,24 @@ msgstr ""
 "ホームディレクトリを作成し、quotaを設定するための外部スクリプトの絶対パスで"
 "す。"
 
-#: ../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 "
@@ -5218,40 +5273,40 @@ msgstr ""
 "\" 、または特定の値、\"属性:説明\" のいずれかにできます。複数のエントリは、セ"
 "ミコロンによって区切られます。"
 
-#: ../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 "このホストの呼称。未入力の場合は、ホスト名が使用されます。"
 
-#: ../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
+#: ../lib/modules/sambaDomain.inc:115
 msgid ""
 "This is the number of bad logon attempts (0 - 999) before the accounts 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."
@@ -5263,13 +5318,15 @@ 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 "アカウント一覧の表示行数です。この数より多くのエントリがある場合は、リストは複数のページに分割されます。"
+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 "
@@ -5279,7 +5336,7 @@ msgstr ""
 "合、LAMは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: "
@@ -5287,7 +5344,7 @@ 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."
@@ -5318,11 +5375,11 @@ msgstr ""
 "のサブツリー中のエントリのみが、アカウント一覧に表示されます。新しいアカウン"
 "トを作成するときは、この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."
@@ -5346,7 +5403,7 @@ msgstr ""
 "短かくすると、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."
@@ -5354,7 +5411,7 @@ 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."
@@ -5362,19 +5419,7 @@ 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グループです。"
 
@@ -5382,7 +5427,7 @@ msgstr "ユーザのプライマリWindowsグループです。"
 msgid "This login shell is invalid!"
 msgstr "ログインシェルが正しくありません!"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:231
+#: ../lib/modules/inetLocalMailRecipient.inc:233
 msgid "This mail address is already in use:"
 msgstr "このメールアドレスは既に使用されています:"
 
@@ -5390,12 +5435,12 @@ 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 "
@@ -5406,19 +5451,19 @@ msgstr ""
 "時間が168ビットに写影され、21桁の16進数(21*8=168)の値として保存されます。先頭"
 "の1ビットはグリニッジ標準時で日曜の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."
@@ -5426,7 +5471,7 @@ 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."
@@ -5434,7 +5479,7 @@ 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)."
@@ -5465,19 +5510,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 "選択された位置の下に新しい organizational unit を作成します。"
 
-#: ../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 ""
@@ -5487,17 +5532,19 @@ 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
+#: ../templates/lists/changePassword.php:171 ../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 "ランダムなパスワードを設定し、これを画面上に表示するか、または、ユーザにメールで送信します。"
+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)."
@@ -5505,28 +5552,28 @@ msgstr ""
 "Kolabdに削除を命ずる特殊なフラグをセットします。Kolabアカウントを完全に削除す"
 "る場合に使用します(e.g. メールボックスは削除されます)。"
 
-#: ../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 ../lib/lamdaemon.inc:121
+#: ../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"
@@ -5534,7 +5581,7 @@ msgstr ""
 "ログインを禁止するためには/bin/falseを使ってください。シェルの一覧は lam/"
 "config/shells から読み込まれます。"
 
-#: ../lib/modules/sambaSamAccount.inc:497
+#: ../lib/modules/sambaSamAccount.inc:499
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "東京、ソウル、大阪、ヤクーツク"
 
@@ -5546,7 +5593,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番号をグループ名に変換"
 
@@ -5558,11 +5605,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 "木曜日"
 
@@ -5586,10 +5633,10 @@ msgid ""
 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:71 ../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番号"
 
@@ -5607,7 +5654,7 @@ msgstr ""
 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."
@@ -5615,7 +5662,7 @@ msgstr ""
 "ホームディレクトリのUNCパス (\\\\サーバ\\共有)。$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."
@@ -5623,7 +5670,7 @@ msgstr ""
 "アカウントを変更できません。あなたはおそらく、設定を変更する権限を持っていま"
 "せん。"
 
-#: ../templates/tests/lamdaemonTest.php:223 ../lib/lamdaemon.inc:134
+#: ../templates/tests/lamdaemonTest.php:284 ../lib/lamdaemon.inc:134
 #: ../lib/lamdaemon.inc:139
 msgid "Unable to connect to remote server!"
 msgstr "リモートサーバーに接続できません!"
@@ -5651,11 +5698,11 @@ 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エントリをロードできません:"
 
@@ -5683,21 +5730,21 @@ msgstr "スキーマを取得できません!"
 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:71 ../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ワークステーション"
 
@@ -5705,11 +5752,11 @@ 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 "パスワード・ロックの解除"
 
@@ -5717,7 +5764,7 @@ msgstr "パスワード・ロックの解除"
 msgid "Unsolved dependency:"
 msgstr "依存関係が解決できませんでした:"
 
-#: ../templates/pdfedit/pdfpage.php:470
+#: ../templates/pdfedit/pdfpage.php:415
 msgid "Up"
 msgstr "上"
 
@@ -5738,35 +5785,31 @@ 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."
 
@@ -5778,16 +5821,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 ""
 "RIDs を UID/GID から計算するために使用します。自信がないなら変更しないこと。"
 
-#: ../lib/modules/quota.inc:116 ../lib/modules/quota.inc:359
+#: ../lib/modules/quota.inc:118 ../lib/modules/quota.inc:361
 msgid "Used inodes"
 msgstr "使用したinode"
 
-#: ../lib/modules/quota.inc:117
+#: ../lib/modules/quota.inc:119
 msgid "Used inodes (files)"
 msgstr "使用したinode(ファイル)"
 
@@ -5803,24 +5846,24 @@ msgstr "ユーザ ID"
 msgid "User accounts (e.g. Unix, Samba and Kolab)"
 msgstr "ユーザアカウント(e.g. Unix, Samba and 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 ""
 "ユーザの説明。もしも空ならば、姓(last name)と名(first name)が使われます。"
 
-#: ../lib/modules/inetOrgPerson.inc:349
+#: ../lib/modules/inetOrgPerson.inc:391
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "ユーザの説明。もしも空ならば、姓(surname)と名(given)が使われます。"
 
-#: ../lib/modules/account.inc:97
+#: ../lib/modules/account.inc:99
 msgid "User description. If left empty user name will be used."
 msgstr "ユーザの説明。もしも空ならば、ユーザ名が使われます。"
 
@@ -5828,25 +5871,25 @@ 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
-#: ../lib/types/user.inc:85 ../lib/modules/account.inc:92
-#: ../lib/modules/account.inc:113 ../lib/modules/account.inc:133
-#: ../lib/modules/account.inc:135 ../lib/modules/account.inc:136
-#: ../lib/modules/account.inc:218 ../lib/modules/account.inc:239
+#: ../templates/lists/changePassword.php:130 ../templates/login.php:248
+#: ../lib/types/user.inc:85 ../lib/modules/account.inc:94
+#: ../lib/modules/account.inc:115 ../lib/modules/account.inc:135
+#: ../lib/modules/account.inc:137 ../lib/modules/account.inc:138
+#: ../lib/modules/account.inc:220 ../lib/modules/account.inc:241
 #: ../lib/modules/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/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/posixAccount.inc:80 ../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:335 ../lib/modules/inetOrgPerson.inc:450
+#: ../lib/modules/inetOrgPerson.inc:710 ../lib/modules/inetOrgPerson.inc:1062
 msgid "User name"
 msgstr "ユーザ名"
 
@@ -5854,8 +5897,8 @@ msgstr "ユーザ名"
 msgid "User name already exists!"
 msgstr "ユーザ名はすでに存在しています!"
 
-#: ../lib/modules/account.inc:133 ../lib/modules/account.inc:134
-#: ../lib/modules/account.inc:136 ../lib/modules/posixAccount.inc:77
+#: ../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
 #: ../lib/modules/inetOrgPerson.inc:100
 msgid ""
@@ -5868,8 +5911,8 @@ msgstr ""
 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 "
@@ -5886,11 +5929,11 @@ msgstr ""
 
 #: ../lib/types/user.inc:44 ../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."
@@ -5898,7 +5941,7 @@ 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."
@@ -5906,12 +5949,12 @@ msgstr ""
 "このグループのメンバーとなるユーザ。ユーザ名はセミコロンによって区切られま"
 "す。"
 
-#: ../templates/tests/lamdaemonTest.php:156
+#: ../templates/tests/lamdaemonTest.php:217
 #, php-format
 msgid "Using %s as lamdaemon remote server."
 msgstr "lamdaemonリモートサーバとして %s を使用します。"
 
-#: ../templates/tests/lamdaemonTest.php:177
+#: ../templates/tests/lamdaemonTest.php:238
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "%sを使用してリモートサーバーに接続します。"
@@ -5920,24 +5963,31 @@ 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
+#: ../templates/delete.php:204 ../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 を作成できませんでした。"
@@ -5950,31 +6000,33 @@ msgstr "DN %s を削除できませんでした。"
 
 #: ../templates/tree/update.php:109 ../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
+#: ../templates/delete.php:212 ../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 ""
 
@@ -5986,63 +6038,56 @@ msgstr ""
 "ldaps:// を使う時は、証明書のIP/ドメイン名と正確に一致するものを使用してくだ"
 "さい。"
 
-#: ../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 "初期プログラムの作業ディレクトリ。"
 
@@ -6054,7 +6099,7 @@ msgstr "書く"
 msgid "Write access"
 msgstr ""
 
-#: ../templates/login.php:429 ../templates/selfService/selfServiceLogin.php:89
+#: ../templates/login.php:440 ../templates/selfService/selfServiceLogin.php:89
 #: ../templates/selfService/selfServiceLogin.php:101
 msgid "Wrong password/user name combination. Please try again."
 msgstr "誤ったパスワード/ユーザ名の組み合わせです。やり直してください。"
@@ -6064,7 +6109,7 @@ 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."
@@ -6072,7 +6117,7 @@ msgstr ""
 "大文字が使われています。Windowsは大文字と小文字を区別しないため、これが原因で"
 "問題が発生する場合があります。"
 
-#: ../lib/modules/account.inc:135 ../lib/modules/posixAccount.inc:76
+#: ../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 "
@@ -6081,11 +6126,13 @@ 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 "LDAP属性に対応するワイルドカードを @@attributes@@ のような書式(例. ユーザ名は @@uid@@)で使用することができます。"
+msgstr ""
+"LDAP属性に対応するワイルドカードを @@attributes@@ のような書式(例. ユーザ名"
+"は @@uid@@)で使用することができます。"
 
 #: ../templates/tree/templates/creation/custom.php:106
 msgid ""
@@ -6099,13 +6146,15 @@ msgstr ""
 msgid ""
 "You do not have the required access rights or the LDAP schema is not "
 "published by your server."
-msgstr "必要なアクセス権が与えられていないか、またはLDAPスキーマがサーバ上に存在しません。"
+msgstr ""
+"必要なアクセス権が与えられていないか、またはLDAPスキーマがサーバ上に存在しま"
+"せん。"
 
 #: ../templates/logout.php:77
 msgid "You have been logged off from LDAP Account Manager."
 msgstr "LDAP Account Managerからログオフしました。"
 
-#: ../templates/lists/changePassword.php:277
+#: ../templates/lists/changePassword.php:283
 msgid "You have to activate the \"I am sure\" checkbox."
 msgstr "\"確認\"のチェックボックスを有効にする必要があります。"
 
@@ -6122,11 +6171,11 @@ 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!"
@@ -6155,33 +6204,42 @@ 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 ""
 
-#: ../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 ""
 
+#: ../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 ""
 
@@ -6201,13 +6259,13 @@ msgstr ""
 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 "切断"
 
@@ -6223,10 +6281,10 @@ msgid "download value"
 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:85 ../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 "電子メールアドレス"
 
@@ -6234,41 +6292,46 @@ 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 ""
 
-#: ../lib/modules/quota.inc:178 ../lib/modules/quota.inc:180
+#: ../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 ""
 
@@ -6292,29 +6355,29 @@ msgstr ""
 "ldaps://141.40.146.133 は、141.40.146.133 へ暗号化されたLDAP接続を行ないま"
 "す。"
 
-#: ../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 ""
 
-#: ../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 "いいえ"
 
@@ -6352,34 +6415,30 @@ msgstr ""
 msgid "ou=accounts,dc=yourdomain,dc=org"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:273
+#: ../lib/modules/posixAccount.inc:279
 msgid "pc01$"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:294
+#: ../lib/modules/posixAccount.inc:300
 msgid "pc01,Room 2.34"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:312
+#: ../lib/modules/inetOrgPerson.inc:350
 msgid "pc01,pc02"
 msgstr ""
 
 #: ../templates/tree/edit.php:246 ../templates/config/confmain.php:466
-#: ../templates/selfService/adminMain.php:554 ../lib/modules.inc:992
+#: ../templates/selfService/adminMain.php:554 ../lib/modules.inc:1134
 msgid "required"
 msgstr "必須"
 
-#: ../templates/config/confmain.php:467
-msgid "required for Samba 3 accounts"
-msgstr "Samba 3アカウントにおいて必須"
-
-#: ../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 ""
 
@@ -6387,20 +6446,20 @@ msgstr ""
 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 ""
 
-#: ../lib/modules/inetLocalMailRecipient.inc:96
+#: ../lib/modules/inetLocalMailRecipient.inc:98
 msgid "smiller@otherdomain.org"
 msgstr ""
 
-#: ../lib/modules/inetLocalMailRecipient.inc:102
+#: ../lib/modules/inetLocalMailRecipient.inc:104
 msgid "smiller@yourdomain.org"
 msgstr ""
 
-#: ../lib/modules/ldapPublicKey.inc:74
+#: ../lib/modules/ldapPublicKey.inc:76
 msgid "ssh-dss 234234 user@host"
 msgstr ""
 
@@ -6412,30 +6471,115 @@ msgstr "構造型"
 msgid "true"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:215
+#: ../lib/modules/inetOrgPerson.inc:229
 msgid "uid=smiller,ou=People,dc=company,dc=com"
 msgstr ""
 
-#: ../lib/modules/posixGroup.inc:362
+#: ../lib/modules/posixGroup.inc:370
 msgid "user01,user02,user03"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:275
+#: ../lib/modules/inetOrgPerson.inc:289
 msgid "user@company.com"
 msgstr ""
 
-#: ../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 "Current projects"
+#~ msgstr "現在のプロジェクト"
+
+#~ msgid "Date when the employee was initially employed."
+#~ msgstr "従業員が最初に雇用された日付。"
+
+#~ msgid "Department"
+#~ msgstr "部署"
+
+#~ msgid "Employee skills"
+#~ msgstr "従業員のスキル"
+
+#~ msgid "Employment date"
+#~ msgstr "雇用された日"
+
+#~ 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 groups"
+#~ msgstr "プロジェクトグループ"
+
+#~ 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 "Samba 3アカウントにおいて必須"
+
 #~ msgid "Apply"
 #~ msgstr "適用"
 
@@ -6487,9 +6631,6 @@ msgstr "はい"
 #~ msgid "Minimum UID number for Unix accounts (hosts)"
 #~ msgstr "unixアカウント(ホスト)に対するUID番号の最小値"
 
-#~ msgid "Minimum UID number for Unix accounts (users)"
-#~ msgstr "unixアカウント(ユーザ)に対するUID番号の最小値"
-
 #~ msgid "Password hash type for Unix accounts"
 #~ msgstr "unixアカウントに対するパスワードハッシュ形式"
 
@@ -6794,9 +6935,6 @@ msgstr "はい"
 #~ msgid "Maximize with correct ratio"
 #~ msgstr "縦横比を維持したまま最大化"
 
-#~ msgid "Password expire"
-#~ msgstr "パスワード有効期限"
-
 #~ msgid "Password warn"
 #~ msgstr "パスワード警告"
 
diff --git a/lam/locale/zh_TW/LC_MESSAGES/messages.mo b/lam/locale/zh_TW/LC_MESSAGES/messages.mo
index a971acf7..37899bf9 100644
Binary files a/lam/locale/zh_TW/LC_MESSAGES/messages.mo and b/lam/locale/zh_TW/LC_MESSAGES/messages.mo differ
diff --git a/lam/locale/zh_TW/LC_MESSAGES/messages.po b/lam/locale/zh_TW/LC_MESSAGES/messages.po
index 36506b3a..b8d1c64a 100644
--- a/lam/locale/zh_TW/LC_MESSAGES/messages.po
+++ b/lam/locale/zh_TW/LC_MESSAGES/messages.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: LAM 2.2.0\n"
+"Project-Id-Version: LAM 2.3.0\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de\n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2008-01-20 09:17+0800\n"
+"PO-Revision-Date: 2008-04-18 19:40+0800\n"
 "Last-Translator: 洪志明 <imeuimeu@yahoo.com.tw>\n"
 "Language-Team: Chinese (Traditional) <imeuimeu@yahoo.com.tw>\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: TAIWAN\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 "$user 和 $group 會被使用者名稱及主要群組名稱所取代"
 
@@ -30,7 +30,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 個群組"
@@ -66,27 +67,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"
 
@@ -94,20 +95,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 "阿布達比, 馬斯喀特, 巴庫"
 
@@ -115,16 +107,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
@@ -132,8 +124,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
@@ -182,27 +172,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
@@ -222,11 +214,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:"
@@ -235,7 +227,7 @@ msgstr "帳號 %s:"
 msgid "Account creation via file upload"
 msgstr "使用上傳檔案建立帳號"
 
-#: ../lib/modules/posixAccount.inc:382
+#: ../lib/modules/posixAccount.inc:392
 msgid "Account deactivated"
 msgstr "帳號已停用"
 
@@ -243,42 +235,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 "帳號清單 - 搜尋過濾器"
 
@@ -286,8 +283,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 "帳號類型"
 
@@ -304,36 +313,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項目(如 users 和 groups). 帳號模組定義要編修那一些屬性 (如 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 "設定這個核取方塊將會刪除使用者個人目錄."
 
@@ -347,35 +356,35 @@ msgstr "啟用的(active)帳號類型"
 #: ../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 "新增 Samba 3 的帳號"
 
-#: ../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 "新增設定輸入欄位"
 
@@ -392,38 +401,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 "新增 phpGroup Ware 延伸功能"
+
 #: ../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 "附加的群組"
 
@@ -431,37 +445,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 "管理 (Administration)"
 
-#: ../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 "別名"
 
@@ -474,12 +488,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 "下文來自郵件本文"
 
@@ -488,32 +502,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 "Almaty(哈薩克首都), 達卡, 可倫坡"
 
@@ -530,8 +544,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 "任何人"
 
@@ -539,7 +554,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 "大西洋時間(加拿大), 卡拉卡斯"
 
@@ -552,19 +567,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 "可選用的群組"
 
@@ -572,32 +583,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
@@ -613,11 +624,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 "返回帳號列表"
 
@@ -629,8 +640,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 "回登入畫面"
 
@@ -645,11 +656,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 "曼谷, 河內, 雅加達"
 
@@ -666,11 +677,11 @@ msgstr "基礎識別名稱"
 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 "北京, 柏斯, 新加坡"
 
@@ -679,14 +690,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 "區塊硬性配額"
@@ -714,7 +717,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 "巴西, 布宜若斯艾利斯"
 
@@ -723,14 +726,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 "公司類別 (例如: 政府機構, 資訊服務, 管理業...)"
 
@@ -743,25 +746,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 "可以留空白"
 
@@ -774,38 +777,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 "無法開啟設定檔!"
 
@@ -813,37 +816,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 "更改使用者和主機的 GIDi編號"
 
@@ -856,7 +862,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 "變更系統管理者密碼"
@@ -864,10 +870,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 "更改密碼"
@@ -877,7 +883,7 @@ msgstr "更改密碼"
 msgid "Change passwords"
 msgstr "更改密碼"
 
-#: ../templates/login.php:344
+#: ../templates/login.php:356
 msgid "Change profile"
 msgstr "變更伺服器設定檔"
 
@@ -890,7 +896,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字元."
 
@@ -902,6 +908,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 "請仔細檢查您的輸入. LAM 對上傳的資料只做基本的檢查."
@@ -919,9 +929,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 "客戶端印表機為預設"
 
@@ -933,18 +943,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 帳號"
-
-#: ../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工作站,可逗點分隔.留空白表示任何工作站都可以登入."
 
@@ -953,16 +953,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 "使用者全名"
 
@@ -992,20 +992,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 "連結時間限制"
 
@@ -1027,20 +1027,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 "國籍名稱錯誤!"
 
@@ -1057,8 +1057,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檔"
 
@@ -1070,7 +1070,8 @@ msgstr "將所有Email別名匯出成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檔"
 
@@ -1094,7 +1095,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檔"
 
@@ -1118,7 +1120,7 @@ msgstr "為所選的範圍(scope)建立新的PDF架構:"
 msgid "Create a new profile"
 msgstr "建立新的設定檔"
 
-#: ../lib/modules.inc:1073
+#: ../lib/modules.inc:1215
 msgid "Create another account"
 msgstr "新增另一個帳號"
 
@@ -1126,8 +1128,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 "建立個人目錄"
 
@@ -1156,14 +1158,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 "自定"
@@ -1176,8 +1170,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"
 
@@ -1186,7 +1180,7 @@ msgid "DN settings"
 msgstr "DN 設定"
 
 #: ../templates/masscreate.php:154
-#: ../help/help.inc:146
+#: ../help/help.inc:148
 msgid "DN suffix"
 msgstr "DN 尾碼"
 
@@ -1199,21 +1193,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."
 
@@ -1223,23 +1213,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)的格式錯誤"
 
@@ -1249,6 +1241,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 "刪除"
@@ -1258,7 +1251,7 @@ msgstr "刪除"
 msgid "Delete %s"
 msgstr "刪除 %s"
 
-#: ../lib/modules/kolabUser.inc:406
+#: ../lib/modules/kolabUser.inc:425
 msgid "Delete Kolab account"
 msgstr "刪除Kolab帳號"
 
@@ -1280,11 +1273,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 "刪除使用者個人目錄"
 
@@ -1302,11 +1296,11 @@ msgid "Delete operation canceled."
 msgstr "已取消刪除動作"
 
 #: ../templates/ou_edit.php:183
-#: ../help/help.inc:186
+#: ../help/help.inc:188
 msgid "Delete organizational unit"
 msgstr "刪除organizational unit"
 
-#: ../lib/modules/inetOrgPerson.inc:843
+#: ../lib/modules/inetOrgPerson.inc:942
 msgid "Delete photo"
 msgstr "刪除相片"
 
@@ -1350,70 +1344,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 "顯示名稱"
 
@@ -1433,7 +1419,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 "確定將這個帳號標示為刪除?"
 
@@ -1445,44 +1431,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 "網域管理者群組"
 
@@ -1493,9 +1479,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 "網域電腦"
@@ -1525,11 +1511,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 "網域名稱"
 
@@ -1538,8 +1524,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 "網域名稱無效!"
 
@@ -1557,7 +1543,7 @@ msgstr "網域 Schema 管理者"
 
 #: ../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 "網域使用者"
@@ -1566,15 +1552,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 分配給使用者個人目錄使用的網路磁碟機編號."
 
@@ -1582,46 +1568,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 "編輯"
@@ -1639,11 +1625,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 "設定成員"
 
@@ -1663,43 +1649,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 "密碼空白,請重試."
 
@@ -1707,7 +1677,7 @@ msgstr "密碼空白,請重試."
 msgid "Encountered an error while performing search."
 msgstr "搜尋時發生錯誤."
 
-#: ../lib/modules/sambaSamAccount.inc:476
+#: ../lib/modules/sambaSamAccount.inc:478
 msgid "Eniwetok, Kwajalein"
 msgstr "埃尼威托克島, 瓜加林島"
 
@@ -1733,7 +1703,7 @@ msgstr "項目 %s 刪除成功"
 msgid "Equality"
 msgstr "相等比對規則"
 
-#: ../templates/config/mainmanage.php:208
+#: ../templates/config/mainmanage.php:256
 msgid "Error"
 msgstr "錯誤"
 
@@ -1755,7 +1725,7 @@ msgid "Example"
 msgstr "範例"
 
 #: ../templates/masscreate.php:162
-#: ../templates/masscreate.php:322
+#: ../templates/masscreate.php:321
 msgid "Example value"
 msgstr "範例值"
 
@@ -1767,7 +1737,7 @@ msgstr "範例"
 msgid "Execute"
 msgstr "執行"
 
-#: ../templates/tests/lamdaemonTest.php:231
+#: ../templates/tests/lamdaemonTest.php:292
 msgid "Execute lamdaemon"
 msgstr "執行 lamdaemon"
 
@@ -1797,25 +1767,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 會以使用者及群組名稱所置換."
 
@@ -1834,12 +1804,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 "名字"
 
@@ -1848,32 +1818,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 "使用者的名字(first name),只容許使用字母,-(減號)和空白"
 
-#: ../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 "星期五"
 
@@ -1881,26 +1853,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"
 
@@ -1909,25 +1881,25 @@ msgstr "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 "德國"
 
@@ -1938,21 +1910,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 "inode(檔案數目)配額的寬限期,大部分的檔案系統都設定最大為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 "檔案數目配額的寬限期"
 
@@ -1961,74 +1933,78 @@ msgstr "檔案數目配額的寬限期"
 msgid "Group"
 msgstr "群組"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:161
-msgid "Group 1, Group 2"
-msgstr "群組 01,群組 02"
-
 #: ../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指令不允許以數字開頭的群組名稱, 所以 LAM 也不允許. 如果該群組名稱已經存在, 則會在結尾自動加上下一個可用的數字"
 
-#: ../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 "Group of names accounts"
+
+#: ../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 "群組密碼"
 
@@ -2037,40 +2013,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 "標題"
 
@@ -2079,18 +2057,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
@@ -2122,15 +2101,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 "說明"
 
@@ -2142,7 +2121,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 "您可以在此更改終端伺服器的存取設定."
 
@@ -2150,19 +2129,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*'). LAM在過濾時不分大小寫."
 
-#: ../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 "您可以指定一個帳號設定檔來設定此帳號的預設值.新增的帳號會自動使用\"default\"設定檔."
 
@@ -2170,7 +2149,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檔."
 
@@ -2182,7 +2161,15 @@ msgstr "您可以在此選擇 LAM 要將記錄檔存放在何處. \"系統記錄
 msgid "Here you can select which plugins you want to use for account management."
 msgstr "您可以選擇一些帳號管理的額外功能(plugins)"
 
-#: ../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 "您可以在此指定使用者密碼的最小長度."
 
@@ -2190,7 +2177,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的模式."
 
@@ -2210,27 +2197,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 "個人目錄"
 
@@ -2239,35 +2226,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 "個人目錄的路徑"
 
@@ -2278,12 +2265,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 "住宅電話號碼"
 
@@ -2300,24 +2287,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 "主機帳號名稱"
 
@@ -2337,8 +2324,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也不允許. 主機名稱必須以 $ 結尾. 如果不是,系統會自動加上. 如果該主機名稱已經存在,則會在結尾自動加上下一個可用的數字."
 
@@ -2346,7 +2333,7 @@ msgstr "將要建立的主機名稱, 可用的字元為: a-z, A-Z, 0-9, .-_$ . 
 #: ../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 "主機帳號"
 
@@ -2354,112 +2341,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 "資訊科技"
-
 #: ../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的密碼當smaba的密碼."
 
-#: ../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 "若留空白,依則會自動產生,端視於您的環境設定."
 
-#: ../lib/modules/posixAccount.inc:338
+#: ../lib/modules/posixAccount.inc:348
 msgid "If empty UID number will be generated automaticly."
 msgstr "若留空白,則會自動產生."
 
-#: ../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 "如果設為真,則會以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 "如果設為真,帳號將會被停用(設定 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 "如果設為真,則不需密碼."
 
-#: ../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 "如果設為真,則這個密碼不會過期(設定 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\" 這個mail樣版."
 
-#: ../lib/modules/sambaSamAccount.inc:261
+#: ../lib/modules/sambaSamAccount.inc:263
 msgid "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr "若留空白,則預設使用的演算法為: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 "如果設為真,則該 phpGroupware 延伸功能會被加入."
+
 #: ../help/help.inc:100
 msgid "If you want to change the current preferences password, please enter it here."
 msgstr "您可以在這裡更改這個系統設定檔的管理密碼."
@@ -2468,12 +2456,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 "如果您想要使用公開的(well-known)的RID,您可以選擇一個公開的(well-known)群組."
 
@@ -2481,9 +2469,9 @@ msgstr "如果您想要使用公開的(well-known)的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 "繼承客戶端的啟動設定"
 
@@ -2497,9 +2485,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 "初始程式"
 
@@ -2559,57 +2547,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可能會被重覆使用.這會造成一些問題. 因為可能會存在屬於該ID權限的舊檔案.要避免這個警告訊息,請將最大的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 帳號"
-
-#: ../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 "使用者的職稱.如總裁,部長...."
 
@@ -2627,7 +2596,7 @@ msgstr "選擇一個屬性類型"
 msgid "Jump to an object class"
 msgstr "選擇一個物件類別"
 
-#: ../lib/modules/kolabUser.inc:70
+#: ../lib/modules/kolabUser.inc:72
 msgid "Kolab"
 msgstr "Kolab"
 
@@ -2636,7 +2605,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 系統設定"
@@ -2645,8 +2614,8 @@ msgstr "LAM 系統設定"
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "LAM已經檢查您的輸入,現在準備建立帳號."
 
-#: ../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 "LAM支援 CRYPT, SHA, SSHA, MD5 和 SMD5 的雜湊演算法, 用來產生密碼的雜湊值. SSHA 和 CRYPT 是最常用的. 但 CRYPT 並不支援超過 8 個字元的密碼. 我們不建議使用明文的密碼."
 
@@ -2660,7 +2629,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 "LAM找不到這個名稱的Samba3網域!"
 
@@ -2672,16 +2641,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."
 
@@ -2691,12 +2660,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 Account Manager設定"
 
+#: ../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=compant,dc=com). 這被用來尋找可能的授權者."
+
 #: ../lib/lists.inc:854
 msgid "LDAP Search failed! Please check your preferences."
 msgstr "LDAP搜尋失敗! 請檢查您的設定."
@@ -2705,11 +2678,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操作成功."
 
@@ -2718,15 +2691,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限制的大小,無法顯示全部項目."
@@ -2735,7 +2708,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的尾碼"
 
@@ -2751,7 +2724,7 @@ msgstr "LDAP上載中,請稍候."
 msgid "LDAP user"
 msgstr "LDAP 使用者"
 
-#: ../help/help.inc:159
+#: ../help/help.inc:161
 msgid "LDAP user and password"
 msgstr "LDAP 使用者及密碼"
 
@@ -2760,36 +2733,37 @@ msgstr "LDAP 使用者及密碼"
 msgid "LDIF Export for: %s"
 msgstr "匯出節點 %s 的LDIF檔"
 
-#: ../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 "尚未定義語言!"
 
@@ -2797,14 +2771,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 "姓氏"
 
@@ -2813,11 +2797,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 "最後密碼變更"
 
@@ -2838,20 +2822,12 @@ msgstr "列出屬性"
 msgid "List attributes are invalid!"
 msgstr "清單上的屬性設定錯誤!"
 
-#: ../lib/modules/neofonieInetOrgPerson.inc:83
-msgid "List of ComBots IDs."
-msgstr "ComBots 帳號清單."
-
-#: ../lib/modules/neofonieInetOrgPerson.inc:86
-msgid "List of Jabber IDs."
-msgstr "Jabber 帳號清單."
-
-#: ../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 "管理者清單是空的或是無效的."
 
@@ -2859,35 +2835,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 "本機郵件信箱的清單"
 
@@ -2895,52 +2859,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
@@ -2948,57 +2922,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 "登入指令檔"
 
@@ -3015,75 +2989,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 "郵件檔案(mailbox)伺服器"
 
-#: ../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 "郵件檔案伺服器名稱錯誤 !"
 
@@ -3091,16 +3065,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 "主頁標題"
 
@@ -3112,10 +3086,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 "管理者(上司)"
 
@@ -3131,12 +3105,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 "標示為刪除"
 
@@ -3164,17 +3138,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!"
 
@@ -3182,8 +3156,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編號"
 
@@ -3214,57 +3188,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 "美國中部大西洋沿岸(Mid-Atlantic)"
 
-#: ../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 "Miller"
 
-#: ../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編號"
 
@@ -3273,29 +3247,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 "手機號碼"
 
@@ -3307,30 +3305,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 "Mountain Time(美國和加拿大)"
 
-#: ../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號"
 
@@ -3340,16 +3342,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位址"
 
@@ -3357,10 +3358,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 "新的別名"
@@ -3373,7 +3378,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 "新增群組"
 
@@ -3381,11 +3391,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 "系統管理者的新密碼"
 
@@ -3399,16 +3409,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 "新增organizational unit物件"
 
-#: ../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 "新密碼"
 
@@ -3416,7 +3426,7 @@ msgstr "新密碼"
 msgid "New password set successfully."
 msgstr "新密碼設定成功."
 
-#: ../lib/modules/nisMailAlias.inc:150
+#: ../lib/modules/nisMailAlias.inc:152
 msgid "New recipient"
 msgstr "新增收信者"
 
@@ -3424,6 +3434,10 @@ msgstr "新增收信者"
 msgid "New required attributes:"
 msgstr "新增的必要屬性"
 
+#: ../templates/pdfedit/pdfpage.php:553
+msgid "New section"
+msgstr "新增section"
+
 #: ../lib/types/user.inc:128
 msgid "New user"
 msgstr "新增使用者"
@@ -3438,51 +3452,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不是數字!"
 
@@ -3493,18 +3507,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 3網域,請先建立一個."
 
-#: ../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群組,請先建立."
 
@@ -3528,12 +3542,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 "找不到群組!"
 
@@ -3545,19 +3560,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 "沒有標誌"
 
@@ -3577,7 +3593,7 @@ msgstr "沒有輸入密碼!"
 msgid "No problems found."
 msgstr "找不到任何問題!"
 
-#: ../templates/pdfedit/pdfpage.php:128
+#: ../templates/pdfedit/pdfpage.php:126
 msgid "No section text specified"
 msgstr "沒有指定區段文字"
 
@@ -3585,7 +3601,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 "沒有指定靜態文字"
 
@@ -3610,7 +3626,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 "注意"
 
@@ -3618,27 +3634,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 "多後之後使用者必須更改密碼.(密碼到期),以秒為單位"
 
@@ -3668,8 +3684,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編輯器"
 
@@ -3684,20 +3700,30 @@ msgstr "物件類別"
 msgid "Obsolete"
 msgstr "已過時(Obsolete)"
 
-#: ../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 "Off"
 
+#: ../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
@@ -3705,7 +3731,7 @@ msgstr "Off"
 #: ../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
@@ -3715,15 +3741,14 @@ msgstr "Off"
 #: ../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"
@@ -3733,18 +3758,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 "在中斷或逾時的連結"
 
@@ -3778,11 +3803,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 "擁有者"
 
@@ -3790,12 +3816,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架構儲存成功."
 
@@ -3803,55 +3828,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
@@ -3863,25 +3884,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 "密碼寬限期"
 
@@ -3890,44 +3911,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 "密碼警告日期"
 
@@ -3936,16 +3962,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會以使用者及群組名稱來置換."
 
@@ -3957,25 +3983,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 "您的公開ssh金鑰清單,以逗點分隔."
 
@@ -3983,11 +4009,15 @@ msgstr "您的公開ssh金鑰清單,以逗點分隔."
 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 "請輸入允許使用者登入的主機清單,以逗點分隔. 如果您的伺服器已使用主機限制功能,則星號(*)表示所有主機,空白表示沒有任何主機."
 
@@ -3998,12 +4028,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"
@@ -4020,11 +4050,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
@@ -4104,18 +4129,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 "請先在另一頁輸入帳號資訊."
 
@@ -4139,16 +4164,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 "請設定這個掛載點的磁碟配額.語法是:{軟性區塊配額},{強制區塊配額},{軟性檔案數目配額},{強制檔案數目配額}"
 
@@ -4158,13 +4183,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表示不限制."
 
@@ -4176,11 +4201,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 檔中啟動該模組!"
 
@@ -4188,7 +4213,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)."
 
@@ -4200,11 +4225,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 頁面的所有必要資訊"
@@ -4214,52 +4239,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 "郵遞區號"
 
@@ -4267,24 +4295,24 @@ msgstr "郵遞區號"
 msgid "Predefined values"
 msgstr "已定義的值"
 
-#: ../lib/modules/inetOrgPerson.inc:203
+#: ../lib/modules/inetOrgPerson.inc:217
 msgid "President"
 msgstr "President"
 
-#: ../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 "私人電話號碼"
 
@@ -4314,7 +4342,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 "設定檔名稱"
 
@@ -4337,21 +4365,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 "設定檔路徑"
 
@@ -4365,33 +4393,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 帳號"
-
-#: ../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 的磁碟配額:"
@@ -4406,8 +4413,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屬性"
 
@@ -4415,11 +4422,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 基數"
 
@@ -4440,21 +4447,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 "中斷則自動重連"
 
@@ -4462,12 +4469,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 "確認密碼"
 
@@ -4491,28 +4498,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 "移除 phpGroup Ware 延伸功能"
+
+#: ../lib/modules/groupOfNames.inc:328
 msgid "Remove selected entries"
 msgstr "刪除所選的項目"
 
@@ -4520,7 +4532,7 @@ msgstr "刪除所選的項目"
 msgid "Remove this account type"
 msgstr "刪除這個帳號類型"
 
-#: ../lib/modules/inetOrgPerson.inc:1324
+#: ../lib/modules/inetOrgPerson.inc:1481
 msgid "Remove/replace photo"
 msgstr "移除/更換相片"
 
@@ -4536,17 +4548,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. "
 
@@ -4561,30 +4573,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 "鎖定密碼後的重設時間必須是一個自然數."
 
@@ -4593,61 +4605,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 錯誤!"
 
@@ -4655,27 +4667,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 網域名稱"
 
@@ -4683,46 +4695,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 "儲存"
 
@@ -4748,15 +4760,15 @@ msgstr "領域(Scope)"
 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 "指令檔伺服器無效!"
 
@@ -4780,21 +4792,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 "也參考"
 
@@ -4806,7 +4818,7 @@ msgstr "為所要新增的物件選擇一種樣版"
 msgid "Select all"
 msgstr "全選"
 
-#: ../lib/modules/posixAccount.inc:1065
+#: ../lib/modules/posixAccount.inc:1090
 msgid "Selected groups"
 msgstr "已選擇的群組"
 
@@ -4814,7 +4826,7 @@ msgstr "已選擇的群組"
 msgid "Selected modules"
 msgstr "已選擇的模組"
 
-#: ../lib/modules/posixGroup.inc:228
+#: ../lib/modules/posixGroup.inc:236
 msgid "Selected users"
 msgstr "已選擇的使用者"
 
@@ -4826,13 +4838,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 "伺服器位址錯誤!"
@@ -4841,7 +4857,7 @@ msgstr "伺服器位址錯誤!"
 msgid "Server list"
 msgstr "伺服器清單"
 
-#: ../templates/login.php:326
+#: ../templates/login.php:338
 msgid "Server profile"
 msgstr "伺服器設定檔"
 
@@ -4850,22 +4866,27 @@ msgstr "伺服器設定檔"
 msgid "Server settings"
 msgstr "伺服器設定"
 
-#: ../templates/config/mainmanage.php:152
+#: ../templates/config/mainmanage.php:159
 #: ../help/help.inc:129
 msgid "Session timeout"
 msgstr "連結(Session)期限"
 
-#: ../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 "Set primary group as 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 "設定隨機的密碼"
 
@@ -4873,17 +4894,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 "Shadowing"
 
@@ -4895,7 +4916,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 "將主要的群組成員以一般的群組成員來顯示"
 
@@ -4903,31 +4924,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 "軟性檔案數目配額限制."
 
@@ -4936,31 +4957,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 "State"
+
+#: ../templates/pdfedit/pdfpage.php:493
+#: ../templates/pdfedit/pdfpage.php:497
 msgid "Static text"
 msgstr "靜態文字"
 
@@ -4972,33 +5002,33 @@ msgstr "步驟1: 名稱和物件類別"
 msgid "Step 2 of 2: Specify attributes and values"
 msgstr "步驟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 "架構名稱"
 
@@ -5015,26 +5045,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 密碼"
 
@@ -5052,32 +5082,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 "Target of invitation policy 錯誤 !"
 
 #: ../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 "臨時雇員, 合約到年底"
 
@@ -5085,8 +5114,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 "終端伺服器選項"
 
@@ -5094,11 +5123,15 @@ msgstr "終端伺服器選項"
 msgid "Tests"
 msgstr "測試"
 
+#: ../templates/pdfedit/pdfpage.php:607
+msgid "Text field"
+msgstr "文字表單"
+
 #: ../help/help.inc:103
 msgid "Text for user PDF"
 msgstr "Text for user 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 郵件空間配額, 以MBytes為單位, 若留空白表示沒有限制."
 
@@ -5107,7 +5140,7 @@ msgstr "使用者的 Cyrus 郵件空間配額, 以MBytes為單位, 若留空白
 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\"指令可以取得."
 
@@ -5115,7 +5148,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值設為相等或使用各自獨立的UID範圍."
 
-#: ../help/help.inc:147
+#: ../help/help.inc:149
 msgid "The account will be saved under this LDAP suffix."
 msgstr "該帳號會被儲存在這個LDAP 尾綴(suffix) 節點之下."
 
@@ -5129,19 +5162,16 @@ msgstr "%s 這個屬性不被您的 LDAP 伺服器的 %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 "第一行為主題."
 
@@ -5154,11 +5184,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 "使用者目錄將被連結在此磁碟機."
 
@@ -5166,20 +5196,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網域或群組的名稱."
 
@@ -5188,7 +5218,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 "這個群組的擁有者."
 
@@ -5198,35 +5232,65 @@ 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
+#: ../help/help.inc:182
 msgid "The wildcard for the new password is @@newPasssword@@."
 msgstr "新密碼使用的萬用字元格式是 @@新密碼@@"
 
@@ -5234,11 +5298,11 @@ msgstr "新密碼使用的萬用字元格式是 @@新密碼@@"
 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 "只能有一個此類型的群組."
 
@@ -5246,15 +5310,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編號.新的群組帳號會配發目前已被使用的最大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 主機帳號時,可以配發的最小及最大UID,這個範圍應該和使用者帳號的UID有所區隔.新的主機帳號會配發目前已被使用的UID編號加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,其範圍應該和主機帳號不同.新的使用者帳號會配發目前已被使用的最大編號加1的UID號碼."
 
@@ -5262,14 +5326,18 @@ msgstr "新增使用者帳號時,所能配發的最小及最大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 "您可以將這個帳號設為特殊的使用者, 類似 管理者(administrator) 或 來賓(guest)"
 
+#: ../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 "改變設定檔的管理密碼"
@@ -5290,6 +5358,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 "本文件由LDAP Account Manager自動產生"
@@ -5307,27 +5379,27 @@ msgstr "這個項目是一個包含 %s 個項目的子樹的根."
 msgid "This gecos value is invalid!"
 msgstr "備註(gecos)欄位的內容無效"
 
-#: ../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 "這是以逗點分隔的delegate清單."
 
-#: ../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 "這是以逗點分隔的MAC位址清單."
 
-#: ../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 "這是以逗點分隔的使用者公開的email清單."
 
@@ -5335,11 +5407,11 @@ msgstr "這是以逗點分隔的使用者公開的email清單."
 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 "這是一組可以存取LAM系統的主機位址清單. 可以使用\"*\" 當萬用字元(例如 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 "這是隸屬於這個群組的成員清單.以分號隔開."
 
@@ -5351,11 +5423,11 @@ msgstr "這是一份 lamdaemon 指令檔所在的伺服器清單. LAM 會以使
 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 "這是所有容許登入 LAM 的使用者的 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\" ,則LAM將會使用 uid=miller 這個條件來搜尋帳號."
 
@@ -5367,31 +5439,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 "這是一個使用者公開的 email信箱."
 
-#: ../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."
 
@@ -5399,26 +5471,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).您必需從下拉式表單中選擇其一(例如,使者帳號通常使用\"uid\",而群組通常使用\"cn\"))"
 
@@ -5426,31 +5499,31 @@ msgstr "指定那一個屬性做為該項目的相對識別名稱(RDN).您必需
 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:屬性欄位名稱\".多個屬位欄位要以分號來分隔."
 
-#: ../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). 若未填寫, 則會使用主機名稱(host 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 "這是使用者的natural name. 若未填寫, 則會使用first 和 last name."
 
-#: ../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 "這是使用者的natural name.若留空白,會使用first and last name或user name."
 
-#: ../lib/modules/sambaDomain.inc:113
+#: ../lib/modules/sambaDomain.inc:115
 msgid "This is the number of bad logon attempts (0 - 999) before the accounts is deactivated. 0 means unlimited attempts."
 msgstr "指帳號被停用之前可嘗試登入錯誤的次數. 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 "這是指要儲存歷史密碼的次數,以防止使用者重覆使用舊密碼."
 
@@ -5458,19 +5531,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 "這個群組帳號的RID(relative 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帳號的RID(relative 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 "這個主機帳號的RID,若留空白,則會使用uidNumber*2 + sambaAlgorithmicRidBase演算法來自動計算."
 
@@ -5486,11 +5559,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會從這個尾碼子樹開始搜尋使用者/群組/主機 項目.只有位於這個尾碼節點以下的項目,才會顯示在使用者/群組/主機 的清單中.在建立新帳號時,這就是它的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表示永遠."
 
@@ -5502,27 +5575,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的搜尋結果,這裡設定快取的有效時間,以分為單位,設定較短的時間,會占用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 帳號."
-
-#: ../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 "這是該使用者隸屬的主要windodws群組."
 
@@ -5530,7 +5591,7 @@ msgstr "這是該使用者隸屬的主要windodws群組."
 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 "這個 Email 已經存在: "
 
@@ -5538,35 +5599,35 @@ msgstr "這個 Email 已經存在: "
 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 "設定這個帳號可以登入的時間.The format is the same as for the LDAP attribute. 使用168(24*7)個位元來表示,這168個位元以21個位元組來儲存(21*8=168).第一個位元表示格林威治時間星期日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搜尋屬性(例如 email 或 使用者名稱)."
 
@@ -5598,19 +5659,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 "在所選擇的節點下建立一個ou物件"
 
-#: ../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 "刪除所選擇的ou物件,這個ou物件必需是空的."
 
@@ -5618,47 +5679,47 @@ msgstr "刪除所選擇的ou物件,這個ou物件必需是空的."
 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表示該使用者無法使用shell登入. 這裡的shell清單取自lam/config/shells檔案中."
 
-#: ../lib/modules/sambaSamAccount.inc:497
+#: ../lib/modules/sambaSamAccount.inc:499
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "東京, 首爾, 大阪, 亞庫次克"
 
@@ -5671,7 +5732,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編號轉換為群組名稱"
 
@@ -5684,11 +5745,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 "星期二"
 
@@ -5712,13 +5773,13 @@ msgstr "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編號"
 
@@ -5731,16 +5792,16 @@ msgstr "使用者的UID已經變更.要維持所屬檔案的使用者,您必須
 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 "使用者個人目錄的UNC路徑(\\\\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!"
@@ -5769,13 +5830,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 項目 :"
 
@@ -5803,24 +5864,24 @@ msgstr "無法取得shcema資料!"
 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工作站"
 
@@ -5829,12 +5890,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 "解除密碼鎖定"
 
@@ -5842,7 +5903,7 @@ msgstr "解除密碼鎖定"
 msgid "Unsolved dependency:"
 msgstr "未解決的相依性問題:"
 
-#: ../templates/pdfedit/pdfpage.php:470
+#: ../templates/pdfedit/pdfpage.php:415
 msgid "Up"
 msgstr "往上"
 
@@ -5863,43 +5924,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"
 
@@ -5911,16 +5967,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 "已使用的inodes(檔案)"
 
@@ -5936,25 +5992,25 @@ msgstr "使用者帳號"
 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 "關於使用者的描述, 若留空白,預設為使用者姓名."
 
@@ -5962,38 +6018,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 "使用者名稱"
 
@@ -6002,9 +6058,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
@@ -6016,9 +6072,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, .-_. LAM 和 useradd 命令一樣都不容許以數字開頭的帳號. 如果指定的帳號已經存在,則會自動在帳號後面加上下一個可用的數字. 警告: 超過8個字元的帳號在舊的系統上會造成問題. 如果超過16個字元就不能登入Windows."
 
@@ -6026,24 +6082,24 @@ msgstr "該使用者的帳號.有效的字元為:a-z, A-Z, 0-9, .-_. LAM 和 use
 #: ../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 做為遠端伺服器."
 
-#: ../templates/tests/lamdaemonTest.php:177
+#: ../templates/tests/lamdaemonTest.php:238
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "使用 %s 連結遠端伺服器."
@@ -6052,25 +6108,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 "需要更多的功能嗎 ? 參考 LAM 專業版 ! "
 
-#: ../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 "無法增加屬性到 %s 這個DN中."
 
-#: ../lib/modules.inc:1530
+#: ../lib/modules.inc:1676
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "無法建立這個DN: %s."
@@ -6086,32 +6146,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 "無法修改 %s 這個 DN 的屬性."
 
 #: ../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 "西歐時間, 倫敦, 里斯本"
 
@@ -6119,65 +6182,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 "初始程式的工作目錄."
 
@@ -6190,7 +6246,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."
@@ -6203,17 +6259,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 "您能使用 @@屬性名稱@@ 的萬用字元格式來表示 LDAP 屬性. (例如: @@uid@@ 表示使用者帳號.)"
 
@@ -6229,7 +6285,7 @@ msgstr "您沒有足夠的權限或您的 LDAP 伺服器並沒有公開 LDAP 綱
 msgid "You have been logged off from LDAP Account Manager."
 msgstr "您已經從LAM登出"
 
-#: ../templates/lists/changePassword.php:277
+#: ../templates/lists/changePassword.php:283
 msgid "You have to activate the \"I am sure\" checkbox."
 msgstr "您必須選取 \"確定\" 的核取方塊."
 
@@ -6246,12 +6302,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 "LAM 系統管理者 (%s) 必須是一個有效的 Unix 帳號, 才能執行 lamdaemon !"
@@ -6269,37 +6325,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 "啟用(active)"
+
 #: ../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 "管理者"
 
@@ -6319,13 +6384,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 "中斷"
 
@@ -6344,13 +6409,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 "電子郵件地址"
 
@@ -6358,42 +6423,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 "時(hours)"
 
-#: ../lib/modules/sambaSamAccount.inc:1393
-#: ../lib/modules/sambaSamAccount.inc:1716
+#: ../lib/modules/phpGroupwareUser.inc:151
+#: ../lib/modules/phpGroupwareUser.inc:371
+msgid "inactive"
+msgstr "停用(inactive)"
+
+#: ../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 "開啟輸入, 開啟通知."
 
@@ -6409,30 +6479,30 @@ msgstr "ldap://localhost:389 表示使用標準的LDAP連結到本機的389通
 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 "否"
 
@@ -6472,38 +6542,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 "對Samba 3的帳號來說是必要的選項"
-
-#: ../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"
 
@@ -6511,21 +6577,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"
 
@@ -6537,30 +6603,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 帳號"
+#~ 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 "群組 01,群組 02"
+#~ msgid "IT"
+#~ msgstr "資訊科技"
+#~ msgid "Jabber IDs"
+#~ msgstr "Jabber 帳號"
+#~ msgid "Job position"
+#~ msgstr "工作場所"
+#~ msgid "Job position of this user (e.g. developer, temp, ...)."
+#~ msgstr "使用者的工作職稱 (例如 開發者, 臨時員工, ...)."
+#~ msgid "List of ComBots IDs."
+#~ msgstr "ComBots 帳號清單."
+#~ msgid "List of Jabber IDs."
+#~ msgstr "Jabber 帳號清單."
+#~ 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 帳號"
+#~ 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 帳號."
+#~ 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 "對Samba 3的帳號來說是必要的選項"
 #~ msgid "Apply"
 #~ msgstr "套用"
 #~ msgid "Create account"
@@ -6605,8 +6740,6 @@ msgstr "是"
 #~ msgstr "Unix群組的最小GID編號"
 #~ msgid "Minimum UID number for Unix accounts (hosts)"
 #~ msgstr "unix帳號(主機)的最小UID"
-#~ msgid "Minimum UID number for Unix accounts (users)"
-#~ msgstr "unix帳號(使用者)的最小UID"
 #~ msgid "Password hash type for Unix accounts"
 #~ msgstr "unix帳號的密碼雜湊類型"
 #~ msgid "Password hash type for Unix groups"