diff --git a/lam/locale/ja_JP/LC_MESSAGES/messages.mo b/lam/locale/ja_JP/LC_MESSAGES/messages.mo
index 62b296a0..4187a439 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 5e18a94c..cfe8ce24 100644
--- a/lam/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/lam/locale/ja_JP/LC_MESSAGES/messages.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: LAM 3.2.0\n"
+"Project-Id-Version: LAM 3.3.0\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de \n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2010-10-18 13:16+0900\n"
+"PO-Revision-Date: 2011-01-09 09:41+0900\n"
 "Last-Translator: Yasuhiro Magara <gama@users.sourceforge.jp>\n"
 "Language-Team: Japanese <gama@users.sourceforge.jp>\n"
 "Language: ja\n"
@@ -23,43 +23,43 @@ msgstr ""
 msgid "\"Send as\" privileges"
 msgstr "\"Send as\"特権"
 
-#: ../lib/modules/posixAccount.inc:365
+#: ../lib/modules/posixAccount.inc:367
 msgid ""
 "$user and $group will be replaced with user name and primary group name."
 msgstr "$user と $group はユーザ名とプライマリグループ名に置き換えられます。"
 
-#: ../lib/types/dhcp.inc:123
+#: ../lib/types/dhcp.inc:162
 #, php-format
 msgid "%s DHCP(s) found"
 msgstr "%s個のDHCPが見つかりました。"
 
-#: ../lib/types/nisObjectType.inc:105
+#: ../lib/types/nisObjectType.inc:144
 #, php-format
 msgid "%s NIS object(s) found"
 msgstr "%s個のNISオブジェクトが見つかりました"
 
-#: ../lib/types/mailAlias.inc:117 ../lib/types/alias.inc:117
+#: ../lib/types/mailAlias.inc:135 ../lib/types/alias.inc:135
 #, php-format
 msgid "%s alias(es) found"
 msgstr "%s個の別名が見つかりました"
 
-#: ../lib/types/smbDomain.inc:117
+#: ../lib/types/smbDomain.inc:156
 #, php-format
 msgid "%s domain(s) found"
 msgstr "%s個のドメインが見つかりました"
 
-#: ../lib/types/asteriskExt.inc:118
+#: ../lib/types/asteriskExt.inc:137
 #, php-format
 msgid "%s extension(s) found"
 msgstr "%s個の拡張が見つかりました"
 
-#: ../lib/types/gon.inc:119 ../lib/types/group.inc:131
-#: ../lib/types/netgroup.inc:119
+#: ../lib/types/gon.inc:158 ../lib/types/group.inc:174
+#: ../lib/types/netgroup.inc:158
 #, php-format
 msgid "%s group(s) found"
 msgstr "%s個のグループが見つかりました"
 
-#: ../lib/types/host.inc:121
+#: ../lib/types/host.inc:161
 #, php-format
 msgid "%s host(s) found"
 msgstr "%s個のSamba ホストが見つかりました"
@@ -69,17 +69,17 @@ msgstr "%s個のSamba ホストが見つかりました"
 msgid "%s object(s) found"
 msgstr "%s個のオブジェクトが見つかりました"
 
-#: ../lib/types/ppolicyType.inc:125
+#: ../lib/types/ppolicyType.inc:143
 #, php-format
 msgid "%s policy(ies) found"
 msgstr "%s個のポリシーが見つかりました"
 
-#: ../lib/types/sudo.inc:109
+#: ../lib/types/sudo.inc:148
 #, php-format
 msgid "%s sudo role(s) found"
 msgstr "%s 個のsudoロールが見つかりました"
 
-#: ../lib/types/user.inc:135
+#: ../lib/types/user.inc:195
 #, php-format
 msgid "%s user(s) found"
 msgstr "%s名のユーザが見つかりました"
@@ -92,7 +92,7 @@ msgstr "(例: cn=MyNewPerson)"
 msgid "(hint: do not include \"ou=\")"
 msgstr "(ヒント: \"ou=\"を含めないでください)"
 
-#: ../lib/modules/nisnetgroup.inc:119
+#: ../lib/modules/nisnetgroup.inc:124
 msgid "(host1,user1,example.com);(host2,user2,example.com)"
 msgstr "(host1,user1,example.com);(host2,user2,example.com)"
 
@@ -104,28 +104,28 @@ msgstr "(このエントリに対して有効な新しい属性はありませ
 msgid "(no new binary attributes available for this entry)"
 msgstr "(このエントリに対して有効な新しいバイナリ属性はありません)"
 
-#: ../lib/modules/posixAccount.inc:223
+#: ../lib/modules/posixAccount.inc:225
 msgid "/home/smiller"
 msgstr "/home/smiller"
 
-#: ../lib/modules/inetOrgPerson.inc:321
+#: ../lib/modules/inetOrgPerson.inc:324
 #: ../lib/modules/asteriskVoicemail.inc:177
 msgid "123-123-1234"
 msgstr "123-123-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:337
+#: ../lib/modules/inetOrgPerson.inc:340
 msgid "123-123-1235"
 msgstr "123-123-1235"
 
-#: ../lib/modules/inetOrgPerson.inc:345
+#: ../lib/modules/inetOrgPerson.inc:348
 msgid "123-123-1236"
 msgstr "123-123-1236"
 
-#: ../lib/modules/inetOrgPerson.inc:329
+#: ../lib/modules/inetOrgPerson.inc:332
 msgid "123-124-1234"
 msgstr "123-124-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:313
+#: ../lib/modules/inetOrgPerson.inc:316
 msgid "12345"
 msgstr "12345"
 
@@ -177,7 +177,7 @@ msgstr "このデバイスについての説明。"
 msgid "A list of options (e.g. NOPASSWD)."
 msgstr "オプション・リスト (例 NOPASSWD)。"
 
-#: ../templates/massBuildAccounts.php:114
+#: ../templates/massBuildAccounts.php:115
 msgid "A required column is missing in your CSV file."
 msgstr "CSVファイル中の必須カラムが不足しています。"
 
@@ -189,11 +189,11 @@ msgstr ""
 "ユーザは自身の代理人を指定できます。この属性はemailの送信にKolab smtpデーモン"
 "(Postfix)を使用する場合にチェックします。"
 
-#: ../lib/modules/sambaSamAccount.inc:538
+#: ../lib/modules/sambaSamAccount.inc:543
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "Abu Dhabi, Muscat, Baku"
 
-#: ../templates/config/confmain.php:324 ../help/help.inc:99
+#: ../templates/config/confmain.php:256 ../help/help.inc:99
 msgid "Access level"
 msgstr "アクセスレベル"
 
@@ -201,12 +201,12 @@ msgstr "アクセスレベル"
 msgid "Account"
 msgstr "アカウント"
 
-#: ../templates/massBuildAccounts.php:169 ../lib/modules/ipHost.inc:109
+#: ../templates/massBuildAccounts.php:170 ../lib/modules/ipHost.inc:109
 #: ../lib/modules/ipHost.inc:110 ../lib/modules/asteriskAccount.inc:169
 #: ../lib/modules/asteriskAccount.inc:172
-#: ../lib/modules/asteriskAccount.inc:175 ../lib/modules/account.inc:117
-#: ../lib/modules/ieee802device.inc:89 ../lib/modules/posixGroup.inc:485
-#: ../lib/modules/posixGroup.inc:489 ../lib/modules/posixGroup.inc:490
+#: ../lib/modules/asteriskAccount.inc:175 ../lib/modules/account.inc:118
+#: ../lib/modules/ieee802device.inc:89 ../lib/modules/posixGroup.inc:481
+#: ../lib/modules/posixGroup.inc:485 ../lib/modules/posixGroup.inc:486
 #: ../lib/modules/zarafaGroup.inc:138 ../lib/modules/zarafaGroup.inc:140
 #: ../lib/modules/zarafaGroup.inc:141 ../lib/modules/zarafaGroup.inc:142
 #: ../lib/modules/zarafaGroup.inc:143 ../lib/modules/device.inc:123
@@ -222,24 +222,26 @@ msgstr "アカウント"
 #: ../lib/modules/quota.inc:51 ../lib/modules/quota.inc:53
 #: ../lib/modules/quota.inc:55 ../lib/modules/quota.inc:57
 #: ../lib/modules/quota.inc:59 ../lib/modules/quota.inc:61
-#: ../lib/modules/quota.inc:62 ../lib/modules/sambaSamAccount.inc:83
-#: ../lib/modules/sambaSamAccount.inc:86 ../lib/modules/sambaSamAccount.inc:89
-#: ../lib/modules/sambaSamAccount.inc:91 ../lib/modules/sambaSamAccount.inc:92
-#: ../lib/modules/sambaSamAccount.inc:93 ../lib/modules/sambaSamAccount.inc:94
-#: ../lib/modules/sambaSamAccount.inc:95 ../lib/modules/sambaSamAccount.inc:97
+#: ../lib/modules/quota.inc:62 ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:91 ../lib/modules/sambaSamAccount.inc:94
+#: ../lib/modules/sambaSamAccount.inc:96 ../lib/modules/sambaSamAccount.inc:97
 #: ../lib/modules/sambaSamAccount.inc:98 ../lib/modules/sambaSamAccount.inc:99
 #: ../lib/modules/sambaSamAccount.inc:100
-#: ../lib/modules/sambaSamAccount.inc:101
 #: ../lib/modules/sambaSamAccount.inc:102
 #: ../lib/modules/sambaSamAccount.inc:103
+#: ../lib/modules/sambaSamAccount.inc:104
 #: ../lib/modules/sambaSamAccount.inc:105
-#: ../lib/modules/sambaSamAccount.inc:106 ../lib/modules/posixAccount.inc:68
-#: ../lib/modules/posixAccount.inc:73 ../lib/modules/posixAccount.inc:77
-#: ../lib/modules/posixAccount.inc:85 ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/sambaSamAccount.inc:107
+#: ../lib/modules/sambaSamAccount.inc:108
+#: ../lib/modules/sambaSamAccount.inc:110
+#: ../lib/modules/sambaSamAccount.inc:111 ../lib/modules/posixAccount.inc:70
+#: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:79
 #: ../lib/modules/posixAccount.inc:87 ../lib/modules/posixAccount.inc:88
 #: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:90
-#: ../lib/modules/posixAccount.inc:92 ../lib/modules/posixAccount.inc:93
-#: ../lib/modules/posixAccount.inc:94 ../lib/modules/posixAccount.inc:96
+#: ../lib/modules/posixAccount.inc:91 ../lib/modules/posixAccount.inc:92
+#: ../lib/modules/posixAccount.inc:94 ../lib/modules/posixAccount.inc:95
+#: ../lib/modules/posixAccount.inc:96 ../lib/modules/posixAccount.inc:98
 #: ../lib/modules/zarafaUser.inc:333 ../lib/modules/zarafaUser.inc:335
 #: ../lib/modules/zarafaUser.inc:337 ../lib/modules/zarafaUser.inc:338
 #: ../lib/modules/zarafaUser.inc:340 ../lib/modules/zarafaUser.inc:342
@@ -252,23 +254,23 @@ msgstr "アカウント"
 #: ../lib/modules/kolabUser.inc:240 ../lib/modules/kolabUser.inc:242
 #: ../lib/modules/phpGroupwareUser.inc:134
 #: ../lib/modules/phpGroupwareUser.inc:135 ../lib/modules/ddns.inc:151
-#: ../lib/modules/nisObject.inc:117 ../lib/modules/sambaGroupMapping.inc:426
-#: ../lib/modules/sambaGroupMapping.inc:427
+#: ../lib/modules/nisObject.inc:117 ../lib/modules/sambaGroupMapping.inc:441
+#: ../lib/modules/sambaGroupMapping.inc:442
 #: ../lib/modules/shadowAccount.inc:58 ../lib/modules/shadowAccount.inc:60
 #: ../lib/modules/shadowAccount.inc:62 ../lib/modules/shadowAccount.inc:64
 #: ../lib/modules/shadowAccount.inc:66 ../lib/modules/shadowAccount.inc:67
 #: ../lib/modules/sambaDomain.inc:202 ../lib/modules/sambaDomain.inc:204
 #: ../lib/modules/sambaDomain.inc:206 ../lib/modules/sambaDomain.inc:208
 #: ../lib/modules/sambaDomain.inc:210 ../lib/modules/sambaDomain.inc:212
-#: ../lib/modules/inetOrgPerson.inc:45 ../lib/modules/inetOrgPerson.inc:47
-#: ../lib/modules/inetOrgPerson.inc:49 ../lib/modules/inetOrgPerson.inc:51
-#: ../lib/modules/inetOrgPerson.inc:53 ../lib/modules/inetOrgPerson.inc:55
-#: ../lib/modules/inetOrgPerson.inc:57 ../lib/modules/inetOrgPerson.inc:59
-#: ../lib/modules/inetOrgPerson.inc:61 ../lib/modules/inetOrgPerson.inc:63
-#: ../lib/modules/inetOrgPerson.inc:65 ../lib/modules/inetOrgPerson.inc:67
-#: ../lib/modules/inetOrgPerson.inc:69 ../lib/modules/inetOrgPerson.inc:71
-#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:73
-#: ../lib/modules/inetOrgPerson.inc:76 ../lib/modules/sudoRole.inc:224
+#: ../lib/modules/inetOrgPerson.inc:48 ../lib/modules/inetOrgPerson.inc:50
+#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:54
+#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:58
+#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:62
+#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:66
+#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:70
+#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:74
+#: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:76
+#: ../lib/modules/inetOrgPerson.inc:79 ../lib/modules/sudoRole.inc:224
 #: ../lib/modules/sudoRole.inc:226 ../lib/modules/sudoRole.inc:228
 #: ../lib/modules/sudoRole.inc:230 ../lib/modules/sudoRole.inc:232
 #: ../lib/modules/sudoRole.inc:234 ../lib/modules/zarafaServer.inc:121
@@ -303,27 +305,27 @@ msgstr "アカウント %s:"
 #: ../lib/modules/asteriskVoicemail.inc:128
 #: ../lib/modules/asteriskVoicemail.inc:142
 #: ../lib/modules/asteriskVoicemail.inc:244
-#: ../lib/modules/asteriskVoicemail.inc:389
+#: ../lib/modules/asteriskVoicemail.inc:394
 msgid "Account context"
 msgstr "アカウント・コンテキスト"
 
-#: ../templates/masscreate.php:110
+#: ../templates/masscreate.php:116
 msgid "Account creation via file upload"
 msgstr "ファイルアップロードによるアカウント作成"
 
-#: ../lib/modules/posixAccount.inc:372
+#: ../lib/modules/posixAccount.inc:374
 msgid "Account deactivated"
 msgstr "アカウントが無効化されました"
 
-#: ../templates/lists/changePassword.php:167
+#: ../templates/lists/changePassword.php:213
 msgid "Account details"
 msgstr "アカウントの詳細"
 
-#: ../lib/modules/sambaSamAccount.inc:318
-#: ../lib/modules/sambaSamAccount.inc:433
-#: ../lib/modules/sambaSamAccount.inc:1104
-#: ../lib/modules/sambaSamAccount.inc:1352
-#: ../lib/modules/sambaSamAccount.inc:1479
+#: ../lib/modules/sambaSamAccount.inc:323
+#: ../lib/modules/sambaSamAccount.inc:438
+#: ../lib/modules/sambaSamAccount.inc:1098
+#: ../lib/modules/sambaSamAccount.inc:1345
+#: ../lib/modules/sambaSamAccount.inc:1472
 #: ../lib/modules/phpGroupwareUser.inc:82
 #: ../lib/modules/phpGroupwareUser.inc:97
 #: ../lib/modules/phpGroupwareUser.inc:121
@@ -340,20 +342,20 @@ msgstr "アカウント失効日"
 msgid "Account inactive"
 msgstr "アカウントが無効です"
 
-#: ../lib/modules/sambaSamAccount.inc:258
-#: ../lib/modules/sambaSamAccount.inc:264
-#: ../lib/modules/sambaSamAccount.inc:425
-#: ../lib/modules/sambaSamAccount.inc:1072
-#: ../lib/modules/sambaSamAccount.inc:1475
+#: ../lib/modules/sambaSamAccount.inc:263
+#: ../lib/modules/sambaSamAccount.inc:269
+#: ../lib/modules/sambaSamAccount.inc:430
+#: ../lib/modules/sambaSamAccount.inc:1066
+#: ../lib/modules/sambaSamAccount.inc:1468
 msgid "Account is deactivated"
 msgstr "アカウントが無効化されています"
 
-#: ../lib/modules/sambaSamAccount.inc:261
-#: ../lib/modules/sambaSamAccount.inc:1078
+#: ../lib/modules/sambaSamAccount.inc:266
+#: ../lib/modules/sambaSamAccount.inc:1072
 msgid "Account is locked"
 msgstr "ロックされたアカウント"
 
-#: ../templates/delete.php:91
+#: ../templates/delete.php:86
 msgid "Account name:"
 msgstr "アカウント名:"
 
@@ -365,23 +367,23 @@ msgstr "アカウント名:"
 msgid "Account status"
 msgstr "アカウントの状態"
 
-#: ../templates/masscreate.php:130 ../templates/pdfedit/pdfdelete.php:82
-#: ../lib/modules/groupOfNames.inc:222
+#: ../templates/masscreate.php:130 ../templates/pdfedit/pdfdelete.php:85
+#: ../lib/modules/groupOfNames.inc:228
 msgid "Account type"
 msgstr "アカウント種別"
 
-#: ../templates/config/confmodules.php:166
-#: ../templates/config/confmain.php:199
-#: ../templates/config/moduleSettings.php:165
-#: ../templates/config/conftypes.php:184
+#: ../templates/config/confmodules.php:169
+#: ../templates/config/confmain.php:202
+#: ../templates/config/moduleSettings.php:168
+#: ../templates/config/conftypes.php:187
 msgid "Account types"
 msgstr "アカウント種別"
 
-#: ../help/help.inc:103
+#: ../help/help.inc:101
 msgid "Account types and modules"
 msgstr "アカウント種別とモジュール"
 
-#: ../help/help.inc:105
+#: ../help/help.inc:103
 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 "
@@ -391,11 +393,11 @@ msgstr ""
 "義します。アカウントモジュールは、編集対象となるプロパティ(e.g. Unix や "
 "Samba)を定義します。"
 
-#: ../lib/modules.inc:1480
+#: ../lib/modules.inc:1532
 msgid "Account was created successfully."
 msgstr "アカウントが作成されました。"
 
-#: ../templates/lists/changePassword.php:459 ../lib/modules.inc:1483
+#: ../templates/lists/changePassword.php:555 ../lib/modules.inc:1535
 msgid "Account was modified successfully."
 msgstr "アカウントが変更されました。"
 
@@ -407,29 +409,29 @@ msgstr "アクション種別"
 msgid "Activate DynDNS"
 msgstr "DynDNSを有効化"
 
-#: ../templates/config/confmain.php:245
+#: ../templates/config/confmain.php:236
 msgid "Activate TLS"
 msgstr "TLSを有効化"
 
-#: ../lib/modules/sambaSamAccount.inc:325
+#: ../lib/modules/sambaSamAccount.inc:330
 msgid "Activate this checkbox to allow this user to use the terminal service."
 msgstr ""
 "このユーザーに対してターミナルサービスの利用を許可する場合にチェックボックス"
 "を有効にしてください。"
 
-#: ../lib/modules/sambaSamAccount.inc:346
+#: ../lib/modules/sambaSamAccount.inc:351
 msgid "Activate this checkbox to connect drives from the client machine."
 msgstr ""
 "クライアントマシンからドライブを接続する場合にチェックボックスを有効にしてく"
 "ださい。"
 
-#: ../lib/modules/sambaSamAccount.inc:349
+#: ../lib/modules/sambaSamAccount.inc:354
 msgid "Activate this checkbox to connect printers from the client machine."
 msgstr ""
 "クライアントマシンからプリンターに接続する場合にチェックボックスを有効にして"
 "ください。"
 
-#: ../lib/modules/sambaSamAccount.inc:334
+#: ../lib/modules/sambaSamAccount.inc:339
 msgid ""
 "Activate this checkbox to inherit the initial program and working directory "
 "from the client machine."
@@ -437,13 +439,13 @@ msgstr ""
 "クライアントマシンの初期プログラムと作業ディレクトリを継承する場合にチェック"
 "ボックスを有効にしてください。"
 
-#: ../lib/modules/sambaSamAccount.inc:352
+#: ../lib/modules/sambaSamAccount.inc:357
 msgid "Activate this checkbox to set the client's printer as default printer."
 msgstr ""
 "クライアントのプリンタをデフォルトプリンタにする場合にチェックボックスを有効"
 "にしてください。"
 
-#: ../lib/modules/posixAccount.inc:344
+#: ../lib/modules/posixAccount.inc:346
 msgid "Activating this checkbox will remove the user's home directory."
 msgstr ""
 "このチェックボックスを有効にした場合、ユーザのホームディレクトリを削除しま"
@@ -457,7 +459,7 @@ msgstr ""
 msgid "Active"
 msgstr "有効"
 
-#: ../templates/config/conftypes.php:240
+#: ../templates/config/conftypes.php:233
 msgid "Active account types"
 msgstr "有効なアカウント種別"
 
@@ -466,15 +468,15 @@ msgstr "有効なアカウント種別"
 #: ../templates/tree/add_oclass_form.php:144
 #: ../templates/tree/add_attr_form.php:130
 #: ../templates/tree/add_attr_form.php:162
-#: ../templates/config/confmodules.php:279
-#: ../templates/config/conftypes.php:228 ../templates/pdfedit/pdfpage.php:579
-#: ../templates/pdfedit/pdfpage.php:596 ../templates/pdfedit/pdfpage.php:624
-#: ../templates/pdfedit/pdfpage.php:660 ../lib/modules/kolabUser.inc:865
-#: ../lib/modules/kolabUser.inc:899 ../lib/modules/nisnetgroup.inc:266
+#: ../templates/config/confmodules.php:284
+#: ../templates/config/conftypes.php:224 ../templates/pdfedit/pdfpage.php:543
+#: ../templates/pdfedit/pdfpage.php:553 ../templates/pdfedit/pdfpage.php:563
+#: ../templates/pdfedit/pdfpage.php:577 ../lib/modules/kolabUser.inc:867
+#: ../lib/modules/kolabUser.inc:901 ../lib/modules/nisnetgroup.inc:271
 #: ../lib/modules/sudoRole.inc:269 ../lib/modules/sudoRole.inc:296
 #: ../lib/modules/sudoRole.inc:323 ../lib/modules/sudoRole.inc:350
 #: ../lib/modules/sudoRole.inc:377 ../lib/modules/sudoRole.inc:404
-#: ../lib/modules/groupOfNames.inc:163 ../lib/modules/groupOfNames.inc:293
+#: ../lib/modules/groupOfNames.inc:169 ../lib/modules/groupOfNames.inc:311
 msgid "Add"
 msgstr "追加"
 
@@ -498,8 +500,8 @@ msgstr "IPアドレス拡張を追加"
 msgid "Add Kolab extension"
 msgstr "Kolab拡張を追加"
 
-#: ../lib/modules/sambaSamAccount.inc:1215
-#: ../lib/modules/sambaGroupMapping.inc:271
+#: ../lib/modules/sambaSamAccount.inc:1209
+#: ../lib/modules/sambaGroupMapping.inc:293
 msgid "Add Samba 3 extension"
 msgstr "Samba 3拡張を追加"
 
@@ -512,7 +514,7 @@ msgstr "Shadowアカウント拡張を追加"
 msgid "Add Zarafa extension"
 msgstr "Zarafa拡張を追加"
 
-#: ../lib/modules/groupOfNames.inc:329
+#: ../lib/modules/groupOfNames.inc:353
 msgid "Add entries of this type:"
 msgstr "この型のエントリを追加:"
 
@@ -524,7 +526,7 @@ msgstr "固定IPアドレスをDNSに追加"
 msgid "Add host extension"
 msgstr "ホスト拡張を追加"
 
-#: ../templates/selfService/adminMain.php:551 ../help/help.inc:178
+#: ../templates/selfService/adminMain.php:552 ../help/help.inc:178
 msgid "Add input field"
 msgstr "入力フィールドの追加"
 
@@ -539,12 +541,12 @@ msgstr "新しい属性の追加"
 msgid "Add new binary attribute"
 msgstr "新しいバイナリ属性の追加"
 
-#: ../templates/selfService/adminMain.php:536 ../help/help.inc:176
+#: ../templates/selfService/adminMain.php:537 ../help/help.inc:176
 msgid "Add new group"
 msgstr "新しいグループの追加"
 
-#: ../lib/modules/inetOrgPerson.inc:544 ../lib/modules/inetOrgPerson.inc:976
-#: ../lib/modules/inetOrgPerson.inc:1011 ../lib/modules/inetOrgPerson.inc:1510
+#: ../lib/modules/inetOrgPerson.inc:547 ../lib/modules/inetOrgPerson.inc:969
+#: ../lib/modules/inetOrgPerson.inc:1004 ../lib/modules/inetOrgPerson.inc:1514
 msgid "Add photo"
 msgstr "写真を追加"
 
@@ -558,7 +560,7 @@ msgid "Add phpGroupWare extension"
 msgstr "phpGroupware拡張を追加"
 
 #: ../templates/config/profmanage.php:206
-#: ../templates/selfService/profManage.php:168 ../help/help.inc:118
+#: ../templates/selfService/profManage.php:168 ../help/help.inc:116
 msgid "Add profile"
 msgstr "プロファイル追加"
 
@@ -570,7 +572,7 @@ msgstr "属性の追加に失敗しました!"
 msgid "Adding the range failed because errors occured."
 msgstr "エラーが発生したため範囲の追加に失敗しました。"
 
-#: ../templates/selfService/adminMain.php:454 ../help/help.inc:182
+#: ../templates/selfService/adminMain.php:455 ../help/help.inc:182
 msgid "Additional CSS links"
 msgstr "追加のCSSリンク"
 
@@ -578,17 +580,21 @@ msgstr "追加のCSSリンク"
 msgid "Additional email addresses for this entry."
 msgstr "このエントリに対する追加の電子メール・アドレス。"
 
-#: ../lib/modules/posixAccount.inc:215 ../lib/modules/posixAccount.inc:302
-#: ../lib/modules/posixAccount.inc:335 ../lib/modules/posixAccount.inc:380
-#: ../lib/modules/posixAccount.inc:979 ../lib/modules/posixAccount.inc:1056
-#: ../lib/modules/posixAccount.inc:1099 ../lib/modules/posixAccount.inc:1169
+#: ../lib/modules/posixAccount.inc:217 ../lib/modules/posixAccount.inc:304
+#: ../lib/modules/posixAccount.inc:337 ../lib/modules/posixAccount.inc:382
+#: ../lib/modules/posixAccount.inc:961 ../lib/modules/posixAccount.inc:1037
+#: ../lib/modules/posixAccount.inc:1080 ../lib/modules/posixAccount.inc:1150
 msgid "Additional groups"
 msgstr "追加のグループ"
 
-#: ../templates/massDoUpload.php:102
+#: ../templates/massDoUpload.php:103
 msgid "Additional tasks for module:"
 msgstr "モジュールに対する追加タスク:"
 
+#: ../lib/modules/imapAccess.inc:67
+msgid "Address of IMAP server (e.g. mail.example.org)."
+msgstr "IMAPサーバーのアドレス(例 mail.example.org)。"
+
 #: ../help/help.inc:177
 msgid ""
 "Adds a new group element to the list of self service options. Use this to "
@@ -611,11 +617,11 @@ msgstr "新しいIPアドレス範囲の入力フィールを追加する。"
 msgid "Admin"
 msgstr "管理"
 
-#: ../lib/modules/inetOrgPerson.inc:281 ../lib/modules/inetOrgPerson.inc:369
+#: ../lib/modules/inetOrgPerson.inc:284 ../lib/modules/inetOrgPerson.inc:372
 msgid "Administration"
 msgstr "管理"
 
-#: ../lib/modules/posixGroup.inc:386 ../lib/modules/nisnetgroup.inc:107
+#: ../lib/modules/posixGroup.inc:378 ../lib/modules/nisnetgroup.inc:112
 #: ../lib/modules/groupOfNames.inc:93
 msgid "Administrators group"
 msgstr "管理者グループ"
@@ -626,7 +632,7 @@ msgstr "管理者グループ"
 msgid "Affiliations"
 msgstr "所属"
 
-#: ../lib/modules/sambaSamAccount.inc:525
+#: ../lib/modules/sambaSamAccount.inc:530
 msgid "Alaska"
 msgstr "Alaska"
 
@@ -666,7 +672,7 @@ msgstr "エイリアス化エントリ"
 msgid "Aliases"
 msgstr "エイリアス"
 
-#: ../lib/lists.inc:627
+#: ../lib/lists.inc:637
 #, php-format
 msgid "All accounts (%s)"
 msgstr "全てのアカウント (%s)"
@@ -680,7 +686,7 @@ msgstr "すべての変更が成功しました。"
 msgid "All following lines form the mail body."
 msgstr "後に続く全ての行はメール本文になります。"
 
-#: ../lib/lists.inc:626
+#: ../lib/lists.inc:636
 #, php-format
 msgid "All selected accounts (%s)"
 msgstr "全ての選択されたアカウント (%s)"
@@ -696,24 +702,24 @@ msgstr "マシンパスワードの変更を許可"
 msgid "Allow password change"
 msgstr "パスワードの変更を許可"
 
-#: ../lib/modules/sambaSamAccount.inc:206
-#: ../lib/modules/sambaSamAccount.inc:324
-#: ../lib/modules/sambaSamAccount.inc:1391
-#: ../lib/modules/sambaSamAccount.inc:1671
+#: ../lib/modules/sambaSamAccount.inc:211
+#: ../lib/modules/sambaSamAccount.inc:329
+#: ../lib/modules/sambaSamAccount.inc:1384
+#: ../lib/modules/sambaSamAccount.inc:1664
 msgid "Allow terminal server login"
 msgstr "ターミナルサーバログインを許可"
 
-#: ../templates/config/mainmanage.php:224 ../lib/types/user.inc:95
-#: ../help/help.inc:140
+#: ../templates/config/mainmanage.php:194 ../lib/types/user.inc:95
+#: ../help/help.inc:138
 msgid "Allowed hosts"
 msgstr "許可されたホスト"
 
-#: ../lib/modules/sambaSamAccount.inc:1242
-#: ../lib/modules/sambaSamAccount.inc:1243
+#: ../lib/modules/sambaSamAccount.inc:1235
+#: ../lib/modules/sambaSamAccount.inc:1236
 msgid "Allowed workstations"
 msgstr "許可されたワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:540
+#: ../lib/modules/sambaSamAccount.inc:545
 msgid "Almaty, Dhaka, Colombo"
 msgstr "Almaty, Dhaka, Colombo"
 
@@ -734,8 +740,8 @@ msgstr "属性(%s)が変更され、ハイライト表示されています。"
 msgid "An sudo role with this name already exists. Please choose another name."
 msgstr "sudoロール名がすでに使用されています。他の名前を選択してください。"
 
-#: ../lib/modules/kolabUser.inc:330 ../lib/modules/kolabUser.inc:788
-#: ../lib/modules/kolabUser.inc:886
+#: ../lib/modules/kolabUser.inc:330 ../lib/modules/kolabUser.inc:790
+#: ../lib/modules/kolabUser.inc:888
 msgid "Anyone"
 msgstr "誰か"
 
@@ -760,6 +766,10 @@ msgstr "アプリケーション・データ"
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "本当にこのオブジェクトを削除しますか?"
 
+#: ../lib/modules/imapAccess.inc:105
+msgid "Ask"
+msgstr "問い合わせ"
+
 #: ../lib/modules/asteriskAccount.inc:66
 msgid "Asterisk"
 msgstr "アスタリスク"
@@ -768,11 +778,11 @@ msgstr "アスタリスク"
 msgid "Asterisk extension"
 msgstr "アスタリスク拡張"
 
-#: ../lib/types/asteriskExt.inc:53
+#: ../lib/types/asteriskExt.inc:54
 msgid "Asterisk extensions"
 msgstr "アスタリスク拡張"
 
-#: ../lib/types/asteriskExt.inc:62
+#: ../lib/types/asteriskExt.inc:63
 msgid "Asterisk extensions entries"
 msgstr "アスタリスク拡張エントリ"
 
@@ -790,7 +800,7 @@ msgstr "アスタリスク・ボイスメール"
 msgid "Asterisk voicemail context."
 msgstr "アスタリスク ボイスメール・コンテキスト"
 
-#: ../lib/modules/sambaSamAccount.inc:530
+#: ../lib/modules/sambaSamAccount.inc:535
 msgid "Atlantic time (Canada), Caracas"
 msgstr "Atlantic time (Canada), Caracas"
 
@@ -802,7 +812,7 @@ msgstr "属性"
 msgid "Attribute types"
 msgstr "属性タイプ"
 
-#: ../lib/modules/sambaSamAccount.inc:546
+#: ../lib/modules/sambaSamAccount.inc:551
 msgid "Auckland, Fiji, Kamchatka"
 msgstr "Auckland, Fiji, Kamchatka"
 
@@ -815,8 +825,8 @@ msgstr ""
 "conf で設定されます (option: \"realm\")。"
 
 #: ../lib/modules/eduPerson.inc:127 ../lib/modules/eduPerson.inc:132
-#: ../lib/modules/sambaSamAccount.inc:142
-#: ../lib/modules/sambaSamAccount.inc:372 ../lib/modules/zarafaUser.inc:120
+#: ../lib/modules/sambaSamAccount.inc:147
+#: ../lib/modules/sambaSamAccount.inc:377 ../lib/modules/zarafaUser.inc:120
 #: ../lib/modules/zarafaUser.inc:1097 ../lib/modules/phpGroupwareUser.inc:86
 #: ../lib/modules/phpGroupwareUser.inc:92 ../lib/modules/shadowAccount.inc:99
 #: ../lib/modules/shadowAccount.inc:188 ../lib/modules/hostObject.inc:76
@@ -824,7 +834,7 @@ msgstr ""
 msgid "Automatically add this extension"
 msgstr "この拡張を自動的に追加"
 
-#: ../templates/config/conftypes.php:221 ../lib/modules/customScripts.inc:54
+#: ../templates/config/conftypes.php:216 ../lib/modules/customScripts.inc:54
 msgid "Available account types"
 msgstr "有効なアカウント種別"
 
@@ -832,23 +842,23 @@ msgstr "有効なアカウント種別"
 msgid "Available actions"
 msgstr "利用可能なアクション"
 
-#: ../lib/modules/posixAccount.inc:1059 ../lib/modules/nisnetgroup.inc:375
+#: ../lib/modules/posixAccount.inc:1040 ../lib/modules/nisnetgroup.inc:375
 msgid "Available groups"
 msgstr "有効なグループ"
 
-#: ../templates/config/confmodules.php:288
+#: ../templates/config/confmodules.php:293
 msgid "Available modules"
 msgstr "有効なモジュール"
 
-#: ../lib/modules/posixGroup.inc:252 ../lib/modules/asteriskExtension.inc:310
+#: ../lib/modules/posixGroup.inc:242 ../lib/modules/asteriskExtension.inc:310
 msgid "Available users"
 msgstr "有効なユーザ"
 
-#: ../lib/modules/sambaSamAccount.inc:1245
+#: ../lib/modules/sambaSamAccount.inc:1238
 msgid "Available workstations"
 msgstr "有効なワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:533
+#: ../lib/modules/sambaSamAccount.inc:538
 msgid "Azores, Cape Verde Islands"
 msgstr "Azores, Cape Verde Islands"
 
@@ -857,10 +867,10 @@ msgid "B-Node (0x01)"
 msgstr "B-Node (0x01)"
 
 #: ../templates/tree/update_confirm.php:255
-#: ../templates/massBuildAccounts.php:210 ../lib/modules/posixGroup.inc:274
-#: ../lib/modules/sambaSamAccount.inc:1262
-#: ../lib/modules/posixAccount.inc:1077 ../lib/modules/nisnetgroup.inc:389
-#: ../lib/modules/inetOrgPerson.inc:1012 ../lib/modules/groupOfNames.inc:336
+#: ../templates/massBuildAccounts.php:227 ../lib/modules/posixGroup.inc:266
+#: ../lib/modules/sambaSamAccount.inc:1255
+#: ../lib/modules/posixAccount.inc:1058 ../lib/modules/nisnetgroup.inc:389
+#: ../lib/modules/inetOrgPerson.inc:1005 ../lib/modules/groupOfNames.inc:360
 msgid "Back"
 msgstr "戻る"
 
@@ -884,7 +894,7 @@ msgstr "エイリアス一覧に戻る"
 msgid "Back to domain list"
 msgstr "ドメイン一覧に戻る"
 
-#: ../lib/types/asteriskExt.inc:44
+#: ../lib/types/asteriskExt.inc:45
 msgid "Back to extensions list"
 msgstr "拡張一覧に戻る"
 
@@ -897,7 +907,7 @@ msgstr "グループ一覧に戻る"
 msgid "Back to host list"
 msgstr "ホスト一覧に戻る"
 
-#: ../templates/delete.php:233
+#: ../templates/delete.php:269
 msgid "Back to list"
 msgstr "一覧に戻る"
 
@@ -928,11 +938,11 @@ msgstr "ユーザー一覧に戻る"
 msgid "Backup script"
 msgstr "スクリプトのバックアップ"
 
-#: ../lib/modules/sambaSamAccount.inc:537
+#: ../lib/modules/sambaSamAccount.inc:542
 msgid "Baghdad, Riyadh, Moscow"
 msgstr "Baghdad, Riyadh, Moscow"
 
-#: ../lib/modules/sambaSamAccount.inc:541
+#: ../lib/modules/sambaSamAccount.inc:546
 msgid "Bangkok, Hanoi, Jakarta"
 msgstr "Bangkok, Hanoi, Jakarta"
 
@@ -944,15 +954,15 @@ msgstr "Base (ベースDNのみ)"
 msgid "Base DN"
 msgstr "ベースDN"
 
-#: ../templates/config/confmodules.php:212 ../help/help.inc:132
+#: ../templates/config/confmodules.php:214 ../help/help.inc:130
 msgid "Base module"
 msgstr "ベースモジュール"
 
-#: ../templates/pdfedit/pdfpage.php:420
+#: ../templates/pdfedit/pdfpage.php:434
 msgid "Beginning"
 msgstr "先頭"
 
-#: ../lib/modules/sambaSamAccount.inc:542
+#: ../lib/modules/sambaSamAccount.inc:547
 msgid "Beijing, Perth, Singapore"
 msgstr "Beijing(北京), Perth, Singapore"
 
@@ -992,23 +1002,23 @@ msgstr ""
 "ブロック・ソフトクオータはブロック・ハードクオータより小さくなくてはなりませ"
 "ん。"
 
-#: ../lib/modules/sambaSamAccount.inc:531
+#: ../lib/modules/sambaSamAccount.inc:536
 msgid "Brazil, Buenos Aires"
 msgstr "Brazil, Buenos Aires"
 
-#: ../lib/modules/sambaGroupMapping.inc:71
+#: ../lib/modules/sambaGroupMapping.inc:73
 msgid "Builtin group"
 msgstr "組み込みグループ"
 
-#: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:121
-#: ../lib/modules/inetOrgPerson.inc:210 ../lib/modules/inetOrgPerson.inc:279
-#: ../lib/modules/inetOrgPerson.inc:461 ../lib/modules/inetOrgPerson.inc:556
-#: ../lib/modules/inetOrgPerson.inc:932 ../lib/modules/inetOrgPerson.inc:1041
-#: ../lib/modules/inetOrgPerson.inc:1488
+#: ../lib/modules/inetOrgPerson.inc:78 ../lib/modules/inetOrgPerson.inc:124
+#: ../lib/modules/inetOrgPerson.inc:213 ../lib/modules/inetOrgPerson.inc:282
+#: ../lib/modules/inetOrgPerson.inc:464 ../lib/modules/inetOrgPerson.inc:559
+#: ../lib/modules/inetOrgPerson.inc:935 ../lib/modules/inetOrgPerson.inc:1045
+#: ../lib/modules/inetOrgPerson.inc:1492
 msgid "Business category"
 msgstr "業種"
 
-#: ../lib/modules/inetOrgPerson.inc:557
+#: ../lib/modules/inetOrgPerson.inc:560
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "業種(例. 役員, ITサービス, マネージャー, ...)"
 
@@ -1022,18 +1032,14 @@ msgstr ""
 "マンドを非表示として出力のみを表示する場合は、このオプションを有効にしてくだ"
 "さい。"
 
-#: ../templates/masscreate.php:222
-msgid "CSV file:"
+#: ../templates/masscreate.php:239
+msgid "CSV file"
 msgstr "CSVファイル:"
 
-#: ../templates/config/confmain.php:281 ../help/help.inc:97
+#: ../help/help.inc:97
 msgid "Cache timeout"
 msgstr "キャッシュ有効時間"
 
-#: ../templates/config/confmain.php:585
-msgid "Cache timeout is invalid!"
-msgstr "キャッシュ有効時間が正しくありません。"
-
 #: ../lib/modules/asteriskAccount.inc:83
 #: ../lib/modules/asteriskAccount.inc:123
 #: ../lib/modules/asteriskAccount.inc:133
@@ -1042,11 +1048,11 @@ msgstr "キャッシュ有効時間が正しくありません。"
 msgid "Caller ID"
 msgstr "発信者番号"
 
-#: ../lib/modules/sambaSamAccount.inc:279
-#: ../lib/modules/sambaSamAccount.inc:282
-#: ../lib/modules/sambaSamAccount.inc:285
-#: ../lib/modules/sambaSamAccount.inc:291 ../lib/modules/posixAccount.inc:381
-#: ../lib/modules/sambaGroupMapping.inc:358
+#: ../lib/modules/sambaSamAccount.inc:284
+#: ../lib/modules/sambaSamAccount.inc:287
+#: ../lib/modules/sambaSamAccount.inc:290
+#: ../lib/modules/sambaSamAccount.inc:296 ../lib/modules/posixAccount.inc:383
+#: ../lib/modules/sambaGroupMapping.inc:369
 #: ../lib/modules/shadowAccount.inc:169 ../lib/modules/shadowAccount.inc:173
 #: ../lib/modules/shadowAccount.inc:177 ../lib/modules/shadowAccount.inc:181
 msgid "Can be left empty."
@@ -1054,25 +1060,25 @@ msgstr "省略可"
 
 #: ../templates/tree/update_confirm.php:241
 #: ../templates/tree/delete_form.php:119 ../templates/tree/delete_form.php:168
-#: ../templates/ou_edit.php:113 ../templates/config/mainmanage.php:398
-#: ../templates/config/confmodules.php:144
-#: ../templates/config/confmain.php:177
-#: ../templates/config/moduleSettings.php:143
-#: ../templates/config/conftypes.php:162
-#: ../templates/selfService/adminMain.php:292
-#: ../templates/pdfedit/pdfdelete.php:92 ../templates/pdfedit/pdfpage.php:691
-#: ../templates/delete.php:113 ../templates/profedit/profiledelete.php:83
-#: ../templates/profedit/profilepage.php:180 ../templates/initsuff.php:187
-#: ../lib/modules/device.inc:234 ../lib/modules/device.inc:254
-#: ../lib/modules/sambaSamAccount.inc:1337
-#: ../lib/modules/sambaSamAccount.inc:1373
-#: ../lib/modules/sambaSamAccount.inc:1453 ../lib/modules/zarafaUser.inc:757
+#: ../templates/ou_edit.php:118 ../templates/config/mainmanage.php:253
+#: ../templates/config/confmodules.php:145
+#: ../templates/config/confmain.php:178
+#: ../templates/config/moduleSettings.php:144
+#: ../templates/config/conftypes.php:163
+#: ../templates/selfService/adminMain.php:301
+#: ../templates/pdfedit/pdfdelete.php:96 ../templates/pdfedit/pdfpage.php:585
+#: ../templates/delete.php:108 ../templates/profedit/profiledelete.php:92
+#: ../templates/profedit/profilepage.php:228 ../templates/initsuff.php:189
+#: ../lib/modules/device.inc:234 ../lib/modules/device.inc:259
+#: ../lib/modules/sambaSamAccount.inc:1330
+#: ../lib/modules/sambaSamAccount.inc:1366
+#: ../lib/modules/sambaSamAccount.inc:1446 ../lib/modules/zarafaUser.inc:757
 #: ../lib/modules/kolabUser.inc:563 ../lib/modules/phpGroupwareUser.inc:261
 #: ../lib/modules/shadowAccount.inc:416 ../lib/modules/nisnetgroup.inc:479
 #: ../lib/modules/aliasEntry.inc:142 ../lib/modules/aliasEntry.inc:162
-#: ../lib/modules/groupOfNames.inc:228 ../lib/modules/groupOfNames.inc:246
-#: ../lib/modules/groupOfNames.inc:294 ../lib/lists.inc:638
-#: ../lib/lists.inc:878 ../lib/modules.inc:1320
+#: ../lib/modules/groupOfNames.inc:234 ../lib/modules/groupOfNames.inc:258
+#: ../lib/modules/groupOfNames.inc:312 ../lib/lists.inc:646
+#: ../lib/lists.inc:897 ../lib/modules.inc:1363
 msgid "Cancel"
 msgstr "中止"
 
@@ -1084,7 +1090,7 @@ msgstr "中止"
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "指定されたLDAPサーバに接続できません。再試行してください。"
 
-#: ../templates/login.php:247 ../lib/config.inc:1230
+#: ../templates/login.php:247 ../lib/config.inc:1234
 msgid "Cannot open config file!"
 msgstr "configファイルをオープンできません!"
 
@@ -1095,77 +1101,77 @@ msgstr "configファイルをオープンできません!"
 msgid "Capacity"
 msgstr "容量"
 
-#: ../templates/selfService/adminMain.php:401
+#: ../templates/selfService/adminMain.php:402
 msgid "Captions and labels"
 msgstr "説明とラベル"
 
-#: ../lib/modules/inetOrgPerson.inc:120 ../lib/modules/inetOrgPerson.inc:206
-#: ../lib/modules/inetOrgPerson.inc:391 ../lib/modules/inetOrgPerson.inc:455
-#: ../lib/modules/inetOrgPerson.inc:568 ../lib/modules/inetOrgPerson.inc:922
-#: ../lib/modules/inetOrgPerson.inc:1043 ../lib/modules/inetOrgPerson.inc:1474
+#: ../lib/modules/inetOrgPerson.inc:123 ../lib/modules/inetOrgPerson.inc:209
+#: ../lib/modules/inetOrgPerson.inc:394 ../lib/modules/inetOrgPerson.inc:458
+#: ../lib/modules/inetOrgPerson.inc:571 ../lib/modules/inetOrgPerson.inc:925
+#: ../lib/modules/inetOrgPerson.inc:1047 ../lib/modules/inetOrgPerson.inc:1478
 msgid "Car license"
 msgstr "免許証番号"
 
-#: ../lib/modules/sambaSamAccount.inc:535
+#: ../lib/modules/sambaSamAccount.inc:540
 msgid "Central Europe Time, Paris, Berlin"
 msgstr "Central Europe Time, Paris, Berlin"
 
-#: ../lib/modules/sambaSamAccount.inc:528
+#: ../lib/modules/sambaSamAccount.inc:533
 msgid "Central Time (US & Canada), Mexico City"
 msgstr "Central Time (US & Canada), Mexico City"
 
-#: ../templates/selfService/adminMain.php:479
-#: ../templates/pdfedit/pdfpage.php:468 ../templates/pdfedit/pdfpage.php:474
-#: ../lib/modules/device.inc:178 ../lib/modules/sambaSamAccount.inc:1107
-#: ../lib/modules/sambaSamAccount.inc:1369
+#: ../templates/selfService/adminMain.php:480
+#: ../templates/pdfedit/pdfpage.php:484 ../templates/pdfedit/pdfpage.php:493
+#: ../lib/modules/device.inc:178 ../lib/modules/sambaSamAccount.inc:1101
+#: ../lib/modules/sambaSamAccount.inc:1362
 #: ../lib/modules/phpGroupwareUser.inc:154
 #: ../lib/modules/phpGroupwareUser.inc:256
 #: ../lib/modules/shadowAccount.inc:339 ../lib/modules/shadowAccount.inc:412
 #: ../lib/modules/asteriskExtension.inc:256 ../lib/modules/aliasEntry.inc:94
-#: ../lib/modules/groupOfNames.inc:153 ../lib/modules/groupOfNames.inc:168
+#: ../lib/modules/groupOfNames.inc:159 ../lib/modules/groupOfNames.inc:174
 msgid "Change"
 msgstr "変更"
 
-#: ../lib/modules/posixGroup.inc:213
+#: ../lib/modules/posixGroup.inc:206 ../lib/modules/posixGroup.inc:417
 msgid "Change GID number of users and hosts"
 msgstr "ユーザとホストのGID番号を変更"
 
-#: ../templates/config/profmanage.php:358 ../help/help.inc:126
+#: ../templates/config/profmanage.php:358 ../help/help.inc:124
 msgid "Change default profile"
 msgstr "デフォルト・プロファイルの変更"
 
-#: ../lib/lists.inc:869
+#: ../lib/lists.inc:888
 msgid "Change list settings"
 msgstr "リスト設定の変更"
 
-#: ../templates/config/mainmanage.php:362 ../help/help.inc:128
+#: ../templates/config/mainmanage.php:245 ../help/help.inc:126
 msgid "Change master password"
 msgstr "マスタパスワードの変更"
 
-#: ../templates/lists/changePassword.php:160
-#: ../templates/lists/changePassword.php:215
-#: ../templates/lists/changePassword.php:246 ../lib/types/user.inc:247
+#: ../templates/lists/changePassword.php:205
+#: ../templates/lists/changePassword.php:261
+#: ../templates/lists/changePassword.php:292 ../lib/types/user.inc:307
 #: ../help/help.inc:95
 msgid "Change password"
 msgstr "パスワードの変更"
 
-#: ../templates/config/confmain.php:333 ../templates/config/confmain.php:336
+#: ../templates/config/confmain.php:253
 msgid "Change passwords"
 msgstr "パスワードの変更"
 
-#: ../lib/types/dhcp.inc:225 ../lib/lists.inc:691
+#: ../lib/types/dhcp.inc:281 ../lib/lists.inc:719
 msgid "Change settings"
 msgstr "設定の変更"
 
-#: ../lib/modules/posixAccount.inc:846
+#: ../lib/modules/posixAccount.inc:828
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "ASCII文字だけが有効なため、%s の値を変更しました。"
 
-#: ../templates/tests/index.php:51
+#: ../templates/tests/index.php:52 ../lib/tools/tests.inc:112
 msgid "Check if quotas and homedirectories can be managed."
 msgstr "quotaおよびホームディレクトリが管理可能な場合にチェックしてください。"
 
-#: ../templates/tests/index.php:54
+#: ../templates/tests/index.php:58 ../lib/tools/tests.inc:118
 msgid ""
 "Check if the LDAP schema fits the requirements of the selected account "
 "modules."
@@ -1173,11 +1179,11 @@ msgstr ""
 "選択したアカウントモジュールの要件にLDAPスキーマが適合するか確認してくださ"
 "い。"
 
-#: ../templates/tests/lamdaemonTest.php:90
+#: ../templates/tests/lamdaemonTest.php:85
 msgid "Check quotas"
 msgstr "クオータをチェック"
 
-#: ../templates/masscreate.php:213
+#: ../templates/masscreate.php:233
 msgid ""
 "Check your input carefully. LAM will only do some basic checks on the upload "
 "data."
@@ -1185,7 +1191,7 @@ msgstr ""
 "入力をよく確認してください。LAMはアップロードデータについて基本的な検査しか行"
 "いません。"
 
-#: ../lib/modules/posixAccount.inc:97
+#: ../lib/modules/posixAccount.inc:99
 msgid "Choose a server for the home directory!"
 msgstr "ホームディレクトリ用のサーバを選択してください!"
 
@@ -1193,18 +1199,25 @@ msgstr "ホームディレクトリ用のサーバを選択してください!"
 msgid "Choose a template"
 msgstr "テンプレートを選択"
 
+#: ../lib/modules/imapAccess.inc:79
+msgid ""
+"Choose the way how to provide the IMAP admin password. You can use the same "
+"password as for the LAM login or LAM will ask you for a password when it is "
+"required."
+msgstr "IMAP管理パスワードの提供手段を選択してください。LAMログインと同じパスワードを使用する事ができ、LAMは必要に応じてパスワードの問い合わせを行います。"
+
 #: ../templates/tree/create.php:169 ../lib/config.inc:158
 msgid "Click here if you are not directed to the next page."
 msgstr "自動的に次ページにジャンプしない場合はここをクリックしてください。"
 
-#: ../lib/types/user.inc:218
+#: ../lib/types/user.inc:278
 msgid "Click to switch between thumbnail and original size."
 msgstr "クリックしてサムネイルと元のサイズを切り替えてください。"
 
-#: ../lib/modules/sambaSamAccount.inc:218
-#: ../lib/modules/sambaSamAccount.inc:351
-#: ../lib/modules/sambaSamAccount.inc:1421
-#: ../lib/modules/sambaSamAccount.inc:1699
+#: ../lib/modules/sambaSamAccount.inc:223
+#: ../lib/modules/sambaSamAccount.inc:356
+#: ../lib/modules/sambaSamAccount.inc:1414
+#: ../lib/modules/sambaSamAccount.inc:1692
 msgid "Client printer is default"
 msgstr "クライアントプリンタをデフォルトにする"
 
@@ -1212,11 +1225,11 @@ msgstr "クライアントプリンタをデフォルトにする"
 msgid "Collective"
 msgstr "集合属性"
 
-#: ../templates/masscreate.php:234
-msgid "Columns:"
+#: ../templates/masscreate.php:250
+msgid "Columns"
 msgstr "カラム:"
 
-#: ../lib/modules/sambaSamAccount.inc:291
+#: ../lib/modules/sambaSamAccount.inc:296
 msgid ""
 "Comma separated list of Samba workstations the user is allowed to login. "
 "Empty means every workstation."
@@ -1239,13 +1252,13 @@ msgstr "コマンド"
 msgid "Commit"
 msgstr "更新"
 
-#: ../lib/modules/posixAccount.inc:95 ../lib/modules/posixAccount.inc:196
-#: ../lib/modules/posixAccount.inc:305 ../lib/modules/posixAccount.inc:384
-#: ../lib/modules/posixAccount.inc:406 ../lib/modules/posixAccount.inc:957
-#: ../lib/modules/posixAccount.inc:1164 ../lib/modules/inetOrgPerson.inc:68
-#: ../lib/modules/inetOrgPerson.inc:474 ../lib/modules/inetOrgPerson.inc:536
-#: ../lib/modules/inetOrgPerson.inc:831 ../lib/modules/inetOrgPerson.inc:1039
-#: ../lib/modules/inetOrgPerson.inc:1093
+#: ../lib/modules/posixAccount.inc:97 ../lib/modules/posixAccount.inc:198
+#: ../lib/modules/posixAccount.inc:307 ../lib/modules/posixAccount.inc:386
+#: ../lib/modules/posixAccount.inc:408 ../lib/modules/posixAccount.inc:939
+#: ../lib/modules/posixAccount.inc:1145 ../lib/modules/inetOrgPerson.inc:71
+#: ../lib/modules/inetOrgPerson.inc:477 ../lib/modules/inetOrgPerson.inc:539
+#: ../lib/modules/inetOrgPerson.inc:834 ../lib/modules/inetOrgPerson.inc:1043
+#: ../lib/modules/inetOrgPerson.inc:1097
 #: ../lib/modules/asteriskExtension.inc:102
 #: ../lib/modules/asteriskExtension.inc:129
 #: ../lib/modules/asteriskExtension.inc:149
@@ -1258,7 +1271,7 @@ msgstr "名称(common name)"
 msgid "Common name of the Asterisk extension."
 msgstr "アスタリスク拡張の名称"
 
-#: ../templates/serverInfo.php:100
+#: ../templates/serverInfo.php:103
 msgid "Config suffix"
 msgstr "サフィックスの設定"
 
@@ -1266,27 +1279,27 @@ msgstr "サフィックスの設定"
 msgid "Configuration overview"
 msgstr "構成の概要"
 
-#: ../templates/config/confmodules.php:371
+#: ../templates/config/confmodules.php:373
 msgid "Conflicting module:"
 msgstr "競合するモジュール"
 
-#: ../lib/modules/sambaSamAccount.inc:216
-#: ../lib/modules/sambaSamAccount.inc:345
-#: ../lib/modules/sambaSamAccount.inc:1417
-#: ../lib/modules/sambaSamAccount.inc:1689
+#: ../lib/modules/sambaSamAccount.inc:221
+#: ../lib/modules/sambaSamAccount.inc:350
+#: ../lib/modules/sambaSamAccount.inc:1410
+#: ../lib/modules/sambaSamAccount.inc:1682
 msgid "Connect client drives"
 msgstr "クライアントのドライブを接続"
 
-#: ../lib/modules/sambaSamAccount.inc:217
-#: ../lib/modules/sambaSamAccount.inc:348
-#: ../lib/modules/sambaSamAccount.inc:1419
-#: ../lib/modules/sambaSamAccount.inc:1694
+#: ../lib/modules/sambaSamAccount.inc:222
+#: ../lib/modules/sambaSamAccount.inc:353
+#: ../lib/modules/sambaSamAccount.inc:1412
+#: ../lib/modules/sambaSamAccount.inc:1687
 msgid "Connect client printers"
 msgstr "クライアントのプリンタを接続する"
 
-#: ../lib/modules/sambaSamAccount.inc:213
-#: ../lib/modules/sambaSamAccount.inc:1411
-#: ../lib/modules/sambaSamAccount.inc:1682
+#: ../lib/modules/sambaSamAccount.inc:218
+#: ../lib/modules/sambaSamAccount.inc:1404
+#: ../lib/modules/sambaSamAccount.inc:1675
 msgid "Connection time limit"
 msgstr "接続時間の制限"
 
@@ -1314,7 +1327,7 @@ msgstr "PDF構成を保存できません。アクセスが拒否されました
 
 #: ../lib/modules/kolabUser.inc:86 ../lib/modules/kolabUser.inc:147
 #: ../lib/modules/kolabUser.inc:176 ../lib/modules/kolabUser.inc:215
-#: ../lib/modules/kolabUser.inc:285 ../lib/modules/kolabUser.inc:764
+#: ../lib/modules/kolabUser.inc:285 ../lib/modules/kolabUser.inc:766
 msgid "Country"
 msgstr "国"
 
@@ -1324,8 +1337,8 @@ msgstr "国名が正しくありません!"
 
 #: ../templates/tree/templates/creation/custom.php:234
 #: ../templates/tree/templates/creation/new_ou_template.php:107
-#: ../templates/pdfedit/pdfmain.php:144
-#: ../templates/profedit/profilemain.php:139 ../templates/initsuff.php:186
+#: ../templates/pdfedit/pdfmain.php:141
+#: ../templates/profedit/profilemain.php:135 ../templates/initsuff.php:188
 msgid "Create"
 msgstr "作成"
 
@@ -1334,12 +1347,12 @@ msgstr "作成"
 msgid "Create Object"
 msgstr "オブジェクト作成"
 
-#: ../lib/lists.inc:428 ../lib/lists.inc:597 ../lib/modules.inc:1494
-#: ../help/help.inc:158
+#: ../lib/lists.inc:435 ../lib/lists.inc:621 ../lib/modules.inc:1549
+#: ../help/help.inc:156
 msgid "Create PDF file"
 msgstr "PDFファイル作成"
 
-#: ../templates/pdfedit/pdfmain.php:135
+#: ../templates/pdfedit/pdfmain.php:134
 msgid "Create a new PDF structure"
 msgstr "新しいPDF構成を作成"
 
@@ -1367,7 +1380,7 @@ msgstr "新たなエイリアスを作成"
 msgid "Create another domain"
 msgstr "新たなドメインを作成"
 
-#: ../lib/types/asteriskExt.inc:43
+#: ../lib/types/asteriskExt.inc:44
 msgid "Create another extension"
 msgstr "新たな拡張を作成"
 
@@ -1392,15 +1405,19 @@ msgstr "新たなsudoロールを作成"
 msgid "Create another user"
 msgstr "新たなユーザーを作成"
 
-#: ../lib/lists.inc:614
+#: ../lib/lists.inc:626
 msgid "Create for"
 msgstr "作成"
 
-#: ../lib/modules/posixAccount.inc:228 ../lib/modules/posixAccount.inc:995
-#: ../lib/modules/posixAccount.inc:1108
+#: ../lib/modules/posixAccount.inc:230 ../lib/modules/posixAccount.inc:977
+#: ../lib/modules/posixAccount.inc:1089
 msgid "Create home directory"
 msgstr "ホームディレクトリを作成"
 
+#: ../lib/modules/imapAccess.inc:196
+msgid "Create mailbox"
+msgstr "メールボックスを作成"
+
 #: ../templates/tree/edit.php:125 ../templates/tree/tree.php:189
 #: ../templates/tree/tree.php:191 ../templates/tree/tree.php:192
 #: ../lib/tree.inc:92 ../lib/tree.inc:93 ../lib/tree.inc:157
@@ -1448,7 +1465,7 @@ msgstr "DHCP"
 msgid "DHCP administration"
 msgstr "DHCPの管理"
 
-#: ../lib/types/dhcp.inc:126 ../lib/modules/dhcp_settings.inc:106
+#: ../lib/types/dhcp.inc:165 ../lib/modules/dhcp_settings.inc:106
 msgid "DHCP settings"
 msgstr "DHCP設定"
 
@@ -1456,16 +1473,16 @@ msgstr "DHCP設定"
 #: ../templates/tree/add_oclass_form.php:124
 #: ../templates/tree/update_confirm.php:79
 #: ../templates/tree/add_attr_form.php:73 ../templates/tree/delete_form.php:77
-#: ../templates/tree/delete_form.php:151 ../templates/delete.php:92
-#: ../lib/modules.inc:384 ../lib/modules.inc:1567 ../lib/modules.inc:2040
+#: ../templates/tree/delete_form.php:151 ../templates/delete.php:87
+#: ../lib/modules.inc:382 ../lib/modules.inc:2059
 msgid "DN"
 msgstr "DN"
 
-#: ../templates/masscreate.php:237
+#: ../templates/masscreate.php:274
 msgid "DN settings"
 msgstr "DN設定"
 
-#: ../templates/masscreate.php:241 ../help/help.inc:152
+#: ../templates/masscreate.php:281 ../help/help.inc:150
 msgid "DN suffix"
 msgstr "DNサフィックス"
 
@@ -1492,11 +1509,11 @@ msgstr "DSMLにエクスポート: %s"
 msgid "Data field for RDN is empty!"
 msgstr "RDNのデータフィールドが空です!"
 
-#: ../lib/modules/sambaSamAccount.inc:271
+#: ../lib/modules/sambaSamAccount.inc:276
 msgid "Date after the user is able to change his password."
 msgstr "ユーザによるパスワード変更の禁止が解かれる日付。"
 
-#: ../lib/modules/sambaSamAccount.inc:273
+#: ../lib/modules/sambaSamAccount.inc:278
 msgid "Date after the user must change his password."
 msgstr "ユーザがパスワードを変更しなければならなくなる日付。"
 
@@ -1508,7 +1525,7 @@ msgstr ""
 "パスワードが期限切れになる前にユーザへパスワード期限切れの猶予期間である旨を"
 "警告する日数。もしもその値を設定するなら0より大きくなければならない。"
 
-#: ../templates/config/mainmanage.php:287
+#: ../templates/config/mainmanage.php:215
 msgid "Debug"
 msgstr "デバッグ"
 
@@ -1518,11 +1535,11 @@ msgstr "デバッグ"
 msgid "Default gateway"
 msgstr "デフォルト・ゲートウェイ"
 
-#: ../templates/config/confmain.php:361 ../help/help.inc:91
+#: ../templates/config/confmain.php:278 ../help/help.inc:91
 msgid "Default language"
 msgstr "規定の言語"
 
-#: ../templates/masscreate.php:249 ../templates/masscreate.php:377
+#: ../templates/masscreate.php:266
 msgid "Default value"
 msgstr "既定値"
 
@@ -1533,16 +1550,16 @@ msgstr "ワークステーションのパスワード変更を許可する場合
 #: ../lib/modules/kolabUser.inc:117 ../lib/modules/kolabUser.inc:131
 #: ../lib/modules/kolabUser.inc:135 ../lib/modules/kolabUser.inc:195
 #: ../lib/modules/kolabUser.inc:218 ../lib/modules/kolabUser.inc:370
-#: ../lib/modules/kolabUser.inc:802 ../lib/modules/kolabUser.inc:866
+#: ../lib/modules/kolabUser.inc:804 ../lib/modules/kolabUser.inc:868
 msgid "Delegates"
 msgstr "代理人"
 
 #: ../templates/tree/edit.php:112 ../templates/tree/delete_form.php:159
-#: ../templates/ou_edit.php:112 ../templates/pdfedit/pdfdelete.php:91
-#: ../templates/pdfedit/pdfmain.php:178 ../templates/delete.php:112
-#: ../templates/profedit/profilemain.php:170 ../lib/tree.inc:1176
-#: ../lib/modules/kolabUser.inc:862 ../lib/modules/nisnetgroup.inc:237
-#: ../lib/lists.inc:422
+#: ../templates/ou_edit.php:117 ../templates/pdfedit/pdfdelete.php:95
+#: ../templates/pdfedit/pdfmain.php:161 ../templates/delete.php:107
+#: ../templates/profedit/profilemain.php:160 ../lib/tree.inc:1176
+#: ../lib/modules/kolabUser.inc:864 ../lib/modules/nisnetgroup.inc:242
+#: ../lib/lists.inc:429
 msgid "Delete"
 msgstr "削除"
 
@@ -1551,15 +1568,15 @@ msgstr "削除"
 msgid "Delete %s"
 msgstr "%s を削除"
 
-#: ../lib/types/dhcp.inc:127
+#: ../lib/types/dhcp.inc:166
 msgid "Delete DHCP(s)"
 msgstr "DHCPの削除"
 
-#: ../lib/types/nisObjectType.inc:108
+#: ../lib/types/nisObjectType.inc:147
 msgid "Delete NIS object(s)"
 msgstr "NISオブジェクトを削除"
 
-#: ../lib/types/mailAlias.inc:120 ../lib/types/alias.inc:120
+#: ../lib/types/mailAlias.inc:138 ../lib/types/alias.inc:138
 msgid "Delete alias(es)"
 msgstr "別名を削除"
 
@@ -1568,45 +1585,49 @@ msgstr "別名を削除"
 msgid "Delete all %s objects"
 msgstr "全ての %s オブジェクトを削除"
 
-#: ../lib/types/smbDomain.inc:120
+#: ../lib/types/smbDomain.inc:159
 msgid "Delete domain(s)"
 msgstr "ドメインの削除"
 
-#: ../lib/types/asteriskExt.inc:121
+#: ../lib/types/asteriskExt.inc:140
 msgid "Delete extension(s)"
 msgstr "拡張の削除"
 
-#: ../lib/types/gon.inc:122 ../lib/types/group.inc:134
-#: ../lib/types/netgroup.inc:122
+#: ../lib/types/gon.inc:161 ../lib/types/group.inc:177
+#: ../lib/types/netgroup.inc:161
 msgid "Delete group(s)"
 msgstr "グループの削除"
 
-#: ../lib/modules/posixAccount.inc:1030
+#: ../lib/modules/posixAccount.inc:1012
 msgid "Delete home directory"
 msgstr "ホームディレクトリを削除"
 
-#: ../lib/types/host.inc:124
+#: ../lib/types/host.inc:164
 msgid "Delete host(s)"
 msgstr "ホストの削除"
 
+#: ../lib/modules/imapAccess.inc:189
+msgid "Delete mailbox"
+msgstr "メールボックスの削除"
+
 #: ../lib/lists.inc:109
 msgid "Delete object"
 msgstr "オブジェクトを削除"
 
-#: ../templates/ou_edit.php:181 ../help/help.inc:205
+#: ../templates/ou_edit.php:191 ../help/help.inc:205
 msgid "Delete organizational unit"
 msgstr "organizational unitを削除"
 
-#: ../lib/modules/inetOrgPerson.inc:979
+#: ../lib/modules/inetOrgPerson.inc:972
 msgid "Delete photo"
 msgstr "写真を削除"
 
-#: ../lib/types/ppolicyType.inc:128
+#: ../lib/types/ppolicyType.inc:146
 msgid "Delete policy(ies)"
 msgstr "ポリシーを削除"
 
 #: ../templates/config/profmanage.php:286
-#: ../templates/selfService/profManage.php:262 ../help/help.inc:122
+#: ../templates/selfService/profManage.php:262 ../help/help.inc:120
 msgid "Delete profile"
 msgstr "プロファイルを削除"
 
@@ -1615,28 +1636,28 @@ msgstr "プロファイルを削除"
 msgid "Delete range"
 msgstr "範囲を削除"
 
-#: ../lib/types/sudo.inc:112
+#: ../lib/types/sudo.inc:151
 msgid "Delete sudo role(s)"
 msgstr "sudoロールの削除"
 
-#: ../lib/types/user.inc:138
+#: ../lib/types/user.inc:198
 msgid "Delete user(s)"
 msgstr "ユーザの削除"
 
-#: ../templates/delete.php:221
+#: ../templates/delete.php:253
 #, php-format
 msgid "Deleted DN: %s"
 msgstr "削除されたDN: %s"
 
-#: ../templates/pdfedit/pdfmain.php:125
+#: ../templates/pdfedit/pdfmain.php:128
 msgid "Deleted PDF structure."
 msgstr "削除したPDF構成。"
 
-#: ../lib/modules/sambaGroupMapping.inc:72
+#: ../lib/modules/sambaGroupMapping.inc:74
 msgid "Deleted account"
 msgstr "削除されたアカウント"
 
-#: ../templates/profedit/profilemain.php:114
+#: ../templates/profedit/profilemain.php:117
 msgid "Deleted profile."
 msgstr "削除したプロファイル。"
 
@@ -1650,15 +1671,15 @@ msgstr "IPアドレス範囲を削除する。"
 msgid "Deleting %s"
 msgstr "%s を削除しています"
 
-#: ../templates/delete.php:131
-msgid "Deleting. Please stand by ..."
-msgstr "削除中です。お待ちください ..."
+#: ../lib/lists.inc:937
+msgid "Deletion was successful."
+msgstr "削除が完了しました。"
 
-#: ../lib/modules/inetOrgPerson.inc:122 ../lib/modules/inetOrgPerson.inc:129
-#: ../lib/modules/inetOrgPerson.inc:212 ../lib/modules/inetOrgPerson.inc:367
-#: ../lib/modules/inetOrgPerson.inc:464 ../lib/modules/inetOrgPerson.inc:576
-#: ../lib/modules/inetOrgPerson.inc:937 ../lib/modules/inetOrgPerson.inc:1049
-#: ../lib/modules/inetOrgPerson.inc:1520
+#: ../lib/modules/inetOrgPerson.inc:125 ../lib/modules/inetOrgPerson.inc:132
+#: ../lib/modules/inetOrgPerson.inc:215 ../lib/modules/inetOrgPerson.inc:370
+#: ../lib/modules/inetOrgPerson.inc:467 ../lib/modules/inetOrgPerson.inc:579
+#: ../lib/modules/inetOrgPerson.inc:940 ../lib/modules/inetOrgPerson.inc:1053
+#: ../lib/modules/inetOrgPerson.inc:1524
 msgid "Department(s)"
 msgstr "部門"
 
@@ -1668,29 +1689,29 @@ msgstr "部門"
 #: ../lib/types/sudo.inc:84 ../lib/types/dhcp.inc:96
 #: ../lib/types/netgroup.inc:92 ../lib/modules/account.inc:75
 #: ../lib/modules/account.inc:88 ../lib/modules/account.inc:98
-#: ../lib/modules/account.inc:106 ../lib/modules/account.inc:219
-#: ../lib/modules/account.inc:230 ../lib/modules/posixGroup.inc:192
-#: ../lib/modules/posixGroup.inc:345 ../lib/modules/posixGroup.inc:397
-#: ../lib/modules/posixGroup.inc:460 ../lib/modules/device.inc:70
+#: ../lib/modules/account.inc:106 ../lib/modules/account.inc:220
+#: ../lib/modules/account.inc:231 ../lib/modules/posixGroup.inc:185
+#: ../lib/modules/posixGroup.inc:337 ../lib/modules/posixGroup.inc:389
+#: ../lib/modules/posixGroup.inc:456 ../lib/modules/device.inc:70
 #: ../lib/modules/device.inc:103 ../lib/modules/device.inc:113
-#: ../lib/modules/device.inc:159 ../lib/modules/device.inc:389
+#: ../lib/modules/device.inc:159 ../lib/modules/device.inc:394
 #: ../lib/modules/dhcp_settings.inc:166 ../lib/modules/dhcp_settings.inc:181
 #: ../lib/modules/dhcp_settings.inc:261 ../lib/modules/dhcp_settings.inc:560
-#: ../lib/modules/dhcp_settings.inc:619 ../lib/modules/posixAccount.inc:402
+#: ../lib/modules/dhcp_settings.inc:619 ../lib/modules/posixAccount.inc:404
 #: ../lib/modules/nisObject.inc:66 ../lib/modules/nisObject.inc:96
 #: ../lib/modules/nisObject.inc:107 ../lib/modules/nisObject.inc:148
-#: ../lib/modules/nisObject.inc:213 ../lib/modules/sambaGroupMapping.inc:303
-#: ../lib/modules/sambaGroupMapping.inc:380 ../lib/modules/nisnetgroup.inc:72
-#: ../lib/modules/nisnetgroup.inc:125 ../lib/modules/nisnetgroup.inc:183
-#: ../lib/modules/nisnetgroup.inc:577 ../lib/modules/inetOrgPerson.inc:176
-#: ../lib/modules/inetOrgPerson.inc:247 ../lib/modules/inetOrgPerson.inc:410
-#: ../lib/modules/inetOrgPerson.inc:480 ../lib/modules/inetOrgPerson.inc:838
-#: ../lib/modules/inetOrgPerson.inc:1024 ../lib/modules/sudoRole.inc:59
+#: ../lib/modules/nisObject.inc:213 ../lib/modules/sambaGroupMapping.inc:325
+#: ../lib/modules/sambaGroupMapping.inc:394 ../lib/modules/nisnetgroup.inc:77
+#: ../lib/modules/nisnetgroup.inc:130 ../lib/modules/nisnetgroup.inc:188
+#: ../lib/modules/nisnetgroup.inc:573 ../lib/modules/inetOrgPerson.inc:179
+#: ../lib/modules/inetOrgPerson.inc:250 ../lib/modules/inetOrgPerson.inc:413
+#: ../lib/modules/inetOrgPerson.inc:483 ../lib/modules/inetOrgPerson.inc:841
+#: ../lib/modules/inetOrgPerson.inc:1028 ../lib/modules/sudoRole.inc:59
 #: ../lib/modules/sudoRole.inc:128 ../lib/modules/sudoRole.inc:172
 #: ../lib/modules/sudoRole.inc:253 ../lib/modules/sudoRole.inc:684
 #: ../lib/modules/groupOfNames.inc:64 ../lib/modules/groupOfNames.inc:91
-#: ../lib/modules/groupOfNames.inc:112 ../lib/modules/groupOfNames.inc:144
-#: ../lib/modules/groupOfNames.inc:427
+#: ../lib/modules/groupOfNames.inc:112 ../lib/modules/groupOfNames.inc:150
+#: ../lib/modules/groupOfNames.inc:451
 msgid "Description"
 msgstr "説明"
 
@@ -1698,8 +1719,8 @@ msgstr "説明"
 msgid "Device"
 msgstr "デバイス"
 
-#: ../lib/modules/sambaSamAccount.inc:366
-#: ../lib/modules/sambaSamAccount.inc:554
+#: ../lib/modules/sambaSamAccount.inc:371
+#: ../lib/modules/sambaSamAccount.inc:559
 msgid "Disable LM hashes"
 msgstr "LMハッシュを無効化"
 
@@ -1716,9 +1737,9 @@ msgstr "クライアントによるDNSエントリの更新を禁止します。
 msgid "Disconnect users outside logon hours"
 msgstr "ログオン許可時間帯以外はユーザをログオフさせる。"
 
-#: ../lib/modules/sambaSamAccount.inc:214
-#: ../lib/modules/sambaSamAccount.inc:1413
-#: ../lib/modules/sambaSamAccount.inc:1683
+#: ../lib/modules/sambaSamAccount.inc:219
+#: ../lib/modules/sambaSamAccount.inc:1406
+#: ../lib/modules/sambaSamAccount.inc:1676
 msgid "Disconnection time limit"
 msgstr "切断時間の制限"
 
@@ -1726,24 +1747,24 @@ msgstr "切断時間の制限"
 msgid "Disconnects users if they are logged in outside logon hours."
 msgstr "ログオン許可時間帯以外にログオン状態のユーザーの接続を切る。"
 
-#: ../lib/modules/sambaSamAccount.inc:96
-#: ../lib/modules/sambaSamAccount.inc:186
-#: ../lib/modules/sambaSamAccount.inc:231
-#: ../lib/modules/sambaSamAccount.inc:389
-#: ../lib/modules/sambaSamAccount.inc:1063
-#: ../lib/modules/sambaSamAccount.inc:1640
-#: ../lib/modules/sambaGroupMapping.inc:236
-#: ../lib/modules/sambaGroupMapping.inc:301
-#: ../lib/modules/sambaGroupMapping.inc:345
-#: ../lib/modules/sambaGroupMapping.inc:378
+#: ../lib/modules/sambaSamAccount.inc:101
+#: ../lib/modules/sambaSamAccount.inc:191
+#: ../lib/modules/sambaSamAccount.inc:236
+#: ../lib/modules/sambaSamAccount.inc:394
+#: ../lib/modules/sambaSamAccount.inc:1057
+#: ../lib/modules/sambaSamAccount.inc:1633
+#: ../lib/modules/sambaGroupMapping.inc:263
+#: ../lib/modules/sambaGroupMapping.inc:323
+#: ../lib/modules/sambaGroupMapping.inc:356
+#: ../lib/modules/sambaGroupMapping.inc:392
 msgid "Display name"
 msgstr "表示名"
 
-#: ../templates/lists/changePassword.php:206
+#: ../templates/lists/changePassword.php:252
 msgid "Display on screen"
 msgstr "スクリーンに表示"
 
-#: ../lib/modules.inc:477
+#: ../lib/modules.inc:475
 msgid ""
 "Displayed account numbers start at \"0\". Add 2 to get the row in your "
 "spreadsheet."
@@ -1751,15 +1772,15 @@ msgstr ""
 "表示されているアカウント番号は\"0\"から始まっています。表計算シート上の行番号"
 "を求めたい場合は、2を足してください。"
 
-#: ../templates/ou_edit.php:106
+#: ../templates/ou_edit.php:109
 msgid "Do you really want to delete this OU?"
 msgstr "本当にこのOUを削除しますか?"
 
-#: ../templates/pdfedit/pdfdelete.php:77
+#: ../templates/pdfedit/pdfdelete.php:81
 msgid "Do you really want to delete this PDF structure?"
 msgstr "本当にこのPDF構成を削除しますか?"
 
-#: ../templates/profedit/profiledelete.php:78
+#: ../templates/profedit/profiledelete.php:81
 msgid "Do you really want to delete this profile?"
 msgstr "本当にこのプロファイルを削除しますか?"
 
@@ -1767,7 +1788,7 @@ msgstr "本当にこのプロファイルを削除しますか?"
 msgid "Do you really want to mark this account for deletion?"
 msgstr "本当にこのアカウントを削除しますか?"
 
-#: ../templates/delete.php:86
+#: ../templates/delete.php:81
 msgid "Do you really want to remove the following accounts?"
 msgstr "本当にこのアカウントを削除しますか?"
 
@@ -1775,19 +1796,19 @@ msgstr "本当にこのアカウントを削除しますか?"
 msgid "Do you want to make these changes?"
 msgstr "これらの変更を行ないますか?"
 
-#: ../lib/modules/sambaSamAccount.inc:187
-#: ../lib/modules/sambaSamAccount.inc:309
-#: ../lib/modules/sambaSamAccount.inc:382
-#: ../lib/modules/sambaSamAccount.inc:506
-#: ../lib/modules/sambaSamAccount.inc:1184
-#: ../lib/modules/sambaSamAccount.inc:1514
-#: ../lib/modules/sambaSamAccount.inc:1536
-#: ../lib/modules/sambaSamAccount.inc:1658
-#: ../lib/modules/sambaGroupMapping.inc:69
-#: ../lib/modules/sambaGroupMapping.inc:268
-#: ../lib/modules/sambaGroupMapping.inc:357
-#: ../lib/modules/sambaGroupMapping.inc:399 ../lib/modules/nisnetgroup.inc:207
-#: ../lib/modules/nisnetgroup.inc:587
+#: ../lib/modules/sambaSamAccount.inc:192
+#: ../lib/modules/sambaSamAccount.inc:314
+#: ../lib/modules/sambaSamAccount.inc:387
+#: ../lib/modules/sambaSamAccount.inc:511
+#: ../lib/modules/sambaSamAccount.inc:1178
+#: ../lib/modules/sambaSamAccount.inc:1507
+#: ../lib/modules/sambaSamAccount.inc:1529
+#: ../lib/modules/sambaSamAccount.inc:1651
+#: ../lib/modules/sambaGroupMapping.inc:71
+#: ../lib/modules/sambaGroupMapping.inc:290
+#: ../lib/modules/sambaGroupMapping.inc:368
+#: ../lib/modules/sambaGroupMapping.inc:414 ../lib/modules/nisnetgroup.inc:212
+#: ../lib/modules/nisnetgroup.inc:583
 msgid "Domain"
 msgstr "ドメイン"
 
@@ -1798,87 +1819,87 @@ msgstr "ドメイン"
 msgid "Domain SID"
 msgstr "ドメインのSID"
 
-#: ../lib/modules/sambaGroupMapping.inc:324
+#: ../lib/modules/sambaGroupMapping.inc:335
 msgid "Domain administrators"
 msgstr "ドメイン管理者(Domain administrator)"
 
-#: ../lib/modules/sambaSamAccount.inc:69
-#: ../lib/modules/sambaGroupMapping.inc:56
-#: ../lib/modules/sambaGroupMapping.inc:330
+#: ../lib/modules/sambaSamAccount.inc:74
+#: ../lib/modules/sambaGroupMapping.inc:58
+#: ../lib/modules/sambaGroupMapping.inc:341
 msgid "Domain admins"
 msgstr "ドメイン管理者(Domain Admins)"
 
-#: ../lib/modules/sambaSamAccount.inc:70
-#: ../lib/modules/sambaGroupMapping.inc:61
+#: ../lib/modules/sambaSamAccount.inc:75
+#: ../lib/modules/sambaGroupMapping.inc:63
 msgid "Domain certificate admins"
 msgstr "ドメイン証明書管理者(Domain Certificate Admins)"
 
-#: ../lib/modules/sambaSamAccount.inc:70
+#: ../lib/modules/sambaSamAccount.inc:75
 #: ../lib/modules/sambaSamAccount.inc:772
-#: ../lib/modules/sambaGroupMapping.inc:59
+#: ../lib/modules/sambaGroupMapping.inc:61
 msgid "Domain computers"
 msgstr "ドメインコンピュータ(Domain Computers)"
 
-#: ../lib/modules/sambaSamAccount.inc:70
-#: ../lib/modules/sambaGroupMapping.inc:60
+#: ../lib/modules/sambaSamAccount.inc:75
+#: ../lib/modules/sambaGroupMapping.inc:62
 msgid "Domain controllers"
 msgstr "ドメインコントローラ(Domain Controllers)"
 
-#: ../lib/modules/sambaSamAccount.inc:71
-#: ../lib/modules/sambaGroupMapping.inc:63
+#: ../lib/modules/sambaSamAccount.inc:76
+#: ../lib/modules/sambaGroupMapping.inc:65
 msgid "Domain enterprise admins"
 msgstr "ドメインエンタープライズ管理者(Domain Enterprise Admins)"
 
-#: ../lib/modules/sambaGroupMapping.inc:68
-#: ../lib/modules/sambaGroupMapping.inc:259
+#: ../lib/modules/sambaGroupMapping.inc:70
+#: ../lib/modules/sambaGroupMapping.inc:281
 msgid "Domain group"
 msgstr "ドメイングループ(Domain Group)"
 
-#: ../lib/modules/sambaSamAccount.inc:69
-#: ../lib/modules/sambaGroupMapping.inc:58
+#: ../lib/modules/sambaSamAccount.inc:74
+#: ../lib/modules/sambaGroupMapping.inc:60
 msgid "Domain guests"
 msgstr "ドメインゲスト(Domain Guests)"
 
 #: ../lib/types/smbDomain.inc:92 ../lib/modules/dhcp_settings.inc:124
 #: ../lib/modules/dhcp_settings.inc:172 ../lib/modules/dhcp_settings.inc:186
 #: ../lib/modules/dhcp_settings.inc:210 ../lib/modules/dhcp_settings.inc:520
-#: ../lib/modules/dhcp_settings.inc:610 ../lib/modules/nisnetgroup.inc:139
+#: ../lib/modules/dhcp_settings.inc:610 ../lib/modules/nisnetgroup.inc:144
 #: ../lib/modules/sambaDomain.inc:70 ../lib/modules/sambaDomain.inc:137
 #: ../lib/modules/sambaDomain.inc:177 ../lib/modules/sambaDomain.inc:234
 #: ../lib/modules/sambaDomain.inc:239 ../lib/modules/sambaDomain.inc:618
 msgid "Domain name"
 msgstr "ドメイン名"
 
-#: ../lib/modules/nisnetgroup.inc:139 ../lib/modules/sambaDomain.inc:201
+#: ../lib/modules/nisnetgroup.inc:144 ../lib/modules/sambaDomain.inc:201
 #: ../lib/modules/sambaDomain.inc:202
 msgid "Domain name is invalid!"
 msgstr "ドメイン名が正しくありません!"
 
-#: ../lib/modules/sambaSamAccount.inc:71
-#: ../lib/modules/sambaGroupMapping.inc:64
+#: ../lib/modules/sambaSamAccount.inc:76
+#: ../lib/modules/sambaGroupMapping.inc:66
 msgid "Domain policy admins"
 msgstr "ドメインポリシー管理者(Domain Policy Admins)"
 
-#: ../lib/modules/sambaSamAccount.inc:71
-#: ../lib/modules/sambaGroupMapping.inc:62
+#: ../lib/modules/sambaSamAccount.inc:76
+#: ../lib/modules/sambaGroupMapping.inc:64
 msgid "Domain schema admins"
 msgstr "ドメインスキーマ管理者(Domain Schema Admins)"
 
-#: ../lib/modules/sambaSamAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:1965
-#: ../lib/modules/sambaGroupMapping.inc:57
+#: ../lib/modules/sambaSamAccount.inc:74
+#: ../lib/modules/sambaSamAccount.inc:1957
+#: ../lib/modules/sambaGroupMapping.inc:59
 msgid "Domain users"
 msgstr "ドメインユーザ(Domain Users)"
 
-#: ../templates/pdfedit/pdfpage.php:434
+#: ../templates/pdfedit/pdfpage.php:459
 msgid "Down"
 msgstr "下へ"
 
-#: ../templates/masscreate.php:226
+#: ../templates/masscreate.php:243
 msgid "Download sample CSV file"
 msgstr "サンプルCSVファイルをダウンロード"
 
-#: ../templates/serverInfo.php:108
+#: ../templates/serverInfo.php:113
 msgid "Dynamic subtrees"
 msgstr "動的サブツリー"
 
@@ -1886,22 +1907,22 @@ msgstr "動的サブツリー"
 msgid "EDU person"
 msgstr "EDU person"
 
-#: ../lib/modules/sambaSamAccount.inc:544
+#: ../lib/modules/sambaSamAccount.inc:549
 msgid "East Australian Standard, Guam"
 msgstr "East Australian Standard, Guam"
 
-#: ../lib/modules/sambaSamAccount.inc:536
+#: ../lib/modules/sambaSamAccount.inc:541
 msgid "Eastern Europe Time, South Africa"
 msgstr "Eastern Europe Time, South Africa"
 
-#: ../lib/modules/sambaSamAccount.inc:529
+#: ../lib/modules/sambaSamAccount.inc:534
 msgid "Eastern Time (US & Canada), Bogota"
 msgstr "Eastern Time (US & Canada), Bogota"
 
-#: ../templates/pdfedit/pdfmain.php:175
-#: ../templates/profedit/profilemain.php:167
-#: ../lib/modules/sambaSamAccount.inc:1189
-#: ../lib/modules/sambaSamAccount.inc:1194 ../lib/lists.inc:416
+#: ../templates/pdfedit/pdfmain.php:158
+#: ../templates/profedit/profilemain.php:157
+#: ../lib/modules/sambaSamAccount.inc:1183
+#: ../lib/modules/sambaSamAccount.inc:1188 ../lib/lists.inc:423
 msgid "Edit"
 msgstr "編集"
 
@@ -1909,11 +1930,11 @@ msgstr "編集"
 msgid "Edit general settings"
 msgstr "一般設定を更新"
 
-#: ../lib/modules/posixAccount.inc:980
+#: ../lib/modules/posixAccount.inc:962
 msgid "Edit groups"
 msgstr "グループの編集"
 
-#: ../lib/modules/posixGroup.inc:196
+#: ../lib/modules/posixGroup.inc:189
 msgid "Edit members"
 msgstr "メンバーの編集"
 
@@ -1925,11 +1946,11 @@ msgstr "セルフサービスの編集"
 msgid "Edit server profiles"
 msgstr "サーバープロファイルの編集"
 
-#: ../lib/modules/nisnetgroup.inc:192
+#: ../lib/modules/nisnetgroup.inc:197
 msgid "Edit subgroups"
 msgstr "サブグループの編集"
 
-#: ../lib/modules/sambaSamAccount.inc:1145
+#: ../lib/modules/sambaSamAccount.inc:1139
 msgid "Edit workstations"
 msgstr "ワークステーションの編集??"
 
@@ -1938,20 +1959,20 @@ msgstr "ワークステーションの編集??"
 msgid "Email"
 msgstr "電子メール"
 
-#: ../templates/lists/changePassword.php:190 ../lib/modules/zarafaGroup.inc:59
+#: ../templates/lists/changePassword.php:236 ../lib/modules/zarafaGroup.inc:59
 #: ../lib/modules/zarafaGroup.inc:60 ../lib/modules/zarafaGroup.inc:87
 #: ../lib/modules/zarafaGroup.inc:124 ../lib/modules/zarafaGroup.inc:137
-#: ../lib/modules/zarafaGroup.inc:413 ../lib/modules/inetOrgPerson.inc:56
-#: ../lib/modules/inetOrgPerson.inc:117 ../lib/modules/inetOrgPerson.inc:202
-#: ../lib/modules/inetOrgPerson.inc:351 ../lib/modules/inetOrgPerson.inc:449
-#: ../lib/modules/inetOrgPerson.inc:532 ../lib/modules/inetOrgPerson.inc:533
-#: ../lib/modules/inetOrgPerson.inc:909 ../lib/modules/inetOrgPerson.inc:1038
-#: ../lib/modules/inetOrgPerson.inc:1390
+#: ../lib/modules/zarafaGroup.inc:413 ../lib/modules/inetOrgPerson.inc:59
+#: ../lib/modules/inetOrgPerson.inc:120 ../lib/modules/inetOrgPerson.inc:205
+#: ../lib/modules/inetOrgPerson.inc:354 ../lib/modules/inetOrgPerson.inc:452
+#: ../lib/modules/inetOrgPerson.inc:535 ../lib/modules/inetOrgPerson.inc:536
+#: ../lib/modules/inetOrgPerson.inc:912 ../lib/modules/inetOrgPerson.inc:1042
+#: ../lib/modules/inetOrgPerson.inc:1394
 #: ../lib/modules/asteriskVoicemail.inc:98
 #: ../lib/modules/asteriskVoicemail.inc:131
 #: ../lib/modules/asteriskVoicemail.inc:169
 #: ../lib/modules/asteriskVoicemail.inc:261
-#: ../lib/modules/asteriskVoicemail.inc:393
+#: ../lib/modules/asteriskVoicemail.inc:410 ../lib/modules/imapAccess.inc:165
 msgid "Email address"
 msgstr "電子メールアドレス"
 
@@ -1986,23 +2007,23 @@ msgstr "電子メール・エイリアス・リストの形式が正しくあり
 #: ../lib/modules/zarafaGroup.inc:170 ../lib/modules/zarafaGroup.inc:418
 #: ../lib/modules/zarafaUser.inc:365 ../lib/modules/kolabUser.inc:189
 #: ../lib/modules/kolabUser.inc:217 ../lib/modules/kolabUser.inc:350
-#: ../lib/modules/kolabUser.inc:798
+#: ../lib/modules/kolabUser.inc:800
 msgid "Email aliases"
 msgstr "電子メール・エイリアス"
 
-#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:138
-#: ../lib/modules/inetOrgPerson.inc:208 ../lib/modules/inetOrgPerson.inc:263
-#: ../lib/modules/inetOrgPerson.inc:458 ../lib/modules/inetOrgPerson.inc:496
-#: ../lib/modules/inetOrgPerson.inc:927 ../lib/modules/inetOrgPerson.inc:1028
+#: ../lib/modules/inetOrgPerson.inc:69 ../lib/modules/inetOrgPerson.inc:141
+#: ../lib/modules/inetOrgPerson.inc:211 ../lib/modules/inetOrgPerson.inc:266
+#: ../lib/modules/inetOrgPerson.inc:461 ../lib/modules/inetOrgPerson.inc:499
+#: ../lib/modules/inetOrgPerson.inc:930 ../lib/modules/inetOrgPerson.inc:1032
 msgid "Employee type"
 msgstr "雇用形態"
 
-#: ../lib/modules/inetOrgPerson.inc:497
+#: ../lib/modules/inetOrgPerson.inc:500
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇用形態: 正社員、実習生、臨時雇用、派遣、..."
 
-#: ../templates/lists/changePassword.php:280
-#: ../templates/lists/changePassword.php:286 ../templates/login.php:437
+#: ../templates/lists/changePassword.php:337
+#: ../templates/lists/changePassword.php:344 ../templates/login.php:437
 msgid "Empty password submitted. Please try again."
 msgstr "パスワードが空です。やり直してください。"
 
@@ -2020,7 +2041,17 @@ msgstr ""
 msgid "Encountered an error while performing search."
 msgstr "検索実行中にエラーが発生しました。"
 
-#: ../lib/modules/sambaSamAccount.inc:522
+#: ../lib/modules/imapAccess.inc:69 ../lib/modules/imapAccess.inc:98
+msgid "Encryption protocol"
+msgstr "暗号化プロトコル"
+
+#: ../lib/modules/imapAccess.inc:70
+msgid ""
+"Encryption protocol for connecting to IMAP server. LAM requires an encrypted "
+"connection."
+msgstr "IMAPサーバーへの接続で使用する暗号化プロトコル。LAMは暗号化された接続を必要とします。"
+
+#: ../lib/modules/sambaSamAccount.inc:527
 msgid "Eniwetok, Kwajalein"
 msgstr "Eniwetok, Kwajalein"
 
@@ -2056,16 +2087,16 @@ msgstr "照合規則"
 msgid "Equipment"
 msgstr "設備"
 
-#: ../templates/config/mainmanage.php:287
+#: ../templates/config/mainmanage.php:215
 msgid "Error"
 msgstr "エラー"
 
-#: ../templates/delete.php:226
+#: ../templates/delete.php:261
 #, php-format
 msgid "Error while deleting DN: %s"
 msgstr "DN: %s の削除中にエラーが発生しました。"
 
-#: ../help/help.inc:133
+#: ../help/help.inc:131
 msgid ""
 "Every account type needs exactly one base module. This module provides a "
 "structural object class."
@@ -2076,11 +2107,11 @@ msgstr ""
 #: ../lib/modules/customScripts.inc:60 ../lib/modules/customScripts.inc:72
 #: ../lib/modules/dhcp_settings.inc:517 ../help/help.inc:70
 #: ../help/help.inc:76 ../help/help.inc:82 ../help/help.inc:87
-#: ../help/help.inc:109
+#: ../help/help.inc:107
 msgid "Example"
 msgstr "例"
 
-#: ../templates/masscreate.php:248 ../templates/masscreate.php:373
+#: ../templates/masscreate.php:262
 msgid "Example value"
 msgstr "例"
 
@@ -2088,11 +2119,11 @@ msgstr "例"
 msgid "Examples"
 msgstr "例"
 
-#: ../templates/config/confmain.php:443
+#: ../templates/config/confmain.php:300
 msgid "Execute"
 msgstr "実行"
 
-#: ../templates/tests/lamdaemonTest.php:247
+#: ../templates/tests/lamdaemonTest.php:261
 msgid "Execute lamdaemon"
 msgstr "lamdaemonを実行"
 
@@ -2111,7 +2142,7 @@ msgstr "エクスポート"
 msgid "Export format"
 msgstr "エクスポート形式"
 
-#: ../lib/types/asteriskExt.inc:91 ../lib/modules/asteriskExtension.inc:86
+#: ../lib/types/asteriskExt.inc:92 ../lib/modules/asteriskExtension.inc:86
 #: ../lib/modules/asteriskExtension.inc:125
 #: ../lib/modules/asteriskExtension.inc:135
 #: ../lib/modules/asteriskExtension.inc:229
@@ -2148,19 +2179,19 @@ msgstr "エントリ %s の削除に失敗しました!"
 msgid "Failure count interval"
 msgstr "試行回数インターバル"
 
-#: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:118
-#: ../lib/modules/inetOrgPerson.inc:200 ../lib/modules/inetOrgPerson.inc:343
-#: ../lib/modules/inetOrgPerson.inc:446 ../lib/modules/inetOrgPerson.inc:528
-#: ../lib/modules/inetOrgPerson.inc:529 ../lib/modules/inetOrgPerson.inc:904
-#: ../lib/modules/inetOrgPerson.inc:1037 ../lib/modules/inetOrgPerson.inc:1418
+#: ../lib/modules/inetOrgPerson.inc:57 ../lib/modules/inetOrgPerson.inc:121
+#: ../lib/modules/inetOrgPerson.inc:203 ../lib/modules/inetOrgPerson.inc:346
+#: ../lib/modules/inetOrgPerson.inc:449 ../lib/modules/inetOrgPerson.inc:531
+#: ../lib/modules/inetOrgPerson.inc:532 ../lib/modules/inetOrgPerson.inc:907
+#: ../lib/modules/inetOrgPerson.inc:1041 ../lib/modules/inetOrgPerson.inc:1422
 msgid "Fax number"
 msgstr "ファクス番号"
 
-#: ../templates/config/mainmanage.php:353
+#: ../templates/config/mainmanage.php:219
 msgid "File"
 msgstr "ファイル"
 
-#: ../lib/modules/sambaSamAccount.inc:285
+#: ../lib/modules/sambaSamAccount.inc:290
 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."
@@ -2174,7 +2205,8 @@ msgstr ""
 msgid "File path"
 msgstr "ファイル・パス"
 
-#: ../templates/masscreate.php:209 ../lib/tools/fileUpload.inc:44
+#: ../templates/masscreate.php:229 ../lib/tools/fileUpload.inc:44
+#: ../lib/types/dhcp.inc:245 ../lib/lists.inc:689
 msgid "File upload"
 msgstr "ファイルのアップロード"
 
@@ -2183,24 +2215,24 @@ msgid "File upload failed!"
 msgstr "ファイルのアップロードに失敗しました!"
 
 #: ../lib/modules/zarafaUser.inc:123 ../lib/modules/zarafaUser.inc:747
-#: ../lib/modules/nisnetgroup.inc:89 ../lib/modules/nisnetgroup.inc:466
-#: ../lib/lists.inc:341 ../help/help.inc:144
+#: ../lib/modules/nisnetgroup.inc:94 ../lib/modules/nisnetgroup.inc:466
+#: ../lib/lists.inc:348 ../help/help.inc:142
 msgid "Filter"
 msgstr "フィルタ"
 
-#: ../lib/types/user.inc:96 ../lib/modules/inetOrgPerson.inc:44
-#: ../lib/modules/inetOrgPerson.inc:116 ../lib/modules/inetOrgPerson.inc:232
-#: ../lib/modules/inetOrgPerson.inc:406 ../lib/modules/inetOrgPerson.inc:488
-#: ../lib/modules/inetOrgPerson.inc:822 ../lib/modules/inetOrgPerson.inc:1026
-#: ../lib/modules/inetOrgPerson.inc:1376
+#: ../lib/types/user.inc:96 ../lib/modules/inetOrgPerson.inc:47
+#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:235
+#: ../lib/modules/inetOrgPerson.inc:409 ../lib/modules/inetOrgPerson.inc:491
+#: ../lib/modules/inetOrgPerson.inc:825 ../lib/modules/inetOrgPerson.inc:1030
+#: ../lib/modules/inetOrgPerson.inc:1380
 msgid "First name"
 msgstr "(姓でない)名"
 
-#: ../lib/modules/inetOrgPerson.inc:44 ../lib/modules/inetOrgPerson.inc:45
+#: ../lib/modules/inetOrgPerson.inc:47 ../lib/modules/inetOrgPerson.inc:48
 msgid "First name contains invalid characters!"
 msgstr "(姓でない)名前に不正な文字が含まれています！"
 
-#: ../lib/modules/inetOrgPerson.inc:489
+#: ../lib/modules/inetOrgPerson.inc:492
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "ユーザの(姓でない)名前。アルファベット, _- と空白のみ有効."
 
@@ -2208,7 +2240,7 @@ msgstr "ユーザの(姓でない)名前。アルファベット, _- と空白
 msgid "Fix IP addresses"
 msgstr "IPアドレスを修正"
 
-#: ../templates/config/confmain.php:495 ../templates/config/confmain.php:498
+#: ../templates/config/confmain.php:342
 msgid "Fixed list"
 msgstr "固定リスト"
 
@@ -2216,7 +2248,7 @@ msgstr "固定リスト"
 msgid "For automatic invitation handling."
 msgstr "For automatic invitation handling."
 
-#: ../lib/modules/nisnetgroup.inc:86
+#: ../lib/modules/nisnetgroup.inc:91
 msgid ""
 "For the upload please specify the entries in the format \"(HOST,USER,"
 "DOMAIN)\". Multiple entries are separated by semicolon."
@@ -2235,7 +2267,7 @@ msgstr "書式"
 #: ../lib/modules/kolabUser.inc:87 ../lib/modules/kolabUser.inc:116
 #: ../lib/modules/kolabUser.inc:155 ../lib/modules/kolabUser.inc:201
 #: ../lib/modules/kolabUser.inc:219 ../lib/modules/kolabUser.inc:312
-#: ../lib/modules/kolabUser.inc:776 ../lib/modules/kolabUser.inc:828
+#: ../lib/modules/kolabUser.inc:778 ../lib/modules/kolabUser.inc:830
 msgid "Free/Busy interval"
 msgstr "Free/Busyインターバル"
 
@@ -2243,24 +2275,24 @@ msgstr "Free/Busyインターバル"
 msgid "Free/Busy interval must be a number!"
 msgstr "Free/Busyインターバルは数でなくてはなりません!"
 
-#: ../lib/modules/sambaSamAccount.inc:1281
+#: ../lib/modules/sambaSamAccount.inc:1274
 msgid "Friday"
 msgstr "金曜日"
 
-#: ../templates/config/confmain.php:472 ../help/help.inc:192
+#: ../templates/config/confmain.php:324 ../help/help.inc:192
 msgid "From address"
 msgstr "発信者アドレス"
 
-#: ../templates/config/confmain.php:591
+#: ../templates/config/confmain.php:412
 msgid "From address for password mails is invalid."
 msgstr "パスワード・メールの発信者アドレスが無効です。"
 
-#: ../templates/lists/changePassword.php:186
+#: ../templates/lists/changePassword.php:232
 #: ../lib/modules/asteriskVoicemail.inc:94
 #: ../lib/modules/asteriskVoicemail.inc:130
 #: ../lib/modules/asteriskVoicemail.inc:163
 #: ../lib/modules/asteriskVoicemail.inc:255
-#: ../lib/modules/asteriskVoicemail.inc:390
+#: ../lib/modules/asteriskVoicemail.inc:398
 msgid "Full name"
 msgstr "フルネーム"
 
@@ -2268,22 +2300,22 @@ msgstr "フルネーム"
 msgid "Full name for Asterisk voicemail mailbox."
 msgstr "アスタリスク・ボイスメールボックスのフルネーム"
 
-#: ../lib/modules/inetOrgPerson.inc:297
+#: ../lib/modules/inetOrgPerson.inc:300
 msgid "GB-12345"
 msgstr "GB-12345"
 
 #: ../lib/types/host.inc:96 ../lib/types/group.inc:93 ../lib/types/user.inc:93
-#: ../lib/modules/posixGroup.inc:183 ../lib/modules/posixGroup.inc:338
-#: ../lib/modules/posixGroup.inc:351 ../lib/modules/posixGroup.inc:393
-#: ../lib/modules/posixGroup.inc:413 ../lib/modules/posixGroup.inc:458
-#: ../lib/modules/posixGroup.inc:478 ../lib/modules/posixAccount.inc:91
-#: ../lib/modules/posixAccount.inc:299 ../lib/modules/posixAccount.inc:1166
-#: ../lib/modules/sambaGroupMapping.inc:299
-#: ../lib/modules/sambaGroupMapping.inc:376
+#: ../lib/modules/posixGroup.inc:176 ../lib/modules/posixGroup.inc:330
+#: ../lib/modules/posixGroup.inc:343 ../lib/modules/posixGroup.inc:385
+#: ../lib/modules/posixGroup.inc:405 ../lib/modules/posixGroup.inc:454
+#: ../lib/modules/posixGroup.inc:474 ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/posixAccount.inc:301 ../lib/modules/posixAccount.inc:1147
+#: ../lib/modules/sambaGroupMapping.inc:321
+#: ../lib/modules/sambaGroupMapping.inc:390
 msgid "GID number"
 msgstr "GID番号"
 
-#: ../lib/modules/posixGroup.inc:478
+#: ../lib/modules/posixGroup.inc:474
 msgid ""
 "GID number has changed. Please select checkbox to change GID number of users "
 "and hosts."
@@ -2291,7 +2323,7 @@ msgstr ""
 "GID番号が変更されました。ユーザとホストのGID番号を変更する場合は、チェック"
 "ボックスを選択してください。"
 
-#: ../lib/modules/posixAccount.inc:91
+#: ../lib/modules/posixAccount.inc:93
 #, php-format
 msgid ""
 "GID number has changed. To keep file ownership you have to run the following "
@@ -2301,25 +2333,26 @@ msgstr ""
 "のコマンドを実行しなければなりません: 'find / -gid %s -uid %s -exec chgrp %s "
 "{} \\;'"
 
-#: ../lib/modules/posixGroup.inc:485
+#: ../lib/modules/posixGroup.inc:481
 msgid "GID number has to be a numeric value!"
 msgstr "GID番号は数値でなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:257 ../lib/modules/posixAccount.inc:289
-#: ../lib/modules/posixAccount.inc:300 ../lib/modules/posixAccount.inc:356
-#: ../lib/modules/posixAccount.inc:394 ../lib/modules/posixAccount.inc:968
-#: ../lib/modules/posixAccount.inc:1167
+#: ../lib/modules/posixAccount.inc:259 ../lib/modules/posixAccount.inc:291
+#: ../lib/modules/posixAccount.inc:302 ../lib/modules/posixAccount.inc:358
+#: ../lib/modules/posixAccount.inc:396 ../lib/modules/posixAccount.inc:950
+#: ../lib/modules/posixAccount.inc:1148
 msgid "Gecos"
 msgstr "Gecos"
 
-#: ../templates/config/confmodules.php:162
-#: ../templates/config/confmain.php:195
-#: ../templates/config/moduleSettings.php:161
-#: ../templates/config/conftypes.php:180
+#: ../templates/config/confmodules.php:165
+#: ../templates/config/confmain.php:198
+#: ../templates/config/moduleSettings.php:164
+#: ../templates/config/conftypes.php:183
+#: ../templates/profedit/profilepage.php:202
 msgid "General settings"
 msgstr "一般設定"
 
-#: ../templates/lists/changePassword.php:202 ../help/help.inc:184
+#: ../templates/lists/changePassword.php:248 ../help/help.inc:184
 msgid "Generate random password"
 msgstr "ランダムなパスワードを生成"
 
@@ -2338,7 +2371,7 @@ msgstr "進む"
 msgid "Grace authentication limit"
 msgstr "猶予認証のリミット"
 
-#: ../lib/modules/quota.inc:117 ../lib/modules/quota.inc:391
+#: ../lib/modules/quota.inc:117 ../lib/modules/quota.inc:390
 msgid "Grace block period"
 msgstr "ブロック猶予期間"
 
@@ -2357,12 +2390,12 @@ msgstr ""
 "iノード(ファイル)クオータの猶予期間。 ほとんどのファイルシステムは、最大値で"
 "ある7日間を固定値として使用します。"
 
-#: ../lib/modules/quota.inc:139 ../lib/modules/quota.inc:395
+#: ../lib/modules/quota.inc:139 ../lib/modules/quota.inc:394
 msgid "Grace inode period"
 msgstr "iノードクオータの猶予期間"
 
-#: ../templates/config/confmain.php:448
-#: ../templates/selfService/adminMain.php:577
+#: ../templates/config/confmain.php:305
+#: ../templates/selfService/adminMain.php:578
 msgid "Group"
 msgstr "グループ"
 
@@ -2370,12 +2403,12 @@ msgstr "グループ"
 msgid "Group accounts (e.g. Unix and Samba)"
 msgstr "グループアカウント(e.g. Unix および Samba)"
 
-#: ../lib/types/group.inc:96 ../lib/modules/posixGroup.inc:384
-#: ../lib/modules/nisnetgroup.inc:105
+#: ../lib/types/group.inc:96 ../lib/modules/posixGroup.inc:376
+#: ../lib/modules/nisnetgroup.inc:110
 msgid "Group description"
 msgstr "グループの説明"
 
-#: ../lib/modules/posixGroup.inc:398
+#: ../lib/modules/posixGroup.inc:390
 msgid "Group description. If left empty group name will be used."
 msgstr "グループの説明。もしも空ならば、グループ名が使われます。"
 
@@ -2383,29 +2416,29 @@ msgstr "グループの説明。もしも空ならば、グループ名が使わ
 msgid "Group member DNs"
 msgstr "グループメンバのDN"
 
-#: ../lib/types/group.inc:94 ../lib/modules/posixGroup.inc:195
-#: ../lib/modules/posixGroup.inc:248 ../lib/modules/posixGroup.inc:339
-#: ../lib/modules/posixGroup.inc:357 ../lib/modules/posixGroup.inc:401
-#: ../lib/modules/posixGroup.inc:405 ../lib/modules/posixGroup.inc:459
+#: ../lib/types/group.inc:94 ../lib/modules/posixGroup.inc:188
+#: ../lib/modules/posixGroup.inc:238 ../lib/modules/posixGroup.inc:331
+#: ../lib/modules/posixGroup.inc:349 ../lib/modules/posixGroup.inc:393
+#: ../lib/modules/posixGroup.inc:397 ../lib/modules/posixGroup.inc:455
 msgid "Group members"
 msgstr "グループメンバ"
 
 #: ../lib/types/gon.inc:91 ../lib/types/group.inc:92
-#: ../lib/types/netgroup.inc:91 ../lib/modules/posixGroup.inc:173
-#: ../lib/modules/posixGroup.inc:342 ../lib/modules/posixGroup.inc:372
-#: ../lib/modules/posixGroup.inc:421 ../lib/modules/posixGroup.inc:457
-#: ../lib/modules/posixGroup.inc:486 ../lib/modules/posixGroup.inc:487
-#: ../lib/modules/posixGroup.inc:488 ../lib/modules/nisnetgroup.inc:68
-#: ../lib/modules/nisnetgroup.inc:97 ../lib/modules/nisnetgroup.inc:124
-#: ../lib/modules/nisnetgroup.inc:136 ../lib/modules/nisnetgroup.inc:177
-#: ../lib/modules/nisnetgroup.inc:575 ../lib/modules/groupOfNames.inc:60
+#: ../lib/types/netgroup.inc:91 ../lib/modules/posixGroup.inc:166
+#: ../lib/modules/posixGroup.inc:334 ../lib/modules/posixGroup.inc:364
+#: ../lib/modules/posixGroup.inc:413 ../lib/modules/posixGroup.inc:453
+#: ../lib/modules/posixGroup.inc:482 ../lib/modules/posixGroup.inc:483
+#: ../lib/modules/posixGroup.inc:484 ../lib/modules/nisnetgroup.inc:73
+#: ../lib/modules/nisnetgroup.inc:102 ../lib/modules/nisnetgroup.inc:129
+#: ../lib/modules/nisnetgroup.inc:141 ../lib/modules/nisnetgroup.inc:182
+#: ../lib/modules/nisnetgroup.inc:571 ../lib/modules/groupOfNames.inc:60
 #: ../lib/modules/groupOfNames.inc:84 ../lib/modules/groupOfNames.inc:111
-#: ../lib/modules/groupOfNames.inc:423
+#: ../lib/modules/groupOfNames.inc:447
 msgid "Group name"
 msgstr "グループ名"
 
-#: ../lib/modules/posixGroup.inc:488 ../lib/modules/posixGroup.inc:489
-#: ../lib/modules/nisnetgroup.inc:136
+#: ../lib/modules/posixGroup.inc:484 ../lib/modules/posixGroup.inc:485
+#: ../lib/modules/nisnetgroup.inc:141
 msgid ""
 "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
@@ -2413,11 +2446,11 @@ msgstr ""
 "グループ名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ で"
 "す!"
 
-#: ../lib/modules/posixGroup.inc:487
+#: ../lib/modules/posixGroup.inc:483
 msgid "Group name in use. Selected next free group name."
 msgstr "グループ名が既に使われています。次の未使用グループ名が選択されました。"
 
-#: ../lib/modules/posixGroup.inc:422
+#: ../lib/modules/posixGroup.inc:414
 msgid ""
 "Group name of the group which should be created. Valid characters are: a-z, "
 "A-Z, 0-9 and .-_ . If group name is already used group name will be expanded "
@@ -2439,15 +2472,15 @@ msgstr "名前グループアカウント"
 msgid "Group of unique names"
 msgstr "uniqueな名前のグループ"
 
-#: ../lib/modules/posixGroup.inc:363 ../lib/modules/posixGroup.inc:409
+#: ../lib/modules/posixGroup.inc:355 ../lib/modules/posixGroup.inc:401
 msgid "Group password"
 msgstr "グループパスワード"
 
-#: ../lib/modules/sambaGroupMapping.inc:264
+#: ../lib/modules/sambaGroupMapping.inc:286
 msgid "Group type"
 msgstr "グループのタイプ"
 
-#: ../lib/types/group.inc:54 ../lib/modules/posixGroup.inc:310
+#: ../lib/types/group.inc:54 ../lib/modules/posixGroup.inc:302
 msgid "Groups"
 msgstr "グループ"
 
@@ -2461,16 +2494,16 @@ msgstr "H-Node (0x08)"
 msgid "HTTP port"
 msgstr "HTTPポート"
 
-#: ../lib/modules/quota.inc:613
+#: ../lib/modules/quota.inc:617
 msgid "Hard block"
 msgstr "ハードblock"
 
 #: ../lib/modules/quota.inc:111 ../lib/modules/quota.inc:112
-#: ../lib/modules/quota.inc:390 ../lib/modules/quota.inc:489
+#: ../lib/modules/quota.inc:389 ../lib/modules/quota.inc:490
 msgid "Hard block limit"
 msgstr "ハードブロック制限"
 
-#: ../lib/modules/quota.inc:615
+#: ../lib/modules/quota.inc:619
 msgid "Hard inode"
 msgstr "ハードinode"
 
@@ -2478,41 +2511,33 @@ msgstr "ハードinode"
 msgid "Hard inode (files) limit"
 msgstr "ハードinode(ファイル)制限"
 
-#: ../lib/modules/quota.inc:133 ../lib/modules/quota.inc:394
-#: ../lib/modules/quota.inc:491
+#: ../lib/modules/quota.inc:133 ../lib/modules/quota.inc:393
+#: ../lib/modules/quota.inc:492
 msgid "Hard inode limit"
 msgstr "ハードinode制限"
 
-#: ../lib/modules/sambaSamAccount.inc:524
+#: ../lib/modules/sambaSamAccount.inc:529
 msgid "Hawaii"
 msgstr "Hawaii"
 
-#: ../templates/pdfedit/pdfpage.php:410 ../templates/pdfedit/pdfpage.php:570
-#: ../templates/pdfedit/pdfpage.php:584
+#: ../templates/pdfedit/pdfpage.php:445 ../templates/pdfedit/pdfpage.php:538
+#: ../templates/pdfedit/pdfpage.php:545
 msgid "Headline"
 msgstr "見出し"
 
-#: ../lib/modules.inc:953
+#: ../lib/modules.inc:952
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../templates/masscreate.php:232
-msgid ""
-"Here is a list of possible columns. The red columns must be included in the "
-"CSV file and filled with data for all accounts."
-msgstr ""
-"カラム候補のリスト。赤字のカラムはCSVファイルに含まれていなくてはならず、かつ"
-"全てのアカウントについて記入済みでなくてはなりません。"
-
 #: ../lib/tools/schemaBrowser.inc:53
 msgid "Here you can browse LDAP object classes and attributes."
 msgstr "ここでは、LDAPオブジェクトのクラスと属性をブラウズできます。"
 
-#: ../lib/modules/sambaSamAccount.inc:364
+#: ../lib/modules/sambaSamAccount.inc:369
 msgid "Here you can change the settings for the terminal server access."
 msgstr "ターミナルサーバーへのアクセス設定を変更できます。"
 
-#: ../templates/masscreate.php:114
+#: ../templates/masscreate.php:121
 msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr ""
 "ここでは、CSVファイルを与える事によって、複数のアカウントを作成できます。"
@@ -2521,7 +2546,7 @@ msgstr ""
 msgid "Here you can enter a description for this DHCP entry."
 msgstr "このDHCPエントリに対する説明を入力できます。"
 
-#: ../lib/modules/nisnetgroup.inc:73 ../lib/modules/groupOfNames.inc:65
+#: ../lib/modules/nisnetgroup.inc:78 ../lib/modules/groupOfNames.inc:65
 msgid "Here you can enter a description for this group."
 msgstr "このグループに対する説明を入力できます。"
 
@@ -2529,7 +2554,7 @@ msgstr "このグループに対する説明を入力できます。"
 msgid "Here you can enter a description for this role."
 msgstr "このロールに対する説明を入力できます。"
 
-#: ../lib/modules/zarafaUser.inc:124 ../lib/modules/nisnetgroup.inc:90
+#: ../lib/modules/zarafaUser.inc:124 ../lib/modules/nisnetgroup.inc:95
 msgid ""
 "Here you can enter a filter value. Only entries which contain the filter "
 "text will be shown."
@@ -2537,7 +2562,7 @@ msgstr ""
 "ここには、フィルタの値を入力します。フィルタテキストを含んだエントリだけが表"
 "示されます。"
 
-#: ../lib/modules/posixAccount.inc:336
+#: ../lib/modules/posixAccount.inc:338
 msgid ""
 "Here you can enter a list of additional group memberships. The group names "
 "are separated by commas."
@@ -2549,7 +2574,7 @@ msgstr ""
 msgid "Here you can enter a serial number for this device."
 msgstr "ここには、このデバイスに対するシリアル番号を入力できます。"
 
-#: ../lib/modules/inetOrgPerson.inc:577
+#: ../lib/modules/inetOrgPerson.inc:580
 msgid ""
 "Here you can enter the user's department(s). Multiple entries are separated "
 "by semicolons."
@@ -2557,7 +2582,7 @@ msgstr ""
 "ここにはユーザーの部門を入力できます。複数のエントリはセミコロンによって区切"
 "られます。"
 
-#: ../help/help.inc:145
+#: ../help/help.inc:143
 msgid ""
 "Here you can input simple filter expressions (e.g. 'value' or 'v*'). The "
 "filter is case-sensitive."
@@ -2565,7 +2590,7 @@ msgstr ""
 "ここには、単純なフィルタ(例 'value'または'v*')を入力できます。大文字と小文字"
 "は区別されます。"
 
-#: ../help/help.inc:157
+#: ../help/help.inc:155
 msgid ""
 "Here you can load an account profile to set default settings for your "
 "account. The \"default\" profile is automatically loaded for new accounts."
@@ -2578,14 +2603,14 @@ msgstr ""
 msgid "Here you can manage your account profiles."
 msgstr "ここで、あなたのアカウントのプロファイルを管理できます。"
 
-#: ../help/help.inc:159
+#: ../help/help.inc:157
 msgid ""
 "Here you can select a PDF structure and export the account to a PDF file."
 msgstr ""
 "ここでは、PDF構成の選択と、アカウントのPDFフィアルへのエクスポートを行えま"
 "す。"
 
-#: ../help/help.inc:139
+#: ../help/help.inc:137
 msgid ""
 "Here you can select where LAM should save its log messages. System logging "
 "will go to Syslog on Unix systems and event log on Windows. You can also "
@@ -2595,12 +2620,12 @@ msgstr ""
 "unixシステムではSyslogに、Windowsではイベントログに出力されます。追加のファイ"
 "ルを選択する事もできます。"
 
-#: ../help/help.inc:104
+#: ../help/help.inc:102
 msgid ""
 "Here you can select which plugins you want to use for account management."
 msgstr "ここでは、アカウント管理に使用するプラグインを選択できます。"
 
-#: ../help/help.inc:117
+#: ../help/help.inc:115
 msgid ""
 "Here you can set a limit for LDAP searches. This will restrict the number of "
 "results for LDAP searches. Please use this if LAM's LDAP queries produce too "
@@ -2623,7 +2648,7 @@ msgstr ""
 msgid "Here you can specify if the account is active or inactive."
 msgstr "ここではアカウントの有効/無効を記述できます。"
 
-#: ../help/help.inc:143
+#: ../help/help.inc:141
 msgid ""
 "Here you can specify minimum requirements for passwords. The character "
 "classes are: lowercase, uppercase, numeric and symbols."
@@ -2631,7 +2656,7 @@ msgstr ""
 "パスワードの要求水準を設定します。文字クラスは lowercase, uppercase, "
 "numeric, symbols です。"
 
-#: ../lib/modules/nisnetgroup.inc:77
+#: ../lib/modules/nisnetgroup.inc:82
 msgid ""
 "Here you can specify subgroups which are included in this NIS netgroup. All "
 "members of the subgroups will be treated as members of this group."
@@ -2655,11 +2680,11 @@ msgid ""
 "Here you can specify the minimum number of characters for a user password."
 msgstr "ユーザーパスワードの最低文字数を設定します。"
 
-#: ../templates/lists/changePassword.php:222
+#: ../templates/lists/changePassword.php:268
 msgid "Here you can specify the new password yourself."
 msgstr "ここではあなた自身の手によって新しいパスワードを指定できます。"
 
-#: ../lib/modules/sambaSamAccount.inc:355
+#: ../lib/modules/sambaSamAccount.inc:360
 msgid "Here you can specify the shadowing mode."
 msgstr "ここではshadowingモードを記述できます。"
 
@@ -2676,10 +2701,10 @@ msgstr "あなたがインストールしたLAMの特定の機能が動作する
 msgid "Hidden"
 msgstr "非表示"
 
-#: ../lib/modules/sambaSamAccount.inc:369
-#: ../lib/modules/sambaSamAccount.inc:557 ../lib/modules/zarafaUser.inc:116
-#: ../lib/modules/zarafaUser.inc:130 ../lib/modules/inetOrgPerson.inc:172
-#: ../lib/modules/inetOrgPerson.inc:580
+#: ../lib/modules/sambaSamAccount.inc:374
+#: ../lib/modules/sambaSamAccount.inc:562 ../lib/modules/zarafaUser.inc:116
+#: ../lib/modules/zarafaUser.inc:130 ../lib/modules/inetOrgPerson.inc:175
+#: ../lib/modules/inetOrgPerson.inc:583
 msgid "Hidden options"
 msgstr "非表示のオプション"
 
@@ -2692,7 +2717,7 @@ msgstr "メッセージ中にコマンドを表示しない"
 msgid "Hide internal attributes"
 msgstr "内部属性を隠す"
 
-#: ../templates/masscreate.php:215
+#: ../templates/masscreate.php:235
 msgid ""
 "Hint: Format all cells as text in your spreadsheet program and turn off auto "
 "correction."
@@ -2705,26 +2730,26 @@ msgid "Hint: To delete an attribute, empty the text field and click save."
 msgstr ""
 "ヒント: 属性を削除するには、テキストフィールドを空にして保存してください。"
 
-#: ../lib/modules/posixAccount.inc:381
+#: ../lib/modules/posixAccount.inc:383
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr ""
 "複数のグループを選択(解除)する場合は、CTRLキーを押しながら操作してください。"
 
-#: ../lib/types/user.inc:98 ../lib/modules/sambaSamAccount.inc:207
-#: ../lib/modules/sambaSamAccount.inc:327
-#: ../lib/modules/sambaSamAccount.inc:1393
-#: ../lib/modules/sambaSamAccount.inc:1672 ../lib/modules/posixAccount.inc:66
-#: ../lib/modules/posixAccount.inc:67 ../lib/modules/posixAccount.inc:69
-#: ../lib/modules/posixAccount.inc:97 ../lib/modules/posixAccount.inc:221
-#: ../lib/modules/posixAccount.inc:303 ../lib/modules/posixAccount.inc:339
-#: ../lib/modules/posixAccount.inc:343 ../lib/modules/posixAccount.inc:347
-#: ../lib/modules/posixAccount.inc:364 ../lib/modules/posixAccount.inc:774
-#: ../lib/modules/posixAccount.inc:983 ../lib/modules/posixAccount.inc:1103
-#: ../lib/modules/posixAccount.inc:1170
+#: ../lib/types/user.inc:98 ../lib/modules/sambaSamAccount.inc:212
+#: ../lib/modules/sambaSamAccount.inc:332
+#: ../lib/modules/sambaSamAccount.inc:1386
+#: ../lib/modules/sambaSamAccount.inc:1665 ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/posixAccount.inc:69 ../lib/modules/posixAccount.inc:71
+#: ../lib/modules/posixAccount.inc:99 ../lib/modules/posixAccount.inc:223
+#: ../lib/modules/posixAccount.inc:305 ../lib/modules/posixAccount.inc:341
+#: ../lib/modules/posixAccount.inc:345 ../lib/modules/posixAccount.inc:349
+#: ../lib/modules/posixAccount.inc:366 ../lib/modules/posixAccount.inc:756
+#: ../lib/modules/posixAccount.inc:965 ../lib/modules/posixAccount.inc:1084
+#: ../lib/modules/posixAccount.inc:1151
 msgid "Home directory"
 msgstr "ホームディレクトリ"
 
-#: ../lib/modules/posixAccount.inc:69
+#: ../lib/modules/posixAccount.inc:71
 #, php-format
 msgid ""
 "Home directory changed. To keep home directory you have to run the following "
@@ -2733,35 +2758,35 @@ msgstr ""
 "ホームディレクトリが変更されました。ホームディレクトリを維持するために、root"
 "権限で以下のコマンドを実行しなければなりません: 'mv %s %s'"
 
-#: ../lib/modules/posixAccount.inc:1115
+#: ../lib/modules/posixAccount.inc:1096
 msgid "Home directory server"
 msgstr "ホームディレクトリ・サーバー"
 
-#: ../lib/modules/sambaSamAccount.inc:191
-#: ../lib/modules/sambaSamAccount.inc:208
-#: ../lib/modules/sambaSamAccount.inc:275
-#: ../lib/modules/sambaSamAccount.inc:456
-#: ../lib/modules/sambaSamAccount.inc:561
-#: ../lib/modules/sambaSamAccount.inc:1118
-#: ../lib/modules/sambaSamAccount.inc:1401
-#: ../lib/modules/sambaSamAccount.inc:1490
-#: ../lib/modules/sambaSamAccount.inc:1646
-#: ../lib/modules/sambaSamAccount.inc:1673
+#: ../lib/modules/sambaSamAccount.inc:196
+#: ../lib/modules/sambaSamAccount.inc:213
+#: ../lib/modules/sambaSamAccount.inc:280
+#: ../lib/modules/sambaSamAccount.inc:461
+#: ../lib/modules/sambaSamAccount.inc:566
+#: ../lib/modules/sambaSamAccount.inc:1112
+#: ../lib/modules/sambaSamAccount.inc:1394
+#: ../lib/modules/sambaSamAccount.inc:1483
+#: ../lib/modules/sambaSamAccount.inc:1639
+#: ../lib/modules/sambaSamAccount.inc:1666
 msgid "Home drive"
 msgstr "ホームドライブ"
 
-#: ../lib/modules/sambaSamAccount.inc:81 ../lib/modules/sambaSamAccount.inc:82
-#: ../lib/modules/sambaSamAccount.inc:194
-#: ../lib/modules/sambaSamAccount.inc:278
-#: ../lib/modules/sambaSamAccount.inc:464
-#: ../lib/modules/sambaSamAccount.inc:562
-#: ../lib/modules/sambaSamAccount.inc:1126
-#: ../lib/modules/sambaSamAccount.inc:1494
-#: ../lib/modules/sambaSamAccount.inc:1643
+#: ../lib/modules/sambaSamAccount.inc:86 ../lib/modules/sambaSamAccount.inc:87
+#: ../lib/modules/sambaSamAccount.inc:199
+#: ../lib/modules/sambaSamAccount.inc:283
+#: ../lib/modules/sambaSamAccount.inc:469
+#: ../lib/modules/sambaSamAccount.inc:567
+#: ../lib/modules/sambaSamAccount.inc:1120
+#: ../lib/modules/sambaSamAccount.inc:1487
+#: ../lib/modules/sambaSamAccount.inc:1636
 msgid "Home path"
 msgstr "ホームパス"
 
-#: ../lib/modules/sambaSamAccount.inc:81 ../lib/modules/sambaSamAccount.inc:83
+#: ../lib/modules/sambaSamAccount.inc:86 ../lib/modules/sambaSamAccount.inc:88
 msgid "Home path is invalid."
 msgstr "ホームパスが正しくありません。"
 
@@ -2769,15 +2794,15 @@ msgstr "ホームパスが正しくありません。"
 msgid "Home server for the user."
 msgstr "ユーザに対するホームサーバー。"
 
-#: ../lib/modules/inetOrgPerson.inc:50 ../lib/modules/inetOrgPerson.inc:120
-#: ../lib/modules/inetOrgPerson.inc:196 ../lib/modules/inetOrgPerson.inc:327
-#: ../lib/modules/inetOrgPerson.inc:440 ../lib/modules/inetOrgPerson.inc:548
-#: ../lib/modules/inetOrgPerson.inc:894 ../lib/modules/inetOrgPerson.inc:1035
-#: ../lib/modules/inetOrgPerson.inc:1404
+#: ../lib/modules/inetOrgPerson.inc:53 ../lib/modules/inetOrgPerson.inc:123
+#: ../lib/modules/inetOrgPerson.inc:199 ../lib/modules/inetOrgPerson.inc:330
+#: ../lib/modules/inetOrgPerson.inc:443 ../lib/modules/inetOrgPerson.inc:551
+#: ../lib/modules/inetOrgPerson.inc:897 ../lib/modules/inetOrgPerson.inc:1039
+#: ../lib/modules/inetOrgPerson.inc:1408
 msgid "Home telephone number"
 msgstr "自宅電話番号"
 
-#: ../lib/modules/posixAccount.inc:66 ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:70
 msgid "Homedirectory contains invalid characters."
 msgstr "ホームディレクトリが不正な文字を含んでいます。"
 
@@ -2786,8 +2811,8 @@ msgstr "ホームディレクトリが不正な文字を含んでいます。"
 #: ../lib/modules/asteriskAccount.inc:125
 #: ../lib/modules/asteriskAccount.inc:147
 #: ../lib/modules/asteriskAccount.inc:203
-#: ../lib/modules/asteriskAccount.inc:296 ../lib/modules/nisnetgroup.inc:201
-#: ../lib/modules/nisnetgroup.inc:585 ../lib/modules/hostObject.inc:142
+#: ../lib/modules/asteriskAccount.inc:296 ../lib/modules/nisnetgroup.inc:206
+#: ../lib/modules/nisnetgroup.inc:581 ../lib/modules/hostObject.inc:142
 msgid "Host"
 msgstr "ホスト"
 
@@ -2799,8 +2824,8 @@ msgstr "ホストアカウント(e.g. Samba)"
 msgid "Host description"
 msgstr "ホストの説明"
 
-#: ../lib/modules/account.inc:89 ../lib/modules/posixAccount.inc:395
-#: ../lib/modules/posixAccount.inc:403
+#: ../lib/modules/account.inc:89 ../lib/modules/posixAccount.inc:397
+#: ../lib/modules/posixAccount.inc:405
 msgid "Host description. If left empty host name will be used."
 msgstr "ホストの説明。もしも空ならば、ホスト名が使われます。"
 
@@ -2810,35 +2835,35 @@ msgid "Host list"
 msgstr "ホスト一覧"
 
 #: ../lib/types/host.inc:91 ../lib/types/host.inc:92
-#: ../lib/modules/account.inc:84 ../lib/modules/account.inc:207
-#: ../lib/modules/posixAccount.inc:81 ../lib/modules/posixAccount.inc:82
-#: ../lib/modules/posixAccount.inc:84 ../lib/modules/posixAccount.inc:268
-#: ../lib/modules/posixAccount.inc:390 ../lib/modules/nisnetgroup.inc:138
+#: ../lib/modules/account.inc:84 ../lib/modules/account.inc:208
+#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:86 ../lib/modules/posixAccount.inc:270
+#: ../lib/modules/posixAccount.inc:392 ../lib/modules/nisnetgroup.inc:143
 #: ../lib/modules/nisnetgroup.inc:470
 msgid "Host name"
 msgstr "ホスト名"
 
-#: ../lib/modules/posixAccount.inc:88
+#: ../lib/modules/posixAccount.inc:90
 msgid "Host name already exists!"
 msgstr "ホスト名は既に存在しています!"
 
-#: ../lib/modules/posixAccount.inc:82 ../lib/modules/posixAccount.inc:86
-#: ../lib/modules/nisnetgroup.inc:138
+#: ../lib/modules/posixAccount.inc:84 ../lib/modules/posixAccount.inc:88
+#: ../lib/modules/nisnetgroup.inc:143
 msgid ""
 "Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
 msgstr ""
 "ホスト名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です。"
 
-#: ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:86
 msgid "Host name in use. Selected next free host name."
 msgstr "ホスト名がすでに使われています。次の未使用ホスト名が選択されました。"
 
-#: ../lib/modules/sambaSamAccount.inc:1032
+#: ../lib/modules/sambaSamAccount.inc:1026
 msgid "Host name must end with $!"
 msgstr "ホスト名の末尾は$でなくてはなりません!"
 
-#: ../lib/modules/account.inc:85 ../lib/modules/posixAccount.inc:391
+#: ../lib/modules/account.inc:85 ../lib/modules/posixAccount.inc:393
 msgid ""
 "Host name of the host which should be created. Valid characters are: a-z,A-"
 "Z,0-9, .-_$. Host names are always ending with $. If last character is not $ "
@@ -2854,9 +2879,9 @@ msgstr ""
 msgid "Host(s)"
 msgstr "ホスト"
 
-#: ../lib/types/host.inc:53 ../lib/modules/posixAccount.inc:61
-#: ../lib/modules/posixAccount.inc:62 ../lib/modules/posixAccount.inc:64
-#: ../lib/modules/posixAccount.inc:167 ../lib/modules/sudoRole.inc:67
+#: ../lib/types/host.inc:53 ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:169 ../lib/modules/sudoRole.inc:67
 #: ../lib/modules/sudoRole.inc:92 ../lib/modules/sudoRole.inc:140
 #: ../lib/modules/sudoRole.inc:174 ../lib/modules/sudoRole.inc:183
 #: ../lib/modules/sudoRole.inc:291 ../lib/modules/sudoRole.inc:690
@@ -2865,23 +2890,31 @@ msgstr "ホスト"
 msgid "Hosts"
 msgstr "ホスト"
 
-#: ../templates/lists/changePassword.php:213
+#: ../templates/lists/changePassword.php:259
 msgid "I am sure"
 msgstr "確認"
 
-#: ../lib/modules/posixGroup.inc:481 ../lib/modules/posixGroup.inc:592
-#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:755
+#: ../lib/modules/posixGroup.inc:477 ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:738
 msgid "ID is already in use"
 msgstr "ID はすでに使用されています"
 
-#: ../lib/modules/posixGroup.inc:479 ../lib/modules/posixGroup.inc:480
-#: ../lib/modules/posixGroup.inc:481 ../lib/modules/posixGroup.inc:584
-#: ../lib/modules/posixGroup.inc:592 ../lib/modules/posixAccount.inc:70
-#: ../lib/modules/posixAccount.inc:71 ../lib/modules/posixAccount.inc:72
-#: ../lib/modules/posixAccount.inc:751 ../lib/modules/posixAccount.inc:755
+#: ../lib/modules/posixGroup.inc:475 ../lib/modules/posixGroup.inc:476
+#: ../lib/modules/posixGroup.inc:477 ../lib/modules/posixGroup.inc:575
+#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:74 ../lib/modules/posixAccount.inc:736
+#: ../lib/modules/posixAccount.inc:738
 msgid "ID-Number"
 msgstr "ID番号"
 
+#: ../lib/modules/imapAccess.inc:75 ../lib/modules/imapAccess.inc:102
+msgid "IMAP admin user"
+msgstr "IMAP管理ユーザー"
+
+#: ../lib/modules/imapAccess.inc:78 ../lib/modules/imapAccess.inc:105
+msgid "IMAP password input"
+msgstr "IMAPパスワード入力"
+
 #: ../lib/types/dhcp.inc:96 ../lib/modules/ipHost.inc:48
 #: ../lib/modules/ipHost.inc:58 ../lib/modules/ipHost.inc:127
 #: ../lib/modules/fixed_ip.inc:93 ../lib/modules/fixed_ip.inc:338
@@ -2904,14 +2937,13 @@ msgstr "IPアドレス"
 msgid "IP list"
 msgstr "IPアドレス一覧"
 
-#: ../templates/masscreate.php:247 ../templates/masscreate.php:259
-#: ../templates/masscreate.php:365
+#: ../templates/masscreate.php:258
 msgid "Identifier"
 msgstr "識別子"
 
-#: ../lib/modules/sambaSamAccount.inc:215
-#: ../lib/modules/sambaSamAccount.inc:1415
-#: ../lib/modules/sambaSamAccount.inc:1684
+#: ../lib/modules/sambaSamAccount.inc:220
+#: ../lib/modules/sambaSamAccount.inc:1408
+#: ../lib/modules/sambaSamAccount.inc:1677
 msgid "Idle time limit"
 msgstr "無動作時間の制限"
 
@@ -2919,13 +2951,15 @@ msgstr "無動作時間の制限"
 msgid ""
 "If activated then the user is forced to change his password at the next "
 "login."
-msgstr "有効にした場合、ユーザーは次のログインの際にパスワードを変更しなくてはなりません。"
+msgstr ""
+"有効にした場合、ユーザーは次のログインの際にパスワードを変更しなくてはなりま"
+"せん。"
 
-#: ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/sambaSamAccount.inc:246
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "チェックした場合、unixパスワードがSambaパスワードとしても使われます。"
 
-#: ../lib/modules/posixAccount.inc:373
+#: ../lib/modules/posixAccount.inc:375
 msgid ""
 "If checked account will be deactivated by putting a \"!\" before the "
 "encrypted password."
@@ -2933,21 +2967,21 @@ msgstr ""
 "チェックした場合、暗号化パスワードの前に\"!\"が挿入され、アカウントは無効化さ"
 "れます。"
 
-#: ../lib/modules/sambaSamAccount.inc:247
+#: ../lib/modules/sambaSamAccount.inc:252
 msgid "If checked no password will be used."
 msgstr "チェックした場合、パスワードは使われません。"
 
-#: ../lib/modules/sambaSamAccount.inc:253
+#: ../lib/modules/sambaSamAccount.inc:258
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "チェックした場合、パスワードは無期限になります。(X-フラグをセット)"
 
-#: ../lib/modules/sambaSamAccount.inc:259
+#: ../lib/modules/sambaSamAccount.inc:264
 msgid "If checked then the account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "チェックした場合、(D-フラグをセットすることにより)アカウントは無効化されま"
 "す。"
 
-#: ../lib/modules/sambaSamAccount.inc:262
+#: ../lib/modules/sambaSamAccount.inc:267
 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 "
@@ -2957,13 +2991,13 @@ msgstr ""
 "す。通常はログイン失敗によってロックされたユーザーのアカウントをアンロックし"
 "たい場合に使用します。"
 
-#: ../lib/modules/posixGroup.inc:394
+#: ../lib/modules/posixGroup.inc:386
 msgid ""
 "If empty GID number will be generated automaticly depending on your "
 "configuration settings."
 msgstr "未記入の場合、設定内容に従ってGID番号が自動的に生成されます。"
 
-#: ../lib/modules/posixAccount.inc:328
+#: ../lib/modules/posixAccount.inc:330
 msgid "If empty UID number will be generated automaticly."
 msgstr "未記入の場合、UID番号が自動的に生成されます。"
 
@@ -2987,21 +3021,21 @@ msgstr ""
 msgid "If set then users need to login to change their password."
 msgstr "パスワード変更の際にユーザーのログオンを強制します。"
 
-#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/sambaSamAccount.inc:249
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr ""
 "\"true\"にセットした場合、unixパスワードがSambaパスワードとしても使われます。"
 
-#: ../lib/modules/sambaSamAccount.inc:265
+#: ../lib/modules/sambaSamAccount.inc:270
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "\"true\"にセットした場合、アカウントは無効化されます。(D-フラグをセット)"
 
-#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/sambaSamAccount.inc:255
 msgid "If set to \"true\" no password will be used."
 msgstr "\"true\"にセットした場合、パスワードは使われません。"
 
-#: ../lib/modules/sambaSamAccount.inc:256
+#: ../lib/modules/sambaSamAccount.inc:261
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr ""
 "\"true\"にセットした場合、パスワードは無期限になります。(X-フラグをセット)"
@@ -3010,7 +3044,9 @@ msgstr ""
 msgid ""
 "If the mailbox size reaches the soft quota limit, the user will not be able "
 "to send email until the size of the mailbox is reduced."
-msgstr "メールボックスサイズがソフトquotaリミットに到達した場合、ユーザーはメールボックスのサイズ減らすまでメールを送ることができません。"
+msgstr ""
+"メールボックスサイズがソフトquotaリミットに到達した場合、ユーザーはメールボッ"
+"クスのサイズ減らすまでメールを送ることができません。"
 
 #: ../help/help.inc:186
 msgid ""
@@ -3020,13 +3056,13 @@ msgstr ""
 "パスワードをメールで送信することを選択した場合、テンプレートとして\"config/"
 "passwordMailTemplate.txt\"が使用されます。"
 
-#: ../lib/modules/sambaSamAccount.inc:304
+#: ../lib/modules/sambaSamAccount.inc:309
 msgid ""
 "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr ""
 "未入力の場合は、LAMは uidNumber*2 + sambaAlgorithmicRidBase を使用します。"
 
-#: ../lib/modules/sambaSamAccount.inc:268
+#: ../lib/modules/sambaSamAccount.inc:273
 msgid ""
 "If you set this option then the user has to change his password at the next "
 "login."
@@ -3046,19 +3082,19 @@ msgid ""
 msgstr ""
 "現在のプリファレンスのパスワードを変更したい場合は、ここに入力してください。"
 
-#: ../help/help.inc:129
+#: ../help/help.inc:127
 msgid ""
 "If you want to change your master configuration password, please enter it "
 "here."
 msgstr "マスタ構成パスワードを変更したい場合は、ここに入力してください。"
 
-#: ../lib/modules/sambaGroupMapping.inc:350
+#: ../lib/modules/sambaGroupMapping.inc:361
 msgid "If you want to use a well known RID you can selcet a well known group."
 msgstr ""
 "もしも、よく知られているRID(well known RID)を使いたいのであれば、よく知られた"
 "グループを選択できます。"
 
-#: ../help/help.inc:108
+#: ../help/help.inc:106
 msgid ""
 "If your server runs on another port then add a comma and the port number "
 "after the server."
@@ -3074,10 +3110,10 @@ msgstr "システム属性を含む"
 msgid "Information about the LDAP server."
 msgstr "LDAPサーバーに関する情報。"
 
-#: ../lib/modules/sambaSamAccount.inc:210
-#: ../lib/modules/sambaSamAccount.inc:333
-#: ../lib/modules/sambaSamAccount.inc:1405
-#: ../lib/modules/sambaSamAccount.inc:1679
+#: ../lib/modules/sambaSamAccount.inc:215
+#: ../lib/modules/sambaSamAccount.inc:338
+#: ../lib/modules/sambaSamAccount.inc:1398
+#: ../lib/modules/sambaSamAccount.inc:1672
 msgid "Inherit client startup configuration"
 msgstr "クライアントのスタートアップ構成を継承する"
 
@@ -3089,10 +3125,10 @@ msgstr "継承元"
 msgid "Inherits from"
 msgstr "継承元"
 
-#: ../lib/modules/sambaSamAccount.inc:211
-#: ../lib/modules/sambaSamAccount.inc:336
-#: ../lib/modules/sambaSamAccount.inc:1407
-#: ../lib/modules/sambaSamAccount.inc:1680
+#: ../lib/modules/sambaSamAccount.inc:216
+#: ../lib/modules/sambaSamAccount.inc:341
+#: ../lib/modules/sambaSamAccount.inc:1400
+#: ../lib/modules/sambaSamAccount.inc:1673
 msgid "Initial program"
 msgstr "初期プログラム"
 
@@ -3127,19 +3163,19 @@ msgstr ""
 "iノード・ソフトクオータはiノード・ハードクオータ<より小さくなくてはなりませ"
 "ん。"
 
-#: ../templates/selfService/adminMain.php:470
+#: ../templates/selfService/adminMain.php:471
 msgid "Input fields"
 msgstr "入力フィールド"
 
-#: ../lib/modules/sambaSamAccount.inc:82
+#: ../lib/modules/sambaSamAccount.inc:87
 msgid "Inserted user or group name in home path."
 msgstr "ホームパス名にユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:93
 msgid "Inserted user or group name in logon script."
 msgstr "ログオンスクリプトパスにユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/sambaSamAccount.inc:85
+#: ../lib/modules/sambaSamAccount.inc:90
 msgid "Inserted user or group name in profile path."
 msgstr "プロファイルパスにユーザ又はグループ名を挿入しました。"
 
@@ -3147,18 +3183,22 @@ msgstr "プロファイルパスにユーザ又はグループ名を挿入しま
 msgid "Invalid MAC address."
 msgstr "不正なMACアドレスです。"
 
-#: ../templates/massBuildAccounts.php:169
+#: ../templates/massBuildAccounts.php:170
 msgid "Invalid RDN attribute!"
 msgstr "不正なRDN属性です!"
 
-#: ../lib/modules/sambaGroupMapping.inc:73
+#: ../lib/modules/sambaGroupMapping.inc:75
 msgid "Invalid account"
 msgstr "無効なアカウント"
 
+#: ../lib/modules/imapAccess.inc:140
+msgid "Invalid password for IMAP admin or other problem occured."
+msgstr "IMAP管理者に対する不正なパスワード、または、その他の問題が発生しました。"
+
 #: ../lib/modules/kolabUser.inc:118 ../lib/modules/kolabUser.inc:123
 #: ../lib/modules/kolabUser.inc:170 ../lib/modules/kolabUser.inc:214
-#: ../lib/modules/kolabUser.inc:315 ../lib/modules/kolabUser.inc:788
-#: ../lib/modules/kolabUser.inc:900
+#: ../lib/modules/kolabUser.inc:315 ../lib/modules/kolabUser.inc:790
+#: ../lib/modules/kolabUser.inc:902
 msgid "Invitation policy"
 msgstr "不正なポリシー"
 
@@ -3166,7 +3206,7 @@ msgstr "不正なポリシー"
 msgid "Invitation policy list"
 msgstr "不正なポリシーリスト"
 
-#: ../lib/modules/sambaSamAccount.inc:539
+#: ../lib/modules/sambaSamAccount.inc:544
 msgid "Islamabad, Karachi"
 msgstr "Islamabad, Karachi"
 
@@ -3174,7 +3214,7 @@ msgstr "Islamabad, Karachi"
 msgid "It is not possible to delete all ranges."
 msgstr "全ての範囲を削除する事はできません"
 
-#: ../lib/modules/posixGroup.inc:479 ../lib/modules/posixAccount.inc:71
+#: ../lib/modules/posixGroup.inc:475 ../lib/modules/posixAccount.inc:73
 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 "
@@ -3184,22 +3224,22 @@ msgstr ""
 "在するかも知れないため、これはいくつかの問題を引き起こすかもしれません。この"
 "警告を防ぐには、maxUIDをより大きな値に設定してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:135
-#: ../lib/modules/inetOrgPerson.inc:204 ../lib/modules/inetOrgPerson.inc:255
-#: ../lib/modules/inetOrgPerson.inc:452 ../lib/modules/inetOrgPerson.inc:484
-#: ../lib/modules/inetOrgPerson.inc:917 ../lib/modules/inetOrgPerson.inc:1025
+#: ../lib/modules/inetOrgPerson.inc:67 ../lib/modules/inetOrgPerson.inc:138
+#: ../lib/modules/inetOrgPerson.inc:207 ../lib/modules/inetOrgPerson.inc:258
+#: ../lib/modules/inetOrgPerson.inc:455 ../lib/modules/inetOrgPerson.inc:487
+#: ../lib/modules/inetOrgPerson.inc:920 ../lib/modules/inetOrgPerson.inc:1029
 msgid "Job title"
 msgstr "役職"
 
-#: ../lib/modules/inetOrgPerson.inc:485
+#: ../lib/modules/inetOrgPerson.inc:488
 msgid "Job title of user: President, department manager, ..."
 msgstr "ユーザの役職: 社長、部長、..."
 
-#: ../lib/lists.inc:280
+#: ../lib/lists.inc:285
 msgid "Jump 10 pages backward"
 msgstr "10ページ前へ戻る"
 
-#: ../lib/lists.inc:300
+#: ../lib/lists.inc:305
 msgid "Jump 10 pages forward"
 msgstr "10ページ先へ進む"
 
@@ -3216,11 +3256,11 @@ msgstr "属性タイプへジャンプ"
 msgid "Jump to an object class"
 msgstr "オブジェクトクラスへジャンプ"
 
-#: ../lib/lists.inc:275
+#: ../lib/lists.inc:280
 msgid "Jump to first page"
 msgstr "最初のページへジャンプ"
 
-#: ../lib/lists.inc:305
+#: ../lib/lists.inc:310
 msgid "Jump to last page"
 msgstr "最後のページへジャンプ"
 
@@ -3242,13 +3282,13 @@ msgstr ""
 msgid "LAM configuration"
 msgstr "LAM構成設定"
 
-#: ../templates/massBuildAccounts.php:194
+#: ../templates/massBuildAccounts.php:196
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr ""
 "LAMは入力内容をチェックしました。アカウントを作成する準備ができました。"
 
-#: ../lib/modules/posixGroup.inc:418 ../lib/modules/posixAccount.inc:324
-#: ../lib/modules/inetOrgPerson.inc:585
+#: ../lib/modules/posixGroup.inc:410 ../lib/modules/posixAccount.inc:326
+#: ../lib/modules/inetOrgPerson.inc:588
 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 "
@@ -3259,28 +3299,32 @@ msgstr ""
 "SMD5をサポートしています。SSHAとCRYPTが最も一般的ですが、CRYPTは8文字より長い"
 "パスワードをサポートしません。平文のパスワードを使うことは推奨いたしません。"
 
-#: ../templates/tests/index.php:46
+#: ../templates/tests/index.php:48
 msgid "LAM tests"
 msgstr "LAMテスト"
 
-#: ../templates/tree/create.php:184 ../templates/massDoUpload.php:86
+#: ../lib/modules/imapAccess.inc:105
+msgid "LAM user password"
+msgstr "LAMユーザーパスワード"
+
+#: ../templates/tree/create.php:184 ../templates/massDoUpload.php:87
 #, php-format
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAMはアカウント %s を作成できませんでした! LDAPエラーが発生しました。"
 
-#: ../lib/modules/sambaGroupMapping.inc:426
+#: ../lib/modules/sambaGroupMapping.inc:441
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "LAMは、この名前のSamba 3ドメインを見つけられませんでした。"
 
-#: ../lib/modules/sambaSamAccount.inc:103
+#: ../lib/modules/sambaSamAccount.inc:108
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAMは、この名前のドメインを見つけられませんでした。"
 
-#: ../lib/modules/posixAccount.inc:89
+#: ../lib/modules/posixAccount.inc:91
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAMは、この名前のグループを見つけられませんでした。"
 
-#: ../lib/modules/posixAccount.inc:1569
+#: ../lib/modules/posixAccount.inc:1549
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAMはグループ %s のグループメンバーシップを変更できませんでした。"
@@ -3298,17 +3342,13 @@ msgstr ""
 "LAMがアカウントを検索する際に使用するLDAP DNとパスワード。これは、読み取り権"
 "限だけを持ったアカウントで充分です。未記入の場合、LAMは匿名接続を試みます。"
 
-#: ../templates/profedit/profilepage.php:217
-msgid "LDAP"
-msgstr "LDAP"
-
 #: ../templates/config/confmodules.php:97 ../templates/config/confmain.php:122
 #: ../templates/config/moduleSettings.php:96
 #: ../templates/config/conftypes.php:115
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP アカウントマネージャ構成"
 
-#: ../templates/config/conftypes.php:319
+#: ../templates/config/conftypes.php:322
 msgid "LDAP Suffix is invalid!"
 msgstr "LDAPサフィックスが正しくありません!"
 
@@ -3316,32 +3356,31 @@ msgstr "LDAPサフィックスが正しくありません!"
 msgid "LDAP error, server says:"
 msgstr "LDAP エラー、サーバからのメッセージ:"
 
-#: ../templates/config/confmain.php:530
+#: ../templates/config/confmain.php:359
 msgid "LDAP filter"
 msgstr "LDAPフィルター"
 
-#: ../lib/modules.inc:1485
+#: ../lib/modules.inc:1540
 msgid "LDAP operation successful."
 msgstr "LDAP操作が完了しました。"
 
-#: ../templates/selfService/adminMain.php:368
+#: ../templates/selfService/adminMain.php:369
 msgid "LDAP password"
 msgstr "LDAPパスワード"
 
-#: ../templates/config/confmain.php:501 ../templates/config/confmain.php:504
-#: ../help/help.inc:114
+#: ../templates/config/confmain.php:343 ../help/help.inc:112
 msgid "LDAP search"
 msgstr "LDAP検索"
 
-#: ../templates/selfService/adminMain.php:379 ../help/help.inc:168
+#: ../templates/selfService/adminMain.php:380 ../help/help.inc:168
 msgid "LDAP search attribute"
 msgstr "LDAP検索属性"
 
-#: ../lib/account.inc:642
+#: ../lib/account.inc:641
 msgid "LDAP search failed! Please check your preferences."
 msgstr "LDAP検索に失敗しました! プリファレンスを確認してください。"
 
-#: ../templates/config/confmain.php:302 ../help/help.inc:116
+#: ../templates/config/confmain.php:246 ../help/help.inc:114
 msgid "LDAP search limit"
 msgstr "LDAP検索リミット"
 
@@ -3349,26 +3388,22 @@ msgstr "LDAP検索リミット"
 msgid "LDAP server"
 msgstr "LDAPサーバ"
 
-#: ../lib/account.inc:633
+#: ../lib/account.inc:632
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "LDAPのサイズ制限を越えました。一部のエントリのみを表示します。"
 
-#: ../templates/config/confmain.php:522 ../templates/config/conftypes.php:252
-#: ../templates/selfService/adminMain.php:344
-#: ../templates/profedit/profilepage.php:221 ../help/help.inc:67
+#: ../templates/config/confmain.php:355 ../templates/config/conftypes.php:244
+#: ../templates/selfService/adminMain.php:345
+#: ../templates/profedit/profilepage.php:189 ../help/help.inc:67
 #: ../help/help.inc:164
 msgid "LDAP suffix"
 msgstr "LDAPサフィックス"
 
-#: ../templates/massDoUpload.php:125
-msgid "LDAP upload has finished"
-msgstr "LDAPアップロードが完了しました。"
-
 #: ../templates/massDoUpload.php:70
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAPアップロード中です。お待ちください。"
 
-#: ../templates/selfService/adminMain.php:356
+#: ../templates/selfService/adminMain.php:357
 msgid "LDAP user"
 msgstr "LDAPユーザー"
 
@@ -3376,7 +3411,7 @@ msgstr "LDAPユーザー"
 msgid "LDAP user and password"
 msgstr "LDAPユーザーとパスワード"
 
-#: ../templates/serverInfo.php:96
+#: ../templates/serverInfo.php:98
 msgid "LDAP version"
 msgstr "LDAPバージョン"
 
@@ -3385,40 +3420,44 @@ msgstr "LDAPバージョン"
 msgid "LDIF Export for: %s"
 msgstr "LDIFにエクスポート: %s"
 
-#: ../lib/types/asteriskExt.inc:92
+#: ../lib/types/asteriskExt.inc:93
 msgid "Label"
 msgstr "ラベル"
 
-#: ../templates/tests/lamdaemonTest.php:177
+#: ../templates/tests/lamdaemonTest.php:183
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemonサーバおよびパス"
 
-#: ../templates/config/confmain.php:401
+#: ../templates/config/confmain.php:315
 msgid "Lamdaemon settings"
 msgstr "Lamdaemon設定"
 
-#: ../templates/tests/lamdaemonTest.php:135
+#: ../templates/tests/lamdaemonTest.php:133
 msgid "Lamdaemon successfully run."
 msgstr "Lamdaemonは正常に起動しました。"
 
-#: ../templates/tests/index.php:50 ../templates/tests/lamdaemonTest.php:47
-#: ../templates/tests/lamdaemonTest.php:68
+#: ../templates/tests/index.php:50 ../templates/tests/lamdaemonTest.php:50
+#: ../lib/tools/tests.inc:110
 msgid "Lamdaemon test"
 msgstr "Lamdaemonテスト"
 
-#: ../templates/tests/lamdaemonTest.php:262
+#: ../templates/tests/lamdaemonTest.php:283
 msgid "Lamdaemon test finished."
 msgstr "Lamdaemonテストが完了しました。"
 
-#: ../templates/tests/lamdaemonTest.php:254
+#: ../templates/tests/lamdaemonTest.php:265
+msgid "Lamdaemon version"
+msgstr "Lamdaemonバージョン"
+
+#: ../templates/tests/lamdaemonTest.php:275
 msgid "Lamdaemon: Quota module installed"
 msgstr "Lamdaemon: クォータモジュールがインストールされました。"
 
-#: ../templates/tests/lamdaemonTest.php:250
+#: ../templates/tests/lamdaemonTest.php:271
 msgid "Lamdaemon: check NSS LDAP"
 msgstr "Lamdaemon: NSS LDAPのチェック"
 
-#: ../templates/tests/lamdaemonTest.php:257
+#: ../templates/tests/lamdaemonTest.php:278
 msgid "Lamdaemon: read quotas"
 msgstr "Lamdaemon: クオータの読み込み"
 
@@ -3426,11 +3465,11 @@ msgstr "Lamdaemon: クオータの読み込み"
 msgid "Language"
 msgstr "言語"
 
-#: ../templates/config/confmain.php:613
+#: ../templates/config/confmain.php:434
 msgid "Language is not defined!"
 msgstr "言語が未定されていません!"
 
-#: ../templates/config/confmain.php:356
+#: ../templates/config/confmain.php:285
 msgid "Language settings"
 msgstr "言語の設定"
 
@@ -3446,19 +3485,19 @@ msgstr "最終ログイン時刻"
 msgid "Last login from"
 msgstr "最終ログインの接続元"
 
-#: ../lib/types/user.inc:97 ../lib/modules/inetOrgPerson.inc:46
-#: ../lib/modules/inetOrgPerson.inc:116 ../lib/modules/inetOrgPerson.inc:238
-#: ../lib/modules/inetOrgPerson.inc:407 ../lib/modules/inetOrgPerson.inc:492
-#: ../lib/modules/inetOrgPerson.inc:825 ../lib/modules/inetOrgPerson.inc:1027
-#: ../lib/modules/inetOrgPerson.inc:1383
+#: ../lib/types/user.inc:97 ../lib/modules/inetOrgPerson.inc:49
+#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:241
+#: ../lib/modules/inetOrgPerson.inc:410 ../lib/modules/inetOrgPerson.inc:495
+#: ../lib/modules/inetOrgPerson.inc:828 ../lib/modules/inetOrgPerson.inc:1031
+#: ../lib/modules/inetOrgPerson.inc:1387
 msgid "Last name"
 msgstr "姓"
 
-#: ../lib/modules/inetOrgPerson.inc:46 ../lib/modules/inetOrgPerson.inc:47
+#: ../lib/modules/inetOrgPerson.inc:49 ../lib/modules/inetOrgPerson.inc:50
 msgid "Last name contains invalid characters or is empty!"
 msgstr "姓に不正な文字が含まれているか、または未入力です!"
 
-#: ../lib/modules/inetOrgPerson.inc:493
+#: ../lib/modules/inetOrgPerson.inc:496
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "ユーザの姓。アルファベット、_ - と空白のみが使用できます。"
 
@@ -3477,19 +3516,19 @@ msgstr "リース期間"
 msgid "Line ends"
 msgstr "行の終わり"
 
-#: ../templates/selfService/adminMain.php:319
+#: ../templates/selfService/adminMain.php:295
 msgid "Link to self service login page for your users"
 msgstr "ユーザーのセルフサービス・ログインページへのリンク"
 
-#: ../templates/config/conftypes.php:266 ../help/help.inc:79
+#: ../templates/config/conftypes.php:259 ../help/help.inc:79
 msgid "List attributes"
 msgstr "属性の一覧"
 
-#: ../templates/config/conftypes.php:326
+#: ../templates/config/conftypes.php:329
 msgid "List attributes are invalid!"
 msgstr "リスト属性が正しくありません!"
 
-#: ../lib/modules/sambaSamAccount.inc:288
+#: ../lib/modules/sambaSamAccount.inc:293
 msgid ""
 "List of Samba workstations the user is allowed to login. Empty means every "
 "workstation."
@@ -3497,7 +3536,7 @@ msgstr ""
 "ユーザがログインできるSambaワークステーションのリスト。未記入はすべてのワーク"
 "ステーションを意味します。"
 
-#: ../templates/config/confmain.php:607
+#: ../templates/config/confmain.php:428
 msgid "List of admin users is empty or invalid!"
 msgstr "管理者(admin users)のリストが空または正しくありません!"
 
@@ -3505,11 +3544,11 @@ msgstr "管理者(admin users)のリストが空または正しくありませ
 msgid "List of entries to be deleted:"
 msgstr "削除されるエントリ一覧:"
 
-#: ../templates/config/confmain.php:514
+#: ../templates/config/confmain.php:351
 msgid "List of valid users"
 msgstr "有効なユーザのリスト"
 
-#: ../lib/modules.inc:1409 ../help/help.inc:156
+#: ../lib/modules.inc:1452 ../help/help.inc:154
 msgid "Load profile"
 msgstr "プロファイルのロード"
 
@@ -3525,7 +3564,7 @@ msgstr "ローカルアドレス"
 msgid "Local address list"
 msgstr "ローカルアドレス一覧"
 
-#: ../lib/modules/sambaGroupMapping.inc:70
+#: ../lib/modules/sambaGroupMapping.inc:72
 msgid "Local group"
 msgstr "ローカルグループ"
 
@@ -3533,17 +3572,17 @@ msgstr "ローカルグループ"
 #: ../lib/modules/ipHost.inc:98 ../lib/modules/ipHost.inc:149
 #: ../lib/modules/ipHost.inc:312 ../lib/modules/device.inc:66
 #: ../lib/modules/device.inc:97 ../lib/modules/device.inc:112
-#: ../lib/modules/device.inc:173 ../lib/modules/device.inc:377
-#: ../lib/modules/inetOrgPerson.inc:121 ../lib/modules/inetOrgPerson.inc:126
-#: ../lib/modules/inetOrgPerson.inc:184 ../lib/modules/inetOrgPerson.inc:375
-#: ../lib/modules/inetOrgPerson.inc:422 ../lib/modules/inetOrgPerson.inc:560
-#: ../lib/modules/inetOrgPerson.inc:861 ../lib/modules/inetOrgPerson.inc:1044
-#: ../lib/modules/inetOrgPerson.inc:1460
+#: ../lib/modules/device.inc:173 ../lib/modules/device.inc:382
+#: ../lib/modules/inetOrgPerson.inc:124 ../lib/modules/inetOrgPerson.inc:129
+#: ../lib/modules/inetOrgPerson.inc:187 ../lib/modules/inetOrgPerson.inc:378
+#: ../lib/modules/inetOrgPerson.inc:425 ../lib/modules/inetOrgPerson.inc:563
+#: ../lib/modules/inetOrgPerson.inc:864 ../lib/modules/inetOrgPerson.inc:1048
+#: ../lib/modules/inetOrgPerson.inc:1464
 msgid "Location"
 msgstr "住所"
 
-#: ../lib/modules/posixGroup.inc:203 ../lib/modules/posixAccount.inc:249
-#: ../lib/modules/posixAccount.inc:1009
+#: ../lib/modules/posixGroup.inc:196 ../lib/modules/posixAccount.inc:251
+#: ../lib/modules/posixAccount.inc:991
 msgid "Lock password"
 msgstr "パスワードのロック"
 
@@ -3578,15 +3617,15 @@ msgstr ""
 "ユーザーをロックアウトするに至るログオン失敗回数は0から999の間でなくてはなり"
 "ません。"
 
-#: ../templates/config/mainmanage.php:309 ../help/help.inc:138
+#: ../templates/config/mainmanage.php:230 ../help/help.inc:136
 msgid "Log destination"
 msgstr "ログ出力先"
 
-#: ../templates/config/mainmanage.php:284 ../help/help.inc:136
+#: ../templates/config/mainmanage.php:216 ../help/help.inc:134
 msgid "Log level"
 msgstr "ログレベル"
 
-#: ../templates/config/mainmanage.php:278
+#: ../templates/config/mainmanage.php:233
 msgid "Logging"
 msgstr "ロギング"
 
@@ -3597,26 +3636,26 @@ msgstr "ロギング"
 msgid "Login"
 msgstr "ログイン"
 
-#: ../templates/selfService/adminMain.php:405 ../help/help.inc:170
+#: ../templates/selfService/adminMain.php:406 ../help/help.inc:170
 msgid "Login attribute label"
 msgstr "ログイン属性ラベル"
 
-#: ../templates/selfService/adminMain.php:418 ../help/help.inc:172
+#: ../templates/selfService/adminMain.php:419 ../help/help.inc:172
 msgid "Login caption"
 msgstr "ログインの説明文"
 
-#: ../templates/config/confmain.php:492 ../help/help.inc:112
+#: ../templates/config/confmain.php:345 ../help/help.inc:110
 msgid "Login method"
 msgstr "ログイン方法"
 
-#: ../lib/types/user.inc:99 ../lib/modules/posixAccount.inc:235
-#: ../lib/modules/posixAccount.inc:304 ../lib/modules/posixAccount.inc:376
-#: ../lib/modules/posixAccount.inc:1002 ../lib/modules/posixAccount.inc:1105
-#: ../lib/modules/posixAccount.inc:1171
+#: ../lib/types/user.inc:99 ../lib/modules/posixAccount.inc:237
+#: ../lib/modules/posixAccount.inc:306 ../lib/modules/posixAccount.inc:378
+#: ../lib/modules/posixAccount.inc:984 ../lib/modules/posixAccount.inc:1086
+#: ../lib/modules/posixAccount.inc:1152
 msgid "Login shell"
 msgstr "ログインシェル"
 
-#: ../templates/pdfedit/pdfpage.php:413
+#: ../templates/pdfedit/pdfpage.php:446
 msgid "Logo"
 msgstr "ロゴ"
 
@@ -3625,34 +3664,34 @@ msgstr "ロゴ"
 msgid "Logon for password change"
 msgstr "パスワード変更のためにログオン"
 
-#: ../lib/modules/sambaSamAccount.inc:104
-#: ../lib/modules/sambaSamAccount.inc:312
-#: ../lib/modules/sambaSamAccount.inc:315
-#: ../lib/modules/sambaSamAccount.inc:496
-#: ../lib/modules/sambaSamAccount.inc:567
-#: ../lib/modules/sambaSamAccount.inc:1188
-#: ../lib/modules/sambaSamAccount.inc:1526
+#: ../lib/modules/sambaSamAccount.inc:109
+#: ../lib/modules/sambaSamAccount.inc:317
+#: ../lib/modules/sambaSamAccount.inc:320
+#: ../lib/modules/sambaSamAccount.inc:501
+#: ../lib/modules/sambaSamAccount.inc:572
+#: ../lib/modules/sambaSamAccount.inc:1182
+#: ../lib/modules/sambaSamAccount.inc:1519
 msgid "Logon hours"
 msgstr "ログオン時間"
 
-#: ../lib/modules/sambaSamAccount.inc:87 ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:200
-#: ../lib/modules/sambaSamAccount.inc:284
-#: ../lib/modules/sambaSamAccount.inc:480
-#: ../lib/modules/sambaSamAccount.inc:565
-#: ../lib/modules/sambaSamAccount.inc:1141
-#: ../lib/modules/sambaSamAccount.inc:1502
-#: ../lib/modules/sambaSamAccount.inc:1649
+#: ../lib/modules/sambaSamAccount.inc:92 ../lib/modules/sambaSamAccount.inc:93
+#: ../lib/modules/sambaSamAccount.inc:205
+#: ../lib/modules/sambaSamAccount.inc:289
+#: ../lib/modules/sambaSamAccount.inc:485
+#: ../lib/modules/sambaSamAccount.inc:570
+#: ../lib/modules/sambaSamAccount.inc:1135
+#: ../lib/modules/sambaSamAccount.inc:1495
+#: ../lib/modules/sambaSamAccount.inc:1642
 msgid "Logon script"
 msgstr "ログオンスクリプト"
 
-#: ../lib/modules/sambaSamAccount.inc:87 ../lib/modules/sambaSamAccount.inc:89
+#: ../lib/modules/sambaSamAccount.inc:92 ../lib/modules/sambaSamAccount.inc:94
 msgid "Logon script is invalid!"
 msgstr "ログオンスクリプトが正しくありません!"
 
 #: ../templates/selfService/selfServiceMain.php:53
 #: ../templates/selfService/selfServiceMain.php:127
-#: ../templates/main_header.php:75
+#: ../templates/main_header.php:96
 msgid "Logout"
 msgstr "ログアウト"
 
@@ -3675,7 +3714,7 @@ msgstr "MACアドレス一覧"
 msgid "MAC address(es)"
 msgstr "MACアドレス"
 
-#: ../lib/modules/sambaSamAccount.inc:545
+#: ../lib/modules/sambaSamAccount.inc:550
 msgid "Magadan, Solomon Islands"
 msgstr "Magadan, Solomon Islands"
 
@@ -3683,9 +3722,13 @@ msgstr "Magadan, Solomon Islands"
 msgid "Mail aliases"
 msgstr "電子メール エイリアス"
 
+#: ../lib/modules/imapAccess.inc:87 ../lib/modules/imapAccess.inc:109
+msgid "Mail domain(s)"
+msgstr "メール・ドメイン"
+
 #: ../lib/modules/kolabUser.inc:88 ../lib/modules/kolabUser.inc:159
 #: ../lib/modules/kolabUser.inc:207 ../lib/modules/kolabUser.inc:220
-#: ../lib/modules/kolabUser.inc:306 ../lib/modules/kolabUser.inc:772
+#: ../lib/modules/kolabUser.inc:306 ../lib/modules/kolabUser.inc:774
 msgid "Mail quota"
 msgstr "メール・クオータ"
 
@@ -3707,7 +3750,7 @@ msgstr "メール転送"
 msgid "Mail server"
 msgstr "メールサーバ"
 
-#: ../templates/lists/changePassword.php:369
+#: ../templates/lists/changePassword.php:452
 #, php-format
 msgid "Mail successfully sent to %s."
 msgstr "%s へ正常にメールを送信しました。"
@@ -3716,13 +3759,22 @@ msgstr "%s へ正常にメールを送信しました。"
 #: ../lib/modules/asteriskVoicemail.inc:129
 #: ../lib/modules/asteriskVoicemail.inc:149
 #: ../lib/modules/asteriskVoicemail.inc:236
-#: ../lib/modules/asteriskVoicemail.inc:388
+#: ../lib/modules/asteriskVoicemail.inc:390 ../lib/modules/imapAccess.inc:52
+#: ../lib/modules/imapAccess.inc:90 ../lib/modules/imapAccess.inc:177
 msgid "Mailbox"
 msgstr "メールボックス"
 
+#: ../lib/modules/imapAccess.inc:185
+msgid "Mailbox already exists on IMAP server."
+msgstr "IMAPサーバー上のメールボックスが既に存在します。"
+
+#: ../lib/modules/imapAccess.inc:192
+msgid "Mailbox does not exist on IMAP server."
+msgstr "IMAPサーバー上にメールボックスが存在しません。"
+
 #: ../lib/modules/kolabUser.inc:151 ../lib/modules/kolabUser.inc:182
 #: ../lib/modules/kolabUser.inc:216 ../lib/modules/kolabUser.inc:292
-#: ../lib/modules/kolabUser.inc:297 ../lib/modules/kolabUser.inc:768
+#: ../lib/modules/kolabUser.inc:297 ../lib/modules/kolabUser.inc:770
 msgid "Mailbox home server"
 msgstr "メールボックス・ホーム・サーバ"
 
@@ -3742,19 +3794,19 @@ msgstr "電子メールエイリアス(e.g. NIS mail aliases)"
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "この名前へのメールは受信者に転送されます。"
 
-#: ../templates/pdfedit/pdfpage.php:360 ../templates/pdfedit/pdfpage.php:719
+#: ../templates/pdfedit/pdfpage.php:360 ../templates/pdfedit/pdfpage.php:615
 msgid "Main"
 msgstr "メイン"
 
-#: ../templates/selfService/adminMain.php:431 ../help/help.inc:174
+#: ../templates/selfService/adminMain.php:432 ../help/help.inc:174
 msgid "Main page caption"
 msgstr "メインページの説明文"
 
-#: ../templates/pdfedit/pdfmain.php:155
+#: ../templates/pdfedit/pdfmain.php:146
 msgid "Manage existing PDF structures"
 msgstr "PDF構成の管理"
 
-#: ../templates/profedit/profilemain.php:148
+#: ../templates/profedit/profilemain.php:141
 msgid "Manage existing profiles"
 msgstr "サーバープロファイルの管理"
 
@@ -3766,16 +3818,16 @@ msgstr "セルフサービスプロファイルの操作"
 msgid "Manage server profiles"
 msgstr "サーバープロファイルの操作"
 
-#: ../templates/serverInfo.php:93
+#: ../templates/serverInfo.php:94
 msgid "Managed suffixes"
 msgstr "管理対象サフィックス"
 
 #: ../lib/modules/ipHost.inc:70 ../lib/modules/ipHost.inc:90
 #: ../lib/modules/ipHost.inc:99 ../lib/modules/ipHost.inc:170
-#: ../lib/modules/ipHost.inc:315 ../lib/modules/inetOrgPerson.inc:214
-#: ../lib/modules/inetOrgPerson.inc:271 ../lib/modules/inetOrgPerson.inc:467
-#: ../lib/modules/inetOrgPerson.inc:500 ../lib/modules/inetOrgPerson.inc:958
-#: ../lib/modules/inetOrgPerson.inc:1029
+#: ../lib/modules/ipHost.inc:315 ../lib/modules/inetOrgPerson.inc:217
+#: ../lib/modules/inetOrgPerson.inc:274 ../lib/modules/inetOrgPerson.inc:470
+#: ../lib/modules/inetOrgPerson.inc:503 ../lib/modules/inetOrgPerson.inc:950
+#: ../lib/modules/inetOrgPerson.inc:1033
 msgid "Manager"
 msgstr "管理者"
 
@@ -3819,7 +3871,7 @@ msgid "Mark for deletion"
 msgstr "削除対象としてマーク"
 
 #: ../templates/config/profmanage.php:377
-#: ../templates/selfService/profManage.php:280 ../help/help.inc:130
+#: ../templates/selfService/profManage.php:280 ../help/help.inc:128
 msgid "Master password"
 msgstr "マスタパスワード"
 
@@ -3840,30 +3892,30 @@ msgstr "照合規則のOID"
 msgid "Matching rules"
 msgstr "照合規則"
 
-#: ../lib/modules/posixGroup.inc:314 ../lib/modules/posixGroup.inc:483
-#: ../lib/modules/posixGroup.inc:484
+#: ../lib/modules/posixGroup.inc:306 ../lib/modules/posixGroup.inc:479
+#: ../lib/modules/posixGroup.inc:480
 msgid "Maximum GID number"
 msgstr "GID番号の最大値"
 
-#: ../lib/modules/posixGroup.inc:483
+#: ../lib/modules/posixGroup.inc:479
 msgid "Maximum GID number is invalid or empty!"
 msgstr "GID番号の最大値が不正または未入力です!"
 
-#: ../lib/modules/posixGroup.inc:484
+#: ../lib/modules/posixGroup.inc:480
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "GID番号の最大値は最小値よりも大きくなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:60 ../lib/modules/posixAccount.inc:62
-#: ../lib/modules/posixAccount.inc:63 ../lib/modules/posixAccount.inc:64
-#: ../lib/modules/posixAccount.inc:162 ../lib/modules/posixAccount.inc:171
+#: ../lib/modules/posixAccount.inc:62 ../lib/modules/posixAccount.inc:64
+#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:164 ../lib/modules/posixAccount.inc:173
 msgid "Maximum UID number"
 msgstr "UID番号の最大値"
 
-#: ../lib/modules/posixAccount.inc:60 ../lib/modules/posixAccount.inc:62
+#: ../lib/modules/posixAccount.inc:62 ../lib/modules/posixAccount.inc:64
 msgid "Maximum UID number is invalid!"
 msgstr "UID番号の最大値が不正です!"
 
-#: ../lib/modules/posixAccount.inc:63 ../lib/modules/posixAccount.inc:64
+#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:66
 msgid "Maximum UID number must be greater than minimum UID number!"
 msgstr "UID番号の最大値は最小値よりも大きくなくてはなりません!"
 
@@ -3888,7 +3940,7 @@ msgstr "最長リース期間"
 msgid "Maximum length"
 msgstr "最大長"
 
-#: ../lib/lists.inc:850 ../help/help.inc:89
+#: ../lib/lists.inc:868 ../help/help.inc:89
 msgid "Maximum list entries"
 msgstr "リストエントリの最大数"
 
@@ -3905,25 +3957,25 @@ msgstr "リストエントリの最大数"
 msgid "Maximum password age"
 msgstr "パスワード期限(age)の最大値"
 
-#: ../lib/types/netgroup.inc:94 ../lib/modules/nisnetgroup.inc:80
-#: ../lib/modules/nisnetgroup.inc:84 ../lib/modules/nisnetgroup.inc:117
-#: ../lib/modules/nisnetgroup.inc:127 ../lib/modules/nisnetgroup.inc:270
-#: ../lib/modules/nisnetgroup.inc:583 ../lib/modules/groupOfNames.inc:72
+#: ../lib/types/netgroup.inc:94 ../lib/modules/nisnetgroup.inc:85
+#: ../lib/modules/nisnetgroup.inc:89 ../lib/modules/nisnetgroup.inc:122
+#: ../lib/modules/nisnetgroup.inc:132 ../lib/modules/nisnetgroup.inc:275
+#: ../lib/modules/nisnetgroup.inc:579 ../lib/modules/groupOfNames.inc:72
 #: ../lib/modules/groupOfNames.inc:76 ../lib/modules/groupOfNames.inc:103
-#: ../lib/modules/groupOfNames.inc:114 ../lib/modules/groupOfNames.inc:167
-#: ../lib/modules/groupOfNames.inc:435
+#: ../lib/modules/groupOfNames.inc:114 ../lib/modules/groupOfNames.inc:173
+#: ../lib/modules/groupOfNames.inc:459
 msgid "Members"
 msgstr "メンバー"
 
-#: ../lib/modules/sambaSamAccount.inc:532
+#: ../lib/modules/sambaSamAccount.inc:537
 msgid "Mid-Atlantic"
 msgstr "Mid-Atlantic"
 
-#: ../lib/modules/sambaSamAccount.inc:523
+#: ../lib/modules/sambaSamAccount.inc:528
 msgid "Midway Island, Samoa"
 msgstr "Midway Island, Samoa"
 
-#: ../lib/modules/inetOrgPerson.inc:240
+#: ../lib/modules/inetOrgPerson.inc:243
 msgid "Miller"
 msgstr "ミラー"
 
@@ -3932,32 +3984,32 @@ msgstr "ミラー"
 msgid "Minimal password length"
 msgstr "パスワード長さの最小値"
 
-#: ../lib/modules/posixGroup.inc:311 ../lib/modules/posixGroup.inc:482
+#: ../lib/modules/posixGroup.inc:303 ../lib/modules/posixGroup.inc:478
 msgid "Minimum GID number"
 msgstr "GID番号の最小値"
 
-#: ../lib/modules/posixGroup.inc:482
+#: ../lib/modules/posixGroup.inc:478
 msgid "Minimum GID number is invalid or empty!"
 msgstr "GID番号の最小値が不正または空です!"
 
-#: ../lib/modules/posixAccount.inc:59 ../lib/modules/posixAccount.inc:61
-#: ../lib/modules/posixAccount.inc:159 ../lib/modules/posixAccount.inc:168
+#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:161 ../lib/modules/posixAccount.inc:170
 msgid "Minimum UID number"
 msgstr "UID番号の最小値"
 
-#: ../lib/modules/posixAccount.inc:59 ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:63
 msgid "Minimum UID number is invalid!"
 msgstr "UID番号の最小値が不正です!"
 
-#: ../templates/config/mainmanage.php:249
+#: ../templates/config/mainmanage.php:208
 msgid "Minimum character classes"
 msgstr "要求文字クラス"
 
-#: ../templates/config/mainmanage.php:245
+#: ../templates/config/mainmanage.php:204
 msgid "Minimum lowercase characters"
 msgstr "小文字の要求文字数"
 
-#: ../templates/config/mainmanage.php:247
+#: ../templates/config/mainmanage.php:206
 msgid "Minimum numeric characters"
 msgstr "数字の要求文字数"
 
@@ -3973,57 +4025,57 @@ msgstr "数字の要求文字数"
 msgid "Minimum password age"
 msgstr "パスワード期限(age)の最小値"
 
-#: ../templates/config/mainmanage.php:244 ../lib/types/ppolicyType.inc:87
+#: ../templates/config/mainmanage.php:203 ../lib/types/ppolicyType.inc:87
 #: ../lib/modules/ppolicy.inc:112 ../lib/modules/ppolicy.inc:139
 #: ../lib/modules/ppolicy.inc:167 ../lib/modules/ppolicy.inc:232
 #: ../lib/modules/ppolicy.inc:464
 msgid "Minimum password length"
 msgstr "パスワード長さの最小値"
 
-#: ../templates/config/mainmanage.php:248
+#: ../templates/config/mainmanage.php:207
 msgid "Minimum symbolic characters"
 msgstr "記号の要求文字数"
 
-#: ../templates/config/mainmanage.php:246
+#: ../templates/config/mainmanage.php:205
 msgid "Minimum uppercase characters"
 msgstr "大文字の要求文字数"
 
-#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:117
-#: ../lib/modules/inetOrgPerson.inc:198 ../lib/modules/inetOrgPerson.inc:335
-#: ../lib/modules/inetOrgPerson.inc:443 ../lib/modules/inetOrgPerson.inc:524
-#: ../lib/modules/inetOrgPerson.inc:525 ../lib/modules/inetOrgPerson.inc:899
-#: ../lib/modules/inetOrgPerson.inc:1036
+#: ../lib/types/user.inc:158 ../lib/modules/inetOrgPerson.inc:55
+#: ../lib/modules/inetOrgPerson.inc:120 ../lib/modules/inetOrgPerson.inc:201
+#: ../lib/modules/inetOrgPerson.inc:338 ../lib/modules/inetOrgPerson.inc:446
+#: ../lib/modules/inetOrgPerson.inc:527 ../lib/modules/inetOrgPerson.inc:528
+#: ../lib/modules/inetOrgPerson.inc:902 ../lib/modules/inetOrgPerson.inc:1040
 msgid "Mobile number"
 msgstr "携帯電話番号"
 
-#: ../lib/modules/inetOrgPerson.inc:1411
+#: ../lib/modules/inetOrgPerson.inc:1415
 msgid "Mobile telephone number"
 msgstr "携帯電話番号"
 
-#: ../templates/config/confmodules.php:174
-#: ../templates/config/confmain.php:207
-#: ../templates/config/moduleSettings.php:173
-#: ../templates/config/conftypes.php:192
+#: ../templates/config/confmodules.php:177
+#: ../templates/config/confmain.php:210
+#: ../templates/config/moduleSettings.php:176
+#: ../templates/config/conftypes.php:195
 msgid "Module settings"
 msgstr "モジュール設定"
 
-#: ../templates/config/confmodules.php:170
-#: ../templates/config/confmain.php:203
-#: ../templates/config/moduleSettings.php:169
-#: ../templates/config/conftypes.php:188
+#: ../templates/config/confmodules.php:173
+#: ../templates/config/confmain.php:206
+#: ../templates/config/moduleSettings.php:172
+#: ../templates/config/conftypes.php:191
 msgid "Modules"
 msgstr "モジュール"
 
-#: ../lib/modules/sambaSamAccount.inc:1280
+#: ../lib/modules/sambaSamAccount.inc:1273
 msgid "Monday"
 msgstr "月曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:527
+#: ../lib/modules/sambaSamAccount.inc:532
 msgid "Mountain Time (US & Canada)"
 msgstr "Mountain Time (US & Canada)"
 
-#: ../lib/modules/quota.inc:97 ../lib/modules/quota.inc:387
-#: ../lib/modules/quota.inc:487 ../lib/modules/quota.inc:611
+#: ../lib/modules/quota.inc:97 ../lib/modules/quota.inc:386
+#: ../lib/modules/quota.inc:488 ../lib/modules/quota.inc:615
 msgid "Mountpoint"
 msgstr "マウントポイント"
 
@@ -4040,19 +4092,19 @@ msgid "Multiple values are separated by comma."
 msgstr "複数の値はカンマによって区切られます。"
 
 #: ../lib/modules/ipHost.inc:86 ../lib/modules/device.inc:99
-#: ../lib/modules/inetOrgPerson.inc:377
+#: ../lib/modules/inetOrgPerson.inc:380
 msgid "MyCity"
 msgstr "わたしの市"
 
-#: ../lib/modules/inetOrgPerson.inc:305
+#: ../lib/modules/inetOrgPerson.inc:308
 msgid "Mycity"
 msgstr "わたしの市"
 
-#: ../lib/modules/inetOrgPerson.inc:289
+#: ../lib/modules/inetOrgPerson.inc:292
 msgid "Mystreetname 42"
 msgstr "わたしの町42番地"
 
-#: ../lib/modules/nisnetgroup.inc:52
+#: ../lib/modules/nisnetgroup.inc:57
 msgid "NIS net group"
 msgstr "NIS ネット・グループ"
 
@@ -4078,20 +4130,20 @@ msgstr "NISオブジェクト"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:59
 #: ../templates/tree/templates/creation/new_ou_template.php:104
-#: ../templates/schema/schema.php:266 ../templates/pdfedit/pdfdelete.php:85
+#: ../templates/schema/schema.php:266 ../templates/pdfedit/pdfdelete.php:88
 #: ../lib/types/ppolicyType.inc:77 ../lib/modules/device.inc:54
 #: ../lib/modules/device.inc:78 ../lib/modules/device.inc:109
-#: ../lib/modules/device.inc:151 ../lib/modules/device.inc:365
+#: ../lib/modules/device.inc:151 ../lib/modules/device.inc:370
 #: ../lib/modules/nisObject.inc:54 ../lib/modules/nisObject.inc:74
 #: ../lib/modules/nisObject.inc:104 ../lib/modules/nisObject.inc:130
 #: ../lib/modules/nisObject.inc:210 ../lib/modules/ppolicy.inc:72
 #: ../lib/modules/ppolicy.inc:134 ../lib/modules/ppolicy.inc:157
 #: ../lib/modules/ppolicy.inc:182 ../lib/modules/ppolicy.inc:445
-#: ../lib/modules/groupOfNames.inc:140
+#: ../lib/modules/groupOfNames.inc:142
 msgid "Name"
 msgstr "名前"
 
-#: ../help/help.inc:151
+#: ../help/help.inc:149
 msgid ""
 "Name under which the profile will be saved. If a profile with the same name "
 "exists, it will be overwritten."
@@ -4116,7 +4168,7 @@ msgstr "NetBIOSネーム・サーバー"
 msgid "Netbios node type"
 msgstr "NetBIOSノードタイプ"
 
-#: ../lib/types/dhcp.inc:125
+#: ../lib/types/dhcp.inc:108 ../lib/types/dhcp.inc:164
 msgid "New DHCP"
 msgstr "新規DHCP"
 
@@ -4128,7 +4180,7 @@ msgstr "新しいIPアドレス"
 msgid "New MAC address"
 msgstr "新しいMACアドレス"
 
-#: ../lib/types/nisObjectType.inc:107
+#: ../lib/types/nisObjectType.inc:92 ../lib/types/nisObjectType.inc:146
 msgid "New NIS object"
 msgstr "新しいNISオブジェクト"
 
@@ -4140,11 +4192,12 @@ msgstr "新しい OU が作成されました。"
 msgid "New SSH public key"
 msgstr "新しいSSH公開鍵"
 
-#: ../lib/modules/inetOrgPerson.inc:385
+#: ../lib/modules/inetOrgPerson.inc:388
 msgid "New York"
 msgstr "New York"
 
-#: ../lib/types/mailAlias.inc:119 ../lib/types/alias.inc:119
+#: ../lib/types/mailAlias.inc:104 ../lib/types/mailAlias.inc:137
+#: ../lib/types/alias.inc:104 ../lib/types/alias.inc:137
 msgid "New alias"
 msgstr "新しい別名"
 
@@ -4152,24 +4205,26 @@ msgstr "新しい別名"
 msgid "New default profile set successfully."
 msgstr "新しいプロファイル既定値が正しく設定されました。"
 
-#: ../lib/types/smbDomain.inc:119
+#: ../lib/types/smbDomain.inc:104 ../lib/types/smbDomain.inc:158
 msgid "New domain"
 msgstr "新しいドメイン"
 
-#: ../lib/types/asteriskExt.inc:120
+#: ../lib/types/asteriskExt.inc:106 ../lib/types/asteriskExt.inc:139
 msgid "New extension"
 msgstr "新しい拡張"
 
-#: ../templates/pdfedit/pdfpage.php:639
+#: ../templates/pdfedit/pdfpage.php:567
 msgid "New field"
 msgstr "新しいフィールド"
 
-#: ../lib/types/gon.inc:121 ../lib/types/group.inc:133
-#: ../lib/types/netgroup.inc:121
+#: ../lib/types/gon.inc:106 ../lib/types/gon.inc:160
+#: ../lib/types/group.inc:108 ../lib/types/group.inc:176
+#: ../lib/types/netgroup.inc:106 ../lib/types/netgroup.inc:160
 msgid "New group"
 msgstr "新しいグループ"
 
-#: ../lib/types/host.inc:123 ../lib/modules/hostObject.inc:149
+#: ../lib/types/host.inc:108 ../lib/types/host.inc:163
+#: ../lib/modules/hostObject.inc:149
 msgid "New host"
 msgstr "新しいホスト"
 
@@ -4177,7 +4232,7 @@ msgstr "新しいホスト"
 msgid "New local address"
 msgstr "新しいローカルアドレス"
 
-#: ../templates/config/mainmanage.php:369
+#: ../templates/config/mainmanage.php:239
 msgid "New master password"
 msgstr "新しいマスタパスワード"
 
@@ -4190,15 +4245,15 @@ msgid "New object"
 msgstr "新しいオブジェクト"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:47
-#: ../templates/ou_edit.php:165 ../help/help.inc:203
+#: ../templates/ou_edit.php:177 ../help/help.inc:203
 msgid "New organizational unit"
 msgstr "新しい organizational unit"
 
-#: ../lib/modules/groupOfNames.inc:240
+#: ../lib/modules/groupOfNames.inc:251
 msgid "New owner"
 msgstr "新しい所有者"
 
-#: ../templates/config/confmain.php:541 ../lib/modules/posixAccount.inc:1695
+#: ../templates/config/confmain.php:364 ../lib/modules/posixAccount.inc:1683
 msgid "New password"
 msgstr "新しいパスワード"
 
@@ -4206,7 +4261,7 @@ msgstr "新しいパスワード"
 msgid "New password set successfully."
 msgstr "新しいパスワードが正しく設定されました。"
 
-#: ../lib/types/ppolicyType.inc:127
+#: ../lib/types/ppolicyType.inc:112 ../lib/types/ppolicyType.inc:145
 msgid "New policy"
 msgstr "新しいポリシー"
 
@@ -4223,15 +4278,15 @@ msgstr "新しい受信者"
 msgid "New required attributes:"
 msgstr "新しい必須属性"
 
-#: ../templates/pdfedit/pdfpage.php:558
+#: ../templates/pdfedit/pdfpage.php:535
 msgid "New section"
 msgstr "新しい部門"
 
-#: ../lib/types/sudo.inc:111
+#: ../lib/types/sudo.inc:96 ../lib/types/sudo.inc:150
 msgid "New sudo role"
 msgstr "新しいsudoロール"
 
-#: ../lib/types/user.inc:137
+#: ../lib/types/user.inc:114 ../lib/types/user.inc:197
 msgid "New user"
 msgstr "新しいユーザ"
 
@@ -4295,31 +4350,28 @@ msgstr "ニックネーム"
 
 #: ../templates/schema/schema.php:151 ../templates/schema/schema.php:193
 #: ../templates/schema/schema.php:198 ../templates/schema/schema.php:203
+#: ../lib/modules/imapAccess.inc:99
 msgid "No"
 msgstr "いいえ"
 
-#: ../lib/types/dhcp.inc:124
+#: ../lib/types/dhcp.inc:163
 msgid "No DHCPs found!"
 msgstr "DHCPが見つかりません!"
 
-#: ../lib/types/nisObjectType.inc:106
+#: ../lib/types/nisObjectType.inc:145
 msgid "No NIS objects found!"
 msgstr "NISオブジェクトが見つかりません!"
 
-#: ../lib/modules/sambaSamAccount.inc:589
-#: ../lib/modules/sambaSamAccount.inc:718
-#: ../lib/modules/sambaSamAccount.inc:1038
-#: ../lib/modules/sambaGroupMapping.inc:90
-#: ../lib/modules/sambaGroupMapping.inc:218
-#: ../lib/modules/sambaGroupMapping.inc:458
+#: ../lib/modules/sambaSamAccount.inc:1032
+#: ../lib/modules/sambaGroupMapping.inc:245
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "Samba 3グループがLDAPに存在しません。最初に一個作成してください。"
 
-#: ../lib/modules/posixAccount.inc:428 ../lib/modules/posixAccount.inc:909
+#: ../lib/modules/posixAccount.inc:430 ../lib/modules/posixAccount.inc:891
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "unixグループがLDAPに存在しません。最初に一個作成してください。"
 
-#: ../lib/types/mailAlias.inc:118 ../lib/types/alias.inc:118
+#: ../lib/types/mailAlias.inc:136 ../lib/types/alias.inc:136
 msgid "No aliases found!"
 msgstr "別名が見つかりません!"
 
@@ -4331,28 +4383,28 @@ msgstr "変更されませんでした。"
 msgid "No description"
 msgstr "説明なし"
 
-#: ../lib/types/smbDomain.inc:118
+#: ../lib/types/smbDomain.inc:157
 msgid "No domains found!"
 msgstr "ドメインが見つかりません!"
 
-#: ../lib/types/asteriskExt.inc:119
+#: ../lib/types/asteriskExt.inc:138
 msgid "No extension(s) found!"
 msgstr "拡張が見つかりません!"
 
-#: ../lib/modules/inetOrgPerson.inc:74
+#: ../lib/modules/inetOrgPerson.inc:77
 msgid "No file selected."
 msgstr "ファイルが選択されていません。"
 
-#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixAccount.inc:70
+#: ../lib/modules/posixGroup.inc:476 ../lib/modules/posixAccount.inc:72
 msgid "No free ID-Number!"
 msgstr "空いているID番号がありません!"
 
-#: ../lib/types/gon.inc:120 ../lib/types/group.inc:132
-#: ../lib/types/netgroup.inc:120
+#: ../lib/types/gon.inc:159 ../lib/types/group.inc:175
+#: ../lib/types/netgroup.inc:159
 msgid "No groups found!"
 msgstr "グループが見つかりません!"
 
-#: ../lib/types/host.inc:122
+#: ../lib/types/host.inc:162
 msgid "No hosts found!"
 msgstr "ホストが見つかりません!"
 
@@ -4360,20 +4412,20 @@ msgstr "ホストが見つかりません!"
 msgid "No internal attributes"
 msgstr "内部属性なし"
 
-#: ../templates/tests/lamdaemonTest.php:184
+#: ../templates/tests/lamdaemonTest.php:193
 msgid "No lamdaemon path set, please update your LAM configuration settings."
 msgstr "lamdaemonのパスがセットされていません。LAM構成設定を修正してください。"
 
-#: ../templates/tests/lamdaemonTest.php:105
-#: ../templates/tests/lamdaemonTest.php:180
+#: ../templates/tests/lamdaemonTest.php:95
+#: ../templates/tests/lamdaemonTest.php:188
 msgid "No lamdaemon server set, please update your LAM configuration settings."
 msgstr "lamdaemonサーバがセットされていません。LAM構成設定を修正してください。"
 
-#: ../templates/config/mainmanage.php:325
+#: ../templates/config/mainmanage.php:219
 msgid "No logging"
 msgstr "ロギング無し"
 
-#: ../templates/pdfedit/pdfpage.php:382
+#: ../templates/pdfedit/pdfpage.php:422
 msgid "No logo"
 msgstr "ロゴがありません"
 
@@ -4381,7 +4433,7 @@ msgstr "ロゴがありません"
 msgid "No objects found!"
 msgstr "オブジェクトが見つかりません!"
 
-#: ../templates/config/confmodules.php:383
+#: ../templates/config/confmodules.php:385
 msgid "No or more than one base module selected!"
 msgstr "ベースモジュールが選択されていないか、または複数が選択されています!"
 
@@ -4389,11 +4441,11 @@ msgstr "ベースモジュールが選択されていないか、または複数
 msgid "No password was entered!"
 msgstr "パスワードが入力されていません!"
 
-#: ../lib/types/ppolicyType.inc:126
+#: ../lib/types/ppolicyType.inc:144
 msgid "No policies found!"
 msgstr "ポリシーが見つかりません!"
 
-#: ../templates/tests/schemaTest.php:69
+#: ../templates/tests/schemaTest.php:68
 msgid "No problems found."
 msgstr "問題は発見されませんでした。"
 
@@ -4426,11 +4478,11 @@ msgstr "そのようなエントリはありません!"
 msgid "No such schema item: \"%s\""
 msgstr "そのようなスキーマアイテムはありません: \"%s\""
 
-#: ../lib/types/sudo.inc:110
+#: ../lib/types/sudo.inc:149
 msgid "No sudo roles found!"
 msgstr "sudoロールが見つかりません!"
 
-#: ../lib/types/user.inc:136
+#: ../lib/types/user.inc:196
 msgid "No users found!"
 msgstr "ユーザが見つかりません!"
 
@@ -4446,11 +4498,11 @@ msgstr ""
 "注意: この属性に対するあなたのLDAPサーバ上における比較ルールをセットしない場"
 "合、\"inappropriate matching\"エラーを受け取るでしょう。"
 
-#: ../templates/config/mainmanage.php:287
+#: ../templates/config/mainmanage.php:215
 msgid "Notice"
 msgstr "注"
 
-#: ../templates/delete.php:95
+#: ../templates/delete.php:90
 msgid "Number of child entries"
 msgstr "子エントリの数"
 
@@ -4500,8 +4552,7 @@ msgstr "OU はすでに存在しています!"
 msgid "OU deleted successfully."
 msgstr "OU は正しく削除されました。"
 
-#: ../templates/ou_edit.php:135 ../templates/ou_edit.php:161
-#: ../lib/tools/ouEditor.inc:44
+#: ../templates/ou_edit.php:149 ../lib/tools/ouEditor.inc:44
 msgid "OU editor"
 msgstr "OUエディタ"
 
@@ -4509,7 +4560,7 @@ msgstr "OUエディタ"
 msgid "OU is invalid!"
 msgstr "OU が正しくありません!"
 
-#: ../templates/ou_edit.php:119
+#: ../templates/ou_edit.php:128
 msgid "OU is not empty or invalid!"
 msgstr "OU が空白でないか不正!"
 
@@ -4532,35 +4583,35 @@ msgstr "Obsolete"
 msgid "Off"
 msgstr "Off"
 
-#: ../lib/modules/inetOrgPerson.inc:121 ../lib/modules/inetOrgPerson.inc:190
-#: ../lib/modules/inetOrgPerson.inc:399 ../lib/modules/inetOrgPerson.inc:431
-#: ../lib/modules/inetOrgPerson.inc:572 ../lib/modules/inetOrgPerson.inc:876
-#: ../lib/modules/inetOrgPerson.inc:1046 ../lib/modules/inetOrgPerson.inc:1481
+#: ../lib/modules/inetOrgPerson.inc:124 ../lib/modules/inetOrgPerson.inc:193
+#: ../lib/modules/inetOrgPerson.inc:402 ../lib/modules/inetOrgPerson.inc:434
+#: ../lib/modules/inetOrgPerson.inc:575 ../lib/modules/inetOrgPerson.inc:879
+#: ../lib/modules/inetOrgPerson.inc:1050 ../lib/modules/inetOrgPerson.inc:1485
 msgid "Office name"
 msgstr "事業所名"
 
 #: ../templates/tree/export_form.php:165
-#: ../templates/tests/lamdaemonTest.php:100 ../templates/ou_edit.php:172
-#: ../templates/ou_edit.php:188 ../templates/masscreate.php:195
+#: ../templates/tests/lamdaemonTest.php:90 ../templates/ou_edit.php:185
+#: ../templates/ou_edit.php:199 ../templates/masscreate.php:195
 #: ../templates/config/profmanage.php:382
-#: ../templates/config/mainmanage.php:396
+#: ../templates/config/mainmanage.php:252
 #: ../templates/config/conflogin.php:158 ../templates/config/conflogin.php:159
 #: ../templates/config/mainlogin.php:155
 #: ../templates/selfService/selfServiceLogin.php:240
 #: ../templates/selfService/profManage.php:285
 #: ../templates/selfService/adminLogin.php:152
 #: ../templates/selfService/adminLogin.php:153
-#: ../templates/selfService/adminMain.php:540
-#: ../templates/selfService/adminMain.php:583
-#: ../templates/profedit/profiledelete.php:82 ../lib/modules/device.inc:233
-#: ../lib/modules/device.inc:253 ../lib/modules/sambaSamAccount.inc:1336
-#: ../lib/modules/sambaSamAccount.inc:1452 ../lib/modules/zarafaUser.inc:749
+#: ../templates/selfService/adminMain.php:541
+#: ../templates/selfService/adminMain.php:584
+#: ../templates/profedit/profiledelete.php:91 ../lib/modules/device.inc:233
+#: ../lib/modules/device.inc:258 ../lib/modules/sambaSamAccount.inc:1329
+#: ../lib/modules/sambaSamAccount.inc:1445 ../lib/modules/zarafaUser.inc:749
 #: ../lib/modules/zarafaUser.inc:756 ../lib/modules/nisnetgroup.inc:468
 #: ../lib/modules/nisnetgroup.inc:478 ../lib/modules/asteriskExtension.inc:330
 #: ../lib/modules/aliasEntry.inc:141 ../lib/modules/aliasEntry.inc:161
-#: ../lib/modules/groupOfNames.inc:227 ../lib/modules/groupOfNames.inc:245
-#: ../lib/modules/groupOfNames.inc:333 ../lib/lists.inc:637
-#: ../lib/lists.inc:877 ../lib/modules.inc:1319
+#: ../lib/modules/imapAccess.inc:221 ../lib/modules/groupOfNames.inc:233
+#: ../lib/modules/groupOfNames.inc:257 ../lib/modules/groupOfNames.inc:357
+#: ../lib/lists.inc:645 ../lib/lists.inc:896 ../lib/modules.inc:1362
 msgid "Ok"
 msgstr "Ok"
 
@@ -4574,10 +4625,10 @@ msgstr "古い値"
 msgid "On"
 msgstr "On"
 
-#: ../lib/modules/sambaSamAccount.inc:220
-#: ../lib/modules/sambaSamAccount.inc:357
-#: ../lib/modules/sambaSamAccount.inc:1438
-#: ../lib/modules/sambaSamAccount.inc:1718
+#: ../lib/modules/sambaSamAccount.inc:225
+#: ../lib/modules/sambaSamAccount.inc:362
+#: ../lib/modules/sambaSamAccount.inc:1431
+#: ../lib/modules/sambaSamAccount.inc:1711
 msgid "On broken or timed out connection"
 msgstr "破棄された、またはタイムアウトした接続"
 
@@ -4599,8 +4650,8 @@ msgstr "任意属性"
 msgid "Optional binary attributes"
 msgstr "任意バイナリ属性"
 
-#: ../templates/lists/changePassword.php:171 ../lib/types/sudo.inc:83
-#: ../lib/modules/zarafaGroup.inc:179 ../lib/modules/posixAccount.inc:176
+#: ../templates/lists/changePassword.php:217 ../lib/types/sudo.inc:83
+#: ../lib/modules/zarafaGroup.inc:179 ../lib/modules/posixAccount.inc:178
 #: ../lib/modules/zarafaUser.inc:481 ../lib/modules/sudoRole.inc:83
 #: ../lib/modules/sudoRole.inc:112 ../lib/modules/sudoRole.inc:164
 #: ../lib/modules/sudoRole.inc:178 ../lib/modules/sudoRole.inc:187
@@ -4611,7 +4662,7 @@ msgstr "任意バイナリ属性"
 #: ../lib/modules/asteriskVoicemail.inc:133
 #: ../lib/modules/asteriskVoicemail.inc:181
 #: ../lib/modules/asteriskVoicemail.inc:273
-#: ../lib/modules/asteriskVoicemail.inc:394
+#: ../lib/modules/asteriskVoicemail.inc:414
 msgid "Options"
 msgstr "オプション"
 
@@ -4644,7 +4695,7 @@ msgstr "Organizational units"
 msgid "Organizational units contains an invalid entry."
 msgstr "Organizational unitsに不正な値が含まれています。"
 
-#: ../templates/config/confmain.php:452
+#: ../templates/config/confmain.php:309
 msgid "Other"
 msgstr "その他"
 
@@ -4653,7 +4704,7 @@ msgstr "その他"
 msgid "Output may contain HTML"
 msgstr "出力はHTMLを含みます。"
 
-#: ../lib/modules/customScripts.inc:416
+#: ../lib/modules/customScripts.inc:407
 #, php-format
 msgid "Output of command \"%s\" with return code %s"
 msgstr "コマンド \"%s\" の出力とリターンコード %s"
@@ -4662,13 +4713,13 @@ msgstr "コマンド \"%s\" の出力とリターンコード %s"
 msgid "Override default quota settings."
 msgstr "デフォルトのquota設定を上書き。"
 
-#: ../templates/config/confmain.php:444 ../lib/types/gon.inc:94
+#: ../templates/config/confmain.php:301 ../lib/types/gon.inc:94
 #: ../lib/modules/device.inc:62 ../lib/modules/device.inc:91
 #: ../lib/modules/device.inc:111 ../lib/modules/device.inc:176
-#: ../lib/modules/device.inc:183 ../lib/modules/device.inc:371
+#: ../lib/modules/device.inc:183 ../lib/modules/device.inc:376
 #: ../lib/modules/groupOfNames.inc:68 ../lib/modules/groupOfNames.inc:97
-#: ../lib/modules/groupOfNames.inc:113 ../lib/modules/groupOfNames.inc:147
-#: ../lib/modules/groupOfNames.inc:162 ../lib/modules/groupOfNames.inc:431
+#: ../lib/modules/groupOfNames.inc:113 ../lib/modules/groupOfNames.inc:153
+#: ../lib/modules/groupOfNames.inc:168 ../lib/modules/groupOfNames.inc:455
 msgid "Owner"
 msgstr "所有者"
 
@@ -4681,11 +4732,12 @@ msgstr "P-Node (0x02)"
 msgid "PC name"
 msgstr "PCの名前"
 
-#: ../templates/pdfedit/pdfmain.php:115 ../lib/tools/pdfEdit.inc:44
+#: ../templates/pdfedit/pdfpage.php:438 ../templates/pdfedit/pdfmain.php:115
+#: ../lib/tools/pdfEdit.inc:44
 msgid "PDF editor"
 msgstr "PDFエディタ"
 
-#: ../lib/lists.inc:601
+#: ../lib/lists.inc:623 ../help/help.inc:160
 msgid "PDF structure"
 msgstr "PDF構成"
 
@@ -4693,11 +4745,11 @@ msgstr "PDF構成"
 msgid "PDF structure name not valid"
 msgstr "PDF構成名が正しくありません"
 
-#: ../templates/pdfedit/pdfmain.php:119
+#: ../templates/pdfedit/pdfmain.php:118
 msgid "PDF structure was successfully saved."
 msgstr "PDF構成を保存しました。"
 
-#: ../lib/modules/sambaSamAccount.inc:526
+#: ../lib/modules/sambaSamAccount.inc:531
 msgid "Pacific Time (US & Canada)"
 msgstr "Pacific Time (US & Canada)"
 
@@ -4710,7 +4762,7 @@ msgstr ""
 "れます。デフォルトゲートウェイは、これらのパケットを宛先のネットワークに転送"
 "します。"
 
-#: ../templates/selfService/adminMain.php:444 ../help/help.inc:180
+#: ../templates/selfService/adminMain.php:445 ../help/help.inc:180
 msgid "Page header"
 msgstr "ページヘッダ"
 
@@ -4718,7 +4770,7 @@ msgstr "ページヘッダ"
 #: ../lib/modules/asteriskVoicemail.inc:132
 #: ../lib/modules/asteriskVoicemail.inc:175
 #: ../lib/modules/asteriskVoicemail.inc:267
-#: ../lib/modules/asteriskVoicemail.inc:392
+#: ../lib/modules/asteriskVoicemail.inc:406
 msgid "Pager"
 msgstr "ページャ"
 
@@ -4730,23 +4782,23 @@ msgstr "アスタリスク・ボイスメールのページャ番号"
 msgid "Parent to"
 msgstr "派生先"
 
-#: ../templates/lists/changePassword.php:226 ../templates/login.php:296
+#: ../templates/lists/changePassword.php:272 ../templates/login.php:296
 #: ../templates/selfService/selfServiceLogin.php:226
 #: ../lib/modules/asteriskAccount.inc:95
-#: ../lib/modules/asteriskAccount.inc:154 ../lib/modules/posixGroup.inc:200
-#: ../lib/modules/posixGroup.inc:477 ../lib/modules/sambaSamAccount.inc:395
-#: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:76
-#: ../lib/modules/posixAccount.inc:141 ../lib/modules/posixAccount.inc:243
-#: ../lib/modules/posixAccount.inc:306 ../lib/modules/posixAccount.inc:368
-#: ../lib/modules/posixAccount.inc:1006 ../lib/modules/posixAccount.inc:1174
+#: ../lib/modules/asteriskAccount.inc:154 ../lib/modules/posixGroup.inc:193
+#: ../lib/modules/posixGroup.inc:473 ../lib/modules/sambaSamAccount.inc:400
+#: ../lib/modules/posixAccount.inc:77 ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:143 ../lib/modules/posixAccount.inc:245
+#: ../lib/modules/posixAccount.inc:308 ../lib/modules/posixAccount.inc:370
+#: ../lib/modules/posixAccount.inc:988 ../lib/modules/posixAccount.inc:1155
 #: ../lib/modules/asteriskVoicemail.inc:90
-#: ../lib/modules/asteriskVoicemail.inc:156 ../lib/modules.inc:1307
-#: ../help/help.inc:160
+#: ../lib/modules/asteriskVoicemail.inc:156 ../lib/modules.inc:1333
+#: ../help/help.inc:158
 msgid "Password"
 msgstr "パスワード"
 
-#: ../lib/modules/sambaSamAccount.inc:267
-#: ../lib/modules/sambaSamAccount.inc:1080
+#: ../lib/modules/sambaSamAccount.inc:272
+#: ../lib/modules/sambaSamAccount.inc:1074
 msgid "Password change at next login"
 msgstr "次回のログインでパスワードを変更"
 
@@ -4761,8 +4813,8 @@ msgstr "パスワードの変更が必要です"
 msgid "Password change requires old password"
 msgstr "パスワード変更には古いパスワードが必要です"
 
-#: ../lib/modules/posixGroup.inc:477 ../lib/modules/sambaSamAccount.inc:92
-#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixGroup.inc:473 ../lib/modules/sambaSamAccount.inc:97
+#: ../lib/modules/posixAccount.inc:78 ../lib/modules/posixAccount.inc:79
 msgid ""
 "Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and #*,.;:_-+!%&/|?{[()]}=@$ !"
@@ -4770,11 +4822,11 @@ msgstr ""
 "パスワードに不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, #*,.;:_-"
 "+!$%&/|?{[()]}=@$ です!"
 
-#: ../lib/modules/sambaSamAccount.inc:252
-#: ../lib/modules/sambaSamAccount.inc:255
-#: ../lib/modules/sambaSamAccount.inc:417
-#: ../lib/modules/sambaSamAccount.inc:1070
-#: ../lib/modules/sambaSamAccount.inc:1477
+#: ../lib/modules/sambaSamAccount.inc:257
+#: ../lib/modules/sambaSamAccount.inc:260
+#: ../lib/modules/sambaSamAccount.inc:422
+#: ../lib/modules/sambaSamAccount.inc:1064
+#: ../lib/modules/sambaSamAccount.inc:1470
 msgid "Password does not expire"
 msgstr "無期限のパスワード"
 
@@ -4793,10 +4845,10 @@ msgstr "パスワード有効期限は自然数または-1でなければなり
 msgid "Password for voicemail mailbox."
 msgstr "ボイスメール・メールボックスのパスワード"
 
-#: ../lib/modules/posixGroup.inc:417 ../lib/modules/posixGroup.inc:441
-#: ../lib/modules/posixAccount.inc:145 ../lib/modules/posixAccount.inc:178
-#: ../lib/modules/posixAccount.inc:323 ../lib/modules/inetOrgPerson.inc:223
-#: ../lib/modules/inetOrgPerson.inc:584
+#: ../lib/modules/posixGroup.inc:409 ../lib/modules/posixGroup.inc:437
+#: ../lib/modules/posixAccount.inc:147 ../lib/modules/posixAccount.inc:180
+#: ../lib/modules/posixAccount.inc:325 ../lib/modules/inetOrgPerson.inc:226
+#: ../lib/modules/inetOrgPerson.inc:587
 msgid "Password hash type"
 msgstr "パスワードハッシュ形式"
 
@@ -4808,7 +4860,7 @@ msgstr "パスワードハッシュ形式"
 msgid "Password history length"
 msgstr "パスワード履歴の長さ"
 
-#: ../templates/config/confmain.php:481
+#: ../templates/config/confmain.php:333
 msgid "Password mail settings"
 msgstr "パスワード・メール設定"
 
@@ -4831,6 +4883,10 @@ msgstr "パスワードの最長寿命は最短寿命より大きくなければ
 msgid "Password minimum age must be are natural number."
 msgstr "パスワード寿命の最小値は自然数でなければなりません。"
 
+#: ../lib/modules/imapAccess.inc:81 ../lib/modules/imapAccess.inc:216
+msgid "Password of IMAP admin user"
+msgstr "IMAP管理ユーザーのパスワード"
+
 #: ../lib/types/ppolicyType.inc:39
 msgid "Password policies"
 msgstr "パスワードポリシー"
@@ -4839,12 +4895,12 @@ msgstr "パスワードポリシー"
 msgid "Password policies (ppolicy)"
 msgstr "パスワードポリシー"
 
-#: ../templates/config/mainmanage.php:239 ../lib/modules/ppolicyUser.inc:38
+#: ../templates/config/mainmanage.php:209 ../lib/modules/ppolicyUser.inc:38
 #: ../lib/modules/ppolicyUser.inc:48 ../lib/modules/ppolicyUser.inc:60
 #: ../lib/modules/ppolicyUser.inc:76 ../lib/modules/ppolicyUser.inc:112
 #: ../lib/modules/ppolicyUser.inc:203 ../lib/modules/ppolicyUser.inc:231
 #: ../lib/modules/ppolicy.inc:54 ../lib/modules/sambaDomain.inc:259
-#: ../help/help.inc:142
+#: ../help/help.inc:140
 msgid "Password policy"
 msgstr "パスワードポリシー"
 
@@ -4865,7 +4921,7 @@ msgstr "パスワード警告"
 msgid "Password warning must be are natural number."
 msgstr "パスワード警告期限は自然数でなければなりません。"
 
-#: ../templates/config/confmain.php:640 ../lib/modules.inc:1351
+#: ../templates/config/confmain.php:461 ../lib/modules.inc:1394
 msgid "Passwords are different!"
 msgstr "パスワードが異なっています!"
 
@@ -4873,11 +4929,11 @@ msgstr "パスワードが異なっています!"
 msgid "Path"
 msgstr "パス"
 
-#: ../lib/modules/sambaSamAccount.inc:331
+#: ../lib/modules/sambaSamAccount.inc:336
 msgid "Path of the user profile."
 msgstr "ユーザープロファイルのパス。"
 
-#: ../lib/modules/sambaSamAccount.inc:282
+#: ../lib/modules/sambaSamAccount.inc:287
 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."
@@ -4885,7 +4941,7 @@ msgstr ""
 "ユーザプロファイルのパス。ローカル絶対パス、または、UNCパス(\\\\サーバ\\共"
 "有)。 $use と $group はユーザとグループ名に置き換えられます。"
 
-#: ../templates/config/confmain.php:412
+#: ../templates/config/confmain.php:292
 msgid "Path to external script"
 msgstr "外部スクリプトのパス"
 
@@ -4897,17 +4953,17 @@ msgstr "DNS更新キーのパス"
 msgid "Permanently delete all children, too?"
 msgstr "全ての下位ツリーも削除しますか?"
 
-#: ../lib/modules/inetOrgPerson.inc:93
+#: ../lib/modules/inetOrgPerson.inc:96
 msgid "Personal"
 msgstr "Personal"
 
-#: ../lib/types/user.inc:102 ../lib/types/user.inc:219
-#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:1504
-#: ../lib/modules/inetOrgPerson.inc:1511
+#: ../lib/types/user.inc:102 ../lib/types/user.inc:279
+#: ../lib/modules/inetOrgPerson.inc:122 ../lib/modules/inetOrgPerson.inc:1508
+#: ../lib/modules/inetOrgPerson.inc:1515
 msgid "Photo"
 msgstr "写真"
 
-#: ../lib/modules/inetOrgPerson.inc:1009
+#: ../lib/modules/inetOrgPerson.inc:1002
 msgid "Photo file (JPG format)"
 msgstr "写真ファイル(JPGフォーマット)"
 
@@ -4927,19 +4983,15 @@ msgstr ""
 msgid "Please add at least one member."
 msgstr "一つ以上のメンバーを追加してください。"
 
-#: ../lib/modules/sambaSamAccount.inc:1032
+#: ../lib/modules/sambaSamAccount.inc:1026
 msgid "Please check your settings on the Unix page!"
 msgstr "Unixページの設定を確認してください!"
 
-#: ../templates/delete.php:83
-msgid "Please confirm:"
-msgstr "確認してください:"
-
 #: ../lib/modules/phpGroupwareUser.inc:134
 msgid "Please enter \"active\" or \"inactive\"."
 msgstr "\"active\"または\"inactive\"を入力してください!"
 
-#: ../lib/modules/sambaSamAccount.inc:93
+#: ../lib/modules/sambaSamAccount.inc:98
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "特殊アカウントのRID番号または名前を入力してください。"
 
@@ -4947,7 +4999,13 @@ msgstr "特殊アカウントのRID番号または名前を入力してくださ
 msgid "Please enter a caller ID."
 msgstr "発信者番号を入力してください。"
 
-#: ../lib/modules/sambaSamAccount.inc:90 ../lib/modules/sambaSamAccount.inc:91
+#: ../lib/modules/imapAccess.inc:88
+msgid ""
+"Please enter a comma separated list of domain names (e.g. \"company.com,"
+"example.com\"). LAM will only manage mailboxes from these domains."
+msgstr "カンマで区切られたドメインのリストを入力してください(例 \"example.org,example.com\")。LAMはこれらのドメインのメールボックスだけを管理します。"
+
+#: ../lib/modules/sambaSamAccount.inc:95 ../lib/modules/sambaSamAccount.inc:96
 msgid "Please enter a comma separated list of host names!"
 msgstr "カンマで区切られたホスト名を入力してください!"
 
@@ -4955,6 +5013,10 @@ msgstr "カンマで区切られたホスト名を入力してください!"
 msgid "Please enter a common name."
 msgstr "名称を入力してください!"
 
+#: ../lib/modules/imapAccess.inc:134
+msgid "Please enter a correct list of valid mail domains."
+msgstr "有効な電子メール・ドメインのリストを入力してください。"
+
 #: ../lib/modules/nisObject.inc:55 ../lib/modules/sudoRole.inc:56
 msgid "Please enter a descriptive name for this entry."
 msgstr "このエントリに対する記述名を入力できます。"
@@ -5026,29 +5088,30 @@ msgstr "ユーザー・パスワードを入力してください。"
 msgid "Please enter a valid DN in the field:"
 msgstr "このフィールドに正しいDNを入力してください:"
 
-#: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:76
+#: ../lib/modules/inetOrgPerson.inc:78 ../lib/modules/inetOrgPerson.inc:79
 msgid "Please enter a valid business category!"
 msgstr "正しい業種を入力してください!"
 
-#: ../lib/modules/posixAccount.inc:95 ../lib/modules/posixAccount.inc:96
-#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:69
+#: ../lib/modules/posixAccount.inc:97 ../lib/modules/posixAccount.inc:98
+#: ../lib/modules/inetOrgPerson.inc:71 ../lib/modules/inetOrgPerson.inc:72
 msgid "Please enter a valid common name!"
 msgstr "正しい名称を入力してください!"
 
-#: ../lib/modules/sambaSamAccount.inc:101
+#: ../lib/modules/sambaSamAccount.inc:106
 msgid "Please enter a valid date in format DD-MM-YYYY."
 msgstr "正しい日付をDD-MM-YYYYの形式で入力してください!"
 
-#: ../lib/modules/sambaSamAccount.inc:95 ../lib/modules/sambaSamAccount.inc:96
+#: ../lib/modules/sambaSamAccount.inc:100
+#: ../lib/modules/sambaSamAccount.inc:101
 msgid "Please enter a valid display name!"
 msgstr "正しい表示名(display name)を入力してください!"
 
-#: ../lib/modules/sambaSamAccount.inc:102
+#: ../lib/modules/sambaSamAccount.inc:107
 msgid "Please enter a valid drive letter."
 msgstr "正しいドライブ文字を入力してください!"
 
 #: ../lib/modules/zarafaGroup.inc:137 ../lib/modules/zarafaGroup.inc:138
-#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:57
+#: ../lib/modules/inetOrgPerson.inc:59 ../lib/modules/inetOrgPerson.inc:60
 msgid "Please enter a valid email address!"
 msgstr "正しい電子メールアドレスを入力してください!"
 
@@ -5056,15 +5119,15 @@ msgstr "正しい電子メールアドレスを入力してください!"
 msgid "Please enter a valid email alias."
 msgstr "有効な電子メールアドレスを入力してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:67
+#: ../lib/modules/inetOrgPerson.inc:69 ../lib/modules/inetOrgPerson.inc:70
 msgid "Please enter a valid employee type!"
 msgstr "正しい雇用形態を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:55
+#: ../lib/modules/inetOrgPerson.inc:57 ../lib/modules/inetOrgPerson.inc:58
 msgid "Please enter a valid fax number!"
 msgstr "正しいファクス番号を入力してください!"
 
-#: ../lib/lists.inc:218
+#: ../lib/lists.inc:222
 msgid ""
 "Please enter a valid filter. Only letters, numbers and \" _*$.-\" are "
 "allowed."
@@ -5072,11 +5135,11 @@ msgstr ""
 "有効なフィルターを入力してください。アルファベット、数字と\" _*$.-\" のみが使"
 "用できます。"
 
-#: ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/sambaSamAccount.inc:111
 msgid "Please enter a valid group name!"
 msgstr "正しいグループ名を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:65
+#: ../lib/modules/inetOrgPerson.inc:67 ../lib/modules/inetOrgPerson.inc:68
 msgid "Please enter a valid job title!"
 msgstr "正しい役職を入力してください!"
 
@@ -5088,7 +5151,7 @@ msgstr "正しい所属リストを入力してください。"
 msgid "Please enter a valid list of host names."
 msgstr "正しいホスト名リストを入力してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:53
+#: ../lib/modules/inetOrgPerson.inc:55 ../lib/modules/inetOrgPerson.inc:56
 msgid "Please enter a valid mobile number!"
 msgstr "正しい携帯電話番号を入力してください!"
 
@@ -5101,11 +5164,11 @@ msgstr "正しいパスを入力してください。"
 msgid "Please enter a valid port number."
 msgstr "有効なポート番号を入力してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:61
+#: ../lib/modules/inetOrgPerson.inc:63 ../lib/modules/inetOrgPerson.inc:64
 msgid "Please enter a valid postal address!"
 msgstr "正しい住所を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:63
+#: ../lib/modules/inetOrgPerson.inc:65 ../lib/modules/inetOrgPerson.inc:66
 msgid "Please enter a valid postal code!"
 msgstr "正しい郵便番号を入力してください!"
 
@@ -5117,21 +5180,25 @@ msgstr "正しい主務所属を入力してください。"
 msgid "Please enter a valid scoped affiliation."
 msgstr "正しい兼務所属を入力してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:59
+#: ../lib/modules/imapAccess.inc:133
+msgid "Please enter a valid server name where the mailboxes reside."
+msgstr "メールボックスが存在する有効なサーバー名を入力してください。"
+
+#: ../lib/modules/inetOrgPerson.inc:61 ../lib/modules/inetOrgPerson.inc:62
 msgid "Please enter a valid street name!"
 msgstr "正しい町名(street name)を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:48 ../lib/modules/inetOrgPerson.inc:49
-#: ../lib/modules/inetOrgPerson.inc:50 ../lib/modules/inetOrgPerson.inc:51
+#: ../lib/modules/inetOrgPerson.inc:51 ../lib/modules/inetOrgPerson.inc:52
+#: ../lib/modules/inetOrgPerson.inc:53 ../lib/modules/inetOrgPerson.inc:54
 msgid "Please enter a valid telephone number!"
 msgstr "正しい電話番号を入力してください!"
 
-#: ../lib/modules/posixGroup.inc:584 ../lib/modules/posixAccount.inc:751
+#: ../lib/modules/posixGroup.inc:575 ../lib/modules/posixAccount.inc:736
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "%s と %s の間の値を入力してください!"
 
-#: ../lib/modules/kolabUser.inc:270
+#: ../lib/modules/kolabUser.inc:270 ../lib/modules/imapAccess.inc:157
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "このページに対するメールアドレスを入力してください。: %s"
@@ -5168,7 +5235,7 @@ msgstr "ユーザー名にはASCII文字だけを入力してください。"
 msgid "Please enter the IP address of your DNS server."
 msgstr "DNSサーバーのIPアドレスを入力してください。"
 
-#: ../help/help.inc:115
+#: ../help/help.inc:113
 msgid ""
 "Please enter the LDAP suffix where LAM should start to search for users. The "
 "LDAP filter needs to match the given user name to exactly one DN. The value "
@@ -5182,7 +5249,7 @@ msgstr ""
 msgid "Please enter the account context."
 msgstr "アカウント・コンテキストを入力してください。"
 
-#: ../lib/modules.inc:1202
+#: ../lib/modules.inc:1210
 msgid "Please enter the account information on the other pages first."
 msgstr "最初に、他のページでアカウント情報を入力してください。"
 
@@ -5244,7 +5311,7 @@ msgstr ""
 msgid "Please enter the mapping name for this entry (e.g. auto.home)."
 msgstr "このエントリに対するマッピング名を入力してください(例 auto.home)。"
 
-#: ../help/help.inc:131
+#: ../help/help.inc:129
 msgid ""
 "Please enter the master configuration password. This is NOT your LDAP "
 "password. It is stored in your config.cfg file. If this is the first time "
@@ -5259,7 +5326,7 @@ msgid "Please enter the master password to change the general preferences:"
 msgstr ""
 "総合プリファレンスを変更するためのマスターパスワードを入力してください:"
 
-#: ../help/help.inc:119
+#: ../help/help.inc:117
 msgid ""
 "Please enter the name of the new profile and the password to change its "
 "settings. Profile names may contain letters, numbers and -/_."
@@ -5267,7 +5334,7 @@ msgstr ""
 "その設定を変更するための新しいプロファイル名とパスワードを入力。プロファイル"
 "名にはアルファベット、数字と -/_ が使用できます。"
 
-#: ../help/help.inc:121
+#: ../help/help.inc:119
 msgid ""
 "Please enter the new name of the profile. The name may contain letters, "
 "numbers and -/_."
@@ -5275,11 +5342,11 @@ msgstr ""
 "新しいプロファイル名を入力。名前にはアルファベット、数字と -/_ が使用できま"
 "す。"
 
-#: ../lib/modules/asteriskAccount.inc:96 ../lib/modules/posixAccount.inc:369
+#: ../lib/modules/asteriskAccount.inc:96 ../lib/modules/posixAccount.inc:371
 msgid "Please enter the password which you want to set for this account."
 msgstr "このアカウントに対するパスワードを入力してください。"
 
-#: ../help/help.inc:161
+#: ../help/help.inc:159
 msgid ""
 "Please enter the password which you want to set for this account. You may "
 "also generate a random password (12 characters) which will be displayed on "
@@ -5288,7 +5355,7 @@ msgstr ""
 "このアカウントに対するパスワードを入力してください。ランダムなパスワード(12文"
 "字)を生成して画面に表示すること模できます。"
 
-#: ../lib/modules/posixAccount.inc:340
+#: ../lib/modules/posixAccount.inc:342
 msgid "Please enter the path to the user's home directory."
 msgstr "ユーザのホームディレクトリを入力してください。"
 
@@ -5312,12 +5379,12 @@ msgstr ""
 "このマウントポイントに対するクォータ設定を入力してください。書式は {soft "
 "block limit},{hard block limit},{soft inode limit},{hard inode limit} です。"
 
-#: ../templates/lists/changePassword.php:290
-#: ../lib/modules/posixAccount.inc:75
+#: ../templates/lists/changePassword.php:349
+#: ../lib/modules/posixAccount.inc:77
 msgid "Please enter the same password in both password fields."
 msgstr "両方のパスワードフィールドに同じパスワードを入力してください。"
 
-#: ../lib/modules/sambaSamAccount.inc:343
+#: ../lib/modules/sambaSamAccount.inc:348
 msgid "Please enter the time limit in minutes. 0 means unlimited."
 msgstr "制限時間を分単位で入力してください。0は無制限を意味します。"
 
@@ -5341,7 +5408,7 @@ msgstr "SSH公開鍵を入力してください。"
 msgid "Please fill out the DHCP settings first."
 msgstr "最初にDHCP設定を記入してください。"
 
-#: ../templates/masscreate.php:211
+#: ../templates/masscreate.php:232
 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 "
@@ -5351,18 +5418,18 @@ msgstr ""
 "子が記入されていなくてはなりません。後に続く行は、各々の行が一つのアカウント"
 "になります。"
 
-#: ../templates/massBuildAccounts.php:209
+#: ../templates/massBuildAccounts.php:210
 msgid "Please provide a file to upload."
 msgstr "アップロードするファイルを指定してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:545
+#: ../lib/modules/inetOrgPerson.inc:548
 msgid ""
 "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr ""
 "アップロードする画像ファイルを選択してください。画像はJPGフォーマット\n"
 "(.jpg/.jpeg)でなくてはなりません。"
 
-#: ../help/help.inc:137
+#: ../help/help.inc:135
 msgid ""
 "Please select your prefered log level. Messages with a lower level will not "
 "be logged."
@@ -5376,7 +5443,7 @@ msgstr ""
 "\"パスワードを設定\"を選択したら、保存前にボイスメール・パスワードを入力して"
 "ください。"
 
-#: ../lib/modules.inc:1157
+#: ../lib/modules.inc:1165
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "ページ %s の必須属性を全て設定してください。"
@@ -5398,43 +5465,42 @@ msgstr ""
 msgid "Policy list has invalid format!"
 msgstr "ポリシーリストの形式が不正です!"
 
-#: ../templates/pdfedit/pdfpage.php:573 ../templates/pdfedit/pdfpage.php:590
-#: ../templates/pdfedit/pdfpage.php:618 ../templates/pdfedit/pdfpage.php:656
+#: ../templates/pdfedit/pdfpage.php:539 ../templates/pdfedit/pdfpage.php:549
+#: ../templates/pdfedit/pdfpage.php:559 ../templates/pdfedit/pdfpage.php:574
 msgid "Position"
 msgstr "位置"
 
-#: ../templates/masscreate.php:260 ../templates/masscreate.php:369
-#: ../lib/modules/customScripts.inc:112 ../lib/modules/customScripts.inc:114
-#: ../lib/modules/customScripts.inc:116
-#: ../lib/modules/sambaGroupMapping.inc:427
+#: ../templates/masscreate.php:270 ../lib/modules/customScripts.inc:112
+#: ../lib/modules/customScripts.inc:114 ../lib/modules/customScripts.inc:116
+#: ../lib/modules/sambaGroupMapping.inc:442
 msgid "Possible values"
 msgstr "候補となる値"
 
-#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:180
-#: ../lib/modules/inetOrgPerson.inc:311 ../lib/modules/inetOrgPerson.inc:416
-#: ../lib/modules/inetOrgPerson.inc:508 ../lib/modules/inetOrgPerson.inc:509
-#: ../lib/modules/inetOrgPerson.inc:851 ../lib/modules/inetOrgPerson.inc:1031
-#: ../lib/modules/inetOrgPerson.inc:1446
+#: ../lib/modules/inetOrgPerson.inc:122 ../lib/modules/inetOrgPerson.inc:183
+#: ../lib/modules/inetOrgPerson.inc:314 ../lib/modules/inetOrgPerson.inc:419
+#: ../lib/modules/inetOrgPerson.inc:511 ../lib/modules/inetOrgPerson.inc:512
+#: ../lib/modules/inetOrgPerson.inc:854 ../lib/modules/inetOrgPerson.inc:1035
+#: ../lib/modules/inetOrgPerson.inc:1450
 msgid "Post office box"
 msgstr "私書箱"
 
-#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:118
-#: ../lib/modules/inetOrgPerson.inc:188 ../lib/modules/inetOrgPerson.inc:303
-#: ../lib/modules/inetOrgPerson.inc:428 ../lib/modules/inetOrgPerson.inc:516
-#: ../lib/modules/inetOrgPerson.inc:871 ../lib/modules/inetOrgPerson.inc:1033
-#: ../lib/modules/inetOrgPerson.inc:1432
+#: ../lib/modules/inetOrgPerson.inc:63 ../lib/modules/inetOrgPerson.inc:121
+#: ../lib/modules/inetOrgPerson.inc:191 ../lib/modules/inetOrgPerson.inc:306
+#: ../lib/modules/inetOrgPerson.inc:431 ../lib/modules/inetOrgPerson.inc:519
+#: ../lib/modules/inetOrgPerson.inc:874 ../lib/modules/inetOrgPerson.inc:1037
+#: ../lib/modules/inetOrgPerson.inc:1436
 msgid "Postal address"
 msgstr "住所"
 
-#: ../lib/modules/inetOrgPerson.inc:517
+#: ../lib/modules/inetOrgPerson.inc:520
 msgid "Postal address, city"
 msgstr "住所、区市町村"
 
-#: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:119
-#: ../lib/modules/inetOrgPerson.inc:182 ../lib/modules/inetOrgPerson.inc:295
-#: ../lib/modules/inetOrgPerson.inc:419 ../lib/modules/inetOrgPerson.inc:512
-#: ../lib/modules/inetOrgPerson.inc:513 ../lib/modules/inetOrgPerson.inc:856
-#: ../lib/modules/inetOrgPerson.inc:1032 ../lib/modules/inetOrgPerson.inc:1439
+#: ../lib/modules/inetOrgPerson.inc:65 ../lib/modules/inetOrgPerson.inc:122
+#: ../lib/modules/inetOrgPerson.inc:185 ../lib/modules/inetOrgPerson.inc:298
+#: ../lib/modules/inetOrgPerson.inc:422 ../lib/modules/inetOrgPerson.inc:515
+#: ../lib/modules/inetOrgPerson.inc:516 ../lib/modules/inetOrgPerson.inc:859
+#: ../lib/modules/inetOrgPerson.inc:1036 ../lib/modules/inetOrgPerson.inc:1443
 msgid "Postal code"
 msgstr "郵便番号"
 
@@ -5442,7 +5508,11 @@ msgstr "郵便番号"
 msgid "Predefined values"
 msgstr "あらかじめ定義された値"
 
-#: ../lib/modules/inetOrgPerson.inc:257
+#: ../lib/modules/imapAccess.inc:84 ../lib/modules/imapAccess.inc:108
+msgid "Prefix for mailboxes"
+msgstr "メールボックスのプリフィックス"
+
+#: ../lib/modules/inetOrgPerson.inc:260
 msgid "President"
 msgstr "社長"
 
@@ -5452,12 +5522,12 @@ msgstr "社長"
 msgid "Primary affiliation"
 msgstr "主たる所属"
 
-#: ../lib/modules/posixGroup.inc:491 ../lib/modules/posixAccount.inc:208
-#: ../lib/modules/posixAccount.inc:282 ../lib/modules/posixAccount.inc:301
-#: ../lib/modules/posixAccount.inc:331 ../lib/modules/posixAccount.inc:360
-#: ../lib/modules/posixAccount.inc:398 ../lib/modules/posixAccount.inc:973
-#: ../lib/modules/posixAccount.inc:1097 ../lib/modules/posixAccount.inc:1120
-#: ../lib/modules/posixAccount.inc:1168
+#: ../lib/modules/posixGroup.inc:487 ../lib/modules/posixAccount.inc:210
+#: ../lib/modules/posixAccount.inc:284 ../lib/modules/posixAccount.inc:303
+#: ../lib/modules/posixAccount.inc:333 ../lib/modules/posixAccount.inc:362
+#: ../lib/modules/posixAccount.inc:400 ../lib/modules/posixAccount.inc:955
+#: ../lib/modules/posixAccount.inc:1078 ../lib/modules/posixAccount.inc:1101
+#: ../lib/modules/posixAccount.inc:1149
 msgid "Primary group"
 msgstr "プライマリグループ"
 
@@ -5477,7 +5547,7 @@ msgstr "プリンシパル名"
 msgid "Principal name is invalid!"
 msgstr "プリンシパル名が正しくありません!"
 
-#: ../lib/types/asteriskExt.inc:93 ../lib/modules/asteriskExtension.inc:90
+#: ../lib/types/asteriskExt.inc:94 ../lib/modules/asteriskExtension.inc:90
 #: ../lib/modules/asteriskExtension.inc:113
 #: ../lib/modules/asteriskExtension.inc:126
 #: ../lib/modules/asteriskExtension.inc:142
@@ -5486,7 +5556,7 @@ msgstr "プリンシパル名が正しくありません!"
 msgid "Priority"
 msgstr "優先度"
 
-#: ../lib/modules/inetOrgPerson.inc:549
+#: ../lib/modules/inetOrgPerson.inc:552
 msgid "Private telephone number"
 msgstr "私用の電話番号"
 
@@ -5495,16 +5565,17 @@ msgstr "私用の電話番号"
 msgid "Profile deleted."
 msgstr "プロファイルが削除されました。"
 
-#: ../templates/profedit/profilemain.php:105 ../lib/tools/profileEditor.inc:44
+#: ../templates/profedit/profilepage.php:171
+#: ../templates/profedit/profilemain.php:104 ../lib/tools/profileEditor.inc:44
 msgid "Profile editor"
 msgstr "プロファイルエディタ"
 
 #: ../templates/config/profmanage.php:52
 #: ../templates/config/profmanage.php:195
 #: ../templates/selfService/profManage.php:38
-#: ../templates/selfService/profManage.php:157 ../help/help.inc:118
-#: ../help/help.inc:120 ../help/help.inc:122 ../help/help.inc:124
-#: ../help/help.inc:126
+#: ../templates/selfService/profManage.php:157 ../help/help.inc:116
+#: ../help/help.inc:118 ../help/help.inc:120 ../help/help.inc:122
+#: ../help/help.inc:124
 msgid "Profile management"
 msgstr "プロファイル管理"
 
@@ -5512,7 +5583,8 @@ msgstr "プロファイル管理"
 #: ../templates/config/profmanage.php:259
 #: ../templates/selfService/profManage.php:172
 #: ../templates/selfService/profManage.php:225
-#: ../templates/profedit/profilepage.php:168 ../help/help.inc:150
+#: ../templates/profedit/profiledelete.php:85
+#: ../templates/profedit/profilepage.php:175 ../help/help.inc:148
 msgid "Profile name"
 msgstr "プロファイル名"
 
@@ -5533,26 +5605,26 @@ msgstr "プロファイルパスワード"
 msgid "Profile passwords are different or empty!"
 msgstr "プロファイルパスワードが異なるか、または未入力です!"
 
-#: ../lib/modules/sambaSamAccount.inc:84 ../lib/modules/sambaSamAccount.inc:85
-#: ../lib/modules/sambaSamAccount.inc:197
-#: ../lib/modules/sambaSamAccount.inc:209
-#: ../lib/modules/sambaSamAccount.inc:281
-#: ../lib/modules/sambaSamAccount.inc:330
-#: ../lib/modules/sambaSamAccount.inc:472
-#: ../lib/modules/sambaSamAccount.inc:563
-#: ../lib/modules/sambaSamAccount.inc:1133
-#: ../lib/modules/sambaSamAccount.inc:1403
-#: ../lib/modules/sambaSamAccount.inc:1498
-#: ../lib/modules/sambaSamAccount.inc:1652
-#: ../lib/modules/sambaSamAccount.inc:1674
+#: ../lib/modules/sambaSamAccount.inc:89 ../lib/modules/sambaSamAccount.inc:90
+#: ../lib/modules/sambaSamAccount.inc:202
+#: ../lib/modules/sambaSamAccount.inc:214
+#: ../lib/modules/sambaSamAccount.inc:286
+#: ../lib/modules/sambaSamAccount.inc:335
+#: ../lib/modules/sambaSamAccount.inc:477
+#: ../lib/modules/sambaSamAccount.inc:568
+#: ../lib/modules/sambaSamAccount.inc:1127
+#: ../lib/modules/sambaSamAccount.inc:1396
+#: ../lib/modules/sambaSamAccount.inc:1491
+#: ../lib/modules/sambaSamAccount.inc:1645
+#: ../lib/modules/sambaSamAccount.inc:1667
 msgid "Profile path"
 msgstr "プロファイルパス"
 
-#: ../lib/modules/sambaSamAccount.inc:84 ../lib/modules/sambaSamAccount.inc:86
+#: ../lib/modules/sambaSamAccount.inc:89 ../lib/modules/sambaSamAccount.inc:91
 msgid "Profile path is invalid!"
 msgstr "プロファイルパスが正しくありません!"
 
-#: ../templates/profedit/profilemain.php:108
+#: ../templates/profedit/profilemain.php:107
 msgid "Profile was saved."
 msgstr "プロファイルがセーブされました。"
 
@@ -5567,7 +5639,7 @@ msgstr "パブリック・ストア"
 msgid "Quota"
 msgstr "クオータ"
 
-#: ../lib/modules/quota.inc:676
+#: ../lib/modules/quota.inc:680
 #, php-format
 msgid "Quota for %s on %s"
 msgstr "%s の %s におけるQuota"
@@ -5608,8 +5680,8 @@ msgstr "quota警告リミット"
 msgid "RDN"
 msgstr "RDN"
 
-#: ../templates/masscreate.php:253 ../templates/profedit/profilepage.php:242
-#: ../lib/modules.inc:1589 ../help/help.inc:148
+#: ../templates/masscreate.php:298 ../templates/profedit/profilepage.php:200
+#: ../lib/modules.inc:1275 ../help/help.inc:146
 msgid "RDN identifier"
 msgstr "RDN識別子"
 
@@ -5640,11 +5712,11 @@ msgstr "範囲の終点"
 msgid "Ranges"
 msgstr "範囲"
 
-#: ../templates/config/confmain.php:441
+#: ../templates/config/confmain.php:298
 msgid "Read"
 msgstr "読み込み"
 
-#: ../templates/config/confmain.php:339 ../templates/config/confmain.php:342
+#: ../templates/config/confmain.php:254
 msgid "Read only"
 msgstr "読み込み専用"
 
@@ -5670,10 +5742,10 @@ msgstr "受信者が正しくありません!"
 msgid "Recipient list"
 msgstr "受信者リスト"
 
-#: ../lib/modules/sambaSamAccount.inc:221
-#: ../lib/modules/sambaSamAccount.inc:360
-#: ../lib/modules/sambaSamAccount.inc:1446
-#: ../lib/modules/sambaSamAccount.inc:1726
+#: ../lib/modules/sambaSamAccount.inc:226
+#: ../lib/modules/sambaSamAccount.inc:365
+#: ../lib/modules/sambaSamAccount.inc:1439
+#: ../lib/modules/sambaSamAccount.inc:1719
 msgid "Reconnect if disconnected"
 msgstr "切断された場合は再接続してください"
 
@@ -5681,11 +5753,11 @@ msgstr "切断された場合は再接続してください"
 msgid "Recursive delete progress"
 msgstr "再帰的な削除中"
 
-#: ../templates/config/mainmanage.php:382
+#: ../templates/config/mainmanage.php:242
 msgid "Reenter new master password"
 msgstr "新しいマスタパスワードを再入力"
 
-#: ../templates/config/confmain.php:549 ../lib/modules/posixAccount.inc:1697
+#: ../templates/config/confmain.php:366 ../lib/modules/posixAccount.inc:1685
 msgid "Reenter password"
 msgstr "パスワード再入力"
 
@@ -5695,8 +5767,8 @@ msgid "Reenter profile password"
 msgstr "プロファイルパスワードを再入力"
 
 #: ../templates/tree/edit.php:98 ../lib/tree.inc:88 ../lib/tree.inc:89
-#: ../lib/types/dhcp.inc:223 ../lib/modules/asteriskExtension.inc:301
-#: ../lib/lists.inc:689
+#: ../lib/types/dhcp.inc:279 ../lib/modules/asteriskExtension.inc:301
+#: ../lib/lists.inc:717
 msgid "Refresh"
 msgstr "リフレッシュ"
 
@@ -5708,14 +5780,14 @@ msgstr "競合の場合に拒否"
 msgid "Relative distinguished name"
 msgstr "相対識別名"
 
-#: ../templates/config/confmodules.php:282
-#: ../templates/pdfedit/pdfpage.php:439
-#: ../lib/modules/sambaSamAccount.inc:1371 ../lib/modules/kolabUser.inc:893
+#: ../templates/config/confmodules.php:289
+#: ../templates/pdfedit/pdfpage.php:461
+#: ../lib/modules/sambaSamAccount.inc:1364 ../lib/modules/kolabUser.inc:895
 #: ../lib/modules/phpGroupwareUser.inc:259
 #: ../lib/modules/shadowAccount.inc:414 ../lib/modules/sudoRole.inc:266
 #: ../lib/modules/sudoRole.inc:293 ../lib/modules/sudoRole.inc:320
 #: ../lib/modules/sudoRole.inc:347 ../lib/modules/sudoRole.inc:374
-#: ../lib/modules/sudoRole.inc:401 ../lib/modules/groupOfNames.inc:154
+#: ../lib/modules/sudoRole.inc:401 ../lib/modules/groupOfNames.inc:160
 msgid "Remove"
 msgstr "削除"
 
@@ -5731,7 +5803,7 @@ msgstr "EDU person拡張を削除"
 msgid "Remove IP address extension"
 msgstr "IPアドレス拡張を削除"
 
-#: ../lib/modules/sambaSamAccount.inc:1210
+#: ../lib/modules/sambaSamAccount.inc:1204
 msgid "Remove Samba 3 extension"
 msgstr "Samba 3拡張を削除"
 
@@ -5748,7 +5820,7 @@ msgstr "Zarafa拡張を削除"
 msgid "Remove host extension"
 msgstr "ホスト拡張を削除"
 
-#: ../lib/modules/posixGroup.inc:208 ../lib/modules/posixAccount.inc:1014
+#: ../lib/modules/posixGroup.inc:201 ../lib/modules/posixAccount.inc:996
 msgid "Remove password"
 msgstr "パスワードを削除"
 
@@ -5757,20 +5829,20 @@ msgstr "パスワードを削除"
 msgid "Remove phpGroupWare extension"
 msgstr "phpGroupware拡張を削除"
 
-#: ../lib/modules/groupOfNames.inc:314
+#: ../lib/modules/groupOfNames.inc:338
 msgid "Remove selected entries"
 msgstr "選択したエントリを削除"
 
-#: ../templates/config/conftypes.php:245
+#: ../templates/config/conftypes.php:268
 msgid "Remove this account type"
 msgstr "このアカウントタイプを削除:"
 
-#: ../lib/modules/inetOrgPerson.inc:1501
+#: ../lib/modules/inetOrgPerson.inc:1505
 msgid "Remove/replace photo"
 msgstr "写真の削除/差し替え"
 
 #: ../templates/config/profmanage.php:255
-#: ../templates/selfService/profManage.php:221 ../help/help.inc:120
+#: ../templates/selfService/profManage.php:221 ../help/help.inc:118
 msgid "Rename profile"
 msgstr "プロファイル名変更"
 
@@ -5779,11 +5851,11 @@ msgstr "プロファイル名変更"
 msgid "Renamed profile."
 msgstr "プロファイル名が変更されました。"
 
-#: ../templates/lists/changePassword.php:234 ../lib/modules.inc:1311
+#: ../templates/lists/changePassword.php:280 ../lib/modules.inc:1338
 msgid "Repeat password"
 msgstr "パスワード再入力"
 
-#: ../lib/modules/posixAccount.inc:67 ../lib/modules/posixAccount.inc:774
+#: ../lib/modules/posixAccount.inc:69 ../lib/modules/posixAccount.inc:756
 msgid "Replaced $user or $group in homedir."
 msgstr "$user または $group をホームディレクトリに置き換えました。"
 
@@ -5803,16 +5875,16 @@ msgstr "オブジェクトクラス %s に対する必須属性"
 msgid "Required attributes"
 msgstr "必須属性"
 
-#: ../lib/modules/sambaSamAccount.inc:1204
+#: ../lib/modules/sambaSamAccount.inc:1198
 msgid "Reset"
 msgstr "リセット"
 
-#: ../lib/modules.inc:1388
+#: ../lib/modules.inc:1431
 msgid "Reset changes"
 msgstr "変更をリセット"
 
-#: ../lib/modules/sambaSamAccount.inc:237
-#: ../lib/modules/sambaSamAccount.inc:1203
+#: ../lib/modules/sambaSamAccount.inc:242
+#: ../lib/modules/sambaSamAccount.inc:1197
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
@@ -5836,7 +5908,7 @@ msgstr "リソース設定"
 msgid "Reverse zone names"
 msgstr "逆引きゾーン名"
 
-#: ../templates/config/confmain.php:418 ../help/help.inc:110
+#: ../templates/config/confmain.php:294 ../help/help.inc:108
 msgid "Rights for the home directory"
 msgstr "ホームディレクトリに対する権限"
 
@@ -5850,10 +5922,10 @@ msgstr "ロール名"
 msgid "Room"
 msgstr "部屋"
 
-#: ../lib/modules/inetOrgPerson.inc:120 ../lib/modules/inetOrgPerson.inc:192
-#: ../lib/modules/inetOrgPerson.inc:359 ../lib/modules/inetOrgPerson.inc:434
-#: ../lib/modules/inetOrgPerson.inc:552 ../lib/modules/inetOrgPerson.inc:881
-#: ../lib/modules/inetOrgPerson.inc:1040 ../lib/modules/inetOrgPerson.inc:1453
+#: ../lib/modules/inetOrgPerson.inc:123 ../lib/modules/inetOrgPerson.inc:195
+#: ../lib/modules/inetOrgPerson.inc:362 ../lib/modules/inetOrgPerson.inc:437
+#: ../lib/modules/inetOrgPerson.inc:555 ../lib/modules/inetOrgPerson.inc:884
+#: ../lib/modules/inetOrgPerson.inc:1044 ../lib/modules/inetOrgPerson.inc:1457
 msgid "Room number"
 msgstr "部屋番号"
 
@@ -5887,15 +5959,15 @@ msgstr "実行ユーザ"
 msgid "Run users"
 msgstr "実行ユーザ"
 
-#: ../templates/serverInfo.php:112
+#: ../templates/serverInfo.php:118
 msgid "SASL mechanisms"
 msgstr "SASLメカニズム"
 
-#: ../templates/tests/lamdaemonTest.php:224
+#: ../templates/tests/lamdaemonTest.php:235
 msgid "SSH connection"
 msgstr "SSH接続"
 
-#: ../templates/tests/lamdaemonTest.php:235
+#: ../templates/tests/lamdaemonTest.php:248
 msgid "SSH connection could be established."
 msgstr "SSHコネクションが確立できました。"
 
@@ -5915,8 +5987,8 @@ msgstr "SSH公開鍵"
 msgid "SSL port"
 msgstr "SSLポート"
 
-#: ../lib/modules/sambaSamAccount.inc:124
-#: ../lib/modules/sambaGroupMapping.inc:290
+#: ../lib/modules/sambaSamAccount.inc:129
+#: ../lib/modules/sambaGroupMapping.inc:312
 msgid "Samba 3"
 msgstr "Samba 3"
 
@@ -5928,19 +6000,19 @@ msgstr "Samba 3 ドメインのSIDが不正です!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 ドメインエントリ"
 
-#: ../lib/modules/sambaSamAccount.inc:302
-#: ../lib/modules/sambaSamAccount.inc:306
-#: ../lib/modules/sambaSamAccount.inc:447
-#: ../lib/modules/sambaSamAccount.inc:513
+#: ../lib/modules/sambaSamAccount.inc:307
+#: ../lib/modules/sambaSamAccount.inc:311
+#: ../lib/modules/sambaSamAccount.inc:452
+#: ../lib/modules/sambaSamAccount.inc:518
 msgid "Samba RID"
 msgstr "Samba RID"
 
-#: ../lib/modules/sambaGroupMapping.inc:328
-#: ../lib/modules/sambaGroupMapping.inc:353
+#: ../lib/modules/sambaGroupMapping.inc:339
+#: ../lib/modules/sambaGroupMapping.inc:364
 msgid "Samba RID number"
 msgstr "Samba RID番号"
 
-#: ../lib/modules/sambaGroupMapping.inc:322
+#: ../lib/modules/sambaGroupMapping.inc:333
 msgid "Samba display name"
 msgstr "Samba表示名"
 
@@ -5948,7 +6020,7 @@ msgstr "Samba表示名"
 msgid "Samba domain"
 msgstr "Samba ドメイン"
 
-#: ../lib/modules/sambaGroupMapping.inc:314
+#: ../lib/modules/sambaGroupMapping.inc:149
 msgid "Samba domain name"
 msgstr "Sambaドメイン名"
 
@@ -5956,30 +6028,30 @@ msgstr "Sambaドメイン名"
 msgid "Samba domains"
 msgstr "Samba ドメイン"
 
-#: ../lib/modules/sambaGroupMapping.inc:302
-#: ../lib/modules/sambaGroupMapping.inc:334
-#: ../lib/modules/sambaGroupMapping.inc:361
-#: ../lib/modules/sambaGroupMapping.inc:379
+#: ../lib/modules/sambaGroupMapping.inc:324
+#: ../lib/modules/sambaGroupMapping.inc:345
+#: ../lib/modules/sambaGroupMapping.inc:372
+#: ../lib/modules/sambaGroupMapping.inc:393
 msgid "Samba group type"
 msgstr "Sambaグループタイプ"
 
-#: ../lib/modules/sambaSamAccount.inc:234
+#: ../lib/modules/sambaSamAccount.inc:239
 msgid "Samba password"
 msgstr "Sambaパスワード"
 
-#: ../lib/modules/sambaSamAccount.inc:90
-#: ../lib/modules/sambaSamAccount.inc:203
-#: ../lib/modules/sambaSamAccount.inc:287
-#: ../lib/modules/sambaSamAccount.inc:290
-#: ../lib/modules/sambaSamAccount.inc:488
-#: ../lib/modules/sambaSamAccount.inc:566
-#: ../lib/modules/sambaSamAccount.inc:1144
-#: ../lib/modules/sambaSamAccount.inc:1506
-#: ../lib/modules/sambaSamAccount.inc:1655
+#: ../lib/modules/sambaSamAccount.inc:95
+#: ../lib/modules/sambaSamAccount.inc:208
+#: ../lib/modules/sambaSamAccount.inc:292
+#: ../lib/modules/sambaSamAccount.inc:295
+#: ../lib/modules/sambaSamAccount.inc:493
+#: ../lib/modules/sambaSamAccount.inc:571
+#: ../lib/modules/sambaSamAccount.inc:1138
+#: ../lib/modules/sambaSamAccount.inc:1499
+#: ../lib/modules/sambaSamAccount.inc:1648
 msgid "Samba workstations"
 msgstr "Samba ワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:1281
+#: ../lib/modules/sambaSamAccount.inc:1274
 msgid "Saturday"
 msgstr "土曜日"
 
@@ -5988,9 +6060,9 @@ msgstr "土曜日"
 #: ../templates/config/moduleSettings.php:141
 #: ../templates/config/conftypes.php:160
 #: ../templates/selfService/selfServiceMain.php:126
-#: ../templates/selfService/adminMain.php:291
-#: ../templates/pdfedit/pdfpage.php:669 ../templates/pdfedit/pdfpage.php:689
-#: ../templates/profedit/profilepage.php:177 ../lib/modules.inc:1385
+#: ../templates/selfService/adminMain.php:300
+#: ../templates/pdfedit/pdfpage.php:583
+#: ../templates/profedit/profilepage.php:225 ../lib/modules.inc:1428
 msgid "Save"
 msgstr "保存"
 
@@ -6002,11 +6074,12 @@ msgstr "ファイルとして保存"
 msgid "Schema browser"
 msgstr "スキーマブラウザ"
 
-#: ../templates/serverInfo.php:104
+#: ../templates/serverInfo.php:108
 msgid "Schema suffix"
 msgstr "スキーマ・サフィックス"
 
-#: ../templates/tests/schemaTest.php:50 ../templates/tests/index.php:53
+#: ../templates/tests/schemaTest.php:53 ../templates/tests/index.php:56
+#: ../lib/tools/tests.inc:116
 msgid "Schema test"
 msgstr "スキーマテスト"
 
@@ -6020,19 +6093,19 @@ msgstr "限定した属性"
 msgid "Script path"
 msgstr "スクリプトパス"
 
-#: ../templates/config/confmain.php:616
+#: ../templates/config/confmain.php:437
 msgid "Script path is invalid!"
 msgstr "スクリプトパスが正しくありません!"
 
-#: ../templates/config/confmain.php:635
+#: ../templates/config/confmain.php:456
 msgid "Script rights are invalid!"
 msgstr "スクリプトの権限が無効です!"
 
-#: ../templates/config/confmain.php:619
+#: ../templates/config/confmain.php:440
 msgid "Script server is invalid!"
 msgstr "スクリプトサーバが無効です!"
 
-#: ../help/help.inc:106
+#: ../help/help.inc:104
 msgid "Script servers"
 msgstr "スクリプトサーバ"
 
@@ -6050,7 +6123,7 @@ msgstr "検索スコープ"
 msgid "Search tree suffix for users"
 msgstr "ユーザーの検索ツリーサフィックス"
 
-#: ../templates/pdfedit/pdfpage.php:565
+#: ../templates/pdfedit/pdfpage.php:555
 msgid "Section"
 msgstr "セクション"
 
@@ -6060,7 +6133,7 @@ msgstr "セクション"
 msgid "Security group"
 msgstr "セキュリティ・グループ"
 
-#: ../templates/config/mainmanage.php:192 ../templates/config/confmain.php:488
+#: ../templates/config/mainmanage.php:195 ../templates/config/confmain.php:370
 msgid "Security settings"
 msgstr "セキュリティ設定"
 
@@ -6068,7 +6141,7 @@ msgstr "セキュリティ設定"
 msgid "See also"
 msgstr "参照"
 
-#: ../lib/account.inc:636
+#: ../lib/account.inc:635
 msgid "See the manual for instructions to solve this problem."
 msgstr "この問題を解決する手順は、マニュアルを参照してください。"
 
@@ -6076,28 +6149,28 @@ msgstr "この問題を解決する手順は、マニュアルを参照してく
 msgid "Select a template for the creation process"
 msgstr "生成処理に対するテンプレートを選んでください"
 
-#: ../lib/lists.inc:399
+#: ../lib/lists.inc:406
 msgid "Select all"
 msgstr "すべてを選択"
 
-#: ../lib/modules/nisnetgroup.inc:224 ../lib/modules/nisnetgroup.inc:253
+#: ../lib/modules/nisnetgroup.inc:229 ../lib/modules/nisnetgroup.inc:258
 msgid "Select host"
 msgstr "ホストを選択"
 
 #: ../lib/modules/zarafaUser.inc:397 ../lib/modules/zarafaUser.inc:410
-#: ../lib/modules/nisnetgroup.inc:230 ../lib/modules/nisnetgroup.inc:259
+#: ../lib/modules/nisnetgroup.inc:235 ../lib/modules/nisnetgroup.inc:264
 msgid "Select user"
 msgstr "ユーザを選択"
 
-#: ../lib/modules/posixAccount.inc:1057 ../lib/modules/nisnetgroup.inc:373
+#: ../lib/modules/posixAccount.inc:1038 ../lib/modules/nisnetgroup.inc:373
 msgid "Selected groups"
 msgstr "選択されたグループ"
 
-#: ../templates/masscreate.php:149 ../templates/config/confmodules.php:258
+#: ../templates/masscreate.php:149 ../templates/config/confmodules.php:278
 msgid "Selected modules"
 msgstr "選択されたモジュール"
 
-#: ../lib/modules/posixGroup.inc:250 ../lib/modules/asteriskExtension.inc:308
+#: ../lib/modules/posixGroup.inc:240 ../lib/modules/asteriskExtension.inc:308
 msgid "Selected users"
 msgstr "選択されたユーザ"
 
@@ -6105,44 +6178,45 @@ msgstr "選択されたユーザ"
 msgid "Self service configuration"
 msgstr "セルフサービスの構成"
 
-#: ../templates/selfService/adminMain.php:284
+#: ../templates/selfService/adminMain.php:285
 msgid "Self service configuration editor"
 msgstr "セルフサービス構成エディタ"
 
-#: ../templates/selfService/adminMain.php:320
+#: ../templates/selfService/adminMain.php:296
 msgid "Self service login"
 msgstr "セルフサービス・ログイン"
 
-#: ../templates/lists/changePassword.php:211
-#: ../templates/lists/changePassword.php:243
+#: ../templates/lists/changePassword.php:257
+#: ../templates/lists/changePassword.php:289
 msgid "Send via mail"
 msgstr "メールで送信"
 
 #: ../lib/modules/device.inc:58 ../lib/modules/device.inc:85
 #: ../lib/modules/device.inc:110 ../lib/modules/device.inc:165
-#: ../lib/modules/device.inc:383
+#: ../lib/modules/device.inc:388
 msgid "Serial number"
 msgstr "シリアル番号"
 
-#: ../templates/tests/lamdaemonTest.php:72
+#: ../templates/tests/lamdaemonTest.php:70
 msgid "Server"
 msgstr "サーバー"
 
-#: ../templates/config/confmain.php:236
-#: ../templates/selfService/adminMain.php:330 ../help/help.inc:54
+#: ../templates/config/confmain.php:231
+#: ../templates/selfService/adminMain.php:331 ../lib/modules/imapAccess.inc:66
+#: ../lib/modules/imapAccess.inc:95 ../help/help.inc:54
 msgid "Server address"
 msgstr "サーバーアドレス"
 
-#: ../templates/config/confmain.php:581
+#: ../templates/config/confmain.php:402
 #: ../templates/selfService/adminMain.php:95
 msgid "Server address is invalid!"
 msgstr "サーバーアドレスが正しくありません!"
 
-#: ../templates/serverInfo.php:89 ../lib/tools/serverInfo.inc:44
+#: ../templates/serverInfo.php:92 ../lib/tools/serverInfo.inc:44
 msgid "Server information"
 msgstr "サーバー情報"
 
-#: ../templates/config/confmain.php:405
+#: ../templates/config/confmain.php:291
 msgid "Server list"
 msgstr "サーバー覧"
 
@@ -6150,12 +6224,12 @@ msgstr "サーバー覧"
 msgid "Server profile"
 msgstr "サーバー プロファイル"
 
-#: ../templates/config/confmain.php:233
-#: ../templates/selfService/adminMain.php:327
+#: ../templates/config/confmain.php:260
+#: ../templates/selfService/adminMain.php:328
 msgid "Server settings"
 msgstr "サーバー設定"
 
-#: ../templates/config/mainmanage.php:198 ../help/help.inc:134
+#: ../templates/config/mainmanage.php:193 ../help/help.inc:132
 msgid "Session timeout"
 msgstr "セッション有効期限"
 
@@ -6163,27 +6237,27 @@ msgstr "セッション有効期限"
 msgid "Set"
 msgstr "設定"
 
-#: ../lib/modules.inc:1276 ../lib/modules.inc:1392
+#: ../lib/modules.inc:1321 ../lib/modules.inc:1435
 msgid "Set password"
 msgstr "パスワードを設定"
 
-#: ../lib/modules/posixAccount.inc:179 ../lib/modules/posixAccount.inc:311
+#: ../lib/modules/posixAccount.inc:181 ../lib/modules/posixAccount.inc:313
 msgid "Set primary group as memberUid"
 msgstr "プライマリーグループをmemberUidとしてセット"
 
-#: ../templates/config/profmanage.php:313 ../help/help.inc:124
+#: ../templates/config/profmanage.php:313 ../help/help.inc:122
 msgid "Set profile password"
 msgstr "プロファイルパスワード設定"
 
-#: ../lib/modules.inc:1321
+#: ../lib/modules.inc:1364
 msgid "Set random password"
 msgstr "ランダムなパスワードを設定"
 
-#: ../templates/lists/changePassword.php:221
+#: ../templates/lists/changePassword.php:267
 msgid "Set specific password"
 msgstr "任意のパスワードを設定"
 
-#: ../lib/modules/posixGroup.inc:410
+#: ../lib/modules/posixGroup.inc:402
 msgid "Sets the group password."
 msgstr "グループパスワードを設定"
 
@@ -6191,10 +6265,10 @@ msgstr "グループパスワードを設定"
 msgid "Shadow"
 msgstr "Shadow"
 
-#: ../lib/modules/sambaSamAccount.inc:219
-#: ../lib/modules/sambaSamAccount.inc:354
-#: ../lib/modules/sambaSamAccount.inc:1430
-#: ../lib/modules/sambaSamAccount.inc:1710
+#: ../lib/modules/sambaSamAccount.inc:224
+#: ../lib/modules/sambaSamAccount.inc:359
+#: ../lib/modules/sambaSamAccount.inc:1423
+#: ../lib/modules/sambaSamAccount.inc:1703
 msgid "Shadowing"
 msgstr "Shadowing"
 
@@ -6224,7 +6298,7 @@ msgstr "内部属性を表示する"
 msgid "Show only Asterisk accounts"
 msgstr "アスタリスク・アカウントだけを表示"
 
-#: ../lib/types/group.inc:256
+#: ../lib/types/group.inc:299
 msgid "Show primary group members as normal group members"
 msgstr "通常のグループメンバーとしてプライマリグループのメンバーを表示"
 
@@ -6232,12 +6306,12 @@ msgstr "通常のグループメンバーとしてプライマリグループの
 msgid "Single valued"
 msgstr "単一の値"
 
-#: ../lib/modules/quota.inc:612
+#: ../lib/modules/quota.inc:616
 msgid "Soft block"
 msgstr "ソフトブロック"
 
-#: ../lib/modules/quota.inc:105 ../lib/modules/quota.inc:389
-#: ../lib/modules/quota.inc:488
+#: ../lib/modules/quota.inc:105 ../lib/modules/quota.inc:388
+#: ../lib/modules/quota.inc:489
 msgid "Soft block limit"
 msgstr "ソフトブロック制限"
 
@@ -6245,7 +6319,7 @@ msgstr "ソフトブロック制限"
 msgid "Soft block limit."
 msgstr "ソフトブロック制限"
 
-#: ../lib/modules/quota.inc:614
+#: ../lib/modules/quota.inc:618
 msgid "Soft inode"
 msgstr "ソフトinode"
 
@@ -6253,17 +6327,23 @@ msgstr "ソフトinode"
 msgid "Soft inode (files) limit."
 msgstr "ソフトinode(ファイル)制限。"
 
-#: ../lib/modules/quota.inc:127 ../lib/modules/quota.inc:393
-#: ../lib/modules/quota.inc:490
+#: ../lib/modules/quota.inc:127 ../lib/modules/quota.inc:392
+#: ../lib/modules/quota.inc:491
 msgid "Soft inode limit"
 msgstr "ソフトinode制限"
 
+#: ../lib/modules/imapAccess.inc:85
+msgid ""
+"Some IMAP servers store mailboxes with a prefix (e.g. \"user\" for Cyrus "
+"which results in \"user.username\")."
+msgstr "いくつかのIMAPサーバはプリフィックスのついたメールボックスを保存します(例 Cyrus における\"user\"プリフィックスは\"user.username\"と解釈されます)。"
+
 #: ../templates/tree/edit.php:138
 #, php-format
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "いくつかの属性(%s)は変更され、ハイライト表示されています。"
 
-#: ../lib/modules.inc:1156
+#: ../lib/modules.inc:1164
 msgid "Some required information is missing"
 msgstr "必須項目が満たされていません。"
 
@@ -6281,8 +6361,8 @@ msgstr ""
 msgid "Sorry this help number ({bold}%d{endbold}) is not available."
 msgstr "このヘルプ番号({bold}%d{endbold})は無効です。"
 
-#: ../lib/modules/sambaSamAccount.inc:299
-#: ../lib/modules/sambaSamAccount.inc:1181
+#: ../lib/modules/sambaSamAccount.inc:304
+#: ../lib/modules/sambaSamAccount.inc:1175
 msgid "Special user"
 msgstr "特殊ユーザ"
 
@@ -6294,7 +6374,9 @@ msgstr "このグループがセキュリティ上の可能性を持つか否か
 msgid ""
 "Specifies if this server contains the public store. This may be changed only "
 "for new entries."
-msgstr "サーバーが公開ストアを含んでいるか否かを記入します。これは新しいエントリに対してのみ反映されます。"
+msgstr ""
+"サーバーが公開ストアを含んでいるか否かを記入します。これは新しいエントリに対"
+"してのみ反映されます。"
 
 #: ../lib/modules/ppolicy.inc:125
 msgid "Specifies if users are allowed to change their own passwords or not."
@@ -6385,15 +6467,15 @@ msgstr ""
 "る必要があるかを設定します。LAMは古いパスワードを必要とするパスワード変更をサ"
 "ポートしていません。"
 
-#: ../lib/modules/inetOrgPerson.inc:121 ../lib/modules/inetOrgPerson.inc:132
-#: ../lib/modules/inetOrgPerson.inc:186 ../lib/modules/inetOrgPerson.inc:383
-#: ../lib/modules/inetOrgPerson.inc:425 ../lib/modules/inetOrgPerson.inc:564
-#: ../lib/modules/inetOrgPerson.inc:866 ../lib/modules/inetOrgPerson.inc:1045
-#: ../lib/modules/inetOrgPerson.inc:1467
+#: ../lib/modules/inetOrgPerson.inc:124 ../lib/modules/inetOrgPerson.inc:135
+#: ../lib/modules/inetOrgPerson.inc:189 ../lib/modules/inetOrgPerson.inc:386
+#: ../lib/modules/inetOrgPerson.inc:428 ../lib/modules/inetOrgPerson.inc:567
+#: ../lib/modules/inetOrgPerson.inc:869 ../lib/modules/inetOrgPerson.inc:1049
+#: ../lib/modules/inetOrgPerson.inc:1471
 msgid "State"
 msgstr "都道府県"
 
-#: ../templates/pdfedit/pdfpage.php:498 ../templates/pdfedit/pdfpage.php:502
+#: ../templates/pdfedit/pdfpage.php:505 ../templates/pdfedit/pdfpage.php:507
 msgid "Static text"
 msgstr "静的テキスト"
 
@@ -6405,17 +6487,17 @@ msgstr "Step 1 of 2: 名前とオブジェクトクラス"
 msgid "Step 2 of 2: Specify attributes and values"
 msgstr "Step 2 of 2: 属性と値の記入"
 
-#: ../lib/modules/inetOrgPerson.inc:234
+#: ../lib/modules/inetOrgPerson.inc:237
 msgid "Steve"
 msgstr "スティーブ"
 
-#: ../lib/modules/sambaSamAccount.inc:391 ../lib/modules/posixAccount.inc:198
-#: ../lib/modules/inetOrgPerson.inc:1095
+#: ../lib/modules/sambaSamAccount.inc:396 ../lib/modules/posixAccount.inc:200
+#: ../lib/modules/inetOrgPerson.inc:1099
 #: ../lib/modules/asteriskVoicemail.inc:165
 msgid "Steve Miller"
 msgstr "スティーブ ミラー"
 
-#: ../lib/modules/posixAccount.inc:259
+#: ../lib/modules/posixAccount.inc:261
 msgid "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 msgstr "スティーブ ミラー, 2-14号室, 123-123-1234,123-123-1234"
 
@@ -6423,15 +6505,15 @@ msgstr "スティーブ ミラー, 2-14号室, 123-123-1234,123-123-1234"
 msgid "Steve, Stevo"
 msgstr "Steve, Stevo"
 
-#: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:118
-#: ../lib/modules/inetOrgPerson.inc:178 ../lib/modules/inetOrgPerson.inc:287
-#: ../lib/modules/inetOrgPerson.inc:413 ../lib/modules/inetOrgPerson.inc:504
-#: ../lib/modules/inetOrgPerson.inc:505 ../lib/modules/inetOrgPerson.inc:846
-#: ../lib/modules/inetOrgPerson.inc:1030 ../lib/modules/inetOrgPerson.inc:1425
+#: ../lib/modules/inetOrgPerson.inc:61 ../lib/modules/inetOrgPerson.inc:121
+#: ../lib/modules/inetOrgPerson.inc:181 ../lib/modules/inetOrgPerson.inc:290
+#: ../lib/modules/inetOrgPerson.inc:416 ../lib/modules/inetOrgPerson.inc:507
+#: ../lib/modules/inetOrgPerson.inc:508 ../lib/modules/inetOrgPerson.inc:849
+#: ../lib/modules/inetOrgPerson.inc:1034 ../lib/modules/inetOrgPerson.inc:1429
 msgid "Street"
 msgstr "町名"
 
-#: ../templates/pdfedit/pdfpage.php:671
+#: ../templates/pdfedit/pdfpage.php:442
 msgid "Structure name"
 msgstr "構成名"
 
@@ -6439,14 +6521,14 @@ msgstr "構成名"
 msgid "Sub (entire subtree)"
 msgstr "Sub (サブツリー全体)"
 
-#: ../lib/types/netgroup.inc:93 ../lib/modules/nisnetgroup.inc:76
-#: ../lib/modules/nisnetgroup.inc:111 ../lib/modules/nisnetgroup.inc:126
-#: ../lib/modules/nisnetgroup.inc:193 ../lib/modules/nisnetgroup.inc:372
-#: ../lib/modules/nisnetgroup.inc:580
+#: ../lib/types/netgroup.inc:93 ../lib/modules/nisnetgroup.inc:81
+#: ../lib/modules/nisnetgroup.inc:116 ../lib/modules/nisnetgroup.inc:131
+#: ../lib/modules/nisnetgroup.inc:198 ../lib/modules/nisnetgroup.inc:372
+#: ../lib/modules/nisnetgroup.inc:576
 msgid "Subgroups"
 msgstr "サブグループ"
 
-#: ../templates/config/confmain.php:475 ../help/help.inc:194
+#: ../templates/config/confmain.php:327 ../help/help.inc:194
 msgid "Subject"
 msgstr "件名"
 
@@ -6483,31 +6565,31 @@ msgstr "sudoロール管理"
 msgid "Sudo roles"
 msgstr "sudoロール"
 
-#: ../lib/lists.inc:658 ../lib/modules.inc:1571
+#: ../lib/lists.inc:660 ../lib/modules.inc:1257
 msgid "Suffix"
 msgstr "サフィックス"
 
-#: ../lib/modules/sambaSamAccount.inc:1281
+#: ../lib/modules/sambaSamAccount.inc:1274
 msgid "Sunday"
 msgstr "日曜日"
 
-#: ../templates/lists/changePassword.php:149
+#: ../templates/lists/changePassword.php:193
 #: ../lib/modules/asteriskAccount.inc:78
 #: ../lib/modules/asteriskVoicemail.inc:77
 msgid "Sync Asterisk password with Unix password"
 msgstr "アスタリスク・パスワードをunixパスワードと同期。"
 
-#: ../templates/lists/changePassword.php:152
+#: ../templates/lists/changePassword.php:196
 msgid "Sync Asterisk voicemail password with Unix password"
 msgstr "アスタリスク・ボイスメール・パスワードをunixパスワードと同期"
 
-#: ../templates/lists/changePassword.php:140
-#: ../lib/modules/sambaSamAccount.inc:225
+#: ../templates/lists/changePassword.php:184
+#: ../lib/modules/sambaSamAccount.inc:230
 msgid "Sync Samba LM password with Unix password"
 msgstr "Samba LMパスワードをunixパスワードと同期します。"
 
-#: ../templates/lists/changePassword.php:139
-#: ../lib/modules/sambaSamAccount.inc:224
+#: ../templates/lists/changePassword.php:183
+#: ../lib/modules/sambaSamAccount.inc:229
 msgid "Sync Samba NT password with Unix password"
 msgstr "Samba NTパスワードをunixパスワードと同期します。"
 
@@ -6523,7 +6605,7 @@ msgstr "Syntax OID"
 msgid "Syntaxes"
 msgstr "Syntaxes"
 
-#: ../templates/config/mainmanage.php:338
+#: ../templates/config/mainmanage.php:219
 msgid "System logging"
 msgstr "システムロギング"
 
@@ -6535,20 +6617,20 @@ msgstr "TLSを ldaps:// と結合できませんでした。"
 msgid "Target of invitation policy is invalid!"
 msgstr "招待ポリシーのターゲット正しくありません。"
 
-#: ../templates/lists/changePassword.php:194
-#: ../lib/modules/inetOrgPerson.inc:48 ../lib/modules/inetOrgPerson.inc:117
-#: ../lib/modules/inetOrgPerson.inc:194 ../lib/modules/inetOrgPerson.inc:319
-#: ../lib/modules/inetOrgPerson.inc:437 ../lib/modules/inetOrgPerson.inc:520
-#: ../lib/modules/inetOrgPerson.inc:521 ../lib/modules/inetOrgPerson.inc:889
-#: ../lib/modules/inetOrgPerson.inc:1034 ../lib/modules/inetOrgPerson.inc:1397
+#: ../templates/lists/changePassword.php:240 ../lib/types/user.inc:154
+#: ../lib/modules/inetOrgPerson.inc:51 ../lib/modules/inetOrgPerson.inc:120
+#: ../lib/modules/inetOrgPerson.inc:197 ../lib/modules/inetOrgPerson.inc:322
+#: ../lib/modules/inetOrgPerson.inc:440 ../lib/modules/inetOrgPerson.inc:523
+#: ../lib/modules/inetOrgPerson.inc:524 ../lib/modules/inetOrgPerson.inc:892
+#: ../lib/modules/inetOrgPerson.inc:1038 ../lib/modules/inetOrgPerson.inc:1401
 msgid "Telephone number"
 msgstr "電話番号"
 
-#: ../lib/modules/inetOrgPerson.inc:265
+#: ../lib/modules/inetOrgPerson.inc:268
 msgid "Temp"
 msgstr "臨時雇用"
 
-#: ../lib/modules/inetOrgPerson.inc:249
+#: ../lib/modules/inetOrgPerson.inc:252
 msgid "Temp, contract until december"
 msgstr "臨時雇用、12月までの契約"
 
@@ -6556,9 +6638,9 @@ msgstr "臨時雇用、12月までの契約"
 msgid "Template"
 msgstr "テンプレート"
 
-#: ../lib/modules/sambaSamAccount.inc:363
-#: ../lib/modules/sambaSamAccount.inc:569
-#: ../lib/modules/sambaSamAccount.inc:1193
+#: ../lib/modules/sambaSamAccount.inc:368
+#: ../lib/modules/sambaSamAccount.inc:574
+#: ../lib/modules/sambaSamAccount.inc:1187
 msgid "Terminal server options"
 msgstr "ターミナルサーバオプション"
 
@@ -6566,18 +6648,14 @@ msgstr "ターミナルサーバオプション"
 msgid "Tests"
 msgstr "テスト"
 
-#: ../templates/config/confmain.php:478 ../help/help.inc:196
+#: ../templates/config/confmain.php:330 ../help/help.inc:196
 msgid "Text"
 msgstr "本文"
 
-#: ../templates/pdfedit/pdfpage.php:610
+#: ../templates/pdfedit/pdfpage.php:564
 msgid "Text field"
 msgstr "テキストフィールド"
 
-#: ../help/help.inc:101
-msgid "Text for user PDF"
-msgstr "ユーザPDFのためのテキスト"
-
 #: ../lib/modules/eduPerson.inc:100
 msgid ""
 "The \"NetID\" of the person for the purposes of inter-institutional "
@@ -6616,6 +6694,12 @@ msgid ""
 "units."
 msgstr "個人のorganizational unitを示すディレクトリ・エントリのDN。"
 
+#: ../lib/modules/posixGroup.inc:418
+msgid ""
+"The ID of this group was changed. You can update all user and host entries "
+"to the new group ID."
+msgstr "このグループのIDは変更されました。全てのユーザーとホストのエントリーを新しいグループIDに更新する事が出来ます。"
+
 #: ../templates/config/mainmanage.php:95
 #, php-format
 msgid "The IP address %s is invalid!"
@@ -6677,11 +6761,18 @@ msgstr "PC名にはA-Z, a-z, 0-9だけが使用できます。"
 msgid "The PC name needs to be at least 2 characters long."
 msgstr "PC名は少なくとも2文字以上でなければなりません。"
 
+#: ../help/help.inc:161
+msgid ""
+"The PDF structure defines what information is exported as PDF file and how "
+"the pages are structured. You can manage the PDF structures in the PDF "
+"editor (under \"Tools\")."
+msgstr "PDF構成は、どの情報がPDFファイルとしてエクスポートされ、どのようにページが構成されるかを定義します。PDF構成はPDFエディタ(\"Tools\"の下)で管理できます。"
+
 #: ../lib/modules/sambaDomain.inc:75
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "SambaサーバのSID。 \"net getlocalsid\" で取得してください。"
 
-#: ../lib/modules/posixAccount.inc:65
+#: ../lib/modules/posixAccount.inc:67
 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 "
@@ -6706,11 +6797,11 @@ msgstr "アカウント・コンテキストが正しくありません。"
 msgid "The account context stores information about the dial plan."
 msgstr "アカウント・コンテキストはダイアル・プランに関する情報を保存します。"
 
-#: ../help/help.inc:153
+#: ../help/help.inc:151
 msgid "The account will be saved under this LDAP suffix."
 msgstr "新しいアカウントはこのLDAPサフィックスの下に保存されます。"
 
-#: ../templates/tests/schemaTest.php:121
+#: ../templates/tests/schemaTest.php:123
 #, php-format
 msgid ""
 "The attribute %s is not supported for the object class(es) %s by your LDAP "
@@ -6778,13 +6869,13 @@ msgstr "拡張コンテキストが正しくありません。"
 msgid "The first line is the subject."
 msgstr "先頭の行は件名です。"
 
-#: ../templates/initsuff.php:177
+#: ../templates/initsuff.php:179
 msgid ""
 "The following suffix(es) are missing in LDAP. LAM can create them for you."
 msgstr "以下のサフィックスはLDAPにありません。LAM はこれらを作成できます。"
 
-#: ../lib/modules/sambaSamAccount.inc:104
-#: ../lib/modules/sambaSamAccount.inc:105
+#: ../lib/modules/sambaSamAccount.inc:109
+#: ../lib/modules/sambaSamAccount.inc:110
 msgid "The format of the logon hours field is invalid!"
 msgstr "ログオン時間フィールドの形式が正しくありません!"
 
@@ -6811,7 +6902,7 @@ msgstr ""
 msgid "The headline for a new section must contain at least one character."
 msgstr "新しいセクションの見出しは、少なくとも一文字以上でなくてはなりません。"
 
-#: ../lib/modules/sambaSamAccount.inc:276
+#: ../lib/modules/sambaSamAccount.inc:281
 msgid "The home directory will be connected under this drive letter."
 msgstr "ホームディレクトリはこのドライブ文字の下に接続されます。"
 
@@ -6860,11 +6951,18 @@ msgstr ""
 "ログファイル名が空であるか、または不正な文字文字が含まれています。有効な文字"
 "は: a-z, A-Z, 0-9, /, \\\\, ., :, _ と -です。"
 
+#: ../lib/modules/imapAccess.inc:76
+msgid ""
+"The login name of your IMAP user who has rights to create/delete mailboxes."
+msgstr "メールボックスを作成/削除する権限を持ったIMAPユーザーのログイン名。"
+
 #: ../help/help.inc:197
 msgid ""
 "The mail text of all password mails. If empty the content of \"config/"
 "passwordMailTemplate.txt\" starting at the second line will be used."
-msgstr "全てのパスワード・メールのメール・テキスト。もしも空の場合、\"config/passwordMailTemplate.txt\" の2行目以降が使用されます。"
+msgstr ""
+"全てのパスワード・メールのメール・テキスト。もしも空の場合、\"config/"
+"passwordMailTemplate.txt\" の2行目以降が使用されます。"
 
 #: ../lib/modules/asteriskVoicemail.inc:201
 msgid "The mailbox format is invalid."
@@ -6882,7 +6980,7 @@ msgstr ""
 "最長リース期間には、この時間が経過するまでにクライアントが新しいIPアドレス要"
 "求を出さなくてはならない秒数を記述します。"
 
-#: ../lib/modules.inc:1201
+#: ../lib/modules.inc:1209
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "モジュール %s は利用できません。"
@@ -6927,15 +7025,17 @@ msgstr "Windowsのドメイン又はワークグループ名。"
 msgid ""
 "The net mask is derived from the subnet mask. LAM will calculate it "
 "automatically."
-msgstr "ネットマスクはサブネットマスクによって割り出されます。LAMが自動的に算出します。"
+msgstr ""
+"ネットマスクはサブネットマスクによって割り出されます。LAMが自動的に算出しま"
+"す。"
 
-#: ../lib/modules.inc:1093
+#: ../lib/modules.inc:1101
 msgid ""
 "The new password will be stored in the directory after you save this account."
 msgstr ""
 "新しいパスワードは個のアカウントをディレクトリにセーブした後で保存されます。"
 
-#: ../help/help.inc:113
+#: ../help/help.inc:111
 msgid ""
 "The number of users who may login to LAM is restricted. This can be either a "
 "fixed list of DNs or LAM can search LDAP to find a DN which matches the "
@@ -6945,16 +7045,16 @@ msgstr ""
 "fixed list of DNs or LAM can search LDAP to find a DN which matches the "
 "given user name."
 
-#: ../templates/tests/schemaTest.php:110
+#: ../templates/tests/schemaTest.php:112
 #, php-format
 msgid "The object class %s is not supported by your LDAP server."
 msgstr "オブジェクトクラス %s はこのLDAPサーバでサポートされていません。"
 
-#: ../lib/modules/inetOrgPerson.inc:573
+#: ../lib/modules/inetOrgPerson.inc:576
 msgid "The office name of the user (e.g. YourCompany, Human Resources)."
 msgstr "ユーザの事業所名"
 
-#: ../templates/selfService/selfServiceMain.php:270 ../lib/modules.inc:1929
+#: ../templates/selfService/selfServiceMain.php:270 ../lib/modules.inc:1949
 msgid "The operation was stopped because of the above errors."
 msgstr "上記のエラーによって操作が停止されました。"
 
@@ -7027,15 +7127,21 @@ msgstr ""
 "パスワードの強度が不足しています。少なくとも%s文字の大文字を入力してくださ"
 "い。"
 
-#: ../lib/modules.inc:1346
+#: ../lib/modules/imapAccess.inc:82
+msgid ""
+"The password of your IMAP admin user. The login name for the IMAP admin user "
+"is stored in the LAM server profile."
+msgstr "IMAP管理ユーザーのパスワード。IMAP管理ユーザーのログイン名はLAMのサーバープロファイルに保存されます。"
+
+#: ../lib/modules.inc:1389
 msgid "The password was set to:"
 msgstr "設定されたパスワード:"
 
-#: ../templates/lists/changePassword.php:333
+#: ../templates/lists/changePassword.php:412
 msgid "The password(s) were set to:"
 msgstr "設定されたパスワード:"
 
-#: ../lib/modules/posixAccount.inc:332
+#: ../lib/modules/posixAccount.inc:334
 msgid ""
 "The primary group for this account. You can insert a GID number or a group "
 "name."
@@ -7043,11 +7149,11 @@ msgstr ""
 "このアカウントに対するプライマリグループ。GID番号またはグループ名を入力してく"
 "ださい。"
 
-#: ../lib/modules/posixAccount.inc:399
+#: ../lib/modules/posixAccount.inc:401
 msgid "The primary group the host should be member of."
 msgstr "ホストがメンバでなければならないプライマリグループ。"
 
-#: ../lib/modules/posixAccount.inc:361
+#: ../lib/modules/posixAccount.inc:363
 msgid "The primary group the user should be member of."
 msgstr "ユーザがメンバでなければならないプライマリグループ。"
 
@@ -7067,7 +7173,7 @@ msgstr "範囲が他の範囲と衝突しています。"
 msgid "The range end needs to be greater than the range start."
 msgstr "範囲の末尾は先頭よりも大きくなくてはなりません。"
 
-#: ../lib/modules/inetOrgPerson.inc:553
+#: ../lib/modules/inetOrgPerson.inc:556
 msgid "The room number of the employee's office."
 msgstr "従業員の事務所の部屋番号。"
 
@@ -7079,8 +7185,8 @@ msgstr ""
 "スクリプトはwebサーバー上でwebサーバーのユーザーコンテキスト(例 apache/www-"
 "data)で実行されます。"
 
-#: ../lib/modules/sambaSamAccount.inc:370 ../lib/modules/zarafaUser.inc:117
-#: ../lib/modules/inetOrgPerson.inc:581
+#: ../lib/modules/sambaSamAccount.inc:375 ../lib/modules/zarafaUser.inc:117
+#: ../lib/modules/inetOrgPerson.inc:584
 msgid ""
 "The selected options will not be managed inside LAM. You can use this to "
 "reduce the number of displayed input fields."
@@ -7092,7 +7198,7 @@ msgstr ""
 msgid "The starting IP address of the range."
 msgstr "範囲の先頭IPアドレス。"
 
-#: ../lib/modules/inetOrgPerson.inc:565
+#: ../lib/modules/inetOrgPerson.inc:568
 msgid "The state where the user resides or works."
 msgstr "ユーザが居住または勤務している都道府県"
 
@@ -7104,7 +7210,9 @@ msgstr "静的テキストは少なくとも一文字以上でなければなり
 msgid ""
 "The subject of all password mails. If empty the first line of \"config/"
 "passwordMailTemplate.txt\" will be used."
-msgstr "全てのパスワード・メールの件名。もしも空の場合は、\"config/passwordMailTemplate.txt\" の先頭行が使用されます。"
+msgstr ""
+"全てのパスワード・メールの件名。もしも空の場合は、\"config/"
+"passwordMailTemplate.txt\" の先頭行が使用されます。"
 
 #: ../lib/modules/dhcp_settings.inc:273
 msgid "The subnet is already in use."
@@ -7138,7 +7246,7 @@ msgstr "ユーザーアカウントは無効で、ログインが禁止されて
 msgid "The user will get warned when his mailbox reaches this limit."
 msgstr "ユーザーはメールボックスがリミットに達した時に警告を受けます。"
 
-#: ../lib/modules/sambaSamAccount.inc:107
+#: ../lib/modules/sambaSamAccount.inc:112
 msgid ""
 "The value for the Samba 3 field \"User can/must change password\" needs to "
 "be a number."
@@ -7159,11 +7267,11 @@ msgstr "新しいパスワードに対応するワイルドカードは @@newPas
 msgid "There are new required attributes which need to be set."
 msgstr "設定すべき新しい必須属性があります。"
 
-#: ../lib/modules/posixGroup.inc:491
+#: ../lib/modules/posixGroup.inc:487
 msgid "There are still users who have this group as their primary group."
 msgstr "このグループをプライマリグループとするユーザがまだ存在します。"
 
-#: ../lib/modules/sambaGroupMapping.inc:425
+#: ../lib/modules/sambaGroupMapping.inc:440
 msgid "There can be only one group of this type."
 msgstr "このタイプのグループを一つだけ指定できます。"
 
@@ -7175,11 +7283,11 @@ msgstr "この発信者番号を使用しているユーザーが既に存在し
 msgid "There is already another user with this mailbox name."
 msgstr "このメールボックス名を使用しているユーザーが既に存在します。"
 
-#: ../templates/massDoUpload.php:127
+#: ../templates/massDoUpload.php:129
 msgid "There were errors while uploading:"
 msgstr "アップロードの際にエラーが発生しました。"
 
-#: ../lib/modules/posixGroup.inc:414
+#: ../lib/modules/posixGroup.inc:406
 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 "
@@ -7188,7 +7296,7 @@ msgstr ""
 "新しいグループアカウントを作成する際に使われるグループIDの最小値と最大値。新"
 "しいグループアカウントには、使用中の番号の最大値+1が常に割り当てられます。"
 
-#: ../lib/modules/posixAccount.inc:320
+#: ../lib/modules/posixAccount.inc:322
 msgid ""
 "These are the minimum and maximum numbers to use for machine IDs when "
 "creating new accounts for hosts. The range should be different from that of "
@@ -7198,7 +7306,7 @@ msgstr ""
 "囲はユーザアカウントのものと異なるようにしなくてはなりません。新しいホストア"
 "カウントには、使用中の番号の最大値+1が常に割り当てられます。"
 
-#: ../lib/modules/posixAccount.inc:316
+#: ../lib/modules/posixAccount.inc:318
 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 "
@@ -7208,7 +7316,7 @@ msgstr ""
 "マシンアカウントのものとは異なるようにしなくてはなりません。新しいユーザアカ"
 "ウントには、使用中の番号の最大値+1が常に割りあてられます。"
 
-#: ../lib/modules/nisnetgroup.inc:81 ../lib/modules/nisnetgroup.inc:85
+#: ../lib/modules/nisnetgroup.inc:86 ../lib/modules/nisnetgroup.inc:90
 msgid ""
 "These entries specify the members of the netgroup. You can limit the set to "
 "a host name, a user name, a domain name or any combination of them."
@@ -7227,7 +7335,7 @@ msgstr ""
 "なユーザー・サフィックスに無いユーザーが存在する場合は、ツリー・サフィックス"
 "を検索する事も出来ます。"
 
-#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:92
 msgid ""
 "This GID number is invalid! Please provide either a number or a group name."
 msgstr ""
@@ -7251,7 +7359,7 @@ msgstr "PC名は既に存在しています。"
 msgid "This account is marked for deletion."
 msgstr "このアカウントを削除対象としてマークしました。"
 
-#: ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/sambaSamAccount.inc:305
 msgid ""
 "This allows you to define this account as a special user like administrator "
 "or guest."
@@ -7259,19 +7367,19 @@ msgstr ""
 "このアカウントをadministratorやguest等の特殊ユーザとして定義する事を可能にし"
 "ます。"
 
-#: ../lib/modules/inetOrgPerson.inc:569
+#: ../lib/modules/inetOrgPerson.inc:572
 msgid "This can be used to specify if the user has a car license."
 msgstr "ユーザが運転免許を保有している場合に記入します。"
 
-#: ../help/help.inc:125
+#: ../help/help.inc:123
 msgid "This changes the password of the selected profile."
 msgstr "選択されたプロファイルのパスワードを変更します。"
 
-#: ../help/help.inc:127
+#: ../help/help.inc:125
 msgid "This changes the profile which is selected by default at login."
 msgstr "ログイン時にデフォルトで選択されるプロファイルを変更します。"
 
-#: ../templates/massBuildAccounts.php:149
+#: ../templates/massBuildAccounts.php:150
 msgid ""
 "This column is defined to include unique entries but duplicates were found:"
 msgstr ""
@@ -7293,7 +7401,7 @@ msgstr ""
 "ログインウィンドウの言語を定義し、この言語を既定値の言語として設定します。"
 "ユーザはログイン時に言語を変更できます。"
 
-#: ../help/help.inc:111
+#: ../help/help.inc:109
 msgid ""
 "This defines the rights for the home directories which are created by "
 "lamdaemon."
@@ -7315,11 +7423,11 @@ msgstr "デバイスの位置を記入します。"
 msgid "This describes the location of the host."
 msgstr "ホストの場所を記入します。"
 
-#: ../lib/modules/inetOrgPerson.inc:561
+#: ../lib/modules/inetOrgPerson.inc:564
 msgid "This describes the location of the user."
 msgstr "ユーザの住所を記入します。"
 
-#: ../lib/lamPDF.inc:126
+#: ../lib/lamPDF.inc:113
 msgid "This document was automatically created by LDAP Account Manager"
 msgstr "この文書はLDAP Account Managerによって自動的に生成されました。"
 
@@ -7327,7 +7435,9 @@ msgstr "この文書はLDAP Account Managerによって自動的に生成され
 msgid ""
 "This email address will be set as sender address of all password mails. If "
 "empty the system default (php.ini) will be used."
-msgstr "このメールアドレスはパスワード・メールの発信者アドレスにセットされます。もしも空の場合は、システムのデフォルト(php.ini)が使用されます。"
+msgstr ""
+"このメールアドレスはパスワード・メールの発信者アドレスにセットされます。もし"
+"も空の場合は、システムのデフォルト(php.ini)が使用されます。"
 
 #: ../templates/tree/edit.php:210
 msgid "This entry has no attributes"
@@ -7338,7 +7448,7 @@ msgstr "このエントリは属性を持っていません。"
 msgid "This entry is the root of a sub-tree containing %s entries."
 msgstr "このエントリは %s エントリを含むサブツリーのルートです。"
 
-#: ../lib/modules/posixAccount.inc:92
+#: ../lib/modules/posixAccount.inc:94
 msgid "This gecos value is invalid!"
 msgstr "gecosの値が正しくありません!"
 
@@ -7370,7 +7480,7 @@ msgstr "カンマで区切られた受信者のリスト。"
 msgid "This is a comma separated list of the users public email addresses."
 msgstr "ユーザの公開メールアドレスのカンマで区切られたリスト。"
 
-#: ../help/help.inc:141
+#: ../help/help.inc:139
 msgid ""
 "This is a list of IP addresses from hosts who may access LAM. You can use \"*"
 "\" as wildcard (e.g. 192.168.0.*)."
@@ -7393,7 +7503,7 @@ msgstr ""
 msgid "This is a list of nick names for this user."
 msgstr "このユーザーのニックネームのリスト。"
 
-#: ../help/help.inc:107
+#: ../help/help.inc:105
 msgid ""
 "This is a list of the servers where the lamdaemon scripts are stored. LDAP "
 "Account Manager will make a SSH connection to the servers with the user name "
@@ -7429,15 +7539,15 @@ msgstr ""
 
 #: ../lib/modules/ipHost.inc:110 ../lib/modules/device.inc:124
 #: ../lib/modules/eduPerson.inc:216 ../lib/modules/eduPerson.inc:218
-#: ../lib/modules/inetOrgPerson.inc:73 ../lib/modules/aliasEntry.inc:79
+#: ../lib/modules/inetOrgPerson.inc:76 ../lib/modules/aliasEntry.inc:79
 msgid "This is not a valid DN!"
 msgstr "無効なDNです!"
 
-#: ../lib/modules/sambaSamAccount.inc:94
+#: ../lib/modules/sambaSamAccount.inc:99
 msgid "This is not a valid RID number!"
 msgstr "無効なRID番号です!"
 
-#: ../lib/modules/sambaGroupMapping.inc:427
+#: ../lib/modules/sambaGroupMapping.inc:442
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不正なSamba 3グループタイプです!"
 
@@ -7471,7 +7581,7 @@ msgstr "ネットワークカードデバイスのIPアドレスです(例 123.1
 msgid "This is the LDAP DN of the host's manager."
 msgstr "ホスト・マネージャーのLDAP DN。"
 
-#: ../lib/modules/inetOrgPerson.inc:501
+#: ../lib/modules/inetOrgPerson.inc:504
 msgid ""
 "This is the LDAP DN of the user's manager. Use this property to represent "
 "hierarchies in your company."
@@ -7485,7 +7595,7 @@ msgid ""
 "EF:18)."
 msgstr "ネットワークカードデバイスのMACアドレスです(例 0:01:02:DE:EF:18)。"
 
-#: ../lib/modules/sambaSamAccount.inc:297
+#: ../lib/modules/sambaSamAccount.inc:302
 msgid "This is the SID of the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループのSIDです。"
 
@@ -7497,11 +7607,11 @@ msgstr ""
 "ホームディレクトリを作成し、quotaを設定するための外部スクリプトの絶対パスで"
 "す。"
 
-#: ../lib/modules/sambaSamAccount.inc:235
+#: ../lib/modules/sambaSamAccount.inc:240
 msgid "This is the account's Windows password."
 msgstr "アカウントのWindowsパスワードです。"
 
-#: ../lib/modules/sambaSamAccount.inc:232
+#: ../lib/modules/sambaSamAccount.inc:237
 msgid "This is the account's full name on Windows systems."
 msgstr "アカウントのWindowsシステム上のフルネームです。"
 
@@ -7509,7 +7619,7 @@ msgstr "アカウントのWindowsシステム上のフルネームです。"
 msgid "This is the active password policy for this account."
 msgstr "このアカウントに対するアクティブなパスワード・ポリシー。"
 
-#: ../lib/modules/sambaSamAccount.inc:319
+#: ../lib/modules/sambaSamAccount.inc:324
 #: ../lib/modules/phpGroupwareUser.inc:83 ../lib/modules/shadowAccount.inc:185
 msgid "This is the date when the account will expire. Format: DD-MM-YYYY"
 msgstr "アカウントが失効する日。形式は: DD-MM-YYYY"
@@ -7518,13 +7628,15 @@ msgstr "アカウントが失効する日。形式は: DD-MM-YYYY"
 msgid ""
 "This is the date when the user changed his password. If you specify a "
 "maximum password age then you can force a password change here."
-msgstr "ユーザー自身がパスワードを変更した日付です。パスワード有効期限を設定すると、パスワードの変更を強制する事ができます。"
+msgstr ""
+"ユーザー自身がパスワードを変更した日付です。パスワード有効期限を設定すると、"
+"パスワードの変更を強制する事ができます。"
 
-#: ../lib/modules/sambaGroupMapping.inc:346
+#: ../lib/modules/sambaGroupMapping.inc:357
 msgid "This is the group name which will be shown in Windows."
 msgstr "Windows上で表示されるグループ名です。"
 
-#: ../help/help.inc:149
+#: ../help/help.inc:147
 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 "
@@ -7555,22 +7667,22 @@ msgstr ""
 msgid "This is the mail server for the user."
 msgstr "ユーザに対するメールサーバ。"
 
-#: ../lib/modules/nisnetgroup.inc:69 ../lib/modules/groupOfNames.inc:61
+#: ../lib/modules/nisnetgroup.inc:74 ../lib/modules/groupOfNames.inc:61
 msgid "This is the name of this group."
 msgstr "このグループの名前。"
 
-#: ../lib/modules/posixAccount.inc:407
+#: ../lib/modules/posixAccount.inc:409
 msgid ""
 "This is the natural name of the host. If empty, the host name will be used."
 msgstr "このホストの呼称。未入力の場合は、ホスト名が使用されます。"
 
-#: ../lib/modules/inetOrgPerson.inc:537
+#: ../lib/modules/inetOrgPerson.inc:540
 msgid ""
 "This is the natural name of the user. If empty, the first and last name is "
 "used."
 msgstr "このユーザの呼称。未入力の場合は、姓と名が使用されます。"
 
-#: ../lib/modules/posixAccount.inc:385
+#: ../lib/modules/posixAccount.inc:387
 msgid ""
 "This is the natural name of the user. If empty, the first and last name or "
 "user name is used."
@@ -7600,11 +7712,11 @@ msgstr ""
 "アカウント一覧の表示行数です。この数より多くのエントリがある場合は、リストは"
 "複数のページに分割されます。"
 
-#: ../lib/modules/sambaSamAccount.inc:328
+#: ../lib/modules/sambaSamAccount.inc:333
 msgid "This is the path to the user's home directory."
 msgstr "ユーザのホームディレクトリのパス。"
 
-#: ../lib/modules/sambaGroupMapping.inc:354
+#: ../lib/modules/sambaGroupMapping.inc:365
 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 "
@@ -7614,7 +7726,7 @@ msgstr ""
 "合、LAMはUIDからRIDを算出します。数値または特殊グループ名のどちらかを指定でき"
 "ます。"
 
-#: ../lib/modules/sambaSamAccount.inc:303
+#: ../lib/modules/sambaSamAccount.inc:308
 msgid ""
 "This is the relative ID number for your Windows account. You can either "
 "enter a number or one of these special accounts: "
@@ -7622,7 +7734,7 @@ msgstr ""
 "あなたのWindowsアカウントに対する相対ID番号です。数字またはこれらの特殊アカウ"
 "ントのどれか一つを指定できます: "
 
-#: ../lib/modules/sambaSamAccount.inc:307
+#: ../lib/modules/sambaSamAccount.inc:312
 msgid ""
 "This is the relative ID number for your host account. If you leave this "
 "empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
@@ -7671,7 +7783,7 @@ msgstr ""
 "アカウントをロックされたユーザーがログインできなくなる時間(分単位)。-1は無期"
 "限を意味する。"
 
-#: ../help/help.inc:135
+#: ../help/help.inc:133
 msgid ""
 "This is the time (in minutes) of inactivity after which a user is "
 "automatically logged off."
@@ -7695,7 +7807,7 @@ msgstr ""
 "他のユーザが将来の予定をチェックする場合の時間的上限(日数)。未入力の場合はデ"
 "フォルト値(60日)がセットされます。"
 
-#: ../lib/modules/sambaSamAccount.inc:322
+#: ../lib/modules/sambaSamAccount.inc:327
 msgid ""
 "This is the time zone of your Samba server. LAM needs this information to "
 "display the logon hours correctly."
@@ -7703,7 +7815,7 @@ msgstr ""
 "Sambaサーバのタイムゾーン。LAMがログオン時間を正確に表示するために、この情報"
 "が必要です。"
 
-#: ../lib/modules/sambaSamAccount.inc:294
+#: ../lib/modules/sambaSamAccount.inc:299
 msgid "This is the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループです。"
 
@@ -7711,7 +7823,7 @@ msgstr "ユーザのプライマリWindowsグループです。"
 msgid "This is used to mark this account as resource."
 msgstr "このアカウントがリソースである事の目印として使用します。"
 
-#: ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/posixAccount.inc:95
 msgid "This login shell is invalid!"
 msgstr "ログインシェルが正しくありません!"
 
@@ -7719,6 +7831,10 @@ msgstr "ログインシェルが正しくありません!"
 msgid "This mail address is already in use:"
 msgstr "このメールアドレスは既に使用されています:"
 
+#: ../lib/modules/imapAccess.inc:91
+msgid "This mailbox will be created/deleted."
+msgstr "このメールボックスが作成/削除されます。"
+
 #: ../lib/lamdaemon.inc:46
 msgid "This module requires the PHP ssh2 extension."
 msgstr "個のモジュールはPHP ssh2拡張を必要とします。"
@@ -7727,12 +7843,18 @@ msgstr "個のモジュールはPHP ssh2拡張を必要とします。"
 msgid "This object class is obsolete."
 msgstr "このオブジェクトクラスは旧式です。"
 
-#: ../lib/modules/sambaSamAccount.inc:313
+#: ../lib/modules/imapAccess.inc:73
+msgid ""
+"This option allows you to disable the certificate check of your IMAP server "
+"certificate. Disabling the certificate check is not recommended."
+msgstr "このオプションは、IMAPサーバー証明書の確認を無効化します。証明書の確認を無効化することは推奨されません。"
+
+#: ../lib/modules/sambaSamAccount.inc:318
 msgid "This option defines the allowed logon hours for this account."
 msgstr ""
 "このオプションは、このアカウントがログオンを許可される時間を定義します。"
 
-#: ../lib/modules/sambaSamAccount.inc:316
+#: ../lib/modules/sambaSamAccount.inc:321
 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 "
@@ -7747,15 +7869,15 @@ msgstr ""
 msgid "This pair of extension name and priority already exists."
 msgstr "この拡張名とポリシーは既に存在しています。"
 
-#: ../lib/modules/sambaSamAccount.inc:337
+#: ../lib/modules/sambaSamAccount.inc:342
 msgid "This program is run after the login."
 msgstr "このプログラムはログオンの後に実行されます。"
 
-#: ../lib/modules/sambaSamAccount.inc:361
+#: ../lib/modules/sambaSamAccount.inc:366
 msgid "This specifies the reconnect policy."
 msgstr "再接続のポリシーを記述します。"
 
-#: ../lib/modules/sambaSamAccount.inc:358
+#: ../lib/modules/sambaSamAccount.inc:363
 msgid "This specifies what to do when the client connection is broken."
 msgstr "クライアント接続が壊れた場合の処理を記述します。"
 
@@ -7781,15 +7903,11 @@ msgid ""
 "email or user name)."
 msgstr "この文字列はLDAP検索属性を簡単に説明します(例. emailまたはユーザ名)。"
 
-#: ../help/help.inc:102
-msgid "This text will appear on top of every user PDF file."
-msgstr "このテキストは、各ユーザのPDFファイルの先頭に表示されます。"
-
 #: ../lib/tools/pdfEdit.inc:53
 msgid "This tool allows you to customize the PDF pages."
 msgstr "このツールで、あなたのPDFページをカスタマイズする事ができます。"
 
-#: ../templates/lists/userlink.php:61 ../templates/lists/changePassword.php:43
+#: ../templates/lists/userlink.php:61 ../templates/lists/changePassword.php:44
 msgid "This user was not found!"
 msgstr "ユーザが見つかりません!"
 
@@ -7798,9 +7916,10 @@ msgid "This value can only be \"Room\" or \"Equipment\"."
 msgstr "この値は、\"部屋\"または\"設備\"のいずれかでなくてはなりません。"
 
 #: ../lib/modules/zarafaGroup.inc:141 ../lib/modules/zarafaGroup.inc:142
-#: ../lib/modules/zarafaGroup.inc:143 ../lib/modules/sambaSamAccount.inc:97
-#: ../lib/modules/sambaSamAccount.inc:98 ../lib/modules/sambaSamAccount.inc:99
-#: ../lib/modules/sambaSamAccount.inc:100 ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/zarafaGroup.inc:143 ../lib/modules/sambaSamAccount.inc:102
+#: ../lib/modules/sambaSamAccount.inc:103
+#: ../lib/modules/sambaSamAccount.inc:104
+#: ../lib/modules/sambaSamAccount.inc:105 ../lib/modules/posixAccount.inc:96
 #: ../lib/modules/zarafaUser.inc:345 ../lib/modules/zarafaUser.inc:346
 #: ../lib/modules/zarafaUser.inc:347 ../lib/modules/zarafaUser.inc:348
 #: ../lib/modules/zarafaUser.inc:349 ../lib/modules/ppolicyUser.inc:86
@@ -7808,7 +7927,7 @@ msgstr "この値は、\"部屋\"または\"設備\"のいずれかでなくて
 msgid "This value can only be \"true\" or \"false\"."
 msgstr "この値は、\"true\"または\"false\"のいずれかでなくてはなりません。"
 
-#: ../lib/modules/posixGroup.inc:490
+#: ../lib/modules/posixGroup.inc:486
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "この値はセミコロンで区切られたユーザ名でなくてはなりません。"
 
@@ -7816,7 +7935,7 @@ msgstr "この値はセミコロンで区切られたユーザ名でなくては
 msgid "This will create a new organizational unit under the selected one."
 msgstr "選択された位置の下に新しい organizational unit を作成します。"
 
-#: ../lib/modules/posixAccount.inc:348
+#: ../lib/modules/posixAccount.inc:350
 msgid "This will create the user's home directory on the specified server."
 msgstr "ユーザのホームディレクトリを指定されたサーバ上に作成します。"
 
@@ -7826,21 +7945,21 @@ msgid ""
 msgstr ""
 "選択された organizational unitを削除します。OUは空でなくてはなりません。"
 
-#: ../help/help.inc:123
+#: ../help/help.inc:121
 msgid "This will delete the selected profile."
 msgstr "選択されたプロファイルを削除します。"
 
-#: ../lib/modules/eduPerson.inc:128 ../lib/modules/sambaSamAccount.inc:373
+#: ../lib/modules/eduPerson.inc:128 ../lib/modules/sambaSamAccount.inc:378
 #: ../lib/modules/zarafaUser.inc:121 ../lib/modules/phpGroupwareUser.inc:87
 #: ../lib/modules/shadowAccount.inc:189 ../lib/modules/hostObject.inc:77
 msgid "This will enable the extension automatically if this profile is loaded."
 msgstr "プロファイルがロードされた場合に自動的に拡張を有効にします。"
 
-#: ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/sambaSamAccount.inc:243
 msgid "This will reset the host's password to a default value."
 msgstr "ホストのパスワードをデフォルト値にリセットします。"
 
-#: ../templates/lists/changePassword.php:203 ../help/help.inc:185
+#: ../templates/lists/changePassword.php:249 ../help/help.inc:185
 msgid ""
 "This will set a random password and display it on the screen or send it the "
 "user via mail."
@@ -7856,20 +7975,20 @@ msgstr ""
 "Kolabdに削除を命ずる特殊なフラグをセットします。Kolabアカウントを完全に削除す"
 "る場合に使用します(e.g. メールボックスは削除されます)。"
 
-#: ../lib/modules/sambaSamAccount.inc:1280
+#: ../lib/modules/sambaSamAccount.inc:1273
 msgid "Thursday"
 msgstr "木曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:1302
+#: ../lib/modules/sambaSamAccount.inc:1295
 msgid "Time"
 msgstr "時刻"
 
-#: ../lib/modules/sambaSamAccount.inc:342
+#: ../lib/modules/sambaSamAccount.inc:347
 msgid "Time limit"
 msgstr "時間制限"
 
-#: ../lib/modules/sambaSamAccount.inc:321
-#: ../lib/modules/sambaSamAccount.inc:549
+#: ../lib/modules/sambaSamAccount.inc:326
+#: ../lib/modules/sambaSamAccount.inc:554
 msgid "Time zone"
 msgstr "タイムゾーン"
 
@@ -7877,7 +7996,7 @@ msgstr "タイムゾーン"
 msgid "Timeout while executing lamdaemon commands!"
 msgstr "lamdaemonコマンドの実行がタイムアウトしました!"
 
-#: ../lib/modules/posixAccount.inc:377
+#: ../lib/modules/posixAccount.inc:379
 msgid ""
 "To disable login use /bin/false. The list of shells is read from lam/config/"
 "shells"
@@ -7885,11 +8004,11 @@ msgstr ""
 "ログインを禁止するためには/bin/falseを使ってください。シェルの一覧は lam/"
 "config/shells から読み込まれます。"
 
-#: ../lib/modules/sambaSamAccount.inc:543
+#: ../lib/modules/sambaSamAccount.inc:548
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "東京、ソウル、大阪、ヤクーツク"
 
-#: ../templates/main_header.php:73
+#: ../templates/tools.php:63 ../templates/main_header.php:98
 msgid "Tools"
 msgstr "ツール"
 
@@ -7897,23 +8016,23 @@ msgstr "ツール"
 msgid "Total entries"
 msgstr "エントリ総数"
 
-#: ../lib/types/user.inc:260
+#: ../lib/types/user.inc:320
 msgid "Translate GID number to group name"
 msgstr "GID番号をグループ名に変換"
 
-#: ../templates/config/confmain.php:269 ../help/help.inc:73
+#: ../templates/config/confmain.php:240 ../help/help.inc:73
 msgid "Tree suffix"
 msgstr "ツリーサフィックス"
 
-#: ../templates/main_header.php:87
+#: ../templates/main_header.php:128
 msgid "Tree view"
 msgstr "ツリービュー"
 
-#: ../templates/config/confmain.php:610
+#: ../templates/config/confmain.php:431
 msgid "TreeSuffix is invalid!"
 msgstr "ツリーサフィックスが正しくありません!"
 
-#: ../lib/modules/sambaSamAccount.inc:1280
+#: ../lib/modules/sambaSamAccount.inc:1273
 msgid "Tuesday"
 msgstr "木曜日"
 
@@ -7925,30 +8044,30 @@ msgstr "木曜日"
 msgid "Type"
 msgstr "型"
 
-#: ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:80
 msgid "UID"
 msgstr "UID"
 
-#: ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:80
 msgid "UID has changed. Do you want to change home directory?"
 msgstr "UIDが変更されました。ホームディレクトリを変更しますか?"
 
-#: ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:75
 msgid ""
 "UID must be a number. It has to be inside the UID range which is defined in "
 "your configuration profile."
 msgstr "UIDは数値で、設定ファイルで定義されたUIDの範囲内でなくてはなりません。"
 
 #: ../lib/types/host.inc:95 ../lib/types/user.inc:92
-#: ../lib/modules/posixAccount.inc:74 ../lib/modules/posixAccount.inc:202
-#: ../lib/modules/posixAccount.inc:276 ../lib/modules/posixAccount.inc:298
-#: ../lib/modules/posixAccount.inc:315 ../lib/modules/posixAccount.inc:319
-#: ../lib/modules/posixAccount.inc:327 ../lib/modules/posixAccount.inc:962
-#: ../lib/modules/posixAccount.inc:1165
+#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:204
+#: ../lib/modules/posixAccount.inc:278 ../lib/modules/posixAccount.inc:300
+#: ../lib/modules/posixAccount.inc:317 ../lib/modules/posixAccount.inc:321
+#: ../lib/modules/posixAccount.inc:329 ../lib/modules/posixAccount.inc:944
+#: ../lib/modules/posixAccount.inc:1146
 msgid "UID number"
 msgstr "UID番号"
 
-#: ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:76
 #, php-format
 msgid ""
 "UID number has changed. To keep file ownership you have to run the following "
@@ -7958,11 +8077,11 @@ msgstr ""
 "コマンドをroot権限で実行す必要があります: 'find / -uid %s -exec chown %s {} "
 "\\;'"
 
-#: ../lib/modules/posixAccount.inc:65
+#: ../lib/modules/posixAccount.inc:67
 msgid "UID ranges for Unix accounts"
 msgstr "unixアカウントに対するUIDの範囲"
 
-#: ../lib/modules/sambaSamAccount.inc:279
+#: ../lib/modules/sambaSamAccount.inc:284
 msgid ""
 "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced "
 "with user and group name."
@@ -7975,6 +8094,10 @@ msgid ""
 "URI (either URN or URL) that indicates a set of rights to specific resources."
 msgstr "特定のリソースに対する権利の集合を示すURL(あるいはURNまたはURL)。"
 
+#: ../lib/modules/imapAccess.inc:135
+msgid "Unable to change ACL on IMAP server for mailbox deletion."
+msgstr "メールボックスを削除するIMAPサーバー上のACLを変更できません。"
+
 #: ../templates/selfService/selfServiceMain.php:273
 msgid ""
 "Unable to change your account. Maybe you do not have enough rights to change "
@@ -7983,11 +8106,15 @@ msgstr ""
 "アカウントを変更できません。あなたはおそらく、設定を変更する権限を持っていま"
 "せん。"
 
-#: ../templates/tests/lamdaemonTest.php:239 ../lib/lamdaemon.inc:88
+#: ../templates/tests/lamdaemonTest.php:253 ../lib/lamdaemon.inc:88
 #: ../lib/lamdaemon.inc:93 ../lib/lamdaemon.inc:140 ../lib/lamdaemon.inc:145
 msgid "Unable to connect to remote server!"
 msgstr "リモートサーバーに接続できません!"
 
+#: ../lib/modules/imapAccess.inc:137
+msgid "Unable to create mailbox on IMAP server."
+msgstr "IMAPサーバー上にメールボックスを作成できません。"
+
 #: ../templates/ou_edit.php:77
 msgid "Unable to create new OU!"
 msgstr "新しいOUを作成できません!"
@@ -8001,18 +8128,22 @@ msgstr "新しいプロファイルを作成できません!"
 msgid "Unable to delete OU!"
 msgstr "OUを削除できません!"
 
-#: ../templates/pdfedit/pdfmain.php:122
+#: ../templates/pdfedit/pdfmain.php:123
 msgid "Unable to delete PDF structure!"
 msgstr "PDF構成を削除できません!"
 
+#: ../lib/modules/imapAccess.inc:136
+msgid "Unable to delete mailbox from IMAP server."
+msgstr "IMAPサーバー上のメールボックスを削除できません。"
+
 #: ../templates/config/profmanage.php:146
 #: ../templates/selfService/profManage.php:129
-#: ../templates/profedit/profilemain.php:111
+#: ../templates/profedit/profilemain.php:112
 msgid "Unable to delete profile!"
 msgstr "プロファイルを削除できません!"
 
-#: ../lib/modules/posixAccount.inc:1352 ../lib/modules/posixAccount.inc:1586
-#: ../lib/modules/nisnetgroup.inc:538
+#: ../lib/modules/posixAccount.inc:1332 ../lib/modules/posixAccount.inc:1566
+#: ../lib/modules/nisnetgroup.inc:534
 msgid "Unable to find group in LDAP."
 msgstr "LDAP内にグループが見つかりません。"
 
@@ -8020,28 +8151,24 @@ msgstr "LDAP内にグループが見つかりません。"
 msgid "Unable to find the user name in LDAP."
 msgstr "LDAP内にユーザー名が見つかりません。"
 
-#: ../lib/modules.inc:1698 ../lib/modules.inc:1702
+#: ../lib/modules.inc:1710 ../lib/modules.inc:1714
 msgid "Unable to load LDAP entry:"
 msgstr "LDAPエントリをロードできません:"
 
-#: ../templates/config/confmain.php:388
-msgid ""
-"Unable to load available languages. Setting English as default language. For "
-"further instructions please contact the Admin of this site."
-msgstr ""
-"有効な言語をロードできません。英語を既定値の言語とします。より詳しい説明は、"
-"このサイトの管理者に連絡してください。"
-
 #: ../lib/profiles.inc:91 ../lib/profiles.inc:95 ../lib/selfService.inc:174
 #: ../lib/selfService.inc:178
 msgid "Unable to load profile!"
 msgstr "プロファイルをロードできません!"
 
-#: ../templates/lists/changePassword.php:416
+#: ../lib/modules/imapAccess.inc:138
+msgid "Unable to locate mailbox on IMAP."
+msgstr "IMAP上のメールボックスを発見できません。"
+
+#: ../templates/lists/changePassword.php:505
 msgid "Unable to read sambaSID attribute."
 msgstr "sambaSID属性の読み込みができません。"
 
-#: ../templates/tests/schemaTest.php:56 ../templates/schema/schema.php:91
+#: ../templates/tests/schemaTest.php:59 ../templates/schema/schema.php:91
 #: ../templates/schema/schema.php:109 ../templates/schema/schema.php:270
 #: ../templates/schema/schema.php:304
 msgid "Unable to retrieve schema!"
@@ -8052,12 +8179,12 @@ msgstr "スキーマを取得できません!"
 msgid "Unable to save profile!"
 msgstr "プロファイルを保存できません!"
 
-#: ../templates/lists/changePassword.php:372
+#: ../templates/lists/changePassword.php:458
 msgid "Unable to send mail!"
 msgstr "メールを送信できません!"
 
-#: ../templates/lists/changePassword.php:412
-#: ../templates/lists/changePassword.php:427
+#: ../templates/lists/changePassword.php:500
+#: ../templates/lists/changePassword.php:517
 msgid ""
 "Unable to sync the time when the user can/must change his password because "
 "no domain was found."
@@ -8065,11 +8192,11 @@ msgstr ""
 "ドメインが見つからないため、ユーザによるパスワード変更が許可/強制される時刻を"
 "同期できません。"
 
-#: ../lib/modules/posixGroup.inc:297 ../lib/modules/posixAccount.inc:127
+#: ../lib/modules/posixGroup.inc:289 ../lib/modules/posixAccount.inc:129
 msgid "Unix"
 msgstr "unix"
 
-#: ../templates/tests/lamdaemonTest.php:197
+#: ../templates/tests/lamdaemonTest.php:206
 msgid "Unix account"
 msgstr "unixアカウント"
 
@@ -8078,39 +8205,43 @@ msgstr "unixアカウント"
 msgid "Unknown delegate address: %s"
 msgstr "未知の委任アドレス: %s"
 
-#: ../templates/lists/changePassword.php:143
+#: ../templates/lists/changePassword.php:187
 msgid "Unlock Samba account"
 msgstr "Sambaアカウントのアンロック"
 
-#: ../lib/modules/posixGroup.inc:206 ../lib/modules/posixAccount.inc:1012
+#: ../lib/modules/posixGroup.inc:199 ../lib/modules/posixAccount.inc:994
 msgid "Unlock password"
 msgstr "パスワード・ロックの解除"
 
-#: ../templates/masscreate.php:98 ../templates/config/confmodules.php:363
+#: ../templates/masscreate.php:98 ../templates/config/confmodules.php:365
 msgid "Unsolved dependency:"
 msgstr "依存関係が解決できませんでした:"
 
-#: ../templates/pdfedit/pdfpage.php:429
+#: ../templates/pdfedit/pdfpage.php:457
 msgid "Up"
 msgstr "上"
 
-#: ../templates/lists/changePassword.php:146
+#: ../templates/lists/changePassword.php:190
 msgid "Update Samba password timestamps"
 msgstr "Sambaパスワードのタイムスタンプを更新"
 
-#: ../lib/modules/sambaSamAccount.inc:226
+#: ../lib/modules/sambaSamAccount.inc:231
 msgid "Update attribute \"sambaPwdLastSet\" on password change"
 msgstr "パスワード変更時に属性 \"sambaPwdLastSet\" を更新する。"
 
-#: ../templates/massBuildAccounts.php:198
+#: ../templates/massBuildAccounts.php:199
 msgid "Upload accounts to LDAP"
 msgstr "アカウントをLDAPにアップロード"
 
-#: ../templates/masscreate.php:223
+#: ../templates/masscreate.php:241
 msgid "Upload file and create accounts"
 msgstr "ファイルをアップロードして、アカウントを作成します。"
 
-#: ../lib/modules.inc:478
+#: ../templates/massDoUpload.php:125 ../lib/lists.inc:940
+msgid "Upload has finished"
+msgstr "アップロードが完了しました"
+
+#: ../lib/modules.inc:476
 #, php-format
 msgid "Upload was stopped after errors in %s module!"
 msgstr "%s モジュールでエラーが発生したため、アプロードを中止しました。"
@@ -8119,17 +8250,17 @@ msgstr "%s モジュールでエラーが発生したため、アプロードを
 msgid "Usage"
 msgstr "使用方法"
 
-#: ../lib/modules/sambaSamAccount.inc:240
-#: ../lib/modules/sambaSamAccount.inc:243
-#: ../lib/modules/sambaSamAccount.inc:401
+#: ../lib/modules/sambaSamAccount.inc:245
+#: ../lib/modules/sambaSamAccount.inc:248
+#: ../lib/modules/sambaSamAccount.inc:406
 msgid "Use Unix password"
 msgstr "unixパスワードを使用"
 
-#: ../lib/modules/sambaSamAccount.inc:246
-#: ../lib/modules/sambaSamAccount.inc:249
-#: ../lib/modules/sambaSamAccount.inc:409
-#: ../lib/modules/sambaSamAccount.inc:1068
-#: ../lib/modules/sambaSamAccount.inc:1473
+#: ../lib/modules/sambaSamAccount.inc:251
+#: ../lib/modules/sambaSamAccount.inc:254
+#: ../lib/modules/sambaSamAccount.inc:414
+#: ../lib/modules/sambaSamAccount.inc:1062
+#: ../lib/modules/sambaSamAccount.inc:1466
 msgid "Use no password"
 msgstr "パスワードなし"
 
@@ -8137,7 +8268,7 @@ msgstr "パスワードなし"
 msgid "Use this to hide this entry from the address book."
 msgstr "このエントリをアドレス帳から隠す場合に使用します。"
 
-#: ../lib/modules/quota.inc:101 ../lib/modules/quota.inc:388
+#: ../lib/modules/quota.inc:101 ../lib/modules/quota.inc:387
 msgid "Used blocks"
 msgstr "使用したブロック"
 
@@ -8158,7 +8289,7 @@ msgid "Used for calculating RIDs from UID/GID. Do not change if unsure."
 msgstr ""
 "RIDs を UID/GID から計算するために使用します。自信がないなら変更しないこと。"
 
-#: ../lib/modules/quota.inc:123 ../lib/modules/quota.inc:392
+#: ../lib/modules/quota.inc:123 ../lib/modules/quota.inc:391
 msgid "Used inodes"
 msgstr "使用したinode"
 
@@ -8166,8 +8297,8 @@ msgstr "使用したinode"
 msgid "Used inodes (files)"
 msgstr "使用したinode(ファイル)"
 
-#: ../lib/modules/sambaGroupMapping.inc:67 ../lib/modules/nisnetgroup.inc:204
-#: ../lib/modules/nisnetgroup.inc:586
+#: ../lib/modules/sambaGroupMapping.inc:69 ../lib/modules/nisnetgroup.inc:209
+#: ../lib/modules/nisnetgroup.inc:582
 msgid "User"
 msgstr "ユーザ"
 
@@ -8179,17 +8310,17 @@ msgstr "ユーザ ID"
 msgid "User accounts (e.g. Unix, Samba and Kolab)"
 msgstr "ユーザアカウント(e.g. Unix, Samba and Kolab)"
 
-#: ../lib/modules/sambaSamAccount.inc:270
-#: ../lib/modules/sambaSamAccount.inc:1082
+#: ../lib/modules/sambaSamAccount.inc:275
+#: ../lib/modules/sambaSamAccount.inc:1076
 msgid "User can change password"
 msgstr "ユーザはパスワードを変更可能"
 
-#: ../lib/modules/posixAccount.inc:357
+#: ../lib/modules/posixAccount.inc:359
 msgid "User description. If left empty first and last name will be used."
 msgstr ""
 "ユーザの説明。もしも空ならば、姓(last name)と名(first name)が使われます。"
 
-#: ../lib/modules/inetOrgPerson.inc:481
+#: ../lib/modules/inetOrgPerson.inc:484
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "ユーザの説明。もしも空ならば、姓(surname)と名(given)が使われます。"
 
@@ -8201,54 +8332,54 @@ msgstr "ユーザの説明。もしも空ならば、ユーザ名が使われま
 msgid "User modification"
 msgstr "ユーザによる変更"
 
-#: ../lib/modules/sambaSamAccount.inc:272
-#: ../lib/modules/sambaSamAccount.inc:1088
+#: ../lib/modules/sambaSamAccount.inc:277
+#: ../lib/modules/sambaSamAccount.inc:1082
 msgid "User must change password"
 msgstr "ユーザはパスワード変更が必要"
 
-#: ../templates/lists/changePassword.php:177 ../templates/login.php:272
+#: ../templates/lists/changePassword.php:223 ../templates/login.php:272
 #: ../lib/types/alias.inc:91 ../lib/types/user.inc:94
 #: ../lib/modules/account.inc:78 ../lib/modules/account.inc:94
-#: ../lib/modules/account.inc:116 ../lib/modules/account.inc:118
-#: ../lib/modules/account.inc:119 ../lib/modules/account.inc:205
-#: ../lib/modules/account.inc:231 ../lib/modules/account.inc:255
+#: ../lib/modules/account.inc:117 ../lib/modules/account.inc:119
+#: ../lib/modules/account.inc:120 ../lib/modules/account.inc:206
+#: ../lib/modules/account.inc:232 ../lib/modules/account.inc:256
 #: ../lib/modules/uidObject.inc:38 ../lib/modules/uidObject.inc:60
 #: ../lib/modules/uidObject.inc:69 ../lib/modules/uidObject.inc:78
 #: ../lib/modules/uidObject.inc:93 ../lib/modules/uidObject.inc:155
-#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:188
-#: ../lib/modules/posixAccount.inc:297 ../lib/modules/posixAccount.inc:352
-#: ../lib/modules/posixAccount.inc:951 ../lib/modules/posixAccount.inc:1163
-#: ../lib/modules/zarafaUser.inc:751 ../lib/modules/nisnetgroup.inc:137
-#: ../lib/modules/nisnetgroup.inc:471 ../lib/modules/inetOrgPerson.inc:70
-#: ../lib/modules/inetOrgPerson.inc:473 ../lib/modules/inetOrgPerson.inc:540
-#: ../lib/modules/inetOrgPerson.inc:818 ../lib/modules/inetOrgPerson.inc:1042
-#: ../lib/modules/inetOrgPerson.inc:1100
+#: ../lib/modules/posixAccount.inc:81 ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixAccount.inc:85 ../lib/modules/posixAccount.inc:190
+#: ../lib/modules/posixAccount.inc:299 ../lib/modules/posixAccount.inc:354
+#: ../lib/modules/posixAccount.inc:933 ../lib/modules/posixAccount.inc:1144
+#: ../lib/modules/zarafaUser.inc:751 ../lib/modules/nisnetgroup.inc:142
+#: ../lib/modules/nisnetgroup.inc:471 ../lib/modules/inetOrgPerson.inc:73
+#: ../lib/modules/inetOrgPerson.inc:476 ../lib/modules/inetOrgPerson.inc:543
+#: ../lib/modules/inetOrgPerson.inc:821 ../lib/modules/inetOrgPerson.inc:1046
+#: ../lib/modules/inetOrgPerson.inc:1104
 msgid "User name"
 msgstr "ユーザ名"
 
-#: ../lib/modules/posixAccount.inc:87 ../lib/modules/inetOrgPerson.inc:72
+#: ../lib/modules/posixAccount.inc:89 ../lib/modules/inetOrgPerson.inc:75
 msgid "User name already exists!"
 msgstr "ユーザ名はすでに存在しています!"
 
-#: ../lib/modules/account.inc:116 ../lib/modules/account.inc:117
-#: ../lib/modules/account.inc:119 ../lib/modules/uidObject.inc:78
-#: ../lib/modules/posixAccount.inc:80 ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/account.inc:117 ../lib/modules/account.inc:118
+#: ../lib/modules/account.inc:120 ../lib/modules/uidObject.inc:78
+#: ../lib/modules/posixAccount.inc:82 ../lib/modules/posixAccount.inc:87
 #: ../lib/modules/zarafaUser.inc:343 ../lib/modules/zarafaUser.inc:344
-#: ../lib/modules/nisnetgroup.inc:137 ../lib/modules/inetOrgPerson.inc:70
-#: ../lib/modules/inetOrgPerson.inc:71
+#: ../lib/modules/nisnetgroup.inc:142 ../lib/modules/inetOrgPerson.inc:73
+#: ../lib/modules/inetOrgPerson.inc:74
 msgid ""
 "User name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
 msgstr ""
 "ユーザ名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です!"
 
-#: ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/posixAccount.inc:85
 msgid "User name in use. Selected next free user name."
 msgstr "使用中のユーザ名です。次の空きユーザ名が選択されました。"
 
-#: ../lib/modules/account.inc:95 ../lib/modules/posixAccount.inc:353
-#: ../lib/modules/inetOrgPerson.inc:541
+#: ../lib/modules/account.inc:95 ../lib/modules/posixAccount.inc:355
+#: ../lib/modules/inetOrgPerson.inc:544
 msgid ""
 "User name of the user who should be created. Valid characters are: a-z,A-"
 "Z,0-9, .-_. If user name is already used user name will be expanded with a "
@@ -8272,9 +8403,9 @@ msgstr "ユーザー・サーバー"
 msgid "User(s)"
 msgstr "ユーザ"
 
-#: ../lib/types/user.inc:53 ../lib/modules/posixAccount.inc:59
-#: ../lib/modules/posixAccount.inc:60 ../lib/modules/posixAccount.inc:63
-#: ../lib/modules/posixAccount.inc:158 ../lib/modules/sudoRole.inc:63
+#: ../lib/types/user.inc:53 ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:62 ../lib/modules/posixAccount.inc:65
+#: ../lib/modules/posixAccount.inc:160 ../lib/modules/sudoRole.inc:63
 #: ../lib/modules/sudoRole.inc:87 ../lib/modules/sudoRole.inc:134
 #: ../lib/modules/sudoRole.inc:173 ../lib/modules/sudoRole.inc:182
 #: ../lib/modules/sudoRole.inc:264 ../lib/modules/sudoRole.inc:687
@@ -8285,7 +8416,7 @@ msgstr "ユーザ"
 msgid "Users or groups that may directly send email as this user."
 msgstr "このユーザーからメールを直接発信できるユーザーまたはグループ。"
 
-#: ../lib/modules/posixGroup.inc:402
+#: ../lib/modules/posixGroup.inc:394
 msgid ""
 "Users who are member of the current group. Users who have set their primary "
 "group to this group will not be shown."
@@ -8293,7 +8424,7 @@ msgstr ""
 "このグループに所属しているユーザ。このグループをプライマリに設定されている"
 "ユーザは表示されません。"
 
-#: ../lib/modules/posixGroup.inc:406
+#: ../lib/modules/posixGroup.inc:398
 msgid ""
 "Users who will become member of the current group. User names are separated "
 "by semicolons."
@@ -8301,12 +8432,12 @@ msgstr ""
 "このグループのメンバーとなるユーザ。ユーザ名はセミコロンによって区切られま"
 "す。"
 
-#: ../templates/tests/lamdaemonTest.php:189
+#: ../templates/tests/lamdaemonTest.php:199
 #, php-format
 msgid "Using %s as lamdaemon remote server."
 msgstr "lamdaemonリモートサーバとして %s を使用します。"
 
-#: ../templates/tests/lamdaemonTest.php:210
+#: ../templates/tests/lamdaemonTest.php:221
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "%sを使用してリモートサーバーに接続します。"
@@ -8315,7 +8446,7 @@ msgstr "%sを使用してリモートサーバーに接続します。"
 msgid "Using template:"
 msgstr "テンプレートを使用:"
 
-#: ../lib/modules/posixAccount.inc:312
+#: ../lib/modules/posixAccount.inc:314
 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 "
@@ -8329,11 +8460,15 @@ msgstr ""
 msgid "Valid users"
 msgstr "有効なユーザ"
 
-#: ../templates/serverInfo.php:116
+#: ../lib/modules/imapAccess.inc:72 ../lib/modules/imapAccess.inc:99
+msgid "Validate server certificate"
+msgstr "サーバー証明書の検証"
+
+#: ../templates/serverInfo.php:123
 msgid "Vendor name"
 msgstr "ベンダー名"
 
-#: ../templates/serverInfo.php:121
+#: ../templates/serverInfo.php:129
 msgid "Vendor version"
 msgstr "ベンダー・バージョン"
 
@@ -8342,7 +8477,7 @@ msgstr "ベンダー・バージョン"
 #: ../lib/modules/asteriskVoicemail.inc:134
 #: ../lib/modules/asteriskVoicemail.inc:187
 #: ../lib/modules/asteriskVoicemail.inc:279
-#: ../lib/modules/asteriskVoicemail.inc:391
+#: ../lib/modules/asteriskVoicemail.inc:402
 msgid "Voicemail context"
 msgstr "ボイスメール・コンテキスト"
 
@@ -8354,53 +8489,53 @@ msgstr "このアカウントに対するボイスメール・メールボック
 msgid "Want more features? Get LAM Pro!"
 msgstr "Want more features? Get LAM Pro!"
 
-#: ../templates/config/mainmanage.php:287
+#: ../templates/config/mainmanage.php:215
 msgid "Warning"
 msgstr "警告"
 
-#: ../templates/delete.php:195 ../lib/modules.inc:1993
+#: ../templates/delete.php:216 ../lib/modules.inc:2013
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "DN %s に属性を追加できませんでした。"
 
-#: ../lib/modules.inc:1963
+#: ../lib/modules.inc:1983
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "DN %s を作成できませんでした。"
 
-#: ../templates/tree/delete.php:113 ../templates/delete.php:270
-#: ../templates/delete.php:278
+#: ../templates/tree/delete.php:113 ../templates/delete.php:319
+#: ../templates/delete.php:328
 #, php-format
 msgid "Was unable to delete DN: %s."
 msgstr "DN %s を削除できませんでした。"
 
 #: ../templates/tree/update.php:109 ../templates/tree/add_oclass.php:93
-#: ../templates/tree/add_oclass_form.php:162 ../templates/delete.php:187
-#: ../lib/modules.inc:1981
+#: ../templates/tree/add_oclass_form.php:162 ../templates/delete.php:207
+#: ../lib/modules.inc:2001
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "DN %s の属性を変更できませんでした。"
 
-#: ../templates/lists/changePassword.php:453
+#: ../templates/lists/changePassword.php:545
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "DN %s の属性を変更できませんでした。"
 
-#: ../templates/delete.php:203 ../lib/modules.inc:2005
+#: ../templates/delete.php:225 ../lib/modules.inc:2025
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "DN %s の属性を削除できませんでした。"
 
-#: ../lib/modules.inc:1944
+#: ../lib/modules.inc:1964
 #, php-format
 msgid "Was unable to rename DN: %s."
 msgstr "DNを変更できませんでした: %s。"
 
-#: ../lib/modules/sambaSamAccount.inc:1280
+#: ../lib/modules/sambaSamAccount.inc:1273
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:534
+#: ../lib/modules/sambaSamAccount.inc:539
 msgid "Western Europe Time, London, Lisbon"
 msgstr "Western Europe Time, London, Lisbon"
 
@@ -8408,7 +8543,9 @@ msgstr "Western Europe Time, London, Lisbon"
 msgid ""
 "When the hard quota limit is reached, email can not be delivered to that "
 "user anymore."
-msgstr "ハードquotaリミットに達した場合、該当ユーザーへのeメールは一切配送されません。"
+msgstr ""
+"ハードquotaリミットに達した場合、該当ユーザーへのeメールは一切配送されませ"
+"ん。"
 
 #: ../help/help.inc:66
 msgid ""
@@ -8418,30 +8555,30 @@ msgstr ""
 "ldaps:// またはTLSを使う時は、証明書のIP/ドメイン名と正確に一致するものを使用"
 "してください!"
 
-#: ../lib/modules/sambaSamAccount.inc:310
+#: ../lib/modules/sambaSamAccount.inc:315
 msgid "Windows domain name of account."
 msgstr "アカウントのWindowsドメイン名"
 
-#: ../lib/modules/sambaSamAccount.inc:188
-#: ../lib/modules/sambaSamAccount.inc:440
-#: ../lib/modules/sambaSamAccount.inc:1165
-#: ../lib/modules/sambaSamAccount.inc:1521
-#: ../lib/modules/sambaSamAccount.inc:1661
-#: ../lib/modules/sambaGroupMapping.inc:256
-#: ../lib/modules/sambaGroupMapping.inc:300
-#: ../lib/modules/sambaGroupMapping.inc:377
+#: ../lib/modules/sambaSamAccount.inc:193
+#: ../lib/modules/sambaSamAccount.inc:445
+#: ../lib/modules/sambaSamAccount.inc:1159
+#: ../lib/modules/sambaSamAccount.inc:1514
+#: ../lib/modules/sambaSamAccount.inc:1654
+#: ../lib/modules/sambaGroupMapping.inc:278
+#: ../lib/modules/sambaGroupMapping.inc:322
+#: ../lib/modules/sambaGroupMapping.inc:391
 msgid "Windows group"
 msgstr "Windowsグループ"
 
-#: ../lib/modules/sambaGroupMapping.inc:349
+#: ../lib/modules/sambaGroupMapping.inc:360
 msgid "Windows group name"
 msgstr "Windowsグループ名"
 
-#: ../lib/modules/sambaGroupMapping.inc:362
+#: ../lib/modules/sambaGroupMapping.inc:373
 msgid "Windows group type."
 msgstr "Windowsグループタイプ"
 
-#: ../lib/modules/sambaSamAccount.inc:367
+#: ../lib/modules/sambaSamAccount.inc:372
 msgid ""
 "Windows password hashes are saved by default as NT and LM hashes. LM hashes "
 "are insecure and only needed for old versions of Windows. You should disable "
@@ -8451,15 +8588,15 @@ msgstr ""
 "されます。LMハッシュはセキュアでないため、古いバージョンのWindowsでのみ必要と"
 "なります。本当に必要な場合を除いて、無効にすべきです。"
 
-#: ../lib/modules/sambaSamAccount.inc:293
+#: ../lib/modules/sambaSamAccount.inc:298
 msgid "Windows primary group"
 msgstr "Windowsプライマリグループ"
 
-#: ../lib/modules/sambaSamAccount.inc:296
+#: ../lib/modules/sambaSamAccount.inc:301
 msgid "Windows primary group SID"
 msgstr "WindowsプライマリグループSID"
 
-#: ../lib/modules/sambaGroupMapping.inc:358
+#: ../lib/modules/sambaGroupMapping.inc:369
 msgid "Windows-Domain name of group."
 msgstr "グループのWindowsドメイン名。"
 
@@ -8467,22 +8604,22 @@ msgstr "グループのWindowsドメイン名。"
 msgid "Workgroup"
 msgstr "ワークグループ"
 
-#: ../lib/modules/sambaSamAccount.inc:212
-#: ../lib/modules/sambaSamAccount.inc:339
-#: ../lib/modules/sambaSamAccount.inc:1409
-#: ../lib/modules/sambaSamAccount.inc:1681
+#: ../lib/modules/sambaSamAccount.inc:217
+#: ../lib/modules/sambaSamAccount.inc:344
+#: ../lib/modules/sambaSamAccount.inc:1402
+#: ../lib/modules/sambaSamAccount.inc:1674
 msgid "Working directory"
 msgstr "作業ディレクトリ"
 
-#: ../lib/modules/sambaSamAccount.inc:340
+#: ../lib/modules/sambaSamAccount.inc:345
 msgid "Working directory of initial program."
 msgstr "初期プログラムの作業ディレクトリ。"
 
-#: ../templates/config/confmain.php:442
+#: ../templates/config/confmain.php:299
 msgid "Write"
 msgstr "書く"
 
-#: ../templates/config/confmain.php:327 ../templates/config/confmain.php:330
+#: ../templates/config/confmain.php:252
 msgid "Write access"
 msgstr "書き込みアクセス"
 
@@ -8494,10 +8631,11 @@ msgstr "誤ったパスワード/ユーザ名の組み合わせです。やり
 
 #: ../templates/schema/schema.php:151 ../templates/schema/schema.php:193
 #: ../templates/schema/schema.php:198 ../templates/schema/schema.php:203
+#: ../lib/modules/imapAccess.inc:99
 msgid "Yes"
 msgstr "はい"
 
-#: ../lib/modules/posixGroup.inc:486
+#: ../lib/modules/posixGroup.inc:482
 msgid ""
 "You are using a capital letters. This can cause problems because Windows "
 "isn't case-sensitive."
@@ -8505,7 +8643,7 @@ msgstr ""
 "大文字が使われています。Windowsは大文字と小文字を区別しないため、これが原因で"
 "問題が発生する場合があります。"
 
-#: ../lib/modules/account.inc:118
+#: ../lib/modules/account.inc:119
 msgid ""
 "You are using a capital letters. This can cause problems because windows "
 "isn't case-sensitive."
@@ -8513,7 +8651,7 @@ msgstr ""
 "大文字が使われています。Windowsは大文字と小文字を区別しないため、これが原因で"
 "問題が発生する場合があります。"
 
-#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:81 ../lib/modules/posixAccount.inc:83
 msgid ""
 "You are using capital letters. This can cause problems because Windows is "
 "not case-sensitive."
@@ -8558,7 +8696,7 @@ msgstr ""
 "このオブジェクトに対するオブジェクトクラスが選択されていません。前に戻って選"
 "択してください。"
 
-#: ../templates/tests/schemaTest.php:56
+#: ../templates/tests/schemaTest.php:59
 msgid ""
 "You do not have the required access rights or the LDAP schema is not "
 "published by your server."
@@ -8570,7 +8708,7 @@ msgstr ""
 msgid "You entered one or more invalid DNS servers."
 msgstr "誤ったDNSサーバーが入力されています。"
 
-#: ../templates/lists/changePassword.php:321
+#: ../templates/lists/changePassword.php:391
 msgid "You have to activate the \"I am sure\" checkbox."
 msgstr "\"確認\"のチェックボックスを有効にする必要があります。"
 
@@ -8591,7 +8729,11 @@ msgstr "変更されませんでした。"
 msgid "You need to add at least one member to this group."
 msgstr "少なくとも一つのメンバーをこのグループへ追加する必要があります。"
 
-#: ../templates/tests/lamdaemonTest.php:214
+#: ../lib/modules/imapAccess.inc:139
+msgid "Your IMAP domain(s) and email address domain do not match."
+msgstr "IMAPドメインとメールアドレスのドメインが食い違っています。"
+
+#: ../templates/tests/lamdaemonTest.php:226
 #, php-format
 msgid ""
 "Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"
@@ -8630,7 +8772,7 @@ msgstr "セッションが期限切れになりました。ログインをやり
 msgid "Your settings were successfully saved."
 msgstr "設定を保存しました。"
 
-#: ../lib/modules/inetOrgPerson.inc:401
+#: ../lib/modules/inetOrgPerson.inc:404
 msgid "YourCompany, Human Resources"
 msgstr "YourCompany, Human Resources"
 
@@ -8654,11 +8796,11 @@ msgstr "DNSサーバーのゾーン名(例 company.local)。"
 msgid "[attribute deleted]"
 msgstr "[削除された属性]"
 
-#: ../lib/modules/sambaSamAccount.inc:466
+#: ../lib/modules/sambaSamAccount.inc:471
 msgid "\\\\server\\homes\\smiller"
 msgstr "\\\\server\\homes\\smiller"
 
-#: ../lib/modules/sambaSamAccount.inc:474
+#: ../lib/modules/sambaSamAccount.inc:479
 msgid "\\\\server\\profiles\\smiller"
 msgstr "\\\\server\\profiles\\smiller"
 
@@ -8671,7 +8813,7 @@ msgstr "有効"
 msgid "add value"
 msgstr "値の追加"
 
-#: ../lib/modules/posixGroup.inc:374 ../lib/modules/nisnetgroup.inc:99
+#: ../lib/modules/posixGroup.inc:366 ../lib/modules/nisnetgroup.inc:104
 #: ../lib/modules/groupOfNames.inc:86
 msgid "adminstrators"
 msgstr "管理者"
@@ -8700,13 +8842,13 @@ msgstr "デフォルト値"
 msgid "delete attribute"
 msgstr "属性の削除"
 
-#: ../lib/modules/sambaSamAccount.inc:1424
-#: ../lib/modules/sambaSamAccount.inc:1701
+#: ../lib/modules/sambaSamAccount.inc:1417
+#: ../lib/modules/sambaSamAccount.inc:1694
 msgid "disabled"
 msgstr "禁止"
 
-#: ../lib/modules/sambaSamAccount.inc:1435
-#: ../lib/modules/sambaSamAccount.inc:1712
+#: ../lib/modules/sambaSamAccount.inc:1428
+#: ../lib/modules/sambaSamAccount.inc:1705
 msgid "disconnect"
 msgstr "切断"
 
@@ -8725,17 +8867,17 @@ msgstr "false"
 msgid "force"
 msgstr "force"
 
-#: ../lib/modules/sambaSamAccount.inc:1443
-#: ../lib/modules/sambaSamAccount.inc:1720
+#: ../lib/modules/sambaSamAccount.inc:1436
+#: ../lib/modules/sambaSamAccount.inc:1713
 msgid "from any client"
 msgstr "任意のクライアントから"
 
-#: ../lib/modules/sambaSamAccount.inc:1444
-#: ../lib/modules/sambaSamAccount.inc:1721
+#: ../lib/modules/sambaSamAccount.inc:1437
+#: ../lib/modules/sambaSamAccount.inc:1714
 msgid "from previous client only"
 msgstr "前回のクライアントからのみ"
 
-#: ../lib/modules/posixAccount.inc:217 ../lib/modules/nisnetgroup.inc:113
+#: ../lib/modules/posixAccount.inc:219 ../lib/modules/nisnetgroup.inc:118
 msgid "group01,group02"
 msgstr "group01,group02"
 
@@ -8756,23 +8898,23 @@ msgstr "時間"
 msgid "inactive"
 msgstr "無効"
 
-#: ../lib/modules/sambaSamAccount.inc:1428
-#: ../lib/modules/sambaSamAccount.inc:1705
+#: ../lib/modules/sambaSamAccount.inc:1421
+#: ../lib/modules/sambaSamAccount.inc:1698
 msgid "input off, notify off"
 msgstr "入力 off, 通知 off"
 
-#: ../lib/modules/sambaSamAccount.inc:1427
-#: ../lib/modules/sambaSamAccount.inc:1704
+#: ../lib/modules/sambaSamAccount.inc:1420
+#: ../lib/modules/sambaSamAccount.inc:1697
 msgid "input off, notify on"
 msgstr "入力 off, 通知 on"
 
-#: ../lib/modules/sambaSamAccount.inc:1426
-#: ../lib/modules/sambaSamAccount.inc:1703
+#: ../lib/modules/sambaSamAccount.inc:1419
+#: ../lib/modules/sambaSamAccount.inc:1696
 msgid "input on, notify off"
 msgstr "入力 on, 通知 off"
 
-#: ../lib/modules/sambaSamAccount.inc:1425
-#: ../lib/modules/sambaSamAccount.inc:1702
+#: ../lib/modules/sambaSamAccount.inc:1418
+#: ../lib/modules/sambaSamAccount.inc:1695
 msgid "input on, notify on"
 msgstr "入力 on, 通知 on"
 
@@ -8796,7 +8938,7 @@ msgstr ""
 "ldaps://ldap.example.com は、ldap.example.com へ暗号化されたLDAP接続を行ない"
 "ます。"
 
-#: ../lib/modules/posixAccount.inc:284
+#: ../lib/modules/posixAccount.inc:286
 msgid "machines"
 msgstr "マシン"
 
@@ -8804,23 +8946,23 @@ msgstr "マシン"
 msgid "mail.yourdomain.org"
 msgstr "mail.yourdomain.org"
 
-#: ../lib/modules/sambaSamAccount.inc:385
-#: ../lib/modules/sambaSamAccount.inc:509
+#: ../lib/modules/sambaSamAccount.inc:390
+#: ../lib/modules/sambaSamAccount.inc:514
 msgid "mydomain"
 msgstr "マイドメイン"
 
-#: ../lib/modules/sambaSamAccount.inc:442
+#: ../lib/modules/sambaSamAccount.inc:447
 msgid "mygroup"
 msgstr "マイグループ"
 
-#: ../templates/config/confmain.php:251 ../templates/config/confmain.php:255
-#: ../lib/modules/zarafaGroup.inc:419 ../lib/modules/zarafaGroup.inc:426
-#: ../lib/modules/zarafaGroup.inc:429 ../lib/modules/sambaSamAccount.inc:553
-#: ../lib/modules/sambaSamAccount.inc:1669
-#: ../lib/modules/sambaSamAccount.inc:1677
-#: ../lib/modules/sambaSamAccount.inc:1687
-#: ../lib/modules/sambaSamAccount.inc:1692
-#: ../lib/modules/sambaSamAccount.inc:1697 ../lib/modules/zarafaUser.inc:1013
+#: ../templates/config/confmain.php:235 ../lib/modules/zarafaGroup.inc:419
+#: ../lib/modules/zarafaGroup.inc:426 ../lib/modules/zarafaGroup.inc:429
+#: ../lib/modules/sambaSamAccount.inc:558
+#: ../lib/modules/sambaSamAccount.inc:1662
+#: ../lib/modules/sambaSamAccount.inc:1670
+#: ../lib/modules/sambaSamAccount.inc:1680
+#: ../lib/modules/sambaSamAccount.inc:1685
+#: ../lib/modules/sambaSamAccount.inc:1690 ../lib/modules/zarafaUser.inc:1013
 #: ../lib/modules/zarafaUser.inc:1058 ../lib/modules/zarafaUser.inc:1064
 #: ../lib/modules/zarafaUser.inc:1070 ../lib/modules/ppolicy.inc:34
 #: ../lib/modules/ppolicy.inc:449 ../lib/modules/ppolicy.inc:465
@@ -8859,16 +9001,16 @@ msgstr ""
 "ou=People,dc=yourcompany,dc=com は、このサブツリーのすべてのアカウントを読み"
 "書きします。"
 
-#: ../templates/masscreate.php:248 ../lib/modules/eduPerson.inc:179
-#: ../lib/modules/eduPerson.inc:185 ../lib/modules/eduPerson.inc:191
+#: ../lib/modules/eduPerson.inc:179 ../lib/modules/eduPerson.inc:185
+#: ../lib/modules/eduPerson.inc:191
 msgid "ou=accounts,dc=yourdomain,dc=org"
 msgstr "ou=accounts,dc=yourdomain,dc=org"
 
-#: ../lib/modules/posixAccount.inc:270
+#: ../lib/modules/posixAccount.inc:272
 msgid "pc01$"
 msgstr "pc01$"
 
-#: ../lib/modules/posixAccount.inc:291
+#: ../lib/modules/posixAccount.inc:293
 msgid "pc01,Room 2.34"
 msgstr "pc01,Room 2.34"
 
@@ -8876,24 +9018,24 @@ msgstr "pc01,Room 2.34"
 msgid "pc01,pc02"
 msgstr "pc01,pc02"
 
-#: ../templates/tree/edit.php:246 ../templates/config/confmain.php:555
-#: ../templates/selfService/adminMain.php:614
+#: ../templates/tree/edit.php:246 ../templates/config/confmain.php:374
+#: ../templates/selfService/adminMain.php:615
 msgid "required"
 msgstr "必須"
 
-#: ../lib/modules/sambaSamAccount.inc:1436
-#: ../lib/modules/sambaSamAccount.inc:1713
+#: ../lib/modules/sambaSamAccount.inc:1429
+#: ../lib/modules/sambaSamAccount.inc:1706
 msgid "reset"
 msgstr "リセット"
 
-#: ../lib/modules/asteriskAccount.inc:156 ../lib/modules/posixGroup.inc:365
-#: ../lib/modules/sambaSamAccount.inc:397 ../lib/modules/posixAccount.inc:245
+#: ../lib/modules/asteriskAccount.inc:156 ../lib/modules/posixGroup.inc:357
+#: ../lib/modules/sambaSamAccount.inc:402 ../lib/modules/posixAccount.inc:247
 #: ../lib/modules/asteriskVoicemail.inc:158
 msgid "secret"
 msgstr "secret"
 
-#: ../lib/modules/uidObject.inc:62 ../lib/modules/posixAccount.inc:190
-#: ../lib/modules/inetOrgPerson.inc:1102 ../lib/modules/nisMailAlias.inc:91
+#: ../lib/modules/uidObject.inc:62 ../lib/modules/posixAccount.inc:192
+#: ../lib/modules/inetOrgPerson.inc:1106 ../lib/modules/nisMailAlias.inc:91
 msgid "smiller"
 msgstr "smiller"
 
@@ -8925,40 +9067,72 @@ msgstr "テスト開始"
 msgid "true"
 msgstr "true"
 
-#: ../lib/modules/ipHost.inc:92 ../lib/modules/inetOrgPerson.inc:273
+#: ../lib/modules/ipHost.inc:92 ../lib/modules/inetOrgPerson.inc:276
 #: ../lib/modules/aliasEntry.inc:64
 msgid "uid=smiller,ou=People,dc=company,dc=com"
 msgstr "uid=smiller,ou=People,dc=company,dc=com"
 
-#: ../lib/modules/posixGroup.inc:359
+#: ../lib/modules/posixGroup.inc:351
 msgid "user01,user02,user03"
 msgstr "user01,user02,user03"
 
-#: ../lib/modules/eduPerson.inc:140 ../lib/modules/inetOrgPerson.inc:353
+#: ../lib/modules/eduPerson.inc:140 ../lib/modules/inetOrgPerson.inc:356
 #: ../lib/modules/asteriskVoicemail.inc:171
 msgid "user@company.com"
 msgstr "user@company.com"
 
-#: ../lib/modules/posixAccount.inc:210
+#: ../lib/modules/posixAccount.inc:212
 msgid "users"
 msgstr "ユーザ"
 
-#: ../templates/config/confmain.php:250 ../templates/config/confmain.php:254
-#: ../lib/modules/zarafaGroup.inc:421 ../lib/modules/zarafaGroup.inc:424
-#: ../lib/modules/zarafaGroup.inc:431 ../lib/modules/sambaSamAccount.inc:553
-#: ../lib/modules/sambaSamAccount.inc:1667
-#: ../lib/modules/sambaSamAccount.inc:1675
-#: ../lib/modules/sambaSamAccount.inc:1685
-#: ../lib/modules/sambaSamAccount.inc:1690
-#: ../lib/modules/sambaSamAccount.inc:1695 ../lib/modules/zarafaUser.inc:1015
+#: ../templates/config/confmain.php:235 ../lib/modules/zarafaGroup.inc:421
+#: ../lib/modules/zarafaGroup.inc:424 ../lib/modules/zarafaGroup.inc:431
+#: ../lib/modules/sambaSamAccount.inc:558
+#: ../lib/modules/sambaSamAccount.inc:1660
+#: ../lib/modules/sambaSamAccount.inc:1668
+#: ../lib/modules/sambaSamAccount.inc:1678
+#: ../lib/modules/sambaSamAccount.inc:1683
+#: ../lib/modules/sambaSamAccount.inc:1688 ../lib/modules/zarafaUser.inc:1015
 #: ../lib/modules/zarafaUser.inc:1060 ../lib/modules/zarafaUser.inc:1066
 #: ../lib/modules/zarafaUser.inc:1072 ../lib/modules/ppolicy.inc:35
 #: ../lib/modules/ppolicy.inc:467 ../lib/modules/ppolicy.inc:472
 #: ../lib/modules/ppolicy.inc:475 ../lib/modules/ppolicy.inc:482
-#: ../lib/modules/inetOrgPerson.inc:393 ../lib/modules/zarafaServer.inc:323
+#: ../lib/modules/inetOrgPerson.inc:396 ../lib/modules/zarafaServer.inc:323
 msgid "yes"
 msgstr "はい"
 
+#~ msgid "Cache timeout is invalid!"
+#~ msgstr "キャッシュ有効時間が正しくありません。"
+
+#~ msgid "Deleting. Please stand by ..."
+#~ msgstr "削除中です。お待ちください ..."
+
+#~ msgid ""
+#~ "Here is a list of possible columns. The red columns must be included in "
+#~ "the CSV file and filled with data for all accounts."
+#~ msgstr ""
+#~ "カラム候補のリスト。赤字のカラムはCSVファイルに含まれていなくてはならず、"
+#~ "かつ全てのアカウントについて記入済みでなくてはなりません。"
+
+#~ msgid "LDAP"
+#~ msgstr "LDAP"
+
+#~ msgid "Please confirm:"
+#~ msgstr "確認してください:"
+
+#~ msgid "Text for user PDF"
+#~ msgstr "ユーザPDFのためのテキスト"
+
+#~ msgid "This text will appear on top of every user PDF file."
+#~ msgstr "このテキストは、各ユーザのPDFファイルの先頭に表示されます。"
+
+#~ msgid ""
+#~ "Unable to load available languages. Setting English as default language. "
+#~ "For further instructions please contact the Admin of this site."
+#~ msgstr ""
+#~ "有効な言語をロードできません。英語を既定値の言語とします。より詳しい説明"
+#~ "は、このサイトの管理者に連絡してください。"
+
 #~ msgid ""
 #~ "Attention: The DHCP service needs to be restarted after changes in DDNS."
 #~ msgstr "注意: DDNSの変更後にDHCPサービスのリスタートが必要です。"
@@ -9527,9 +9701,6 @@ msgstr "はい"
 #~ msgid "TreeSuffix"
 #~ msgstr "ツリーサフィックス"
 
-#~ msgid "Unable to delete domain!"
-#~ msgstr "ドメインを削除できません!"
-
 #~ msgid "User modules"
 #~ msgstr "ユーザモジュール"