diff --git a/lam/locale/ja_JP/LC_MESSAGES/messages.mo b/lam/locale/ja_JP/LC_MESSAGES/messages.mo
index dea78220..a1ba95dc 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 9de06991..b4e700ce 100644
--- a/lam/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/lam/locale/ja_JP/LC_MESSAGES/messages.po
@@ -5,52 +5,68 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: LAM 2.5.0\n"
+"Project-Id-Version: LAM 3.0.0\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de \n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2009-01-13 05:55+0900\n"
+"PO-Revision-Date: 2010-03-22 15:05+0900\n"
 "Last-Translator: Yasuhiro Magara <gama@users.sourceforge.jp>\n"
 "Language-Team: Japanese <gama@users.sourceforge.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/modules/posixAccount.inc:385
-msgid "$user and $group are replaced with user name or primary group name."
-msgstr ""
-"$user と $group はユーザ名またはプライマリグループ名に置き換えられます。"
+#: ../lib/modules/posixAccount.inc:377
+msgid ""
+"$user and $group will be replaced with user name and primary group name."
+msgstr "$user と $group はユーザ名とプライマリグループ名に置き換えられます。"
 
-#: ../lib/types/dhcp.inc:112
+#: ../lib/types/dhcp.inc:123
 #, php-format
 msgid "%s DHCP(s) found"
 msgstr "%s個のDHCPが見つかりました。"
 
-#: ../lib/types/mailAlias.inc:108 ../lib/types/alias.inc:108
+#: ../lib/types/nisObjectType.inc:105
+#, php-format
+msgid "%s NIS object(s) found"
+msgstr "%s個のNISオブジェクトが見つかりました"
+
+#: ../lib/types/mailAlias.inc:117 ../lib/types/alias.inc:117
 #, php-format
 msgid "%s alias(es) found"
 msgstr "%s個の別名が見つかりました"
 
-#: ../lib/types/smbDomain.inc:108
+#: ../lib/types/smbDomain.inc:117
 #, php-format
 msgid "%s domain(s) found"
 msgstr "%s個のドメインが見つかりました"
 
-#: ../lib/types/group.inc:122 ../lib/types/gon.inc:110
+#: ../lib/types/asteriskExt.inc:118
+#, php-format
+msgid "%s extension(s) found"
+msgstr "%s個の拡張が見つかりました"
+
+#: ../lib/types/group.inc:131 ../lib/types/netgroup.inc:119
+#: ../lib/types/gon.inc:119
 #, php-format
 msgid "%s group(s) found"
 msgstr "%s個のグループが見つかりました"
 
-#: ../lib/types/host.inc:112
+#: ../lib/types/host.inc:121
 #, php-format
 msgid "%s host(s) found"
 msgstr "%s個のSamba ホストが見つかりました"
 
-#: ../lib/lists.inc:103
+#: ../lib/lists.inc:106
 #, php-format
 msgid "%s object(s) found"
 msgstr "%s個のオブジェクトが見つかりました"
 
-#: ../lib/types/user.inc:126
+#: ../lib/types/ppolicyType.inc:125
+#, php-format
+msgid "%s policy(ies) found"
+msgstr "%s個のポリシーが見つかりました"
+
+#: ../lib/types/user.inc:135
 #, php-format
 msgid "%s user(s) found"
 msgstr "%s名のユーザが見つかりました"
@@ -63,6 +79,10 @@ msgstr "(例: cn=MyNewPerson)"
 msgid "(hint: do not include \"ou=\")"
 msgstr "(ヒント: \"ou=\"を含めないでください)"
 
+#: ../lib/modules/nisnetgroup.inc:119
+msgid "(host1,user1,example.com);(host2,user2,example.com)"
+msgstr ""
+
 #: ../templates/tree/add_attr_form.php:136
 msgid "(no new attributes available for this entry)"
 msgstr "(このエントリに対して有効な新しい属性はありません)"
@@ -71,31 +91,31 @@ msgstr "(このエントリに対して有効な新しい属性はありませ
 msgid "(no new binary attributes available for this entry)"
 msgstr "(このエントリに対して有効な新しいバイナリ属性はありません)"
 
-#: ../lib/modules/posixAccount.inc:232
+#: ../lib/modules/posixAccount.inc:236
 msgid "/home/smiller"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:265
+#: ../lib/modules/inetOrgPerson.inc:392
 msgid "123-123-1234"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:277
+#: ../lib/modules/inetOrgPerson.inc:408
 msgid "123-123-1235"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:283
+#: ../lib/modules/inetOrgPerson.inc:416
 msgid "123-123-1236"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:271
+#: ../lib/modules/inetOrgPerson.inc:400
 msgid "123-124-1234"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:259
+#: ../lib/modules/inetOrgPerson.inc:384
 msgid "12345"
 msgstr ""
 
-#: ../lib/modules/dhcp_settings.inc:149
+#: ../lib/modules/dhcp_settings.inc:141
 msgid ""
 "<b>B-Node (0x01): Broadcast.</b><br/>The client tries to find other "
 "workstations via broadcasting\n"
@@ -117,20 +137,25 @@ msgid ""
 "networks. In large networks Point-to-Point (0x02) should be used."
 msgstr ""
 "<b>B-Node (0x01): Broadcast.</b><br/>\n"
-"クライアントはブロードキャストによって他のワークステーションを発見します(同じコリジョンドメイン、すなわち同じサブネットの中でのみ機能します)。<br/><br/>\n"
+"クライアントはブロードキャストによって他のワークステーションを発見します(同じ"
+"コリジョンドメイン、すなわち同じサブネットの中でのみ機能します)。<br/><br/>\n"
 "\n"
 "<b>P-Node (0x02): Point-To-Point</b><br/>\n"
-"クライアントはMicrosift Windows Name Service(WINS)によってNetBIOSネームサーバー(NBNS)に接続し、名前解決を行います。<br/><br/>\n"
+"クライアントはMicrosift Windows Name Service(WINS)によってNetBIOSネームサー"
+"バー(NBNS)に接続し、名前解決を行います。<br/><br/>\n"
 "\n"
 "<b>M-Node (0x04): Mixed</b><br />\n"
-"ノードは最初にブロードキャストを試みます。もし失敗した場合は、WINSを試みます。<br/><br/>\n"
+"ノードは最初にブロードキャストを試みます。もし失敗した場合は、WINSを試みま"
+"す。<br/><br/>\n"
 "\n"
 "<b>H-Node (0x08): Hybrid</b><br />\n"
-"ノードは最初にWINSを試みます。もし失敗した場合は、ブロードキャストを試みます。<br/><br/>\n"
+"ノードは最初にWINSを試みます。もし失敗した場合は、ブロードキャストを試みま"
+"す。<br/><br/>\n"
 "\n"
-"デフォルトでは、ノードは小規模ネットワーク向きのH-Nodeとして構成されます。大規模ネットワークでは、Point-to-Point(0x02)を利用するべきです。"
+"デフォルトでは、ノードは小規模ネットワーク向きのH-Nodeとして構成されます。大"
+"規模ネットワークでは、Point-to-Point(0x02)を利用するべきです。"
 
-#: ../templates/massBuildAccounts.php:117
+#: ../templates/massBuildAccounts.php:114
 msgid "A required column is missing in your CSV file."
 msgstr "CSVファイル中の必須カラムが不足しています。"
 
@@ -142,11 +167,11 @@ msgstr ""
 "ユーザは自身の代理人を指定できます。この属性はemailの送信にKolab smtpデーモン"
 "(Postfix)を使用する場合にチェックします。"
 
-#: ../lib/modules/sambaSamAccount.inc:514
+#: ../lib/modules/sambaSamAccount.inc:543
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr ""
 
-#: ../templates/config/confmain.php:201
+#: ../templates/config/confmain.php:317 ../help/help.inc:102
 msgid "Access level"
 msgstr "アクセスレベル"
 
@@ -154,8 +179,14 @@ msgstr "アクセスレベル"
 msgid "Account"
 msgstr "アカウント"
 
-#: ../templates/massBuildAccounts.php:170 ../lib/modules/nisMailAlias.inc:106
-#: ../lib/modules/nisMailAlias.inc:108 ../lib/modules/account.inc:136
+#: ../templates/massBuildAccounts.php:169 ../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/nisMailAlias.inc:106 ../lib/modules/nisMailAlias.inc:108
+#: ../lib/modules/account.inc:117 ../lib/modules/ddns.inc:147
 #: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:74
 #: ../lib/modules/inetOrgPerson.inc:76 ../lib/modules/inetOrgPerson.inc:78
 #: ../lib/modules/inetOrgPerson.inc:80 ../lib/modules/inetOrgPerson.inc:82
@@ -165,54 +196,50 @@ msgstr "アカウント"
 #: ../lib/modules/inetOrgPerson.inc:96 ../lib/modules/inetOrgPerson.inc:98
 #: ../lib/modules/inetOrgPerson.inc:100 ../lib/modules/inetOrgPerson.inc:101
 #: ../lib/modules/inetOrgPerson.inc:102 ../lib/modules/inetOrgPerson.inc:105
-#: ../lib/modules/inetOrgPerson.inc:108 ../lib/modules/ieee802device.inc:89
-#: ../lib/modules/sambaAccount.inc:63 ../lib/modules/sambaAccount.inc:66
-#: ../lib/modules/sambaAccount.inc:69 ../lib/modules/sambaAccount.inc:71
-#: ../lib/modules/sambaAccount.inc:73 ../lib/modules/sambaAccount.inc:76
-#: ../lib/modules/sambaAccount.inc:77 ../lib/modules/sambaAccount.inc:79
-#: ../lib/modules/sambaAccount.inc:80 ../lib/modules/sambaAccount.inc:81
-#: ../lib/modules/sambaAccount.inc:82 ../lib/modules/sambaAccount.inc:83
-#: ../lib/modules/sambaAccount.inc:84 ../lib/modules/sambaAccount.inc:85
-#: ../lib/modules/sambaAccount.inc:86 ../lib/modules/sambaAccount.inc:87
-#: ../lib/modules/sambaGroupMapping.inc:438
-#: ../lib/modules/sambaGroupMapping.inc:439 ../lib/modules/posixGroup.inc:503
-#: ../lib/modules/posixGroup.inc:507 ../lib/modules/posixGroup.inc:508
-#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:70
-#: ../lib/modules/posixAccount.inc:74 ../lib/modules/posixAccount.inc:82
-#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/ieee802device.inc:89 ../lib/modules/ipHost.inc:107
+#: ../lib/modules/ipHost.inc:108 ../lib/modules/sambaGroupMapping.inc:439
+#: ../lib/modules/sambaGroupMapping.inc:440 ../lib/modules/posixGroup.inc:473
+#: ../lib/modules/posixGroup.inc:477 ../lib/modules/posixGroup.inc:478
+#: ../lib/modules/posixAccount.inc:67 ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:84
 #: ../lib/modules/posixAccount.inc:85 ../lib/modules/posixAccount.inc:86
-#: ../lib/modules/posixAccount.inc:87 ../lib/modules/posixAccount.inc:89
-#: ../lib/modules/posixAccount.inc:90 ../lib/modules/posixAccount.inc:91
-#: ../lib/modules/posixAccount.inc:93 ../lib/modules/kolabUser.inc:236
+#: ../lib/modules/posixAccount.inc:87 ../lib/modules/posixAccount.inc:88
+#: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:91
+#: ../lib/modules/posixAccount.inc:92 ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/posixAccount.inc:95 ../lib/modules/kolabUser.inc:236
 #: ../lib/modules/kolabUser.inc:238 ../lib/modules/kolabUser.inc:240
 #: ../lib/modules/kolabUser.inc:242 ../lib/modules/kolabUser.inc:244
 #: ../lib/modules/kolabUser.inc:246 ../lib/modules/kolabUser.inc:248
+#: ../lib/modules/asteriskAccount.inc:155
+#: ../lib/modules/asteriskAccount.inc:158
+#: ../lib/modules/asteriskAccount.inc:161 ../lib/modules/nisObject.inc:114
+#: ../lib/modules/nisObject.inc:116 ../lib/modules/eduPerson.inc:211
+#: ../lib/modules/eduPerson.inc:213 ../lib/modules/eduPerson.inc:215
+#: ../lib/modules/eduPerson.inc:217 ../lib/modules/eduPerson.inc:218
+#: ../lib/modules/eduPerson.inc:219 ../lib/modules/eduPerson.inc:220
 #: ../lib/modules/inetLocalMailRecipient.inc:125
 #: ../lib/modules/inetLocalMailRecipient.inc:127
 #: ../lib/modules/inetLocalMailRecipient.inc:129
-#: ../lib/modules/sambaSamAccount.inc:85 ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:91 ../lib/modules/sambaSamAccount.inc:93
-#: ../lib/modules/sambaSamAccount.inc:96 ../lib/modules/sambaSamAccount.inc:97
-#: ../lib/modules/sambaSamAccount.inc:98 ../lib/modules/sambaSamAccount.inc:99
+#: ../lib/modules/sambaSamAccount.inc:83 ../lib/modules/sambaSamAccount.inc:86
+#: ../lib/modules/sambaSamAccount.inc:89 ../lib/modules/sambaSamAccount.inc:91
+#: ../lib/modules/sambaSamAccount.inc:92 ../lib/modules/sambaSamAccount.inc:93
+#: ../lib/modules/sambaSamAccount.inc:94 ../lib/modules/sambaSamAccount.inc:95
+#: ../lib/modules/sambaSamAccount.inc:97 ../lib/modules/sambaSamAccount.inc:98
+#: ../lib/modules/sambaSamAccount.inc:99
+#: ../lib/modules/sambaSamAccount.inc:100
 #: ../lib/modules/sambaSamAccount.inc:101
 #: ../lib/modules/sambaSamAccount.inc:102
 #: ../lib/modules/sambaSamAccount.inc:103
-#: ../lib/modules/sambaSamAccount.inc:104
 #: ../lib/modules/sambaSamAccount.inc:105
-#: ../lib/modules/sambaSamAccount.inc:106
-#: ../lib/modules/sambaSamAccount.inc:107
-#: ../lib/modules/sambaSamAccount.inc:108
-#: ../lib/modules/sambaSamAccount.inc:109
-#: ../lib/modules/sambaSamAccount.inc:111
-#: ../lib/modules/sambaSamAccount.inc:112 ../lib/modules/quota.inc:47
-#: ../lib/modules/quota.inc:49 ../lib/modules/quota.inc:51
-#: ../lib/modules/quota.inc:53 ../lib/modules/quota.inc:55
-#: ../lib/modules/quota.inc:57 ../lib/modules/quota.inc:58
+#: ../lib/modules/sambaSamAccount.inc:106 ../lib/modules/quota.inc:49
+#: ../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:60
 #: ../lib/modules/shadowAccount.inc:58 ../lib/modules/shadowAccount.inc:60
 #: ../lib/modules/shadowAccount.inc:62 ../lib/modules/shadowAccount.inc:64
 #: ../lib/modules/shadowAccount.inc:66 ../lib/modules/shadowAccount.inc:67
-#: ../lib/modules/phpGroupwareUser.inc:124
-#: ../lib/modules/phpGroupwareUser.inc:125 ../lib/modules/sambaDomain.inc:189
+#: ../lib/modules/phpGroupwareUser.inc:135
+#: ../lib/modules/phpGroupwareUser.inc:136 ../lib/modules/sambaDomain.inc:189
 #: ../lib/modules/sambaDomain.inc:191 ../lib/modules/sambaDomain.inc:193
 #: ../lib/modules/sambaDomain.inc:195 ../lib/modules/sambaDomain.inc:197
 #: ../lib/modules/sambaDomain.inc:199 ../lib/modules/aliasEntry.inc:79
@@ -220,81 +247,90 @@ msgstr "アカウント"
 msgid "Account %s:"
 msgstr "アカウント %s:"
 
-#: ../templates/masscreate.php:86
+#: ../lib/modules/asteriskExtension.inc:82
+#: ../lib/modules/asteriskExtension.inc:113
+#: ../lib/modules/asteriskExtension.inc:173
+#: ../lib/modules/asteriskExtension.inc:218
+#: ../lib/modules/asteriskExtension.inc:457
+#: ../lib/modules/asteriskAccount.inc:85
+#: ../lib/modules/asteriskAccount.inc:100
+#: ../lib/modules/asteriskAccount.inc:126
+#: ../lib/modules/asteriskAccount.inc:186
+#: ../lib/modules/asteriskAccount.inc:272
+msgid "Account context"
+msgstr "アカウント・コンテキスト"
+
+#: ../templates/masscreate.php:110
 msgid "Account creation via file upload"
 msgstr "ファイルアップロードによるアカウント作成"
 
-#: ../lib/modules/posixAccount.inc:392
+#: ../lib/modules/posixAccount.inc:384
 msgid "Account deactivated"
 msgstr "アカウントが無効化されました"
 
-#: ../templates/lists/changePassword.php:128
+#: ../templates/lists/changePassword.php:124
 msgid "Account details"
 msgstr "アカウントの詳細"
 
-#: ../lib/modules/sambaSamAccount.inc:294
-#: ../lib/modules/sambaSamAccount.inc:417
-#: ../lib/modules/sambaSamAccount.inc:1069
-#: ../lib/modules/sambaSamAccount.inc:1302
-#: ../lib/modules/sambaSamAccount.inc:1492
-#: ../lib/modules/shadowAccount.inc:120 ../lib/modules/shadowAccount.inc:185
-#: ../lib/modules/shadowAccount.inc:217 ../lib/modules/shadowAccount.inc:321
-#: ../lib/modules/shadowAccount.inc:373 ../lib/modules/phpGroupwareUser.inc:82
-#: ../lib/modules/phpGroupwareUser.inc:111
-#: ../lib/modules/phpGroupwareUser.inc:142
-#: ../lib/modules/phpGroupwareUser.inc:225
-#: ../lib/modules/phpGroupwareUser.inc:378
+#: ../lib/modules/sambaSamAccount.inc:319
+#: ../lib/modules/sambaSamAccount.inc:434
+#: ../lib/modules/sambaSamAccount.inc:1136
+#: ../lib/modules/sambaSamAccount.inc:1380
+#: ../lib/modules/sambaSamAccount.inc:1564
+#: ../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/phpGroupwareUser.inc:82
+#: ../lib/modules/phpGroupwareUser.inc:122
+#: ../lib/modules/phpGroupwareUser.inc:153
+#: ../lib/modules/phpGroupwareUser.inc:237
+#: ../lib/modules/phpGroupwareUser.inc:342
 msgid "Account expiration date"
 msgstr "アカウント失効日"
 
-#: ../lib/modules/shadowAccount.inc:400
+#: ../lib/modules/shadowAccount.inc:418
 msgid "Account inactive"
 msgstr "アカウントが無効です"
 
-#: ../lib/modules/sambaAccount.inc:142 ../lib/modules/sambaAccount.inc:259
-#: ../lib/modules/sambaAccount.inc:371 ../lib/modules/sambaAccount.inc:374
-#: ../lib/modules/sambaAccount.inc:762 ../lib/modules/sambaSamAccount.inc:234
-#: ../lib/modules/sambaSamAccount.inc:240
-#: ../lib/modules/sambaSamAccount.inc:395
-#: ../lib/modules/sambaSamAccount.inc:1007
-#: ../lib/modules/sambaSamAccount.inc:1480
+#: ../lib/modules/sambaSamAccount.inc:259
+#: ../lib/modules/sambaSamAccount.inc:265
+#: ../lib/modules/sambaSamAccount.inc:426
+#: ../lib/modules/sambaSamAccount.inc:1096
+#: ../lib/modules/sambaSamAccount.inc:1552
 msgid "Account is deactivated"
 msgstr "アカウントが無効化されています"
 
-#: ../lib/modules/sambaSamAccount.inc:237
-#: ../lib/modules/sambaSamAccount.inc:1015
+#: ../lib/modules/sambaSamAccount.inc:262
+#: ../lib/modules/sambaSamAccount.inc:1104
 msgid "Account is locked"
 msgstr "ロックされたアカウント"
 
-#: ../help/help.inc:140
-msgid "Account lists - Filters"
-msgstr "アカウント一覧 - フィルター"
-
-#: ../templates/delete.php:94
+#: ../templates/delete.php:90
 msgid "Account name:"
 msgstr "アカウント名:"
 
 #: ../lib/modules/phpGroupwareUser.inc:78
-#: ../lib/modules/phpGroupwareUser.inc:104
-#: ../lib/modules/phpGroupwareUser.inc:149
-#: ../lib/modules/phpGroupwareUser.inc:373
+#: ../lib/modules/phpGroupwareUser.inc:115
+#: ../lib/modules/phpGroupwareUser.inc:160
+#: ../lib/modules/phpGroupwareUser.inc:337
 msgid "Account status"
 msgstr "アカウントの状態"
 
-#: ../templates/pdfedit/pdfdelete.php:87 ../lib/modules/groupOfNames.inc:225
-#: ../lib/modules/aliasEntry.inc:141
+#: ../templates/pdfedit/pdfdelete.php:85 ../templates/masscreate.php:130
+#: ../lib/modules/groupOfNames.inc:229 ../lib/modules/aliasEntry.inc:141
 msgid "Account type"
 msgstr "アカウント種別"
 
-#: ../templates/config/conftypes.php:169
-msgid "Account type selection"
-msgstr "アカウント種別の選択"
+#: ../templates/config/conftypes.php:156 ../templates/config/confmain.php:174
+#: ../templates/config/confmodules.php:141
+#: ../templates/config/moduleSettings.php:140
+msgid "Account types"
+msgstr "アカウント種別"
 
-#: ../templates/config/confmain.php:235 ../help/help.inc:105
+#: ../help/help.inc:106
 msgid "Account types and modules"
 msgstr "アカウント種別とモジュール"
 
-#: ../help/help.inc:107
+#: ../help/help.inc:108
 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 "
@@ -304,37 +340,45 @@ msgstr ""
 "義します。アカウントモジュールは、編集対象となるプロパティ(e.g. Unix や "
 "Samba)を定義します。"
 
-#: ../lib/modules.inc:1205
+#: ../lib/modules.inc:1428
 msgid "Account was created successfully."
 msgstr "アカウントが作成されました。"
 
-#: ../templates/lists/changePassword.php:413 ../lib/modules.inc:1208
+#: ../templates/lists/changePassword.php:399 ../lib/modules.inc:1431
 msgid "Account was modified successfully."
 msgstr "アカウントが変更されました。"
 
-#: ../lib/modules/ddns.inc:81 ../lib/modules/ddns.inc:287
+#: ../lib/modules/customScripts.inc:119
+msgid "Action type"
+msgstr "アクション種別"
+
+#: ../lib/modules/ddns.inc:83 ../lib/modules/ddns.inc:338
 msgid "Activate DynDNS"
 msgstr "DynDNSを有効化"
 
-#: ../lib/modules/sambaSamAccount.inc:301
+#: ../templates/config/confmain.php:238
+msgid "Activate TLS"
+msgstr "TLSを有効化"
+
+#: ../lib/modules/sambaSamAccount.inc:326
 msgid "Activate this checkbox to allow this user to use the terminal service."
 msgstr ""
 "このユーザーに対してターミナルサービスの利用を許可する場合にチェックボックス"
 "を有効にしてください。"
 
-#: ../lib/modules/sambaSamAccount.inc:322
+#: ../lib/modules/sambaSamAccount.inc:347
 msgid "Activate this checkbox to connect drives from the client machine."
 msgstr ""
 "クライアントマシンからドライブを接続する場合にチェックボックスを有効にしてく"
 "ださい。"
 
-#: ../lib/modules/sambaSamAccount.inc:325
+#: ../lib/modules/sambaSamAccount.inc:350
 msgid "Activate this checkbox to connect printers from the client machine."
 msgstr ""
 "クライアントマシンからプリンターに接続する場合にチェックボックスを有効にして"
 "ください。"
 
-#: ../lib/modules/sambaSamAccount.inc:310
+#: ../lib/modules/sambaSamAccount.inc:335
 msgid ""
 "Activate this checkbox to inherit the initial program and working directory "
 "from the client machine."
@@ -342,19 +386,19 @@ msgstr ""
 "クライアントマシンの初期プログラムと作業ディレクトリを継承する場合にチェック"
 "ボックスを有効にしてください。"
 
-#: ../lib/modules/sambaSamAccount.inc:328
+#: ../lib/modules/sambaSamAccount.inc:353
 msgid "Activate this checkbox to set the client's printer as default printer."
 msgstr ""
 "クライアントのプリンタをデフォルトプリンタにする場合にチェックボックスを有効"
 "にしてください。"
 
-#: ../lib/modules/posixAccount.inc:364
+#: ../lib/modules/posixAccount.inc:356
 msgid "Activating this checkbox will remove the user's home directory."
 msgstr ""
 "このチェックボックスを有効にした場合、ユーザのホームディレクトリを削除しま"
 "す。"
 
-#: ../templates/config/conftypes.php:191
+#: ../templates/config/conftypes.php:230
 msgid "Active account types"
 msgstr "有効なアカウント種別"
 
@@ -363,45 +407,56 @@ msgstr "有効なアカウント種別"
 #: ../templates/tree/add_oclass_form.php:144
 #: ../templates/tree/add_attr_form.php:130
 #: ../templates/tree/add_attr_form.php:162
-#: ../templates/pdfedit/pdfpage.php:574 ../templates/pdfedit/pdfpage.php:591
-#: ../templates/pdfedit/pdfpage.php:621 ../templates/pdfedit/pdfpage.php:662
-#: ../templates/config/conftypes.php:180 ../lib/modules/nisMailAlias.inc:154
-#: ../lib/modules/ieee802device.inc:111 ../lib/modules/groupOfNames.inc:168
-#: ../lib/modules/groupOfNames.inc:310 ../lib/modules/kolabUser.inc:342
-#: ../lib/modules/kolabUser.inc:359 ../lib/modules/kolabUser.inc:385
+#: ../templates/pdfedit/pdfpage.php:563 ../templates/pdfedit/pdfpage.php:580
+#: ../templates/pdfedit/pdfpage.php:608 ../templates/pdfedit/pdfpage.php:649
+#: ../templates/config/conftypes.php:218
+#: ../templates/config/confmodules.php:270 ../lib/modules/nisnetgroup.inc:247
+#: ../lib/modules/nisMailAlias.inc:155 ../lib/modules/ieee802device.inc:111
+#: ../lib/modules/ipHost.inc:138 ../lib/modules/groupOfNames.inc:168
+#: ../lib/modules/groupOfNames.inc:302 ../lib/modules/kolabUser.inc:340
+#: ../lib/modules/kolabUser.inc:357 ../lib/modules/kolabUser.inc:383
 #: ../lib/modules/kolabUser.inc:863 ../lib/modules/kolabUser.inc:903
+#: ../lib/modules/eduPerson.inc:290 ../lib/modules/eduPerson.inc:315
+#: ../lib/modules/eduPerson.inc:341 ../lib/modules/eduPerson.inc:387
 #: ../lib/modules/ldapPublicKey.inc:105
 #: ../lib/modules/inetLocalMailRecipient.inc:167
 msgid "Add"
 msgstr "追加"
 
-#: ../lib/modules/fixed_ip.inc:91 ../lib/modules/fixed_ip.inc:422
-#: ../lib/modules/fixed_ip.inc:423
-msgid "Add IP"
-msgstr "IPアドレスを追加"
+#: ../lib/modules/asteriskAccount.inc:192
+msgid "Add Asterisk account"
+msgstr "Asteriskアカウントを追加"
 
-#: ../lib/modules/kolabUser.inc:403
+#: ../lib/modules/eduPerson.inc:402
+msgid "Add EDU person extension"
+msgstr "EDU person拡張を追加"
+
+#: ../lib/modules/ipHost.inc:181
+msgid "Add IP address extension"
+msgstr "IPアドレス拡張を追加"
+
+#: ../lib/modules/kolabUser.inc:401
 msgid "Add Kolab extension"
 msgstr "Kolab拡張を追加"
 
-#: ../lib/modules/sambaGroupMapping.inc:279
-#: ../lib/modules/sambaSamAccount.inc:1179
-msgid "Add Samba 3 account"
-msgstr "Samba 3アカウントの追加"
+#: ../lib/modules/sambaGroupMapping.inc:280
+#: ../lib/modules/sambaSamAccount.inc:1267
+msgid "Add Samba 3 extension"
+msgstr "Samba 3拡張を追加"
 
-#: ../lib/modules/shadowAccount.inc:331
-msgid "Add Shadow account"
-msgstr "Shadowアカウントの追加"
+#: ../lib/modules/shadowAccount.inc:349
+msgid "Add Shadow account extension"
+msgstr "Shadowアカウント拡張を追加"
 
-#: ../lib/modules/groupOfNames.inc:342
+#: ../lib/modules/groupOfNames.inc:338
 msgid "Add entries of this type:"
 msgstr "この型のエントリを追加:"
 
-#: ../lib/modules/ddns.inc:292
+#: ../lib/modules/ddns.inc:343
 msgid "Add fix IP addresses to DNS"
 msgstr "固定IPアドレスをDNSに追加"
 
-#: ../templates/selfService/adminMain.php:483 ../help/help.inc:174
+#: ../templates/selfService/adminMain.php:553 ../help/help.inc:183
 msgid "Add input field"
 msgstr "入力フィールドの追加"
 
@@ -416,12 +471,12 @@ msgstr "新しい属性の追加"
 msgid "Add new binary attribute"
 msgstr "新しいバイナリ属性の追加"
 
-#: ../templates/selfService/adminMain.php:466 ../help/help.inc:172
+#: ../templates/selfService/adminMain.php:538 ../help/help.inc:181
 msgid "Add new group"
 msgstr "新しいグループの追加"
 
-#: ../lib/modules/inetOrgPerson.inc:462 ../lib/modules/inetOrgPerson.inc:941
-#: ../lib/modules/inetOrgPerson.inc:1032 ../lib/modules/inetOrgPerson.inc:1494
+#: ../lib/modules/inetOrgPerson.inc:631 ../lib/modules/inetOrgPerson.inc:1164
+#: ../lib/modules/inetOrgPerson.inc:1207 ../lib/modules/inetOrgPerson.inc:1744
 msgid "Add photo"
 msgstr "写真を追加"
 
@@ -429,13 +484,13 @@ msgstr "写真を追加"
 #: ../lib/modules/phpGroupwareGroup.inc:83
 #: ../lib/modules/phpGroupwareGroup.inc:106
 #: ../lib/modules/phpGroupwareUser.inc:74
-#: ../lib/modules/phpGroupwareUser.inc:97
-#: ../lib/modules/phpGroupwareUser.inc:183
+#: ../lib/modules/phpGroupwareUser.inc:108
+#: ../lib/modules/phpGroupwareUser.inc:194
 msgid "Add phpGroupWare extension"
 msgstr "phpGroupware拡張を追加"
 
-#: ../templates/selfService/profManage.php:138
-#: ../templates/config/profmanage.php:169 ../help/help.inc:114
+#: ../templates/selfService/profManage.php:149
+#: ../templates/config/profmanage.php:178 ../help/help.inc:121
 msgid "Add profile"
 msgstr "プロファイル追加"
 
@@ -443,26 +498,26 @@ msgstr "プロファイル追加"
 msgid "Adding attribute failed!"
 msgstr "属性の追加に失敗しました!"
 
-#: ../lib/modules/fixed_ip.inc:101
-msgid "Adding of a fixed IP failed because of errors."
-msgstr "エラーが発生したため固定IPアドレスの追加に失敗しました。"
-
-#: ../lib/modules/range.inc:100
+#: ../lib/modules/range.inc:98
 msgid "Adding the range failed because errors occured."
 msgstr "エラーが発生したため範囲の追加に失敗しました。"
 
-#: ../lib/modules/posixAccount.inc:224 ../lib/modules/posixAccount.inc:355
-#: ../lib/modules/posixAccount.inc:400 ../lib/modules/posixAccount.inc:997
-#: ../lib/modules/posixAccount.inc:1090 ../lib/modules/posixAccount.inc:1162
-#: ../lib/modules/posixAccount.inc:1248
+#: ../templates/selfService/adminMain.php:456 ../help/help.inc:187
+msgid "Additional CSS links"
+msgstr "追加のCSSリンク"
+
+#: ../lib/modules/posixAccount.inc:228 ../lib/modules/posixAccount.inc:347
+#: ../lib/modules/posixAccount.inc:392 ../lib/modules/posixAccount.inc:966
+#: ../lib/modules/posixAccount.inc:1051 ../lib/modules/posixAccount.inc:1096
+#: ../lib/modules/posixAccount.inc:1182
 msgid "Additional groups"
 msgstr "追加のグループ"
 
-#: ../templates/massDoUpload.php:106
+#: ../templates/massDoUpload.php:102
 msgid "Additional tasks for module:"
 msgstr "モジュールに対する追加タスク:"
 
-#: ../help/help.inc:173
+#: ../help/help.inc:182
 msgid ""
 "Adds a new group element to the list of self service options. Use this to "
 "structure the input fields."
@@ -470,27 +525,30 @@ msgstr ""
 "セルフサービス・オプションのリストに新しいグループ要素を追加します。入力"
 "フィールドを構造化するために使用します。"
 
-#: ../help/help.inc:175
+#: ../help/help.inc:184
 msgid "Adds a new self service option to the selected group element."
 msgstr "選択したグループ要素に新しいセルフサービス・オプションを追加します。"
 
-#: ../lib/modules/range.inc:90
+#: ../lib/modules/range.inc:88
 msgid "Adds input fields for a new IP range."
 msgstr "新しいIPアドレス範囲の入力フィールを追加する。"
 
-#: ../lib/modules/fixed_ip.inc:92
-msgid "Adds input fields for a new fixed IP address."
-msgstr "新しい固定IPアドレスの入力フィールドを追加する。"
-
-#: ../lib/modules/inetOrgPerson.inc:235
+#: ../lib/modules/inetOrgPerson.inc:352 ../lib/modules/inetOrgPerson.inc:440
 msgid "Administration"
 msgstr "管理"
 
-#: ../lib/modules/groupOfNames.inc:93 ../lib/modules/posixGroup.inc:401
+#: ../lib/modules/nisnetgroup.inc:107 ../lib/modules/groupOfNames.inc:93
+#: ../lib/modules/posixGroup.inc:372
 msgid "Administrators group"
 msgstr "管理者グループ"
 
-#: ../lib/modules/sambaSamAccount.inc:501
+#: ../lib/modules/eduPerson.inc:90 ../lib/modules/eduPerson.inc:94
+#: ../lib/modules/eduPerson.inc:161 ../lib/modules/eduPerson.inc:282
+#: ../lib/modules/eduPerson.inc:679
+msgid "Affiliations"
+msgstr "所属"
+
+#: ../lib/modules/sambaSamAccount.inc:530
 msgid "Alaska"
 msgstr ""
 
@@ -502,69 +560,74 @@ msgstr "アルゴリズム的なRIDベースが数字でありません!"
 msgid "Alias"
 msgstr "エイリアス"
 
-#: ../lib/types/alias.inc:53
+#: ../lib/types/alias.inc:62
 msgid "Alias entries"
 msgstr "エイリアス・エントリ"
 
 #: ../lib/modules/nisMailAlias.inc:67 ../lib/modules/nisMailAlias.inc:82
-#: ../lib/modules/nisMailAlias.inc:139 ../lib/modules/nisMailAlias.inc:276
-#: ../lib/types/mailAlias.inc:82
+#: ../lib/modules/nisMailAlias.inc:139 ../lib/modules/nisMailAlias.inc:278
+#: ../lib/types/mailAlias.inc:91
 msgid "Alias name"
 msgstr "エイリアス名"
 
-#: ../lib/modules/uidObject.inc:52 ../lib/modules/aliasEntry.inc:54
-#: ../lib/modules/aliasEntry.inc:62 ../lib/modules/aliasEntry.inc:92
-#: ../lib/modules/aliasEntry.inc:109 ../lib/modules/aliasEntry.inc:167
-#: ../lib/modules/aliasEntry.inc:242 ../lib/types/alias.inc:83
+#: ../lib/modules/uidObject.inc:52 ../lib/modules/customScripts.inc:45
+#: ../lib/modules/aliasEntry.inc:54 ../lib/modules/aliasEntry.inc:62
+#: ../lib/modules/aliasEntry.inc:92 ../lib/modules/aliasEntry.inc:109
+#: ../lib/modules/aliasEntry.inc:161 ../lib/modules/aliasEntry.inc:237
+#: ../lib/types/alias.inc:92
 msgid "Aliased entry"
 msgstr "エイリアス化エントリ"
 
-#: ../templates/schema/schema.php:231 ../lib/types/alias.inc:44
+#: ../templates/schema/schema.php:224 ../lib/types/alias.inc:53
 msgid "Aliases"
 msgstr "エイリアス"
 
-#: ../lib/lists.inc:657
+#: ../lib/lists.inc:579
 #, php-format
 msgid "All accounts (%s)"
 msgstr "全てのアカウント (%s)"
 
-#: ../templates/selfService/selfServiceMain.php:186
-#: ../templates/initsuff.php:160
+#: ../templates/selfService/selfServiceMain.php:282
+#: ../templates/initsuff.php:157
 msgid "All changes were successful."
 msgstr "すべての変更が成功しました。"
 
-#: ../help/help.inc:181
+#: ../help/help.inc:194
 msgid "All following lines form the mail body."
 msgstr "後に続く全ての行はメール本文になります。"
 
-#: ../lib/lists.inc:656
+#: ../lib/lists.inc:578
 #, php-format
 msgid "All selected accounts (%s)"
 msgstr "全ての選択されたアカウント (%s)"
 
 #: ../lib/modules/sambaDomain.inc:110 ../lib/modules/sambaDomain.inc:299
-#: ../lib/modules/sambaDomain.inc:669
+#: ../lib/modules/sambaDomain.inc:670
 msgid "Allow machine password changes"
 msgstr "マシンパスワードの変更を許可"
 
-#: ../lib/modules/sambaSamAccount.inc:300
-#: ../lib/modules/sambaSamAccount.inc:1345
-#: ../lib/modules/sambaSamAccount.inc:1726
+#: ../lib/modules/ppolicy.inc:124 ../lib/modules/ppolicy.inc:288
+#: ../lib/modules/ppolicy.inc:501 ../lib/types/ppolicyType.inc:90
+msgid "Allow password change"
+msgstr "パスワードの変更を許可"
+
+#: ../lib/modules/sambaSamAccount.inc:325
+#: ../lib/modules/sambaSamAccount.inc:1423
+#: ../lib/modules/sambaSamAccount.inc:1792
 msgid "Allow terminal server login"
 msgstr "ターミナルサーバログインを許可"
 
-#: ../templates/config/mainmanage.php:188 ../lib/types/user.inc:86
-#: ../help/help.inc:136
+#: ../templates/config/mainmanage.php:199 ../lib/types/user.inc:95
+#: ../help/help.inc:143
 msgid "Allowed hosts"
 msgstr "許可されたホスト"
 
-#: ../lib/modules/sambaAccount.inc:867 ../lib/modules/sambaAccount.inc:868
-#: ../lib/modules/sambaSamAccount.inc:1202
-#: ../lib/modules/sambaSamAccount.inc:1203
+#: ../lib/modules/sambaSamAccount.inc:1290
+#: ../lib/modules/sambaSamAccount.inc:1291
 msgid "Allowed workstations"
 msgstr "許可されたワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:516
+#: ../lib/modules/sambaSamAccount.inc:545
 msgid "Almaty, Dhaka, Colombo"
 msgstr ""
 
@@ -581,20 +644,51 @@ msgstr "常に拒否"
 msgid "An attribute (%s) was modified and is highlighted below."
 msgstr "属性(%s)が変更され、ハイライト表示されています。"
 
-#: ../lib/modules/kolabUser.inc:324 ../lib/modules/kolabUser.inc:782
+#: ../lib/modules/kolabUser.inc:322 ../lib/modules/kolabUser.inc:781
 #: ../lib/modules/kolabUser.inc:884
 msgid "Anyone"
 msgstr "誰か"
 
+#: ../lib/modules/asteriskExtension.inc:94
+#: ../lib/modules/asteriskExtension.inc:121
+#: ../lib/modules/asteriskExtension.inc:160
+#: ../lib/modules/asteriskExtension.inc:230
+#: ../lib/modules/asteriskExtension.inc:463
+msgid "Application"
+msgstr "アプリケーション"
+
+#: ../lib/modules/asteriskExtension.inc:78
+#: ../lib/modules/asteriskExtension.inc:167
+#: ../lib/modules/asteriskExtension.inc:234
+#: ../lib/modules/asteriskExtension.inc:460
+msgid "Application data"
+msgstr "アプリケーション・データ"
+
 #: ../templates/tree/delete_form.php:149
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "本当にこのオブジェクトを削除しますか?"
 
-#: ../lib/modules/sambaSamAccount.inc:506
+#: ../lib/modules/asteriskAccount.inc:64
+msgid "Asterisk"
+msgstr "アスタリスク"
+
+#: ../lib/modules/asteriskExtension.inc:63
+msgid "Asterisk extension"
+msgstr "アスタリスク拡張"
+
+#: ../lib/types/asteriskExt.inc:53
+msgid "Asterisk extensions"
+msgstr "アスタリスク拡張"
+
+#: ../lib/types/asteriskExt.inc:62
+msgid "Asterisk extensions entries"
+msgstr "アスタリスク拡張エントリ"
+
+#: ../lib/modules/sambaSamAccount.inc:535
 msgid "Atlantic time (Canada), Caracas"
 msgstr ""
 
-#: ../lib/modules/ddns.inc:339
+#: ../lib/modules/ddns.inc:390
 msgid ""
 "Attention: The DHCP service needs to be restarted after changes in DDNS."
 msgstr "注意: DDNSの変更後にDHCPサービスのリスタートが必要です。"
@@ -603,99 +697,145 @@ msgstr "注意: DDNSの変更後にDHCPサービスのリスタートが必要
 msgid "Attribute"
 msgstr "属性"
 
-#: ../templates/schema/schema.php:74 ../templates/schema/schema.php:75
+#: ../templates/schema/schema.php:67 ../templates/schema/schema.php:68
 msgid "Attribute types"
 msgstr "属性タイプ"
 
-#: ../lib/modules/sambaSamAccount.inc:522
+#: ../lib/modules/sambaSamAccount.inc:551
 msgid "Auckland, Fiji, Kamchatka"
 msgstr ""
 
-#: ../templates/config/conftypes.php:173
+#: ../lib/modules/eduPerson.inc:127 ../lib/modules/eduPerson.inc:133
+#: ../lib/modules/sambaSamAccount.inc:143
+#: ../lib/modules/sambaSamAccount.inc:373 ../lib/modules/shadowAccount.inc:99
+#: ../lib/modules/shadowAccount.inc:193 ../lib/modules/phpGroupwareUser.inc:86
+#: ../lib/modules/phpGroupwareUser.inc:93
+msgid "Automatically add this extension"
+msgstr "この拡張を自動的に追加"
+
+#: ../templates/config/conftypes.php:211 ../lib/modules/customScripts.inc:54
 msgid "Available account types"
 msgstr "有効なアカウント種別"
 
-#: ../lib/modules/posixAccount.inc:1102
+#: ../lib/modules/customScripts.inc:55 ../lib/modules/customScripts.inc:67
+msgid "Available actions"
+msgstr "利用可能なアクション"
+
+#: ../lib/modules/nisnetgroup.inc:364 ../lib/modules/posixAccount.inc:1063
 msgid "Available groups"
 msgstr "有効なグループ"
 
-#: ../templates/config/confmodules.php:211
+#: ../templates/config/confmodules.php:279
 msgid "Available modules"
 msgstr "有効なモジュール"
 
-#: ../lib/modules/posixGroup.inc:260
+#: ../lib/modules/posixGroup.inc:253 ../lib/modules/asteriskExtension.inc:311
 msgid "Available users"
 msgstr "有効なユーザ"
 
-#: ../lib/modules/sambaAccount.inc:873 ../lib/modules/sambaSamAccount.inc:1208
+#: ../lib/modules/sambaSamAccount.inc:1296
 msgid "Available workstations"
 msgstr "有効なワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:509
+#: ../lib/modules/sambaSamAccount.inc:538
 msgid "Azores, Cape Verde Islands"
 msgstr ""
 
-#: ../lib/modules/dhcp_settings.inc:96
+#: ../lib/modules/dhcp_settings.inc:87
 msgid "B-Node (0x01)"
 msgstr ""
 
-#: ../templates/tree/update_confirm.php:255
-#: ../lib/modules/inetOrgPerson.inc:1033 ../lib/modules/groupOfNames.inc:352
-#: ../lib/modules/sambaAccount.inc:878 ../lib/modules/posixGroup.inc:266
-#: ../lib/modules/posixGroup.inc:289 ../lib/modules/posixAccount.inc:1108
-#: ../lib/modules/sambaSamAccount.inc:1212
+#: ../templates/massBuildAccounts.php:212
+#: ../templates/tree/update_confirm.php:255 ../lib/modules/nisnetgroup.inc:370
+#: ../lib/modules/inetOrgPerson.inc:1208 ../lib/modules/groupOfNames.inc:348
+#: ../lib/modules/posixGroup.inc:259 ../lib/modules/asteriskExtension.inc:318
+#: ../lib/modules/posixAccount.inc:1069
+#: ../lib/modules/sambaSamAccount.inc:1300
 msgid "Back"
 msgstr "戻る"
 
-#: ../templates/logout.php:78 ../templates/selfService/adminMain.php:114
-#: ../templates/selfService/adminLogin.php:150
-#: ../templates/config/index.php:114 ../templates/config/conflogin.php:153
-#: ../templates/config/confmain.php:602 ../templates/config/mainlogin.php:138
+#: ../lib/types/dhcp.inc:47
+msgid "Back to DHCP list"
+msgstr "DHCP一覧に戻る"
+
+#: ../templates/logout.php:78 ../templates/selfService/adminMain.php:140
+#: ../templates/selfService/adminLogin.php:157
+#: ../templates/config/index.php:115 ../templates/config/conflogin.php:161
+#: ../templates/config/confsave.php:88 ../templates/config/mainlogin.php:154
 msgid "Back to Login"
 msgstr "ログインに戻る"
 
-#: ../templates/ou_edit.php:127 ../templates/ou_edit.php:131
+#: ../lib/types/nisObjectType.inc:30
+msgid "Back to NIS object list"
+msgstr "NISオブジェクト一覧に戻る"
+
+#: ../templates/ou_edit.php:123 ../templates/ou_edit.php:127
 msgid "Back to OU-Editor"
 msgstr "OU-エディタに戻る"
 
-#: ../templates/pdfedit/pdfpage.php:106 ../templates/pdfedit/pdfdelete.php:67
-#: ../templates/pdfedit/pdfdelete.php:75
+#: ../templates/pdfedit/pdfpage.php:101 ../templates/pdfedit/pdfdelete.php:65
+#: ../templates/pdfedit/pdfdelete.php:73
 msgid "Back to PDF Editor"
 msgstr "PDFエディタに戻る"
 
-#: ../lib/modules.inc:1216
+#: ../lib/baseType.inc:46
 msgid "Back to account list"
 msgstr "アカウント一覧に戻る"
 
-#: ../templates/lists/userlink.php:66
+#: ../lib/types/mailAlias.inc:44 ../lib/types/alias.inc:44
+msgid "Back to alias list"
+msgstr "エイリアス一覧に戻る"
+
+#: ../lib/types/smbDomain.inc:44
+msgid "Back to domain list"
+msgstr "ドメイン一覧に戻る"
+
+#: ../lib/types/asteriskExt.inc:44
+msgid "Back to extensions list"
+msgstr "拡張一覧に戻る"
+
+#: ../templates/lists/userlink.php:63 ../lib/types/group.inc:45
+#: ../lib/types/netgroup.inc:44 ../lib/types/gon.inc:44
 msgid "Back to group list"
 msgstr "グループ一覧に戻る"
 
-#: ../templates/delete.php:242
+#: ../lib/types/host.inc:44
+msgid "Back to host list"
+msgstr "ホスト一覧に戻る"
+
+#: ../templates/delete.php:232
 msgid "Back to list"
 msgstr "一覧に戻る"
 
-#: ../templates/config/mainmanage.php:141
-#: ../templates/config/mainmanage.php:384
+#: ../templates/config/mainmanage.php:150
+#: ../templates/config/mainmanage.php:382
 msgid "Back to login"
 msgstr "ログインに戻る"
 
-#: ../templates/profedit/profilepage.php:126
-#: ../templates/profedit/profiledelete.php:67
-#: ../templates/profedit/profiledelete.php:75
+#: ../lib/types/ppolicyType.inc:30
+msgid "Back to policy list"
+msgstr "ポリシー一覧に戻る"
+
+#: ../templates/profedit/profilepage.php:123
+#: ../templates/profedit/profiledelete.php:65
+#: ../templates/profedit/profiledelete.php:73
 msgid "Back to profile editor"
 msgstr "プロファイルエディタに戻る"
 
-#: ../templates/selfService/profManage.php:268
-#: ../templates/config/profmanage.php:374
+#: ../templates/selfService/profManage.php:267
+#: ../templates/config/profmanage.php:365
 msgid "Back to profile login"
 msgstr "プロファイルログインに戻る"
 
-#: ../lib/modules/sambaSamAccount.inc:513
+#: ../lib/types/user.inc:44
+msgid "Back to user list"
+msgstr "ユーザー一覧に戻る"
+
+#: ../lib/modules/sambaSamAccount.inc:542
 msgid "Baghdad, Riyadh, Moscow"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:517
+#: ../lib/modules/sambaSamAccount.inc:546
 msgid "Bangkok, Hanoi, Jakarta"
 msgstr ""
 
@@ -707,55 +847,55 @@ msgstr "Base (ベースDNのみ)"
 msgid "Base DN"
 msgstr "ベースDN"
 
-#: ../templates/config/confmodules.php:120 ../help/help.inc:128
+#: ../templates/config/confmodules.php:206 ../help/help.inc:135
 msgid "Base module"
 msgstr "ベースモジュール"
 
-#: ../templates/pdfedit/pdfpage.php:406
+#: ../templates/pdfedit/pdfpage.php:396
 msgid "Beginning"
 msgstr "先頭"
 
-#: ../lib/modules/sambaSamAccount.inc:518
+#: ../lib/modules/sambaSamAccount.inc:547
 msgid "Beijing, Perth, Singapore"
 msgstr "Beijing(北京), Perth, Singapore"
 
-#: ../templates/tree/edit.php:176 ../templates/tree/edit.php:305
+#: ../templates/tree/edit.php:179 ../templates/tree/edit.php:308
 msgid "Binary value"
 msgstr "バイナリ値"
 
-#: ../lib/modules/quota.inc:48
+#: ../lib/modules/quota.inc:50
 msgid "Block hard quota"
 msgstr "ブロック・ハードクオータ"
 
-#: ../lib/modules/quota.inc:48 ../lib/modules/quota.inc:49
+#: ../lib/modules/quota.inc:50 ../lib/modules/quota.inc:51
 msgid ""
 "Block hard quota contains invalid characters. Only natural numbers are "
 "allowed."
 msgstr ""
 "ブロック・ハードクォータに不正な文字が含まれています。自然数のみが有効です。"
 
-#: ../lib/modules/quota.inc:54
+#: ../lib/modules/quota.inc:56
 msgid "Block quota"
 msgstr "ブロック・クオータ"
 
-#: ../lib/modules/quota.inc:46
+#: ../lib/modules/quota.inc:48
 msgid "Block soft quota"
 msgstr "ブロック・ソフトクオータ"
 
-#: ../lib/modules/quota.inc:46 ../lib/modules/quota.inc:47
+#: ../lib/modules/quota.inc:48 ../lib/modules/quota.inc:49
 msgid ""
 "Block soft quota contains invalid characters. Only natural numbers are "
 "allowed."
 msgstr ""
 "ブロック・ソフトクオータに不正な文字が含まれています。自然数のみが有効です。"
 
-#: ../lib/modules/quota.inc:54 ../lib/modules/quota.inc:55
+#: ../lib/modules/quota.inc:56 ../lib/modules/quota.inc:57
 msgid "Block soft quota must be smaller than block hard quota."
 msgstr ""
 "ブロック・ソフトクオータはブロック・ハードクオータより小さくなくてはなりませ"
 "ん。"
 
-#: ../lib/modules/sambaSamAccount.inc:507
+#: ../lib/modules/sambaSamAccount.inc:536
 msgid "Brazil, Buenos Aires"
 msgstr ""
 
@@ -763,154 +903,154 @@ msgstr ""
 msgid "Builtin group"
 msgstr "組み込みグループ"
 
-#: ../lib/modules/inetOrgPerson.inc:107 ../lib/modules/inetOrgPerson.inc:233
-#: ../lib/modules/inetOrgPerson.inc:474 ../lib/modules/inetOrgPerson.inc:894
-#: ../lib/modules/inetOrgPerson.inc:1063
+#: ../lib/modules/inetOrgPerson.inc:104 ../lib/modules/inetOrgPerson.inc:153
+#: ../lib/modules/inetOrgPerson.inc:271 ../lib/modules/inetOrgPerson.inc:350
+#: ../lib/modules/inetOrgPerson.inc:643 ../lib/modules/inetOrgPerson.inc:1105
+#: ../lib/modules/inetOrgPerson.inc:1238 ../lib/modules/inetOrgPerson.inc:1713
 msgid "Business category"
 msgstr "業種"
 
-#: ../lib/modules/inetOrgPerson.inc:475
+#: ../lib/modules/inetOrgPerson.inc:644
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "業種(例. 役員, ITサービス, マネージャー, ...)"
 
-#: ../templates/masscreate.php:141
+#: ../templates/masscreate.php:219
 msgid "CSV file:"
 msgstr "CSVファイル:"
 
-#: ../templates/config/confmain.php:178 ../help/help.inc:101
+#: ../templates/config/confmain.php:274 ../help/help.inc:100
 msgid "Cache timeout"
 msgstr "キャッシュ有効時間"
 
-#: ../templates/config/confmain.php:494
+#: ../templates/config/confmain.php:563
 msgid "Cache timeout is invalid!"
 msgstr "キャッシュ有効時間が正しくありません。"
 
-#: ../lib/modules/sambaAccount.inc:386 ../lib/modules/sambaAccount.inc:389
-#: ../lib/modules/sambaAccount.inc:392 ../lib/modules/sambaAccount.inc:398
-#: ../lib/modules/sambaAccount.inc:410
-#: ../lib/modules/sambaGroupMapping.inc:367
-#: ../lib/modules/posixAccount.inc:401 ../lib/modules/sambaSamAccount.inc:255
-#: ../lib/modules/sambaSamAccount.inc:258
-#: ../lib/modules/sambaSamAccount.inc:261
-#: ../lib/modules/sambaSamAccount.inc:267 ../lib/modules/shadowAccount.inc:170
-#: ../lib/modules/shadowAccount.inc:174 ../lib/modules/shadowAccount.inc:178
-#: ../lib/modules/shadowAccount.inc:182
+#: ../lib/modules/asteriskAccount.inc:77
+#: ../lib/modules/asteriskAccount.inc:119
+#: ../lib/modules/asteriskAccount.inc:175
+#: ../lib/modules/asteriskAccount.inc:271
+msgid "Caller ID"
+msgstr "発信者番号"
+
+#: ../lib/modules/sambaGroupMapping.inc:368
+#: ../lib/modules/posixAccount.inc:393 ../lib/modules/sambaSamAccount.inc:280
+#: ../lib/modules/sambaSamAccount.inc:283
+#: ../lib/modules/sambaSamAccount.inc:286
+#: ../lib/modules/sambaSamAccount.inc:292 ../lib/modules/shadowAccount.inc:174
+#: ../lib/modules/shadowAccount.inc:178 ../lib/modules/shadowAccount.inc:182
+#: ../lib/modules/shadowAccount.inc:186
 msgid "Can be left empty."
 msgstr "省略可"
 
 #: ../templates/tree/delete_form.php:119 ../templates/tree/delete_form.php:168
 #: ../templates/tree/update_confirm.php:241
-#: ../templates/selfService/adminMain.php:547
-#: ../templates/pdfedit/pdfpage.php:708 ../templates/pdfedit/pdfdelete.php:97
-#: ../templates/delete.php:117 ../templates/ou_edit.php:108
-#: ../templates/profedit/profilepage.php:263
-#: ../templates/profedit/profiledelete.php:86
-#: ../templates/config/conftypes.php:239 ../templates/config/confmain.php:457
-#: ../templates/config/confmodules.php:116 ../templates/initsuff.php:193
-#: ../lib/modules/inetOrgPerson.inc:996 ../lib/modules/groupOfNames.inc:231
-#: ../lib/modules/groupOfNames.inc:258 ../lib/modules/groupOfNames.inc:311
-#: ../lib/modules/posixAccount.inc:1137 ../lib/modules/kolabUser.inc:572
-#: ../lib/modules/sambaSamAccount.inc:1277
-#: ../lib/modules/sambaSamAccount.inc:1325
-#: ../lib/modules/sambaSamAccount.inc:1448
-#: ../lib/modules/shadowAccount.inc:385
-#: ../lib/modules/phpGroupwareUser.inc:248 ../lib/modules/aliasEntry.inc:147
-#: ../lib/modules/aliasEntry.inc:173 ../lib/lists.inc:667 ../lib/lists.inc:898
+#: ../templates/selfService/adminMain.php:306
+#: ../templates/pdfedit/pdfpage.php:697 ../templates/pdfedit/pdfdelete.php:95
+#: ../templates/delete.php:112 ../templates/ou_edit.php:108
+#: ../templates/profedit/profilepage.php:257
+#: ../templates/profedit/profiledelete.php:84
+#: ../templates/config/conftypes.php:199 ../templates/config/confmain.php:217
+#: ../templates/config/confmodules.php:184
+#: ../templates/config/moduleSettings.php:183 ../templates/initsuff.php:187
+#: ../lib/modules.inc:1291 ../lib/modules/nisnetgroup.inc:467
+#: ../lib/modules/groupOfNames.inc:235 ../lib/modules/groupOfNames.inc:256
+#: ../lib/modules/groupOfNames.inc:303 ../lib/modules/kolabUser.inc:570
+#: ../lib/modules/sambaSamAccount.inc:1365
+#: ../lib/modules/sambaSamAccount.inc:1403
+#: ../lib/modules/sambaSamAccount.inc:1526
+#: ../lib/modules/shadowAccount.inc:403
+#: ../lib/modules/phpGroupwareUser.inc:260 ../lib/modules/aliasEntry.inc:147
+#: ../lib/modules/aliasEntry.inc:167 ../lib/lists.inc:589 ../lib/lists.inc:805
 msgid "Cancel"
 msgstr "中止"
 
-#: ../templates/selfService/selfServiceLogin.php:111
-#: ../templates/selfService/selfServiceLogin.php:115
-#: ../templates/selfService/selfServiceMain.php:86 ../templates/login.php:437
-#: ../templates/login.php:442
+#: ../templates/selfService/selfServiceLogin.php:118
+#: ../templates/selfService/selfServiceLogin.php:122
+#: ../templates/selfService/selfServiceMain.php:163 ../templates/login.php:401
+#: ../templates/login.php:459 ../templates/login.php:464
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "指定されたLDAPサーバに接続できません。再試行してください。"
 
-#: ../lib/config.inc:392 ../lib/config.inc:1016
+#: ../lib/config.inc:419 ../lib/config.inc:1146
 msgid "Cannot open config file!"
 msgstr "configファイルをオープンできません!"
 
-#: ../templates/selfService/adminMain.php:348
+#: ../templates/selfService/adminMain.php:403
 msgid "Captions and labels"
 msgstr "説明とラベル"
 
-#: ../lib/modules/inetOrgPerson.inc:155 ../lib/modules/inetOrgPerson.inc:311
-#: ../lib/modules/inetOrgPerson.inc:486 ../lib/modules/inetOrgPerson.inc:880
-#: ../lib/modules/inetOrgPerson.inc:1065 ../lib/modules/inetOrgPerson.inc:1455
+#: ../lib/modules/inetOrgPerson.inc:152 ../lib/modules/inetOrgPerson.inc:265
+#: ../lib/modules/inetOrgPerson.inc:462 ../lib/modules/inetOrgPerson.inc:655
+#: ../lib/modules/inetOrgPerson.inc:1087 ../lib/modules/inetOrgPerson.inc:1240
+#: ../lib/modules/inetOrgPerson.inc:1697
 msgid "Car license"
 msgstr "免許証番号"
 
-#: ../lib/modules/sambaSamAccount.inc:511
+#: ../lib/modules/sambaSamAccount.inc:540
 msgid "Central Europe Time, Paris, Berlin"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:504
+#: ../lib/modules/sambaSamAccount.inc:533
 msgid "Central Time (US & Canada), Mexico City"
 msgstr ""
 
-#: ../templates/selfService/adminMain.php:409
-#: ../templates/pdfedit/pdfpage.php:453 ../templates/pdfedit/pdfpage.php:459
+#: ../templates/selfService/adminMain.php:481
+#: ../templates/pdfedit/pdfpage.php:443 ../templates/pdfedit/pdfpage.php:449
 #: ../lib/modules/groupOfNames.inc:157 ../lib/modules/groupOfNames.inc:174
-#: ../lib/modules/sambaSamAccount.inc:1038
-#: ../lib/modules/sambaSamAccount.inc:1055
-#: ../lib/modules/sambaSamAccount.inc:1072
-#: ../lib/modules/sambaSamAccount.inc:1321
-#: ../lib/modules/shadowAccount.inc:324 ../lib/modules/shadowAccount.inc:381
-#: ../lib/modules/phpGroupwareUser.inc:145
-#: ../lib/modules/phpGroupwareUser.inc:244 ../lib/modules/aliasEntry.inc:100
+#: ../lib/modules/asteriskExtension.inc:240
+#: ../lib/modules/sambaSamAccount.inc:1139
+#: ../lib/modules/sambaSamAccount.inc:1399
+#: ../lib/modules/shadowAccount.inc:335 ../lib/modules/shadowAccount.inc:399
+#: ../lib/modules/phpGroupwareUser.inc:156
+#: ../lib/modules/phpGroupwareUser.inc:256 ../lib/modules/aliasEntry.inc:100
 msgid "Change"
 msgstr "変更"
 
-#: ../lib/modules/posixGroup.inc:212
+#: ../lib/modules/posixGroup.inc:205
 msgid "Change GID number of users and hosts"
 msgstr "ユーザとホストのGID番号を変更"
 
-#: ../templates/config/profmanage.php:333 ../help/help.inc:122
+#: ../templates/config/profmanage.php:330 ../help/help.inc:129
 msgid "Change default profile"
 msgstr "デフォルト・プロファイルの変更"
 
-#: ../lib/lists.inc:883
+#: ../lib/lists.inc:791
 msgid "Change list settings"
 msgstr "リスト設定の変更"
 
-#: ../templates/config/mainmanage.php:338 ../help/help.inc:124
+#: ../templates/config/mainmanage.php:337 ../help/help.inc:131
 msgid "Change master password"
 msgstr "マスタパスワードの変更"
 
-#: ../templates/lists/changePassword.php:121
-#: ../templates/lists/changePassword.php:193
-#: ../templates/lists/changePassword.php:220
-#: ../lib/modules/inetOrgPerson.inc:767 ../lib/modules/posixGroup.inc:202
-#: ../lib/modules/posixAccount.inc:1043 ../lib/types/user.inc:234
-#: ../help/help.inc:99
+#: ../templates/lists/changePassword.php:117
+#: ../templates/lists/changePassword.php:187
+#: ../templates/lists/changePassword.php:214 ../lib/types/user.inc:247
+#: ../help/help.inc:98
 msgid "Change password"
 msgstr "パスワードの変更"
 
-#: ../templates/config/confmain.php:210 ../templates/config/confmain.php:213
+#: ../templates/config/confmain.php:326 ../templates/config/confmain.php:329
 msgid "Change passwords"
 msgstr "パスワードの変更"
 
-#: ../templates/login.php:362
+#: ../templates/login.php:340
 msgid "Change profile"
 msgstr "プロファイルの変更"
 
-#: ../lib/lists.inc:721 ../lib/lists.inc:722
+#: ../lib/lists.inc:642 ../lib/lists.inc:643
 msgid "Change settings"
 msgstr "設定の変更"
 
-#: ../lib/lists.inc:696
-msgid "Change suffix"
-msgstr "サフィックスの変更"
-
-#: ../lib/modules/posixAccount.inc:862
+#: ../lib/modules/posixAccount.inc:872
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "ASCII文字だけが有効なため、%s の値を変更しました。"
 
-#: ../templates/tests/index.php:59
+#: ../templates/tests/index.php:51
 msgid "Check if quotas and homedirectories can be managed."
 msgstr "quotaおよびホームディレクトリが管理可能な場合にチェックしてください。"
 
-#: ../templates/tests/index.php:62
+#: ../templates/tests/index.php:54
 msgid ""
 "Check if the LDAP schema fits the requirements of the selected account "
 "modules."
@@ -918,11 +1058,11 @@ msgstr ""
 "選択したアカウントモジュールの要件にLDAPスキーマが適合するか確認してくださ"
 "い。"
 
-#: ../templates/tests/lamdaemonTest.php:98
+#: ../templates/tests/lamdaemonTest.php:90
 msgid "Check quotas"
 msgstr "クオータをチェック"
 
-#: ../templates/masscreate.php:132
+#: ../templates/masscreate.php:210
 msgid ""
 "Check your input carefully. LAM will only do some basic checks on the upload "
 "data."
@@ -930,7 +1070,7 @@ msgstr ""
 "入力をよく確認してください。LAMはアップロードデータについて基本的な検査しか行"
 "いません。"
 
-#: ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:96
 msgid "Choose a server for the home directory!"
 msgstr "ホームディレクトリ用のサーバを選択してください!"
 
@@ -942,21 +1082,25 @@ msgstr "テンプレートを選択"
 msgid "Click here if you are not directed to the next page."
 msgstr "自動的に次ページにジャンプしない場合はここをクリックしてください。"
 
-#: ../lib/modules/sambaSamAccount.inc:327
-#: ../lib/modules/sambaSamAccount.inc:1411
-#: ../lib/modules/sambaSamAccount.inc:1754
+#: ../lib/types/user.inc:218
+msgid "Click to switch between thumbnail and original size."
+msgstr "クリックしてサムネイルと元のサイズを切り替えてください。"
+
+#: ../lib/modules/sambaSamAccount.inc:352
+#: ../lib/modules/sambaSamAccount.inc:1489
+#: ../lib/modules/sambaSamAccount.inc:1820
 msgid "Client printer is default"
 msgstr "クライアントプリンタをデフォルトにする"
 
-#: ../templates/schema/schema.php:204
+#: ../templates/schema/schema.php:197
 msgid "Collective"
 msgstr "集合属性"
 
-#: ../templates/masscreate.php:151
+#: ../templates/masscreate.php:230
 msgid "Columns:"
 msgstr "カラム:"
 
-#: ../lib/modules/sambaAccount.inc:398 ../lib/modules/sambaSamAccount.inc:267
+#: ../lib/modules/sambaSamAccount.inc:292
 msgid ""
 "Comma separated list of Samba workstations the user is allowed to login. "
 "Empty means every workstation."
@@ -964,49 +1108,57 @@ msgstr ""
 "ユーザがログインできるSambaワークステーションのコンマ区切りリスト。空入力はす"
 "べてのワークステーションを意味します。"
 
+#: ../lib/modules/customScripts.inc:120
+msgid "Command"
+msgstr "コマンド"
+
 #: ../templates/tree/update_confirm.php:234
 msgid "Commit"
 msgstr "更新"
 
-#: ../lib/modules/inetOrgPerson.inc:97 ../lib/modules/inetOrgPerson.inc:328
-#: ../lib/modules/inetOrgPerson.inc:446 ../lib/modules/inetOrgPerson.inc:735
-#: ../lib/modules/inetOrgPerson.inc:1061 ../lib/modules/posixAccount.inc:92
-#: ../lib/modules/posixAccount.inc:205 ../lib/modules/posixAccount.inc:404
-#: ../lib/modules/posixAccount.inc:426 ../lib/modules/posixAccount.inc:970
-#: ../lib/modules/posixAccount.inc:1243
+#: ../lib/modules/inetOrgPerson.inc:97 ../lib/modules/inetOrgPerson.inc:619
+#: ../lib/modules/inetOrgPerson.inc:935 ../lib/modules/inetOrgPerson.inc:1236
+#: ../lib/modules/inetOrgPerson.inc:1290
+#: ../lib/modules/asteriskExtension.inc:102
+#: ../lib/modules/asteriskExtension.inc:153
+#: ../lib/modules/asteriskExtension.inc:214
+#: ../lib/modules/asteriskExtension.inc:475 ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:209 ../lib/modules/posixAccount.inc:396
+#: ../lib/modules/posixAccount.inc:418 ../lib/modules/posixAccount.inc:944
+#: ../lib/modules/posixAccount.inc:1177
 msgid "Common name"
-msgstr "氏名(common name)"
+msgstr "名称(common name)"
 
-#: ../templates/config/index.php:48
+#: ../lib/modules/asteriskExtension.inc:103
+msgid "Common name of the Asterisk extension."
+msgstr "アスタリスク拡張の名称"
+
+#: ../templates/serverInfo.php:100
+msgid "Config suffix"
+msgstr "サフィックスの設定"
+
+#: ../templates/config/index.php:50
 msgid "Configuration overview"
 msgstr "構成の概要"
 
-#: ../help/help.inc:57 ../help/help.inc:59 ../help/help.inc:71
-#: ../help/help.inc:77 ../help/help.inc:83 ../help/help.inc:88
-#: ../help/help.inc:95 ../help/help.inc:97 ../help/help.inc:99
-#: ../help/help.inc:101 ../help/help.inc:103 ../help/help.inc:105
-#: ../help/help.inc:108 ../help/help.inc:112 ../help/help.inc:128
-msgid "Configuration wizard"
-msgstr "構成設定ウィザード"
-
-#: ../templates/config/confmodules.php:252
+#: ../templates/config/confmodules.php:362
 msgid "Conflicting module:"
 msgstr "競合するモジュール"
 
-#: ../lib/modules/sambaSamAccount.inc:321
-#: ../lib/modules/sambaSamAccount.inc:1401
-#: ../lib/modules/sambaSamAccount.inc:1744
+#: ../lib/modules/sambaSamAccount.inc:346
+#: ../lib/modules/sambaSamAccount.inc:1479
+#: ../lib/modules/sambaSamAccount.inc:1810
 msgid "Connect client drives"
 msgstr "クライアントのドライブを接続"
 
-#: ../lib/modules/sambaSamAccount.inc:324
-#: ../lib/modules/sambaSamAccount.inc:1406
-#: ../lib/modules/sambaSamAccount.inc:1749
+#: ../lib/modules/sambaSamAccount.inc:349
+#: ../lib/modules/sambaSamAccount.inc:1484
+#: ../lib/modules/sambaSamAccount.inc:1815
 msgid "Connect client printers"
 msgstr "クライアントのプリンタを接続する"
 
-#: ../lib/modules/sambaSamAccount.inc:1386
-#: ../lib/modules/sambaSamAccount.inc:1737
+#: ../lib/modules/sambaSamAccount.inc:1464
+#: ../lib/modules/sambaSamAccount.inc:1803
 msgid "Connection time limit"
 msgstr "接続時間の制限"
 
@@ -1023,18 +1175,18 @@ msgstr "コンテナのDN"
 msgid "Could not perform ldap_modify operation."
 msgstr "ldap_modifyオペレーションを実行できません。"
 
-#: ../templates/selfService/profManage.php:86
-#: ../templates/config/profmanage.php:100
+#: ../templates/selfService/profManage.php:97
+#: ../templates/config/profmanage.php:109
 msgid "Could not rename file!"
 msgstr "ファイル名を変更できません!"
 
-#: ../templates/pdfedit/pdfpage.php:103
+#: ../templates/pdfedit/pdfpage.php:98
 msgid "Could not save PDF profile, access denied."
 msgstr "PDFプロファイルを保存できません。アクセスが拒否されました。"
 
 #: ../lib/modules/kolabUser.inc:90 ../lib/modules/kolabUser.inc:159
-#: ../lib/modules/kolabUser.inc:188 ../lib/modules/kolabUser.inc:284
-#: ../lib/modules/kolabUser.inc:758
+#: ../lib/modules/kolabUser.inc:188 ../lib/modules/kolabUser.inc:282
+#: ../lib/modules/kolabUser.inc:757
 msgid "Country"
 msgstr "国"
 
@@ -1044,8 +1196,8 @@ msgstr "国名が正しくありません!"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:107
 #: ../templates/tree/templates/creation/custom.php:234
-#: ../templates/pdfedit/pdfmain.php:134
-#: ../templates/profedit/profilemain.php:127 ../templates/initsuff.php:192
+#: ../templates/pdfedit/pdfmain.php:126
+#: ../templates/profedit/profilemain.php:117 ../templates/initsuff.php:186
 msgid "Create"
 msgstr "作成"
 
@@ -1054,29 +1206,66 @@ msgstr "作成"
 msgid "Create Object"
 msgstr "オブジェクト作成"
 
-#: ../lib/modules.inc:1223 ../lib/lists.inc:469 ../lib/lists.inc:631
-#: ../help/help.inc:155
+#: ../lib/modules.inc:1442 ../lib/lists.inc:405 ../lib/lists.inc:556
+#: ../help/help.inc:162
 msgid "Create PDF file"
 msgstr "PDFファイル作成"
 
-#: ../templates/pdfedit/pdfmain.php:125
+#: ../templates/pdfedit/pdfmain.php:117
 msgid "Create a new PDF structure"
 msgstr "新しいPDF構成を作成"
 
-#: ../templates/profedit/profilemain.php:116
+#: ../templates/profedit/profilemain.php:106
 msgid "Create a new profile"
 msgstr "新しいプロファイルの作成"
 
-#: ../lib/modules.inc:1215
+#: ../lib/types/dhcp.inc:46
+msgid "Create another DHCP entry"
+msgstr "新たなDHCPエントリを作成"
+
+#: ../lib/types/nisObjectType.inc:29
+msgid "Create another NIS object"
+msgstr "新たなNISアカウントを作成"
+
+#: ../lib/baseType.inc:45
 msgid "Create another account"
 msgstr "他のアカウントを作成"
 
-#: ../lib/lists.inc:651
+#: ../lib/types/mailAlias.inc:43 ../lib/types/alias.inc:43
+msgid "Create another alias"
+msgstr "新たなエイリアスを作成"
+
+#: ../lib/types/smbDomain.inc:43
+msgid "Create another domain"
+msgstr "新たなドメインを作成"
+
+#: ../lib/types/asteriskExt.inc:43
+msgid "Create another extension"
+msgstr "新たな拡張を作成"
+
+#: ../lib/types/group.inc:44 ../lib/types/netgroup.inc:43
+#: ../lib/types/gon.inc:43
+msgid "Create another group"
+msgstr "新たなグループを作成"
+
+#: ../lib/types/host.inc:43
+msgid "Create another host"
+msgstr "新たなホストを作成"
+
+#: ../lib/types/ppolicyType.inc:29
+msgid "Create another policy"
+msgstr "新たなポリシーを作成"
+
+#: ../lib/types/user.inc:43
+msgid "Create another user"
+msgstr "新たなユーザーを作成"
+
+#: ../lib/lists.inc:573
 msgid "Create for"
 msgstr "作成"
 
-#: ../lib/modules/posixAccount.inc:237 ../lib/modules/posixAccount.inc:1013
-#: ../lib/modules/posixAccount.inc:1179
+#: ../lib/modules/posixAccount.inc:241 ../lib/modules/posixAccount.inc:984
+#: ../lib/modules/posixAccount.inc:1113
 msgid "Create home directory"
 msgstr "ホームディレクトリを作成"
 
@@ -1087,12 +1276,12 @@ msgstr "ホームディレクトリを作成"
 msgid "Create new entry"
 msgstr "新しいエントリを作成"
 
-#: ../templates/selfService/profManage.php:69
-#: ../templates/config/profmanage.php:85
+#: ../templates/selfService/profManage.php:80
+#: ../templates/config/profmanage.php:94
 msgid "Created new profile."
 msgstr "新しいプロファイルが作成されました。"
 
-#: ../templates/tools.php:65
+#: ../lib/tools/fileUpload.inc:53
 msgid "Creates accounts by uploading a CSV formated file."
 msgstr "CSVファイルをアップロードする事によってアカウントを作成します。"
 
@@ -1104,24 +1293,30 @@ msgstr "属性に対する現在の値のリスト:"
 msgid "Custom"
 msgstr "カスタム"
 
+#: ../lib/modules/customScripts.inc:41 ../lib/modules/customScripts.inc:52
+#: ../lib/modules/customScripts.inc:65 ../lib/modules/customScripts.inc:79
+#: ../lib/modules/customScripts.inc:87
+msgid "Custom scripts"
+msgstr "カスタム・スクリプト"
+
 #: ../lib/modules/ddns.inc:65
 msgid "DDNS"
 msgstr ""
 
-#: ../lib/modules/ddns.inc:309
+#: ../lib/modules/ddns.inc:360
 msgid ""
 "DDNS ist not activated. You can activate it in the DHCP settings (DDNS)."
 msgstr "DDNSが無効です。DHCP設定の中(DDNS)で有効にできます。"
 
-#: ../lib/types/dhcp.inc:45
+#: ../lib/types/dhcp.inc:56
 msgid "DHCP"
 msgstr ""
 
-#: ../lib/types/dhcp.inc:54
+#: ../lib/types/dhcp.inc:65
 msgid "DHCP administration"
 msgstr "DHCPの管理"
 
-#: ../lib/modules/dhcp_settings.inc:111 ../lib/types/dhcp.inc:115
+#: ../lib/modules/dhcp_settings.inc:101 ../lib/types/dhcp.inc:126
 msgid "DHCP settings"
 msgstr "DHCP設定"
 
@@ -1130,27 +1325,31 @@ msgstr "DHCP設定"
 #: ../templates/tree/update_confirm.php:79
 #: ../templates/tree/add_oclass_form.php:124
 #: ../templates/tree/add_attr_form.php:73 ../templates/tree/edit.php:92
-#: ../templates/delete.php:95 ../lib/modules.inc:1308 ../lib/modules.inc:1748
+#: ../templates/delete.php:91 ../lib/modules.inc:1526 ../lib/modules.inc:1993
 msgid "DN"
 msgstr ""
 
-#: ../templates/masscreate.php:154
+#: ../templates/masscreate.php:233
 msgid "DN settings"
 msgstr "DN設定"
 
-#: ../templates/masscreate.php:158 ../help/help.inc:149
+#: ../templates/masscreate.php:237 ../help/help.inc:156
 msgid "DN suffix"
 msgstr "DNサフィックス"
 
-#: ../lib/modules/dhcp_settings.inc:206 ../lib/modules/dhcp_settings.inc:681
-#: ../lib/modules/dhcp_settings.inc:777
+#: ../lib/modules/dhcp_settings.inc:202 ../lib/modules/dhcp_settings.inc:256
+#: ../lib/modules/dhcp_settings.inc:569 ../lib/modules/dhcp_settings.inc:671
 msgid "DNS"
 msgstr ""
 
-#: ../lib/modules/dhcp_settings.inc:139
+#: ../lib/modules/dhcp_settings.inc:131
 msgid "DNS (Domain Name System)"
 msgstr ""
 
+#: ../lib/modules/asteriskExtension.inc:99
+msgid "DNs of the extension owners"
+msgstr "拡張所有者のDN"
+
 #: ../lib/export.inc:511
 #, php-format
 msgid "DSML Export for: %s"
@@ -1160,15 +1359,15 @@ msgstr "DSMLにエクスポート: %s"
 msgid "Data field for RDN is empty!"
 msgstr "RDNのデータフィールドが空です!"
 
-#: ../lib/modules/sambaAccount.inc:378 ../lib/modules/sambaSamAccount.inc:247
-msgid "Date after the user is able to change his password. Format: DD-MM-YYYY"
-msgstr "ユーザによるパスワード変更の禁止が解かれる日付。形式は: DD-MM-YYYY"
+#: ../lib/modules/sambaSamAccount.inc:272
+msgid "Date after the user is able to change his password."
+msgstr "ユーザによるパスワード変更の禁止が解かれる日付。"
 
-#: ../lib/modules/sambaAccount.inc:380 ../lib/modules/sambaSamAccount.inc:249
-msgid "Date after the user must change his password. Format: DD-MM-YYYY"
-msgstr "ユーザがパスワードを変更しなければならなくなる日付。形式は: DD-MM-YYYY"
+#: ../lib/modules/sambaSamAccount.inc:274
+msgid "Date after the user must change his password."
+msgstr "ユーザがパスワードを変更しなければならなくなる日付。"
 
-#: ../lib/modules/shadowAccount.inc:170
+#: ../lib/modules/shadowAccount.inc:174
 msgid ""
 "Days before password is to expire that user is warned of pending password "
 "expiration. If set value must be >0."
@@ -1176,16 +1375,21 @@ msgstr ""
 "パスワードが期限切れになる前にユーザへパスワード期限切れの猶予期間である旨を"
 "警告する日数。もしもその値を設定するなら0より大きくなければならない。"
 
-#: ../lib/modules/dhcp_settings.inc:142 ../lib/modules/dhcp_settings.inc:211
-#: ../lib/modules/dhcp_settings.inc:687 ../lib/modules/dhcp_settings.inc:778
+#: ../templates/config/mainmanage.php:262
+msgid "Debug"
+msgstr "デバッグ"
+
+#: ../lib/modules/dhcp_settings.inc:134 ../lib/modules/dhcp_settings.inc:207
+#: ../lib/modules/dhcp_settings.inc:262 ../lib/modules/dhcp_settings.inc:575
+#: ../lib/modules/dhcp_settings.inc:672
 msgid "Default gateway"
 msgstr "デフォルト・ゲートウェイ"
 
-#: ../templates/config/confmain.php:298 ../help/help.inc:95
+#: ../templates/config/confmain.php:354 ../help/help.inc:94
 msgid "Default language"
 msgstr "規定の言語"
 
-#: ../templates/masscreate.php:167 ../templates/masscreate.php:329
+#: ../templates/masscreate.php:245 ../templates/masscreate.php:408
 msgid "Default value"
 msgstr "既定値"
 
@@ -1195,7 +1399,7 @@ 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:388 ../lib/modules/kolabUser.inc:796
+#: ../lib/modules/kolabUser.inc:386 ../lib/modules/kolabUser.inc:795
 #: ../lib/modules/kolabUser.inc:866
 msgid "Delegates"
 msgstr "代理人"
@@ -1205,10 +1409,13 @@ msgid "Delegates has invalid format!"
 msgstr "代理人の形式が正しくありません。"
 
 #: ../templates/tree/delete_form.php:159 ../templates/tree/edit.php:115
-#: ../templates/pdfedit/pdfdelete.php:96 ../templates/pdfedit/pdfmain.php:168
-#: ../templates/delete.php:116 ../templates/ou_edit.php:107
-#: ../templates/profedit/profilemain.php:158 ../lib/modules/kolabUser.inc:857
-#: ../lib/lists.inc:465 ../lib/tree.inc:1178
+#: ../templates/pdfedit/pdfdelete.php:94 ../templates/pdfedit/pdfmain.php:160
+#: ../templates/delete.php:111 ../templates/ou_edit.php:107
+#: ../templates/profedit/profilemain.php:148
+#: ../lib/modules/nisnetgroup.inc:225 ../lib/modules/kolabUser.inc:857
+#: ../lib/modules/eduPerson.inc:274 ../lib/modules/eduPerson.inc:299
+#: ../lib/modules/eduPerson.inc:325 ../lib/modules/eduPerson.inc:371
+#: ../lib/lists.inc:401 ../lib/tree.inc:1176
 msgid "Delete"
 msgstr "削除"
 
@@ -1217,24 +1424,19 @@ msgstr "削除"
 msgid "Delete %s"
 msgstr "%s を削除"
 
-#: ../lib/types/dhcp.inc:116
+#: ../lib/types/dhcp.inc:127
 msgid "Delete DHCP(s)"
 msgstr "DHCPの削除"
 
-#: ../lib/modules/fixed_ip.inc:88 ../lib/modules/fixed_ip.inc:413
-#: ../lib/modules/fixed_ip.inc:414
-msgid "Delete IP"
-msgstr "IPアドレスを削除"
-
-#: ../lib/modules/kolabUser.inc:397
+#: ../lib/modules/kolabUser.inc:395
 msgid "Delete Kolab account"
 msgstr "Kolabアカウントを削除"
 
-#: ../templates/pdfedit/pdfdelete.php:53
-msgid "Delete PDF structure"
-msgstr "PDF構成の削除"
+#: ../lib/types/nisObjectType.inc:108
+msgid "Delete NIS object(s)"
+msgstr "NISオブジェクトを削除"
 
-#: ../lib/types/mailAlias.inc:111 ../lib/types/alias.inc:111
+#: ../lib/types/mailAlias.inc:120 ../lib/types/alias.inc:120
 msgid "Delete alias(es)"
 msgstr "別名を削除"
 
@@ -1243,60 +1445,68 @@ msgstr "別名を削除"
 msgid "Delete all %s objects"
 msgstr "全ての %s オブジェクトを削除"
 
-#: ../lib/types/smbDomain.inc:111
+#: ../lib/types/smbDomain.inc:120
 msgid "Delete domain(s)"
 msgstr "ドメインの削除"
 
-#: ../lib/types/group.inc:125 ../lib/types/gon.inc:113
+#: ../lib/types/asteriskExt.inc:121
+msgid "Delete extension(s)"
+msgstr "拡張の削除"
+
+#: ../lib/types/group.inc:134 ../lib/types/netgroup.inc:122
+#: ../lib/types/gon.inc:122
 msgid "Delete group(s)"
 msgstr "グループの削除"
 
-#: ../lib/modules/posixAccount.inc:1062
+#: ../lib/modules/posixAccount.inc:1023
 msgid "Delete home directory"
 msgstr "ホームディレクトリを削除"
 
-#: ../lib/types/host.inc:115
+#: ../lib/types/host.inc:124
 msgid "Delete host(s)"
 msgstr "ホストの削除"
 
-#: ../lib/lists.inc:106
+#: ../lib/lists.inc:109
 msgid "Delete object"
 msgstr "オブジェクトを削除"
 
-#: ../templates/pdfedit/pdfdelete.php:74
-#: ../templates/profedit/profiledelete.php:74
+#: ../templates/pdfedit/pdfdelete.php:72
+#: ../templates/profedit/profiledelete.php:72
 msgid "Delete operation canceled."
 msgstr "削除操作がキャンセルされました。"
 
-#: ../templates/ou_edit.php:189 ../help/help.inc:189
+#: ../templates/ou_edit.php:178 ../help/help.inc:202
 msgid "Delete organizational unit"
 msgstr "organizational unitを削除"
 
-#: ../lib/modules/inetOrgPerson.inc:944
+#: ../lib/modules/inetOrgPerson.inc:1167
 msgid "Delete photo"
 msgstr "写真を削除"
 
-#: ../templates/selfService/profManage.php:228
-#: ../templates/profedit/profiledelete.php:56
-#: ../templates/config/profmanage.php:255 ../help/help.inc:118
+#: ../lib/types/ppolicyType.inc:128
+msgid "Delete policy(ies)"
+msgstr "ポリシーを削除"
+
+#: ../templates/selfService/profManage.php:233
+#: ../templates/config/profmanage.php:258 ../help/help.inc:125
 msgid "Delete profile"
 msgstr "プロファイルを削除"
 
-#: ../lib/modules/range.inc:86 ../lib/modules/range.inc:101
-#: ../lib/modules/range.inc:441 ../lib/modules/range.inc:442
+#: ../lib/modules/range.inc:84 ../lib/modules/range.inc:99
+#: ../lib/modules/range.inc:428 ../lib/modules/range.inc:429
 msgid "Delete range"
 msgstr "範囲を削除"
 
-#: ../lib/types/user.inc:129
+#: ../lib/types/user.inc:138
 msgid "Delete user(s)"
 msgstr "ユーザの削除"
 
-#: ../templates/delete.php:230
+#: ../templates/delete.php:220
 #, php-format
 msgid "Deleted DN: %s"
 msgstr "削除されたDN: %s"
 
-#: ../templates/pdfedit/pdfdelete.php:65
+#: ../templates/pdfedit/pdfdelete.php:63
 msgid "Deleted PDF structure:"
 msgstr "削除したPDF構成:"
 
@@ -1304,15 +1514,11 @@ msgstr "削除したPDF構成:"
 msgid "Deleted account"
 msgstr "削除されたアカウント"
 
-#: ../templates/profedit/profiledelete.php:66
+#: ../templates/profedit/profiledelete.php:64
 msgid "Deleted profile:"
 msgstr "削除したプロファイル:"
 
-#: ../lib/modules/fixed_ip.inc:89
-msgid "Deletes a fixed IP address."
-msgstr "固定IPアドレスを削除。"
-
-#: ../lib/modules/range.inc:87
+#: ../lib/modules/range.inc:85
 msgid "Deletes an IP range."
 msgstr "IPアドレス範囲を削除する。"
 
@@ -1322,41 +1528,59 @@ msgstr "IPアドレス範囲を削除する。"
 msgid "Deleting %s"
 msgstr "%s を削除しています"
 
-#: ../templates/delete.php:139
+#: ../templates/delete.php:130
 msgid "Deleting. Please stand by ..."
 msgstr "削除中です。お待ちください ..."
 
-#: ../templates/schema/schema.php:94 ../templates/schema/schema.php:148
-#: ../templates/schema/schema.php:351 ../templates/tree/add_value_form.php:186
-#: ../lib/modules/account.inc:88 ../lib/modules/account.inc:98
-#: ../lib/modules/account.inc:122 ../lib/modules/account.inc:226
-#: ../lib/modules/account.inc:240 ../lib/modules/inetOrgPerson.inc:209
-#: ../lib/modules/inetOrgPerson.inc:390 ../lib/modules/inetOrgPerson.inc:743
-#: ../lib/modules/inetOrgPerson.inc:1045 ../lib/modules/groupOfNames.inc:64
+#: ../lib/modules/inetOrgPerson.inc:154 ../lib/modules/inetOrgPerson.inc:165
+#: ../lib/modules/inetOrgPerson.inc:275 ../lib/modules/inetOrgPerson.inc:438
+#: ../lib/modules/inetOrgPerson.inc:663 ../lib/modules/inetOrgPerson.inc:1114
+#: ../lib/modules/inetOrgPerson.inc:1246 ../lib/modules/inetOrgPerson.inc:1754
+msgid "Department(s)"
+msgstr "部門"
+
+#: ../templates/schema/schema.php:87 ../templates/schema/schema.php:141
+#: ../templates/schema/schema.php:344 ../templates/tree/add_value_form.php:186
+#: ../lib/modules/nisnetgroup.inc:72 ../lib/modules/nisnetgroup.inc:180
+#: ../lib/modules/nisnetgroup.inc:565 ../lib/modules/dhcp_settings.inc:161
+#: ../lib/modules/dhcp_settings.inc:289 ../lib/modules/dhcp_settings.inc:615
+#: ../lib/modules/dhcp_settings.inc:677 ../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/inetOrgPerson.inc:215 ../lib/modules/inetOrgPerson.inc:318
+#: ../lib/modules/inetOrgPerson.inc:563 ../lib/modules/inetOrgPerson.inc:944
+#: ../lib/modules/inetOrgPerson.inc:1220 ../lib/modules/groupOfNames.inc:64
 #: ../lib/modules/groupOfNames.inc:91 ../lib/modules/groupOfNames.inc:143
-#: ../lib/modules/groupOfNames.inc:443 ../lib/modules/sambaAccount.inc:898
-#: ../lib/modules/sambaGroupMapping.inc:389 ../lib/modules/posixGroup.inc:177
-#: ../lib/modules/posixGroup.inc:412 ../lib/modules/posixGroup.inc:478
-#: ../lib/modules/posixAccount.inc:310 ../lib/modules/posixAccount.inc:422
-#: ../lib/types/user.inc:92
+#: ../lib/modules/groupOfNames.inc:440
+#: ../lib/modules/sambaGroupMapping.inc:390 ../lib/modules/posixGroup.inc:178
+#: ../lib/modules/posixGroup.inc:383 ../lib/modules/posixGroup.inc:449
+#: ../lib/modules/posixAccount.inc:414 ../lib/modules/nisObject.inc:66
+#: ../lib/modules/nisObject.inc:96 ../lib/modules/nisObject.inc:147
+#: ../lib/modules/nisObject.inc:222 ../lib/types/netgroup.inc:92
+#: ../lib/types/user.inc:101 ../lib/types/nisObjectType.inc:80
 msgid "Description"
 msgstr "説明"
 
-#: ../lib/modules/ddns.inc:87 ../lib/modules/ddns.inc:297
+#: ../lib/modules/sambaSamAccount.inc:367
+#: ../lib/modules/sambaSamAccount.inc:557
+msgid "Disable LM hashes"
+msgstr "LMハッシュを無効化"
+
+#: ../lib/modules/ddns.inc:89 ../lib/modules/ddns.inc:348
 msgid "Disable client updates"
 msgstr "クライアントによる更新を禁止"
 
-#: ../lib/modules/ddns.inc:88
+#: ../lib/modules/ddns.inc:90
 msgid "Disables the client to update DNS entries."
 msgstr "クライアントによるDNSエントリの更新を禁止します。"
 
 #: ../lib/modules/sambaDomain.inc:106 ../lib/modules/sambaDomain.inc:288
-#: ../lib/modules/sambaDomain.inc:664
+#: ../lib/modules/sambaDomain.inc:665
 msgid "Disconnect users outside logon hours"
 msgstr "ログオン許可時間帯以外はユーザをログオフさせる。"
 
-#: ../lib/modules/sambaSamAccount.inc:1391
-#: ../lib/modules/sambaSamAccount.inc:1738
+#: ../lib/modules/sambaSamAccount.inc:1469
+#: ../lib/modules/sambaSamAccount.inc:1804
 msgid "Disconnection time limit"
 msgstr "切断時間の制限"
 
@@ -1364,21 +1588,18 @@ msgstr "切断時間の制限"
 msgid "Disconnects users if they are logged in outside logon hours."
 msgstr "ログオン許可時間帯以外にログオン状態のユーザーの接続を切る。"
 
-#: ../lib/modules/sambaAccount.inc:78 ../lib/modules/sambaAccount.inc:223
-#: ../lib/modules/sambaAccount.inc:344 ../lib/modules/sambaAccount.inc:728
-#: ../lib/modules/sambaAccount.inc:891
-#: ../lib/modules/sambaGroupMapping.inc:235
-#: ../lib/modules/sambaGroupMapping.inc:354
-#: ../lib/modules/sambaGroupMapping.inc:387
-#: ../lib/modules/sambaSamAccount.inc:100
-#: ../lib/modules/sambaSamAccount.inc:207
-#: ../lib/modules/sambaSamAccount.inc:359
-#: ../lib/modules/sambaSamAccount.inc:979
-#: ../lib/modules/sambaSamAccount.inc:1695
+#: ../lib/modules/sambaGroupMapping.inc:236
+#: ../lib/modules/sambaGroupMapping.inc:355
+#: ../lib/modules/sambaGroupMapping.inc:388
+#: ../lib/modules/sambaSamAccount.inc:96
+#: ../lib/modules/sambaSamAccount.inc:232
+#: ../lib/modules/sambaSamAccount.inc:390
+#: ../lib/modules/sambaSamAccount.inc:1081
+#: ../lib/modules/sambaSamAccount.inc:1761
 msgid "Display name"
 msgstr "表示名"
 
-#: ../lib/modules.inc:449
+#: ../lib/modules.inc:463
 msgid ""
 "Displayed account numbers start at \"0\". Add 2 to get the row in your "
 "spreadsheet."
@@ -1390,19 +1611,19 @@ msgstr ""
 msgid "Do you really want to delete this OU?"
 msgstr "本当にこのOUを削除しますか?"
 
-#: ../templates/pdfedit/pdfdelete.php:82
+#: ../templates/pdfedit/pdfdelete.php:80
 msgid "Do you really want to delete this PDF structure?"
 msgstr "本当にこのPDF構成を削除しますか?"
 
-#: ../templates/profedit/profiledelete.php:81
+#: ../templates/profedit/profiledelete.php:79
 msgid "Do you really want to delete this profile?"
 msgstr "本当にこのプロファイルを削除しますか?"
 
-#: ../lib/modules/kolabUser.inc:567
+#: ../lib/modules/kolabUser.inc:565
 msgid "Do you really want to mark this account for deletion?"
 msgstr "本当にこのアカウントを削除しますか?"
 
-#: ../templates/delete.php:89
+#: ../templates/delete.php:85
 msgid "Do you really want to remove the following accounts?"
 msgstr "本当にこのアカウントを削除しますか?"
 
@@ -1410,131 +1631,118 @@ msgstr "本当にこのアカウントを削除しますか?"
 msgid "Do you want to make these changes?"
 msgstr "これらの変更を行ないますか?"
 
-#: ../lib/modules/sambaAccount.inc:181 ../lib/modules/sambaAccount.inc:325
-#: ../lib/modules/sambaAccount.inc:335 ../lib/modules/sambaAccount.inc:409
-#: ../lib/modules/sambaAccount.inc:839 ../lib/modules/sambaAccount.inc:897
+#: ../lib/modules/nisnetgroup.inc:205 ../lib/modules/nisnetgroup.inc:575
 #: ../lib/modules/sambaGroupMapping.inc:69
-#: ../lib/modules/sambaGroupMapping.inc:272
-#: ../lib/modules/sambaGroupMapping.inc:366
-#: ../lib/modules/sambaGroupMapping.inc:409
-#: ../lib/modules/sambaSamAccount.inc:285
-#: ../lib/modules/sambaSamAccount.inc:352
-#: ../lib/modules/sambaSamAccount.inc:478
-#: ../lib/modules/sambaSamAccount.inc:1153
-#: ../lib/modules/sambaSamAccount.inc:1550
-#: ../lib/modules/sambaSamAccount.inc:1580
-#: ../lib/modules/sambaSamAccount.inc:1713
+#: ../lib/modules/sambaGroupMapping.inc:273
+#: ../lib/modules/sambaGroupMapping.inc:367
+#: ../lib/modules/sambaGroupMapping.inc:410
+#: ../lib/modules/sambaSamAccount.inc:310
+#: ../lib/modules/sambaSamAccount.inc:383
+#: ../lib/modules/sambaSamAccount.inc:507
+#: ../lib/modules/sambaSamAccount.inc:1230
+#: ../lib/modules/sambaSamAccount.inc:1622
+#: ../lib/modules/sambaSamAccount.inc:1654
+#: ../lib/modules/sambaSamAccount.inc:1779
 msgid "Domain"
 msgstr "ドメイン"
 
 #: ../lib/modules/sambaDomain.inc:74 ../lib/modules/sambaDomain.inc:144
 #: ../lib/modules/sambaDomain.inc:231 ../lib/modules/sambaDomain.inc:237
-#: ../lib/modules/sambaDomain.inc:636 ../lib/types/smbDomain.inc:82
+#: ../lib/modules/sambaDomain.inc:637 ../lib/types/smbDomain.inc:91
 msgid "Domain SID"
 msgstr "ドメインのSID"
 
-#: ../lib/modules/sambaGroupMapping.inc:333
+#: ../lib/modules/sambaGroupMapping.inc:334
 msgid "Domain administrators"
 msgstr "ドメイン管理者(Domain administrator)"
 
-#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaAccount.inc:320
 #: ../lib/modules/sambaGroupMapping.inc:56
-#: ../lib/modules/sambaGroupMapping.inc:339
-#: ../lib/modules/sambaSamAccount.inc:71
+#: ../lib/modules/sambaGroupMapping.inc:340
+#: ../lib/modules/sambaSamAccount.inc:69
 msgid "Domain admins"
 msgstr "ドメイン管理者(Domain Admins)"
 
-#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaGroupMapping.inc:61
-#: ../lib/modules/sambaSamAccount.inc:72
+#: ../lib/modules/sambaGroupMapping.inc:61
+#: ../lib/modules/sambaSamAccount.inc:70
 msgid "Domain certificate admins"
 msgstr "ドメイン証明書管理者(Domain Certificate Admins)"
 
-#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:570
 #: ../lib/modules/sambaGroupMapping.inc:59
-#: ../lib/modules/sambaSamAccount.inc:72
-#: ../lib/modules/sambaSamAccount.inc:675
+#: ../lib/modules/sambaSamAccount.inc:70
+#: ../lib/modules/sambaSamAccount.inc:795
 msgid "Domain computers"
 msgstr "ドメインコンピュータ(Domain Computers)"
 
-#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaGroupMapping.inc:60
-#: ../lib/modules/sambaSamAccount.inc:72
+#: ../lib/modules/sambaGroupMapping.inc:60
+#: ../lib/modules/sambaSamAccount.inc:70
 msgid "Domain controllers"
 msgstr "ドメインコントローラ(Domain Controllers)"
 
-#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaGroupMapping.inc:63
-#: ../lib/modules/sambaSamAccount.inc:73
+#: ../lib/modules/sambaGroupMapping.inc:63
+#: ../lib/modules/sambaSamAccount.inc:71
 msgid "Domain enterprise admins"
 msgstr "ドメインエンタープライズ管理者(Domain Enterprise Admins)"
 
 #: ../lib/modules/sambaGroupMapping.inc:68
-#: ../lib/modules/sambaGroupMapping.inc:260
+#: ../lib/modules/sambaGroupMapping.inc:261
 msgid "Domain group"
 msgstr "ドメイングループ(Domain Group)"
 
-#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaGroupMapping.inc:58
-#: ../lib/modules/sambaSamAccount.inc:71
+#: ../lib/modules/sambaGroupMapping.inc:58
+#: ../lib/modules/sambaSamAccount.inc:69
 msgid "Domain guests"
 msgstr "ドメインゲスト(Domain Guests)"
 
-#: ../lib/modules/dhcp_settings.inc:127 ../lib/modules/dhcp_settings.inc:191
-#: ../lib/modules/dhcp_settings.inc:663 ../lib/modules/dhcp_settings.inc:774
-#: ../lib/modules/sambaAccount.inc:72 ../lib/modules/sambaDomain.inc:70
-#: ../lib/modules/sambaDomain.inc:137 ../lib/modules/sambaDomain.inc:218
-#: ../lib/modules/sambaDomain.inc:224 ../lib/modules/sambaDomain.inc:633
-#: ../lib/types/smbDomain.inc:83
+#: ../lib/modules/nisnetgroup.inc:137 ../lib/modules/dhcp_settings.inc:119
+#: ../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/sambaDomain.inc:70 ../lib/modules/sambaDomain.inc:137
+#: ../lib/modules/sambaDomain.inc:218 ../lib/modules/sambaDomain.inc:224
+#: ../lib/modules/sambaDomain.inc:634 ../lib/types/smbDomain.inc:92
 msgid "Domain name"
 msgstr "ドメイン名"
 
-#: ../lib/modules/sambaAccount.inc:72 ../lib/modules/sambaAccount.inc:73
-msgid ""
-"Domain name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
-"and -."
-msgstr ""
-"ドメイン名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9 と -で"
-"す。"
-
-#: ../lib/modules/sambaDomain.inc:188 ../lib/modules/sambaDomain.inc:189
+#: ../lib/modules/nisnetgroup.inc:137 ../lib/modules/sambaDomain.inc:188
+#: ../lib/modules/sambaDomain.inc:189
 msgid "Domain name is invalid!"
 msgstr "ドメイン名が正しくありません!"
 
-#: ../lib/modules/sambaAccount.inc:52 ../lib/modules/sambaGroupMapping.inc:64
-#: ../lib/modules/sambaSamAccount.inc:73
+#: ../lib/modules/sambaGroupMapping.inc:64
+#: ../lib/modules/sambaSamAccount.inc:71
 msgid "Domain policy admins"
 msgstr "ドメインポリシー管理者(Domain Policy Admins)"
 
-#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaGroupMapping.inc:62
-#: ../lib/modules/sambaSamAccount.inc:73
+#: ../lib/modules/sambaGroupMapping.inc:62
+#: ../lib/modules/sambaSamAccount.inc:71
 msgid "Domain schema admins"
 msgstr "ドメインスキーマ管理者(Domain Schema Admins)"
 
-#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaGroupMapping.inc:57
-#: ../lib/modules/sambaSamAccount.inc:71
-#: ../lib/modules/sambaSamAccount.inc:2039
+#: ../lib/modules/sambaGroupMapping.inc:57
+#: ../lib/modules/sambaSamAccount.inc:69
+#: ../lib/modules/sambaSamAccount.inc:2086
 msgid "Domain users"
 msgstr "ドメインユーザ(Domain Users)"
 
-#: ../templates/main_header.php:60
-msgid "Donate"
-msgstr "寄付する"
-
-#: ../templates/pdfedit/pdfpage.php:420
+#: ../templates/pdfedit/pdfpage.php:410
 msgid "Down"
 msgstr "下へ"
 
-#: ../templates/masscreate.php:284
+#: ../templates/masscreate.php:364
 msgid "Download sample CSV file"
 msgstr "サンプルCSVファイルをダウンロード"
 
-#: ../lib/modules/sambaAccount.inc:383
-msgid "Drive letter assigned on windows workstations as homedirectory."
+#: ../templates/serverInfo.php:108
+msgid "Dynamic subtrees"
 msgstr ""
-"Windows ワークステーションのホームディレクトリとして割り当てられたドライブ文"
-"字。"
 
-#: ../lib/types/user.inc:91
+#: ../lib/types/user.inc:100
 msgid "E-Mail"
 msgstr "電子メール"
 
+#: ../lib/modules/eduPerson.inc:64
+msgid "EDU person"
+msgstr ""
+
 #: ../lib/modules/kolabUser.inc:151
 msgid "EMail alias"
 msgstr "電子メールの別名"
@@ -1555,50 +1763,42 @@ msgstr "電子メールの別名リスト"
 msgid "EMail alias list has invalid format!"
 msgstr "電子メール別名リストの形式が正しくありません!"
 
-#: ../lib/modules/kolabUser.inc:201 ../lib/modules/kolabUser.inc:362
-#: ../lib/modules/kolabUser.inc:792
+#: ../lib/modules/kolabUser.inc:201 ../lib/modules/kolabUser.inc:360
+#: ../lib/modules/kolabUser.inc:791
 msgid "EMail aliases"
 msgstr "電子メールの別名"
 
-#: ../lib/modules/sambaSamAccount.inc:520
+#: ../lib/modules/sambaSamAccount.inc:549
 msgid "East Australian Standard, Guam"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:512
+#: ../lib/modules/sambaSamAccount.inc:541
 msgid "Eastern Europe Time, South Africa"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:505
+#: ../lib/modules/sambaSamAccount.inc:534
 msgid "Eastern Time (US & Canada), Bogota"
 msgstr ""
 
-#: ../templates/pdfedit/pdfmain.php:165
-#: ../templates/profedit/profilemain.php:155
-#: ../lib/modules/sambaSamAccount.inc:1160
-#: ../lib/modules/sambaSamAccount.inc:1164 ../lib/lists.inc:460
+#: ../templates/pdfedit/pdfmain.php:157
+#: ../templates/profedit/profilemain.php:145
+#: ../lib/modules/sambaSamAccount.inc:1238
+#: ../lib/modules/sambaSamAccount.inc:1244 ../lib/lists.inc:396
 msgid "Edit"
 msgstr "編集"
 
-#: ../templates/config/confmain.php:245
-msgid "Edit account types"
-msgstr "アカウント種別の編集"
-
-#: ../templates/config/index.php:77 ../templates/config/mainmanage.php:58
+#: ../templates/config/index.php:77 ../templates/config/mainmanage.php:60
 msgid "Edit general settings"
 msgstr "一般設定を更新"
 
-#: ../lib/modules/posixAccount.inc:998
+#: ../lib/modules/posixAccount.inc:967
 msgid "Edit groups"
 msgstr "グループの編集"
 
-#: ../lib/modules/posixGroup.inc:183
+#: ../lib/modules/posixGroup.inc:184
 msgid "Edit members"
 msgstr "メンバーの編集"
 
-#: ../templates/config/confmain.php:247
-msgid "Edit modules"
-msgstr "モジュールの編集"
-
 #: ../templates/config/index.php:103
 msgid "Edit self service"
 msgstr "セルフサービスの編集"
@@ -1607,30 +1807,42 @@ msgstr "セルフサービスの編集"
 msgid "Edit server profiles"
 msgstr "サーバープロファイルの編集"
 
-#: ../lib/modules/sambaAccount.inc:798 ../lib/modules/sambaSamAccount.inc:1112
+#: ../lib/modules/nisnetgroup.inc:191
+msgid "Edit subgroups"
+msgstr "サブグループの編集"
+
+#: ../lib/modules/sambaSamAccount.inc:1188
 msgid "Edit workstations"
 msgstr "ワークステーションの編集??"
 
-#: ../lib/modules/inetOrgPerson.inc:95 ../lib/modules/inetOrgPerson.inc:172
-#: ../lib/modules/inetOrgPerson.inc:221 ../lib/modules/inetOrgPerson.inc:406
-#: ../lib/modules/inetOrgPerson.inc:887 ../lib/modules/inetOrgPerson.inc:1050
+#: ../lib/modules/inetOrgPerson.inc:95 ../lib/modules/inetOrgPerson.inc:183
+#: ../lib/modules/inetOrgPerson.inc:268 ../lib/modules/inetOrgPerson.inc:334
+#: ../lib/modules/inetOrgPerson.inc:579 ../lib/modules/inetOrgPerson.inc:1096
+#: ../lib/modules/inetOrgPerson.inc:1225
 msgid "Employee type"
 msgstr "雇用形態"
 
-#: ../lib/modules/inetOrgPerson.inc:407
+#: ../lib/modules/inetOrgPerson.inc:580
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇用形態: 正社員、実習生、臨時雇用、派遣、..."
 
-#: ../templates/lists/changePassword.php:258
-#: ../templates/lists/changePassword.php:264 ../templates/login.php:405
+#: ../templates/lists/changePassword.php:244
+#: ../templates/lists/changePassword.php:250 ../templates/login.php:382
 msgid "Empty password submitted. Please try again."
 msgstr "パスワードが空です。やり直してください。"
 
+#: ../lib/modules/ppolicy.inc:89
+msgid ""
+"Enables quality checking (e.g. password length) of passwords. If set to "
+"\"force\" then you need to disable password hashing in your LAM server "
+"profile to change passwords with LAM."
+msgstr "パスワードの強度チェック(例 パスワード長)を有効にする。もしも「強制」に設定した場合、LAMのパスワードを変更するために、LAMサーバープロファイルのパスワード・ハッシュを無効にする必要があります。"
+
 #: ../templates/tree/download_binary_attr.php:71
 msgid "Encountered an error while performing search."
 msgstr "検索実行中にエラーが発生しました。"
 
-#: ../lib/modules/sambaSamAccount.inc:498
+#: ../lib/modules/sambaSamAccount.inc:527
 msgid "Eniwetok, Kwajalein"
 msgstr ""
 
@@ -1638,6 +1850,12 @@ msgstr ""
 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:333
+#: ../lib/modules/eduPerson.inc:683
+msgid "Entitlements"
+msgstr "資格"
+
 #: ../lib/export.inc:407
 msgid "Entry"
 msgstr "エントリ"
@@ -1652,20 +1870,20 @@ msgstr "エントリ %s とサブツリーは削除されました。"
 msgid "Entry %s deleted successfully."
 msgstr "エントリ %s は削除されました。"
 
-#: ../templates/schema/schema.php:171
+#: ../templates/schema/schema.php:164
 msgid "Equality"
 msgstr "照合規則"
 
-#: ../templates/config/mainmanage.php:256
+#: ../templates/config/mainmanage.php:262
 msgid "Error"
 msgstr "エラー"
 
-#: ../templates/delete.php:235
+#: ../templates/delete.php:225
 #, php-format
 msgid "Error while deleting DN: %s"
 msgstr "DN: %s の削除中にエラーが発生しました。"
 
-#: ../help/help.inc:129
+#: ../help/help.inc:136
 msgid ""
 "Every account type needs exactly one base module. This module provides a "
 "structural object class."
@@ -1673,28 +1891,34 @@ msgstr ""
 "全てのアカウントタイプにはただ一つのベースモジュールが必要です。このモジュー"
 "ルは構造型のオブジェクトクラスを提供します。"
 
-#: ../lib/modules/dhcp_settings.inc:658 ../help/help.inc:74
-#: ../help/help.inc:80 ../help/help.inc:86 ../help/help.inc:91
-#: ../help/help.inc:111
+#: ../lib/modules/dhcp_settings.inc:546 ../lib/modules/customScripts.inc:60
+#: ../lib/modules/customScripts.inc:72 ../help/help.inc:73 ../help/help.inc:79
+#: ../help/help.inc:85 ../help/help.inc:90 ../help/help.inc:112
 msgid "Example"
 msgstr "例"
 
-#: ../templates/masscreate.php:166 ../templates/masscreate.php:325
+#: ../templates/masscreate.php:244 ../templates/masscreate.php:404
 msgid "Example value"
 msgstr "例"
 
-#: ../help/help.inc:62
+#: ../help/help.inc:61
 msgid "Examples"
 msgstr "例"
 
-#: ../templates/config/confmain.php:386
+#: ../templates/config/confmain.php:436
 msgid "Execute"
 msgstr "実行"
 
-#: ../templates/tests/lamdaemonTest.php:307
+#: ../templates/tests/lamdaemonTest.php:294
 msgid "Execute lamdaemon"
 msgstr "lamdaemonを実行"
 
+#: ../lib/modules/ppolicy.inc:108 ../lib/modules/ppolicy.inc:153
+#: ../lib/modules/ppolicy.inc:197 ../lib/modules/ppolicy.inc:485
+#: ../lib/types/ppolicyType.inc:86
+msgid "Expire warning"
+msgstr "期限切れ警告"
+
 #: ../templates/tree/export_form.php:88 ../templates/tree/export_form.php:96
 #: ../templates/tree/edit.php:119
 msgid "Export"
@@ -1704,11 +1928,26 @@ msgstr "エクスポート"
 msgid "Export format"
 msgstr "エクスポート形式"
 
+#: ../lib/modules/asteriskExtension.inc:86
+#: ../lib/modules/asteriskExtension.inc:139
+#: ../lib/modules/asteriskExtension.inc:222
+#: ../lib/modules/asteriskExtension.inc:469 ../lib/types/asteriskExt.inc:91
+msgid "Extension name"
+msgstr "拡張名"
+
+#: ../lib/modules/asteriskExtension.inc:98
+#: ../lib/modules/asteriskExtension.inc:180
+#: ../lib/modules/asteriskExtension.inc:239
+#: ../lib/modules/asteriskExtension.inc:301
+#: ../lib/modules/asteriskExtension.inc:472
+msgid "Extension owners"
+msgstr "拡張の所有者"
+
 #: ../templates/tree/add_attr.php:132
 msgid "Failed to add the attribute."
 msgstr "属性の追加に失敗しました!"
 
-#: ../templates/initsuff.php:154
+#: ../templates/initsuff.php:151
 msgid "Failed to create entry!"
 msgstr "エントリ作成に失敗しました!"
 
@@ -1718,18 +1957,25 @@ msgstr "エントリ作成に失敗しました!"
 msgid "Failed to delete entry %s"
 msgstr "エントリ %s の削除に失敗しました!"
 
-#: ../lib/modules/inetOrgPerson.inc:83 ../lib/modules/inetOrgPerson.inc:153
-#: ../lib/modules/inetOrgPerson.inc:281 ../lib/modules/inetOrgPerson.inc:438
-#: ../lib/modules/inetOrgPerson.inc:439 ../lib/modules/inetOrgPerson.inc:856
-#: ../lib/modules/inetOrgPerson.inc:1059 ../lib/modules/inetOrgPerson.inc:1391
+#: ../lib/modules/ppolicy.inc:104 ../lib/modules/ppolicy.inc:152
+#: ../lib/modules/ppolicy.inc:270 ../lib/modules/ppolicy.inc:484
+#: ../lib/types/ppolicyType.inc:85
+msgid "Failure count interval"
+msgstr "試行回数インターバル"
+
+#: ../lib/modules/inetOrgPerson.inc:83 ../lib/modules/inetOrgPerson.inc:150
+#: ../lib/modules/inetOrgPerson.inc:255 ../lib/modules/inetOrgPerson.inc:414
+#: ../lib/modules/inetOrgPerson.inc:611 ../lib/modules/inetOrgPerson.inc:612
+#: ../lib/modules/inetOrgPerson.inc:1057 ../lib/modules/inetOrgPerson.inc:1234
+#: ../lib/modules/inetOrgPerson.inc:1633
 msgid "Fax number"
 msgstr "ファクス番号"
 
-#: ../templates/config/mainmanage.php:329
+#: ../templates/config/mainmanage.php:328
 msgid "File"
 msgstr "ファイル"
 
-#: ../lib/modules/sambaSamAccount.inc:261
+#: ../lib/modules/sambaSamAccount.inc:286
 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."
@@ -1737,15 +1983,7 @@ msgstr ""
 "ログオンの時に実行される、ネットログオン共有への相対的なパスとファイル名。 "
 "$user と $group はユーザとグループの名前に置き換えられます。"
 
-#: ../lib/modules/sambaAccount.inc:392
-msgid ""
-"File name and path relative to the netlogon-share which should be executed "
-"on logon. $user and $group are replaced with user and group name."
-msgstr ""
-"ログオンの時に実行される、ネットログオン共有への相対的なパスとファイル名。 "
-"$user と $group はユーザとグループ名に置き換えられます。"
-
-#: ../templates/masscreate.php:128 ../templates/tools.php:64
+#: ../templates/masscreate.php:206 ../lib/tools/fileUpload.inc:44
 msgid "File upload"
 msgstr "ファイルのアップロード"
 
@@ -1753,14 +1991,15 @@ msgstr "ファイルのアップロード"
 msgid "File upload failed!"
 msgstr "ファイルのアップロードに失敗しました!"
 
-#: ../lib/lists.inc:387
+#: ../lib/modules/nisnetgroup.inc:89 ../lib/modules/nisnetgroup.inc:448
+#: ../lib/lists.inc:329 ../help/help.inc:147
 msgid "Filter"
 msgstr "フィルタ"
 
-#: ../lib/modules/inetOrgPerson.inc:73 ../lib/modules/inetOrgPerson.inc:151
-#: ../lib/modules/inetOrgPerson.inc:196 ../lib/modules/inetOrgPerson.inc:398
-#: ../lib/modules/inetOrgPerson.inc:720 ../lib/modules/inetOrgPerson.inc:1048
-#: ../lib/modules/inetOrgPerson.inc:1343 ../lib/types/user.inc:87
+#: ../lib/modules/inetOrgPerson.inc:73 ../lib/modules/inetOrgPerson.inc:148
+#: ../lib/modules/inetOrgPerson.inc:303 ../lib/modules/inetOrgPerson.inc:571
+#: ../lib/modules/inetOrgPerson.inc:920 ../lib/modules/inetOrgPerson.inc:1223
+#: ../lib/modules/inetOrgPerson.inc:1585 ../lib/types/user.inc:96
 msgid "First name"
 msgstr "(姓でない)名"
 
@@ -1768,30 +2007,40 @@ msgstr "(姓でない)名"
 msgid "First name contains invalid characters!"
 msgstr "(姓でない)名前に不正な文字がある"
 
-#: ../lib/modules/inetOrgPerson.inc:399
+#: ../lib/modules/inetOrgPerson.inc:572
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "ユーザの(姓でない)名前。アルファベット, _- と空白のみ有効."
 
-#: ../lib/modules/ddns.inc:84
+#: ../lib/modules/ddns.inc:86
 msgid "Fix IP addresses"
 msgstr "IPアドレスを修正"
 
-#: ../lib/modules/dhcp_settings.inc:712 ../lib/modules/fixed_ip.inc:63
+#: ../lib/modules/fixed_ip.inc:63
 msgid "Fixed IP"
 msgstr "固定IP"
 
+#: ../templates/config/confmain.php:468 ../templates/config/confmain.php:471
+msgid "Fixed list"
+msgstr "固定リスト"
+
 #: ../lib/modules/kolabUser.inc:136
 msgid "For automatic invitation handling."
 msgstr ""
 
-#: ../help/help.inc:179
+#: ../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."
+msgstr "アップロードする場合はエントリの形式を \"(HOST,USER,DOMAIN)\" としてください。複数のエントリはセミコロンによって区切られます。"
+
+#: ../help/help.inc:192
 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:307 ../lib/modules/kolabUser.inc:770
-#: ../lib/modules/kolabUser.inc:822
+#: ../lib/modules/kolabUser.inc:305 ../lib/modules/kolabUser.inc:769
+#: ../lib/modules/kolabUser.inc:821
 msgid "Free/Busy interval"
 msgstr "Free/Busyインターバル"
 
@@ -1799,28 +2048,28 @@ msgstr "Free/Busyインターバル"
 msgid "Free/Busy interval must be a number!"
 msgstr "Free/Busyインターバルは数でなくてはなりません!"
 
-#: ../lib/modules/sambaSamAccount.inc:1230
+#: ../lib/modules/sambaSamAccount.inc:1318
 msgid "Friday"
 msgstr "金曜日"
 
-#: ../templates/lists/changePassword.php:147
+#: ../templates/lists/changePassword.php:143
 msgid "Full name"
 msgstr "フルネーム"
 
-#: ../lib/modules/inetOrgPerson.inc:247
+#: ../lib/modules/inetOrgPerson.inc:368
 msgid "GB-12345"
 msgstr ""
 
-#: ../lib/modules/sambaGroupMapping.inc:385 ../lib/modules/posixGroup.inc:172
-#: ../lib/modules/posixGroup.inc:366 ../lib/modules/posixGroup.inc:408
-#: ../lib/modules/posixGroup.inc:428 ../lib/modules/posixGroup.inc:476
-#: ../lib/modules/posixGroup.inc:496 ../lib/modules/posixAccount.inc:88
-#: ../lib/modules/posixAccount.inc:1245 ../lib/types/group.inc:84
-#: ../lib/types/user.inc:84 ../lib/types/host.inc:87
+#: ../lib/modules/sambaGroupMapping.inc:386 ../lib/modules/posixGroup.inc:173
+#: ../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:90
+#: ../lib/modules/posixAccount.inc:1179 ../lib/types/group.inc:93
+#: ../lib/types/user.inc:93 ../lib/types/host.inc:96
 msgid "GID number"
 msgstr "GID番号"
 
-#: ../lib/modules/posixGroup.inc:496
+#: ../lib/modules/posixGroup.inc:466
 msgid ""
 "GID number has changed. Please select checkbox to change GID number of users "
 "and hosts."
@@ -1828,7 +2077,7 @@ msgstr ""
 "GID番号が変更されました。ユーザとホストのGID番号を変更する場合は、チェック"
 "ボックスを選択してください。"
 
-#: ../lib/modules/posixAccount.inc:88
+#: ../lib/modules/posixAccount.inc:90
 #, php-format
 msgid ""
 "GID number has changed. To keep file ownership you have to run the following "
@@ -1838,17 +2087,23 @@ msgstr ""
 "のコマンドを実行しなければなりません: 'find / -gid %s -uid %s -exec chgrp %s "
 "{} \\;'"
 
-#: ../lib/modules/posixGroup.inc:503
+#: ../lib/modules/posixGroup.inc:473
 msgid "GID number has to be a numeric value!"
 msgstr "GID番号は数値でなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:266 ../lib/modules/posixAccount.inc:298
-#: ../lib/modules/posixAccount.inc:376 ../lib/modules/posixAccount.inc:414
-#: ../lib/modules/posixAccount.inc:982 ../lib/modules/posixAccount.inc:1246
+#: ../lib/modules/posixAccount.inc:270 ../lib/modules/posixAccount.inc:302
+#: ../lib/modules/posixAccount.inc:368 ../lib/modules/posixAccount.inc:406
+#: ../lib/modules/posixAccount.inc:956 ../lib/modules/posixAccount.inc:1180
 msgid "Gecos"
 msgstr ""
 
-#: ../templates/lists/changePassword.php:178 ../help/help.inc:176
+#: ../templates/config/conftypes.php:146 ../templates/config/confmain.php:164
+#: ../templates/config/confmodules.php:131
+#: ../templates/config/moduleSettings.php:130
+msgid "General settings"
+msgstr "一般設定"
+
+#: ../templates/lists/changePassword.php:174 ../help/help.inc:189
 msgid "Generate random password"
 msgstr "ランダムなパスワードを生成"
 
@@ -1856,23 +2111,29 @@ msgstr "ランダムなパスワードを生成"
 msgid "Germany"
 msgstr "日本"
 
-#: ../templates/schema/schema.php:133 ../templates/schema/schema.php:270
-#: ../templates/schema/schema.php:301 ../templates/schema/schema.php:326
+#: ../templates/schema/schema.php:126 ../templates/schema/schema.php:263
+#: ../templates/schema/schema.php:294 ../templates/schema/schema.php:319
 msgid "Go"
 msgstr "進む"
 
-#: ../lib/modules/quota.inc:113 ../lib/modules/quota.inc:378
+#: ../lib/modules/ppolicy.inc:92 ../lib/modules/ppolicy.inc:149
+#: ../lib/modules/ppolicy.inc:206 ../lib/modules/ppolicy.inc:481
+#: ../lib/types/ppolicyType.inc:82
+msgid "Grace authentication limit"
+msgstr "猶予認証のリミット"
+
+#: ../lib/modules/quota.inc:117 ../lib/modules/quota.inc:389
 msgid "Grace block period"
 msgstr "ブロック猶予期間"
 
-#: ../lib/modules/quota.inc:114
+#: ../lib/modules/quota.inc:118
 msgid ""
 "Grace block period. Most filesystems use a fixed maximum value of 7 days."
 msgstr ""
 "ブロッククオータの猶予期間。 ほとんどのファイルシステムは、最大値である7日間"
 "を固定値として使用します。"
 
-#: ../lib/modules/quota.inc:136
+#: ../lib/modules/quota.inc:140
 msgid ""
 "Grace inode (files) period. Most filesystems use a fixed maximum value of 7 "
 "days."
@@ -1880,48 +2141,53 @@ msgstr ""
 "iノード(ファイル)クオータの猶予期間。 ほとんどのファイルシステムは、最大値で"
 "ある7日間を固定値として使用します。"
 
-#: ../lib/modules/quota.inc:135 ../lib/modules/quota.inc:382
+#: ../lib/modules/quota.inc:139 ../lib/modules/quota.inc:393
 msgid "Grace inode period"
 msgstr "iノードクオータの猶予期間"
 
-#: ../templates/selfService/adminMain.php:498
-#: ../templates/config/confmain.php:391
+#: ../templates/selfService/adminMain.php:568
+#: ../templates/config/confmain.php:441
 msgid "Group"
 msgstr "グループ"
 
-#: ../lib/types/group.inc:54
+#: ../lib/types/group.inc:63
 msgid "Group accounts (e.g. Unix and Samba)"
 msgstr "グループアカウント(e.g. Unix および Samba)"
 
-#: ../lib/modules/posixGroup.inc:399 ../lib/types/group.inc:87
+#: ../lib/modules/nisnetgroup.inc:105 ../lib/modules/posixGroup.inc:370
+#: ../lib/types/group.inc:96
 msgid "Group description"
 msgstr "グループの説明"
 
-#: ../lib/modules/posixGroup.inc:413
+#: ../lib/modules/posixGroup.inc:384
 msgid "Group description. If left empty group name will be used."
 msgstr "グループの説明。もしも空ならば、グループ名が使われます。"
 
-#: ../lib/types/group.inc:86 ../lib/types/gon.inc:83 ../lib/types/gon.inc:84
+#: ../lib/types/group.inc:95 ../lib/types/gon.inc:92 ../lib/types/gon.inc:93
 msgid "Group member DNs"
 msgstr "グループメンバのDN"
 
-#: ../lib/modules/posixGroup.inc:182 ../lib/modules/posixGroup.inc:248
-#: ../lib/modules/posixGroup.inc:372 ../lib/modules/posixGroup.inc:416
-#: ../lib/modules/posixGroup.inc:420 ../lib/modules/posixGroup.inc:477
-#: ../lib/types/group.inc:85
+#: ../lib/modules/posixGroup.inc:183 ../lib/modules/posixGroup.inc:241
+#: ../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
 msgid "Group members"
 msgstr "グループメンバ"
 
-#: ../lib/modules/groupOfNames.inc:60 ../lib/modules/groupOfNames.inc:84
-#: ../lib/modules/groupOfNames.inc:439 ../lib/modules/posixGroup.inc:167
-#: ../lib/modules/posixGroup.inc:387 ../lib/modules/posixGroup.inc:436
-#: ../lib/modules/posixGroup.inc:475 ../lib/modules/posixGroup.inc:504
-#: ../lib/modules/posixGroup.inc:505 ../lib/modules/posixGroup.inc:506
-#: ../lib/types/group.inc:83 ../lib/types/gon.inc:82
+#: ../lib/modules/nisnetgroup.inc:68 ../lib/modules/nisnetgroup.inc:97
+#: ../lib/modules/nisnetgroup.inc:134 ../lib/modules/nisnetgroup.inc:176
+#: ../lib/modules/nisnetgroup.inc:563 ../lib/modules/groupOfNames.inc:60
+#: ../lib/modules/groupOfNames.inc:84 ../lib/modules/groupOfNames.inc:436
+#: ../lib/modules/posixGroup.inc:168 ../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/types/group.inc:92
+#: ../lib/types/netgroup.inc:91 ../lib/types/gon.inc:91
 msgid "Group name"
 msgstr "グループ名"
 
-#: ../lib/modules/posixGroup.inc:506 ../lib/modules/posixGroup.inc:507
+#: ../lib/modules/nisnetgroup.inc:134 ../lib/modules/posixGroup.inc:476
+#: ../lib/modules/posixGroup.inc:477
 msgid ""
 "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
@@ -1929,28 +2195,22 @@ msgstr ""
 "グループ名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ で"
 "す!"
 
-#: ../lib/modules/posixGroup.inc:505
+#: ../lib/modules/posixGroup.inc:475
 msgid "Group name in use. Selected next free group name."
 msgstr "グループ名が既に使われています。次の未使用グループ名が選択されました。"
 
-#: ../lib/modules/posixGroup.inc:437
+#: ../lib/modules/posixGroup.inc:408
 msgid ""
 "Group name of the group which should be created. Valid characters are: a-z, "
-"A-Z, 0-9 and .-_ . LAM does not allow a number as first character because "
-"groupadd also does not allow it. If group name is already used group name "
-"will be expanded with a number. The next free number will be used."
-msgstr ""
-"作成しようとしているグループの名前。有効な文字は: a-z,A-Z,0-9, .-_ です。"
-"groupaddコマンドで許されていないため、先頭の文字として数字は使えません。大文"
-"字のA-Zは、いくつかの問題を引き起こす事があるため使えません。もしもグループ名"
-"が既に使われていたならば、グループ名に番号が付加されます。この場合、空いてい"
-"る次の番号が使われます。"
+"A-Z, 0-9 and .-_ . If group name is already used group name will be expanded "
+"with a number. The next free number will be used."
+msgstr "作成しようとしているグループの名前。有効な文字は: a-z, A-Z, 0-9, .-_ です。もしもグループ名が既に使われていたならば、グループ名に番号が付加されます。この場合、空いている次の番号が使われます。"
 
-#: ../lib/modules/groupOfNames.inc:44 ../lib/types/gon.inc:44
+#: ../lib/modules/groupOfNames.inc:44 ../lib/types/gon.inc:53
 msgid "Group of names"
 msgstr "名前のグループ"
 
-#: ../lib/types/gon.inc:53
+#: ../lib/types/gon.inc:62
 msgid "Group of names accounts"
 msgstr "名前グループアカウント"
 
@@ -1958,102 +2218,58 @@ msgstr "名前グループアカウント"
 msgid "Group of unique names"
 msgstr "uniqueな名前のグループ"
 
-#: ../lib/modules/posixGroup.inc:378 ../lib/modules/posixGroup.inc:424
+#: ../lib/modules/posixGroup.inc:349 ../lib/modules/posixGroup.inc:395
 msgid "Group password"
 msgstr "グループパスワード"
 
-#: ../lib/modules/sambaGroupMapping.inc:266
+#: ../lib/modules/sambaGroupMapping.inc:267
 msgid "Group type"
 msgstr "グループのタイプ"
 
-#: ../lib/modules/posixGroup.inc:326 ../lib/types/group.inc:45
+#: ../lib/modules/posixGroup.inc:297 ../lib/types/group.inc:54
 msgid "Groups"
 msgstr "グループ"
 
-#: ../lib/modules/dhcp_settings.inc:99 ../lib/modules/dhcp_settings.inc:698
+#: ../lib/modules/dhcp_settings.inc:90
 msgid "H-Node (0x08)"
 msgstr ""
 
-#: ../lib/modules/quota.inc:571
+#: ../lib/modules/quota.inc:582
 msgid "Hard block"
 msgstr "ハードblock"
 
-#: ../lib/modules/quota.inc:107 ../lib/modules/quota.inc:108
-#: ../lib/modules/quota.inc:377 ../lib/modules/quota.inc:462
+#: ../lib/modules/quota.inc:111 ../lib/modules/quota.inc:112
+#: ../lib/modules/quota.inc:388 ../lib/modules/quota.inc:473
 msgid "Hard block limit"
 msgstr "ハードブロック制限"
 
-#: ../lib/modules/quota.inc:573
+#: ../lib/modules/quota.inc:584
 msgid "Hard inode"
 msgstr "ハードinode"
 
-#: ../lib/modules/quota.inc:130
+#: ../lib/modules/quota.inc:134
 msgid "Hard inode (files) limit"
 msgstr "ハードinode(ファイル)制限"
 
-#: ../lib/modules/quota.inc:129 ../lib/modules/quota.inc:381
-#: ../lib/modules/quota.inc:464
+#: ../lib/modules/quota.inc:133 ../lib/modules/quota.inc:392
+#: ../lib/modules/quota.inc:475
 msgid "Hard inode limit"
 msgstr "ハードinode制限"
 
-#: ../lib/modules/sambaSamAccount.inc:500
+#: ../lib/modules/sambaSamAccount.inc:529
 msgid "Hawaii"
 msgstr ""
 
-#: ../templates/pdfedit/pdfpage.php:396 ../templates/pdfedit/pdfpage.php:565
-#: ../templates/pdfedit/pdfpage.php:579
+#: ../templates/pdfedit/pdfpage.php:386 ../templates/pdfedit/pdfpage.php:554
+#: ../templates/pdfedit/pdfpage.php:568
 msgid "Headline"
 msgstr "見出し"
 
-#: ../templates/selfService/profManage.php:160
-#: ../templates/selfService/profManage.php:200
-#: ../templates/selfService/profManage.php:235
-#: ../templates/selfService/profManage.php:259
-#: ../templates/selfService/adminMain.php:273
-#: ../templates/selfService/adminMain.php:287
-#: ../templates/selfService/adminMain.php:301
-#: ../templates/selfService/adminMain.php:315
-#: ../templates/selfService/adminMain.php:338
-#: ../templates/selfService/adminMain.php:358
-#: ../templates/selfService/adminMain.php:373
-#: ../templates/selfService/adminMain.php:388
-#: ../templates/selfService/adminMain.php:472
-#: ../templates/selfService/adminMain.php:506
-#: ../templates/selfService/adminLogin.php:126
-#: ../templates/pdfedit/pdfpage.php:685
-#: ../templates/lists/changePassword.php:190 ../templates/masscreate.php:161
-#: ../templates/masscreate.php:174 ../templates/masscreate.php:312
-#: ../templates/ou_edit.php:183 ../templates/ou_edit.php:199
-#: ../templates/profedit/profilepage.php:199
-#: ../templates/profedit/profilepage.php:219
-#: ../templates/profedit/profilepage.php:256
-#: ../templates/config/conftypes.php:204 ../templates/config/conftypes.php:220
-#: ../templates/config/conflogin.php:129
-#: ../templates/config/mainmanage.php:180
-#: ../templates/config/mainmanage.php:197
-#: ../templates/config/mainmanage.php:236
-#: ../templates/config/mainmanage.php:273
-#: ../templates/config/mainmanage.php:289
-#: ../templates/config/mainmanage.php:353 ../templates/config/confmain.php:154
-#: ../templates/config/confmain.php:168 ../templates/config/confmain.php:190
-#: ../templates/config/confmain.php:225 ../templates/config/confmain.php:249
-#: ../templates/config/confmain.php:330 ../templates/config/confmain.php:349
-#: ../templates/config/confmain.php:358 ../templates/config/confmain.php:403
-#: ../templates/config/confmain.php:422 ../templates/config/confmain.php:436
-#: ../templates/config/profmanage.php:180
-#: ../templates/config/profmanage.php:232
-#: ../templates/config/profmanage.php:262
-#: ../templates/config/profmanage.php:296
-#: ../templates/config/profmanage.php:341
-#: ../templates/config/profmanage.php:365
-#: ../templates/config/confmodules.php:123
-#: ../templates/config/mainlogin.php:120 ../lib/modules.inc:831
-#: ../lib/modules.inc:1168 ../lib/modules.inc:1224 ../lib/modules.inc:1341
-#: ../lib/lists.inc:383
+#: ../lib/modules.inc:925
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../templates/masscreate.php:149
+#: ../templates/masscreate.php:228
 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."
@@ -2061,24 +2277,34 @@ msgstr ""
 "カラム候補のリスト。赤字のカラムはCSVファイルに含まれていなくてはならず、かつ"
 "全てのアカウントについて記入済みでなくてはなりません。"
 
-#: ../templates/tools.php:89
+#: ../lib/tools/schemaBrowser.inc:53
 msgid "Here you can browse LDAP object classes and attributes."
 msgstr "ここでは、LDAPオブジェクトのクラスと属性をブラウズできます。"
 
-#: ../lib/modules/sambaSamAccount.inc:340
+#: ../lib/modules/sambaSamAccount.inc:365
 msgid "Here you can change the settings for the terminal server access."
 msgstr "ターミナルサーバーへのアクセス設定を変更できます。"
 
-#: ../templates/masscreate.php:91
+#: ../templates/masscreate.php:114
 msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr ""
 "ここでは、CSVファイルを与える事によって、複数のアカウントを作成できます。"
 
-#: ../lib/modules/groupOfNames.inc:65
+#: ../lib/modules/dhcp_settings.inc:162
+msgid "Here you can enter a description for this DHCP entry."
+msgstr "このDHCPエントリに対する説明を入力できます。"
+
+#: ../lib/modules/nisnetgroup.inc:73 ../lib/modules/groupOfNames.inc:65
 msgid "Here you can enter a description for this group."
 msgstr "このグループに対する説明を入力できます。"
 
-#: ../lib/modules/posixAccount.inc:356
+#: ../lib/modules/nisnetgroup.inc:90
+msgid ""
+"Here you can enter a filter value. Only entries which contain the filter "
+"text will be shown."
+msgstr "ここには、フィルタの値を入力します。フィルタテキストを含んだエントリだけが表示されます。"
+
+#: ../lib/modules/posixAccount.inc:348
 msgid ""
 "Here you can enter a list of additional group memberships. The group names "
 "are separated by commas."
@@ -2086,15 +2312,19 @@ msgstr ""
 "ここにはメンバーとして所属する追加グループのリストを入力します。グループ名は"
 "カンマによって区切られます。"
 
-#: ../help/help.inc:141
+#: ../lib/modules/inetOrgPerson.inc:664
 msgid ""
-"Here you can input small filter expressions (e.g. 'value' or 'v*'). LAM will "
-"filter case-insensitive."
-msgstr ""
-"ここには、簡単なフィルタ(例 'value'または'v*')を入力できます。大文字と小文字"
-"は区別されます。"
+"Here you can enter the user's department(s). Multiple entries are separated "
+"by semicolons."
+msgstr "ここにはユーザーの部門を入力できます。複数のエントリはセミコロンによって区切られます。"
 
-#: ../help/help.inc:154
+#: ../help/help.inc:148
+msgid ""
+"Here you can input simple filter expressions (e.g. 'value' or 'v*'). The "
+"filter is case-sensitive."
+msgstr "ここには、単純なフィルタ(例 'value'または'v*')を入力できます。大文字と小文字は区別されます。"
+
+#: ../help/help.inc:161
 msgid ""
 "Here you can load an account profile to set default settings for your "
 "account. The \"default\" profile is automatically loaded for new accounts."
@@ -2103,18 +2333,18 @@ msgstr ""
 "プロファイルをロードできます。新しいアカウントに対しては、\"default\"プロファ"
 "イルが自動的にロードされます。"
 
-#: ../templates/tools.php:57
+#: ../lib/tools/profileEditor.inc:53
 msgid "Here you can manage your account profiles."
 msgstr "ここで、あなたのアカウントのプロファイルを管理できます。"
 
-#: ../help/help.inc:156
+#: ../help/help.inc:163
 msgid ""
 "Here you can select a PDF structure and export the account to a PDF file."
 msgstr ""
 "ここでは、PDF構成の選択と、アカウントのPDFフィアルへのエクスポートを行えま"
 "す。"
 
-#: ../help/help.inc:135
+#: ../help/help.inc:142
 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 "
@@ -2124,16 +2354,30 @@ msgstr ""
 "unixシステムではSyslogに、Windowsではイベントログに出力されます。追加のファイ"
 "ルを選択する事もできます。"
 
-#: ../help/help.inc:106
+#: ../help/help.inc:107
 msgid ""
 "Here you can select which plugins you want to use for account management."
 msgstr "ここでは、アカウント管理に使用するプラグインを選択できます。"
 
+#: ../help/help.inc:120
+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 "
+"much load."
+msgstr "ここには、LDAP検索の上限を設定します。これは、LDAP検索結果数を制限します。LAMのLDAPクエリが過大な負荷を生じる場合に使用してください。"
+
+#: ../help/help.inc:188
+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 "
+"enter one link per line."
+msgstr "ここには、自己サービスページのレイアウトを変更する追加のCSSリンクを記述できます。これは、コーポレートデザインを適用する場合に有用です。1行につき1個のリンクを入力してください。"
+
 #: ../lib/modules/phpGroupwareUser.inc:79
 msgid "Here you can specify if the account is active or inactive."
 msgstr "ここではアカウントの有効/無効を記述できます。"
 
-#: ../help/help.inc:139
+#: ../help/help.inc:146
 msgid ""
 "Here you can specify minimum requirements for passwords. The character "
 "classes are: lowercase, uppercase, numeric and symbols."
@@ -2141,28 +2385,40 @@ msgstr ""
 "パスワードの要求水準を設定します。文字クラスは lowercase, uppercase, "
 "numeric, symbols です。"
 
+#: ../lib/modules/nisnetgroup.inc:77
+msgid ""
+"Here you can specify subgroups which are included in this NIS netgroup. All "
+"members of the subgroups will be treated as members of this group."
+msgstr "ここでは、NISネットグループによってインクルードされるサブグループを指定できます。サブグループに含まれる全てのメンバーは、グループのメンバーとして扱われます。"
+
 #: ../lib/modules/sambaDomain.inc:95
 msgid ""
 "Here you can specify the minimum number of characters for a user password."
 msgstr "ユーザーパスワードの最低文字数を設定します。"
 
-#: ../templates/lists/changePassword.php:200
+#: ../templates/lists/changePassword.php:194
 msgid "Here you can specify the new password yourself."
 msgstr "ここではあなた自身の手によって新しいパスワードを指定できます。"
 
-#: ../lib/modules/sambaSamAccount.inc:331
+#: ../lib/modules/sambaSamAccount.inc:356
 msgid "Here you can specify the shadowing mode."
 msgstr "ここではshadowingモードを記述できます。"
 
-#: ../templates/tools.php:96
+#: ../lib/tools/tests.inc:53
 msgid "Here you can test if certain LAM features work on your installation."
 msgstr "あなたがインストールしたLAMの特定の機能が動作するかをテストできます。"
 
+#: ../lib/modules/inetOrgPerson.inc:211 ../lib/modules/inetOrgPerson.inc:667
+#: ../lib/modules/sambaSamAccount.inc:370
+#: ../lib/modules/sambaSamAccount.inc:568
+msgid "Hidden options"
+msgstr "非表示のオプション"
+
 #: ../templates/tree/edit.php:104
 msgid "Hide internal attributes"
 msgstr "内部属性を隠す"
 
-#: ../templates/masscreate.php:134
+#: ../templates/masscreate.php:212
 msgid ""
 "Hint: Format all cells as text in your spreadsheet program and turn off auto "
 "correction."
@@ -2175,24 +2431,24 @@ msgid "Hint: To delete an attribute, empty the text field and click save."
 msgstr ""
 "ヒント: 属性を削除するには、テキストフィールドを空にして保存してください。"
 
-#: ../lib/modules/posixAccount.inc:401
+#: ../lib/modules/posixAccount.inc:393
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr ""
 "複数のグループを選択(解除)する場合は、CTRLキーを押しながら操作してください。"
 
-#: ../lib/modules/posixAccount.inc:63 ../lib/modules/posixAccount.inc:64
-#: ../lib/modules/posixAccount.inc:66 ../lib/modules/posixAccount.inc:94
-#: ../lib/modules/posixAccount.inc:230 ../lib/modules/posixAccount.inc:359
-#: ../lib/modules/posixAccount.inc:363 ../lib/modules/posixAccount.inc:367
-#: ../lib/modules/posixAccount.inc:384 ../lib/modules/posixAccount.inc:787
-#: ../lib/modules/posixAccount.inc:1001 ../lib/modules/posixAccount.inc:1168
-#: ../lib/modules/posixAccount.inc:1249 ../lib/modules/sambaSamAccount.inc:303
-#: ../lib/modules/sambaSamAccount.inc:1350
-#: ../lib/modules/sambaSamAccount.inc:1727 ../lib/types/user.inc:89
+#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:96
+#: ../lib/modules/posixAccount.inc:234 ../lib/modules/posixAccount.inc:351
+#: ../lib/modules/posixAccount.inc:355 ../lib/modules/posixAccount.inc:359
+#: ../lib/modules/posixAccount.inc:376 ../lib/modules/posixAccount.inc:800
+#: ../lib/modules/posixAccount.inc:970 ../lib/modules/posixAccount.inc:1102
+#: ../lib/modules/posixAccount.inc:1183 ../lib/modules/sambaSamAccount.inc:328
+#: ../lib/modules/sambaSamAccount.inc:1428
+#: ../lib/modules/sambaSamAccount.inc:1793 ../lib/types/user.inc:98
 msgid "Home directory"
 msgstr "ホームディレクトリ"
 
-#: ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:68
 #, php-format
 msgid ""
 "Home directory changed. To keep home directory you have to run the following "
@@ -2201,160 +2457,157 @@ msgstr ""
 "ホームディレクトリが変更されました。ホームディレクトリを維持するために、root"
 "権限で以下のコマンドを実行しなければなりません: 'mv %s %s'"
 
-#: ../lib/modules/posixAccount.inc:1189
+#: ../lib/modules/posixAccount.inc:1123
 msgid "Home directory server"
 msgstr "ホームディレクトリ・サーバー"
 
-#: ../lib/modules/sambaAccount.inc:150 ../lib/modules/sambaAccount.inc:281
-#: ../lib/modules/sambaAccount.inc:382 ../lib/modules/sambaAccount.inc:785
-#: ../lib/modules/sambaAccount.inc:893 ../lib/modules/sambaSamAccount.inc:251
-#: ../lib/modules/sambaSamAccount.inc:424
-#: ../lib/modules/sambaSamAccount.inc:1083
-#: ../lib/modules/sambaSamAccount.inc:1361
-#: ../lib/modules/sambaSamAccount.inc:1515
-#: ../lib/modules/sambaSamAccount.inc:1701
-#: ../lib/modules/sambaSamAccount.inc:1728
+#: ../lib/modules/sambaSamAccount.inc:276
+#: ../lib/modules/sambaSamAccount.inc:457
+#: ../lib/modules/sambaSamAccount.inc:572
+#: ../lib/modules/sambaSamAccount.inc:1151
+#: ../lib/modules/sambaSamAccount.inc:1439
+#: ../lib/modules/sambaSamAccount.inc:1578
+#: ../lib/modules/sambaSamAccount.inc:1767
+#: ../lib/modules/sambaSamAccount.inc:1794
 msgid "Home drive"
 msgstr "ホームドライブ"
 
-#: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaAccount.inc:62
-#: ../lib/modules/sambaAccount.inc:156 ../lib/modules/sambaAccount.inc:287
-#: ../lib/modules/sambaAccount.inc:385 ../lib/modules/sambaAccount.inc:788
-#: ../lib/modules/sambaAccount.inc:892 ../lib/modules/sambaSamAccount.inc:83
-#: ../lib/modules/sambaSamAccount.inc:84
-#: ../lib/modules/sambaSamAccount.inc:254
-#: ../lib/modules/sambaSamAccount.inc:430
-#: ../lib/modules/sambaSamAccount.inc:1091
-#: ../lib/modules/sambaSamAccount.inc:1521
-#: ../lib/modules/sambaSamAccount.inc:1698
+#: ../lib/modules/sambaSamAccount.inc:81 ../lib/modules/sambaSamAccount.inc:82
+#: ../lib/modules/sambaSamAccount.inc:279
+#: ../lib/modules/sambaSamAccount.inc:465
+#: ../lib/modules/sambaSamAccount.inc:575
+#: ../lib/modules/sambaSamAccount.inc:1161
+#: ../lib/modules/sambaSamAccount.inc:1586
+#: ../lib/modules/sambaSamAccount.inc:1764
 msgid "Home path"
 msgstr "ホームパス"
 
-#: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaSamAccount.inc:83
-#: ../lib/modules/sambaSamAccount.inc:85
+#: ../lib/modules/sambaSamAccount.inc:81 ../lib/modules/sambaSamAccount.inc:83
 msgid "Home path is invalid."
 msgstr "ホームパスが正しくありません。"
 
-#: ../lib/modules/inetOrgPerson.inc:79 ../lib/modules/inetOrgPerson.inc:155
-#: ../lib/modules/inetOrgPerson.inc:269 ../lib/modules/inetOrgPerson.inc:466
-#: ../lib/modules/inetOrgPerson.inc:842 ../lib/modules/inetOrgPerson.inc:1057
-#: ../lib/modules/inetOrgPerson.inc:1375
+#: ../lib/modules/inetOrgPerson.inc:79 ../lib/modules/inetOrgPerson.inc:152
+#: ../lib/modules/inetOrgPerson.inc:248 ../lib/modules/inetOrgPerson.inc:398
+#: ../lib/modules/inetOrgPerson.inc:635 ../lib/modules/inetOrgPerson.inc:1039
+#: ../lib/modules/inetOrgPerson.inc:1232 ../lib/modules/inetOrgPerson.inc:1617
 msgid "Home telephone number"
 msgstr "自宅電話番号"
 
-#: ../lib/modules/posixAccount.inc:63 ../lib/modules/posixAccount.inc:65
+#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:67
 msgid "Homedirectory contains invalid characters."
 msgstr "ホームディレクトリが不正な文字を含んでいます。"
 
-#: ../lib/types/host.inc:53
+#: ../lib/modules/nisnetgroup.inc:203 ../lib/modules/nisnetgroup.inc:573
+#: ../lib/modules/asteriskAccount.inc:81 ../lib/modules/asteriskAccount.inc:96
+#: ../lib/modules/asteriskAccount.inc:133
+#: ../lib/modules/asteriskAccount.inc:179
+#: ../lib/modules/asteriskAccount.inc:273
+msgid "Host"
+msgstr "ホスト"
+
+#: ../lib/types/host.inc:62
 msgid "Host accounts (e.g. Samba)"
 msgstr "ホストアカウント(e.g. Samba)"
 
-#: ../lib/types/host.inc:85
+#: ../lib/types/host.inc:94
 msgid "Host description"
 msgstr "ホストの説明"
 
-#: ../lib/modules/account.inc:89 ../lib/modules/posixAccount.inc:415
-#: ../lib/modules/posixAccount.inc:423
+#: ../lib/modules/account.inc:89 ../lib/modules/posixAccount.inc:407
+#: ../lib/modules/posixAccount.inc:415
 msgid "Host description. If left empty host name will be used."
 msgstr "ホストの説明。もしも空ならば、ホスト名が使われます。"
 
-#: ../lib/modules/account.inc:108
-msgid "Host list"
-msgstr "ホスト一覧"
-
-#: ../lib/modules/account.inc:84 ../lib/modules/posixAccount.inc:78
-#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:81
-#: ../lib/modules/posixAccount.inc:277 ../lib/modules/posixAccount.inc:410
-#: ../lib/types/host.inc:82 ../lib/types/host.inc:83
+#: ../lib/modules/nisnetgroup.inc:136 ../lib/modules/nisnetgroup.inc:453
+#: ../lib/modules/account.inc:84 ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:81 ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/posixAccount.inc:281 ../lib/modules/posixAccount.inc:402
+#: ../lib/types/host.inc:91 ../lib/types/host.inc:92
 msgid "Host name"
 msgstr "ホスト名"
 
-#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/posixAccount.inc:87
 msgid "Host name already exists!"
 msgstr "ホスト名は既に存在しています!"
 
-#: ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/nisnetgroup.inc:136 ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:85
 msgid ""
 "Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
 msgstr ""
 "ホスト名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です。"
 
-#: ../lib/modules/posixAccount.inc:79
-msgid ""
-"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, .-_ です。"
-"ホスト名の末尾は$でなくてはなりません。"
-
-#: ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:83
 msgid "Host name in use. Selected next free host name."
 msgstr "ホスト名がすでに使われています。次の未使用ホスト名が選択されました。"
 
-#: ../lib/modules/account.inc:85 ../lib/modules/posixAccount.inc:411
+#: ../lib/modules/sambaSamAccount.inc:1049
+msgid "Host name must end with $!"
+msgstr "ホスト名の末尾は$でなくてはなりません!"
+
+#: ../lib/modules/account.inc:85 ../lib/modules/posixAccount.inc:403
 msgid ""
 "Host name of the host which should be created. Valid characters are: a-z,A-"
-"Z,0-9, .-_$. LAM does not allow a number as first character because useradd "
-"also does not allow it. Host names are always ending with $. If last "
-"character is not $ it will be added. If host name is already used host name "
-"will be expanded with a number. The next free number will be used."
-msgstr ""
-"作成しようとしているホストのホスト名。有効な文字は: a-z, A-Z, 0-9, .-_$ で"
-"す。useraddコマンドで許されてしないため、先頭文字に数字は使えません。ホスト名"
-"の末尾は必ず $ になります。もしも最後の文字が $ でなければ追加されます。もし"
-"もホスト名がすでに使われていれば、ホスト名に番号が付加されます。この場合、空"
-"いている次の番号が使われます。"
+"Z,0-9, .-_$. Host names are always ending with $. If last character is not $ "
+"it will be added. If host name is already used host name will be expanded "
+"with a number. The next free number will be used."
+msgstr "作成しようとしているホストの名前。有効な文字は: a-z, A-Z, 0-9, .-_$ です。ホスト名の末尾は必ず $ になります。もしも最後の文字が $ でなければ追加されます。もしもホスト名がすでに使われていれば、ホスト名に番号が付加されます。この場合、空いている次の番号が使われます。"
 
-#: ../lib/modules/posixAccount.inc:58 ../lib/modules/posixAccount.inc:59
-#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:166
-#: ../lib/types/host.inc:44
+#: ../lib/modules/posixAccount.inc:60 ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:63 ../lib/modules/posixAccount.inc:170
+#: ../lib/types/host.inc:53
 msgid "Hosts"
 msgstr "ホスト"
 
-#: ../templates/lists/changePassword.php:187
+#: ../templates/lists/changePassword.php:183
 msgid "I am sure"
 msgstr "確認"
 
-#: ../lib/modules/posixGroup.inc:499 ../lib/modules/posixGroup.inc:610
-#: ../lib/modules/posixAccount.inc:69 ../lib/modules/posixAccount.inc:768
+#: ../lib/modules/posixGroup.inc:469 ../lib/modules/posixGroup.inc:580
+#: ../lib/modules/posixAccount.inc:71 ../lib/modules/posixAccount.inc:781
 msgid "ID is already in use"
 msgstr "ID はすでに使用されています"
 
-#: ../lib/modules/posixGroup.inc:497 ../lib/modules/posixGroup.inc:498
-#: ../lib/modules/posixGroup.inc:499 ../lib/modules/posixGroup.inc:602
-#: ../lib/modules/posixGroup.inc:610 ../lib/modules/posixAccount.inc:67
-#: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:69
-#: ../lib/modules/posixAccount.inc:764 ../lib/modules/posixAccount.inc:768
+#: ../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:69
+#: ../lib/modules/posixAccount.inc:70 ../lib/modules/posixAccount.inc:71
+#: ../lib/modules/posixAccount.inc:777 ../lib/modules/posixAccount.inc:781
 msgid "ID-Number"
 msgstr "ID番号"
 
-#: ../lib/modules/fixed_ip.inc:85 ../lib/modules/fixed_ip.inc:406
-#: ../lib/modules/fixed_ip.inc:511
+#: ../lib/modules/ipHost.inc:48 ../lib/modules/ipHost.inc:58
+#: ../lib/modules/ipHost.inc:122 ../lib/modules/fixed_ip.inc:87
+#: ../lib/modules/fixed_ip.inc:334 ../lib/modules/fixed_ip.inc:518
 msgid "IP address"
 msgstr "IPアドレス"
 
-#: ../lib/modules/ddns.inc:94 ../lib/modules/ddns.inc:313
-#: ../lib/modules/ddns.inc:360
+#: ../lib/modules/ddns.inc:96 ../lib/modules/ddns.inc:116
+#: ../lib/modules/ddns.inc:364 ../lib/modules/ddns.inc:411
 msgid "IP address of the DNS server"
 msgstr "DNSサーバーのIPアドレス"
 
-#: ../templates/masscreate.php:165 ../templates/masscreate.php:178
-#: ../templates/masscreate.php:317
+#: ../lib/modules/ipHost.inc:62 ../lib/modules/ipHost.inc:77
+#: ../lib/modules/ipHost.inc:310
+msgid "IP address(es)"
+msgstr "IPアドレス"
+
+#: ../templates/masscreate.php:243 ../templates/masscreate.php:255
+#: ../templates/masscreate.php:396
 msgid "Identifier"
 msgstr "識別子"
 
-#: ../lib/modules/sambaSamAccount.inc:1396
-#: ../lib/modules/sambaSamAccount.inc:1739
+#: ../lib/modules/sambaSamAccount.inc:1474
+#: ../lib/modules/sambaSamAccount.inc:1805
 msgid "Idle time limit"
 msgstr "無動作時間の制限"
 
-#: ../lib/modules/sambaAccount.inc:354 ../lib/modules/sambaSamAccount.inc:217
+#: ../lib/modules/sambaSamAccount.inc:242
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "チェックした場合、unixパスワードがSambaパスワードとしても使われます。"
 
-#: ../lib/modules/posixAccount.inc:393
+#: ../lib/modules/posixAccount.inc:385
 msgid ""
 "If checked account will be deactivated by putting a \"!\" before the "
 "encrypted password."
@@ -2362,26 +2615,21 @@ msgstr ""
 "チェックした場合、暗号化パスワードの前に\"!\"が挿入され、アカウントは無効化さ"
 "れます。"
 
-#: ../lib/modules/sambaAccount.inc:372
-msgid "If checked account will be deactivated. (Setting D-Flag)"
-msgstr ""
-"チェックした場合、(D-フラグをセットすることで)アカウントは無効化されます。"
-
-#: ../lib/modules/sambaAccount.inc:360 ../lib/modules/sambaSamAccount.inc:223
+#: ../lib/modules/sambaSamAccount.inc:248
 msgid "If checked no password will be used."
 msgstr "チェックした場合、パスワードは使われません。"
 
-#: ../lib/modules/sambaAccount.inc:366 ../lib/modules/sambaSamAccount.inc:229
+#: ../lib/modules/sambaSamAccount.inc:254
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "チェックした場合、パスワードは無期限になります。(X-フラグをセット)"
 
-#: ../lib/modules/sambaSamAccount.inc:235
+#: ../lib/modules/sambaSamAccount.inc:260
 msgid "If checked then the account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "チェックした場合、(D-フラグをセットすることにより)アカウントは無効化されま"
 "す。"
 
-#: ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/sambaSamAccount.inc:263
 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 "
@@ -2391,40 +2639,52 @@ msgstr ""
 "す。通常はログイン失敗によってロックされたユーザーのアカウントをアンロックし"
 "たい場合に使用します。"
 
-#: ../lib/modules/posixGroup.inc:409
+#: ../lib/modules/posixGroup.inc:380
 msgid ""
 "If empty GID number will be generated automaticly depending on your "
 "configuration settings."
 msgstr "未記入の場合、設定内容に従ってGID番号が自動的に生成されます。"
 
-#: ../lib/modules/posixAccount.inc:348
+#: ../lib/modules/posixAccount.inc:340
 msgid "If empty UID number will be generated automaticly."
 msgstr "未記入の場合、UID番号が自動的に生成されます。"
 
+#: ../lib/modules/ppolicy.inc:117
+msgid ""
+"If enabled the user will not be allowed to login after there have been a "
+"specified number of consecutive failed login attempts."
+msgstr "有効にした場合は、連続したログイン試行の失敗が設定された回数に達すると、ユーザはログインできなくなります。"
+
+#: ../lib/modules/ppolicy.inc:121
+msgid ""
+"If enabled users must change their passwords when they first login after a "
+"password is set or reset by the administrator."
+msgstr "有効にすると、管理者によってパスワードの設定またはリセットが行われた後の最初のログインで、ユーザーはパスワードを変更しなくてはなりません。"
+
 #: ../lib/modules/sambaDomain.inc:103
 msgid "If set then users need to login to change their password."
 msgstr "パスワード変更の際にユーザーのログオンを強制します。"
 
-#: ../lib/modules/sambaAccount.inc:357 ../lib/modules/sambaSamAccount.inc:220
+#: ../lib/modules/sambaSamAccount.inc:245
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr ""
 "\"true\"にセットした場合、unixパスワードがSambaパスワードとしても使われます。"
 
-#: ../lib/modules/sambaAccount.inc:375 ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/sambaSamAccount.inc:266
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "\"true\"にセットした場合、アカウントは無効化されます。(D-フラグをセット)"
 
-#: ../lib/modules/sambaAccount.inc:363 ../lib/modules/sambaSamAccount.inc:226
+#: ../lib/modules/sambaSamAccount.inc:251
 msgid "If set to \"true\" no password will be used."
 msgstr "\"true\"にセットした場合、パスワードは使われません。"
 
-#: ../lib/modules/sambaAccount.inc:369 ../lib/modules/sambaSamAccount.inc:232
+#: ../lib/modules/sambaSamAccount.inc:257
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr ""
 "\"true\"にセットした場合、パスワードは無期限になります。(X-フラグをセット)"
 
-#: ../help/help.inc:178
+#: ../help/help.inc:191
 msgid ""
 "If you decide to send the password via mail then the mail template \"config/"
 "passwordMailTemplate.txt\" will be used."
@@ -2432,17 +2692,19 @@ msgstr ""
 "パスワードをメールで送信することを選択した場合、テンプレートとして\"config/"
 "passwordMailTemplate.txt\"が使用されます。"
 
-#: ../lib/modules/sambaSamAccount.inc:280
+#: ../lib/modules/sambaSamAccount.inc:305
 msgid ""
 "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr ""
 "未入力の場合は、LAMは uidNumber*2 + sambaAlgorithmicRidBase を使用します。"
 
-#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/sambaSamAccount.inc:269
 msgid ""
 "If you set this option then the user has to change his password at the next "
 "login."
-msgstr "このオプションを設定した場合、ユーザーは次のログインの際にパスワードを変更しなくてはなりません。"
+msgstr ""
+"このオプションを設定した場合、ユーザーは次のログインの際にパスワードを変更し"
+"なくてはなりません。"
 
 #: ../lib/modules/phpGroupwareGroup.inc:74
 #: ../lib/modules/phpGroupwareUser.inc:75
@@ -2450,34 +2712,25 @@ msgid ""
 "If you set this to \"true\" then the phpGroupware extension will be added."
 msgstr "\"true\"にセットした場合、phpGroupware拡張が追加されます。"
 
-#: ../help/help.inc:100
+#: ../help/help.inc:99
 msgid ""
 "If you want to change the current preferences password, please enter it here."
 msgstr ""
 "現在のプリファレンスのパスワードを変更したい場合は、ここに入力してください。"
 
-#: ../help/help.inc:125
+#: ../help/help.inc:132
 msgid ""
 "If you want to change your master configuration password, please enter it "
 "here."
 msgstr "マスタ構成パスワードを変更したい場合は、ここに入力してください。"
 
-#: ../lib/modules/sambaAccount.inc:407
-msgid ""
-"If you want to create domain administrators or other special users use this "
-"option."
-msgstr ""
-"ドメイン管理者やその他の特殊アカウントを作成したい場合は、このオプションを使"
-"用してください。"
-
-#: ../lib/modules/sambaAccount.inc:401
-#: ../lib/modules/sambaGroupMapping.inc:359
+#: ../lib/modules/sambaGroupMapping.inc:360
 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:110
+#: ../help/help.inc:111
 msgid ""
 "If your server runs on another port then add a comma and the port number "
 "after the server."
@@ -2489,80 +2742,82 @@ msgstr ""
 msgid "Include system attributes"
 msgstr "システム属性を含む"
 
-#: ../lib/modules/sambaSamAccount.inc:309
-#: ../lib/modules/sambaSamAccount.inc:1371
-#: ../lib/modules/sambaSamAccount.inc:1734
+#: ../lib/tools/serverInfo.inc:53
+msgid "Information about the LDAP server."
+msgstr "LDAPサーバーに関する情報。"
+
+#: ../lib/modules/sambaSamAccount.inc:334
+#: ../lib/modules/sambaSamAccount.inc:1449
+#: ../lib/modules/sambaSamAccount.inc:1800
 msgid "Inherit client startup configuration"
 msgstr "クライアントのスタートアップ構成を継承する"
 
-#: ../templates/schema/schema.php:401 ../templates/schema/schema.php:422
+#: ../templates/schema/schema.php:394 ../templates/schema/schema.php:415
 msgid "Inherited from"
 msgstr "継承元"
 
-#: ../templates/schema/schema.php:162 ../templates/schema/schema.php:358
+#: ../templates/schema/schema.php:155 ../templates/schema/schema.php:351
 msgid "Inherits from"
 msgstr "継承元"
 
-#: ../lib/modules/sambaSamAccount.inc:312
-#: ../lib/modules/sambaSamAccount.inc:1376
-#: ../lib/modules/sambaSamAccount.inc:1735
+#: ../lib/modules/sambaSamAccount.inc:337
+#: ../lib/modules/sambaSamAccount.inc:1454
+#: ../lib/modules/sambaSamAccount.inc:1801
 msgid "Initial program"
 msgstr "初期プログラム"
 
-#: ../lib/modules/quota.inc:52
+#: ../lib/modules/quota.inc:54
 msgid "Inode hard quota"
 msgstr "Inode ハードquota"
 
-#: ../lib/modules/quota.inc:52 ../lib/modules/quota.inc:53
+#: ../lib/modules/quota.inc:54 ../lib/modules/quota.inc:55
 msgid ""
 "Inode hard quota contains invalid characters. Only natural numbers are "
 "allowed."
 msgstr ""
 "Inodeハードクオータに不正な文字が含まれています。自然数のみが有効です。"
 
-#: ../lib/modules/quota.inc:56
+#: ../lib/modules/quota.inc:58
 msgid "Inode quota"
 msgstr "Inodeクオータ"
 
-#: ../lib/modules/quota.inc:50
+#: ../lib/modules/quota.inc:52
 msgid "Inode soft quota"
 msgstr "Inodeソフトquota"
 
-#: ../lib/modules/quota.inc:50 ../lib/modules/quota.inc:51
+#: ../lib/modules/quota.inc:52 ../lib/modules/quota.inc:53
 msgid ""
 "Inode soft quota contains invalid characters. Only natural numbers are "
 "allowed."
 msgstr "Inode ソフトクオータに不正な文字が含まれています。自然数のみ有効です。"
 
-#: ../lib/modules/quota.inc:56 ../lib/modules/quota.inc:57
+#: ../lib/modules/quota.inc:58 ../lib/modules/quota.inc:59
 msgid "Inode soft quota must be smaller than inode hard quota."
 msgstr ""
 "iノード・ソフトクオータはiノード・ハードクオータ<より小さくなくてはなりませ"
 "ん。"
 
-#: ../templates/selfService/adminMain.php:400
+#: ../templates/selfService/adminMain.php:472
 msgid "Input fields"
 msgstr "入力フィールド"
 
-#: ../lib/modules/sambaAccount.inc:62 ../lib/modules/sambaAccount.inc:63
-#: ../lib/modules/sambaSamAccount.inc:84
+#: ../lib/modules/sambaSamAccount.inc:82
 msgid "Inserted user or group name in home path."
 msgstr "ホームパス名にユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/sambaAccount.inc:68 ../lib/modules/sambaSamAccount.inc:90
+#: ../lib/modules/sambaSamAccount.inc:88
 msgid "Inserted user or group name in logon script."
 msgstr "ログオンスクリプトパスにユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/sambaAccount.inc:65 ../lib/modules/sambaAccount.inc:66
-#: ../lib/modules/sambaSamAccount.inc:87
+#: ../lib/modules/sambaSamAccount.inc:85
 msgid "Inserted user or group name in profile path."
 msgstr "プロファイルパスにユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/fixed_ip.inc:386
+#: ../lib/modules/fixed_ip.inc:373
 msgid "Invalid MAC address."
 msgstr "不正なMACアドレスです。"
 
-#: ../templates/massBuildAccounts.php:170
+#: ../templates/massBuildAccounts.php:169
 msgid "Invalid RDN attribute!"
 msgstr "不正なRDN属性です!"
 
@@ -2571,8 +2826,8 @@ msgid "Invalid account"
 msgstr "無効なアカウント"
 
 #: ../lib/modules/kolabUser.inc:130 ../lib/modules/kolabUser.inc:135
-#: ../lib/modules/kolabUser.inc:182 ../lib/modules/kolabUser.inc:345
-#: ../lib/modules/kolabUser.inc:782 ../lib/modules/kolabUser.inc:905
+#: ../lib/modules/kolabUser.inc:182 ../lib/modules/kolabUser.inc:343
+#: ../lib/modules/kolabUser.inc:781 ../lib/modules/kolabUser.inc:905
 msgid "Invitation policy"
 msgstr "不正なポリシー"
 
@@ -2580,15 +2835,15 @@ msgstr "不正なポリシー"
 msgid "Invitation policy list"
 msgstr "不正なポリシーリスト"
 
-#: ../lib/modules/sambaSamAccount.inc:515
+#: ../lib/modules/sambaSamAccount.inc:544
 msgid "Islamabad, Karachi"
 msgstr ""
 
-#: ../lib/modules/range.inc:101
+#: ../lib/modules/range.inc:99
 msgid "It is not possible to delete all ranges."
 msgstr "全ての範囲を削除する事はできません"
 
-#: ../lib/modules/posixGroup.inc:497 ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/posixGroup.inc:467 ../lib/modules/posixAccount.inc:70
 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 "
@@ -2598,26 +2853,27 @@ msgstr ""
 "在するかも知れないため、これはいくつかの問題を引き起こすかもしれません。この"
 "警告を防ぐには、maxUIDをより大きな値に設定してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:93 ../lib/modules/inetOrgPerson.inc:168
-#: ../lib/modules/inetOrgPerson.inc:215 ../lib/modules/inetOrgPerson.inc:394
-#: ../lib/modules/inetOrgPerson.inc:873 ../lib/modules/inetOrgPerson.inc:1047
+#: ../lib/modules/inetOrgPerson.inc:93 ../lib/modules/inetOrgPerson.inc:177
+#: ../lib/modules/inetOrgPerson.inc:261 ../lib/modules/inetOrgPerson.inc:326
+#: ../lib/modules/inetOrgPerson.inc:567 ../lib/modules/inetOrgPerson.inc:1078
+#: ../lib/modules/inetOrgPerson.inc:1222
 msgid "Job title"
 msgstr "役職"
 
-#: ../lib/modules/inetOrgPerson.inc:395
+#: ../lib/modules/inetOrgPerson.inc:568
 msgid "Job title of user: President, department manager, ..."
 msgstr "ユーザの役職: 社長、部長、..."
 
-#: ../templates/schema/schema.php:260
+#: ../templates/schema/schema.php:253
 msgid "Jump to a matching rule"
 msgstr "照合規則へジャンプ"
 
-#: ../templates/schema/schema.php:119
+#: ../templates/schema/schema.php:112
 msgid "Jump to an attribute type"
 msgstr "属性タイプへジャンプ"
 
-#: ../templates/schema/schema.php:313 ../templates/schema/schema.php:363
-#: ../templates/schema/schema.php:378
+#: ../templates/schema/schema.php:306 ../templates/schema/schema.php:356
+#: ../templates/schema/schema.php:371
 msgid "Jump to an object class"
 msgstr "オブジェクトクラスへジャンプ"
 
@@ -2635,7 +2891,7 @@ msgstr ""
 "LAMはこのエントリおよび全ての子を再帰的に削除します。この操作が削除する全ての"
 "エントリのリストは下に表示されています。実行してもよろしいですか?"
 
-#: ../templates/login.php:217 ../templates/config/index.php:61
+#: ../templates/login.php:177 ../templates/config/index.php:63
 msgid "LAM configuration"
 msgstr "LAM構成設定"
 
@@ -2644,7 +2900,8 @@ msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr ""
 "LAMは入力内容をチェックしました。アカウントを作成する準備ができました。"
 
-#: ../lib/modules/posixGroup.inc:433 ../lib/modules/posixAccount.inc:344
+#: ../lib/modules/inetOrgPerson.inc:672 ../lib/modules/posixGroup.inc:404
+#: ../lib/modules/posixAccount.inc:336
 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 "
@@ -2655,37 +2912,37 @@ msgstr ""
 "SMD5をサポートしています。SSHAとCRYPTが最も一般的ですが、CRYPTは8文字より長い"
 "パスワードをサポートしません。平文のパスワードを使うことは推奨いたしません。"
 
-#: ../templates/tests/index.php:54
+#: ../templates/tests/index.php:46
 msgid "LAM tests"
-msgstr ""
+msgstr "LAMテスト"
 
-#: ../templates/tree/create.php:184 ../templates/massDoUpload.php:90
+#: ../templates/tree/create.php:184 ../templates/massDoUpload.php:86
 #, php-format
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAMはアカウント %s を作成できませんでした! LDAPエラーが発生しました。"
 
-#: ../lib/modules/sambaGroupMapping.inc:438
+#: ../lib/modules/sambaGroupMapping.inc:439
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "LAMは、この名前のSamba 3ドメインを見つけられませんでした。"
 
-#: ../lib/modules/sambaSamAccount.inc:109
+#: ../lib/modules/sambaSamAccount.inc:103
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAMは、この名前のドメインを見つけられませんでした。"
 
-#: ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:88
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAMは、この名前のグループを見つけられませんでした。"
 
-#: ../lib/modules/posixAccount.inc:1643
+#: ../lib/modules/posixAccount.inc:1579
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAMはグループ %s のグループメンバーシップを変更できませんでした。"
 
-#: ../help/help.inc:161
+#: ../help/help.inc:170
 msgid "LAM will search for accounts in this part of the LDAP tree."
 msgstr "LAMは、このLDAPツリー部分からアカウントを検索します。"
 
-#: ../help/help.inc:163
+#: ../help/help.inc:172
 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 "
@@ -2694,52 +2951,67 @@ msgstr ""
 "LAMがアカウントを検索する際に使用するLDAP DNとパスワード。これは、読み取り権"
 "限だけを持ったアカウントで充分です。未記入の場合、LAMは匿名接続を試みます。"
 
-#: ../templates/profedit/profilepage.php:180
+#: ../templates/profedit/profilepage.php:177
 msgid "LDAP"
 msgstr ""
 
-#: ../templates/selfService/adminMain.php:107
-#: ../templates/config/conftypes.php:154 ../templates/config/confmain.php:121
-#: ../templates/config/confmain.php:594 ../templates/config/confmodules.php:76
+#: ../templates/selfService/adminMain.php:133
+#: ../templates/config/conftypes.php:112 ../templates/config/confmain.php:122
+#: ../templates/config/confmodules.php:97
+#: ../templates/config/moduleSettings.php:96
+#: ../templates/config/confsave.php:81
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP アカウントマネージャ構成"
 
-#: ../templates/config/conftypes.php:79
+#: ../templates/config/conftypes.php:312
 msgid "LDAP Suffix is invalid!"
 msgstr "LDAPサフィックスが正しくありません!"
 
-#: ../templates/login.php:452
+#: ../templates/login.php:474
 msgid "LDAP error, server says:"
 msgstr "LDAP エラー、サーバからのメッセージ:"
 
-#: ../lib/modules.inc:1210
+#: ../templates/config/confmain.php:506
+msgid "LDAP filter"
+msgstr "LDAPフィルター"
+
+#: ../lib/modules.inc:1433
 msgid "LDAP operation successful."
 msgstr "LDAP操作が完了しました。"
 
-#: ../templates/selfService/adminMain.php:311
+#: ../templates/selfService/adminMain.php:370
 msgid "LDAP password"
 msgstr "LDAPパスワード"
 
-#: ../templates/selfService/adminMain.php:324 ../help/help.inc:164
+#: ../templates/config/confmain.php:474 ../templates/config/confmain.php:477
+#: ../help/help.inc:117
+msgid "LDAP search"
+msgstr "LDAP検索"
+
+#: ../templates/selfService/adminMain.php:381 ../help/help.inc:173
 msgid "LDAP search attribute"
 msgstr "LDAP検索属性"
 
-#: ../lib/lists.inc:852
+#: ../lib/account.inc:634
 msgid "LDAP search failed! Please check your preferences."
 msgstr "LDAP検索に失敗しました! プリファレンスを確認してください。"
 
-#: ../templates/login.php:336
+#: ../templates/config/confmain.php:295 ../help/help.inc:119
+msgid "LDAP search limit"
+msgstr "LDAP検索リミット"
+
+#: ../templates/login.php:314
 msgid "LDAP server"
 msgstr "LDAPサーバ"
 
-#: ../lib/lists.inc:835 ../lib/types/group.inc:238
+#: ../lib/account.inc:625
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "LDAPのサイズ制限を越えました。一部のエントリのみを表示します。"
 
-#: ../templates/selfService/adminMain.php:283
-#: ../templates/profedit/profilepage.php:184
-#: ../templates/config/conftypes.php:200 ../help/help.inc:71
-#: ../help/help.inc:160
+#: ../templates/selfService/adminMain.php:346
+#: ../templates/profedit/profilepage.php:181
+#: ../templates/config/conftypes.php:242 ../templates/config/confmain.php:497
+#: ../help/help.inc:70 ../help/help.inc:169
 msgid "LDAP suffix"
 msgstr "LDAPサフィックス"
 
@@ -2747,74 +3019,90 @@ msgstr "LDAPサフィックス"
 msgid "LDAP upload has finished"
 msgstr "LDAPアップロードが完了しました。"
 
-#: ../templates/massDoUpload.php:74
+#: ../templates/massDoUpload.php:70
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAPアップロード中です。お待ちください。"
 
-#: ../templates/selfService/adminMain.php:297
+#: ../templates/selfService/adminMain.php:358
 msgid "LDAP user"
 msgstr "LDAPユーザー"
 
-#: ../help/help.inc:162
+#: ../help/help.inc:171
 msgid "LDAP user and password"
 msgstr "LDAPユーザーとパスワード"
 
+#: ../templates/serverInfo.php:96
+msgid "LDAP version"
+msgstr "LDAPバージョン"
+
 #: ../lib/export.inc:441
 #, php-format
 msgid "LDIF Export for: %s"
 msgstr "LDIFにエクスポート: %s"
 
-#: ../templates/tests/lamdaemonTest.php:214
+#: ../lib/types/asteriskExt.inc:92
+msgid "Label"
+msgstr ""
+
+#: ../templates/tests/lamdaemonTest.php:207
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemonサーバおよびパス"
 
-#: ../templates/tests/lamdaemonTest.php:178
+#: ../templates/config/confmain.php:394
+msgid "Lamdaemon settings"
+msgstr "Lamdaemon設定"
+
+#: ../templates/tests/lamdaemonTest.php:170
 msgid "Lamdaemon successfully run."
 msgstr "Lamdaemonは正常に起動しました。"
 
-#: ../templates/tests/index.php:58 ../templates/tests/lamdaemonTest.php:55
-#: ../templates/tests/lamdaemonTest.php:76
+#: ../templates/tests/index.php:50 ../templates/tests/lamdaemonTest.php:47
+#: ../templates/tests/lamdaemonTest.php:68
 msgid "Lamdaemon test"
 msgstr "Lamdaemonテスト"
 
-#: ../templates/tests/lamdaemonTest.php:319
+#: ../templates/tests/lamdaemonTest.php:309
 msgid "Lamdaemon test finished."
 msgstr "Lamdaemonテストが完了しました。"
 
-#: ../templates/tests/lamdaemonTest.php:311
+#: ../templates/tests/lamdaemonTest.php:301
 msgid "Lamdaemon: Quota module installed"
 msgstr "Lamdaemon: クォータモジュールがインストールされました。"
 
-#: ../templates/tests/lamdaemonTest.php:314
+#: ../templates/tests/lamdaemonTest.php:297
+msgid "Lamdaemon: check NSS LDAP"
+msgstr "Lamdaemon: NSS LDAPのチェック"
+
+#: ../templates/tests/lamdaemonTest.php:304
 msgid "Lamdaemon: read quotas"
 msgstr "Lamdaemon: クオータの読み込み"
 
-#: ../templates/login.php:285
+#: ../templates/login.php:263
 msgid "Language"
 msgstr "言語"
 
-#: ../templates/config/confmain.php:513
+#: ../templates/config/confmain.php:586
 msgid "Language is not defined!"
 msgstr "言語が未定されていません!"
 
-#: ../templates/config/confmain.php:293
+#: ../templates/config/confmain.php:349
 msgid "Language settings"
 msgstr "言語の設定"
 
-#: ../lib/modules/phpGroupwareUser.inc:160
-#: ../lib/modules/phpGroupwareUser.inc:386
+#: ../lib/modules/phpGroupwareUser.inc:171
+#: ../lib/modules/phpGroupwareUser.inc:350
 msgid "Last login"
 msgstr "最終ログイン時刻"
 
-#: ../lib/modules/phpGroupwareUser.inc:168
-#: ../lib/modules/phpGroupwareUser.inc:381
+#: ../lib/modules/phpGroupwareUser.inc:179
+#: ../lib/modules/phpGroupwareUser.inc:345
 msgid "Last login from"
 msgstr "最終ログインの接続元"
 
-#: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:151
-#: ../lib/modules/inetOrgPerson.inc:202 ../lib/modules/inetOrgPerson.inc:402
-#: ../lib/modules/inetOrgPerson.inc:727 ../lib/modules/inetOrgPerson.inc:1049
-#: ../lib/modules/inetOrgPerson.inc:1351 ../lib/types/user.inc:88
+#: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:148
+#: ../lib/modules/inetOrgPerson.inc:309 ../lib/modules/inetOrgPerson.inc:575
+#: ../lib/modules/inetOrgPerson.inc:927 ../lib/modules/inetOrgPerson.inc:1224
+#: ../lib/modules/inetOrgPerson.inc:1593 ../lib/types/user.inc:97
 msgid "Last name"
 msgstr "姓"
 
@@ -2822,16 +3110,17 @@ msgstr "姓"
 msgid "Last name contains invalid characters or is empty!"
 msgstr "姓に不正な文字が含まれているか、または未入力です!"
 
-#: ../lib/modules/inetOrgPerson.inc:403
+#: ../lib/modules/inetOrgPerson.inc:576
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "ユーザの姓。アルファベット、_ - と空白のみが使用できます。"
 
-#: ../lib/modules/shadowAccount.inc:398
+#: ../lib/modules/shadowAccount.inc:416
 msgid "Last password change"
 msgstr "パスワード最終変更時刻"
 
-#: ../lib/modules/dhcp_settings.inc:133 ../lib/modules/dhcp_settings.inc:196
-#: ../lib/modules/dhcp_settings.inc:669 ../lib/modules/dhcp_settings.inc:775
+#: ../lib/modules/dhcp_settings.inc:125 ../lib/modules/dhcp_settings.inc:192
+#: ../lib/modules/dhcp_settings.inc:244 ../lib/modules/dhcp_settings.inc:557
+#: ../lib/modules/dhcp_settings.inc:669
 msgid "Lease time"
 msgstr "リース期間"
 
@@ -2839,19 +3128,19 @@ msgstr "リース期間"
 msgid "Line ends"
 msgstr "行の終わり"
 
-#: ../templates/selfService/adminMain.php:254
+#: ../templates/selfService/adminMain.php:321
 msgid "Link to login page for this self service profile"
 msgstr "このセルフサービス・プロファイルのログインページへのリンク"
 
-#: ../templates/config/conftypes.php:216 ../help/help.inc:83
+#: ../templates/config/conftypes.php:256 ../help/help.inc:82
 msgid "List attributes"
 msgstr "属性の一覧"
 
-#: ../templates/config/conftypes.php:86
+#: ../templates/config/conftypes.php:319
 msgid "List attributes are invalid!"
 msgstr "リスト属性が正しくありません!"
 
-#: ../lib/modules/sambaAccount.inc:395 ../lib/modules/sambaSamAccount.inc:264
+#: ../lib/modules/sambaSamAccount.inc:289
 msgid ""
 "List of Samba workstations the user is allowed to login. Empty means every "
 "workstation."
@@ -2859,7 +3148,7 @@ msgstr ""
 "ユーザがログインできるSambaワークステーションのリスト。未記入はすべてのワーク"
 "ステーションを意味します。"
 
-#: ../templates/config/confmain.php:507
+#: ../templates/config/confmain.php:580
 msgid "List of admin users is empty or invalid!"
 msgstr "管理者(admin users)のリストが空または正しくありません!"
 
@@ -2867,11 +3156,11 @@ msgstr "管理者(admin users)のリストが空または正しくありませ
 msgid "List of entries to be deleted:"
 msgstr "削除されるエントリ一覧:"
 
-#: ../templates/config/confmain.php:418
+#: ../templates/config/confmain.php:488
 msgid "List of valid users"
 msgstr "有効なユーザのリスト"
 
-#: ../lib/modules.inc:1166 ../help/help.inc:153
+#: ../lib/modules.inc:1382 ../help/help.inc:160
 msgid "Load profile"
 msgstr "プロファイルのロード"
 
@@ -2882,7 +3171,7 @@ msgstr "ローカルアドレス"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:69
 #: ../lib/modules/inetLocalMailRecipient.inc:102
-#: ../lib/modules/inetLocalMailRecipient.inc:316
+#: ../lib/modules/inetLocalMailRecipient.inc:317
 msgid "Local address list"
 msgstr "ローカルアドレス一覧"
 
@@ -2890,20 +3179,25 @@ msgstr "ローカルアドレス一覧"
 msgid "Local group"
 msgstr "ローカルグループ"
 
-#: ../lib/modules/inetOrgPerson.inc:156 ../lib/modules/inetOrgPerson.inc:160
-#: ../lib/modules/inetOrgPerson.inc:299 ../lib/modules/inetOrgPerson.inc:478
-#: ../lib/modules/inetOrgPerson.inc:797 ../lib/modules/inetOrgPerson.inc:1066
-#: ../lib/modules/inetOrgPerson.inc:1439
+#: ../lib/modules/inetOrgPerson.inc:153 ../lib/modules/inetOrgPerson.inc:159
+#: ../lib/modules/inetOrgPerson.inc:228 ../lib/modules/inetOrgPerson.inc:446
+#: ../lib/modules/inetOrgPerson.inc:647 ../lib/modules/inetOrgPerson.inc:982
+#: ../lib/modules/inetOrgPerson.inc:1241 ../lib/modules/inetOrgPerson.inc:1681
+#: ../lib/modules/ipHost.inc:66 ../lib/modules/ipHost.inc:84
+#: ../lib/modules/ipHost.inc:146 ../lib/modules/ipHost.inc:313
 msgid "Location"
 msgstr "住所"
 
-#: ../lib/modules/posixGroup.inc:192 ../lib/modules/posixAccount.inc:258
-#: ../lib/modules/posixAccount.inc:1034
+#: ../lib/modules/posixGroup.inc:188 ../lib/modules/posixAccount.inc:262
+#: ../lib/modules/posixAccount.inc:999
 msgid "Lock password"
 msgstr "パスワードのロック"
 
+#: ../lib/modules/ppolicy.inc:96 ../lib/modules/ppolicy.inc:150
+#: ../lib/modules/ppolicy.inc:252 ../lib/modules/ppolicy.inc:482
 #: ../lib/modules/sambaDomain.inc:126 ../lib/modules/sambaDomain.inc:203
-#: ../lib/modules/sambaDomain.inc:337 ../lib/modules/sambaDomain.inc:681
+#: ../lib/modules/sambaDomain.inc:337 ../lib/modules/sambaDomain.inc:682
+#: ../lib/types/ppolicyType.inc:83
 msgid "Lockout duration"
 msgstr "ロッカウト期間"
 
@@ -2911,8 +3205,13 @@ msgstr "ロッカウト期間"
 msgid "Lockout duration must be are natural number."
 msgstr "ロックアウト期間は自然数でなければなりません。"
 
+#: ../lib/modules/ppolicy.inc:116 ../lib/modules/ppolicy.inc:243
+#: ../lib/modules/ppolicy.inc:491 ../lib/types/ppolicyType.inc:88
+msgid "Lockout users"
+msgstr "ロッカウト・ユーザー"
+
 #: ../lib/modules/sambaDomain.inc:114 ../lib/modules/sambaDomain.inc:205
-#: ../lib/modules/sambaDomain.inc:310 ../lib/modules/sambaDomain.inc:672
+#: ../lib/modules/sambaDomain.inc:310 ../lib/modules/sambaDomain.inc:673
 msgid "Lockout users after bad logon attempts"
 msgstr "ユーザーをロックアウトするに至るログオン失敗回数"
 
@@ -2922,90 +3221,91 @@ msgstr ""
 "ユーザーをロックアウトするに至るログオン失敗回数は0から999の間でなくてはなり"
 "ません。"
 
-#: ../templates/config/mainmanage.php:282 ../help/help.inc:134
+#: ../templates/config/mainmanage.php:284 ../help/help.inc:141
 msgid "Log destination"
 msgstr "ログ出力先"
 
-#: ../templates/config/mainmanage.php:253 ../help/help.inc:132
+#: ../templates/config/mainmanage.php:259 ../help/help.inc:139
 msgid "Log level"
 msgstr "ログレベル"
 
-#: ../templates/config/mainmanage.php:247
+#: ../templates/config/mainmanage.php:253
 msgid "Logging"
 msgstr "ロギング"
 
-#: ../templates/selfService/adminMain.php:255
-#: ../templates/selfService/adminLogin.php:61
-#: ../templates/selfService/selfServiceLogin.php:135
-#: ../templates/login.php:311 ../templates/config/conflogin.php:59
-#: ../templates/config/mainlogin.php:67 ../help/help.inc:57
+#: ../templates/selfService/adminMain.php:322
+#: ../templates/selfService/adminLogin.php:64
+#: ../templates/selfService/selfServiceLogin.php:136
+#: ../templates/login.php:289 ../templates/config/conflogin.php:62
+#: ../templates/config/mainlogin.php:70 ../help/help.inc:55
 msgid "Login"
 msgstr "ログイン"
 
-#: ../templates/selfService/adminMain.php:352 ../help/help.inc:166
+#: ../templates/selfService/adminMain.php:407 ../help/help.inc:175
 msgid "Login attribute label"
 msgstr "ログイン属性ラベル"
 
-#: ../templates/selfService/adminMain.php:367 ../help/help.inc:168
+#: ../templates/selfService/adminMain.php:420 ../help/help.inc:177
 msgid "Login caption"
 msgstr "ログインの説明文"
 
-#: ../lib/modules/posixAccount.inc:244 ../lib/modules/posixAccount.inc:396
-#: ../lib/modules/posixAccount.inc:1022 ../lib/modules/posixAccount.inc:1173
-#: ../lib/modules/posixAccount.inc:1250 ../lib/types/user.inc:90
+#: ../templates/config/confmain.php:465 ../help/help.inc:115
+msgid "Login method"
+msgstr "ログイン方法"
+
+#: ../lib/modules/posixAccount.inc:248 ../lib/modules/posixAccount.inc:388
+#: ../lib/modules/posixAccount.inc:993 ../lib/modules/posixAccount.inc:1107
+#: ../lib/modules/posixAccount.inc:1184 ../lib/types/user.inc:99
 msgid "Login shell"
 msgstr "ログインシェル"
 
-#: ../templates/pdfedit/pdfpage.php:399
+#: ../templates/pdfedit/pdfpage.php:389
 msgid "Logo"
 msgstr "ロゴ"
 
 #: ../lib/modules/sambaDomain.inc:102 ../lib/modules/sambaDomain.inc:277
-#: ../lib/modules/sambaDomain.inc:659
+#: ../lib/modules/sambaDomain.inc:660
 msgid "Logon for password change"
 msgstr "パスワード変更のためにログオン"
 
-#: ../lib/modules/sambaSamAccount.inc:110
-#: ../lib/modules/sambaSamAccount.inc:288
-#: ../lib/modules/sambaSamAccount.inc:291
-#: ../lib/modules/sambaSamAccount.inc:468
-#: ../lib/modules/sambaSamAccount.inc:1159
-#: ../lib/modules/sambaSamAccount.inc:1567
+#: ../lib/modules/sambaSamAccount.inc:104
+#: ../lib/modules/sambaSamAccount.inc:313
+#: ../lib/modules/sambaSamAccount.inc:316
+#: ../lib/modules/sambaSamAccount.inc:497
+#: ../lib/modules/sambaSamAccount.inc:588
+#: ../lib/modules/sambaSamAccount.inc:1237
+#: ../lib/modules/sambaSamAccount.inc:1640
 msgid "Logon hours"
 msgstr "ログオン時間"
 
-#: ../lib/modules/sambaAccount.inc:67 ../lib/modules/sambaAccount.inc:68
-#: ../lib/modules/sambaAccount.inc:168 ../lib/modules/sambaAccount.inc:299
-#: ../lib/modules/sambaAccount.inc:391 ../lib/modules/sambaAccount.inc:794
-#: ../lib/modules/sambaAccount.inc:894 ../lib/modules/sambaSamAccount.inc:89
-#: ../lib/modules/sambaSamAccount.inc:90
-#: ../lib/modules/sambaSamAccount.inc:260
-#: ../lib/modules/sambaSamAccount.inc:442
-#: ../lib/modules/sambaSamAccount.inc:1107
-#: ../lib/modules/sambaSamAccount.inc:1533
-#: ../lib/modules/sambaSamAccount.inc:1704
+#: ../lib/modules/sambaSamAccount.inc:87 ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:285
+#: ../lib/modules/sambaSamAccount.inc:481
+#: ../lib/modules/sambaSamAccount.inc:582
+#: ../lib/modules/sambaSamAccount.inc:1181
+#: ../lib/modules/sambaSamAccount.inc:1602
+#: ../lib/modules/sambaSamAccount.inc:1770
 msgid "Logon script"
 msgstr "ログオンスクリプト"
 
-#: ../lib/modules/sambaAccount.inc:67 ../lib/modules/sambaAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:89 ../lib/modules/sambaSamAccount.inc:91
+#: ../lib/modules/sambaSamAccount.inc:87 ../lib/modules/sambaSamAccount.inc:89
 msgid "Logon script is invalid!"
 msgstr "ログオンスクリプトが正しくありません!"
 
-#: ../templates/logout.php:67 ../templates/selfService/selfServiceMain.php:43
-#: ../templates/selfService/selfServiceMain.php:273
-#: ../templates/main_header.php:69
+#: ../templates/logout.php:67 ../templates/selfService/selfServiceMain.php:45
+#: ../templates/selfService/selfServiceMain.php:127
+#: ../templates/main_header.php:70
 msgid "Logout"
 msgstr "ログアウト"
 
-#: ../lib/modules/dhcp_settings.inc:98
+#: ../lib/modules/dhcp_settings.inc:89
 msgid "M-Node (0x04)"
 msgstr ""
 
 #: ../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:82 ../lib/modules/fixed_ip.inc:389
-#: ../lib/modules/fixed_ip.inc:511
+#: ../lib/modules/fixed_ip.inc:84 ../lib/modules/fixed_ip.inc:330
+#: ../lib/modules/fixed_ip.inc:518
 msgid "MAC address"
 msgstr "MACアドレス"
 
@@ -3013,21 +3313,21 @@ msgstr "MACアドレス"
 msgid "MAC address list"
 msgstr "MACアドレス一覧"
 
-#: ../lib/modules/ieee802device.inc:197
+#: ../lib/modules/ieee802device.inc:198
 msgid "MAC address(es)"
 msgstr "MACアドレス"
 
-#: ../lib/modules/sambaSamAccount.inc:521
+#: ../lib/modules/sambaSamAccount.inc:550
 msgid "Magadan, Solomon Islands"
 msgstr ""
 
-#: ../lib/modules/nisMailAlias.inc:55 ../lib/types/mailAlias.inc:44
+#: ../lib/modules/nisMailAlias.inc:55 ../lib/types/mailAlias.inc:53
 msgid "Mail aliases"
 msgstr "電子メール エイリアス"
 
 #: ../lib/modules/kolabUser.inc:98 ../lib/modules/kolabUser.inc:171
-#: ../lib/modules/kolabUser.inc:219 ../lib/modules/kolabUser.inc:302
-#: ../lib/modules/kolabUser.inc:766
+#: ../lib/modules/kolabUser.inc:219 ../lib/modules/kolabUser.inc:300
+#: ../lib/modules/kolabUser.inc:765
 msgid "Mail quota"
 msgstr "メール・クオータ"
 
@@ -3044,18 +3344,18 @@ msgstr "メール転送"
 #: ../lib/modules/inetLocalMailRecipient.inc:79
 #: ../lib/modules/inetLocalMailRecipient.inc:108
 #: ../lib/modules/inetLocalMailRecipient.inc:150
-#: ../lib/modules/inetLocalMailRecipient.inc:319
+#: ../lib/modules/inetLocalMailRecipient.inc:320
 msgid "Mail server"
 msgstr "メールサーバ"
 
-#: ../templates/lists/changePassword.php:328
+#: ../templates/lists/changePassword.php:314
 #, php-format
 msgid "Mail successfully sent to %s."
 msgstr "%s へ正常にメールを送信しました。"
 
 #: ../lib/modules/kolabUser.inc:163 ../lib/modules/kolabUser.inc:194
-#: ../lib/modules/kolabUser.inc:290 ../lib/modules/kolabUser.inc:296
-#: ../lib/modules/kolabUser.inc:762
+#: ../lib/modules/kolabUser.inc:288 ../lib/modules/kolabUser.inc:294
+#: ../lib/modules/kolabUser.inc:761
 msgid "Mailbox home server"
 msgstr "メールボックス・ホーム・サーバ"
 
@@ -3067,7 +3367,7 @@ msgstr "メールボックス・ホーム・サーバ名が空です。"
 msgid "Mailbox home server name is invalid!"
 msgstr "メールボックス・ホーム・サーバ名が正しくありません!"
 
-#: ../lib/types/mailAlias.inc:53
+#: ../lib/types/mailAlias.inc:62
 msgid "Mailing aliases (e.g. NIS mail aliases)"
 msgstr "電子メールエイリアス(e.g. NIS mail aliases)"
 
@@ -3075,36 +3375,43 @@ msgstr "電子メールエイリアス(e.g. NIS mail aliases)"
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "この名前へのメールは受信者に転送されます。"
 
-#: ../templates/pdfedit/pdfpage.php:648
+#: ../templates/pdfedit/pdfpage.php:634
 msgid "Main"
 msgstr "メイン"
 
-#: ../templates/selfService/adminMain.php:382 ../help/help.inc:170
+#: ../templates/selfService/adminMain.php:433 ../help/help.inc:179
 msgid "Main page caption"
 msgstr "メインページの説明文"
 
-#: ../templates/pdfedit/pdfmain.php:145
+#: ../templates/pdfedit/pdfmain.php:137
 msgid "Manage existing PDF structures"
 msgstr "PDF構成の管理"
 
-#: ../templates/profedit/profilemain.php:136
+#: ../templates/profedit/profilemain.php:126
 msgid "Manage existing profiles"
 msgstr "サーバープロファイルの管理"
 
-#: ../templates/selfService/adminLogin.php:137
+#: ../templates/selfService/adminLogin.php:144
 msgid "Manage self service profiles"
 msgstr "セルフサービスプロファイルの操作"
 
-#: ../templates/config/conflogin.php:140
+#: ../templates/config/conflogin.php:148
 msgid "Manage server profiles"
 msgstr "サーバープロファイルの操作"
 
-#: ../lib/modules/inetOrgPerson.inc:227 ../lib/modules/inetOrgPerson.inc:410
-#: ../lib/modules/inetOrgPerson.inc:923 ../lib/modules/inetOrgPerson.inc:1051
+#: ../templates/serverInfo.php:93
+msgid "Managed suffixes"
+msgstr "管理対象サフィックス"
+
+#: ../lib/modules/inetOrgPerson.inc:278 ../lib/modules/inetOrgPerson.inc:342
+#: ../lib/modules/inetOrgPerson.inc:583 ../lib/modules/inetOrgPerson.inc:1145
+#: ../lib/modules/inetOrgPerson.inc:1226 ../lib/modules/ipHost.inc:70
+#: ../lib/modules/ipHost.inc:90 ../lib/modules/ipHost.inc:165
+#: ../lib/modules/ipHost.inc:316
 msgid "Manager"
 msgstr "管理者"
 
-#: ../templates/tools.php:73
+#: ../lib/tools/ouEditor.inc:53
 msgid "Manages OU objects in your LDAP tree."
 msgstr "LDAPツリーのOUオブジェクトを管理します。"
 
@@ -3116,7 +3423,24 @@ msgstr "手動"
 msgid "Manual if conflicts"
 msgstr "競合した場合は手動"
 
-#: ../lib/modules/kolabUser.inc:394 ../lib/modules/kolabUser.inc:571
+#: ../lib/modules/nisObject.inc:58 ../lib/modules/nisObject.inc:89
+#: ../lib/modules/nisObject.inc:115 ../lib/modules/nisObject.inc:141
+#: ../lib/modules/nisObject.inc:220 ../lib/types/nisObjectType.inc:78
+msgid "Mapping entry"
+msgstr "マッピング・エントリ"
+
+#: ../lib/modules/nisObject.inc:115 ../lib/modules/nisObject.inc:116
+msgid ""
+"Mapping entry contains invalid characters. Only ASCII characters are allowed."
+msgstr "マッピング・エントリに不正な文字が含まれています。ASCII文字のみが有効です。"
+
+#: ../lib/modules/nisObject.inc:62 ../lib/modules/nisObject.inc:82
+#: ../lib/modules/nisObject.inc:135 ../lib/modules/nisObject.inc:221
+#: ../lib/types/nisObjectType.inc:79
+msgid "Mapping name"
+msgstr "マッピング名"
+
+#: ../lib/modules/kolabUser.inc:392 ../lib/modules/kolabUser.inc:569
 msgid "Mark account for deletion"
 msgstr "アカウントを削除対象としてマークする"
 
@@ -3124,211 +3448,267 @@ msgstr "アカウントを削除対象としてマークする"
 msgid "Mark for deletion"
 msgstr "削除対象としてマーク"
 
-#: ../templates/selfService/profManage.php:249
-#: ../templates/config/profmanage.php:355 ../help/help.inc:126
+#: ../templates/selfService/profManage.php:251
+#: ../templates/config/profmanage.php:349 ../help/help.inc:133
 msgid "Master password"
 msgstr "マスタパスワード"
 
-#: ../templates/selfService/profManage.php:57
-#: ../templates/config/profmanage.php:69
+#: ../templates/selfService/profManage.php:68
+#: ../templates/config/profmanage.php:78
 msgid "Master password is wrong!"
 msgstr "マスタパスワードが正しくありません!"
 
-#: ../templates/config/mainmanage.php:89
+#: ../templates/config/mainmanage.php:98
 msgid "Master passwords are different or empty!"
 msgstr "マスタパスワードが異なっているか、または空です!"
 
-#: ../templates/schema/schema.php:273
+#: ../templates/schema/schema.php:266
 msgid "Matching rule OID"
 msgstr "照合規則のOID"
 
-#: ../templates/schema/schema.php:82 ../templates/schema/schema.php:83
+#: ../templates/schema/schema.php:75 ../templates/schema/schema.php:76
 msgid "Matching rules"
 msgstr "照合規則"
 
-#: ../lib/modules/posixGroup.inc:329 ../lib/modules/posixGroup.inc:501
-#: ../lib/modules/posixGroup.inc:502
+#: ../lib/modules/posixGroup.inc:300 ../lib/modules/posixGroup.inc:471
+#: ../lib/modules/posixGroup.inc:472
 msgid "Maximum GID number"
 msgstr "GID番号の最大値"
 
-#: ../lib/modules/posixGroup.inc:501
+#: ../lib/modules/posixGroup.inc:471
 msgid "Maximum GID number is invalid or empty!"
 msgstr "GID番号の最大値が不正または未入力です!"
 
-#: ../lib/modules/posixGroup.inc:502
+#: ../lib/modules/posixGroup.inc:472
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "GID番号の最大値は最小値よりも大きくなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:57 ../lib/modules/posixAccount.inc:59
-#: ../lib/modules/posixAccount.inc:60 ../lib/modules/posixAccount.inc:61
-#: ../lib/modules/posixAccount.inc:160 ../lib/modules/posixAccount.inc:169
+#: ../lib/modules/posixAccount.inc:59 ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:62 ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:164 ../lib/modules/posixAccount.inc:173
 msgid "Maximum UID number"
 msgstr "UID番号の最大値"
 
-#: ../lib/modules/posixAccount.inc:57 ../lib/modules/posixAccount.inc:59
+#: ../lib/modules/posixAccount.inc:59 ../lib/modules/posixAccount.inc:61
 msgid "Maximum UID number is invalid!"
 msgstr "UID番号の最大値が不正です!"
 
-#: ../lib/modules/posixAccount.inc:60 ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:62 ../lib/modules/posixAccount.inc:63
 msgid "Maximum UID number must be greater than minimum UID number!"
 msgstr "UID番号の最大値は最小値よりも大きくなくてはなりません!"
 
+#: ../lib/modules/ppolicy.inc:100 ../lib/modules/ppolicy.inc:151
+#: ../lib/modules/ppolicy.inc:261 ../lib/modules/ppolicy.inc:483
+#: ../lib/types/ppolicyType.inc:84
+msgid "Maximum failure count"
+msgstr "最大試行回数"
+
 #: ../templates/tree/add_attr_form.php:167
 #, php-format
 msgid "Maximum file size: %s"
 msgstr "最大ファイルサイズ: %s"
 
-#: ../lib/modules/dhcp_settings.inc:136 ../lib/modules/dhcp_settings.inc:201
-#: ../lib/modules/dhcp_settings.inc:675 ../lib/modules/dhcp_settings.inc:776
+#: ../lib/modules/dhcp_settings.inc:128 ../lib/modules/dhcp_settings.inc:197
+#: ../lib/modules/dhcp_settings.inc:250 ../lib/modules/dhcp_settings.inc:563
+#: ../lib/modules/dhcp_settings.inc:670
 msgid "Maximum lease time"
 msgstr "最長リース期間"
 
-#: ../templates/schema/schema.php:219 ../templates/tree/add_value_form.php:194
+#: ../templates/schema/schema.php:212 ../templates/tree/add_value_form.php:194
 msgid "Maximum length"
 msgstr "最大長"
 
-#: ../lib/lists.inc:873 ../help/help.inc:93
+#: ../lib/lists.inc:781 ../help/help.inc:92
 msgid "Maximum list entries"
 msgstr "リストエントリの最大数"
 
-#: ../lib/modules/shadowAccount.inc:59 ../lib/modules/shadowAccount.inc:65
-#: ../lib/modules/shadowAccount.inc:115 ../lib/modules/shadowAccount.inc:181
-#: ../lib/modules/shadowAccount.inc:211 ../lib/modules/shadowAccount.inc:310
-#: ../lib/modules/sambaDomain.inc:122 ../lib/modules/sambaDomain.inc:200
-#: ../lib/modules/sambaDomain.inc:202 ../lib/modules/sambaDomain.inc:328
-#: ../lib/modules/sambaDomain.inc:678
+#: ../lib/modules/ppolicy.inc:80 ../lib/modules/ppolicy.inc:146
+#: ../lib/modules/ppolicy.inc:147 ../lib/modules/ppolicy.inc:188
+#: ../lib/modules/ppolicy.inc:469 ../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/sambaDomain.inc:122
+#: ../lib/modules/sambaDomain.inc:200 ../lib/modules/sambaDomain.inc:202
+#: ../lib/modules/sambaDomain.inc:328 ../lib/modules/sambaDomain.inc:679
+#: ../lib/types/ppolicyType.inc:79
 msgid "Maximum password age"
 msgstr "パスワード期限(age)の最大値"
 
-#: ../lib/modules/groupOfNames.inc:72 ../lib/modules/groupOfNames.inc:76
-#: ../lib/modules/groupOfNames.inc:103 ../lib/modules/groupOfNames.inc:173
-#: ../lib/modules/groupOfNames.inc:451
+#: ../lib/modules/nisnetgroup.inc:80 ../lib/modules/nisnetgroup.inc:84
+#: ../lib/modules/nisnetgroup.inc:117 ../lib/modules/nisnetgroup.inc:250
+#: ../lib/modules/nisnetgroup.inc:571 ../lib/modules/groupOfNames.inc:72
+#: ../lib/modules/groupOfNames.inc:76 ../lib/modules/groupOfNames.inc:103
+#: ../lib/modules/groupOfNames.inc:173 ../lib/modules/groupOfNames.inc:448
+#: ../lib/types/netgroup.inc:94
 msgid "Members"
 msgstr "メンバー"
 
-#: ../lib/modules/sambaSamAccount.inc:508
+#: ../lib/modules/sambaSamAccount.inc:537
 msgid "Mid-Atlantic"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:499
+#: ../lib/modules/sambaSamAccount.inc:528
 msgid "Midway Island, Samoa"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:204
+#: ../lib/modules/inetOrgPerson.inc:311
 msgid "Miller"
 msgstr "ミラー"
 
 #: ../lib/modules/sambaDomain.inc:94 ../lib/modules/sambaDomain.inc:255
-#: ../lib/modules/sambaDomain.inc:651
+#: ../lib/modules/sambaDomain.inc:652
 msgid "Minimal password length"
 msgstr "パスワード長さの最小値"
 
-#: ../lib/modules/posixGroup.inc:326 ../lib/modules/posixGroup.inc:500
+#: ../lib/modules/posixGroup.inc:297 ../lib/modules/posixGroup.inc:470
 msgid "Minimum GID number"
 msgstr "GID番号の最小値"
 
-#: ../lib/modules/posixGroup.inc:500
+#: ../lib/modules/posixGroup.inc:470
 msgid "Minimum GID number is invalid or empty!"
 msgstr "GID番号の最小値が不正または空です!"
 
-#: ../lib/modules/posixAccount.inc:56 ../lib/modules/posixAccount.inc:58
-#: ../lib/modules/posixAccount.inc:157 ../lib/modules/posixAccount.inc:166
+#: ../lib/modules/posixAccount.inc:58 ../lib/modules/posixAccount.inc:60
+#: ../lib/modules/posixAccount.inc:161 ../lib/modules/posixAccount.inc:170
 msgid "Minimum UID number"
 msgstr "UID番号の最小値"
 
-#: ../lib/modules/posixAccount.inc:56 ../lib/modules/posixAccount.inc:58
+#: ../lib/modules/posixAccount.inc:58 ../lib/modules/posixAccount.inc:60
 msgid "Minimum UID number is invalid!"
 msgstr "UID番号の最小値が不正です!"
 
-#: ../templates/config/mainmanage.php:216
+#: ../templates/config/mainmanage.php:224
 msgid "Minimum character classes"
 msgstr "要求文字クラス"
 
-#: ../templates/config/mainmanage.php:212
+#: ../templates/config/mainmanage.php:220
 msgid "Minimum lowercase characters"
 msgstr "小文字の要求文字数"
 
-#: ../templates/config/mainmanage.php:214
+#: ../templates/config/mainmanage.php:222
 msgid "Minimum numeric characters"
 msgstr "数字の要求文字数"
 
-#: ../lib/modules/shadowAccount.inc:57 ../lib/modules/shadowAccount.inc:110
-#: ../lib/modules/shadowAccount.inc:177 ../lib/modules/shadowAccount.inc:205
-#: ../lib/modules/shadowAccount.inc:304 ../lib/modules/sambaDomain.inc:118
+#: ../lib/modules/ppolicy.inc:76 ../lib/modules/ppolicy.inc:145
+#: ../lib/modules/ppolicy.inc:179 ../lib/modules/ppolicy.inc:468
+#: ../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/sambaDomain.inc:118
 #: ../lib/modules/sambaDomain.inc:201 ../lib/modules/sambaDomain.inc:319
-#: ../lib/modules/sambaDomain.inc:675
+#: ../lib/modules/sambaDomain.inc:676 ../lib/types/ppolicyType.inc:78
 msgid "Minimum password age"
 msgstr "パスワード期限(age)の最小値"
 
-#: ../templates/config/mainmanage.php:211
+#: ../templates/config/mainmanage.php:219 ../lib/modules/ppolicy.inc:112
+#: ../lib/modules/ppolicy.inc:154 ../lib/modules/ppolicy.inc:234
+#: ../lib/modules/ppolicy.inc:486 ../lib/types/ppolicyType.inc:87
 msgid "Minimum password length"
 msgstr "パスワード長さの最小値"
 
-#: ../templates/config/mainmanage.php:215
+#: ../templates/config/mainmanage.php:223
 msgid "Minimum symbolic characters"
 msgstr "記号の要求文字数"
 
-#: ../templates/config/mainmanage.php:213
+#: ../templates/config/mainmanage.php:221
 msgid "Minimum uppercase characters"
 msgstr "大文字の要求文字数"
 
-#: ../lib/modules/inetOrgPerson.inc:81 ../lib/modules/inetOrgPerson.inc:152
-#: ../lib/modules/inetOrgPerson.inc:275 ../lib/modules/inetOrgPerson.inc:434
-#: ../lib/modules/inetOrgPerson.inc:435 ../lib/modules/inetOrgPerson.inc:849
-#: ../lib/modules/inetOrgPerson.inc:1058
+#: ../lib/modules/inetOrgPerson.inc:81 ../lib/modules/inetOrgPerson.inc:149
+#: ../lib/modules/inetOrgPerson.inc:251 ../lib/modules/inetOrgPerson.inc:406
+#: ../lib/modules/inetOrgPerson.inc:607 ../lib/modules/inetOrgPerson.inc:608
+#: ../lib/modules/inetOrgPerson.inc:1048 ../lib/modules/inetOrgPerson.inc:1233
 msgid "Mobile number"
 msgstr "携帯電話番号"
 
-#: ../lib/modules/inetOrgPerson.inc:1383
+#: ../lib/modules/inetOrgPerson.inc:1625
 msgid "Mobile telephone number"
 msgstr "携帯電話番号"
 
-#: ../templates/lists/changePassword.php:180
+#: ../templates/lists/changePassword.php:176
 msgid "Mode"
 msgstr "モード"
 
-#: ../templates/config/confmodules.php:88
-msgid "Module selection"
-msgstr "モジュール選択"
+#: ../templates/config/conftypes.php:176 ../templates/config/confmain.php:194
+#: ../templates/config/confmodules.php:161
+#: ../templates/config/moduleSettings.php:160
+msgid "Module settings"
+msgstr "モジュール設定"
 
-#: ../lib/modules/sambaSamAccount.inc:1229
+#: ../templates/config/conftypes.php:166 ../templates/config/confmain.php:184
+#: ../templates/config/confmodules.php:151
+#: ../templates/config/moduleSettings.php:150
+msgid "Modules"
+msgstr "モジュール"
+
+#: ../lib/modules/sambaSamAccount.inc:1317
 msgid "Monday"
 msgstr "月曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:503
+#: ../lib/modules/sambaSamAccount.inc:532
 msgid "Mountain Time (US & Canada)"
 msgstr ""
 
-#: ../lib/modules/quota.inc:93 ../lib/modules/quota.inc:374
-#: ../lib/modules/quota.inc:460 ../lib/modules/quota.inc:569
+#: ../lib/modules/quota.inc:97 ../lib/modules/quota.inc:385
+#: ../lib/modules/quota.inc:471 ../lib/modules/quota.inc:580
 msgid "Mountpoint"
 msgstr "マウントポイント"
 
-#: ../lib/modules/quota.inc:94
+#: ../lib/modules/quota.inc:98
 msgid "Mountpoint of device with enabled quotas."
 msgstr "quotaが有効になったデバイスのマウントポイント。"
 
-#: ../lib/modules/inetOrgPerson.inc:301
+#: ../lib/modules/eduPerson.inc:96 ../lib/modules/eduPerson.inc:108
+#: ../lib/modules/eduPerson.inc:124
+msgid "Multiple values are separated by comma."
+msgstr "複数の値はカンマによって区切られます。"
+
+#: ../lib/modules/inetOrgPerson.inc:448 ../lib/modules/ipHost.inc:86
 msgid "MyCity"
 msgstr "わたしの市"
 
-#: ../lib/modules/inetOrgPerson.inc:253
+#: ../lib/modules/inetOrgPerson.inc:376
 msgid "Mycity"
 msgstr "わたしの市"
 
-#: ../lib/modules/inetOrgPerson.inc:241
+#: ../lib/modules/inetOrgPerson.inc:360
 msgid "Mystreetname 42"
 msgstr "わたしの町42番地"
 
-#: ../templates/schema/schema.php:273
+#: ../lib/modules/nisnetgroup.inc:52
+msgid "NIS net group"
+msgstr "NIS ネット・グループ"
+
+#: ../lib/types/netgroup.inc:62
+msgid "NIS netgroup entries"
+msgstr "NIS ネットグループ・エントリ"
+
+#: ../lib/types/netgroup.inc:53
+msgid "NIS netgroups"
+msgstr "NISネットグループ"
+
+#: ../lib/modules/nisObject.inc:40
+msgid "NIS object"
+msgstr "NISオブジェクト"
+
+#: ../lib/types/nisObjectType.inc:48
+msgid "NIS object entries"
+msgstr "NISオブジェクト・エントリ"
+
+#: ../lib/types/nisObjectType.inc:39
+msgid "NIS objects"
+msgstr "NISオブジェクト"
+
+#: ../templates/schema/schema.php:266
 #: ../templates/tree/templates/creation/new_ou_template.php:59
 #: ../templates/tree/templates/creation/new_ou_template.php:104
-#: ../templates/pdfedit/pdfdelete.php:62 ../templates/pdfedit/pdfdelete.php:65
-#: ../templates/pdfedit/pdfdelete.php:90 ../lib/modules/groupOfNames.inc:138
+#: ../templates/pdfedit/pdfdelete.php:60 ../templates/pdfedit/pdfdelete.php:63
+#: ../templates/pdfedit/pdfdelete.php:88 ../lib/modules/ppolicy.inc:72
+#: ../lib/modules/ppolicy.inc:170 ../lib/modules/ppolicy.inc:467
+#: ../lib/modules/groupOfNames.inc:138 ../lib/types/ppolicyType.inc:77
 msgid "Name"
 msgstr "名前"
 
-#: ../help/help.inc:148
+#: ../help/help.inc:155
 msgid ""
 "Name under which the profile will be saved. If a profile with the same name "
 "exists, it will be overwritten."
@@ -3336,29 +3716,39 @@ msgstr ""
 "プロファイルがセーブされる名前。もしも同じ名前のプロファイルがある場合は上書"
 "きされます。"
 
-#: ../lib/modules/dhcp_settings.inc:166 ../lib/modules/dhcp_settings.inc:714
-#: ../lib/modules/dhcp_settings.inc:782
+#: ../lib/modules/dhcp_settings.inc:158 ../lib/modules/dhcp_settings.inc:608
+#: ../lib/modules/dhcp_settings.inc:676
 msgid "Net mask"
 msgstr "ネットマスク"
 
-#: ../lib/modules/dhcp_settings.inc:145 ../lib/modules/dhcp_settings.inc:216
-#: ../lib/modules/dhcp_settings.inc:693 ../lib/modules/dhcp_settings.inc:779
+#: ../lib/modules/dhcp_settings.inc:137 ../lib/modules/dhcp_settings.inc:212
+#: ../lib/modules/dhcp_settings.inc:268 ../lib/modules/dhcp_settings.inc:581
+#: ../lib/modules/dhcp_settings.inc:673
 msgid "Netbios name servers"
 msgstr "NetBIOSネーム・サーバー"
 
-#: ../lib/modules/dhcp_settings.inc:148 ../lib/modules/dhcp_settings.inc:221
-#: ../lib/modules/dhcp_settings.inc:700 ../lib/modules/dhcp_settings.inc:780
+#: ../lib/modules/dhcp_settings.inc:140 ../lib/modules/dhcp_settings.inc:217
+#: ../lib/modules/dhcp_settings.inc:274 ../lib/modules/dhcp_settings.inc:595
+#: ../lib/modules/dhcp_settings.inc:674
 msgid "Netbios node type"
 msgstr "NetBIOSノードタイプ"
 
-#: ../lib/types/dhcp.inc:114
+#: ../lib/types/dhcp.inc:125
 msgid "New DHCP"
 msgstr "新規DHCP"
 
+#: ../lib/modules/ipHost.inc:135
+msgid "New IP address"
+msgstr "新しいIPアドレス"
+
 #: ../lib/modules/ieee802device.inc:109
 msgid "New MAC address"
 msgstr "新しいMACアドレス"
 
+#: ../lib/types/nisObjectType.inc:107
+msgid "New NIS object"
+msgstr "新しいNISオブジェクト"
+
 #: ../templates/ou_edit.php:71
 msgid "New OU created successfully."
 msgstr "新しい OU が作成されました。"
@@ -3367,31 +3757,36 @@ msgstr "新しい OU が作成されました。"
 msgid "New SSH public key"
 msgstr "新しいSSH公開鍵"
 
-#: ../lib/modules/inetOrgPerson.inc:307
+#: ../lib/modules/inetOrgPerson.inc:456
 msgid "New York"
 msgstr ""
 
-#: ../lib/types/mailAlias.inc:110 ../lib/types/alias.inc:110
+#: ../lib/types/mailAlias.inc:119 ../lib/types/alias.inc:119
 msgid "New alias"
 msgstr "新しい別名"
 
-#: ../templates/config/profmanage.php:128
+#: ../templates/config/profmanage.php:137
 msgid "New default profile set successfully."
 msgstr "新しいプロファイル既定値が正しく設定されました。"
 
-#: ../lib/types/smbDomain.inc:110
+#: ../lib/types/smbDomain.inc:119
 msgid "New domain"
 msgstr "新しいドメイン"
 
-#: ../templates/pdfedit/pdfpage.php:636
+#: ../lib/types/asteriskExt.inc:120
+msgid "New extension"
+msgstr "新しい拡張"
+
+#: ../templates/pdfedit/pdfpage.php:623
 msgid "New field"
 msgstr "新しいフィールド"
 
-#: ../lib/types/group.inc:124 ../lib/types/gon.inc:112
+#: ../lib/types/group.inc:133 ../lib/types/netgroup.inc:121
+#: ../lib/types/gon.inc:121
 msgid "New group"
 msgstr "新しいグループ"
 
-#: ../lib/types/host.inc:114
+#: ../lib/types/host.inc:123
 msgid "New host"
 msgstr "新しいホスト"
 
@@ -3399,41 +3794,45 @@ msgstr "新しいホスト"
 msgid "New local address"
 msgstr "新しいローカルアドレス"
 
-#: ../templates/config/mainmanage.php:345
+#: ../templates/config/mainmanage.php:344
 msgid "New master password"
 msgstr "新しいマスタパスワード"
 
-#: ../templates/config/mainmanage.php:86
+#: ../templates/config/mainmanage.php:95
 msgid "New master password set successfully."
 msgstr "新しいマスタパスワードが正しく設定されました。"
 
-#: ../lib/lists.inc:105
+#: ../lib/lists.inc:108
 msgid "New object"
 msgstr "新しいオブジェクト"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:47
-#: ../templates/ou_edit.php:173 ../help/help.inc:187
+#: ../templates/ou_edit.php:162 ../help/help.inc:200
 msgid "New organizational unit"
 msgstr "新しい organizational unit"
 
-#: ../lib/modules/groupOfNames.inc:252
+#: ../lib/modules/groupOfNames.inc:250
 msgid "New owner"
 msgstr "新しい所有者"
 
-#: ../templates/config/confmain.php:431 ../lib/modules/posixAccount.inc:1770
+#: ../templates/config/confmain.php:517 ../lib/modules/posixAccount.inc:1706
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: ../templates/config/profmanage.php:118
+#: ../templates/config/profmanage.php:127 ../lib/modules.inc:1065
 msgid "New password set successfully."
 msgstr "新しいパスワードが正しく設定されました。"
 
-#: ../lib/modules/range.inc:89 ../lib/modules/range.inc:100
-#: ../lib/modules/range.inc:451 ../lib/modules/range.inc:452
+#: ../lib/types/ppolicyType.inc:127
+msgid "New policy"
+msgstr "新しいポリシー"
+
+#: ../lib/modules/range.inc:87 ../lib/modules/range.inc:98
+#: ../lib/modules/range.inc:438 ../lib/modules/range.inc:439
 msgid "New range"
 msgstr "新しい範囲"
 
-#: ../lib/modules/nisMailAlias.inc:152
+#: ../lib/modules/nisMailAlias.inc:153
 msgid "New recipient"
 msgstr "新しい受信者"
 
@@ -3441,11 +3840,11 @@ msgstr "新しい受信者"
 msgid "New required attributes:"
 msgstr "新しい必須属性"
 
-#: ../templates/pdfedit/pdfpage.php:553
+#: ../templates/pdfedit/pdfpage.php:542
 msgid "New section"
 msgstr "新しい部門"
 
-#: ../lib/types/user.inc:128
+#: ../lib/types/user.inc:137
 msgid "New user"
 msgstr "新しいユーザ"
 
@@ -3460,7 +3859,7 @@ msgid "Next"
 msgstr "次"
 
 #: ../lib/modules/sambaDomain.inc:78 ../lib/modules/sambaDomain.inc:158
-#: ../lib/modules/sambaDomain.inc:359 ../lib/modules/sambaDomain.inc:639
+#: ../lib/modules/sambaDomain.inc:359 ../lib/modules/sambaDomain.inc:640
 msgid "Next RID"
 msgstr "次のRID"
 
@@ -3481,7 +3880,7 @@ 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:369 ../lib/modules/sambaDomain.inc:645
+#: ../lib/modules/sambaDomain.inc:369 ../lib/modules/sambaDomain.inc:646
 msgid "Next group RID"
 msgstr "次のグループRID"
 
@@ -3490,7 +3889,7 @@ msgid "Next group RID is not a number!"
 msgstr "次のグループRIDが番号ではありあせん!"
 
 #: ../lib/modules/sambaDomain.inc:82 ../lib/modules/sambaDomain.inc:164
-#: ../lib/modules/sambaDomain.inc:364 ../lib/modules/sambaDomain.inc:642
+#: ../lib/modules/sambaDomain.inc:364 ../lib/modules/sambaDomain.inc:643
 msgid "Next user RID"
 msgstr "次のユーザRID"
 
@@ -3498,111 +3897,132 @@ msgstr "次のユーザRID"
 msgid "Next user RID is not a number!"
 msgstr "次のユーザRIDが番号ではありません!"
 
-#: ../templates/schema/schema.php:158 ../templates/schema/schema.php:200
-#: ../templates/schema/schema.php:205 ../templates/schema/schema.php:210
+#: ../lib/modules/eduPerson.inc:86 ../lib/modules/eduPerson.inc:168
+#: ../lib/modules/eduPerson.inc:307 ../lib/modules/eduPerson.inc:675
+msgid "Nick names"
+msgstr "ニックネーム"
+
+#: ../templates/schema/schema.php:151 ../templates/schema/schema.php:193
+#: ../templates/schema/schema.php:198 ../templates/schema/schema.php:203
 msgid "No"
 msgstr "いいえ"
 
-#: ../lib/types/dhcp.inc:113
+#: ../lib/types/dhcp.inc:124
 msgid "No DHCPs found!"
 msgstr "DHCPが見つかりません!"
 
+#: ../lib/types/nisObjectType.inc:106
+msgid "No NIS objects found!"
+msgstr "NISオブジェクトが見つかりません!"
+
 #: ../lib/modules/sambaGroupMapping.inc:90
-#: ../lib/modules/sambaGroupMapping.inc:217
-#: ../lib/modules/sambaGroupMapping.inc:470
-#: ../lib/modules/sambaSamAccount.inc:545
-#: ../lib/modules/sambaSamAccount.inc:622
-#: ../lib/modules/sambaSamAccount.inc:953
+#: ../lib/modules/sambaGroupMapping.inc:218
+#: ../lib/modules/sambaGroupMapping.inc:471
+#: ../lib/modules/sambaSamAccount.inc:615
+#: ../lib/modules/sambaSamAccount.inc:741
+#: ../lib/modules/sambaSamAccount.inc:1055
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "Samba 3グループがLDAPに存在しません。最初に一個作成してください。"
 
-#: ../lib/modules/posixAccount.inc:448 ../lib/modules/posixAccount.inc:651
-#: ../lib/modules/posixAccount.inc:956
+#: ../lib/modules/posixAccount.inc:440 ../lib/modules/posixAccount.inc:930
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "unixグループがLDAPに存在しません。最初に一個作成してください。"
 
-#: ../lib/types/mailAlias.inc:109 ../lib/types/alias.inc:109
+#: ../lib/types/mailAlias.inc:118 ../lib/types/alias.inc:118
 msgid "No aliases found!"
 msgstr "別名が見つかりません!"
 
-#: ../templates/initsuff.php:166
+#: ../templates/initsuff.php:163
 msgid "No changes were made."
 msgstr "変更されませんでした。"
 
-#: ../templates/schema/schema.php:149
+#: ../templates/schema/schema.php:142
 msgid "No description"
 msgstr "説明なし"
 
-#: ../lib/types/smbDomain.inc:109
+#: ../lib/types/smbDomain.inc:118
 msgid "No domains found!"
 msgstr "ドメインが見つかりません!"
 
-#: ../lib/modules/inetOrgPerson.inc:106
+#: ../lib/types/asteriskExt.inc:119
+msgid "No extension(s) found!"
+msgstr "拡張が見つかりません!"
+
+#: ../lib/modules/inetOrgPerson.inc:103
 msgid "No file selected."
 msgstr "ファイルが選択されていません。"
 
-#: ../lib/modules/posixGroup.inc:498 ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixGroup.inc:468 ../lib/modules/posixAccount.inc:69
 msgid "No free ID-Number!"
 msgstr "空いているID番号がありません!"
 
-#: ../lib/types/group.inc:123 ../lib/types/gon.inc:111
+#: ../lib/types/group.inc:132 ../lib/types/netgroup.inc:120
+#: ../lib/types/gon.inc:120
 msgid "No groups found!"
 msgstr "グループが見つかりません!"
 
-#: ../lib/types/host.inc:113
+#: ../lib/types/host.inc:122
 msgid "No hosts found!"
 msgstr "ホストが見つかりません!"
 
-#: ../templates/tree/edit.php:193
+#: ../templates/tree/edit.php:196
 msgid "No internal attributes"
 msgstr "内部属性なし"
 
-#: ../templates/tests/lamdaemonTest.php:221
+#: ../templates/tests/lamdaemonTest.php:214
 msgid "No lamdaemon path set, please update your LAM configuration settings."
 msgstr "lamdaemonのパスがセットされていません。LAM構成設定を修正してください。"
 
-#: ../templates/tests/lamdaemonTest.php:113
-#: ../templates/tests/lamdaemonTest.php:217
+#: ../templates/tests/lamdaemonTest.php:105
+#: ../templates/tests/lamdaemonTest.php:210
 msgid "No lamdaemon server set, please update your LAM configuration settings."
 msgstr "lamdaemonサーバがセットされていません。LAM構成設定を修正してください。"
 
-#: ../templates/config/mainmanage.php:301
+#: ../templates/config/mainmanage.php:300
 msgid "No logging"
 msgstr "ロギング無し"
 
-#: ../templates/pdfedit/pdfpage.php:371
+#: ../templates/pdfedit/pdfpage.php:366
 msgid "No logo"
 msgstr "ロゴがありません"
 
-#: ../lib/lists.inc:104
+#: ../lib/lists.inc:107
 msgid "No objects found!"
 msgstr "オブジェクトが見つかりません!"
 
-#: ../templates/config/confmodules.php:268
+#: ../templates/config/confmodules.php:374
 msgid "No or more than one base module selected!"
 msgstr "ベースモジュールが選択されていないか、または複数が選択されています!"
 
-#: ../templates/config/confmain.php:52
+#: ../templates/config/confmain.php:54 ../templates/config/confsave.php:53
 msgid "No password was entered!"
 msgstr "パスワードが入力されていません!"
 
-#: ../templates/tests/schemaTest.php:80
+#: ../lib/types/ppolicyType.inc:126
+msgid "No policies found!"
+msgstr "ポリシーが見つかりません!"
+
+#: ../templates/tests/schemaTest.php:69
 msgid "No problems found."
 msgstr "問題は発見されませんでした。"
 
-#: ../templates/pdfedit/pdfpage.php:126
+#: ../lib/modules/customScripts.inc:152
+msgid "No scripts to run."
+msgstr "実行するスクリプトがありません。"
+
+#: ../templates/pdfedit/pdfpage.php:121
 msgid "No section text specified"
 msgstr "セクションテキストが指定されていません!"
 
-#: ../templates/config/conflogin.php:95
+#: ../templates/config/conflogin.php:105
 msgid "No server profiles found. Please create one."
 msgstr "サーバープロファイルがありません。作成してください。"
 
-#: ../templates/pdfedit/pdfpage.php:114
+#: ../templates/pdfedit/pdfpage.php:109
 msgid "No static text specified"
 msgstr "静的テキストが指定されていません!"
 
-#: ../lib/modules/dhcp_settings.inc:237
+#: ../lib/modules/dhcp_settings.inc:300
 msgid "No subnet entered."
 msgstr "サブネットが未入力です。"
 
@@ -3610,16 +4030,16 @@ msgstr "サブネットが未入力です。"
 msgid "No such entry!"
 msgstr "そのようなエントリはありません!"
 
-#: ../templates/schema/schema.php:442
+#: ../templates/schema/schema.php:435
 #, php-format
 msgid "No such schema item: \"%s\""
 msgstr "そのようなスキーマアイテムはありません: \"%s\""
 
-#: ../lib/types/user.inc:127
+#: ../lib/types/user.inc:136
 msgid "No users found!"
 msgstr "ユーザが見つかりません!"
 
-#: ../help/help.inc:68
+#: ../help/help.inc:67
 msgid "Note"
 msgstr "注"
 
@@ -3631,20 +4051,20 @@ msgstr ""
 "注意: この属性に対するあなたのLDAPサーバ上における比較ルールをセットしない場"
 "合、\"inappropriate matching\"エラーを受け取るでしょう。"
 
-#: ../templates/config/mainmanage.php:256
+#: ../templates/config/mainmanage.php:262
 msgid "Notice"
 msgstr "注"
 
-#: ../templates/delete.php:98
+#: ../templates/delete.php:94
 msgid "Number of child entries"
 msgstr "子エントリの数"
 
-#: ../lib/modules/shadowAccount.inc:174
+#: ../lib/modules/shadowAccount.inc:178
 msgid ""
 "Number of days a user can login even his password has expired. -1=always."
 msgstr "パスワードが期限切れになってもユーザがログインできる日数。-1は無期限。"
 
-#: ../lib/modules/shadowAccount.inc:178
+#: ../lib/modules/shadowAccount.inc:182
 msgid ""
 "Number of days a user has to wait until he is allowed to change his password "
 "again. If set value must be >0."
@@ -3652,7 +4072,7 @@ msgstr ""
 "パスワードの再変更が許可されるまでの日数。設定するならば0より大きな値にするこ"
 "と。"
 
-#: ../lib/modules/shadowAccount.inc:182
+#: ../lib/modules/shadowAccount.inc:186
 msgid ""
 "Number of days after a user has to change his password again. If set value "
 "must be >0."
@@ -3664,16 +4084,16 @@ msgstr ""
 msgid "Number of minutes after which the bad logon attempts are reset."
 msgstr "ログオン試行の失敗がリセットされるまでの時間(分単位)"
 
-#: ../lib/modules/sambaDomain.inc:119
+#: ../lib/modules/ppolicy.inc:77 ../lib/modules/sambaDomain.inc:119
 msgid ""
 "Number of seconds after the user is allowed to change his password again."
 msgstr "パスワードを再変更できるようになるまでの秒数。"
 
-#: ../lib/modules/sambaDomain.inc:123
+#: ../lib/modules/ppolicy.inc:81 ../lib/modules/sambaDomain.inc:123
 msgid "Number of seconds after which the user must change his password."
 msgstr "ユーザがパスワード変更を強制されるまでの秒数。"
 
-#: ../templates/schema/schema.php:152 ../templates/schema/schema.php:349
+#: ../templates/schema/schema.php:145 ../templates/schema/schema.php:342
 msgid "OID"
 msgstr ""
 
@@ -3685,8 +4105,8 @@ msgstr "OU はすでに存在しています!"
 msgid "OU deleted successfully."
 msgstr "OU は正しく削除されました。"
 
-#: ../templates/ou_edit.php:155 ../templates/ou_edit.php:169
-#: ../templates/tools.php:72
+#: ../templates/ou_edit.php:144 ../templates/ou_edit.php:158
+#: ../lib/tools/ouEditor.inc:44
 msgid "OU editor"
 msgstr "OUエディタ"
 
@@ -3698,55 +4118,51 @@ msgstr "OU が正しくありません!"
 msgid "OU is not empty or invalid!"
 msgstr "OU が空白でないか不正!"
 
-#: ../help/help.inc:187 ../help/help.inc:189
+#: ../help/help.inc:200 ../help/help.inc:202
 msgid "OU-Editor"
 msgstr "OUエディタ"
 
-#: ../templates/schema/schema.php:70 ../templates/schema/schema.php:71
+#: ../templates/schema/schema.php:63 ../templates/schema/schema.php:64
 #: ../templates/tree/templates/creation/custom.php:70
 msgid "Object classes"
 msgstr "オブジェクトクラス"
 
-#: ../templates/schema/schema.php:157 ../templates/schema/schema.php:288
+#: ../templates/schema/schema.php:150 ../templates/schema/schema.php:281
 msgid "Obsolete"
 msgstr ""
 
 #: ../lib/modules/sambaDomain.inc:279 ../lib/modules/sambaDomain.inc:290
-#: ../lib/modules/sambaDomain.inc:301 ../lib/modules/sambaDomain.inc:657
-#: ../lib/modules/sambaDomain.inc:662 ../lib/modules/sambaDomain.inc:667
+#: ../lib/modules/sambaDomain.inc:301 ../lib/modules/sambaDomain.inc:658
+#: ../lib/modules/sambaDomain.inc:663 ../lib/modules/sambaDomain.inc:668
 msgid "Off"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:156 ../lib/modules/inetOrgPerson.inc:317
-#: ../lib/modules/inetOrgPerson.inc:490 ../lib/modules/inetOrgPerson.inc:818
-#: ../lib/modules/inetOrgPerson.inc:1068 ../lib/modules/inetOrgPerson.inc:1463
+#: ../lib/modules/inetOrgPerson.inc:153 ../lib/modules/inetOrgPerson.inc:238
+#: ../lib/modules/inetOrgPerson.inc:470 ../lib/modules/inetOrgPerson.inc:659
+#: ../lib/modules/inetOrgPerson.inc:1009 ../lib/modules/inetOrgPerson.inc:1243
+#: ../lib/modules/inetOrgPerson.inc:1705
 msgid "Office name"
 msgstr "事業所名"
 
 #: ../templates/tree/export_form.php:165
-#: ../templates/selfService/profManage.php:254
-#: ../templates/selfService/adminMain.php:470
-#: ../templates/selfService/adminMain.php:504
-#: ../templates/selfService/adminMain.php:544
-#: ../templates/selfService/adminLogin.php:122
-#: ../templates/selfService/adminLogin.php:123
-#: ../templates/selfService/selfServiceLogin.php:209
-#: ../templates/tests/lamdaemonTest.php:108 ../templates/masscreate.php:112
-#: ../templates/ou_edit.php:180 ../templates/ou_edit.php:196
-#: ../templates/profedit/profiledelete.php:85
-#: ../templates/config/conftypes.php:238 ../templates/config/conflogin.php:125
-#: ../templates/config/conflogin.php:126
-#: ../templates/config/mainmanage.php:374 ../templates/config/confmain.php:454
-#: ../templates/config/profmanage.php:360
-#: ../templates/config/confmodules.php:110
-#: ../templates/config/confmodules.php:113
-#: ../templates/config/mainlogin.php:118 ../lib/modules/inetOrgPerson.inc:995
-#: ../lib/modules/groupOfNames.inc:230 ../lib/modules/groupOfNames.inc:257
-#: ../lib/modules/groupOfNames.inc:344 ../lib/modules/posixGroup.inc:288
-#: ../lib/modules/posixAccount.inc:1136
-#: ../lib/modules/sambaSamAccount.inc:1276
-#: ../lib/modules/sambaSamAccount.inc:1447 ../lib/modules/aliasEntry.inc:146
-#: ../lib/modules/aliasEntry.inc:172 ../lib/lists.inc:666 ../lib/lists.inc:897
+#: ../templates/selfService/profManage.php:256
+#: ../templates/selfService/adminMain.php:542
+#: ../templates/selfService/adminMain.php:574
+#: ../templates/selfService/adminLogin.php:132
+#: ../templates/selfService/adminLogin.php:133
+#: ../templates/selfService/selfServiceLogin.php:226
+#: ../templates/tests/lamdaemonTest.php:100 ../templates/masscreate.php:190
+#: ../templates/ou_edit.php:169 ../templates/ou_edit.php:185
+#: ../templates/profedit/profiledelete.php:83
+#: ../templates/config/conflogin.php:135 ../templates/config/conflogin.php:136
+#: ../templates/config/mainmanage.php:371
+#: ../templates/config/profmanage.php:354
+#: ../templates/config/mainlogin.php:135 ../lib/modules.inc:1288
+#: ../lib/modules/nisnetgroup.inc:450 ../lib/modules/nisnetgroup.inc:466
+#: ../lib/modules/groupOfNames.inc:234 ../lib/modules/groupOfNames.inc:255
+#: ../lib/modules/groupOfNames.inc:340 ../lib/modules/sambaSamAccount.inc:1364
+#: ../lib/modules/sambaSamAccount.inc:1525 ../lib/modules/aliasEntry.inc:146
+#: ../lib/modules/aliasEntry.inc:166 ../lib/lists.inc:588 ../lib/lists.inc:804
 msgid "Ok"
 msgstr ""
 
@@ -3755,14 +4171,14 @@ msgid "Old value"
 msgstr "古い値"
 
 #: ../lib/modules/sambaDomain.inc:279 ../lib/modules/sambaDomain.inc:290
-#: ../lib/modules/sambaDomain.inc:301 ../lib/modules/sambaDomain.inc:658
-#: ../lib/modules/sambaDomain.inc:663 ../lib/modules/sambaDomain.inc:668
+#: ../lib/modules/sambaDomain.inc:301 ../lib/modules/sambaDomain.inc:659
+#: ../lib/modules/sambaDomain.inc:664 ../lib/modules/sambaDomain.inc:669
 msgid "On"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:333
-#: ../lib/modules/sambaSamAccount.inc:1432
-#: ../lib/modules/sambaSamAccount.inc:1773
+#: ../lib/modules/sambaSamAccount.inc:358
+#: ../lib/modules/sambaSamAccount.inc:1510
+#: ../lib/modules/sambaSamAccount.inc:1839
 msgid "On broken or timed out connection"
 msgstr "破棄された、またはタイムアウトした接続"
 
@@ -3770,12 +4186,12 @@ msgstr "破棄された、またはタイムアウトした接続"
 msgid "One (one level beneath base)"
 msgstr "One (ベース直下の1階層)"
 
-#: ../lib/modules/range.inc:99 ../lib/modules/fixed_ip.inc:100
+#: ../lib/modules/range.inc:97 ../lib/modules/fixed_ip.inc:96
 msgid "One or more errors occured. The invalid fields are marked."
 msgstr ""
 "1件以上のエラーが発生しました。不正なフィールドには目印が付いています。"
 
-#: ../templates/schema/schema.php:389
+#: ../templates/schema/schema.php:382
 #: ../templates/tree/templates/creation/custom.php:209
 msgid "Optional attributes"
 msgstr "任意属性"
@@ -3784,97 +4200,121 @@ msgstr "任意属性"
 msgid "Optional binary attributes"
 msgstr "任意バイナリ属性"
 
-#: ../templates/lists/changePassword.php:132
+#: ../templates/lists/changePassword.php:128
+#: ../lib/modules/asteriskExtension.inc:106
 msgid "Options"
 msgstr "オプション"
 
-#: ../templates/schema/schema.php:176
+#: ../templates/schema/schema.php:169
 msgid "Ordering"
 msgstr "並べ替え"
 
+#: ../lib/modules/eduPerson.inc:111 ../lib/modules/eduPerson.inc:180
+#: ../lib/modules/eduPerson.inc:212 ../lib/modules/eduPerson.inc:351
+#: ../lib/modules/eduPerson.inc:686
+msgid "Organization"
+msgstr "組織"
+
 #: ../templates/tree/templates/templates.inc:46
 msgid "Organizational unit"
 msgstr ""
 
-#: ../templates/config/confmain.php:395
+#: ../lib/modules/eduPerson.inc:119 ../lib/modules/eduPerson.inc:123
+#: ../lib/modules/eduPerson.inc:192 ../lib/modules/eduPerson.inc:379
+#: ../lib/modules/eduPerson.inc:692
+msgid "Organizational units"
+msgstr ""
+
+#: ../lib/modules/eduPerson.inc:216
+msgid "Organizational units contains an invalid entry."
+msgstr "Organizational unitsに不正な値が含まれています。"
+
+#: ../templates/config/confmain.php:445
 msgid "Other"
 msgstr "その他"
 
-#: ../templates/config/confmain.php:387 ../lib/modules/groupOfNames.inc:68
+#: ../lib/modules/customScripts.inc:392
+#, php-format
+msgid "Output of command \"%s\" with return code %s"
+msgstr ""
+
+#: ../templates/config/confmain.php:437 ../lib/modules/groupOfNames.inc:68
 #: ../lib/modules/groupOfNames.inc:97 ../lib/modules/groupOfNames.inc:149
-#: ../lib/modules/groupOfNames.inc:167 ../lib/modules/groupOfNames.inc:447
-#: ../lib/types/gon.inc:85
+#: ../lib/modules/groupOfNames.inc:167 ../lib/modules/groupOfNames.inc:444
+#: ../lib/types/gon.inc:94
 msgid "Owner"
 msgstr "所有者"
 
-#: ../lib/modules/dhcp_settings.inc:97
+#: ../lib/modules/dhcp_settings.inc:88
 msgid "P-Node (0x02)"
 msgstr ""
 
-#: ../lib/modules/fixed_ip.inc:79 ../lib/modules/fixed_ip.inc:375
-#: ../lib/modules/fixed_ip.inc:511
+#: ../lib/modules/fixed_ip.inc:81 ../lib/modules/fixed_ip.inc:326
+#: ../lib/modules/fixed_ip.inc:518
 msgid "PC name"
 msgstr "PCの名前"
 
-#: ../templates/pdfedit/pdfmain.php:118 ../templates/tools.php:80
+#: ../templates/pdfedit/pdfmain.php:110 ../lib/tools/pdfEdit.inc:44
 msgid "PDF editor"
 msgstr "PDFエディタ"
 
-#: ../lib/lists.inc:638
+#: ../lib/lists.inc:560
 msgid "PDF structure"
 msgstr "PDF構成"
 
-#: ../templates/pdfedit/pdfpage.php:100
+#: ../templates/pdfedit/pdfpage.php:95
 msgid "PDF structure was successfully saved."
 msgstr "PDF構成を保存しました。"
 
-#: ../templates/pdfedit/pdfpage.php:95
+#: ../templates/pdfedit/pdfpage.php:90
 msgid "PDF-structure name not valid"
 msgstr "PDF構成名が正しくありません"
 
-#: ../lib/modules/sambaSamAccount.inc:502
+#: ../lib/modules/sambaSamAccount.inc:531
 msgid "Pacific Time (US & Canada)"
 msgstr ""
 
-#: ../lib/modules/dhcp_settings.inc:143
+#: ../lib/modules/dhcp_settings.inc:135
 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."
-msgstr "受信側が同じネットワークに無い場合は、パケットはデフォルトゲートウェイに送られます。デフォルトゲートウェイは、これらのパケットを宛先のネットワークに転送します。"
+msgstr ""
+"受信側が同じネットワークに無い場合は、パケットはデフォルトゲートウェイに送ら"
+"れます。デフォルトゲートウェイは、これらのパケットを宛先のネットワークに転送"
+"します。"
 
-#: ../templates/schema/schema.php:371
+#: ../templates/selfService/adminMain.php:446 ../help/help.inc:185
+msgid "Page header"
+msgstr "ページヘッダ"
+
+#: ../templates/schema/schema.php:364
 msgid "Parent to"
 msgstr "派生先"
 
-#: ../templates/selfService/selfServiceLogin.php:195
-#: ../templates/lists/changePassword.php:204 ../templates/login.php:275
-#: ../lib/modules/inetOrgPerson.inc:103 ../lib/modules/inetOrgPerson.inc:104
-#: ../lib/modules/inetOrgPerson.inc:458 ../lib/modules/inetOrgPerson.inc:755
-#: ../lib/modules/inetOrgPerson.inc:766 ../lib/modules/inetOrgPerson.inc:986
-#: ../lib/modules/sambaAccount.inc:74 ../lib/modules/sambaAccount.inc:75
-#: ../lib/modules/sambaAccount.inc:229 ../lib/modules/posixGroup.inc:187
-#: ../lib/modules/posixGroup.inc:199 ../lib/modules/posixGroup.inc:279
-#: ../lib/modules/posixGroup.inc:494 ../lib/modules/posixGroup.inc:495
-#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:73
-#: ../lib/modules/posixAccount.inc:136 ../lib/modules/posixAccount.inc:252
-#: ../lib/modules/posixAccount.inc:388 ../lib/modules/posixAccount.inc:1029
-#: ../lib/modules/posixAccount.inc:1040 ../lib/modules/posixAccount.inc:1121
-#: ../lib/modules/posixAccount.inc:1253 ../lib/modules/sambaSamAccount.inc:94
-#: ../lib/modules/sambaSamAccount.inc:95
-#: ../lib/modules/sambaSamAccount.inc:365
+#: ../templates/selfService/selfServiceLogin.php:212
+#: ../templates/lists/changePassword.php:198 ../templates/login.php:253
+#: ../lib/modules.inc:1262 ../lib/modules/posixGroup.inc:195
+#: ../lib/modules/posixGroup.inc:465 ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:140
+#: ../lib/modules/posixAccount.inc:256 ../lib/modules/posixAccount.inc:380
+#: ../lib/modules/posixAccount.inc:1005 ../lib/modules/asteriskAccount.inc:89
+#: ../lib/modules/asteriskAccount.inc:140
+#: ../lib/modules/sambaSamAccount.inc:396 ../help/help.inc:164
 msgid "Password"
 msgstr "パスワード"
 
-#: ../lib/modules/sambaSamAccount.inc:243
-#: ../lib/modules/sambaSamAccount.inc:1020
+#: ../lib/modules/sambaSamAccount.inc:268
+#: ../lib/modules/sambaSamAccount.inc:1109
 msgid "Password change at next login"
 msgstr "次回のログインでパスワードを変更"
 
-#: ../lib/modules/inetOrgPerson.inc:104 ../lib/modules/inetOrgPerson.inc:105
-#: ../lib/modules/sambaAccount.inc:75 ../lib/modules/sambaAccount.inc:76
-#: ../lib/modules/posixGroup.inc:495 ../lib/modules/posixAccount.inc:73
-#: ../lib/modules/posixAccount.inc:74 ../lib/modules/sambaSamAccount.inc:95
-#: ../lib/modules/sambaSamAccount.inc:96
+#: ../lib/modules/ppolicy.inc:128 ../lib/modules/ppolicy.inc:297
+#: ../lib/modules/ppolicy.inc:506 ../lib/types/ppolicyType.inc:91
+msgid "Password change requires old password"
+msgstr "パスワード変更には古いパスワードが必要です"
+
+#: ../lib/modules/posixGroup.inc:465 ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:76 ../lib/modules/sambaSamAccount.inc:92
 msgid ""
 "Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and #*,.;:_-+!%&/|?{[()]}=@$ !"
@@ -3882,19 +4322,17 @@ msgstr ""
 "パスワードに不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, #*,.;:_-"
 "+!$%&/|?{[()]}=@$ です!"
 
-#: ../lib/modules/sambaAccount.inc:136 ../lib/modules/sambaAccount.inc:251
-#: ../lib/modules/sambaAccount.inc:365 ../lib/modules/sambaAccount.inc:368
-#: ../lib/modules/sambaAccount.inc:759 ../lib/modules/sambaSamAccount.inc:228
-#: ../lib/modules/sambaSamAccount.inc:231
-#: ../lib/modules/sambaSamAccount.inc:387
-#: ../lib/modules/sambaSamAccount.inc:1003
-#: ../lib/modules/sambaSamAccount.inc:1486
+#: ../lib/modules/sambaSamAccount.inc:253
+#: ../lib/modules/sambaSamAccount.inc:256
+#: ../lib/modules/sambaSamAccount.inc:418
+#: ../lib/modules/sambaSamAccount.inc:1092
+#: ../lib/modules/sambaSamAccount.inc:1558
 msgid "Password does not expire"
 msgstr "無期限のパスワード"
 
-#: ../lib/modules/shadowAccount.inc:61 ../lib/modules/shadowAccount.inc:105
-#: ../lib/modules/shadowAccount.inc:173 ../lib/modules/shadowAccount.inc:199
-#: ../lib/modules/shadowAccount.inc:298 ../lib/modules/shadowAccount.inc:401
+#: ../lib/modules/shadowAccount.inc:61 ../lib/modules/shadowAccount.inc:109
+#: ../lib/modules/shadowAccount.inc:177 ../lib/modules/shadowAccount.inc:207
+#: ../lib/modules/shadowAccount.inc:309 ../lib/modules/shadowAccount.inc:419
 msgid "Password expiration"
 msgstr "パスワード有効期限"
 
@@ -3902,39 +4340,59 @@ msgstr "パスワード有効期限"
 msgid "Password expiration must be are natural number or -1."
 msgstr "パスワード有効期限は自然数または-1でなければなりません。"
 
-#: ../lib/modules/posixGroup.inc:432 ../lib/modules/posixGroup.inc:455
-#: ../lib/modules/posixAccount.inc:140 ../lib/modules/posixAccount.inc:175
-#: ../lib/modules/posixAccount.inc:343
+#: ../lib/modules/inetOrgPerson.inc:290 ../lib/modules/inetOrgPerson.inc:671
+#: ../lib/modules/posixGroup.inc:403 ../lib/modules/posixGroup.inc:426
+#: ../lib/modules/posixAccount.inc:144 ../lib/modules/posixAccount.inc:179
+#: ../lib/modules/posixAccount.inc:335
 msgid "Password hash type"
 msgstr "パスワードハッシュ形式"
 
+#: ../lib/modules/ppolicy.inc:84 ../lib/modules/ppolicy.inc:148
+#: ../lib/modules/ppolicy.inc:215 ../lib/modules/ppolicy.inc:470
 #: ../lib/modules/sambaDomain.inc:98 ../lib/modules/sambaDomain.inc:266
-#: ../lib/modules/sambaDomain.inc:654
+#: ../lib/modules/sambaDomain.inc:655 ../lib/types/ppolicyType.inc:80
 msgid "Password history length"
 msgstr "パスワード履歴の長さ"
 
-#: ../lib/modules/shadowAccount.inc:59 ../lib/modules/shadowAccount.inc:60
-#: ../lib/modules/sambaDomain.inc:202
+#: ../lib/modules/ppolicy.inc:146 ../lib/modules/shadowAccount.inc:59
+#: ../lib/modules/shadowAccount.inc:60 ../lib/modules/sambaDomain.inc:202
 msgid "Password maximum age must be are natural number."
 msgstr "パスワード寿命の最大値は自然数でなければなりません。"
 
-#: ../lib/modules/shadowAccount.inc:65 ../lib/modules/shadowAccount.inc:66
-#: ../lib/modules/sambaDomain.inc:200
+#: ../lib/modules/ppolicy.inc:147 ../lib/modules/shadowAccount.inc:65
+#: ../lib/modules/shadowAccount.inc:66 ../lib/modules/sambaDomain.inc:200
 msgid "Password maximum age must be bigger as password minimum age."
 msgstr "パスワード寿命の最大値は最小値より大きくなければなりません。"
 
-#: ../lib/modules/shadowAccount.inc:57 ../lib/modules/shadowAccount.inc:58
-#: ../lib/modules/sambaDomain.inc:201
+#: ../lib/modules/ppolicy.inc:145 ../lib/modules/shadowAccount.inc:57
+#: ../lib/modules/shadowAccount.inc:58 ../lib/modules/sambaDomain.inc:201
 msgid "Password minimum age must be are natural number."
 msgstr "パスワード寿命の最小値は自然数でなければなりません。"
 
-#: ../templates/config/mainmanage.php:206 ../help/help.inc:138
+#: ../lib/types/ppolicyType.inc:39
+msgid "Password policies"
+msgstr "パスワードポリシー"
+
+#: ../lib/types/ppolicyType.inc:48
+msgid "Password policies (ppolicy)"
+msgstr "パスワードポリシー"
+
+#: ../templates/config/mainmanage.php:214 ../lib/modules/ppolicy.inc:54
+#: ../lib/modules/ppolicyUser.inc:38 ../lib/modules/ppolicyUser.inc:48
+#: ../lib/modules/ppolicyUser.inc:55 ../lib/modules/ppolicyUser.inc:95
+#: ../lib/modules/ppolicyUser.inc:161 ../lib/modules/ppolicyUser.inc:188
+#: ../help/help.inc:145
 msgid "Password policy"
 msgstr "パスワードポリシー"
 
-#: ../lib/modules/shadowAccount.inc:63 ../lib/modules/shadowAccount.inc:100
-#: ../lib/modules/shadowAccount.inc:169 ../lib/modules/shadowAccount.inc:193
-#: ../lib/modules/shadowAccount.inc:292 ../lib/modules/shadowAccount.inc:399
+#: ../lib/modules/ppolicy.inc:88 ../lib/modules/ppolicy.inc:224
+#: ../lib/modules/ppolicy.inc:480 ../lib/types/ppolicyType.inc:81
+msgid "Password quality check"
+msgstr "パスワード強度チェック"
+
+#: ../lib/modules/shadowAccount.inc:63 ../lib/modules/shadowAccount.inc:104
+#: ../lib/modules/shadowAccount.inc:173 ../lib/modules/shadowAccount.inc:201
+#: ../lib/modules/shadowAccount.inc:303 ../lib/modules/shadowAccount.inc:417
 msgid "Password warning"
 msgstr "パスワード警告"
 
@@ -3942,15 +4400,21 @@ msgstr "パスワード警告"
 msgid "Password warning must be are natural number."
 msgstr "パスワード警告期限は自然数でなければなりません。"
 
-#: ../templates/config/confmain.php:540
+#: ../templates/config/confmain.php:613 ../lib/modules.inc:1324
 msgid "Passwords are different!"
 msgstr "パスワードが異なっています!"
 
-#: ../lib/modules/sambaSamAccount.inc:307
+#: ../lib/modules/nisObject.inc:54 ../lib/modules/nisObject.inc:74
+#: ../lib/modules/nisObject.inc:113 ../lib/modules/nisObject.inc:129
+#: ../lib/modules/nisObject.inc:219 ../lib/types/nisObjectType.inc:77
+msgid "Path"
+msgstr "パス"
+
+#: ../lib/modules/sambaSamAccount.inc:332
 msgid "Path of the user profile."
 msgstr "ユーザープロファイルのパス。"
 
-#: ../lib/modules/sambaAccount.inc:389 ../lib/modules/sambaSamAccount.inc:258
+#: ../lib/modules/sambaSamAccount.inc:283
 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."
@@ -3958,11 +4422,11 @@ msgstr ""
 "ユーザプロファイルのパス。ローカル絶対パス、または、UNCパス(\\\\サーバ\\共"
 "有)。 $use と $group はユーザとグループ名に置き換えられます。"
 
-#: ../templates/config/confmain.php:353
+#: ../templates/config/confmain.php:405
 msgid "Path to external script"
 msgstr "外部スクリプトのパス"
 
-#: ../lib/modules/ddns.inc:90 ../lib/modules/ddns.inc:302
+#: ../lib/modules/ddns.inc:92 ../lib/modules/ddns.inc:353
 msgid "Path to key for DNS updates"
 msgstr "DNS更新キーのパス"
 
@@ -3970,18 +4434,18 @@ msgstr "DNS更新キーのパス"
 msgid "Permanently delete all children, too?"
 msgstr "全ての下位ツリーも削除しますか?"
 
-#: ../lib/modules/inetOrgPerson.inc:125
+#: ../lib/modules/inetOrgPerson.inc:122
 msgid "Personal"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:154 ../lib/modules/inetOrgPerson.inc:939
-#: ../lib/modules/inetOrgPerson.inc:1475 ../lib/modules/inetOrgPerson.inc:1478
-#: ../lib/modules/inetOrgPerson.inc:1492 ../lib/types/user.inc:93
-#: ../lib/types/user.inc:209
+#: ../lib/modules/inetOrgPerson.inc:151 ../lib/modules/inetOrgPerson.inc:1162
+#: ../lib/modules/inetOrgPerson.inc:1725 ../lib/modules/inetOrgPerson.inc:1728
+#: ../lib/modules/inetOrgPerson.inc:1742 ../lib/types/user.inc:102
+#: ../lib/types/user.inc:219
 msgid "Photo"
 msgstr "写真"
 
-#: ../lib/modules/inetOrgPerson.inc:1026
+#: ../lib/modules/inetOrgPerson.inc:1201
 msgid "Photo file (JPG format)"
 msgstr "写真ファイル(JPGフォーマット)"
 
@@ -3989,19 +4453,31 @@ msgstr "写真ファイル(JPGフォーマット)"
 msgid "Please a comma separated list of your public SSH keys."
 msgstr "カンマで区切られたSSH公開鍵のリストを入力してください!"
 
-#: ../templates/delete.php:86
+#: ../lib/modules/asteriskExtension.inc:202
+msgid "Please add at least one member."
+msgstr "一つ以上のメンバーを追加してください。"
+
+#: ../lib/modules/sambaSamAccount.inc:1049
+msgid "Please check your settings on the Unix page!"
+msgstr "Unixページの設定を確認してください!"
+
+#: ../templates/delete.php:82
 msgid "Please confirm:"
 msgstr "確認してください:"
 
-#: ../lib/modules/phpGroupwareUser.inc:124
+#: ../lib/modules/phpGroupwareUser.inc:135
 msgid "Please enter \"active\" or \"inactive\"."
 msgstr "\"active\"または\"inactive\"を入力してください!"
 
-#: ../lib/modules/sambaSamAccount.inc:97
+#: ../lib/modules/sambaSamAccount.inc:93
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "特殊アカウントのRID番号または名前を入力してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:455
+#: ../lib/modules/asteriskAccount.inc:152
+msgid "Please enter a caller ID."
+msgstr "発信者番号を入力してください。"
+
+#: ../lib/modules/inetOrgPerson.inc:628
 msgid ""
 "Please enter a comma separated list of host names where this user is allowed "
 "to log in. If you enable host restrictions for your servers then \"*\" means "
@@ -4011,43 +4487,76 @@ msgstr ""
 "トを入力して下さい。サーバー制限が有効な場合、\"*\"は全てのホストを意味し、空"
 "欄はホスト無しを意味します。"
 
-#: ../lib/modules/sambaAccount.inc:70 ../lib/modules/sambaAccount.inc:71
-#: ../lib/modules/sambaSamAccount.inc:92 ../lib/modules/sambaSamAccount.inc:93
+#: ../lib/modules/sambaSamAccount.inc:90 ../lib/modules/sambaSamAccount.inc:91
 msgid "Please enter a comma separated list of host names!"
 msgstr "カンマで区切られたホスト名を入力してください!"
 
+#: ../lib/modules/asteriskExtension.inc:195
+msgid "Please enter a common name."
+msgstr "名称を入力してください!"
+
 #: ../lib/modules/groupOfNames.inc:120
 msgid "Please enter a group name!"
 msgstr "グループ名を入力してください!"
 
-#: ../lib/modules/kolabUser.inc:264 ../lib/modules/kolabUser.inc:269
-#, php-format
-msgid "Please enter a user password on this page: %s"
-msgstr "このページに対するパスワードを入力してください: %s"
+#: ../lib/modules/ppolicy.inc:153
+msgid "Please enter a numeric value for the expire warning."
+msgstr "期限切れ警告の数値を入力してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:107 ../lib/modules/inetOrgPerson.inc:108
+#: ../lib/modules/ppolicy.inc:152
+msgid "Please enter a numeric value for the failure count interval."
+msgstr "試行回数インターバルの数値を入力してください。"
+
+#: ../lib/modules/ppolicy.inc:149
+msgid "Please enter a numeric value for the grace authentication limit."
+msgstr "猶予認証リミットの数値を入力してください。"
+
+#: ../lib/modules/ppolicy.inc:150
+msgid "Please enter a numeric value for the lockout duration."
+msgstr "ロックアウト期間の数値を入力してください。"
+
+#: ../lib/modules/ppolicy.inc:151
+msgid "Please enter a numeric value for the maximum failure count."
+msgstr "最大試行回数の数値を入力してください。"
+
+#: ../lib/modules/ppolicy.inc:154
+msgid "Please enter a numeric value for the minimum password length."
+msgstr "最短パスワード長の数値を入力してください。"
+
+#: ../lib/modules/ppolicy.inc:148
+msgid "Please enter a numeric value for the password history length."
+msgstr "パスワード履歴長の数値を入力してください。"
+
+#: ../lib/modules/ppolicy.inc:73
+msgid "Please enter a unique name for this password policy."
+msgstr "このパスワード・ポリシーに他と重複しない名前を入力してください。"
+
+#: ../lib/modules/kolabUser.inc:264 ../lib/modules/kolabUser.inc:268
+msgid "Please enter a user password."
+msgstr "ユーザー・パスワードを入力してください。"
+
+#: ../lib/modules/eduPerson.inc:212 ../lib/modules/eduPerson.inc:214
+msgid "Please enter a valid DN in the field:"
+msgstr "このフィールドに正しいDNを入力してください:"
+
+#: ../lib/modules/inetOrgPerson.inc:104 ../lib/modules/inetOrgPerson.inc:105
 msgid "Please enter a valid business category!"
 msgstr "正しい業種を入力してください!"
 
 #: ../lib/modules/inetOrgPerson.inc:97 ../lib/modules/inetOrgPerson.inc:98
-#: ../lib/modules/posixAccount.inc:92 ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/posixAccount.inc:94 ../lib/modules/posixAccount.inc:95
 msgid "Please enter a valid common name!"
-msgstr "正しい氏名を入力してください!"
+msgstr "正しい名称を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:83 ../lib/modules/sambaAccount.inc:84
-#: ../lib/modules/sambaSamAccount.inc:105
-#: ../lib/modules/sambaSamAccount.inc:106
-#: ../lib/modules/sambaSamAccount.inc:107
+#: ../lib/modules/sambaSamAccount.inc:101
 msgid "Please enter a valid date in format DD-MM-YYYY."
 msgstr "正しい日付をDD-MM-YYYYの形式で入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:77 ../lib/modules/sambaAccount.inc:78
-#: ../lib/modules/sambaSamAccount.inc:99
-#: ../lib/modules/sambaSamAccount.inc:100
+#: ../lib/modules/sambaSamAccount.inc:95 ../lib/modules/sambaSamAccount.inc:96
 msgid "Please enter a valid display name!"
 msgstr "正しい表示名(display name)を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:85 ../lib/modules/sambaSamAccount.inc:108
+#: ../lib/modules/sambaSamAccount.inc:102
 msgid "Please enter a valid drive letter."
 msgstr "正しいドライブ文字を入力してください!"
 
@@ -4063,11 +4572,7 @@ msgstr "正しい雇用形態を入力してください!"
 msgid "Please enter a valid fax number!"
 msgstr "正しいファクス番号を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:86
-msgid "Please enter a valid group RID."
-msgstr "正しいグループRIDを入力してください!"
-
-#: ../lib/modules/sambaSamAccount.inc:112
+#: ../lib/modules/sambaSamAccount.inc:106
 msgid "Please enter a valid group name!"
 msgstr "正しいグループ名を入力してください!"
 
@@ -4075,10 +4580,18 @@ msgstr "正しいグループ名を入力してください!"
 msgid "Please enter a valid job title!"
 msgstr "正しい役職を入力してください!"
 
+#: ../lib/modules/eduPerson.inc:220
+msgid "Please enter a valid list of affiliations."
+msgstr "正しい所属リストを入力してください。"
+
 #: ../lib/modules/inetOrgPerson.inc:81 ../lib/modules/inetOrgPerson.inc:82
 msgid "Please enter a valid mobile number!"
 msgstr "正しい携帯電話番号を入力してください!"
 
+#: ../lib/modules/nisObject.inc:113 ../lib/modules/nisObject.inc:114
+msgid "Please enter a valid path."
+msgstr "正しいパスを入力してください。"
+
 #: ../lib/modules/inetOrgPerson.inc:89 ../lib/modules/inetOrgPerson.inc:90
 msgid "Please enter a valid postal address!"
 msgstr "正しい住所を入力してください!"
@@ -4087,9 +4600,13 @@ msgstr "正しい住所を入力してください!"
 msgid "Please enter a valid postal code!"
 msgstr "正しい郵便番号を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:87
-msgid "Please enter a valid special user name."
-msgstr "正しい特殊ユーザ名(special user name)を入力してください!"
+#: ../lib/modules/eduPerson.inc:218
+msgid "Please enter a valid primary affiliation."
+msgstr "正しい主務所属を入力してください。"
+
+#: ../lib/modules/eduPerson.inc:219
+msgid "Please enter a valid scoped affiliation."
+msgstr "正しい兼務所属を入力してください。"
 
 #: ../lib/modules/inetOrgPerson.inc:87 ../lib/modules/inetOrgPerson.inc:88
 msgid "Please enter a valid street name!"
@@ -4100,25 +4617,40 @@ msgstr "正しい町名(street name)を入力してください!"
 msgid "Please enter a valid telephone number!"
 msgstr "正しい電話番号を入力してください!"
 
-#: ../lib/modules/posixGroup.inc:602 ../lib/modules/posixAccount.inc:764
+#: ../lib/modules/posixGroup.inc:572 ../lib/modules/posixAccount.inc:777
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "%s と %s の間の値を入力してください!"
 
-#: ../lib/modules/kolabUser.inc:274
+#: ../lib/modules/kolabUser.inc:272
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "このページに対するメールアドレスを入力してください。: %s"
 
-#: ../lib/modules/ddns.inc:95
+#: ../lib/modules/ddns.inc:97
 msgid "Please enter the IP address of your DNS server."
 msgstr "DNSサーバーのIPアドレスを入力してください。"
 
-#: ../lib/modules.inc:1088
+#: ../help/help.inc:118
+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\" はログインページのユーザー名に置き換えられます。"
+
+#: ../lib/modules.inc:1174
 msgid "Please enter the account information on the other pages first."
 msgstr "最初に、他のページでアカウント情報を入力してください。"
 
-#: ../help/help.inc:58
+#: ../lib/modules/asteriskExtension.inc:197
+msgid "Please enter the application data."
+msgstr "アプリケーション・データを入力してください。"
+
+#: ../lib/modules/asteriskExtension.inc:196
+msgid "Please enter the application."
+msgstr "アプリケーションを入力してください。"
+
+#: ../help/help.inc:56
 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 "
@@ -4128,7 +4660,41 @@ msgstr ""
 "ルに記録されます。もしもこれが最初のログインならば、\"lam\" と入力してくださ"
 "い。"
 
-#: ../help/help.inc:127
+#: ../lib/modules/asteriskExtension.inc:198
+#: ../lib/modules/asteriskAccount.inc:156
+msgid "Please enter the extension context."
+msgstr "拡張コンテキストを入力してください。"
+
+#: ../lib/modules/asteriskExtension.inc:199
+msgid "Please enter the extension name."
+msgstr "拡張名を入力してください。"
+
+#: ../lib/modules/asteriskAccount.inc:159
+msgid "Please enter the host name."
+msgstr "ホスト名を入力してください。"
+
+#: ../lib/modules/customScripts.inc:53
+msgid ""
+"Please enter the list of scripts which should be run. Each line has the "
+"following format: [account type] [action] [script and arguments]"
+msgstr "実行するスクリプトのリストを入力してください。各々の行は以下のフォーマットで記入してください: [account type] [action] [script and arguments]"
+
+#: ../lib/modules/customScripts.inc:66
+msgid ""
+"Please enter the list of scripts which should be run. Each line has the "
+"following format: [action] [script and arguments]"
+msgstr "実行するスクリプトのリストを入力してください。各々の行は以下のフォーマットで記入してください: [action] [script and arguments]<"
+
+#: ../lib/modules/nisObject.inc:59
+msgid ""
+"Please enter the mapping entry (e.g. \"-fstype=nfs,rw server:/projects\")."
+msgstr "マッピング・エントリを入力してください(例 \"-fstype=nfs,rw server:/projects\")。"
+
+#: ../lib/modules/nisObject.inc:63
+msgid "Please enter the mapping name for this entry (e.g. auto.home)."
+msgstr "このエントリに対するマッピング名を入力してください(例 auto.home)。"
+
+#: ../help/help.inc:134
 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 "
@@ -4138,12 +4704,16 @@ msgstr ""
 "これはconfig.cfgファイルに保存されます。もしもこれが最初のログインならば、 "
 "\"lam\" と入力してください。"
 
-#: ../templates/config/mainlogin.php:98
+#: ../templates/config/mainlogin.php:115
 msgid "Please enter the master password to change the general preferences:"
 msgstr ""
 "総合プリファレンスを変更するためのマスターパスワードを入力してください:"
 
-#: ../help/help.inc:115
+#: ../lib/modules/nisObject.inc:55
+msgid "Please enter the mount point for this entry (e.g. /home)."
+msgstr "このエントリに対するマウントポイントを入力してください(例 /home)。"
+
+#: ../help/help.inc:122
 msgid ""
 "Please enter the name of the new profile and the password to change its "
 "settings. Profile names may contain letters, numbers and -/_."
@@ -4151,7 +4721,7 @@ msgstr ""
 "その設定を変更するための新しいプロファイル名とパスワードを入力。プロファイル"
 "名にはアルファベット、数字と -/_ が使用できます。"
 
-#: ../help/help.inc:117
+#: ../help/help.inc:124
 msgid ""
 "Please enter the new name of the profile. The name may contain letters, "
 "numbers and -/_."
@@ -4159,15 +4729,26 @@ msgstr ""
 "新しいプロファイル名を入力。名前にはアルファベット、数字と -/_ が使用できま"
 "す。"
 
-#: ../lib/modules/inetOrgPerson.inc:459 ../lib/modules/posixAccount.inc:389
+#: ../lib/modules/posixAccount.inc:381 ../lib/modules/asteriskAccount.inc:90
 msgid "Please enter the password which you want to set for this account."
 msgstr "このアカウントに対するパスワードを入力してください。"
 
-#: ../lib/modules/posixAccount.inc:360
+#: ../help/help.inc:165
+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 "
+"your screen."
+msgstr "このアカウントに対するパスワードを入力してください。ランダムなパスワード(12文字)を生成して画面に表示すること模できます。"
+
+#: ../lib/modules/posixAccount.inc:352
 msgid "Please enter the path to the user's home directory."
 msgstr "ユーザのホームディレクトリを入力してください。"
 
-#: ../lib/modules/quota.inc:142
+#: ../lib/modules/asteriskExtension.inc:200
+msgid "Please enter the priority."
+msgstr "優先度を入力してください。"
+
+#: ../lib/modules/quota.inc:146
 msgid ""
 "Please enter the quota settings for this mount point. The syntax is: {soft "
 "block limit},{hard block limit},{soft inode limit},{hard inode limit}"
@@ -4175,21 +4756,16 @@ msgstr ""
 "このマウントポイントに対するクォータ設定を入力してください。書式は {soft "
 "block limit},{hard block limit},{soft inode limit},{hard inode limit} です。"
 
-#: ../lib/modules/inetOrgPerson.inc:103 ../lib/modules/posixAccount.inc:72
+#: ../templates/lists/changePassword.php:254
+#: ../lib/modules/posixAccount.inc:74
 msgid "Please enter the same password in both password fields."
 msgstr "両方のパスワードフィールドに同じパスワードを入力してください。"
 
-#: ../templates/lists/changePassword.php:268
-#: ../lib/modules/sambaAccount.inc:74 ../lib/modules/posixGroup.inc:494
-#: ../lib/modules/sambaSamAccount.inc:94
-msgid "Please enter the same password in both password-fields."
-msgstr "2つのパスワードフィールドに同じパスワードを入力してください。"
-
-#: ../lib/modules/sambaSamAccount.inc:319
+#: ../lib/modules/sambaSamAccount.inc:344
 msgid "Please enter the time limit in minutes. 0 means unlimited."
 msgstr "制限時間を分単位で入力してください。0は無制限を意味します。"
 
-#: ../templates/selfService/adminLogin.php:97
+#: ../templates/selfService/adminLogin.php:107
 msgid ""
 "Please enter your master configuration password to change the self service "
 "profile:"
@@ -4197,7 +4773,7 @@ msgstr ""
 "セルフサービスプロファイルを変更するためのマスター構成パスワードを入力してく"
 "ださい:"
 
-#: ../templates/config/conflogin.php:90
+#: ../templates/config/conflogin.php:100
 msgid "Please enter your password to change the server preferences:"
 msgstr "サーバープリファレンスを変更するためのパスワードを入力してください:"
 
@@ -4205,15 +4781,15 @@ msgstr "サーバープリファレンスを変更するためのパスワード
 msgid "Please enter your public SSH key."
 msgstr "SSH公開鍵を入力してください。"
 
-#: ../lib/modules/range.inc:395 ../lib/modules/fixed_ip.inc:341
+#: ../lib/modules/range.inc:382 ../lib/modules/fixed_ip.inc:320
 msgid "Please fill out the DHCP settings first."
 msgstr "最初にDHCP設定を記入してください。"
 
-#: ../templates/tests/lamdaemonTest.php:268
+#: ../templates/tests/lamdaemonTest.php:261
 msgid "Please install the SSH2 module for PHP and activate it in your php.ini!"
 msgstr "PHPのSSH2モジュールをインストールし、php.iniで有効化してください。"
 
-#: ../templates/masscreate.php:130
+#: ../templates/masscreate.php:208
 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 "
@@ -4223,18 +4799,18 @@ msgstr ""
 "子が記入されていなくてはなりません。後に続く行は、各々の行が一つのアカウント"
 "になります。"
 
-#: ../lib/modules/inetOrgPerson.inc:463
+#: ../templates/massBuildAccounts.php:211
+msgid "Please provide a file to upload."
+msgstr "アップロードするファイルを指定してください。"
+
+#: ../lib/modules/inetOrgPerson.inc:632
 msgid ""
 "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr ""
 "アップロードする画像ファイルを選択してください。画像はJPGフォーマット\n"
 "(.jpg/.jpeg)でなくてはなりません。"
 
-#: ../templates/masscreate.php:97
-msgid "Please select your account type:"
-msgstr "アカウントタイプを選択してください:"
-
-#: ../help/help.inc:133
+#: ../help/help.inc:140
 msgid ""
 "Please select your prefered log level. Messages with a lower level will not "
 "be logged."
@@ -4242,157 +4818,190 @@ msgstr ""
 "希望するログレベルを選択してください。下のレベルではメッセージは記録されませ"
 "ん。"
 
-#: ../templates/login.php:248
+#: ../templates/login.php:223
 msgid "Please select your user name and enter your password to log in."
 msgstr "ユーザ名を選択し、パスワードを入力してログインしてください。"
 
-#: ../lib/modules.inc:1043
+#: ../lib/modules.inc:1129
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "ページ %s の必須属性を全て設定してください。"
 
-#: ../templates/selfService/profManage.php:114
-#: ../templates/config/profmanage.php:145
+#: ../templates/selfService/profManage.php:125
+#: ../templates/config/profmanage.php:154
 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
+msgid ""
+"Please set your LDAP suffix to an LDAP entry with object class \"dhcpServer"
+"\"."
+msgstr "\"dhcpServer\"オブジェクトクラスのLDAPエントリに対するLDAPサフィックスを設定してください。"
+
 #: ../lib/modules/kolabUser.inc:236
 msgid "Policy list has invalid format!"
 msgstr "ポリシーリストの形式が不正です!"
 
-#: ../templates/pdfedit/pdfpage.php:568 ../templates/pdfedit/pdfpage.php:585
-#: ../templates/pdfedit/pdfpage.php:615 ../templates/pdfedit/pdfpage.php:658
+#: ../templates/pdfedit/pdfpage.php:557 ../templates/pdfedit/pdfpage.php:574
+#: ../templates/pdfedit/pdfpage.php:602 ../templates/pdfedit/pdfpage.php:645
 msgid "Position"
 msgstr "位置"
 
-#: ../templates/masscreate.php:179 ../templates/masscreate.php:321
-#: ../lib/modules/sambaGroupMapping.inc:439
+#: ../templates/masscreate.php:256 ../templates/masscreate.php:400
+#: ../lib/modules/sambaGroupMapping.inc:440
+#: ../lib/modules/customScripts.inc:102 ../lib/modules/customScripts.inc:104
+#: ../lib/modules/customScripts.inc:106
 msgid "Possible values"
 msgstr "候補となる値"
 
-#: ../lib/modules/inetOrgPerson.inc:154 ../lib/modules/inetOrgPerson.inc:257
-#: ../lib/modules/inetOrgPerson.inc:418 ../lib/modules/inetOrgPerson.inc:419
-#: ../lib/modules/inetOrgPerson.inc:783 ../lib/modules/inetOrgPerson.inc:1053
-#: ../lib/modules/inetOrgPerson.inc:1423
+#: ../lib/modules/inetOrgPerson.inc:151 ../lib/modules/inetOrgPerson.inc:221
+#: ../lib/modules/inetOrgPerson.inc:382 ../lib/modules/inetOrgPerson.inc:591
+#: ../lib/modules/inetOrgPerson.inc:592 ../lib/modules/inetOrgPerson.inc:964
+#: ../lib/modules/inetOrgPerson.inc:1228 ../lib/modules/inetOrgPerson.inc:1665
 msgid "Post office box"
 msgstr "私書箱"
 
-#: ../lib/modules/inetOrgPerson.inc:89 ../lib/modules/inetOrgPerson.inc:153
-#: ../lib/modules/inetOrgPerson.inc:251 ../lib/modules/inetOrgPerson.inc:426
-#: ../lib/modules/inetOrgPerson.inc:811 ../lib/modules/inetOrgPerson.inc:1055
-#: ../lib/modules/inetOrgPerson.inc:1407
+#: ../lib/modules/inetOrgPerson.inc:89 ../lib/modules/inetOrgPerson.inc:150
+#: ../lib/modules/inetOrgPerson.inc:235 ../lib/modules/inetOrgPerson.inc:374
+#: ../lib/modules/inetOrgPerson.inc:599 ../lib/modules/inetOrgPerson.inc:1000
+#: ../lib/modules/inetOrgPerson.inc:1230 ../lib/modules/inetOrgPerson.inc:1649
 msgid "Postal address"
 msgstr "住所"
 
-#: ../lib/modules/inetOrgPerson.inc:427
+#: ../lib/modules/inetOrgPerson.inc:600
 msgid "Postal address, city"
 msgstr "住所、区市町村"
 
-#: ../lib/modules/inetOrgPerson.inc:91 ../lib/modules/inetOrgPerson.inc:154
-#: ../lib/modules/inetOrgPerson.inc:245 ../lib/modules/inetOrgPerson.inc:422
-#: ../lib/modules/inetOrgPerson.inc:423 ../lib/modules/inetOrgPerson.inc:790
-#: ../lib/modules/inetOrgPerson.inc:1054 ../lib/modules/inetOrgPerson.inc:1415
+#: ../lib/modules/inetOrgPerson.inc:91 ../lib/modules/inetOrgPerson.inc:151
+#: ../lib/modules/inetOrgPerson.inc:225 ../lib/modules/inetOrgPerson.inc:366
+#: ../lib/modules/inetOrgPerson.inc:595 ../lib/modules/inetOrgPerson.inc:596
+#: ../lib/modules/inetOrgPerson.inc:973 ../lib/modules/inetOrgPerson.inc:1229
+#: ../lib/modules/inetOrgPerson.inc:1657
 msgid "Postal code"
 msgstr "郵便番号"
 
-#: ../help/help.inc:87
+#: ../help/help.inc:86
 msgid "Predefined values"
 msgstr "あらかじめ定義された値"
 
-#: ../lib/modules/inetOrgPerson.inc:217
+#: ../lib/modules/inetOrgPerson.inc:328
 msgid "President"
 msgstr "社長"
 
-#: ../lib/modules/posixGroup.inc:509 ../lib/modules/posixAccount.inc:217
-#: ../lib/modules/posixAccount.inc:291 ../lib/modules/posixAccount.inc:351
-#: ../lib/modules/posixAccount.inc:380 ../lib/modules/posixAccount.inc:418
-#: ../lib/modules/posixAccount.inc:991 ../lib/modules/posixAccount.inc:1157
-#: ../lib/modules/posixAccount.inc:1197 ../lib/modules/posixAccount.inc:1247
+#: ../lib/modules/eduPerson.inc:78 ../lib/modules/eduPerson.inc:148
+#: ../lib/modules/eduPerson.inc:247 ../lib/modules/eduPerson.inc:665
+msgid "Primary affiliation"
+msgstr "主たる所属"
+
+#: ../lib/modules/posixGroup.inc:479 ../lib/modules/posixAccount.inc:221
+#: ../lib/modules/posixAccount.inc:295 ../lib/modules/posixAccount.inc:343
+#: ../lib/modules/posixAccount.inc:372 ../lib/modules/posixAccount.inc:410
+#: ../lib/modules/posixAccount.inc:960 ../lib/modules/posixAccount.inc:1091
+#: ../lib/modules/posixAccount.inc:1131 ../lib/modules/posixAccount.inc:1181
 msgid "Primary group"
 msgstr "プライマリグループ"
 
-#: ../lib/modules/inetOrgPerson.inc:467
+#: ../lib/modules/eduPerson.inc:115 ../lib/modules/eduPerson.inc:186
+#: ../lib/modules/eduPerson.inc:214 ../lib/modules/eduPerson.inc:361
+#: ../lib/modules/eduPerson.inc:689
+msgid "Primary organizational unit"
+msgstr "主たるorganizational unit"
+
+#: ../lib/modules/eduPerson.inc:99 ../lib/modules/eduPerson.inc:141
+#: ../lib/modules/eduPerson.inc:237 ../lib/modules/eduPerson.inc:671
+msgid "Principal name"
+msgstr "プリンシパル名"
+
+#: ../lib/modules/eduPerson.inc:210 ../lib/modules/eduPerson.inc:211
+msgid "Principal name is invalid!"
+msgstr "プリンシパル名が正しくありません!"
+
+#: ../lib/modules/asteriskExtension.inc:90
+#: ../lib/modules/asteriskExtension.inc:117
+#: ../lib/modules/asteriskExtension.inc:146
+#: ../lib/modules/asteriskExtension.inc:226
+#: ../lib/modules/asteriskExtension.inc:466 ../lib/types/asteriskExt.inc:93
+msgid "Priority"
+msgstr "優先度"
+
+#: ../lib/modules/inetOrgPerson.inc:636
 msgid "Private telephone number"
 msgstr "私用の電話番号"
 
-#: ../templates/selfService/profManage.php:97
-#: ../templates/config/profmanage.php:107
+#: ../templates/selfService/profManage.php:108
+#: ../templates/config/profmanage.php:116
 msgid "Profile deleted."
 msgstr "プロファイルが削除されました。"
 
-#: ../templates/profedit/profilemain.php:108 ../templates/tools.php:56
+#: ../templates/profedit/profilemain.php:98 ../lib/tools/profileEditor.inc:44
 msgid "Profile editor"
 msgstr "プロファイルエディタ"
 
-#: ../templates/selfService/profManage.php:36
-#: ../templates/selfService/profManage.php:127
-#: ../templates/config/profmanage.php:50
-#: ../templates/config/profmanage.php:158 ../help/help.inc:114
-#: ../help/help.inc:116 ../help/help.inc:118 ../help/help.inc:120
-#: ../help/help.inc:122
+#: ../templates/selfService/profManage.php:38
+#: ../templates/selfService/profManage.php:138
+#: ../templates/config/profmanage.php:52
+#: ../templates/config/profmanage.php:167 ../help/help.inc:121
+#: ../help/help.inc:123 ../help/help.inc:125 ../help/help.inc:127
+#: ../help/help.inc:129
 msgid "Profile management"
 msgstr "プロファイル管理"
 
-#: ../templates/selfService/profManage.php:142
-#: ../templates/selfService/profManage.php:193
-#: ../templates/profedit/profilepage.php:251
-#: ../templates/config/profmanage.php:173
-#: ../templates/config/profmanage.php:225 ../help/help.inc:147
+#: ../templates/selfService/profManage.php:153
+#: ../templates/selfService/profManage.php:201
+#: ../templates/profedit/profilepage.php:247
+#: ../templates/config/profmanage.php:182
+#: ../templates/config/profmanage.php:231 ../help/help.inc:154
 msgid "Profile name"
 msgstr "プロファイル名"
 
-#: ../templates/selfService/profManage.php:73
-#: ../templates/selfService/profManage.php:88
-#: ../templates/config/profmanage.php:91
-#: ../templates/config/profmanage.php:102
+#: ../templates/selfService/profManage.php:84
+#: ../templates/selfService/profManage.php:99
+#: ../templates/config/profmanage.php:100
+#: ../templates/config/profmanage.php:111
 msgid "Profile name is invalid!"
 msgstr "プロファイル名が正しくありません!"
 
-#: ../templates/config/profmanage.php:189
+#: ../templates/config/profmanage.php:195
 #: ../templates/config/profmanage.php:289
 msgid "Profile password"
 msgstr "プロファイルパスワード"
 
-#: ../templates/config/profmanage.php:89
-#: ../templates/config/profmanage.php:120
+#: ../templates/config/profmanage.php:98
+#: ../templates/config/profmanage.php:129
 msgid "Profile passwords are different or empty!"
 msgstr "プロファイルパスワードが異なるか、または未入力です!"
 
-#: ../lib/modules/sambaAccount.inc:64 ../lib/modules/sambaAccount.inc:65
-#: ../lib/modules/sambaAccount.inc:162 ../lib/modules/sambaAccount.inc:293
-#: ../lib/modules/sambaAccount.inc:388 ../lib/modules/sambaAccount.inc:791
-#: ../lib/modules/sambaAccount.inc:895 ../lib/modules/sambaSamAccount.inc:86
-#: ../lib/modules/sambaSamAccount.inc:87
-#: ../lib/modules/sambaSamAccount.inc:257
-#: ../lib/modules/sambaSamAccount.inc:306
-#: ../lib/modules/sambaSamAccount.inc:436
-#: ../lib/modules/sambaSamAccount.inc:1099
-#: ../lib/modules/sambaSamAccount.inc:1366
-#: ../lib/modules/sambaSamAccount.inc:1527
-#: ../lib/modules/sambaSamAccount.inc:1707
-#: ../lib/modules/sambaSamAccount.inc:1729
+#: ../lib/modules/sambaSamAccount.inc:84 ../lib/modules/sambaSamAccount.inc:85
+#: ../lib/modules/sambaSamAccount.inc:282
+#: ../lib/modules/sambaSamAccount.inc:331
+#: ../lib/modules/sambaSamAccount.inc:473
+#: ../lib/modules/sambaSamAccount.inc:578
+#: ../lib/modules/sambaSamAccount.inc:1171
+#: ../lib/modules/sambaSamAccount.inc:1444
+#: ../lib/modules/sambaSamAccount.inc:1594
+#: ../lib/modules/sambaSamAccount.inc:1773
+#: ../lib/modules/sambaSamAccount.inc:1795
 msgid "Profile path"
 msgstr "プロファイルパス"
 
-#: ../lib/modules/sambaAccount.inc:64 ../lib/modules/sambaSamAccount.inc:86
-#: ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:84 ../lib/modules/sambaSamAccount.inc:86
 msgid "Profile path is invalid!"
 msgstr "プロファイルパスが正しくありません!"
 
-#: ../templates/profedit/profilepage.php:125
+#: ../templates/profedit/profilepage.php:122
 msgid "Profile was saved."
 msgstr "プロファイルがセーブされました。"
 
-#: ../lib/modules/quota.inc:75 ../lib/modules/quota.inc:141
+#: ../lib/modules/quota.inc:77 ../lib/modules/quota.inc:145
 msgid "Quota"
 msgstr ""
 
-#: ../lib/modules/quota.inc:626
+#: ../lib/modules/quota.inc:638
 #, php-format
 msgid "Quota for %s on %s"
 msgstr "%s の %s におけるQuota"
 
-#: ../lib/modules/quota.inc:58
+#: ../lib/modules/quota.inc:60
 msgid "Quota has wrong format!"
 msgstr "quotaの形式が正しくありません!"
 
@@ -4400,38 +5009,38 @@ msgstr "quotaの形式が正しくありません!"
 msgid "RDN"
 msgstr ""
 
-#: ../templates/masscreate.php:171 ../templates/profedit/profilepage.php:204
-#: ../lib/modules.inc:1330 ../help/help.inc:145
+#: ../templates/masscreate.php:249 ../templates/profedit/profilepage.php:201
+#: ../lib/modules.inc:1548 ../help/help.inc:152
 msgid "RDN identifier"
 msgstr "RDN識別子"
 
-#: ../lib/types/host.inc:84
+#: ../lib/types/host.inc:93
 msgid "RID (Windows UID)"
 msgstr "RID (Windows UID)"
 
 #: ../lib/modules/sambaDomain.inc:90 ../lib/modules/sambaDomain.inc:151
 #: ../lib/modules/sambaDomain.inc:376 ../lib/modules/sambaDomain.inc:382
-#: ../lib/modules/sambaDomain.inc:648
+#: ../lib/modules/sambaDomain.inc:649
 msgid "RID base"
 msgstr ""
 
-#: ../lib/modules/range.inc:80 ../lib/modules/range.inc:420
+#: ../lib/modules/range.inc:78 ../lib/modules/range.inc:407
 msgid "Range from"
 msgstr "範囲の始点"
 
-#: ../lib/modules/range.inc:83 ../lib/modules/range.inc:434
+#: ../lib/modules/range.inc:81 ../lib/modules/range.inc:421
 msgid "Range to"
 msgstr "範囲の終点"
 
-#: ../lib/modules/range.inc:64 ../lib/modules/range.inc:487
+#: ../lib/modules/range.inc:60 ../lib/modules/range.inc:474
 msgid "Ranges"
 msgstr "範囲"
 
-#: ../templates/config/confmain.php:384
+#: ../templates/config/confmain.php:434
 msgid "Read"
 msgstr "読み込み"
 
-#: ../templates/config/confmain.php:216 ../templates/config/confmain.php:219
+#: ../templates/config/confmain.php:332 ../templates/config/confmain.php:335
 msgid "Read only"
 msgstr "読み込み専用"
 
@@ -4439,22 +5048,22 @@ msgstr "読み込み専用"
 msgid "Really create this new OU?"
 msgstr "このOUを新規作成しますか?"
 
-#: ../templates/tree/edit.php:527
+#: ../templates/tree/edit.php:530
 msgid "Really delete attribute?"
 msgstr "この属性を削除しますか?"
 
-#: ../lib/modules/nisMailAlias.inc:71 ../lib/modules/nisMailAlias.inc:145
+#: ../lib/modules/nisMailAlias.inc:71 ../lib/modules/nisMailAlias.inc:146
 msgid "Recipient"
 msgstr "受信者"
 
 #: ../lib/modules/nisMailAlias.inc:75 ../lib/modules/nisMailAlias.inc:89
-#: ../lib/modules/nisMailAlias.inc:279 ../lib/types/mailAlias.inc:83
+#: ../lib/modules/nisMailAlias.inc:281 ../lib/types/mailAlias.inc:92
 msgid "Recipient list"
 msgstr "受信者リスト"
 
-#: ../lib/modules/sambaSamAccount.inc:336
-#: ../lib/modules/sambaSamAccount.inc:1441
-#: ../lib/modules/sambaSamAccount.inc:1781
+#: ../lib/modules/sambaSamAccount.inc:361
+#: ../lib/modules/sambaSamAccount.inc:1519
+#: ../lib/modules/sambaSamAccount.inc:1847
 msgid "Reconnect if disconnected"
 msgstr "切断された場合は再接続してください"
 
@@ -4462,21 +5071,21 @@ msgstr "切断された場合は再接続してください"
 msgid "Recursive delete progress"
 msgstr "再帰的な削除中"
 
-#: ../templates/config/mainmanage.php:361
+#: ../templates/config/mainmanage.php:357
 msgid "Reenter new master password"
 msgstr "新しいマスタパスワードを再入力"
 
-#: ../templates/config/confmain.php:441 ../lib/modules/posixAccount.inc:1772
+#: ../templates/config/confmain.php:525 ../lib/modules/posixAccount.inc:1708
 msgid "Reenter password"
 msgstr "パスワード再入力"
 
-#: ../templates/config/profmanage.php:198
-#: ../templates/config/profmanage.php:305
+#: ../templates/config/profmanage.php:204
+#: ../templates/config/profmanage.php:302
 msgid "Reenter profile password"
 msgstr "プロファイルパスワードを再入力"
 
-#: ../templates/tree/edit.php:101 ../lib/lists.inc:323 ../lib/tree.inc:88
-#: ../lib/tree.inc:89
+#: ../templates/tree/edit.php:101 ../lib/modules/asteriskExtension.inc:297
+#: ../lib/lists.inc:268 ../lib/tree.inc:88 ../lib/tree.inc:89
 msgid "Refresh"
 msgstr "リフレッシュ"
 
@@ -4488,87 +5097,105 @@ msgstr "競合の場合に拒否"
 msgid "Relative distinguished name"
 msgstr "相対識別名"
 
-#: ../templates/pdfedit/pdfpage.php:425 ../lib/modules/nisMailAlias.inc:147
-#: ../lib/modules/ieee802device.inc:104 ../lib/modules/groupOfNames.inc:158
-#: ../lib/modules/kolabUser.inc:334 ../lib/modules/kolabUser.inc:353
-#: ../lib/modules/kolabUser.inc:379 ../lib/modules/kolabUser.inc:895
-#: ../lib/modules/ldapPublicKey.inc:98
+#: ../templates/pdfedit/pdfpage.php:415
+#: ../templates/config/confmodules.php:273 ../lib/modules/nisMailAlias.inc:148
+#: ../lib/modules/ieee802device.inc:104 ../lib/modules/ipHost.inc:125
+#: ../lib/modules/groupOfNames.inc:158 ../lib/modules/kolabUser.inc:332
+#: ../lib/modules/kolabUser.inc:351 ../lib/modules/kolabUser.inc:377
+#: ../lib/modules/kolabUser.inc:895 ../lib/modules/ldapPublicKey.inc:98
 #: ../lib/modules/inetLocalMailRecipient.inc:160
-#: ../lib/modules/sambaSamAccount.inc:1323
-#: ../lib/modules/shadowAccount.inc:383
-#: ../lib/modules/phpGroupwareUser.inc:246
+#: ../lib/modules/sambaSamAccount.inc:1401
+#: ../lib/modules/shadowAccount.inc:401
+#: ../lib/modules/phpGroupwareUser.inc:258
 msgid "Remove"
 msgstr "削除"
 
-#: ../lib/modules/posixGroup.inc:206 ../lib/modules/posixAccount.inc:1047
+#: ../lib/modules/eduPerson.inc:396
+msgid "Remove EDU person extension"
+msgstr "EDU person拡張を削除"
+
+#: ../lib/modules/ipHost.inc:175
+msgid "Remove IP address extension"
+msgstr "IPアドレス拡張を削除"
+
+#: ../lib/modules/sambaSamAccount.inc:1261
+msgid "Remove Samba 3 extension"
+msgstr "Samba 3拡張を削除"
+
+#: ../lib/modules/shadowAccount.inc:343
+msgid "Remove Shadow account extension"
+msgstr "Shadowアカウント拡張を削除"
+
+#: ../lib/modules/posixGroup.inc:199 ../lib/modules/posixAccount.inc:1009
 msgid "Remove password"
 msgstr "パスワードを削除"
 
 #: ../lib/modules/phpGroupwareGroup.inc:101
-#: ../lib/modules/phpGroupwareUser.inc:178
+#: ../lib/modules/phpGroupwareUser.inc:189
 msgid "Remove phpGroupWare extension"
 msgstr "phpGroupware拡張を削除"
 
-#: ../lib/modules/groupOfNames.inc:328
+#: ../lib/modules/groupOfNames.inc:320
 msgid "Remove selected entries"
 msgstr "選択したエントリを削除"
 
-#: ../templates/config/conftypes.php:227
+#: ../templates/config/conftypes.php:235
 msgid "Remove this account type"
 msgstr "このアカウントタイプを削除:"
 
-#: ../lib/modules/inetOrgPerson.inc:1483
+#: ../lib/modules/inetOrgPerson.inc:1733
 msgid "Remove/replace photo"
 msgstr "写真の削除/差し替え"
 
-#: ../templates/selfService/profManage.php:189
-#: ../templates/config/profmanage.php:221 ../help/help.inc:116
+#: ../templates/selfService/profManage.php:197
+#: ../templates/config/profmanage.php:227 ../help/help.inc:123
 msgid "Rename profile"
 msgstr "プロファイル名変更"
 
-#: ../templates/selfService/profManage.php:84
-#: ../templates/config/profmanage.php:98
+#: ../templates/selfService/profManage.php:95
+#: ../templates/config/profmanage.php:107
 msgid "Renamed profile."
 msgstr "プロファイル名が変更されました。"
 
-#: ../templates/lists/changePassword.php:212
-#: ../lib/modules/inetOrgPerson.inc:759 ../lib/modules/inetOrgPerson.inc:990
-#: ../lib/modules/sambaAccount.inc:748 ../lib/modules/posixGroup.inc:283
-#: ../lib/modules/posixAccount.inc:1125 ../lib/modules/sambaSamAccount.inc:990
+#: ../templates/lists/changePassword.php:206 ../lib/modules.inc:1285
 msgid "Repeat password"
 msgstr "パスワード再入力"
 
-#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:787
+#: ../lib/modules/posixAccount.inc:66 ../lib/modules/posixAccount.inc:800
 msgid "Replaced $user or $group in homedir."
 msgstr "$user または $group をホームディレクトリに置き換えました。"
 
-#: ../templates/tree/edit.php:246
+#: ../lib/modules/ppolicy.inc:120 ../lib/modules/ppolicy.inc:279
+#: ../lib/modules/ppolicy.inc:496 ../lib/types/ppolicyType.inc:89
+msgid "Require password change on first login"
+msgstr "最初のログインでパスワード変更が必要"
+
+#: ../templates/tree/edit.php:249
 #, php-format
 msgid "Required attribute for objectClass(es) %s"
 msgstr "オブジェクトクラス %s に対する必須属性"
 
-#: ../templates/schema/schema.php:388
+#: ../templates/schema/schema.php:381
 #: ../templates/tree/templates/creation/custom.php:187
 msgid "Required attributes"
 msgstr "必須属性"
 
-#: ../templates/profedit/profilepage.php:261
-#: ../lib/modules/sambaAccount.inc:845 ../lib/modules/sambaSamAccount.inc:1172
+#: ../templates/profedit/profilepage.php:255
+#: ../lib/modules/sambaSamAccount.inc:1253
 msgid "Reset"
 msgstr "リセット"
 
-#: ../lib/modules.inc:1149
+#: ../lib/modules.inc:1361
 msgid "Reset changes"
 msgstr "変更をリセット"
 
-#: ../lib/modules/sambaAccount.inc:350 ../lib/modules/sambaAccount.inc:844
-#: ../lib/modules/sambaSamAccount.inc:213
-#: ../lib/modules/sambaSamAccount.inc:1171
+#: ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/sambaSamAccount.inc:1252
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
 #: ../lib/modules/sambaDomain.inc:130 ../lib/modules/sambaDomain.inc:204
-#: ../lib/modules/sambaDomain.inc:346 ../lib/modules/sambaDomain.inc:684
+#: ../lib/modules/sambaDomain.inc:346 ../lib/modules/sambaDomain.inc:685
 msgid "Reset time after lockout"
 msgstr "ロックアウト解除時間"
 
@@ -4576,33 +5203,38 @@ msgstr "ロックアウト解除時間"
 msgid "Reset time after lockout must be are natural number."
 msgstr "ロックアウト解除時間は自然数でなければなりません。"
 
-#: ../lib/modules/ddns.inc:100 ../lib/modules/ddns.inc:333
-#: ../lib/modules/ddns.inc:362
+#: ../lib/modules/ddns.inc:102 ../lib/modules/ddns.inc:130
+#: ../lib/modules/ddns.inc:384 ../lib/modules/ddns.inc:413
 msgid "Reverse zone names"
 msgstr "逆引きゾーン名"
 
-#: ../templates/config/confmain.php:361 ../help/help.inc:112
+#: ../templates/config/confmain.php:411 ../help/help.inc:113
 msgid "Rights for the home directory"
 msgstr "ホームディレクトリに対する権限"
 
-#: ../lib/modules/inetOrgPerson.inc:155 ../lib/modules/inetOrgPerson.inc:293
-#: ../lib/modules/inetOrgPerson.inc:470 ../lib/modules/inetOrgPerson.inc:825
-#: ../lib/modules/inetOrgPerson.inc:1062 ../lib/modules/inetOrgPerson.inc:1431
+#: ../lib/modules/inetOrgPerson.inc:152 ../lib/modules/inetOrgPerson.inc:241
+#: ../lib/modules/inetOrgPerson.inc:430 ../lib/modules/inetOrgPerson.inc:639
+#: ../lib/modules/inetOrgPerson.inc:1018 ../lib/modules/inetOrgPerson.inc:1237
+#: ../lib/modules/inetOrgPerson.inc:1673
 msgid "Room number"
 msgstr "部屋番号"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:61
 #: ../lib/modules/inetLocalMailRecipient.inc:96
 #: ../lib/modules/inetLocalMailRecipient.inc:143
-#: ../lib/modules/inetLocalMailRecipient.inc:313
+#: ../lib/modules/inetLocalMailRecipient.inc:314
 msgid "Routing address"
 msgstr "転送アドレス"
 
-#: ../templates/tests/lamdaemonTest.php:278
+#: ../templates/serverInfo.php:112
+msgid "SASL mechanisms"
+msgstr ""
+
+#: ../templates/tests/lamdaemonTest.php:271
 msgid "SSH connection"
 msgstr "SSH接続"
 
-#: ../templates/tests/lamdaemonTest.php:295
+#: ../templates/tests/lamdaemonTest.php:282
 msgid "SSH connection could be established."
 msgstr "SSHコネクションが確立できました。"
 
@@ -4612,24 +5244,20 @@ msgstr "SSHコネクションが確立できました。"
 msgid "SSH public key"
 msgstr "SSH公開鍵"
 
-#: ../lib/modules/ldapPublicKey.inc:167
+#: ../lib/modules/ldapPublicKey.inc:168
 msgid "SSH public key(s)"
 msgstr "SSH公開鍵"
 
-#: ../templates/tests/lamdaemonTest.php:261
+#: ../templates/tests/lamdaemonTest.php:254
 msgid "SSH2 module"
 msgstr "SSH2モジュール"
 
-#: ../templates/tests/lamdaemonTest.php:264
+#: ../templates/tests/lamdaemonTest.php:257
 msgid "SSH2 module is installed."
 msgstr "SSH2モジュールがインストールされています。"
 
-#: ../lib/modules/sambaAccount.inc:109
-msgid "Samba 2"
-msgstr "Samba 2"
-
-#: ../lib/modules/sambaGroupMapping.inc:299
-#: ../lib/modules/sambaSamAccount.inc:134
+#: ../lib/modules/sambaGroupMapping.inc:300
+#: ../lib/modules/sambaSamAccount.inc:124
 msgid "Samba 3"
 msgstr "Samba 3"
 
@@ -4637,23 +5265,23 @@ msgstr "Samba 3"
 msgid "Samba 3 domain SID is invalid!"
 msgstr "Samba 3 ドメインのSIDが不正です!"
 
-#: ../lib/types/smbDomain.inc:53
+#: ../lib/types/smbDomain.inc:62
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 ドメインエントリ"
 
-#: ../lib/modules/sambaSamAccount.inc:278
-#: ../lib/modules/sambaSamAccount.inc:282
-#: ../lib/modules/sambaSamAccount.inc:461
-#: ../lib/modules/sambaSamAccount.inc:485
+#: ../lib/modules/sambaSamAccount.inc:303
+#: ../lib/modules/sambaSamAccount.inc:307
+#: ../lib/modules/sambaSamAccount.inc:448
+#: ../lib/modules/sambaSamAccount.inc:514
 msgid "Samba RID"
 msgstr "Samba RID"
 
-#: ../lib/modules/sambaGroupMapping.inc:337
-#: ../lib/modules/sambaGroupMapping.inc:362
+#: ../lib/modules/sambaGroupMapping.inc:338
+#: ../lib/modules/sambaGroupMapping.inc:363
 msgid "Samba RID number"
 msgstr "Samba RID番号"
 
-#: ../lib/modules/sambaGroupMapping.inc:331
+#: ../lib/modules/sambaGroupMapping.inc:332
 msgid "Samba display name"
 msgstr "Samba表示名"
 
@@ -4661,47 +5289,46 @@ msgstr "Samba表示名"
 msgid "Samba domain"
 msgstr "Samba ドメイン"
 
-#: ../lib/modules/sambaGroupMapping.inc:323
+#: ../lib/modules/sambaGroupMapping.inc:324
 msgid "Samba domain name"
 msgstr "Sambaドメイン名"
 
-#: ../lib/types/smbDomain.inc:44
+#: ../lib/types/smbDomain.inc:53
 msgid "Samba domains"
 msgstr "Samba ドメイン"
 
-#: ../lib/modules/sambaGroupMapping.inc:343
-#: ../lib/modules/sambaGroupMapping.inc:370
-#: ../lib/modules/sambaGroupMapping.inc:388
+#: ../lib/modules/sambaGroupMapping.inc:344
+#: ../lib/modules/sambaGroupMapping.inc:371
+#: ../lib/modules/sambaGroupMapping.inc:389
 msgid "Samba group type"
 msgstr "Sambaグループタイプ"
 
-#: ../lib/modules/sambaAccount.inc:347 ../lib/modules/sambaAccount.inc:745
-#: ../lib/modules/sambaSamAccount.inc:210
-#: ../lib/modules/sambaSamAccount.inc:986
+#: ../lib/modules/sambaSamAccount.inc:235
 msgid "Samba password"
 msgstr "Sambaパスワード"
 
-#: ../lib/modules/sambaAccount.inc:70 ../lib/modules/sambaAccount.inc:174
-#: ../lib/modules/sambaAccount.inc:305 ../lib/modules/sambaAccount.inc:394
-#: ../lib/modules/sambaAccount.inc:397 ../lib/modules/sambaAccount.inc:797
-#: ../lib/modules/sambaAccount.inc:896 ../lib/modules/sambaSamAccount.inc:92
-#: ../lib/modules/sambaSamAccount.inc:263
-#: ../lib/modules/sambaSamAccount.inc:266
-#: ../lib/modules/sambaSamAccount.inc:448
-#: ../lib/modules/sambaSamAccount.inc:1111
-#: ../lib/modules/sambaSamAccount.inc:1539
-#: ../lib/modules/sambaSamAccount.inc:1710
+#: ../lib/modules/sambaSamAccount.inc:90
+#: ../lib/modules/sambaSamAccount.inc:288
+#: ../lib/modules/sambaSamAccount.inc:291
+#: ../lib/modules/sambaSamAccount.inc:489
+#: ../lib/modules/sambaSamAccount.inc:585
+#: ../lib/modules/sambaSamAccount.inc:1187
+#: ../lib/modules/sambaSamAccount.inc:1610
+#: ../lib/modules/sambaSamAccount.inc:1776
 msgid "Samba workstations"
 msgstr "Samba ワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:1230
+#: ../lib/modules/sambaSamAccount.inc:1318
 msgid "Saturday"
 msgstr "土曜日"
 
-#: ../templates/tree/edit.php:512
-#: ../templates/selfService/selfServiceMain.php:270
-#: ../templates/pdfedit/pdfpage.php:671 ../templates/pdfedit/pdfpage.php:705
-#: ../templates/profedit/profilepage.php:259 ../lib/modules.inc:1146
+#: ../templates/tree/edit.php:515 ../templates/selfService/adminMain.php:296
+#: ../templates/selfService/selfServiceMain.php:117
+#: ../templates/pdfedit/pdfpage.php:658 ../templates/pdfedit/pdfpage.php:694
+#: ../templates/profedit/profilepage.php:253
+#: ../templates/config/conftypes.php:189 ../templates/config/confmain.php:207
+#: ../templates/config/confmodules.php:174
+#: ../templates/config/moduleSettings.php:173 ../lib/modules.inc:1358
 msgid "Save"
 msgstr "保存"
 
@@ -4709,42 +5336,47 @@ msgstr "保存"
 msgid "Save as file"
 msgstr "ファイルとして保存"
 
-#: ../templates/tools.php:88
+#: ../lib/tools/schemaBrowser.inc:44
 msgid "Schema browser"
 msgstr "スキーマブラウザ"
 
-#: ../templates/tests/index.php:61 ../templates/tests/schemaTest.php:61
+#: ../templates/serverInfo.php:104
+msgid "Schema suffix"
+msgstr "スキーマ・サフィックス"
+
+#: ../templates/tests/index.php:53 ../templates/tests/schemaTest.php:50
 msgid "Schema test"
 msgstr "スキーマテスト"
 
-#: ../templates/pdfedit/pdfdelete.php:62 ../templates/pdfedit/pdfdelete.php:65
+#: ../templates/pdfedit/pdfdelete.php:60 ../templates/pdfedit/pdfdelete.php:63
 msgid "Scope"
 msgstr "スコープ"
 
-#: ../help/help.inc:97
+#: ../lib/modules/eduPerson.inc:82 ../lib/modules/eduPerson.inc:155
+#: ../lib/modules/eduPerson.inc:260 ../lib/modules/eduPerson.inc:668
+msgid "Scoped affiliation"
+msgstr ""
+
+#: ../help/help.inc:96
 msgid "Script path"
 msgstr "スクリプトパス"
 
-#: ../templates/config/confmain.php:516
+#: ../templates/config/confmain.php:589
 msgid "Script path is invalid!"
 msgstr "スクリプトパスが正しくありません!"
 
-#: ../templates/config/confmain.php:535
+#: ../templates/config/confmain.php:608
 msgid "Script rights are invalid!"
 msgstr "スクリプトの権限が無効です!"
 
-#: ../templates/config/confmain.php:519
+#: ../templates/config/confmain.php:592
 msgid "Script server is invalid!"
 msgstr "スクリプトサーバが無効です!"
 
-#: ../help/help.inc:108
+#: ../help/help.inc:109
 msgid "Script servers"
 msgstr "スクリプトサーバ"
 
-#: ../templates/config/confmain.php:340
-msgid "Script settings"
-msgstr "スクリプト設定"
-
 #: ../templates/tree/export_form.php:115 ../lib/export.inc:443
 #: ../lib/export.inc:513
 msgid "Search filter"
@@ -4755,78 +5387,94 @@ msgstr "検索フィルタ"
 msgid "Search scope"
 msgstr "検索スコープ"
 
-#: ../templates/pdfedit/pdfpage.php:560
+#: ../lib/modules/asteriskExtension.inc:292
+msgid "Search tree suffix for users"
+msgstr "ユーザーの検索ツリーサフィックス"
+
+#: ../templates/pdfedit/pdfpage.php:549
 msgid "Section"
 msgstr "セクション"
 
-#: ../templates/config/mainmanage.php:153 ../templates/config/confmain.php:413
+#: ../templates/config/mainmanage.php:167 ../templates/config/confmain.php:461
 msgid "Security settings"
 msgstr "セキュリティ設定"
 
-#: ../lib/lists.inc:835 ../lib/types/group.inc:238
-msgid "See README.openldap.txt to solve this problem."
-msgstr "この問題を解決するには、README.openldap.txtを参照してください。"
-
 #: ../templates/help.php:91
 msgid "See also"
 msgstr "参照"
 
+#: ../lib/account.inc:628
+msgid "See the manual for instructions to solve this problem."
+msgstr "この問題を解決する手順は、マニュアルを参照してください。"
+
 #: ../templates/tree/create_form.php:77
 msgid "Select a template for the creation process"
 msgstr "生成処理に対するテンプレートを選んでください"
 
-#: ../lib/lists.inc:446
+#: ../lib/lists.inc:382
 msgid "Select all"
 msgstr "すべてを選択"
 
-#: ../lib/modules/posixAccount.inc:1092
+#: ../lib/modules/nisnetgroup.inc:220 ../lib/modules/nisnetgroup.inc:242
+msgid "Select host"
+msgstr "ホストを選択"
+
+#: ../lib/modules/nisnetgroup.inc:222 ../lib/modules/nisnetgroup.inc:244
+msgid "Select user"
+msgstr "ユーザを選択"
+
+#: ../lib/modules/nisnetgroup.inc:354 ../lib/modules/posixAccount.inc:1053
 msgid "Selected groups"
 msgstr "選択されたグループ"
 
-#: ../templates/config/confmodules.php:183
+#: ../templates/masscreate.php:146 ../templates/config/confmodules.php:249
 msgid "Selected modules"
 msgstr "選択されたモジュール"
 
-#: ../lib/modules/posixGroup.inc:250
+#: ../lib/modules/posixGroup.inc:243 ../lib/modules/asteriskExtension.inc:303
 msgid "Selected users"
 msgstr "選択されたユーザ"
 
-#: ../templates/selfService/adminMain.php:225
+#: ../templates/selfService/adminMain.php:253
 msgid "Self service configuration"
 msgstr "セルフサービスの構成"
 
-#: ../templates/selfService/adminMain.php:238
+#: ../templates/selfService/adminMain.php:275
 msgid "Self service configuration editor"
 msgstr "セルフサービス構成エディタ"
 
-#: ../templates/tests/lamdaemonTest.php:80
+#: ../templates/tests/lamdaemonTest.php:72
 msgid "Server"
 msgstr "サーバー"
 
-#: ../templates/selfService/adminMain.php:267
-#: ../templates/config/confmain.php:148 ../help/help.inc:59
+#: ../templates/selfService/adminMain.php:332
+#: ../templates/config/confmain.php:229 ../help/help.inc:57
 msgid "Server address"
 msgstr "サーバーアドレス"
 
-#: ../templates/selfService/adminMain.php:60
-#: ../templates/config/confmain.php:491
+#: ../templates/selfService/adminMain.php:95
+#: ../templates/config/confmain.php:559
 msgid "Server address is invalid!"
 msgstr "サーバーアドレスが正しくありません!"
 
-#: ../templates/config/confmain.php:344
+#: ../templates/serverInfo.php:89 ../lib/tools/serverInfo.inc:44
+msgid "Server information"
+msgstr "サーバー情報"
+
+#: ../templates/config/confmain.php:398
 msgid "Server list"
 msgstr "サーバー覧"
 
-#: ../templates/login.php:344
+#: ../templates/login.php:322
 msgid "Server profile"
 msgstr "サーバー プロファイル"
 
-#: ../templates/selfService/adminMain.php:264
-#: ../templates/config/confmain.php:145
+#: ../templates/selfService/adminMain.php:329
+#: ../templates/config/confmain.php:226
 msgid "Server settings"
 msgstr "サーバー設定"
 
-#: ../templates/config/mainmanage.php:159 ../help/help.inc:130
+#: ../templates/config/mainmanage.php:173 ../help/help.inc:137
 msgid "Session timeout"
 msgstr "セッション有効期限"
 
@@ -4834,27 +5482,27 @@ msgstr "セッション有効期限"
 msgid "Set"
 msgstr "設定"
 
-#: ../lib/modules/posixGroup.inc:188 ../lib/modules/posixAccount.inc:1030
+#: ../lib/modules.inc:1252 ../lib/modules.inc:1365
 msgid "Set password"
 msgstr "パスワードを設定"
 
-#: ../lib/modules/posixAccount.inc:183 ../lib/modules/posixAccount.inc:331
+#: ../lib/modules/posixAccount.inc:187 ../lib/modules/posixAccount.inc:323
 msgid "Set primary group as memberUid"
 msgstr "プライマリーグループをmemberUidとしてセット"
 
-#: ../templates/config/profmanage.php:285 ../help/help.inc:120
+#: ../templates/config/profmanage.php:285 ../help/help.inc:127
 msgid "Set profile password"
 msgstr "プロファイルパスワード設定"
 
-#: ../lib/modules/posixAccount.inc:1139
+#: ../lib/modules.inc:1294
 msgid "Set random password"
 msgstr "ランダムなパスワードを設定"
 
-#: ../templates/lists/changePassword.php:199
+#: ../templates/lists/changePassword.php:193
 msgid "Set specific password"
 msgstr "任意のパスワードを設定"
 
-#: ../lib/modules/posixGroup.inc:425
+#: ../lib/modules/posixGroup.inc:396
 msgid "Sets the group password."
 msgstr "グループパスワードを設定"
 
@@ -4862,17 +5510,17 @@ msgstr "グループパスワードを設定"
 msgid "Shadow"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:330
-#: ../lib/modules/sambaSamAccount.inc:1423
-#: ../lib/modules/sambaSamAccount.inc:1765
+#: ../lib/modules/sambaSamAccount.inc:355
+#: ../lib/modules/sambaSamAccount.inc:1501
+#: ../lib/modules/sambaSamAccount.inc:1831
 msgid "Shadowing"
 msgstr ""
 
-#: ../lib/modules/ddns.inc:82
+#: ../lib/modules/ddns.inc:84
 msgid "Should DDNS (Dynamic DNS) be activated?"
 msgstr "DDNS(Dynamic DNS)を有効にしますか?"
 
-#: ../lib/modules/ddns.inc:85
+#: ../lib/modules/ddns.inc:87
 msgid "Should fix IP addresses be added to the DNS server?"
 msgstr "固定IPアドレスをDNSサーバーに追加しますか?"
 
@@ -4884,37 +5532,41 @@ msgstr "LDIFファイルを表示"
 msgid "Show internal attributes"
 msgstr "内部属性を表示する"
 
-#: ../lib/types/group.inc:260
+#: ../lib/modules/asteriskExtension.inc:287
+msgid "Show only Asterisk accounts"
+msgstr "アスタリスク・アカウントだけを表示"
+
+#: ../lib/types/group.inc:256
 msgid "Show primary group members as normal group members"
 msgstr "通常のグループメンバーとしてプライマリグループのメンバーを表示"
 
-#: ../templates/schema/schema.php:199
+#: ../templates/schema/schema.php:192
 msgid "Single valued"
 msgstr "単一の値"
 
-#: ../lib/modules/quota.inc:570
+#: ../lib/modules/quota.inc:581
 msgid "Soft block"
 msgstr "ソフトブロック"
 
-#: ../lib/modules/quota.inc:101 ../lib/modules/quota.inc:376
-#: ../lib/modules/quota.inc:461
+#: ../lib/modules/quota.inc:105 ../lib/modules/quota.inc:387
+#: ../lib/modules/quota.inc:472
 msgid "Soft block limit"
 msgstr "ソフトブロック制限"
 
-#: ../lib/modules/quota.inc:102
+#: ../lib/modules/quota.inc:106
 msgid "Soft block limit."
 msgstr "ソフトブロック制限"
 
-#: ../lib/modules/quota.inc:572
+#: ../lib/modules/quota.inc:583
 msgid "Soft inode"
 msgstr "ソフトinode"
 
-#: ../lib/modules/quota.inc:124
+#: ../lib/modules/quota.inc:128
 msgid "Soft inode (files) limit."
 msgstr "ソフトinode(ファイル)制限。"
 
-#: ../lib/modules/quota.inc:123 ../lib/modules/quota.inc:380
-#: ../lib/modules/quota.inc:463
+#: ../lib/modules/quota.inc:127 ../lib/modules/quota.inc:391
+#: ../lib/modules/quota.inc:474
 msgid "Soft inode limit"
 msgstr "ソフトinode制限"
 
@@ -4923,7 +5575,7 @@ msgstr "ソフトinode制限"
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "いくつかの属性(%s)は変更され、ハイライト表示されています。"
 
-#: ../lib/modules.inc:1042
+#: ../lib/modules.inc:1128
 msgid "Some required information is missing"
 msgstr "必須項目が満たされていません。"
 
@@ -4941,20 +5593,86 @@ msgstr ""
 msgid "Sorry this help number ({bold}%d{endbold}) is not available."
 msgstr "このヘルプ番号({bold}%d{endbold})は無効です。"
 
-#: ../lib/modules/sambaAccount.inc:318 ../lib/modules/sambaAccount.inc:406
-#: ../lib/modules/sambaAccount.inc:835 ../lib/modules/sambaSamAccount.inc:275
-#: ../lib/modules/sambaSamAccount.inc:1148
+#: ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/sambaSamAccount.inc:1225
 msgid "Special user"
 msgstr "特殊ユーザ"
 
-#: ../lib/modules/inetOrgPerson.inc:156 ../lib/modules/inetOrgPerson.inc:164
-#: ../lib/modules/inetOrgPerson.inc:305 ../lib/modules/inetOrgPerson.inc:482
-#: ../lib/modules/inetOrgPerson.inc:804 ../lib/modules/inetOrgPerson.inc:1067
-#: ../lib/modules/inetOrgPerson.inc:1447
+#: ../lib/modules/ppolicy.inc:125
+msgid "Specifies if users are allowed to change their own passwords or not."
+msgstr "ユーザー自身によるパスワード変更を許可するか否かを指定します。"
+
+#: ../lib/modules/ppolicy.inc:109
+msgid ""
+"Specifies the maximum number of seconds before a password is due to expire "
+"that expiration warning messages will be returned to a user."
+msgstr "ユーザーにパスワード期限切れ警告を発してから期限切れになるまでの最大秒数を指定します。"
+
+#: ../lib/modules/ppolicy.inc:113
+msgid ""
+"Specifies the minimum number of characters that will be accepted in a "
+"password."
+msgstr "パスワードの最低文字数を設定します。"
+
+#: ../lib/modules/ppolicy.inc:101
+msgid ""
+"Specifies the number of consecutive failed login attempts after which the "
+"password may not be used to login."
+msgstr "パスワードが無効になるログイン失敗の連続回数を指定します。"
+
+#: ../lib/modules/ppolicy.inc:85
+msgid ""
+"Specifies the number of previously used passwords which should be saved in "
+"the password history. New passwords can only be set if they are not in the "
+"password history."
+msgstr "パスワード履歴に保存する使用済みパスワードの数を指定します。パスワード履歴に存在しない新しいパスワードだけが設定できます。"
+
+#: ../lib/modules/ppolicy.inc:105
+msgid ""
+"Specifies the number of seconds after which old consecutive failed login "
+"attempts are purged from the failure counter, even though no successful "
+"authentication has occurred."
+msgstr "古いログイン連続失敗の記録が、(認証に成功しなくとも)ログイン失敗カウンタから末梢されるまでの秒数を指定します。"
+
+#: ../lib/modules/ppolicy.inc:97
+msgid ""
+"Specifies the number of seconds during which the password cannot be used to "
+"login due to too many consecutive failed bind attempts."
+msgstr "連続したbind試行の失敗によってパスワードがログインに使えなくなる秒数を指定します。"
+
+#: ../lib/modules/eduPerson.inc:83
+msgid ""
+"Specifies the person's affiliation within a particular security domain in "
+"broad categories such as student, faculty, staff, alum, etc."
+msgstr "学生、教員、職員、同窓生など、特定のセキュリティ・ドメインに対する個人の属性の大分類。"
+
+#: ../lib/modules/eduPerson.inc:79
+msgid ""
+"Specifies the person's primary relationship to the institution in broad "
+"categories such as student, faculty, staff, alum, etc."
+msgstr "学生、教員、職員、同窓生など、教育施設に対する個人の主たる関係の大分類。"
+
+#: ../lib/modules/eduPerson.inc:91 ../lib/modules/eduPerson.inc:95
+msgid ""
+"Specifies the person's relationship(s) to the institution in broad "
+"categories such as student, faculty, staff, alum, etc."
+msgstr "学生、教員、職員、同窓生など、教育施設に対する個人の関係の大分類。"
+
+#: ../lib/modules/ppolicy.inc:129
+msgid ""
+"Specifies whether the user's existing password must be sent along with their "
+"new password when changing a password. Attention, LAM does not support "
+"password changes which require the old password."
+msgstr "パスワード変更の際に、ユーザーの現在のパスワードを新しいパスワードと一緒に送る必要があるかを設定します。LAMは古いパスワードを必要とするパスワード変更をサポートしていません。"
+
+#: ../lib/modules/inetOrgPerson.inc:153 ../lib/modules/inetOrgPerson.inc:171
+#: ../lib/modules/inetOrgPerson.inc:231 ../lib/modules/inetOrgPerson.inc:454
+#: ../lib/modules/inetOrgPerson.inc:651 ../lib/modules/inetOrgPerson.inc:991
+#: ../lib/modules/inetOrgPerson.inc:1242 ../lib/modules/inetOrgPerson.inc:1689
 msgid "State"
 msgstr "都道府県"
 
-#: ../templates/pdfedit/pdfpage.php:493 ../templates/pdfedit/pdfpage.php:497
+#: ../templates/pdfedit/pdfpage.php:482 ../templates/pdfedit/pdfpage.php:486
 msgid "Static text"
 msgstr "静的テキスト"
 
@@ -4966,27 +5684,32 @@ msgstr "Step 1 of 2: 名前とオブジェクトクラス"
 msgid "Step 2 of 2: Specify attributes and values"
 msgstr "Step 2 of 2: 属性と値の記入"
 
-#: ../lib/modules/inetOrgPerson.inc:198
+#: ../lib/modules/inetOrgPerson.inc:305
 msgid "Steve"
 msgstr "スティーブ"
 
-#: ../lib/modules/inetOrgPerson.inc:330 ../lib/modules/sambaAccount.inc:225
-#: ../lib/modules/posixAccount.inc:207 ../lib/modules/sambaSamAccount.inc:361
+#: ../lib/modules/inetOrgPerson.inc:1292 ../lib/modules/posixAccount.inc:211
+#: ../lib/modules/sambaSamAccount.inc:392
 msgid "Steve Miller"
 msgstr "スティーブ ミラー"
 
-#: ../lib/modules/posixAccount.inc:268
+#: ../lib/modules/posixAccount.inc:272
 msgid "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 msgstr "スティーブ ミラー, 2-14号室, 123-123-1234,123-123-1234"
 
-#: ../lib/modules/inetOrgPerson.inc:87 ../lib/modules/inetOrgPerson.inc:153
-#: ../lib/modules/inetOrgPerson.inc:239 ../lib/modules/inetOrgPerson.inc:414
-#: ../lib/modules/inetOrgPerson.inc:415 ../lib/modules/inetOrgPerson.inc:776
-#: ../lib/modules/inetOrgPerson.inc:1052 ../lib/modules/inetOrgPerson.inc:1399
+#: ../lib/modules/eduPerson.inc:170
+msgid "Steve, Stevo"
+msgstr ""
+
+#: ../lib/modules/inetOrgPerson.inc:87 ../lib/modules/inetOrgPerson.inc:150
+#: ../lib/modules/inetOrgPerson.inc:218 ../lib/modules/inetOrgPerson.inc:358
+#: ../lib/modules/inetOrgPerson.inc:587 ../lib/modules/inetOrgPerson.inc:588
+#: ../lib/modules/inetOrgPerson.inc:955 ../lib/modules/inetOrgPerson.inc:1227
+#: ../lib/modules/inetOrgPerson.inc:1641
 msgid "Street"
 msgstr "町名"
 
-#: ../templates/pdfedit/pdfpage.php:679
+#: ../templates/pdfedit/pdfpage.php:666
 msgid "Structure name"
 msgstr "構成名"
 
@@ -4994,18 +5717,25 @@ msgstr "構成名"
 msgid "Sub (entire subtree)"
 msgstr "Sub (サブツリー全体)"
 
-#: ../lib/modules/dhcp_settings.inc:130 ../lib/modules/dhcp_settings.inc:186
-#: ../lib/modules/dhcp_settings.inc:648 ../lib/modules/dhcp_settings.inc:655
-#: ../lib/modules/dhcp_settings.inc:773
+#: ../lib/modules/nisnetgroup.inc:76 ../lib/modules/nisnetgroup.inc:111
+#: ../lib/modules/nisnetgroup.inc:193 ../lib/modules/nisnetgroup.inc:352
+#: ../lib/modules/nisnetgroup.inc:568 ../lib/types/netgroup.inc:93
+msgid "Subgroups"
+msgstr "サブグループ"
+
+#: ../lib/modules/dhcp_settings.inc:122 ../lib/modules/dhcp_settings.inc:182
+#: ../lib/modules/dhcp_settings.inc:230 ../lib/modules/dhcp_settings.inc:543
+#: ../lib/modules/dhcp_settings.inc:667
 msgid "Subnet"
 msgstr "サブネット"
 
-#: ../lib/modules/dhcp_settings.inc:163 ../lib/modules/dhcp_settings.inc:226
-#: ../lib/modules/dhcp_settings.inc:707 ../lib/modules/dhcp_settings.inc:781
+#: ../lib/modules/dhcp_settings.inc:155 ../lib/modules/dhcp_settings.inc:222
+#: ../lib/modules/dhcp_settings.inc:282 ../lib/modules/dhcp_settings.inc:602
+#: ../lib/modules/dhcp_settings.inc:675
 msgid "Subnet mask"
 msgstr "サブネット・マスク"
 
-#: ../templates/schema/schema.php:181
+#: ../templates/schema/schema.php:174
 msgid "Substring Rule"
 msgstr ""
 
@@ -5013,61 +5743,66 @@ msgstr ""
 msgid "Success"
 msgstr "成功"
 
-#: ../templates/tests/lamdaemonTest.php:166
+#: ../templates/tests/lamdaemonTest.php:158
 msgid "Sudo is not setup correctly!"
 msgstr "sudoが正しく設定されていません。"
 
-#: ../lib/modules.inc:1312 ../lib/lists.inc:687
+#: ../lib/modules.inc:1530 ../lib/lists.inc:609
 msgid "Suffix"
 msgstr "サフィックス"
 
-#: ../lib/modules/sambaSamAccount.inc:1230
+#: ../lib/modules/sambaSamAccount.inc:1318
 msgid "Sunday"
 msgstr "日曜日"
 
-#: ../templates/lists/changePassword.php:112
-#: ../lib/modules/sambaSamAccount.inc:199
+#: ../templates/lists/changePassword.php:108
+#: ../lib/modules/sambaSamAccount.inc:226
 msgid "Sync Samba LM password with Unix password"
 msgstr "Samba LMパスワードをunixパスワードと同期します。"
 
-#: ../templates/lists/changePassword.php:111
-#: ../lib/modules/sambaSamAccount.inc:198
+#: ../templates/lists/changePassword.php:107
+#: ../lib/modules/sambaSamAccount.inc:225
 msgid "Sync Samba NT password with Unix password"
 msgstr "Samba NTパスワードをunixパスワードと同期します。"
 
-#: ../templates/schema/schema.php:186 ../templates/tree/add_value_form.php:190
+#: ../templates/schema/schema.php:179 ../templates/tree/add_value_form.php:190
 msgid "Syntax"
 msgstr ""
 
-#: ../templates/schema/schema.php:94
+#: ../templates/schema/schema.php:87
 msgid "Syntax OID"
 msgstr ""
 
-#: ../templates/schema/schema.php:78 ../templates/schema/schema.php:79
+#: ../templates/schema/schema.php:71 ../templates/schema/schema.php:72
 msgid "Syntaxes"
 msgstr ""
 
-#: ../templates/config/mainmanage.php:314
+#: ../templates/config/mainmanage.php:313
 msgid "System logging"
 msgstr "システムロギング"
 
+#: ../help/help.inc:59
+msgid "TLS cannot be combined with ldaps://."
+msgstr ""
+
 #: ../lib/modules/kolabUser.inc:235
 msgid "Target of invitation policy is invalid!"
 msgstr "招待ポリシーのターゲット正しくありません。"
 
-#: ../templates/lists/changePassword.php:165
-#: ../lib/modules/inetOrgPerson.inc:77 ../lib/modules/inetOrgPerson.inc:152
-#: ../lib/modules/inetOrgPerson.inc:263 ../lib/modules/inetOrgPerson.inc:430
-#: ../lib/modules/inetOrgPerson.inc:431 ../lib/modules/inetOrgPerson.inc:835
-#: ../lib/modules/inetOrgPerson.inc:1056 ../lib/modules/inetOrgPerson.inc:1367
+#: ../templates/lists/changePassword.php:161
+#: ../lib/modules/inetOrgPerson.inc:77 ../lib/modules/inetOrgPerson.inc:149
+#: ../lib/modules/inetOrgPerson.inc:245 ../lib/modules/inetOrgPerson.inc:390
+#: ../lib/modules/inetOrgPerson.inc:603 ../lib/modules/inetOrgPerson.inc:604
+#: ../lib/modules/inetOrgPerson.inc:1030 ../lib/modules/inetOrgPerson.inc:1231
+#: ../lib/modules/inetOrgPerson.inc:1609
 msgid "Telephone number"
 msgstr "電話番号"
 
-#: ../lib/modules/inetOrgPerson.inc:223
+#: ../lib/modules/inetOrgPerson.inc:336
 msgid "Temp"
 msgstr "臨時雇用"
 
-#: ../lib/modules/inetOrgPerson.inc:211
+#: ../lib/modules/inetOrgPerson.inc:320
 msgid "Temp, contract until december"
 msgstr "臨時雇用、12月までの契約"
 
@@ -5075,86 +5810,116 @@ msgstr "臨時雇用、12月までの契約"
 msgid "Template"
 msgstr "テンプレート"
 
-#: ../lib/modules/sambaSamAccount.inc:339
-#: ../lib/modules/sambaSamAccount.inc:1163
+#: ../lib/modules/sambaSamAccount.inc:364
+#: ../lib/modules/sambaSamAccount.inc:592
+#: ../lib/modules/sambaSamAccount.inc:1243
 msgid "Terminal server options"
 msgstr "ターミナルサーバオプション"
 
-#: ../templates/tools.php:95
+#: ../lib/tools/tests.inc:44
 msgid "Tests"
 msgstr "テスト"
 
-#: ../templates/pdfedit/pdfpage.php:607
+#: ../templates/pdfedit/pdfpage.php:594
 msgid "Text field"
 msgstr "テキストフィールド"
 
-#: ../help/help.inc:103
+#: ../help/help.inc:104
 msgid "Text for user PDF"
 msgstr "ユーザPDFのためのテキスト"
 
+#: ../lib/modules/eduPerson.inc:100
+msgid ""
+"The \"NetID\" of the person for the purposes of inter-institutional "
+"authentication. It should be represented in the form \"user@scope\" where "
+"scope defines a local security domain."
+msgstr "教育組織間の認証のための個人の\"NetID\"。これは \"user@scope\" の形式で表され、scopeはローカルなセキュリティ・ドメインを定義します。"
+
 #: ../lib/modules/kolabUser.inc:172
 msgid ""
 "The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
 msgstr "ユーザに対するCyrusメールクォータ(MB単位)。未入力の場合は無制限。"
 
-#: ../lib/modules/dhcp_settings.inc:249
+#: ../lib/modules/dhcp_settings.inc:317
 msgid "The DHCP ranges were changed to fit for the new subnet."
 msgstr "新しいサブネットに適合するようにDHCP範囲が変更されました。"
 
-#: ../templates/config/mainmanage.php:107
+#: ../lib/modules/eduPerson.inc:112
+msgid ""
+"The DN of the directory entry representing the institution with which the "
+"person is associated."
+msgstr "個人と関係のある教育施設のorganizational unitを示すディレクトリ・エントリのDN。"
+
+#: ../lib/modules/eduPerson.inc:116
+msgid ""
+"The DN of the directory entry representing the person's primary "
+"organizational unit."
+msgstr "個人の主たるorganizational unitを示すディレクトリ・エントリのDN。"
+
+#: ../lib/modules/eduPerson.inc:120 ../lib/modules/eduPerson.inc:124
+msgid ""
+"The DNs of the directory entries representing the person's organizational "
+"units."
+msgstr "個人のorganizational unitを示すディレクトリ・エントリのDN。"
+
+#: ../templates/config/mainmanage.php:116
 #, php-format
 msgid "The IP address %s is invalid!"
 msgstr "IPアドレス %s は正しくありません!"
 
-#: ../lib/modules/fixed_ip.inc:400
+#: ../lib/modules/fixed_ip.inc:387
 msgid "The IP address does not match the subnet."
 msgstr "IPアドレスがサブネットと矛盾しています。"
 
-#: ../lib/modules/fixed_ip.inc:403
+#: ../lib/modules/fixed_ip.inc:390
 msgid "The IP address is already in use."
 msgstr "このIPアドレスは既に使用されています:"
 
-#: ../lib/modules/range.inc:409 ../lib/modules/range.inc:427
+#: ../lib/modules/range.inc:396 ../lib/modules/range.inc:414
+#: ../lib/modules/fixed_ip.inc:382
 msgid "The IP address is invalid."
 msgstr "IPアドレスが正しくありません。"
 
-#: ../lib/modules/fixed_ip.inc:86
+#: ../lib/modules/fixed_ip.inc:88
 msgid "The IP address of the PC."
 msgstr "PCのIPアドレス。"
 
-#: ../lib/modules/dhcp_settings.inc:140
+#: ../lib/modules/dhcp_settings.inc:132
 msgid ""
 "The IP address(es) of the DNS servers. Multiple addresses are separated by "
 "\",\". Example: 192.168.0.10, 192.168.0.11"
-msgstr "DNSサーバーのIPアドレス。複数のIPアドレスは\",\"によって区切られます。例: 192.168.0.10, 192.168.0.11"
+msgstr ""
+"DNSサーバーのIPアドレス。複数のIPアドレスは\",\"によって区切られます。例: "
+"192.168.0.10, 192.168.0.11"
 
-#: ../lib/modules/dhcp_settings.inc:146
+#: ../lib/modules/dhcp_settings.inc:138
 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)。"
+msgstr ""
+"NetBIOSネームサーバーのIPアドレス(例: 192.168.123.123, 192.168.123.124)。"
 
-#: ../lib/modules/range.inc:413 ../lib/modules/range.inc:429
+#: ../lib/modules/range.inc:400 ../lib/modules/range.inc:416
 msgid "The IP does not match the subnet."
 msgstr "IPアドレスがサブネットにマッチしません。"
 
-#: ../lib/modules/fixed_ip.inc:83
+#: ../lib/modules/fixed_ip.inc:85
 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:243
+#: ../lib/modules/dhcp_settings.inc:310 ../lib/modules/dhcp_settings.inc:311
 msgid "The Netbios server is invalid."
 msgstr "NetBIOSサーバーが正しくありません。"
 
-#: ../lib/modules/fixed_ip.inc:362
+#: ../lib/modules/fixed_ip.inc:354
 msgid "The PC name may not be longer than 20 characters."
 msgstr "PC名は20文字より長くてはなりません。"
 
-#: ../lib/modules/fixed_ip.inc:371
+#: ../lib/modules/fixed_ip.inc:363
 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:365
+#: ../lib/modules/fixed_ip.inc:357
 msgid "The PC name needs to be at least 2 characters long."
 msgstr "PC名は少なくとも2文字以上でなければなりません。"
 
@@ -5162,7 +5927,7 @@ msgstr "PC名は少なくとも2文字以上でなければなりません。"
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "SambaサーバのSID。 \"net getlocalsid\" で取得してください。"
 
-#: ../lib/modules/posixAccount.inc:62
+#: ../lib/modules/posixAccount.inc:64
 msgid ""
 "The UID ranges for users and hosts overlap! This is a problem because LAM "
 "uses the highest UID in use + 1 for new accounts. Please set the minimum UID "
@@ -5172,11 +5937,16 @@ msgstr ""
 "てるため、これは問題です。UIDの最小値を適切に変更するか、独立した範囲を指定し"
 "てください。"
 
-#: ../help/help.inc:150
+#: ../lib/modules/asteriskExtension.inc:83
+#: ../lib/modules/asteriskAccount.inc:86
+msgid "The account context stores information about the dial plan."
+msgstr "アカウント・コンテキストはダイアル・プランに関する情報を保存します。"
+
+#: ../help/help.inc:157
 msgid "The account will be saved under this LDAP suffix."
 msgstr "新しいアカウントはこのLDAPサフィックスの下に保存されます。"
 
-#: ../templates/tests/schemaTest.php:133
+#: ../templates/tests/schemaTest.php:122
 #, php-format
 msgid ""
 "The attribute %s is not supported for the object class(es) %s by your LDAP "
@@ -5185,6 +5955,11 @@ msgstr ""
 "このLDAPサーバでは、属性 %s はオブジェクトクラス %s に対してサポートされてい"
 "ません。"
 
+#: ../lib/modules/asteriskAccount.inc:153
+#: ../lib/modules/asteriskAccount.inc:155
+msgid "The caller ID format is invalid."
+msgstr "発信者番号が正しくありません。"
+
 #: ../templates/tree/templates/creation/custom.php:99
 #, php-format
 msgid "The container you specified (%s) does not exist. Please try again."
@@ -5194,11 +5969,11 @@ msgstr "指定されたコンテナ(%s)が存在しません。再試行して
 msgid "The country name of the user."
 msgstr "ユーザの国名"
 
-#: ../lib/modules/dhcp_settings.inc:242
+#: ../lib/modules/dhcp_settings.inc:308 ../lib/modules/dhcp_settings.inc:309
 msgid "The default gateway is invalid."
 msgstr "デフォルト・ゲートウェイが正しくありません。"
 
-#: ../lib/modules/dhcp_settings.inc:253
+#: ../lib/modules/dhcp_settings.inc:321 ../lib/modules/dhcp_settings.inc:324
 msgid ""
 "The domain name includes invalid characters. Valid characters are A-Z, a-z, "
 "0-9, \".\", \"_\",\"-\"."
@@ -5206,53 +5981,77 @@ msgstr ""
 "ドメイン名に不正な文字が含まれています。有効な文字は: A-Z, a-z, 0-9, \".\", "
 "\"_\", \"-\" です。"
 
-#: ../lib/modules/dhcp_settings.inc:251
+#: ../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:252
+#: ../lib/modules/dhcp_settings.inc:320 ../lib/modules/dhcp_settings.inc:323
 msgid "The domain name needs to have at least 3 characters."
 msgstr "ドメイン名は少なくとも3文字以上でなければなりません。"
 
-#: ../lib/modules/dhcp_settings.inc:128
+#: ../lib/modules/dhcp_settings.inc:120
 msgid "The domain name of the subnet."
 msgstr "サブネットのドメイン名"
 
-#: ../lib/modules/range.inc:84
+#: ../lib/modules/range.inc:82
 msgid "The ending IP address of the range."
 msgstr "IPアドレス範囲の終点。"
 
-#: ../lib/modules/dhcp_settings.inc:244
+#: ../lib/modules/dhcp_settings.inc:312
 msgid "The entered Netbios node type does not exist."
 msgstr "入力されたNetBIOSノードタイプが存在しません。"
 
-#: ../lib/modules/shadowAccount.inc:67 ../lib/modules/phpGroupwareUser.inc:125
+#: ../lib/modules/shadowAccount.inc:67 ../lib/modules/phpGroupwareUser.inc:136
 msgid "The expiration date is invalid."
 msgstr "有効期限が正しくありません。"
 
-#: ../help/help.inc:180
+#: ../lib/modules/asteriskAccount.inc:157
+#: ../lib/modules/asteriskAccount.inc:158
+msgid "The extension context is invalid."
+msgstr "拡張コンテキストが正しくありません。"
+
+#: ../help/help.inc:193
 msgid "The first line is the subject."
 msgstr "先頭の行は件名です。"
 
-#: ../templates/initsuff.php:183
+#: ../templates/initsuff.php:177
 msgid ""
 "The following suffix(es) are missing in LDAP. LAM can create them for you."
 msgstr "以下のサフィックスはLDAPにありません。LAM はこれらを作成できます。"
 
-#: ../lib/modules/sambaSamAccount.inc:110
-#: ../lib/modules/sambaSamAccount.inc:111
+#: ../lib/modules/sambaSamAccount.inc:104
+#: ../lib/modules/sambaSamAccount.inc:105
 msgid "The format of the logon hours field is invalid!"
 msgstr "ログオン時間フィールドの形式が正しくありません!"
 
-#: ../templates/pdfedit/pdfpage.php:126
+#: ../lib/modules/customScripts.inc:100
+msgid "The format of this custom script setting is invalid."
+msgstr "カスタム・スクリプト設定の形式が正しくありません。"
+
+#: ../templates/login.php:415
+msgid "The given user name matches multiple LDAP entries."
+msgstr "与えられた名前は複数のLDAPエントリにマッチします。"
+
+#: ../lib/modules/ppolicy.inc:93
+msgid ""
+"The grace authentication limit specifies the number of times that an expired "
+"password may be used to login."
+msgstr "猶予認証リミットは期限切れパスワードをログインに使用できる回数を指定します。"
+
+#: ../templates/pdfedit/pdfpage.php:121
 msgid "The headline for a new section must contain at least one character."
 msgstr "新しいセクションの見出しは、少なくとも一文字以上でなくてはなりません。"
 
-#: ../lib/modules/sambaSamAccount.inc:252
+#: ../lib/modules/sambaSamAccount.inc:277
 msgid "The home directory will be connected under this drive letter."
 msgstr "ホームディレクトリはこのドライブ文字の下に接続されます。"
 
-#: ../lib/modules/ddns.inc:91
+#: ../lib/modules/asteriskAccount.inc:160
+#: ../lib/modules/asteriskAccount.inc:161
+msgid "The host name is invalid."
+msgstr "ホスト名が正しくありません。"
+
+#: ../lib/modules/ddns.inc:93
 msgid ""
 "The key enables the DHCP server to perform DNS updates. The key is generated "
 "with \"genDDNSkey\"."
@@ -5260,11 +6059,11 @@ msgstr ""
 "このキーはDNSサーバーをDNSアップデート可能にします。キーは\"getDDNSkey\"に"
 "よって生成されます。"
 
-#: ../lib/modules/dhcp_settings.inc:241
+#: ../lib/modules/dhcp_settings.inc:306 ../lib/modules/dhcp_settings.inc:307
 msgid "The lease time is invalid."
 msgstr "リース期間が正しくありません。"
 
-#: ../lib/modules/dhcp_settings.inc:134
+#: ../lib/modules/dhcp_settings.inc:126
 msgid ""
 "The lease time specifies after how many seconds the client should request a "
 "new IP address."
@@ -5272,7 +6071,7 @@ msgstr ""
 "リース期間にはクライアントが新しいIPアドレス要求を出すまでの秒数を記述しま"
 "す。"
 
-#: ../templates/config/mainmanage.php:123
+#: ../templates/config/mainmanage.php:132
 msgid ""
 "The log file is empty or contains invalid characters! Valid characters are: "
 "a-z, A-Z, 0-9, /, \\, ., :, _ and -."
@@ -5280,11 +6079,11 @@ msgstr ""
 "ログファイル名が空であるか、または不正な文字文字が含まれています。有効な文字"
 "は: a-z, A-Z, 0-9, /, \\\\, ., :, _ と -です。"
 
-#: ../lib/modules/dhcp_settings.inc:245
+#: ../lib/modules/dhcp_settings.inc:313 ../lib/modules/dhcp_settings.inc:314
 msgid "The maximum lease time is invalid."
 msgstr "最長リース期間が正しくありません。"
 
-#: ../lib/modules/dhcp_settings.inc:137
+#: ../lib/modules/dhcp_settings.inc:129
 msgid ""
 "The maximum lease time specifies after how many seconds the client must "
 "request a new IP address."
@@ -5292,12 +6091,12 @@ msgstr ""
 "最長リース期間には、この時間が経過するまでにクライアントが新しいIPアドレス要"
 "求を出さなくてはならない秒数を記述します。"
 
-#: ../lib/modules.inc:1087
+#: ../lib/modules.inc:1173
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "モジュール %s は利用できません。"
 
-#: ../templates/pdfedit/pdfpage.php:95
+#: ../templates/pdfedit/pdfpage.php:90
 msgid ""
 "The name for that PDF-structure you submitted is not valid. A valid name "
 "must constist at least of one of the following characters 'a-z','A-Z','0-"
@@ -5306,15 +6105,25 @@ msgstr ""
 "指定されたPDF構成の名前が正しくありません。正しい名前は一文字以上の長さで、使"
 "用可能な文字は 'a-z', 'A-Z', '0-9' '_', '-', '.' です。"
 
-#: ../lib/modules/fixed_ip.inc:80
+#: ../lib/modules/asteriskExtension.inc:95
+msgid ""
+"The name of a command to execute. The available commands may be listed at "
+"the Asterisk command line by executing \"core show applications\"."
+msgstr "実行するコマンドの名前。使用可能なコマンドはアスタリスクのコマンドラインで　\"core show applications\"　を実効すると列挙されます。"
+
+#: ../lib/modules/fixed_ip.inc:82
 msgid "The name of the PC."
 msgstr "PCの名前"
 
+#: ../lib/modules/asteriskExtension.inc:87
+msgid "The name of the extension (e.g. voicemail or sip)."
+msgstr "拡張の名前(例 voicemail or sip)。"
+
 #: ../lib/modules/kolabUser.inc:164
 msgid "The name of the server where the mailbox is located."
 msgstr "メールボックスがあるサーバーの名前。"
 
-#: ../lib/modules/dhcp_settings.inc:131
+#: ../lib/modules/dhcp_settings.inc:123
 msgid "The name of the subnet. Example: 192.168.10.0"
 msgstr "サブネットのアドレス。例: 192.168.10.0"
 
@@ -5322,7 +6131,7 @@ msgstr "サブネットのアドレス。例: 192.168.10.0"
 msgid "The name of your Windows domain or workgroup."
 msgstr "Windowsのドメイン又はワークグループ名。"
 
-#: ../lib/modules/dhcp_settings.inc:167
+#: ../lib/modules/dhcp_settings.inc:159
 msgid ""
 "The net mask is derived from the subnet mask. If you leave this field empty "
 "then LAM will calculate it for you."
@@ -5330,38 +6139,47 @@ msgstr ""
 "ネットマスクはサブネットマスクに由来します。未記入の場合は、LAMによって算出さ"
 "れます。"
 
-#: ../lib/modules/dhcp_settings.inc:248
-msgid "The net mask was invalid and was corrected."
-msgstr "不正なネットマスクを修正しました。"
+#: ../lib/modules.inc:1065
+msgid ""
+"The new password will be stored in the directory after you save this account."
+msgstr "新しいパスワードは個のアカウントをディレクトリにセーブした後で保存されます。"
 
-#: ../lib/modules/dhcp_settings.inc:247
-msgid "The netmask was set."
-msgstr "ネットマスクが設定されました。"
+#: ../help/help.inc:116
+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 "
+"given user name."
+msgstr "LAMにログインできるユーザーの数は制限されています。 This can be either a fixed list of DNs or LAM can search LDAP to find a DN which matches the given user name."
 
-#: ../templates/tests/schemaTest.php:122
+#: ../templates/tests/schemaTest.php:111
 #, php-format
 msgid "The object class %s is not supported by your LDAP server."
 msgstr "オブジェクトクラス %s はこのLDAPサーバでサポートされていません。"
 
-#: ../lib/modules/inetOrgPerson.inc:491
+#: ../lib/modules/inetOrgPerson.inc:660
 msgid "The office name of the user (e.g. YourCompany, Human Resources)."
 msgstr "ユーザの事業所名"
 
+#: ../templates/selfService/selfServiceMain.php:259 ../lib/modules.inc:1888
+msgid "The operation was stopped because of the above errors."
+msgstr "上記のエラーによって操作が停止されました。"
+
 #: ../lib/modules/groupOfNames.inc:69
 msgid "The owner of this group."
 msgstr "このグループの所有者。"
 
-#: ../templates/selfService/adminLogin.php:51
-#: ../templates/config/confmain.php:70 ../templates/config/mainlogin.php:56
+#: ../templates/selfService/adminLogin.php:54
+#: ../templates/config/confmain.php:72 ../templates/config/confsave.php:71
+#: ../templates/config/mainlogin.php:59
 msgid "The password is invalid! Please try again."
 msgstr "パスワードが正しくありません! やり直してください。"
 
-#: ../lib/security.inc:231
+#: ../lib/security.inc:233
 #, php-format
 msgid "The password is too short. You have to enter at least %s characters."
 msgstr "パスワードが短すぎます。少なくとも%s文字以上でなくてはなりません。"
 
-#: ../lib/security.inc:283
+#: ../lib/security.inc:285
 #, php-format
 msgid ""
 "The password is too weak. You have to enter at least %s different character "
@@ -5370,7 +6188,7 @@ msgstr ""
 "パスワードの強度が不足しています。少なくとも%s種類の文字種(大文字、小文字、数"
 "字、記号)を入力してください。"
 
-#: ../lib/security.inc:254
+#: ../lib/security.inc:256
 #, php-format
 msgid ""
 "The password is too weak. You have to enter at least %s lower case "
@@ -5379,21 +6197,21 @@ msgstr ""
 "パスワードの強度が不足しています。少なくとも%s文字の小文字を入力してくださ"
 "い。"
 
-#: ../lib/security.inc:262
+#: ../lib/security.inc:264
 #, php-format
 msgid ""
 "The password is too weak. You have to enter at least %s numeric characters."
 msgstr ""
 "パスワードの強度が不足しています。少なくとも%s文字の数字を入力してください。"
 
-#: ../lib/security.inc:266
+#: ../lib/security.inc:268
 #, php-format
 msgid ""
 "The password is too weak. You have to enter at least %s symbolic characters."
 msgstr ""
 "パスワードの強度が不足しています。少なくとも%s文字の記号を入力してください。"
 
-#: ../lib/security.inc:258
+#: ../lib/security.inc:260
 #, php-format
 msgid ""
 "The password is too weak. You have to enter at least %s upper case "
@@ -5402,11 +6220,15 @@ msgstr ""
 "パスワードの強度が不足しています。少なくとも%s文字の大文字を入力してくださ"
 "い。"
 
-#: ../templates/lists/changePassword.php:335
+#: ../lib/modules.inc:1319
+msgid "The password was set to:"
+msgstr "設定されたパスワード:"
+
+#: ../templates/lists/changePassword.php:321
 msgid "The password(s) were set to:"
 msgstr "設定されたパスワード:"
 
-#: ../lib/modules/posixAccount.inc:352
+#: ../lib/modules/posixAccount.inc:344
 msgid ""
 "The primary group for this account. You can insert a GID number or a group "
 "name."
@@ -5414,61 +6236,81 @@ msgstr ""
 "このアカウントに対するプライマリグループ。GID番号またはグループ名を入力してく"
 "ださい。"
 
-#: ../lib/modules/posixAccount.inc:419
+#: ../lib/modules/posixAccount.inc:411
 msgid "The primary group the host should be member of."
 msgstr "ホストがメンバでなければならないプライマリグループ。"
 
-#: ../lib/modules/posixAccount.inc:381
+#: ../lib/modules/posixAccount.inc:373
 msgid "The primary group the user should be member of."
 msgstr "ユーザがメンバでなければならないプライマリグループ。"
 
-#: ../lib/modules/range.inc:415
+#: ../lib/modules/asteriskExtension.inc:91
+msgid ""
+"The priority is a sequence number used to order the execution of commands. "
+"Commands are executed beginning with the lowest sequence number."
+msgstr "優先度はコマンドの実行順序を決定する通し番号です。コマンドは通し番号の少ない純に実行されます。"
+
+#: ../lib/modules/range.inc:402
 msgid "The range conflicts with another range."
 msgstr "範囲が他の範囲と衝突しています。"
 
-#: ../lib/modules/range.inc:411
+#: ../lib/modules/range.inc:398
 msgid "The range end needs to be greater than the range start."
 msgstr "範囲の末尾は先頭よりも大きくなくてはなりません。"
 
-#: ../lib/modules/inetOrgPerson.inc:471
+#: ../lib/modules/inetOrgPerson.inc:640
 msgid "The room number of the employee's office."
 msgstr "従業員の事務所の部屋番号。"
 
-#: ../lib/modules/range.inc:81
+#: ../lib/modules/customScripts.inc:57 ../lib/modules/customScripts.inc:69
+msgid ""
+"The scripts will be run on your web server in the user context of your web "
+"server (e.g. apache/www-data)."
+msgstr "スクリプトはwebサーバー上でwebサーバーのユーザーコンテキスト(例 apache/www-data)で実行されます。"
+
+#: ../lib/modules/inetOrgPerson.inc:668 ../lib/modules/sambaSamAccount.inc:371
+msgid ""
+"The selected options will not be managed inside LAM. You can use this to "
+"reduce the number of displayed input fields."
+msgstr "選択されたオプションはLAMの中で管理されます。これは、表示される入力フィールドの数を削減するのに使用できます。"
+
+#: ../lib/modules/range.inc:79
 msgid "The starting IP address of the range."
 msgstr "範囲の先頭IPアドレス。"
 
-#: ../lib/modules/inetOrgPerson.inc:483
+#: ../lib/modules/inetOrgPerson.inc:652
 msgid "The state where the user resides or works."
 msgstr "ユーザが居住または勤務している都道府県"
 
-#: ../templates/pdfedit/pdfpage.php:114
+#: ../templates/pdfedit/pdfpage.php:109
 msgid "The static text must contain at least one character."
 msgstr "静的テキストは少なくとも一文字以上でなければなりません。"
 
-#: ../lib/modules/dhcp_settings.inc:238
+#: ../lib/modules/dhcp_settings.inc:301
 msgid "The subnet is already in use."
 msgstr "サブネットはすでに使用されています"
 
-#: ../lib/modules/dhcp_settings.inc:239
+#: ../lib/modules/dhcp_settings.inc:302 ../lib/modules/dhcp_settings.inc:303
 msgid "The subnet is invalid."
 msgstr "サブネットが正しくありません。"
 
-#: ../lib/modules/dhcp_settings.inc:246
+#: ../lib/modules/dhcp_settings.inc:315 ../lib/modules/dhcp_settings.inc:316
 msgid "The subnet mask is invalid."
 msgstr "サブネット・マスクが正しくありません。"
 
-#: ../lib/modules/dhcp_settings.inc:164
+#: ../lib/modules/dhcp_settings.inc:156
 msgid "The subnet mask of the network."
 msgstr "ネットワークのサブネット・マスク"
 
-#: ../lib/modules/sambaSamAccount.inc:113
+#: ../lib/modules/sambaSamAccount.inc:107
 msgid ""
 "The value for the Samba 3 field \"User can/must change password\" needs to "
 "be a number."
-msgstr "Samba 3フィールド \"ユーザによるパスワード変更の許可/強制\" に与える値は数値である必要があります。"
+msgstr ""
+"Samba 3フィールド \"ユーザによるパスワード変更の許可/強制\" に与える値は数値"
+"である必要があります。"
 
-#: ../help/help.inc:183
+#: ../help/help.inc:196
 msgid "The wildcard for the new password is @@newPassword@@."
 msgstr "新しいパスワードに対応するワイルドカードは @@newPassword@@ です。"
 
@@ -5476,19 +6318,23 @@ msgstr "新しいパスワードに対応するワイルドカードは @@newPas
 msgid "There are new required attributes which need to be set."
 msgstr "設定すべき新しい必須属性があります。"
 
-#: ../lib/modules/posixGroup.inc:509
+#: ../lib/modules/posixGroup.inc:479
 msgid "There are still users who have this group as their primary group."
 msgstr "このグループをプライマリグループとするユーザがまだ存在します。"
 
-#: ../lib/modules/sambaGroupMapping.inc:437
+#: ../lib/modules/sambaGroupMapping.inc:438
 msgid "There can be only one group of this type."
 msgstr "このタイプのグループを一つだけ指定できます。"
 
+#: ../lib/modules/asteriskAccount.inc:154
+msgid "There is already another user with this caller ID."
+msgstr "この発信者番号を使用しているユーザーが既に存在します。"
+
 #: ../templates/massDoUpload.php:128
 msgid "There were errors while uploading:"
 msgstr "アップロードの際にエラーが発生しました。"
 
-#: ../lib/modules/posixGroup.inc:429
+#: ../lib/modules/posixGroup.inc:400
 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 "
@@ -5497,18 +6343,14 @@ msgstr ""
 "新しいグループアカウントを作成する際に使われるグループIDの最小値と最大値。新"
 "しいグループアカウントには、使用中の番号の最大値+1が常に割り当てられます。"
 
-#: ../lib/modules/posixAccount.inc:340
+#: ../lib/modules/posixAccount.inc:332
 msgid ""
 "These are the minimum and maximum numbers to use for machine IDs when "
-"creating new accounts for Samba hosts. The range should be different from "
-"that of users. New host accounts will always get the highest number in use "
-"plus one."
-msgstr ""
-"新しいSambaホストアカウントを作成する際に使われるマシンIDの最小値と最大値。範"
-"囲はユーザアカウントのものと異なるようにしなくてはなりません。新しいホストア"
-"カウントには、使用中の番号の最大値+1が常に割り当てられます。"
+"creating new accounts for hosts. The range should be different from that of "
+"users. New host accounts will always get the highest number in use plus one."
+msgstr "新しいSambaホストアカウントを作成する際に使われるマシンIDの最小値と最大値。範囲はユーザアカウントのものと異なるようにしなくてはなりません。新しいホストアカウントには、使用中の番号の最大値+1が常に割り当てられます。"
 
-#: ../lib/modules/posixAccount.inc:336
+#: ../lib/modules/posixAccount.inc:328
 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 "
@@ -5518,22 +6360,41 @@ msgstr ""
 "マシンアカウントのものとは異なるようにしなくてはなりません。新しいユーザアカ"
 "ウントには、使用中の番号の最大値+1が常に割りあてられます。"
 
-#: ../lib/modules/posixAccount.inc:87
+#: ../lib/modules/nisnetgroup.inc:81 ../lib/modules/nisnetgroup.inc:85
+msgid ""
+"These entries specify the members of the netgroup. You can limit the set to "
+"a host name, a user name, a domain name or any combination of them."
+msgstr "これらのエントリはネットグループのメンバーを記述します。ホスト名、ユーザー名、ドメイン名またはこれらの組み合わせによって集合を限定することができます。"
+
+#: ../lib/modules/asteriskExtension.inc:107
+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 ""
+
+#: ../lib/modules/posixAccount.inc:89
 msgid ""
 "This GID number is invalid! Please provide either a number or a group name."
 msgstr ""
 "このGID番号は正しくありません。別な番号を指定するか、グループ名を記入してくだ"
 "さい。"
 
-#: ../lib/modules/fixed_ip.inc:368
+#: ../help/help.inc:186
+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."
+msgstr "このHTMLコードはセルフサービス・メインページのトップに配置されます。例えば、カスタムロゴの配置等に使用できます。ここにはあらゆるHTMLコードを書く事ができます。"
+
+#: ../lib/modules/fixed_ip.inc:360
 msgid "This PC name already exists."
 msgstr "PC名は既に存在しています。"
 
-#: ../lib/modules/kolabUser.inc:279
+#: ../lib/modules/kolabUser.inc:277
 msgid "This account is marked for deletion."
 msgstr "このアカウントを削除対象としてマークしました。"
 
-#: ../lib/modules/sambaSamAccount.inc:276
+#: ../lib/modules/sambaSamAccount.inc:301
 msgid ""
 "This allows you to define this account as a special user like administrator "
 "or guest."
@@ -5541,25 +6402,33 @@ msgstr ""
 "このアカウントをadministratorやguest等の特殊ユーザとして定義する事を可能にし"
 "ます。"
 
-#: ../lib/modules/inetOrgPerson.inc:487
+#: ../lib/modules/inetOrgPerson.inc:656
 msgid "This can be used to specify if the user has a car license."
 msgstr "ユーザが運転免許を保有している場合に記入します。"
 
-#: ../help/help.inc:121
+#: ../help/help.inc:128
 msgid "This changes the password of the selected profile."
 msgstr "選択されたプロファイルのパスワードを変更します。"
 
-#: ../help/help.inc:123
+#: ../help/help.inc:130
 msgid "This changes the profile which is selected by default at login."
 msgstr "ログイン時にデフォルトで選択されるプロファイルを変更します。"
 
-#: ../templates/massBuildAccounts.php:152
+#: ../templates/massBuildAccounts.php:149
 msgid ""
 "This column is defined to include unique entries but duplicates were found:"
 msgstr ""
 "ユニークなエントリを含むものとして定義されているカラムで重複がみつかりました:"
 
-#: ../help/help.inc:96
+#: ../lib/modules/customScripts.inc:101
+msgid "This custom script setting includes an invalid account type."
+msgstr "カスタムスクリプト設定に不正なアカウントタイプが含まれています。"
+
+#: ../lib/modules/customScripts.inc:103 ../lib/modules/customScripts.inc:105
+msgid "This custom script setting includes an invalid action type."
+msgstr "カスタムスクリプト設定に不正なアクションタイプが含まれています。"
+
+#: ../help/help.inc:95
 msgid ""
 "This defines the language of the login window and sets this language as the "
 "default language. Users can change the language at login."
@@ -5567,13 +6436,23 @@ msgstr ""
 "ログインウィンドウの言語を定義し、この言語を既定値の言語として設定します。"
 "ユーザはログイン時に言語を変更できます。"
 
-#: ../help/help.inc:113
+#: ../help/help.inc:114
 msgid ""
 "This defines the rights for the home directories which are created by "
 "lamdaemon."
 msgstr "lamdaemonによって作成されたホームディレクトリの権限を定義します。"
 
-#: ../lib/modules/inetOrgPerson.inc:479
+#: ../lib/modules/asteriskExtension.inc:79
+msgid ""
+"This defines what application Asterisk has to start for this user (e.g. SIP/"
+"user1)."
+msgstr "アスタリスクがこのユーザーに対してスタートするアプリケーションを定義します(例 SIP/user1)。"
+
+#: ../lib/modules/ipHost.inc:67
+msgid "This describes the location of the host."
+msgstr "ホストの場所を記述します。"
+
+#: ../lib/modules/inetOrgPerson.inc:648
 msgid "This describes the location of the user."
 msgstr "ユーザの住所を記入します。"
 
@@ -5581,7 +6460,7 @@ msgstr "ユーザの住所を記入します。"
 msgid "This document was automatically created by LDAP Account Manager"
 msgstr "この文書はLDAP Account Managerによって自動的に生成されました。"
 
-#: ../templates/tree/edit.php:210
+#: ../templates/tree/edit.php:213
 msgid "This entry has no attributes"
 msgstr "このエントリは属性を持っていません。"
 
@@ -5590,10 +6469,14 @@ msgstr "このエントリは属性を持っていません。"
 msgid "This entry is the root of a sub-tree containing %s entries."
 msgstr "このエントリは %s エントリを含むサブツリーのルートです。"
 
-#: ../lib/modules/posixAccount.inc:89
+#: ../lib/modules/posixAccount.inc:91
 msgid "This gecos value is invalid!"
 msgstr "gecosの値が正しくありません!"
 
+#: ../lib/modules/ipHost.inc:63
+msgid "This is a comma separated list of IP addresses."
+msgstr "カンマで区切られたIPアドレスのリスト。"
+
 #: ../lib/modules/ieee802device.inc:66
 msgid "This is a comma separated list of MAC addresses."
 msgstr "カンマで区切られたMACアドレスのリスト。"
@@ -5618,7 +6501,7 @@ msgstr "カンマで区切られた受信者のリスト。"
 msgid "This is a comma separated list of the users public email addresses."
 msgstr "ユーザの公開メールアドレスのカンマで区切られたリスト。"
 
-#: ../help/help.inc:137
+#: ../help/help.inc:144
 msgid ""
 "This is a list of IP addresses from hosts who may access LAM. You can use \"*"
 "\" as wildcard (e.g. 192.168.0.*)."
@@ -5637,7 +6520,11 @@ msgid ""
 msgstr ""
 "このグループのメンバーのリスト。ユーザ名はセミコロンによって区切られます。"
 
-#: ../help/help.inc:109
+#: ../lib/modules/eduPerson.inc:87
+msgid "This is a list of nick names for this user."
+msgstr "このユーザーのニックネームのリスト。"
+
+#: ../help/help.inc:110
 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 "
@@ -5649,7 +6536,7 @@ msgstr ""
 "います。サーバ名はセミコロンによって区切られます。セミコロンに続けて記述的名"
 "前を付加することもできます。"
 
-#: ../help/help.inc:89
+#: ../help/help.inc:88
 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."
@@ -5657,14 +6544,18 @@ msgstr ""
 "LDAP Account Manager にログイン可能なすべてのユーザの有効なDNエントリの一覧で"
 "す。各行毎に1個のDNを入力してください。"
 
-#: ../templates/masscreate.php:231
+#: ../templates/masscreate.php:311
 msgid ""
 "This is an example how it would look in your spreadsheet program before you "
 "convert to CSV:"
 msgstr ""
 "CSVに変換する前に、あなたの表計算プログラムでどのように見えるかの例です。"
 
-#: ../help/help.inc:165
+#: ../lib/modules/nisObject.inc:67
+msgid "This is an optional description for this entry."
+msgstr "このエントリに対する付加的な説明。"
+
+#: ../help/help.inc:174
 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 "
@@ -5674,18 +6565,24 @@ msgstr ""
 "していて入力が\"miller\"だった場合、LAMは uid=miller という条件でアカウントを"
 "検索します。"
 
-#: ../lib/modules/inetOrgPerson.inc:102 ../lib/modules/aliasEntry.inc:79
+#: ../lib/modules/inetOrgPerson.inc:102 ../lib/modules/ipHost.inc:108
+#: ../lib/modules/eduPerson.inc:213 ../lib/modules/eduPerson.inc:215
+#: ../lib/modules/aliasEntry.inc:79
 msgid "This is not a valid DN!"
 msgstr "無効なDNです!"
 
-#: ../lib/modules/sambaSamAccount.inc:98
+#: ../lib/modules/sambaSamAccount.inc:94
 msgid "This is not a valid RID number!"
 msgstr "無効なRID番号です!"
 
-#: ../lib/modules/sambaGroupMapping.inc:439
+#: ../lib/modules/sambaGroupMapping.inc:440
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不正なSamba 3グループタイプです!"
 
+#: ../lib/modules/eduPerson.inc:217
+msgid "This is not a valid list of DNs!"
+msgstr "無効なDNリストです!"
+
 #: ../lib/modules/inetLocalMailRecipient.inc:66
 msgid "This is one of the users public email addresses."
 msgstr "ユーザの公開メールアドレスの一つ。"
@@ -5694,7 +6591,23 @@ msgstr "ユーザの公開メールアドレスの一つ。"
 msgid "This is one recipient for this alias."
 msgstr "この別名に対する1名の受信者。"
 
-#: ../lib/modules/inetOrgPerson.inc:411
+#: ../lib/modules/asteriskAccount.inc:78
+msgid ""
+"This is the ID of the user in the Asterisk database. It may contain digits "
+"and letters (e.g. user1 or 200134)."
+msgstr "アスタリスク・データベースにおけるユーザーのIDです。数字と文字を含むこと臥できます(例 user1 200134)。"
+
+#: ../lib/modules/ipHost.inc:59
+msgid ""
+"This is the IP address of the network card of the device (e.g. "
+"123.123.123.123)."
+msgstr "ネットワークカードデバイスのIPアドレスです(例 123.123.123.123)。"
+
+#: ../lib/modules/ipHost.inc:71
+msgid "This is the LDAP DN of the host's manager."
+msgstr "ホスト・マネージャーのLDAP DN。"
+
+#: ../lib/modules/inetOrgPerson.inc:584
 msgid ""
 "This is the LDAP DN of the user's manager. Use this property to represent "
 "hierarchies in your company."
@@ -5708,15 +6621,11 @@ msgid ""
 "EF:18)."
 msgstr "ネットワークカードデバイスのMACアドレスです(例 0:01:02:DE:EF:18)。"
 
-#: ../lib/modules/sambaAccount.inc:404
-msgid "This is the RID of the user's primary Windows group."
-msgstr "ユーザのプライマリWindowsグループのRIDです。"
-
-#: ../lib/modules/sambaSamAccount.inc:273
+#: ../lib/modules/sambaSamAccount.inc:298
 msgid "This is the SID of the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループのSIDです。"
 
-#: ../help/help.inc:98
+#: ../help/help.inc:97
 msgid ""
 "This is the absolute path to an external script for setting quotas and "
 "creating home directories."
@@ -5724,24 +6633,28 @@ msgstr ""
 "ホームディレクトリを作成し、quotaを設定するための外部スクリプトの絶対パスで"
 "す。"
 
-#: ../lib/modules/sambaAccount.inc:348 ../lib/modules/sambaSamAccount.inc:211
+#: ../lib/modules/sambaSamAccount.inc:236
 msgid "This is the account's Windows password."
 msgstr "アカウントのWindowsパスワードです。"
 
-#: ../lib/modules/sambaAccount.inc:345 ../lib/modules/sambaSamAccount.inc:208
+#: ../lib/modules/sambaSamAccount.inc:233
 msgid "This is the account's full name on Windows systems."
 msgstr "アカウントのWindowsシステム上のフルネームです。"
 
-#: ../lib/modules/sambaSamAccount.inc:295 ../lib/modules/shadowAccount.inc:186
+#: ../lib/modules/ppolicyUser.inc:49
+msgid "This is the active password policy for this account."
+msgstr "このアカウントに対するアクティブなパスワード・ポリシー。"
+
+#: ../lib/modules/sambaSamAccount.inc:320 ../lib/modules/shadowAccount.inc:190
 #: ../lib/modules/phpGroupwareUser.inc:83
 msgid "This is the date when the account will expire. Format: DD-MM-YYYY"
 msgstr "アカウントが失効する日。形式は: DD-MM-YYYY"
 
-#: ../lib/modules/sambaGroupMapping.inc:355
+#: ../lib/modules/sambaGroupMapping.inc:356
 msgid "This is the group name which will be shown in Windows."
 msgstr "Windows上で表示されるグループ名です。"
 
-#: ../help/help.inc:146
+#: ../help/help.inc:153
 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 "
@@ -5751,7 +6664,7 @@ msgstr ""
 "てはなりません(例えば、ユーザアカウントでは通常\"uid\"を使用し、グループでは"
 "\"cn\"を使用します)。"
 
-#: ../help/help.inc:84
+#: ../help/help.inc:83
 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:"
@@ -5761,26 +6674,32 @@ msgstr ""
 "\" 、または特定の値、\"属性:説明\" のいずれかにできます。複数のエントリは、セ"
 "ミコロンによって区切られます。"
 
+#: ../lib/modules/asteriskAccount.inc:82
+msgid ""
+"This is the machine id (e.g. IP address or host name) from which the user "
+"can call/receive calls."
+msgstr "ユーザーが通話を送受信できるマシンID(例 IPアドレスまたはホスト名)です。"
+
 #: ../lib/modules/inetLocalMailRecipient.inc:74
 msgid "This is the mail server for the user."
 msgstr "ユーザに対するメールサーバ。"
 
-#: ../lib/modules/groupOfNames.inc:61
+#: ../lib/modules/nisnetgroup.inc:69 ../lib/modules/groupOfNames.inc:61
 msgid "This is the name of this group."
 msgstr "このグループの名前。"
 
-#: ../lib/modules/posixAccount.inc:427
+#: ../lib/modules/posixAccount.inc:419
 msgid ""
 "This is the natural name of the host. If empty, the host name will be used."
 msgstr "このホストの呼称。未入力の場合は、ホスト名が使用されます。"
 
-#: ../lib/modules/inetOrgPerson.inc:447
+#: ../lib/modules/inetOrgPerson.inc:620
 msgid ""
 "This is the natural name of the user. If empty, the first and last name is "
 "used."
 msgstr "このユーザの呼称。未入力の場合は、姓と名が使用されます。"
 
-#: ../lib/modules/posixAccount.inc:405
+#: ../lib/modules/posixAccount.inc:397
 msgid ""
 "This is the natural name of the user. If empty, the first and last name or "
 "user name is used."
@@ -5802,7 +6721,7 @@ msgstr ""
 "ユーザーが過去に使用したパスワードを再利用する事を防ぐために記録しておくパス"
 "ワードの履歴数。"
 
-#: ../help/help.inc:94
+#: ../help/help.inc:93
 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."
@@ -5810,17 +6729,11 @@ msgstr ""
 "アカウント一覧の表示行数です。この数より多くのエントリがある場合は、リストは"
 "複数のページに分割されます。"
 
-#: ../lib/modules/sambaSamAccount.inc:343
-msgid ""
-"This is the number of seconds after when the user may or has to change his "
-"password."
-msgstr "ユーザによるパスワード変更が可能になる、または強制されるまでの秒数を示す数値。"
-
-#: ../lib/modules/sambaSamAccount.inc:304
+#: ../lib/modules/sambaSamAccount.inc:329
 msgid "This is the path to the user's home directory."
 msgstr "ユーザのホームディレクトリのパス。"
 
-#: ../lib/modules/sambaGroupMapping.inc:363
+#: ../lib/modules/sambaGroupMapping.inc:364
 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 "
@@ -5830,7 +6743,7 @@ msgstr ""
 "合、LAMはUIDからRIDを算出します。数値または特殊グループ名のどちらかを指定でき"
 "ます。"
 
-#: ../lib/modules/sambaSamAccount.inc:279
+#: ../lib/modules/sambaSamAccount.inc:304
 msgid ""
 "This is the relative ID number for your Windows account. You can either "
 "enter a number or one of these special accounts: "
@@ -5838,7 +6751,7 @@ msgstr ""
 "あなたのWindowsアカウントに対する相対ID番号です。数字またはこれらの特殊アカウ"
 "ントのどれか一つを指定できます: "
 
-#: ../lib/modules/sambaSamAccount.inc:283
+#: ../lib/modules/sambaSamAccount.inc:308
 msgid ""
 "This is the relative ID number for your host account. If you leave this "
 "empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
@@ -5846,20 +6759,18 @@ msgstr ""
 "あなたのホストアカウントに対する相対ID番号です。未入力の場合、LAMは "
 "uidNumber*2 + sambaAlgorithmicRidBase を使用します。"
 
-#: ../help/help.inc:60
+#: ../help/help.inc:58
 msgid ""
-"This is the server address of your LDAP server. Use ldap:// for standard "
-"LDAP connections and ldaps:// for encrypted (require server certificates) "
-"connections. The port value is optional."
-msgstr ""
-"これはLDAPサーバのアドレスです。ldap:// を標準的なLDAP接続に、ldaps:// を暗号"
-"化された(サーバ認証が必要)接続に使用してください。ポート番号は省略できます。"
+"This is the server address of your LDAP server. Use ldap:// for unencrypted "
+"LDAP connections or TLS encrypted connections. LDAP+SSL (LDAPS) encrypted "
+"connections are specified with ldaps://. The port value is optional."
+msgstr "これはLDAPサーバのアドレスです。ldap:// を暗号化されないLDAP接続に、ldaps:// をTLS暗号化された接続に使用してください。LDSP+SSL(LDAPS)暗号化接続は　https:// で指定します。ポート番号は省略できます。"
 
-#: ../help/help.inc:78
+#: ../help/help.inc:77
 msgid "This is the suffix for the LDAP tree viewer."
 msgstr "LDAPツリービューアに対するサフィックス。"
 
-#: ../help/help.inc:72
+#: ../help/help.inc:71
 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 "
@@ -5873,7 +6784,8 @@ msgstr ""
 msgid "This is the target email address for the user's mails."
 msgstr "ユーザのメールの最終的なメールアドレス"
 
-#: ../lib/modules/uidObject.inc:53 ../lib/modules/aliasEntry.inc:55
+#: ../lib/modules/uidObject.inc:53 ../lib/modules/customScripts.inc:46
+#: ../lib/modules/aliasEntry.inc:55
 msgid "This is the target of this alias entry."
 msgstr "このエイリアス・エントリの対象。"
 
@@ -5885,13 +6797,13 @@ msgstr ""
 "アカウントをロックされたユーザーがログインできなくなる時間(分単位)。-1は無期"
 "限を意味する。"
 
-#: ../help/help.inc:131
+#: ../help/help.inc:138
 msgid ""
 "This is the time (in minutes) of inactivity after which a user is "
 "automatically logged off."
 msgstr "ユーザーが自動的ログオフするまでの時間(分単位)。"
 
-#: ../help/help.inc:102
+#: ../help/help.inc:101
 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 "
@@ -5909,7 +6821,7 @@ msgstr ""
 "他のユーザが将来の予定をチェックする場合の時間的上限(日数)。未入力の場合はデ"
 "フォルト値(60日)がセットされます。"
 
-#: ../lib/modules/sambaSamAccount.inc:298
+#: ../lib/modules/sambaSamAccount.inc:323
 msgid ""
 "This is the time zone of your Samba server. LAM needs this information to "
 "display the logon hours correctly."
@@ -5917,11 +6829,11 @@ msgstr ""
 "Sambaサーバのタイムゾーン。LAMがログオン時間を正確に表示するために、この情報"
 "が必要です。"
 
-#: ../lib/modules/sambaSamAccount.inc:270
+#: ../lib/modules/sambaSamAccount.inc:295
 msgid "This is the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループです。"
 
-#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:92
 msgid "This login shell is invalid!"
 msgstr "ログインシェルが正しくありません!"
 
@@ -5929,16 +6841,20 @@ msgstr "ログインシェルが正しくありません!"
 msgid "This mail address is already in use:"
 msgstr "このメールアドレスは既に使用されています:"
 
-#: ../templates/schema/schema.php:355
+#: ../lib/modules/quota.inc:364 ../lib/lamdaemon.inc:44
+msgid "This module requires the PHP ssh2 extension."
+msgstr "個のモジュールはPHP ssh2拡張を必要とします。"
+
+#: ../templates/schema/schema.php:348
 msgid "This object class is obsolete."
 msgstr "このオブジェクトクラスは旧式です。"
 
-#: ../lib/modules/sambaSamAccount.inc:289
+#: ../lib/modules/sambaSamAccount.inc:314
 msgid "This option defines the allowed logon hours for this account."
 msgstr ""
 "このオプションは、このアカウントがログオンを許可される時間を定義します。"
 
-#: ../lib/modules/sambaSamAccount.inc:292
+#: ../lib/modules/sambaSamAccount.inc:317
 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 "
@@ -5949,19 +6865,23 @@ msgstr ""
 "時間が168ビットに写影され、21桁の16進数(21*8=168)の値として保存されます。先頭"
 "の1ビットはグリニッジ標準時で日曜の0:00 - 0:59を意味します。"
 
-#: ../lib/modules/sambaSamAccount.inc:313
+#: ../lib/modules/asteriskExtension.inc:201
+msgid "This pair of extension name and priority already exists."
+msgstr "この拡張名とポリシーは既に存在しています。"
+
+#: ../lib/modules/sambaSamAccount.inc:338
 msgid "This program is run after the login."
 msgstr "このプログラムはログオンの後に実行されます。"
 
-#: ../lib/modules/sambaSamAccount.inc:337
+#: ../lib/modules/sambaSamAccount.inc:362
 msgid "This specifies the reconnect policy."
 msgstr "再接続のポリシーを記述します。"
 
-#: ../lib/modules/sambaSamAccount.inc:334
+#: ../lib/modules/sambaSamAccount.inc:359
 msgid "This specifies what to do when the client connection is broken."
 msgstr "クライアント接続が壊れた場合の処理を記述します。"
 
-#: ../help/help.inc:169
+#: ../help/help.inc:178
 msgid ""
 "This text is displayed on top of the self service login page. You can also "
 "input HTML code here."
@@ -5969,7 +6889,7 @@ msgstr ""
 "この文字列はセルフサービス・ログインページのトップに表示されます。ここには"
 "HTMLコードを書く事もできます。"
 
-#: ../help/help.inc:171
+#: ../help/help.inc:180
 msgid ""
 "This text is displayed on top of the self service main page. You can also "
 "input HTML code here."
@@ -5977,64 +6897,66 @@ msgstr ""
 "この文字列はセルフサービス・メインページのトップに表示されます。ここにはHTML"
 "コードを書く事もできます。"
 
-#: ../help/help.inc:167
+#: ../help/help.inc:176
 msgid ""
 "This text should shortly describe your selected LDAP search attribute (e.g. "
 "email or user name)."
 msgstr "この文字列はLDAP検索属性を簡単に説明します(例. emailまたはユーザ名)。"
 
-#: ../help/help.inc:104
+#: ../help/help.inc:105
 msgid "This text will appear on top of every user PDF file."
 msgstr "このテキストは、各ユーザのPDFファイルの先頭に表示されます。"
 
-#: ../templates/tools.php:81
+#: ../lib/tools/pdfEdit.inc:53
 msgid "This tool allows you to customize the PDF pages."
 msgstr "このツールで、あなたのPDFページをカスタマイズする事ができます。"
 
-#: ../templates/lists/userlink.php:64 ../templates/lists/changePassword.php:50
+#: ../templates/lists/userlink.php:61 ../templates/lists/changePassword.php:46
 msgid "This user was not found!"
 msgstr "ユーザが見つかりません!"
 
-#: ../lib/modules/sambaAccount.inc:79 ../lib/modules/sambaAccount.inc:80
-#: ../lib/modules/sambaAccount.inc:81 ../lib/modules/sambaAccount.inc:82
-#: ../lib/modules/sambaSamAccount.inc:101
-#: ../lib/modules/sambaSamAccount.inc:102
-#: ../lib/modules/sambaSamAccount.inc:103
-#: ../lib/modules/sambaSamAccount.inc:104
+#: ../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\\\"!"
 msgstr "この値は、\"true\"または\"false\"のいずれかでなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:91
+#: ../lib/modules/posixAccount.inc:93
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"."
 msgstr "この値は、\"true\"または\"false\"のいずれかでなくてはなりません。"
 
-#: ../lib/modules/posixGroup.inc:508
+#: ../lib/modules/posixGroup.inc:478
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "この値はセミコロンで区切られたユーザ名でなくてはなりません。"
 
-#: ../help/help.inc:188
+#: ../help/help.inc:201
 msgid "This will create a new organizational unit under the selected one."
 msgstr "選択された位置の下に新しい organizational unit を作成します。"
 
-#: ../lib/modules/posixAccount.inc:368
+#: ../lib/modules/posixAccount.inc:360
 msgid "This will create the user's home directory on the specified server."
 msgstr "ユーザのホームディレクトリを指定されたサーバ上に作成します。"
 
-#: ../help/help.inc:190
+#: ../help/help.inc:203
 msgid ""
 "This will delete the selected organizational unit. The OU has to be empty."
 msgstr ""
 "選択された organizational unitを削除します。OUは空でなくてはなりません。"
 
-#: ../help/help.inc:119
+#: ../help/help.inc:126
 msgid "This will delete the selected profile."
 msgstr "選択されたプロファイルを削除します。"
 
-#: ../lib/modules/sambaAccount.inc:351 ../lib/modules/sambaSamAccount.inc:214
+#: ../lib/modules/eduPerson.inc:128 ../lib/modules/sambaSamAccount.inc:374
+#: ../lib/modules/shadowAccount.inc:194 ../lib/modules/phpGroupwareUser.inc:87
+msgid "This will enable the extension automatically if this profile is loaded."
+msgstr "プロファイルがロードされた場合に自動的に拡張を有効にします。"
+
+#: ../lib/modules/sambaSamAccount.inc:239
 msgid "This will reset the host's password to a default value."
 msgstr "ホストのパスワードをデフォルト値にリセットします。"
 
-#: ../templates/lists/changePassword.php:179 ../help/help.inc:177
+#: ../templates/lists/changePassword.php:175 ../help/help.inc:190
 msgid ""
 "This will set a random password and display it on the screen or send it the "
 "user via mail."
@@ -6050,28 +6972,28 @@ msgstr ""
 "Kolabdに削除を命ずる特殊なフラグをセットします。Kolabアカウントを完全に削除す"
 "る場合に使用します(e.g. メールボックスは削除されます)。"
 
-#: ../lib/modules/sambaSamAccount.inc:1229
+#: ../lib/modules/sambaSamAccount.inc:1317
 msgid "Thursday"
 msgstr "木曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:1270
+#: ../lib/modules/sambaSamAccount.inc:1358
 msgid "Time"
 msgstr "時刻"
 
-#: ../lib/modules/sambaSamAccount.inc:318
+#: ../lib/modules/sambaSamAccount.inc:343
 msgid "Time limit"
 msgstr "時間制限"
 
-#: ../lib/modules/sambaSamAccount.inc:297
-#: ../lib/modules/sambaSamAccount.inc:495
+#: ../lib/modules/sambaSamAccount.inc:322
+#: ../lib/modules/sambaSamAccount.inc:524
 msgid "Time zone"
 msgstr "タイムゾーン"
 
-#: ../templates/tests/lamdaemonTest.php:154 ../lib/lamdaemon.inc:127
+#: ../templates/tests/lamdaemonTest.php:146 ../lib/lamdaemon.inc:75
 msgid "Timeout while executing lamdaemon commands!"
 msgstr "lamdaemonコマンドの実行がタイムアウトしました!"
 
-#: ../lib/modules/posixAccount.inc:397
+#: ../lib/modules/posixAccount.inc:389
 msgid ""
 "To disable login use /bin/false. The list of shells is read from lam/config/"
 "shells"
@@ -6079,11 +7001,11 @@ msgstr ""
 "ログインを禁止するためには/bin/falseを使ってください。シェルの一覧は lam/"
 "config/shells から読み込まれます。"
 
-#: ../lib/modules/sambaSamAccount.inc:519
+#: ../lib/modules/sambaSamAccount.inc:548
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "東京、ソウル、大阪、ヤクーツク"
 
-#: ../templates/main_header.php:64
+#: ../templates/main_header.php:65
 msgid "Tools"
 msgstr "ツール"
 
@@ -6091,54 +7013,54 @@ msgstr "ツール"
 msgid "Total entries"
 msgstr "エントリ総数"
 
-#: ../lib/types/user.inc:247
+#: ../lib/types/user.inc:260
 msgid "Translate GID number to group name"
 msgstr "GID番号をグループ名に変換"
 
-#: ../templates/config/confmain.php:164 ../help/help.inc:77
+#: ../templates/config/confmain.php:262 ../help/help.inc:76
 msgid "Tree suffix"
 msgstr "ツリーサフィックス"
 
-#: ../templates/main_header.php:76
+#: ../templates/main_header.php:77
 msgid "Tree view"
 msgstr "ツリービュー"
 
-#: ../templates/config/confmain.php:510
+#: ../templates/config/confmain.php:583
 msgid "TreeSuffix is invalid!"
 msgstr "ツリーサフィックスが正しくありません!"
 
-#: ../lib/modules/sambaSamAccount.inc:1229
+#: ../lib/modules/sambaSamAccount.inc:1317
 msgid "Tuesday"
 msgstr "木曜日"
 
-#: ../templates/schema/schema.php:353
-#: ../templates/selfService/profManage.php:145
+#: ../templates/schema/schema.php:346
+#: ../templates/selfService/profManage.php:156
 msgid "Type"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:77
 msgid "UID"
 msgstr "UID"
 
-#: ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:77
 msgid "UID has changed. Do you want to change home directory?"
 msgstr "UIDが変更されました。ホームディレクトリを変更しますか?"
 
-#: ../lib/modules/posixAccount.inc:70
+#: ../lib/modules/posixAccount.inc:72
 msgid ""
 "UID must be a number. It has to be inside the UID range which is defined in "
 "your configuration profile."
 msgstr "UIDは数値で、設定ファイルで定義されたUIDの範囲内でなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:71 ../lib/modules/posixAccount.inc:211
-#: ../lib/modules/posixAccount.inc:285 ../lib/modules/posixAccount.inc:335
-#: ../lib/modules/posixAccount.inc:339 ../lib/modules/posixAccount.inc:347
-#: ../lib/modules/posixAccount.inc:976 ../lib/modules/posixAccount.inc:1244
-#: ../lib/types/user.inc:83 ../lib/types/host.inc:86
+#: ../lib/modules/posixAccount.inc:73 ../lib/modules/posixAccount.inc:215
+#: ../lib/modules/posixAccount.inc:289 ../lib/modules/posixAccount.inc:327
+#: ../lib/modules/posixAccount.inc:331 ../lib/modules/posixAccount.inc:339
+#: ../lib/modules/posixAccount.inc:950 ../lib/modules/posixAccount.inc:1178
+#: ../lib/types/user.inc:92 ../lib/types/host.inc:95
 msgid "UID number"
 msgstr "UID番号"
 
-#: ../lib/modules/posixAccount.inc:71
+#: ../lib/modules/posixAccount.inc:73
 #, php-format
 msgid ""
 "UID number has changed. To keep file ownership you have to run the following "
@@ -6148,11 +7070,11 @@ msgstr ""
 "コマンドをroot権限で実行す必要があります: 'find / -uid %s -exec chown %s {} "
 "\\;'"
 
-#: ../lib/modules/posixAccount.inc:62
+#: ../lib/modules/posixAccount.inc:64
 msgid "UID ranges for Unix accounts"
 msgstr "unixアカウントに対するUIDの範囲"
 
-#: ../lib/modules/sambaAccount.inc:386 ../lib/modules/sambaSamAccount.inc:255
+#: ../lib/modules/sambaSamAccount.inc:280
 msgid ""
 "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced "
 "with user and group name."
@@ -6160,7 +7082,12 @@ msgstr ""
 "ホームディレクトリのUNCパス (\\\\サーバ\\共有)。$user と $group はユーザ名と"
 "グループ名に置換されます。"
 
-#: ../templates/selfService/selfServiceMain.php:176
+#: ../lib/modules/eduPerson.inc:104 ../lib/modules/eduPerson.inc:108
+msgid ""
+"URI (either URN or URL) that indicates a set of rights to specific resources."
+msgstr "特定のリソースに対する権利の集合を示すURL(あるいはURNまたはURL)。"
+
+#: ../templates/selfService/selfServiceMain.php:262
 msgid ""
 "Unable to change your account. Maybe you do not have enough rights to change "
 "the settings."
@@ -6168,9 +7095,9 @@ msgstr ""
 "アカウントを変更できません。あなたはおそらく、設定を変更する権限を持っていま"
 "せん。"
 
-#: ../templates/tests/lamdaemonTest.php:143
-#: ../templates/tests/lamdaemonTest.php:299 ../lib/lamdaemon.inc:140
-#: ../lib/lamdaemon.inc:145
+#: ../templates/tests/lamdaemonTest.php:135
+#: ../templates/tests/lamdaemonTest.php:286 ../lib/lamdaemon.inc:88
+#: ../lib/lamdaemon.inc:93
 msgid "Unable to connect to remote server!"
 msgstr "リモートサーバーに接続できません!"
 
@@ -6178,8 +7105,8 @@ msgstr "リモートサーバーに接続できません!"
 msgid "Unable to create new OU!"
 msgstr "新しいOUを作成できません!"
 
-#: ../templates/selfService/profManage.php:71
-#: ../templates/config/profmanage.php:87
+#: ../templates/selfService/profManage.php:82
+#: ../templates/config/profmanage.php:96
 msgid "Unable to create new profile!"
 msgstr "新しいプロファイルを作成できません!"
 
@@ -6187,25 +7114,30 @@ msgstr "新しいプロファイルを作成できません!"
 msgid "Unable to delete OU!"
 msgstr "OUを削除できません!"
 
-#: ../templates/pdfedit/pdfdelete.php:62
+#: ../templates/pdfedit/pdfdelete.php:60
 msgid "Unable to delete PDF structure!"
 msgstr "PDF構成を削除できません!"
 
-#: ../templates/selfService/profManage.php:99
-#: ../templates/profedit/profiledelete.php:64
-#: ../templates/config/profmanage.php:109
+#: ../templates/selfService/profManage.php:110
+#: ../templates/profedit/profiledelete.php:62
+#: ../templates/config/profmanage.php:118
 msgid "Unable to delete profile!"
 msgstr "プロファイルを削除できません!"
 
-#: ../lib/modules/posixAccount.inc:1425 ../lib/modules/posixAccount.inc:1660
+#: ../lib/modules/nisnetgroup.inc:526 ../lib/modules/posixAccount.inc:1362
+#: ../lib/modules/posixAccount.inc:1596
 msgid "Unable to find group in LDAP."
 msgstr "LDAP内にグループが見つかりません。"
 
-#: ../lib/modules.inc:1440 ../lib/modules.inc:1444
+#: ../templates/login.php:423 ../templates/login.php:429
+msgid "Unable to find the user name in LDAP."
+msgstr "LDAP内にユーザー名が見つかりません。"
+
+#: ../lib/modules.inc:1657 ../lib/modules.inc:1661
 msgid "Unable to load LDAP entry:"
 msgstr "LDAPエントリをロードできません:"
 
-#: ../templates/config/confmain.php:325
+#: ../templates/config/confmain.php:381
 msgid ""
 "Unable to load available languages. Setting English as default language. For "
 "further instructions please contact the Admin of this site."
@@ -6218,46 +7150,45 @@ msgstr ""
 msgid "Unable to load profile!"
 msgstr "プロファイルをロードできません!"
 
-#: ../templates/lists/changePassword.php:379
-#: ../lib/modules/sambaSamAccount.inc:2165
+#: ../templates/lists/changePassword.php:365
 msgid "Unable to read sambaSID attribute."
 msgstr "sambaSID属性の読み込みができません。"
 
-#: ../templates/schema/schema.php:98 ../templates/schema/schema.php:116
-#: ../templates/schema/schema.php:277 ../templates/schema/schema.php:311
-#: ../templates/tests/schemaTest.php:67
+#: ../templates/schema/schema.php:91 ../templates/schema/schema.php:109
+#: ../templates/schema/schema.php:270 ../templates/schema/schema.php:304
+#: ../templates/tests/schemaTest.php:56
 msgid "Unable to retrieve schema!"
 msgstr "スキーマを取得できません!"
 
-#: ../templates/selfService/adminMain.php:124
-#: ../templates/profedit/profilepage.php:130
+#: ../templates/selfService/adminMain.php:150
+#: ../templates/profedit/profilepage.php:127
 msgid "Unable to save profile!"
 msgstr "プロファイルを保存できません!"
 
-#: ../templates/lists/changePassword.php:331
+#: ../templates/lists/changePassword.php:317
 msgid "Unable to send mail!"
 msgstr "メールを送信できません!"
 
-#: ../templates/lists/changePassword.php:375
-#: ../templates/lists/changePassword.php:390
-#: ../lib/modules/sambaSamAccount.inc:2161
-#: ../lib/modules/sambaSamAccount.inc:2176
+#: ../templates/lists/changePassword.php:361
+#: ../templates/lists/changePassword.php:376
 msgid ""
 "Unable to sync the time when the user can/must change his password because "
 "no domain was found."
-msgstr "ドメインが見つからないため、ユーザによるパスワード変更が許可/強制される時刻を同期できません。"
+msgstr ""
+"ドメインが見つからないため、ユーザによるパスワード変更が許可/強制される時刻を"
+"同期できません。"
 
-#: ../lib/modules/posixGroup.inc:312 ../lib/modules/posixAccount.inc:122
+#: ../lib/modules/posixGroup.inc:283 ../lib/modules/posixAccount.inc:126
 msgid "Unix"
 msgstr "unix"
 
-#: ../templates/tests/lamdaemonTest.php:234
+#: ../templates/tests/lamdaemonTest.php:227
 msgid "Unix account"
 msgstr "unixアカウント"
 
-#: ../lib/modules/inetOrgPerson.inc:71 ../lib/modules/inetOrgPerson.inc:348
-#: ../lib/modules/inetOrgPerson.inc:454 ../lib/modules/inetOrgPerson.inc:904
-#: ../lib/modules/inetOrgPerson.inc:1046
+#: ../lib/modules/inetOrgPerson.inc:71 ../lib/modules/inetOrgPerson.inc:480
+#: ../lib/modules/inetOrgPerson.inc:627 ../lib/modules/inetOrgPerson.inc:1125
+#: ../lib/modules/inetOrgPerson.inc:1221
 msgid "Unix workstations"
 msgstr "unixワークステーション"
 
@@ -6265,92 +7196,78 @@ msgstr "unixワークステーション"
 msgid "Unix workstations are invalid!"
 msgstr "unixワークステーションが正しくありません。"
 
-#: ../templates/tests/lamdaemonTest.php:169
+#: ../templates/tests/lamdaemonTest.php:161
 msgid "Unknown error"
 msgstr "不明なエラー"
 
-#: ../templates/lists/changePassword.php:115
+#: ../templates/lists/changePassword.php:111
 msgid "Unlock Samba account"
 msgstr "Sambaアカウントのアンロック"
 
-#: ../lib/modules/posixGroup.inc:195 ../lib/modules/posixAccount.inc:1037
+#: ../lib/modules/posixGroup.inc:191 ../lib/modules/posixAccount.inc:1002
 msgid "Unlock password"
 msgstr "パスワード・ロックの解除"
 
-#: ../templates/config/confmodules.php:240
+#: ../templates/masscreate.php:98 ../templates/config/confmodules.php:354
 msgid "Unsolved dependency:"
 msgstr "依存関係が解決できませんでした:"
 
-#: ../templates/pdfedit/pdfpage.php:415
+#: ../templates/pdfedit/pdfpage.php:405
 msgid "Up"
 msgstr "上"
 
-#: ../templates/lists/changePassword.php:118
+#: ../templates/lists/changePassword.php:114
 msgid "Update Samba password timestamps"
 msgstr "Sambaパスワードのタイムスタンプを更新"
 
-#: ../lib/modules/sambaSamAccount.inc:202
-msgid "Update attribute \"sambaPwdCanChange\" on password change"
-msgstr "パスワード変更時に属性 \"sambaPwdCanChange\" を更新する。"
-
-#: ../lib/modules/sambaSamAccount.inc:200
+#: ../lib/modules/sambaSamAccount.inc:227
 msgid "Update attribute \"sambaPwdLastSet\" on password change"
 msgstr "パスワード変更時に属性 \"sambaPwdLastSet\" を更新する。"
 
-#: ../lib/modules/sambaSamAccount.inc:201
-msgid "Update attribute \"sambaPwdMustChange\" on password change"
-msgstr "パスワード変更時に属性 \"sambaPwdMustChange\" を更新する。"
-
 #: ../templates/massBuildAccounts.php:199
 msgid "Upload accounts to LDAP"
 msgstr "アカウントをLDAPにアップロード"
 
-#: ../templates/masscreate.php:142
+#: ../templates/masscreate.php:220
 msgid "Upload file and create accounts"
 msgstr "ファイルをアップロードして、アカウントを作成します。"
 
-#: ../lib/modules.inc:450
+#: ../lib/modules.inc:464
 #, php-format
 msgid "Upload was stopped after errors in %s module!"
 msgstr "%s モジュールでエラーが発生したため、アプロードを中止しました。"
 
-#: ../templates/schema/schema.php:214
+#: ../templates/schema/schema.php:207
 msgid "Usage"
 msgstr "使用方法"
 
-#: ../lib/modules/sambaAccount.inc:124 ../lib/modules/sambaAccount.inc:235
-#: ../lib/modules/sambaAccount.inc:353 ../lib/modules/sambaAccount.inc:356
-#: ../lib/modules/sambaAccount.inc:752 ../lib/modules/sambaSamAccount.inc:216
-#: ../lib/modules/sambaSamAccount.inc:219
-#: ../lib/modules/sambaSamAccount.inc:371
-#: ../lib/modules/sambaSamAccount.inc:994
-#: ../lib/modules/sambaSamAccount.inc:1468
+#: ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/sambaSamAccount.inc:402
 msgid "Use Unix password"
 msgstr "unixパスワードを使用"
 
-#: ../lib/modules/sambaAccount.inc:130 ../lib/modules/sambaAccount.inc:243
-#: ../lib/modules/sambaAccount.inc:359 ../lib/modules/sambaAccount.inc:362
-#: ../lib/modules/sambaAccount.inc:756 ../lib/modules/sambaSamAccount.inc:222
-#: ../lib/modules/sambaSamAccount.inc:225
-#: ../lib/modules/sambaSamAccount.inc:379
-#: ../lib/modules/sambaSamAccount.inc:999
-#: ../lib/modules/sambaSamAccount.inc:1474
+#: ../lib/modules/sambaSamAccount.inc:247
+#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/sambaSamAccount.inc:410
+#: ../lib/modules/sambaSamAccount.inc:1088
+#: ../lib/modules/sambaSamAccount.inc:1546
 msgid "Use no password"
 msgstr "パスワードなし"
 
-#: ../lib/modules/quota.inc:97 ../lib/modules/quota.inc:375
+#: ../lib/modules/quota.inc:101 ../lib/modules/quota.inc:386
 msgid "Used blocks"
 msgstr "使用したブロック"
 
-#: ../lib/modules/quota.inc:98
+#: ../lib/modules/quota.inc:102
 msgid "Used blocks. 1000 blocks are usually 1MB"
 msgstr "使用したブロック。1000ブロックは通常1MB."
 
-#: ../templates/schema/schema.php:273
+#: ../templates/schema/schema.php:266
 msgid "Used by attributes"
 msgstr "使用されている属性"
 
-#: ../templates/schema/schema.php:242
+#: ../templates/schema/schema.php:235
 msgid "Used by object classes"
 msgstr "使用されているオブジェクトクラス"
 
@@ -6359,45 +7276,38 @@ msgid "Used for calculating RIDs from UID/GID. Do not change if unsure."
 msgstr ""
 "RIDs を UID/GID から計算するために使用します。自信がないなら変更しないこと。"
 
-#: ../lib/modules/quota.inc:119 ../lib/modules/quota.inc:379
+#: ../lib/modules/quota.inc:123 ../lib/modules/quota.inc:390
 msgid "Used inodes"
 msgstr "使用したinode"
 
-#: ../lib/modules/quota.inc:120
+#: ../lib/modules/quota.inc:124
 msgid "Used inodes (files)"
 msgstr "使用したinode(ファイル)"
 
+#: ../lib/modules/nisnetgroup.inc:204 ../lib/modules/nisnetgroup.inc:574
 #: ../lib/modules/sambaGroupMapping.inc:67
 msgid "User"
 msgstr "ユーザ"
 
-#: ../lib/types/user.inc:82
+#: ../lib/types/user.inc:91
 msgid "User ID"
 msgstr "ユーザ ID"
 
-#: ../lib/types/user.inc:53
+#: ../lib/types/user.inc:62
 msgid "User accounts (e.g. Unix, Samba and Kolab)"
 msgstr "ユーザアカウント(e.g. Unix, Samba and Kolab)"
 
-#: ../lib/modules/sambaAccount.inc:267 ../lib/modules/sambaAccount.inc:377
-#: ../lib/modules/sambaAccount.inc:768 ../lib/modules/sambaSamAccount.inc:246
-#: ../lib/modules/sambaSamAccount.inc:403
-#: ../lib/modules/sambaSamAccount.inc:1035
-#: ../lib/modules/sambaSamAccount.inc:1292
-#: ../lib/modules/sambaSamAccount.inc:1503
+#: ../lib/modules/sambaSamAccount.inc:271
+#: ../lib/modules/sambaSamAccount.inc:1114
 msgid "User can change password"
 msgstr "ユーザはパスワードを変更可能"
 
-#: ../lib/modules/sambaSamAccount.inc:342
-msgid "User can/must change password"
-msgstr "ユーザによるパスワード変更の許可/強制"
-
-#: ../lib/modules/posixAccount.inc:377
+#: ../lib/modules/posixAccount.inc:369
 msgid "User description. If left empty first and last name will be used."
 msgstr ""
 "ユーザの説明。もしも空ならば、姓(last name)と名(first name)が使われます。"
 
-#: ../lib/modules/inetOrgPerson.inc:391
+#: ../lib/modules/inetOrgPerson.inc:564
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "ユーザの説明。もしも空ならば、姓(surname)と名(given)が使われます。"
 
@@ -6405,77 +7315,69 @@ msgstr "ユーザの説明。もしも空ならば、姓(surname)と名(given)
 msgid "User description. If left empty user name will be used."
 msgstr "ユーザの説明。もしも空ならば、ユーザ名が使われます。"
 
-#: ../templates/schema/schema.php:209
+#: ../templates/schema/schema.php:202
 msgid "User modification"
 msgstr "ユーザによる変更"
 
-#: ../lib/modules/sambaAccount.inc:274 ../lib/modules/sambaAccount.inc:379
-#: ../lib/modules/sambaAccount.inc:776 ../lib/modules/sambaSamAccount.inc:248
-#: ../lib/modules/sambaSamAccount.inc:410
-#: ../lib/modules/sambaSamAccount.inc:1052
-#: ../lib/modules/sambaSamAccount.inc:1297
-#: ../lib/modules/sambaSamAccount.inc:1508
+#: ../lib/modules/sambaSamAccount.inc:273
+#: ../lib/modules/sambaSamAccount.inc:1120
 msgid "User must change password"
 msgstr "ユーザはパスワード変更が必要"
 
-#: ../templates/lists/changePassword.php:138 ../templates/login.php:254
-#: ../lib/modules/account.inc:94 ../lib/modules/account.inc:115
-#: ../lib/modules/account.inc:135 ../lib/modules/account.inc:137
-#: ../lib/modules/account.inc:138 ../lib/modules/account.inc:220
-#: ../lib/modules/account.inc:241 ../lib/modules/inetOrgPerson.inc:99
-#: ../lib/modules/inetOrgPerson.inc:335 ../lib/modules/inetOrgPerson.inc:450
-#: ../lib/modules/inetOrgPerson.inc:712 ../lib/modules/inetOrgPerson.inc:1064
+#: ../templates/lists/changePassword.php:134 ../templates/login.php:229
+#: ../lib/modules/nisnetgroup.inc:135 ../lib/modules/nisnetgroup.inc:454
+#: ../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/inetOrgPerson.inc:99
+#: ../lib/modules/inetOrgPerson.inc:623 ../lib/modules/inetOrgPerson.inc:912
+#: ../lib/modules/inetOrgPerson.inc:1239 ../lib/modules/inetOrgPerson.inc:1297
 #: ../lib/modules/uidObject.inc:38 ../lib/modules/uidObject.inc:60
 #: ../lib/modules/uidObject.inc:78 ../lib/modules/uidObject.inc:92
-#: ../lib/modules/uidObject.inc:153 ../lib/modules/posixAccount.inc:76
-#: ../lib/modules/posixAccount.inc:77 ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:197 ../lib/modules/posixAccount.inc:372
-#: ../lib/modules/posixAccount.inc:964 ../lib/modules/posixAccount.inc:1242
-#: ../lib/types/user.inc:85 ../lib/types/alias.inc:82
+#: ../lib/modules/uidObject.inc:154 ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixAccount.inc:201 ../lib/modules/posixAccount.inc:364
+#: ../lib/modules/posixAccount.inc:938 ../lib/modules/posixAccount.inc:1176
+#: ../lib/types/user.inc:94 ../lib/types/alias.inc:91
 msgid "User name"
 msgstr "ユーザ名"
 
-#: ../lib/modules/inetOrgPerson.inc:101 ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/inetOrgPerson.inc:101 ../lib/modules/posixAccount.inc:86
 msgid "User name already exists!"
 msgstr "ユーザ名はすでに存在しています!"
 
-#: ../lib/modules/account.inc:135 ../lib/modules/account.inc:136
-#: ../lib/modules/account.inc:138 ../lib/modules/inetOrgPerson.inc:99
-#: ../lib/modules/inetOrgPerson.inc:100 ../lib/modules/uidObject.inc:78
-#: ../lib/modules/posixAccount.inc:77 ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/nisnetgroup.inc:135 ../lib/modules/account.inc:116
+#: ../lib/modules/account.inc:117 ../lib/modules/account.inc:119
+#: ../lib/modules/inetOrgPerson.inc:99 ../lib/modules/inetOrgPerson.inc:100
+#: ../lib/modules/uidObject.inc:78 ../lib/modules/posixAccount.inc:79
+#: ../lib/modules/posixAccount.inc:84
 msgid ""
 "User name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
 msgstr ""
 "ユーザ名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です!"
 
-#: ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:82
 msgid "User name in use. Selected next free user name."
 msgstr "使用中のユーザ名です。次の空きユーザ名が選択されました。"
 
-#: ../lib/modules/account.inc:95 ../lib/modules/inetOrgPerson.inc:451
-#: ../lib/modules/posixAccount.inc:373
+#: ../lib/modules/account.inc:95 ../lib/modules/inetOrgPerson.inc:624
+#: ../lib/modules/posixAccount.inc:365
 msgid ""
 "User name of the user who should be created. Valid characters are: a-z,A-Z,0-"
-"9, .-_. LAM does not allow a number as first character because useradd also "
-"does not allow it. If user name is already used user name will be expanded "
-"with a number. The next free number will be used. Warning: Older systems "
-"have problems with user names longer than 8 characters. You can not log in "
-"to Windows if user name is longer than 16 characters."
-msgstr ""
-"作成しようとしているユーザのユーザ名。有効な文字は: a-z, A-Z, 0-9 と .-_で"
-"す。useraddコマンドで許されていないため、先頭の文字に数字は使用できません。"
-"ユーザ名が既に使われていたならば、ユーザ名に番号が付加されます。この場合、次"
-"の空き番号が使われます。警告: 古いシステムでは、8文字より長いユーザ名で問題が"
-"発生します。16文字より長いユーザ名ではWindowsにログオンできません。"
+"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."
+msgstr "作成しようとしているユーザのユーザ名。有効な文字は: a-z, A-Z, 0-9 と .-_です。ユーザ名が既に使われていたならば、ユーザ名に番号が付加されます。この場合、次の空き番号が使われます。警告: 古いシステムでは、8文字より長いユーザ名で問題が発生します。16文字より長いユーザ名ではWindowsにログオンできません。"
 
-#: ../lib/modules/posixAccount.inc:56 ../lib/modules/posixAccount.inc:57
-#: ../lib/modules/posixAccount.inc:60 ../lib/modules/posixAccount.inc:157
-#: ../lib/types/user.inc:44
+#: ../lib/modules/posixAccount.inc:58 ../lib/modules/posixAccount.inc:59
+#: ../lib/modules/posixAccount.inc:62 ../lib/modules/posixAccount.inc:161
+#: ../lib/types/user.inc:53
 msgid "Users"
 msgstr "ユーザ"
 
-#: ../lib/modules/posixGroup.inc:417
+#: ../lib/modules/posixGroup.inc:388
 msgid ""
 "Users who are member of the current group. Users who have set their primary "
 "group to this group will not be shown."
@@ -6483,7 +7385,7 @@ msgstr ""
 "このグループに所属しているユーザ。このグループをプライマリに設定されている"
 "ユーザは表示されません。"
 
-#: ../lib/modules/posixGroup.inc:421
+#: ../lib/modules/posixGroup.inc:392
 msgid ""
 "Users who will become member of the current group. User names are separated "
 "by semicolons."
@@ -6491,12 +7393,12 @@ msgstr ""
 "このグループのメンバーとなるユーザ。ユーザ名はセミコロンによって区切られま"
 "す。"
 
-#: ../templates/tests/lamdaemonTest.php:226
+#: ../templates/tests/lamdaemonTest.php:219
 #, php-format
 msgid "Using %s as lamdaemon remote server."
 msgstr "lamdaemonリモートサーバとして %s を使用します。"
 
-#: ../templates/tests/lamdaemonTest.php:247
+#: ../templates/tests/lamdaemonTest.php:240
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "%sを使用してリモートサーバーに接続します。"
@@ -6505,7 +7407,7 @@ msgstr "%sを使用してリモートサーバーに接続します。"
 msgid "Using template:"
 msgstr "テンプレートを使用:"
 
-#: ../lib/modules/posixAccount.inc:332
+#: ../lib/modules/posixAccount.inc:324
 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 "
@@ -6515,111 +7417,115 @@ msgstr ""
 "ん。もし使用するアプリケーションがプライマリグループを無視する場合は、このオ"
 "プションを有効にして、この動作を変更してください。"
 
-#: ../help/help.inc:88
+#: ../help/help.inc:87
 msgid "Valid users"
 msgstr "有効なユーザ"
 
-#: ../templates/login.php:212
+#: ../templates/serverInfo.php:116
+msgid "Vendor name"
+msgstr "ベンダー名"
+
+#: ../templates/serverInfo.php:121
+msgid "Vendor version"
+msgstr "ベンダー・バージョン"
+
+#: ../templates/login.php:182
 msgid "Want more features? Get LAM Pro!"
 msgstr ""
 
-#: ../templates/config/mainmanage.php:256
+#: ../templates/config/mainmanage.php:262
 msgid "Warning"
 msgstr "警告"
 
-#: ../templates/delete.php:204 ../lib/modules.inc:1705
+#: ../templates/delete.php:194 ../lib/modules.inc:1946
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "DN %s に属性を追加できませんでした。"
 
-#: ../lib/modules.inc:1676
+#: ../lib/modules.inc:1916
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "DN %s を作成できませんでした。"
 
-#: ../templates/tree/delete.php:113 ../templates/delete.php:284
-#: ../templates/delete.php:292
+#: ../templates/tree/delete.php:113 ../templates/delete.php:270
+#: ../templates/delete.php:278
 #, php-format
 msgid "Was unable to delete DN: %s."
 msgstr "DN %s を削除できませんでした。"
 
 #: ../templates/tree/update.php:109 ../templates/tree/add_oclass_form.php:162
-#: ../templates/tree/add_oclass.php:93 ../templates/delete.php:196
-#: ../lib/modules.inc:1693
+#: ../templates/tree/add_oclass.php:93 ../templates/delete.php:186
+#: ../lib/modules.inc:1934
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "DN %s の属性を変更できませんでした。"
 
-#: ../templates/lists/changePassword.php:407
+#: ../templates/lists/changePassword.php:393
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "DN %s の属性を変更できませんでした。"
 
-#: ../templates/delete.php:212 ../lib/modules.inc:1717
-#: ../lib/modules/phpGroupwareGroup.inc:190
-#: ../lib/modules/phpGroupwareUser.inc:333
-#: ../lib/modules/phpGroupwareUser.inc:353
+#: ../templates/delete.php:202 ../lib/modules.inc:1958
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "DN %s の属性を削除できませんでした。"
 
-#: ../lib/modules.inc:1663
+#: ../lib/modules.inc:1903
 #, php-format
 msgid "Was unable to rename DN: %s."
 msgstr "DNを変更できませんでした: %s。"
 
-#: ../lib/modules/sambaSamAccount.inc:1229
+#: ../lib/modules/sambaSamAccount.inc:1317
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:510
+#: ../lib/modules/sambaSamAccount.inc:539
 msgid "Western Europe Time, London, Lisbon"
 msgstr ""
 
-#: ../help/help.inc:70
+#: ../help/help.inc:69
 msgid ""
-"When using ldaps:// be sure to use exactly the same IP/domain name as in "
-"your certificate!"
-msgstr ""
-"ldaps:// を使う時は、証明書のIP/ドメイン名と正確に一致するものを使用してくだ"
-"さい。"
+"When using ldaps:// or TLS be sure to use exactly the same IP/domain name as "
+"in your certificate!"
+msgstr "ldaps:// またはTLSを使う時は、証明書のIP/ドメイン名と正確に一致するものを使用してください!"
 
-#: ../lib/modules/sambaAccount.inc:410 ../lib/modules/sambaSamAccount.inc:286
+#: ../lib/modules/sambaSamAccount.inc:311
 msgid "Windows domain name of account."
 msgstr "アカウントのWindowsドメイン名"
 
-#: ../lib/modules/sambaAccount.inc:311 ../lib/modules/sambaAccount.inc:820
-#: ../lib/modules/sambaGroupMapping.inc:255
-#: ../lib/modules/sambaGroupMapping.inc:386
-#: ../lib/modules/sambaSamAccount.inc:454
-#: ../lib/modules/sambaSamAccount.inc:1129
-#: ../lib/modules/sambaSamAccount.inc:1561
-#: ../lib/modules/sambaSamAccount.inc:1716
+#: ../lib/modules/sambaGroupMapping.inc:256
+#: ../lib/modules/sambaGroupMapping.inc:387
+#: ../lib/modules/sambaSamAccount.inc:441
+#: ../lib/modules/sambaSamAccount.inc:1206
+#: ../lib/modules/sambaSamAccount.inc:1633
+#: ../lib/modules/sambaSamAccount.inc:1782
 msgid "Windows group"
 msgstr "Windowsグループ"
 
-#: ../lib/modules/sambaAccount.inc:403
-msgid "Windows group RID"
-msgstr "WindowsグループRID"
-
-#: ../lib/modules/sambaAccount.inc:400
-#: ../lib/modules/sambaGroupMapping.inc:358
+#: ../lib/modules/sambaGroupMapping.inc:359
 msgid "Windows group name"
 msgstr "Windowsグループ名"
 
-#: ../lib/modules/sambaGroupMapping.inc:371
+#: ../lib/modules/sambaGroupMapping.inc:372
 msgid "Windows group type."
 msgstr "Windowsグループタイプ"
 
-#: ../lib/modules/sambaSamAccount.inc:269
+#: ../lib/modules/sambaSamAccount.inc:368
+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 "
+"them unless you really need them."
+msgstr "既定の動作では、Windowsパスワード・ハッシュはNTハッシュとLMハッシュとして保存されます。LMハッシュはセキュアでないため、古いバージョンのWindowsでのみ必要となります。本当に必要な場合を除いて、無効にすべきです。"
+
+#: ../lib/modules/sambaSamAccount.inc:294
 msgid "Windows primary group"
 msgstr "Windowsプライマリグループ"
 
-#: ../lib/modules/sambaSamAccount.inc:272
+#: ../lib/modules/sambaSamAccount.inc:297
 msgid "Windows primary group SID"
 msgstr "WindowsプライマリグループSID"
 
-#: ../lib/modules/sambaGroupMapping.inc:367
+#: ../lib/modules/sambaGroupMapping.inc:368
 msgid "Windows-Domain name of group."
 msgstr "グループのWindowsドメイン名。"
 
@@ -6627,36 +7533,36 @@ msgstr "グループのWindowsドメイン名。"
 msgid "Workgroup"
 msgstr "ワークグループ"
 
-#: ../lib/modules/sambaSamAccount.inc:315
-#: ../lib/modules/sambaSamAccount.inc:1381
-#: ../lib/modules/sambaSamAccount.inc:1736
+#: ../lib/modules/sambaSamAccount.inc:340
+#: ../lib/modules/sambaSamAccount.inc:1459
+#: ../lib/modules/sambaSamAccount.inc:1802
 msgid "Working directory"
 msgstr "作業ディレクトリ"
 
-#: ../lib/modules/sambaSamAccount.inc:316
+#: ../lib/modules/sambaSamAccount.inc:341
 msgid "Working directory of initial program."
 msgstr "初期プログラムの作業ディレクトリ。"
 
-#: ../templates/config/confmain.php:385
+#: ../templates/config/confmain.php:435
 msgid "Write"
 msgstr "書く"
 
-#: ../templates/config/confmain.php:204 ../templates/config/confmain.php:207
+#: ../templates/config/confmain.php:320 ../templates/config/confmain.php:323
 msgid "Write access"
 msgstr "書き込みアクセス"
 
-#: ../templates/selfService/selfServiceLogin.php:89
-#: ../templates/selfService/selfServiceLogin.php:107
-#: ../templates/login.php:447
+#: ../templates/selfService/selfServiceLogin.php:96
+#: ../templates/selfService/selfServiceLogin.php:114
+#: ../templates/login.php:411 ../templates/login.php:469
 msgid "Wrong password/user name combination. Please try again."
 msgstr "誤ったパスワード/ユーザ名の組み合わせです。やり直してください。"
 
-#: ../templates/schema/schema.php:158 ../templates/schema/schema.php:200
-#: ../templates/schema/schema.php:205 ../templates/schema/schema.php:210
+#: ../templates/schema/schema.php:151 ../templates/schema/schema.php:193
+#: ../templates/schema/schema.php:198 ../templates/schema/schema.php:203
 msgid "Yes"
 msgstr "はい"
 
-#: ../lib/modules/posixGroup.inc:504
+#: ../lib/modules/posixGroup.inc:474
 msgid ""
 "You are using a capital letters. This can cause problems because Windows "
 "isn't case-sensitive."
@@ -6664,8 +7570,8 @@ msgstr ""
 "大文字が使われています。Windowsは大文字と小文字を区別しないため、これが原因で"
 "問題が発生する場合があります。"
 
-#: ../lib/modules/account.inc:137 ../lib/modules/posixAccount.inc:76
-#: ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/account.inc:118 ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:80
 msgid ""
 "You are using a capital letters. This can cause problems because windows "
 "isn't case-sensitive."
@@ -6673,7 +7579,13 @@ msgstr ""
 "大文字が使われています。Windowsは大文字と小文字を区別しないため、これが原因で"
 "問題が発生する場合があります。"
 
-#: ../help/help.inc:182
+#: ../help/help.inc:103
+msgid ""
+"You can specify if LAM allows full write access, password changes or only "
+"read access."
+msgstr "LAMに完全な書き込み、パスワード変更のみ、または読み込みのみのいずれの権限を許可するかを指定できます。"
+
+#: ../help/help.inc:195
 msgid ""
 "You can use wildcards for LDAP attributes in the form @@attribute@@ (e.g. "
 "@@uid@@ for the user name)."
@@ -6681,6 +7593,13 @@ msgstr ""
 "LDAP属性に対応するワイルドカードを @@attributes@@ のような書式(例. ユーザ名"
 "は @@uid@@)で使用することができます。"
 
+#: ../lib/modules/customScripts.inc:58 ../lib/modules/customScripts.inc:70
+msgid ""
+"You can use wildcards in the format $wildcard$ which are replaced by the "
+"LDAP attribute with the same name. For multi-value attributes the values "
+"will be separated by commas."
+msgstr "同じ名前のLDAP属性で置き換えられるワイルドカードを $wildcard$ の形式で指定できます。複数値を持つ属性の場合は、値はカンマで区切られます。"
+
 #: ../templates/tree/templates/creation/custom.php:106
 msgid ""
 "You did not select any object classes for this object. Please go back and do "
@@ -6689,7 +7608,7 @@ msgstr ""
 "このオブジェクトに対するオブジェクトクラスが選択されていません。前に戻って選"
 "択してください。"
 
-#: ../templates/tests/schemaTest.php:67
+#: ../templates/tests/schemaTest.php:56
 msgid ""
 "You do not have the required access rights or the LDAP schema is not "
 "published by your server."
@@ -6697,7 +7616,7 @@ msgstr ""
 "必要なアクセス権が与えられていないか、またはLDAPスキーマがサーバ上に存在しま"
 "せん。"
 
-#: ../lib/modules/dhcp_settings.inc:240
+#: ../lib/modules/dhcp_settings.inc:304 ../lib/modules/dhcp_settings.inc:305
 msgid "You entered one or more invalid DNS servers."
 msgstr "誤ったDNSサーバーが入力されています。"
 
@@ -6705,7 +7624,7 @@ msgstr "誤ったDNSサーバーが入力されています。"
 msgid "You have been logged off from LDAP Account Manager."
 msgstr "LDAP Account Managerからログオフしました。"
 
-#: ../templates/lists/changePassword.php:292
+#: ../templates/lists/changePassword.php:278
 msgid "You have to activate the \"I am sure\" checkbox."
 msgstr "\"確認\"のチェックボックスを有効にする必要があります。"
 
@@ -6726,7 +7645,7 @@ msgstr "変更されませんでした。"
 msgid "You need to add at least one member to this group."
 msgstr "少なくとも一つのメンバーをこのグループへ追加する必要があります。"
 
-#: ../templates/tests/lamdaemonTest.php:251
+#: ../templates/tests/lamdaemonTest.php:244
 #, php-format
 msgid ""
 "Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"
@@ -6734,7 +7653,7 @@ msgstr ""
 "lamdaemonと連携するには、LAM管理ユーザ(%s)が有効なunixアカウントでなくてはな"
 "りません。"
 
-#: ../lib/lamdaemon.inc:111 ../lib/lamdaemon.inc:116
+#: ../lib/lamdaemon.inc:59 ../lib/lamdaemon.inc:64
 msgid ""
 "Your LAM admin user must be a valid Unix account to work with lamdaemon!"
 msgstr ""
@@ -6749,31 +7668,31 @@ msgstr ""
 "PHP設定によってファイルアップロードが禁止されています。実行前に php.ini を確"
 "認してください。"
 
-#: ../lib/security.inc:139
+#: ../lib/security.inc:141
 msgid "Your session expired, click here to go back to the login page."
 msgstr ""
 "セッションが期限切れになりました。ここをクリックしてログインページに戻ってく"
 "ださい。"
 
-#: ../templates/login.php:233
+#: ../templates/login.php:208
 msgid "Your session expired, please log in again."
 msgstr "セッションが期限切れになりました。ログインをやり直してください。"
 
-#: ../templates/selfService/adminMain.php:113
-#: ../templates/config/mainmanage.php:139 ../lib/config.inc:389
+#: ../templates/selfService/adminMain.php:139
+#: ../templates/config/mainmanage.php:148 ../lib/config.inc:416
 msgid "Your settings were successfully saved."
 msgstr "設定を保存しました。"
 
-#: ../lib/modules/inetOrgPerson.inc:319
+#: ../lib/modules/inetOrgPerson.inc:472
 msgid "YourCompany, Human Resources"
 msgstr ""
 
-#: ../lib/modules/ddns.inc:97 ../lib/modules/ddns.inc:328
-#: ../lib/modules/ddns.inc:361
+#: ../lib/modules/ddns.inc:99 ../lib/modules/ddns.inc:123
+#: ../lib/modules/ddns.inc:379 ../lib/modules/ddns.inc:412
 msgid "Zone names"
 msgstr "ゾーン名"
 
-#: ../lib/modules/ddns.inc:98
+#: ../lib/modules/ddns.inc:100
 msgid "Zone names for the DNS server (e.g. company.local)."
 msgstr "DNSサーバーのゾーン名(例 company.local)。"
 
@@ -6782,124 +7701,135 @@ msgstr "DNSサーバーのゾーン名(例 company.local)。"
 msgid "[attribute deleted]"
 msgstr "[削除された属性]"
 
-#: ../lib/modules/sambaAccount.inc:289 ../lib/modules/sambaSamAccount.inc:432
+#: ../lib/modules/sambaSamAccount.inc:467
 msgid "\\\\server\\homes\\smiller"
 msgstr ""
 
-#: ../lib/modules/sambaAccount.inc:295 ../lib/modules/sambaSamAccount.inc:438
+#: ../lib/modules/sambaSamAccount.inc:475
 msgid "\\\\server\\profiles\\smiller"
 msgstr ""
 
-#: ../lib/modules/phpGroupwareUser.inc:151
-#: ../lib/modules/phpGroupwareUser.inc:368
+#: ../lib/modules/phpGroupwareUser.inc:162
+#: ../lib/modules/phpGroupwareUser.inc:332
 msgid "active"
 msgstr "有効"
 
-#: ../templates/tree/edit.php:494
+#: ../templates/tree/edit.php:497
 msgid "add value"
 msgstr "値の追加"
 
-#: ../lib/modules/groupOfNames.inc:86 ../lib/modules/posixGroup.inc:389
+#: ../lib/modules/nisnetgroup.inc:99 ../lib/modules/groupOfNames.inc:86
+#: ../lib/modules/posixGroup.inc:360
 msgid "adminstrators"
 msgstr ""
 
-#: ../templates/schema/schema.php:225
+#: ../templates/schema/schema.php:218
 msgid "character"
 msgstr "文字"
 
-#: ../templates/schema/schema.php:224
+#: ../templates/schema/schema.php:217
 msgid "characters"
 msgstr "文字"
 
-#: ../help/help.inc:82
+#: ../help/help.inc:81
 msgid "dc=yourcompany,dc=com"
 msgstr ""
 
-#: ../templates/tree/edit.php:314
+#: ../lib/modules/ppolicyUser.inc:88 ../lib/modules/ppolicyUser.inc:93
+#: ../lib/modules/ppolicyUser.inc:110 ../lib/modules/ppolicyUser.inc:154
+msgid "default"
+msgstr "デフォルト値"
+
+#: ../templates/tree/edit.php:317
 msgid "delete attribute"
 msgstr "属性の削除"
 
-#: ../lib/modules/sambaSamAccount.inc:1416
-#: ../lib/modules/sambaSamAccount.inc:1756
+#: ../lib/modules/sambaSamAccount.inc:1494
+#: ../lib/modules/sambaSamAccount.inc:1822
 msgid "disabled"
 msgstr "禁止"
 
-#: ../lib/modules/sambaSamAccount.inc:1428
-#: ../lib/modules/sambaSamAccount.inc:1767
+#: ../lib/modules/sambaSamAccount.inc:1506
+#: ../lib/modules/sambaSamAccount.inc:1833
 msgid "disconnect"
 msgstr "切断"
 
-#: ../templates/lists/changePassword.php:182
+#: ../templates/lists/changePassword.php:178
 msgid "display on screen"
 msgstr "スクリーンに表示"
 
 #: ../templates/tree/add_value_form.php:107
-#: ../templates/tree/add_value_form.php:110 ../templates/tree/edit.php:179
-#: ../templates/tree/edit.php:181 ../templates/tree/edit.php:308
-#: ../templates/tree/edit.php:310
+#: ../templates/tree/add_value_form.php:110 ../templates/tree/edit.php:182
+#: ../templates/tree/edit.php:184 ../templates/tree/edit.php:311
+#: ../templates/tree/edit.php:313
 msgid "download value"
 msgstr "ダウンロード"
 
-#: ../templates/lists/changePassword.php:156
-#: ../lib/modules/inetOrgPerson.inc:85 ../lib/modules/inetOrgPerson.inc:152
-#: ../lib/modules/inetOrgPerson.inc:287 ../lib/modules/inetOrgPerson.inc:442
-#: ../lib/modules/inetOrgPerson.inc:443 ../lib/modules/inetOrgPerson.inc:863
-#: ../lib/modules/inetOrgPerson.inc:1060 ../lib/modules/inetOrgPerson.inc:1359
+#: ../templates/lists/changePassword.php:152
+#: ../lib/modules/inetOrgPerson.inc:85 ../lib/modules/inetOrgPerson.inc:149
+#: ../lib/modules/inetOrgPerson.inc:258 ../lib/modules/inetOrgPerson.inc:422
+#: ../lib/modules/inetOrgPerson.inc:615 ../lib/modules/inetOrgPerson.inc:616
+#: ../lib/modules/inetOrgPerson.inc:1066 ../lib/modules/inetOrgPerson.inc:1235
+#: ../lib/modules/inetOrgPerson.inc:1601
 msgid "eMail address"
 msgstr "電子メールアドレス"
 
-#: ../templates/tree/edit.php:391
+#: ../templates/tree/edit.php:394
 msgid "false"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:1437
-#: ../lib/modules/sambaSamAccount.inc:1775
+#: ../lib/modules/ppolicy.inc:36
+msgid "force"
+msgstr ""
+
+#: ../lib/modules/sambaSamAccount.inc:1515
+#: ../lib/modules/sambaSamAccount.inc:1841
 msgid "from any client"
 msgstr "任意のクライアントから"
 
-#: ../lib/modules/sambaSamAccount.inc:1438
-#: ../lib/modules/sambaSamAccount.inc:1776
+#: ../lib/modules/sambaSamAccount.inc:1516
+#: ../lib/modules/sambaSamAccount.inc:1842
 msgid "from previous client only"
 msgstr "前回のクライアントからのみ"
 
-#: ../lib/modules/posixAccount.inc:226
+#: ../lib/modules/nisnetgroup.inc:113 ../lib/modules/posixAccount.inc:230
 msgid "group01,group02"
 msgstr ""
 
-#: ../lib/modules/quota.inc:181 ../lib/modules/quota.inc:183
+#: ../lib/modules/quota.inc:186 ../lib/modules/quota.inc:188
 msgid "hours"
 msgstr "時間"
 
-#: ../lib/modules/phpGroupwareUser.inc:151
-#: ../lib/modules/phpGroupwareUser.inc:371
+#: ../lib/modules/phpGroupwareUser.inc:162
+#: ../lib/modules/phpGroupwareUser.inc:335
 msgid "inactive"
 msgstr "無効"
 
-#: ../lib/modules/sambaSamAccount.inc:1420
-#: ../lib/modules/sambaSamAccount.inc:1760
+#: ../lib/modules/sambaSamAccount.inc:1498
+#: ../lib/modules/sambaSamAccount.inc:1826
 msgid "input off, notify off"
-msgstr ""
+msgstr "入力 off, 通知 off"
 
-#: ../lib/modules/sambaSamAccount.inc:1419
-#: ../lib/modules/sambaSamAccount.inc:1759
+#: ../lib/modules/sambaSamAccount.inc:1497
+#: ../lib/modules/sambaSamAccount.inc:1825
 msgid "input off, notify on"
-msgstr ""
+msgstr "入力 off, 通知 on"
 
-#: ../lib/modules/sambaSamAccount.inc:1418
-#: ../lib/modules/sambaSamAccount.inc:1758
+#: ../lib/modules/sambaSamAccount.inc:1496
+#: ../lib/modules/sambaSamAccount.inc:1824
 msgid "input on, notify off"
-msgstr ""
+msgstr "入力 on, 通知 off"
 
-#: ../lib/modules/sambaSamAccount.inc:1417
-#: ../lib/modules/sambaSamAccount.inc:1757
+#: ../lib/modules/sambaSamAccount.inc:1495
+#: ../lib/modules/sambaSamAccount.inc:1823
 msgid "input on, notify on"
-msgstr ""
+msgstr "入力 on, 通知 on"
 
-#: ../lib/tree.inc:1177
+#: ../lib/tree.inc:1175
 msgid "jpegPhoto contains errors"
 msgstr "jpegPhoto にエラーがあります"
 
-#: ../help/help.inc:64
+#: ../help/help.inc:63
 msgid ""
 "ldap://localhost:389 connects to localhost using a standard LDAP connection "
 "on port 389"
@@ -6907,15 +7837,13 @@ msgstr ""
 "ldaps://localhost:389 は、localhostのポート389へ標準的なLDAP接続を行ないま"
 "す。"
 
-#: ../help/help.inc:66
+#: ../help/help.inc:65
 msgid ""
-"ldaps://141.40.146.133 connects to 141.40.146.133 using an encrypted LDAP "
+"ldaps://ldap.domain.com connects to ldap.domain.com using an encrypted LDAP "
 "connection."
-msgstr ""
-"ldaps://141.40.146.133 は、141.40.146.133 へ暗号化されたLDAP接続を行ないま"
-"す。"
+msgstr "ldaps://ldap.example.com は、ldap.example.com へ暗号化されたLDAP接続を行ないます。"
 
-#: ../lib/modules/posixAccount.inc:293
+#: ../lib/modules/posixAccount.inc:297
 msgid "machines"
 msgstr "マシン"
 
@@ -6923,47 +7851,51 @@ msgstr "マシン"
 msgid "mail.yourdomain.org"
 msgstr ""
 
-#: ../lib/modules/sambaAccount.inc:327 ../lib/modules/sambaAccount.inc:337
-#: ../lib/modules/sambaSamAccount.inc:355
-#: ../lib/modules/sambaSamAccount.inc:481
+#: ../lib/modules/sambaSamAccount.inc:386
+#: ../lib/modules/sambaSamAccount.inc:510
 msgid "mydomain"
 msgstr "マイドメイン"
 
-#: ../lib/modules/sambaSamAccount.inc:456
+#: ../lib/modules/sambaSamAccount.inc:443
 msgid "mygroup"
 msgstr "マイグループ"
 
-#: ../lib/modules/sambaSamAccount.inc:1724
-#: ../lib/modules/sambaSamAccount.inc:1732
-#: ../lib/modules/sambaSamAccount.inc:1742
-#: ../lib/modules/sambaSamAccount.inc:1747
-#: ../lib/modules/sambaSamAccount.inc:1752
+#: ../templates/config/confmain.php:244 ../templates/config/confmain.php:248
+#: ../lib/modules/ppolicy.inc:34 ../lib/modules/ppolicy.inc:471
+#: ../lib/modules/ppolicy.inc:487 ../lib/modules/ppolicy.inc:492
+#: ../lib/modules/ppolicy.inc:499 ../lib/modules/ppolicy.inc:502
+#: ../lib/modules/sambaSamAccount.inc:561
+#: ../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
 msgid "no"
 msgstr "いいえ"
 
-#: ../templates/schema/schema.php:165 ../templates/schema/schema.php:234
-#: ../templates/schema/schema.php:245 ../templates/schema/schema.php:294
-#: ../templates/schema/schema.php:360 ../templates/schema/schema.php:375
-#: ../templates/schema/schema.php:409 ../templates/schema/schema.php:431
+#: ../templates/schema/schema.php:158 ../templates/schema/schema.php:227
+#: ../templates/schema/schema.php:238 ../templates/schema/schema.php:287
+#: ../templates/schema/schema.php:353 ../templates/schema/schema.php:368
+#: ../templates/schema/schema.php:402 ../templates/schema/schema.php:424
 #: ../templates/tree/templates/creation/custom.php:189
 #: ../templates/tree/templates/creation/custom.php:212
 msgid "none"
 msgstr "なし"
 
-#: ../templates/tree/edit.php:392
+#: ../templates/tree/edit.php:395
 msgid "none, remove value"
 msgstr "なし, 値を削除"
 
-#: ../templates/schema/schema.php:221
+#: ../templates/schema/schema.php:214
 msgid "not applicable"
 msgstr "適用対象外"
 
-#: ../templates/schema/schema.php:172 ../templates/schema/schema.php:177
-#: ../templates/schema/schema.php:182 ../templates/schema/schema.php:215
+#: ../templates/schema/schema.php:165 ../templates/schema/schema.php:170
+#: ../templates/schema/schema.php:175 ../templates/schema/schema.php:208
 msgid "not specified"
 msgstr "未入力"
 
-#: ../help/help.inc:76
+#: ../help/help.inc:75
 msgid ""
 "ou=People,dc=yourcompany,dc=com will read and store all accounts in this "
 "subtree."
@@ -6971,43 +7903,45 @@ msgstr ""
 "ou=People,dc=yourcompany,dc=com は、このサブツリーのすべてのアカウントを読み"
 "書きします。"
 
-#: ../templates/masscreate.php:166
+#: ../templates/masscreate.php:244 ../lib/modules/eduPerson.inc:182
+#: ../lib/modules/eduPerson.inc:188 ../lib/modules/eduPerson.inc:194
 msgid "ou=accounts,dc=yourdomain,dc=org"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:279
+#: ../lib/modules/posixAccount.inc:283
 msgid "pc01$"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:300
+#: ../lib/modules/posixAccount.inc:304
 msgid "pc01,Room 2.34"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:350
+#: ../lib/modules/inetOrgPerson.inc:482
 msgid "pc01,pc02"
 msgstr ""
 
-#: ../templates/tree/edit.php:246 ../templates/selfService/adminMain.php:554
-#: ../templates/config/confmain.php:466 ../lib/modules.inc:1134
+#: ../templates/tree/edit.php:249 ../templates/selfService/adminMain.php:605
+#: ../templates/config/confmain.php:531 ../lib/modules.inc:1232
 msgid "required"
 msgstr "必須"
 
-#: ../lib/modules/sambaSamAccount.inc:1429
-#: ../lib/modules/sambaSamAccount.inc:1768
+#: ../lib/modules/sambaSamAccount.inc:1507
+#: ../lib/modules/sambaSamAccount.inc:1834
 msgid "reset"
 msgstr "リセット"
 
-#: ../lib/modules/sambaAccount.inc:231 ../lib/modules/posixGroup.inc:380
-#: ../lib/modules/posixAccount.inc:254 ../lib/modules/sambaSamAccount.inc:367
+#: ../lib/modules/posixGroup.inc:351 ../lib/modules/posixAccount.inc:258
+#: ../lib/modules/asteriskAccount.inc:142
+#: ../lib/modules/sambaSamAccount.inc:398
 msgid "secret"
 msgstr ""
 
-#: ../templates/lists/changePassword.php:184
+#: ../templates/lists/changePassword.php:180
 msgid "send via mail"
 msgstr "メールで送信"
 
-#: ../lib/modules/nisMailAlias.inc:91 ../lib/modules/inetOrgPerson.inc:337
-#: ../lib/modules/uidObject.inc:62 ../lib/modules/posixAccount.inc:199
+#: ../lib/modules/nisMailAlias.inc:91 ../lib/modules/inetOrgPerson.inc:1299
+#: ../lib/modules/uidObject.inc:62 ../lib/modules/posixAccount.inc:203
 msgid "smiller"
 msgstr ""
 
@@ -7023,39 +7957,171 @@ msgstr ""
 msgid "ssh-dss 234234 user@host"
 msgstr ""
 
-#: ../templates/tree/edit.php:437
+#: ../templates/tree/edit.php:440
 msgid "structural"
 msgstr "構造型"
 
-#: ../templates/tree/edit.php:389
+#: ../lib/modules/asteriskExtension.inc:175
+msgid "test"
+msgstr "テスト"
+
+#: ../lib/modules/asteriskExtension.inc:169
+msgid "test-start"
+msgstr ""
+
+#: ../templates/tree/edit.php:392
 msgid "true"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:229 ../lib/modules/aliasEntry.inc:64
+#: ../lib/modules/inetOrgPerson.inc:344 ../lib/modules/ipHost.inc:92
+#: ../lib/modules/aliasEntry.inc:64
 msgid "uid=smiller,ou=People,dc=company,dc=com"
 msgstr ""
 
-#: ../lib/modules/posixGroup.inc:374
+#: ../lib/modules/posixGroup.inc:345
 msgid "user01,user02,user03"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:289
+#: ../lib/modules/inetOrgPerson.inc:424 ../lib/modules/eduPerson.inc:143
 msgid "user@company.com"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:219
+#: ../lib/modules/posixAccount.inc:223
 msgid "users"
 msgstr "ユーザ"
 
-#: ../lib/modules/inetOrgPerson.inc:313
-#: ../lib/modules/sambaSamAccount.inc:1722
-#: ../lib/modules/sambaSamAccount.inc:1730
-#: ../lib/modules/sambaSamAccount.inc:1740
-#: ../lib/modules/sambaSamAccount.inc:1745
-#: ../lib/modules/sambaSamAccount.inc:1750
+#: ../templates/config/confmain.php:243 ../templates/config/confmain.php:247
+#: ../lib/modules/ppolicy.inc:35 ../lib/modules/ppolicy.inc:489
+#: ../lib/modules/ppolicy.inc:494 ../lib/modules/ppolicy.inc:497
+#: ../lib/modules/ppolicy.inc:504 ../lib/modules/inetOrgPerson.inc:464
+#: ../lib/modules/sambaSamAccount.inc:560
+#: ../lib/modules/sambaSamAccount.inc:1788
+#: ../lib/modules/sambaSamAccount.inc:1796
+#: ../lib/modules/sambaSamAccount.inc:1806
+#: ../lib/modules/sambaSamAccount.inc:1811
+#: ../lib/modules/sambaSamAccount.inc:1816
 msgid "yes"
 msgstr "はい"
 
+#~ msgid "Account lists - Filters"
+#~ msgstr "アカウント一覧 - フィルター"
+
+#~ msgid "Account type selection"
+#~ msgstr "アカウント種別の選択"
+
+#~ msgid "Add IP"
+#~ msgstr "IPアドレスを追加"
+
+#~ msgid "Add Samba 3 account"
+#~ msgstr "Samba 3アカウントの追加"
+
+#~ msgid "Adding of a fixed IP failed because of errors."
+#~ msgstr "エラーが発生したため固定IPアドレスの追加に失敗しました。"
+
+#~ msgid "Adds input fields for a new fixed IP address."
+#~ msgstr "新しい固定IPアドレスの入力フィールドを追加する。"
+
+#~ msgid "Configuration wizard"
+#~ msgstr "構成設定ウィザード"
+
+#~ msgid "Delete IP"
+#~ msgstr "IPアドレスを削除"
+
+#~ msgid "Delete PDF structure"
+#~ msgstr "PDF構成の削除"
+
+#~ msgid "Deletes a fixed IP address."
+#~ msgstr "固定IPアドレスを削除。"
+
+#~ msgid ""
+#~ "Domain name contains invalid characters. Valid characters are: a-z, A-Z, "
+#~ "0-9 and -."
+#~ msgstr ""
+#~ "ドメイン名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9 と -で"
+#~ "す。"
+
+#~ msgid "Donate"
+#~ msgstr "寄付する"
+
+#~ msgid "Drive letter assigned on windows workstations as homedirectory."
+#~ msgstr ""
+#~ "Windows ワークステーションのホームディレクトリとして割り当てられたドライブ"
+#~ "文字。"
+
+#~ msgid "Edit account types"
+#~ msgstr "アカウント種別の編集"
+
+#~ msgid "Edit modules"
+#~ msgstr "モジュールの編集"
+
+#~ msgid ""
+#~ "File name and path relative to the netlogon-share which should be "
+#~ "executed on logon. $user and $group are replaced with user and group name."
+#~ msgstr ""
+#~ "ログオンの時に実行される、ネットログオン共有への相対的なパスとファイル"
+#~ "名。 $user と $group はユーザとグループ名に置き換えられます。"
+
+#~ msgid "Host list"
+#~ msgstr "ホスト一覧"
+
+#~ msgid ""
+#~ "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, .-_ で"
+#~ "す。ホスト名の末尾は$でなくてはなりません。"
+
+#~ msgid "If checked account will be deactivated. (Setting D-Flag)"
+#~ msgstr ""
+#~ "チェックした場合、(D-フラグをセットすることで)アカウントは無効化されます。"
+
+#~ msgid ""
+#~ "If you want to create domain administrators or other special users use "
+#~ "this option."
+#~ msgstr ""
+#~ "ドメイン管理者やその他の特殊アカウントを作成したい場合は、このオプションを"
+#~ "使用してください。"
+
+#~ msgid "Module selection"
+#~ msgstr "モジュール選択"
+
+#~ msgid "Please enter the same password in both password-fields."
+#~ msgstr "2つのパスワードフィールドに同じパスワードを入力してください。"
+
+#~ msgid "Please select your account type:"
+#~ msgstr "アカウントタイプを選択してください:"
+
+#~ msgid "Samba 2"
+#~ msgstr "Samba 2"
+
+#~ msgid "Script settings"
+#~ msgstr "スクリプト設定"
+
+#~ msgid "The net mask was invalid and was corrected."
+#~ msgstr "不正なネットマスクを修正しました。"
+
+#~ msgid "The netmask was set."
+#~ msgstr "ネットマスクが設定されました。"
+
+#~ msgid ""
+#~ "This is the number of seconds after when the user may or has to change "
+#~ "his password."
+#~ msgstr ""
+#~ "ユーザによるパスワード変更が可能になる、または強制されるまでの秒数を示す数"
+#~ "値。"
+
+#~ msgid "Update attribute \"sambaPwdCanChange\" on password change"
+#~ msgstr "パスワード変更時に属性 \"sambaPwdCanChange\" を更新する。"
+
+#~ msgid "Update attribute \"sambaPwdMustChange\" on password change"
+#~ msgstr "パスワード変更時に属性 \"sambaPwdMustChange\" を更新する。"
+
+#~ msgid "User can/must change password"
+#~ msgstr "ユーザによるパスワード変更の許可/強制"
+
+#~ msgid "Windows group RID"
+#~ msgstr "WindowsグループRID"
+
 #~ msgid "Account suffix"
 #~ msgstr "アカウント・サフィックス"
 
@@ -7132,9 +8198,6 @@ msgstr "はい"
 #~ msgid "Date when the employee was initially employed."
 #~ msgstr "従業員が最初に雇用された日付。"
 
-#~ msgid "Department"
-#~ msgstr "部署"
-
 #~ msgid "Employee skills"
 #~ msgstr "従業員のスキル"
 
@@ -7186,12 +8249,6 @@ msgstr "はい"
 #~ msgid "This is the user's login name for the wiki."
 #~ msgstr "このユーザのwiki上のログイン名。"
 
-#~ msgid "Use default"
-#~ msgstr "デフォルト値を使用"
-
-#~ msgid "Wiki name"
-#~ msgstr "Wiki名"
-
 #~ msgid "required for Samba 3 accounts"
 #~ msgstr "Samba 3アカウントにおいて必須"
 
@@ -7216,9 +8273,6 @@ msgstr "はい"
 #~ msgid "Delete group"
 #~ msgstr "グループを削除"
 
-#~ msgid "Delete host"
-#~ msgstr "ホストを削除"
-
 #~ msgid "Edit logon hours"
 #~ msgstr "ログオン時間の編集"
 
@@ -7344,9 +8398,6 @@ msgstr "はい"
 #~ msgid "Attributes in User List"
 #~ msgstr "ユーザリスト中の属性"
 
-#~ msgid "Back to domain list"
-#~ msgstr "ドメイン一覧に戻る"
-
 #~ msgid "Create group accounts"
 #~ msgstr "グループアカウントを作成"
 
@@ -7413,9 +8464,6 @@ msgstr "はい"
 #~ msgid "Manages Samba 3 domain accounts."
 #~ msgstr "Samba 3アカウントを管理します。"
 
-#~ msgid "Module settings"
-#~ msgstr "モジュール設定"
-
 #~ msgid "Next RID to use when creating groups."
 #~ msgstr "グループ作成時に使われる次のRID。"
 
@@ -7470,9 +8518,6 @@ msgstr "はい"
 #~ msgid "Time zones:"
 #~ msgstr "タイムゾーン:"
 
-#~ msgid "User information page"
-#~ msgstr "ユーザ情報ページ"
-
 #~ msgid "Account expiration date. Format: DD-MM-YYYY"
 #~ msgstr "アカウント有効期限。形式は: DD-MM-YYYY"
 
@@ -7553,9 +8598,6 @@ msgstr "はい"
 #~ msgid "Position in ldap-tree where the user should be created."
 #~ msgstr "ユーザを作成すべきLDAPツリーの位置。"
 
-#~ msgid "Select group profile"
-#~ msgstr "グループプロファイルの選択"
-
 #~ msgid "Size"
 #~ msgstr "サイズ"