diff --git a/lam/locale/ja_JP/LC_MESSAGES/messages.mo b/lam/locale/ja_JP/LC_MESSAGES/messages.mo
index e3eb7278..62b296a0 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 0acc8cf4..5e18a94c 100644
--- a/lam/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/lam/locale/ja_JP/LC_MESSAGES/messages.po
@@ -5,17 +5,25 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: LAM 3.1.0\n"
+"Project-Id-Version: LAM 3.2.0\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de \n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2010-06-20 23:49+0900\n"
+"PO-Revision-Date: 2010-10-18 13:16+0900\n"
 "Last-Translator: Yasuhiro Magara <gama@users.sourceforge.jp>\n"
 "Language-Team: Japanese <gama@users.sourceforge.jp>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/modules/posixAccount.inc:379
+#: ../lib/modules/zarafaUser.inc:88 ../lib/modules/zarafaUser.inc:142
+#: ../lib/modules/zarafaUser.inc:170 ../lib/modules/zarafaUser.inc:305
+#: ../lib/modules/zarafaUser.inc:343 ../lib/modules/zarafaUser.inc:385
+#: ../lib/modules/zarafaUser.inc:1080
+msgid "\"Send as\" privileges"
+msgstr "\"Send as\"特権"
+
+#: ../lib/modules/posixAccount.inc:365
 msgid ""
 "$user and $group will be replaced with user name and primary group name."
 msgstr "$user と $group はユーザ名とプライマリグループ名に置き換えられます。"
@@ -96,32 +104,32 @@ msgstr "(このエントリに対して有効な新しい属性はありませ
 msgid "(no new binary attributes available for this entry)"
 msgstr "(このエントリに対して有効な新しいバイナリ属性はありません)"
 
-#: ../lib/modules/posixAccount.inc:237
+#: ../lib/modules/posixAccount.inc:223
 msgid "/home/smiller"
 msgstr "/home/smiller"
 
-#: ../lib/modules/inetOrgPerson.inc:332
-#: ../lib/modules/asteriskVoicemail.inc:182
+#: ../lib/modules/inetOrgPerson.inc:321
+#: ../lib/modules/asteriskVoicemail.inc:177
 msgid "123-123-1234"
 msgstr "123-123-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:348
+#: ../lib/modules/inetOrgPerson.inc:337
 msgid "123-123-1235"
 msgstr "123-123-1235"
 
-#: ../lib/modules/inetOrgPerson.inc:356
+#: ../lib/modules/inetOrgPerson.inc:345
 msgid "123-123-1236"
 msgstr "123-123-1236"
 
-#: ../lib/modules/inetOrgPerson.inc:340
+#: ../lib/modules/inetOrgPerson.inc:329
 msgid "123-124-1234"
 msgstr "123-124-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:324
+#: ../lib/modules/inetOrgPerson.inc:313
 msgid "12345"
 msgstr "12345"
 
-#: ../lib/modules/dhcp_settings.inc:141
+#: ../lib/modules/dhcp_settings.inc:146
 msgid ""
 "<b>B-Node (0x01): Broadcast.</b><br/>The client tries to find other "
 "workstations via broadcasting\n"
@@ -161,6 +169,10 @@ msgstr ""
 "デフォルトでは、ノードは小規模ネットワーク向きのH-Nodeとして構成されます。大"
 "規模ネットワークでは、Point-to-Point(0x02)を利用するべきです。"
 
+#: ../lib/modules/device.inc:71
+msgid "A description for this device."
+msgstr "このデバイスについての説明。"
+
 #: ../lib/modules/sudoRole.inc:84 ../lib/modules/sudoRole.inc:113
 msgid "A list of options (e.g. NOPASSWD)."
 msgstr "オプション・リスト (例 NOPASSWD)。"
@@ -169,7 +181,7 @@ msgstr "オプション・リスト (例 NOPASSWD)。"
 msgid "A required column is missing in your CSV file."
 msgstr "CSVファイル中の必須カラムが不足しています。"
 
-#: ../lib/modules/kolabUser.inc:144
+#: ../lib/modules/kolabUser.inc:132
 msgid ""
 "A user may define who is allowed to act on behalf of herself. This property "
 "is checked when using the Kolab smtp daemon (Postfix) to send emails."
@@ -177,11 +189,11 @@ msgstr ""
 "ユーザは自身の代理人を指定できます。この属性はemailの送信にKolab smtpデーモン"
 "(Postfix)を使用する場合にチェックします。"
 
-#: ../lib/modules/sambaSamAccount.inc:545
+#: ../lib/modules/sambaSamAccount.inc:538
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "Abu Dhabi, Muscat, Baku"
 
-#: ../templates/config/confmain.php:317 ../help/help.inc:102
+#: ../templates/config/confmain.php:324 ../help/help.inc:99
 msgid "Access level"
 msgstr "アクセスレベル"
 
@@ -190,20 +202,23 @@ msgid "Account"
 msgstr "アカウント"
 
 #: ../templates/massBuildAccounts.php:169 ../lib/modules/ipHost.inc:109
-#: ../lib/modules/ipHost.inc:110 ../lib/modules/asteriskAccount.inc:171
-#: ../lib/modules/asteriskAccount.inc:174
-#: ../lib/modules/asteriskAccount.inc:177 ../lib/modules/account.inc:117
-#: ../lib/modules/ieee802device.inc:89 ../lib/modules/posixGroup.inc:473
-#: ../lib/modules/posixGroup.inc:477 ../lib/modules/posixGroup.inc:478
-#: ../lib/modules/dhcp_settings.inc:303 ../lib/modules/dhcp_settings.inc:305
-#: ../lib/modules/dhcp_settings.inc:307 ../lib/modules/dhcp_settings.inc:309
-#: ../lib/modules/dhcp_settings.inc:311 ../lib/modules/dhcp_settings.inc:312
-#: ../lib/modules/dhcp_settings.inc:314 ../lib/modules/dhcp_settings.inc:316
-#: ../lib/modules/dhcp_settings.inc:322 ../lib/modules/dhcp_settings.inc:323
-#: ../lib/modules/dhcp_settings.inc:324 ../lib/modules/eduPerson.inc:217
-#: ../lib/modules/eduPerson.inc:219 ../lib/modules/eduPerson.inc:221
-#: ../lib/modules/eduPerson.inc:223 ../lib/modules/eduPerson.inc:224
-#: ../lib/modules/eduPerson.inc:225 ../lib/modules/eduPerson.inc:226
+#: ../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/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
+#: ../lib/modules/device.inc:124 ../lib/modules/dhcp_settings.inc:275
+#: ../lib/modules/dhcp_settings.inc:277 ../lib/modules/dhcp_settings.inc:279
+#: ../lib/modules/dhcp_settings.inc:281 ../lib/modules/dhcp_settings.inc:283
+#: ../lib/modules/dhcp_settings.inc:284 ../lib/modules/dhcp_settings.inc:286
+#: ../lib/modules/dhcp_settings.inc:288 ../lib/modules/dhcp_settings.inc:293
+#: ../lib/modules/dhcp_settings.inc:294 ../lib/modules/eduPerson.inc:214
+#: ../lib/modules/eduPerson.inc:216 ../lib/modules/eduPerson.inc:218
+#: ../lib/modules/eduPerson.inc:220 ../lib/modules/eduPerson.inc:221
+#: ../lib/modules/eduPerson.inc:222 ../lib/modules/eduPerson.inc:223
 #: ../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
@@ -225,13 +240,20 @@ msgstr "アカウント"
 #: ../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/kolabUser.inc:242 ../lib/modules/kolabUser.inc:244
-#: ../lib/modules/kolabUser.inc:246 ../lib/modules/kolabUser.inc:248
-#: ../lib/modules/kolabUser.inc:250 ../lib/modules/kolabUser.inc:252
-#: ../lib/modules/kolabUser.inc:254 ../lib/modules/phpGroupwareUser.inc:137
-#: ../lib/modules/phpGroupwareUser.inc:138 ../lib/modules/ddns.inc:147
-#: ../lib/modules/nisObject.inc:117 ../lib/modules/sambaGroupMapping.inc:439
-#: ../lib/modules/sambaGroupMapping.inc:440
+#: ../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
+#: ../lib/modules/zarafaUser.inc:344 ../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 ../lib/modules/kolabUser.inc:230
+#: ../lib/modules/kolabUser.inc:232 ../lib/modules/kolabUser.inc:234
+#: ../lib/modules/kolabUser.inc:236 ../lib/modules/kolabUser.inc:238
+#: ../lib/modules/kolabUser.inc:240 ../lib/modules/kolabUser.inc:242
+#: ../lib/modules/phpGroupwareUser.inc:134
+#: ../lib/modules/phpGroupwareUser.inc:135 ../lib/modules/ddns.inc:151
+#: ../lib/modules/nisObject.inc:117 ../lib/modules/sambaGroupMapping.inc:426
+#: ../lib/modules/sambaGroupMapping.inc:427
 #: ../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
@@ -246,39 +268,42 @@ msgstr "アカウント"
 #: ../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:240
-#: ../lib/modules/sudoRole.inc:242 ../lib/modules/sudoRole.inc:244
-#: ../lib/modules/sudoRole.inc:246 ../lib/modules/sudoRole.inc:248
-#: ../lib/modules/sudoRole.inc:250 ../lib/modules/asteriskVoicemail.inc:211
-#: ../lib/modules/asteriskVoicemail.inc:217
-#: ../lib/modules/asteriskVoicemail.inc:219
-#: ../lib/modules/inetLocalMailRecipient.inc:127
-#: ../lib/modules/inetLocalMailRecipient.inc:129
-#: ../lib/modules/inetLocalMailRecipient.inc:131
+#: ../lib/modules/inetOrgPerson.inc:76 ../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
+#: ../lib/modules/zarafaServer.inc:123 ../lib/modules/zarafaServer.inc:125
+#: ../lib/modules/zarafaServer.inc:126
+#: ../lib/modules/asteriskVoicemail.inc:206
+#: ../lib/modules/asteriskVoicemail.inc:212
+#: ../lib/modules/asteriskVoicemail.inc:214
+#: ../lib/modules/inetLocalMailRecipient.inc:124
+#: ../lib/modules/inetLocalMailRecipient.inc:126
+#: ../lib/modules/inetLocalMailRecipient.inc:128
 #: ../lib/modules/aliasEntry.inc:79 ../lib/modules/nisMailAlias.inc:107
-#: ../lib/modules/nisMailAlias.inc:109 ../lib/modules/hostObject.inc:107
+#: ../lib/modules/nisMailAlias.inc:109 ../lib/modules/hostObject.inc:104
 #, php-format
 msgid "Account %s:"
 msgstr "アカウント %s:"
 
-#: ../lib/modules/asteriskAccount.inc:87
+#: ../lib/modules/asteriskAccount.inc:91
 #: ../lib/modules/asteriskAccount.inc:114
-#: ../lib/modules/asteriskAccount.inc:126
-#: ../lib/modules/asteriskAccount.inc:142
-#: ../lib/modules/asteriskAccount.inc:202
-#: ../lib/modules/asteriskAccount.inc:288
+#: ../lib/modules/asteriskAccount.inc:124
+#: ../lib/modules/asteriskAccount.inc:140
+#: ../lib/modules/asteriskAccount.inc:211
+#: ../lib/modules/asteriskAccount.inc:295
 #: ../lib/modules/asteriskExtension.inc:82
-#: ../lib/modules/asteriskExtension.inc:113
-#: ../lib/modules/asteriskExtension.inc:133
-#: ../lib/modules/asteriskExtension.inc:178
-#: ../lib/modules/asteriskExtension.inc:223
-#: ../lib/modules/asteriskExtension.inc:463
-#: ../lib/modules/asteriskVoicemail.inc:78
-#: ../lib/modules/asteriskVoicemail.inc:121
-#: ../lib/modules/asteriskVoicemail.inc:133
-#: ../lib/modules/asteriskVoicemail.inc:147
-#: ../lib/modules/asteriskVoicemail.inc:238
-#: ../lib/modules/asteriskVoicemail.inc:374
+#: ../lib/modules/asteriskExtension.inc:112
+#: ../lib/modules/asteriskExtension.inc:124
+#: ../lib/modules/asteriskExtension.inc:169
+#: ../lib/modules/asteriskExtension.inc:221
+#: ../lib/modules/asteriskExtension.inc:469
+#: ../lib/modules/asteriskVoicemail.inc:82
+#: ../lib/modules/asteriskVoicemail.inc:118
+#: ../lib/modules/asteriskVoicemail.inc:128
+#: ../lib/modules/asteriskVoicemail.inc:142
+#: ../lib/modules/asteriskVoicemail.inc:244
+#: ../lib/modules/asteriskVoicemail.inc:389
 msgid "Account context"
 msgstr "アカウント・コンテキスト"
 
@@ -286,77 +311,77 @@ msgstr "アカウント・コンテキスト"
 msgid "Account creation via file upload"
 msgstr "ファイルアップロードによるアカウント作成"
 
-#: ../lib/modules/posixAccount.inc:386
+#: ../lib/modules/posixAccount.inc:372
 msgid "Account deactivated"
 msgstr "アカウントが無効化されました"
 
-#: ../templates/lists/changePassword.php:135
+#: ../templates/lists/changePassword.php:167
 msgid "Account details"
 msgstr "アカウントの詳細"
 
-#: ../lib/modules/sambaSamAccount.inc:321
-#: ../lib/modules/sambaSamAccount.inc:436
-#: ../lib/modules/sambaSamAccount.inc:1138
-#: ../lib/modules/sambaSamAccount.inc:1382
-#: ../lib/modules/sambaSamAccount.inc:1566
+#: ../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/phpGroupwareUser.inc:82
-#: ../lib/modules/phpGroupwareUser.inc:100
-#: ../lib/modules/phpGroupwareUser.inc:124
-#: ../lib/modules/phpGroupwareUser.inc:155
-#: ../lib/modules/phpGroupwareUser.inc:239
-#: ../lib/modules/phpGroupwareUser.inc:344
-#: ../lib/modules/shadowAccount.inc:124 ../lib/modules/shadowAccount.inc:189
-#: ../lib/modules/shadowAccount.inc:225 ../lib/modules/shadowAccount.inc:332
-#: ../lib/modules/shadowAccount.inc:391 ../lib/modules/shadowAccount.inc:419
+#: ../lib/modules/phpGroupwareUser.inc:97
+#: ../lib/modules/phpGroupwareUser.inc:121
+#: ../lib/modules/phpGroupwareUser.inc:152
+#: ../lib/modules/phpGroupwareUser.inc:233
+#: ../lib/modules/phpGroupwareUser.inc:342
+#: ../lib/modules/shadowAccount.inc:121 ../lib/modules/shadowAccount.inc:184
+#: ../lib/modules/shadowAccount.inc:224 ../lib/modules/shadowAccount.inc:336
+#: ../lib/modules/shadowAccount.inc:404 ../lib/modules/shadowAccount.inc:431
 msgid "Account expiration date"
 msgstr "アカウント失効日"
 
-#: ../lib/modules/shadowAccount.inc:167
+#: ../lib/modules/shadowAccount.inc:162
 msgid "Account inactive"
 msgstr "アカウントが無効です"
 
-#: ../lib/modules/sambaSamAccount.inc:261
-#: ../lib/modules/sambaSamAccount.inc:267
-#: ../lib/modules/sambaSamAccount.inc:428
-#: ../lib/modules/sambaSamAccount.inc:1098
-#: ../lib/modules/sambaSamAccount.inc:1554
+#: ../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
 msgid "Account is deactivated"
 msgstr "アカウントが無効化されています"
 
-#: ../lib/modules/sambaSamAccount.inc:264
-#: ../lib/modules/sambaSamAccount.inc:1106
+#: ../lib/modules/sambaSamAccount.inc:261
+#: ../lib/modules/sambaSamAccount.inc:1078
 msgid "Account is locked"
 msgstr "ロックされたアカウント"
 
-#: ../templates/delete.php:90
+#: ../templates/delete.php:91
 msgid "Account name:"
 msgstr "アカウント名:"
 
 #: ../lib/modules/phpGroupwareUser.inc:78
-#: ../lib/modules/phpGroupwareUser.inc:99
-#: ../lib/modules/phpGroupwareUser.inc:117
-#: ../lib/modules/phpGroupwareUser.inc:162
-#: ../lib/modules/phpGroupwareUser.inc:339
+#: ../lib/modules/phpGroupwareUser.inc:96
+#: ../lib/modules/phpGroupwareUser.inc:114
+#: ../lib/modules/phpGroupwareUser.inc:161
+#: ../lib/modules/phpGroupwareUser.inc:337
 msgid "Account status"
 msgstr "アカウントの状態"
 
 #: ../templates/masscreate.php:130 ../templates/pdfedit/pdfdelete.php:82
-#: ../lib/modules/groupOfNames.inc:232
+#: ../lib/modules/groupOfNames.inc:222
 msgid "Account type"
 msgstr "アカウント種別"
 
-#: ../templates/config/confmodules.php:141
-#: ../templates/config/confmain.php:174
-#: ../templates/config/moduleSettings.php:140
-#: ../templates/config/conftypes.php:159
+#: ../templates/config/confmodules.php:166
+#: ../templates/config/confmain.php:199
+#: ../templates/config/moduleSettings.php:165
+#: ../templates/config/conftypes.php:184
 msgid "Account types"
 msgstr "アカウント種別"
 
-#: ../help/help.inc:106
+#: ../help/help.inc:103
 msgid "Account types and modules"
 msgstr "アカウント種別とモジュール"
 
-#: ../help/help.inc:108
+#: ../help/help.inc:105
 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 "
@@ -366,11 +391,11 @@ msgstr ""
 "義します。アカウントモジュールは、編集対象となるプロパティ(e.g. Unix や "
 "Samba)を定義します。"
 
-#: ../lib/modules.inc:1454
+#: ../lib/modules.inc:1480
 msgid "Account was created successfully."
 msgstr "アカウントが作成されました。"
 
-#: ../templates/lists/changePassword.php:428 ../lib/modules.inc:1457
+#: ../templates/lists/changePassword.php:459 ../lib/modules.inc:1483
 msgid "Account was modified successfully."
 msgstr "アカウントが変更されました。"
 
@@ -378,33 +403,33 @@ msgstr "アカウントが変更されました。"
 msgid "Action type"
 msgstr "アクション種別"
 
-#: ../lib/modules/ddns.inc:83 ../lib/modules/ddns.inc:338
+#: ../lib/modules/ddns.inc:87 ../lib/modules/ddns.inc:342
 msgid "Activate DynDNS"
 msgstr "DynDNSを有効化"
 
-#: ../templates/config/confmain.php:238
+#: ../templates/config/confmain.php:245
 msgid "Activate TLS"
 msgstr "TLSを有効化"
 
-#: ../lib/modules/sambaSamAccount.inc:328
+#: ../lib/modules/sambaSamAccount.inc:325
 msgid "Activate this checkbox to allow this user to use the terminal service."
 msgstr ""
 "このユーザーに対してターミナルサービスの利用を許可する場合にチェックボックス"
 "を有効にしてください。"
 
-#: ../lib/modules/sambaSamAccount.inc:349
+#: ../lib/modules/sambaSamAccount.inc:346
 msgid "Activate this checkbox to connect drives from the client machine."
 msgstr ""
 "クライアントマシンからドライブを接続する場合にチェックボックスを有効にしてく"
 "ださい。"
 
-#: ../lib/modules/sambaSamAccount.inc:352
+#: ../lib/modules/sambaSamAccount.inc:349
 msgid "Activate this checkbox to connect printers from the client machine."
 msgstr ""
 "クライアントマシンからプリンターに接続する場合にチェックボックスを有効にして"
 "ください。"
 
-#: ../lib/modules/sambaSamAccount.inc:337
+#: ../lib/modules/sambaSamAccount.inc:334
 msgid ""
 "Activate this checkbox to inherit the initial program and working directory "
 "from the client machine."
@@ -412,19 +437,27 @@ msgstr ""
 "クライアントマシンの初期プログラムと作業ディレクトリを継承する場合にチェック"
 "ボックスを有効にしてください。"
 
-#: ../lib/modules/sambaSamAccount.inc:355
+#: ../lib/modules/sambaSamAccount.inc:352
 msgid "Activate this checkbox to set the client's printer as default printer."
 msgstr ""
 "クライアントのプリンタをデフォルトプリンタにする場合にチェックボックスを有効"
 "にしてください。"
 
-#: ../lib/modules/posixAccount.inc:358
+#: ../lib/modules/posixAccount.inc:344
 msgid "Activating this checkbox will remove the user's home directory."
 msgstr ""
 "このチェックボックスを有効にした場合、ユーザのホームディレクトリを削除しま"
 "す。"
 
-#: ../templates/config/conftypes.php:233
+#: ../lib/modules/zarafaGroup.inc:79 ../lib/modules/zarafaGroup.inc:115
+#: ../lib/modules/zarafaGroup.inc:125 ../lib/modules/zarafaGroup.inc:201
+#: ../lib/modules/zarafaGroup.inc:428 ../lib/modules/zarafaUser.inc:68
+#: ../lib/modules/zarafaUser.inc:150 ../lib/modules/zarafaUser.inc:229
+#: ../lib/modules/zarafaUser.inc:511
+msgid "Active"
+msgstr "有効"
+
+#: ../templates/config/conftypes.php:240
 msgid "Active account types"
 msgstr "有効なアカウント種別"
 
@@ -433,55 +466,53 @@ 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:275
-#: ../templates/config/conftypes.php:221 ../templates/pdfedit/pdfpage.php:579
+#: ../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/ipHost.inc:140
-#: ../lib/modules/ieee802device.inc:111 ../lib/modules/eduPerson.inc:296
-#: ../lib/modules/eduPerson.inc:321 ../lib/modules/eduPerson.inc:347
-#: ../lib/modules/eduPerson.inc:393 ../lib/modules/kolabUser.inc:346
-#: ../lib/modules/kolabUser.inc:363 ../lib/modules/kolabUser.inc:389
-#: ../lib/modules/kolabUser.inc:869 ../lib/modules/kolabUser.inc:909
-#: ../lib/modules/ldapPublicKey.inc:109 ../lib/modules/nisnetgroup.inc:251
-#: ../lib/modules/sudoRole.inc:290 ../lib/modules/sudoRole.inc:317
-#: ../lib/modules/sudoRole.inc:344 ../lib/modules/sudoRole.inc:371
-#: ../lib/modules/sudoRole.inc:398 ../lib/modules/sudoRole.inc:425
-#: ../lib/modules/inetLocalMailRecipient.inc:169
-#: ../lib/modules/groupOfNames.inc:171 ../lib/modules/groupOfNames.inc:305
-#: ../lib/modules/nisMailAlias.inc:156 ../lib/modules/hostObject.inc:152
+#: ../templates/pdfedit/pdfpage.php:660 ../lib/modules/kolabUser.inc:865
+#: ../lib/modules/kolabUser.inc:899 ../lib/modules/nisnetgroup.inc:266
+#: ../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
 msgid "Add"
 msgstr "追加"
 
-#: ../lib/modules/asteriskAccount.inc:208
+#: ../lib/modules/asteriskAccount.inc:216
 msgid "Add Asterisk account"
 msgstr "Asteriskアカウントを追加"
 
-#: ../lib/modules/asteriskVoicemail.inc:272
+#: ../lib/modules/asteriskVoicemail.inc:288
 msgid "Add Asterisk voicemail extension"
 msgstr "アスタリスク ボイスメール拡張"
 
-#: ../lib/modules/eduPerson.inc:408
+#: ../lib/modules/eduPerson.inc:384
 msgid "Add EDU person extension"
 msgstr "EDU person拡張を追加"
 
-#: ../lib/modules/ipHost.inc:186
+#: ../lib/modules/ipHost.inc:181
 msgid "Add IP address extension"
 msgstr "IPアドレス拡張を追加"
 
-#: ../lib/modules/kolabUser.inc:407
+#: ../lib/modules/kolabUser.inc:394
 msgid "Add Kolab extension"
 msgstr "Kolab拡張を追加"
 
-#: ../lib/modules/sambaSamAccount.inc:1269
-#: ../lib/modules/sambaGroupMapping.inc:280
+#: ../lib/modules/sambaSamAccount.inc:1215
+#: ../lib/modules/sambaGroupMapping.inc:271
 msgid "Add Samba 3 extension"
 msgstr "Samba 3拡張を追加"
 
-#: ../lib/modules/shadowAccount.inc:349
+#: ../lib/modules/shadowAccount.inc:364
 msgid "Add Shadow account extension"
 msgstr "Shadowアカウント拡張を追加"
 
-#: ../lib/modules/groupOfNames.inc:344
+#: ../lib/modules/zarafaGroup.inc:211 ../lib/modules/zarafaUser.inc:360
+#: ../lib/modules/zarafaServer.inc:172
+msgid "Add Zarafa extension"
+msgstr "Zarafa拡張を追加"
+
+#: ../lib/modules/groupOfNames.inc:329
 msgid "Add entries of this type:"
 msgstr "この型のエントリを追加:"
 
@@ -489,11 +520,11 @@ msgstr "この型のエントリを追加:"
 msgid "Add fix IP addresses to DNS"
 msgstr "固定IPアドレスをDNSに追加"
 
-#: ../lib/modules/hostObject.inc:166
+#: ../lib/modules/hostObject.inc:161
 msgid "Add host extension"
 msgstr "ホスト拡張を追加"
 
-#: ../templates/selfService/adminMain.php:553 ../help/help.inc:183
+#: ../templates/selfService/adminMain.php:551 ../help/help.inc:178
 msgid "Add input field"
 msgstr "入力フィールドの追加"
 
@@ -508,26 +539,26 @@ msgstr "新しい属性の追加"
 msgid "Add new binary attribute"
 msgstr "新しいバイナリ属性の追加"
 
-#: ../templates/selfService/adminMain.php:538 ../help/help.inc:181
+#: ../templates/selfService/adminMain.php:536 ../help/help.inc:176
 msgid "Add new group"
 msgstr "新しいグループの追加"
 
-#: ../lib/modules/inetOrgPerson.inc:555 ../lib/modules/inetOrgPerson.inc:1066
-#: ../lib/modules/inetOrgPerson.inc:1109 ../lib/modules/inetOrgPerson.inc:1634
+#: ../lib/modules/inetOrgPerson.inc:544 ../lib/modules/inetOrgPerson.inc:976
+#: ../lib/modules/inetOrgPerson.inc:1011 ../lib/modules/inetOrgPerson.inc:1510
 msgid "Add photo"
 msgstr "写真を追加"
 
 #: ../lib/modules/phpGroupwareGroup.inc:73
 #: ../lib/modules/phpGroupwareGroup.inc:83
-#: ../lib/modules/phpGroupwareGroup.inc:106
+#: ../lib/modules/phpGroupwareGroup.inc:103
 #: ../lib/modules/phpGroupwareUser.inc:74
-#: ../lib/modules/phpGroupwareUser.inc:110
-#: ../lib/modules/phpGroupwareUser.inc:196
+#: ../lib/modules/phpGroupwareUser.inc:107
+#: ../lib/modules/phpGroupwareUser.inc:191
 msgid "Add phpGroupWare extension"
 msgstr "phpGroupware拡張を追加"
 
-#: ../templates/config/profmanage.php:178
-#: ../templates/selfService/profManage.php:149 ../help/help.inc:121
+#: ../templates/config/profmanage.php:206
+#: ../templates/selfService/profManage.php:168 ../help/help.inc:118
 msgid "Add profile"
 msgstr "プロファイル追加"
 
@@ -535,18 +566,22 @@ msgstr "プロファイル追加"
 msgid "Adding attribute failed!"
 msgstr "属性の追加に失敗しました!"
 
-#: ../lib/modules/range.inc:98
+#: ../lib/modules/range.inc:108
 msgid "Adding the range failed because errors occured."
 msgstr "エラーが発生したため範囲の追加に失敗しました。"
 
-#: ../templates/selfService/adminMain.php:456 ../help/help.inc:187
+#: ../templates/selfService/adminMain.php:454 ../help/help.inc:182
 msgid "Additional CSS links"
 msgstr "追加のCSSリンク"
 
-#: ../lib/modules/posixAccount.inc:229 ../lib/modules/posixAccount.inc:316
-#: ../lib/modules/posixAccount.inc:349 ../lib/modules/posixAccount.inc:394
-#: ../lib/modules/posixAccount.inc:966 ../lib/modules/posixAccount.inc:1050
-#: ../lib/modules/posixAccount.inc:1095 ../lib/modules/posixAccount.inc:1181
+#: ../lib/modules/zarafaGroup.inc:64 ../lib/modules/zarafaGroup.inc:68
+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
 msgid "Additional groups"
 msgstr "追加のグループ"
 
@@ -554,7 +589,7 @@ msgstr "追加のグループ"
 msgid "Additional tasks for module:"
 msgstr "モジュールに対する追加タスク:"
 
-#: ../help/help.inc:182
+#: ../help/help.inc:177
 msgid ""
 "Adds a new group element to the list of self service options. Use this to "
 "structure the input fields."
@@ -562,30 +597,36 @@ msgstr ""
 "セルフサービス・オプションのリストに新しいグループ要素を追加します。入力"
 "フィールドを構造化するために使用します。"
 
-#: ../help/help.inc:184
+#: ../help/help.inc:179
 msgid "Adds a new self service option to the selected group element."
 msgstr "選択したグループ要素に新しいセルフサービス・オプションを追加します。"
 
-#: ../lib/modules/range.inc:88
+#: ../lib/modules/range.inc:95
 msgid "Adds input fields for a new IP range."
 msgstr "新しいIPアドレス範囲の入力フィールを追加する。"
 
-#: ../lib/modules/inetOrgPerson.inc:292 ../lib/modules/inetOrgPerson.inc:380
+#: ../lib/modules/zarafaUser.inc:92 ../lib/modules/zarafaUser.inc:256
+#: ../lib/modules/zarafaUser.inc:290 ../lib/modules/zarafaUser.inc:487
+#: ../lib/modules/zarafaUser.inc:1062
+msgid "Admin"
+msgstr "管理"
+
+#: ../lib/modules/inetOrgPerson.inc:281 ../lib/modules/inetOrgPerson.inc:369
 msgid "Administration"
 msgstr "管理"
 
-#: ../lib/modules/posixGroup.inc:372 ../lib/modules/nisnetgroup.inc:107
+#: ../lib/modules/posixGroup.inc:386 ../lib/modules/nisnetgroup.inc:107
 #: ../lib/modules/groupOfNames.inc:93
 msgid "Administrators group"
 msgstr "管理者グループ"
 
 #: ../lib/modules/eduPerson.inc:90 ../lib/modules/eduPerson.inc:94
-#: ../lib/modules/eduPerson.inc:161 ../lib/modules/eduPerson.inc:199
-#: ../lib/modules/eduPerson.inc:288 ../lib/modules/eduPerson.inc:688
+#: ../lib/modules/eduPerson.inc:158 ../lib/modules/eduPerson.inc:196
+#: ../lib/modules/eduPerson.inc:273 ../lib/modules/eduPerson.inc:663
 msgid "Affiliations"
 msgstr "所属"
 
-#: ../lib/modules/sambaSamAccount.inc:532
+#: ../lib/modules/sambaSamAccount.inc:525
 msgid "Alaska"
 msgstr "Alaska"
 
@@ -607,7 +648,7 @@ msgstr "エイリアスが空または不正!"
 
 #: ../lib/types/mailAlias.inc:91 ../lib/modules/nisMailAlias.inc:67
 #: ../lib/modules/nisMailAlias.inc:82 ../lib/modules/nisMailAlias.inc:96
-#: ../lib/modules/nisMailAlias.inc:140 ../lib/modules/nisMailAlias.inc:279
+#: ../lib/modules/nisMailAlias.inc:143 ../lib/modules/nisMailAlias.inc:283
 msgid "Alias name"
 msgstr "エイリアス名"
 
@@ -615,62 +656,64 @@ msgstr "エイリアス名"
 #: ../lib/modules/uidObject.inc:52 ../lib/modules/aliasEntry.inc:54
 #: ../lib/modules/aliasEntry.inc:62 ../lib/modules/aliasEntry.inc:70
 #: ../lib/modules/aliasEntry.inc:92 ../lib/modules/aliasEntry.inc:101
-#: ../lib/modules/aliasEntry.inc:230
+#: ../lib/modules/aliasEntry.inc:231
 msgid "Aliased entry"
 msgstr "エイリアス化エントリ"
 
 #: ../templates/schema/schema.php:224 ../lib/types/alias.inc:53
+#: ../lib/modules/zarafaUser.inc:152 ../lib/modules/zarafaUser.inc:320
+#: ../lib/modules/zarafaUser.inc:1086
 msgid "Aliases"
 msgstr "エイリアス"
 
-#: ../lib/lists.inc:603
+#: ../lib/lists.inc:627
 #, php-format
 msgid "All accounts (%s)"
 msgstr "全てのアカウント (%s)"
 
-#: ../templates/selfService/selfServiceMain.php:284
+#: ../templates/selfService/selfServiceMain.php:293
 #: ../templates/initsuff.php:157
 msgid "All changes were successful."
 msgstr "すべての変更が成功しました。"
 
-#: ../help/help.inc:194
+#: ../help/help.inc:189
 msgid "All following lines form the mail body."
 msgstr "後に続く全ての行はメール本文になります。"
 
-#: ../lib/lists.inc:602
+#: ../lib/lists.inc:626
 #, php-format
 msgid "All selected accounts (%s)"
 msgstr "全ての選択されたアカウント (%s)"
 
 #: ../lib/modules/sambaDomain.inc:110 ../lib/modules/sambaDomain.inc:187
-#: ../lib/modules/sambaDomain.inc:312 ../lib/modules/sambaDomain.inc:684
+#: ../lib/modules/sambaDomain.inc:301 ../lib/modules/sambaDomain.inc:654
 msgid "Allow machine password changes"
 msgstr "マシンパスワードの変更を許可"
 
 #: ../lib/types/ppolicyType.inc:90 ../lib/modules/ppolicy.inc:124
-#: ../lib/modules/ppolicy.inc:147 ../lib/modules/ppolicy.inc:301
-#: ../lib/modules/ppolicy.inc:517
+#: ../lib/modules/ppolicy.inc:147 ../lib/modules/ppolicy.inc:268
+#: ../lib/modules/ppolicy.inc:479
 msgid "Allow password change"
 msgstr "パスワードの変更を許可"
 
-#: ../lib/modules/sambaSamAccount.inc:209
-#: ../lib/modules/sambaSamAccount.inc:327
-#: ../lib/modules/sambaSamAccount.inc:1425
-#: ../lib/modules/sambaSamAccount.inc:1794
+#: ../lib/modules/sambaSamAccount.inc:206
+#: ../lib/modules/sambaSamAccount.inc:324
+#: ../lib/modules/sambaSamAccount.inc:1391
+#: ../lib/modules/sambaSamAccount.inc:1671
 msgid "Allow terminal server login"
 msgstr "ターミナルサーバログインを許可"
 
-#: ../templates/config/mainmanage.php:204 ../lib/types/user.inc:95
-#: ../help/help.inc:143
+#: ../templates/config/mainmanage.php:224 ../lib/types/user.inc:95
+#: ../help/help.inc:140
 msgid "Allowed hosts"
 msgstr "許可されたホスト"
 
-#: ../lib/modules/sambaSamAccount.inc:1292
-#: ../lib/modules/sambaSamAccount.inc:1293
+#: ../lib/modules/sambaSamAccount.inc:1242
+#: ../lib/modules/sambaSamAccount.inc:1243
 msgid "Allowed workstations"
 msgstr "許可されたワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:547
+#: ../lib/modules/sambaSamAccount.inc:540
 msgid "Almaty, Dhaka, Colombo"
 msgstr "Almaty, Dhaka, Colombo"
 
@@ -687,29 +730,29 @@ msgstr "常に拒否"
 msgid "An attribute (%s) was modified and is highlighted below."
 msgstr "属性(%s)が変更され、ハイライト表示されています。"
 
-#: ../lib/modules/sudoRole.inc:238
+#: ../lib/modules/sudoRole.inc:222
 msgid "An sudo role with this name already exists. Please choose another name."
 msgstr "sudoロール名がすでに使用されています。他の名前を選択してください。"
 
-#: ../lib/modules/kolabUser.inc:328 ../lib/modules/kolabUser.inc:787
-#: ../lib/modules/kolabUser.inc:890
+#: ../lib/modules/kolabUser.inc:330 ../lib/modules/kolabUser.inc:788
+#: ../lib/modules/kolabUser.inc:886
 msgid "Anyone"
 msgstr "誰か"
 
 #: ../lib/modules/asteriskExtension.inc:94
-#: ../lib/modules/asteriskExtension.inc:121
-#: ../lib/modules/asteriskExtension.inc:136
-#: ../lib/modules/asteriskExtension.inc:165
-#: ../lib/modules/asteriskExtension.inc:235
-#: ../lib/modules/asteriskExtension.inc:469
+#: ../lib/modules/asteriskExtension.inc:114
+#: ../lib/modules/asteriskExtension.inc:127
+#: ../lib/modules/asteriskExtension.inc:156
+#: ../lib/modules/asteriskExtension.inc:245
+#: ../lib/modules/asteriskExtension.inc:475
 msgid "Application"
 msgstr "アプリケーション"
 
 #: ../lib/modules/asteriskExtension.inc:78
-#: ../lib/modules/asteriskExtension.inc:132
-#: ../lib/modules/asteriskExtension.inc:172
-#: ../lib/modules/asteriskExtension.inc:239
-#: ../lib/modules/asteriskExtension.inc:466
+#: ../lib/modules/asteriskExtension.inc:123
+#: ../lib/modules/asteriskExtension.inc:163
+#: ../lib/modules/asteriskExtension.inc:253
+#: ../lib/modules/asteriskExtension.inc:472
 msgid "Application data"
 msgstr "アプリケーション・データ"
 
@@ -733,8 +776,9 @@ msgstr "アスタリスク拡張"
 msgid "Asterisk extensions entries"
 msgstr "アスタリスク拡張エントリ"
 
-#: ../lib/modules/asteriskAccount.inc:95
-#: ../lib/modules/asteriskAccount.inc:102
+#: ../lib/modules/asteriskAccount.inc:99
+#: ../lib/modules/asteriskAccount.inc:105
+#: ../lib/modules/asteriskAccount.inc:109
 msgid "Asterisk realm"
 msgstr "アスタリスク・レルム"
 
@@ -742,19 +786,14 @@ msgstr "アスタリスク・レルム"
 msgid "Asterisk voicemail"
 msgstr "アスタリスク・ボイスメール"
 
-#: ../lib/modules/asteriskVoicemail.inc:107
+#: ../lib/modules/asteriskVoicemail.inc:111
 msgid "Asterisk voicemail context."
 msgstr "アスタリスク ボイスメール・コンテキスト"
 
-#: ../lib/modules/sambaSamAccount.inc:537
+#: ../lib/modules/sambaSamAccount.inc:530
 msgid "Atlantic time (Canada), Caracas"
 msgstr "Atlantic time (Canada), Caracas"
 
-#: ../lib/modules/ddns.inc:390
-msgid ""
-"Attention: The DHCP service needs to be restarted after changes in DDNS."
-msgstr "注意: DDNSの変更後にDHCPサービスのリスタートが必要です。"
-
 #: ../templates/tree/update_confirm.php:152
 msgid "Attribute"
 msgstr "属性"
@@ -763,27 +802,29 @@ msgstr "属性"
 msgid "Attribute types"
 msgstr "属性タイプ"
 
-#: ../lib/modules/sambaSamAccount.inc:553
+#: ../lib/modules/sambaSamAccount.inc:546
 msgid "Auckland, Fiji, Kamchatka"
 msgstr "Auckland, Fiji, Kamchatka"
 
-#: ../lib/modules/asteriskAccount.inc:96
+#: ../lib/modules/asteriskAccount.inc:100
 msgid ""
 "Authentication realm for Asterisk server (default: asterisk). This value set "
 "in sip.conf (option: \"realm\")."
-msgstr "アスタリスク・サーバーに対する認証レルム(default: asterisk)。この値は sip.conf で設定されます (option: \"realm\")。"
+msgstr ""
+"アスタリスク・サーバーに対する認証レルム(default: asterisk)。この値は sip."
+"conf で設定されます (option: \"realm\")。"
 
-#: ../lib/modules/eduPerson.inc:127 ../lib/modules/eduPerson.inc:133
-#: ../lib/modules/sambaSamAccount.inc:143
-#: ../lib/modules/sambaSamAccount.inc:375
-#: ../lib/modules/phpGroupwareUser.inc:86
-#: ../lib/modules/phpGroupwareUser.inc:93 ../lib/modules/shadowAccount.inc:99
-#: ../lib/modules/shadowAccount.inc:193 ../lib/modules/hostObject.inc:76
-#: ../lib/modules/hostObject.inc:95
+#: ../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/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
+#: ../lib/modules/hostObject.inc:94
 msgid "Automatically add this extension"
 msgstr "この拡張を自動的に追加"
 
-#: ../templates/config/conftypes.php:214 ../lib/modules/customScripts.inc:54
+#: ../templates/config/conftypes.php:221 ../lib/modules/customScripts.inc:54
 msgid "Available account types"
 msgstr "有効なアカウント種別"
 
@@ -791,23 +832,23 @@ msgstr "有効なアカウント種別"
 msgid "Available actions"
 msgstr "利用可能なアクション"
 
-#: ../lib/modules/posixAccount.inc:1062 ../lib/modules/nisnetgroup.inc:368
+#: ../lib/modules/posixAccount.inc:1059 ../lib/modules/nisnetgroup.inc:375
 msgid "Available groups"
 msgstr "有効なグループ"
 
-#: ../templates/config/confmodules.php:284
+#: ../templates/config/confmodules.php:288
 msgid "Available modules"
 msgstr "有効なモジュール"
 
-#: ../lib/modules/posixGroup.inc:253 ../lib/modules/asteriskExtension.inc:317
+#: ../lib/modules/posixGroup.inc:252 ../lib/modules/asteriskExtension.inc:310
 msgid "Available users"
 msgstr "有効なユーザ"
 
-#: ../lib/modules/sambaSamAccount.inc:1298
+#: ../lib/modules/sambaSamAccount.inc:1245
 msgid "Available workstations"
 msgstr "有効なワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:540
+#: ../lib/modules/sambaSamAccount.inc:533
 msgid "Azores, Cape Verde Islands"
 msgstr "Azores, Cape Verde Islands"
 
@@ -816,12 +857,10 @@ msgid "B-Node (0x01)"
 msgstr "B-Node (0x01)"
 
 #: ../templates/tree/update_confirm.php:255
-#: ../templates/massBuildAccounts.php:212 ../lib/modules/posixGroup.inc:259
-#: ../lib/modules/sambaSamAccount.inc:1302
-#: ../lib/modules/posixAccount.inc:1068 ../lib/modules/nisnetgroup.inc:374
-#: ../lib/modules/inetOrgPerson.inc:1110
-#: ../lib/modules/asteriskExtension.inc:324
-#: ../lib/modules/groupOfNames.inc:354
+#: ../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
 msgid "Back"
 msgstr "戻る"
 
@@ -829,13 +868,6 @@ msgstr "戻る"
 msgid "Back to DHCP list"
 msgstr "DHCP一覧に戻る"
 
-#: ../templates/config/index.php:115 ../templates/config/conflogin.php:161
-#: ../templates/config/mainlogin.php:154
-#: ../templates/selfService/adminLogin.php:157
-#: ../templates/selfService/adminMain.php:140
-msgid "Back to Login"
-msgstr "ログインに戻る"
-
 #: ../lib/types/nisObjectType.inc:30
 msgid "Back to NIS object list"
 msgstr "NISオブジェクト一覧に戻る"
@@ -865,16 +897,22 @@ msgstr "グループ一覧に戻る"
 msgid "Back to host list"
 msgstr "ホスト一覧に戻る"
 
-#: ../templates/delete.php:232
+#: ../templates/delete.php:233
 msgid "Back to list"
 msgstr "一覧に戻る"
 
+#: ../templates/config/mainmanage.php:155 ../templates/config/index.php:71
+#: ../templates/config/conflogin.php:109 ../templates/config/mainlogin.php:114
+#: ../templates/selfService/adminLogin.php:109
+msgid "Back to login"
+msgstr "ログインに戻る"
+
 #: ../lib/types/ppolicyType.inc:30
 msgid "Back to policy list"
 msgstr "ポリシー一覧に戻る"
 
-#: ../templates/config/profmanage.php:365
-#: ../templates/selfService/profManage.php:277
+#: ../templates/config/profmanage.php:73
+#: ../templates/selfService/profManage.php:73
 msgid "Back to profile login"
 msgstr "プロファイルログインに戻る"
 
@@ -890,11 +928,11 @@ msgstr "ユーザー一覧に戻る"
 msgid "Backup script"
 msgstr "スクリプトのバックアップ"
 
-#: ../lib/modules/sambaSamAccount.inc:544
+#: ../lib/modules/sambaSamAccount.inc:537
 msgid "Baghdad, Riyadh, Moscow"
 msgstr "Baghdad, Riyadh, Moscow"
 
-#: ../lib/modules/sambaSamAccount.inc:548
+#: ../lib/modules/sambaSamAccount.inc:541
 msgid "Bangkok, Hanoi, Jakarta"
 msgstr "Bangkok, Hanoi, Jakarta"
 
@@ -906,7 +944,7 @@ msgstr "Base (ベースDNのみ)"
 msgid "Base DN"
 msgstr "ベースDN"
 
-#: ../templates/config/confmodules.php:206 ../help/help.inc:135
+#: ../templates/config/confmodules.php:212 ../help/help.inc:132
 msgid "Base module"
 msgstr "ベースモジュール"
 
@@ -914,7 +952,7 @@ msgstr "ベースモジュール"
 msgid "Beginning"
 msgstr "先頭"
 
-#: ../lib/modules/sambaSamAccount.inc:549
+#: ../lib/modules/sambaSamAccount.inc:542
 msgid "Beijing, Perth, Singapore"
 msgstr "Beijing(北京), Perth, Singapore"
 
@@ -954,7 +992,7 @@ msgstr ""
 "ブロック・ソフトクオータはブロック・ハードクオータより小さくなくてはなりませ"
 "ん。"
 
-#: ../lib/modules/sambaSamAccount.inc:538
+#: ../lib/modules/sambaSamAccount.inc:531
 msgid "Brazil, Buenos Aires"
 msgstr "Brazil, Buenos Aires"
 
@@ -963,14 +1001,14 @@ msgid "Builtin group"
 msgstr "組み込みグループ"
 
 #: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:121
-#: ../lib/modules/inetOrgPerson.inc:217 ../lib/modules/inetOrgPerson.inc:290
-#: ../lib/modules/inetOrgPerson.inc:472 ../lib/modules/inetOrgPerson.inc:567
-#: ../lib/modules/inetOrgPerson.inc:1015 ../lib/modules/inetOrgPerson.inc:1139
-#: ../lib/modules/inetOrgPerson.inc:1603
+#: ../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
 msgid "Business category"
 msgstr "業種"
 
-#: ../lib/modules/inetOrgPerson.inc:568
+#: ../lib/modules/inetOrgPerson.inc:557
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "業種(例. 役員, ITサービス, マネージャー, ...)"
 
@@ -979,140 +1017,147 @@ msgid ""
 "By default, LAM will show the executed command along with any output of it. "
 "If you want to hide the command and only show the output then activate this "
 "option."
-msgstr "デフォルトでは、LAMは実行したコマンドを全ての出力と一緒に表示します。もしもコマンドを非表示として出力のみを表示する場合は、このオプションを有効にしてください。"
+msgstr ""
+"デフォルトでは、LAMは実行したコマンドを全ての出力と一緒に表示します。もしもコ"
+"マンドを非表示として出力のみを表示する場合は、このオプションを有効にしてくだ"
+"さい。"
 
-#: ../templates/masscreate.php:224
+#: ../templates/masscreate.php:222
 msgid "CSV file:"
 msgstr "CSVファイル:"
 
-#: ../templates/config/confmain.php:274 ../help/help.inc:100
+#: ../templates/config/confmain.php:281 ../help/help.inc:97
 msgid "Cache timeout"
 msgstr "キャッシュ有効時間"
 
-#: ../templates/config/confmain.php:563
+#: ../templates/config/confmain.php:585
 msgid "Cache timeout is invalid!"
 msgstr "キャッシュ有効時間が正しくありません。"
 
-#: ../lib/modules/asteriskAccount.inc:79
-#: ../lib/modules/asteriskAccount.inc:125
-#: ../lib/modules/asteriskAccount.inc:135
-#: ../lib/modules/asteriskAccount.inc:191
-#: ../lib/modules/asteriskAccount.inc:287
+#: ../lib/modules/asteriskAccount.inc:83
+#: ../lib/modules/asteriskAccount.inc:123
+#: ../lib/modules/asteriskAccount.inc:133
+#: ../lib/modules/asteriskAccount.inc:195
+#: ../lib/modules/asteriskAccount.inc:294
 msgid "Caller ID"
 msgstr "発信者番号"
 
+#: ../lib/modules/sambaSamAccount.inc:279
 #: ../lib/modules/sambaSamAccount.inc:282
 #: ../lib/modules/sambaSamAccount.inc:285
-#: ../lib/modules/sambaSamAccount.inc:288
-#: ../lib/modules/sambaSamAccount.inc:294 ../lib/modules/posixAccount.inc:395
-#: ../lib/modules/sambaGroupMapping.inc:368
-#: ../lib/modules/shadowAccount.inc:174 ../lib/modules/shadowAccount.inc:178
-#: ../lib/modules/shadowAccount.inc:182 ../lib/modules/shadowAccount.inc:186
+#: ../lib/modules/sambaSamAccount.inc:291 ../lib/modules/posixAccount.inc:381
+#: ../lib/modules/sambaGroupMapping.inc:358
+#: ../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."
 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:378
-#: ../templates/config/confmodules.php:184
-#: ../templates/config/confmain.php:217
-#: ../templates/config/moduleSettings.php:183
-#: ../templates/config/conftypes.php:202
-#: ../templates/selfService/adminMain.php:306
-#: ../templates/pdfedit/pdfdelete.php:92 ../templates/pdfedit/pdfpage.php:688
-#: ../templates/delete.php:112 ../templates/profedit/profiledelete.php:83
-#: ../templates/profedit/profilepage.php:259 ../templates/initsuff.php:187
-#: ../lib/modules/sambaSamAccount.inc:1367
-#: ../lib/modules/sambaSamAccount.inc:1405
-#: ../lib/modules/sambaSamAccount.inc:1528 ../lib/modules/kolabUser.inc:576
-#: ../lib/modules/phpGroupwareUser.inc:262
-#: ../lib/modules/shadowAccount.inc:403 ../lib/modules/nisnetgroup.inc:471
-#: ../lib/modules/aliasEntry.inc:142 ../lib/modules/aliasEntry.inc:161
-#: ../lib/modules/groupOfNames.inc:238 ../lib/modules/groupOfNames.inc:259
-#: ../lib/modules/groupOfNames.inc:306 ../lib/lists.inc:614
-#: ../lib/lists.inc:830 ../lib/modules.inc:1317
+#: ../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
+#: ../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
 msgid "Cancel"
 msgstr "中止"
 
-#: ../templates/login.php:417 ../templates/login.php:475
-#: ../templates/login.php:480
+#: ../templates/login.php:460 ../templates/login.php:518
+#: ../templates/login.php:523
 #: ../templates/selfService/selfServiceLogin.php:120
 #: ../templates/selfService/selfServiceLogin.php:124
-#: ../templates/selfService/selfServiceMain.php:165
+#: ../templates/selfService/selfServiceMain.php:174
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "指定されたLDAPサーバに接続できません。再試行してください。"
 
-#: ../templates/login.php:220 ../lib/config.inc:1150
+#: ../templates/login.php:247 ../lib/config.inc:1230
 msgid "Cannot open config file!"
 msgstr "configファイルをオープンできません!"
 
-#: ../templates/selfService/adminMain.php:403
+#: ../lib/modules/zarafaUser.inc:104 ../lib/modules/zarafaUser.inc:148
+#: ../lib/modules/zarafaUser.inc:221 ../lib/modules/zarafaUser.inc:314
+#: ../lib/modules/zarafaUser.inc:339 ../lib/modules/zarafaUser.inc:477
+#: ../lib/modules/zarafaUser.inc:1050
+msgid "Capacity"
+msgstr "容量"
+
+#: ../templates/selfService/adminMain.php:401
 msgid "Captions and labels"
 msgstr "説明とラベル"
 
-#: ../lib/modules/inetOrgPerson.inc:120 ../lib/modules/inetOrgPerson.inc:213
-#: ../lib/modules/inetOrgPerson.inc:402 ../lib/modules/inetOrgPerson.inc:466
-#: ../lib/modules/inetOrgPerson.inc:579 ../lib/modules/inetOrgPerson.inc:997
-#: ../lib/modules/inetOrgPerson.inc:1141 ../lib/modules/inetOrgPerson.inc:1587
+#: ../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
 msgid "Car license"
 msgstr "免許証番号"
 
-#: ../lib/modules/sambaSamAccount.inc:542
+#: ../lib/modules/sambaSamAccount.inc:535
 msgid "Central Europe Time, Paris, Berlin"
 msgstr "Central Europe Time, Paris, Berlin"
 
-#: ../lib/modules/sambaSamAccount.inc:535
+#: ../lib/modules/sambaSamAccount.inc:528
 msgid "Central Time (US & Canada), Mexico City"
 msgstr "Central Time (US & Canada), Mexico City"
 
-#: ../templates/selfService/adminMain.php:481
+#: ../templates/selfService/adminMain.php:479
 #: ../templates/pdfedit/pdfpage.php:468 ../templates/pdfedit/pdfpage.php:474
-#: ../lib/modules/sambaSamAccount.inc:1141
-#: ../lib/modules/sambaSamAccount.inc:1401
-#: ../lib/modules/phpGroupwareUser.inc:158
-#: ../lib/modules/phpGroupwareUser.inc:258
-#: ../lib/modules/shadowAccount.inc:335 ../lib/modules/shadowAccount.inc:399
-#: ../lib/modules/asteriskExtension.inc:245 ../lib/modules/aliasEntry.inc:94
-#: ../lib/modules/groupOfNames.inc:160 ../lib/modules/groupOfNames.inc:177
+#: ../lib/modules/device.inc:178 ../lib/modules/sambaSamAccount.inc:1107
+#: ../lib/modules/sambaSamAccount.inc:1369
+#: ../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
 msgid "Change"
 msgstr "変更"
 
-#: ../lib/modules/posixGroup.inc:205
+#: ../lib/modules/posixGroup.inc:213
 msgid "Change GID number of users and hosts"
 msgstr "ユーザとホストのGID番号を変更"
 
-#: ../templates/config/profmanage.php:330 ../help/help.inc:129
+#: ../templates/config/profmanage.php:358 ../help/help.inc:126
 msgid "Change default profile"
 msgstr "デフォルト・プロファイルの変更"
 
-#: ../lib/lists.inc:816
+#: ../lib/lists.inc:869
 msgid "Change list settings"
 msgstr "リスト設定の変更"
 
-#: ../templates/config/mainmanage.php:342 ../help/help.inc:131
+#: ../templates/config/mainmanage.php:362 ../help/help.inc:128
 msgid "Change master password"
 msgstr "マスタパスワードの変更"
 
-#: ../templates/lists/changePassword.php:128
-#: ../templates/lists/changePassword.php:183
-#: ../templates/lists/changePassword.php:214 ../lib/types/user.inc:247
-#: ../help/help.inc:98
+#: ../templates/lists/changePassword.php:160
+#: ../templates/lists/changePassword.php:215
+#: ../templates/lists/changePassword.php:246 ../lib/types/user.inc:247
+#: ../help/help.inc:95
 msgid "Change password"
 msgstr "パスワードの変更"
 
-#: ../templates/config/confmain.php:326 ../templates/config/confmain.php:329
+#: ../templates/config/confmain.php:333 ../templates/config/confmain.php:336
 msgid "Change passwords"
 msgstr "パスワードの変更"
 
-#: ../templates/login.php:352
-msgid "Change profile"
-msgstr "プロファイルの変更"
-
-#: ../lib/lists.inc:667 ../lib/lists.inc:668
+#: ../lib/types/dhcp.inc:225 ../lib/lists.inc:691
 msgid "Change settings"
 msgstr "設定の変更"
 
-#: ../lib/modules/posixAccount.inc:837
+#: ../lib/modules/posixAccount.inc:846
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "ASCII文字だけが有効なため、%s の値を変更しました。"
 
@@ -1132,7 +1177,7 @@ msgstr ""
 msgid "Check quotas"
 msgstr "クオータをチェック"
 
-#: ../templates/masscreate.php:215
+#: ../templates/masscreate.php:213
 msgid ""
 "Check your input carefully. LAM will only do some basic checks on the upload "
 "data."
@@ -1148,7 +1193,7 @@ msgstr "ホームディレクトリ用のサーバを選択してください!"
 msgid "Choose a template"
 msgstr "テンプレートを選択"
 
-#: ../templates/tree/create.php:169 ../lib/config.inc:152
+#: ../templates/tree/create.php:169 ../lib/config.inc:158
 msgid "Click here if you are not directed to the next page."
 msgstr "自動的に次ページにジャンプしない場合はここをクリックしてください。"
 
@@ -1156,10 +1201,10 @@ msgstr "自動的に次ページにジャンプしない場合はここをクリ
 msgid "Click to switch between thumbnail and original size."
 msgstr "クリックしてサムネイルと元のサイズを切り替えてください。"
 
-#: ../lib/modules/sambaSamAccount.inc:221
-#: ../lib/modules/sambaSamAccount.inc:354
-#: ../lib/modules/sambaSamAccount.inc:1491
-#: ../lib/modules/sambaSamAccount.inc:1822
+#: ../lib/modules/sambaSamAccount.inc:218
+#: ../lib/modules/sambaSamAccount.inc:351
+#: ../lib/modules/sambaSamAccount.inc:1421
+#: ../lib/modules/sambaSamAccount.inc:1699
 msgid "Client printer is default"
 msgstr "クライアントプリンタをデフォルトにする"
 
@@ -1167,11 +1212,11 @@ msgstr "クライアントプリンタをデフォルトにする"
 msgid "Collective"
 msgstr "集合属性"
 
-#: ../templates/masscreate.php:235
+#: ../templates/masscreate.php:234
 msgid "Columns:"
 msgstr "カラム:"
 
-#: ../lib/modules/sambaSamAccount.inc:294
+#: ../lib/modules/sambaSamAccount.inc:291
 msgid ""
 "Comma separated list of Samba workstations the user is allowed to login. "
 "Empty means every workstation."
@@ -1185,8 +1230,8 @@ msgstr "コマンド"
 
 #: ../lib/modules/sudoRole.inc:71 ../lib/modules/sudoRole.inc:97
 #: ../lib/modules/sudoRole.inc:146 ../lib/modules/sudoRole.inc:175
-#: ../lib/modules/sudoRole.inc:190 ../lib/modules/sudoRole.inc:339
-#: ../lib/modules/sudoRole.inc:714
+#: ../lib/modules/sudoRole.inc:184 ../lib/modules/sudoRole.inc:318
+#: ../lib/modules/sudoRole.inc:693
 msgid "Commands"
 msgstr "コマンド"
 
@@ -1194,18 +1239,18 @@ msgstr "コマンド"
 msgid "Commit"
 msgstr "更新"
 
-#: ../lib/modules/posixAccount.inc:95 ../lib/modules/posixAccount.inc:210
-#: ../lib/modules/posixAccount.inc:319 ../lib/modules/posixAccount.inc:398
-#: ../lib/modules/posixAccount.inc:420 ../lib/modules/posixAccount.inc:944
-#: ../lib/modules/posixAccount.inc:1176 ../lib/modules/inetOrgPerson.inc:68
-#: ../lib/modules/inetOrgPerson.inc:485 ../lib/modules/inetOrgPerson.inc:547
-#: ../lib/modules/inetOrgPerson.inc:845 ../lib/modules/inetOrgPerson.inc:1137
-#: ../lib/modules/inetOrgPerson.inc:1191
+#: ../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/asteriskExtension.inc:102
-#: ../lib/modules/asteriskExtension.inc:138
-#: ../lib/modules/asteriskExtension.inc:158
-#: ../lib/modules/asteriskExtension.inc:219
-#: ../lib/modules/asteriskExtension.inc:481
+#: ../lib/modules/asteriskExtension.inc:129
+#: ../lib/modules/asteriskExtension.inc:149
+#: ../lib/modules/asteriskExtension.inc:213
+#: ../lib/modules/asteriskExtension.inc:487
 msgid "Common name"
 msgstr "名称(common name)"
 
@@ -1221,27 +1266,27 @@ msgstr "サフィックスの設定"
 msgid "Configuration overview"
 msgstr "構成の概要"
 
-#: ../templates/config/confmodules.php:367
+#: ../templates/config/confmodules.php:371
 msgid "Conflicting module:"
 msgstr "競合するモジュール"
 
-#: ../lib/modules/sambaSamAccount.inc:219
-#: ../lib/modules/sambaSamAccount.inc:348
-#: ../lib/modules/sambaSamAccount.inc:1481
-#: ../lib/modules/sambaSamAccount.inc:1812
+#: ../lib/modules/sambaSamAccount.inc:216
+#: ../lib/modules/sambaSamAccount.inc:345
+#: ../lib/modules/sambaSamAccount.inc:1417
+#: ../lib/modules/sambaSamAccount.inc:1689
 msgid "Connect client drives"
 msgstr "クライアントのドライブを接続"
 
-#: ../lib/modules/sambaSamAccount.inc:220
-#: ../lib/modules/sambaSamAccount.inc:351
-#: ../lib/modules/sambaSamAccount.inc:1486
-#: ../lib/modules/sambaSamAccount.inc:1817
+#: ../lib/modules/sambaSamAccount.inc:217
+#: ../lib/modules/sambaSamAccount.inc:348
+#: ../lib/modules/sambaSamAccount.inc:1419
+#: ../lib/modules/sambaSamAccount.inc:1694
 msgid "Connect client printers"
 msgstr "クライアントのプリンタを接続する"
 
-#: ../lib/modules/sambaSamAccount.inc:216
-#: ../lib/modules/sambaSamAccount.inc:1466
-#: ../lib/modules/sambaSamAccount.inc:1805
+#: ../lib/modules/sambaSamAccount.inc:213
+#: ../lib/modules/sambaSamAccount.inc:1411
+#: ../lib/modules/sambaSamAccount.inc:1682
 msgid "Connection time limit"
 msgstr "接続時間の制限"
 
@@ -1258,8 +1303,8 @@ msgstr "コンテナのDN"
 msgid "Could not perform ldap_modify operation."
 msgstr "ldap_modifyオペレーションを実行できません。"
 
-#: ../templates/config/profmanage.php:109
-#: ../templates/selfService/profManage.php:97
+#: ../templates/config/profmanage.php:137
+#: ../templates/selfService/profManage.php:116
 msgid "Could not rename file!"
 msgstr "ファイル名を変更できません!"
 
@@ -1267,13 +1312,13 @@ msgstr "ファイル名を変更できません!"
 msgid "Could not save PDF structure, access denied."
 msgstr "PDF構成を保存できません。アクセスが拒否されました。"
 
-#: ../lib/modules/kolabUser.inc:90 ../lib/modules/kolabUser.inc:159
-#: ../lib/modules/kolabUser.inc:188 ../lib/modules/kolabUser.inc:227
-#: ../lib/modules/kolabUser.inc:288 ../lib/modules/kolabUser.inc:763
+#: ../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
 msgid "Country"
 msgstr "国"
 
-#: ../lib/modules/kolabUser.inc:245 ../lib/modules/kolabUser.inc:246
+#: ../lib/modules/kolabUser.inc:233 ../lib/modules/kolabUser.inc:234
 msgid "Country name is invalid!"
 msgstr "国名が正しくありません!"
 
@@ -1289,8 +1334,8 @@ msgstr "作成"
 msgid "Create Object"
 msgstr "オブジェクト作成"
 
-#: ../lib/lists.inc:411 ../lib/lists.inc:573 ../lib/modules.inc:1468
-#: ../help/help.inc:162
+#: ../lib/lists.inc:428 ../lib/lists.inc:597 ../lib/modules.inc:1494
+#: ../help/help.inc:158
 msgid "Create PDF file"
 msgstr "PDFファイル作成"
 
@@ -1347,12 +1392,12 @@ msgstr "新たなsudoロールを作成"
 msgid "Create another user"
 msgstr "新たなユーザーを作成"
 
-#: ../lib/lists.inc:590
+#: ../lib/lists.inc:614
 msgid "Create for"
 msgstr "作成"
 
-#: ../lib/modules/posixAccount.inc:242 ../lib/modules/posixAccount.inc:983
-#: ../lib/modules/posixAccount.inc:1112
+#: ../lib/modules/posixAccount.inc:228 ../lib/modules/posixAccount.inc:995
+#: ../lib/modules/posixAccount.inc:1108
 msgid "Create home directory"
 msgstr "ホームディレクトリを作成"
 
@@ -1363,8 +1408,8 @@ msgstr "ホームディレクトリを作成"
 msgid "Create new entry"
 msgstr "新しいエントリを作成"
 
-#: ../templates/config/profmanage.php:94
-#: ../templates/selfService/profManage.php:80
+#: ../templates/config/profmanage.php:119
+#: ../templates/selfService/profManage.php:99
 msgid "Created new profile."
 msgstr "新しいプロファイルが作成されました。"
 
@@ -1386,11 +1431,11 @@ msgstr "カスタム"
 msgid "Custom scripts"
 msgstr "カスタム・スクリプト"
 
-#: ../lib/modules/ddns.inc:65
+#: ../lib/modules/ddns.inc:69
 msgid "DDNS"
 msgstr "DDNS"
 
-#: ../lib/modules/ddns.inc:360
+#: ../lib/modules/ddns.inc:352
 msgid ""
 "DDNS ist not activated. You can activate it in the DHCP settings (DDNS)."
 msgstr "DDNSが無効です。DHCP設定の中(DDNS)で有効にできます。"
@@ -1403,7 +1448,7 @@ msgstr "DHCP"
 msgid "DHCP administration"
 msgstr "DHCPの管理"
 
-#: ../lib/types/dhcp.inc:126 ../lib/modules/dhcp_settings.inc:101
+#: ../lib/types/dhcp.inc:126 ../lib/modules/dhcp_settings.inc:106
 msgid "DHCP settings"
 msgstr "DHCP設定"
 
@@ -1411,26 +1456,26 @@ 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:91
-#: ../lib/modules.inc:384 ../lib/modules.inc:1546 ../lib/modules.inc:2019
+#: ../templates/tree/delete_form.php:151 ../templates/delete.php:92
+#: ../lib/modules.inc:384 ../lib/modules.inc:1567 ../lib/modules.inc:2040
 msgid "DN"
 msgstr "DN"
 
-#: ../templates/masscreate.php:238
+#: ../templates/masscreate.php:237
 msgid "DN settings"
 msgstr "DN設定"
 
-#: ../templates/masscreate.php:242 ../help/help.inc:156
+#: ../templates/masscreate.php:241 ../help/help.inc:152
 msgid "DN suffix"
 msgstr "DNサフィックス"
 
-#: ../lib/modules/dhcp_settings.inc:170 ../lib/modules/dhcp_settings.inc:202
-#: ../lib/modules/dhcp_settings.inc:256 ../lib/modules/dhcp_settings.inc:569
-#: ../lib/modules/dhcp_settings.inc:671
+#: ../lib/modules/dhcp_settings.inc:175 ../lib/modules/dhcp_settings.inc:189
+#: ../lib/modules/dhcp_settings.inc:228 ../lib/modules/dhcp_settings.inc:526
+#: ../lib/modules/dhcp_settings.inc:613
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/modules/dhcp_settings.inc:131
+#: ../lib/modules/dhcp_settings.inc:136
 msgid "DNS (Domain Name System)"
 msgstr "DNS (Domain Name System)"
 
@@ -1438,7 +1483,7 @@ msgstr "DNS (Domain Name System)"
 msgid "DNs of the extension owners"
 msgstr "拡張所有者のDN"
 
-#: ../lib/export.inc:511
+#: ../lib/export.inc:513
 #, php-format
 msgid "DSML Export for: %s"
 msgstr "DSMLにエクスポート: %s"
@@ -1447,15 +1492,15 @@ msgstr "DSMLにエクスポート: %s"
 msgid "Data field for RDN is empty!"
 msgstr "RDNのデータフィールドが空です!"
 
-#: ../lib/modules/sambaSamAccount.inc:274
+#: ../lib/modules/sambaSamAccount.inc:271
 msgid "Date after the user is able to change his password."
 msgstr "ユーザによるパスワード変更の禁止が解かれる日付。"
 
-#: ../lib/modules/sambaSamAccount.inc:276
+#: ../lib/modules/sambaSamAccount.inc:273
 msgid "Date after the user must change his password."
 msgstr "ユーザがパスワードを変更しなければならなくなる日付。"
 
-#: ../lib/modules/shadowAccount.inc:174
+#: ../lib/modules/shadowAccount.inc:169
 msgid ""
 "Days before password is to expire that user is warned of pending password "
 "expiration. If set value must be >0."
@@ -1463,21 +1508,21 @@ msgstr ""
 "パスワードが期限切れになる前にユーザへパスワード期限切れの猶予期間である旨を"
 "警告する日数。もしもその値を設定するなら0より大きくなければならない。"
 
-#: ../templates/config/mainmanage.php:267
+#: ../templates/config/mainmanage.php:287
 msgid "Debug"
 msgstr "デバッグ"
 
-#: ../lib/modules/dhcp_settings.inc:134 ../lib/modules/dhcp_settings.inc:171
-#: ../lib/modules/dhcp_settings.inc:207 ../lib/modules/dhcp_settings.inc:262
-#: ../lib/modules/dhcp_settings.inc:575 ../lib/modules/dhcp_settings.inc:672
+#: ../lib/modules/dhcp_settings.inc:139 ../lib/modules/dhcp_settings.inc:176
+#: ../lib/modules/dhcp_settings.inc:190 ../lib/modules/dhcp_settings.inc:234
+#: ../lib/modules/dhcp_settings.inc:528 ../lib/modules/dhcp_settings.inc:614
 msgid "Default gateway"
 msgstr "デフォルト・ゲートウェイ"
 
-#: ../templates/config/confmain.php:354 ../help/help.inc:94
+#: ../templates/config/confmain.php:361 ../help/help.inc:91
 msgid "Default language"
 msgstr "規定の言語"
 
-#: ../templates/masscreate.php:250 ../templates/masscreate.php:413
+#: ../templates/masscreate.php:249 ../templates/masscreate.php:377
 msgid "Default value"
 msgstr "既定値"
 
@@ -1485,25 +1530,19 @@ msgstr "既定値"
 msgid "Defines if workstations may change their passwords."
 msgstr "ワークステーションのパスワード変更を許可する場合に定義します。"
 
-#: ../lib/modules/kolabUser.inc:129 ../lib/modules/kolabUser.inc:143
-#: ../lib/modules/kolabUser.inc:147 ../lib/modules/kolabUser.inc:207
-#: ../lib/modules/kolabUser.inc:230 ../lib/modules/kolabUser.inc:392
-#: ../lib/modules/kolabUser.inc:801 ../lib/modules/kolabUser.inc:872
+#: ../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
 msgid "Delegates"
 msgstr "代理人"
 
-#: ../lib/modules/kolabUser.inc:250
-msgid "Delegates has invalid format!"
-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:111
+#: ../templates/pdfedit/pdfmain.php:178 ../templates/delete.php:112
 #: ../templates/profedit/profilemain.php:170 ../lib/tree.inc:1176
-#: ../lib/modules/eduPerson.inc:280 ../lib/modules/eduPerson.inc:305
-#: ../lib/modules/eduPerson.inc:331 ../lib/modules/eduPerson.inc:377
-#: ../lib/modules/kolabUser.inc:863 ../lib/modules/nisnetgroup.inc:229
-#: ../lib/lists.inc:406
+#: ../lib/modules/kolabUser.inc:862 ../lib/modules/nisnetgroup.inc:237
+#: ../lib/lists.inc:422
 msgid "Delete"
 msgstr "削除"
 
@@ -1516,10 +1555,6 @@ msgstr "%s を削除"
 msgid "Delete DHCP(s)"
 msgstr "DHCPの削除"
 
-#: ../lib/modules/kolabUser.inc:401
-msgid "Delete Kolab account"
-msgstr "Kolabアカウントを削除"
-
 #: ../lib/types/nisObjectType.inc:108
 msgid "Delete NIS object(s)"
 msgstr "NISオブジェクトを削除"
@@ -1546,7 +1581,7 @@ msgstr "拡張の削除"
 msgid "Delete group(s)"
 msgstr "グループの削除"
 
-#: ../lib/modules/posixAccount.inc:1022
+#: ../lib/modules/posixAccount.inc:1030
 msgid "Delete home directory"
 msgstr "ホームディレクトリを削除"
 
@@ -1558,11 +1593,11 @@ msgstr "ホストの削除"
 msgid "Delete object"
 msgstr "オブジェクトを削除"
 
-#: ../templates/ou_edit.php:181 ../help/help.inc:202
+#: ../templates/ou_edit.php:181 ../help/help.inc:205
 msgid "Delete organizational unit"
 msgstr "organizational unitを削除"
 
-#: ../lib/modules/inetOrgPerson.inc:1069
+#: ../lib/modules/inetOrgPerson.inc:979
 msgid "Delete photo"
 msgstr "写真を削除"
 
@@ -1570,13 +1605,13 @@ msgstr "写真を削除"
 msgid "Delete policy(ies)"
 msgstr "ポリシーを削除"
 
-#: ../templates/config/profmanage.php:258
-#: ../templates/selfService/profManage.php:243 ../help/help.inc:125
+#: ../templates/config/profmanage.php:286
+#: ../templates/selfService/profManage.php:262 ../help/help.inc:122
 msgid "Delete profile"
 msgstr "プロファイルを削除"
 
-#: ../lib/modules/range.inc:84 ../lib/modules/range.inc:99
-#: ../lib/modules/range.inc:428 ../lib/modules/range.inc:429
+#: ../lib/modules/range.inc:91 ../lib/modules/range.inc:109
+#: ../lib/modules/range.inc:435
 msgid "Delete range"
 msgstr "範囲を削除"
 
@@ -1588,7 +1623,7 @@ msgstr "sudoロールの削除"
 msgid "Delete user(s)"
 msgstr "ユーザの削除"
 
-#: ../templates/delete.php:220
+#: ../templates/delete.php:221
 #, php-format
 msgid "Deleted DN: %s"
 msgstr "削除されたDN: %s"
@@ -1605,7 +1640,7 @@ msgstr "削除されたアカウント"
 msgid "Deleted profile."
 msgstr "削除したプロファイル。"
 
-#: ../lib/modules/range.inc:85
+#: ../lib/modules/range.inc:92
 msgid "Deletes an IP range."
 msgstr "IPアドレス範囲を削除する。"
 
@@ -1615,68 +1650,75 @@ msgstr "IPアドレス範囲を削除する。"
 msgid "Deleting %s"
 msgstr "%s を削除しています"
 
-#: ../templates/delete.php:130
+#: ../templates/delete.php:131
 msgid "Deleting. Please stand by ..."
 msgstr "削除中です。お待ちください ..."
 
-#: ../lib/modules/inetOrgPerson.inc:122 ../lib/modules/inetOrgPerson.inc:133
-#: ../lib/modules/inetOrgPerson.inc:219 ../lib/modules/inetOrgPerson.inc:378
-#: ../lib/modules/inetOrgPerson.inc:475 ../lib/modules/inetOrgPerson.inc:587
-#: ../lib/modules/inetOrgPerson.inc:1024 ../lib/modules/inetOrgPerson.inc:1147
-#: ../lib/modules/inetOrgPerson.inc:1644
+#: ../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
 msgid "Department(s)"
 msgstr "部門"
 
 #: ../templates/tree/add_value_form.php:186 ../templates/schema/schema.php:87
 #: ../templates/schema/schema.php:141 ../templates/schema/schema.php:344
 #: ../lib/types/nisObjectType.inc:80 ../lib/types/user.inc:101
-#: ../lib/types/sudo.inc:84 ../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:208 ../lib/modules/account.inc:222
-#: ../lib/modules/posixGroup.inc:178 ../lib/modules/posixGroup.inc:331
-#: ../lib/modules/posixGroup.inc:383 ../lib/modules/posixGroup.inc:449
-#: ../lib/modules/dhcp_settings.inc:161 ../lib/modules/dhcp_settings.inc:176
-#: ../lib/modules/dhcp_settings.inc:289 ../lib/modules/dhcp_settings.inc:615
-#: ../lib/modules/dhcp_settings.inc:677 ../lib/modules/posixAccount.inc:416
+#: ../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/device.inc:103 ../lib/modules/device.inc:113
+#: ../lib/modules/device.inc:159 ../lib/modules/device.inc:389
+#: ../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/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:313
-#: ../lib/modules/sambaGroupMapping.inc:390 ../lib/modules/nisnetgroup.inc:72
-#: ../lib/modules/nisnetgroup.inc:125 ../lib/modules/nisnetgroup.inc:184
-#: ../lib/modules/nisnetgroup.inc:569 ../lib/modules/inetOrgPerson.inc:183
-#: ../lib/modules/inetOrgPerson.inc:258 ../lib/modules/inetOrgPerson.inc:421
-#: ../lib/modules/inetOrgPerson.inc:491 ../lib/modules/inetOrgPerson.inc:854
-#: ../lib/modules/inetOrgPerson.inc:1122 ../lib/modules/sudoRole.inc:59
+#: ../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/sudoRole.inc:128 ../lib/modules/sudoRole.inc:172
-#: ../lib/modules/sudoRole.inc:272 ../lib/modules/sudoRole.inc:705
+#: ../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:146
-#: ../lib/modules/groupOfNames.inc:446
+#: ../lib/modules/groupOfNames.inc:112 ../lib/modules/groupOfNames.inc:144
+#: ../lib/modules/groupOfNames.inc:427
 msgid "Description"
 msgstr "説明"
 
-#: ../lib/modules/sambaSamAccount.inc:369
-#: ../lib/modules/sambaSamAccount.inc:559
+#: ../lib/modules/device.inc:38
+msgid "Device"
+msgstr "デバイス"
+
+#: ../lib/modules/sambaSamAccount.inc:366
+#: ../lib/modules/sambaSamAccount.inc:554
 msgid "Disable LM hashes"
 msgstr "LMハッシュを無効化"
 
-#: ../lib/modules/ddns.inc:89 ../lib/modules/ddns.inc:348
+#: ../lib/modules/ddns.inc:93 ../lib/modules/ddns.inc:344
 msgid "Disable client updates"
 msgstr "クライアントによる更新を禁止"
 
-#: ../lib/modules/ddns.inc:90
+#: ../lib/modules/ddns.inc:94
 msgid "Disables the client to update DNS entries."
 msgstr "クライアントによるDNSエントリの更新を禁止します。"
 
 #: ../lib/modules/sambaDomain.inc:106 ../lib/modules/sambaDomain.inc:186
-#: ../lib/modules/sambaDomain.inc:301 ../lib/modules/sambaDomain.inc:679
+#: ../lib/modules/sambaDomain.inc:292 ../lib/modules/sambaDomain.inc:649
 msgid "Disconnect users outside logon hours"
 msgstr "ログオン許可時間帯以外はユーザをログオフさせる。"
 
-#: ../lib/modules/sambaSamAccount.inc:217
-#: ../lib/modules/sambaSamAccount.inc:1471
-#: ../lib/modules/sambaSamAccount.inc:1806
+#: ../lib/modules/sambaSamAccount.inc:214
+#: ../lib/modules/sambaSamAccount.inc:1413
+#: ../lib/modules/sambaSamAccount.inc:1683
 msgid "Disconnection time limit"
 msgstr "切断時間の制限"
 
@@ -1685,19 +1727,19 @@ msgid "Disconnects users if they are logged in outside logon hours."
 msgstr "ログオン許可時間帯以外にログオン状態のユーザーの接続を切る。"
 
 #: ../lib/modules/sambaSamAccount.inc:96
-#: ../lib/modules/sambaSamAccount.inc:189
-#: ../lib/modules/sambaSamAccount.inc:234
-#: ../lib/modules/sambaSamAccount.inc:392
-#: ../lib/modules/sambaSamAccount.inc:1083
-#: ../lib/modules/sambaSamAccount.inc:1763
+#: ../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:311
-#: ../lib/modules/sambaGroupMapping.inc:355
-#: ../lib/modules/sambaGroupMapping.inc:388
+#: ../lib/modules/sambaGroupMapping.inc:301
+#: ../lib/modules/sambaGroupMapping.inc:345
+#: ../lib/modules/sambaGroupMapping.inc:378
 msgid "Display name"
 msgstr "表示名"
 
-#: ../templates/lists/changePassword.php:174
+#: ../templates/lists/changePassword.php:206
 msgid "Display on screen"
 msgstr "スクリーンに表示"
 
@@ -1721,11 +1763,11 @@ msgstr "本当にこのPDF構成を削除しますか?"
 msgid "Do you really want to delete this profile?"
 msgstr "本当にこのプロファイルを削除しますか?"
 
-#: ../lib/modules/kolabUser.inc:571
+#: ../lib/modules/kolabUser.inc:558
 msgid "Do you really want to mark this account for deletion?"
 msgstr "本当にこのアカウントを削除しますか?"
 
-#: ../templates/delete.php:85
+#: ../templates/delete.php:86
 msgid "Do you really want to remove the following accounts?"
 msgstr "本当にこのアカウントを削除しますか?"
 
@@ -1733,36 +1775,36 @@ msgstr "本当にこのアカウントを削除しますか?"
 msgid "Do you want to make these changes?"
 msgstr "これらの変更を行ないますか?"
 
-#: ../lib/modules/sambaSamAccount.inc:190
-#: ../lib/modules/sambaSamAccount.inc:312
-#: ../lib/modules/sambaSamAccount.inc:385
-#: ../lib/modules/sambaSamAccount.inc:509
-#: ../lib/modules/sambaSamAccount.inc:1232
-#: ../lib/modules/sambaSamAccount.inc:1624
-#: ../lib/modules/sambaSamAccount.inc:1656
-#: ../lib/modules/sambaSamAccount.inc:1781
+#: ../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:273
-#: ../lib/modules/sambaGroupMapping.inc:367
-#: ../lib/modules/sambaGroupMapping.inc:410 ../lib/modules/nisnetgroup.inc:209
-#: ../lib/modules/nisnetgroup.inc:579
+#: ../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
 msgid "Domain"
 msgstr "ドメイン"
 
 #: ../lib/types/smbDomain.inc:91 ../lib/modules/sambaDomain.inc:74
 #: ../lib/modules/sambaDomain.inc:144 ../lib/modules/sambaDomain.inc:178
-#: ../lib/modules/sambaDomain.inc:244 ../lib/modules/sambaDomain.inc:250
-#: ../lib/modules/sambaDomain.inc:651
+#: ../lib/modules/sambaDomain.inc:249 ../lib/modules/sambaDomain.inc:254
+#: ../lib/modules/sambaDomain.inc:621
 msgid "Domain SID"
 msgstr "ドメインのSID"
 
-#: ../lib/modules/sambaGroupMapping.inc:334
+#: ../lib/modules/sambaGroupMapping.inc:324
 msgid "Domain administrators"
 msgstr "ドメイン管理者(Domain administrator)"
 
 #: ../lib/modules/sambaSamAccount.inc:69
 #: ../lib/modules/sambaGroupMapping.inc:56
-#: ../lib/modules/sambaGroupMapping.inc:340
+#: ../lib/modules/sambaGroupMapping.inc:330
 msgid "Domain admins"
 msgstr "ドメイン管理者(Domain Admins)"
 
@@ -1772,7 +1814,7 @@ msgid "Domain certificate admins"
 msgstr "ドメイン証明書管理者(Domain Certificate Admins)"
 
 #: ../lib/modules/sambaSamAccount.inc:70
-#: ../lib/modules/sambaSamAccount.inc:797
+#: ../lib/modules/sambaSamAccount.inc:772
 #: ../lib/modules/sambaGroupMapping.inc:59
 msgid "Domain computers"
 msgstr "ドメインコンピュータ(Domain Computers)"
@@ -1788,7 +1830,7 @@ msgid "Domain enterprise admins"
 msgstr "ドメインエンタープライズ管理者(Domain Enterprise Admins)"
 
 #: ../lib/modules/sambaGroupMapping.inc:68
-#: ../lib/modules/sambaGroupMapping.inc:261
+#: ../lib/modules/sambaGroupMapping.inc:259
 msgid "Domain group"
 msgstr "ドメイングループ(Domain Group)"
 
@@ -1797,13 +1839,13 @@ msgstr "ドメイングループ(Domain Group)"
 msgid "Domain guests"
 msgstr "ドメインゲスト(Domain Guests)"
 
-#: ../lib/types/smbDomain.inc:92 ../lib/modules/dhcp_settings.inc:119
-#: ../lib/modules/dhcp_settings.inc:167 ../lib/modules/dhcp_settings.inc:187
-#: ../lib/modules/dhcp_settings.inc:238 ../lib/modules/dhcp_settings.inc:551
-#: ../lib/modules/dhcp_settings.inc:668 ../lib/modules/nisnetgroup.inc:139
+#: ../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/sambaDomain.inc:70 ../lib/modules/sambaDomain.inc:137
-#: ../lib/modules/sambaDomain.inc:177 ../lib/modules/sambaDomain.inc:231
-#: ../lib/modules/sambaDomain.inc:237 ../lib/modules/sambaDomain.inc:648
+#: ../lib/modules/sambaDomain.inc:177 ../lib/modules/sambaDomain.inc:234
+#: ../lib/modules/sambaDomain.inc:239 ../lib/modules/sambaDomain.inc:618
 msgid "Domain name"
 msgstr "ドメイン名"
 
@@ -1823,7 +1865,7 @@ msgid "Domain schema admins"
 msgstr "ドメインスキーマ管理者(Domain Schema Admins)"
 
 #: ../lib/modules/sambaSamAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:2088
+#: ../lib/modules/sambaSamAccount.inc:1965
 #: ../lib/modules/sambaGroupMapping.inc:57
 msgid "Domain users"
 msgstr "ドメインユーザ(Domain Users)"
@@ -1832,7 +1874,7 @@ msgstr "ドメインユーザ(Domain Users)"
 msgid "Down"
 msgstr "下へ"
 
-#: ../templates/masscreate.php:369
+#: ../templates/masscreate.php:226
 msgid "Download sample CSV file"
 msgstr "サンプルCSVファイルをダウンロード"
 
@@ -1844,113 +1886,123 @@ msgstr "動的サブツリー"
 msgid "EDU person"
 msgstr "EDU person"
 
-#: ../lib/modules/sambaSamAccount.inc:551
+#: ../lib/modules/sambaSamAccount.inc:544
 msgid "East Australian Standard, Guam"
 msgstr "East Australian Standard, Guam"
 
-#: ../lib/modules/sambaSamAccount.inc:543
+#: ../lib/modules/sambaSamAccount.inc:536
 msgid "Eastern Europe Time, South Africa"
 msgstr "Eastern Europe Time, South Africa"
 
-#: ../lib/modules/sambaSamAccount.inc:536
+#: ../lib/modules/sambaSamAccount.inc:529
 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:1240
-#: ../lib/modules/sambaSamAccount.inc:1246 ../lib/lists.inc:401
+#: ../lib/modules/sambaSamAccount.inc:1189
+#: ../lib/modules/sambaSamAccount.inc:1194 ../lib/lists.inc:416
 msgid "Edit"
 msgstr "編集"
 
-#: ../templates/config/mainmanage.php:134 ../templates/config/index.php:77
+#: ../templates/config/mainmanage.php:134 ../templates/config/index.php:91
 msgid "Edit general settings"
 msgstr "一般設定を更新"
 
-#: ../lib/modules/posixAccount.inc:967
+#: ../lib/modules/posixAccount.inc:980
 msgid "Edit groups"
 msgstr "グループの編集"
 
-#: ../lib/modules/posixGroup.inc:184
+#: ../lib/modules/posixGroup.inc:196
 msgid "Edit members"
 msgstr "メンバーの編集"
 
-#: ../templates/config/index.php:103
+#: ../templates/config/index.php:117
 msgid "Edit self service"
 msgstr "セルフサービスの編集"
 
-#: ../templates/config/index.php:89
+#: ../templates/config/index.php:103
 msgid "Edit server profiles"
 msgstr "サーバープロファイルの編集"
 
-#: ../lib/modules/nisnetgroup.inc:195
+#: ../lib/modules/nisnetgroup.inc:192
 msgid "Edit subgroups"
 msgstr "サブグループの編集"
 
-#: ../lib/modules/sambaSamAccount.inc:1190
+#: ../lib/modules/sambaSamAccount.inc:1145
 msgid "Edit workstations"
 msgstr "ワークステーションの編集??"
 
-#: ../lib/types/user.inc:100
+#: ../lib/types/user.inc:100 ../lib/modules/zarafaGroup.inc:154
+#: ../lib/modules/zarafaGroup.inc:160
 msgid "Email"
 msgstr "電子メール"
 
-#: ../templates/lists/changePassword.php:158
-#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:117
-#: ../lib/modules/inetOrgPerson.inc:209 ../lib/modules/inetOrgPerson.inc:362
-#: ../lib/modules/inetOrgPerson.inc:460 ../lib/modules/inetOrgPerson.inc:543
-#: ../lib/modules/inetOrgPerson.inc:544 ../lib/modules/inetOrgPerson.inc:976
-#: ../lib/modules/inetOrgPerson.inc:1136 ../lib/modules/inetOrgPerson.inc:1491
-#: ../lib/modules/asteriskVoicemail.inc:94
-#: ../lib/modules/asteriskVoicemail.inc:136
-#: ../lib/modules/asteriskVoicemail.inc:174
-#: ../lib/modules/asteriskVoicemail.inc:249
-#: ../lib/modules/asteriskVoicemail.inc:378
+#: ../templates/lists/changePassword.php:190 ../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/asteriskVoicemail.inc:98
+#: ../lib/modules/asteriskVoicemail.inc:131
+#: ../lib/modules/asteriskVoicemail.inc:169
+#: ../lib/modules/asteriskVoicemail.inc:261
+#: ../lib/modules/asteriskVoicemail.inc:393
 msgid "Email address"
 msgstr "電子メールアドレス"
 
-#: ../lib/modules/asteriskVoicemail.inc:95
+#: ../lib/modules/asteriskVoicemail.inc:99
 msgid "Email address for this voicemail account."
 msgstr "このボイスメール・アカウントに対する電子メール・アドレス。"
 
-#: ../lib/modules/kolabUser.inc:151
+#: ../lib/modules/zarafaUser.inc:108 ../lib/modules/zarafaUser.inc:162
+#: ../lib/modules/kolabUser.inc:139
 msgid "Email alias"
 msgstr "電子メールの別名"
 
-#: ../lib/modules/kolabUser.inc:152
+#: ../lib/modules/zarafaUser.inc:109 ../lib/modules/kolabUser.inc:140
 msgid "Email alias for this account."
 msgstr "このアカウントに対する電子メール・エイリアス。"
 
-#: ../lib/modules/kolabUser.inc:243
+#: ../lib/modules/zarafaUser.inc:341 ../lib/modules/zarafaUser.inc:342
+#: ../lib/modules/kolabUser.inc:231
 msgid "Email alias is invalid!"
 msgstr "電子メール・エイリアスが正しくありません!"
 
-#: ../lib/modules/kolabUser.inc:155
+#: ../lib/modules/kolabUser.inc:143
 msgid "Email alias list"
 msgstr "電子メール・エイリアスのリスト"
 
-#: ../lib/modules/kolabUser.inc:244
+#: ../lib/modules/kolabUser.inc:232
 msgid "Email alias list has invalid format!"
 msgstr "電子メール・エイリアス・リストの形式が正しくありません!"
 
-#: ../lib/modules/kolabUser.inc:201 ../lib/modules/kolabUser.inc:229
-#: ../lib/modules/kolabUser.inc:366 ../lib/modules/kolabUser.inc:797
+#: ../lib/modules/zarafaGroup.inc:63 ../lib/modules/zarafaGroup.inc:67
+#: ../lib/modules/zarafaGroup.inc:93 ../lib/modules/zarafaGroup.inc:127
+#: ../lib/modules/zarafaGroup.inc:170 ../lib/modules/zarafaGroup.inc:418
+#: ../lib/modules/zarafaUser.inc:365 ../lib/modules/kolabUser.inc:189
+#: ../lib/modules/kolabUser.inc:217 ../lib/modules/kolabUser.inc:350
+#: ../lib/modules/kolabUser.inc:798
 msgid "Email aliases"
 msgstr "電子メール・エイリアス"
 
-#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:151
-#: ../lib/modules/inetOrgPerson.inc:215 ../lib/modules/inetOrgPerson.inc:274
-#: ../lib/modules/inetOrgPerson.inc:469 ../lib/modules/inetOrgPerson.inc:507
-#: ../lib/modules/inetOrgPerson.inc:1006 ../lib/modules/inetOrgPerson.inc:1126
+#: ../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
 msgid "Employee type"
 msgstr "雇用形態"
 
-#: ../lib/modules/inetOrgPerson.inc:508
+#: ../lib/modules/inetOrgPerson.inc:497
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇用形態: 正社員、実習生、臨時雇用、派遣、..."
 
-#: ../templates/lists/changePassword.php:246
-#: ../templates/lists/changePassword.php:252 ../templates/login.php:394
+#: ../templates/lists/changePassword.php:280
+#: ../templates/lists/changePassword.php:286 ../templates/login.php:437
 msgid "Empty password submitted. Please try again."
 msgstr "パスワードが空です。やり直してください。"
 
@@ -1968,7 +2020,7 @@ msgstr ""
 msgid "Encountered an error while performing search."
 msgstr "検索実行中にエラーが発生しました。"
 
-#: ../lib/modules/sambaSamAccount.inc:529
+#: ../lib/modules/sambaSamAccount.inc:522
 msgid "Eniwetok, Kwajalein"
 msgstr "Eniwetok, Kwajalein"
 
@@ -1977,12 +2029,12 @@ msgid "Enter the value you would like to add:"
 msgstr "追加したい値を入力してください:"
 
 #: ../lib/modules/eduPerson.inc:103 ../lib/modules/eduPerson.inc:107
-#: ../lib/modules/eduPerson.inc:174 ../lib/modules/eduPerson.inc:205
-#: ../lib/modules/eduPerson.inc:339 ../lib/modules/eduPerson.inc:692
+#: ../lib/modules/eduPerson.inc:171 ../lib/modules/eduPerson.inc:202
+#: ../lib/modules/eduPerson.inc:321 ../lib/modules/eduPerson.inc:667
 msgid "Entitlements"
 msgstr "資格"
 
-#: ../lib/export.inc:407
+#: ../lib/export.inc:409
 msgid "Entry"
 msgstr "エントリ"
 
@@ -2000,16 +2052,20 @@ msgstr "エントリ %s は削除されました。"
 msgid "Equality"
 msgstr "照合規則"
 
-#: ../templates/config/mainmanage.php:267
+#: ../lib/modules/zarafaUser.inc:461 ../lib/modules/zarafaUser.inc:1042
+msgid "Equipment"
+msgstr "設備"
+
+#: ../templates/config/mainmanage.php:287
 msgid "Error"
 msgstr "エラー"
 
-#: ../templates/delete.php:225
+#: ../templates/delete.php:226
 #, php-format
 msgid "Error while deleting DN: %s"
 msgstr "DN: %s の削除中にエラーが発生しました。"
 
-#: ../help/help.inc:136
+#: ../help/help.inc:133
 msgid ""
 "Every account type needs exactly one base module. This module provides a "
 "structural object class."
@@ -2018,31 +2074,31 @@ msgstr ""
 "ルは構造型のオブジェクトクラスを提供します。"
 
 #: ../lib/modules/customScripts.inc:60 ../lib/modules/customScripts.inc:72
-#: ../lib/modules/dhcp_settings.inc:546 ../help/help.inc:73
-#: ../help/help.inc:79 ../help/help.inc:85 ../help/help.inc:90
-#: ../help/help.inc:112
+#: ../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
 msgid "Example"
 msgstr "例"
 
-#: ../templates/masscreate.php:249 ../templates/masscreate.php:409
+#: ../templates/masscreate.php:248 ../templates/masscreate.php:373
 msgid "Example value"
 msgstr "例"
 
-#: ../help/help.inc:61
+#: ../help/help.inc:58
 msgid "Examples"
 msgstr "例"
 
-#: ../templates/config/confmain.php:436
+#: ../templates/config/confmain.php:443
 msgid "Execute"
 msgstr "実行"
 
-#: ../templates/tests/lamdaemonTest.php:249
+#: ../templates/tests/lamdaemonTest.php:247
 msgid "Execute lamdaemon"
 msgstr "lamdaemonを実行"
 
 #: ../lib/types/ppolicyType.inc:86 ../lib/modules/ppolicy.inc:108
 #: ../lib/modules/ppolicy.inc:140 ../lib/modules/ppolicy.inc:166
-#: ../lib/modules/ppolicy.inc:210 ../lib/modules/ppolicy.inc:501
+#: ../lib/modules/ppolicy.inc:202 ../lib/modules/ppolicy.inc:463
 msgid "Expire warning"
 msgstr "期限切れ警告"
 
@@ -2056,19 +2112,19 @@ msgid "Export format"
 msgstr "エクスポート形式"
 
 #: ../lib/types/asteriskExt.inc:91 ../lib/modules/asteriskExtension.inc:86
-#: ../lib/modules/asteriskExtension.inc:134
-#: ../lib/modules/asteriskExtension.inc:144
-#: ../lib/modules/asteriskExtension.inc:227
-#: ../lib/modules/asteriskExtension.inc:475
+#: ../lib/modules/asteriskExtension.inc:125
+#: ../lib/modules/asteriskExtension.inc:135
+#: ../lib/modules/asteriskExtension.inc:229
+#: ../lib/modules/asteriskExtension.inc:481
 msgid "Extension name"
 msgstr "拡張名"
 
 #: ../lib/modules/asteriskExtension.inc:98
-#: ../lib/modules/asteriskExtension.inc:137
-#: ../lib/modules/asteriskExtension.inc:185
-#: ../lib/modules/asteriskExtension.inc:244
-#: ../lib/modules/asteriskExtension.inc:307
-#: ../lib/modules/asteriskExtension.inc:478
+#: ../lib/modules/asteriskExtension.inc:128
+#: ../lib/modules/asteriskExtension.inc:176
+#: ../lib/modules/asteriskExtension.inc:255
+#: ../lib/modules/asteriskExtension.inc:327
+#: ../lib/modules/asteriskExtension.inc:484
 msgid "Extension owners"
 msgstr "拡張の所有者"
 
@@ -2088,23 +2144,23 @@ msgstr "エントリ %s の削除に失敗しました!"
 
 #: ../lib/types/ppolicyType.inc:85 ../lib/modules/ppolicy.inc:104
 #: ../lib/modules/ppolicy.inc:145 ../lib/modules/ppolicy.inc:165
-#: ../lib/modules/ppolicy.inc:283 ../lib/modules/ppolicy.inc:500
+#: ../lib/modules/ppolicy.inc:256 ../lib/modules/ppolicy.inc:462
 msgid "Failure count interval"
 msgstr "試行回数インターバル"
 
 #: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:118
-#: ../lib/modules/inetOrgPerson.inc:207 ../lib/modules/inetOrgPerson.inc:354
-#: ../lib/modules/inetOrgPerson.inc:457 ../lib/modules/inetOrgPerson.inc:539
-#: ../lib/modules/inetOrgPerson.inc:540 ../lib/modules/inetOrgPerson.inc:967
-#: ../lib/modules/inetOrgPerson.inc:1135 ../lib/modules/inetOrgPerson.inc:1523
+#: ../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
 msgid "Fax number"
 msgstr "ファクス番号"
 
-#: ../templates/config/mainmanage.php:333
+#: ../templates/config/mainmanage.php:353
 msgid "File"
 msgstr "ファイル"
 
-#: ../lib/modules/sambaSamAccount.inc:288
+#: ../lib/modules/sambaSamAccount.inc:285
 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."
@@ -2112,7 +2168,13 @@ msgstr ""
 "ログオンの時に実行される、ネットログオン共有への相対的なパスとファイル名。 "
 "$user と $group はユーザとグループの名前に置き換えられます。"
 
-#: ../templates/masscreate.php:211 ../lib/tools/fileUpload.inc:44
+#: ../lib/modules/zarafaServer.inc:69 ../lib/modules/zarafaServer.inc:93
+#: ../lib/modules/zarafaServer.inc:110 ../lib/modules/zarafaServer.inc:124
+#: ../lib/modules/zarafaServer.inc:154 ../lib/modules/zarafaServer.inc:320
+msgid "File path"
+msgstr "ファイル・パス"
+
+#: ../templates/masscreate.php:209 ../lib/tools/fileUpload.inc:44
 msgid "File upload"
 msgstr "ファイルのアップロード"
 
@@ -2120,99 +2182,108 @@ msgstr "ファイルのアップロード"
 msgid "File upload failed!"
 msgstr "ファイルのアップロードに失敗しました!"
 
-#: ../lib/modules/nisnetgroup.inc:89 ../lib/modules/nisnetgroup.inc:452
-#: ../lib/lists.inc:334 ../help/help.inc:147
+#: ../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
 msgid "Filter"
 msgstr "フィルタ"
 
 #: ../lib/types/user.inc:96 ../lib/modules/inetOrgPerson.inc:44
-#: ../lib/modules/inetOrgPerson.inc:116 ../lib/modules/inetOrgPerson.inc:243
-#: ../lib/modules/inetOrgPerson.inc:417 ../lib/modules/inetOrgPerson.inc:499
-#: ../lib/modules/inetOrgPerson.inc:830 ../lib/modules/inetOrgPerson.inc:1124
-#: ../lib/modules/inetOrgPerson.inc:1475
+#: ../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
 msgid "First name"
 msgstr "(姓でない)名"
 
 #: ../lib/modules/inetOrgPerson.inc:44 ../lib/modules/inetOrgPerson.inc:45
 msgid "First name contains invalid characters!"
-msgstr "(姓でない)名前に不正な文字がある"
+msgstr "(姓でない)名前に不正な文字が含まれています！"
 
-#: ../lib/modules/inetOrgPerson.inc:500
+#: ../lib/modules/inetOrgPerson.inc:489
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "ユーザの(姓でない)名前。アルファベット, _- と空白のみ有効."
 
-#: ../lib/modules/ddns.inc:86
+#: ../lib/modules/ddns.inc:90
 msgid "Fix IP addresses"
 msgstr "IPアドレスを修正"
 
-#: ../lib/modules/fixed_ip.inc:63
-msgid "Fixed IP"
-msgstr "固定IP"
-
-#: ../templates/config/confmain.php:468 ../templates/config/confmain.php:471
+#: ../templates/config/confmain.php:495 ../templates/config/confmain.php:498
 msgid "Fixed list"
 msgstr "固定リスト"
 
-#: ../lib/modules/kolabUser.inc:136
+#: ../lib/modules/kolabUser.inc:124
 msgid "For automatic invitation handling."
 msgstr "For automatic invitation handling."
 
 #: ../lib/modules/nisnetgroup.inc:86
 msgid ""
-"For the upload please specify the entries in the format \"(HOST,USER,DOMAIN)"
-"\". Multiple entries are separated by semicolon."
+"For the upload please specify the entries in the format \"(HOST,USER,"
+"DOMAIN)\". Multiple entries are separated by semicolon."
 msgstr ""
 "アップロードする場合はエントリの形式を \"(HOST,USER,DOMAIN)\" としてくださ"
 "い。複数のエントリはセミコロンによって区切られます。"
 
-#: ../help/help.inc:192
+#: ../lib/modules/shadowAccount.inc:353
+msgid "Force password change"
+msgstr "強制的なパスワード変更"
+
+#: ../help/help.inc:187 ../help/help.inc:198
 msgid "Format"
 msgstr "書式"
 
-#: ../lib/modules/kolabUser.inc:94 ../lib/modules/kolabUser.inc:128
-#: ../lib/modules/kolabUser.inc:167 ../lib/modules/kolabUser.inc:213
-#: ../lib/modules/kolabUser.inc:231 ../lib/modules/kolabUser.inc:311
-#: ../lib/modules/kolabUser.inc:775 ../lib/modules/kolabUser.inc:827
+#: ../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
 msgid "Free/Busy interval"
 msgstr "Free/Busyインターバル"
 
-#: ../lib/modules/kolabUser.inc:251 ../lib/modules/kolabUser.inc:252
+#: ../lib/modules/kolabUser.inc:239 ../lib/modules/kolabUser.inc:240
 msgid "Free/Busy interval must be a number!"
 msgstr "Free/Busyインターバルは数でなくてはなりません!"
 
-#: ../lib/modules/sambaSamAccount.inc:1320
+#: ../lib/modules/sambaSamAccount.inc:1281
 msgid "Friday"
 msgstr "金曜日"
 
-#: ../templates/lists/changePassword.php:154
-#: ../lib/modules/asteriskVoicemail.inc:90
-#: ../lib/modules/asteriskVoicemail.inc:135
-#: ../lib/modules/asteriskVoicemail.inc:168
-#: ../lib/modules/asteriskVoicemail.inc:245
-#: ../lib/modules/asteriskVoicemail.inc:375
+#: ../templates/config/confmain.php:472 ../help/help.inc:192
+msgid "From address"
+msgstr "発信者アドレス"
+
+#: ../templates/config/confmain.php:591
+msgid "From address for password mails is invalid."
+msgstr "パスワード・メールの発信者アドレスが無効です。"
+
+#: ../templates/lists/changePassword.php:186
+#: ../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
 msgid "Full name"
 msgstr "フルネーム"
 
-#: ../lib/modules/asteriskVoicemail.inc:91
+#: ../lib/modules/asteriskVoicemail.inc:95
 msgid "Full name for Asterisk voicemail mailbox."
 msgstr "アスタリスク・ボイスメールボックスのフルネーム"
 
-#: ../lib/modules/inetOrgPerson.inc:308
+#: ../lib/modules/inetOrgPerson.inc:297
 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:173 ../lib/modules/posixGroup.inc:324
-#: ../lib/modules/posixGroup.inc:337 ../lib/modules/posixGroup.inc:379
-#: ../lib/modules/posixGroup.inc:399 ../lib/modules/posixGroup.inc:447
-#: ../lib/modules/posixGroup.inc:466 ../lib/modules/posixAccount.inc:91
-#: ../lib/modules/posixAccount.inc:313 ../lib/modules/posixAccount.inc:1178
-#: ../lib/modules/sambaGroupMapping.inc:309
-#: ../lib/modules/sambaGroupMapping.inc:386
+#: ../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
 msgid "GID number"
 msgstr "GID番号"
 
-#: ../lib/modules/posixGroup.inc:466
+#: ../lib/modules/posixGroup.inc:478
 msgid ""
 "GID number has changed. Please select checkbox to change GID number of users "
 "and hosts."
@@ -2230,29 +2301,29 @@ msgstr ""
 "のコマンドを実行しなければなりません: 'find / -gid %s -uid %s -exec chgrp %s "
 "{} \\;'"
 
-#: ../lib/modules/posixGroup.inc:473
+#: ../lib/modules/posixGroup.inc:485
 msgid "GID number has to be a numeric value!"
 msgstr "GID番号は数値でなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:271 ../lib/modules/posixAccount.inc:303
-#: ../lib/modules/posixAccount.inc:314 ../lib/modules/posixAccount.inc:370
-#: ../lib/modules/posixAccount.inc:408 ../lib/modules/posixAccount.inc:956
-#: ../lib/modules/posixAccount.inc:1179
+#: ../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
 msgid "Gecos"
 msgstr "Gecos"
 
-#: ../templates/config/confmodules.php:131
-#: ../templates/config/confmain.php:164
-#: ../templates/config/moduleSettings.php:130
-#: ../templates/config/conftypes.php:149
+#: ../templates/config/confmodules.php:162
+#: ../templates/config/confmain.php:195
+#: ../templates/config/moduleSettings.php:161
+#: ../templates/config/conftypes.php:180
 msgid "General settings"
 msgstr "一般設定"
 
-#: ../templates/lists/changePassword.php:170 ../help/help.inc:189
+#: ../templates/lists/changePassword.php:202 ../help/help.inc:184
 msgid "Generate random password"
 msgstr "ランダムなパスワードを生成"
 
-#: ../lib/modules/kolabUser.inc:190
+#: ../lib/modules/kolabUser.inc:178
 msgid "Germany"
 msgstr "日本"
 
@@ -2263,11 +2334,11 @@ msgstr "進む"
 
 #: ../lib/types/ppolicyType.inc:82 ../lib/modules/ppolicy.inc:92
 #: ../lib/modules/ppolicy.inc:141 ../lib/modules/ppolicy.inc:162
-#: ../lib/modules/ppolicy.inc:219 ../lib/modules/ppolicy.inc:497
+#: ../lib/modules/ppolicy.inc:208 ../lib/modules/ppolicy.inc:459
 msgid "Grace authentication limit"
 msgstr "猶予認証のリミット"
 
-#: ../lib/modules/quota.inc:117 ../lib/modules/quota.inc:385
+#: ../lib/modules/quota.inc:117 ../lib/modules/quota.inc:391
 msgid "Grace block period"
 msgstr "ブロック猶予期間"
 
@@ -2286,12 +2357,12 @@ msgstr ""
 "iノード(ファイル)クオータの猶予期間。 ほとんどのファイルシステムは、最大値で"
 "ある7日間を固定値として使用します。"
 
-#: ../lib/modules/quota.inc:139 ../lib/modules/quota.inc:389
+#: ../lib/modules/quota.inc:139 ../lib/modules/quota.inc:395
 msgid "Grace inode period"
 msgstr "iノードクオータの猶予期間"
 
-#: ../templates/config/confmain.php:441
-#: ../templates/selfService/adminMain.php:579
+#: ../templates/config/confmain.php:448
+#: ../templates/selfService/adminMain.php:577
 msgid "Group"
 msgstr "グループ"
 
@@ -2299,12 +2370,12 @@ msgstr "グループ"
 msgid "Group accounts (e.g. Unix and Samba)"
 msgstr "グループアカウント(e.g. Unix および Samba)"
 
-#: ../lib/types/group.inc:96 ../lib/modules/posixGroup.inc:370
+#: ../lib/types/group.inc:96 ../lib/modules/posixGroup.inc:384
 #: ../lib/modules/nisnetgroup.inc:105
 msgid "Group description"
 msgstr "グループの説明"
 
-#: ../lib/modules/posixGroup.inc:384
+#: ../lib/modules/posixGroup.inc:398
 msgid "Group description. If left empty group name will be used."
 msgstr "グループの説明。もしも空ならば、グループ名が使われます。"
 
@@ -2312,28 +2383,28 @@ msgstr "グループの説明。もしも空ならば、グループ名が使わ
 msgid "Group member DNs"
 msgstr "グループメンバのDN"
 
-#: ../lib/types/group.inc:94 ../lib/modules/posixGroup.inc:183
-#: ../lib/modules/posixGroup.inc:241 ../lib/modules/posixGroup.inc:325
-#: ../lib/modules/posixGroup.inc:343 ../lib/modules/posixGroup.inc:387
-#: ../lib/modules/posixGroup.inc:391 ../lib/modules/posixGroup.inc:448
+#: ../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
 msgid "Group members"
 msgstr "グループメンバ"
 
 #: ../lib/types/gon.inc:91 ../lib/types/group.inc:92
-#: ../lib/types/netgroup.inc:91 ../lib/modules/posixGroup.inc:168
-#: ../lib/modules/posixGroup.inc:328 ../lib/modules/posixGroup.inc:358
-#: ../lib/modules/posixGroup.inc:407 ../lib/modules/posixGroup.inc:446
-#: ../lib/modules/posixGroup.inc:474 ../lib/modules/posixGroup.inc:475
-#: ../lib/modules/posixGroup.inc:476 ../lib/modules/nisnetgroup.inc:68
+#: ../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:178
-#: ../lib/modules/nisnetgroup.inc:567 ../lib/modules/groupOfNames.inc:60
+#: ../lib/modules/nisnetgroup.inc:136 ../lib/modules/nisnetgroup.inc:177
+#: ../lib/modules/nisnetgroup.inc:575 ../lib/modules/groupOfNames.inc:60
 #: ../lib/modules/groupOfNames.inc:84 ../lib/modules/groupOfNames.inc:111
-#: ../lib/modules/groupOfNames.inc:442
+#: ../lib/modules/groupOfNames.inc:423
 msgid "Group name"
 msgstr "グループ名"
 
-#: ../lib/modules/posixGroup.inc:476 ../lib/modules/posixGroup.inc:477
+#: ../lib/modules/posixGroup.inc:488 ../lib/modules/posixGroup.inc:489
 #: ../lib/modules/nisnetgroup.inc:136
 msgid ""
 "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
@@ -2342,11 +2413,11 @@ msgstr ""
 "グループ名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ で"
 "す!"
 
-#: ../lib/modules/posixGroup.inc:475
+#: ../lib/modules/posixGroup.inc:487
 msgid "Group name in use. Selected next free group name."
 msgstr "グループ名が既に使われています。次の未使用グループ名が選択されました。"
 
-#: ../lib/modules/posixGroup.inc:408
+#: ../lib/modules/posixGroup.inc:422
 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 "
@@ -2368,15 +2439,15 @@ msgstr "名前グループアカウント"
 msgid "Group of unique names"
 msgstr "uniqueな名前のグループ"
 
-#: ../lib/modules/posixGroup.inc:349 ../lib/modules/posixGroup.inc:395
+#: ../lib/modules/posixGroup.inc:363 ../lib/modules/posixGroup.inc:409
 msgid "Group password"
 msgstr "グループパスワード"
 
-#: ../lib/modules/sambaGroupMapping.inc:267
+#: ../lib/modules/sambaGroupMapping.inc:264
 msgid "Group type"
 msgstr "グループのタイプ"
 
-#: ../lib/types/group.inc:54 ../lib/modules/posixGroup.inc:297
+#: ../lib/types/group.inc:54 ../lib/modules/posixGroup.inc:310
 msgid "Groups"
 msgstr "グループ"
 
@@ -2384,16 +2455,22 @@ msgstr "グループ"
 msgid "H-Node (0x08)"
 msgstr "H-Node (0x08)"
 
-#: ../lib/modules/quota.inc:592
+#: ../lib/modules/zarafaServer.inc:61 ../lib/modules/zarafaServer.inc:81
+#: ../lib/modules/zarafaServer.inc:108 ../lib/modules/zarafaServer.inc:120
+#: ../lib/modules/zarafaServer.inc:142 ../lib/modules/zarafaServer.inc:310
+msgid "HTTP port"
+msgstr "HTTPポート"
+
+#: ../lib/modules/quota.inc:613
 msgid "Hard block"
 msgstr "ハードblock"
 
 #: ../lib/modules/quota.inc:111 ../lib/modules/quota.inc:112
-#: ../lib/modules/quota.inc:384 ../lib/modules/quota.inc:476
+#: ../lib/modules/quota.inc:390 ../lib/modules/quota.inc:489
 msgid "Hard block limit"
 msgstr "ハードブロック制限"
 
-#: ../lib/modules/quota.inc:594
+#: ../lib/modules/quota.inc:615
 msgid "Hard inode"
 msgstr "ハードinode"
 
@@ -2401,12 +2478,12 @@ msgstr "ハードinode"
 msgid "Hard inode (files) limit"
 msgstr "ハードinode(ファイル)制限"
 
-#: ../lib/modules/quota.inc:133 ../lib/modules/quota.inc:388
-#: ../lib/modules/quota.inc:478
+#: ../lib/modules/quota.inc:133 ../lib/modules/quota.inc:394
+#: ../lib/modules/quota.inc:491
 msgid "Hard inode limit"
 msgstr "ハードinode制限"
 
-#: ../lib/modules/sambaSamAccount.inc:531
+#: ../lib/modules/sambaSamAccount.inc:524
 msgid "Hawaii"
 msgstr "Hawaii"
 
@@ -2415,11 +2492,11 @@ msgstr "Hawaii"
 msgid "Headline"
 msgstr "見出し"
 
-#: ../lib/modules.inc:952
+#: ../lib/modules.inc:953
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../templates/masscreate.php:233
+#: ../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."
@@ -2431,7 +2508,7 @@ msgstr ""
 msgid "Here you can browse LDAP object classes and attributes."
 msgstr "ここでは、LDAPオブジェクトのクラスと属性をブラウズできます。"
 
-#: ../lib/modules/sambaSamAccount.inc:367
+#: ../lib/modules/sambaSamAccount.inc:364
 msgid "Here you can change the settings for the terminal server access."
 msgstr "ターミナルサーバーへのアクセス設定を変更できます。"
 
@@ -2440,7 +2517,7 @@ msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr ""
 "ここでは、CSVファイルを与える事によって、複数のアカウントを作成できます。"
 
-#: ../lib/modules/dhcp_settings.inc:162
+#: ../lib/modules/dhcp_settings.inc:167
 msgid "Here you can enter a description for this DHCP entry."
 msgstr "このDHCPエントリに対する説明を入力できます。"
 
@@ -2452,7 +2529,7 @@ msgstr "このグループに対する説明を入力できます。"
 msgid "Here you can enter a description for this role."
 msgstr "このロールに対する説明を入力できます。"
 
-#: ../lib/modules/nisnetgroup.inc:90
+#: ../lib/modules/zarafaUser.inc:124 ../lib/modules/nisnetgroup.inc:90
 msgid ""
 "Here you can enter a filter value. Only entries which contain the filter "
 "text will be shown."
@@ -2460,7 +2537,7 @@ msgstr ""
 "ここには、フィルタの値を入力します。フィルタテキストを含んだエントリだけが表"
 "示されます。"
 
-#: ../lib/modules/posixAccount.inc:350
+#: ../lib/modules/posixAccount.inc:336
 msgid ""
 "Here you can enter a list of additional group memberships. The group names "
 "are separated by commas."
@@ -2468,7 +2545,11 @@ msgstr ""
 "ここにはメンバーとして所属する追加グループのリストを入力します。グループ名は"
 "カンマによって区切られます。"
 
-#: ../lib/modules/inetOrgPerson.inc:588
+#: ../lib/modules/device.inc:59
+msgid "Here you can enter a serial number for this device."
+msgstr "ここには、このデバイスに対するシリアル番号を入力できます。"
+
+#: ../lib/modules/inetOrgPerson.inc:577
 msgid ""
 "Here you can enter the user's department(s). Multiple entries are separated "
 "by semicolons."
@@ -2476,7 +2557,7 @@ msgstr ""
 "ここにはユーザーの部門を入力できます。複数のエントリはセミコロンによって区切"
 "られます。"
 
-#: ../help/help.inc:148
+#: ../help/help.inc:145
 msgid ""
 "Here you can input simple filter expressions (e.g. 'value' or 'v*'). The "
 "filter is case-sensitive."
@@ -2484,7 +2565,7 @@ msgstr ""
 "ここには、単純なフィルタ(例 'value'または'v*')を入力できます。大文字と小文字"
 "は区別されます。"
 
-#: ../help/help.inc:161
+#: ../help/help.inc:157
 msgid ""
 "Here you can load an account profile to set default settings for your "
 "account. The \"default\" profile is automatically loaded for new accounts."
@@ -2497,14 +2578,14 @@ msgstr ""
 msgid "Here you can manage your account profiles."
 msgstr "ここで、あなたのアカウントのプロファイルを管理できます。"
 
-#: ../help/help.inc:163
+#: ../help/help.inc:159
 msgid ""
 "Here you can select a PDF structure and export the account to a PDF file."
 msgstr ""
 "ここでは、PDF構成の選択と、アカウントのPDFフィアルへのエクスポートを行えま"
 "す。"
 
-#: ../help/help.inc:142
+#: ../help/help.inc:139
 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 "
@@ -2514,12 +2595,12 @@ msgstr ""
 "unixシステムではSyslogに、Windowsではイベントログに出力されます。追加のファイ"
 "ルを選択する事もできます。"
 
-#: ../help/help.inc:107
+#: ../help/help.inc:104
 msgid ""
 "Here you can select which plugins you want to use for account management."
 msgstr "ここでは、アカウント管理に使用するプラグインを選択できます。"
 
-#: ../help/help.inc:120
+#: ../help/help.inc:117
 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 "
@@ -2528,7 +2609,7 @@ msgstr ""
 "ここには、LDAP検索の上限を設定します。これは、LDAP検索結果数を制限します。LAM"
 "のLDAPクエリが過大な負荷を生じる場合に使用してください。"
 
-#: ../help/help.inc:188
+#: ../help/help.inc:183
 msgid ""
 "Here you can specify additional CSS links to change the layout of the self "
 "service pages. This is useful to adapt them to your corporate design. Please "
@@ -2542,7 +2623,7 @@ msgstr ""
 msgid "Here you can specify if the account is active or inactive."
 msgstr "ここではアカウントの有効/無効を記述できます。"
 
-#: ../help/help.inc:146
+#: ../help/help.inc:143
 msgid ""
 "Here you can specify minimum requirements for passwords. The character "
 "classes are: lowercase, uppercase, numeric and symbols."
@@ -2564,18 +2645,21 @@ msgid ""
 "Here you can specify the list of host names where this account has login "
 "privileges. The wildcard \"*\" represents all hosts. You may also use \"!\" "
 "in front of a host name to deny access to a host."
-msgstr "ここでは、このアカウントがログイン権限をモツホスト名のリストを記述できます。ワイルドカード \"*\" は全てのホストを意味します。また、ホストへのアクセスを拒否するために、ホスト名の先頭に \"!\" を使用する事が出来ます。"
+msgstr ""
+"ここでは、このアカウントがログイン権限をモツホスト名のリストを記述できます。"
+"ワイルドカード \"*\" は全てのホストを意味します。また、ホストへのアクセスを拒"
+"否するために、ホスト名の先頭に \"!\" を使用する事が出来ます。"
 
 #: ../lib/modules/sambaDomain.inc:95
 msgid ""
 "Here you can specify the minimum number of characters for a user password."
 msgstr "ユーザーパスワードの最低文字数を設定します。"
 
-#: ../templates/lists/changePassword.php:190
+#: ../templates/lists/changePassword.php:222
 msgid "Here you can specify the new password yourself."
 msgstr "ここではあなた自身の手によって新しいパスワードを指定できます。"
 
-#: ../lib/modules/sambaSamAccount.inc:358
+#: ../lib/modules/sambaSamAccount.inc:355
 msgid "Here you can specify the shadowing mode."
 msgstr "ここではshadowingモードを記述できます。"
 
@@ -2583,9 +2667,19 @@ msgstr "ここではshadowingモードを記述できます。"
 msgid "Here you can test if certain LAM features work on your installation."
 msgstr "あなたがインストールしたLAMの特定の機能が動作するかをテストできます。"
 
-#: ../lib/modules/sambaSamAccount.inc:372
-#: ../lib/modules/sambaSamAccount.inc:570 ../lib/modules/inetOrgPerson.inc:179
-#: ../lib/modules/inetOrgPerson.inc:591
+#: ../lib/modules/zarafaGroup.inc:75 ../lib/modules/zarafaGroup.inc:107
+#: ../lib/modules/zarafaGroup.inc:126 ../lib/modules/zarafaGroup.inc:193
+#: ../lib/modules/zarafaGroup.inc:433 ../lib/modules/zarafaUser.inc:64
+#: ../lib/modules/zarafaUser.inc:264 ../lib/modules/zarafaUser.inc:289
+#: ../lib/modules/zarafaUser.inc:317 ../lib/modules/zarafaUser.inc:494
+#: ../lib/modules/zarafaUser.inc:1074
+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
 msgid "Hidden options"
 msgstr "非表示のオプション"
 
@@ -2598,7 +2692,7 @@ msgstr "メッセージ中にコマンドを表示しない"
 msgid "Hide internal attributes"
 msgstr "内部属性を隠す"
 
-#: ../templates/masscreate.php:217
+#: ../templates/masscreate.php:215
 msgid ""
 "Hint: Format all cells as text in your spreadsheet program and turn off auto "
 "correction."
@@ -2611,22 +2705,22 @@ msgid "Hint: To delete an attribute, empty the text field and click save."
 msgstr ""
 "ヒント: 属性を削除するには、テキストフィールドを空にして保存してください。"
 
-#: ../lib/modules/posixAccount.inc:395
+#: ../lib/modules/posixAccount.inc:381
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr ""
 "複数のグループを選択(解除)する場合は、CTRLキーを押しながら操作してください。"
 
-#: ../lib/types/user.inc:98 ../lib/modules/sambaSamAccount.inc:210
-#: ../lib/modules/sambaSamAccount.inc:330
-#: ../lib/modules/sambaSamAccount.inc:1430
-#: ../lib/modules/sambaSamAccount.inc:1795 ../lib/modules/posixAccount.inc:66
+#: ../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:235
-#: ../lib/modules/posixAccount.inc:317 ../lib/modules/posixAccount.inc:353
-#: ../lib/modules/posixAccount.inc:357 ../lib/modules/posixAccount.inc:361
-#: ../lib/modules/posixAccount.inc:378 ../lib/modules/posixAccount.inc:765
-#: ../lib/modules/posixAccount.inc:970 ../lib/modules/posixAccount.inc:1101
-#: ../lib/modules/posixAccount.inc:1182
+#: ../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
 msgid "Home directory"
 msgstr "ホームディレクトリ"
 
@@ -2639,31 +2733,31 @@ msgstr ""
 "ホームディレクトリが変更されました。ホームディレクトリを維持するために、root"
 "権限で以下のコマンドを実行しなければなりません: 'mv %s %s'"
 
-#: ../lib/modules/posixAccount.inc:1122
+#: ../lib/modules/posixAccount.inc:1115
 msgid "Home directory server"
 msgstr "ホームディレクトリ・サーバー"
 
-#: ../lib/modules/sambaSamAccount.inc:194
-#: ../lib/modules/sambaSamAccount.inc:211
-#: ../lib/modules/sambaSamAccount.inc:278
-#: ../lib/modules/sambaSamAccount.inc:459
-#: ../lib/modules/sambaSamAccount.inc:574
-#: ../lib/modules/sambaSamAccount.inc:1153
-#: ../lib/modules/sambaSamAccount.inc:1441
-#: ../lib/modules/sambaSamAccount.inc:1580
-#: ../lib/modules/sambaSamAccount.inc:1769
-#: ../lib/modules/sambaSamAccount.inc:1796
+#: ../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
 msgid "Home drive"
 msgstr "ホームドライブ"
 
 #: ../lib/modules/sambaSamAccount.inc:81 ../lib/modules/sambaSamAccount.inc:82
-#: ../lib/modules/sambaSamAccount.inc:197
-#: ../lib/modules/sambaSamAccount.inc:281
-#: ../lib/modules/sambaSamAccount.inc:467
-#: ../lib/modules/sambaSamAccount.inc:577
-#: ../lib/modules/sambaSamAccount.inc:1163
-#: ../lib/modules/sambaSamAccount.inc:1588
-#: ../lib/modules/sambaSamAccount.inc:1766
+#: ../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
 msgid "Home path"
 msgstr "ホームパス"
 
@@ -2671,11 +2765,15 @@ msgstr "ホームパス"
 msgid "Home path is invalid."
 msgstr "ホームパスが正しくありません。"
 
+#: ../lib/modules/zarafaUser.inc:113
+msgid "Home server for the user."
+msgstr "ユーザに対するホームサーバー。"
+
 #: ../lib/modules/inetOrgPerson.inc:50 ../lib/modules/inetOrgPerson.inc:120
-#: ../lib/modules/inetOrgPerson.inc:203 ../lib/modules/inetOrgPerson.inc:338
-#: ../lib/modules/inetOrgPerson.inc:451 ../lib/modules/inetOrgPerson.inc:559
-#: ../lib/modules/inetOrgPerson.inc:949 ../lib/modules/inetOrgPerson.inc:1133
-#: ../lib/modules/inetOrgPerson.inc:1507
+#: ../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
 msgid "Home telephone number"
 msgstr "自宅電話番号"
 
@@ -2683,13 +2781,13 @@ msgstr "自宅電話番号"
 msgid "Homedirectory contains invalid characters."
 msgstr "ホームディレクトリが不正な文字を含んでいます。"
 
-#: ../lib/modules/asteriskAccount.inc:83
-#: ../lib/modules/asteriskAccount.inc:110
-#: ../lib/modules/asteriskAccount.inc:127
-#: ../lib/modules/asteriskAccount.inc:149
-#: ../lib/modules/asteriskAccount.inc:195
-#: ../lib/modules/asteriskAccount.inc:289 ../lib/modules/nisnetgroup.inc:207
-#: ../lib/modules/nisnetgroup.inc:577 ../lib/modules/hostObject.inc:143
+#: ../lib/modules/asteriskAccount.inc:87
+#: ../lib/modules/asteriskAccount.inc:113
+#: ../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
 msgid "Host"
 msgstr "ホスト"
 
@@ -2701,21 +2799,22 @@ msgstr "ホストアカウント(e.g. Samba)"
 msgid "Host description"
 msgstr "ホストの説明"
 
-#: ../lib/modules/account.inc:89 ../lib/modules/posixAccount.inc:409
-#: ../lib/modules/posixAccount.inc:417
+#: ../lib/modules/account.inc:89 ../lib/modules/posixAccount.inc:395
+#: ../lib/modules/posixAccount.inc:403
 msgid "Host description. If left empty host name will be used."
 msgstr "ホストの説明。もしも空ならば、ホスト名が使われます。"
 
 #: ../lib/modules/hostObject.inc:84 ../lib/modules/hostObject.inc:91
-#: ../lib/modules/hostObject.inc:261
+#: ../lib/modules/hostObject.inc:255
 msgid "Host list"
 msgstr "ホスト一覧"
 
 #: ../lib/types/host.inc:91 ../lib/types/host.inc:92
-#: ../lib/modules/account.inc:84 ../lib/modules/posixAccount.inc:81
-#: ../lib/modules/posixAccount.inc:82 ../lib/modules/posixAccount.inc:84
-#: ../lib/modules/posixAccount.inc:282 ../lib/modules/posixAccount.inc:404
-#: ../lib/modules/nisnetgroup.inc:138 ../lib/modules/nisnetgroup.inc:457
+#: ../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/nisnetgroup.inc:470
 msgid "Host name"
 msgstr "ホスト名"
 
@@ -2735,11 +2834,11 @@ msgstr ""
 msgid "Host name in use. Selected next free host name."
 msgstr "ホスト名がすでに使われています。次の未使用ホスト名が選択されました。"
 
-#: ../lib/modules/sambaSamAccount.inc:1051
+#: ../lib/modules/sambaSamAccount.inc:1032
 msgid "Host name must end with $!"
 msgstr "ホスト名の末尾は$でなくてはなりません!"
 
-#: ../lib/modules/account.inc:85 ../lib/modules/posixAccount.inc:405
+#: ../lib/modules/account.inc:85 ../lib/modules/posixAccount.inc:391
 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 $ "
@@ -2757,68 +2856,76 @@ 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:171 ../lib/modules/sudoRole.inc:67
+#: ../lib/modules/posixAccount.inc:167 ../lib/modules/sudoRole.inc:67
 #: ../lib/modules/sudoRole.inc:92 ../lib/modules/sudoRole.inc:140
-#: ../lib/modules/sudoRole.inc:174 ../lib/modules/sudoRole.inc:186
-#: ../lib/modules/sudoRole.inc:312 ../lib/modules/sudoRole.inc:711
-#: ../lib/modules/hostObject.inc:62 ../lib/modules/hostObject.inc:72
+#: ../lib/modules/sudoRole.inc:174 ../lib/modules/sudoRole.inc:183
+#: ../lib/modules/sudoRole.inc:291 ../lib/modules/sudoRole.inc:690
+#: ../lib/modules/fixed_ip.inc:69 ../lib/modules/hostObject.inc:62
+#: ../lib/modules/hostObject.inc:72
 msgid "Hosts"
 msgstr "ホスト"
 
-#: ../templates/lists/changePassword.php:181
+#: ../templates/lists/changePassword.php:213
 msgid "I am sure"
 msgstr "確認"
 
-#: ../lib/modules/posixGroup.inc:469 ../lib/modules/posixGroup.inc:580
-#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:746
+#: ../lib/modules/posixGroup.inc:481 ../lib/modules/posixGroup.inc:592
+#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:755
 msgid "ID is already in use"
 msgstr "ID はすでに使用されています"
 
-#: ../lib/modules/posixGroup.inc:467 ../lib/modules/posixGroup.inc:468
-#: ../lib/modules/posixGroup.inc:469 ../lib/modules/posixGroup.inc:572
-#: ../lib/modules/posixGroup.inc:580 ../lib/modules/posixAccount.inc:70
+#: ../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:742 ../lib/modules/posixAccount.inc:746
+#: ../lib/modules/posixAccount.inc:751 ../lib/modules/posixAccount.inc:755
 msgid "ID-Number"
 msgstr "ID番号"
 
-#: ../lib/modules/ipHost.inc:48 ../lib/modules/ipHost.inc:58
-#: ../lib/modules/ipHost.inc:124 ../lib/modules/fixed_ip.inc:87
-#: ../lib/modules/fixed_ip.inc:334 ../lib/modules/fixed_ip.inc:518
+#: ../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
+#: ../lib/modules/fixed_ip.inc:513
 msgid "IP address"
 msgstr "IPアドレス"
 
-#: ../lib/modules/ddns.inc:96 ../lib/modules/ddns.inc:107
-#: ../lib/modules/ddns.inc:116 ../lib/modules/ddns.inc:364
-#: ../lib/modules/ddns.inc:411
+#: ../lib/modules/ddns.inc:100 ../lib/modules/ddns.inc:111
+#: ../lib/modules/ddns.inc:120 ../lib/modules/ddns.inc:356
+#: ../lib/modules/ddns.inc:399
 msgid "IP address of the DNS server"
 msgstr "DNSサーバーのIPアドレス"
 
 #: ../lib/modules/ipHost.inc:62 ../lib/modules/ipHost.inc:77
-#: ../lib/modules/ipHost.inc:97 ../lib/modules/ipHost.inc:315
+#: ../lib/modules/ipHost.inc:97 ../lib/modules/ipHost.inc:309
 msgid "IP address(es)"
 msgstr "IPアドレス"
 
-#: ../lib/modules/fixed_ip.inc:91
+#: ../lib/modules/fixed_ip.inc:97
 msgid "IP list"
 msgstr "IPアドレス一覧"
 
-#: ../templates/masscreate.php:248 ../templates/masscreate.php:260
-#: ../templates/masscreate.php:401
+#: ../templates/masscreate.php:247 ../templates/masscreate.php:259
+#: ../templates/masscreate.php:365
 msgid "Identifier"
 msgstr "識別子"
 
-#: ../lib/modules/sambaSamAccount.inc:218
-#: ../lib/modules/sambaSamAccount.inc:1476
-#: ../lib/modules/sambaSamAccount.inc:1807
+#: ../lib/modules/sambaSamAccount.inc:215
+#: ../lib/modules/sambaSamAccount.inc:1415
+#: ../lib/modules/sambaSamAccount.inc:1684
 msgid "Idle time limit"
 msgstr "無動作時間の制限"
 
-#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/ppolicyUser.inc:53
+msgid ""
+"If activated then the user is forced to change his password at the next "
+"login."
+msgstr "有効にした場合、ユーザーは次のログインの際にパスワードを変更しなくてはなりません。"
+
+#: ../lib/modules/sambaSamAccount.inc:241
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "チェックした場合、unixパスワードがSambaパスワードとしても使われます。"
 
-#: ../lib/modules/posixAccount.inc:387
+#: ../lib/modules/posixAccount.inc:373
 msgid ""
 "If checked account will be deactivated by putting a \"!\" before the "
 "encrypted password."
@@ -2826,21 +2933,21 @@ msgstr ""
 "チェックした場合、暗号化パスワードの前に\"!\"が挿入され、アカウントは無効化さ"
 "れます。"
 
-#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/sambaSamAccount.inc:247
 msgid "If checked no password will be used."
 msgstr "チェックした場合、パスワードは使われません。"
 
-#: ../lib/modules/sambaSamAccount.inc:256
+#: ../lib/modules/sambaSamAccount.inc:253
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "チェックした場合、パスワードは無期限になります。(X-フラグをセット)"
 
-#: ../lib/modules/sambaSamAccount.inc:262
+#: ../lib/modules/sambaSamAccount.inc:259
 msgid "If checked then the account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "チェックした場合、(D-フラグをセットすることにより)アカウントは無効化されま"
 "す。"
 
-#: ../lib/modules/sambaSamAccount.inc:265
+#: ../lib/modules/sambaSamAccount.inc:262
 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 "
@@ -2850,13 +2957,13 @@ msgstr ""
 "す。通常はログイン失敗によってロックされたユーザーのアカウントをアンロックし"
 "たい場合に使用します。"
 
-#: ../lib/modules/posixGroup.inc:380
+#: ../lib/modules/posixGroup.inc:394
 msgid ""
 "If empty GID number will be generated automaticly depending on your "
 "configuration settings."
 msgstr "未記入の場合、設定内容に従ってGID番号が自動的に生成されます。"
 
-#: ../lib/modules/posixAccount.inc:342
+#: ../lib/modules/posixAccount.inc:328
 msgid "If empty UID number will be generated automaticly."
 msgstr "未記入の場合、UID番号が自動的に生成されます。"
 
@@ -2880,26 +2987,32 @@ msgstr ""
 msgid "If set then users need to login to change their password."
 msgstr "パスワード変更の際にユーザーのログオンを強制します。"
 
-#: ../lib/modules/sambaSamAccount.inc:247
+#: ../lib/modules/sambaSamAccount.inc:244
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr ""
 "\"true\"にセットした場合、unixパスワードがSambaパスワードとしても使われます。"
 
-#: ../lib/modules/sambaSamAccount.inc:268
+#: ../lib/modules/sambaSamAccount.inc:265
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "\"true\"にセットした場合、アカウントは無効化されます。(D-フラグをセット)"
 
-#: ../lib/modules/sambaSamAccount.inc:253
+#: ../lib/modules/sambaSamAccount.inc:250
 msgid "If set to \"true\" no password will be used."
 msgstr "\"true\"にセットした場合、パスワードは使われません。"
 
-#: ../lib/modules/sambaSamAccount.inc:259
+#: ../lib/modules/sambaSamAccount.inc:256
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr ""
 "\"true\"にセットした場合、パスワードは無期限になります。(X-フラグをセット)"
 
-#: ../help/help.inc:191
+#: ../lib/modules/zarafaUser.inc:81
+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リミットに到達した場合、ユーザーはメールボックスのサイズ減らすまでメールを送ることができません。"
+
+#: ../help/help.inc:186
 msgid ""
 "If you decide to send the password via mail then the mail template \"config/"
 "passwordMailTemplate.txt\" will be used."
@@ -2907,13 +3020,13 @@ msgstr ""
 "パスワードをメールで送信することを選択した場合、テンプレートとして\"config/"
 "passwordMailTemplate.txt\"が使用されます。"
 
-#: ../lib/modules/sambaSamAccount.inc:307
+#: ../lib/modules/sambaSamAccount.inc:304
 msgid ""
 "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr ""
 "未入力の場合は、LAMは uidNumber*2 + sambaAlgorithmicRidBase を使用します。"
 
-#: ../lib/modules/sambaSamAccount.inc:271
+#: ../lib/modules/sambaSamAccount.inc:268
 msgid ""
 "If you set this option then the user has to change his password at the next "
 "login."
@@ -2927,25 +3040,25 @@ msgid ""
 "If you set this to \"true\" then the phpGroupware extension will be added."
 msgstr "\"true\"にセットした場合、phpGroupware拡張が追加されます。"
 
-#: ../help/help.inc:99
+#: ../help/help.inc:96
 msgid ""
 "If you want to change the current preferences password, please enter it here."
 msgstr ""
 "現在のプリファレンスのパスワードを変更したい場合は、ここに入力してください。"
 
-#: ../help/help.inc:132
+#: ../help/help.inc:129
 msgid ""
 "If you want to change your master configuration password, please enter it "
 "here."
 msgstr "マスタ構成パスワードを変更したい場合は、ここに入力してください。"
 
-#: ../lib/modules/sambaGroupMapping.inc:360
+#: ../lib/modules/sambaGroupMapping.inc:350
 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:111
+#: ../help/help.inc:108
 msgid ""
 "If your server runs on another port then add a comma and the port number "
 "after the server."
@@ -2961,10 +3074,10 @@ msgstr "システム属性を含む"
 msgid "Information about the LDAP server."
 msgstr "LDAPサーバーに関する情報。"
 
-#: ../lib/modules/sambaSamAccount.inc:213
-#: ../lib/modules/sambaSamAccount.inc:336
-#: ../lib/modules/sambaSamAccount.inc:1451
-#: ../lib/modules/sambaSamAccount.inc:1802
+#: ../lib/modules/sambaSamAccount.inc:210
+#: ../lib/modules/sambaSamAccount.inc:333
+#: ../lib/modules/sambaSamAccount.inc:1405
+#: ../lib/modules/sambaSamAccount.inc:1679
 msgid "Inherit client startup configuration"
 msgstr "クライアントのスタートアップ構成を継承する"
 
@@ -2976,10 +3089,10 @@ msgstr "継承元"
 msgid "Inherits from"
 msgstr "継承元"
 
-#: ../lib/modules/sambaSamAccount.inc:214
-#: ../lib/modules/sambaSamAccount.inc:339
-#: ../lib/modules/sambaSamAccount.inc:1456
-#: ../lib/modules/sambaSamAccount.inc:1803
+#: ../lib/modules/sambaSamAccount.inc:211
+#: ../lib/modules/sambaSamAccount.inc:336
+#: ../lib/modules/sambaSamAccount.inc:1407
+#: ../lib/modules/sambaSamAccount.inc:1680
 msgid "Initial program"
 msgstr "初期プログラム"
 
@@ -3014,7 +3127,7 @@ msgstr ""
 "iノード・ソフトクオータはiノード・ハードクオータ<より小さくなくてはなりませ"
 "ん。"
 
-#: ../templates/selfService/adminMain.php:472
+#: ../templates/selfService/adminMain.php:470
 msgid "Input fields"
 msgstr "入力フィールド"
 
@@ -3030,7 +3143,7 @@ msgstr "ログオンスクリプトパスにユーザ又はグループ名を挿
 msgid "Inserted user or group name in profile path."
 msgstr "プロファイルパスにユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/fixed_ip.inc:373
+#: ../lib/modules/fixed_ip.inc:375
 msgid "Invalid MAC address."
 msgstr "不正なMACアドレスです。"
 
@@ -3042,26 +3155,26 @@ msgstr "不正なRDN属性です!"
 msgid "Invalid account"
 msgstr "無効なアカウント"
 
-#: ../lib/modules/kolabUser.inc:130 ../lib/modules/kolabUser.inc:135
-#: ../lib/modules/kolabUser.inc:182 ../lib/modules/kolabUser.inc:226
-#: ../lib/modules/kolabUser.inc:349 ../lib/modules/kolabUser.inc:787
-#: ../lib/modules/kolabUser.inc:911
+#: ../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
 msgid "Invitation policy"
 msgstr "不正なポリシー"
 
-#: ../lib/modules/kolabUser.inc:139
+#: ../lib/modules/kolabUser.inc:127
 msgid "Invitation policy list"
 msgstr "不正なポリシーリスト"
 
-#: ../lib/modules/sambaSamAccount.inc:546
+#: ../lib/modules/sambaSamAccount.inc:539
 msgid "Islamabad, Karachi"
 msgstr "Islamabad, Karachi"
 
-#: ../lib/modules/range.inc:99
+#: ../lib/modules/range.inc:109
 msgid "It is not possible to delete all ranges."
 msgstr "全ての範囲を削除する事はできません"
 
-#: ../lib/modules/posixGroup.inc:467 ../lib/modules/posixAccount.inc:71
+#: ../lib/modules/posixGroup.inc:479 ../lib/modules/posixAccount.inc:71
 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 "
@@ -3071,17 +3184,25 @@ msgstr ""
 "在するかも知れないため、これはいくつかの問題を引き起こすかもしれません。この"
 "警告を防ぐには、maxUIDをより大きな値に設定してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:145
-#: ../lib/modules/inetOrgPerson.inc:211 ../lib/modules/inetOrgPerson.inc:266
-#: ../lib/modules/inetOrgPerson.inc:463 ../lib/modules/inetOrgPerson.inc:495
-#: ../lib/modules/inetOrgPerson.inc:988 ../lib/modules/inetOrgPerson.inc:1123
+#: ../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
 msgid "Job title"
 msgstr "役職"
 
-#: ../lib/modules/inetOrgPerson.inc:496
+#: ../lib/modules/inetOrgPerson.inc:485
 msgid "Job title of user: President, department manager, ..."
 msgstr "ユーザの役職: 社長、部長、..."
 
+#: ../lib/lists.inc:280
+msgid "Jump 10 pages backward"
+msgstr "10ページ前へ戻る"
+
+#: ../lib/lists.inc:300
+msgid "Jump 10 pages forward"
+msgstr "10ページ先へ進む"
+
 #: ../templates/schema/schema.php:253
 msgid "Jump to a matching rule"
 msgstr "照合規則へジャンプ"
@@ -3095,6 +3216,14 @@ msgstr "属性タイプへジャンプ"
 msgid "Jump to an object class"
 msgstr "オブジェクトクラスへジャンプ"
 
+#: ../lib/lists.inc:275
+msgid "Jump to first page"
+msgstr "最初のページへジャンプ"
+
+#: ../lib/lists.inc:305
+msgid "Jump to last page"
+msgstr "最後のページへジャンプ"
+
 #: ../lib/modules/kolabUser.inc:73
 msgid "Kolab"
 msgstr "Kolab"
@@ -3109,7 +3238,7 @@ msgstr ""
 "LAMはこのエントリおよび全ての子を再帰的に削除します。この操作が削除する全ての"
 "エントリのリストは下に表示されています。実行してもよろしいですか?"
 
-#: ../templates/login.php:175 ../templates/config/index.php:63
+#: ../templates/login.php:207 ../templates/config/index.php:77
 msgid "LAM configuration"
 msgstr "LAM構成設定"
 
@@ -3118,8 +3247,8 @@ msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr ""
 "LAMは入力内容をチェックしました。アカウントを作成する準備ができました。"
 
-#: ../lib/modules/posixGroup.inc:404 ../lib/modules/posixAccount.inc:338
-#: ../lib/modules/inetOrgPerson.inc:596
+#: ../lib/modules/posixGroup.inc:418 ../lib/modules/posixAccount.inc:324
+#: ../lib/modules/inetOrgPerson.inc:585
 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 "
@@ -3139,7 +3268,7 @@ msgstr "LAMテスト"
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAMはアカウント %s を作成できませんでした! LDAPエラーが発生しました。"
 
-#: ../lib/modules/sambaGroupMapping.inc:439
+#: ../lib/modules/sambaGroupMapping.inc:426
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "LAMは、この名前のSamba 3ドメインを見つけられませんでした。"
 
@@ -3151,16 +3280,16 @@ msgstr "LAMは、この名前のドメインを見つけられませんでした
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAMは、この名前のグループを見つけられませんでした。"
 
-#: ../lib/modules/posixAccount.inc:1581
+#: ../lib/modules/posixAccount.inc:1569
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAMはグループ %s のグループメンバーシップを変更できませんでした。"
 
-#: ../help/help.inc:170
+#: ../help/help.inc:165
 msgid "LAM will search for accounts in this part of the LDAP tree."
 msgstr "LAMは、このLDAPツリー部分からアカウントを検索します。"
 
-#: ../help/help.inc:172
+#: ../help/help.inc:167
 msgid ""
 "LAM will use this LDAP DN and password to search for accounts. It is "
 "sufficient to specify an account with read rights. If nothing is inserted "
@@ -3169,70 +3298,69 @@ msgstr ""
 "LAMがアカウントを検索する際に使用するLDAP DNとパスワード。これは、読み取り権"
 "限だけを持ったアカウントで充分です。未記入の場合、LAMは匿名接続を試みます。"
 
-#: ../templates/profedit/profilepage.php:175
+#: ../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
-#: ../templates/selfService/adminMain.php:133
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP アカウントマネージャ構成"
 
-#: ../templates/config/conftypes.php:315
+#: ../templates/config/conftypes.php:319
 msgid "LDAP Suffix is invalid!"
 msgstr "LDAPサフィックスが正しくありません!"
 
-#: ../templates/login.php:490
+#: ../templates/login.php:533
 msgid "LDAP error, server says:"
 msgstr "LDAP エラー、サーバからのメッセージ:"
 
-#: ../templates/config/confmain.php:506
+#: ../templates/config/confmain.php:530
 msgid "LDAP filter"
 msgstr "LDAPフィルター"
 
-#: ../lib/modules.inc:1459
+#: ../lib/modules.inc:1485
 msgid "LDAP operation successful."
 msgstr "LDAP操作が完了しました。"
 
-#: ../templates/selfService/adminMain.php:370
+#: ../templates/selfService/adminMain.php:368
 msgid "LDAP password"
 msgstr "LDAPパスワード"
 
-#: ../templates/config/confmain.php:474 ../templates/config/confmain.php:477
-#: ../help/help.inc:117
+#: ../templates/config/confmain.php:501 ../templates/config/confmain.php:504
+#: ../help/help.inc:114
 msgid "LDAP search"
 msgstr "LDAP検索"
 
-#: ../templates/selfService/adminMain.php:381 ../help/help.inc:173
+#: ../templates/selfService/adminMain.php:379 ../help/help.inc:168
 msgid "LDAP search attribute"
 msgstr "LDAP検索属性"
 
-#: ../lib/account.inc:641
+#: ../lib/account.inc:642
 msgid "LDAP search failed! Please check your preferences."
 msgstr "LDAP検索に失敗しました! プリファレンスを確認してください。"
 
-#: ../templates/config/confmain.php:295 ../help/help.inc:119
+#: ../templates/config/confmain.php:302 ../help/help.inc:116
 msgid "LDAP search limit"
 msgstr "LDAP検索リミット"
 
-#: ../templates/login.php:326
+#: ../templates/login.php:361
 msgid "LDAP server"
 msgstr "LDAPサーバ"
 
-#: ../lib/account.inc:632
+#: ../lib/account.inc:633
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "LDAPのサイズ制限を越えました。一部のエントリのみを表示します。"
 
-#: ../templates/config/confmain.php:497 ../templates/config/conftypes.php:245
-#: ../templates/selfService/adminMain.php:346
-#: ../templates/profedit/profilepage.php:179 ../help/help.inc:70
-#: ../help/help.inc:169
+#: ../templates/config/confmain.php:522 ../templates/config/conftypes.php:252
+#: ../templates/selfService/adminMain.php:344
+#: ../templates/profedit/profilepage.php:221 ../help/help.inc:67
+#: ../help/help.inc:164
 msgid "LDAP suffix"
 msgstr "LDAPサフィックス"
 
-#: ../templates/massDoUpload.php:126
+#: ../templates/massDoUpload.php:125
 msgid "LDAP upload has finished"
 msgstr "LDAPアップロードが完了しました。"
 
@@ -3240,11 +3368,11 @@ msgstr "LDAPアップロードが完了しました。"
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAPアップロード中です。お待ちください。"
 
-#: ../templates/selfService/adminMain.php:358
+#: ../templates/selfService/adminMain.php:356
 msgid "LDAP user"
 msgstr "LDAPユーザー"
 
-#: ../help/help.inc:171
+#: ../help/help.inc:166
 msgid "LDAP user and password"
 msgstr "LDAPユーザーとパスワード"
 
@@ -3252,7 +3380,7 @@ msgstr "LDAPユーザーとパスワード"
 msgid "LDAP version"
 msgstr "LDAPバージョン"
 
-#: ../lib/export.inc:441
+#: ../lib/export.inc:443
 #, php-format
 msgid "LDIF Export for: %s"
 msgstr "LDIFにエクスポート: %s"
@@ -3261,15 +3389,15 @@ msgstr "LDIFにエクスポート: %s"
 msgid "Label"
 msgstr "ラベル"
 
-#: ../templates/tests/lamdaemonTest.php:179
+#: ../templates/tests/lamdaemonTest.php:177
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemonサーバおよびパス"
 
-#: ../templates/config/confmain.php:394
+#: ../templates/config/confmain.php:401
 msgid "Lamdaemon settings"
 msgstr "Lamdaemon設定"
 
-#: ../templates/tests/lamdaemonTest.php:137
+#: ../templates/tests/lamdaemonTest.php:135
 msgid "Lamdaemon successfully run."
 msgstr "Lamdaemonは正常に起動しました。"
 
@@ -3278,51 +3406,51 @@ msgstr "Lamdaemonは正常に起動しました。"
 msgid "Lamdaemon test"
 msgstr "Lamdaemonテスト"
 
-#: ../templates/tests/lamdaemonTest.php:264
+#: ../templates/tests/lamdaemonTest.php:262
 msgid "Lamdaemon test finished."
 msgstr "Lamdaemonテストが完了しました。"
 
-#: ../templates/tests/lamdaemonTest.php:256
+#: ../templates/tests/lamdaemonTest.php:254
 msgid "Lamdaemon: Quota module installed"
 msgstr "Lamdaemon: クォータモジュールがインストールされました。"
 
-#: ../templates/tests/lamdaemonTest.php:252
+#: ../templates/tests/lamdaemonTest.php:250
 msgid "Lamdaemon: check NSS LDAP"
 msgstr "Lamdaemon: NSS LDAPのチェック"
 
-#: ../templates/tests/lamdaemonTest.php:259
+#: ../templates/tests/lamdaemonTest.php:257
 msgid "Lamdaemon: read quotas"
 msgstr "Lamdaemon: クオータの読み込み"
 
-#: ../templates/login.php:275
+#: ../templates/login.php:306
 msgid "Language"
 msgstr "言語"
 
-#: ../templates/config/confmain.php:586
+#: ../templates/config/confmain.php:613
 msgid "Language is not defined!"
 msgstr "言語が未定されていません!"
 
-#: ../templates/config/confmain.php:349
+#: ../templates/config/confmain.php:356
 msgid "Language settings"
 msgstr "言語の設定"
 
-#: ../lib/modules/phpGroupwareUser.inc:102
-#: ../lib/modules/phpGroupwareUser.inc:173
-#: ../lib/modules/phpGroupwareUser.inc:352
+#: ../lib/modules/phpGroupwareUser.inc:99
+#: ../lib/modules/phpGroupwareUser.inc:174
+#: ../lib/modules/phpGroupwareUser.inc:350
 msgid "Last login"
 msgstr "最終ログイン時刻"
 
-#: ../lib/modules/phpGroupwareUser.inc:101
+#: ../lib/modules/phpGroupwareUser.inc:98
 #: ../lib/modules/phpGroupwareUser.inc:181
-#: ../lib/modules/phpGroupwareUser.inc:347
+#: ../lib/modules/phpGroupwareUser.inc:345
 msgid "Last login from"
 msgstr "最終ログインの接続元"
 
 #: ../lib/types/user.inc:97 ../lib/modules/inetOrgPerson.inc:46
-#: ../lib/modules/inetOrgPerson.inc:116 ../lib/modules/inetOrgPerson.inc:249
-#: ../lib/modules/inetOrgPerson.inc:418 ../lib/modules/inetOrgPerson.inc:503
-#: ../lib/modules/inetOrgPerson.inc:837 ../lib/modules/inetOrgPerson.inc:1125
-#: ../lib/modules/inetOrgPerson.inc:1483
+#: ../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
 msgid "Last name"
 msgstr "姓"
 
@@ -3330,17 +3458,18 @@ msgstr "姓"
 msgid "Last name contains invalid characters or is empty!"
 msgstr "姓に不正な文字が含まれているか、または未入力です!"
 
-#: ../lib/modules/inetOrgPerson.inc:504
+#: ../lib/modules/inetOrgPerson.inc:493
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "ユーザの姓。アルファベット、_ - と空白のみが使用できます。"
 
-#: ../lib/modules/shadowAccount.inc:165 ../lib/modules/shadowAccount.inc:416
+#: ../lib/modules/shadowAccount.inc:160 ../lib/modules/shadowAccount.inc:192
+#: ../lib/modules/shadowAccount.inc:349 ../lib/modules/shadowAccount.inc:428
 msgid "Last password change"
 msgstr "パスワード最終変更時刻"
 
-#: ../lib/modules/dhcp_settings.inc:125 ../lib/modules/dhcp_settings.inc:168
-#: ../lib/modules/dhcp_settings.inc:192 ../lib/modules/dhcp_settings.inc:244
-#: ../lib/modules/dhcp_settings.inc:557 ../lib/modules/dhcp_settings.inc:669
+#: ../lib/modules/dhcp_settings.inc:130 ../lib/modules/dhcp_settings.inc:173
+#: ../lib/modules/dhcp_settings.inc:187 ../lib/modules/dhcp_settings.inc:216
+#: ../lib/modules/dhcp_settings.inc:522 ../lib/modules/dhcp_settings.inc:611
 msgid "Lease time"
 msgstr "リース期間"
 
@@ -3348,19 +3477,19 @@ msgstr "リース期間"
 msgid "Line ends"
 msgstr "行の終わり"
 
-#: ../templates/selfService/adminMain.php:321
+#: ../templates/selfService/adminMain.php:319
 msgid "Link to self service login page for your users"
 msgstr "ユーザーのセルフサービス・ログインページへのリンク"
 
-#: ../templates/config/conftypes.php:259 ../help/help.inc:82
+#: ../templates/config/conftypes.php:266 ../help/help.inc:79
 msgid "List attributes"
 msgstr "属性の一覧"
 
-#: ../templates/config/conftypes.php:322
+#: ../templates/config/conftypes.php:326
 msgid "List attributes are invalid!"
 msgstr "リスト属性が正しくありません!"
 
-#: ../lib/modules/sambaSamAccount.inc:291
+#: ../lib/modules/sambaSamAccount.inc:288
 msgid ""
 "List of Samba workstations the user is allowed to login. Empty means every "
 "workstation."
@@ -3368,7 +3497,7 @@ msgstr ""
 "ユーザがログインできるSambaワークステーションのリスト。未記入はすべてのワーク"
 "ステーションを意味します。"
 
-#: ../templates/config/confmain.php:580
+#: ../templates/config/confmain.php:607
 msgid "List of admin users is empty or invalid!"
 msgstr "管理者(admin users)のリストが空または正しくありません!"
 
@@ -3376,23 +3505,23 @@ msgstr "管理者(admin users)のリストが空または正しくありませ
 msgid "List of entries to be deleted:"
 msgstr "削除されるエントリ一覧:"
 
-#: ../templates/config/confmain.php:488
+#: ../templates/config/confmain.php:514
 msgid "List of valid users"
 msgstr "有効なユーザのリスト"
 
-#: ../lib/modules.inc:1408 ../help/help.inc:160
+#: ../lib/modules.inc:1409 ../help/help.inc:156
 msgid "Load profile"
 msgstr "プロファイルのロード"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:65
-#: ../lib/modules/inetLocalMailRecipient.inc:160
+#: ../lib/modules/inetLocalMailRecipient.inc:150
 msgid "Local address"
 msgstr "ローカルアドレス"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:69
-#: ../lib/modules/inetLocalMailRecipient.inc:102
-#: ../lib/modules/inetLocalMailRecipient.inc:116
-#: ../lib/modules/inetLocalMailRecipient.inc:319
+#: ../lib/modules/inetLocalMailRecipient.inc:99
+#: ../lib/modules/inetLocalMailRecipient.inc:113
+#: ../lib/modules/inetLocalMailRecipient.inc:303
 msgid "Local address list"
 msgstr "ローカルアドレス一覧"
 
@@ -3401,26 +3530,29 @@ msgid "Local group"
 msgstr "ローカルグループ"
 
 #: ../lib/modules/ipHost.inc:66 ../lib/modules/ipHost.inc:84
-#: ../lib/modules/ipHost.inc:98 ../lib/modules/ipHost.inc:148
-#: ../lib/modules/ipHost.inc:318 ../lib/modules/inetOrgPerson.inc:121
-#: ../lib/modules/inetOrgPerson.inc:127 ../lib/modules/inetOrgPerson.inc:191
-#: ../lib/modules/inetOrgPerson.inc:386 ../lib/modules/inetOrgPerson.inc:433
-#: ../lib/modules/inetOrgPerson.inc:571 ../lib/modules/inetOrgPerson.inc:892
-#: ../lib/modules/inetOrgPerson.inc:1142 ../lib/modules/inetOrgPerson.inc:1571
+#: ../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
 msgid "Location"
 msgstr "住所"
 
-#: ../lib/modules/posixGroup.inc:188 ../lib/modules/posixAccount.inc:263
-#: ../lib/modules/posixAccount.inc:998
+#: ../lib/modules/posixGroup.inc:203 ../lib/modules/posixAccount.inc:249
+#: ../lib/modules/posixAccount.inc:1009
 msgid "Lock password"
 msgstr "パスワードのロック"
 
 #: ../lib/types/ppolicyType.inc:83 ../lib/modules/ppolicy.inc:96
 #: ../lib/modules/ppolicy.inc:143 ../lib/modules/ppolicy.inc:163
-#: ../lib/modules/ppolicy.inc:265 ../lib/modules/ppolicy.inc:498
+#: ../lib/modules/ppolicy.inc:244 ../lib/modules/ppolicy.inc:460
 #: ../lib/modules/sambaDomain.inc:126 ../lib/modules/sambaDomain.inc:191
-#: ../lib/modules/sambaDomain.inc:216 ../lib/modules/sambaDomain.inc:350
-#: ../lib/modules/sambaDomain.inc:696
+#: ../lib/modules/sambaDomain.inc:216 ../lib/modules/sambaDomain.inc:327
+#: ../lib/modules/sambaDomain.inc:666
 msgid "Lockout duration"
 msgstr "ロッカウト期間"
 
@@ -3429,14 +3561,14 @@ msgid "Lockout duration must be are natural number."
 msgstr "ロックアウト期間は自然数でなければなりません。"
 
 #: ../lib/types/ppolicyType.inc:88 ../lib/modules/ppolicy.inc:116
-#: ../lib/modules/ppolicy.inc:142 ../lib/modules/ppolicy.inc:256
-#: ../lib/modules/ppolicy.inc:507
+#: ../lib/modules/ppolicy.inc:142 ../lib/modules/ppolicy.inc:238
+#: ../lib/modules/ppolicy.inc:469
 msgid "Lockout users"
 msgstr "ロッカウト・ユーザー"
 
 #: ../lib/modules/sambaDomain.inc:114 ../lib/modules/sambaDomain.inc:188
-#: ../lib/modules/sambaDomain.inc:218 ../lib/modules/sambaDomain.inc:323
-#: ../lib/modules/sambaDomain.inc:687
+#: ../lib/modules/sambaDomain.inc:218 ../lib/modules/sambaDomain.inc:309
+#: ../lib/modules/sambaDomain.inc:657
 msgid "Lockout users after bad logon attempts"
 msgstr "ユーザーをロックアウトするに至るログオン失敗回数"
 
@@ -3446,41 +3578,41 @@ msgstr ""
 "ユーザーをロックアウトするに至るログオン失敗回数は0から999の間でなくてはなり"
 "ません。"
 
-#: ../templates/config/mainmanage.php:289 ../help/help.inc:141
+#: ../templates/config/mainmanage.php:309 ../help/help.inc:138
 msgid "Log destination"
 msgstr "ログ出力先"
 
-#: ../templates/config/mainmanage.php:264 ../help/help.inc:139
+#: ../templates/config/mainmanage.php:284 ../help/help.inc:136
 msgid "Log level"
 msgstr "ログレベル"
 
-#: ../templates/config/mainmanage.php:258
+#: ../templates/config/mainmanage.php:278
 msgid "Logging"
 msgstr "ロギング"
 
-#: ../templates/login.php:301 ../templates/config/conflogin.php:62
+#: ../templates/login.php:332 ../templates/config/conflogin.php:62
 #: ../templates/config/mainlogin.php:70
 #: ../templates/selfService/selfServiceLogin.php:138
-#: ../templates/selfService/adminLogin.php:64 ../help/help.inc:55
+#: ../templates/selfService/adminLogin.php:64 ../help/help.inc:52
 msgid "Login"
 msgstr "ログイン"
 
-#: ../templates/selfService/adminMain.php:407 ../help/help.inc:175
+#: ../templates/selfService/adminMain.php:405 ../help/help.inc:170
 msgid "Login attribute label"
 msgstr "ログイン属性ラベル"
 
-#: ../templates/selfService/adminMain.php:420 ../help/help.inc:177
+#: ../templates/selfService/adminMain.php:418 ../help/help.inc:172
 msgid "Login caption"
 msgstr "ログインの説明文"
 
-#: ../templates/config/confmain.php:465 ../help/help.inc:115
+#: ../templates/config/confmain.php:492 ../help/help.inc:112
 msgid "Login method"
 msgstr "ログイン方法"
 
-#: ../lib/types/user.inc:99 ../lib/modules/posixAccount.inc:249
-#: ../lib/modules/posixAccount.inc:318 ../lib/modules/posixAccount.inc:390
-#: ../lib/modules/posixAccount.inc:992 ../lib/modules/posixAccount.inc:1106
-#: ../lib/modules/posixAccount.inc:1183
+#: ../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
 msgid "Login shell"
 msgstr "ログインシェル"
 
@@ -3489,28 +3621,28 @@ msgid "Logo"
 msgstr "ロゴ"
 
 #: ../lib/modules/sambaDomain.inc:102 ../lib/modules/sambaDomain.inc:185
-#: ../lib/modules/sambaDomain.inc:290 ../lib/modules/sambaDomain.inc:674
+#: ../lib/modules/sambaDomain.inc:283 ../lib/modules/sambaDomain.inc:644
 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:318
-#: ../lib/modules/sambaSamAccount.inc:499
-#: ../lib/modules/sambaSamAccount.inc:590
-#: ../lib/modules/sambaSamAccount.inc:1239
-#: ../lib/modules/sambaSamAccount.inc:1642
+#: ../lib/modules/sambaSamAccount.inc:496
+#: ../lib/modules/sambaSamAccount.inc:567
+#: ../lib/modules/sambaSamAccount.inc:1188
+#: ../lib/modules/sambaSamAccount.inc:1526
 msgid "Logon hours"
 msgstr "ログオン時間"
 
 #: ../lib/modules/sambaSamAccount.inc:87 ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:203
-#: ../lib/modules/sambaSamAccount.inc:287
-#: ../lib/modules/sambaSamAccount.inc:483
-#: ../lib/modules/sambaSamAccount.inc:584
-#: ../lib/modules/sambaSamAccount.inc:1183
-#: ../lib/modules/sambaSamAccount.inc:1604
-#: ../lib/modules/sambaSamAccount.inc:1772
+#: ../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
 msgid "Logon script"
 msgstr "ログオンスクリプト"
 
@@ -3518,9 +3650,9 @@ msgstr "ログオンスクリプト"
 msgid "Logon script is invalid!"
 msgstr "ログオンスクリプトが正しくありません!"
 
-#: ../templates/selfService/selfServiceMain.php:47
-#: ../templates/selfService/selfServiceMain.php:129
-#: ../templates/main_header.php:70
+#: ../templates/selfService/selfServiceMain.php:53
+#: ../templates/selfService/selfServiceMain.php:127
+#: ../templates/main_header.php:75
 msgid "Logout"
 msgstr "ログアウト"
 
@@ -3528,10 +3660,10 @@ msgstr "ログアウト"
 msgid "M-Node (0x04)"
 msgstr "M-Node (0x04)"
 
-#: ../lib/modules/ieee802device.inc:51 ../lib/modules/ieee802device.inc:61
-#: ../lib/modules/ieee802device.inc:72 ../lib/modules/ieee802device.inc:102
-#: ../lib/modules/fixed_ip.inc:84 ../lib/modules/fixed_ip.inc:330
-#: ../lib/modules/fixed_ip.inc:518
+#: ../lib/types/dhcp.inc:96 ../lib/modules/ieee802device.inc:51
+#: ../lib/modules/ieee802device.inc:61 ../lib/modules/ieee802device.inc:72
+#: ../lib/modules/ieee802device.inc:104 ../lib/modules/fixed_ip.inc:90
+#: ../lib/modules/fixed_ip.inc:334 ../lib/modules/fixed_ip.inc:513
 msgid "MAC address"
 msgstr "MACアドレス"
 
@@ -3539,11 +3671,11 @@ msgstr "MACアドレス"
 msgid "MAC address list"
 msgstr "MACアドレス一覧"
 
-#: ../lib/modules/ieee802device.inc:79 ../lib/modules/ieee802device.inc:198
+#: ../lib/modules/ieee802device.inc:79 ../lib/modules/ieee802device.inc:206
 msgid "MAC address(es)"
 msgstr "MACアドレス"
 
-#: ../lib/modules/sambaSamAccount.inc:552
+#: ../lib/modules/sambaSamAccount.inc:545
 msgid "Magadan, Solomon Islands"
 msgstr "Magadan, Solomon Islands"
 
@@ -3551,13 +3683,13 @@ msgstr "Magadan, Solomon Islands"
 msgid "Mail aliases"
 msgstr "電子メール エイリアス"
 
-#: ../lib/modules/kolabUser.inc:98 ../lib/modules/kolabUser.inc:171
-#: ../lib/modules/kolabUser.inc:219 ../lib/modules/kolabUser.inc:232
-#: ../lib/modules/kolabUser.inc:306 ../lib/modules/kolabUser.inc:771
+#: ../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
 msgid "Mail quota"
 msgstr "メール・クオータ"
 
-#: ../lib/modules/kolabUser.inc:253 ../lib/modules/kolabUser.inc:254
+#: ../lib/modules/kolabUser.inc:241 ../lib/modules/kolabUser.inc:242
 msgid "Mail quota must be a number!"
 msgstr "メール・クォータは数字でなくてはなりません!"
 
@@ -3565,40 +3697,40 @@ msgstr "メール・クォータは数字でなくてはなりません!"
 msgid "Mail routing"
 msgstr "メール転送"
 
-#: ../lib/modules/kolabUser.inc:86
+#: ../lib/modules/kolabUser.inc:85
 #: ../lib/modules/inetLocalMailRecipient.inc:73
-#: ../lib/modules/inetLocalMailRecipient.inc:79
-#: ../lib/modules/inetLocalMailRecipient.inc:108
-#: ../lib/modules/inetLocalMailRecipient.inc:117
-#: ../lib/modules/inetLocalMailRecipient.inc:152
-#: ../lib/modules/inetLocalMailRecipient.inc:322
+#: ../lib/modules/inetLocalMailRecipient.inc:78
+#: ../lib/modules/inetLocalMailRecipient.inc:105
+#: ../lib/modules/inetLocalMailRecipient.inc:114
+#: ../lib/modules/inetLocalMailRecipient.inc:145
+#: ../lib/modules/inetLocalMailRecipient.inc:306
 msgid "Mail server"
 msgstr "メールサーバ"
 
-#: ../templates/lists/changePassword.php:338
+#: ../templates/lists/changePassword.php:369
 #, php-format
 msgid "Mail successfully sent to %s."
 msgstr "%s へ正常にメールを送信しました。"
 
-#: ../lib/modules/asteriskVoicemail.inc:82
-#: ../lib/modules/asteriskVoicemail.inc:134
-#: ../lib/modules/asteriskVoicemail.inc:154
-#: ../lib/modules/asteriskVoicemail.inc:234
-#: ../lib/modules/asteriskVoicemail.inc:373
+#: ../lib/modules/asteriskVoicemail.inc:86
+#: ../lib/modules/asteriskVoicemail.inc:129
+#: ../lib/modules/asteriskVoicemail.inc:149
+#: ../lib/modules/asteriskVoicemail.inc:236
+#: ../lib/modules/asteriskVoicemail.inc:388
 msgid "Mailbox"
 msgstr "メールボックス"
 
-#: ../lib/modules/kolabUser.inc:163 ../lib/modules/kolabUser.inc:194
-#: ../lib/modules/kolabUser.inc:228 ../lib/modules/kolabUser.inc:294
-#: ../lib/modules/kolabUser.inc:300 ../lib/modules/kolabUser.inc:767
+#: ../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
 msgid "Mailbox home server"
 msgstr "メールボックス・ホーム・サーバ"
 
-#: ../lib/modules/kolabUser.inc:249
+#: ../lib/modules/kolabUser.inc:237
 msgid "Mailbox home server name is empty!"
 msgstr "メールボックス・ホーム・サーバ名が空です。"
 
-#: ../lib/modules/kolabUser.inc:247 ../lib/modules/kolabUser.inc:248
+#: ../lib/modules/kolabUser.inc:235 ../lib/modules/kolabUser.inc:236
 msgid "Mailbox home server name is invalid!"
 msgstr "メールボックス・ホーム・サーバ名が正しくありません!"
 
@@ -3610,11 +3742,11 @@ 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:716
+#: ../templates/pdfedit/pdfpage.php:360 ../templates/pdfedit/pdfpage.php:719
 msgid "Main"
 msgstr "メイン"
 
-#: ../templates/selfService/adminMain.php:433 ../help/help.inc:179
+#: ../templates/selfService/adminMain.php:431 ../help/help.inc:174
 msgid "Main page caption"
 msgstr "メインページの説明文"
 
@@ -3626,11 +3758,11 @@ msgstr "PDF構成の管理"
 msgid "Manage existing profiles"
 msgstr "サーバープロファイルの管理"
 
-#: ../templates/selfService/adminLogin.php:144
+#: ../templates/selfService/adminLogin.php:164
 msgid "Manage self service profiles"
 msgstr "セルフサービスプロファイルの操作"
 
-#: ../templates/config/conflogin.php:148
+#: ../templates/config/conflogin.php:171
 msgid "Manage server profiles"
 msgstr "サーバープロファイルの操作"
 
@@ -3640,10 +3772,10 @@ 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:321 ../lib/modules/inetOrgPerson.inc:221
-#: ../lib/modules/inetOrgPerson.inc:282 ../lib/modules/inetOrgPerson.inc:478
-#: ../lib/modules/inetOrgPerson.inc:511 ../lib/modules/inetOrgPerson.inc:1047
-#: ../lib/modules/inetOrgPerson.inc:1127
+#: ../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
 msgid "Manager"
 msgstr "管理者"
 
@@ -3678,21 +3810,21 @@ msgstr ""
 msgid "Mapping name"
 msgstr "マッピング名"
 
-#: ../lib/modules/kolabUser.inc:398 ../lib/modules/kolabUser.inc:575
+#: ../lib/modules/kolabUser.inc:388 ../lib/modules/kolabUser.inc:562
 msgid "Mark account for deletion"
 msgstr "アカウントを削除対象としてマークする"
 
-#: ../lib/modules/kolabUser.inc:175
+#: ../lib/modules/kolabUser.inc:163
 msgid "Mark for deletion"
 msgstr "削除対象としてマーク"
 
-#: ../templates/config/profmanage.php:349
-#: ../templates/selfService/profManage.php:261 ../help/help.inc:133
+#: ../templates/config/profmanage.php:377
+#: ../templates/selfService/profManage.php:280 ../help/help.inc:130
 msgid "Master password"
 msgstr "マスタパスワード"
 
-#: ../templates/config/profmanage.php:78
-#: ../templates/selfService/profManage.php:68
+#: ../templates/config/profmanage.php:98
+#: ../templates/selfService/profManage.php:87
 msgid "Master password is wrong!"
 msgstr "マスタパスワードが正しくありません!"
 
@@ -3708,22 +3840,22 @@ msgstr "照合規則のOID"
 msgid "Matching rules"
 msgstr "照合規則"
 
-#: ../lib/modules/posixGroup.inc:300 ../lib/modules/posixGroup.inc:471
-#: ../lib/modules/posixGroup.inc:472
+#: ../lib/modules/posixGroup.inc:314 ../lib/modules/posixGroup.inc:483
+#: ../lib/modules/posixGroup.inc:484
 msgid "Maximum GID number"
 msgstr "GID番号の最大値"
 
-#: ../lib/modules/posixGroup.inc:471
+#: ../lib/modules/posixGroup.inc:483
 msgid "Maximum GID number is invalid or empty!"
 msgstr "GID番号の最大値が不正または未入力です!"
 
-#: ../lib/modules/posixGroup.inc:472
+#: ../lib/modules/posixGroup.inc:484
 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:165 ../lib/modules/posixAccount.inc:174
+#: ../lib/modules/posixAccount.inc:162 ../lib/modules/posixAccount.inc:171
 msgid "Maximum UID number"
 msgstr "UID番号の最大値"
 
@@ -3737,7 +3869,7 @@ msgstr "UID番号の最大値は最小値よりも大きくなくてはなりま
 
 #: ../lib/types/ppolicyType.inc:84 ../lib/modules/ppolicy.inc:100
 #: ../lib/modules/ppolicy.inc:144 ../lib/modules/ppolicy.inc:164
-#: ../lib/modules/ppolicy.inc:274 ../lib/modules/ppolicy.inc:499
+#: ../lib/modules/ppolicy.inc:250 ../lib/modules/ppolicy.inc:461
 msgid "Maximum failure count"
 msgstr "最大試行回数"
 
@@ -3746,9 +3878,9 @@ msgstr "最大試行回数"
 msgid "Maximum file size: %s"
 msgstr "最大ファイルサイズ: %s"
 
-#: ../lib/modules/dhcp_settings.inc:128 ../lib/modules/dhcp_settings.inc:169
-#: ../lib/modules/dhcp_settings.inc:197 ../lib/modules/dhcp_settings.inc:250
-#: ../lib/modules/dhcp_settings.inc:563 ../lib/modules/dhcp_settings.inc:670
+#: ../lib/modules/dhcp_settings.inc:133 ../lib/modules/dhcp_settings.inc:174
+#: ../lib/modules/dhcp_settings.inc:188 ../lib/modules/dhcp_settings.inc:222
+#: ../lib/modules/dhcp_settings.inc:524 ../lib/modules/dhcp_settings.inc:612
 msgid "Maximum lease time"
 msgstr "最長リース期間"
 
@@ -3756,60 +3888,60 @@ msgstr "最長リース期間"
 msgid "Maximum length"
 msgstr "最大長"
 
-#: ../lib/lists.inc:806 ../help/help.inc:92
+#: ../lib/lists.inc:850 ../help/help.inc:89
 msgid "Maximum list entries"
 msgstr "リストエントリの最大数"
 
 #: ../lib/types/ppolicyType.inc:79 ../lib/modules/shadowAccount.inc:59
-#: ../lib/modules/shadowAccount.inc:65 ../lib/modules/shadowAccount.inc:119
-#: ../lib/modules/shadowAccount.inc:185 ../lib/modules/shadowAccount.inc:219
-#: ../lib/modules/shadowAccount.inc:321 ../lib/modules/ppolicy.inc:80
-#: ../lib/modules/ppolicy.inc:136 ../lib/modules/ppolicy.inc:159
-#: ../lib/modules/ppolicy.inc:160 ../lib/modules/ppolicy.inc:201
-#: ../lib/modules/ppolicy.inc:485 ../lib/modules/sambaDomain.inc:122
-#: ../lib/modules/sambaDomain.inc:190 ../lib/modules/sambaDomain.inc:213
-#: ../lib/modules/sambaDomain.inc:215 ../lib/modules/sambaDomain.inc:341
-#: ../lib/modules/sambaDomain.inc:693
+#: ../lib/modules/shadowAccount.inc:65 ../lib/modules/shadowAccount.inc:116
+#: ../lib/modules/shadowAccount.inc:180 ../lib/modules/shadowAccount.inc:218
+#: ../lib/modules/shadowAccount.inc:325 ../lib/modules/shadowAccount.inc:433
+#: ../lib/modules/ppolicy.inc:80 ../lib/modules/ppolicy.inc:136
+#: ../lib/modules/ppolicy.inc:159 ../lib/modules/ppolicy.inc:160
+#: ../lib/modules/ppolicy.inc:196 ../lib/modules/ppolicy.inc:447
+#: ../lib/modules/sambaDomain.inc:122 ../lib/modules/sambaDomain.inc:190
+#: ../lib/modules/sambaDomain.inc:213 ../lib/modules/sambaDomain.inc:215
+#: ../lib/modules/sambaDomain.inc:321 ../lib/modules/sambaDomain.inc:663
 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:254
-#: ../lib/modules/nisnetgroup.inc:575 ../lib/modules/groupOfNames.inc:72
+#: ../lib/modules/nisnetgroup.inc:127 ../lib/modules/nisnetgroup.inc:270
+#: ../lib/modules/nisnetgroup.inc:583 ../lib/modules/groupOfNames.inc:72
 #: ../lib/modules/groupOfNames.inc:76 ../lib/modules/groupOfNames.inc:103
-#: ../lib/modules/groupOfNames.inc:114 ../lib/modules/groupOfNames.inc:176
-#: ../lib/modules/groupOfNames.inc:454
+#: ../lib/modules/groupOfNames.inc:114 ../lib/modules/groupOfNames.inc:167
+#: ../lib/modules/groupOfNames.inc:435
 msgid "Members"
 msgstr "メンバー"
 
-#: ../lib/modules/sambaSamAccount.inc:539
+#: ../lib/modules/sambaSamAccount.inc:532
 msgid "Mid-Atlantic"
 msgstr "Mid-Atlantic"
 
-#: ../lib/modules/sambaSamAccount.inc:530
+#: ../lib/modules/sambaSamAccount.inc:523
 msgid "Midway Island, Samoa"
 msgstr "Midway Island, Samoa"
 
-#: ../lib/modules/inetOrgPerson.inc:251
+#: ../lib/modules/inetOrgPerson.inc:240
 msgid "Miller"
 msgstr "ミラー"
 
 #: ../lib/modules/sambaDomain.inc:94 ../lib/modules/sambaDomain.inc:183
-#: ../lib/modules/sambaDomain.inc:268 ../lib/modules/sambaDomain.inc:666
+#: ../lib/modules/sambaDomain.inc:269 ../lib/modules/sambaDomain.inc:636
 msgid "Minimal password length"
 msgstr "パスワード長さの最小値"
 
-#: ../lib/modules/posixGroup.inc:297 ../lib/modules/posixGroup.inc:470
+#: ../lib/modules/posixGroup.inc:311 ../lib/modules/posixGroup.inc:482
 msgid "Minimum GID number"
 msgstr "GID番号の最小値"
 
-#: ../lib/modules/posixGroup.inc:470
+#: ../lib/modules/posixGroup.inc:482
 msgid "Minimum GID number is invalid or empty!"
 msgstr "GID番号の最小値が不正または空です!"
 
 #: ../lib/modules/posixAccount.inc:59 ../lib/modules/posixAccount.inc:61
-#: ../lib/modules/posixAccount.inc:162 ../lib/modules/posixAccount.inc:171
+#: ../lib/modules/posixAccount.inc:159 ../lib/modules/posixAccount.inc:168
 msgid "Minimum UID number"
 msgstr "UID番号の最小値"
 
@@ -3817,80 +3949,81 @@ msgstr "UID番号の最小値"
 msgid "Minimum UID number is invalid!"
 msgstr "UID番号の最小値が不正です!"
 
-#: ../templates/config/mainmanage.php:229
+#: ../templates/config/mainmanage.php:249
 msgid "Minimum character classes"
 msgstr "要求文字クラス"
 
-#: ../templates/config/mainmanage.php:225
+#: ../templates/config/mainmanage.php:245
 msgid "Minimum lowercase characters"
 msgstr "小文字の要求文字数"
 
-#: ../templates/config/mainmanage.php:227
+#: ../templates/config/mainmanage.php:247
 msgid "Minimum numeric characters"
 msgstr "数字の要求文字数"
 
 #: ../lib/types/ppolicyType.inc:78 ../lib/modules/shadowAccount.inc:57
-#: ../lib/modules/shadowAccount.inc:114 ../lib/modules/shadowAccount.inc:181
-#: ../lib/modules/shadowAccount.inc:213 ../lib/modules/shadowAccount.inc:315
-#: ../lib/modules/ppolicy.inc:76 ../lib/modules/ppolicy.inc:135
-#: ../lib/modules/ppolicy.inc:158 ../lib/modules/ppolicy.inc:192
-#: ../lib/modules/ppolicy.inc:484 ../lib/modules/sambaDomain.inc:118
-#: ../lib/modules/sambaDomain.inc:189 ../lib/modules/sambaDomain.inc:214
-#: ../lib/modules/sambaDomain.inc:332 ../lib/modules/sambaDomain.inc:690
+#: ../lib/modules/shadowAccount.inc:111 ../lib/modules/shadowAccount.inc:176
+#: ../lib/modules/shadowAccount.inc:212 ../lib/modules/shadowAccount.inc:318
+#: ../lib/modules/shadowAccount.inc:432 ../lib/modules/ppolicy.inc:76
+#: ../lib/modules/ppolicy.inc:135 ../lib/modules/ppolicy.inc:158
+#: ../lib/modules/ppolicy.inc:190 ../lib/modules/ppolicy.inc:446
+#: ../lib/modules/sambaDomain.inc:118 ../lib/modules/sambaDomain.inc:189
+#: ../lib/modules/sambaDomain.inc:214 ../lib/modules/sambaDomain.inc:315
+#: ../lib/modules/sambaDomain.inc:660
 msgid "Minimum password age"
 msgstr "パスワード期限(age)の最小値"
 
-#: ../templates/config/mainmanage.php:224 ../lib/types/ppolicyType.inc:87
+#: ../templates/config/mainmanage.php:244 ../lib/types/ppolicyType.inc:87
 #: ../lib/modules/ppolicy.inc:112 ../lib/modules/ppolicy.inc:139
-#: ../lib/modules/ppolicy.inc:167 ../lib/modules/ppolicy.inc:247
-#: ../lib/modules/ppolicy.inc:502
+#: ../lib/modules/ppolicy.inc:167 ../lib/modules/ppolicy.inc:232
+#: ../lib/modules/ppolicy.inc:464
 msgid "Minimum password length"
 msgstr "パスワード長さの最小値"
 
-#: ../templates/config/mainmanage.php:228
+#: ../templates/config/mainmanage.php:248
 msgid "Minimum symbolic characters"
 msgstr "記号の要求文字数"
 
-#: ../templates/config/mainmanage.php:226
+#: ../templates/config/mainmanage.php:246
 msgid "Minimum uppercase characters"
 msgstr "大文字の要求文字数"
 
 #: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:117
-#: ../lib/modules/inetOrgPerson.inc:205 ../lib/modules/inetOrgPerson.inc:346
-#: ../lib/modules/inetOrgPerson.inc:454 ../lib/modules/inetOrgPerson.inc:535
-#: ../lib/modules/inetOrgPerson.inc:536 ../lib/modules/inetOrgPerson.inc:958
-#: ../lib/modules/inetOrgPerson.inc:1134
+#: ../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
 msgid "Mobile number"
 msgstr "携帯電話番号"
 
-#: ../lib/modules/inetOrgPerson.inc:1515
+#: ../lib/modules/inetOrgPerson.inc:1411
 msgid "Mobile telephone number"
 msgstr "携帯電話番号"
 
-#: ../templates/config/confmodules.php:161
-#: ../templates/config/confmain.php:194
-#: ../templates/config/moduleSettings.php:160
-#: ../templates/config/conftypes.php:179
+#: ../templates/config/confmodules.php:174
+#: ../templates/config/confmain.php:207
+#: ../templates/config/moduleSettings.php:173
+#: ../templates/config/conftypes.php:192
 msgid "Module settings"
 msgstr "モジュール設定"
 
-#: ../templates/config/confmodules.php:151
-#: ../templates/config/confmain.php:184
-#: ../templates/config/moduleSettings.php:150
-#: ../templates/config/conftypes.php:169
+#: ../templates/config/confmodules.php:170
+#: ../templates/config/confmain.php:203
+#: ../templates/config/moduleSettings.php:169
+#: ../templates/config/conftypes.php:188
 msgid "Modules"
 msgstr "モジュール"
 
-#: ../lib/modules/sambaSamAccount.inc:1319
+#: ../lib/modules/sambaSamAccount.inc:1280
 msgid "Monday"
 msgstr "月曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:534
+#: ../lib/modules/sambaSamAccount.inc:527
 msgid "Mountain Time (US & Canada)"
 msgstr "Mountain Time (US & Canada)"
 
-#: ../lib/modules/quota.inc:97 ../lib/modules/quota.inc:381
-#: ../lib/modules/quota.inc:474 ../lib/modules/quota.inc:590
+#: ../lib/modules/quota.inc:97 ../lib/modules/quota.inc:387
+#: ../lib/modules/quota.inc:487 ../lib/modules/quota.inc:611
 msgid "Mountpoint"
 msgstr "マウントポイント"
 
@@ -3898,23 +4031,24 @@ msgstr "マウントポイント"
 msgid "Mountpoint of device with enabled quotas."
 msgstr "quotaが有効になったデバイスのマウントポイント。"
 
-#: ../lib/modules/eduPerson.inc:96 ../lib/modules/eduPerson.inc:108
-#: ../lib/modules/eduPerson.inc:124 ../lib/modules/sudoRole.inc:89
-#: ../lib/modules/sudoRole.inc:94 ../lib/modules/sudoRole.inc:99
-#: ../lib/modules/sudoRole.inc:104 ../lib/modules/sudoRole.inc:109
-#: ../lib/modules/sudoRole.inc:114
+#: ../lib/modules/zarafaGroup.inc:68 ../lib/modules/eduPerson.inc:96
+#: ../lib/modules/eduPerson.inc:108 ../lib/modules/eduPerson.inc:124
+#: ../lib/modules/sudoRole.inc:89 ../lib/modules/sudoRole.inc:94
+#: ../lib/modules/sudoRole.inc:99 ../lib/modules/sudoRole.inc:104
+#: ../lib/modules/sudoRole.inc:109 ../lib/modules/sudoRole.inc:114
 msgid "Multiple values are separated by comma."
 msgstr "複数の値はカンマによって区切られます。"
 
-#: ../lib/modules/ipHost.inc:86 ../lib/modules/inetOrgPerson.inc:388
+#: ../lib/modules/ipHost.inc:86 ../lib/modules/device.inc:99
+#: ../lib/modules/inetOrgPerson.inc:377
 msgid "MyCity"
 msgstr "わたしの市"
 
-#: ../lib/modules/inetOrgPerson.inc:316
+#: ../lib/modules/inetOrgPerson.inc:305
 msgid "Mycity"
 msgstr "わたしの市"
 
-#: ../lib/modules/inetOrgPerson.inc:300
+#: ../lib/modules/inetOrgPerson.inc:289
 msgid "Mystreetname 42"
 msgstr "わたしの町42番地"
 
@@ -3945,16 +4079,19 @@ 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
-#: ../lib/types/ppolicyType.inc:77 ../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:183
-#: ../lib/modules/ppolicy.inc:483 ../lib/modules/groupOfNames.inc:141
+#: ../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/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
 msgid "Name"
 msgstr "名前"
 
-#: ../help/help.inc:155
+#: ../help/help.inc:151
 msgid ""
 "Name under which the profile will be saved. If a profile with the same name "
 "exists, it will be overwritten."
@@ -3962,20 +4099,20 @@ msgstr ""
 "プロファイルがセーブされる名前。もしも同じ名前のプロファイルがある場合は上書"
 "きされます。"
 
-#: ../lib/modules/dhcp_settings.inc:158 ../lib/modules/dhcp_settings.inc:175
-#: ../lib/modules/dhcp_settings.inc:608 ../lib/modules/dhcp_settings.inc:676
+#: ../lib/modules/dhcp_settings.inc:163 ../lib/modules/dhcp_settings.inc:180
+#: ../lib/modules/dhcp_settings.inc:550 ../lib/modules/dhcp_settings.inc:618
 msgid "Net mask"
 msgstr "ネットマスク"
 
-#: ../lib/modules/dhcp_settings.inc:137 ../lib/modules/dhcp_settings.inc:172
-#: ../lib/modules/dhcp_settings.inc:212 ../lib/modules/dhcp_settings.inc:268
-#: ../lib/modules/dhcp_settings.inc:581 ../lib/modules/dhcp_settings.inc:673
+#: ../lib/modules/dhcp_settings.inc:142 ../lib/modules/dhcp_settings.inc:177
+#: ../lib/modules/dhcp_settings.inc:191 ../lib/modules/dhcp_settings.inc:240
+#: ../lib/modules/dhcp_settings.inc:530 ../lib/modules/dhcp_settings.inc:615
 msgid "Netbios name servers"
 msgstr "NetBIOSネーム・サーバー"
 
-#: ../lib/modules/dhcp_settings.inc:140 ../lib/modules/dhcp_settings.inc:173
-#: ../lib/modules/dhcp_settings.inc:217 ../lib/modules/dhcp_settings.inc:274
-#: ../lib/modules/dhcp_settings.inc:595 ../lib/modules/dhcp_settings.inc:674
+#: ../lib/modules/dhcp_settings.inc:145 ../lib/modules/dhcp_settings.inc:178
+#: ../lib/modules/dhcp_settings.inc:193 ../lib/modules/dhcp_settings.inc:246
+#: ../lib/modules/dhcp_settings.inc:540 ../lib/modules/dhcp_settings.inc:616
 msgid "Netbios node type"
 msgstr "NetBIOSノードタイプ"
 
@@ -3983,11 +4120,11 @@ msgstr "NetBIOSノードタイプ"
 msgid "New DHCP"
 msgstr "新規DHCP"
 
-#: ../lib/modules/ipHost.inc:137
+#: ../lib/modules/ipHost.inc:139
 msgid "New IP address"
 msgstr "新しいIPアドレス"
 
-#: ../lib/modules/ieee802device.inc:109
+#: ../lib/modules/ieee802device.inc:114
 msgid "New MAC address"
 msgstr "新しいMACアドレス"
 
@@ -3999,11 +4136,11 @@ msgstr "新しいNISオブジェクト"
 msgid "New OU created successfully."
 msgstr "新しい OU が作成されました。"
 
-#: ../lib/modules/ldapPublicKey.inc:107
+#: ../lib/modules/ldapPublicKey.inc:108
 msgid "New SSH public key"
 msgstr "新しいSSH公開鍵"
 
-#: ../lib/modules/inetOrgPerson.inc:396
+#: ../lib/modules/inetOrgPerson.inc:385
 msgid "New York"
 msgstr "New York"
 
@@ -4011,7 +4148,7 @@ msgstr "New York"
 msgid "New alias"
 msgstr "新しい別名"
 
-#: ../templates/config/profmanage.php:137
+#: ../templates/config/profmanage.php:165
 msgid "New default profile set successfully."
 msgstr "新しいプロファイル既定値が正しく設定されました。"
 
@@ -4032,15 +4169,15 @@ msgstr "新しいフィールド"
 msgid "New group"
 msgstr "新しいグループ"
 
-#: ../lib/types/host.inc:123 ../lib/modules/hostObject.inc:150
+#: ../lib/types/host.inc:123 ../lib/modules/hostObject.inc:149
 msgid "New host"
 msgstr "新しいホスト"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:167
+#: ../lib/modules/inetLocalMailRecipient.inc:156
 msgid "New local address"
 msgstr "新しいローカルアドレス"
 
-#: ../templates/config/mainmanage.php:349
+#: ../templates/config/mainmanage.php:369
 msgid "New master password"
 msgstr "新しいマスタパスワード"
 
@@ -4053,19 +4190,19 @@ msgid "New object"
 msgstr "新しいオブジェクト"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:47
-#: ../templates/ou_edit.php:165 ../help/help.inc:200
+#: ../templates/ou_edit.php:165 ../help/help.inc:203
 msgid "New organizational unit"
 msgstr "新しい organizational unit"
 
-#: ../lib/modules/groupOfNames.inc:253
+#: ../lib/modules/groupOfNames.inc:240
 msgid "New owner"
 msgstr "新しい所有者"
 
-#: ../templates/config/confmain.php:517 ../lib/modules/posixAccount.inc:1708
+#: ../templates/config/confmain.php:541 ../lib/modules/posixAccount.inc:1695
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: ../templates/config/profmanage.php:127 ../lib/modules.inc:1092
+#: ../templates/config/profmanage.php:155
 msgid "New password set successfully."
 msgstr "新しいパスワードが正しく設定されました。"
 
@@ -4073,12 +4210,12 @@ msgstr "新しいパスワードが正しく設定されました。"
 msgid "New policy"
 msgstr "新しいポリシー"
 
-#: ../lib/modules/range.inc:87 ../lib/modules/range.inc:98
-#: ../lib/modules/range.inc:438 ../lib/modules/range.inc:439
+#: ../lib/modules/range.inc:94 ../lib/modules/range.inc:108
+#: ../lib/modules/range.inc:444
 msgid "New range"
 msgstr "新しい範囲"
 
-#: ../lib/modules/nisMailAlias.inc:154
+#: ../lib/modules/nisMailAlias.inc:158
 msgid "New recipient"
 msgstr "新しい受信者"
 
@@ -4109,8 +4246,8 @@ msgid "Next"
 msgstr "次"
 
 #: ../lib/modules/sambaDomain.inc:78 ../lib/modules/sambaDomain.inc:158
-#: ../lib/modules/sambaDomain.inc:179 ../lib/modules/sambaDomain.inc:372
-#: ../lib/modules/sambaDomain.inc:654
+#: ../lib/modules/sambaDomain.inc:179 ../lib/modules/sambaDomain.inc:344
+#: ../lib/modules/sambaDomain.inc:624
 msgid "Next RID"
 msgstr "次のRID"
 
@@ -4131,8 +4268,8 @@ msgid "Next RID to use when creating user accounts (only used by Winbind)."
 msgstr "ユーザアカウントを作成するときに使われる次のRID(Winbindのみが使用)。"
 
 #: ../lib/modules/sambaDomain.inc:86 ../lib/modules/sambaDomain.inc:170
-#: ../lib/modules/sambaDomain.inc:181 ../lib/modules/sambaDomain.inc:382
-#: ../lib/modules/sambaDomain.inc:660
+#: ../lib/modules/sambaDomain.inc:181 ../lib/modules/sambaDomain.inc:356
+#: ../lib/modules/sambaDomain.inc:630
 msgid "Next group RID"
 msgstr "次のグループRID"
 
@@ -4141,8 +4278,8 @@ msgid "Next group RID is not a number!"
 msgstr "次のグループRIDが番号ではありあせん!"
 
 #: ../lib/modules/sambaDomain.inc:82 ../lib/modules/sambaDomain.inc:164
-#: ../lib/modules/sambaDomain.inc:180 ../lib/modules/sambaDomain.inc:377
-#: ../lib/modules/sambaDomain.inc:657
+#: ../lib/modules/sambaDomain.inc:180 ../lib/modules/sambaDomain.inc:350
+#: ../lib/modules/sambaDomain.inc:627
 msgid "Next user RID"
 msgstr "次のユーザRID"
 
@@ -4150,9 +4287,9 @@ msgstr "次のユーザRID"
 msgid "Next user RID is not a number!"
 msgstr "次のユーザRIDが番号ではありません!"
 
-#: ../lib/modules/eduPerson.inc:86 ../lib/modules/eduPerson.inc:168
-#: ../lib/modules/eduPerson.inc:200 ../lib/modules/eduPerson.inc:313
-#: ../lib/modules/eduPerson.inc:684
+#: ../lib/modules/eduPerson.inc:86 ../lib/modules/eduPerson.inc:165
+#: ../lib/modules/eduPerson.inc:197 ../lib/modules/eduPerson.inc:297
+#: ../lib/modules/eduPerson.inc:659
 msgid "Nick names"
 msgstr "ニックネーム"
 
@@ -4169,16 +4306,16 @@ msgstr "DHCPが見つかりません!"
 msgid "No NIS objects found!"
 msgstr "NISオブジェクトが見つかりません!"
 
-#: ../lib/modules/sambaSamAccount.inc:617
-#: ../lib/modules/sambaSamAccount.inc:743
-#: ../lib/modules/sambaSamAccount.inc:1057
+#: ../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:471
+#: ../lib/modules/sambaGroupMapping.inc:458
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "Samba 3グループがLDAPに存在しません。最初に一個作成してください。"
 
-#: ../lib/modules/posixAccount.inc:442 ../lib/modules/posixAccount.inc:895
+#: ../lib/modules/posixAccount.inc:428 ../lib/modules/posixAccount.inc:909
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "unixグループがLDAPに存在しません。最初に一個作成してください。"
 
@@ -4206,7 +4343,7 @@ msgstr "拡張が見つかりません!"
 msgid "No file selected."
 msgstr "ファイルが選択されていません。"
 
-#: ../lib/modules/posixGroup.inc:468 ../lib/modules/posixAccount.inc:70
+#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixAccount.inc:70
 msgid "No free ID-Number!"
 msgstr "空いているID番号がありません!"
 
@@ -4223,16 +4360,16 @@ msgstr "ホストが見つかりません!"
 msgid "No internal attributes"
 msgstr "内部属性なし"
 
-#: ../templates/tests/lamdaemonTest.php:186
+#: ../templates/tests/lamdaemonTest.php:184
 msgid "No lamdaemon path set, please update your LAM configuration settings."
 msgstr "lamdaemonのパスがセットされていません。LAM構成設定を修正してください。"
 
 #: ../templates/tests/lamdaemonTest.php:105
-#: ../templates/tests/lamdaemonTest.php:182
+#: ../templates/tests/lamdaemonTest.php:180
 msgid "No lamdaemon server set, please update your LAM configuration settings."
 msgstr "lamdaemonサーバがセットされていません。LAM構成設定を修正してください。"
 
-#: ../templates/config/mainmanage.php:305
+#: ../templates/config/mainmanage.php:325
 msgid "No logging"
 msgstr "ロギング無し"
 
@@ -4244,7 +4381,7 @@ msgstr "ロゴがありません"
 msgid "No objects found!"
 msgstr "オブジェクトが見つかりません!"
 
-#: ../templates/config/confmodules.php:379
+#: ../templates/config/confmodules.php:383
 msgid "No or more than one base module selected!"
 msgstr "ベースモジュールが選択されていないか、または複数が選択されています!"
 
@@ -4268,7 +4405,7 @@ msgstr "実行するスクリプトがありません。"
 msgid "No section text specified"
 msgstr "セクションテキストが指定されていません!"
 
-#: ../templates/config/conflogin.php:105
+#: ../templates/config/conflogin.php:128
 msgid "No server profiles found. Please create one."
 msgstr "サーバープロファイルがありません。作成してください。"
 
@@ -4276,7 +4413,7 @@ msgstr "サーバープロファイルがありません。作成してくださ
 msgid "No static text specified"
 msgstr "静的テキストが指定されていません!"
 
-#: ../lib/modules/dhcp_settings.inc:300
+#: ../lib/modules/dhcp_settings.inc:272
 msgid "No subnet entered."
 msgstr "サブネットが未入力です。"
 
@@ -4284,7 +4421,7 @@ msgstr "サブネットが未入力です。"
 msgid "No such entry!"
 msgstr "そのようなエントリはありません!"
 
-#: ../templates/schema/schema.php:435
+#: ../templates/schema/schema.php:436
 #, php-format
 msgid "No such schema item: \"%s\""
 msgstr "そのようなスキーマアイテムはありません: \"%s\""
@@ -4297,7 +4434,7 @@ msgstr "sudoロールが見つかりません!"
 msgid "No users found!"
 msgstr "ユーザが見つかりません!"
 
-#: ../help/help.inc:67
+#: ../help/help.inc:64
 msgid "Note"
 msgstr "注"
 
@@ -4309,20 +4446,20 @@ msgstr ""
 "注意: この属性に対するあなたのLDAPサーバ上における比較ルールをセットしない場"
 "合、\"inappropriate matching\"エラーを受け取るでしょう。"
 
-#: ../templates/config/mainmanage.php:267
+#: ../templates/config/mainmanage.php:287
 msgid "Notice"
 msgstr "注"
 
-#: ../templates/delete.php:94
+#: ../templates/delete.php:95
 msgid "Number of child entries"
 msgstr "子エントリの数"
 
-#: ../lib/modules/shadowAccount.inc:178
+#: ../lib/modules/shadowAccount.inc:173
 msgid ""
 "Number of days a user can login even his password has expired. -1=always."
 msgstr "パスワードが期限切れになってもユーザがログインできる日数。-1は無期限。"
 
-#: ../lib/modules/shadowAccount.inc:182
+#: ../lib/modules/shadowAccount.inc:177
 msgid ""
 "Number of days a user has to wait until he is allowed to change his password "
 "again. If set value must be >0."
@@ -4330,7 +4467,7 @@ msgstr ""
 "パスワードの再変更が許可されるまでの日数。設定するならば0より大きな値にするこ"
 "と。"
 
-#: ../lib/modules/shadowAccount.inc:186
+#: ../lib/modules/shadowAccount.inc:181
 msgid ""
 "Number of days after a user has to change his password again. If set value "
 "must be >0."
@@ -4376,7 +4513,7 @@ msgstr "OU が正しくありません!"
 msgid "OU is not empty or invalid!"
 msgstr "OU が空白でないか不正!"
 
-#: ../help/help.inc:200 ../help/help.inc:202
+#: ../help/help.inc:203 ../help/help.inc:205
 msgid "OU-Editor"
 msgstr "OUエディタ"
 
@@ -4389,39 +4526,41 @@ msgstr "オブジェクトクラス"
 msgid "Obsolete"
 msgstr "Obsolete"
 
-#: ../lib/modules/sambaDomain.inc:292 ../lib/modules/sambaDomain.inc:303
-#: ../lib/modules/sambaDomain.inc:314 ../lib/modules/sambaDomain.inc:672
-#: ../lib/modules/sambaDomain.inc:677 ../lib/modules/sambaDomain.inc:682
+#: ../lib/modules/sambaDomain.inc:282 ../lib/modules/sambaDomain.inc:291
+#: ../lib/modules/sambaDomain.inc:300 ../lib/modules/sambaDomain.inc:642
+#: ../lib/modules/sambaDomain.inc:647 ../lib/modules/sambaDomain.inc:652
 msgid "Off"
 msgstr "Off"
 
-#: ../lib/modules/inetOrgPerson.inc:121 ../lib/modules/inetOrgPerson.inc:197
-#: ../lib/modules/inetOrgPerson.inc:410 ../lib/modules/inetOrgPerson.inc:442
-#: ../lib/modules/inetOrgPerson.inc:583 ../lib/modules/inetOrgPerson.inc:919
-#: ../lib/modules/inetOrgPerson.inc:1144 ../lib/modules/inetOrgPerson.inc:1595
+#: ../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
 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/config/profmanage.php:354
-#: ../templates/config/mainmanage.php:376
-#: ../templates/config/conflogin.php:135 ../templates/config/conflogin.php:136
-#: ../templates/config/mainlogin.php:135
-#: ../templates/selfService/selfServiceLogin.php:228
-#: ../templates/selfService/profManage.php:266
-#: ../templates/selfService/adminLogin.php:132
-#: ../templates/selfService/adminLogin.php:133
-#: ../templates/selfService/adminMain.php:542
-#: ../templates/selfService/adminMain.php:585
-#: ../templates/profedit/profiledelete.php:82
-#: ../lib/modules/sambaSamAccount.inc:1366
-#: ../lib/modules/sambaSamAccount.inc:1527 ../lib/modules/nisnetgroup.inc:454
-#: ../lib/modules/nisnetgroup.inc:470 ../lib/modules/aliasEntry.inc:141
-#: ../lib/modules/aliasEntry.inc:160 ../lib/modules/groupOfNames.inc:237
-#: ../lib/modules/groupOfNames.inc:258 ../lib/modules/groupOfNames.inc:346
-#: ../lib/lists.inc:613 ../lib/lists.inc:829 ../lib/modules.inc:1314
+#: ../templates/config/profmanage.php:382
+#: ../templates/config/mainmanage.php:396
+#: ../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
+#: ../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
 msgid "Ok"
 msgstr "Ok"
 
@@ -4429,16 +4568,16 @@ msgstr "Ok"
 msgid "Old value"
 msgstr "古い値"
 
-#: ../lib/modules/sambaDomain.inc:292 ../lib/modules/sambaDomain.inc:303
-#: ../lib/modules/sambaDomain.inc:314 ../lib/modules/sambaDomain.inc:673
-#: ../lib/modules/sambaDomain.inc:678 ../lib/modules/sambaDomain.inc:683
+#: ../lib/modules/sambaDomain.inc:282 ../lib/modules/sambaDomain.inc:291
+#: ../lib/modules/sambaDomain.inc:300 ../lib/modules/sambaDomain.inc:643
+#: ../lib/modules/sambaDomain.inc:648 ../lib/modules/sambaDomain.inc:653
 msgid "On"
 msgstr "On"
 
-#: ../lib/modules/sambaSamAccount.inc:223
-#: ../lib/modules/sambaSamAccount.inc:360
-#: ../lib/modules/sambaSamAccount.inc:1512
-#: ../lib/modules/sambaSamAccount.inc:1841
+#: ../lib/modules/sambaSamAccount.inc:220
+#: ../lib/modules/sambaSamAccount.inc:357
+#: ../lib/modules/sambaSamAccount.inc:1438
+#: ../lib/modules/sambaSamAccount.inc:1718
 msgid "On broken or timed out connection"
 msgstr "破棄された、またはタイムアウトした接続"
 
@@ -4446,7 +4585,7 @@ msgstr "破棄された、またはタイムアウトした接続"
 msgid "One (one level beneath base)"
 msgstr "One (ベース直下の1階層)"
 
-#: ../lib/modules/range.inc:97 ../lib/modules/fixed_ip.inc:96
+#: ../lib/modules/range.inc:107 ../lib/modules/fixed_ip.inc:105
 msgid "One or more errors occured. The invalid fields are marked."
 msgstr ""
 "1件以上のエラーが発生しました。不正なフィールドには目印が付いています。"
@@ -4460,31 +4599,34 @@ msgstr "任意属性"
 msgid "Optional binary attributes"
 msgstr "任意バイナリ属性"
 
-#: ../templates/lists/changePassword.php:139 ../lib/types/sudo.inc:83
-#: ../lib/modules/sudoRole.inc:83 ../lib/modules/sudoRole.inc:112
-#: ../lib/modules/sudoRole.inc:164 ../lib/modules/sudoRole.inc:178
-#: ../lib/modules/sudoRole.inc:202 ../lib/modules/sudoRole.inc:420
-#: ../lib/modules/sudoRole.inc:723 ../lib/modules/asteriskExtension.inc:106
-#: ../lib/modules/asteriskVoicemail.inc:102
-#: ../lib/modules/asteriskVoicemail.inc:113
-#: ../lib/modules/asteriskVoicemail.inc:138
-#: ../lib/modules/asteriskVoicemail.inc:186
-#: ../lib/modules/asteriskVoicemail.inc:257
-#: ../lib/modules/asteriskVoicemail.inc:379
+#: ../templates/lists/changePassword.php:171 ../lib/types/sudo.inc:83
+#: ../lib/modules/zarafaGroup.inc:179 ../lib/modules/posixAccount.inc:176
+#: ../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
+#: ../lib/modules/sudoRole.inc:399 ../lib/modules/sudoRole.inc:702
+#: ../lib/modules/asteriskExtension.inc:106
+#: ../lib/modules/asteriskVoicemail.inc:106
+#: ../lib/modules/asteriskVoicemail.inc:116
+#: ../lib/modules/asteriskVoicemail.inc:133
+#: ../lib/modules/asteriskVoicemail.inc:181
+#: ../lib/modules/asteriskVoicemail.inc:273
+#: ../lib/modules/asteriskVoicemail.inc:394
 msgid "Options"
 msgstr "オプション"
 
-#: ../lib/modules/asteriskVoicemail.inc:103
+#: ../lib/modules/asteriskVoicemail.inc:107
 msgid "Options for Asterisk voicemail account (e.g. sendvoicemail=yes)."
-msgstr "アスタリスク・ボイスメール・アカウントのオプション(例 sendvoicemail=yes)。"
+msgstr ""
+"アスタリスク・ボイスメール・アカウントのオプション(例 sendvoicemail=yes)。"
 
 #: ../templates/schema/schema.php:169
 msgid "Ordering"
 msgstr "並べ替え"
 
-#: ../lib/modules/eduPerson.inc:111 ../lib/modules/eduPerson.inc:180
-#: ../lib/modules/eduPerson.inc:201 ../lib/modules/eduPerson.inc:218
-#: ../lib/modules/eduPerson.inc:357 ../lib/modules/eduPerson.inc:695
+#: ../lib/modules/eduPerson.inc:111 ../lib/modules/eduPerson.inc:177
+#: ../lib/modules/eduPerson.inc:198 ../lib/modules/eduPerson.inc:215
+#: ../lib/modules/eduPerson.inc:339 ../lib/modules/eduPerson.inc:670
 msgid "Organization"
 msgstr "組織"
 
@@ -4493,16 +4635,16 @@ msgid "Organizational unit"
 msgstr "Organizational unit"
 
 #: ../lib/modules/eduPerson.inc:119 ../lib/modules/eduPerson.inc:123
-#: ../lib/modules/eduPerson.inc:192 ../lib/modules/eduPerson.inc:202
-#: ../lib/modules/eduPerson.inc:385 ../lib/modules/eduPerson.inc:701
+#: ../lib/modules/eduPerson.inc:189 ../lib/modules/eduPerson.inc:199
+#: ../lib/modules/eduPerson.inc:363 ../lib/modules/eduPerson.inc:676
 msgid "Organizational units"
 msgstr "Organizational units"
 
-#: ../lib/modules/eduPerson.inc:222
+#: ../lib/modules/eduPerson.inc:219
 msgid "Organizational units contains an invalid entry."
 msgstr "Organizational unitsに不正な値が含まれています。"
 
-#: ../templates/config/confmain.php:445
+#: ../templates/config/confmain.php:452
 msgid "Other"
 msgstr "その他"
 
@@ -4516,10 +4658,17 @@ msgstr "出力はHTMLを含みます。"
 msgid "Output of command \"%s\" with return code %s"
 msgstr "コマンド \"%s\" の出力とリターンコード %s"
 
-#: ../templates/config/confmain.php:437 ../lib/types/gon.inc:94
+#: ../lib/modules/zarafaUser.inc:73
+msgid "Override default quota settings."
+msgstr "デフォルトのquota設定を上書き。"
+
+#: ../templates/config/confmain.php:444 ../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/groupOfNames.inc:68 ../lib/modules/groupOfNames.inc:97
-#: ../lib/modules/groupOfNames.inc:113 ../lib/modules/groupOfNames.inc:152
-#: ../lib/modules/groupOfNames.inc:170 ../lib/modules/groupOfNames.inc:450
+#: ../lib/modules/groupOfNames.inc:113 ../lib/modules/groupOfNames.inc:147
+#: ../lib/modules/groupOfNames.inc:162 ../lib/modules/groupOfNames.inc:431
 msgid "Owner"
 msgstr "所有者"
 
@@ -4527,8 +4676,8 @@ msgstr "所有者"
 msgid "P-Node (0x02)"
 msgstr "P-Node (0x02)"
 
-#: ../lib/modules/fixed_ip.inc:81 ../lib/modules/fixed_ip.inc:326
-#: ../lib/modules/fixed_ip.inc:518
+#: ../lib/modules/fixed_ip.inc:87 ../lib/modules/fixed_ip.inc:330
+#: ../lib/modules/fixed_ip.inc:513
 msgid "PC name"
 msgstr "PCの名前"
 
@@ -4536,7 +4685,7 @@ msgstr "PCの名前"
 msgid "PDF editor"
 msgstr "PDFエディタ"
 
-#: ../lib/lists.inc:577
+#: ../lib/lists.inc:601
 msgid "PDF structure"
 msgstr "PDF構成"
 
@@ -4548,11 +4697,11 @@ msgstr "PDF構成名が正しくありません"
 msgid "PDF structure was successfully saved."
 msgstr "PDF構成を保存しました。"
 
-#: ../lib/modules/sambaSamAccount.inc:533
+#: ../lib/modules/sambaSamAccount.inc:526
 msgid "Pacific Time (US & Canada)"
 msgstr "Pacific Time (US & Canada)"
 
-#: ../lib/modules/dhcp_settings.inc:135
+#: ../lib/modules/dhcp_settings.inc:140
 msgid ""
 "Packets are sent to the default gateway if the receiver does not reside in "
 "the same network. The default gateway routes them to the target network."
@@ -4561,19 +4710,19 @@ msgstr ""
 "れます。デフォルトゲートウェイは、これらのパケットを宛先のネットワークに転送"
 "します。"
 
-#: ../templates/selfService/adminMain.php:446 ../help/help.inc:185
+#: ../templates/selfService/adminMain.php:444 ../help/help.inc:180
 msgid "Page header"
 msgstr "ページヘッダ"
 
-#: ../lib/modules/asteriskVoicemail.inc:98
-#: ../lib/modules/asteriskVoicemail.inc:137
-#: ../lib/modules/asteriskVoicemail.inc:180
-#: ../lib/modules/asteriskVoicemail.inc:253
-#: ../lib/modules/asteriskVoicemail.inc:377
+#: ../lib/modules/asteriskVoicemail.inc:102
+#: ../lib/modules/asteriskVoicemail.inc:132
+#: ../lib/modules/asteriskVoicemail.inc:175
+#: ../lib/modules/asteriskVoicemail.inc:267
+#: ../lib/modules/asteriskVoicemail.inc:392
 msgid "Pager"
 msgstr "ページャ"
 
-#: ../lib/modules/asteriskVoicemail.inc:99
+#: ../lib/modules/asteriskVoicemail.inc:103
 msgid "Pager number for Asterisk voicemail."
 msgstr "アスタリスク・ボイスメールのページャ番号"
 
@@ -4581,33 +4730,38 @@ msgstr "アスタリスク・ボイスメールのページャ番号"
 msgid "Parent to"
 msgstr "派生先"
 
-#: ../templates/lists/changePassword.php:194 ../templates/login.php:265
-#: ../templates/selfService/selfServiceLogin.php:214
-#: ../lib/modules/asteriskAccount.inc:91
-#: ../lib/modules/asteriskAccount.inc:156 ../lib/modules/posixGroup.inc:195
-#: ../lib/modules/posixGroup.inc:465 ../lib/modules/sambaSamAccount.inc:398
+#: ../templates/lists/changePassword.php:226 ../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:257
-#: ../lib/modules/posixAccount.inc:320 ../lib/modules/posixAccount.inc:382
-#: ../lib/modules/posixAccount.inc:1004 ../lib/modules/posixAccount.inc:1186
-#: ../lib/modules/asteriskVoicemail.inc:86
-#: ../lib/modules/asteriskVoicemail.inc:161 ../lib/modules.inc:1288
-#: ../help/help.inc:164
+#: ../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/asteriskVoicemail.inc:90
+#: ../lib/modules/asteriskVoicemail.inc:156 ../lib/modules.inc:1307
+#: ../help/help.inc:160
 msgid "Password"
 msgstr "パスワード"
 
-#: ../lib/modules/sambaSamAccount.inc:270
-#: ../lib/modules/sambaSamAccount.inc:1111
+#: ../lib/modules/sambaSamAccount.inc:267
+#: ../lib/modules/sambaSamAccount.inc:1080
 msgid "Password change at next login"
 msgstr "次回のログインでパスワードを変更"
 
+#: ../lib/modules/ppolicyUser.inc:52 ../lib/modules/ppolicyUser.inc:67
+#: ../lib/modules/ppolicyUser.inc:121
+msgid "Password change required"
+msgstr "パスワードの変更が必要です"
+
 #: ../lib/types/ppolicyType.inc:91 ../lib/modules/ppolicy.inc:128
-#: ../lib/modules/ppolicy.inc:148 ../lib/modules/ppolicy.inc:310
-#: ../lib/modules/ppolicy.inc:522
+#: ../lib/modules/ppolicy.inc:148 ../lib/modules/ppolicy.inc:274
+#: ../lib/modules/ppolicy.inc:484
 msgid "Password change requires old password"
 msgstr "パスワード変更には古いパスワードが必要です"
 
-#: ../lib/modules/posixGroup.inc:465 ../lib/modules/sambaSamAccount.inc:92
+#: ../lib/modules/posixGroup.inc:477 ../lib/modules/sambaSamAccount.inc:92
 #: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:77
 msgid ""
 "Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
@@ -4616,18 +4770,18 @@ msgstr ""
 "パスワードに不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, #*,.;:_-"
 "+!$%&/|?{[()]}=@$ です!"
 
+#: ../lib/modules/sambaSamAccount.inc:252
 #: ../lib/modules/sambaSamAccount.inc:255
-#: ../lib/modules/sambaSamAccount.inc:258
-#: ../lib/modules/sambaSamAccount.inc:420
-#: ../lib/modules/sambaSamAccount.inc:1094
-#: ../lib/modules/sambaSamAccount.inc:1560
+#: ../lib/modules/sambaSamAccount.inc:417
+#: ../lib/modules/sambaSamAccount.inc:1070
+#: ../lib/modules/sambaSamAccount.inc:1477
 msgid "Password does not expire"
 msgstr "無期限のパスワード"
 
-#: ../lib/modules/shadowAccount.inc:61 ../lib/modules/shadowAccount.inc:109
-#: ../lib/modules/shadowAccount.inc:168 ../lib/modules/shadowAccount.inc:177
-#: ../lib/modules/shadowAccount.inc:207 ../lib/modules/shadowAccount.inc:309
-#: ../lib/modules/shadowAccount.inc:418
+#: ../lib/modules/shadowAccount.inc:61 ../lib/modules/shadowAccount.inc:106
+#: ../lib/modules/shadowAccount.inc:163 ../lib/modules/shadowAccount.inc:172
+#: ../lib/modules/shadowAccount.inc:206 ../lib/modules/shadowAccount.inc:311
+#: ../lib/modules/shadowAccount.inc:430
 msgid "Password expiration"
 msgstr "パスワード有効期限"
 
@@ -4635,25 +4789,29 @@ msgstr "パスワード有効期限"
 msgid "Password expiration must be are natural number or -1."
 msgstr "パスワード有効期限は自然数または-1でなければなりません。"
 
-#: ../lib/modules/asteriskVoicemail.inc:87
+#: ../lib/modules/asteriskVoicemail.inc:91
 msgid "Password for voicemail mailbox."
 msgstr "ボイスメール・メールボックスのパスワード"
 
-#: ../lib/modules/posixGroup.inc:403 ../lib/modules/posixGroup.inc:426
-#: ../lib/modules/posixAccount.inc:145 ../lib/modules/posixAccount.inc:180
-#: ../lib/modules/posixAccount.inc:337 ../lib/modules/inetOrgPerson.inc:229
-#: ../lib/modules/inetOrgPerson.inc:595
+#: ../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
 msgid "Password hash type"
 msgstr "パスワードハッシュ形式"
 
 #: ../lib/types/ppolicyType.inc:80 ../lib/modules/ppolicy.inc:84
 #: ../lib/modules/ppolicy.inc:137 ../lib/modules/ppolicy.inc:161
-#: ../lib/modules/ppolicy.inc:228 ../lib/modules/ppolicy.inc:486
+#: ../lib/modules/ppolicy.inc:214 ../lib/modules/ppolicy.inc:448
 #: ../lib/modules/sambaDomain.inc:98 ../lib/modules/sambaDomain.inc:184
-#: ../lib/modules/sambaDomain.inc:279 ../lib/modules/sambaDomain.inc:669
+#: ../lib/modules/sambaDomain.inc:276 ../lib/modules/sambaDomain.inc:639
 msgid "Password history length"
 msgstr "パスワード履歴の長さ"
 
+#: ../templates/config/confmain.php:481
+msgid "Password mail settings"
+msgstr "パスワード・メール設定"
+
 #: ../lib/modules/shadowAccount.inc:59 ../lib/modules/shadowAccount.inc:60
 #: ../lib/modules/ppolicy.inc:159 ../lib/modules/sambaDomain.inc:215
 msgid "Password maximum age must be are natural number."
@@ -4681,24 +4839,25 @@ msgstr "パスワードポリシー"
 msgid "Password policies (ppolicy)"
 msgstr "パスワードポリシー"
 
-#: ../templates/config/mainmanage.php:219 ../lib/modules/ppolicyUser.inc:38
-#: ../lib/modules/ppolicyUser.inc:48 ../lib/modules/ppolicyUser.inc:55
-#: ../lib/modules/ppolicyUser.inc:63 ../lib/modules/ppolicyUser.inc:98
-#: ../lib/modules/ppolicyUser.inc:168 ../lib/modules/ppolicyUser.inc:196
-#: ../lib/modules/ppolicy.inc:54 ../help/help.inc:145
+#: ../templates/config/mainmanage.php:239 ../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
 msgid "Password policy"
 msgstr "パスワードポリシー"
 
 #: ../lib/types/ppolicyType.inc:81 ../lib/modules/ppolicy.inc:88
-#: ../lib/modules/ppolicy.inc:138 ../lib/modules/ppolicy.inc:237
-#: ../lib/modules/ppolicy.inc:496
+#: ../lib/modules/ppolicy.inc:138 ../lib/modules/ppolicy.inc:224
+#: ../lib/modules/ppolicy.inc:458
 msgid "Password quality check"
 msgstr "パスワード強度チェック"
 
-#: ../lib/modules/shadowAccount.inc:63 ../lib/modules/shadowAccount.inc:104
-#: ../lib/modules/shadowAccount.inc:166 ../lib/modules/shadowAccount.inc:173
-#: ../lib/modules/shadowAccount.inc:201 ../lib/modules/shadowAccount.inc:303
-#: ../lib/modules/shadowAccount.inc:417
+#: ../lib/modules/shadowAccount.inc:63 ../lib/modules/shadowAccount.inc:101
+#: ../lib/modules/shadowAccount.inc:161 ../lib/modules/shadowAccount.inc:168
+#: ../lib/modules/shadowAccount.inc:200 ../lib/modules/shadowAccount.inc:304
+#: ../lib/modules/shadowAccount.inc:429
 msgid "Password warning"
 msgstr "パスワード警告"
 
@@ -4706,7 +4865,7 @@ msgstr "パスワード警告"
 msgid "Password warning must be are natural number."
 msgstr "パスワード警告期限は自然数でなければなりません。"
 
-#: ../templates/config/confmain.php:613 ../lib/modules.inc:1350
+#: ../templates/config/confmain.php:640 ../lib/modules.inc:1351
 msgid "Passwords are different!"
 msgstr "パスワードが異なっています!"
 
@@ -4714,11 +4873,11 @@ msgstr "パスワードが異なっています!"
 msgid "Path"
 msgstr "パス"
 
-#: ../lib/modules/sambaSamAccount.inc:334
+#: ../lib/modules/sambaSamAccount.inc:331
 msgid "Path of the user profile."
 msgstr "ユーザープロファイルのパス。"
 
-#: ../lib/modules/sambaSamAccount.inc:285
+#: ../lib/modules/sambaSamAccount.inc:282
 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."
@@ -4726,11 +4885,11 @@ msgstr ""
 "ユーザプロファイルのパス。ローカル絶対パス、または、UNCパス(\\\\サーバ\\共"
 "有)。 $use と $group はユーザとグループ名に置き換えられます。"
 
-#: ../templates/config/confmain.php:405
+#: ../templates/config/confmain.php:412
 msgid "Path to external script"
 msgstr "外部スクリプトのパス"
 
-#: ../lib/modules/ddns.inc:92 ../lib/modules/ddns.inc:353
+#: ../lib/modules/ddns.inc:96 ../lib/modules/ddns.inc:345
 msgid "Path to key for DNS updates"
 msgstr "DNS更新キーのパス"
 
@@ -4743,13 +4902,12 @@ msgid "Personal"
 msgstr "Personal"
 
 #: ../lib/types/user.inc:102 ../lib/types/user.inc:219
-#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:1064
-#: ../lib/modules/inetOrgPerson.inc:1615 ../lib/modules/inetOrgPerson.inc:1618
-#: ../lib/modules/inetOrgPerson.inc:1632
+#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:1504
+#: ../lib/modules/inetOrgPerson.inc:1511
 msgid "Photo"
 msgstr "写真"
 
-#: ../lib/modules/inetOrgPerson.inc:1103
+#: ../lib/modules/inetOrgPerson.inc:1009
 msgid "Photo file (JPG format)"
 msgstr "写真ファイル(JPGフォーマット)"
 
@@ -4761,21 +4919,23 @@ msgstr "カンマで区切られたSSH公開鍵のリストを入力してくだ
 msgid ""
 "Please activate this option if your scripts may generate HTML output. "
 "Otherwise, the output is treated as plain text."
-msgstr "あなたのスクリプトがHTML出力を生成する場合は、このオプションを有効にしてください。それ以外の場合は、出力はプレーンテキストとして扱われます。"
+msgstr ""
+"あなたのスクリプトがHTML出力を生成する場合は、このオプションを有効にしてくだ"
+"さい。それ以外の場合は、出力はプレーンテキストとして扱われます。"
 
-#: ../lib/modules/asteriskExtension.inc:207
+#: ../lib/modules/asteriskExtension.inc:198
 msgid "Please add at least one member."
 msgstr "一つ以上のメンバーを追加してください。"
 
-#: ../lib/modules/sambaSamAccount.inc:1051
+#: ../lib/modules/sambaSamAccount.inc:1032
 msgid "Please check your settings on the Unix page!"
 msgstr "Unixページの設定を確認してください!"
 
-#: ../templates/delete.php:82
+#: ../templates/delete.php:83
 msgid "Please confirm:"
 msgstr "確認してください:"
 
-#: ../lib/modules/phpGroupwareUser.inc:137
+#: ../lib/modules/phpGroupwareUser.inc:134
 msgid "Please enter \"active\" or \"inactive\"."
 msgstr "\"active\"または\"inactive\"を入力してください!"
 
@@ -4783,7 +4943,7 @@ msgstr "\"active\"または\"inactive\"を入力してください!"
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "特殊アカウントのRID番号または名前を入力してください。"
 
-#: ../lib/modules/asteriskAccount.inc:168
+#: ../lib/modules/asteriskAccount.inc:166
 msgid "Please enter a caller ID."
 msgstr "発信者番号を入力してください。"
 
@@ -4791,7 +4951,7 @@ msgstr "発信者番号を入力してください。"
 msgid "Please enter a comma separated list of host names!"
 msgstr "カンマで区切られたホスト名を入力してください!"
 
-#: ../lib/modules/asteriskExtension.inc:200
+#: ../lib/modules/asteriskExtension.inc:191
 msgid "Please enter a common name."
 msgstr "名称を入力してください!"
 
@@ -4803,14 +4963,25 @@ msgstr "このエントリに対する記述名を入力できます。"
 msgid "Please enter a group name!"
 msgstr "グループ名を入力してください!"
 
-#: ../lib/modules/asteriskVoicemail.inc:205
+#: ../lib/modules/asteriskVoicemail.inc:200
 msgid "Please enter a mailbox."
 msgstr "メールボックスを入力してください。"
 
+#: ../lib/modules/device.inc:55
+msgid "Please enter a name for this device."
+msgstr "このデバイスの名前を入力してください。"
+
 #: ../lib/modules/ppolicy.inc:157
 msgid "Please enter a name for this policy."
 msgstr "このポリシーに対する名前を入力してください。"
 
+#: ../lib/modules/zarafaUser.inc:332 ../lib/modules/zarafaUser.inc:333
+#: ../lib/modules/zarafaUser.inc:334 ../lib/modules/zarafaUser.inc:335
+#: ../lib/modules/zarafaUser.inc:336 ../lib/modules/zarafaUser.inc:337
+#: ../lib/modules/zarafaUser.inc:339 ../lib/modules/zarafaUser.inc:340
+msgid "Please enter a number."
+msgstr "番号を入力してください。"
+
 #: ../lib/modules/ppolicy.inc:166
 msgid "Please enter a numeric value for the expire warning."
 msgstr "期限切れ警告の数値を入力してください。"
@@ -4839,7 +5010,7 @@ msgstr "最短パスワード長の数値を入力してください。"
 msgid "Please enter a numeric value for the password history length."
 msgstr "パスワード履歴長の数値を入力してください。"
 
-#: ../lib/modules/sudoRole.inc:237
+#: ../lib/modules/sudoRole.inc:221
 msgid "Please enter a role name."
 msgstr "ロール名を入力してください。"
 
@@ -4847,11 +5018,11 @@ msgstr "ロール名を入力してください。"
 msgid "Please enter a unique name for this password policy."
 msgstr "このパスワード・ポリシーに他と重複しない名前を入力してください。"
 
-#: ../lib/modules/kolabUser.inc:270 ../lib/modules/kolabUser.inc:274
+#: ../lib/modules/kolabUser.inc:258 ../lib/modules/kolabUser.inc:264
 msgid "Please enter a user password."
 msgstr "ユーザー・パスワードを入力してください。"
 
-#: ../lib/modules/eduPerson.inc:218 ../lib/modules/eduPerson.inc:220
+#: ../lib/modules/eduPerson.inc:215 ../lib/modules/eduPerson.inc:217
 msgid "Please enter a valid DN in the field:"
 msgstr "このフィールドに正しいDNを入力してください:"
 
@@ -4876,10 +5047,15 @@ msgstr "正しい表示名(display name)を入力してください!"
 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
 msgid "Please enter a valid email address!"
 msgstr "正しい電子メールアドレスを入力してください!"
 
+#: ../lib/modules/zarafaGroup.inc:139 ../lib/modules/zarafaGroup.inc:140
+msgid "Please enter a valid email alias."
+msgstr "有効な電子メールアドレスを入力してください。"
+
 #: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:67
 msgid "Please enter a valid employee type!"
 msgstr "正しい雇用形態を入力してください!"
@@ -4888,11 +5064,13 @@ msgstr "正しい雇用形態を入力してください!"
 msgid "Please enter a valid fax number!"
 msgstr "正しいファクス番号を入力してください!"
 
-#: ../lib/lists.inc:221
+#: ../lib/lists.inc:218
 msgid ""
 "Please enter a valid filter. Only letters, numbers and \" _*$.-\" are "
 "allowed."
-msgstr "有効なフィルターを入力してください。アルファベット、数字と\" _*$.-\" のみが使用できます。"
+msgstr ""
+"有効なフィルターを入力してください。アルファベット、数字と\" _*$.-\" のみが使"
+"用できます。"
 
 #: ../lib/modules/sambaSamAccount.inc:106
 msgid "Please enter a valid group name!"
@@ -4902,11 +5080,11 @@ msgstr "正しいグループ名を入力してください!"
 msgid "Please enter a valid job title!"
 msgstr "正しい役職を入力してください!"
 
-#: ../lib/modules/eduPerson.inc:226
+#: ../lib/modules/eduPerson.inc:223
 msgid "Please enter a valid list of affiliations."
 msgstr "正しい所属リストを入力してください。"
 
-#: ../lib/modules/hostObject.inc:107
+#: ../lib/modules/hostObject.inc:104
 msgid "Please enter a valid list of host names."
 msgstr "正しいホスト名リストを入力してください。"
 
@@ -4914,6 +5092,15 @@ msgstr "正しいホスト名リストを入力してください。"
 msgid "Please enter a valid mobile number!"
 msgstr "正しい携帯電話番号を入力してください!"
 
+#: ../lib/modules/zarafaServer.inc:124 ../lib/modules/zarafaServer.inc:125
+msgid "Please enter a valid path."
+msgstr "正しいパスを入力してください。"
+
+#: ../lib/modules/zarafaServer.inc:120 ../lib/modules/zarafaServer.inc:121
+#: ../lib/modules/zarafaServer.inc:122 ../lib/modules/zarafaServer.inc:123
+msgid "Please enter a valid port number."
+msgstr "有効なポート番号を入力してください。"
+
 #: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:61
 msgid "Please enter a valid postal address!"
 msgstr "正しい住所を入力してください!"
@@ -4922,11 +5109,11 @@ msgstr "正しい住所を入力してください!"
 msgid "Please enter a valid postal code!"
 msgstr "正しい郵便番号を入力してください!"
 
-#: ../lib/modules/eduPerson.inc:224
+#: ../lib/modules/eduPerson.inc:221
 msgid "Please enter a valid primary affiliation."
 msgstr "正しい主務所属を入力してください。"
 
-#: ../lib/modules/eduPerson.inc:225
+#: ../lib/modules/eduPerson.inc:222
 msgid "Please enter a valid scoped affiliation."
 msgstr "正しい兼務所属を入力してください。"
 
@@ -4939,71 +5126,75 @@ msgstr "正しい町名(street name)を入力してください!"
 msgid "Please enter a valid telephone number!"
 msgstr "正しい電話番号を入力してください!"
 
-#: ../lib/modules/posixGroup.inc:572 ../lib/modules/posixAccount.inc:742
+#: ../lib/modules/posixGroup.inc:584 ../lib/modules/posixAccount.inc:751
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "%s と %s の間の値を入力してください!"
 
-#: ../lib/modules/kolabUser.inc:278
+#: ../lib/modules/kolabUser.inc:270
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "このページに対するメールアドレスを入力してください。: %s"
 
-#: ../lib/modules/sudoRole.inc:243 ../lib/modules/sudoRole.inc:244
+#: ../lib/modules/sudoRole.inc:227 ../lib/modules/sudoRole.inc:228
 msgid "Please enter only ASCII characters for the commands."
 msgstr "コマンドにはASCII文字だけを入力してください。"
 
-#: ../lib/modules/sudoRole.inc:241 ../lib/modules/sudoRole.inc:242
+#: ../lib/modules/sudoRole.inc:225 ../lib/modules/sudoRole.inc:226
 msgid "Please enter only ASCII characters for the host names."
 msgstr "ホスト名にはASCII文字だけを入力してください。"
 
-#: ../lib/modules/sudoRole.inc:249 ../lib/modules/sudoRole.inc:250
+#: ../lib/modules/sudoRole.inc:233 ../lib/modules/sudoRole.inc:234
 msgid "Please enter only ASCII characters for the options."
 msgstr "オプションにはにはASCII文字だけを入力してください。"
 
-#: ../lib/modules/sudoRole.inc:247 ../lib/modules/sudoRole.inc:248
+#: ../lib/modules/sudoRole.inc:231 ../lib/modules/sudoRole.inc:232
 msgid "Please enter only ASCII characters for the run groups."
 msgstr "実行グループにはASCII文字だけを入力してください。"
 
-#: ../lib/modules/sudoRole.inc:245 ../lib/modules/sudoRole.inc:246
+#: ../lib/modules/sudoRole.inc:229 ../lib/modules/sudoRole.inc:230
 msgid "Please enter only ASCII characters for the run users."
 msgstr "実行ユーザーにはASCII文字だけを入力してください。"
 
-#: ../lib/modules/sudoRole.inc:239 ../lib/modules/sudoRole.inc:240
+#: ../lib/modules/device.inc:122 ../lib/modules/device.inc:123
+msgid "Please enter only ASCII characters for the serial number."
+msgstr "シリアル番号にはASCII文字だけを入力してください。"
+
+#: ../lib/modules/sudoRole.inc:223 ../lib/modules/sudoRole.inc:224
 msgid "Please enter only ASCII characters for the user names."
 msgstr "ユーザー名にはASCII文字だけを入力してください。"
 
-#: ../lib/modules/ddns.inc:97
+#: ../lib/modules/ddns.inc:101
 msgid "Please enter the IP address of your DNS server."
 msgstr "DNSサーバーのIPアドレスを入力してください。"
 
-#: ../help/help.inc:118
+#: ../help/help.inc:115
 msgid ""
 "Please enter the LDAP suffix where LAM should start to search for users. The "
 "LDAP filter needs to match the given user name to exactly one DN. The value "
 "\"%USER%\" will be replaced by the user name from the login page."
 msgstr ""
 "LAMがユーザー検索を開始するLDAPサフィックスを入力してください。LDAPフィルタは"
-"既存の一つのDNと正確に一致するユーザー名にマッチする必要があります。値 \"%"
-"USER\" はログインページのユーザー名に置き換えられます。"
+"既存の一つのDNと正確に一致するユーザー名にマッチする必要があります。値 "
+"\"%USER\" はログインページのユーザー名に置き換えられます。"
 
-#: ../lib/modules/asteriskVoicemail.inc:209
+#: ../lib/modules/asteriskVoicemail.inc:204
 msgid "Please enter the account context."
 msgstr "アカウント・コンテキストを入力してください。"
 
-#: ../lib/modules.inc:1201
+#: ../lib/modules.inc:1202
 msgid "Please enter the account information on the other pages first."
 msgstr "最初に、他のページでアカウント情報を入力してください。"
 
-#: ../lib/modules/asteriskExtension.inc:202
+#: ../lib/modules/asteriskExtension.inc:193
 msgid "Please enter the application data."
 msgstr "アプリケーション・データを入力してください。"
 
-#: ../lib/modules/asteriskExtension.inc:201
+#: ../lib/modules/asteriskExtension.inc:192
 msgid "Please enter the application."
 msgstr "アプリケーションを入力してください。"
 
-#: ../help/help.inc:56
+#: ../help/help.inc:53
 msgid ""
 "Please enter the configuration password. This is NOT your LDAP password. It "
 "is stored in your .conf-file. If this is the first time you log in, enter "
@@ -5013,16 +5204,16 @@ msgstr ""
 "ルに記録されます。もしもこれが最初のログインならば、\"lam\" と入力してくださ"
 "い。"
 
-#: ../lib/modules/asteriskAccount.inc:172
-#: ../lib/modules/asteriskExtension.inc:203
+#: ../lib/modules/asteriskAccount.inc:170
+#: ../lib/modules/asteriskExtension.inc:194
 msgid "Please enter the extension context."
 msgstr "拡張コンテキストを入力してください。"
 
-#: ../lib/modules/asteriskExtension.inc:204
+#: ../lib/modules/asteriskExtension.inc:195
 msgid "Please enter the extension name."
 msgstr "拡張名を入力してください。"
 
-#: ../lib/modules/asteriskAccount.inc:175
+#: ../lib/modules/asteriskAccount.inc:173
 msgid "Please enter the host name."
 msgstr "ホスト名を入力してください。"
 
@@ -5053,7 +5244,7 @@ msgstr ""
 msgid "Please enter the mapping name for this entry (e.g. auto.home)."
 msgstr "このエントリに対するマッピング名を入力してください(例 auto.home)。"
 
-#: ../help/help.inc:134
+#: ../help/help.inc:131
 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 "
@@ -5063,12 +5254,12 @@ msgstr ""
 "これはconfig.cfgファイルに保存されます。もしもこれが最初のログインならば、 "
 "\"lam\" と入力してください。"
 
-#: ../templates/config/mainlogin.php:115
+#: ../templates/config/mainlogin.php:135
 msgid "Please enter the master password to change the general preferences:"
 msgstr ""
 "総合プリファレンスを変更するためのマスターパスワードを入力してください:"
 
-#: ../help/help.inc:122
+#: ../help/help.inc:119
 msgid ""
 "Please enter the name of the new profile and the password to change its "
 "settings. Profile names may contain letters, numbers and -/_."
@@ -5076,7 +5267,7 @@ msgstr ""
 "その設定を変更するための新しいプロファイル名とパスワードを入力。プロファイル"
 "名にはアルファベット、数字と -/_ が使用できます。"
 
-#: ../help/help.inc:124
+#: ../help/help.inc:121
 msgid ""
 "Please enter the new name of the profile. The name may contain letters, "
 "numbers and -/_."
@@ -5084,11 +5275,11 @@ msgstr ""
 "新しいプロファイル名を入力。名前にはアルファベット、数字と -/_ が使用できま"
 "す。"
 
-#: ../lib/modules/asteriskAccount.inc:92 ../lib/modules/posixAccount.inc:383
+#: ../lib/modules/asteriskAccount.inc:96 ../lib/modules/posixAccount.inc:369
 msgid "Please enter the password which you want to set for this account."
 msgstr "このアカウントに対するパスワードを入力してください。"
 
-#: ../help/help.inc:165
+#: ../help/help.inc:161
 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 "
@@ -5097,11 +5288,19 @@ msgstr ""
 "このアカウントに対するパスワードを入力してください。ランダムなパスワード(12文"
 "字)を生成して画面に表示すること模できます。"
 
-#: ../lib/modules/posixAccount.inc:354
+#: ../lib/modules/posixAccount.inc:340
 msgid "Please enter the path to the user's home directory."
 msgstr "ユーザのホームディレクトリを入力してください。"
 
-#: ../lib/modules/asteriskExtension.inc:205
+#: ../lib/modules/zarafaServer.inc:62
+msgid "Please enter the port number for (unencrypted) HTTP connections."
+msgstr "(暗号化されない)HTTPコネクションのポート番号を入力してください。"
+
+#: ../lib/modules/zarafaServer.inc:66
+msgid "Please enter the port number for encrypted connections."
+msgstr "暗号化コネクションに対するポート番号を入力してください。"
+
+#: ../lib/modules/asteriskExtension.inc:196
 msgid "Please enter the priority."
 msgstr "優先度を入力してください。"
 
@@ -5113,16 +5312,16 @@ msgstr ""
 "このマウントポイントに対するクォータ設定を入力してください。書式は {soft "
 "block limit},{hard block limit},{soft inode limit},{hard inode limit} です。"
 
-#: ../templates/lists/changePassword.php:256
+#: ../templates/lists/changePassword.php:290
 #: ../lib/modules/posixAccount.inc:75
 msgid "Please enter the same password in both password fields."
 msgstr "両方のパスワードフィールドに同じパスワードを入力してください。"
 
-#: ../lib/modules/sambaSamAccount.inc:346
+#: ../lib/modules/sambaSamAccount.inc:343
 msgid "Please enter the time limit in minutes. 0 means unlimited."
 msgstr "制限時間を分単位で入力してください。0は無制限を意味します。"
 
-#: ../templates/selfService/adminLogin.php:107
+#: ../templates/selfService/adminLogin.php:127
 msgid ""
 "Please enter your master configuration password to change the self service "
 "profile:"
@@ -5130,7 +5329,7 @@ msgstr ""
 "セルフサービスプロファイルを変更するためのマスター構成パスワードを入力してく"
 "ださい:"
 
-#: ../templates/config/conflogin.php:100
+#: ../templates/config/conflogin.php:123
 msgid "Please enter your password to change the server preferences:"
 msgstr "サーバープリファレンスを変更するためのパスワードを入力してください:"
 
@@ -5138,11 +5337,11 @@ msgstr "サーバープリファレンスを変更するためのパスワード
 msgid "Please enter your public SSH key."
 msgstr "SSH公開鍵を入力してください。"
 
-#: ../lib/modules/range.inc:382 ../lib/modules/fixed_ip.inc:320
+#: ../lib/modules/range.inc:394 ../lib/modules/fixed_ip.inc:324
 msgid "Please fill out the DHCP settings first."
 msgstr "最初にDHCP設定を記入してください。"
 
-#: ../templates/masscreate.php:213
+#: ../templates/masscreate.php:211
 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 "
@@ -5152,18 +5351,18 @@ msgstr ""
 "子が記入されていなくてはなりません。後に続く行は、各々の行が一つのアカウント"
 "になります。"
 
-#: ../templates/massBuildAccounts.php:211
+#: ../templates/massBuildAccounts.php:209
 msgid "Please provide a file to upload."
 msgstr "アップロードするファイルを指定してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:556
+#: ../lib/modules/inetOrgPerson.inc:545
 msgid ""
 "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr ""
 "アップロードする画像ファイルを選択してください。画像はJPGフォーマット\n"
 "(.jpg/.jpeg)でなくてはなりません。"
 
-#: ../help/help.inc:140
+#: ../help/help.inc:137
 msgid ""
 "Please select your prefered log level. Messages with a lower level will not "
 "be logged."
@@ -5171,25 +5370,23 @@ msgstr ""
 "希望するログレベルを選択してください。下のレベルではメッセージは記録されませ"
 "ん。"
 
-#: ../templates/login.php:235
-msgid "Please select your user name and enter your password to log in."
-msgstr "ユーザ名を選択し、パスワードを入力してログインしてください。"
-
-#: ../lib/modules/asteriskVoicemail.inc:220
+#: ../lib/modules/asteriskVoicemail.inc:215
 msgid "Please set the voicemail password with \"Set password\" before saving."
-msgstr "\"パスワードを設定\"を選択したら、保存前にボイスメール・パスワードを入力してください。"
+msgstr ""
+"\"パスワードを設定\"を選択したら、保存前にボイスメール・パスワードを入力して"
+"ください。"
 
-#: ../lib/modules.inc:1156
+#: ../lib/modules.inc:1157
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "ページ %s の必須属性を全て設定してください。"
 
-#: ../templates/config/profmanage.php:154
-#: ../templates/selfService/profManage.php:125
+#: ../templates/config/profmanage.php:182
+#: ../templates/selfService/profManage.php:144
 msgid "Please set up your master configuration file (config/config.cfg) first!"
 msgstr "最初に、マスター設定ファイル(config/config.cfg)を設定してください!"
 
-#: ../lib/modules/dhcp_settings.inc:535 ../lib/modules/ddns.inc:331
+#: ../lib/modules/dhcp_settings.inc:503 ../lib/modules/ddns.inc:336
 msgid ""
 "Please set your LDAP suffix to an LDAP entry with object class \"dhcpServer"
 "\"."
@@ -5197,7 +5394,7 @@ msgstr ""
 "\"dhcpServer\"オブジェクトクラスのLDAPエントリに対するLDAPサフィックスを設定"
 "してください。"
 
-#: ../lib/modules/kolabUser.inc:242
+#: ../lib/modules/kolabUser.inc:230
 msgid "Policy list has invalid format!"
 msgstr "ポリシーリストの形式が不正です!"
 
@@ -5206,95 +5403,95 @@ msgstr "ポリシーリストの形式が不正です!"
 msgid "Position"
 msgstr "位置"
 
-#: ../templates/masscreate.php:261 ../templates/masscreate.php:405
+#: ../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:440
+#: ../lib/modules/sambaGroupMapping.inc:427
 msgid "Possible values"
 msgstr "候補となる値"
 
-#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:187
-#: ../lib/modules/inetOrgPerson.inc:322 ../lib/modules/inetOrgPerson.inc:427
-#: ../lib/modules/inetOrgPerson.inc:519 ../lib/modules/inetOrgPerson.inc:520
-#: ../lib/modules/inetOrgPerson.inc:874 ../lib/modules/inetOrgPerson.inc:1129
-#: ../lib/modules/inetOrgPerson.inc:1555
+#: ../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
 msgid "Post office box"
 msgstr "私書箱"
 
 #: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:118
-#: ../lib/modules/inetOrgPerson.inc:195 ../lib/modules/inetOrgPerson.inc:314
-#: ../lib/modules/inetOrgPerson.inc:439 ../lib/modules/inetOrgPerson.inc:527
-#: ../lib/modules/inetOrgPerson.inc:910 ../lib/modules/inetOrgPerson.inc:1131
-#: ../lib/modules/inetOrgPerson.inc:1539
+#: ../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
 msgid "Postal address"
 msgstr "住所"
 
-#: ../lib/modules/inetOrgPerson.inc:528
+#: ../lib/modules/inetOrgPerson.inc:517
 msgid "Postal address, city"
 msgstr "住所、区市町村"
 
 #: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:119
-#: ../lib/modules/inetOrgPerson.inc:189 ../lib/modules/inetOrgPerson.inc:306
-#: ../lib/modules/inetOrgPerson.inc:430 ../lib/modules/inetOrgPerson.inc:523
-#: ../lib/modules/inetOrgPerson.inc:524 ../lib/modules/inetOrgPerson.inc:883
-#: ../lib/modules/inetOrgPerson.inc:1130 ../lib/modules/inetOrgPerson.inc:1547
+#: ../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
 msgid "Postal code"
 msgstr "郵便番号"
 
-#: ../help/help.inc:86
+#: ../help/help.inc:83
 msgid "Predefined values"
 msgstr "あらかじめ定義された値"
 
-#: ../lib/modules/inetOrgPerson.inc:268
+#: ../lib/modules/inetOrgPerson.inc:257
 msgid "President"
 msgstr "社長"
 
-#: ../lib/modules/eduPerson.inc:78 ../lib/modules/eduPerson.inc:148
-#: ../lib/modules/eduPerson.inc:203 ../lib/modules/eduPerson.inc:253
-#: ../lib/modules/eduPerson.inc:674
+#: ../lib/modules/eduPerson.inc:78 ../lib/modules/eduPerson.inc:145
+#: ../lib/modules/eduPerson.inc:200 ../lib/modules/eduPerson.inc:245
+#: ../lib/modules/eduPerson.inc:649
 msgid "Primary affiliation"
 msgstr "主たる所属"
 
-#: ../lib/modules/posixGroup.inc:479 ../lib/modules/posixAccount.inc:222
-#: ../lib/modules/posixAccount.inc:296 ../lib/modules/posixAccount.inc:315
-#: ../lib/modules/posixAccount.inc:345 ../lib/modules/posixAccount.inc:374
-#: ../lib/modules/posixAccount.inc:412 ../lib/modules/posixAccount.inc:960
-#: ../lib/modules/posixAccount.inc:1090 ../lib/modules/posixAccount.inc:1130
-#: ../lib/modules/posixAccount.inc:1180
+#: ../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
 msgid "Primary group"
 msgstr "プライマリグループ"
 
-#: ../lib/modules/eduPerson.inc:115 ../lib/modules/eduPerson.inc:186
-#: ../lib/modules/eduPerson.inc:206 ../lib/modules/eduPerson.inc:220
-#: ../lib/modules/eduPerson.inc:367 ../lib/modules/eduPerson.inc:698
+#: ../lib/modules/eduPerson.inc:115 ../lib/modules/eduPerson.inc:183
+#: ../lib/modules/eduPerson.inc:203 ../lib/modules/eduPerson.inc:217
+#: ../lib/modules/eduPerson.inc:347 ../lib/modules/eduPerson.inc:673
 msgid "Primary organizational unit"
 msgstr "主たるorganizational unit"
 
-#: ../lib/modules/eduPerson.inc:99 ../lib/modules/eduPerson.inc:141
-#: ../lib/modules/eduPerson.inc:204 ../lib/modules/eduPerson.inc:243
-#: ../lib/modules/eduPerson.inc:680
+#: ../lib/modules/eduPerson.inc:99 ../lib/modules/eduPerson.inc:138
+#: ../lib/modules/eduPerson.inc:201 ../lib/modules/eduPerson.inc:239
+#: ../lib/modules/eduPerson.inc:655
 msgid "Principal name"
 msgstr "プリンシパル名"
 
-#: ../lib/modules/eduPerson.inc:216 ../lib/modules/eduPerson.inc:217
+#: ../lib/modules/eduPerson.inc:213 ../lib/modules/eduPerson.inc:214
 msgid "Principal name is invalid!"
 msgstr "プリンシパル名が正しくありません!"
 
 #: ../lib/types/asteriskExt.inc:93 ../lib/modules/asteriskExtension.inc:90
-#: ../lib/modules/asteriskExtension.inc:117
-#: ../lib/modules/asteriskExtension.inc:135
-#: ../lib/modules/asteriskExtension.inc:151
-#: ../lib/modules/asteriskExtension.inc:231
-#: ../lib/modules/asteriskExtension.inc:472
+#: ../lib/modules/asteriskExtension.inc:113
+#: ../lib/modules/asteriskExtension.inc:126
+#: ../lib/modules/asteriskExtension.inc:142
+#: ../lib/modules/asteriskExtension.inc:237
+#: ../lib/modules/asteriskExtension.inc:478
 msgid "Priority"
 msgstr "優先度"
 
-#: ../lib/modules/inetOrgPerson.inc:560
+#: ../lib/modules/inetOrgPerson.inc:549
 msgid "Private telephone number"
 msgstr "私用の電話番号"
 
-#: ../templates/config/profmanage.php:116
-#: ../templates/selfService/profManage.php:108
+#: ../templates/config/profmanage.php:144
+#: ../templates/selfService/profManage.php:127
 msgid "Profile deleted."
 msgstr "プロファイルが削除されました。"
 
@@ -5303,51 +5500,51 @@ msgid "Profile editor"
 msgstr "プロファイルエディタ"
 
 #: ../templates/config/profmanage.php:52
-#: ../templates/config/profmanage.php:167
+#: ../templates/config/profmanage.php:195
 #: ../templates/selfService/profManage.php:38
-#: ../templates/selfService/profManage.php:138 ../help/help.inc:121
-#: ../help/help.inc:123 ../help/help.inc:125 ../help/help.inc:127
-#: ../help/help.inc:129
+#: ../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
 msgid "Profile management"
 msgstr "プロファイル管理"
 
-#: ../templates/config/profmanage.php:182
-#: ../templates/config/profmanage.php:231
-#: ../templates/selfService/profManage.php:153
-#: ../templates/selfService/profManage.php:206
-#: ../templates/profedit/profilepage.php:245 ../help/help.inc:154
+#: ../templates/config/profmanage.php:210
+#: ../templates/config/profmanage.php:259
+#: ../templates/selfService/profManage.php:172
+#: ../templates/selfService/profManage.php:225
+#: ../templates/profedit/profilepage.php:168 ../help/help.inc:150
 msgid "Profile name"
 msgstr "プロファイル名"
 
-#: ../templates/config/profmanage.php:100
-#: ../templates/config/profmanage.php:111
-#: ../templates/selfService/profManage.php:84
-#: ../templates/selfService/profManage.php:99
+#: ../templates/config/profmanage.php:128
+#: ../templates/config/profmanage.php:139
+#: ../templates/selfService/profManage.php:103
+#: ../templates/selfService/profManage.php:118
 msgid "Profile name is invalid!"
 msgstr "プロファイル名が正しくありません!"
 
-#: ../templates/config/profmanage.php:195
-#: ../templates/config/profmanage.php:289
+#: ../templates/config/profmanage.php:223
+#: ../templates/config/profmanage.php:317
 msgid "Profile password"
 msgstr "プロファイルパスワード"
 
-#: ../templates/config/profmanage.php:98
-#: ../templates/config/profmanage.php:129
+#: ../templates/config/profmanage.php:126
+#: ../templates/config/profmanage.php:157
 msgid "Profile passwords are different or empty!"
 msgstr "プロファイルパスワードが異なるか、または未入力です!"
 
 #: ../lib/modules/sambaSamAccount.inc:84 ../lib/modules/sambaSamAccount.inc:85
-#: ../lib/modules/sambaSamAccount.inc:200
-#: ../lib/modules/sambaSamAccount.inc:212
-#: ../lib/modules/sambaSamAccount.inc:284
-#: ../lib/modules/sambaSamAccount.inc:333
-#: ../lib/modules/sambaSamAccount.inc:475
-#: ../lib/modules/sambaSamAccount.inc:580
-#: ../lib/modules/sambaSamAccount.inc:1173
-#: ../lib/modules/sambaSamAccount.inc:1446
-#: ../lib/modules/sambaSamAccount.inc:1596
-#: ../lib/modules/sambaSamAccount.inc:1775
-#: ../lib/modules/sambaSamAccount.inc:1797
+#: ../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
 msgid "Profile path"
 msgstr "プロファイルパス"
 
@@ -5359,26 +5556,60 @@ msgstr "プロファイルパスが正しくありません!"
 msgid "Profile was saved."
 msgstr "プロファイルがセーブされました。"
 
+#: ../lib/modules/zarafaServer.inc:73 ../lib/modules/zarafaServer.inc:99
+#: ../lib/modules/zarafaServer.inc:111 ../lib/modules/zarafaServer.inc:160
+#: ../lib/modules/zarafaServer.inc:325
+msgid "Public store"
+msgstr "パブリック・ストア"
+
 #: ../lib/modules/quota.inc:79 ../lib/modules/quota.inc:92
-#: ../lib/modules/quota.inc:145
+#: ../lib/modules/quota.inc:145 ../lib/modules/zarafaUser.inc:419
 msgid "Quota"
 msgstr "クオータ"
 
-#: ../lib/modules/quota.inc:655
+#: ../lib/modules/quota.inc:676
 #, php-format
 msgid "Quota for %s on %s"
 msgstr "%s の %s におけるQuota"
 
+#: ../lib/modules/zarafaUser.inc:84 ../lib/modules/zarafaUser.inc:140
+#: ../lib/modules/zarafaUser.inc:204 ../lib/modules/zarafaUser.inc:302
+#: ../lib/modules/zarafaUser.inc:336 ../lib/modules/zarafaUser.inc:450
+#: ../lib/modules/zarafaUser.inc:1035 ../lib/modules/zarafaUser.inc:1109
+msgid "Quota hard limit"
+msgstr "quotaハード・リミット"
+
 #: ../lib/modules/quota.inc:62
 msgid "Quota has wrong format!"
 msgstr "quotaの形式が正しくありません!"
 
+#: ../lib/modules/zarafaUser.inc:72 ../lib/modules/zarafaUser.inc:134
+#: ../lib/modules/zarafaUser.inc:178 ../lib/modules/zarafaUser.inc:293
+#: ../lib/modules/zarafaUser.inc:426 ../lib/modules/zarafaUser.inc:1017
+#: ../lib/modules/zarafaUser.inc:1100
+msgid "Quota override"
+msgstr "quotaの上書き"
+
+#: ../lib/modules/zarafaUser.inc:80 ../lib/modules/zarafaUser.inc:138
+#: ../lib/modules/zarafaUser.inc:196 ../lib/modules/zarafaUser.inc:299
+#: ../lib/modules/zarafaUser.inc:334 ../lib/modules/zarafaUser.inc:442
+#: ../lib/modules/zarafaUser.inc:1029 ../lib/modules/zarafaUser.inc:1106
+msgid "Quota soft limit"
+msgstr "quotaソフト・リミット"
+
+#: ../lib/modules/zarafaUser.inc:76 ../lib/modules/zarafaUser.inc:136
+#: ../lib/modules/zarafaUser.inc:188 ../lib/modules/zarafaUser.inc:296
+#: ../lib/modules/zarafaUser.inc:332 ../lib/modules/zarafaUser.inc:434
+#: ../lib/modules/zarafaUser.inc:1023 ../lib/modules/zarafaUser.inc:1103
+msgid "Quota warning limit"
+msgstr "quota警告リミット"
+
 #: ../templates/tree/templates/creation/custom.php:62
 msgid "RDN"
 msgstr "RDN"
 
-#: ../templates/masscreate.php:254 ../templates/profedit/profilepage.php:199
-#: ../lib/modules.inc:1568 ../help/help.inc:152
+#: ../templates/masscreate.php:253 ../templates/profedit/profilepage.php:242
+#: ../lib/modules.inc:1589 ../help/help.inc:148
 msgid "RDN identifier"
 msgstr "RDN識別子"
 
@@ -5387,29 +5618,33 @@ msgid "RID (Windows UID)"
 msgstr "RID (Windows UID)"
 
 #: ../lib/modules/sambaDomain.inc:90 ../lib/modules/sambaDomain.inc:151
-#: ../lib/modules/sambaDomain.inc:182 ../lib/modules/sambaDomain.inc:389
-#: ../lib/modules/sambaDomain.inc:395 ../lib/modules/sambaDomain.inc:663
+#: ../lib/modules/sambaDomain.inc:182 ../lib/modules/sambaDomain.inc:360
+#: ../lib/modules/sambaDomain.inc:365 ../lib/modules/sambaDomain.inc:633
 msgid "RID base"
 msgstr "RID base"
 
-#: ../lib/modules/range.inc:78 ../lib/modules/range.inc:407
+#: ../lib/modules/sambaDomain.inc:335
+msgid "RID settings"
+msgstr "RID設定"
+
+#: ../lib/modules/range.inc:85 ../lib/modules/range.inc:418
 msgid "Range from"
 msgstr "範囲の始点"
 
-#: ../lib/modules/range.inc:81 ../lib/modules/range.inc:421
+#: ../lib/modules/range.inc:88 ../lib/modules/range.inc:430
 msgid "Range to"
 msgstr "範囲の終点"
 
-#: ../lib/modules/range.inc:60 ../lib/modules/range.inc:92
-#: ../lib/modules/range.inc:474
+#: ../lib/types/dhcp.inc:95 ../lib/modules/range.inc:67
+#: ../lib/modules/range.inc:99 ../lib/modules/range.inc:482
 msgid "Ranges"
 msgstr "範囲"
 
-#: ../templates/config/confmain.php:434
+#: ../templates/config/confmain.php:441
 msgid "Read"
 msgstr "読み込み"
 
-#: ../templates/config/confmain.php:332 ../templates/config/confmain.php:335
+#: ../templates/config/confmain.php:339 ../templates/config/confmain.php:342
 msgid "Read only"
 msgstr "読み込み専用"
 
@@ -5421,7 +5656,7 @@ msgstr "このOUを新規作成しますか?"
 msgid "Really delete attribute?"
 msgstr "この属性を削除しますか?"
 
-#: ../lib/modules/nisMailAlias.inc:71 ../lib/modules/nisMailAlias.inc:147
+#: ../lib/modules/nisMailAlias.inc:71 ../lib/modules/nisMailAlias.inc:151
 msgid "Recipient"
 msgstr "受信者"
 
@@ -5431,14 +5666,14 @@ msgstr "受信者が正しくありません!"
 
 #: ../lib/types/mailAlias.inc:92 ../lib/modules/nisMailAlias.inc:75
 #: ../lib/modules/nisMailAlias.inc:89 ../lib/modules/nisMailAlias.inc:97
-#: ../lib/modules/nisMailAlias.inc:282
+#: ../lib/modules/nisMailAlias.inc:286
 msgid "Recipient list"
 msgstr "受信者リスト"
 
-#: ../lib/modules/sambaSamAccount.inc:224
-#: ../lib/modules/sambaSamAccount.inc:363
-#: ../lib/modules/sambaSamAccount.inc:1521
-#: ../lib/modules/sambaSamAccount.inc:1849
+#: ../lib/modules/sambaSamAccount.inc:221
+#: ../lib/modules/sambaSamAccount.inc:360
+#: ../lib/modules/sambaSamAccount.inc:1446
+#: ../lib/modules/sambaSamAccount.inc:1726
 msgid "Reconnect if disconnected"
 msgstr "切断された場合は再接続してください"
 
@@ -5446,21 +5681,22 @@ msgstr "切断された場合は再接続してください"
 msgid "Recursive delete progress"
 msgstr "再帰的な削除中"
 
-#: ../templates/config/mainmanage.php:362
+#: ../templates/config/mainmanage.php:382
 msgid "Reenter new master password"
 msgstr "新しいマスタパスワードを再入力"
 
-#: ../templates/config/confmain.php:525 ../lib/modules/posixAccount.inc:1710
+#: ../templates/config/confmain.php:549 ../lib/modules/posixAccount.inc:1697
 msgid "Reenter password"
 msgstr "パスワード再入力"
 
-#: ../templates/config/profmanage.php:204
-#: ../templates/config/profmanage.php:302
+#: ../templates/config/profmanage.php:232
+#: ../templates/config/profmanage.php:330
 msgid "Reenter profile password"
 msgstr "プロファイルパスワードを再入力"
 
 #: ../templates/tree/edit.php:98 ../lib/tree.inc:88 ../lib/tree.inc:89
-#: ../lib/modules/asteriskExtension.inc:303 ../lib/lists.inc:273
+#: ../lib/types/dhcp.inc:223 ../lib/modules/asteriskExtension.inc:301
+#: ../lib/lists.inc:689
 msgid "Refresh"
 msgstr "リフレッシュ"
 
@@ -5472,88 +5708,88 @@ msgstr "競合の場合に拒否"
 msgid "Relative distinguished name"
 msgstr "相対識別名"
 
-#: ../templates/config/confmodules.php:278
-#: ../templates/pdfedit/pdfpage.php:439 ../lib/modules/ipHost.inc:127
-#: ../lib/modules/ieee802device.inc:104
-#: ../lib/modules/sambaSamAccount.inc:1403 ../lib/modules/kolabUser.inc:338
-#: ../lib/modules/kolabUser.inc:357 ../lib/modules/kolabUser.inc:383
-#: ../lib/modules/kolabUser.inc:901 ../lib/modules/phpGroupwareUser.inc:260
-#: ../lib/modules/shadowAccount.inc:401 ../lib/modules/ldapPublicKey.inc:101
-#: ../lib/modules/sudoRole.inc:287 ../lib/modules/sudoRole.inc:314
-#: ../lib/modules/sudoRole.inc:341 ../lib/modules/sudoRole.inc:368
-#: ../lib/modules/sudoRole.inc:395 ../lib/modules/sudoRole.inc:422
-#: ../lib/modules/inetLocalMailRecipient.inc:162
-#: ../lib/modules/groupOfNames.inc:161 ../lib/modules/nisMailAlias.inc:149
-#: ../lib/modules/hostObject.inc:145
+#: ../templates/config/confmodules.php:282
+#: ../templates/pdfedit/pdfpage.php:439
+#: ../lib/modules/sambaSamAccount.inc:1371 ../lib/modules/kolabUser.inc:893
+#: ../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
 msgid "Remove"
 msgstr "削除"
 
-#: ../lib/modules/asteriskVoicemail.inc:266
+#: ../lib/modules/asteriskVoicemail.inc:282
 msgid "Remove Asterisk voicemail extension"
 msgstr "アスタリスク・ボイスメール拡張を削除"
 
-#: ../lib/modules/eduPerson.inc:402
+#: ../lib/modules/eduPerson.inc:379
 msgid "Remove EDU person extension"
 msgstr "EDU person拡張を削除"
 
-#: ../lib/modules/ipHost.inc:180
+#: ../lib/modules/ipHost.inc:176
 msgid "Remove IP address extension"
 msgstr "IPアドレス拡張を削除"
 
-#: ../lib/modules/sambaSamAccount.inc:1263
+#: ../lib/modules/sambaSamAccount.inc:1210
 msgid "Remove Samba 3 extension"
 msgstr "Samba 3拡張を削除"
 
-#: ../lib/modules/shadowAccount.inc:343
+#: ../lib/modules/shadowAccount.inc:359
 msgid "Remove Shadow account extension"
 msgstr "Shadowアカウント拡張を削除"
 
-#: ../lib/modules/hostObject.inc:160
+#: ../lib/modules/zarafaGroup.inc:206 ../lib/modules/zarafaUser.inc:526
+#: ../lib/modules/zarafaServer.inc:167
+msgid "Remove Zarafa extension"
+msgstr "Zarafa拡張を削除"
+
+#: ../lib/modules/hostObject.inc:156
 msgid "Remove host extension"
 msgstr "ホスト拡張を削除"
 
-#: ../lib/modules/posixGroup.inc:199 ../lib/modules/posixAccount.inc:1008
+#: ../lib/modules/posixGroup.inc:208 ../lib/modules/posixAccount.inc:1014
 msgid "Remove password"
 msgstr "パスワードを削除"
 
-#: ../lib/modules/phpGroupwareGroup.inc:101
-#: ../lib/modules/phpGroupwareUser.inc:191
+#: ../lib/modules/phpGroupwareGroup.inc:100
+#: ../lib/modules/phpGroupwareUser.inc:186
 msgid "Remove phpGroupWare extension"
 msgstr "phpGroupware拡張を削除"
 
-#: ../lib/modules/groupOfNames.inc:326
+#: ../lib/modules/groupOfNames.inc:314
 msgid "Remove selected entries"
 msgstr "選択したエントリを削除"
 
-#: ../templates/config/conftypes.php:238
+#: ../templates/config/conftypes.php:245
 msgid "Remove this account type"
 msgstr "このアカウントタイプを削除:"
 
-#: ../lib/modules/inetOrgPerson.inc:1623
+#: ../lib/modules/inetOrgPerson.inc:1501
 msgid "Remove/replace photo"
 msgstr "写真の削除/差し替え"
 
-#: ../templates/config/profmanage.php:227
-#: ../templates/selfService/profManage.php:202 ../help/help.inc:123
+#: ../templates/config/profmanage.php:255
+#: ../templates/selfService/profManage.php:221 ../help/help.inc:120
 msgid "Rename profile"
 msgstr "プロファイル名変更"
 
-#: ../templates/config/profmanage.php:107
-#: ../templates/selfService/profManage.php:95
+#: ../templates/config/profmanage.php:135
+#: ../templates/selfService/profManage.php:114
 msgid "Renamed profile."
 msgstr "プロファイル名が変更されました。"
 
-#: ../templates/lists/changePassword.php:202 ../lib/modules.inc:1311
+#: ../templates/lists/changePassword.php:234 ../lib/modules.inc:1311
 msgid "Repeat password"
 msgstr "パスワード再入力"
 
-#: ../lib/modules/posixAccount.inc:67 ../lib/modules/posixAccount.inc:765
+#: ../lib/modules/posixAccount.inc:67 ../lib/modules/posixAccount.inc:774
 msgid "Replaced $user or $group in homedir."
 msgstr "$user または $group をホームディレクトリに置き換えました。"
 
 #: ../lib/types/ppolicyType.inc:89 ../lib/modules/ppolicy.inc:120
-#: ../lib/modules/ppolicy.inc:146 ../lib/modules/ppolicy.inc:292
-#: ../lib/modules/ppolicy.inc:512
+#: ../lib/modules/ppolicy.inc:146 ../lib/modules/ppolicy.inc:262
+#: ../lib/modules/ppolicy.inc:474
 msgid "Require password change on first login"
 msgstr "最初のログインでパスワード変更が必要"
 
@@ -5567,23 +5803,22 @@ msgstr "オブジェクトクラス %s に対する必須属性"
 msgid "Required attributes"
 msgstr "必須属性"
 
-#: ../templates/profedit/profilepage.php:257
-#: ../lib/modules/sambaSamAccount.inc:1255
+#: ../lib/modules/sambaSamAccount.inc:1204
 msgid "Reset"
 msgstr "リセット"
 
-#: ../lib/modules.inc:1387
+#: ../lib/modules.inc:1388
 msgid "Reset changes"
 msgstr "変更をリセット"
 
-#: ../lib/modules/sambaSamAccount.inc:240
-#: ../lib/modules/sambaSamAccount.inc:1254
+#: ../lib/modules/sambaSamAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:1203
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
 #: ../lib/modules/sambaDomain.inc:130 ../lib/modules/sambaDomain.inc:192
-#: ../lib/modules/sambaDomain.inc:217 ../lib/modules/sambaDomain.inc:359
-#: ../lib/modules/sambaDomain.inc:699
+#: ../lib/modules/sambaDomain.inc:217 ../lib/modules/sambaDomain.inc:333
+#: ../lib/modules/sambaDomain.inc:669
 msgid "Reset time after lockout"
 msgstr "ロックアウト解除時間"
 
@@ -5591,34 +5826,42 @@ msgstr "ロックアウト解除時間"
 msgid "Reset time after lockout must be are natural number."
 msgstr "ロックアウト解除時間は自然数でなければなりません。"
 
-#: ../lib/modules/ddns.inc:102 ../lib/modules/ddns.inc:109
-#: ../lib/modules/ddns.inc:130 ../lib/modules/ddns.inc:384
-#: ../lib/modules/ddns.inc:413
+#: ../lib/modules/zarafaUser.inc:455
+msgid "Resource settings"
+msgstr "リソース設定"
+
+#: ../lib/modules/ddns.inc:106 ../lib/modules/ddns.inc:113
+#: ../lib/modules/ddns.inc:134 ../lib/modules/ddns.inc:374
+#: ../lib/modules/ddns.inc:401
 msgid "Reverse zone names"
 msgstr "逆引きゾーン名"
 
-#: ../templates/config/confmain.php:411 ../help/help.inc:113
+#: ../templates/config/confmain.php:418 ../help/help.inc:110
 msgid "Rights for the home directory"
 msgstr "ホームディレクトリに対する権限"
 
 #: ../lib/types/sudo.inc:77 ../lib/modules/sudoRole.inc:55
 #: ../lib/modules/sudoRole.inc:121 ../lib/modules/sudoRole.inc:171
-#: ../lib/modules/sudoRole.inc:264 ../lib/modules/sudoRole.inc:703
+#: ../lib/modules/sudoRole.inc:247 ../lib/modules/sudoRole.inc:682
 msgid "Role name"
 msgstr "ロール名"
 
-#: ../lib/modules/inetOrgPerson.inc:120 ../lib/modules/inetOrgPerson.inc:199
-#: ../lib/modules/inetOrgPerson.inc:370 ../lib/modules/inetOrgPerson.inc:445
-#: ../lib/modules/inetOrgPerson.inc:563 ../lib/modules/inetOrgPerson.inc:928
-#: ../lib/modules/inetOrgPerson.inc:1138 ../lib/modules/inetOrgPerson.inc:1563
+#: ../lib/modules/zarafaUser.inc:460 ../lib/modules/zarafaUser.inc:1039
+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
 msgid "Room number"
 msgstr "部屋番号"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:61
-#: ../lib/modules/inetLocalMailRecipient.inc:96
-#: ../lib/modules/inetLocalMailRecipient.inc:115
-#: ../lib/modules/inetLocalMailRecipient.inc:145
-#: ../lib/modules/inetLocalMailRecipient.inc:316
+#: ../lib/modules/inetLocalMailRecipient.inc:93
+#: ../lib/modules/inetLocalMailRecipient.inc:112
+#: ../lib/modules/inetLocalMailRecipient.inc:141
+#: ../lib/modules/inetLocalMailRecipient.inc:300
 msgid "Routing address"
 msgstr "転送アドレス"
 
@@ -5628,8 +5871,8 @@ msgstr "実行グループ"
 
 #: ../lib/modules/sudoRole.inc:79 ../lib/modules/sudoRole.inc:107
 #: ../lib/modules/sudoRole.inc:158 ../lib/modules/sudoRole.inc:177
-#: ../lib/modules/sudoRole.inc:198 ../lib/modules/sudoRole.inc:393
-#: ../lib/modules/sudoRole.inc:720
+#: ../lib/modules/sudoRole.inc:186 ../lib/modules/sudoRole.inc:372
+#: ../lib/modules/sudoRole.inc:699
 msgid "Run groups"
 msgstr "実行グループ"
 
@@ -5639,8 +5882,8 @@ msgstr "実行ユーザ"
 
 #: ../lib/modules/sudoRole.inc:75 ../lib/modules/sudoRole.inc:102
 #: ../lib/modules/sudoRole.inc:152 ../lib/modules/sudoRole.inc:176
-#: ../lib/modules/sudoRole.inc:194 ../lib/modules/sudoRole.inc:366
-#: ../lib/modules/sudoRole.inc:717
+#: ../lib/modules/sudoRole.inc:185 ../lib/modules/sudoRole.inc:345
+#: ../lib/modules/sudoRole.inc:696
 msgid "Run users"
 msgstr "実行ユーザ"
 
@@ -5648,26 +5891,32 @@ msgstr "実行ユーザ"
 msgid "SASL mechanisms"
 msgstr "SASLメカニズム"
 
-#: ../templates/tests/lamdaemonTest.php:226
+#: ../templates/tests/lamdaemonTest.php:224
 msgid "SSH connection"
 msgstr "SSH接続"
 
-#: ../templates/tests/lamdaemonTest.php:237
+#: ../templates/tests/lamdaemonTest.php:235
 msgid "SSH connection could be established."
 msgstr "SSHコネクションが確立できました。"
 
 #: ../lib/modules/ldapPublicKey.inc:52 ../lib/modules/ldapPublicKey.inc:62
 #: ../lib/modules/ldapPublicKey.inc:66 ../lib/modules/ldapPublicKey.inc:74
-#: ../lib/modules/ldapPublicKey.inc:99
+#: ../lib/modules/ldapPublicKey.inc:98
 msgid "SSH public key"
 msgstr "SSH公開鍵"
 
-#: ../lib/modules/ldapPublicKey.inc:81 ../lib/modules/ldapPublicKey.inc:172
+#: ../lib/modules/ldapPublicKey.inc:81 ../lib/modules/ldapPublicKey.inc:176
 msgid "SSH public key(s)"
 msgstr "SSH公開鍵"
 
+#: ../lib/modules/zarafaServer.inc:65 ../lib/modules/zarafaServer.inc:87
+#: ../lib/modules/zarafaServer.inc:109 ../lib/modules/zarafaServer.inc:122
+#: ../lib/modules/zarafaServer.inc:148 ../lib/modules/zarafaServer.inc:315
+msgid "SSL port"
+msgstr "SSLポート"
+
 #: ../lib/modules/sambaSamAccount.inc:124
-#: ../lib/modules/sambaGroupMapping.inc:300
+#: ../lib/modules/sambaGroupMapping.inc:290
 msgid "Samba 3"
 msgstr "Samba 3"
 
@@ -5679,19 +5928,19 @@ msgstr "Samba 3 ドメインのSIDが不正です!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 ドメインエントリ"
 
-#: ../lib/modules/sambaSamAccount.inc:305
-#: ../lib/modules/sambaSamAccount.inc:309
-#: ../lib/modules/sambaSamAccount.inc:450
-#: ../lib/modules/sambaSamAccount.inc:516
+#: ../lib/modules/sambaSamAccount.inc:302
+#: ../lib/modules/sambaSamAccount.inc:306
+#: ../lib/modules/sambaSamAccount.inc:447
+#: ../lib/modules/sambaSamAccount.inc:513
 msgid "Samba RID"
 msgstr "Samba RID"
 
-#: ../lib/modules/sambaGroupMapping.inc:338
-#: ../lib/modules/sambaGroupMapping.inc:363
+#: ../lib/modules/sambaGroupMapping.inc:328
+#: ../lib/modules/sambaGroupMapping.inc:353
 msgid "Samba RID number"
 msgstr "Samba RID番号"
 
-#: ../lib/modules/sambaGroupMapping.inc:332
+#: ../lib/modules/sambaGroupMapping.inc:322
 msgid "Samba display name"
 msgstr "Samba表示名"
 
@@ -5699,7 +5948,7 @@ msgstr "Samba表示名"
 msgid "Samba domain"
 msgstr "Samba ドメイン"
 
-#: ../lib/modules/sambaGroupMapping.inc:324
+#: ../lib/modules/sambaGroupMapping.inc:314
 msgid "Samba domain name"
 msgstr "Sambaドメイン名"
 
@@ -5707,41 +5956,41 @@ msgstr "Sambaドメイン名"
 msgid "Samba domains"
 msgstr "Samba ドメイン"
 
-#: ../lib/modules/sambaGroupMapping.inc:312
-#: ../lib/modules/sambaGroupMapping.inc:344
-#: ../lib/modules/sambaGroupMapping.inc:371
-#: ../lib/modules/sambaGroupMapping.inc:389
+#: ../lib/modules/sambaGroupMapping.inc:302
+#: ../lib/modules/sambaGroupMapping.inc:334
+#: ../lib/modules/sambaGroupMapping.inc:361
+#: ../lib/modules/sambaGroupMapping.inc:379
 msgid "Samba group type"
 msgstr "Sambaグループタイプ"
 
-#: ../lib/modules/sambaSamAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:234
 msgid "Samba password"
 msgstr "Sambaパスワード"
 
 #: ../lib/modules/sambaSamAccount.inc:90
-#: ../lib/modules/sambaSamAccount.inc:206
+#: ../lib/modules/sambaSamAccount.inc:203
+#: ../lib/modules/sambaSamAccount.inc:287
 #: ../lib/modules/sambaSamAccount.inc:290
-#: ../lib/modules/sambaSamAccount.inc:293
-#: ../lib/modules/sambaSamAccount.inc:491
-#: ../lib/modules/sambaSamAccount.inc:587
-#: ../lib/modules/sambaSamAccount.inc:1189
-#: ../lib/modules/sambaSamAccount.inc:1612
-#: ../lib/modules/sambaSamAccount.inc:1778
+#: ../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
 msgid "Samba workstations"
 msgstr "Samba ワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:1320
+#: ../lib/modules/sambaSamAccount.inc:1281
 msgid "Saturday"
 msgstr "土曜日"
 
-#: ../templates/tree/edit.php:512 ../templates/config/confmodules.php:174
-#: ../templates/config/confmain.php:207
-#: ../templates/config/moduleSettings.php:173
-#: ../templates/config/conftypes.php:192
-#: ../templates/selfService/selfServiceMain.php:119
-#: ../templates/selfService/adminMain.php:296
-#: ../templates/pdfedit/pdfpage.php:669 ../templates/pdfedit/pdfpage.php:686
-#: ../templates/profedit/profilepage.php:255 ../lib/modules.inc:1384
+#: ../templates/tree/edit.php:512 ../templates/config/confmodules.php:142
+#: ../templates/config/confmain.php:175
+#: ../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
 msgid "Save"
 msgstr "保存"
 
@@ -5761,43 +6010,43 @@ msgstr "スキーマ・サフィックス"
 msgid "Schema test"
 msgstr "スキーマテスト"
 
-#: ../lib/modules/eduPerson.inc:82 ../lib/modules/eduPerson.inc:155
-#: ../lib/modules/eduPerson.inc:207 ../lib/modules/eduPerson.inc:266
-#: ../lib/modules/eduPerson.inc:677
+#: ../lib/modules/eduPerson.inc:82 ../lib/modules/eduPerson.inc:152
+#: ../lib/modules/eduPerson.inc:204 ../lib/modules/eduPerson.inc:254
+#: ../lib/modules/eduPerson.inc:652
 msgid "Scoped affiliation"
 msgstr "限定した属性"
 
-#: ../help/help.inc:96
+#: ../help/help.inc:93
 msgid "Script path"
 msgstr "スクリプトパス"
 
-#: ../templates/config/confmain.php:589
+#: ../templates/config/confmain.php:616
 msgid "Script path is invalid!"
 msgstr "スクリプトパスが正しくありません!"
 
-#: ../templates/config/confmain.php:608
+#: ../templates/config/confmain.php:635
 msgid "Script rights are invalid!"
 msgstr "スクリプトの権限が無効です!"
 
-#: ../templates/config/confmain.php:592
+#: ../templates/config/confmain.php:619
 msgid "Script server is invalid!"
 msgstr "スクリプトサーバが無効です!"
 
-#: ../help/help.inc:109
+#: ../help/help.inc:106
 msgid "Script servers"
 msgstr "スクリプトサーバ"
 
-#: ../templates/tree/export_form.php:115 ../lib/export.inc:443
-#: ../lib/export.inc:513
+#: ../templates/tree/export_form.php:115 ../lib/export.inc:445
+#: ../lib/export.inc:515
 msgid "Search filter"
 msgstr "検索フィルタ"
 
-#: ../templates/tree/export_form.php:103 ../lib/export.inc:442
-#: ../lib/export.inc:512
+#: ../templates/tree/export_form.php:103 ../lib/export.inc:444
+#: ../lib/export.inc:514
 msgid "Search scope"
 msgstr "検索スコープ"
 
-#: ../lib/modules/asteriskExtension.inc:298
+#: ../lib/modules/asteriskExtension.inc:304
 msgid "Search tree suffix for users"
 msgstr "ユーザーの検索ツリーサフィックス"
 
@@ -5805,7 +6054,13 @@ msgstr "ユーザーの検索ツリーサフィックス"
 msgid "Section"
 msgstr "セクション"
 
-#: ../templates/config/mainmanage.php:172 ../templates/config/confmain.php:461
+#: ../lib/modules/zarafaGroup.inc:71 ../lib/modules/zarafaGroup.inc:99
+#: ../lib/modules/zarafaGroup.inc:128 ../lib/modules/zarafaGroup.inc:185
+#: ../lib/modules/zarafaGroup.inc:423
+msgid "Security group"
+msgstr "セキュリティ・グループ"
+
+#: ../templates/config/mainmanage.php:192 ../templates/config/confmain.php:488
 msgid "Security settings"
 msgstr "セキュリティ設定"
 
@@ -5813,7 +6068,7 @@ msgstr "セキュリティ設定"
 msgid "See also"
 msgstr "参照"
 
-#: ../lib/account.inc:635
+#: ../lib/account.inc:636
 msgid "See the manual for instructions to solve this problem."
 msgstr "この問題を解決する手順は、マニュアルを参照してください。"
 
@@ -5821,57 +6076,64 @@ msgstr "この問題を解決する手順は、マニュアルを参照してく
 msgid "Select a template for the creation process"
 msgstr "生成処理に対するテンプレートを選んでください"
 
-#: ../lib/lists.inc:387
+#: ../lib/lists.inc:399
 msgid "Select all"
 msgstr "すべてを選択"
 
-#: ../lib/modules/nisnetgroup.inc:224 ../lib/modules/nisnetgroup.inc:246
+#: ../lib/modules/nisnetgroup.inc:224 ../lib/modules/nisnetgroup.inc:253
 msgid "Select host"
 msgstr "ホストを選択"
 
-#: ../lib/modules/nisnetgroup.inc:226 ../lib/modules/nisnetgroup.inc:248
+#: ../lib/modules/zarafaUser.inc:397 ../lib/modules/zarafaUser.inc:410
+#: ../lib/modules/nisnetgroup.inc:230 ../lib/modules/nisnetgroup.inc:259
 msgid "Select user"
 msgstr "ユーザを選択"
 
-#: ../lib/modules/posixAccount.inc:1052 ../lib/modules/nisnetgroup.inc:358
+#: ../lib/modules/posixAccount.inc:1057 ../lib/modules/nisnetgroup.inc:373
 msgid "Selected groups"
 msgstr "選択されたグループ"
 
-#: ../templates/masscreate.php:149 ../templates/config/confmodules.php:254
+#: ../templates/masscreate.php:149 ../templates/config/confmodules.php:258
 msgid "Selected modules"
 msgstr "選択されたモジュール"
 
-#: ../lib/modules/posixGroup.inc:243 ../lib/modules/asteriskExtension.inc:309
+#: ../lib/modules/posixGroup.inc:250 ../lib/modules/asteriskExtension.inc:308
 msgid "Selected users"
 msgstr "選択されたユーザ"
 
-#: ../templates/selfService/adminMain.php:253
+#: ../templates/selfService/adminMain.php:244
 msgid "Self service configuration"
 msgstr "セルフサービスの構成"
 
-#: ../templates/selfService/adminMain.php:275
+#: ../templates/selfService/adminMain.php:284
 msgid "Self service configuration editor"
 msgstr "セルフサービス構成エディタ"
 
-#: ../templates/selfService/adminMain.php:322
+#: ../templates/selfService/adminMain.php:320
 msgid "Self service login"
 msgstr "セルフサービス・ログイン"
 
-#: ../templates/lists/changePassword.php:179
 #: ../templates/lists/changePassword.php:211
+#: ../templates/lists/changePassword.php:243
 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
+msgid "Serial number"
+msgstr "シリアル番号"
+
 #: ../templates/tests/lamdaemonTest.php:72
 msgid "Server"
 msgstr "サーバー"
 
-#: ../templates/config/confmain.php:229
-#: ../templates/selfService/adminMain.php:332 ../help/help.inc:57
+#: ../templates/config/confmain.php:236
+#: ../templates/selfService/adminMain.php:330 ../help/help.inc:54
 msgid "Server address"
 msgstr "サーバーアドレス"
 
-#: ../templates/config/confmain.php:559
+#: ../templates/config/confmain.php:581
 #: ../templates/selfService/adminMain.php:95
 msgid "Server address is invalid!"
 msgstr "サーバーアドレスが正しくありません!"
@@ -5880,48 +6142,48 @@ msgstr "サーバーアドレスが正しくありません!"
 msgid "Server information"
 msgstr "サーバー情報"
 
-#: ../templates/config/confmain.php:398
+#: ../templates/config/confmain.php:405
 msgid "Server list"
 msgstr "サーバー覧"
 
-#: ../templates/login.php:334
+#: ../templates/login.php:372
 msgid "Server profile"
 msgstr "サーバー プロファイル"
 
-#: ../templates/config/confmain.php:226
-#: ../templates/selfService/adminMain.php:329
+#: ../templates/config/confmain.php:233
+#: ../templates/selfService/adminMain.php:327
 msgid "Server settings"
 msgstr "サーバー設定"
 
-#: ../templates/config/mainmanage.php:178 ../help/help.inc:137
+#: ../templates/config/mainmanage.php:198 ../help/help.inc:134
 msgid "Session timeout"
 msgstr "セッション有効期限"
 
-#: ../lib/modules/aliasEntry.inc:102
+#: ../lib/modules/device.inc:184 ../lib/modules/aliasEntry.inc:102
 msgid "Set"
 msgstr "設定"
 
-#: ../lib/modules.inc:1278 ../lib/modules.inc:1391
+#: ../lib/modules.inc:1276 ../lib/modules.inc:1392
 msgid "Set password"
 msgstr "パスワードを設定"
 
-#: ../lib/modules/posixAccount.inc:188 ../lib/modules/posixAccount.inc:325
+#: ../lib/modules/posixAccount.inc:179 ../lib/modules/posixAccount.inc:311
 msgid "Set primary group as memberUid"
 msgstr "プライマリーグループをmemberUidとしてセット"
 
-#: ../templates/config/profmanage.php:285 ../help/help.inc:127
+#: ../templates/config/profmanage.php:313 ../help/help.inc:124
 msgid "Set profile password"
 msgstr "プロファイルパスワード設定"
 
-#: ../lib/modules.inc:1320
+#: ../lib/modules.inc:1321
 msgid "Set random password"
 msgstr "ランダムなパスワードを設定"
 
-#: ../templates/lists/changePassword.php:189
+#: ../templates/lists/changePassword.php:221
 msgid "Set specific password"
 msgstr "任意のパスワードを設定"
 
-#: ../lib/modules/posixGroup.inc:396
+#: ../lib/modules/posixGroup.inc:410
 msgid "Sets the group password."
 msgstr "グループパスワードを設定"
 
@@ -5929,22 +6191,28 @@ msgstr "グループパスワードを設定"
 msgid "Shadow"
 msgstr "Shadow"
 
-#: ../lib/modules/sambaSamAccount.inc:222
-#: ../lib/modules/sambaSamAccount.inc:357
-#: ../lib/modules/sambaSamAccount.inc:1503
-#: ../lib/modules/sambaSamAccount.inc:1833
+#: ../lib/modules/sambaSamAccount.inc:219
+#: ../lib/modules/sambaSamAccount.inc:354
+#: ../lib/modules/sambaSamAccount.inc:1430
+#: ../lib/modules/sambaSamAccount.inc:1710
 msgid "Shadowing"
 msgstr "Shadowing"
 
-#: ../lib/modules/ddns.inc:84
+#: ../lib/modules/zarafaUser.inc:96 ../lib/modules/zarafaUser.inc:144
+#: ../lib/modules/zarafaUser.inc:239 ../lib/modules/zarafaUser.inc:308
+#: ../lib/modules/zarafaUser.inc:502 ../lib/modules/zarafaUser.inc:1068
+msgid "Shared store only"
+msgstr "共有ストアのみ"
+
+#: ../lib/modules/ddns.inc:88
 msgid "Should DDNS (Dynamic DNS) be activated?"
 msgstr "DDNS(Dynamic DNS)を有効にしますか?"
 
-#: ../lib/modules/ddns.inc:87
+#: ../lib/modules/ddns.inc:91
 msgid "Should fix IP addresses be added to the DNS server?"
 msgstr "固定IPアドレスをDNSサーバーに追加しますか?"
 
-#: ../templates/massBuildAccounts.php:202
+#: ../templates/massBuildAccounts.php:201
 msgid "Show LDIF file"
 msgstr "LDIFファイルを表示"
 
@@ -5952,7 +6220,7 @@ msgstr "LDIFファイルを表示"
 msgid "Show internal attributes"
 msgstr "内部属性を表示する"
 
-#: ../lib/modules/asteriskExtension.inc:293
+#: ../lib/modules/asteriskExtension.inc:300
 msgid "Show only Asterisk accounts"
 msgstr "アスタリスク・アカウントだけを表示"
 
@@ -5964,12 +6232,12 @@ msgstr "通常のグループメンバーとしてプライマリグループの
 msgid "Single valued"
 msgstr "単一の値"
 
-#: ../lib/modules/quota.inc:591
+#: ../lib/modules/quota.inc:612
 msgid "Soft block"
 msgstr "ソフトブロック"
 
-#: ../lib/modules/quota.inc:105 ../lib/modules/quota.inc:383
-#: ../lib/modules/quota.inc:475
+#: ../lib/modules/quota.inc:105 ../lib/modules/quota.inc:389
+#: ../lib/modules/quota.inc:488
 msgid "Soft block limit"
 msgstr "ソフトブロック制限"
 
@@ -5977,7 +6245,7 @@ msgstr "ソフトブロック制限"
 msgid "Soft block limit."
 msgstr "ソフトブロック制限"
 
-#: ../lib/modules/quota.inc:593
+#: ../lib/modules/quota.inc:614
 msgid "Soft inode"
 msgstr "ソフトinode"
 
@@ -5985,8 +6253,8 @@ msgstr "ソフトinode"
 msgid "Soft inode (files) limit."
 msgstr "ソフトinode(ファイル)制限。"
 
-#: ../lib/modules/quota.inc:127 ../lib/modules/quota.inc:387
-#: ../lib/modules/quota.inc:477
+#: ../lib/modules/quota.inc:127 ../lib/modules/quota.inc:393
+#: ../lib/modules/quota.inc:490
 msgid "Soft inode limit"
 msgstr "ソフトinode制限"
 
@@ -5995,7 +6263,7 @@ msgstr "ソフトinode制限"
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "いくつかの属性(%s)は変更され、ハイライト表示されています。"
 
-#: ../lib/modules.inc:1155
+#: ../lib/modules.inc:1156
 msgid "Some required information is missing"
 msgstr "必須項目が満たされていません。"
 
@@ -6013,15 +6281,29 @@ msgstr ""
 msgid "Sorry this help number ({bold}%d{endbold}) is not available."
 msgstr "このヘルプ番号({bold}%d{endbold})は無効です。"
 
-#: ../lib/modules/sambaSamAccount.inc:302
-#: ../lib/modules/sambaSamAccount.inc:1227
+#: ../lib/modules/sambaSamAccount.inc:299
+#: ../lib/modules/sambaSamAccount.inc:1181
 msgid "Special user"
 msgstr "特殊ユーザ"
 
+#: ../lib/modules/zarafaGroup.inc:72
+msgid "Specifies if this group has security possibilities."
+msgstr "このグループがセキュリティ上の可能性を持つか否かを記入します。"
+
+#: ../lib/modules/zarafaServer.inc:74
+msgid ""
+"Specifies if this server contains the public store. This may be changed only "
+"for new entries."
+msgstr "サーバーが公開ストアを含んでいるか否かを記入します。これは新しいエントリに対してのみ反映されます。"
+
 #: ../lib/modules/ppolicy.inc:125
 msgid "Specifies if users are allowed to change their own passwords or not."
 msgstr "ユーザー自身によるパスワード変更を許可するか否かを指定します。"
 
+#: ../lib/modules/zarafaUser.inc:105
+msgid "Specifies the capacity of this resource."
+msgstr "このリソースの容量を記述する。"
+
 #: ../lib/modules/ppolicy.inc:109
 msgid ""
 "Specifies the maximum number of seconds before a password is due to expire "
@@ -6089,6 +6371,10 @@ msgid ""
 "categories such as student, faculty, staff, alum, etc."
 msgstr "学生、教員、職員、同窓生など、教育施設に対する個人の関係の大分類。"
 
+#: ../lib/modules/zarafaUser.inc:93
+msgid "Specifies whether the user is an admin."
+msgstr "ユーザーが管理者であるか否かを記入します。"
+
 #: ../lib/modules/ppolicy.inc:129
 msgid ""
 "Specifies whether the user's existing password must be sent along with their "
@@ -6099,11 +6385,11 @@ msgstr ""
 "る必要があるかを設定します。LAMは古いパスワードを必要とするパスワード変更をサ"
 "ポートしていません。"
 
-#: ../lib/modules/inetOrgPerson.inc:121 ../lib/modules/inetOrgPerson.inc:139
-#: ../lib/modules/inetOrgPerson.inc:193 ../lib/modules/inetOrgPerson.inc:394
-#: ../lib/modules/inetOrgPerson.inc:436 ../lib/modules/inetOrgPerson.inc:575
-#: ../lib/modules/inetOrgPerson.inc:901 ../lib/modules/inetOrgPerson.inc:1143
-#: ../lib/modules/inetOrgPerson.inc:1579
+#: ../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
 msgid "State"
 msgstr "都道府県"
 
@@ -6119,29 +6405,29 @@ msgstr "Step 1 of 2: 名前とオブジェクトクラス"
 msgid "Step 2 of 2: Specify attributes and values"
 msgstr "Step 2 of 2: 属性と値の記入"
 
-#: ../lib/modules/inetOrgPerson.inc:245
+#: ../lib/modules/inetOrgPerson.inc:234
 msgid "Steve"
 msgstr "スティーブ"
 
-#: ../lib/modules/sambaSamAccount.inc:394 ../lib/modules/posixAccount.inc:212
-#: ../lib/modules/inetOrgPerson.inc:1193
-#: ../lib/modules/asteriskVoicemail.inc:170
+#: ../lib/modules/sambaSamAccount.inc:391 ../lib/modules/posixAccount.inc:198
+#: ../lib/modules/inetOrgPerson.inc:1095
+#: ../lib/modules/asteriskVoicemail.inc:165
 msgid "Steve Miller"
 msgstr "スティーブ ミラー"
 
-#: ../lib/modules/posixAccount.inc:273
+#: ../lib/modules/posixAccount.inc:259
 msgid "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 msgstr "スティーブ ミラー, 2-14号室, 123-123-1234,123-123-1234"
 
-#: ../lib/modules/eduPerson.inc:170
+#: ../lib/modules/eduPerson.inc:167
 msgid "Steve, Stevo"
 msgstr "Steve, Stevo"
 
 #: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:118
-#: ../lib/modules/inetOrgPerson.inc:185 ../lib/modules/inetOrgPerson.inc:298
-#: ../lib/modules/inetOrgPerson.inc:424 ../lib/modules/inetOrgPerson.inc:515
-#: ../lib/modules/inetOrgPerson.inc:516 ../lib/modules/inetOrgPerson.inc:865
-#: ../lib/modules/inetOrgPerson.inc:1128 ../lib/modules/inetOrgPerson.inc:1531
+#: ../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
 msgid "Street"
 msgstr "町名"
 
@@ -6155,20 +6441,25 @@ 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:197 ../lib/modules/nisnetgroup.inc:356
-#: ../lib/modules/nisnetgroup.inc:572
+#: ../lib/modules/nisnetgroup.inc:193 ../lib/modules/nisnetgroup.inc:372
+#: ../lib/modules/nisnetgroup.inc:580
 msgid "Subgroups"
 msgstr "サブグループ"
 
-#: ../lib/modules/dhcp_settings.inc:122 ../lib/modules/dhcp_settings.inc:166
-#: ../lib/modules/dhcp_settings.inc:182 ../lib/modules/dhcp_settings.inc:230
-#: ../lib/modules/dhcp_settings.inc:543 ../lib/modules/dhcp_settings.inc:667
+#: ../templates/config/confmain.php:475 ../help/help.inc:194
+msgid "Subject"
+msgstr "件名"
+
+#: ../lib/types/dhcp.inc:94 ../lib/modules/dhcp_settings.inc:127
+#: ../lib/modules/dhcp_settings.inc:171 ../lib/modules/dhcp_settings.inc:185
+#: ../lib/modules/dhcp_settings.inc:202 ../lib/modules/dhcp_settings.inc:514
+#: ../lib/modules/dhcp_settings.inc:609
 msgid "Subnet"
 msgstr "サブネット"
 
-#: ../lib/modules/dhcp_settings.inc:155 ../lib/modules/dhcp_settings.inc:174
-#: ../lib/modules/dhcp_settings.inc:222 ../lib/modules/dhcp_settings.inc:282
-#: ../lib/modules/dhcp_settings.inc:602 ../lib/modules/dhcp_settings.inc:675
+#: ../lib/modules/dhcp_settings.inc:160 ../lib/modules/dhcp_settings.inc:179
+#: ../lib/modules/dhcp_settings.inc:196 ../lib/modules/dhcp_settings.inc:254
+#: ../lib/modules/dhcp_settings.inc:546 ../lib/modules/dhcp_settings.inc:617
 msgid "Subnet mask"
 msgstr "サブネット・マスク"
 
@@ -6192,29 +6483,31 @@ msgstr "sudoロール管理"
 msgid "Sudo roles"
 msgstr "sudoロール"
 
-#: ../lib/lists.inc:634 ../lib/modules.inc:1550
+#: ../lib/lists.inc:658 ../lib/modules.inc:1571
 msgid "Suffix"
 msgstr "サフィックス"
 
-#: ../lib/modules/sambaSamAccount.inc:1320
+#: ../lib/modules/sambaSamAccount.inc:1281
 msgid "Sunday"
 msgstr "日曜日"
 
-#: ../templates/lists/changePassword.php:117
+#: ../templates/lists/changePassword.php:149
+#: ../lib/modules/asteriskAccount.inc:78
+#: ../lib/modules/asteriskVoicemail.inc:77
 msgid "Sync Asterisk password with Unix password"
 msgstr "アスタリスク・パスワードをunixパスワードと同期。"
 
-#: ../templates/lists/changePassword.php:120
+#: ../templates/lists/changePassword.php:152
 msgid "Sync Asterisk voicemail password with Unix password"
 msgstr "アスタリスク・ボイスメール・パスワードをunixパスワードと同期"
 
-#: ../templates/lists/changePassword.php:108
-#: ../lib/modules/sambaSamAccount.inc:228
+#: ../templates/lists/changePassword.php:140
+#: ../lib/modules/sambaSamAccount.inc:225
 msgid "Sync Samba LM password with Unix password"
 msgstr "Samba LMパスワードをunixパスワードと同期します。"
 
-#: ../templates/lists/changePassword.php:107
-#: ../lib/modules/sambaSamAccount.inc:227
+#: ../templates/lists/changePassword.php:139
+#: ../lib/modules/sambaSamAccount.inc:224
 msgid "Sync Samba NT password with Unix password"
 msgstr "Samba NTパスワードをunixパスワードと同期します。"
 
@@ -6230,32 +6523,32 @@ msgstr "Syntax OID"
 msgid "Syntaxes"
 msgstr "Syntaxes"
 
-#: ../templates/config/mainmanage.php:318
+#: ../templates/config/mainmanage.php:338
 msgid "System logging"
 msgstr "システムロギング"
 
-#: ../help/help.inc:59
+#: ../help/help.inc:56
 msgid "TLS cannot be combined with ldaps://."
 msgstr "TLSを ldaps:// と結合できませんでした。"
 
-#: ../lib/modules/kolabUser.inc:241
+#: ../lib/modules/kolabUser.inc:229
 msgid "Target of invitation policy is invalid!"
 msgstr "招待ポリシーのターゲット正しくありません。"
 
-#: ../templates/lists/changePassword.php:162
+#: ../templates/lists/changePassword.php:194
 #: ../lib/modules/inetOrgPerson.inc:48 ../lib/modules/inetOrgPerson.inc:117
-#: ../lib/modules/inetOrgPerson.inc:201 ../lib/modules/inetOrgPerson.inc:330
-#: ../lib/modules/inetOrgPerson.inc:448 ../lib/modules/inetOrgPerson.inc:531
-#: ../lib/modules/inetOrgPerson.inc:532 ../lib/modules/inetOrgPerson.inc:940
-#: ../lib/modules/inetOrgPerson.inc:1132 ../lib/modules/inetOrgPerson.inc:1499
+#: ../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
 msgid "Telephone number"
 msgstr "電話番号"
 
-#: ../lib/modules/inetOrgPerson.inc:276
+#: ../lib/modules/inetOrgPerson.inc:265
 msgid "Temp"
 msgstr "臨時雇用"
 
-#: ../lib/modules/inetOrgPerson.inc:260
+#: ../lib/modules/inetOrgPerson.inc:249
 msgid "Temp, contract until december"
 msgstr "臨時雇用、12月までの契約"
 
@@ -6263,9 +6556,9 @@ msgstr "臨時雇用、12月までの契約"
 msgid "Template"
 msgstr "テンプレート"
 
-#: ../lib/modules/sambaSamAccount.inc:366
-#: ../lib/modules/sambaSamAccount.inc:594
-#: ../lib/modules/sambaSamAccount.inc:1245
+#: ../lib/modules/sambaSamAccount.inc:363
+#: ../lib/modules/sambaSamAccount.inc:569
+#: ../lib/modules/sambaSamAccount.inc:1193
 msgid "Terminal server options"
 msgstr "ターミナルサーバオプション"
 
@@ -6273,11 +6566,15 @@ msgstr "ターミナルサーバオプション"
 msgid "Tests"
 msgstr "テスト"
 
+#: ../templates/config/confmain.php:478 ../help/help.inc:196
+msgid "Text"
+msgstr "本文"
+
 #: ../templates/pdfedit/pdfpage.php:610
 msgid "Text field"
 msgstr "テキストフィールド"
 
-#: ../help/help.inc:104
+#: ../help/help.inc:101
 msgid "Text for user PDF"
 msgstr "ユーザPDFのためのテキスト"
 
@@ -6290,12 +6587,12 @@ msgstr ""
 "教育組織間の認証のための個人の\"NetID\"。これは \"user@scope\" の形式で表さ"
 "れ、scopeはローカルなセキュリティ・ドメインを定義します。"
 
-#: ../lib/modules/kolabUser.inc:172
+#: ../lib/modules/kolabUser.inc:160
 msgid ""
 "The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
 msgstr "ユーザに対するCyrusメールクォータ(MB単位)。未入力の場合は無制限。"
 
-#: ../lib/modules/dhcp_settings.inc:317
+#: ../lib/modules/dhcp_settings.inc:289
 msgid "The DHCP ranges were changed to fit for the new subnet."
 msgstr "新しいサブネットに適合するようにDHCP範囲が変更されました。"
 
@@ -6324,24 +6621,24 @@ msgstr "個人のorganizational unitを示すディレクトリ・エントリ
 msgid "The IP address %s is invalid!"
 msgstr "IPアドレス %s は正しくありません!"
 
-#: ../lib/modules/fixed_ip.inc:387
+#: ../lib/modules/fixed_ip.inc:389
 msgid "The IP address does not match the subnet."
 msgstr "IPアドレスがサブネットと矛盾しています。"
 
-#: ../lib/modules/fixed_ip.inc:390
+#: ../lib/modules/fixed_ip.inc:392
 msgid "The IP address is already in use."
 msgstr "このIPアドレスは既に使用されています:"
 
-#: ../lib/modules/range.inc:396 ../lib/modules/range.inc:414
-#: ../lib/modules/fixed_ip.inc:382
+#: ../lib/modules/range.inc:408 ../lib/modules/range.inc:424
+#: ../lib/modules/fixed_ip.inc:384
 msgid "The IP address is invalid."
 msgstr "IPアドレスが正しくありません。"
 
-#: ../lib/modules/fixed_ip.inc:88
+#: ../lib/modules/fixed_ip.inc:94
 msgid "The IP address of the PC."
 msgstr "PCのIPアドレス。"
 
-#: ../lib/modules/dhcp_settings.inc:132
+#: ../lib/modules/dhcp_settings.inc:137
 msgid ""
 "The IP address(es) of the DNS servers. Multiple addresses are separated by "
 "\",\". Example: 192.168.0.10, 192.168.0.11"
@@ -6349,34 +6646,34 @@ msgstr ""
 "DNSサーバーのIPアドレス。複数のIPアドレスは\",\"によって区切られます。例: "
 "192.168.0.10, 192.168.0.11"
 
-#: ../lib/modules/dhcp_settings.inc:138
+#: ../lib/modules/dhcp_settings.inc:143
 msgid ""
 "The IP addresses of the Netbios name servers (e.g. \"123.123.123.123, "
 "123.123.123.124\")."
 msgstr ""
 "NetBIOSネームサーバーのIPアドレス(例: 192.168.123.123, 192.168.123.124)。"
 
-#: ../lib/modules/range.inc:400 ../lib/modules/range.inc:416
+#: ../lib/modules/range.inc:412 ../lib/modules/range.inc:426
 msgid "The IP does not match the subnet."
 msgstr "IPアドレスがサブネットにマッチしません。"
 
-#: ../lib/modules/fixed_ip.inc:85
+#: ../lib/modules/fixed_ip.inc:91
 msgid "The MAC address of the PC. Example: 11:22:33:44:55:aa"
 msgstr "PCのMACアドレス。例: 11:22:33:44:55:aa"
 
-#: ../lib/modules/dhcp_settings.inc:310 ../lib/modules/dhcp_settings.inc:311
+#: ../lib/modules/dhcp_settings.inc:282 ../lib/modules/dhcp_settings.inc:283
 msgid "The Netbios server is invalid."
 msgstr "NetBIOSサーバーが正しくありません。"
 
-#: ../lib/modules/fixed_ip.inc:354
+#: ../lib/modules/fixed_ip.inc:356
 msgid "The PC name may not be longer than 20 characters."
 msgstr "PC名は20文字より長くてはなりません。"
 
-#: ../lib/modules/fixed_ip.inc:363
+#: ../lib/modules/fixed_ip.inc:365
 msgid "The PC name may only contain A-Z, a-z and 0-9."
 msgstr "PC名にはA-Z, a-z, 0-9だけが使用できます。"
 
-#: ../lib/modules/fixed_ip.inc:357
+#: ../lib/modules/fixed_ip.inc:359
 msgid "The PC name needs to be at least 2 characters long."
 msgstr "PC名は少なくとも2文字以上でなければなりません。"
 
@@ -6394,22 +6691,26 @@ msgstr ""
 "てるため、これは問題です。UIDの最小値を適切に変更するか、独立した範囲を指定し"
 "てください。"
 
-#: ../lib/modules/asteriskVoicemail.inc:210
-#: ../lib/modules/asteriskVoicemail.inc:211
+#: ../lib/modules/zarafaServer.inc:70
+msgid "The Unix socket or named pipe to the server."
+msgstr "サーバのUnixソケットまたは名前付きパイプ。"
+
+#: ../lib/modules/asteriskVoicemail.inc:205
+#: ../lib/modules/asteriskVoicemail.inc:206
 msgid "The account context is invalid."
 msgstr "アカウント・コンテキストが正しくありません。"
 
-#: ../lib/modules/asteriskAccount.inc:88
+#: ../lib/modules/asteriskAccount.inc:92
 #: ../lib/modules/asteriskExtension.inc:83
-#: ../lib/modules/asteriskVoicemail.inc:79
+#: ../lib/modules/asteriskVoicemail.inc:83
 msgid "The account context stores information about the dial plan."
 msgstr "アカウント・コンテキストはダイアル・プランに関する情報を保存します。"
 
-#: ../help/help.inc:157
+#: ../help/help.inc:153
 msgid "The account will be saved under this LDAP suffix."
 msgstr "新しいアカウントはこのLDAPサフィックスの下に保存されます。"
 
-#: ../templates/tests/schemaTest.php:122
+#: ../templates/tests/schemaTest.php:121
 #, php-format
 msgid ""
 "The attribute %s is not supported for the object class(es) %s by your LDAP "
@@ -6418,8 +6719,8 @@ msgstr ""
 "このLDAPサーバでは、属性 %s はオブジェクトクラス %s に対してサポートされてい"
 "ません。"
 
+#: ../lib/modules/asteriskAccount.inc:167
 #: ../lib/modules/asteriskAccount.inc:169
-#: ../lib/modules/asteriskAccount.inc:171
 msgid "The caller ID format is invalid."
 msgstr "発信者番号が正しくありません。"
 
@@ -6428,15 +6729,15 @@ msgstr "発信者番号が正しくありません。"
 msgid "The container you specified (%s) does not exist. Please try again."
 msgstr "指定されたコンテナ(%s)が存在しません。再試行してください。"
 
-#: ../lib/modules/kolabUser.inc:160
+#: ../lib/modules/kolabUser.inc:148
 msgid "The country name of the user."
 msgstr "ユーザの国名"
 
-#: ../lib/modules/dhcp_settings.inc:308 ../lib/modules/dhcp_settings.inc:309
+#: ../lib/modules/dhcp_settings.inc:280 ../lib/modules/dhcp_settings.inc:281
 msgid "The default gateway is invalid."
 msgstr "デフォルト・ゲートウェイが正しくありません。"
 
-#: ../lib/modules/dhcp_settings.inc:321 ../lib/modules/dhcp_settings.inc:324
+#: ../lib/modules/dhcp_settings.inc:292 ../lib/modules/dhcp_settings.inc:294
 msgid ""
 "The domain name includes invalid characters. Valid characters are A-Z, a-z, "
 "0-9, \".\", \"_\",\"-\"."
@@ -6444,40 +6745,36 @@ msgstr ""
 "ドメイン名に不正な文字が含まれています。有効な文字は: A-Z, a-z, 0-9, \".\", "
 "\"_\", \"-\" です。"
 
-#: ../lib/modules/dhcp_settings.inc:319 ../lib/modules/dhcp_settings.inc:322
-msgid "The domain name needs to be shorter than 15 characters."
-msgstr "ドメイン名は15文字未満でなくてはなりません。"
-
-#: ../lib/modules/dhcp_settings.inc:320 ../lib/modules/dhcp_settings.inc:323
+#: ../lib/modules/dhcp_settings.inc:291 ../lib/modules/dhcp_settings.inc:293
 msgid "The domain name needs to have at least 3 characters."
 msgstr "ドメイン名は少なくとも3文字以上でなければなりません。"
 
-#: ../lib/modules/dhcp_settings.inc:120
+#: ../lib/modules/dhcp_settings.inc:125
 msgid "The domain name of the subnet."
 msgstr "サブネットのドメイン名"
 
-#: ../lib/modules/asteriskVoicemail.inc:214
+#: ../lib/modules/asteriskVoicemail.inc:209
 msgid "The email address is invalid."
 msgstr "電子メール・アドレスが正しくありません。"
 
-#: ../lib/modules/range.inc:82
+#: ../lib/modules/range.inc:89
 msgid "The ending IP address of the range."
 msgstr "IPアドレス範囲の終点。"
 
-#: ../lib/modules/dhcp_settings.inc:312
+#: ../lib/modules/dhcp_settings.inc:284
 msgid "The entered Netbios node type does not exist."
 msgstr "入力されたNetBIOSノードタイプが存在しません。"
 
-#: ../lib/modules/phpGroupwareUser.inc:138 ../lib/modules/shadowAccount.inc:67
+#: ../lib/modules/phpGroupwareUser.inc:135 ../lib/modules/shadowAccount.inc:67
 msgid "The expiration date is invalid."
 msgstr "有効期限が正しくありません。"
 
-#: ../lib/modules/asteriskAccount.inc:173
-#: ../lib/modules/asteriskAccount.inc:174
+#: ../lib/modules/asteriskAccount.inc:171
+#: ../lib/modules/asteriskAccount.inc:172
 msgid "The extension context is invalid."
 msgstr "拡張コンテキストが正しくありません。"
 
-#: ../help/help.inc:193
+#: ../help/help.inc:188
 msgid "The first line is the subject."
 msgstr "先頭の行は件名です。"
 
@@ -6495,11 +6792,11 @@ msgstr "ログオン時間フィールドの形式が正しくありません!"
 msgid "The format of this custom script setting is invalid."
 msgstr "カスタム・スクリプト設定の形式が正しくありません。"
 
-#: ../lib/modules/asteriskVoicemail.inc:213
+#: ../lib/modules/asteriskVoicemail.inc:208
 msgid "The full name is invalid."
 msgstr "フルネームが正しくありません。"
 
-#: ../templates/login.php:431
+#: ../templates/login.php:474
 msgid "The given user name matches multiple LDAP entries."
 msgstr "与えられた名前は複数のLDAPエントリにマッチします。"
 
@@ -6514,16 +6811,16 @@ msgstr ""
 msgid "The headline for a new section must contain at least one character."
 msgstr "新しいセクションの見出しは、少なくとも一文字以上でなくてはなりません。"
 
-#: ../lib/modules/sambaSamAccount.inc:279
+#: ../lib/modules/sambaSamAccount.inc:276
 msgid "The home directory will be connected under this drive letter."
 msgstr "ホームディレクトリはこのドライブ文字の下に接続されます。"
 
-#: ../lib/modules/asteriskAccount.inc:176
-#: ../lib/modules/asteriskAccount.inc:177
+#: ../lib/modules/asteriskAccount.inc:174
+#: ../lib/modules/asteriskAccount.inc:175
 msgid "The host name is invalid."
 msgstr "ホスト名が正しくありません。"
 
-#: ../lib/modules/ddns.inc:93
+#: ../lib/modules/ddns.inc:97
 msgid ""
 "The key enables the DHCP server to perform DNS updates. The key is generated "
 "with \"genDDNSkey\"."
@@ -6531,11 +6828,11 @@ msgstr ""
 "このキーはDNSサーバーをDNSアップデート可能にします。キーは\"getDDNSkey\"に"
 "よって生成されます。"
 
-#: ../lib/modules/dhcp_settings.inc:306 ../lib/modules/dhcp_settings.inc:307
+#: ../lib/modules/dhcp_settings.inc:278 ../lib/modules/dhcp_settings.inc:279
 msgid "The lease time is invalid."
 msgstr "リース期間が正しくありません。"
 
-#: ../lib/modules/dhcp_settings.inc:126
+#: ../lib/modules/dhcp_settings.inc:131
 msgid ""
 "The lease time specifies after how many seconds the client should request a "
 "new IP address."
@@ -6563,15 +6860,21 @@ msgstr ""
 "ログファイル名が空であるか、または不正な文字文字が含まれています。有効な文字"
 "は: a-z, A-Z, 0-9, /, \\\\, ., :, _ と -です。"
 
-#: ../lib/modules/asteriskVoicemail.inc:206
+#: ../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行目以降が使用されます。"
+
+#: ../lib/modules/asteriskVoicemail.inc:201
 msgid "The mailbox format is invalid."
 msgstr "メールボックスの書式が正しくありません。"
 
-#: ../lib/modules/dhcp_settings.inc:313 ../lib/modules/dhcp_settings.inc:314
+#: ../lib/modules/dhcp_settings.inc:285 ../lib/modules/dhcp_settings.inc:286
 msgid "The maximum lease time is invalid."
 msgstr "最長リース期間が正しくありません。"
 
-#: ../lib/modules/dhcp_settings.inc:129
+#: ../lib/modules/dhcp_settings.inc:134
 msgid ""
 "The maximum lease time specifies after how many seconds the client must "
 "request a new IP address."
@@ -6579,7 +6882,7 @@ msgstr ""
 "最長リース期間には、この時間が経過するまでにクライアントが新しいIPアドレス要"
 "求を出さなくてはならない秒数を記述します。"
 
-#: ../lib/modules.inc:1200
+#: ../lib/modules.inc:1201
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "モジュール %s は利用できません。"
@@ -6588,7 +6891,9 @@ msgstr "モジュール %s は利用できません。"
 msgid ""
 "The name for that PDF-structure you submitted is not valid. A valid name "
 "must consist of the following characters: 'a-z','A-Z','0-9','_','-'."
-msgstr "指定されたPDF構成の名前が正しくありません。正しい名前に使用可能な文字は 'a-z', 'A-Z', '0-9' '_', '-', '.' です。"
+msgstr ""
+"指定されたPDF構成の名前が正しくありません。正しい名前に使用可能な文字は 'a-"
+"z', 'A-Z', '0-9' '_', '-', '.' です。"
 
 #: ../lib/modules/asteriskExtension.inc:95
 msgid ""
@@ -6598,7 +6903,7 @@ msgstr ""
 "実行するコマンドの名前。使用可能なコマンドはアスタリスクのコマンドラインで　"
 "\"core show applications\"　を実効すると列挙されます。"
 
-#: ../lib/modules/fixed_ip.inc:82
+#: ../lib/modules/fixed_ip.inc:88
 msgid "The name of the PC."
 msgstr "PCの名前"
 
@@ -6606,11 +6911,11 @@ msgstr "PCの名前"
 msgid "The name of the extension (e.g. voicemail or sip)."
 msgstr "拡張の名前(例 voicemail or sip)。"
 
-#: ../lib/modules/kolabUser.inc:164
+#: ../lib/modules/kolabUser.inc:152
 msgid "The name of the server where the mailbox is located."
 msgstr "メールボックスがあるサーバーの名前。"
 
-#: ../lib/modules/dhcp_settings.inc:123
+#: ../lib/modules/dhcp_settings.inc:128
 msgid "The name of the subnet. Example: 192.168.10.0"
 msgstr "サブネットのアドレス。例: 192.168.10.0"
 
@@ -6618,21 +6923,19 @@ msgstr "サブネットのアドレス。例: 192.168.10.0"
 msgid "The name of your Windows domain or workgroup."
 msgstr "Windowsのドメイン又はワークグループ名。"
 
-#: ../lib/modules/dhcp_settings.inc:159
+#: ../lib/modules/dhcp_settings.inc:164
 msgid ""
-"The net mask is derived from the subnet mask. If you leave this field empty "
-"then LAM will calculate it for you."
-msgstr ""
-"ネットマスクはサブネットマスクに由来します。未記入の場合は、LAMによって算出さ"
-"れます。"
+"The net mask is derived from the subnet mask. LAM will calculate it "
+"automatically."
+msgstr "ネットマスクはサブネットマスクによって割り出されます。LAMが自動的に算出します。"
 
-#: ../lib/modules.inc:1092
+#: ../lib/modules.inc:1093
 msgid ""
 "The new password will be stored in the directory after you save this account."
 msgstr ""
 "新しいパスワードは個のアカウントをディレクトリにセーブした後で保存されます。"
 
-#: ../help/help.inc:116
+#: ../help/help.inc:113
 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 "
@@ -6642,29 +6945,33 @@ msgstr ""
 "fixed list of DNs or LAM can search LDAP to find a DN which matches the "
 "given user name."
 
-#: ../templates/tests/schemaTest.php:111
+#: ../templates/tests/schemaTest.php:110
 #, php-format
 msgid "The object class %s is not supported by your LDAP server."
 msgstr "オブジェクトクラス %s はこのLDAPサーバでサポートされていません。"
 
-#: ../lib/modules/inetOrgPerson.inc:584
+#: ../lib/modules/inetOrgPerson.inc:573
 msgid "The office name of the user (e.g. YourCompany, Human Resources)."
 msgstr "ユーザの事業所名"
 
-#: ../templates/selfService/selfServiceMain.php:261 ../lib/modules.inc:1908
+#: ../templates/selfService/selfServiceMain.php:270 ../lib/modules.inc:1929
 msgid "The operation was stopped because of the above errors."
 msgstr "上記のエラーによって操作が停止されました。"
 
-#: ../lib/modules/asteriskVoicemail.inc:216
-#: ../lib/modules/asteriskVoicemail.inc:217
+#: ../lib/modules/asteriskVoicemail.inc:211
+#: ../lib/modules/asteriskVoicemail.inc:212
 msgid "The options have bad format."
 msgstr "オプションの書式が不正です。"
 
+#: ../lib/modules/device.inc:63
+msgid "The owner of this device."
+msgstr "このデバイスの所有者。"
+
 #: ../lib/modules/groupOfNames.inc:69
 msgid "The owner of this group."
 msgstr "このグループの所有者。"
 
-#: ../lib/modules/asteriskVoicemail.inc:215
+#: ../lib/modules/asteriskVoicemail.inc:210
 msgid "The pager number has bad format."
 msgstr "ページャ番号の書式が不正です。"
 
@@ -6720,15 +7027,15 @@ msgstr ""
 "パスワードの強度が不足しています。少なくとも%s文字の大文字を入力してくださ"
 "い。"
 
-#: ../lib/modules.inc:1345
+#: ../lib/modules.inc:1346
 msgid "The password was set to:"
 msgstr "設定されたパスワード:"
 
-#: ../templates/lists/changePassword.php:297
+#: ../templates/lists/changePassword.php:333
 msgid "The password(s) were set to:"
 msgstr "設定されたパスワード:"
 
-#: ../lib/modules/posixAccount.inc:346
+#: ../lib/modules/posixAccount.inc:332
 msgid ""
 "The primary group for this account. You can insert a GID number or a group "
 "name."
@@ -6736,11 +7043,11 @@ msgstr ""
 "このアカウントに対するプライマリグループ。GID番号またはグループ名を入力してく"
 "ださい。"
 
-#: ../lib/modules/posixAccount.inc:413
+#: ../lib/modules/posixAccount.inc:399
 msgid "The primary group the host should be member of."
 msgstr "ホストがメンバでなければならないプライマリグループ。"
 
-#: ../lib/modules/posixAccount.inc:375
+#: ../lib/modules/posixAccount.inc:361
 msgid "The primary group the user should be member of."
 msgstr "ユーザがメンバでなければならないプライマリグループ。"
 
@@ -6752,15 +7059,15 @@ msgstr ""
 "優先度はコマンドの実行順序を決定する通し番号です。コマンドは通し番号の少ない"
 "純に実行されます。"
 
-#: ../lib/modules/range.inc:402
+#: ../lib/modules/range.inc:414
 msgid "The range conflicts with another range."
 msgstr "範囲が他の範囲と衝突しています。"
 
-#: ../lib/modules/range.inc:398
+#: ../lib/modules/range.inc:410
 msgid "The range end needs to be greater than the range start."
 msgstr "範囲の末尾は先頭よりも大きくなくてはなりません。"
 
-#: ../lib/modules/inetOrgPerson.inc:564
+#: ../lib/modules/inetOrgPerson.inc:553
 msgid "The room number of the employee's office."
 msgstr "従業員の事務所の部屋番号。"
 
@@ -6772,7 +7079,8 @@ msgstr ""
 "スクリプトはwebサーバー上でwebサーバーのユーザーコンテキスト(例 apache/www-"
 "data)で実行されます。"
 
-#: ../lib/modules/sambaSamAccount.inc:373 ../lib/modules/inetOrgPerson.inc:592
+#: ../lib/modules/sambaSamAccount.inc:370 ../lib/modules/zarafaUser.inc:117
+#: ../lib/modules/inetOrgPerson.inc:581
 msgid ""
 "The selected options will not be managed inside LAM. You can use this to "
 "reduce the number of displayed input fields."
@@ -6780,11 +7088,11 @@ msgstr ""
 "選択されたオプションはLAMの中で管理されます。これは、表示される入力フィールド"
 "の数を削減するのに使用できます。"
 
-#: ../lib/modules/range.inc:79
+#: ../lib/modules/range.inc:86
 msgid "The starting IP address of the range."
 msgstr "範囲の先頭IPアドレス。"
 
-#: ../lib/modules/inetOrgPerson.inc:576
+#: ../lib/modules/inetOrgPerson.inc:565
 msgid "The state where the user resides or works."
 msgstr "ユーザが居住または勤務している都道府県"
 
@@ -6792,19 +7100,25 @@ msgstr "ユーザが居住または勤務している都道府県"
 msgid "The static text must contain at least one character."
 msgstr "静的テキストは少なくとも一文字以上でなければなりません。"
 
-#: ../lib/modules/dhcp_settings.inc:301
+#: ../help/help.inc:195
+msgid ""
+"The subject of all password mails. If empty the first line of \"config/"
+"passwordMailTemplate.txt\" will be used."
+msgstr "全てのパスワード・メールの件名。もしも空の場合は、\"config/passwordMailTemplate.txt\" の先頭行が使用されます。"
+
+#: ../lib/modules/dhcp_settings.inc:273
 msgid "The subnet is already in use."
 msgstr "サブネットはすでに使用されています"
 
-#: ../lib/modules/dhcp_settings.inc:302 ../lib/modules/dhcp_settings.inc:303
+#: ../lib/modules/dhcp_settings.inc:274 ../lib/modules/dhcp_settings.inc:275
 msgid "The subnet is invalid."
 msgstr "サブネットが正しくありません。"
 
-#: ../lib/modules/dhcp_settings.inc:315 ../lib/modules/dhcp_settings.inc:316
+#: ../lib/modules/dhcp_settings.inc:287 ../lib/modules/dhcp_settings.inc:288
 msgid "The subnet mask is invalid."
 msgstr "サブネット・マスクが正しくありません。"
 
-#: ../lib/modules/dhcp_settings.inc:156
+#: ../lib/modules/dhcp_settings.inc:161
 msgid "The subnet mask of the network."
 msgstr "ネットワークのサブネット・マスク"
 
@@ -6816,6 +7130,14 @@ msgstr "sudoコマンドはこれらのグループ権限で実行されます
 msgid "The sudo commands may be run as these users (e.g. root)."
 msgstr "sudoコマンドはこれらのユーザー(例. root)として実行されます。"
 
+#: ../lib/modules/zarafaUser.inc:97
+msgid "The user account is non-active and login is disabled."
+msgstr "ユーザーアカウントは無効で、ログインが禁止されています。"
+
+#: ../lib/modules/zarafaUser.inc:77
+msgid "The user will get warned when his mailbox reaches this limit."
+msgstr "ユーザーはメールボックスがリミットに達した時に警告を受けます。"
+
 #: ../lib/modules/sambaSamAccount.inc:107
 msgid ""
 "The value for the Samba 3 field \"User can/must change password\" needs to "
@@ -6824,12 +7146,12 @@ msgstr ""
 "Samba 3フィールド \"ユーザによるパスワード変更の許可/強制\" に与える値は数値"
 "である必要があります。"
 
-#: ../lib/modules/asteriskVoicemail.inc:218
-#: ../lib/modules/asteriskVoicemail.inc:219
+#: ../lib/modules/asteriskVoicemail.inc:213
+#: ../lib/modules/asteriskVoicemail.inc:214
 msgid "The voicemail context name is invalid."
 msgstr "ボイスメール・コンテキスト名が正しくありません。"
 
-#: ../help/help.inc:196
+#: ../help/help.inc:191 ../help/help.inc:200
 msgid "The wildcard for the new password is @@newPassword@@."
 msgstr "新しいパスワードに対応するワイルドカードは @@newPassword@@ です。"
 
@@ -6837,27 +7159,27 @@ msgstr "新しいパスワードに対応するワイルドカードは @@newPas
 msgid "There are new required attributes which need to be set."
 msgstr "設定すべき新しい必須属性があります。"
 
-#: ../lib/modules/posixGroup.inc:479
+#: ../lib/modules/posixGroup.inc:491
 msgid "There are still users who have this group as their primary group."
 msgstr "このグループをプライマリグループとするユーザがまだ存在します。"
 
-#: ../lib/modules/sambaGroupMapping.inc:438
+#: ../lib/modules/sambaGroupMapping.inc:425
 msgid "There can be only one group of this type."
 msgstr "このタイプのグループを一つだけ指定できます。"
 
-#: ../lib/modules/asteriskAccount.inc:170
+#: ../lib/modules/asteriskAccount.inc:168
 msgid "There is already another user with this caller ID."
 msgstr "この発信者番号を使用しているユーザーが既に存在します。"
 
-#: ../lib/modules/asteriskVoicemail.inc:207
+#: ../lib/modules/asteriskVoicemail.inc:202
 msgid "There is already another user with this mailbox name."
 msgstr "このメールボックス名を使用しているユーザーが既に存在します。"
 
-#: ../templates/massDoUpload.php:128
+#: ../templates/massDoUpload.php:127
 msgid "There were errors while uploading:"
 msgstr "アップロードの際にエラーが発生しました。"
 
-#: ../lib/modules/posixGroup.inc:400
+#: ../lib/modules/posixGroup.inc:414
 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 "
@@ -6866,7 +7188,7 @@ msgstr ""
 "新しいグループアカウントを作成する際に使われるグループIDの最小値と最大値。新"
 "しいグループアカウントには、使用中の番号の最大値+1が常に割り当てられます。"
 
-#: ../lib/modules/posixAccount.inc:334
+#: ../lib/modules/posixAccount.inc:320
 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 "
@@ -6876,7 +7198,7 @@ msgstr ""
 "囲はユーザアカウントのものと異なるようにしなくてはなりません。新しいホストア"
 "カウントには、使用中の番号の最大値+1が常に割り当てられます。"
 
-#: ../lib/modules/posixAccount.inc:330
+#: ../lib/modules/posixAccount.inc:316
 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 "
@@ -6899,7 +7221,11 @@ msgid ""
 "These options change the list of potential extension owners below. You can "
 "select to show Asterisk accounts or all users. It is also possible to search "
 "the tree suffix if you have users which are not in the standard user suffix."
-msgstr "これらのオプションは、下記の潜在的な拡張の所有者のリストを変更します。アスタリスク・アカウントまたは全てのユーザーを表示するような選択も可能です。標準的なユーザー・サフィックスに無いユーザーが存在する場合は、ツリー・サフィックスを検索する事も出来ます。"
+msgstr ""
+"これらのオプションは、下記の潜在的な拡張の所有者のリストを変更します。アスタ"
+"リスク・アカウントまたは全てのユーザーを表示するような選択も可能です。標準的"
+"なユーザー・サフィックスに無いユーザーが存在する場合は、ツリー・サフィックス"
+"を検索する事も出来ます。"
 
 #: ../lib/modules/posixAccount.inc:90
 msgid ""
@@ -6908,7 +7234,7 @@ msgstr ""
 "このGID番号は正しくありません。別な番号を指定するか、グループ名を記入してくだ"
 "さい。"
 
-#: ../help/help.inc:186
+#: ../help/help.inc:181
 msgid ""
 "This HTML code will be placed on top of all self service pages. E.g. you can "
 "use this to place your custom logo. Any HTML code is permitted."
@@ -6917,15 +7243,15 @@ msgstr ""
 "カスタムロゴの配置等に使用できます。ここにはあらゆるHTMLコードを書く事ができ"
 "ます。"
 
-#: ../lib/modules/fixed_ip.inc:360
+#: ../lib/modules/fixed_ip.inc:362
 msgid "This PC name already exists."
 msgstr "PC名は既に存在しています。"
 
-#: ../lib/modules/kolabUser.inc:283
+#: ../lib/modules/kolabUser.inc:276
 msgid "This account is marked for deletion."
 msgstr "このアカウントを削除対象としてマークしました。"
 
-#: ../lib/modules/sambaSamAccount.inc:303
+#: ../lib/modules/sambaSamAccount.inc:300
 msgid ""
 "This allows you to define this account as a special user like administrator "
 "or guest."
@@ -6933,15 +7259,15 @@ msgstr ""
 "このアカウントをadministratorやguest等の特殊ユーザとして定義する事を可能にし"
 "ます。"
 
-#: ../lib/modules/inetOrgPerson.inc:580
+#: ../lib/modules/inetOrgPerson.inc:569
 msgid "This can be used to specify if the user has a car license."
 msgstr "ユーザが運転免許を保有している場合に記入します。"
 
-#: ../help/help.inc:128
+#: ../help/help.inc:125
 msgid "This changes the password of the selected profile."
 msgstr "選択されたプロファイルのパスワードを変更します。"
 
-#: ../help/help.inc:130
+#: ../help/help.inc:127
 msgid "This changes the profile which is selected by default at login."
 msgstr "ログイン時にデフォルトで選択されるプロファイルを変更します。"
 
@@ -6959,7 +7285,7 @@ msgstr "カスタムスクリプト設定に不正なアカウントタイプが
 msgid "This custom script setting includes an invalid action type."
 msgstr "カスタムスクリプト設定に不正なアクションタイプが含まれています。"
 
-#: ../help/help.inc:95
+#: ../help/help.inc:92
 msgid ""
 "This defines the language of the login window and sets this language as the "
 "default language. Users can change the language at login."
@@ -6967,7 +7293,7 @@ msgstr ""
 "ログインウィンドウの言語を定義し、この言語を既定値の言語として設定します。"
 "ユーザはログイン時に言語を変更できます。"
 
-#: ../help/help.inc:114
+#: ../help/help.inc:111
 msgid ""
 "This defines the rights for the home directories which are created by "
 "lamdaemon."
@@ -6981,11 +7307,15 @@ msgstr ""
 "アスタリスクがこのユーザーに対してスタートするアプリケーションを定義します"
 "(例 SIP/user1)。"
 
+#: ../lib/modules/device.inc:67
+msgid "This describes the location of the device."
+msgstr "デバイスの位置を記入します。"
+
 #: ../lib/modules/ipHost.inc:67
 msgid "This describes the location of the host."
-msgstr "ホストの場所を記述します。"
+msgstr "ホストの場所を記入します。"
 
-#: ../lib/modules/inetOrgPerson.inc:572
+#: ../lib/modules/inetOrgPerson.inc:561
 msgid "This describes the location of the user."
 msgstr "ユーザの住所を記入します。"
 
@@ -6993,6 +7323,12 @@ msgstr "ユーザの住所を記入します。"
 msgid "This document was automatically created by LDAP Account Manager"
 msgstr "この文書はLDAP Account Managerによって自動的に生成されました。"
 
+#: ../help/help.inc:193
+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)が使用されます。"
+
 #: ../templates/tree/edit.php:210
 msgid "This entry has no attributes"
 msgstr "このエントリは属性を持っていません。"
@@ -7014,15 +7350,15 @@ msgstr "カンマで区切られたIPアドレスのリスト。"
 msgid "This is a comma separated list of MAC addresses."
 msgstr "カンマで区切られたMACアドレスのリスト。"
 
-#: ../lib/modules/kolabUser.inc:148
+#: ../lib/modules/kolabUser.inc:136
 msgid "This is a comma separated list of delegates."
 msgstr "カンマで区切られた委任者のリスト。"
 
-#: ../lib/modules/kolabUser.inc:156
+#: ../lib/modules/kolabUser.inc:144
 msgid "This is a comma separated list of eMail aliases."
 msgstr "カンマで区切られた電子メール別名のリスト。"
 
-#: ../lib/modules/kolabUser.inc:140
+#: ../lib/modules/kolabUser.inc:128
 msgid "This is a comma separated list of invitation policies."
 msgstr "カンマで区切られた招待ポリシーのリスト。"
 
@@ -7034,7 +7370,7 @@ msgstr "カンマで区切られた受信者のリスト。"
 msgid "This is a comma separated list of the users public email addresses."
 msgstr "ユーザの公開メールアドレスのカンマで区切られたリスト。"
 
-#: ../help/help.inc:144
+#: ../help/help.inc:141
 msgid ""
 "This is a list of IP addresses from hosts who may access LAM. You can use \"*"
 "\" as wildcard (e.g. 192.168.0.*)."
@@ -7057,7 +7393,7 @@ msgstr ""
 msgid "This is a list of nick names for this user."
 msgstr "このユーザーのニックネームのリスト。"
 
-#: ../help/help.inc:110
+#: ../help/help.inc:107
 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 "
@@ -7069,7 +7405,7 @@ msgstr ""
 "います。サーバ名はセミコロンによって区切られます。セミコロンに続けて記述的名"
 "前を付加することもできます。"
 
-#: ../help/help.inc:88
+#: ../help/help.inc:85
 msgid ""
 "This is a list of valid DN entries of all users that are allowed to login to "
 "LDAP Account Manager. Please enter one DN per line."
@@ -7077,18 +7413,11 @@ msgstr ""
 "LDAP Account Manager にログイン可能なすべてのユーザの有効なDNエントリの一覧で"
 "す。各行毎に1個のDNを入力してください。"
 
-#: ../templates/masscreate.php:316
-msgid ""
-"This is an example how it would look in your spreadsheet program before you "
-"convert to CSV:"
-msgstr ""
-"CSVに変換する前に、あなたの表計算プログラムでどのように見えるかの例です。"
-
 #: ../lib/modules/nisObject.inc:67
 msgid "This is an optional description for this entry."
 msgstr "このエントリに対する付加的な説明。"
 
-#: ../help/help.inc:174
+#: ../help/help.inc:169
 msgid ""
 "This is needed to find the LDAP DNs of your user accounts. E.g. if you use "
 "\"uid\" and your user inputs \"miller\" then LAM will search for an account "
@@ -7098,9 +7427,9 @@ msgstr ""
 "していて入力が\"miller\"だった場合、LAMは uid=miller という条件でアカウントを"
 "検索します。"
 
-#: ../lib/modules/ipHost.inc:110 ../lib/modules/eduPerson.inc:219
-#: ../lib/modules/eduPerson.inc:221 ../lib/modules/inetOrgPerson.inc:73
-#: ../lib/modules/aliasEntry.inc:79
+#: ../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
 msgid "This is not a valid DN!"
 msgstr "無効なDNです!"
 
@@ -7108,11 +7437,11 @@ msgstr "無効なDNです!"
 msgid "This is not a valid RID number!"
 msgstr "無効なRID番号です!"
 
-#: ../lib/modules/sambaGroupMapping.inc:440
+#: ../lib/modules/sambaGroupMapping.inc:427
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不正なSamba 3グループタイプです!"
 
-#: ../lib/modules/eduPerson.inc:223
+#: ../lib/modules/eduPerson.inc:220
 msgid "This is not a valid list of DNs!"
 msgstr "無効なDNリストです!"
 
@@ -7124,7 +7453,7 @@ msgstr "ユーザの公開メールアドレスの一つ。"
 msgid "This is one recipient for this alias."
 msgstr "この別名に対する1名の受信者。"
 
-#: ../lib/modules/asteriskAccount.inc:80
+#: ../lib/modules/asteriskAccount.inc:84
 msgid ""
 "This is the ID of the user in the Asterisk database. It may contain digits "
 "and letters (e.g. user1 or 200134)."
@@ -7142,7 +7471,7 @@ msgstr "ネットワークカードデバイスのIPアドレスです(例 123.1
 msgid "This is the LDAP DN of the host's manager."
 msgstr "ホスト・マネージャーのLDAP DN。"
 
-#: ../lib/modules/inetOrgPerson.inc:512
+#: ../lib/modules/inetOrgPerson.inc:501
 msgid ""
 "This is the LDAP DN of the user's manager. Use this property to represent "
 "hierarchies in your company."
@@ -7156,11 +7485,11 @@ msgid ""
 "EF:18)."
 msgstr "ネットワークカードデバイスのMACアドレスです(例 0:01:02:DE:EF:18)。"
 
-#: ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/sambaSamAccount.inc:297
 msgid "This is the SID of the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループのSIDです。"
 
-#: ../help/help.inc:97
+#: ../help/help.inc:94
 msgid ""
 "This is the absolute path to an external script for setting quotas and "
 "creating home directories."
@@ -7168,11 +7497,11 @@ msgstr ""
 "ホームディレクトリを作成し、quotaを設定するための外部スクリプトの絶対パスで"
 "す。"
 
-#: ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/sambaSamAccount.inc:235
 msgid "This is the account's Windows password."
 msgstr "アカウントのWindowsパスワードです。"
 
-#: ../lib/modules/sambaSamAccount.inc:235
+#: ../lib/modules/sambaSamAccount.inc:232
 msgid "This is the account's full name on Windows systems."
 msgstr "アカウントのWindowsシステム上のフルネームです。"
 
@@ -7180,16 +7509,22 @@ msgstr "アカウントのWindowsシステム上のフルネームです。"
 msgid "This is the active password policy for this account."
 msgstr "このアカウントに対するアクティブなパスワード・ポリシー。"
 
-#: ../lib/modules/sambaSamAccount.inc:322
-#: ../lib/modules/phpGroupwareUser.inc:83 ../lib/modules/shadowAccount.inc:190
+#: ../lib/modules/sambaSamAccount.inc:319
+#: ../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"
 
-#: ../lib/modules/sambaGroupMapping.inc:356
+#: ../lib/modules/shadowAccount.inc:193
+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 "ユーザー自身がパスワードを変更した日付です。パスワード有効期限を設定すると、パスワードの変更を強制する事ができます。"
+
+#: ../lib/modules/sambaGroupMapping.inc:346
 msgid "This is the group name which will be shown in Windows."
 msgstr "Windows上で表示されるグループ名です。"
 
-#: ../help/help.inc:153
+#: ../help/help.inc:149
 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 "
@@ -7199,7 +7534,7 @@ msgstr ""
 "てはなりません(例えば、ユーザアカウントでは通常\"uid\"を使用し、グループでは"
 "\"cn\"を使用します)。"
 
-#: ../help/help.inc:83
+#: ../help/help.inc:80
 msgid ""
 "This is the list of attributes to show in the account list. The entries can "
 "either be predefined values, \"#attribute\", or individual ones, \"attribute:"
@@ -7209,7 +7544,7 @@ msgstr ""
 "\" 、または特定の値、\"属性:説明\" のいずれかにできます。複数のエントリは、セ"
 "ミコロンによって区切られます。"
 
-#: ../lib/modules/asteriskAccount.inc:84
+#: ../lib/modules/asteriskAccount.inc:88
 msgid ""
 "This is the machine id (e.g. IP address or host name) from which the user "
 "can call/receive calls."
@@ -7224,18 +7559,18 @@ msgstr "ユーザに対するメールサーバ。"
 msgid "This is the name of this group."
 msgstr "このグループの名前。"
 
-#: ../lib/modules/posixAccount.inc:421
+#: ../lib/modules/posixAccount.inc:407
 msgid ""
 "This is the natural name of the host. If empty, the host name will be used."
 msgstr "このホストの呼称。未入力の場合は、ホスト名が使用されます。"
 
-#: ../lib/modules/inetOrgPerson.inc:548
+#: ../lib/modules/inetOrgPerson.inc:537
 msgid ""
 "This is the natural name of the user. If empty, the first and last name is "
 "used."
 msgstr "このユーザの呼称。未入力の場合は、姓と名が使用されます。"
 
-#: ../lib/modules/posixAccount.inc:399
+#: ../lib/modules/posixAccount.inc:385
 msgid ""
 "This is the natural name of the user. If empty, the first and last name or "
 "user name is used."
@@ -7257,7 +7592,7 @@ msgstr ""
 "ユーザーが過去に使用したパスワードを再利用する事を防ぐために記録しておくパス"
 "ワードの履歴数。"
 
-#: ../help/help.inc:93
+#: ../help/help.inc:90
 msgid ""
 "This is the number of rows to show in the account list. If more entries are "
 "found the list will be split into several pages."
@@ -7265,11 +7600,11 @@ msgstr ""
 "アカウント一覧の表示行数です。この数より多くのエントリがある場合は、リストは"
 "複数のページに分割されます。"
 
-#: ../lib/modules/sambaSamAccount.inc:331
+#: ../lib/modules/sambaSamAccount.inc:328
 msgid "This is the path to the user's home directory."
 msgstr "ユーザのホームディレクトリのパス。"
 
-#: ../lib/modules/sambaGroupMapping.inc:364
+#: ../lib/modules/sambaGroupMapping.inc:354
 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 "
@@ -7279,7 +7614,7 @@ msgstr ""
 "合、LAMはUIDからRIDを算出します。数値または特殊グループ名のどちらかを指定でき"
 "ます。"
 
-#: ../lib/modules/sambaSamAccount.inc:306
+#: ../lib/modules/sambaSamAccount.inc:303
 msgid ""
 "This is the relative ID number for your Windows account. You can either "
 "enter a number or one of these special accounts: "
@@ -7287,7 +7622,7 @@ msgstr ""
 "あなたのWindowsアカウントに対する相対ID番号です。数字またはこれらの特殊アカウ"
 "ントのどれか一つを指定できます: "
 
-#: ../lib/modules/sambaSamAccount.inc:310
+#: ../lib/modules/sambaSamAccount.inc:307
 msgid ""
 "This is the relative ID number for your host account. If you leave this "
 "empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
@@ -7295,7 +7630,7 @@ msgstr ""
 "あなたのホストアカウントに対する相対ID番号です。未入力の場合、LAMは "
 "uidNumber*2 + sambaAlgorithmicRidBase を使用します。"
 
-#: ../help/help.inc:58
+#: ../help/help.inc:55
 msgid ""
 "This is the server address of your LDAP server. Use ldap:// for unencrypted "
 "LDAP connections or TLS encrypted connections. LDAP+SSL (LDAPS) encrypted "
@@ -7305,11 +7640,11 @@ msgstr ""
 "をTLS暗号化された接続に使用してください。LDSP+SSL(LDAPS)暗号化接続は　"
 "https:// で指定します。ポート番号は省略できます。"
 
-#: ../help/help.inc:77
+#: ../help/help.inc:74
 msgid "This is the suffix for the LDAP tree viewer."
 msgstr "LDAPツリービューアに対するサフィックス。"
 
-#: ../help/help.inc:71
+#: ../help/help.inc:68
 msgid ""
 "This is the suffix of the LDAP tree from where to search for LDAP entries. "
 "Only entries in this subtree will be displayed in the account list. When "
@@ -7336,13 +7671,13 @@ msgstr ""
 "アカウントをロックされたユーザーがログインできなくなる時間(分単位)。-1は無期"
 "限を意味する。"
 
-#: ../help/help.inc:138
+#: ../help/help.inc:135
 msgid ""
 "This is the time (in minutes) of inactivity after which a user is "
 "automatically logged off."
 msgstr "ユーザーが自動的ログオフするまでの時間(分単位)。"
 
-#: ../help/help.inc:101
+#: ../help/help.inc:98
 msgid ""
 "This is the time in minutes which LAM caches its LDAP searches. Shorter "
 "times will stress LDAP more but decrease the possibility that changes are "
@@ -7352,7 +7687,7 @@ msgstr ""
 "短かくすると、LDAPに負荷をかける代わりに、変更が認識できなくなる可能性を減ら"
 "します。"
 
-#: ../lib/modules/kolabUser.inc:168
+#: ../lib/modules/kolabUser.inc:156
 msgid ""
 "This is the time limit (in days) for other users who want to check future "
 "appointments. If you leave this blank the default (60 days) will be set."
@@ -7360,7 +7695,7 @@ msgstr ""
 "他のユーザが将来の予定をチェックする場合の時間的上限(日数)。未入力の場合はデ"
 "フォルト値(60日)がセットされます。"
 
-#: ../lib/modules/sambaSamAccount.inc:325
+#: ../lib/modules/sambaSamAccount.inc:322
 msgid ""
 "This is the time zone of your Samba server. LAM needs this information to "
 "display the logon hours correctly."
@@ -7368,15 +7703,19 @@ msgstr ""
 "Sambaサーバのタイムゾーン。LAMがログオン時間を正確に表示するために、この情報"
 "が必要です。"
 
-#: ../lib/modules/sambaSamAccount.inc:297
+#: ../lib/modules/sambaSamAccount.inc:294
 msgid "This is the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループです。"
 
+#: ../lib/modules/zarafaUser.inc:101
+msgid "This is used to mark this account as resource."
+msgstr "このアカウントがリソースである事の目印として使用します。"
+
 #: ../lib/modules/posixAccount.inc:93
 msgid "This login shell is invalid!"
 msgstr "ログインシェルが正しくありません!"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:235
+#: ../lib/modules/inetLocalMailRecipient.inc:221
 msgid "This mail address is already in use:"
 msgstr "このメールアドレスは既に使用されています:"
 
@@ -7388,12 +7727,12 @@ msgstr "個のモジュールはPHP ssh2拡張を必要とします。"
 msgid "This object class is obsolete."
 msgstr "このオブジェクトクラスは旧式です。"
 
-#: ../lib/modules/sambaSamAccount.inc:316
+#: ../lib/modules/sambaSamAccount.inc:313
 msgid "This option defines the allowed logon hours for this account."
 msgstr ""
 "このオプションは、このアカウントがログオンを許可される時間を定義します。"
 
-#: ../lib/modules/sambaSamAccount.inc:319
+#: ../lib/modules/sambaSamAccount.inc:316
 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 "
@@ -7404,23 +7743,23 @@ msgstr ""
 "時間が168ビットに写影され、21桁の16進数(21*8=168)の値として保存されます。先頭"
 "の1ビットはグリニッジ標準時で日曜の0:00 - 0:59を意味します。"
 
-#: ../lib/modules/asteriskExtension.inc:206
+#: ../lib/modules/asteriskExtension.inc:197
 msgid "This pair of extension name and priority already exists."
 msgstr "この拡張名とポリシーは既に存在しています。"
 
-#: ../lib/modules/sambaSamAccount.inc:340
+#: ../lib/modules/sambaSamAccount.inc:337
 msgid "This program is run after the login."
 msgstr "このプログラムはログオンの後に実行されます。"
 
-#: ../lib/modules/sambaSamAccount.inc:364
+#: ../lib/modules/sambaSamAccount.inc:361
 msgid "This specifies the reconnect policy."
 msgstr "再接続のポリシーを記述します。"
 
-#: ../lib/modules/sambaSamAccount.inc:361
+#: ../lib/modules/sambaSamAccount.inc:358
 msgid "This specifies what to do when the client connection is broken."
 msgstr "クライアント接続が壊れた場合の処理を記述します。"
 
-#: ../help/help.inc:178
+#: ../help/help.inc:173
 msgid ""
 "This text is displayed on top of the self service login page. You can also "
 "input HTML code here."
@@ -7428,7 +7767,7 @@ msgstr ""
 "この文字列はセルフサービス・ログインページのトップに表示されます。ここには"
 "HTMLコードを書く事もできます。"
 
-#: ../help/help.inc:180
+#: ../help/help.inc:175
 msgid ""
 "This text is displayed on top of the self service main page. You can also "
 "input HTML code here."
@@ -7436,13 +7775,13 @@ msgstr ""
 "この文字列はセルフサービス・メインページのトップに表示されます。ここにはHTML"
 "コードを書く事もできます。"
 
-#: ../help/help.inc:176
+#: ../help/help.inc:171
 msgid ""
 "This text should shortly describe your selected LDAP search attribute (e.g. "
 "email or user name)."
 msgstr "この文字列はLDAP検索属性を簡単に説明します(例. emailまたはユーザ名)。"
 
-#: ../help/help.inc:105
+#: ../help/help.inc:102
 msgid "This text will appear on top of every user PDF file."
 msgstr "このテキストは、各ユーザのPDFファイルの先頭に表示されます。"
 
@@ -7450,53 +7789,58 @@ msgstr "このテキストは、各ユーザのPDFファイルの先頭に表示
 msgid "This tool allows you to customize the PDF pages."
 msgstr "このツールで、あなたのPDFページをカスタマイズする事ができます。"
 
-#: ../templates/lists/userlink.php:61 ../templates/lists/changePassword.php:46
+#: ../templates/lists/userlink.php:61 ../templates/lists/changePassword.php:43
 msgid "This user was not found!"
 msgstr "ユーザが見つかりません!"
 
-#: ../lib/modules/sambaSamAccount.inc:97 ../lib/modules/sambaSamAccount.inc:98
-#: ../lib/modules/sambaSamAccount.inc:99
-#: ../lib/modules/sambaSamAccount.inc:100
-msgid "This value can only be \\\"true\\\" or \\\"false\\\"!"
+#: ../lib/modules/zarafaUser.inc:338
+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/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
+#: ../lib/modules/zarafaServer.inc:126
+msgid "This value can only be \"true\" or \"false\"."
 msgstr "この値は、\"true\"または\"false\"のいずれかでなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:94
-msgid "This value can only be \\\"true\\\" or \\\"false\\\"."
-msgstr "この値は、\"true\"または\"false\"のいずれかでなくてはなりません。"
-
-#: ../lib/modules/posixGroup.inc:478
+#: ../lib/modules/posixGroup.inc:490
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "この値はセミコロンで区切られたユーザ名でなくてはなりません。"
 
-#: ../help/help.inc:201
+#: ../help/help.inc:204
 msgid "This will create a new organizational unit under the selected one."
 msgstr "選択された位置の下に新しい organizational unit を作成します。"
 
-#: ../lib/modules/posixAccount.inc:362
+#: ../lib/modules/posixAccount.inc:348
 msgid "This will create the user's home directory on the specified server."
 msgstr "ユーザのホームディレクトリを指定されたサーバ上に作成します。"
 
-#: ../help/help.inc:203
+#: ../help/help.inc:206
 msgid ""
 "This will delete the selected organizational unit. The OU has to be empty."
 msgstr ""
 "選択された organizational unitを削除します。OUは空でなくてはなりません。"
 
-#: ../help/help.inc:126
+#: ../help/help.inc:123
 msgid "This will delete the selected profile."
 msgstr "選択されたプロファイルを削除します。"
 
-#: ../lib/modules/eduPerson.inc:128 ../lib/modules/sambaSamAccount.inc:376
-#: ../lib/modules/phpGroupwareUser.inc:87 ../lib/modules/shadowAccount.inc:194
-#: ../lib/modules/hostObject.inc:77
+#: ../lib/modules/eduPerson.inc:128 ../lib/modules/sambaSamAccount.inc:373
+#: ../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:241
+#: ../lib/modules/sambaSamAccount.inc:238
 msgid "This will reset the host's password to a default value."
 msgstr "ホストのパスワードをデフォルト値にリセットします。"
 
-#: ../templates/lists/changePassword.php:171 ../help/help.inc:190
+#: ../templates/lists/changePassword.php:203 ../help/help.inc:185
 msgid ""
 "This will set a random password and display it on the screen or send it the "
 "user via mail."
@@ -7504,7 +7848,7 @@ msgstr ""
 "ランダムなパスワードを設定し、これを画面上に表示するか、または、ユーザにメー"
 "ルで送信します。"
 
-#: ../lib/modules/kolabUser.inc:176
+#: ../lib/modules/kolabUser.inc:164
 msgid ""
 "This will set a special flag on the account which tells Kolabd to remove it. "
 "Use this to cleanly delete Kolab accounts (e.g. this removes mail boxes)."
@@ -7512,20 +7856,20 @@ msgstr ""
 "Kolabdに削除を命ずる特殊なフラグをセットします。Kolabアカウントを完全に削除す"
 "る場合に使用します(e.g. メールボックスは削除されます)。"
 
-#: ../lib/modules/sambaSamAccount.inc:1319
+#: ../lib/modules/sambaSamAccount.inc:1280
 msgid "Thursday"
 msgstr "木曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:1360
+#: ../lib/modules/sambaSamAccount.inc:1302
 msgid "Time"
 msgstr "時刻"
 
-#: ../lib/modules/sambaSamAccount.inc:345
+#: ../lib/modules/sambaSamAccount.inc:342
 msgid "Time limit"
 msgstr "時間制限"
 
-#: ../lib/modules/sambaSamAccount.inc:324
-#: ../lib/modules/sambaSamAccount.inc:526
+#: ../lib/modules/sambaSamAccount.inc:321
+#: ../lib/modules/sambaSamAccount.inc:549
 msgid "Time zone"
 msgstr "タイムゾーン"
 
@@ -7533,7 +7877,7 @@ msgstr "タイムゾーン"
 msgid "Timeout while executing lamdaemon commands!"
 msgstr "lamdaemonコマンドの実行がタイムアウトしました!"
 
-#: ../lib/modules/posixAccount.inc:391
+#: ../lib/modules/posixAccount.inc:377
 msgid ""
 "To disable login use /bin/false. The list of shells is read from lam/config/"
 "shells"
@@ -7541,15 +7885,15 @@ msgstr ""
 "ログインを禁止するためには/bin/falseを使ってください。シェルの一覧は lam/"
 "config/shells から読み込まれます。"
 
-#: ../lib/modules/sambaSamAccount.inc:550
+#: ../lib/modules/sambaSamAccount.inc:543
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "東京、ソウル、大阪、ヤクーツク"
 
-#: ../templates/main_header.php:65
+#: ../templates/main_header.php:73
 msgid "Tools"
 msgstr "ツール"
 
-#: ../lib/export.inc:444 ../lib/export.inc:514
+#: ../lib/export.inc:446 ../lib/export.inc:516
 msgid "Total entries"
 msgstr "エントリ総数"
 
@@ -7557,24 +7901,27 @@ msgstr "エントリ総数"
 msgid "Translate GID number to group name"
 msgstr "GID番号をグループ名に変換"
 
-#: ../templates/config/confmain.php:262 ../help/help.inc:76
+#: ../templates/config/confmain.php:269 ../help/help.inc:73
 msgid "Tree suffix"
 msgstr "ツリーサフィックス"
 
-#: ../templates/main_header.php:77
+#: ../templates/main_header.php:87
 msgid "Tree view"
 msgstr "ツリービュー"
 
-#: ../templates/config/confmain.php:583
+#: ../templates/config/confmain.php:610
 msgid "TreeSuffix is invalid!"
 msgstr "ツリーサフィックスが正しくありません!"
 
-#: ../lib/modules/sambaSamAccount.inc:1319
+#: ../lib/modules/sambaSamAccount.inc:1280
 msgid "Tuesday"
 msgstr "木曜日"
 
-#: ../templates/selfService/profManage.php:156
-#: ../templates/schema/schema.php:346
+#: ../templates/selfService/profManage.php:175
+#: ../templates/schema/schema.php:346 ../lib/modules/zarafaUser.inc:100
+#: ../lib/modules/zarafaUser.inc:146 ../lib/modules/zarafaUser.inc:212
+#: ../lib/modules/zarafaUser.inc:311 ../lib/modules/zarafaUser.inc:467
+#: ../lib/modules/zarafaUser.inc:1044
 msgid "Type"
 msgstr "型"
 
@@ -7593,11 +7940,11 @@ msgid ""
 msgstr "UIDは数値で、設定ファイルで定義されたUIDの範囲内でなくてはなりません。"
 
 #: ../lib/types/host.inc:95 ../lib/types/user.inc:92
-#: ../lib/modules/posixAccount.inc:74 ../lib/modules/posixAccount.inc:216
-#: ../lib/modules/posixAccount.inc:290 ../lib/modules/posixAccount.inc:312
-#: ../lib/modules/posixAccount.inc:329 ../lib/modules/posixAccount.inc:333
-#: ../lib/modules/posixAccount.inc:341 ../lib/modules/posixAccount.inc:950
-#: ../lib/modules/posixAccount.inc:1177
+#: ../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
 msgid "UID number"
 msgstr "UID番号"
 
@@ -7615,7 +7962,7 @@ msgstr ""
 msgid "UID ranges for Unix accounts"
 msgstr "unixアカウントに対するUIDの範囲"
 
-#: ../lib/modules/sambaSamAccount.inc:282
+#: ../lib/modules/sambaSamAccount.inc:279
 msgid ""
 "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced "
 "with user and group name."
@@ -7628,7 +7975,7 @@ msgid ""
 "URI (either URN or URL) that indicates a set of rights to specific resources."
 msgstr "特定のリソースに対する権利の集合を示すURL(あるいはURNまたはURL)。"
 
-#: ../templates/selfService/selfServiceMain.php:264
+#: ../templates/selfService/selfServiceMain.php:273
 msgid ""
 "Unable to change your account. Maybe you do not have enough rights to change "
 "the settings."
@@ -7636,8 +7983,8 @@ msgstr ""
 "アカウントを変更できません。あなたはおそらく、設定を変更する権限を持っていま"
 "せん。"
 
-#: ../templates/tests/lamdaemonTest.php:241 ../lib/lamdaemon.inc:88
-#: ../lib/lamdaemon.inc:93 ../lib/lamdaemon.inc:137 ../lib/lamdaemon.inc:142
+#: ../templates/tests/lamdaemonTest.php:239 ../lib/lamdaemon.inc:88
+#: ../lib/lamdaemon.inc:93 ../lib/lamdaemon.inc:140 ../lib/lamdaemon.inc:145
 msgid "Unable to connect to remote server!"
 msgstr "リモートサーバーに接続できません!"
 
@@ -7645,8 +7992,8 @@ msgstr "リモートサーバーに接続できません!"
 msgid "Unable to create new OU!"
 msgstr "新しいOUを作成できません!"
 
-#: ../templates/config/profmanage.php:96
-#: ../templates/selfService/profManage.php:82
+#: ../templates/config/profmanage.php:122
+#: ../templates/selfService/profManage.php:101
 msgid "Unable to create new profile!"
 msgstr "新しいプロファイルを作成できません!"
 
@@ -7658,26 +8005,26 @@ msgstr "OUを削除できません!"
 msgid "Unable to delete PDF structure!"
 msgstr "PDF構成を削除できません!"
 
-#: ../templates/config/profmanage.php:118
-#: ../templates/selfService/profManage.php:110
+#: ../templates/config/profmanage.php:146
+#: ../templates/selfService/profManage.php:129
 #: ../templates/profedit/profilemain.php:111
 msgid "Unable to delete profile!"
 msgstr "プロファイルを削除できません!"
 
-#: ../lib/modules/posixAccount.inc:1364 ../lib/modules/posixAccount.inc:1598
-#: ../lib/modules/nisnetgroup.inc:530
+#: ../lib/modules/posixAccount.inc:1352 ../lib/modules/posixAccount.inc:1586
+#: ../lib/modules/nisnetgroup.inc:538
 msgid "Unable to find group in LDAP."
 msgstr "LDAP内にグループが見つかりません。"
 
-#: ../templates/login.php:439 ../templates/login.php:445
+#: ../templates/login.php:482 ../templates/login.php:488
 msgid "Unable to find the user name in LDAP."
 msgstr "LDAP内にユーザー名が見つかりません。"
 
-#: ../lib/modules.inc:1677 ../lib/modules.inc:1681
+#: ../lib/modules.inc:1698 ../lib/modules.inc:1702
 msgid "Unable to load LDAP entry:"
 msgstr "LDAPエントリをロードできません:"
 
-#: ../templates/config/confmain.php:381
+#: ../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."
@@ -7690,7 +8037,7 @@ msgstr ""
 msgid "Unable to load profile!"
 msgstr "プロファイルをロードできません!"
 
-#: ../templates/lists/changePassword.php:385
+#: ../templates/lists/changePassword.php:416
 msgid "Unable to read sambaSID attribute."
 msgstr "sambaSID属性の読み込みができません。"
 
@@ -7700,17 +8047,17 @@ msgstr "sambaSID属性の読み込みができません。"
 msgid "Unable to retrieve schema!"
 msgstr "スキーマを取得できません!"
 
-#: ../templates/selfService/adminMain.php:150
+#: ../templates/selfService/adminMain.php:141
 #: ../templates/profedit/profilepage.php:113
 msgid "Unable to save profile!"
 msgstr "プロファイルを保存できません!"
 
-#: ../templates/lists/changePassword.php:341
+#: ../templates/lists/changePassword.php:372
 msgid "Unable to send mail!"
 msgstr "メールを送信できません!"
 
-#: ../templates/lists/changePassword.php:381
-#: ../templates/lists/changePassword.php:396
+#: ../templates/lists/changePassword.php:412
+#: ../templates/lists/changePassword.php:427
 msgid ""
 "Unable to sync the time when the user can/must change his password because "
 "no domain was found."
@@ -7718,23 +8065,28 @@ msgstr ""
 "ドメインが見つからないため、ユーザによるパスワード変更が許可/強制される時刻を"
 "同期できません。"
 
-#: ../lib/modules/posixGroup.inc:283 ../lib/modules/posixAccount.inc:127
+#: ../lib/modules/posixGroup.inc:297 ../lib/modules/posixAccount.inc:127
 msgid "Unix"
 msgstr "unix"
 
-#: ../templates/tests/lamdaemonTest.php:199
+#: ../templates/tests/lamdaemonTest.php:197
 msgid "Unix account"
 msgstr "unixアカウント"
 
-#: ../templates/lists/changePassword.php:111
+#: ../lib/modules/kolabUser.inc:238
+#, php-format
+msgid "Unknown delegate address: %s"
+msgstr "未知の委任アドレス: %s"
+
+#: ../templates/lists/changePassword.php:143
 msgid "Unlock Samba account"
 msgstr "Sambaアカウントのアンロック"
 
-#: ../lib/modules/posixGroup.inc:191 ../lib/modules/posixAccount.inc:1001
+#: ../lib/modules/posixGroup.inc:206 ../lib/modules/posixAccount.inc:1012
 msgid "Unlock password"
 msgstr "パスワード・ロックの解除"
 
-#: ../templates/masscreate.php:98 ../templates/config/confmodules.php:359
+#: ../templates/masscreate.php:98 ../templates/config/confmodules.php:363
 msgid "Unsolved dependency:"
 msgstr "依存関係が解決できませんでした:"
 
@@ -7742,19 +8094,19 @@ msgstr "依存関係が解決できませんでした:"
 msgid "Up"
 msgstr "上"
 
-#: ../templates/lists/changePassword.php:114
+#: ../templates/lists/changePassword.php:146
 msgid "Update Samba password timestamps"
 msgstr "Sambaパスワードのタイムスタンプを更新"
 
-#: ../lib/modules/sambaSamAccount.inc:229
+#: ../lib/modules/sambaSamAccount.inc:226
 msgid "Update attribute \"sambaPwdLastSet\" on password change"
 msgstr "パスワード変更時に属性 \"sambaPwdLastSet\" を更新する。"
 
-#: ../templates/massBuildAccounts.php:199
+#: ../templates/massBuildAccounts.php:198
 msgid "Upload accounts to LDAP"
 msgstr "アカウントをLDAPにアップロード"
 
-#: ../templates/masscreate.php:225
+#: ../templates/masscreate.php:223
 msgid "Upload file and create accounts"
 msgstr "ファイルをアップロードして、アカウントを作成します。"
 
@@ -7767,21 +8119,25 @@ msgstr "%s モジュールでエラーが発生したため、アプロードを
 msgid "Usage"
 msgstr "使用方法"
 
+#: ../lib/modules/sambaSamAccount.inc:240
 #: ../lib/modules/sambaSamAccount.inc:243
-#: ../lib/modules/sambaSamAccount.inc:246
-#: ../lib/modules/sambaSamAccount.inc:404
+#: ../lib/modules/sambaSamAccount.inc:401
 msgid "Use Unix password"
 msgstr "unixパスワードを使用"
 
+#: ../lib/modules/sambaSamAccount.inc:246
 #: ../lib/modules/sambaSamAccount.inc:249
-#: ../lib/modules/sambaSamAccount.inc:252
-#: ../lib/modules/sambaSamAccount.inc:412
-#: ../lib/modules/sambaSamAccount.inc:1090
-#: ../lib/modules/sambaSamAccount.inc:1548
+#: ../lib/modules/sambaSamAccount.inc:409
+#: ../lib/modules/sambaSamAccount.inc:1068
+#: ../lib/modules/sambaSamAccount.inc:1473
 msgid "Use no password"
 msgstr "パスワードなし"
 
-#: ../lib/modules/quota.inc:101 ../lib/modules/quota.inc:382
+#: ../lib/modules/zarafaGroup.inc:76 ../lib/modules/zarafaUser.inc:65
+msgid "Use this to hide this entry from the address book."
+msgstr "このエントリをアドレス帳から隠す場合に使用します。"
+
+#: ../lib/modules/quota.inc:101 ../lib/modules/quota.inc:388
 msgid "Used blocks"
 msgstr "使用したブロック"
 
@@ -7802,7 +8158,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:386
+#: ../lib/modules/quota.inc:123 ../lib/modules/quota.inc:392
 msgid "Used inodes"
 msgstr "使用したinode"
 
@@ -7810,8 +8166,8 @@ msgstr "使用したinode"
 msgid "Used inodes (files)"
 msgstr "使用したinode(ファイル)"
 
-#: ../lib/modules/sambaGroupMapping.inc:67 ../lib/modules/nisnetgroup.inc:208
-#: ../lib/modules/nisnetgroup.inc:578
+#: ../lib/modules/sambaGroupMapping.inc:67 ../lib/modules/nisnetgroup.inc:204
+#: ../lib/modules/nisnetgroup.inc:586
 msgid "User"
 msgstr "ユーザ"
 
@@ -7823,17 +8179,17 @@ msgstr "ユーザ ID"
 msgid "User accounts (e.g. Unix, Samba and Kolab)"
 msgstr "ユーザアカウント(e.g. Unix, Samba and Kolab)"
 
-#: ../lib/modules/sambaSamAccount.inc:273
-#: ../lib/modules/sambaSamAccount.inc:1116
+#: ../lib/modules/sambaSamAccount.inc:270
+#: ../lib/modules/sambaSamAccount.inc:1082
 msgid "User can change password"
 msgstr "ユーザはパスワードを変更可能"
 
-#: ../lib/modules/posixAccount.inc:371
+#: ../lib/modules/posixAccount.inc:357
 msgid "User description. If left empty first and last name will be used."
 msgstr ""
 "ユーザの説明。もしも空ならば、姓(last name)と名(first name)が使われます。"
 
-#: ../lib/modules/inetOrgPerson.inc:492
+#: ../lib/modules/inetOrgPerson.inc:481
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "ユーザの説明。もしも空ならば、姓(surname)と名(given)が使われます。"
 
@@ -7845,28 +8201,29 @@ msgstr "ユーザの説明。もしも空ならば、ユーザ名が使われま
 msgid "User modification"
 msgstr "ユーザによる変更"
 
-#: ../lib/modules/sambaSamAccount.inc:275
-#: ../lib/modules/sambaSamAccount.inc:1122
+#: ../lib/modules/sambaSamAccount.inc:272
+#: ../lib/modules/sambaSamAccount.inc:1088
 msgid "User must change password"
 msgstr "ユーザはパスワード変更が必要"
 
-#: ../templates/lists/changePassword.php:145 ../templates/login.php:241
+#: ../templates/lists/changePassword.php:177 ../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:201
-#: ../lib/modules/account.inc:223 ../lib/modules/account.inc:247
+#: ../lib/modules/account.inc:119 ../lib/modules/account.inc:205
+#: ../lib/modules/account.inc:231 ../lib/modules/account.inc:255
 #: ../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:202
-#: ../lib/modules/posixAccount.inc:311 ../lib/modules/posixAccount.inc:366
-#: ../lib/modules/posixAccount.inc:938 ../lib/modules/posixAccount.inc:1175
-#: ../lib/modules/nisnetgroup.inc:137 ../lib/modules/nisnetgroup.inc:458
-#: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:484
-#: ../lib/modules/inetOrgPerson.inc:551 ../lib/modules/inetOrgPerson.inc:822
-#: ../lib/modules/inetOrgPerson.inc:1140 ../lib/modules/inetOrgPerson.inc:1198
+#: ../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
 msgid "User name"
 msgstr "ユーザ名"
 
@@ -7877,6 +8234,7 @@ 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/zarafaUser.inc:343 ../lib/modules/zarafaUser.inc:344
 #: ../lib/modules/nisnetgroup.inc:137 ../lib/modules/inetOrgPerson.inc:70
 #: ../lib/modules/inetOrgPerson.inc:71
 msgid ""
@@ -7889,11 +8247,11 @@ msgstr ""
 msgid "User name in use. Selected next free user name."
 msgstr "使用中のユーザ名です。次の空きユーザ名が選択されました。"
 
-#: ../lib/modules/account.inc:95 ../lib/modules/posixAccount.inc:367
-#: ../lib/modules/inetOrgPerson.inc:552
+#: ../lib/modules/account.inc:95 ../lib/modules/posixAccount.inc:353
+#: ../lib/modules/inetOrgPerson.inc:541
 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 "
+"User name of the user who should be created. Valid characters are: a-z,A-"
+"Z,0-9, .-_. If user name is already used user name will be expanded with a "
 "number. The next free number will be used. Warning: Older systems have "
 "problems with user names longer than 8 characters. You can not log in to "
 "Windows if user name is longer than 16 characters."
@@ -7903,21 +8261,31 @@ msgstr ""
 "合、次の空き番号が使われます。警告: 古いシステムでは、8文字より長いユーザ名で"
 "問題が発生します。16文字より長いユーザ名ではWindowsにログオンできません。"
 
+#: ../lib/modules/zarafaUser.inc:112 ../lib/modules/zarafaUser.inc:154
+#: ../lib/modules/zarafaUser.inc:249 ../lib/modules/zarafaUser.inc:323
+#: ../lib/modules/zarafaUser.inc:522 ../lib/modules/zarafaUser.inc:1056
+#: ../lib/modules/zarafaUser.inc:1114
+msgid "User server"
+msgstr "ユーザー・サーバー"
+
 #: ../lib/types/sudo.inc:78
 msgid "User(s)"
 msgstr "ユーザ"
 
-#: ../lib/types/user.inc:53 ../lib/modules/asteriskAccount.inc:102
-#: ../lib/modules/posixAccount.inc:59 ../lib/modules/posixAccount.inc:60
-#: ../lib/modules/posixAccount.inc:63 ../lib/modules/posixAccount.inc:162
-#: ../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:285
-#: ../lib/modules/sudoRole.inc:708
+#: ../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/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
 msgid "Users"
 msgstr "ユーザ"
 
-#: ../lib/modules/posixGroup.inc:388
+#: ../lib/modules/zarafaUser.inc:89
+msgid "Users or groups that may directly send email as this user."
+msgstr "このユーザーからメールを直接発信できるユーザーまたはグループ。"
+
+#: ../lib/modules/posixGroup.inc:402
 msgid ""
 "Users who are member of the current group. Users who have set their primary "
 "group to this group will not be shown."
@@ -7925,7 +8293,7 @@ msgstr ""
 "このグループに所属しているユーザ。このグループをプライマリに設定されている"
 "ユーザは表示されません。"
 
-#: ../lib/modules/posixGroup.inc:392
+#: ../lib/modules/posixGroup.inc:406
 msgid ""
 "Users who will become member of the current group. User names are separated "
 "by semicolons."
@@ -7933,12 +8301,12 @@ msgstr ""
 "このグループのメンバーとなるユーザ。ユーザ名はセミコロンによって区切られま"
 "す。"
 
-#: ../templates/tests/lamdaemonTest.php:191
+#: ../templates/tests/lamdaemonTest.php:189
 #, php-format
 msgid "Using %s as lamdaemon remote server."
 msgstr "lamdaemonリモートサーバとして %s を使用します。"
 
-#: ../templates/tests/lamdaemonTest.php:212
+#: ../templates/tests/lamdaemonTest.php:210
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "%sを使用してリモートサーバーに接続します。"
@@ -7947,7 +8315,7 @@ msgstr "%sを使用してリモートサーバーに接続します。"
 msgid "Using template:"
 msgstr "テンプレートを使用:"
 
-#: ../lib/modules/posixAccount.inc:326
+#: ../lib/modules/posixAccount.inc:312
 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 "
@@ -7957,7 +8325,7 @@ msgstr ""
 "ん。もし使用するアプリケーションがプライマリグループを無視する場合は、このオ"
 "プションを有効にして、この動作を変更してください。"
 
-#: ../help/help.inc:87
+#: ../help/help.inc:84
 msgid "Valid users"
 msgstr "有効なユーザ"
 
@@ -7969,33 +8337,33 @@ msgstr "ベンダー名"
 msgid "Vendor version"
 msgstr "ベンダー・バージョン"
 
-#: ../lib/modules/asteriskVoicemail.inc:106
+#: ../lib/modules/asteriskVoicemail.inc:110
 #: ../lib/modules/asteriskVoicemail.inc:117
-#: ../lib/modules/asteriskVoicemail.inc:139
-#: ../lib/modules/asteriskVoicemail.inc:192
-#: ../lib/modules/asteriskVoicemail.inc:261
-#: ../lib/modules/asteriskVoicemail.inc:376
+#: ../lib/modules/asteriskVoicemail.inc:134
+#: ../lib/modules/asteriskVoicemail.inc:187
+#: ../lib/modules/asteriskVoicemail.inc:279
+#: ../lib/modules/asteriskVoicemail.inc:391
 msgid "Voicemail context"
 msgstr "ボイスメール・コンテキスト"
 
-#: ../lib/modules/asteriskVoicemail.inc:83
+#: ../lib/modules/asteriskVoicemail.inc:87
 msgid "Voicemail mailbox for this account."
 msgstr "このアカウントに対するボイスメール・メールボックス"
 
-#: ../templates/login.php:180
+#: ../templates/login.php:405
 msgid "Want more features? Get LAM Pro!"
 msgstr "Want more features? Get LAM Pro!"
 
-#: ../templates/config/mainmanage.php:267
+#: ../templates/config/mainmanage.php:287
 msgid "Warning"
 msgstr "警告"
 
-#: ../templates/delete.php:194 ../lib/modules.inc:1972
+#: ../templates/delete.php:195 ../lib/modules.inc:1993
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "DN %s に属性を追加できませんでした。"
 
-#: ../lib/modules.inc:1942
+#: ../lib/modules.inc:1963
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "DN %s を作成できませんでした。"
@@ -8007,36 +8375,42 @@ 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:186
-#: ../lib/modules.inc:1960
+#: ../templates/tree/add_oclass_form.php:162 ../templates/delete.php:187
+#: ../lib/modules.inc:1981
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "DN %s の属性を変更できませんでした。"
 
-#: ../templates/lists/changePassword.php:422
+#: ../templates/lists/changePassword.php:453
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "DN %s の属性を変更できませんでした。"
 
-#: ../templates/delete.php:202 ../lib/modules.inc:1984
+#: ../templates/delete.php:203 ../lib/modules.inc:2005
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "DN %s の属性を削除できませんでした。"
 
-#: ../lib/modules.inc:1923
+#: ../lib/modules.inc:1944
 #, php-format
 msgid "Was unable to rename DN: %s."
 msgstr "DNを変更できませんでした: %s。"
 
-#: ../lib/modules/sambaSamAccount.inc:1319
+#: ../lib/modules/sambaSamAccount.inc:1280
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:541
+#: ../lib/modules/sambaSamAccount.inc:534
 msgid "Western Europe Time, London, Lisbon"
 msgstr "Western Europe Time, London, Lisbon"
 
-#: ../help/help.inc:69
+#: ../lib/modules/zarafaUser.inc:85
+msgid ""
+"When the hard quota limit is reached, email can not be delivered to that "
+"user anymore."
+msgstr "ハードquotaリミットに達した場合、該当ユーザーへのeメールは一切配送されません。"
+
+#: ../help/help.inc:66
 msgid ""
 "When using ldaps:// or TLS be sure to use exactly the same IP/domain name as "
 "in your certificate!"
@@ -8044,30 +8418,30 @@ msgstr ""
 "ldaps:// またはTLSを使う時は、証明書のIP/ドメイン名と正確に一致するものを使用"
 "してください!"
 
-#: ../lib/modules/sambaSamAccount.inc:313
+#: ../lib/modules/sambaSamAccount.inc:310
 msgid "Windows domain name of account."
 msgstr "アカウントのWindowsドメイン名"
 
-#: ../lib/modules/sambaSamAccount.inc:191
-#: ../lib/modules/sambaSamAccount.inc:443
-#: ../lib/modules/sambaSamAccount.inc:1208
-#: ../lib/modules/sambaSamAccount.inc:1635
-#: ../lib/modules/sambaSamAccount.inc:1784
+#: ../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:310
-#: ../lib/modules/sambaGroupMapping.inc:387
+#: ../lib/modules/sambaGroupMapping.inc:300
+#: ../lib/modules/sambaGroupMapping.inc:377
 msgid "Windows group"
 msgstr "Windowsグループ"
 
-#: ../lib/modules/sambaGroupMapping.inc:359
+#: ../lib/modules/sambaGroupMapping.inc:349
 msgid "Windows group name"
 msgstr "Windowsグループ名"
 
-#: ../lib/modules/sambaGroupMapping.inc:372
+#: ../lib/modules/sambaGroupMapping.inc:362
 msgid "Windows group type."
 msgstr "Windowsグループタイプ"
 
-#: ../lib/modules/sambaSamAccount.inc:370
+#: ../lib/modules/sambaSamAccount.inc:367
 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 "
@@ -8077,15 +8451,15 @@ msgstr ""
 "されます。LMハッシュはセキュアでないため、古いバージョンのWindowsでのみ必要と"
 "なります。本当に必要な場合を除いて、無効にすべきです。"
 
-#: ../lib/modules/sambaSamAccount.inc:296
+#: ../lib/modules/sambaSamAccount.inc:293
 msgid "Windows primary group"
 msgstr "Windowsプライマリグループ"
 
-#: ../lib/modules/sambaSamAccount.inc:299
+#: ../lib/modules/sambaSamAccount.inc:296
 msgid "Windows primary group SID"
 msgstr "WindowsプライマリグループSID"
 
-#: ../lib/modules/sambaGroupMapping.inc:368
+#: ../lib/modules/sambaGroupMapping.inc:358
 msgid "Windows-Domain name of group."
 msgstr "グループのWindowsドメイン名。"
 
@@ -8093,26 +8467,26 @@ msgstr "グループのWindowsドメイン名。"
 msgid "Workgroup"
 msgstr "ワークグループ"
 
-#: ../lib/modules/sambaSamAccount.inc:215
-#: ../lib/modules/sambaSamAccount.inc:342
-#: ../lib/modules/sambaSamAccount.inc:1461
-#: ../lib/modules/sambaSamAccount.inc:1804
+#: ../lib/modules/sambaSamAccount.inc:212
+#: ../lib/modules/sambaSamAccount.inc:339
+#: ../lib/modules/sambaSamAccount.inc:1409
+#: ../lib/modules/sambaSamAccount.inc:1681
 msgid "Working directory"
 msgstr "作業ディレクトリ"
 
-#: ../lib/modules/sambaSamAccount.inc:343
+#: ../lib/modules/sambaSamAccount.inc:340
 msgid "Working directory of initial program."
 msgstr "初期プログラムの作業ディレクトリ。"
 
-#: ../templates/config/confmain.php:435
+#: ../templates/config/confmain.php:442
 msgid "Write"
 msgstr "書く"
 
-#: ../templates/config/confmain.php:320 ../templates/config/confmain.php:323
+#: ../templates/config/confmain.php:327 ../templates/config/confmain.php:330
 msgid "Write access"
 msgstr "書き込みアクセス"
 
-#: ../templates/login.php:427 ../templates/login.php:485
+#: ../templates/login.php:470 ../templates/login.php:528
 #: ../templates/selfService/selfServiceLogin.php:98
 #: ../templates/selfService/selfServiceLogin.php:116
 msgid "Wrong password/user name combination. Please try again."
@@ -8123,7 +8497,7 @@ msgstr "誤ったパスワード/ユーザ名の組み合わせです。やり
 msgid "Yes"
 msgstr "はい"
 
-#: ../lib/modules/posixGroup.inc:474
+#: ../lib/modules/posixGroup.inc:486
 msgid ""
 "You are using a capital letters. This can cause problems because Windows "
 "isn't case-sensitive."
@@ -8143,9 +8517,11 @@ msgstr ""
 msgid ""
 "You are using capital letters. This can cause problems because Windows is "
 "not case-sensitive."
-msgstr "大文字が使われています。Windowsは大文字と小文字を区別しないため、問題が発生する場合があります。"
+msgstr ""
+"大文字が使われています。Windowsは大文字と小文字を区別しないため、問題が発生す"
+"る場合があります。"
 
-#: ../help/help.inc:103
+#: ../help/help.inc:100
 msgid ""
 "You can specify if LAM allows full write access, password changes or only "
 "read access."
@@ -8153,7 +8529,11 @@ msgstr ""
 "LAMに完全な書き込み、パスワード変更のみ、または読み込みのみのいずれの権限を許"
 "可するかを指定できます。"
 
-#: ../help/help.inc:195
+#: ../lib/modules/zarafaGroup.inc:80 ../lib/modules/zarafaUser.inc:69
+msgid "You can use this to temporarily deactivate the Zarafa extension."
+msgstr "Zarafa拡張を一時的に無効化させるために使用する事が出来ます。"
+
+#: ../help/help.inc:190 ../help/help.inc:199
 msgid ""
 "You can use wildcards for LDAP attributes in the form @@attribute@@ (e.g. "
 "@@uid@@ for the user name)."
@@ -8186,11 +8566,11 @@ msgstr ""
 "必要なアクセス権が与えられていないか、またはLDAPスキーマがサーバ上に存在しま"
 "せん。"
 
-#: ../lib/modules/dhcp_settings.inc:304 ../lib/modules/dhcp_settings.inc:305
+#: ../lib/modules/dhcp_settings.inc:276 ../lib/modules/dhcp_settings.inc:277
 msgid "You entered one or more invalid DNS servers."
 msgstr "誤ったDNSサーバーが入力されています。"
 
-#: ../templates/lists/changePassword.php:285
+#: ../templates/lists/changePassword.php:321
 msgid "You have to activate the \"I am sure\" checkbox."
 msgstr "\"確認\"のチェックボックスを有効にする必要があります。"
 
@@ -8211,7 +8591,7 @@ msgstr "変更されませんでした。"
 msgid "You need to add at least one member to this group."
 msgstr "少なくとも一つのメンバーをこのグループへ追加する必要があります。"
 
-#: ../templates/tests/lamdaemonTest.php:216
+#: ../templates/tests/lamdaemonTest.php:214
 #, php-format
 msgid ""
 "Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"
@@ -8219,8 +8599,8 @@ msgstr ""
 "lamdaemonと連携するには、LAM管理ユーザ(%s)が有効なunixアカウントでなくてはな"
 "りません。"
 
-#: ../lib/lamdaemon.inc:60 ../lib/lamdaemon.inc:65 ../lib/lamdaemon.inc:122
-#: ../lib/lamdaemon.inc:127
+#: ../lib/lamdaemon.inc:60 ../lib/lamdaemon.inc:65 ../lib/lamdaemon.inc:125
+#: ../lib/lamdaemon.inc:130
 msgid ""
 "Your LAM admin user must be a valid Unix account to work with lamdaemon!"
 msgstr ""
@@ -8241,26 +8621,31 @@ msgstr ""
 "セッションが期限切れになりました。ここをクリックしてログインページに戻ってく"
 "ださい。"
 
-#: ../templates/login.php:206
+#: ../templates/login.php:233
 msgid "Your session expired, please log in again."
 msgstr "セッションが期限切れになりました。ログインをやり直してください。"
 
-#: ../templates/login.php:211 ../templates/login.php:216
-#: ../templates/selfService/adminMain.php:139
+#: ../templates/login.php:238 ../templates/login.php:243
+#: ../templates/login.php:252
 msgid "Your settings were successfully saved."
 msgstr "設定を保存しました。"
 
-#: ../lib/modules/inetOrgPerson.inc:412
+#: ../lib/modules/inetOrgPerson.inc:401
 msgid "YourCompany, Human Resources"
 msgstr "YourCompany, Human Resources"
 
-#: ../lib/modules/ddns.inc:99 ../lib/modules/ddns.inc:108
-#: ../lib/modules/ddns.inc:123 ../lib/modules/ddns.inc:379
-#: ../lib/modules/ddns.inc:412
+#: ../lib/modules/zarafaGroup.inc:49 ../lib/modules/zarafaUser.inc:49
+#: ../lib/modules/zarafaServer.inc:49
+msgid "Zarafa"
+msgstr "Zarafa"
+
+#: ../lib/modules/ddns.inc:103 ../lib/modules/ddns.inc:112
+#: ../lib/modules/ddns.inc:127 ../lib/modules/ddns.inc:370
+#: ../lib/modules/ddns.inc:400
 msgid "Zone names"
 msgstr "ゾーン名"
 
-#: ../lib/modules/ddns.inc:100
+#: ../lib/modules/ddns.inc:104
 msgid "Zone names for the DNS server (e.g. company.local)."
 msgstr "DNSサーバーのゾーン名(例 company.local)。"
 
@@ -8269,16 +8654,16 @@ msgstr "DNSサーバーのゾーン名(例 company.local)。"
 msgid "[attribute deleted]"
 msgstr "[削除された属性]"
 
-#: ../lib/modules/sambaSamAccount.inc:469
+#: ../lib/modules/sambaSamAccount.inc:466
 msgid "\\\\server\\homes\\smiller"
 msgstr "\\\\server\\homes\\smiller"
 
-#: ../lib/modules/sambaSamAccount.inc:477
+#: ../lib/modules/sambaSamAccount.inc:474
 msgid "\\\\server\\profiles\\smiller"
 msgstr "\\\\server\\profiles\\smiller"
 
-#: ../lib/modules/phpGroupwareUser.inc:164
-#: ../lib/modules/phpGroupwareUser.inc:334
+#: ../lib/modules/phpGroupwareUser.inc:162
+#: ../lib/modules/phpGroupwareUser.inc:332
 msgid "active"
 msgstr "有効"
 
@@ -8286,7 +8671,7 @@ msgstr "有効"
 msgid "add value"
 msgstr "値の追加"
 
-#: ../lib/modules/posixGroup.inc:360 ../lib/modules/nisnetgroup.inc:99
+#: ../lib/modules/posixGroup.inc:374 ../lib/modules/nisnetgroup.inc:99
 #: ../lib/modules/groupOfNames.inc:86
 msgid "adminstrators"
 msgstr "管理者"
@@ -8303,12 +8688,11 @@ msgstr "文字"
 msgid "characters"
 msgstr "文字"
 
-#: ../help/help.inc:81
+#: ../help/help.inc:78
 msgid "dc=yourcompany,dc=com"
 msgstr "dc=yourcompany,dc=com"
 
-#: ../lib/modules/ppolicyUser.inc:88 ../lib/modules/ppolicyUser.inc:96
-#: ../lib/modules/ppolicyUser.inc:114 ../lib/modules/ppolicyUser.inc:158
+#: ../lib/modules/ppolicyUser.inc:111
 msgid "default"
 msgstr "デフォルト値"
 
@@ -8316,13 +8700,13 @@ msgstr "デフォルト値"
 msgid "delete attribute"
 msgstr "属性の削除"
 
-#: ../lib/modules/sambaSamAccount.inc:1496
-#: ../lib/modules/sambaSamAccount.inc:1824
+#: ../lib/modules/sambaSamAccount.inc:1424
+#: ../lib/modules/sambaSamAccount.inc:1701
 msgid "disabled"
 msgstr "禁止"
 
-#: ../lib/modules/sambaSamAccount.inc:1508
-#: ../lib/modules/sambaSamAccount.inc:1835
+#: ../lib/modules/sambaSamAccount.inc:1435
+#: ../lib/modules/sambaSamAccount.inc:1712
 msgid "disconnect"
 msgstr "切断"
 
@@ -8341,46 +8725,54 @@ msgstr "false"
 msgid "force"
 msgstr "force"
 
-#: ../lib/modules/sambaSamAccount.inc:1517
-#: ../lib/modules/sambaSamAccount.inc:1843
+#: ../lib/modules/sambaSamAccount.inc:1443
+#: ../lib/modules/sambaSamAccount.inc:1720
 msgid "from any client"
 msgstr "任意のクライアントから"
 
-#: ../lib/modules/sambaSamAccount.inc:1518
-#: ../lib/modules/sambaSamAccount.inc:1844
+#: ../lib/modules/sambaSamAccount.inc:1444
+#: ../lib/modules/sambaSamAccount.inc:1721
 msgid "from previous client only"
 msgstr "前回のクライアントからのみ"
 
-#: ../lib/modules/posixAccount.inc:231 ../lib/modules/nisnetgroup.inc:113
+#: ../lib/modules/posixAccount.inc:217 ../lib/modules/nisnetgroup.inc:113
 msgid "group01,group02"
 msgstr "group01,group02"
 
-#: ../lib/modules/quota.inc:187 ../lib/modules/quota.inc:189
+#: ../lib/modules/zarafaGroup.inc:95
+msgid "group1@company.com,group2@company.com"
+msgstr "group1@company.com,group2@company.com"
+
+#: ../lib/modules/zarafaGroup.inc:89
+msgid "group@company.com"
+msgstr "group@company.com"
+
+#: ../lib/modules/quota.inc:190 ../lib/modules/quota.inc:192
 msgid "hours"
 msgstr "時間"
 
-#: ../lib/modules/phpGroupwareUser.inc:164
-#: ../lib/modules/phpGroupwareUser.inc:337
+#: ../lib/modules/phpGroupwareUser.inc:162
+#: ../lib/modules/phpGroupwareUser.inc:335
 msgid "inactive"
 msgstr "無効"
 
-#: ../lib/modules/sambaSamAccount.inc:1500
-#: ../lib/modules/sambaSamAccount.inc:1828
+#: ../lib/modules/sambaSamAccount.inc:1428
+#: ../lib/modules/sambaSamAccount.inc:1705
 msgid "input off, notify off"
 msgstr "入力 off, 通知 off"
 
-#: ../lib/modules/sambaSamAccount.inc:1499
-#: ../lib/modules/sambaSamAccount.inc:1827
+#: ../lib/modules/sambaSamAccount.inc:1427
+#: ../lib/modules/sambaSamAccount.inc:1704
 msgid "input off, notify on"
 msgstr "入力 off, 通知 on"
 
-#: ../lib/modules/sambaSamAccount.inc:1498
-#: ../lib/modules/sambaSamAccount.inc:1826
+#: ../lib/modules/sambaSamAccount.inc:1426
+#: ../lib/modules/sambaSamAccount.inc:1703
 msgid "input on, notify off"
 msgstr "入力 on, 通知 off"
 
-#: ../lib/modules/sambaSamAccount.inc:1497
-#: ../lib/modules/sambaSamAccount.inc:1825
+#: ../lib/modules/sambaSamAccount.inc:1425
+#: ../lib/modules/sambaSamAccount.inc:1702
 msgid "input on, notify on"
 msgstr "入力 on, 通知 on"
 
@@ -8388,7 +8780,7 @@ msgstr "入力 on, 通知 on"
 msgid "jpegPhoto contains errors"
 msgstr "jpegPhoto にエラーがあります"
 
-#: ../help/help.inc:63
+#: ../help/help.inc:60
 msgid ""
 "ldap://localhost:389 connects to localhost using a standard LDAP connection "
 "on port 389"
@@ -8396,7 +8788,7 @@ msgstr ""
 "ldaps://localhost:389 は、localhostのポート389へ標準的なLDAP接続を行ないま"
 "す。"
 
-#: ../help/help.inc:65
+#: ../help/help.inc:62
 msgid ""
 "ldaps://ldap.domain.com connects to ldap.domain.com using an encrypted LDAP "
 "connection."
@@ -8404,33 +8796,36 @@ msgstr ""
 "ldaps://ldap.example.com は、ldap.example.com へ暗号化されたLDAP接続を行ない"
 "ます。"
 
-#: ../lib/modules/posixAccount.inc:298
+#: ../lib/modules/posixAccount.inc:284
 msgid "machines"
 msgstr "マシン"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:110
+#: ../lib/modules/inetLocalMailRecipient.inc:107
 msgid "mail.yourdomain.org"
 msgstr "mail.yourdomain.org"
 
-#: ../lib/modules/sambaSamAccount.inc:388
-#: ../lib/modules/sambaSamAccount.inc:512
+#: ../lib/modules/sambaSamAccount.inc:385
+#: ../lib/modules/sambaSamAccount.inc:509
 msgid "mydomain"
 msgstr "マイドメイン"
 
-#: ../lib/modules/sambaSamAccount.inc:445
+#: ../lib/modules/sambaSamAccount.inc:442
 msgid "mygroup"
 msgstr "マイグループ"
 
-#: ../templates/config/confmain.php:244 ../templates/config/confmain.php:248
-#: ../lib/modules/sambaSamAccount.inc:563
-#: ../lib/modules/sambaSamAccount.inc:1792
-#: ../lib/modules/sambaSamAccount.inc:1800
-#: ../lib/modules/sambaSamAccount.inc:1810
-#: ../lib/modules/sambaSamAccount.inc:1815
-#: ../lib/modules/sambaSamAccount.inc:1820 ../lib/modules/ppolicy.inc:34
-#: ../lib/modules/ppolicy.inc:487 ../lib/modules/ppolicy.inc:503
-#: ../lib/modules/ppolicy.inc:508 ../lib/modules/ppolicy.inc:515
-#: ../lib/modules/ppolicy.inc:518
+#: ../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
+#: ../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
+#: ../lib/modules/ppolicy.inc:470 ../lib/modules/ppolicy.inc:477
+#: ../lib/modules/ppolicy.inc:480 ../lib/modules/zarafaServer.inc:321
 msgid "no"
 msgstr "いいえ"
 
@@ -8456,7 +8851,7 @@ msgstr "適用対象外"
 msgid "not specified"
 msgstr "未入力"
 
-#: ../help/help.inc:75
+#: ../help/help.inc:72
 msgid ""
 "ou=People,dc=yourcompany,dc=com will read and store all accounts in this "
 "subtree."
@@ -8464,16 +8859,16 @@ msgstr ""
 "ou=People,dc=yourcompany,dc=com は、このサブツリーのすべてのアカウントを読み"
 "書きします。"
 
-#: ../templates/masscreate.php:249 ../lib/modules/eduPerson.inc:182
-#: ../lib/modules/eduPerson.inc:188 ../lib/modules/eduPerson.inc:194
+#: ../templates/masscreate.php:248 ../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:284
+#: ../lib/modules/posixAccount.inc:270
 msgid "pc01$"
 msgstr "pc01$"
 
-#: ../lib/modules/posixAccount.inc:305
+#: ../lib/modules/posixAccount.inc:291
 msgid "pc01,Room 2.34"
 msgstr "pc01,Room 2.34"
 
@@ -8481,32 +8876,32 @@ msgstr "pc01,Room 2.34"
 msgid "pc01,pc02"
 msgstr "pc01,pc02"
 
-#: ../templates/tree/edit.php:246 ../templates/config/confmain.php:531
-#: ../templates/selfService/adminMain.php:616
+#: ../templates/tree/edit.php:246 ../templates/config/confmain.php:555
+#: ../templates/selfService/adminMain.php:614
 msgid "required"
 msgstr "必須"
 
-#: ../lib/modules/sambaSamAccount.inc:1509
-#: ../lib/modules/sambaSamAccount.inc:1836
+#: ../lib/modules/sambaSamAccount.inc:1436
+#: ../lib/modules/sambaSamAccount.inc:1713
 msgid "reset"
 msgstr "リセット"
 
-#: ../lib/modules/asteriskAccount.inc:158 ../lib/modules/posixGroup.inc:351
-#: ../lib/modules/sambaSamAccount.inc:400 ../lib/modules/posixAccount.inc:259
-#: ../lib/modules/asteriskVoicemail.inc:163
+#: ../lib/modules/asteriskAccount.inc:156 ../lib/modules/posixGroup.inc:365
+#: ../lib/modules/sambaSamAccount.inc:397 ../lib/modules/posixAccount.inc:245
+#: ../lib/modules/asteriskVoicemail.inc:158
 msgid "secret"
 msgstr "secret"
 
-#: ../lib/modules/uidObject.inc:62 ../lib/modules/posixAccount.inc:204
-#: ../lib/modules/inetOrgPerson.inc:1200 ../lib/modules/nisMailAlias.inc:91
+#: ../lib/modules/uidObject.inc:62 ../lib/modules/posixAccount.inc:190
+#: ../lib/modules/inetOrgPerson.inc:1102 ../lib/modules/nisMailAlias.inc:91
 msgid "smiller"
 msgstr "smiller"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:98
+#: ../lib/modules/inetLocalMailRecipient.inc:95
 msgid "smiller@otherdomain.org"
 msgstr "smiller@otherdomain.org"
 
-#: ../lib/modules/inetLocalMailRecipient.inc:104
+#: ../lib/modules/inetLocalMailRecipient.inc:101
 msgid "smiller@yourdomain.org"
 msgstr "smiller@yourdomain.org"
 
@@ -8518,11 +8913,11 @@ msgstr "ssh-dss 234234 user@host"
 msgid "structural"
 msgstr "構造型"
 
-#: ../lib/modules/asteriskExtension.inc:180
+#: ../lib/modules/asteriskExtension.inc:171
 msgid "test"
 msgstr "テスト"
 
-#: ../lib/modules/asteriskExtension.inc:174
+#: ../lib/modules/asteriskExtension.inc:165
 msgid "test-start"
 msgstr "テスト開始"
 
@@ -8530,46 +8925,80 @@ msgstr "テスト開始"
 msgid "true"
 msgstr "true"
 
-#: ../lib/modules/ipHost.inc:92 ../lib/modules/inetOrgPerson.inc:284
+#: ../lib/modules/ipHost.inc:92 ../lib/modules/inetOrgPerson.inc:273
 #: ../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:345
+#: ../lib/modules/posixGroup.inc:359
 msgid "user01,user02,user03"
 msgstr "user01,user02,user03"
 
-#: ../lib/modules/eduPerson.inc:143 ../lib/modules/inetOrgPerson.inc:364
-#: ../lib/modules/asteriskVoicemail.inc:176
+#: ../lib/modules/eduPerson.inc:140 ../lib/modules/inetOrgPerson.inc:353
+#: ../lib/modules/asteriskVoicemail.inc:171
 msgid "user@company.com"
 msgstr "user@company.com"
 
-#: ../lib/modules/posixAccount.inc:224
+#: ../lib/modules/posixAccount.inc:210
 msgid "users"
 msgstr "ユーザ"
 
-#: ../templates/config/confmain.php:243 ../templates/config/confmain.php:247
-#: ../lib/modules/sambaSamAccount.inc:562
-#: ../lib/modules/sambaSamAccount.inc:1790
-#: ../lib/modules/sambaSamAccount.inc:1798
-#: ../lib/modules/sambaSamAccount.inc:1808
-#: ../lib/modules/sambaSamAccount.inc:1813
-#: ../lib/modules/sambaSamAccount.inc:1818 ../lib/modules/ppolicy.inc:35
-#: ../lib/modules/ppolicy.inc:505 ../lib/modules/ppolicy.inc:510
-#: ../lib/modules/ppolicy.inc:513 ../lib/modules/ppolicy.inc:520
-#: ../lib/modules/inetOrgPerson.inc:404
+#: ../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
+#: ../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
 msgid "yes"
 msgstr "はい"
 
+#~ msgid ""
+#~ "Attention: The DHCP service needs to be restarted after changes in DDNS."
+#~ msgstr "注意: DDNSの変更後にDHCPサービスのリスタートが必要です。"
+
+#~ msgid "Back to Login"
+#~ msgstr "ログインに戻る"
+
+#~ msgid "Change profile"
+#~ msgstr "プロファイルの変更"
+
+#~ msgid "Delegates has invalid format!"
+#~ msgstr "代理人の形式が正しくありません。"
+
+#~ msgid "Delete Kolab account"
+#~ msgstr "Kolabアカウントを削除"
+
+#~ msgid "Fixed IP"
+#~ msgstr "固定IP"
+
+#~ msgid "Please select your user name and enter your password to log in."
+#~ msgstr "ユーザ名を選択し、パスワードを入力してログインしてください。"
+
+#~ msgid "The domain name needs to be shorter than 15 characters."
+#~ msgstr "ドメイン名は15文字未満でなくてはなりません。"
+
+#~ msgid ""
+#~ "This is an example how it would look in your spreadsheet program before "
+#~ "you convert to CSV:"
+#~ msgstr ""
+#~ "CSVに変換する前に、あなたの表計算プログラムでどのように見えるかの例です。"
+
+#~ msgid "This value can only be \\\"true\\\" or \\\"false\\\"!"
+#~ msgstr "この値は、\"true\"または\"false\"のいずれかでなくてはなりません。"
+
 #~ msgid "Back to OU-Editor"
 #~ msgstr "OU-エディタに戻る"
 
 #~ msgid "Back to PDF Editor"
 #~ msgstr "PDFエディタに戻る"
 
-#~ msgid "Back to login"
-#~ msgstr "ログインに戻る"
-
 #~ msgid "Back to profile editor"
 #~ msgstr "プロファイルエディタに戻る"
 
@@ -8591,9 +9020,6 @@ msgstr "はい"
 #~ "ストを入力して下さい。サーバー制限が有効な場合、\"*\"は全てのホストを意味"
 #~ "し、空欄はホスト無しを意味します。"
 
-#~ msgid "Please enter a valid path."
-#~ msgstr "正しいパスを入力してください。"
-
 #~ msgid "Please enter the mount point for this entry (e.g. /home)."
 #~ msgstr "このエントリに対するマウントポイントを入力してください(例 /home)。"
 
@@ -8684,8 +9110,8 @@ msgstr "はい"
 #~ "名。 $user と $group はユーザとグループ名に置き換えられます。"
 
 #~ msgid ""
-#~ "Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-"
-#~ "9 and .-_ ! Host name must end with $ !"
+#~ "Host name contains invalid characters. Valid characters are: a-z, A-Z, "
+#~ "0-9 and .-_ ! Host name must end with $ !"
 #~ msgstr ""
 #~ "ホスト名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ で"
 #~ "す。ホスト名の末尾は$でなくてはなりません。"
@@ -8957,9 +9383,6 @@ msgstr "はい"
 #~ msgid "Password maxage"
 #~ msgstr "パスワード寿命の最大値"
 
-#~ msgid "Password minage"
-#~ msgstr "パスワード寿命の最小値"
-
 #~ msgid ""
 #~ "Please report this error to the Bug-Tracker at {link=http://lam."
 #~ "sourceforge.net}LDAP Account Manager Development Team{endlink}. The error "