From a53c8c3e62ccd59f124c5c4cfd232ab18cb8a82d Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Thu, 1 Nov 2007 16:00:44 +0000
Subject: [PATCH] translation update

---
 lam/locale/ja_JP/LC_MESSAGES/messages.mo |  Bin 118925 -> 128077 bytes
 lam/locale/ja_JP/LC_MESSAGES/messages.po | 3046 +++++++++++++---------
 2 files changed, 1837 insertions(+), 1209 deletions(-)

diff --git a/lam/locale/ja_JP/LC_MESSAGES/messages.mo b/lam/locale/ja_JP/LC_MESSAGES/messages.mo
index 741f2cc61bfd8b626ecefab66f6871a181ccfa22..68c3a64777c6bb5f5db1136c6ccba96297e7d05c 100644
GIT binary patch
delta 32414
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

delta 24980
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
UrG7Hc82|H+%;)}EKbx@s543B?!~g&Q

diff --git a/lam/locale/ja_JP/LC_MESSAGES/messages.po b/lam/locale/ja_JP/LC_MESSAGES/messages.po
index e8f58204..f4462209 100644
--- a/lam/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/lam/locale/ja_JP/LC_MESSAGES/messages.po
@@ -5,17 +5,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: LAM 1.1.0\n"
+"Project-Id-Version: LAM 2.1.0\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de \n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2006-10-27 00:29+0900\n"
+"PO-Revision-Date: 2007-11-02 00:27+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:360
+#: ../lib/modules/posixAccount.inc:373
 msgid "$user and $group are replaced with user name or primary group name."
 msgstr ""
 "$user と $group はユーザ名またはプライマリグループ名に置き換えられます。"
@@ -30,7 +30,7 @@ msgstr "%s個の別名が見つかりました"
 msgid "%s domain(s) found"
 msgstr "%s個のドメインが見つかりました"
 
-#: ../lib/types/group.inc:110
+#: ../lib/types/group.inc:121
 #, php-format
 msgid "%s group(s) found"
 msgstr "%s個のグループが見つかりました"
@@ -45,7 +45,7 @@ msgstr "%s個のSamba ホストが見つかりました"
 msgid "%s object(s) found"
 msgstr "%s個のオブジェクトが見つかりました"
 
-#: ../lib/types/user.inc:122
+#: ../lib/types/user.inc:123
 #, php-format
 msgid "%s user(s) found"
 msgstr "%s名のユーザが見つかりました"
@@ -66,10 +66,30 @@ msgstr "(このエントリに対して有効な新しい属性はありませ
 msgid "(no new binary attributes available for this entry)"
 msgstr "(このエントリに対して有効な新しいバイナリ属性はありません)"
 
-#: ../lib/modules/posixAccount.inc:222
+#: ../lib/modules/posixAccount.inc:224
 msgid "/home/smiller"
 msgstr ""
 
+#: ../lib/modules/inetOrgPerson.inc:219
+msgid "123-123-1234"
+msgstr ""
+
+#: ../lib/modules/inetOrgPerson.inc:231
+msgid "123-123-1235"
+msgstr ""
+
+#: ../lib/modules/inetOrgPerson.inc:237
+msgid "123-123-1236"
+msgstr ""
+
+#: ../lib/modules/inetOrgPerson.inc:225
+msgid "123-124-1234"
+msgstr ""
+
+#: ../lib/modules/inetOrgPerson.inc:213
+msgid "12345"
+msgstr ""
+
 #: ../templates/massBuildAccounts.php:114
 msgid "A required column is missing in your CSV file."
 msgstr "CSVファイル中の必須カラムが不足しています。"
@@ -82,55 +102,67 @@ msgstr ""
 "ユーザは自身の代理人を指定できます。この属性はemailの送信にKolab smtpデーモン"
 "(Postfix)を使用する場合にチェックします。"
 
-#: ../lib/modules/sambaSamAccount.inc:440
+#: ../lib/modules/neofonieInetOrgPerson.inc:76
+#: ../lib/modules/neofonieInetOrgPerson.inc:124
+#: ../lib/modules/neofonieInetOrgPerson.inc:178
+#: ../lib/modules/neofonieInetOrgPerson.inc:227
+#: ../lib/modules/neofonieInetOrgPerson.inc:600
+#: ../lib/modules/neofonieInetOrgPerson.inc:724
+msgid "AIM account"
+msgstr "AIMアカウント"
+
+#: ../lib/modules/sambaSamAccount.inc:489
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr ""
 
-#: ../lib/modules/account.inc:53
+#: ../lib/modules/account.inc:54
 msgid "Account"
 msgstr "アカウント"
 
-#: ../templates/massBuildAccounts.php:167 ../lib/modules/account.inc:117
-#: ../lib/modules/ieee802device.inc:85 ../lib/modules/posixGroup.inc:470
-#: ../lib/modules/posixGroup.inc:474 ../lib/modules/posixGroup.inc:475
+#: ../templates/massBuildAccounts.php:167 ../lib/modules/account.inc:132
+#: ../lib/modules/ieee802device.inc:85 ../lib/modules/posixGroup.inc:461
+#: ../lib/modules/posixGroup.inc:465 ../lib/modules/posixGroup.inc:466
 #: ../lib/modules/quota.inc:46 ../lib/modules/quota.inc:48
 #: ../lib/modules/quota.inc:50 ../lib/modules/quota.inc:52
 #: ../lib/modules/quota.inc:54 ../lib/modules/quota.inc:56
-#: ../lib/modules/quota.inc:57 ../lib/modules/sambaAccount.inc:63
-#: ../lib/modules/sambaAccount.inc:66 ../lib/modules/sambaAccount.inc:69
-#: ../lib/modules/sambaAccount.inc:71 ../lib/modules/sambaAccount.inc:73
-#: ../lib/modules/sambaAccount.inc:76 ../lib/modules/sambaAccount.inc:77
-#: ../lib/modules/sambaAccount.inc:79 ../lib/modules/sambaAccount.inc:80
-#: ../lib/modules/sambaAccount.inc:81 ../lib/modules/sambaAccount.inc:82
-#: ../lib/modules/sambaAccount.inc:83 ../lib/modules/sambaAccount.inc:84
-#: ../lib/modules/sambaAccount.inc:85 ../lib/modules/sambaAccount.inc:86
-#: ../lib/modules/sambaAccount.inc:87 ../lib/modules/sambaSamAccount.inc:78
-#: ../lib/modules/sambaSamAccount.inc:81 ../lib/modules/sambaSamAccount.inc:84
-#: ../lib/modules/sambaSamAccount.inc:86 ../lib/modules/sambaSamAccount.inc:89
-#: ../lib/modules/sambaSamAccount.inc:90 ../lib/modules/sambaSamAccount.inc:91
-#: ../lib/modules/sambaSamAccount.inc:92 ../lib/modules/sambaSamAccount.inc:94
+#: ../lib/modules/quota.inc:57 ../lib/modules/neofonieInetOrgPerson.inc:32
+#: ../lib/modules/neofonieInetOrgPerson.inc:33
+#: ../lib/modules/sambaAccount.inc:63 ../lib/modules/sambaAccount.inc:66
+#: ../lib/modules/sambaAccount.inc:69 ../lib/modules/sambaAccount.inc:71
+#: ../lib/modules/sambaAccount.inc:73 ../lib/modules/sambaAccount.inc:76
+#: ../lib/modules/sambaAccount.inc:77 ../lib/modules/sambaAccount.inc:79
+#: ../lib/modules/sambaAccount.inc:80 ../lib/modules/sambaAccount.inc:81
+#: ../lib/modules/sambaAccount.inc:82 ../lib/modules/sambaAccount.inc:83
+#: ../lib/modules/sambaAccount.inc:84 ../lib/modules/sambaAccount.inc:85
+#: ../lib/modules/sambaAccount.inc:86 ../lib/modules/sambaAccount.inc:87
+#: ../lib/modules/sambaSamAccount.inc:82 ../lib/modules/sambaSamAccount.inc:85
+#: ../lib/modules/sambaSamAccount.inc:88 ../lib/modules/sambaSamAccount.inc:90
+#: ../lib/modules/sambaSamAccount.inc:93 ../lib/modules/sambaSamAccount.inc:94
 #: ../lib/modules/sambaSamAccount.inc:95 ../lib/modules/sambaSamAccount.inc:96
-#: ../lib/modules/sambaSamAccount.inc:97 ../lib/modules/sambaSamAccount.inc:98
-#: ../lib/modules/sambaSamAccount.inc:99
+#: ../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/posixAccount.inc:62
-#: ../lib/modules/posixAccount.inc:67 ../lib/modules/posixAccount.inc:71
-#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:80
-#: ../lib/modules/posixAccount.inc:81 ../lib/modules/posixAccount.inc:82
-#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/sambaSamAccount.inc:105
+#: ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/sambaSamAccount.inc:108
+#: ../lib/modules/sambaSamAccount.inc:109 ../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/posixAccount.inc:85
 #: ../lib/modules/posixAccount.inc:86 ../lib/modules/posixAccount.inc:87
-#: ../lib/modules/posixAccount.inc:88 ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:91 ../lib/modules/posixAccount.inc:93
 #: ../lib/modules/kolabUser.inc:225 ../lib/modules/kolabUser.inc:227
 #: ../lib/modules/kolabUser.inc:229 ../lib/modules/kolabUser.inc:231
 #: ../lib/modules/kolabUser.inc:233 ../lib/modules/kolabUser.inc:235
-#: ../lib/modules/kolabUser.inc:237 ../lib/modules/sambaGroupMapping.inc:376
-#: ../lib/modules/sambaGroupMapping.inc:377
-#: ../lib/modules/shadowAccount.inc:46 ../lib/modules/shadowAccount.inc:48
-#: ../lib/modules/shadowAccount.inc:50 ../lib/modules/shadowAccount.inc:52
-#: ../lib/modules/shadowAccount.inc:54 ../lib/modules/shadowAccount.inc:55
+#: ../lib/modules/kolabUser.inc:237 ../lib/modules/sambaGroupMapping.inc:381
+#: ../lib/modules/sambaGroupMapping.inc:382
+#: ../lib/modules/shadowAccount.inc:47 ../lib/modules/shadowAccount.inc:49
+#: ../lib/modules/shadowAccount.inc:51 ../lib/modules/shadowAccount.inc:53
+#: ../lib/modules/shadowAccount.inc:55 ../lib/modules/shadowAccount.inc:56
 #: ../lib/modules/sambaDomain.inc:185 ../lib/modules/sambaDomain.inc:187
 #: ../lib/modules/sambaDomain.inc:189 ../lib/modules/sambaDomain.inc:191
 #: ../lib/modules/sambaDomain.inc:193 ../lib/modules/sambaDomain.inc:195
@@ -141,8 +173,9 @@ msgstr "アカウント"
 #: ../lib/modules/inetOrgPerson.inc:61 ../lib/modules/inetOrgPerson.inc:63
 #: ../lib/modules/inetOrgPerson.inc:65 ../lib/modules/inetOrgPerson.inc:67
 #: ../lib/modules/inetOrgPerson.inc:69 ../lib/modules/inetOrgPerson.inc:71
-#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:73
-#: ../lib/modules/inetOrgPerson.inc:76
+#: ../lib/modules/inetOrgPerson.inc:73 ../lib/modules/inetOrgPerson.inc:74
+#: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:78
+#: ../lib/modules/inetOrgPerson.inc:81
 #: ../lib/modules/inetLocalMailRecipient.inc:121
 #: ../lib/modules/inetLocalMailRecipient.inc:123
 #: ../lib/modules/inetLocalMailRecipient.inc:125
@@ -155,43 +188,49 @@ msgstr "アカウント %s"
 msgid "Account creation via file upload"
 msgstr "ファイルアップロードによるアカウント作成"
 
-#: ../lib/modules/posixAccount.inc:367
+#: ../lib/modules/posixAccount.inc:380
 msgid "Account deactivated"
 msgstr "アカウントが無効化されました"
 
-#: ../lib/modules/sambaSamAccount.inc:265
-#: ../lib/modules/sambaSamAccount.inc:343
-#: ../lib/modules/sambaSamAccount.inc:885
-#: ../lib/modules/sambaSamAccount.inc:1105
-#: ../lib/modules/shadowAccount.inc:104 ../lib/modules/shadowAccount.inc:169
-#: ../lib/modules/shadowAccount.inc:201 ../lib/modules/shadowAccount.inc:289
-#: ../lib/modules/shadowAccount.inc:334
+#: ../lib/modules/sambaSamAccount.inc:272
+#: ../lib/modules/sambaSamAccount.inc:392
+#: ../lib/modules/sambaSamAccount.inc:1051
+#: ../lib/modules/sambaSamAccount.inc:1283
+#: ../lib/modules/sambaSamAccount.inc:1473
+#: ../lib/modules/shadowAccount.inc:105 ../lib/modules/shadowAccount.inc:170
+#: ../lib/modules/shadowAccount.inc:202 ../lib/modules/shadowAccount.inc:290
+#: ../lib/modules/shadowAccount.inc:335
 msgid "Account expiration date"
 msgstr "アカウント失効日"
 
-#: ../lib/modules/shadowAccount.inc:362
+#: ../lib/modules/shadowAccount.inc:363
 msgid "Account inactive"
 msgstr "アカウントが無効です"
 
 #: ../lib/modules/sambaAccount.inc:138 ../lib/modules/sambaAccount.inc:255
 #: ../lib/modules/sambaAccount.inc:367 ../lib/modules/sambaAccount.inc:370
-#: ../lib/modules/sambaAccount.inc:732 ../lib/modules/sambaSamAccount.inc:211
-#: ../lib/modules/sambaSamAccount.inc:214
-#: ../lib/modules/sambaSamAccount.inc:321
-#: ../lib/modules/sambaSamAccount.inc:863
-#: ../lib/modules/sambaSamAccount.inc:1093
+#: ../lib/modules/sambaAccount.inc:746 ../lib/modules/sambaSamAccount.inc:215
+#: ../lib/modules/sambaSamAccount.inc:221
+#: ../lib/modules/sambaSamAccount.inc:370
+#: ../lib/modules/sambaSamAccount.inc:994
+#: ../lib/modules/sambaSamAccount.inc:1461
 msgid "Account is deactivated"
 msgstr "無効なアカウント"
 
-#: ../help/help.inc:139
+#: ../lib/modules/sambaSamAccount.inc:218
+#: ../lib/modules/sambaSamAccount.inc:1002
+msgid "Account is locked"
+msgstr "ロックされたアカウント"
+
+#: ../help/help.inc:137
 msgid "Account lists - Filters"
 msgstr "アカウント一覧 - フィルター"
 
-#: ../templates/delete.php:87
+#: ../templates/delete.php:89
 msgid "Account name:"
 msgstr "アカウント名:"
 
-#: ../templates/pdfedit/pdfdelete.php:82
+#: ../templates/pdfedit/pdfdelete.php:82 ../lib/modules/groupOfNames.inc:219
 msgid "Account type"
 msgstr "アカウント種別"
 
@@ -199,11 +238,11 @@ msgstr "アカウント種別"
 msgid "Account type selection"
 msgstr "アカウント種別の選択"
 
-#: ../templates/config/confmain.php:192 ../help/help.inc:112
+#: ../templates/config/confmain.php:198 ../help/help.inc:105
 msgid "Account types and modules"
 msgstr "アカウント種別とモジュール"
 
-#: ../help/help.inc:114
+#: ../help/help.inc:107
 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 "
@@ -213,19 +252,39 @@ msgstr ""
 "義します。アカウントモジュールは、編集対象となるプロパティ(e.g. Unix や "
 "Samba)を定義します。"
 
-#: ../lib/modules.inc:1011
+#: ../lib/modules.inc:1043
 msgid "Account was created successfully."
 msgstr "アカウントが作成されました。"
 
-#: ../lib/modules.inc:1014
+#: ../lib/modules.inc:1046
 msgid "Account was modified successfully."
 msgstr "アカウントが変更されました。"
 
-#: ../lib/modules/posixAccount.inc:343
+#: ../lib/modules/sambaSamAccount.inc:279
+msgid "Activate this checkbox to allow this user to use the terminal service."
+msgstr "このユーザーに対してターミナルサービスの利用を許可する場合にチェックボックスを有効にしてください。"
+
+#: ../lib/modules/sambaSamAccount.inc:300
+msgid "Activate this checkbox to connect drives from the client machine."
+msgstr "クライアントマシンからドライブを接続する場合にチェックボックスを有効にしてください。"
+
+#: ../lib/modules/sambaSamAccount.inc:303
+msgid "Activate this checkbox to connect printers from the client machine."
+msgstr "クライアントマシンからプリンターに接続する場合にチェックボックスを有効にしてください。"
+
+#: ../lib/modules/sambaSamAccount.inc:288
+msgid ""
+"Activate this checkbox to inherit the initial program and working directory "
+"from the client machine."
+msgstr "クライアントマシンの初期プログラムと作業ディレクトリを継承する場合にチェックボックスを有効にしてください。"
+
+#: ../lib/modules/sambaSamAccount.inc:306
+msgid "Activate this checkbox to set the client's printer as default printer."
+msgstr "クライアントのプリンタをデフォルトプリンタにする場合にチェックボックスを有効にしてください。"
+
+#: ../lib/modules/posixAccount.inc:352
 msgid "Activating this checkbox will remove the user's home directory."
-msgstr ""
-"このチェックボックスを有効にした場合、ユーザのホームディレクトリを削除しま"
-"す。"
+msgstr "このチェックボックスを有効にした場合、ユーザのホームディレクトリを削除します。"
 
 #: ../templates/config/conftypes.php:189
 msgid "Active account types"
@@ -237,15 +296,29 @@ msgstr "有効なアカウント種別"
 #: ../templates/tree/add_attr_form.php:130
 #: ../templates/tree/add_attr_form.php:162
 #: ../templates/config/conftypes.php:178 ../templates/pdfedit/pdfpage.php:725
-#: ../lib/modules/ieee802device.inc:106 ../lib/modules/kolabUser.inc:345
-#: ../lib/modules/kolabUser.inc:362 ../lib/modules/kolabUser.inc:388
-#: ../lib/modules/ldapPublicKey.inc:99
+#: ../lib/modules/ieee802device.inc:106
+#: ../lib/modules/neofonieInetOrgPerson.inc:432
+#: ../lib/modules/kolabUser.inc:347 ../lib/modules/kolabUser.inc:364
+#: ../lib/modules/kolabUser.inc:390 ../lib/modules/ldapPublicKey.inc:99
 #: ../lib/modules/inetLocalMailRecipient.inc:161
+#: ../lib/modules/groupOfNames.inc:162 ../lib/modules/groupOfNames.inc:304
 #: ../lib/modules/nisMailAlias.inc:148
 msgid "Add"
 msgstr "追加"
 
-#: ../templates/selfService/adminMain.php:445 ../help/help.inc:175
+#: ../lib/modules/neofonieInetOrgPerson.inc:344
+msgid "Add Neofonie attributes"
+msgstr "Neofonie属性の追加"
+
+#: ../lib/modules/sambaSamAccount.inc:1161
+msgid "Add Samba 3 account"
+msgstr "Samba 3アカウントの追加"
+
+#: ../lib/modules/groupOfNames.inc:336
+msgid "Add entries of this type:"
+msgstr "この型のエントリを追加:"
+
+#: ../templates/selfService/adminMain.php:480 ../help/help.inc:173
 msgid "Add input field"
 msgstr "入力フィールドの追加"
 
@@ -260,17 +333,17 @@ msgstr "新しい属性の追加"
 msgid "Add new binary attribute"
 msgstr "新しいバイナリ属性の追加"
 
-#: ../templates/selfService/adminMain.php:428 ../help/help.inc:173
+#: ../templates/selfService/adminMain.php:463 ../help/help.inc:171
 msgid "Add new group"
 msgstr "新しいグループの追加"
 
-#: ../lib/modules/inetOrgPerson.inc:360 ../lib/modules/inetOrgPerson.inc:712
-#: ../lib/modules/inetOrgPerson.inc:797
+#: ../lib/modules/inetOrgPerson.inc:386 ../lib/modules/inetOrgPerson.inc:794
+#: ../lib/modules/inetOrgPerson.inc:879 ../lib/modules/inetOrgPerson.inc:1289
 msgid "Add photo"
 msgstr "写真を追加"
 
 #: ../templates/config/profmanage.php:162
-#: ../templates/selfService/profManage.php:137 ../help/help.inc:115
+#: ../templates/selfService/profManage.php:137 ../help/help.inc:113
 msgid "Add profile"
 msgstr "プロファイル追加"
 
@@ -282,10 +355,10 @@ msgstr "セクションまた静的テキストを追加"
 msgid "Adding attribute failed!"
 msgstr "属性の追加に失敗しました!"
 
-#: ../lib/modules/posixAccount.inc:214 ../lib/modules/posixAccount.inc:334
-#: ../lib/modules/posixAccount.inc:375 ../lib/modules/posixAccount.inc:836
-#: ../lib/modules/posixAccount.inc:914 ../lib/modules/posixAccount.inc:975
-#: ../lib/modules/posixAccount.inc:1033
+#: ../lib/modules/posixAccount.inc:216 ../lib/modules/posixAccount.inc:343
+#: ../lib/modules/posixAccount.inc:388 ../lib/modules/posixAccount.inc:957
+#: ../lib/modules/posixAccount.inc:1045 ../lib/modules/posixAccount.inc:1108
+#: ../lib/modules/posixAccount.inc:1168
 msgid "Additional groups"
 msgstr "追加のグループ"
 
@@ -293,7 +366,7 @@ msgstr "追加のグループ"
 msgid "Additional tasks for module:"
 msgstr "モジュールに対する追加タスク:"
 
-#: ../help/help.inc:174
+#: ../help/help.inc:172
 msgid ""
 "Adds a new group element to the list of self service options. Use this to "
 "structure the input fields."
@@ -301,15 +374,19 @@ msgstr ""
 "セルフサービス・オプションのリストに新しいグループ要素を追加します。入力"
 "フィールドを構造化するために使用します。"
 
-#: ../help/help.inc:176
+#: ../help/help.inc:174
 msgid "Adds a new self service option to the selected group element."
 msgstr "選択したグループ要素に新しいセルフサービス・オプションを追加します。"
 
-#: ../lib/modules/posixGroup.inc:357
+#: ../lib/modules/inetOrgPerson.inc:189
+msgid "Administration"
+msgstr "管理"
+
+#: ../lib/modules/posixGroup.inc:348 ../lib/modules/groupOfNames.inc:89
 msgid "Administrators group"
 msgstr "管理者グループ"
 
-#: ../lib/modules/sambaSamAccount.inc:427
+#: ../lib/modules/sambaSamAccount.inc:476
 msgid "Alaska"
 msgstr ""
 
@@ -327,28 +404,34 @@ msgstr "別名"
 msgid "Aliases"
 msgstr "別名"
 
-#: ../templates/selfService/selfServiceMain.php:128
+#: ../templates/selfService/selfServiceMain.php:145
 #: ../templates/initsuff.php:156
 msgid "All changes were successful."
 msgstr "すべての変更が成功しました。"
 
-#: ../lib/modules/sambaDomain.inc:106 ../lib/modules/sambaDomain.inc:272
-#: ../lib/modules/sambaDomain.inc:619
+#: ../lib/modules/sambaDomain.inc:106 ../lib/modules/sambaDomain.inc:293
+#: ../lib/modules/sambaDomain.inc:663
 msgid "Allow machine password changes"
 msgstr "マシンパスワードの変更を許可"
 
+#: ../lib/modules/sambaSamAccount.inc:278
+#: ../lib/modules/sambaSamAccount.inc:1326
+#: ../lib/modules/sambaSamAccount.inc:1690
+msgid "Allow terminal server login"
+msgstr "ターミナルサーバログインを許可"
+
 #: ../templates/config/mainmanage.php:180 ../lib/types/user.inc:86
-#: ../help/help.inc:137
+#: ../help/help.inc:135
 msgid "Allowed hosts"
 msgstr "許可されたホスト"
 
-#: ../lib/modules/sambaAccount.inc:830 ../lib/modules/sambaAccount.inc:831
-#: ../lib/modules/sambaSamAccount.inc:986
-#: ../lib/modules/sambaSamAccount.inc:987
+#: ../lib/modules/sambaAccount.inc:850 ../lib/modules/sambaAccount.inc:851
+#: ../lib/modules/sambaSamAccount.inc:1183
+#: ../lib/modules/sambaSamAccount.inc:1184
 msgid "Allowed workstations"
 msgstr "許可されたワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:442
+#: ../lib/modules/sambaSamAccount.inc:491
 msgid "Almaty, Dhaka, Colombo"
 msgstr ""
 
@@ -365,11 +448,11 @@ msgstr "常に拒否"
 msgid "An attribute (%s) was modified and is highlighted below."
 msgstr "属性(%s)が変更され、ハイライト表示されています。"
 
-#: ../lib/modules/kolabUser.inc:327 ../lib/modules/kolabUser.inc:770
+#: ../lib/modules/kolabUser.inc:329 ../lib/modules/kolabUser.inc:774
 msgid "Anyone"
 msgstr "誰か"
 
-#: ../lib/types/user.inc:239
+#: ../lib/types/group.inc:167 ../lib/types/user.inc:239
 msgid "Apply"
 msgstr "適用"
 
@@ -377,7 +460,7 @@ msgstr "適用"
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "本当にこのオブジェクトを削除しますか?"
 
-#: ../lib/modules/sambaSamAccount.inc:432
+#: ../lib/modules/sambaSamAccount.inc:481
 msgid "Atlantic time (Canada), Caracas"
 msgstr ""
 
@@ -389,7 +472,7 @@ msgstr "属性"
 msgid "Attribute types"
 msgstr "属性タイプ"
 
-#: ../lib/modules/sambaSamAccount.inc:448
+#: ../lib/modules/sambaSamAccount.inc:497
 msgid "Auckland, Fiji, Kamchatka"
 msgstr ""
 
@@ -401,7 +484,7 @@ msgstr "有効なPDFフィールド"
 msgid "Available account types"
 msgstr "有効なアカウント種別"
 
-#: ../lib/modules/posixAccount.inc:926
+#: ../lib/modules/posixAccount.inc:1057
 msgid "Available groups"
 msgstr "有効なグループ"
 
@@ -413,25 +496,26 @@ msgstr "有効なモジュール"
 msgid "Available users"
 msgstr "有効なユーザ"
 
-#: ../lib/modules/sambaAccount.inc:836 ../lib/modules/sambaSamAccount.inc:992
+#: ../lib/modules/sambaAccount.inc:856 ../lib/modules/sambaSamAccount.inc:1189
 msgid "Available workstations"
 msgstr "有効なワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:435
+#: ../lib/modules/sambaSamAccount.inc:484
 msgid "Azores, Cape Verde Islands"
 msgstr ""
 
 #: ../templates/tree/update_confirm.php:252 ../lib/modules/posixGroup.inc:238
-#: ../lib/modules/posixGroup.inc:261 ../lib/modules/sambaAccount.inc:841
-#: ../lib/modules/sambaSamAccount.inc:996 ../lib/modules/posixAccount.inc:932
-#: ../lib/modules/inetOrgPerson.inc:798
+#: ../lib/modules/posixGroup.inc:261 ../lib/modules/sambaAccount.inc:861
+#: ../lib/modules/sambaSamAccount.inc:1193
+#: ../lib/modules/posixAccount.inc:1063 ../lib/modules/inetOrgPerson.inc:880
+#: ../lib/modules/groupOfNames.inc:346
 msgid "Back"
 msgstr "戻る"
 
-#: ../templates/config/index.php:113 ../templates/config/confmain.php:508
+#: ../templates/config/index.php:113 ../templates/config/confmain.php:583
 #: ../templates/config/conflogin.php:152 ../templates/config/mainlogin.php:137
 #: ../templates/selfService/adminLogin.php:149
-#: ../templates/selfService/adminMain.php:78 ../templates/logout.php:78
+#: ../templates/selfService/adminMain.php:113 ../templates/logout.php:78
 msgid "Back to Login"
 msgstr "ログインに戻る"
 
@@ -443,7 +527,7 @@ msgstr "OU-エディタに戻る"
 msgid "Back to PDF Editor"
 msgstr "PDFエディタに戻る"
 
-#: ../lib/modules.inc:1023
+#: ../lib/modules.inc:1055
 msgid "Back to account list"
 msgstr "アカウント一覧に戻る"
 
@@ -451,7 +535,7 @@ msgstr "アカウント一覧に戻る"
 msgid "Back to group list"
 msgstr "グループ一覧に戻る"
 
-#: ../templates/delete.php:234
+#: ../templates/delete.php:236
 msgid "Back to list"
 msgstr "一覧に戻る"
 
@@ -471,11 +555,11 @@ msgstr "プロファイルエディタに戻る"
 msgid "Back to profile login"
 msgstr "プロファイルログインに戻る"
 
-#: ../lib/modules/sambaSamAccount.inc:439
+#: ../lib/modules/sambaSamAccount.inc:488
 msgid "Baghdad, Riyadh, Moscow"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:443
+#: ../lib/modules/sambaSamAccount.inc:492
 msgid "Bangkok, Hanoi, Jakarta"
 msgstr ""
 
@@ -487,7 +571,7 @@ msgstr "Base (ベースDNのみ)"
 msgid "Base DN"
 msgstr "ベースDN"
 
-#: ../templates/config/confmodules.php:119 ../help/help.inc:129
+#: ../templates/config/confmodules.php:119 ../help/help.inc:127
 msgid "Base module"
 msgstr "ベースモジュール"
 
@@ -495,7 +579,7 @@ msgstr "ベースモジュール"
 msgid "Beginning"
 msgstr "先頭"
 
-#: ../lib/modules/sambaSamAccount.inc:444
+#: ../lib/modules/sambaSamAccount.inc:493
 msgid "Beijing, Perth, Singapore"
 msgstr "Beijing(北京), Perth, Singapore"
 
@@ -503,6 +587,14 @@ msgstr "Beijing(北京), Perth, Singapore"
 msgid "Binary value"
 msgstr "バイナリ値"
 
+#: ../lib/modules/neofonieInetOrgPerson.inc:106
+#: ../lib/modules/neofonieInetOrgPerson.inc:174
+#: ../lib/modules/neofonieInetOrgPerson.inc:329
+#: ../lib/modules/neofonieInetOrgPerson.inc:510
+#: ../lib/modules/neofonieInetOrgPerson.inc:598
+msgid "Birth date"
+msgstr "誕生日"
+
 #: ../lib/modules/quota.inc:47
 msgid "Block hard quota"
 msgstr "ブロック・ハードクオータ"
@@ -535,7 +627,7 @@ msgstr ""
 "ブロック・ソフトクオータはブロック・ハードクオータより小さくなくてはなりませ"
 "ん。"
 
-#: ../lib/modules/sambaSamAccount.inc:433
+#: ../lib/modules/sambaSamAccount.inc:482
 msgid "Brazil, Buenos Aires"
 msgstr ""
 
@@ -543,71 +635,99 @@ msgstr ""
 msgid "Builtin group"
 msgstr "組み込みグループ"
 
+#: ../lib/modules/inetOrgPerson.inc:80 ../lib/modules/inetOrgPerson.inc:187
+#: ../lib/modules/inetOrgPerson.inc:398 ../lib/modules/inetOrgPerson.inc:747
+#: ../lib/modules/inetOrgPerson.inc:910
+msgid "Business category"
+msgstr "業種"
+
+#: ../lib/modules/inetOrgPerson.inc:399
+msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
+msgstr "業種(例. 役員, ITサービス, マネージャー, ...)"
+
 #: ../templates/masscreate.php:134
 msgid "CSV file:"
 msgstr "CSVファイル:"
 
-#: ../templates/config/confmain.php:171 ../help/help.inc:108
+#: ../templates/config/confmain.php:177 ../help/help.inc:101
 msgid "Cache timeout"
 msgstr "キャッシュ有効時間"
 
-#: ../templates/config/confmain.php:428
+#: ../templates/config/confmain.php:480
 msgid "Cache timeout is invalid!"
 msgstr "キャッシュ有効時間が正しくありません。"
 
 #: ../lib/modules/sambaAccount.inc:382 ../lib/modules/sambaAccount.inc:385
 #: ../lib/modules/sambaAccount.inc:388 ../lib/modules/sambaAccount.inc:394
-#: ../lib/modules/sambaAccount.inc:406 ../lib/modules/sambaSamAccount.inc:226
-#: ../lib/modules/sambaSamAccount.inc:229
-#: ../lib/modules/sambaSamAccount.inc:232
-#: ../lib/modules/sambaSamAccount.inc:238 ../lib/modules/posixAccount.inc:376
-#: ../lib/modules/sambaGroupMapping.inc:305
-#: ../lib/modules/shadowAccount.inc:154 ../lib/modules/shadowAccount.inc:158
-#: ../lib/modules/shadowAccount.inc:162 ../lib/modules/shadowAccount.inc:166
+#: ../lib/modules/sambaAccount.inc:406 ../lib/modules/sambaSamAccount.inc:233
+#: ../lib/modules/sambaSamAccount.inc:236
+#: ../lib/modules/sambaSamAccount.inc:239
+#: ../lib/modules/sambaSamAccount.inc:245 ../lib/modules/posixAccount.inc:389
+#: ../lib/modules/sambaGroupMapping.inc:310
+#: ../lib/modules/shadowAccount.inc:155 ../lib/modules/shadowAccount.inc:159
+#: ../lib/modules/shadowAccount.inc:163 ../lib/modules/shadowAccount.inc:167
 msgid "Can be left empty."
 msgstr "省略可"
 
 #: ../templates/tree/update_confirm.php:238
 #: ../templates/tree/delete_form.php:119 ../templates/tree/delete_form.php:168
 #: ../templates/ou_edit.php:107 ../templates/config/confmodules.php:115
-#: ../templates/config/confmain.php:387 ../templates/config/conftypes.php:236
-#: ../templates/selfService/adminMain.php:489
+#: ../templates/config/confmain.php:439 ../templates/config/conftypes.php:236
+#: ../templates/selfService/adminMain.php:544
 #: ../templates/pdfedit/pdfdelete.php:92 ../templates/pdfedit/pdfpage.php:773
-#: ../templates/pdfedit/pdfmain.php:153 ../templates/delete.php:110
+#: ../templates/pdfedit/pdfmain.php:153 ../templates/delete.php:112
 #: ../templates/profedit/profiledelete.php:83
 #: ../templates/profedit/profilepage.php:253
 #: ../templates/profedit/profilemain.php:166 ../templates/initsuff.php:189
-#: ../lib/modules/sambaSamAccount.inc:1061 ../lib/modules/posixAccount.inc:955
-#: ../lib/modules/kolabUser.inc:564 ../lib/modules/shadowAccount.inc:347
-#: ../lib/modules/inetOrgPerson.inc:761
+#: ../lib/modules/neofonieInetOrgPerson.inc:540
+#: ../lib/modules/sambaSamAccount.inc:1258
+#: ../lib/modules/sambaSamAccount.inc:1306
+#: ../lib/modules/sambaSamAccount.inc:1429
+#: ../lib/modules/posixAccount.inc:1086 ../lib/modules/kolabUser.inc:566
+#: ../lib/modules/shadowAccount.inc:348 ../lib/modules/inetOrgPerson.inc:843
+#: ../lib/modules/groupOfNames.inc:225 ../lib/modules/groupOfNames.inc:252
+#: ../lib/modules/groupOfNames.inc:305
 msgid "Cancel"
 msgstr "中止"
 
-#: ../templates/login.php:405 ../templates/login.php:410
+#: ../templates/login.php:416 ../templates/login.php:421
 #: ../templates/selfService/selfServiceLogin.php:105
 #: ../templates/selfService/selfServiceLogin.php:109
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "指定されたLDAPサーバに接続できません。再試行してください。"
 
-#: ../lib/config.inc:342 ../lib/config.inc:824
+#: ../lib/config.inc:389 ../lib/config.inc:951
 msgid "Cannot open config file!"
 msgstr "configファイルをオープンできません!"
 
-#: ../templates/selfService/adminMain.php:310
+#: ../templates/selfService/adminMain.php:345
 msgid "Captions and labels"
 msgstr "説明とラベル"
 
-#: ../lib/modules/sambaSamAccount.inc:437
+#: ../lib/modules/sambaSamAccount.inc:486
 msgid "Central Europe Time, Paris, Berlin"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:430
+#: ../lib/modules/sambaSamAccount.inc:479
 msgid "Central Time (US & Canada), Mexico City"
 msgstr ""
 
-#: ../templates/selfService/adminMain.php:371
+#: ../templates/selfService/adminMain.php:406
 #: ../templates/pdfedit/pdfpage.php:499 ../templates/pdfedit/pdfpage.php:505
-#: ../lib/modules/shadowAccount.inc:292 ../lib/modules/shadowAccount.inc:343
+#: ../lib/modules/neofonieInetOrgPerson.inc:248
+#: ../lib/modules/neofonieInetOrgPerson.inc:260
+#: ../lib/modules/neofonieInetOrgPerson.inc:288
+#: ../lib/modules/neofonieInetOrgPerson.inc:300
+#: ../lib/modules/neofonieInetOrgPerson.inc:312
+#: ../lib/modules/neofonieInetOrgPerson.inc:322
+#: ../lib/modules/neofonieInetOrgPerson.inc:332
+#: ../lib/modules/neofonieInetOrgPerson.inc:536
+#: ../lib/modules/sambaSamAccount.inc:1020
+#: ../lib/modules/sambaSamAccount.inc:1037
+#: ../lib/modules/sambaSamAccount.inc:1054
+#: ../lib/modules/sambaSamAccount.inc:1302
+#: ../lib/modules/shadowAccount.inc:293 ../lib/modules/shadowAccount.inc:344
+#: ../lib/modules/groupOfNames.inc:151 ../lib/modules/groupOfNames.inc:168
 msgid "Change"
 msgstr "変更"
 
@@ -615,28 +735,28 @@ msgstr "変更"
 msgid "Change GID number of users and hosts"
 msgstr "ユーザとホストのGID番号を変更"
 
-#: ../templates/config/profmanage.php:326 ../help/help.inc:123
+#: ../templates/config/profmanage.php:326 ../help/help.inc:121
 msgid "Change default profile"
 msgstr "デフォルト・プロファイルの変更"
 
-#: ../templates/config/mainmanage.php:289 ../help/help.inc:125
+#: ../templates/config/mainmanage.php:289 ../help/help.inc:123
 msgid "Change master password"
 msgstr "マスタパスワードの変更"
 
-#: ../lib/modules/posixGroup.inc:180 ../lib/modules/posixAccount.inc:865
-#: ../lib/modules/inetOrgPerson.inc:601 ../help/help.inc:106
+#: ../lib/modules/posixGroup.inc:180 ../lib/modules/posixAccount.inc:996
+#: ../lib/modules/inetOrgPerson.inc:651 ../help/help.inc:99
 msgid "Change password"
 msgstr "パスワードの変更"
 
-#: ../templates/login.php:331
+#: ../templates/login.php:341
 msgid "Change profile"
 msgstr "プロファイルの変更"
 
-#: ../lib/lists.inc:494
+#: ../lib/lists.inc:534
 msgid "Change suffix"
 msgstr "サフィックスの変更"
 
-#: ../lib/modules/posixAccount.inc:727
+#: ../lib/modules/posixAccount.inc:835
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "ASCII文字だけが有効なため、%s の値を変更しました。"
 
@@ -652,14 +772,24 @@ msgstr ""
 "入力をよく確認してください。LAMはアップロードデータについて基本的な検査しか行"
 "いません。"
 
+#: ../lib/modules/posixAccount.inc:94
+msgid "Choose a server for the home directory!"
+msgstr "ホームディレクトリ用のサーバを選択してください!"
+
 #: ../templates/tree/create_form.php:76
 msgid "Choose a template"
 msgstr "テンプレートを選択"
 
-#: ../templates/tree/create.php:166 ../lib/config.inc:111
+#: ../templates/tree/create.php:166 ../lib/config.inc:152
 msgid "Click here if you are not directed to the next page."
 msgstr "自動的に次ページにジャンプしない場合はここをクリックしてください。"
 
+#: ../lib/modules/sambaSamAccount.inc:305
+#: ../lib/modules/sambaSamAccount.inc:1392
+#: ../lib/modules/sambaSamAccount.inc:1718
+msgid "Client printer is default"
+msgstr "クライアントプリンタをデフォルトにする"
+
 #: ../templates/schema/schema.php:204
 msgid "Collective"
 msgstr "集合属性"
@@ -668,7 +798,17 @@ msgstr "集合属性"
 msgid "Columns:"
 msgstr "カラム:"
 
-#: ../lib/modules/sambaAccount.inc:394 ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/neofonieInetOrgPerson.inc:82
+#: ../lib/modules/neofonieInetOrgPerson.inc:134
+#: ../lib/modules/neofonieInetOrgPerson.inc:179
+#: ../lib/modules/neofonieInetOrgPerson.inc:245
+#: ../lib/modules/neofonieInetOrgPerson.inc:386
+#: ../lib/modules/neofonieInetOrgPerson.inc:623
+#: ../lib/modules/neofonieInetOrgPerson.inc:740
+msgid "ComBots IDs"
+msgstr ""
+
+#: ../lib/modules/sambaAccount.inc:394 ../lib/modules/sambaSamAccount.inc:245
 msgid ""
 "Comma separated list of Samba workstations the user is allowed to login. "
 "Empty means every workstation."
@@ -680,11 +820,12 @@ msgstr ""
 msgid "Commit"
 msgstr "更新"
 
-#: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:195
-#: ../lib/modules/posixAccount.inc:379 ../lib/modules/posixAccount.inc:818
-#: ../lib/modules/posixAccount.inc:1028 ../lib/modules/inetOrgPerson.inc:68
-#: ../lib/modules/inetOrgPerson.inc:235 ../lib/modules/inetOrgPerson.inc:344
-#: ../lib/modules/inetOrgPerson.inc:570 ../lib/modules/inetOrgPerson.inc:825
+#: ../lib/modules/posixAccount.inc:92 ../lib/modules/posixAccount.inc:197
+#: ../lib/modules/posixAccount.inc:392 ../lib/modules/posixAccount.inc:414
+#: ../lib/modules/posixAccount.inc:930 ../lib/modules/posixAccount.inc:1163
+#: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:258
+#: ../lib/modules/inetOrgPerson.inc:370 ../lib/modules/inetOrgPerson.inc:619
+#: ../lib/modules/inetOrgPerson.inc:908
 msgid "Common name"
 msgstr "氏名(common name)"
 
@@ -692,11 +833,12 @@ msgstr "氏名(common name)"
 msgid "Configuration overview"
 msgstr "構成の概要"
 
-#: ../help/help.inc:56 ../help/help.inc:58 ../help/help.inc:70
-#: ../help/help.inc:76 ../help/help.inc:82 ../help/help.inc:87
-#: ../help/help.inc:92 ../help/help.inc:94 ../help/help.inc:96
-#: ../help/help.inc:101 ../help/help.inc:106 ../help/help.inc:108
-#: ../help/help.inc:110 ../help/help.inc:112 ../help/help.inc:129
+#: ../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:93 ../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:111
+#: ../help/help.inc:127
 msgid "Configuration wizard"
 msgstr "構成設定ウィザード"
 
@@ -704,6 +846,23 @@ msgstr "構成設定ウィザード"
 msgid "Conflicting module:"
 msgstr "競合するモジュール"
 
+#: ../lib/modules/sambaSamAccount.inc:299
+#: ../lib/modules/sambaSamAccount.inc:1382
+#: ../lib/modules/sambaSamAccount.inc:1708
+msgid "Connect client drives"
+msgstr "クライアントのドライブを接続"
+
+#: ../lib/modules/sambaSamAccount.inc:302
+#: ../lib/modules/sambaSamAccount.inc:1387
+#: ../lib/modules/sambaSamAccount.inc:1713
+msgid "Connect client printers"
+msgstr "クライアントのプリンタを接続する"
+
+#: ../lib/modules/sambaSamAccount.inc:1367
+#: ../lib/modules/sambaSamAccount.inc:1701
+msgid "Connection time limit"
+msgstr "接続時間の制限"
+
 #: ../templates/tree/templates/creation/custom.php:66
 #: ../templates/tree/templates/creation/new_ou_template.php:105
 msgid "Container"
@@ -727,8 +886,8 @@ msgid "Could not save PDF profile, access denied."
 msgstr "PDFプロファイルを保存できません。アクセスが拒否されました。"
 
 #: ../lib/modules/kolabUser.inc:85 ../lib/modules/kolabUser.inc:148
-#: ../lib/modules/kolabUser.inc:177 ../lib/modules/kolabUser.inc:287
-#: ../lib/modules/kolabUser.inc:746
+#: ../lib/modules/kolabUser.inc:177 ../lib/modules/kolabUser.inc:289
+#: ../lib/modules/kolabUser.inc:750
 msgid "Country"
 msgstr "国"
 
@@ -747,7 +906,7 @@ msgstr "作成"
 msgid "Create Object"
 msgstr "オブジェクト作成"
 
-#: ../lib/modules.inc:1030 ../help/help.inc:156
+#: ../lib/modules.inc:1062 ../help/help.inc:154
 msgid "Create PDF file"
 msgstr "PDFファイル作成"
 
@@ -759,7 +918,7 @@ msgstr "全ての別名のPDFファイル作成"
 msgid "Create PDF for all domains"
 msgstr "全ドメインのPDFファイル作成"
 
-#: ../lib/types/group.inc:115
+#: ../lib/types/group.inc:126
 msgid "Create PDF for all groups"
 msgstr "全グループのPDFファイル作成"
 
@@ -771,7 +930,7 @@ msgstr "全ホストのPDFファイル作成"
 msgid "Create PDF for all objects"
 msgstr "全オブジェクトのPDFファイル作成"
 
-#: ../lib/types/user.inc:127
+#: ../lib/types/user.inc:128
 msgid "Create PDF for all users"
 msgstr "全ユーザのPDFファイル作成"
 
@@ -783,7 +942,7 @@ msgstr "選択された別名のPDFファイル作成"
 msgid "Create PDF for selected domain(s)"
 msgstr "選択されたドメインのPDFファイル作成"
 
-#: ../lib/types/group.inc:114
+#: ../lib/types/group.inc:125
 msgid "Create PDF for selected group(s)"
 msgstr "選択されたグループのPDFファイル作成"
 
@@ -795,7 +954,7 @@ msgstr "選択されたホストのPDFファイル作成"
 msgid "Create PDF for selected object(s)"
 msgstr "選択されたオブジェクトのPDFファイル作成"
 
-#: ../lib/types/user.inc:126
+#: ../lib/types/user.inc:127
 msgid "Create PDF for selected user(s)"
 msgstr "選択されたユーザのPDFファイル作成"
 
@@ -807,22 +966,22 @@ msgstr "スコープに対する新しいPDF構成を作成:"
 msgid "Create a new profile"
 msgstr "新しいプロファイルの作成"
 
-#: ../lib/modules.inc:1073
+#: ../lib/modules.inc:1110
 msgid "Create account"
 msgstr "アカウント作成"
 
-#: ../lib/modules.inc:1022
+#: ../lib/modules.inc:1054
 msgid "Create another account"
 msgstr "他のアカウントを作成"
 
-#: ../lib/modules/posixAccount.inc:845
+#: ../lib/modules/posixAccount.inc:229 ../lib/modules/posixAccount.inc:973
 msgid "Create home directory"
 msgstr "ホームディレクトリを作成"
 
 #: ../templates/tree/edit.php:125 ../templates/tree/tree.php:186
 #: ../templates/tree/tree.php:188 ../templates/tree/tree.php:189
-#: ../lib/tree.inc:66 ../lib/tree.inc:67 ../lib/tree.inc:129
-#: ../lib/tree.inc:131 ../lib/tree.inc:132
+#: ../lib/tree.inc:90 ../lib/tree.inc:91 ../lib/tree.inc:153
+#: ../lib/tree.inc:155 ../lib/tree.inc:156
 msgid "Create new entry"
 msgstr "新しいエントリを作成"
 
@@ -839,6 +998,14 @@ msgstr "CSVファイルをアップロードする事によってアカウント
 msgid "Current list of values for attribute:"
 msgstr "属性に対する現在の値のリスト:"
 
+#: ../lib/modules/neofonieInetOrgPerson.inc:94
+#: ../lib/modules/neofonieInetOrgPerson.inc:154
+#: ../lib/modules/neofonieInetOrgPerson.inc:285
+#: ../lib/modules/neofonieInetOrgPerson.inc:398
+#: ../lib/modules/neofonieInetOrgPerson.inc:605
+msgid "Current projects"
+msgstr "現在のプロジェクト"
+
 #: ../templates/tree/templates/templates.inc:51
 msgid "Custom"
 msgstr "カスタム"
@@ -847,8 +1014,8 @@ msgstr "カスタム"
 #: ../templates/tree/add_oclass_form.php:121
 #: ../templates/tree/update_confirm.php:76
 #: ../templates/tree/add_attr_form.php:73 ../templates/tree/delete_form.php:77
-#: ../templates/tree/delete_form.php:151 ../templates/delete.php:88
-#: ../lib/modules.inc:1555
+#: ../templates/tree/delete_form.php:151 ../templates/delete.php:90
+#: ../lib/modules.inc:1035 ../lib/modules.inc:1523
 msgid "DN"
 msgstr ""
 
@@ -856,7 +1023,7 @@ msgstr ""
 msgid "DN settings"
 msgstr "DN設定"
 
-#: ../templates/masscreate.php:151 ../help/help.inc:148
+#: ../templates/masscreate.php:151 ../help/help.inc:146
 msgid "DN suffix"
 msgstr "DNサフィックス"
 
@@ -869,23 +1036,25 @@ msgstr "DSMLにエクスポート: %s"
 msgid "Data field for RDN is empty!"
 msgstr "RDNのデータフィールドが空です!"
 
-#: ../lib/modules/sambaAccount.inc:374 ../lib/modules/sambaSamAccount.inc:218
+#: ../lib/modules/sambaAccount.inc:374 ../lib/modules/sambaSamAccount.inc:225
 msgid "Date after the user is able to change his password. Format: DD-MM-YYYY"
 msgstr "ユーザによるパスワード変更の禁止が解かれる日付。形式は: DD-MM-YYYY"
 
-#: ../lib/modules/sambaAccount.inc:376 ../lib/modules/sambaSamAccount.inc:220
+#: ../lib/modules/sambaAccount.inc:376 ../lib/modules/sambaSamAccount.inc:227
 msgid "Date after the user must change his password. Format: DD-MM-YYYY"
 msgstr "ユーザがパスワードを変更しなければならなくなる日付。形式は: DD-MM-YYYY"
 
-#: ../lib/modules/shadowAccount.inc:154
+#: ../lib/modules/neofonieInetOrgPerson.inc:104
+msgid "Date when the employee was initially employed."
+msgstr "従業員が最初に雇用された日付。"
+
+#: ../lib/modules/shadowAccount.inc:155
 msgid ""
 "Days before password is to expire that user is warned of pending password "
-"expiration. If set value must be 0<."
-msgstr ""
-"パスワードが期限切れになる前にユーザへパスワード期限切れの猶予期間である旨を"
-"警告する日数。もしもその値を設定するなら0より大きくなければならない。"
+"expiration. If set value must be >0."
+msgstr "パスワードが期限切れになる前にユーザへパスワード期限切れの猶予期間である旨を警告する日数。もしもその値を設定するなら0より大きくなければならない。"
 
-#: ../templates/config/confmain.php:274 ../help/help.inc:94
+#: ../templates/config/confmain.php:280 ../help/help.inc:95
 msgid "Default language"
 msgstr "規定の言語"
 
@@ -898,8 +1067,8 @@ msgid "Defines if workstations may change their passwords."
 msgstr "ワークステーションのパスワード変更を許可する場合に定義します。"
 
 #: ../lib/modules/kolabUser.inc:132 ../lib/modules/kolabUser.inc:136
-#: ../lib/modules/kolabUser.inc:196 ../lib/modules/kolabUser.inc:391
-#: ../lib/modules/kolabUser.inc:784
+#: ../lib/modules/kolabUser.inc:196 ../lib/modules/kolabUser.inc:393
+#: ../lib/modules/kolabUser.inc:788
 msgid "Delegates"
 msgstr "代理人"
 
@@ -909,7 +1078,7 @@ msgstr "代理人の形式が正しくありません。"
 
 #: ../templates/tree/edit.php:114 ../templates/tree/delete_form.php:159
 #: ../templates/ou_edit.php:106 ../templates/pdfedit/pdfdelete.php:91
-#: ../templates/delete.php:109 ../lib/tree.inc:1149
+#: ../templates/delete.php:111 ../lib/tree.inc:1173 ../lib/lists.inc:424
 msgid "Delete"
 msgstr "削除"
 
@@ -918,7 +1087,7 @@ msgstr "削除"
 msgid "Delete %s"
 msgstr "%s を削除"
 
-#: ../lib/modules/kolabUser.inc:400
+#: ../lib/modules/kolabUser.inc:402
 msgid "Delete Kolab account"
 msgstr "Kolabアカウントを削除"
 
@@ -927,7 +1096,7 @@ msgid "Delete PDF structure"
 msgstr "PDF構成の削除"
 
 #: ../lib/types/mailAlias.inc:111
-msgid "Delete alias"
+msgid "Delete alias(es)"
 msgstr "別名を削除"
 
 #: ../templates/tree/delete_form.php:111
@@ -936,20 +1105,20 @@ msgid "Delete all %s objects"
 msgstr "全ての %s オブジェクトを削除"
 
 #: ../lib/types/smbDomain.inc:111
-msgid "Delete domain"
-msgstr "ドメインを削除"
+msgid "Delete domain(s)"
+msgstr "ドメインの削除"
 
-#: ../lib/types/group.inc:113
-msgid "Delete group"
-msgstr "グループを削除"
+#: ../lib/types/group.inc:124
+msgid "Delete group(s)"
+msgstr "グループの削除"
 
-#: ../lib/modules/posixAccount.inc:886
+#: ../lib/modules/posixAccount.inc:1017
 msgid "Delete home directory"
 msgstr "ホームディレクトリを削除"
 
 #: ../lib/types/host.inc:115
-msgid "Delete host"
-msgstr "ホストを削除"
+msgid "Delete host(s)"
+msgstr "ホストの削除"
 
 #: ../lib/lists.inc:97
 msgid "Delete object"
@@ -960,26 +1129,26 @@ msgstr "オブジェクトを削除"
 msgid "Delete operation canceled."
 msgstr "削除操作がキャンセルされました。"
 
-#: ../templates/ou_edit.php:178 ../help/help.inc:182
+#: ../templates/ou_edit.php:180 ../help/help.inc:180
 msgid "Delete organizational unit"
 msgstr "organizational unitを削除"
 
-#: ../lib/modules/inetOrgPerson.inc:715
+#: ../lib/modules/inetOrgPerson.inc:797
 msgid "Delete photo"
 msgstr "写真を削除"
 
 #: ../templates/config/profmanage.php:248
 #: ../templates/selfService/profManage.php:227
 #: ../templates/profedit/profiledelete.php:53
-#: ../templates/profedit/profilemain.php:154 ../help/help.inc:119
+#: ../templates/profedit/profilemain.php:154 ../help/help.inc:117
 msgid "Delete profile"
 msgstr "プロファイルを削除"
 
-#: ../lib/types/user.inc:125
-msgid "Delete user"
-msgstr "ユーザを削除"
+#: ../lib/types/user.inc:126
+msgid "Delete user(s)"
+msgstr "ユーザの削除"
 
-#: ../templates/delete.php:222
+#: ../templates/delete.php:224
 #, php-format
 msgid "Deleted DN: %s"
 msgstr "削除されたDN: %s"
@@ -1002,47 +1171,62 @@ msgstr "削除したプロファイル:"
 msgid "Deleting %s"
 msgstr "%s を削除しています"
 
-#: ../templates/delete.php:131
+#: ../templates/delete.php:133
 msgid "Deleting. Please stand by ..."
 msgstr "削除中です。お待ちください ..."
 
+#: ../lib/modules/neofonieInetOrgPerson.inc:88
+#: ../lib/modules/neofonieInetOrgPerson.inc:110
+#: ../lib/modules/neofonieInetOrgPerson.inc:144
+#: ../lib/modules/neofonieInetOrgPerson.inc:267
+#: ../lib/modules/neofonieInetOrgPerson.inc:608
+msgid "Department"
+msgstr "部署"
+
 #: ../templates/tree/add_value_form.php:186 ../templates/schema/schema.php:94
 #: ../templates/schema/schema.php:148 ../templates/schema/schema.php:351
-#: ../lib/types/user.inc:92 ../lib/modules/account.inc:79
-#: ../lib/modules/account.inc:103 ../lib/modules/account.inc:203
-#: ../lib/modules/account.inc:217 ../lib/modules/posixGroup.inc:156
-#: ../lib/modules/posixGroup.inc:383 ../lib/modules/posixGroup.inc:445
-#: ../lib/modules/sambaAccount.inc:861 ../lib/modules/posixAccount.inc:293
-#: ../lib/modules/posixAccount.inc:397
-#: ../lib/modules/sambaGroupMapping.inc:327
-#: ../lib/modules/inetOrgPerson.inc:158 ../lib/modules/inetOrgPerson.inc:288
-#: ../lib/modules/inetOrgPerson.inc:577 ../lib/modules/inetOrgPerson.inc:810
+#: ../lib/types/user.inc:92 ../lib/modules/account.inc:84
+#: ../lib/modules/account.inc:94 ../lib/modules/account.inc:118
+#: ../lib/modules/account.inc:218 ../lib/modules/account.inc:232
+#: ../lib/modules/posixGroup.inc:156 ../lib/modules/posixGroup.inc:374
+#: ../lib/modules/posixGroup.inc:436 ../lib/modules/sambaAccount.inc:881
+#: ../lib/modules/posixAccount.inc:302 ../lib/modules/posixAccount.inc:410
+#: ../lib/modules/sambaGroupMapping.inc:332
+#: ../lib/modules/inetOrgPerson.inc:163 ../lib/modules/inetOrgPerson.inc:314
+#: ../lib/modules/inetOrgPerson.inc:627 ../lib/modules/inetOrgPerson.inc:892
+#: ../lib/modules/groupOfNames.inc:60 ../lib/modules/groupOfNames.inc:87
+#: ../lib/modules/groupOfNames.inc:137 ../lib/modules/groupOfNames.inc:437
 msgid "Description"
 msgstr "説明"
 
-#: ../lib/modules/sambaDomain.inc:102 ../lib/modules/sambaDomain.inc:265
-#: ../lib/modules/sambaDomain.inc:614
+#: ../lib/modules/sambaDomain.inc:102 ../lib/modules/sambaDomain.inc:282
+#: ../lib/modules/sambaDomain.inc:658
 msgid "Disconnect users outside logon hours"
 msgstr "ログオン許可時間帯以外はユーザをログオフさせる。"
 
+#: ../lib/modules/sambaSamAccount.inc:1372
+#: ../lib/modules/sambaSamAccount.inc:1702
+msgid "Disconnection time limit"
+msgstr "切断時間の制限"
+
 #: ../lib/modules/sambaDomain.inc:103
-msgid "Disconnects users if they are loggen in outside logon hours."
-msgstr "ログオン状態のユーザーをログオン許可時間帯以外にログオフさせる。"
+msgid "Disconnects users if they are logged in outside logon hours."
+msgstr "ログオン許可時間帯以外にログオン状態のユーザーの接続を切る。"
 
 #: ../lib/modules/sambaAccount.inc:78 ../lib/modules/sambaAccount.inc:219
-#: ../lib/modules/sambaAccount.inc:340 ../lib/modules/sambaAccount.inc:698
-#: ../lib/modules/sambaAccount.inc:854 ../lib/modules/sambaSamAccount.inc:93
-#: ../lib/modules/sambaSamAccount.inc:184
-#: ../lib/modules/sambaSamAccount.inc:285
-#: ../lib/modules/sambaSamAccount.inc:831
-#: ../lib/modules/sambaSamAccount.inc:1289
+#: ../lib/modules/sambaAccount.inc:340 ../lib/modules/sambaAccount.inc:712
+#: ../lib/modules/sambaAccount.inc:874 ../lib/modules/sambaSamAccount.inc:97
+#: ../lib/modules/sambaSamAccount.inc:188
+#: ../lib/modules/sambaSamAccount.inc:334
+#: ../lib/modules/sambaSamAccount.inc:966
+#: ../lib/modules/sambaSamAccount.inc:1659
 #: ../lib/modules/sambaGroupMapping.inc:190
-#: ../lib/modules/sambaGroupMapping.inc:292
-#: ../lib/modules/sambaGroupMapping.inc:325
+#: ../lib/modules/sambaGroupMapping.inc:297
+#: ../lib/modules/sambaGroupMapping.inc:330
 msgid "Display name"
 msgstr "表示名"
 
-#: ../lib/modules.inc:473
+#: ../lib/modules.inc:449
 msgid ""
 "Displayed account numbers start at \"0\". Add 2 to get the row in your "
 "spreadsheet."
@@ -1062,11 +1246,11 @@ msgstr "本当にこのPDF構成を削除しますか?"
 msgid "Do you really want to delete this profile?"
 msgstr "本当にこのプロファイルを削除しますか?"
 
-#: ../lib/modules/kolabUser.inc:559
+#: ../lib/modules/kolabUser.inc:561
 msgid "Do you really want to mark this account for deletion?"
 msgstr "本当にこのアカウントを削除しますか?"
 
-#: ../templates/delete.php:82
+#: ../templates/delete.php:84
 msgid "Do you really want to remove the following accounts?"
 msgstr "本当にこのアカウントを削除しますか?"
 
@@ -1076,74 +1260,74 @@ msgstr "これらの変更を行ないますか?"
 
 #: ../lib/modules/sambaAccount.inc:177 ../lib/modules/sambaAccount.inc:321
 #: ../lib/modules/sambaAccount.inc:331 ../lib/modules/sambaAccount.inc:405
-#: ../lib/modules/sambaAccount.inc:803 ../lib/modules/sambaAccount.inc:860
-#: ../lib/modules/sambaSamAccount.inc:256
-#: ../lib/modules/sambaSamAccount.inc:278
-#: ../lib/modules/sambaSamAccount.inc:404
-#: ../lib/modules/sambaSamAccount.inc:951
-#: ../lib/modules/sambaSamAccount.inc:1153
-#: ../lib/modules/sambaSamAccount.inc:1183
-#: ../lib/modules/sambaSamAccount.inc:1295
+#: ../lib/modules/sambaAccount.inc:823 ../lib/modules/sambaAccount.inc:880
+#: ../lib/modules/sambaSamAccount.inc:263
+#: ../lib/modules/sambaSamAccount.inc:327
+#: ../lib/modules/sambaSamAccount.inc:453
+#: ../lib/modules/sambaSamAccount.inc:1135
+#: ../lib/modules/sambaSamAccount.inc:1521
+#: ../lib/modules/sambaSamAccount.inc:1551
+#: ../lib/modules/sambaSamAccount.inc:1677
 #: ../lib/modules/sambaGroupMapping.inc:68
-#: ../lib/modules/sambaGroupMapping.inc:220
-#: ../lib/modules/sambaGroupMapping.inc:304
-#: ../lib/modules/sambaGroupMapping.inc:347
+#: ../lib/modules/sambaGroupMapping.inc:225
+#: ../lib/modules/sambaGroupMapping.inc:309
+#: ../lib/modules/sambaGroupMapping.inc:352
 msgid "Domain"
 msgstr "ドメイン"
 
 #: ../lib/types/smbDomain.inc:82 ../lib/modules/sambaDomain.inc:70
-#: ../lib/modules/sambaDomain.inc:140 ../lib/modules/sambaDomain.inc:224
-#: ../lib/modules/sambaDomain.inc:230 ../lib/modules/sambaDomain.inc:586
+#: ../lib/modules/sambaDomain.inc:140 ../lib/modules/sambaDomain.inc:225
+#: ../lib/modules/sambaDomain.inc:231 ../lib/modules/sambaDomain.inc:630
 msgid "Domain SID"
 msgstr "ドメインのSID"
 
-#: ../lib/modules/sambaGroupMapping.inc:271
+#: ../lib/modules/sambaGroupMapping.inc:276
 msgid "Domain administrators"
 msgstr "ドメイン管理者(Domain administrator)"
 
 #: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaAccount.inc:316
-#: ../lib/modules/sambaSamAccount.inc:65
+#: ../lib/modules/sambaSamAccount.inc:69
 #: ../lib/modules/sambaGroupMapping.inc:55
-#: ../lib/modules/sambaGroupMapping.inc:277
+#: ../lib/modules/sambaGroupMapping.inc:282
 msgid "Domain admins"
 msgstr "ドメイン管理者(Domain Admins)"
 
-#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaSamAccount.inc:66
+#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaSamAccount.inc:70
 #: ../lib/modules/sambaGroupMapping.inc:60
 msgid "Domain certificate admins"
 msgstr "ドメイン証明書管理者(Domain Certificate Admins)"
 
-#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:548
-#: ../lib/modules/sambaSamAccount.inc:66
-#: ../lib/modules/sambaSamAccount.inc:607
+#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:555
+#: ../lib/modules/sambaSamAccount.inc:70
+#: ../lib/modules/sambaSamAccount.inc:672
 #: ../lib/modules/sambaGroupMapping.inc:58
 msgid "Domain computers"
 msgstr "ドメインコンピュータ(Domain Computers)"
 
-#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaSamAccount.inc:66
+#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaSamAccount.inc:70
 #: ../lib/modules/sambaGroupMapping.inc:59
 msgid "Domain controllers"
 msgstr "ドメインコントローラ(Domain Controllers)"
 
-#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:67
+#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:71
 #: ../lib/modules/sambaGroupMapping.inc:62
 msgid "Domain enterprise admins"
 msgstr "ドメインエンタープライズ管理者(Domain Enterprise Admins)"
 
 #: ../lib/modules/sambaGroupMapping.inc:67
-#: ../lib/modules/sambaGroupMapping.inc:210
+#: ../lib/modules/sambaGroupMapping.inc:215
 msgid "Domain group"
 msgstr "ドメイングループ(Domain Group)"
 
-#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaSamAccount.inc:65
+#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaSamAccount.inc:69
 #: ../lib/modules/sambaGroupMapping.inc:57
 msgid "Domain guests"
 msgstr "ドメインゲスト(Domain Guests)"
 
 #: ../lib/types/smbDomain.inc:83 ../lib/modules/sambaAccount.inc:72
 #: ../lib/modules/sambaDomain.inc:66 ../lib/modules/sambaDomain.inc:133
-#: ../lib/modules/sambaDomain.inc:211 ../lib/modules/sambaDomain.inc:217
-#: ../lib/modules/sambaDomain.inc:583
+#: ../lib/modules/sambaDomain.inc:212 ../lib/modules/sambaDomain.inc:218
+#: ../lib/modules/sambaDomain.inc:627
 msgid "Domain name"
 msgstr "ドメイン名"
 
@@ -1159,18 +1343,18 @@ msgstr ""
 msgid "Domain name is invalid!"
 msgstr "ドメイン名が正しくありません!"
 
-#: ../lib/modules/sambaAccount.inc:52 ../lib/modules/sambaSamAccount.inc:67
+#: ../lib/modules/sambaAccount.inc:52 ../lib/modules/sambaSamAccount.inc:71
 #: ../lib/modules/sambaGroupMapping.inc:63
 msgid "Domain policy admins"
 msgstr "ドメインポリシー管理者(Domain Policy Admins)"
 
-#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:67
+#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:71
 #: ../lib/modules/sambaGroupMapping.inc:61
 msgid "Domain schema admins"
 msgstr "ドメインスキーマ管理者(Domain Schema Admins)"
 
-#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaSamAccount.inc:65
-#: ../lib/modules/sambaSamAccount.inc:1552
+#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaSamAccount.inc:69
+#: ../lib/modules/sambaSamAccount.inc:2003
 #: ../lib/modules/sambaGroupMapping.inc:56
 msgid "Domain users"
 msgstr "ドメインユーザ(Domain Users)"
@@ -1187,7 +1371,7 @@ msgstr "下へ"
 msgid "Download sample CSV file"
 msgstr "サンプルCSVファイルをダウンロード"
 
-#: ../lib/modules/sambaAccount.inc:379 ../lib/modules/sambaSamAccount.inc:223
+#: ../lib/modules/sambaAccount.inc:379
 msgid "Drive letter assigned on windows workstations as homedirectory."
 msgstr ""
 "Windows ワークステーションのホームディレクトリとして割り当てられたドライブ文"
@@ -1217,24 +1401,25 @@ msgstr "電子メールの別名リスト"
 msgid "EMail alias list has invalid format!"
 msgstr "電子メール別名リストの形式が正しくありません!"
 
-#: ../lib/modules/kolabUser.inc:190 ../lib/modules/kolabUser.inc:365
-#: ../lib/modules/kolabUser.inc:780
+#: ../lib/modules/kolabUser.inc:190 ../lib/modules/kolabUser.inc:367
+#: ../lib/modules/kolabUser.inc:784
 msgid "EMail aliases"
 msgstr "電子メールの別名"
 
-#: ../lib/modules/sambaSamAccount.inc:446
+#: ../lib/modules/sambaSamAccount.inc:495
 msgid "East Australian Standard, Guam"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:438
+#: ../lib/modules/sambaSamAccount.inc:487
 msgid "Eastern Europe Time, South Africa"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:431
+#: ../lib/modules/sambaSamAccount.inc:480
 msgid "Eastern Time (US & Canada), Bogota"
 msgstr ""
 
-#: ../lib/types/group.inc:142 ../lib/types/user.inc:193 ../lib/lists.inc:380
+#: ../lib/modules/sambaSamAccount.inc:1142
+#: ../lib/modules/sambaSamAccount.inc:1146 ../lib/lists.inc:420
 msgid "Edit"
 msgstr "編集"
 
@@ -1242,7 +1427,7 @@ msgstr "編集"
 msgid "Edit PDF structure"
 msgstr "PDF構成の編集"
 
-#: ../templates/config/confmain.php:200
+#: ../templates/config/confmain.php:208
 msgid "Edit account types"
 msgstr "アカウント種別の編集"
 
@@ -1250,19 +1435,15 @@ msgstr "アカウント種別の編集"
 msgid "Edit general settings"
 msgstr "一般設定を更新"
 
-#: ../lib/modules/posixAccount.inc:837
+#: ../lib/modules/posixAccount.inc:958
 msgid "Edit groups"
 msgstr "グループの編集"
 
-#: ../lib/modules/sambaSamAccount.inc:957
-msgid "Edit logon hours"
-msgstr "ログオン時間の編集"
-
 #: ../lib/modules/posixGroup.inc:161
 msgid "Edit members"
 msgstr "メンバーの編集"
 
-#: ../templates/config/confmain.php:202
+#: ../templates/config/confmain.php:210
 msgid "Edit modules"
 msgstr "モジュールの編集"
 
@@ -1278,21 +1459,37 @@ msgstr "セルフサービスの編集"
 msgid "Edit server profiles"
 msgstr "サーバープロファイルの編集"
 
-#: ../lib/modules/sambaAccount.inc:768 ../lib/modules/sambaSamAccount.inc:913
+#: ../lib/modules/sambaAccount.inc:782 ../lib/modules/sambaSamAccount.inc:1094
 msgid "Edit workstations"
 msgstr "ワークステーションの編集??"
 
-#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:123
-#: ../lib/modules/inetOrgPerson.inc:170 ../lib/modules/inetOrgPerson.inc:304
-#: ../lib/modules/inetOrgPerson.inc:666 ../lib/modules/inetOrgPerson.inc:815
+#: ../lib/modules/neofonieInetOrgPerson.inc:100
+#: ../lib/modules/neofonieInetOrgPerson.inc:164
+#: ../lib/modules/neofonieInetOrgPerson.inc:309
+#: ../lib/modules/neofonieInetOrgPerson.inc:410
+#: ../lib/modules/neofonieInetOrgPerson.inc:615
+msgid "Employee skills"
+msgstr "従業員のスキル"
+
+#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:128
+#: ../lib/modules/inetOrgPerson.inc:175 ../lib/modules/inetOrgPerson.inc:330
+#: ../lib/modules/inetOrgPerson.inc:740 ../lib/modules/inetOrgPerson.inc:897
 msgid "Employee type"
 msgstr "雇用形態"
 
-#: ../lib/modules/inetOrgPerson.inc:305
+#: ../lib/modules/inetOrgPerson.inc:331
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇用形態: 正社員、実習生、臨時雇用、派遣、..."
 
-#: ../templates/login.php:373
+#: ../lib/modules/neofonieInetOrgPerson.inc:103
+#: ../lib/modules/neofonieInetOrgPerson.inc:169
+#: ../lib/modules/neofonieInetOrgPerson.inc:319
+#: ../lib/modules/neofonieInetOrgPerson.inc:505
+#: ../lib/modules/neofonieInetOrgPerson.inc:620
+msgid "Employment date"
+msgstr "雇用された日"
+
+#: ../templates/login.php:383
 msgid "Empty password submitted. Please try again."
 msgstr "パスワードが空です。やり直してください。"
 
@@ -1300,7 +1497,7 @@ msgstr "パスワードが空です。やり直してください。"
 msgid "Encountered an error while performing search."
 msgstr "検索実行中にエラーが発生しました。"
 
-#: ../lib/modules/sambaSamAccount.inc:424
+#: ../lib/modules/sambaSamAccount.inc:473
 msgid "Eniwetok, Kwajalein"
 msgstr ""
 
@@ -1326,22 +1523,22 @@ msgstr "エントリ %s は削除されました。"
 msgid "Equality"
 msgstr "照合規則"
 
-#: ../templates/tests/lamdaemonTest.php:61
-#: ../templates/tests/lamdaemonTest.php:65
-#: ../templates/tests/lamdaemonTest.php:95
-#: ../templates/tests/lamdaemonTest.php:112
-#: ../templates/tests/lamdaemonTest.php:137
-#: ../templates/tests/lamdaemonTest.php:182
+#: ../templates/tests/lamdaemonTest.php:103
+#: ../templates/tests/lamdaemonTest.php:138
+#: ../templates/tests/lamdaemonTest.php:142
+#: ../templates/tests/lamdaemonTest.php:172
+#: ../templates/tests/lamdaemonTest.php:189
+#: ../templates/tests/lamdaemonTest.php:214
 #: ../templates/config/mainmanage.php:207
 msgid "Error"
 msgstr "エラー"
 
-#: ../templates/delete.php:227
+#: ../templates/delete.php:229
 #, php-format
 msgid "Error while deleting DN: %s"
 msgstr "DN: %s の削除中にエラーが発生しました。"
 
-#: ../help/help.inc:130
+#: ../help/help.inc:128
 msgid ""
 "Every account type needs exactly one base module. This module provides a "
 "structural object class."
@@ -1349,8 +1546,8 @@ msgstr ""
 "全てのアカウントタイプにはただ一つのベースモジュールが必要です。このモジュー"
 "ルは構造型のオブジェクトクラスを提供します。"
 
-#: ../help/help.inc:73 ../help/help.inc:79 ../help/help.inc:85
-#: ../help/help.inc:90
+#: ../help/help.inc:74 ../help/help.inc:80 ../help/help.inc:86
+#: ../help/help.inc:91 ../help/help.inc:110
 msgid "Example"
 msgstr "例"
 
@@ -1358,13 +1555,17 @@ msgstr "例"
 msgid "Example value"
 msgstr "例"
 
-#: ../help/help.inc:61
+#: ../help/help.inc:62
 msgid "Examples"
 msgstr "例"
 
-#: ../templates/tests/lamdaemonTest.php:148
+#: ../templates/config/confmain.php:368
+msgid "Execute"
+msgstr "実行"
+
+#: ../templates/tests/lamdaemonTest.php:223
 msgid "Execute lamdaemon"
-msgstr ""
+msgstr "lamdaemonを実行"
 
 #: ../templates/tree/edit.php:117 ../templates/tree/export_form.php:88
 #: ../templates/tree/export_form.php:96
@@ -1389,10 +1590,10 @@ msgstr "エントリ作成に失敗しました!"
 msgid "Failed to delete entry %s"
 msgstr "エントリ %s の削除に失敗しました!"
 
-#: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:114
-#: ../lib/modules/inetOrgPerson.inc:218 ../lib/modules/inetOrgPerson.inc:336
-#: ../lib/modules/inetOrgPerson.inc:337 ../lib/modules/inetOrgPerson.inc:645
-#: ../lib/modules/inetOrgPerson.inc:823 ../lib/modules/inetOrgPerson.inc:1099
+#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:118
+#: ../lib/modules/inetOrgPerson.inc:235 ../lib/modules/inetOrgPerson.inc:362
+#: ../lib/modules/inetOrgPerson.inc:363 ../lib/modules/inetOrgPerson.inc:716
+#: ../lib/modules/inetOrgPerson.inc:906 ../lib/modules/inetOrgPerson.inc:1218
 msgid "Fax number"
 msgstr "ファクス番号"
 
@@ -1400,7 +1601,7 @@ msgstr "ファクス番号"
 msgid "File"
 msgstr "ファイル"
 
-#: ../lib/modules/sambaSamAccount.inc:232
+#: ../lib/modules/sambaSamAccount.inc:239
 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."
@@ -1424,14 +1625,14 @@ msgstr "ファイルのアップロード"
 msgid "File upload failed!"
 msgstr "ファイルのアップロードに失敗しました!"
 
-#: ../lib/lists.inc:338
+#: ../lib/lists.inc:348
 msgid "Filter"
 msgstr "フィルタ"
 
 #: ../lib/types/user.inc:87 ../lib/modules/inetOrgPerson.inc:46
-#: ../lib/modules/inetOrgPerson.inc:112 ../lib/modules/inetOrgPerson.inc:145
-#: ../lib/modules/inetOrgPerson.inc:296 ../lib/modules/inetOrgPerson.inc:557
-#: ../lib/modules/inetOrgPerson.inc:813 ../lib/modules/inetOrgPerson.inc:1059
+#: ../lib/modules/inetOrgPerson.inc:116 ../lib/modules/inetOrgPerson.inc:150
+#: ../lib/modules/inetOrgPerson.inc:322 ../lib/modules/inetOrgPerson.inc:604
+#: ../lib/modules/inetOrgPerson.inc:895 ../lib/modules/inetOrgPerson.inc:1170
 msgid "First name"
 msgstr "(姓でない)名"
 
@@ -1439,7 +1640,7 @@ msgstr "(姓でない)名"
 msgid "First name contains invalid characters!"
 msgstr "(姓でない)名前に不正な文字がある"
 
-#: ../lib/modules/inetOrgPerson.inc:297
+#: ../lib/modules/inetOrgPerson.inc:323
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "ユーザの(姓でない)名前。アルファベット, _- と空白のみ有効."
 
@@ -1448,8 +1649,8 @@ msgid "For automatic invitation handling."
 msgstr ""
 
 #: ../lib/modules/kolabUser.inc:89 ../lib/modules/kolabUser.inc:156
-#: ../lib/modules/kolabUser.inc:202 ../lib/modules/kolabUser.inc:310
-#: ../lib/modules/kolabUser.inc:758
+#: ../lib/modules/kolabUser.inc:202 ../lib/modules/kolabUser.inc:312
+#: ../lib/modules/kolabUser.inc:762
 msgid "Free/Busy interval"
 msgstr "Free/Busyインターバル"
 
@@ -1457,20 +1658,24 @@ msgstr "Free/Busyインターバル"
 msgid "Free/Busy interval must be a number!"
 msgstr "Free/Busyインターバルは数でなくてはなりません!"
 
-#: ../lib/modules/sambaSamAccount.inc:1014
+#: ../lib/modules/sambaSamAccount.inc:1211
 msgid "Friday"
 msgstr "金曜日"
 
-#: ../lib/types/host.inc:87 ../lib/types/group.inc:83 ../lib/types/user.inc:84
-#: ../lib/modules/posixGroup.inc:152 ../lib/modules/posixGroup.inc:349
-#: ../lib/modules/posixGroup.inc:379 ../lib/modules/posixGroup.inc:399
-#: ../lib/modules/posixGroup.inc:443 ../lib/modules/posixGroup.inc:463
-#: ../lib/modules/posixAccount.inc:85 ../lib/modules/posixAccount.inc:1030
-#: ../lib/modules/sambaGroupMapping.inc:323
+#: ../lib/modules/inetOrgPerson.inc:201
+msgid "GB-12345"
+msgstr ""
+
+#: ../lib/types/host.inc:87 ../lib/types/group.inc:84 ../lib/types/user.inc:84
+#: ../lib/modules/posixGroup.inc:152 ../lib/modules/posixGroup.inc:340
+#: ../lib/modules/posixGroup.inc:370 ../lib/modules/posixGroup.inc:390
+#: ../lib/modules/posixGroup.inc:434 ../lib/modules/posixGroup.inc:454
+#: ../lib/modules/posixAccount.inc:88 ../lib/modules/posixAccount.inc:1165
+#: ../lib/modules/sambaGroupMapping.inc:328
 msgid "GID number"
 msgstr "GID番号"
 
-#: ../lib/modules/posixGroup.inc:463
+#: ../lib/modules/posixGroup.inc:454
 msgid ""
 "GID number has changed. Please select checkbox to change GID number of users "
 "and hosts."
@@ -1478,7 +1683,7 @@ msgstr ""
 "GID番号が変更されました。ユーザとホストのGID番号を変更する場合は、チェック"
 "ボックスを選択してください。"
 
-#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/posixAccount.inc:88
 #, php-format
 msgid ""
 "GID number has changed. To keep file ownership you have to run the following "
@@ -1488,17 +1693,13 @@ msgstr ""
 "のコマンドを実行しなければなりません: 'find / -gid %s -uid %s -exec chgrp %s "
 "{} \\;'"
 
-#: ../lib/modules/posixGroup.inc:470
+#: ../lib/modules/posixGroup.inc:461
 msgid "GID number has to be a numeric value!"
 msgstr "GID番号は数値でなくてはなりません。"
 
-#: ../lib/modules/posixGroup.inc:305
-msgid "GID ranges for Unix groups"
-msgstr "unixグループのGID範囲"
-
-#: ../lib/modules/posixAccount.inc:249 ../lib/modules/posixAccount.inc:281
-#: ../lib/modules/posixAccount.inc:351 ../lib/modules/posixAccount.inc:389
-#: ../lib/modules/posixAccount.inc:826 ../lib/modules/posixAccount.inc:1031
+#: ../lib/modules/posixAccount.inc:258 ../lib/modules/posixAccount.inc:290
+#: ../lib/modules/posixAccount.inc:364 ../lib/modules/posixAccount.inc:402
+#: ../lib/modules/posixAccount.inc:942 ../lib/modules/posixAccount.inc:1166
 msgid "Gecos"
 msgstr ""
 
@@ -1511,18 +1712,18 @@ msgstr "日本"
 msgid "Go"
 msgstr "進む"
 
-#: ../lib/modules/quota.inc:102 ../lib/modules/quota.inc:314
+#: ../lib/modules/quota.inc:108 ../lib/modules/quota.inc:357
 msgid "Grace block period"
 msgstr "ブロック猶予期間"
 
-#: ../lib/modules/quota.inc:103
+#: ../lib/modules/quota.inc:109
 msgid ""
 "Grace block period. Most filesystems use a fixed maximum value of 7 days."
 msgstr ""
 "ブロッククオータの猶予期間。 ほとんどのファイルシステムは、最大値である7日間"
 "を固定値として使用します。"
 
-#: ../lib/modules/quota.inc:119
+#: ../lib/modules/quota.inc:131
 msgid ""
 "Grace inode (files) period. Most filesystems use a fixed maximum value of 7 "
 "days."
@@ -1530,45 +1731,52 @@ msgstr ""
 "iノード(ファイル)クオータの猶予期間。 ほとんどのファイルシステムは、最大値で"
 "ある7日間を固定値として使用します。"
 
-#: ../lib/modules/quota.inc:118 ../lib/modules/quota.inc:318
+#: ../lib/modules/quota.inc:130 ../lib/modules/quota.inc:361
 msgid "Grace inode period"
 msgstr "iノードクオータの猶予期間"
 
-#: ../templates/selfService/adminMain.php:460
+#: ../templates/config/confmain.php:373
+#: ../templates/selfService/adminMain.php:495
 msgid "Group"
 msgstr "グループ"
 
-#: ../lib/types/group.inc:53
+#: ../lib/modules/neofonieInetOrgPerson.inc:161
+msgid "Group 1, Group 2"
+msgstr ""
+
+#: ../lib/types/group.inc:54
 msgid "Group accounts (e.g. Unix and Samba)"
 msgstr "グループアカウント(e.g. Unix および Samba)"
 
-#: ../lib/types/group.inc:86 ../lib/modules/posixGroup.inc:355
+#: ../lib/types/group.inc:87 ../lib/modules/posixGroup.inc:346
 msgid "Group description"
 msgstr "グループの説明"
 
-#: ../lib/modules/posixGroup.inc:384
+#: ../lib/modules/posixGroup.inc:375
 msgid "Group description. If left empty group name will be used."
 msgstr "グループの説明。もしも空ならば、グループ名が使われます。"
 
-#: ../lib/types/group.inc:85
+#: ../lib/types/group.inc:86
 msgid "Group member DNs"
 msgstr "グループメンバのDN"
 
-#: ../lib/types/group.inc:84 ../lib/modules/posixGroup.inc:160
-#: ../lib/modules/posixGroup.inc:220 ../lib/modules/posixGroup.inc:361
-#: ../lib/modules/posixGroup.inc:387 ../lib/modules/posixGroup.inc:391
-#: ../lib/modules/posixGroup.inc:444
+#: ../lib/types/group.inc:85 ../lib/modules/posixGroup.inc:160
+#: ../lib/modules/posixGroup.inc:220 ../lib/modules/posixGroup.inc:352
+#: ../lib/modules/posixGroup.inc:378 ../lib/modules/posixGroup.inc:382
+#: ../lib/modules/posixGroup.inc:435
 msgid "Group members"
 msgstr "グループメンバ"
 
-#: ../lib/types/group.inc:82 ../lib/modules/posixGroup.inc:148
-#: ../lib/modules/posixGroup.inc:341 ../lib/modules/posixGroup.inc:375
-#: ../lib/modules/posixGroup.inc:442 ../lib/modules/posixGroup.inc:471
-#: ../lib/modules/posixGroup.inc:472 ../lib/modules/posixGroup.inc:473
+#: ../lib/types/group.inc:83 ../lib/modules/posixGroup.inc:148
+#: ../lib/modules/posixGroup.inc:332 ../lib/modules/posixGroup.inc:366
+#: ../lib/modules/posixGroup.inc:433 ../lib/modules/posixGroup.inc:462
+#: ../lib/modules/posixGroup.inc:463 ../lib/modules/posixGroup.inc:464
+#: ../lib/modules/groupOfNames.inc:56 ../lib/modules/groupOfNames.inc:80
+#: ../lib/modules/groupOfNames.inc:433
 msgid "Group name"
 msgstr "グループ名"
 
-#: ../lib/modules/posixGroup.inc:473 ../lib/modules/posixGroup.inc:474
+#: ../lib/modules/posixGroup.inc:464 ../lib/modules/posixGroup.inc:465
 msgid ""
 "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
@@ -1576,59 +1784,61 @@ msgstr ""
 "グループ名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ で"
 "す!"
 
-#: ../lib/modules/posixGroup.inc:472
+#: ../lib/modules/posixGroup.inc:463
 msgid "Group name in use. Selected next free group name."
 msgstr "グループ名が既に使われています。次の未使用グループ名が選択されました。"
 
-#: ../lib/modules/posixGroup.inc:376
+#: ../lib/modules/posixGroup.inc:367
 msgid ""
-"Group name of the group which should be created. Valid characters are: a-z,0-"
-"9, .-_. LAM does not allow a number as first character because groupadd also "
-"does not allow it. LAM does not allow capital letters A-Z because it can "
-"cause several problems. If group name is already used group name will be "
-"expanded with a number. The next free number will be used."
-msgstr ""
-"作成しようとしているグループのグループ名。有効な文字は: a-z,0-9, .-_ です。"
-"groupaddコマンドで許されていないため、先頭の文字として数字は使えません。大文"
-"字のA-Zは、いくつかの問題を引き起こす事があるため使えません。もしもグループ名"
-"が既に使われていたならば、グループ名に番号が付加されます。この場合、空いてい"
-"る次の番号が使われます。"
+"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は、いくつかの問題を引き起こす事があるため使えません。もしもグループ名が既に使われていたならば、グループ名に番号が付加されます。この場合、空いている次の番号が使われます。"
 
-#: ../lib/modules/posixGroup.inc:367 ../lib/modules/posixGroup.inc:395
+#: ../lib/modules/groupOfNames.inc:40
+msgid "Group of names"
+msgstr "名前のグループ"
+
+#: ../lib/modules/groupOfUniqueNames.inc:40
+msgid "Group of unique names"
+msgstr "uniqueな名前のグループ"
+
+#: ../lib/modules/posixGroup.inc:358 ../lib/modules/posixGroup.inc:386
 msgid "Group password"
 msgstr "グループパスワード"
 
-#: ../lib/modules/sambaGroupMapping.inc:215
+#: ../lib/modules/sambaGroupMapping.inc:220
 msgid "Group type"
 msgstr "グループのタイプ"
 
-#: ../lib/types/group.inc:44
+#: ../lib/types/group.inc:45 ../lib/modules/posixGroup.inc:296
 msgid "Groups"
 msgstr "グループ"
 
-#: ../lib/modules/quota.inc:443
+#: ../lib/modules/quota.inc:550
 msgid "Hard block"
 msgstr "ハードblock"
 
-#: ../lib/modules/quota.inc:98 ../lib/modules/quota.inc:99
-#: ../lib/modules/quota.inc:313 ../lib/modules/quota.inc:366
+#: ../lib/modules/quota.inc:102 ../lib/modules/quota.inc:103
+#: ../lib/modules/quota.inc:356 ../lib/modules/quota.inc:441
 msgid "Hard block limit"
 msgstr "ハードブロック制限"
 
-#: ../lib/modules/quota.inc:445
+#: ../lib/modules/quota.inc:552
 msgid "Hard inode"
 msgstr "ハードinode"
 
-#: ../lib/modules/quota.inc:115
+#: ../lib/modules/quota.inc:125
 msgid "Hard inode (files) limit"
 msgstr "ハードinode(ファイル)制限"
 
-#: ../lib/modules/quota.inc:114 ../lib/modules/quota.inc:317
-#: ../lib/modules/quota.inc:368
+#: ../lib/modules/quota.inc:124 ../lib/modules/quota.inc:360
+#: ../lib/modules/quota.inc:443
 msgid "Hard inode limit"
 msgstr "ハードinode制限"
 
-#: ../lib/modules/sambaSamAccount.inc:426
+#: ../lib/modules/sambaSamAccount.inc:475
 msgid "Hawaii"
 msgstr ""
 
@@ -1636,7 +1846,7 @@ msgstr ""
 msgid "Headline"
 msgstr "見出し"
 
-#: ../templates/ou_edit.php:173 ../templates/ou_edit.php:186
+#: ../templates/ou_edit.php:174 ../templates/ou_edit.php:189
 #: ../templates/masscreate.php:154 ../templates/masscreate.php:167
 #: ../templates/masscreate.php:301 ../templates/config/profmanage.php:173
 #: ../templates/config/profmanage.php:225
@@ -1650,33 +1860,34 @@ msgstr "見出し"
 #: ../templates/config/mainmanage.php:240
 #: ../templates/config/mainmanage.php:304
 #: ../templates/config/confmodules.php:122
-#: ../templates/config/confmain.php:147 ../templates/config/confmain.php:161
-#: ../templates/config/confmain.php:183 ../templates/config/confmain.php:204
-#: ../templates/config/confmain.php:261 ../templates/config/confmain.php:306
-#: ../templates/config/confmain.php:325 ../templates/config/confmain.php:334
-#: ../templates/config/confmain.php:352 ../templates/config/confmain.php:366
-#: ../templates/config/conftypes.php:201 ../templates/config/conftypes.php:217
-#: ../templates/config/conflogin.php:128 ../templates/config/mainlogin.php:119
+#: ../templates/config/confmain.php:153 ../templates/config/confmain.php:167
+#: ../templates/config/confmain.php:189 ../templates/config/confmain.php:212
+#: ../templates/config/confmain.php:267 ../templates/config/confmain.php:312
+#: ../templates/config/confmain.php:331 ../templates/config/confmain.php:340
+#: ../templates/config/confmain.php:385 ../templates/config/confmain.php:404
+#: ../templates/config/confmain.php:418 ../templates/config/conftypes.php:201
+#: ../templates/config/conftypes.php:217 ../templates/config/conflogin.php:128
+#: ../templates/config/mainlogin.php:119
 #: ../templates/selfService/profManage.php:159
 #: ../templates/selfService/profManage.php:199
 #: ../templates/selfService/profManage.php:234
 #: ../templates/selfService/profManage.php:258
 #: ../templates/selfService/adminLogin.php:125
-#: ../templates/selfService/adminMain.php:235
-#: ../templates/selfService/adminMain.php:249
-#: ../templates/selfService/adminMain.php:263
-#: ../templates/selfService/adminMain.php:277
-#: ../templates/selfService/adminMain.php:300
-#: ../templates/selfService/adminMain.php:320
+#: ../templates/selfService/adminMain.php:270
+#: ../templates/selfService/adminMain.php:284
+#: ../templates/selfService/adminMain.php:298
+#: ../templates/selfService/adminMain.php:312
 #: ../templates/selfService/adminMain.php:335
-#: ../templates/selfService/adminMain.php:350
-#: ../templates/selfService/adminMain.php:434
-#: ../templates/selfService/adminMain.php:468
+#: ../templates/selfService/adminMain.php:355
+#: ../templates/selfService/adminMain.php:370
+#: ../templates/selfService/adminMain.php:385
+#: ../templates/selfService/adminMain.php:469
+#: ../templates/selfService/adminMain.php:503
 #: ../templates/pdfedit/pdfpage.php:750
 #: ../templates/profedit/profilepage.php:195
 #: ../templates/profedit/profilepage.php:215
-#: ../templates/profedit/profilepage.php:246 ../lib/lists.inc:334
-#: ../lib/modules.inc:698
+#: ../templates/profedit/profilepage.php:246 ../lib/lists.inc:344
+#: ../lib/modules.inc:693
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -1692,16 +1903,20 @@ msgstr ""
 msgid "Here you can browse LDAP object classes and attributes."
 msgstr "ここでは、LDAPオブジェクトのクラスと属性をブラウズできます。"
 
+#: ../lib/modules/sambaSamAccount.inc:318
+msgid "Here you can change the settings for the terminal server access."
+msgstr "ターミナルサーバーへのアクセス設定を変更できます。"
+
 #: ../templates/masscreate.php:88
 msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr ""
 "ここでは、CSVファイルを与える事によって、複数のアカウントを作成できます。"
 
-#: ../lib/modules/sambaDomain.inc:111
-msgid "Here you can define to deactivate accounts after bad logon attempts."
-msgstr "アカウント無効化に至るログオン失敗回数を設定します。"
+#: ../lib/modules/groupOfNames.inc:61
+msgid "Here you can enter a description for this group."
+msgstr "このグループに対する説明を入力できます。"
 
-#: ../lib/modules/posixAccount.inc:335
+#: ../lib/modules/posixAccount.inc:344
 msgid ""
 "Here you can enter a list of additional group memberships. The group names "
 "are separated by commas."
@@ -1709,7 +1924,7 @@ msgstr ""
 "ここにはメンバーとして所属する追加グループのリストを入力します。グループ名は"
 "カンマによって区切られます。"
 
-#: ../help/help.inc:140
+#: ../help/help.inc:138
 msgid ""
 "Here you can input small filter expressions (e.g. 'value' or 'v*'). LAM will "
 "filter case-insensitive."
@@ -1717,7 +1932,7 @@ msgstr ""
 "ここには、簡単なフィルタ(例 'value'または'v*')を入力できます。大文字と小文字"
 "は区別されます。"
 
-#: ../help/help.inc:153
+#: ../help/help.inc:151
 msgid ""
 "Here you can load an account profile to set default settings for your "
 "account. The \"default\" profile is automatically loaded for new accounts."
@@ -1730,14 +1945,14 @@ msgstr ""
 msgid "Here you can manage your account profiles."
 msgstr "ここで、あなたのアカウントのプロファイルを管理できます。"
 
-#: ../help/help.inc:157
+#: ../help/help.inc:155
 msgid ""
 "Here you can select a PDF structure and export the account to a PDF file."
 msgstr ""
 "ここでは、PDF構成の選択と、アカウントのPDFフィアルへのエクスポートを行えま"
 "す。"
 
-#: ../help/help.inc:136
+#: ../help/help.inc:134
 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 "
@@ -1747,7 +1962,7 @@ msgstr ""
 "unixシステムではSyslogに、Windowsではイベントログに出力されます。追加のファイ"
 "ルを選択する事もできます。"
 
-#: ../help/help.inc:113
+#: ../help/help.inc:106
 msgid ""
 "Here you can select which plugins you want to use for account management."
 msgstr "ここでは、アカウント管理に使用するプラグインを選択できます。"
@@ -1757,6 +1972,10 @@ msgid ""
 "Here you can specify the minimum number of characters for a user password."
 msgstr "ユーザーパスワードの最低文字数を設定します。"
 
+#: ../lib/modules/sambaSamAccount.inc:309
+msgid "Here you can specify the shadowing mode."
+msgstr "ここではshadowingモードを記述できます。"
+
 #: ../templates/tools.php:91
 msgid "Here you can test if certain LAM features work on your installation."
 msgstr "あなたがインストールしたLAMの特定の機能が動作するかをテストできます。"
@@ -1778,21 +1997,24 @@ msgid "Hint: To delete an attribute, empty the text field and click save."
 msgstr ""
 "ヒント: 属性を削除するには、テキストフィールドを空にして保存してください。"
 
-#: ../lib/modules/posixAccount.inc:376
+#: ../lib/modules/posixAccount.inc:389
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr ""
 "複数のグループを選択(解除)する場合は、CTRLキーを押しながら操作してください。"
 
-#: ../lib/types/user.inc:89 ../lib/modules/posixAccount.inc:60
-#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:63
-#: ../lib/modules/posixAccount.inc:220 ../lib/modules/posixAccount.inc:338
-#: ../lib/modules/posixAccount.inc:342 ../lib/modules/posixAccount.inc:359
-#: ../lib/modules/posixAccount.inc:652 ../lib/modules/posixAccount.inc:840
-#: ../lib/modules/posixAccount.inc:980 ../lib/modules/posixAccount.inc:1034
+#: ../lib/types/user.inc:89 ../lib/modules/sambaSamAccount.inc:281
+#: ../lib/modules/sambaSamAccount.inc:1331
+#: ../lib/modules/sambaSamAccount.inc:1691 ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:94 ../lib/modules/posixAccount.inc:222
+#: ../lib/modules/posixAccount.inc:347 ../lib/modules/posixAccount.inc:351
+#: ../lib/modules/posixAccount.inc:355 ../lib/modules/posixAccount.inc:372
+#: ../lib/modules/posixAccount.inc:760 ../lib/modules/posixAccount.inc:961
+#: ../lib/modules/posixAccount.inc:1114 ../lib/modules/posixAccount.inc:1169
 msgid "Home directory"
 msgstr "ホームディレクトリ"
 
-#: ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:66
 #, php-format
 msgid ""
 "Home directory changed. To keep home directory you have to run the following "
@@ -1802,34 +2024,43 @@ msgstr ""
 "権限で以下のコマンドを実行しなければなりません: 'mv %s %s'"
 
 #: ../lib/modules/sambaAccount.inc:146 ../lib/modules/sambaAccount.inc:277
-#: ../lib/modules/sambaAccount.inc:378 ../lib/modules/sambaAccount.inc:755
-#: ../lib/modules/sambaAccount.inc:856 ../lib/modules/sambaSamAccount.inc:222
-#: ../lib/modules/sambaSamAccount.inc:350
-#: ../lib/modules/sambaSamAccount.inc:900
-#: ../lib/modules/sambaSamAccount.inc:1118
-#: ../lib/modules/sambaSamAccount.inc:1291
+#: ../lib/modules/sambaAccount.inc:378 ../lib/modules/sambaAccount.inc:769
+#: ../lib/modules/sambaAccount.inc:876 ../lib/modules/sambaSamAccount.inc:229
+#: ../lib/modules/sambaSamAccount.inc:399
+#: ../lib/modules/sambaSamAccount.inc:1065
+#: ../lib/modules/sambaSamAccount.inc:1342
+#: ../lib/modules/sambaSamAccount.inc:1486
+#: ../lib/modules/sambaSamAccount.inc:1665
+#: ../lib/modules/sambaSamAccount.inc:1692
 msgid "Home drive"
 msgstr "ホームドライブ"
 
 #: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaAccount.inc:62
 #: ../lib/modules/sambaAccount.inc:152 ../lib/modules/sambaAccount.inc:283
-#: ../lib/modules/sambaAccount.inc:381 ../lib/modules/sambaAccount.inc:758
-#: ../lib/modules/sambaAccount.inc:855 ../lib/modules/sambaSamAccount.inc:76
-#: ../lib/modules/sambaSamAccount.inc:77
-#: ../lib/modules/sambaSamAccount.inc:225
-#: ../lib/modules/sambaSamAccount.inc:356
-#: ../lib/modules/sambaSamAccount.inc:903
-#: ../lib/modules/sambaSamAccount.inc:1124
-#: ../lib/modules/sambaSamAccount.inc:1290
+#: ../lib/modules/sambaAccount.inc:381 ../lib/modules/sambaAccount.inc:772
+#: ../lib/modules/sambaAccount.inc:875 ../lib/modules/sambaSamAccount.inc:80
+#: ../lib/modules/sambaSamAccount.inc:81
+#: ../lib/modules/sambaSamAccount.inc:232
+#: ../lib/modules/sambaSamAccount.inc:405
+#: ../lib/modules/sambaSamAccount.inc:1073
+#: ../lib/modules/sambaSamAccount.inc:1492
+#: ../lib/modules/sambaSamAccount.inc:1662
 msgid "Home path"
 msgstr "ホームパス"
 
-#: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaSamAccount.inc:76
-#: ../lib/modules/sambaSamAccount.inc:78
+#: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaSamAccount.inc:80
+#: ../lib/modules/sambaSamAccount.inc:82
 msgid "Home path is invalid."
 msgstr "ホームパスが正しくありません。"
 
-#: ../lib/modules/posixAccount.inc:60 ../lib/modules/posixAccount.inc:62
+#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:120
+#: ../lib/modules/inetOrgPerson.inc:223 ../lib/modules/inetOrgPerson.inc:390
+#: ../lib/modules/inetOrgPerson.inc:702 ../lib/modules/inetOrgPerson.inc:904
+#: ../lib/modules/inetOrgPerson.inc:1202
+msgid "Home telephone number"
+msgstr "自宅電話番号"
+
+#: ../lib/modules/posixAccount.inc:63 ../lib/modules/posixAccount.inc:65
 msgid "Homedirectory contains invalid characters."
 msgstr "ホームディレクトリが不正な文字を含んでいます。"
 
@@ -1841,34 +2072,34 @@ msgstr "ホストアカウント(e.g. Samba)"
 msgid "Host description"
 msgstr "ホストの説明"
 
-#: ../lib/modules/account.inc:80 ../lib/modules/posixAccount.inc:390
-#: ../lib/modules/posixAccount.inc:398
+#: ../lib/modules/account.inc:85 ../lib/modules/posixAccount.inc:403
+#: ../lib/modules/posixAccount.inc:411
 msgid "Host description. If left empty host name will be used."
 msgstr "ホストの説明。もしも空ならば、ホスト名が使われます。"
 
-#: ../lib/modules/account.inc:89
+#: ../lib/modules/account.inc:104
 msgid "Host list"
 msgstr "ホスト一覧"
 
 #: ../lib/types/host.inc:82 ../lib/types/host.inc:83
-#: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:76
-#: ../lib/modules/posixAccount.inc:78 ../lib/modules/posixAccount.inc:260
-#: ../lib/modules/posixAccount.inc:385
+#: ../lib/modules/account.inc:80 ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:269 ../lib/modules/posixAccount.inc:398
 msgid "Host name"
 msgstr "ホスト名"
 
-#: ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixAccount.inc:85
 msgid "Host name already exists!"
 msgstr "ホスト名は既に存在しています!"
 
-#: ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:83
 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:76
+#: ../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 $ !"
@@ -1876,55 +2107,57 @@ msgstr ""
 "ホスト名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です。"
 "ホスト名の末尾は$でなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:81
 msgid "Host name in use. Selected next free host name."
 msgstr "ホスト名がすでに使われています。次の未使用ホスト名が選択されました。"
 
-#: ../lib/modules/posixAccount.inc:386
+#: ../lib/modules/account.inc:81 ../lib/modules/posixAccount.inc:399
 msgid ""
-"Host name of the host which should be created. Valid characters are: a-z,0-"
-"9, .-_$. LAM does not allow a number as first character because useradd also "
-"does not allow it. LAM does not allow capital letters A-Z because it can "
-"cause several problems. Host names are always ending with $. If last "
+"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, 0-9, .-_$ です。"
-"useraddコマンドで許されてしないため、先頭文字に数字は使えません。大文字のA-Z"
-"は、いくつかの問題を引き起こす事があるため使えません。ホスト名の末尾は必ず $ "
-"になります。もしも最後の文字が $ でなければ追加されます。もしもホスト名がすで"
-"に使われていれば、ホスト名に番号が付加されます。この場合、空いている次の番号"
-"が使われます。"
+msgstr "作成しようとしているホストのホスト名。有効な文字は: a-z, A-Z, 0-9, .-_$ です。useraddコマンドで許されてしないため、先頭文字に数字は使えません。ホスト名の末尾は必ず $ になります。もしも最後の文字が $ でなければ追加されます。もしもホスト名がすでに使われていれば、ホスト名に番号が付加されます。この場合、空いている次の番号が使われます。"
 
-#: ../lib/types/host.inc:44 ../lib/modules/posixAccount.inc:55
-#: ../lib/modules/posixAccount.inc:56 ../lib/modules/posixAccount.inc:58
-#: ../lib/modules/posixAccount.inc:152
+#: ../lib/types/host.inc:44 ../lib/modules/posixAccount.inc:58
+#: ../lib/modules/posixAccount.inc:59 ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:165
 msgid "Hosts"
 msgstr "ホスト"
 
-#: ../lib/modules/posixGroup.inc:466 ../lib/modules/posixGroup.inc:574
-#: ../lib/modules/posixAccount.inc:66 ../lib/modules/posixAccount.inc:634
+#: ../lib/modules/posixGroup.inc:457 ../lib/modules/posixGroup.inc:565
+#: ../lib/modules/posixAccount.inc:69 ../lib/modules/posixAccount.inc:742
 msgid "ID is already in use"
 msgstr "ID はすでに使用されています"
 
-#: ../lib/modules/posixGroup.inc:464 ../lib/modules/posixGroup.inc:465
-#: ../lib/modules/posixGroup.inc:466 ../lib/modules/posixGroup.inc:566
-#: ../lib/modules/posixGroup.inc:574 ../lib/modules/posixAccount.inc:64
-#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:66
-#: ../lib/modules/posixAccount.inc:630 ../lib/modules/posixAccount.inc:634
+#: ../lib/modules/posixGroup.inc:455 ../lib/modules/posixGroup.inc:456
+#: ../lib/modules/posixGroup.inc:457 ../lib/modules/posixGroup.inc:557
+#: ../lib/modules/posixGroup.inc:565 ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:69
+#: ../lib/modules/posixAccount.inc:738 ../lib/modules/posixAccount.inc:742
 msgid "ID-Number"
 msgstr "ID番号"
 
+#: ../lib/modules/neofonieInetOrgPerson.inc:146
+msgid "IT"
+msgstr ""
+
 #: ../templates/masscreate.php:158 ../templates/masscreate.php:171
 #: ../templates/masscreate.php:306
 msgid "Identifier"
 msgstr "識別子"
 
-#: ../lib/modules/sambaAccount.inc:350 ../lib/modules/sambaSamAccount.inc:194
+#: ../lib/modules/sambaSamAccount.inc:1377
+#: ../lib/modules/sambaSamAccount.inc:1703
+msgid "Idle time limit"
+msgstr "無動作時間の制限"
+
+#: ../lib/modules/sambaAccount.inc:350 ../lib/modules/sambaSamAccount.inc:198
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "チェックした場合、unixパスワードがSambaパスワードとしても使われます。"
 
-#: ../lib/modules/posixAccount.inc:368
+#: ../lib/modules/posixAccount.inc:381
 msgid ""
 "If checked account will be deactivated by putting a \"!\" before the "
 "encrypted password."
@@ -1932,26 +2165,37 @@ msgstr ""
 "チェックした場合、暗号化パスワードの前に\"!\"が挿入され、アカウントは無効化さ"
 "れます。"
 
-#: ../lib/modules/sambaAccount.inc:368 ../lib/modules/sambaSamAccount.inc:212
+#: ../lib/modules/sambaAccount.inc:368
 msgid "If checked account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "チェックした場合、(D-フラグをセットすることで)アカウントは無効化されます。"
 
-#: ../lib/modules/sambaAccount.inc:356 ../lib/modules/sambaSamAccount.inc:200
+#: ../lib/modules/sambaAccount.inc:356 ../lib/modules/sambaSamAccount.inc:204
 msgid "If checked no password will be used."
 msgstr "チェックした場合、パスワードは使われません。"
 
-#: ../lib/modules/sambaAccount.inc:362 ../lib/modules/sambaSamAccount.inc:206
+#: ../lib/modules/sambaAccount.inc:362 ../lib/modules/sambaSamAccount.inc:210
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "チェックした場合、パスワードは無期限になります。(X-フラグをセット)"
 
-#: ../lib/modules/posixGroup.inc:380
+#: ../lib/modules/sambaSamAccount.inc:216
+msgid "If checked then the account will be deactivated. (Setting D-Flag)"
+msgstr "チェックした場合、(D-フラグをセットすることにより)アカウントは無効化されます。"
+
+#: ../lib/modules/sambaSamAccount.inc:219
+msgid ""
+"If checked then the account will be locked (setting L-Flag). You usually "
+"want to use this setting to unlock user accounts which were locked because "
+"of failed login attempts."
+msgstr "チェックした場合、(L-フラグをセットすることにより)アカウントはロックされます。通常はログイン失敗によってロックされたユーザーのアカウントをアンロックしたい場合に使用します。"
+
+#: ../lib/modules/posixGroup.inc:371
 msgid ""
 "If empty GID number will be generated automaticly depending on your "
 "configuration settings."
 msgstr "未記入の場合、設定内容に従ってGID番号が自動的に生成されます。"
 
-#: ../lib/modules/posixAccount.inc:327
+#: ../lib/modules/posixAccount.inc:336
 msgid "If empty UID number will be generated automaticly."
 msgstr "未記入の場合、UID番号が自動的に生成されます。"
 
@@ -1959,38 +2203,38 @@ msgstr "未記入の場合、UID番号が自動的に生成されます。"
 msgid "If set then users need to login to change their password."
 msgstr "パスワード変更の際にユーザーのログオンを強制します。"
 
-#: ../lib/modules/sambaAccount.inc:353 ../lib/modules/sambaSamAccount.inc:197
+#: ../lib/modules/sambaAccount.inc:353 ../lib/modules/sambaSamAccount.inc:201
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr ""
 "\"true\"にセットした場合、unixパスワードがSambaパスワードとしても使われます。"
 
-#: ../lib/modules/sambaAccount.inc:371 ../lib/modules/sambaSamAccount.inc:215
+#: ../lib/modules/sambaAccount.inc:371 ../lib/modules/sambaSamAccount.inc:222
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "\"true\"にセットした場合、アカウントは無効になります。(D-フラグをセット)"
 
-#: ../lib/modules/sambaAccount.inc:359 ../lib/modules/sambaSamAccount.inc:203
+#: ../lib/modules/sambaAccount.inc:359 ../lib/modules/sambaSamAccount.inc:207
 msgid "If set to \"true\" no password will be used."
 msgstr "\"true\"にセットした場合、パスワードは使われません。"
 
-#: ../lib/modules/sambaAccount.inc:365 ../lib/modules/sambaSamAccount.inc:209
+#: ../lib/modules/sambaAccount.inc:365 ../lib/modules/sambaSamAccount.inc:213
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr ""
 "\"true\"にセットした場合、パスワードは無期限になります。(X-フラグをセット)"
 
-#: ../lib/modules/sambaSamAccount.inc:251
+#: ../lib/modules/sambaSamAccount.inc:258
 msgid ""
 "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr ""
 "未入力の場合は、LAMは uidNumber*2 + sambaAlgorithmicRidBase を使用します。"
 
-#: ../help/help.inc:107
+#: ../help/help.inc:100
 msgid ""
 "If you want to change the current preferences password, please enter it here."
 msgstr ""
 "現在のプリファレンスのパスワードを変更したい場合は、ここに入力してください。"
 
-#: ../help/help.inc:126
+#: ../help/help.inc:124
 msgid ""
 "If you want to change your master configuration password, please enter it "
 "here."
@@ -2005,7 +2249,7 @@ msgstr ""
 "用してください。"
 
 #: ../lib/modules/sambaAccount.inc:397
-#: ../lib/modules/sambaGroupMapping.inc:297
+#: ../lib/modules/sambaGroupMapping.inc:302
 msgid "If you want to use a well known RID you can selcet a well known group."
 msgstr ""
 "もしも、よく知られているRID(well known RID)を使いたいのであれば、よく知られた"
@@ -2015,6 +2259,12 @@ msgstr ""
 msgid "Include system attributes"
 msgstr "システム属性を含む"
 
+#: ../lib/modules/sambaSamAccount.inc:287
+#: ../lib/modules/sambaSamAccount.inc:1352
+#: ../lib/modules/sambaSamAccount.inc:1698
+msgid "Inherit client startup configuration"
+msgstr "クライアントのスタートアップ構成を継承する"
+
 #: ../templates/schema/schema.php:401 ../templates/schema/schema.php:422
 msgid "Inherited from"
 msgstr "継承元"
@@ -2023,6 +2273,12 @@ msgstr "継承元"
 msgid "Inherits from"
 msgstr "継承元"
 
+#: ../lib/modules/sambaSamAccount.inc:290
+#: ../lib/modules/sambaSamAccount.inc:1357
+#: ../lib/modules/sambaSamAccount.inc:1699
+msgid "Initial program"
+msgstr "初期プログラム"
+
 #: ../lib/modules/quota.inc:51
 msgid "Inode hard quota"
 msgstr "Inode ハードquota"
@@ -2054,21 +2310,21 @@ msgstr ""
 "iノード・ソフトクオータはiノード・ハードクオータ<より小さくなくてはなりませ"
 "ん。"
 
-#: ../templates/selfService/adminMain.php:362
+#: ../templates/selfService/adminMain.php:397
 msgid "Input fields"
 msgstr "入力フィールド"
 
 #: ../lib/modules/sambaAccount.inc:62 ../lib/modules/sambaAccount.inc:63
-#: ../lib/modules/sambaSamAccount.inc:77
+#: ../lib/modules/sambaSamAccount.inc:81
 msgid "Inserted user or group name in home path."
 msgstr "ホームパス名にユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/sambaAccount.inc:68 ../lib/modules/sambaSamAccount.inc:83
+#: ../lib/modules/sambaAccount.inc:68 ../lib/modules/sambaSamAccount.inc:87
 msgid "Inserted user or group name in logon script."
 msgstr "ログオンスクリプトパスにユーザ又はグループ名を挿入しました。"
 
 #: ../lib/modules/sambaAccount.inc:65 ../lib/modules/sambaAccount.inc:66
-#: ../lib/modules/sambaSamAccount.inc:80
+#: ../lib/modules/sambaSamAccount.inc:84
 msgid "Inserted user or group name in profile path."
 msgstr "プロファイルパスにユーザ又はグループ名を挿入しました。"
 
@@ -2081,7 +2337,7 @@ msgid "Invalid account"
 msgstr "無効なアカウント"
 
 #: ../lib/modules/kolabUser.inc:124 ../lib/modules/kolabUser.inc:171
-#: ../lib/modules/kolabUser.inc:348 ../lib/modules/kolabUser.inc:770
+#: ../lib/modules/kolabUser.inc:350 ../lib/modules/kolabUser.inc:774
 msgid "Invitation policy"
 msgstr "不正なポリシー"
 
@@ -2089,11 +2345,11 @@ msgstr "不正なポリシー"
 msgid "Invitation policy list"
 msgstr "不正なポリシーリスト"
 
-#: ../lib/modules/sambaSamAccount.inc:441
+#: ../lib/modules/sambaSamAccount.inc:490
 msgid "Islamabad, Karachi"
 msgstr ""
 
-#: ../lib/modules/posixGroup.inc:464 ../lib/modules/posixAccount.inc:65
+#: ../lib/modules/posixGroup.inc:455 ../lib/modules/posixAccount.inc:68
 msgid ""
 "It is possible that this ID-number is reused. This can cause several "
 "problems because files with old permissions might still exist. To avoid this "
@@ -2103,13 +2359,34 @@ msgstr ""
 "在するかも知れないため、これはいくつかの問題を引き起こすかもしれません。この"
 "警告を防ぐには、maxUIDをより大きな値に設定してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:119
-#: ../lib/modules/inetOrgPerson.inc:164 ../lib/modules/inetOrgPerson.inc:292
-#: ../lib/modules/inetOrgPerson.inc:660 ../lib/modules/inetOrgPerson.inc:812
+#: ../lib/modules/neofonieInetOrgPerson.inc:85
+#: ../lib/modules/neofonieInetOrgPerson.inc:139
+#: ../lib/modules/neofonieInetOrgPerson.inc:179
+#: ../lib/modules/neofonieInetOrgPerson.inc:257
+#: ../lib/modules/neofonieInetOrgPerson.inc:392
+#: ../lib/modules/neofonieInetOrgPerson.inc:627
+#: ../lib/modules/neofonieInetOrgPerson.inc:748
+msgid "Jabber IDs"
+msgstr ""
+
+#: ../lib/modules/neofonieInetOrgPerson.inc:91
+#: ../lib/modules/neofonieInetOrgPerson.inc:149
+#: ../lib/modules/neofonieInetOrgPerson.inc:275
+#: ../lib/modules/neofonieInetOrgPerson.inc:618
+msgid "Job position"
+msgstr "職種"
+
+#: ../lib/modules/neofonieInetOrgPerson.inc:92
+msgid "Job position of this user (e.g. developer, temp, ...)."
+msgstr "ユーザーの職種(例 開発者, 臨時工, ...)"
+
+#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:124
+#: ../lib/modules/inetOrgPerson.inc:169 ../lib/modules/inetOrgPerson.inc:318
+#: ../lib/modules/inetOrgPerson.inc:733 ../lib/modules/inetOrgPerson.inc:894
 msgid "Job title"
 msgstr "役職"
 
-#: ../lib/modules/inetOrgPerson.inc:293
+#: ../lib/modules/inetOrgPerson.inc:319
 msgid "Job title of user: President, department manager, ..."
 msgstr "ユーザの役職: 社長、部長、..."
 
@@ -2140,7 +2417,7 @@ msgstr ""
 "LAMはこのエントリおよび全ての子を再帰的に削除します。この操作が削除する全ての"
 "エントリのリストは下に表示されています。実行してもよろしいですか?"
 
-#: ../templates/login.php:187 ../templates/config/index.php:60
+#: ../templates/login.php:197 ../templates/config/index.php:60
 msgid "LAM configuration"
 msgstr "LAM構成設定"
 
@@ -2149,7 +2426,7 @@ msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr ""
 "LAMは入力内容をチェックしました。アカウントを作成する準備ができました。"
 
-#: ../lib/modules/posixGroup.inc:404 ../lib/modules/posixAccount.inc:323
+#: ../lib/modules/posixGroup.inc:395 ../lib/modules/posixAccount.inc:332
 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 "
@@ -2169,28 +2446,28 @@ msgstr ""
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAMはアカウント %s を作成できませんでした! LDAPエラーが発生しました。"
 
-#: ../lib/modules/sambaGroupMapping.inc:376
+#: ../lib/modules/sambaGroupMapping.inc:381
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "LAMは、この名前のSamba 3ドメインを見つけられませんでした。"
 
-#: ../lib/modules/sambaSamAccount.inc:102
+#: ../lib/modules/sambaSamAccount.inc:106
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAMは、この名前のドメインを見つけられませんでした。"
 
-#: ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/posixAccount.inc:86
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAMは、この名前のグループを見つけられませんでした。"
 
-#: ../lib/modules/posixAccount.inc:1408
+#: ../lib/modules/posixAccount.inc:1545
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAMはグループ %s のグループメンバーシップを変更できませんでした。"
 
-#: ../help/help.inc:162
+#: ../help/help.inc:160
 msgid "LAM will search for accounts in this part of the LDAP tree."
 msgstr "LAMは、このLDAPツリー部分からアカウントを検索します。"
 
-#: ../help/help.inc:164
+#: ../help/help.inc:162
 msgid ""
 "LAM will use this LDAP DN and password to search for accounts. It is "
 "sufficient to specify an account with read rights. If nothing is inserted "
@@ -2203,13 +2480,13 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: ../templates/config/confmodules.php:76 ../templates/config/confmain.php:120
-#: ../templates/config/confmain.php:501 ../templates/config/conftypes.php:154
-#: ../templates/selfService/adminMain.php:72
+#: ../templates/config/confmodules.php:76 ../templates/config/confmain.php:121
+#: ../templates/config/confmain.php:576 ../templates/config/conftypes.php:154
+#: ../templates/selfService/adminMain.php:107
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP アカウントマネージャ構成"
 
-#: ../lib/lists.inc:659
+#: ../lib/lists.inc:724
 msgid "LDAP Search failed! Please check your preferences."
 msgstr "LDAP検索に失敗しました! プリファレンスを確認してください。"
 
@@ -2217,34 +2494,34 @@ msgstr "LDAP検索に失敗しました! プリファレンスを確認してく
 msgid "LDAP Suffix is invalid!"
 msgstr "LDAPサフィックスが正しくありません!"
 
-#: ../templates/login.php:420
+#: ../templates/login.php:431
 msgid "LDAP error, server says:"
 msgstr "LDAP エラー、サーバからのメッセージ:"
 
-#: ../lib/modules.inc:1017
+#: ../lib/modules.inc:1049
 msgid "LDAP operation successful."
 msgstr "LDAP操作が完了しました。"
 
-#: ../templates/selfService/adminMain.php:273
+#: ../templates/selfService/adminMain.php:308
 msgid "LDAP password"
 msgstr "LDAPパスワード"
 
-#: ../templates/selfService/adminMain.php:286 ../help/help.inc:165
+#: ../templates/selfService/adminMain.php:321 ../help/help.inc:163
 msgid "LDAP search attribute"
 msgstr "LDAP検索属性"
 
-#: ../templates/login.php:305
+#: ../templates/login.php:315
 msgid "LDAP server"
 msgstr "LDAPサーバ"
 
-#: ../lib/lists.inc:645
+#: ../lib/types/group.inc:272 ../lib/lists.inc:707
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "LDAPのサイズ制限を越えました。一部のエントリのみを表示します。"
 
 #: ../templates/config/conftypes.php:197
-#: ../templates/selfService/adminMain.php:245
-#: ../templates/profedit/profilepage.php:180 ../help/help.inc:70
-#: ../help/help.inc:161
+#: ../templates/selfService/adminMain.php:280
+#: ../templates/profedit/profilepage.php:180 ../help/help.inc:71
+#: ../help/help.inc:159
 msgid "LDAP suffix"
 msgstr "LDAPサフィックス"
 
@@ -2256,11 +2533,11 @@ msgstr "LDAPアップロードが完了しました。"
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAPアップロード中です。お待ちください。"
 
-#: ../templates/selfService/adminMain.php:259
+#: ../templates/selfService/adminMain.php:294
 msgid "LDAP user"
 msgstr "LDAPユーザー"
 
-#: ../help/help.inc:163
+#: ../help/help.inc:161
 msgid "LDAP user and password"
 msgstr "LDAPユーザーとパスワード"
 
@@ -2269,38 +2546,46 @@ msgstr "LDAPユーザーとパスワード"
 msgid "LDIF Export for: %s"
 msgstr "LDIFにエクスポート: %s"
 
-#: ../templates/tests/lamdaemonTest.php:59
+#: ../templates/tests/lamdaemonTest.php:136
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemonサーバおよびパス"
 
-#: ../templates/tests/lamdaemonTest.php:179
+#: ../templates/tests/lamdaemonTest.php:100
 msgid "Lamdaemon successfully run."
 msgstr "Lamdaemonは正常に起動しました。"
 
-#: ../templates/tests/index.php:55 ../templates/tests/lamdaemonTest.php:51
+#: ../templates/tests/index.php:55 ../templates/tests/lamdaemonTest.php:52
 msgid "Lamdaemon test"
 msgstr "Lamdaemonテスト"
 
-#: ../templates/tests/lamdaemonTest.php:195
+#: ../templates/tests/lamdaemonTest.php:232
 msgid "Lamdaemon test finished."
 msgstr "Lamdaemonテストが完了しました。"
 
-#: ../templates/login.php:254
+#: ../templates/tests/lamdaemonTest.php:224
+msgid "Lamdaemon: Quota module installed"
+msgstr "Lamdaemon: クォータモジュールがインストールされました。"
+
+#: ../templates/tests/lamdaemonTest.php:225
+msgid "Lamdaemon: read quotas"
+msgstr "Lamdaemon: クオータの読み込み"
+
+#: ../templates/login.php:264
 msgid "Language"
 msgstr "言語"
 
-#: ../templates/config/confmain.php:440
+#: ../templates/config/confmain.php:499
 msgid "Language is not defined!"
 msgstr "言語が未定されていません!"
 
-#: ../templates/config/confmain.php:269
+#: ../templates/config/confmain.php:275
 msgid "Language settings"
 msgstr "言語の設定"
 
 #: ../lib/types/user.inc:88 ../lib/modules/inetOrgPerson.inc:48
-#: ../lib/modules/inetOrgPerson.inc:112 ../lib/modules/inetOrgPerson.inc:151
-#: ../lib/modules/inetOrgPerson.inc:300 ../lib/modules/inetOrgPerson.inc:563
-#: ../lib/modules/inetOrgPerson.inc:814 ../lib/modules/inetOrgPerson.inc:1067
+#: ../lib/modules/inetOrgPerson.inc:116 ../lib/modules/inetOrgPerson.inc:156
+#: ../lib/modules/inetOrgPerson.inc:326 ../lib/modules/inetOrgPerson.inc:611
+#: ../lib/modules/inetOrgPerson.inc:896 ../lib/modules/inetOrgPerson.inc:1178
 msgid "Last name"
 msgstr "姓"
 
@@ -2308,11 +2593,11 @@ msgstr "姓"
 msgid "Last name contains invalid characters or is empty!"
 msgstr "姓に不正な文字が含まれているか、または未入力です!"
 
-#: ../lib/modules/inetOrgPerson.inc:301
+#: ../lib/modules/inetOrgPerson.inc:327
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "ユーザの姓。アルファベット、_ - と空白のみが使用できます。"
 
-#: ../lib/modules/shadowAccount.inc:360
+#: ../lib/modules/shadowAccount.inc:361
 msgid "Last password change"
 msgstr "パスワード最終変更時刻"
 
@@ -2320,11 +2605,11 @@ msgstr "パスワード最終変更時刻"
 msgid "Line ends"
 msgstr "行の終わり"
 
-#: ../templates/selfService/adminMain.php:217
+#: ../templates/selfService/adminMain.php:252
 msgid "Link to login page for this self service profile"
 msgstr "このセルフサービス・プロファイルのログインページへのリンク"
 
-#: ../templates/config/conftypes.php:213 ../help/help.inc:82
+#: ../templates/config/conftypes.php:213 ../help/help.inc:83
 msgid "List attributes"
 msgstr "属性の一覧"
 
@@ -2332,7 +2617,15 @@ msgstr "属性の一覧"
 msgid "List attributes are invalid!"
 msgstr "リスト属性が正しくありません!"
 
-#: ../lib/modules/sambaAccount.inc:391 ../lib/modules/sambaSamAccount.inc:235
+#: ../lib/modules/neofonieInetOrgPerson.inc:83
+msgid "List of ComBots IDs."
+msgstr "ComBOTS IDのリスト"
+
+#: ../lib/modules/neofonieInetOrgPerson.inc:86
+msgid "List of Jabber IDs."
+msgstr "Jabber IDのリスト"
+
+#: ../lib/modules/sambaAccount.inc:391 ../lib/modules/sambaSamAccount.inc:242
 msgid ""
 "List of Samba workstations the user is allowed to login. Empty means every "
 "workstation."
@@ -2340,23 +2633,35 @@ msgstr ""
 "ユーザがログインできるSambaワークステーションのリスト。未記入はすべてのワーク"
 "ステーションを意味します。"
 
-#: ../templates/config/confmain.php:431
+#: ../templates/config/confmain.php:490
 msgid "List of admin users is empty or invalid!"
 msgstr "管理者(admin users)のリストが空または正しくありません!"
 
 #: ../templates/tree/delete_form.php:130
 msgid "List of entries to be deleted:"
-msgstr "削除されるエントリ:"
+msgstr "削除されるエントリ一覧:"
 
-#: ../templates/config/confmain.php:348
+#: ../lib/modules/neofonieInetOrgPerson.inc:98
+msgid "List of project groups of this user."
+msgstr "このユーザーのプロジェクトグループ一覧"
+
+#: ../lib/modules/neofonieInetOrgPerson.inc:95
+msgid "List of projects the user is working on."
+msgstr ""
+
+#: ../lib/modules/neofonieInetOrgPerson.inc:101
+msgid "List of special skills that the user has."
+msgstr "ユーザーが持っている特殊技能の一覧。"
+
+#: ../templates/config/confmain.php:400
 msgid "List of valid users"
 msgstr "有効なユーザのリスト"
 
-#: ../templates/config/confmain.php:244
+#: ../templates/config/confmain.php:250
 msgid "List settings"
 msgstr "リスト設定"
 
-#: ../lib/modules.inc:1063 ../lib/modules.inc:1066 ../help/help.inc:152
+#: ../lib/modules.inc:1100 ../lib/modules.inc:1103 ../help/help.inc:150
 msgid "Load profile"
 msgstr "プロファイルのロード"
 
@@ -2375,13 +2680,13 @@ msgstr "ローカルアドレス一覧"
 msgid "Local group"
 msgstr "ローカルグループ"
 
-#: ../lib/modules/posixGroup.inc:170 ../lib/modules/posixAccount.inc:241
-#: ../lib/modules/posixAccount.inc:856
+#: ../lib/modules/posixGroup.inc:170 ../lib/modules/posixAccount.inc:250
+#: ../lib/modules/posixAccount.inc:987
 msgid "Lock password"
 msgstr "パスワードのロック"
 
 #: ../lib/modules/sambaDomain.inc:122 ../lib/modules/sambaDomain.inc:199
-#: ../lib/modules/sambaDomain.inc:296 ../lib/modules/sambaDomain.inc:633
+#: ../lib/modules/sambaDomain.inc:331 ../lib/modules/sambaDomain.inc:675
 msgid "Lockout duration"
 msgstr "ロッカウト期間"
 
@@ -2389,16 +2694,20 @@ msgstr "ロッカウト期間"
 msgid "Lockout duration must be are natural number."
 msgstr "ロックアウト期間は自然数でなければなりません。"
 
-#: ../lib/modules/sambaDomain.inc:110 ../lib/modules/sambaDomain.inc:279
-#: ../lib/modules/sambaDomain.inc:624
+#: ../lib/modules/sambaDomain.inc:110 ../lib/modules/sambaDomain.inc:201
+#: ../lib/modules/sambaDomain.inc:304 ../lib/modules/sambaDomain.inc:666
 msgid "Lockout users after bad logon attempts"
 msgstr "ユーザーをロックアウトするに至るログオン失敗回数"
 
-#: ../templates/config/mainmanage.php:233 ../help/help.inc:135
+#: ../lib/modules/sambaDomain.inc:201
+msgid "Lockout users after bad logon attempts must be between 0 and 999."
+msgstr "ユーザーをロックアウトするに至るログオン失敗回数は0から999の間でなくてはなりません。"
+
+#: ../templates/config/mainmanage.php:233 ../help/help.inc:133
 msgid "Log destination"
 msgstr "ログ出力先"
 
-#: ../templates/config/mainmanage.php:204 ../help/help.inc:133
+#: ../templates/config/mainmanage.php:204 ../help/help.inc:131
 msgid "Log level"
 msgstr "ログレベル"
 
@@ -2406,25 +2715,25 @@ msgstr "ログレベル"
 msgid "Logging"
 msgstr "ロギング"
 
-#: ../templates/login.php:280 ../templates/config/conflogin.php:59
+#: ../templates/login.php:290 ../templates/config/conflogin.php:59
 #: ../templates/config/mainlogin.php:67
 #: ../templates/selfService/selfServiceLogin.php:130
 #: ../templates/selfService/adminLogin.php:61
-#: ../templates/selfService/adminMain.php:218 ../help/help.inc:56
+#: ../templates/selfService/adminMain.php:253 ../help/help.inc:57
 msgid "Login"
 msgstr "ログイン"
 
-#: ../templates/selfService/adminMain.php:314 ../help/help.inc:167
+#: ../templates/selfService/adminMain.php:349 ../help/help.inc:165
 msgid "Login attribute label"
 msgstr "ログイン属性ラベル"
 
-#: ../templates/selfService/adminMain.php:329 ../help/help.inc:169
+#: ../templates/selfService/adminMain.php:364 ../help/help.inc:167
 msgid "Login caption"
 msgstr "ログインの説明文"
 
-#: ../lib/types/user.inc:90 ../lib/modules/posixAccount.inc:227
-#: ../lib/modules/posixAccount.inc:371 ../lib/modules/posixAccount.inc:875
-#: ../lib/modules/posixAccount.inc:984 ../lib/modules/posixAccount.inc:1035
+#: ../lib/types/user.inc:90 ../lib/modules/posixAccount.inc:236
+#: ../lib/modules/posixAccount.inc:384 ../lib/modules/posixAccount.inc:1006
+#: ../lib/modules/posixAccount.inc:1119 ../lib/modules/posixAccount.inc:1170
 msgid "Login shell"
 msgstr "ログインシェル"
 
@@ -2432,39 +2741,39 @@ msgstr "ログインシェル"
 msgid "Logo"
 msgstr "ロゴ"
 
-#: ../lib/modules/sambaDomain.inc:98 ../lib/modules/sambaDomain.inc:258
-#: ../lib/modules/sambaDomain.inc:609
+#: ../lib/modules/sambaDomain.inc:98 ../lib/modules/sambaDomain.inc:271
+#: ../lib/modules/sambaDomain.inc:653
 msgid "Logon for password change"
 msgstr "パスワード変更のためにログオン"
 
-#: ../lib/modules/sambaSamAccount.inc:103
-#: ../lib/modules/sambaSamAccount.inc:259
-#: ../lib/modules/sambaSamAccount.inc:262
-#: ../lib/modules/sambaSamAccount.inc:394
-#: ../lib/modules/sambaSamAccount.inc:956
-#: ../lib/modules/sambaSamAccount.inc:1170
+#: ../lib/modules/sambaSamAccount.inc:107
+#: ../lib/modules/sambaSamAccount.inc:266
+#: ../lib/modules/sambaSamAccount.inc:269
+#: ../lib/modules/sambaSamAccount.inc:443
+#: ../lib/modules/sambaSamAccount.inc:1141
+#: ../lib/modules/sambaSamAccount.inc:1538
 msgid "Logon hours"
 msgstr "ログオン時間"
 
 #: ../lib/modules/sambaAccount.inc:67 ../lib/modules/sambaAccount.inc:68
 #: ../lib/modules/sambaAccount.inc:164 ../lib/modules/sambaAccount.inc:295
-#: ../lib/modules/sambaAccount.inc:387 ../lib/modules/sambaAccount.inc:764
-#: ../lib/modules/sambaAccount.inc:857 ../lib/modules/sambaSamAccount.inc:82
-#: ../lib/modules/sambaSamAccount.inc:83
-#: ../lib/modules/sambaSamAccount.inc:231
-#: ../lib/modules/sambaSamAccount.inc:368
-#: ../lib/modules/sambaSamAccount.inc:909
-#: ../lib/modules/sambaSamAccount.inc:1136
-#: ../lib/modules/sambaSamAccount.inc:1292
+#: ../lib/modules/sambaAccount.inc:387 ../lib/modules/sambaAccount.inc:778
+#: ../lib/modules/sambaAccount.inc:877 ../lib/modules/sambaSamAccount.inc:86
+#: ../lib/modules/sambaSamAccount.inc:87
+#: ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/sambaSamAccount.inc:417
+#: ../lib/modules/sambaSamAccount.inc:1089
+#: ../lib/modules/sambaSamAccount.inc:1504
+#: ../lib/modules/sambaSamAccount.inc:1668
 msgid "Logon script"
 msgstr "ログオンスクリプト"
 
 #: ../lib/modules/sambaAccount.inc:67 ../lib/modules/sambaAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:82 ../lib/modules/sambaSamAccount.inc:84
+#: ../lib/modules/sambaSamAccount.inc:86 ../lib/modules/sambaSamAccount.inc:88
 msgid "Logon script is invalid!"
 msgstr "ログオンスクリプトが正しくありません!"
 
-#: ../templates/selfService/selfServiceMain.php:200
+#: ../templates/selfService/selfServiceMain.php:233
 #: ../templates/main_header.php:69 ../templates/logout.php:67
 msgid "Logout"
 msgstr "ログアウト"
@@ -2482,7 +2791,7 @@ msgstr "MACアドレス一覧"
 msgid "MAC address(es)"
 msgstr "MACアドレス"
 
-#: ../lib/modules/sambaSamAccount.inc:447
+#: ../lib/modules/sambaSamAccount.inc:496
 msgid "Magadan, Solomon Islands"
 msgstr ""
 
@@ -2491,8 +2800,8 @@ msgid "Mail aliases"
 msgstr "電子メール エイリアス"
 
 #: ../lib/modules/kolabUser.inc:93 ../lib/modules/kolabUser.inc:160
-#: ../lib/modules/kolabUser.inc:208 ../lib/modules/kolabUser.inc:305
-#: ../lib/modules/kolabUser.inc:754
+#: ../lib/modules/kolabUser.inc:208 ../lib/modules/kolabUser.inc:307
+#: ../lib/modules/kolabUser.inc:758
 msgid "Mail quota"
 msgstr "メール・クオータ"
 
@@ -2514,8 +2823,8 @@ msgid "Mail server"
 msgstr "メールサーバ"
 
 #: ../lib/modules/kolabUser.inc:152 ../lib/modules/kolabUser.inc:183
-#: ../lib/modules/kolabUser.inc:293 ../lib/modules/kolabUser.inc:299
-#: ../lib/modules/kolabUser.inc:750
+#: ../lib/modules/kolabUser.inc:295 ../lib/modules/kolabUser.inc:301
+#: ../lib/modules/kolabUser.inc:754
 msgid "Mailbox home server"
 msgstr "メールボックス・ホーム・サーバ"
 
@@ -2535,12 +2844,12 @@ msgstr "電子メールエイリアス(e.g. NIS mail aliases)"
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "この名前へのメールは受信者に転送されます。"
 
-#: ../templates/pdfedit/pdfpage.php:617 ../lib/modules.inc:969
-#: ../lib/modules.inc:997
+#: ../templates/pdfedit/pdfpage.php:617 ../lib/modules.inc:978
+#: ../lib/modules.inc:992
 msgid "Main"
 msgstr "メイン"
 
-#: ../templates/selfService/adminMain.php:344 ../help/help.inc:171
+#: ../templates/selfService/adminMain.php:379 ../help/help.inc:169
 msgid "Main page caption"
 msgstr "メインページの説明文"
 
@@ -2552,8 +2861,8 @@ msgstr "セルフサービスプロファイルの操作"
 msgid "Manage server profiles"
 msgstr "サーバープロファイルの操作"
 
-#: ../lib/modules/inetOrgPerson.inc:176 ../lib/modules/inetOrgPerson.inc:308
-#: ../lib/modules/inetOrgPerson.inc:694 ../lib/modules/inetOrgPerson.inc:816
+#: ../lib/modules/inetOrgPerson.inc:181 ../lib/modules/inetOrgPerson.inc:334
+#: ../lib/modules/inetOrgPerson.inc:776 ../lib/modules/inetOrgPerson.inc:898
 msgid "Manager"
 msgstr "管理者"
 
@@ -2569,7 +2878,7 @@ msgstr "手動"
 msgid "Manual if conflicts"
 msgstr "競合した場合は手動"
 
-#: ../lib/modules/kolabUser.inc:397 ../lib/modules/kolabUser.inc:563
+#: ../lib/modules/kolabUser.inc:399 ../lib/modules/kolabUser.inc:565
 msgid "Mark account for deletion"
 msgstr "アカウントを削除対象としてマークする"
 
@@ -2578,7 +2887,7 @@ msgid "Mark for deletion"
 msgstr "削除対象としてマーク"
 
 #: ../templates/config/profmanage.php:348
-#: ../templates/selfService/profManage.php:248 ../help/help.inc:127
+#: ../templates/selfService/profManage.php:248 ../help/help.inc:125
 msgid "Master password"
 msgstr "マスタパスワード"
 
@@ -2599,46 +2908,34 @@ msgstr "照合規則のOID"
 msgid "Matching rules"
 msgstr "照合規則"
 
-#: ../templates/config/confmain.php:437
+#: ../templates/config/confmain.php:496
 msgid "Max list entries is invalid!"
 msgstr "リストエントリの最大数が正しくありません!"
 
-#: ../lib/modules/posixGroup.inc:299 ../lib/modules/posixGroup.inc:468
-#: ../lib/modules/posixGroup.inc:469
+#: ../lib/modules/posixGroup.inc:299 ../lib/modules/posixGroup.inc:459
+#: ../lib/modules/posixGroup.inc:460
 msgid "Maximum GID number"
 msgstr "GID番号の最大値"
 
-#: ../lib/modules/posixGroup.inc:308
-msgid "Maximum GID number for Unix groups"
-msgstr "unixグループに対するGID番号の最大値"
-
-#: ../lib/modules/posixGroup.inc:468
+#: ../lib/modules/posixGroup.inc:459
 msgid "Maximum GID number is invalid or empty!"
 msgstr "GID番号の最大値が不正または未入力です!"
 
-#: ../lib/modules/posixGroup.inc:469
+#: ../lib/modules/posixGroup.inc:460
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "GID番号の最大値は最小値よりも大きくなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:54 ../lib/modules/posixAccount.inc:56
-#: ../lib/modules/posixAccount.inc:57 ../lib/modules/posixAccount.inc:58
-#: ../lib/modules/posixAccount.inc:146 ../lib/modules/posixAccount.inc:155
+#: ../lib/modules/posixAccount.inc:57 ../lib/modules/posixAccount.inc:59
+#: ../lib/modules/posixAccount.inc:60 ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:159 ../lib/modules/posixAccount.inc:168
 msgid "Maximum UID number"
 msgstr "UID番号の最大値"
 
-#: ../lib/modules/posixAccount.inc:176
-msgid "Maximum UID number for Unix accounts (hosts)"
-msgstr "ホストnounixアカウントに対するUID番号の最大値。"
-
-#: ../lib/modules/posixAccount.inc:174
-msgid "Maximum UID number for Unix accounts (users)"
-msgstr "ユーザのunixアカウントに対するUID番号の最大値。"
-
-#: ../lib/modules/posixAccount.inc:54 ../lib/modules/posixAccount.inc:56
+#: ../lib/modules/posixAccount.inc:57 ../lib/modules/posixAccount.inc:59
 msgid "Maximum UID number is invalid!"
 msgstr "UID番号の最大値が不正です!"
 
-#: ../lib/modules/posixAccount.inc:57 ../lib/modules/posixAccount.inc:58
+#: ../lib/modules/posixAccount.inc:60 ../lib/modules/posixAccount.inc:61
 msgid "Maximum UID number must be greater than minimum UID number!"
 msgstr "UID番号の最大値は最小値よりも大きくなくてはなりません!"
 
@@ -2651,85 +2948,79 @@ msgstr "最大ファイルサイズ: %s"
 msgid "Maximum length"
 msgstr "最大長"
 
-#: ../templates/config/confmain.php:249 ../help/help.inc:92
+#: ../templates/config/confmain.php:255 ../help/help.inc:93
 msgid "Maximum list entries"
 msgstr "リストエントリの最大数"
 
-#: ../lib/modules/shadowAccount.inc:47 ../lib/modules/shadowAccount.inc:53
-#: ../lib/modules/shadowAccount.inc:99 ../lib/modules/shadowAccount.inc:165
-#: ../lib/modules/shadowAccount.inc:195 ../lib/modules/shadowAccount.inc:278
+#: ../lib/modules/shadowAccount.inc:48 ../lib/modules/shadowAccount.inc:54
+#: ../lib/modules/shadowAccount.inc:100 ../lib/modules/shadowAccount.inc:166
+#: ../lib/modules/shadowAccount.inc:196 ../lib/modules/shadowAccount.inc:279
 #: ../lib/modules/sambaDomain.inc:118 ../lib/modules/sambaDomain.inc:196
-#: ../lib/modules/sambaDomain.inc:198 ../lib/modules/sambaDomain.inc:291
-#: ../lib/modules/sambaDomain.inc:630
+#: ../lib/modules/sambaDomain.inc:198 ../lib/modules/sambaDomain.inc:322
+#: ../lib/modules/sambaDomain.inc:672
 msgid "Maximum password age"
 msgstr "パスワード期限(age)の最大値"
 
-#: ../lib/modules/sambaSamAccount.inc:434
+#: ../lib/modules/groupOfNames.inc:68 ../lib/modules/groupOfNames.inc:72
+#: ../lib/modules/groupOfNames.inc:99 ../lib/modules/groupOfNames.inc:167
+#: ../lib/modules/groupOfNames.inc:445
+msgid "Members"
+msgstr "メンバー"
+
+#: ../lib/modules/sambaSamAccount.inc:483
 msgid "Mid-Atlantic"
 msgstr ""
 
-#: ../lib/modules/sambaSamAccount.inc:425
+#: ../lib/modules/sambaSamAccount.inc:474
 msgid "Midway Island, Samoa"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:153
+#: ../lib/modules/inetOrgPerson.inc:158
 msgid "Miller"
 msgstr "ミラー"
 
-#: ../lib/modules/sambaDomain.inc:90 ../lib/modules/sambaDomain.inc:244
-#: ../lib/modules/sambaDomain.inc:601
+#: ../lib/modules/sambaDomain.inc:90 ../lib/modules/sambaDomain.inc:249
+#: ../lib/modules/sambaDomain.inc:645
 msgid "Minimal password length"
 msgstr "パスワード長さの最小値"
 
-#: ../lib/modules/posixGroup.inc:296 ../lib/modules/posixGroup.inc:467
+#: ../lib/modules/posixGroup.inc:296 ../lib/modules/posixGroup.inc:458
 msgid "Minimum GID number"
 msgstr "GID番号の最小値"
 
-#: ../lib/modules/posixGroup.inc:307
-msgid "Minimum GID number for Unix groups"
-msgstr "unixグループに対するGID番号の最小値"
-
-#: ../lib/modules/posixGroup.inc:467
+#: ../lib/modules/posixGroup.inc:458
 msgid "Minimum GID number is invalid or empty!"
 msgstr "GID番号の最小値が不正または空です!"
 
-#: ../lib/modules/posixAccount.inc:53 ../lib/modules/posixAccount.inc:55
-#: ../lib/modules/posixAccount.inc:143 ../lib/modules/posixAccount.inc:152
+#: ../lib/modules/posixAccount.inc:56 ../lib/modules/posixAccount.inc:58
+#: ../lib/modules/posixAccount.inc:156 ../lib/modules/posixAccount.inc:165
 msgid "Minimum UID number"
 msgstr "UID番号の最小値"
 
-#: ../lib/modules/posixAccount.inc:175
-msgid "Minimum UID number for Unix accounts (hosts)"
-msgstr "unixアカウント(ホスト)に対するUID番号の最小値"
-
-#: ../lib/modules/posixAccount.inc:173
-msgid "Minimum UID number for Unix accounts (users)"
-msgstr "unixアカウント(ユーザ)に対するUID番号の最小値"
-
-#: ../lib/modules/posixAccount.inc:53 ../lib/modules/posixAccount.inc:55
+#: ../lib/modules/posixAccount.inc:56 ../lib/modules/posixAccount.inc:58
 msgid "Minimum UID number is invalid!"
 msgstr "UID番号の最小値が不正です!"
 
-#: ../lib/modules/shadowAccount.inc:45 ../lib/modules/shadowAccount.inc:94
-#: ../lib/modules/shadowAccount.inc:161 ../lib/modules/shadowAccount.inc:189
-#: ../lib/modules/shadowAccount.inc:273 ../lib/modules/sambaDomain.inc:114
-#: ../lib/modules/sambaDomain.inc:197 ../lib/modules/sambaDomain.inc:286
-#: ../lib/modules/sambaDomain.inc:627
+#: ../lib/modules/shadowAccount.inc:46 ../lib/modules/shadowAccount.inc:95
+#: ../lib/modules/shadowAccount.inc:162 ../lib/modules/shadowAccount.inc:190
+#: ../lib/modules/shadowAccount.inc:274 ../lib/modules/sambaDomain.inc:114
+#: ../lib/modules/sambaDomain.inc:197 ../lib/modules/sambaDomain.inc:313
+#: ../lib/modules/sambaDomain.inc:669
 msgid "Minimum password age"
 msgstr "パスワード期限(age)の最小値"
 
-#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:113
-#: ../lib/modules/inetOrgPerson.inc:212 ../lib/modules/inetOrgPerson.inc:332
-#: ../lib/modules/inetOrgPerson.inc:333 ../lib/modules/inetOrgPerson.inc:639
-#: ../lib/modules/inetOrgPerson.inc:822
+#: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:117
+#: ../lib/modules/inetOrgPerson.inc:229 ../lib/modules/inetOrgPerson.inc:358
+#: ../lib/modules/inetOrgPerson.inc:359 ../lib/modules/inetOrgPerson.inc:709
+#: ../lib/modules/inetOrgPerson.inc:905
 msgid "Mobile number"
 msgstr "携帯電話番号"
 
-#: ../lib/modules/inetOrgPerson.inc:1091
+#: ../lib/modules/inetOrgPerson.inc:1210
 msgid "Mobile telephone number"
 msgstr "携帯電話番号"
 
-#: ../lib/modules.inc:1072
+#: ../lib/modules.inc:1109
 msgid "Modify account"
 msgstr "アカウント変更"
 
@@ -2737,28 +3028,28 @@ msgstr "アカウント変更"
 msgid "Module selection"
 msgstr "モジュール選択"
 
-#: ../lib/modules/sambaSamAccount.inc:1013
+#: ../lib/modules/sambaSamAccount.inc:1210
 msgid "Monday"
 msgstr "月曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:429
+#: ../lib/modules/sambaSamAccount.inc:478
 msgid "Mountain Time (US & Canada)"
 msgstr ""
 
-#: ../lib/modules/quota.inc:86 ../lib/modules/quota.inc:310
-#: ../lib/modules/quota.inc:364 ../lib/modules/quota.inc:441
+#: ../lib/modules/quota.inc:88 ../lib/modules/quota.inc:353
+#: ../lib/modules/quota.inc:439 ../lib/modules/quota.inc:548
 msgid "Mountpoint"
 msgstr "マウントポイント"
 
-#: ../lib/modules/quota.inc:87
+#: ../lib/modules/quota.inc:89
 msgid "Mountpoint of device with enabled quotas."
 msgstr "quotaが有効になったデバイスのマウントポイント。"
 
-#: ../lib/modules/inetOrgPerson.inc:196
+#: ../lib/modules/inetOrgPerson.inc:207
 msgid "Mycity"
 msgstr "わたしの市"
 
-#: ../lib/modules/inetOrgPerson.inc:184
+#: ../lib/modules/inetOrgPerson.inc:195
 msgid "Mystreetname 42"
 msgstr "わたしの町42番地"
 
@@ -2766,11 +3057,11 @@ msgstr "わたしの町42番地"
 #: ../templates/tree/templates/creation/new_ou_template.php:104
 #: ../templates/schema/schema.php:273 ../templates/pdfedit/pdfdelete.php:57
 #: ../templates/pdfedit/pdfdelete.php:60 ../templates/pdfedit/pdfdelete.php:85
-#: ../templates/pdfedit/pdfpage.php:669
+#: ../templates/pdfedit/pdfpage.php:669 ../lib/modules/groupOfNames.inc:132
 msgid "Name"
 msgstr "名前"
 
-#: ../help/help.inc:147
+#: ../help/help.inc:145
 msgid ""
 "Name under which the profile will be saved. If a profile with the same name "
 "exists, it will be overwritten."
@@ -2802,7 +3093,7 @@ msgstr "新しいプロファイル既定値が正しく設定されました。
 msgid "New domain"
 msgstr "新しいドメイン"
 
-#: ../lib/types/group.inc:112
+#: ../lib/types/group.inc:123
 msgid "New group"
 msgstr "新しいグループ"
 
@@ -2827,11 +3118,15 @@ msgid "New object"
 msgstr "新しいオブジェクト"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:47
-#: ../templates/ou_edit.php:165 ../help/help.inc:180
+#: ../templates/ou_edit.php:165 ../help/help.inc:178
 msgid "New organizational unit"
 msgstr "新しい organizational unit"
 
-#: ../templates/config/confmain.php:361 ../lib/modules/posixAccount.inc:1516
+#: ../lib/modules/groupOfNames.inc:246
+msgid "New owner"
+msgstr "新しい所有者"
+
+#: ../templates/config/confmain.php:413 ../lib/modules/posixAccount.inc:1672
 msgid "New password"
 msgstr "新しいパスワード"
 
@@ -2847,7 +3142,7 @@ msgstr "新しい受信者"
 msgid "New required attributes:"
 msgstr "新しい必須属性"
 
-#: ../lib/types/user.inc:124
+#: ../lib/types/user.inc:125
 msgid "New user"
 msgstr "新しいユーザ"
 
@@ -2862,7 +3157,7 @@ msgid "Next"
 msgstr "次"
 
 #: ../lib/modules/sambaDomain.inc:74 ../lib/modules/sambaDomain.inc:154
-#: ../lib/modules/sambaDomain.inc:314 ../lib/modules/sambaDomain.inc:589
+#: ../lib/modules/sambaDomain.inc:353 ../lib/modules/sambaDomain.inc:633
 msgid "Next RID"
 msgstr "次のRID"
 
@@ -2883,7 +3178,7 @@ msgid "Next RID to use when creating user accounts (only used by Winbind)."
 msgstr "ユーザアカウントを作成するときに使われる次のRID(Winbindのみが使用)。"
 
 #: ../lib/modules/sambaDomain.inc:82 ../lib/modules/sambaDomain.inc:166
-#: ../lib/modules/sambaDomain.inc:324 ../lib/modules/sambaDomain.inc:595
+#: ../lib/modules/sambaDomain.inc:363 ../lib/modules/sambaDomain.inc:639
 msgid "Next group RID"
 msgstr "次のグループRID"
 
@@ -2892,7 +3187,7 @@ msgid "Next group RID is not a number!"
 msgstr "次のグループRIDが番号ではありあせん!"
 
 #: ../lib/modules/sambaDomain.inc:78 ../lib/modules/sambaDomain.inc:160
-#: ../lib/modules/sambaDomain.inc:319 ../lib/modules/sambaDomain.inc:592
+#: ../lib/modules/sambaDomain.inc:358 ../lib/modules/sambaDomain.inc:636
 msgid "Next user RID"
 msgstr "次のユーザRID"
 
@@ -2905,17 +3200,17 @@ msgstr "次のユーザRIDが番号ではありません!"
 msgid "No"
 msgstr "いいえ"
 
-#: ../lib/modules/sambaSamAccount.inc:473
-#: ../lib/modules/sambaSamAccount.inc:557
-#: ../lib/modules/sambaSamAccount.inc:802
+#: ../lib/modules/sambaSamAccount.inc:520
+#: ../lib/modules/sambaSamAccount.inc:621
+#: ../lib/modules/sambaSamAccount.inc:941
 #: ../lib/modules/sambaGroupMapping.inc:88
 #: ../lib/modules/sambaGroupMapping.inc:173
-#: ../lib/modules/sambaGroupMapping.inc:408
+#: ../lib/modules/sambaGroupMapping.inc:414
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "Samba 3グループがLDAPに存在しません。最初に一個作成してください。"
 
-#: ../lib/modules/posixAccount.inc:415 ../lib/modules/posixAccount.inc:536
-#: ../lib/modules/posixAccount.inc:808
+#: ../lib/modules/posixAccount.inc:432 ../lib/modules/posixAccount.inc:626
+#: ../lib/modules/posixAccount.inc:916
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "unixグループがLDAPに存在しません。最初に一個作成してください。"
 
@@ -2935,15 +3230,15 @@ msgstr "説明なし"
 msgid "No domains found!"
 msgstr "ドメインが見つかりません!"
 
-#: ../lib/modules/inetOrgPerson.inc:77
+#: ../lib/modules/inetOrgPerson.inc:79
 msgid "No file selected."
 msgstr "ファイルが選択されていません。"
 
-#: ../lib/modules/posixGroup.inc:465 ../lib/modules/posixAccount.inc:64
+#: ../lib/modules/posixGroup.inc:456 ../lib/modules/posixAccount.inc:67
 msgid "No free ID-Number!"
 msgstr "空いているID番号がありません!"
 
-#: ../lib/types/group.inc:111
+#: ../lib/types/group.inc:122
 msgid "No groups found!"
 msgstr "グループが見つかりません!"
 
@@ -2955,11 +3250,11 @@ msgstr "ホストが見つかりません!"
 msgid "No internal attributes"
 msgstr "内部属性なし"
 
-#: ../templates/tests/lamdaemonTest.php:66
+#: ../templates/tests/lamdaemonTest.php:143
 msgid "No lamdaemon path set, please update your LAM configuration settings."
 msgstr "lamdaemonのパスがセットされていません。LAM構成設定を修正してください。"
 
-#: ../templates/tests/lamdaemonTest.php:62
+#: ../templates/tests/lamdaemonTest.php:139
 msgid "No lamdaemon server set, please update your LAM configuration settings."
 msgstr "lamdaemonサーバがセットされていません。LAM構成設定を修正してください。"
 
@@ -2979,7 +3274,7 @@ msgstr "オブジェクトが見つかりません!"
 msgid "No or more than one base module selected!"
 msgstr "ベースモジュールが選択されていないか、または複数が選択されています!"
 
-#: ../templates/config/confmain.php:52
+#: ../templates/config/confmain.php:53
 msgid "No password was entered!"
 msgstr "パスワードが入力されていません!"
 
@@ -3004,11 +3299,11 @@ msgstr "そのようなエントリはありません!"
 msgid "No such schema item: \"%s\""
 msgstr "そのようなスキーマアイテムはありません: \"%s\""
 
-#: ../lib/types/user.inc:123
+#: ../lib/types/user.inc:124
 msgid "No users found!"
 msgstr "ユーザが見つかりません!"
 
-#: ../help/help.inc:67
+#: ../help/help.inc:68
 msgid "Note"
 msgstr "注"
 
@@ -3024,30 +3319,26 @@ msgstr ""
 msgid "Notice"
 msgstr "注"
 
-#: ../templates/delete.php:91
+#: ../templates/delete.php:93
 msgid "Number of child entries"
 msgstr "子エントリの数"
 
-#: ../lib/modules/shadowAccount.inc:158
+#: ../lib/modules/shadowAccount.inc:159
 msgid ""
 "Number of days a user can login even his password has expired. -1=always."
 msgstr "パスワードが期限切れになってもユーザがログインできる日数。-1は無期限。"
 
-#: ../lib/modules/shadowAccount.inc:162
+#: ../lib/modules/shadowAccount.inc:163
 msgid ""
-"Number of days a user has to wait until he\\'s allowed to change his "
-"password again. If set value must be 0<."
-msgstr ""
-"再度パスワードを変更できるまで待たなければならない日数。設定するならば0より大"
-"きくなければならない。"
+"Number of days a user has to wait until he is allowed to change his password "
+"again. If set value must be >0."
+msgstr "パスワードの再変更が許可されるまでの日数。設定するならば0より大きな値にすること。"
 
-#: ../lib/modules/shadowAccount.inc:166
+#: ../lib/modules/shadowAccount.inc:167
 msgid ""
 "Number of days after a user has to change his password again. If set value "
-"must be 0<."
-msgstr ""
-"再度パスワードを変更しなければならなくなる日数。設定するならば0より大きくなけ"
-"ればならない。"
+"must be >0."
+msgstr "パスワードを再変更しなければならなくなる日数。設定する場合は0より大きな値にすること。"
 
 #: ../lib/modules/sambaDomain.inc:127
 msgid "Number of minutes after which the bad logon attempts are reset."
@@ -3086,7 +3377,7 @@ msgstr "OU が正しくありません!"
 msgid "OU is not empty or invalid!"
 msgstr "OU が空白でないか不正!"
 
-#: ../help/help.inc:180 ../help/help.inc:182
+#: ../help/help.inc:178 ../help/help.inc:180
 msgid "OU-Editor"
 msgstr "OUエディタ"
 
@@ -3099,38 +3390,41 @@ msgstr "オブジェクトクラス"
 msgid "Obsolete"
 msgstr ""
 
-#: ../lib/modules/sambaDomain.inc:260 ../lib/modules/sambaDomain.inc:267
-#: ../lib/modules/sambaDomain.inc:274 ../lib/modules/sambaDomain.inc:281
-#: ../lib/modules/sambaDomain.inc:607 ../lib/modules/sambaDomain.inc:612
-#: ../lib/modules/sambaDomain.inc:617 ../lib/modules/sambaDomain.inc:622
+#: ../lib/modules/sambaDomain.inc:273 ../lib/modules/sambaDomain.inc:284
+#: ../lib/modules/sambaDomain.inc:295 ../lib/modules/sambaDomain.inc:651
+#: ../lib/modules/sambaDomain.inc:656 ../lib/modules/sambaDomain.inc:661
 msgid "Off"
 msgstr ""
 
 #: ../templates/tree/export_form.php:165
-#: ../templates/tests/lamdaemonTest.php:70
-#: ../templates/tests/lamdaemonTest.php:91
-#: ../templates/tests/lamdaemonTest.php:108
-#: ../templates/tests/lamdaemonTest.php:133
-#: ../templates/tests/lamdaemonTest.php:178 ../templates/ou_edit.php:193
+#: ../templates/tests/lamdaemonTest.php:99
+#: ../templates/tests/lamdaemonTest.php:147
+#: ../templates/tests/lamdaemonTest.php:168
+#: ../templates/tests/lamdaemonTest.php:185
+#: ../templates/tests/lamdaemonTest.php:210 ../templates/ou_edit.php:197
 #: ../templates/masscreate.php:107 ../templates/config/profmanage.php:353
 #: ../templates/config/mainmanage.php:325
 #: ../templates/config/confmodules.php:109
 #: ../templates/config/confmodules.php:112
-#: ../templates/config/confmain.php:384 ../templates/config/conftypes.php:235
+#: ../templates/config/confmain.php:436 ../templates/config/conftypes.php:235
 #: ../templates/config/conflogin.php:124 ../templates/config/conflogin.php:125
 #: ../templates/config/mainlogin.php:117
 #: ../templates/selfService/selfServiceLogin.php:204
 #: ../templates/selfService/profManage.php:253
 #: ../templates/selfService/adminLogin.php:121
 #: ../templates/selfService/adminLogin.php:122
-#: ../templates/selfService/adminMain.php:432
-#: ../templates/selfService/adminMain.php:466
-#: ../templates/selfService/adminMain.php:486
+#: ../templates/selfService/adminMain.php:467
+#: ../templates/selfService/adminMain.php:501
+#: ../templates/selfService/adminMain.php:541
 #: ../templates/pdfedit/pdfmain.php:152
 #: ../templates/profedit/profiledelete.php:82
 #: ../templates/profedit/profilemain.php:165 ../lib/modules/posixGroup.inc:260
-#: ../lib/modules/sambaSamAccount.inc:1060 ../lib/modules/posixAccount.inc:954
-#: ../lib/modules/inetOrgPerson.inc:760
+#: ../lib/modules/neofonieInetOrgPerson.inc:448
+#: ../lib/modules/sambaSamAccount.inc:1257
+#: ../lib/modules/sambaSamAccount.inc:1428
+#: ../lib/modules/posixAccount.inc:1085 ../lib/modules/inetOrgPerson.inc:842
+#: ../lib/modules/groupOfNames.inc:224 ../lib/modules/groupOfNames.inc:251
+#: ../lib/modules/groupOfNames.inc:338
 msgid "Ok"
 msgstr ""
 
@@ -3138,13 +3432,18 @@ msgstr ""
 msgid "Old value"
 msgstr "古い値"
 
-#: ../lib/modules/sambaDomain.inc:260 ../lib/modules/sambaDomain.inc:267
-#: ../lib/modules/sambaDomain.inc:274 ../lib/modules/sambaDomain.inc:281
-#: ../lib/modules/sambaDomain.inc:608 ../lib/modules/sambaDomain.inc:613
-#: ../lib/modules/sambaDomain.inc:618 ../lib/modules/sambaDomain.inc:623
+#: ../lib/modules/sambaDomain.inc:273 ../lib/modules/sambaDomain.inc:284
+#: ../lib/modules/sambaDomain.inc:295 ../lib/modules/sambaDomain.inc:652
+#: ../lib/modules/sambaDomain.inc:657 ../lib/modules/sambaDomain.inc:662
 msgid "On"
 msgstr ""
 
+#: ../lib/modules/sambaSamAccount.inc:311
+#: ../lib/modules/sambaSamAccount.inc:1413
+#: ../lib/modules/sambaSamAccount.inc:1737
+msgid "On broken or timed out connection"
+msgstr "破棄された、またはタイムアウトした接続"
+
 #: ../templates/tree/export_form.php:75
 msgid "One (one level beneath base)"
 msgstr "One (ベース直下の1階層)"
@@ -3166,11 +3465,21 @@ msgstr "並べ替え"
 msgid "Organizational unit"
 msgstr ""
 
+#: ../templates/config/confmain.php:377
+msgid "Other"
+msgstr "その他"
+
+#: ../templates/config/confmain.php:369 ../lib/modules/groupOfNames.inc:64
+#: ../lib/modules/groupOfNames.inc:93 ../lib/modules/groupOfNames.inc:143
+#: ../lib/modules/groupOfNames.inc:161 ../lib/modules/groupOfNames.inc:441
+msgid "Owner"
+msgstr "所有者"
+
 #: ../templates/tools.php:76
 msgid "PDF editor"
 msgstr "PDFエディタ"
 
-#: ../templates/pdfedit/pdfpage.php:451 ../lib/lists.inc:511
+#: ../templates/pdfedit/pdfpage.php:451 ../lib/lists.inc:565
 msgid "PDF structure"
 msgstr "PDF構成"
 
@@ -3186,7 +3495,7 @@ msgstr "PDF構成"
 msgid "PDF-structure name not valid"
 msgstr "PDF構成名が正しくありません"
 
-#: ../lib/modules/sambaSamAccount.inc:428
+#: ../lib/modules/sambaSamAccount.inc:477
 msgid "Pacific Time (US & Canada)"
 msgstr ""
 
@@ -3198,104 +3507,99 @@ msgstr "ページ設定"
 msgid "Parent to"
 msgstr "派生先"
 
-#: ../templates/login.php:244
+#: ../templates/login.php:254
 #: ../templates/selfService/selfServiceLogin.php:190
 #: ../lib/modules/posixGroup.inc:165 ../lib/modules/posixGroup.inc:177
-#: ../lib/modules/posixGroup.inc:251 ../lib/modules/posixGroup.inc:461
-#: ../lib/modules/posixGroup.inc:462 ../lib/modules/sambaAccount.inc:74
+#: ../lib/modules/posixGroup.inc:251 ../lib/modules/posixGroup.inc:452
+#: ../lib/modules/posixGroup.inc:453 ../lib/modules/sambaAccount.inc:74
 #: ../lib/modules/sambaAccount.inc:75 ../lib/modules/sambaAccount.inc:225
-#: ../lib/modules/sambaSamAccount.inc:87 ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:291 ../lib/modules/posixAccount.inc:69
-#: ../lib/modules/posixAccount.inc:70 ../lib/modules/posixAccount.inc:130
-#: ../lib/modules/posixAccount.inc:235 ../lib/modules/posixAccount.inc:363
-#: ../lib/modules/posixAccount.inc:851 ../lib/modules/posixAccount.inc:862
-#: ../lib/modules/posixAccount.inc:945 ../lib/modules/posixAccount.inc:1038
-#: ../lib/modules/inetOrgPerson.inc:74 ../lib/modules/inetOrgPerson.inc:75
-#: ../lib/modules/inetOrgPerson.inc:356 ../lib/modules/inetOrgPerson.inc:589
-#: ../lib/modules/inetOrgPerson.inc:600 ../lib/modules/inetOrgPerson.inc:751
+#: ../lib/modules/sambaSamAccount.inc:91 ../lib/modules/sambaSamAccount.inc:92
+#: ../lib/modules/sambaSamAccount.inc:340 ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:73 ../lib/modules/posixAccount.inc:132
+#: ../lib/modules/posixAccount.inc:244 ../lib/modules/posixAccount.inc:376
+#: ../lib/modules/posixAccount.inc:982 ../lib/modules/posixAccount.inc:993
+#: ../lib/modules/posixAccount.inc:1076 ../lib/modules/posixAccount.inc:1173
+#: ../lib/modules/inetOrgPerson.inc:76 ../lib/modules/inetOrgPerson.inc:77
+#: ../lib/modules/inetOrgPerson.inc:382 ../lib/modules/inetOrgPerson.inc:639
+#: ../lib/modules/inetOrgPerson.inc:650 ../lib/modules/inetOrgPerson.inc:833
 msgid "Password"
 msgstr "パスワード"
 
-#: ../lib/modules/posixGroup.inc:462 ../lib/modules/sambaAccount.inc:75
-#: ../lib/modules/sambaAccount.inc:76 ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:89 ../lib/modules/posixAccount.inc:70
-#: ../lib/modules/posixAccount.inc:71 ../lib/modules/inetOrgPerson.inc:75
-#: ../lib/modules/inetOrgPerson.inc:76
+#: ../lib/modules/posixGroup.inc:453 ../lib/modules/sambaAccount.inc:75
+#: ../lib/modules/sambaAccount.inc:76 ../lib/modules/sambaSamAccount.inc:92
+#: ../lib/modules/sambaSamAccount.inc:93 ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:74 ../lib/modules/inetOrgPerson.inc:77
+#: ../lib/modules/inetOrgPerson.inc:78
 msgid ""
 "Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
-"and #*,.;:_-+!$%&/|?{[()]}=@$ !"
-msgstr ""
-"パスワードに不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, #*,.;:_-"
-"+!$%&/|?{[()]}=@$ ! です。"
+"and #*,.;:_-+!%&/|?{[()]}=@$ !"
+msgstr "パスワードに不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, #*,.;:_-+!$%&/|?{[()]}=@$ です!"
 
 #: ../lib/modules/sambaAccount.inc:132 ../lib/modules/sambaAccount.inc:247
 #: ../lib/modules/sambaAccount.inc:361 ../lib/modules/sambaAccount.inc:364
-#: ../lib/modules/sambaAccount.inc:729 ../lib/modules/sambaSamAccount.inc:205
-#: ../lib/modules/sambaSamAccount.inc:208
-#: ../lib/modules/sambaSamAccount.inc:313
-#: ../lib/modules/sambaSamAccount.inc:860
-#: ../lib/modules/sambaSamAccount.inc:1099
+#: ../lib/modules/sambaAccount.inc:743 ../lib/modules/sambaSamAccount.inc:209
+#: ../lib/modules/sambaSamAccount.inc:212
+#: ../lib/modules/sambaSamAccount.inc:362
+#: ../lib/modules/sambaSamAccount.inc:990
+#: ../lib/modules/sambaSamAccount.inc:1467
 msgid "Password does not expire"
 msgstr "無期限のパスワード"
 
-#: ../lib/modules/shadowAccount.inc:49 ../lib/modules/shadowAccount.inc:89
-#: ../lib/modules/shadowAccount.inc:157 ../lib/modules/shadowAccount.inc:183
-#: ../lib/modules/shadowAccount.inc:268 ../lib/modules/shadowAccount.inc:363
+#: ../lib/modules/shadowAccount.inc:50 ../lib/modules/shadowAccount.inc:90
+#: ../lib/modules/shadowAccount.inc:158 ../lib/modules/shadowAccount.inc:184
+#: ../lib/modules/shadowAccount.inc:269 ../lib/modules/shadowAccount.inc:364
 msgid "Password expiration"
 msgstr "パスワード有効期限"
 
-#: ../lib/modules/shadowAccount.inc:49 ../lib/modules/shadowAccount.inc:50
+#: ../lib/modules/shadowAccount.inc:50 ../lib/modules/shadowAccount.inc:51
 msgid "Password expiration must be are natural number or -1."
 msgstr "パスワード有効期限は自然数または-1でなければなりません。"
 
-#: ../lib/modules/posixGroup.inc:403 ../lib/modules/posixGroup.inc:422
-#: ../lib/modules/posixAccount.inc:161 ../lib/modules/posixAccount.inc:322
+#: ../lib/modules/posixGroup.inc:394 ../lib/modules/posixGroup.inc:413
+#: ../lib/modules/posixAccount.inc:136 ../lib/modules/posixAccount.inc:174
+#: ../lib/modules/posixAccount.inc:331
 msgid "Password hash type"
 msgstr "パスワードハッシュ形式"
 
-#: ../lib/modules/posixAccount.inc:177
-msgid "Password hash type for Unix accounts"
-msgstr "unixアカウントに対するパスワードハッシュ形式"
-
-#: ../lib/modules/posixGroup.inc:309
-msgid "Password hash type for Unix groups"
-msgstr "unixグループに対するパスワードハッシュ形式"
-
-#: ../lib/modules/sambaDomain.inc:94 ../lib/modules/sambaDomain.inc:251
-#: ../lib/modules/sambaDomain.inc:604
+#: ../lib/modules/sambaDomain.inc:94 ../lib/modules/sambaDomain.inc:260
+#: ../lib/modules/sambaDomain.inc:648
 msgid "Password history length"
 msgstr "パスワード履歴の長さ"
 
-#: ../lib/modules/shadowAccount.inc:47 ../lib/modules/shadowAccount.inc:48
+#: ../lib/modules/shadowAccount.inc:48 ../lib/modules/shadowAccount.inc:49
 #: ../lib/modules/sambaDomain.inc:198
 msgid "Password maximum age must be are natural number."
 msgstr "パスワード寿命の最大値は自然数でなければなりません。"
 
-#: ../lib/modules/shadowAccount.inc:53 ../lib/modules/shadowAccount.inc:54
+#: ../lib/modules/shadowAccount.inc:54 ../lib/modules/shadowAccount.inc:55
 #: ../lib/modules/sambaDomain.inc:196
 msgid "Password maximum age must be bigger as password minimum age."
 msgstr "パスワード寿命の最大値は最小値より大きくなければなりません。"
 
-#: ../lib/modules/shadowAccount.inc:45 ../lib/modules/shadowAccount.inc:46
+#: ../lib/modules/shadowAccount.inc:46 ../lib/modules/shadowAccount.inc:47
 #: ../lib/modules/sambaDomain.inc:197
 msgid "Password minimum age must be are natural number."
 msgstr "パスワード寿命の最小値は自然数でなければなりません。"
 
-#: ../lib/modules/shadowAccount.inc:51 ../lib/modules/shadowAccount.inc:84
-#: ../lib/modules/shadowAccount.inc:153 ../lib/modules/shadowAccount.inc:177
-#: ../lib/modules/shadowAccount.inc:263 ../lib/modules/shadowAccount.inc:361
+#: ../lib/modules/shadowAccount.inc:52 ../lib/modules/shadowAccount.inc:85
+#: ../lib/modules/shadowAccount.inc:154 ../lib/modules/shadowAccount.inc:178
+#: ../lib/modules/shadowAccount.inc:264 ../lib/modules/shadowAccount.inc:362
 msgid "Password warning"
 msgstr "パスワード警告"
 
-#: ../lib/modules/shadowAccount.inc:51 ../lib/modules/shadowAccount.inc:52
+#: ../lib/modules/shadowAccount.inc:52 ../lib/modules/shadowAccount.inc:53
 msgid "Password warning must be are natural number."
 msgstr "パスワード警告期限は自然数でなければなりません。"
 
-#: ../templates/config/confmain.php:451
+#: ../templates/config/confmain.php:526
 msgid "Passwords are different!"
 msgstr "パスワードが異なっています!"
 
-#: ../lib/modules/sambaAccount.inc:385 ../lib/modules/sambaSamAccount.inc:229
+#: ../lib/modules/sambaSamAccount.inc:285
+msgid "Path of the user profile."
+msgstr "ユーザープロファイルのパス。"
+
+#: ../lib/modules/sambaAccount.inc:385 ../lib/modules/sambaSamAccount.inc:236
 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."
@@ -3303,7 +3607,7 @@ msgstr ""
 "ユーザプロファイルのパス。ローカル絶対パス、または、UNCパス(\\\\サーバ\\共"
 "有)。 $use と $group はユーザとグループ名に置き換えられます。"
 
-#: ../templates/config/confmain.php:329
+#: ../templates/config/confmain.php:335
 msgid "Path to external script"
 msgstr "外部スクリプトのパス"
 
@@ -3311,15 +3615,18 @@ msgstr "外部スクリプトのパス"
 msgid "Permanently delete all children, too?"
 msgstr "全ての子も削除しますか?"
 
-#: ../lib/modules/inetOrgPerson.inc:90
+#: ../lib/modules/inetOrgPerson.inc:94
 msgid "Personal"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:710
+#: ../lib/types/user.inc:93 ../lib/types/user.inc:219
+#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:792
+#: ../lib/modules/inetOrgPerson.inc:1270 ../lib/modules/inetOrgPerson.inc:1273
+#: ../lib/modules/inetOrgPerson.inc:1287
 msgid "Photo"
 msgstr "写真"
 
-#: ../lib/modules/inetOrgPerson.inc:791
+#: ../lib/modules/inetOrgPerson.inc:873
 msgid "Photo file (JPG format)"
 msgstr "写真ファイル(JPGフォーマット)"
 
@@ -3327,15 +3634,15 @@ msgstr "写真ファイル(JPGフォーマット)"
 msgid "Please a comma separated list of your public SSH keys."
 msgstr "カンマで区切られたSSH公開鍵のリストを入力してください!"
 
-#: ../templates/delete.php:79
+#: ../templates/delete.php:81
 msgid "Please confirm:"
 msgstr "確認してください:"
 
-#: ../lib/modules/sambaSamAccount.inc:90
+#: ../lib/modules/sambaSamAccount.inc:94
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "特殊アカウントのRID番号または名前を入力してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:353
+#: ../lib/modules/inetOrgPerson.inc:379
 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 "
@@ -3346,44 +3653,58 @@ msgstr ""
 "欄はホスト無しを意味します。"
 
 #: ../lib/modules/sambaAccount.inc:70 ../lib/modules/sambaAccount.inc:71
-#: ../lib/modules/sambaSamAccount.inc:85 ../lib/modules/sambaSamAccount.inc:86
+#: ../lib/modules/sambaSamAccount.inc:89 ../lib/modules/sambaSamAccount.inc:90
 msgid "Please enter a comma separated list of host names!"
 msgstr "カンマで区切られたホスト名を入力してください!"
 
-#: ../lib/modules/kolabUser.inc:266 ../lib/modules/kolabUser.inc:271
+#: ../lib/modules/groupOfNames.inc:116
+msgid "Please enter a group name!"
+msgstr "グループ名を入力してください!"
+
+#: ../lib/modules/kolabUser.inc:268 ../lib/modules/kolabUser.inc:273
 #, php-format
 msgid "Please enter a user password on this page: %s"
 msgstr "このページに対するパスワードを入力してください: %s"
 
-#: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:90
-#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:69
+#: ../lib/modules/inetOrgPerson.inc:80 ../lib/modules/inetOrgPerson.inc:81
+msgid "Please enter a valid business category!"
+msgstr "正しい業種を入力してください!"
+
+#: ../lib/modules/posixAccount.inc:92 ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:71
 msgid "Please enter a valid common name!"
 msgstr "正しい氏名を入力してください!"
 
+#: ../lib/modules/neofonieInetOrgPerson.inc:32
+#: ../lib/modules/neofonieInetOrgPerson.inc:33
+msgid "Please enter a valid date (format DD.MM.YYYY)!"
+msgstr "正しい日付をDD.MM.YYYYの形式で入力してください!"
+
 #: ../lib/modules/sambaAccount.inc:83 ../lib/modules/sambaAccount.inc:84
-#: ../lib/modules/sambaSamAccount.inc:98 ../lib/modules/sambaSamAccount.inc:99
-#: ../lib/modules/sambaSamAccount.inc:100
+#: ../lib/modules/sambaSamAccount.inc:102
+#: ../lib/modules/sambaSamAccount.inc:103
+#: ../lib/modules/sambaSamAccount.inc:104
 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:92 ../lib/modules/sambaSamAccount.inc:93
+#: ../lib/modules/sambaSamAccount.inc:96 ../lib/modules/sambaSamAccount.inc:97
 msgid "Please enter a valid display name!"
 msgstr "正しい表示名(display name)を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:85 ../lib/modules/sambaSamAccount.inc:101
+#: ../lib/modules/sambaAccount.inc:85 ../lib/modules/sambaSamAccount.inc:105
 msgid "Please enter a valid drive letter."
 msgstr "正しいドライブ文字を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:57
+#: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:59
 msgid "Please enter a valid eMail address!"
 msgstr "正しい電子メールアドレスを入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:67
+#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:69
 msgid "Please enter a valid employee type!"
 msgstr "正しい雇用形態を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:55
+#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:57
 msgid "Please enter a valid fax number!"
 msgstr "正しいファクス番号を入力してください!"
 
@@ -3391,23 +3712,23 @@ msgstr "正しいファクス番号を入力してください!"
 msgid "Please enter a valid group RID."
 msgstr "正しいグループRIDを入力してください!"
 
-#: ../lib/modules/sambaSamAccount.inc:105
+#: ../lib/modules/sambaSamAccount.inc:109
 msgid "Please enter a valid group name!"
 msgstr "正しいグループ名を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:65
+#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:67
 msgid "Please enter a valid job title!"
 msgstr "正しい役職を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:53
+#: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:55
 msgid "Please enter a valid mobile number!"
 msgstr "正しい携帯電話番号を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:61
+#: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:63
 msgid "Please enter a valid postal address!"
 msgstr "正しい住所を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:63
+#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:65
 msgid "Please enter a valid postal code!"
 msgstr "正しい郵便番号を入力してください!"
 
@@ -3415,29 +3736,30 @@ msgstr "正しい郵便番号を入力してください!"
 msgid "Please enter a valid special user name."
 msgstr "正しい特殊ユーザ名(special user name)を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:59
+#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:61
 msgid "Please enter a valid street name!"
 msgstr "正しい町名(street name)を入力してください!"
 
 #: ../lib/modules/inetOrgPerson.inc:50 ../lib/modules/inetOrgPerson.inc:51
+#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:53
 msgid "Please enter a valid telephone number!"
 msgstr "正しい電話番号を入力してください!"
 
-#: ../lib/modules/posixGroup.inc:566 ../lib/modules/posixAccount.inc:630
+#: ../lib/modules/posixGroup.inc:557 ../lib/modules/posixAccount.inc:738
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "%s と %s の間の値を入力してください!"
 
-#: ../lib/modules/kolabUser.inc:276
+#: ../lib/modules/kolabUser.inc:278
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "このページに対するメールアドレスを入力してください。: %s"
 
-#: ../lib/modules.inc:912
+#: ../lib/modules.inc:931
 msgid "Please enter the account information on the other pages first."
 msgstr "最初に、他のページでアカウント情報を入力してください。"
 
-#: ../help/help.inc:57
+#: ../help/help.inc:58
 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 "
@@ -3447,7 +3769,7 @@ msgstr ""
 "ルに記録されます。もしもこれが最初のログインならば、\"lam\" と入力してくださ"
 "い。"
 
-#: ../help/help.inc:128
+#: ../help/help.inc:126
 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 "
@@ -3462,7 +3784,7 @@ msgid "Please enter the master password to change the general preferences:"
 msgstr ""
 "総合プリファレンスを変更するためのマスターパスワードを入力してください:"
 
-#: ../help/help.inc:116
+#: ../help/help.inc:114
 msgid ""
 "Please enter the name of the new profile and the password to change its "
 "settings. Profile names may contain letters, numbers and -/_."
@@ -3470,7 +3792,7 @@ msgstr ""
 "その設定を変更するための新しいプロファイル名とパスワードを入力。プロファイル"
 "名にはアルファベット、数字と -/_ が使用できます。"
 
-#: ../help/help.inc:118
+#: ../help/help.inc:116
 msgid ""
 "Please enter the new name of the profile. The name may contain letters, "
 "numbers and -/_."
@@ -3478,15 +3800,15 @@ msgstr ""
 "新しいプロファイル名を入力。名前にはアルファベット、数字と -/_ が使用できま"
 "す。"
 
-#: ../lib/modules/posixAccount.inc:364 ../lib/modules/inetOrgPerson.inc:357
+#: ../lib/modules/posixAccount.inc:377 ../lib/modules/inetOrgPerson.inc:383
 msgid "Please enter the password which you want to set for this account."
 msgstr "このアカウントに対するパスワードを入力してください。"
 
-#: ../lib/modules/posixAccount.inc:339
+#: ../lib/modules/posixAccount.inc:348
 msgid "Please enter the path to the user's home directory."
 msgstr "ユーザのホームディレクトリを入力してください。"
 
-#: ../lib/modules/quota.inc:123
+#: ../lib/modules/quota.inc:137
 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}"
@@ -3494,15 +3816,19 @@ msgstr ""
 "このマウントポイントに対するクォータ設定を入力してください。書式は {soft "
 "block limit},{hard block limit},{soft inode limit},{hard inode limit} です。"
 
-#: ../lib/modules/posixAccount.inc:69 ../lib/modules/inetOrgPerson.inc:74
+#: ../lib/modules/posixAccount.inc:72 ../lib/modules/inetOrgPerson.inc:76
 msgid "Please enter the same password in both password fields."
 msgstr "両方のパスワードフィールドに同じパスワードを入力してください。"
 
-#: ../lib/modules/posixGroup.inc:461 ../lib/modules/sambaAccount.inc:74
-#: ../lib/modules/sambaSamAccount.inc:87
+#: ../lib/modules/posixGroup.inc:452 ../lib/modules/sambaAccount.inc:74
+#: ../lib/modules/sambaSamAccount.inc:91
 msgid "Please enter the same password in both password-fields."
 msgstr "2つのパスワードフィールドに同じパスワードを入力してください。"
 
+#: ../lib/modules/sambaSamAccount.inc:297
+msgid "Please enter the time limit in minutes. 0 means unlimited."
+msgstr "制限時間を分単位で入力してください。0は無制限を意味します。"
+
 #: ../templates/selfService/adminLogin.php:96
 msgid ""
 "Please enter your master configuration password to change the self service "
@@ -3519,7 +3845,7 @@ msgstr "サーバープリファレンスを変更するためのパスワード
 msgid "Please enter your public SSH key."
 msgstr "SSH公開鍵を入力してください。"
 
-#: ../templates/tests/lamdaemonTest.php:113
+#: ../templates/tests/lamdaemonTest.php:190
 msgid "Please install the SSH2 module for PHP and activate it in your php.ini!"
 msgstr "PHPのSSH2モジュールをインストールし、php.iniで有効化してください。"
 
@@ -3533,22 +3859,18 @@ msgstr ""
 "子が記入されていなくてはなりません。後に続く行は、各々の行が一つのアカウント"
 "になります。"
 
-#: ../lib/modules/inetOrgPerson.inc:361
+#: ../lib/modules/inetOrgPerson.inc:387
 msgid ""
 "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr ""
 "アップロードする画像ファイルを選択してください。画像はJPGフォーマット\n"
 "(.jpg/.jpeg)でなくてはなりません。"
 
-#: ../lib/modules.inc:958
-msgid "Please select page:"
-msgstr "ページを選択:"
-
 #: ../templates/masscreate.php:94
 msgid "Please select your account type:"
 msgstr "アカウントタイプを選択してください:"
 
-#: ../help/help.inc:134
+#: ../help/help.inc:132
 msgid ""
 "Please select your prefered log level. Messages with a lower level will not "
 "be logged."
@@ -3556,11 +3878,11 @@ msgstr ""
 "希望するログレベルを選択してください。下のレベルではメッセージは記録されませ"
 "ん。"
 
-#: ../templates/login.php:217
+#: ../templates/login.php:227
 msgid "Please select your user name and enter your password to log in."
 msgstr "ユーザ名を選択し、パスワードを入力してログインしてください。"
 
-#: ../lib/modules.inc:950
+#: ../lib/modules.inc:969
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "ページ %s の必須属性を全て設定してください。"
@@ -3579,51 +3901,55 @@ msgid "Position"
 msgstr "位置"
 
 #: ../templates/masscreate.php:172 ../templates/masscreate.php:310
-#: ../lib/modules/sambaGroupMapping.inc:377
+#: ../lib/modules/sambaGroupMapping.inc:382
 msgid "Possible values"
 msgstr "候補となる値"
 
-#: ../lib/modules/inetOrgPerson.inc:115 ../lib/modules/inetOrgPerson.inc:200
-#: ../lib/modules/inetOrgPerson.inc:316 ../lib/modules/inetOrgPerson.inc:317
-#: ../lib/modules/inetOrgPerson.inc:615 ../lib/modules/inetOrgPerson.inc:818
-#: ../lib/modules/inetOrgPerson.inc:1131
+#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:211
+#: ../lib/modules/inetOrgPerson.inc:342 ../lib/modules/inetOrgPerson.inc:343
+#: ../lib/modules/inetOrgPerson.inc:667 ../lib/modules/inetOrgPerson.inc:900
+#: ../lib/modules/inetOrgPerson.inc:1250
 msgid "Post office box"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:114
-#: ../lib/modules/inetOrgPerson.inc:194 ../lib/modules/inetOrgPerson.inc:324
-#: ../lib/modules/inetOrgPerson.inc:627 ../lib/modules/inetOrgPerson.inc:820
-#: ../lib/modules/inetOrgPerson.inc:1115
+#: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:118
+#: ../lib/modules/inetOrgPerson.inc:205 ../lib/modules/inetOrgPerson.inc:350
+#: ../lib/modules/inetOrgPerson.inc:681 ../lib/modules/inetOrgPerson.inc:902
+#: ../lib/modules/inetOrgPerson.inc:1234
 msgid "Postal address"
 msgstr "住所"
 
-#: ../lib/modules/inetOrgPerson.inc:325
+#: ../lib/modules/inetOrgPerson.inc:351
 msgid "Postal address, city"
 msgstr "住所、区市町村"
 
-#: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:115
-#: ../lib/modules/inetOrgPerson.inc:188 ../lib/modules/inetOrgPerson.inc:320
-#: ../lib/modules/inetOrgPerson.inc:321 ../lib/modules/inetOrgPerson.inc:621
-#: ../lib/modules/inetOrgPerson.inc:819 ../lib/modules/inetOrgPerson.inc:1123
+#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:119
+#: ../lib/modules/inetOrgPerson.inc:199 ../lib/modules/inetOrgPerson.inc:346
+#: ../lib/modules/inetOrgPerson.inc:347 ../lib/modules/inetOrgPerson.inc:674
+#: ../lib/modules/inetOrgPerson.inc:901 ../lib/modules/inetOrgPerson.inc:1242
 msgid "Postal code"
 msgstr "郵便番号"
 
-#: ../help/help.inc:86
+#: ../help/help.inc:87
 msgid "Predefined values"
 msgstr "あらかじめ定義された値"
 
-#: ../lib/modules/inetOrgPerson.inc:166
+#: ../lib/modules/inetOrgPerson.inc:171
 msgid "President"
 msgstr "社長"
 
-#: ../lib/modules/posixGroup.inc:476 ../lib/modules/posixAccount.inc:207
-#: ../lib/modules/posixAccount.inc:274 ../lib/modules/posixAccount.inc:330
-#: ../lib/modules/posixAccount.inc:355 ../lib/modules/posixAccount.inc:393
-#: ../lib/modules/posixAccount.inc:830 ../lib/modules/posixAccount.inc:971
-#: ../lib/modules/posixAccount.inc:991 ../lib/modules/posixAccount.inc:1032
+#: ../lib/modules/posixGroup.inc:467 ../lib/modules/posixAccount.inc:209
+#: ../lib/modules/posixAccount.inc:283 ../lib/modules/posixAccount.inc:339
+#: ../lib/modules/posixAccount.inc:368 ../lib/modules/posixAccount.inc:406
+#: ../lib/modules/posixAccount.inc:951 ../lib/modules/posixAccount.inc:1103
+#: ../lib/modules/posixAccount.inc:1126 ../lib/modules/posixAccount.inc:1167
 msgid "Primary group"
 msgstr "プライマリグループ"
 
+#: ../lib/modules/inetOrgPerson.inc:391
+msgid "Private telephone number"
+msgstr "私用の電話番号"
+
 #: ../templates/config/profmanage.php:106
 #: ../templates/selfService/profManage.php:96
 msgid "Profile deleted."
@@ -3636,9 +3962,9 @@ msgstr "プロファイルエディタ"
 #: ../templates/config/profmanage.php:50
 #: ../templates/config/profmanage.php:151
 #: ../templates/selfService/profManage.php:36
-#: ../templates/selfService/profManage.php:126 ../help/help.inc:115
-#: ../help/help.inc:117 ../help/help.inc:119 ../help/help.inc:121
-#: ../help/help.inc:123
+#: ../templates/selfService/profManage.php:126 ../help/help.inc:113
+#: ../help/help.inc:115 ../help/help.inc:117 ../help/help.inc:119
+#: ../help/help.inc:121
 msgid "Profile management"
 msgstr "プロファイル管理"
 
@@ -3646,7 +3972,7 @@ msgstr "プロファイル管理"
 #: ../templates/config/profmanage.php:218
 #: ../templates/selfService/profManage.php:141
 #: ../templates/selfService/profManage.php:192
-#: ../templates/profedit/profilepage.php:241 ../help/help.inc:146
+#: ../templates/profedit/profilepage.php:241 ../help/help.inc:144
 msgid "Profile name"
 msgstr "プロファイル名"
 
@@ -3669,19 +3995,22 @@ msgstr "プロファイルパスワードが異なるか、または未入力で
 
 #: ../lib/modules/sambaAccount.inc:64 ../lib/modules/sambaAccount.inc:65
 #: ../lib/modules/sambaAccount.inc:158 ../lib/modules/sambaAccount.inc:289
-#: ../lib/modules/sambaAccount.inc:384 ../lib/modules/sambaAccount.inc:761
-#: ../lib/modules/sambaAccount.inc:858 ../lib/modules/sambaSamAccount.inc:79
-#: ../lib/modules/sambaSamAccount.inc:80
-#: ../lib/modules/sambaSamAccount.inc:228
-#: ../lib/modules/sambaSamAccount.inc:362
-#: ../lib/modules/sambaSamAccount.inc:906
-#: ../lib/modules/sambaSamAccount.inc:1130
-#: ../lib/modules/sambaSamAccount.inc:1293
+#: ../lib/modules/sambaAccount.inc:384 ../lib/modules/sambaAccount.inc:775
+#: ../lib/modules/sambaAccount.inc:878 ../lib/modules/sambaSamAccount.inc:83
+#: ../lib/modules/sambaSamAccount.inc:84
+#: ../lib/modules/sambaSamAccount.inc:235
+#: ../lib/modules/sambaSamAccount.inc:284
+#: ../lib/modules/sambaSamAccount.inc:411
+#: ../lib/modules/sambaSamAccount.inc:1081
+#: ../lib/modules/sambaSamAccount.inc:1347
+#: ../lib/modules/sambaSamAccount.inc:1498
+#: ../lib/modules/sambaSamAccount.inc:1671
+#: ../lib/modules/sambaSamAccount.inc:1693
 msgid "Profile path"
 msgstr "プロファイルパス"
 
-#: ../lib/modules/sambaAccount.inc:64 ../lib/modules/sambaSamAccount.inc:79
-#: ../lib/modules/sambaSamAccount.inc:81
+#: ../lib/modules/sambaAccount.inc:64 ../lib/modules/sambaSamAccount.inc:83
+#: ../lib/modules/sambaSamAccount.inc:85
 msgid "Profile path is invalid!"
 msgstr "プロファイルパスが正しくありません!"
 
@@ -3689,13 +4018,35 @@ msgstr "プロファイルパスが正しくありません!"
 msgid "Profile was saved."
 msgstr "プロファイルがセーブされました。"
 
-#: ../lib/modules/quota.inc:70 ../lib/modules/quota.inc:122
+#: ../lib/modules/neofonieInetOrgPerson.inc:156
+msgid "Project 1, Project 2"
+msgstr ""
+
+#: ../lib/modules/neofonieInetOrgPerson.inc:97
+#: ../lib/modules/neofonieInetOrgPerson.inc:159
+#: ../lib/modules/neofonieInetOrgPerson.inc:297
+#: ../lib/modules/neofonieInetOrgPerson.inc:404
+#: ../lib/modules/neofonieInetOrgPerson.inc:611
+msgid "Project groups"
+msgstr "プロジェクトグループ"
+
+#: ../lib/modules/neofonieInetOrgPerson.inc:79
+#: ../lib/modules/neofonieInetOrgPerson.inc:129
+#: ../lib/modules/neofonieInetOrgPerson.inc:178
+#: ../lib/modules/neofonieInetOrgPerson.inc:235
+#: ../lib/modules/neofonieInetOrgPerson.inc:602
+#: ../lib/modules/neofonieInetOrgPerson.inc:732
+msgid "Quake ID"
+msgstr ""
+
+#: ../lib/modules/quota.inc:70 ../lib/modules/quota.inc:136
 msgid "Quota"
 msgstr ""
 
-#: ../lib/modules/quota.inc:489
-msgid "Quota for:"
-msgstr "Quotaの対象:"
+#: ../lib/modules/quota.inc:605
+#, php-format
+msgid "Quota for %s on %s"
+msgstr "%s の %s におけるQuota"
 
 #: ../lib/modules/quota.inc:57
 msgid "Quota has wrong format!"
@@ -3706,7 +4057,7 @@ msgid "RDN"
 msgstr ""
 
 #: ../templates/masscreate.php:164 ../templates/profedit/profilepage.php:200
-#: ../lib/modules.inc:1055 ../help/help.inc:144
+#: ../lib/modules.inc:1092 ../help/help.inc:142
 msgid "RDN identifier"
 msgstr "RDN識別子"
 
@@ -3715,11 +4066,15 @@ msgid "RID (Windows UID)"
 msgstr "RID (Windows UID)"
 
 #: ../lib/modules/sambaDomain.inc:86 ../lib/modules/sambaDomain.inc:147
-#: ../lib/modules/sambaDomain.inc:331 ../lib/modules/sambaDomain.inc:337
-#: ../lib/modules/sambaDomain.inc:598
+#: ../lib/modules/sambaDomain.inc:370 ../lib/modules/sambaDomain.inc:376
+#: ../lib/modules/sambaDomain.inc:642
 msgid "RID base"
 msgstr ""
 
+#: ../templates/config/confmain.php:366
+msgid "Read"
+msgstr "読み込み"
+
 #: ../templates/tree/templates/creation/new_ou_template.php:99
 msgid "Really create this new OU?"
 msgstr "このOUを新規作成しますか?"
@@ -3737,6 +4092,12 @@ msgstr "受信者"
 msgid "Recipient list"
 msgstr "受信者リスト"
 
+#: ../lib/modules/sambaSamAccount.inc:314
+#: ../lib/modules/sambaSamAccount.inc:1422
+#: ../lib/modules/sambaSamAccount.inc:1745
+msgid "Reconnect if disconnected"
+msgstr "切断された場合は再接続してください"
+
 #: ../templates/tree/rdelete.php:72
 msgid "Recursive delete progress"
 msgstr "再帰的な削除中"
@@ -3745,7 +4106,7 @@ msgstr "再帰的な削除中"
 msgid "Reenter new master password"
 msgstr "新しいマスタパスワードを再入力"
 
-#: ../templates/config/confmain.php:371 ../lib/modules/posixAccount.inc:1518
+#: ../templates/config/confmain.php:423 ../lib/modules/posixAccount.inc:1674
 msgid "Reenter password"
 msgstr "パスワード再入力"
 
@@ -3754,8 +4115,8 @@ msgstr "パスワード再入力"
 msgid "Reenter profile password"
 msgstr "プロファイルパスワードを再入力"
 
-#: ../templates/tree/edit.php:101 ../lib/tree.inc:64 ../lib/tree.inc:65
-#: ../lib/lists.inc:278
+#: ../templates/tree/edit.php:101 ../lib/tree.inc:88 ../lib/tree.inc:89
+#: ../lib/lists.inc:288
 msgid "Refresh"
 msgstr "リフレッシュ"
 
@@ -3768,24 +4129,34 @@ msgid "Relative distinguished name"
 msgstr "相対識別名"
 
 #: ../templates/pdfedit/pdfpage.php:475 ../lib/modules/ieee802device.inc:99
-#: ../lib/modules/kolabUser.inc:337 ../lib/modules/kolabUser.inc:356
-#: ../lib/modules/kolabUser.inc:382 ../lib/modules/shadowAccount.inc:345
-#: ../lib/modules/ldapPublicKey.inc:92
+#: ../lib/modules/neofonieInetOrgPerson.inc:439
+#: ../lib/modules/neofonieInetOrgPerson.inc:538
+#: ../lib/modules/sambaSamAccount.inc:1304 ../lib/modules/kolabUser.inc:339
+#: ../lib/modules/kolabUser.inc:358 ../lib/modules/kolabUser.inc:384
+#: ../lib/modules/shadowAccount.inc:346 ../lib/modules/ldapPublicKey.inc:92
 #: ../lib/modules/inetLocalMailRecipient.inc:154
-#: ../lib/modules/nisMailAlias.inc:141
+#: ../lib/modules/groupOfNames.inc:152 ../lib/modules/nisMailAlias.inc:141
 msgid "Remove"
 msgstr "削除"
 
-#: ../lib/modules/posixGroup.inc:184 ../lib/modules/posixAccount.inc:869
+#: ../lib/modules/posixGroup.inc:184 ../lib/modules/posixAccount.inc:1000
 msgid "Remove password"
 msgstr "パスワードを削除"
 
+#: ../lib/modules/groupOfNames.inc:322
+msgid "Remove selected entries"
+msgstr "選択したエントリを削除"
+
 #: ../templates/config/conftypes.php:224
 msgid "Remove this account type"
 msgstr "このアカウントタイプを削除:"
 
+#: ../lib/modules/inetOrgPerson.inc:1278
+msgid "Remove/replace photo"
+msgstr "写真の削除/差し替え"
+
 #: ../templates/config/profmanage.php:214
-#: ../templates/selfService/profManage.php:188 ../help/help.inc:117
+#: ../templates/selfService/profManage.php:188 ../help/help.inc:115
 msgid "Rename profile"
 msgstr "プロファイル名変更"
 
@@ -3794,13 +4165,13 @@ msgstr "プロファイル名変更"
 msgid "Renamed profile."
 msgstr "プロファイル名が変更されました。"
 
-#: ../lib/modules/posixGroup.inc:255 ../lib/modules/sambaAccount.inc:718
-#: ../lib/modules/sambaSamAccount.inc:850 ../lib/modules/posixAccount.inc:949
-#: ../lib/modules/inetOrgPerson.inc:593 ../lib/modules/inetOrgPerson.inc:755
+#: ../lib/modules/posixGroup.inc:255 ../lib/modules/sambaAccount.inc:732
+#: ../lib/modules/sambaSamAccount.inc:977 ../lib/modules/posixAccount.inc:1080
+#: ../lib/modules/inetOrgPerson.inc:643 ../lib/modules/inetOrgPerson.inc:837
 msgid "Repeat password"
 msgstr "パスワード再入力"
 
-#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:652
+#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:760
 msgid "Replaced $user or $group in homedir."
 msgstr "$user または $group をホームディレクトリに置き換えました。"
 
@@ -3815,22 +4186,22 @@ msgid "Required attributes"
 msgstr "必須属性"
 
 #: ../templates/profedit/profilepage.php:251
-#: ../lib/modules/sambaAccount.inc:809 ../lib/modules/sambaSamAccount.inc:964
+#: ../lib/modules/sambaAccount.inc:829 ../lib/modules/sambaSamAccount.inc:1154
 msgid "Reset"
 msgstr "リセット"
 
-#: ../lib/modules.inc:961 ../lib/modules.inc:989
+#: ../lib/modules.inc:1026
 msgid "Reset changes"
 msgstr "変更をリセット"
 
-#: ../lib/modules/sambaAccount.inc:346 ../lib/modules/sambaAccount.inc:808
-#: ../lib/modules/sambaSamAccount.inc:190
-#: ../lib/modules/sambaSamAccount.inc:963
+#: ../lib/modules/sambaAccount.inc:346 ../lib/modules/sambaAccount.inc:828
+#: ../lib/modules/sambaSamAccount.inc:194
+#: ../lib/modules/sambaSamAccount.inc:1153
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
 #: ../lib/modules/sambaDomain.inc:126 ../lib/modules/sambaDomain.inc:200
-#: ../lib/modules/sambaDomain.inc:301 ../lib/modules/sambaDomain.inc:636
+#: ../lib/modules/sambaDomain.inc:340 ../lib/modules/sambaDomain.inc:678
 msgid "Reset time after lockout"
 msgstr "ロックアウト解除時間"
 
@@ -3838,6 +4209,16 @@ msgstr "ロックアウト解除時間"
 msgid "Reset time after lockout must be are natural number."
 msgstr "ロックアウト解除時間は自然数でなければなりません。"
 
+#: ../templates/config/confmain.php:343 ../help/help.inc:111
+msgid "Rights for the home directory"
+msgstr "ホームディレクトリに対する権限"
+
+#: ../lib/modules/inetOrgPerson.inc:120 ../lib/modules/inetOrgPerson.inc:247
+#: ../lib/modules/inetOrgPerson.inc:394 ../lib/modules/inetOrgPerson.inc:688
+#: ../lib/modules/inetOrgPerson.inc:909 ../lib/modules/inetOrgPerson.inc:1258
+msgid "Room number"
+msgstr "部屋番号"
+
 #: ../lib/modules/inetLocalMailRecipient.inc:57
 #: ../lib/modules/inetLocalMailRecipient.inc:92
 #: ../lib/modules/inetLocalMailRecipient.inc:137
@@ -3845,11 +4226,11 @@ msgstr "ロックアウト解除時間は自然数でなければなりません
 msgid "Routing address"
 msgstr "転送アドレス"
 
-#: ../templates/tests/lamdaemonTest.php:123
+#: ../templates/tests/lamdaemonTest.php:200
 msgid "SSH connection"
 msgstr "SSH接続"
 
-#: ../templates/tests/lamdaemonTest.php:134
+#: ../templates/tests/lamdaemonTest.php:211
 msgid "SSH connection could be established."
 msgstr "SSHコネクションが確立できました。"
 
@@ -3863,11 +4244,11 @@ msgstr "SSH公開鍵"
 msgid "SSH public key(s)"
 msgstr "SSH公開鍵"
 
-#: ../templates/tests/lamdaemonTest.php:106
+#: ../templates/tests/lamdaemonTest.php:183
 msgid "SSH2 module"
 msgstr "SSH2モジュール"
 
-#: ../templates/tests/lamdaemonTest.php:109
+#: ../templates/tests/lamdaemonTest.php:186
 msgid "SSH2 module is installed."
 msgstr "SSH2モジュールがインストールされています。"
 
@@ -3875,8 +4256,8 @@ msgstr "SSH2モジュールがインストールされています。"
 msgid "Samba 2"
 msgstr "Samba 2"
 
-#: ../lib/modules/sambaSamAccount.inc:122
-#: ../lib/modules/sambaGroupMapping.inc:237
+#: ../lib/modules/sambaSamAccount.inc:126
+#: ../lib/modules/sambaGroupMapping.inc:242
 msgid "Samba 3"
 msgstr "Samba 3"
 
@@ -3888,23 +4269,19 @@ msgstr "Samba 3 ドメインのSIDが不正です!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 ドメインエントリ"
 
-#: ../lib/modules/sambaSamAccount.inc:455
-msgid "Samba 3 settings"
-msgstr "Samba 3 設定"
-
-#: ../lib/modules/sambaSamAccount.inc:249
-#: ../lib/modules/sambaSamAccount.inc:253
-#: ../lib/modules/sambaSamAccount.inc:387
-#: ../lib/modules/sambaSamAccount.inc:411
+#: ../lib/modules/sambaSamAccount.inc:256
+#: ../lib/modules/sambaSamAccount.inc:260
+#: ../lib/modules/sambaSamAccount.inc:436
+#: ../lib/modules/sambaSamAccount.inc:460
 msgid "Samba RID"
 msgstr "Samba RID"
 
-#: ../lib/modules/sambaGroupMapping.inc:275
-#: ../lib/modules/sambaGroupMapping.inc:300
+#: ../lib/modules/sambaGroupMapping.inc:280
+#: ../lib/modules/sambaGroupMapping.inc:305
 msgid "Samba RID number"
 msgstr "Samba RID番号"
 
-#: ../lib/modules/sambaGroupMapping.inc:269
+#: ../lib/modules/sambaGroupMapping.inc:274
 msgid "Samba display name"
 msgstr "Samba表示名"
 
@@ -3912,7 +4289,7 @@ msgstr "Samba表示名"
 msgid "Samba domain"
 msgstr "Samba ドメイン"
 
-#: ../lib/modules/sambaGroupMapping.inc:261
+#: ../lib/modules/sambaGroupMapping.inc:266
 msgid "Samba domain name"
 msgstr "Sambaドメイン名"
 
@@ -3920,43 +4297,43 @@ msgstr "Sambaドメイン名"
 msgid "Samba domains"
 msgstr "Samba ドメイン"
 
-#: ../lib/modules/sambaGroupMapping.inc:281
-#: ../lib/modules/sambaGroupMapping.inc:308
-#: ../lib/modules/sambaGroupMapping.inc:326
+#: ../lib/modules/sambaGroupMapping.inc:286
+#: ../lib/modules/sambaGroupMapping.inc:313
+#: ../lib/modules/sambaGroupMapping.inc:331
 msgid "Samba group type"
 msgstr "Sambaグループタイプ"
 
-#: ../lib/modules/sambaAccount.inc:343 ../lib/modules/sambaAccount.inc:715
-#: ../lib/modules/sambaSamAccount.inc:187
-#: ../lib/modules/sambaSamAccount.inc:846
+#: ../lib/modules/sambaAccount.inc:343 ../lib/modules/sambaAccount.inc:729
+#: ../lib/modules/sambaSamAccount.inc:191
+#: ../lib/modules/sambaSamAccount.inc:973
 msgid "Samba password"
 msgstr "Sambaパスワード"
 
 #: ../lib/modules/sambaAccount.inc:70 ../lib/modules/sambaAccount.inc:170
 #: ../lib/modules/sambaAccount.inc:301 ../lib/modules/sambaAccount.inc:390
-#: ../lib/modules/sambaAccount.inc:393 ../lib/modules/sambaAccount.inc:767
-#: ../lib/modules/sambaAccount.inc:859 ../lib/modules/sambaSamAccount.inc:85
-#: ../lib/modules/sambaSamAccount.inc:234
-#: ../lib/modules/sambaSamAccount.inc:237
-#: ../lib/modules/sambaSamAccount.inc:374
-#: ../lib/modules/sambaSamAccount.inc:912
-#: ../lib/modules/sambaSamAccount.inc:1142
-#: ../lib/modules/sambaSamAccount.inc:1294
+#: ../lib/modules/sambaAccount.inc:393 ../lib/modules/sambaAccount.inc:781
+#: ../lib/modules/sambaAccount.inc:879 ../lib/modules/sambaSamAccount.inc:89
+#: ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/sambaSamAccount.inc:423
+#: ../lib/modules/sambaSamAccount.inc:1093
+#: ../lib/modules/sambaSamAccount.inc:1510
+#: ../lib/modules/sambaSamAccount.inc:1674
 msgid "Samba workstations"
 msgstr "Samba ワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:1014
+#: ../lib/modules/sambaSamAccount.inc:1211
 msgid "Saturday"
 msgstr "土曜日"
 
 #: ../templates/tree/edit.php:508
-#: ../templates/selfService/selfServiceMain.php:197
+#: ../templates/selfService/selfServiceMain.php:230
 #: ../templates/pdfedit/pdfpage.php:736 ../templates/pdfedit/pdfpage.php:770
 #: ../templates/profedit/profilepage.php:249
 msgid "Save"
 msgstr "保存"
 
-#: ../help/help.inc:154
+#: ../help/help.inc:152
 msgid "Save account"
 msgstr "アカウントを保存"
 
@@ -3972,23 +4349,27 @@ msgstr "スキーマブラウザ"
 msgid "Scope"
 msgstr "スコープ"
 
-#: ../help/help.inc:96
+#: ../help/help.inc:97
 msgid "Script path"
 msgstr "スクリプトパス"
 
-#: ../templates/config/confmain.php:443
+#: ../templates/config/confmain.php:502
 msgid "Script path is invalid!"
 msgstr "スクリプトパスが正しくありません!"
 
-#: ../help/help.inc:101
-msgid "Script server"
+#: ../templates/config/confmain.php:521
+msgid "Script rights are invalid!"
+msgstr "スクリプトの権限が無効です!"
+
+#: ../templates/config/confmain.php:505
+msgid "Script server is invalid!"
+msgstr "スクリプトサーバが無効です!"
+
+#: ../help/help.inc:108
+msgid "Script servers"
 msgstr "スクリプトサーバ"
 
-#: ../templates/config/confmain.php:446
-msgid "Script server is invalid!"
-msgstr "スクリプトサーバが正しくありません!"
-
-#: ../templates/config/confmain.php:316
+#: ../templates/config/confmain.php:322
 msgid "Script settings"
 msgstr "スクリプト設定"
 
@@ -4006,15 +4387,15 @@ msgstr "検索スコープ"
 msgid "Section"
 msgstr "セクション"
 
-#: ../templates/config/mainmanage.php:145 ../templates/config/confmain.php:344
+#: ../templates/config/mainmanage.php:145 ../templates/config/confmain.php:395
 msgid "Security settings"
 msgstr "セキュリティ設定"
 
-#: ../lib/lists.inc:645
+#: ../lib/types/group.inc:272 ../lib/lists.inc:707
 msgid "See README.openldap.txt to solve this problem."
 msgstr "この問題を解決するには、README.openldap.txtを参照してください。"
 
-#: ../templates/help.php:109
+#: ../templates/help.php:107
 msgid "See also"
 msgstr "参照"
 
@@ -4022,11 +4403,11 @@ msgstr "参照"
 msgid "Select a template for the creation process"
 msgstr "生成処理に対するテンプレートを選んでください"
 
-#: ../lib/types/group.inc:182 ../lib/types/user.inc:218 ../lib/lists.inc:405
+#: ../lib/lists.inc:407
 msgid "Select all"
 msgstr "すべてを選択"
 
-#: ../lib/modules/posixAccount.inc:916
+#: ../lib/modules/posixAccount.inc:1047
 msgid "Selected groups"
 msgstr "選択されたグループ"
 
@@ -4038,57 +4419,63 @@ msgstr "選択されたモジュール"
 msgid "Selected users"
 msgstr "選択されたユーザ"
 
-#: ../templates/selfService/adminMain.php:189
+#: ../templates/selfService/adminMain.php:224
 msgid "Self service configuration"
 msgstr "セルフサービスの構成"
 
-#: ../templates/selfService/adminMain.php:201
+#: ../templates/selfService/adminMain.php:236
 msgid "Self service configuration editor"
 msgstr "セルフサービス構成エディタ"
 
-#: ../templates/config/confmain.php:141
-#: ../templates/selfService/adminMain.php:229 ../help/help.inc:58
+#: ../templates/config/confmain.php:147
+#: ../templates/selfService/adminMain.php:264 ../help/help.inc:59
 msgid "Server address"
 msgstr "サーバアドレス"
 
-#: ../templates/config/confmain.php:425
-#: ../templates/selfService/adminMain.php:53
+#: ../templates/config/confmain.php:477
+#: ../templates/selfService/adminMain.php:60
 msgid "Server address is invalid!"
 msgstr "サーバーアドレスが正しくありません!"
 
-#: ../templates/config/confmain.php:320
-msgid "Server of external script"
-msgstr "外部スクリプトのサーバ"
+#: ../templates/config/confmain.php:326
+msgid "Server list"
+msgstr "サーバー覧"
 
-#: ../templates/login.php:313
+#: ../templates/login.php:323
 msgid "Server profile"
 msgstr "サーバー プロファイル"
 
-#: ../templates/config/confmain.php:138
-#: ../templates/selfService/adminMain.php:226
+#: ../templates/config/confmain.php:144
+#: ../templates/selfService/adminMain.php:261
 msgid "Server settings"
 msgstr "サーバー設定"
 
-#: ../templates/config/mainmanage.php:151 ../help/help.inc:131
+#: ../templates/config/mainmanage.php:151 ../help/help.inc:129
 msgid "Session timeout"
 msgstr "セッション有効期限"
 
-#: ../lib/modules/posixGroup.inc:166 ../lib/modules/posixAccount.inc:852
+#: ../lib/modules/posixGroup.inc:166 ../lib/modules/posixAccount.inc:983
 msgid "Set password"
 msgstr "パスワードを設定"
 
-#: ../templates/config/profmanage.php:278 ../help/help.inc:121
+#: ../templates/config/profmanage.php:278 ../help/help.inc:119
 msgid "Set profile password"
 msgstr "プロファイルパスワード設定"
 
-#: ../lib/modules/posixGroup.inc:396
+#: ../lib/modules/posixGroup.inc:387
 msgid "Sets the group password."
 msgstr "グループパスワードを設定"
 
-#: ../lib/modules/shadowAccount.inc:68
+#: ../lib/modules/shadowAccount.inc:69
 msgid "Shadow"
 msgstr ""
 
+#: ../lib/modules/sambaSamAccount.inc:308
+#: ../lib/modules/sambaSamAccount.inc:1404
+#: ../lib/modules/sambaSamAccount.inc:1729
+msgid "Shadowing"
+msgstr ""
+
 #: ../templates/massBuildAccounts.php:199
 msgid "Show LDIF file"
 msgstr "LDIFファイルを表示"
@@ -4097,33 +4484,37 @@ msgstr "LDIFファイルを表示"
 msgid "Show internal attributes"
 msgstr "内部属性を表示する"
 
+#: ../lib/types/group.inc:162
+msgid "Show primary group members as normal group members"
+msgstr "通常のグループメンバーとしてプライマリグループのメンバーを表示"
+
 #: ../templates/schema/schema.php:199
 msgid "Single valued"
 msgstr "単一の値"
 
-#: ../lib/modules/quota.inc:442
+#: ../lib/modules/quota.inc:549
 msgid "Soft block"
 msgstr "ソフトブロック"
 
-#: ../lib/modules/quota.inc:94 ../lib/modules/quota.inc:312
-#: ../lib/modules/quota.inc:365
+#: ../lib/modules/quota.inc:96 ../lib/modules/quota.inc:355
+#: ../lib/modules/quota.inc:440
 msgid "Soft block limit"
 msgstr "ソフトブロック制限"
 
-#: ../lib/modules/quota.inc:95
+#: ../lib/modules/quota.inc:97
 msgid "Soft block limit."
 msgstr "ソフトブロック制限"
 
-#: ../lib/modules/quota.inc:444
+#: ../lib/modules/quota.inc:551
 msgid "Soft inode"
 msgstr "ソフトinode"
 
-#: ../lib/modules/quota.inc:111
+#: ../lib/modules/quota.inc:119
 msgid "Soft inode (files) limit."
 msgstr "ソフトinode(ファイル)制限。"
 
-#: ../lib/modules/quota.inc:110 ../lib/modules/quota.inc:316
-#: ../lib/modules/quota.inc:367
+#: ../lib/modules/quota.inc:118 ../lib/modules/quota.inc:359
+#: ../lib/modules/quota.inc:442
 msgid "Soft inode limit"
 msgstr "ソフトinode制限"
 
@@ -4132,11 +4523,11 @@ msgstr "ソフトinode制限"
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "いくつかの属性(%s)は変更され、ハイライト表示されています。"
 
-#: ../lib/modules.inc:949
+#: ../lib/modules.inc:968
 msgid "Some required information is missing"
 msgstr "必須項目が満たされていません。"
 
-#: ../templates/help.php:142
+#: ../templates/help.php:138
 #, php-format
 msgid ""
 "Sorry this help id ({bold}%s{endbold}) is not available for this module "
@@ -4145,14 +4536,14 @@ msgstr ""
 "このヘルプID({bold}%s{endbold})は、このモジュール({bold}%s{endbold})では無効"
 "です。"
 
-#: ../templates/help.php:156
+#: ../templates/help.php:152
 #, php-format
 msgid "Sorry this help number ({bold}%d{endbold}) is not available."
 msgstr "このヘルプ番号({bold}%d{endbold})は無効です。"
 
 #: ../lib/modules/sambaAccount.inc:314 ../lib/modules/sambaAccount.inc:402
-#: ../lib/modules/sambaAccount.inc:799 ../lib/modules/sambaSamAccount.inc:246
-#: ../lib/modules/sambaSamAccount.inc:947
+#: ../lib/modules/sambaAccount.inc:819 ../lib/modules/sambaSamAccount.inc:253
+#: ../lib/modules/sambaSamAccount.inc:1130
 msgid "Special user"
 msgstr "特殊ユーザ"
 
@@ -4169,23 +4560,23 @@ msgstr "Step 1 of 2: 名前とオブジェクトクラス"
 msgid "Step 2 of 2: Specify attributes and values"
 msgstr "Step 2 of 2: 属性と値の記入"
 
-#: ../lib/modules/inetOrgPerson.inc:147
+#: ../lib/modules/inetOrgPerson.inc:152
 msgid "Steve"
 msgstr "スティーブ"
 
-#: ../lib/modules/sambaAccount.inc:221 ../lib/modules/sambaSamAccount.inc:287
-#: ../lib/modules/posixAccount.inc:197 ../lib/modules/inetOrgPerson.inc:237
+#: ../lib/modules/sambaAccount.inc:221 ../lib/modules/sambaSamAccount.inc:336
+#: ../lib/modules/posixAccount.inc:199 ../lib/modules/inetOrgPerson.inc:260
 msgid "Steve Miller"
 msgstr "スティーブ ミラー"
 
-#: ../lib/modules/posixAccount.inc:251
+#: ../lib/modules/posixAccount.inc:260
 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:58 ../lib/modules/inetOrgPerson.inc:114
-#: ../lib/modules/inetOrgPerson.inc:182 ../lib/modules/inetOrgPerson.inc:312
-#: ../lib/modules/inetOrgPerson.inc:313 ../lib/modules/inetOrgPerson.inc:609
-#: ../lib/modules/inetOrgPerson.inc:817 ../lib/modules/inetOrgPerson.inc:1107
+#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:118
+#: ../lib/modules/inetOrgPerson.inc:193 ../lib/modules/inetOrgPerson.inc:338
+#: ../lib/modules/inetOrgPerson.inc:339 ../lib/modules/inetOrgPerson.inc:660
+#: ../lib/modules/inetOrgPerson.inc:899 ../lib/modules/inetOrgPerson.inc:1226
 msgid "Street"
 msgstr "町名"
 
@@ -4205,23 +4596,23 @@ msgstr ""
 msgid "Success"
 msgstr "成功"
 
-#: ../templates/tests/lamdaemonTest.php:172
+#: ../templates/tests/lamdaemonTest.php:90
 msgid "Sudo is not setup correctly!"
 msgstr "sudoが正しく設定されていません。"
 
-#: ../lib/lists.inc:485 ../lib/modules.inc:1042
+#: ../lib/lists.inc:525 ../lib/modules.inc:1079
 msgid "Suffix"
 msgstr "サフィックス"
 
-#: ../lib/modules/sambaSamAccount.inc:1014
+#: ../lib/modules/sambaSamAccount.inc:1211
 msgid "Sunday"
 msgstr "日曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:179
+#: ../lib/modules/sambaSamAccount.inc:183
 msgid "Sync Samba LM password with Unix password"
 msgstr "Samba LMパスワードをunixパスワードと同期します。"
 
-#: ../lib/modules/sambaSamAccount.inc:178
+#: ../lib/modules/sambaSamAccount.inc:182
 msgid "Sync Samba NT password with Unix password"
 msgstr "Samba NTパスワードをunixパスワードと同期します。"
 
@@ -4245,18 +4636,19 @@ msgstr "システムロギング"
 msgid "Target of invitation policy is invalid!"
 msgstr "招待ポリシーのターゲット正しくありません。"
 
-#: ../lib/modules/inetOrgPerson.inc:50 ../lib/modules/inetOrgPerson.inc:113
-#: ../lib/modules/inetOrgPerson.inc:206 ../lib/modules/inetOrgPerson.inc:328
-#: ../lib/modules/inetOrgPerson.inc:329 ../lib/modules/inetOrgPerson.inc:633
-#: ../lib/modules/inetOrgPerson.inc:821 ../lib/modules/inetOrgPerson.inc:1083
+#: ../lib/modules/inetOrgPerson.inc:50 ../lib/modules/inetOrgPerson.inc:117
+#: ../lib/modules/inetOrgPerson.inc:217 ../lib/modules/inetOrgPerson.inc:354
+#: ../lib/modules/inetOrgPerson.inc:355 ../lib/modules/inetOrgPerson.inc:695
+#: ../lib/modules/inetOrgPerson.inc:903 ../lib/modules/inetOrgPerson.inc:1194
 msgid "Telephone number"
 msgstr "電話番号"
 
-#: ../lib/modules/inetOrgPerson.inc:172
+#: ../lib/modules/neofonieInetOrgPerson.inc:151
+#: ../lib/modules/inetOrgPerson.inc:177
 msgid "Temp"
 msgstr "臨時雇用"
 
-#: ../lib/modules/inetOrgPerson.inc:160
+#: ../lib/modules/inetOrgPerson.inc:165
 msgid "Temp, contract until december"
 msgstr "臨時雇用、12月までの契約"
 
@@ -4264,11 +4656,16 @@ msgstr "臨時雇用、12月までの契約"
 msgid "Template"
 msgstr "テンプレート"
 
+#: ../lib/modules/sambaSamAccount.inc:317
+#: ../lib/modules/sambaSamAccount.inc:1145
+msgid "Terminal server options"
+msgstr "ターミナルサーバオプション"
+
 #: ../templates/tools.php:90
 msgid "Tests"
 msgstr "テスト"
 
-#: ../help/help.inc:110
+#: ../help/help.inc:103
 msgid "Text for user PDF"
 msgstr "ユーザPDFのためのテキスト"
 
@@ -4286,7 +4683,7 @@ msgstr "IPアドレス %s は正しくありません!"
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "SambaサーバのSID。 \"net getlocalsid\" で取得してください。"
 
-#: ../lib/modules/posixAccount.inc:59
+#: ../lib/modules/posixAccount.inc:62
 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 "
@@ -4305,7 +4702,11 @@ msgstr "指定されたコンテナ(%s)が存在しません。再試行して
 msgid "The country name of the user."
 msgstr "ユーザの国名"
 
-#: ../lib/modules/shadowAccount.inc:55
+#: ../lib/modules/neofonieInetOrgPerson.inc:89
+msgid "The department where the employee is employed."
+msgstr "従業員が雇用されている部署。"
+
+#: ../lib/modules/shadowAccount.inc:56
 msgid "The expiration date is invalid."
 msgstr "有効期限が正しくありません。"
 
@@ -4314,8 +4715,8 @@ msgid ""
 "The following suffix(es) are missing in LDAP. LAM can create them for you."
 msgstr "以下のサフィックスはLDAPにありません。LAM はこれらを作成できます。"
 
-#: ../lib/modules/sambaSamAccount.inc:103
-#: ../lib/modules/sambaSamAccount.inc:104
+#: ../lib/modules/sambaSamAccount.inc:107
+#: ../lib/modules/sambaSamAccount.inc:108
 msgid "The format of the logon hours field is invalid!"
 msgstr "ログオン時間フィールドの形式が正しくありません!"
 
@@ -4323,6 +4724,10 @@ msgstr "ログオン時間フィールドの形式が正しくありません!"
 msgid "The headline for a new section must contain at least one character."
 msgstr "新しいセクションの見出しは、少なくとも一文字以上でなくてはなりません。"
 
+#: ../lib/modules/sambaSamAccount.inc:230
+msgid "The home directory will be connected under this drive letter."
+msgstr "ホームディレクトリはこのドライブ文字の下に接続されます。"
+
 #: ../templates/config/mainmanage.php:122
 msgid ""
 "The log file is empty or contains invalid characters! Valid characters are: "
@@ -4331,7 +4736,7 @@ msgstr ""
 "ログファイル名が空であるか、または不正な文字文字が含まれています。有効な文字"
 "は: a-z, A-Z, 0-9, /, \\\\, ., :, _ と -です。"
 
-#: ../lib/modules.inc:911
+#: ../lib/modules.inc:930
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "モジュール %s は利用できません。"
@@ -4353,16 +4758,20 @@ msgstr "メールボックスがあるサーバーの名前。"
 msgid "The name of your Windows domain or workgroup."
 msgstr "Windowsのドメイン又はワークグループ名。"
 
-#: ../help/help.inc:149
+#: ../help/help.inc:147
 msgid "The new account will be saved under this LDAP suffix."
 msgstr "新しいアカウントはLDAPサフィックスの下に作成されます。"
 
-#: ../templates/config/confmain.php:70 ../templates/config/mainlogin.php:56
+#: ../lib/modules/groupOfNames.inc:65
+msgid "The owner of this group."
+msgstr "このグループの所有者。"
+
+#: ../templates/config/confmain.php:71 ../templates/config/mainlogin.php:56
 #: ../templates/selfService/adminLogin.php:51
 msgid "The password is invalid! Please try again."
 msgstr "パスワードが正しくありません! やり直してください。"
 
-#: ../lib/modules/posixAccount.inc:331
+#: ../lib/modules/posixAccount.inc:340
 msgid ""
 "The primary group for this account. You can insert a GID number or a group "
 "name."
@@ -4370,27 +4779,35 @@ msgstr ""
 "このアカウントに対するプライマリグループ。GID番号またはグループ名を入力してく"
 "ださい。"
 
-#: ../lib/modules/posixAccount.inc:394
+#: ../lib/modules/posixAccount.inc:407
 msgid "The primary group the host should be member of."
 msgstr "ホストがメンバでなければならないプライマリグループ。"
 
-#: ../lib/modules/posixAccount.inc:356
+#: ../lib/modules/posixAccount.inc:369
 msgid "The primary group the user should be member of."
 msgstr "ユーザがメンバでなければならないプライマリグループ。"
 
+#: ../lib/modules/inetOrgPerson.inc:395
+msgid "The room number of the employee's office."
+msgstr "従業員の事務所の部屋番号。"
+
 #: ../templates/pdfedit/pdfpage.php:126
 msgid "The static text must contain at least one character."
 msgstr "静的テキストは少なくとも一文字以上でなければななりません。"
 
+#: ../lib/modules/neofonieInetOrgPerson.inc:107
+msgid "The user's birth date."
+msgstr "ユーザーの誕生日。"
+
 #: ../templates/tree/add_oclass_form.php:122
 msgid "There are new required attributes which need to be set."
 msgstr "設定すべき新しい必須属性があります。"
 
-#: ../lib/modules/posixGroup.inc:476
+#: ../lib/modules/posixGroup.inc:467
 msgid "There are still users who have this group as their primary group."
 msgstr "このグループをプライマリグループとするユーザがまだ存在します。"
 
-#: ../lib/modules/sambaGroupMapping.inc:375
+#: ../lib/modules/sambaGroupMapping.inc:380
 msgid "There can be only one group of this type."
 msgstr "このタイプのグループを一つだけ指定できます。"
 
@@ -4398,7 +4815,7 @@ msgstr "このタイプのグループを一つだけ指定できます。"
 msgid "There were errors while uploading:"
 msgstr "アップロードの際にエラーが発生しました。"
 
-#: ../lib/modules/posixGroup.inc:400
+#: ../lib/modules/posixGroup.inc:391
 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 "
@@ -4407,7 +4824,7 @@ msgstr ""
 "新しいグループアカウントを作成する際に使われるグループIDの最小値と最大値。新"
 "しいグループアカウントには、使用中の番号の最大値+1が常に割り当てられます。"
 
-#: ../lib/modules/posixAccount.inc:319
+#: ../lib/modules/posixAccount.inc:328
 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 "
@@ -4418,7 +4835,7 @@ msgstr ""
 "囲はユーザアカウントのものと異なるようにしなくてはなりません。新しいホストア"
 "カウントには、使用中の番号の最大値+1が常に割り当てられます。"
 
-#: ../lib/modules/posixAccount.inc:315
+#: ../lib/modules/posixAccount.inc:324
 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 "
@@ -4428,18 +4845,18 @@ msgstr ""
 "マシンアカウントのものとは異なるようにしなくてはなりません。新しいユーザアカ"
 "ウントには、使用中の番号の最大値+1が常に割りあてられます。"
 
-#: ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:87
 msgid ""
 "This GID number is invalid! Please provide either a number or a group name."
 msgstr ""
 "このGID番号は正しくありません。別な番号を指定するか、グループ名を記入してくだ"
 "さい。"
 
-#: ../lib/modules/kolabUser.inc:282
+#: ../lib/modules/kolabUser.inc:284
 msgid "This account is marked for deletion."
 msgstr "このアカウントを削除対象としてマークしました。"
 
-#: ../lib/modules/sambaSamAccount.inc:247
+#: ../lib/modules/sambaSamAccount.inc:254
 msgid ""
 "This allows you to define this account as a special user like administrator "
 "or guest."
@@ -4447,11 +4864,11 @@ msgstr ""
 "このアカウントをadministratorやguest等の特殊ユーザとして定義する事を可能にし"
 "ます。"
 
-#: ../help/help.inc:122
+#: ../help/help.inc:120
 msgid "This changes the password of the selected profile."
 msgstr "選択されたプロファイルのパスワードを変更します。"
 
-#: ../help/help.inc:124
+#: ../help/help.inc:122
 msgid "This changes the profile which is selected by default at login."
 msgstr "ログイン時にデフォルトで選択されるプロファイルを変更します。"
 
@@ -4461,7 +4878,7 @@ msgid ""
 msgstr ""
 "ユニークなエントリを含むものとして定義されているカラムで重複がみつかりました:"
 
-#: ../help/help.inc:95
+#: ../help/help.inc:96
 msgid ""
 "This defines the language of the login window and sets this language as the "
 "default language. Users can change the language at login."
@@ -4469,7 +4886,13 @@ msgstr ""
 "ログインウィンドウの言語を定義し、この言語を既定値の言語として設定します。"
 "ユーザはログイン時に言語を変更できます。"
 
-#: ../lib/pdf.inc:454
+#: ../help/help.inc:112
+msgid ""
+"This defines the rights for the home directories which are created by "
+"lamdaemon."
+msgstr "lamdaemonによって作成されたホームディレクトリの権限を定義します。"
+
+#: ../lib/pdf.inc:426
 msgid "This document was automatically created by LDAP Account Manager"
 msgstr "この文書はLDAP Account Managerによって自動的に生成されました。"
 
@@ -4482,7 +4905,7 @@ msgstr "このエントリは属性を持っていません。"
 msgid "This entry is the root of a sub-tree containing %s entries."
 msgstr "このエントリは %s エントリを含むサブツリーのルートです。"
 
-#: ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:89
 msgid "This gecos value is invalid!"
 msgstr "gecosの値が正しくありません!"
 
@@ -4510,7 +4933,7 @@ msgstr "カンマで区切られた受信者のリスト。"
 msgid "This is a comma separated list of the users public email addresses."
 msgstr "ユーザの公開メールアドレスのカンマで区切られたリスト。"
 
-#: ../help/help.inc:138
+#: ../help/help.inc:136
 msgid ""
 "This is a list of IP addresses from hosts who may access LAM. You can use \"*"
 "\" as wildcard (e.g. 192.168.0.*)."
@@ -4518,13 +4941,29 @@ msgstr ""
 "LAMへのアクセスを許可するホストのIPアドレスのリスト。ワイルドカードとして\"*"
 "\"が使えます(例 192.168.0.*)。"
 
-#: ../help/help.inc:88
+#: ../lib/modules/groupOfNames.inc:69
+msgid "This is a list of members of this group."
+msgstr "このグループのメンバーのリスト。"
+
+#: ../lib/modules/groupOfNames.inc:73
+msgid ""
+"This is a list of members of this group. Multiple members are separated by "
+"semicolons."
+msgstr "このグループのメンバーのリスト。ユーザ名はセミコロンによって区切られます。"
+
+#: ../help/help.inc:109
+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 "
+"and password provided at login. Multiple servers are separated by "
+"semicolons. You can append a descriptive name after a colon."
+msgstr "これはldapdaemonスクリプトが格納されるサーバのリストです。LDAP Account Managerは、ログイン時に提供されるユーザ名とパスワードでサーバにSSH接続を行ないます。サーバ名はセミコロンによって区切られます。セミコロンに続けて記述的名前を付加することもできます。"
+
+#: ../help/help.inc:89
 msgid ""
 "This is a list of valid DN entries of all users that are allowed to login to "
-"LDAP Account Manager. The user names have to be separated by semicolons."
-msgstr ""
-"LDAP Account Manager にログイン可能なすべてのユーザの有効なDNエントリの一覧で"
-"す。ユーザ名はセミコロンによって区切る必要があります。"
+"LDAP Account Manager. Please enter one DN per line."
+msgstr "LDAP Account Manager にログイン可能なすべてのユーザの有効なDNエントリの一覧です。各行毎に1個のDNを入力してください。"
 
 #: ../templates/masscreate.php:219
 msgid ""
@@ -4533,7 +4972,7 @@ msgid ""
 msgstr ""
 "CSVに変換する前に、あなたの表計算プログラムでどのように見えるかの例です。"
 
-#: ../help/help.inc:166
+#: ../help/help.inc:164
 msgid ""
 "This is needed to find the LDAP DNs of your user accounts. E.g. if you use "
 "\"uid\" and your user inputs \"miller\" then LAM will search for an account "
@@ -4543,15 +4982,15 @@ msgstr ""
 "していて入力が\"miller\"だった場合、LAMは uid=miller という条件でアカウントを"
 "検索します。"
 
-#: ../lib/modules/inetOrgPerson.inc:73
+#: ../lib/modules/inetOrgPerson.inc:75
 msgid "This is not a valid DN!"
 msgstr "無効なDNです!"
 
-#: ../lib/modules/sambaSamAccount.inc:91
+#: ../lib/modules/sambaSamAccount.inc:95
 msgid "This is not a valid RID number!"
 msgstr "無効なRID番号です!"
 
-#: ../lib/modules/sambaGroupMapping.inc:377
+#: ../lib/modules/sambaGroupMapping.inc:382
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不正なSamba 3グループタイプです!"
 
@@ -4563,7 +5002,7 @@ msgstr "ユーザの公開メールアドレスの一つ。"
 msgid "This is one recipient for this alias."
 msgstr "この別名に対する1名の受信者。"
 
-#: ../lib/modules/inetOrgPerson.inc:309
+#: ../lib/modules/inetOrgPerson.inc:335
 msgid ""
 "This is the LDAP DN of the user's manager. Use this property to represent "
 "hierarchies in your company."
@@ -4581,11 +5020,11 @@ msgstr "ネットワークカードデバイスのMACアドレスです(例 0:01
 msgid "This is the RID of the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループのRIDです。"
 
-#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/sambaSamAccount.inc:251
 msgid "This is the SID of the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループのSIDです。"
 
-#: ../help/help.inc:97
+#: ../help/help.inc:98
 msgid ""
 "This is the absolute path to an external script for setting quotas and "
 "creating home directories."
@@ -4593,23 +5032,23 @@ msgstr ""
 "ホームディレクトリを作成し、quotaを設定するための外部スクリプトの絶対パスで"
 "す。"
 
-#: ../lib/modules/sambaAccount.inc:344 ../lib/modules/sambaSamAccount.inc:188
+#: ../lib/modules/sambaAccount.inc:344 ../lib/modules/sambaSamAccount.inc:192
 msgid "This is the account's Windows password."
 msgstr "アカウントのWindowsパスワードです。"
 
-#: ../lib/modules/sambaAccount.inc:341 ../lib/modules/sambaSamAccount.inc:185
+#: ../lib/modules/sambaAccount.inc:341 ../lib/modules/sambaSamAccount.inc:189
 msgid "This is the account's full name on Windows systems."
 msgstr "アカウントのWindowsシステム上のフルネームです。"
 
-#: ../lib/modules/sambaSamAccount.inc:266 ../lib/modules/shadowAccount.inc:170
+#: ../lib/modules/sambaSamAccount.inc:273 ../lib/modules/shadowAccount.inc:171
 msgid "This is the date when the account will expire. Format: DD-MM-YYYY"
 msgstr "アカウントが失効する日。形式は: DD-MM-YYYY"
 
-#: ../lib/modules/sambaGroupMapping.inc:293
+#: ../lib/modules/sambaGroupMapping.inc:298
 msgid "This is the group name which will be shown in Windows."
 msgstr "Windows上で表示されるグループ名です。"
 
-#: ../help/help.inc:145
+#: ../help/help.inc:143
 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 "
@@ -4619,33 +5058,45 @@ msgstr ""
 "てはなりません(例えば、ユーザアカウントでは通常\"uid\"を使用し、グループでは"
 "\"cn\"を使用します)。"
 
-#: ../help/help.inc:83
+#: ../help/help.inc:84
 msgid ""
 "This is the list of attributes to show in the account list. The entries can "
 "either be predefined values, \"#attribute\", or individual ones, \"attribute:"
-"description\". Several entries are seperated by semicolons."
-msgstr ""
-"これは、ユーザ/グループ/ホスト一覧に表示する属性のリストです。エントリは既定"
-"の値、\"#属性\" 、または特定の値、\"属性:説明\" のいずれかにできます。いくつ"
-"かのエントリは、セミコロンによって区切られます。"
+"description\". Several entries are separated by semicolons."
+msgstr "これは、アカウント一覧に表示する属性のリストです。エントリは既定の値、\"#属性\" 、または特定の値、\"属性:説明\" のいずれかにできます。複数のエントリは、セミコロンによって区切られます。"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:70
 msgid "This is the mail server for the user."
 msgstr "ユーザに対するメールサーバ。"
 
-#: ../lib/modules/inetOrgPerson.inc:345
+#: ../lib/modules/groupOfNames.inc:57
+msgid "This is the name of this group."
+msgstr "このグループの名前。"
+
+#: ../lib/modules/posixAccount.inc:415
+msgid ""
+"This is the natural name of the host. If empty, the host name will be used."
+msgstr "このホストの呼称。未入力の場合は、ホスト名が使用されます。"
+
+#: ../lib/modules/inetOrgPerson.inc:371
 msgid ""
 "This is the natural name of the user. If empty, the first and last name is "
 "used."
 msgstr "このユーザの呼称。未入力の場合は、姓と名が使用されます。"
 
-#: ../lib/modules/posixAccount.inc:380
+#: ../lib/modules/posixAccount.inc:393
 msgid ""
 "This is the natural name of the user. If empty, the first and last name or "
 "user name is used."
 msgstr ""
 "このユーザの呼称。未入力の場合は、姓と名、またはユーザ名が使用されます。"
 
+#: ../lib/modules/sambaDomain.inc:111
+msgid ""
+"This is the number of bad logon attempts (0 - 999) before the accounts is "
+"deactivated. 0 means unlimited attempts."
+msgstr "アカウントが無効化される不正ログオン試行回数(0-999)。0は無制限を意味します。"
+
 #: ../lib/modules/sambaDomain.inc:95
 msgid ""
 "This is the number of passwords which are saved to prevent that users reuse "
@@ -4654,7 +5105,7 @@ msgstr ""
 "ユーザーが過去に使用したパスワードを再利用する事を防ぐために記録しておくパス"
 "ワードの履歴数。"
 
-#: ../help/help.inc:93
+#: ../help/help.inc:94
 msgid ""
 "This is the number of rows to show in the user/group/host list. If more "
 "entries are found the list will be split into several pages."
@@ -4662,7 +5113,11 @@ msgstr ""
 "ユーザ/グループ/ホスト一覧に表示する行数です。もしもより多くのエントリがある"
 "ならば、リストは複数のページに分割されます。"
 
-#: ../lib/modules/sambaGroupMapping.inc:301
+#: ../lib/modules/sambaSamAccount.inc:282
+msgid "This is the path to the user's home directory."
+msgstr "ユーザのホームディレクトリのパス。"
+
+#: ../lib/modules/sambaGroupMapping.inc:306
 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 "
@@ -4672,7 +5127,7 @@ msgstr ""
 "合、LAMはUIDからRIDを算出します。数値または特殊グループ名のどちらかを指定でき"
 "ます。"
 
-#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/sambaSamAccount.inc:257
 msgid ""
 "This is the relative ID number for your Windows account. You can either "
 "enter a number or one of these special accounts: "
@@ -4680,7 +5135,7 @@ msgstr ""
 "あなたのWindowsアカウントに対する相対ID番号です。数字またはこれらの特殊アカウ"
 "ントのどれか一つを指定できます: "
 
-#: ../lib/modules/sambaSamAccount.inc:254
+#: ../lib/modules/sambaSamAccount.inc:261
 msgid ""
 "This is the relative ID number for your host account. If you leave this "
 "empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
@@ -4688,7 +5143,7 @@ msgstr ""
 "あなたのホストアカウントに対する相対ID番号です。未入力の場合、LAMは "
 "uidNumber*2 + sambaAlgorithmicRidBase を使用します。"
 
-#: ../help/help.inc:59
+#: ../help/help.inc:60
 msgid ""
 "This is the server address of your LDAP server. Use ldap:// for standard "
 "LDAP connections and ldaps:// for encrypted (require server certificates) "
@@ -4697,20 +5152,11 @@ msgstr ""
 "これはLDAPサーバのアドレスです。ldap:// を標準的なLDAP接続に、ldaps:// を暗号"
 "化された(サーバ認証が必要)接続に使用してください。ポート番号は省略できます。"
 
-#: ../help/help.inc:102
-msgid ""
-"This is the server where the lamdaemon script is stored. LDAP Account "
-"Manager will make a SSH connection to this server with user name and "
-"password provided at login."
-msgstr ""
-"これはldapdaemonスクリプトが格納されるサーバです。LDAP Account Managerは、ロ"
-"グイン時に提供されるユーザ名とパスワードでサーバにSSH接続を行ないます。"
-
-#: ../help/help.inc:77
+#: ../help/help.inc:78
 msgid "This is the suffix for the LDAP tree viewer."
 msgstr "LDAPツリービューアに対するサフィックス。"
 
-#: ../help/help.inc:71
+#: ../help/help.inc:72
 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 "
@@ -4732,13 +5178,13 @@ msgstr ""
 "アカウントをロックされたユーザーがログインできなくなる時間(分単位)。-1は無期"
 "限を意味する。"
 
-#: ../help/help.inc:132
+#: ../help/help.inc:130
 msgid ""
 "This is the time (in minutes) of inactivity after which a user is "
 "automatically logged off."
 msgstr "ユーザーが自動的ログオフするまでの時間(分単位)。"
 
-#: ../help/help.inc:109
+#: ../help/help.inc:102
 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 "
@@ -4756,7 +5202,7 @@ msgstr ""
 "他のユーザが将来の予定をチェックする場合の時間的上限(日数)。未入力の場合はデ"
 "フォルト値(60日)がセットされます。"
 
-#: ../lib/modules/sambaSamAccount.inc:269
+#: ../lib/modules/sambaSamAccount.inc:276
 msgid ""
 "This is the time zone of your Samba server. LAM needs this information to "
 "display the logon hours correctly."
@@ -4764,11 +5210,23 @@ msgstr ""
 "Sambaサーバのタイムゾーン。LAMがログオン時間を正確に表示するために、この情報"
 "が必要です。"
 
-#: ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/neofonieInetOrgPerson.inc:77
+msgid "This is the user's AIM account name"
+msgstr "ユーザーのAIMアカウント名。"
+
+#: ../lib/modules/neofonieInetOrgPerson.inc:80
+msgid "This is the user's Quake ID."
+msgstr "ユーザのQuake ID。"
+
+#: ../lib/modules/neofonieInetOrgPerson.inc:74
+msgid "This is the user's login name for the wiki."
+msgstr "このユーザのwiki上のログイン名。"
+
+#: ../lib/modules/sambaSamAccount.inc:248
 msgid "This is the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループです。"
 
-#: ../lib/modules/posixAccount.inc:87
+#: ../lib/modules/posixAccount.inc:90
 msgid "This login shell is invalid!"
 msgstr "ログインシェルが正しくありません!"
 
@@ -4780,12 +5238,12 @@ msgstr "このメールアドレスは既に使用されています:"
 msgid "This object class is obsolete."
 msgstr "このオブジェクトクラスは旧式です。"
 
-#: ../lib/modules/sambaSamAccount.inc:260
+#: ../lib/modules/sambaSamAccount.inc:267
 msgid "This option defines the allowed logon hours for this account."
 msgstr ""
 "このオプションは、このアカウントがログオンを許可される時間を定義します。"
 
-#: ../lib/modules/sambaSamAccount.inc:263
+#: ../lib/modules/sambaSamAccount.inc:270
 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 "
@@ -4796,11 +5254,23 @@ msgstr ""
 "時間が168ビットに写影され、21桁の16進数(21*8=168)の値として保存されます。先頭"
 "の1ビットはグリニッジ標準時で日曜の0:00 - 0:59を意味します。"
 
-#: ../help/help.inc:155
+#: ../lib/modules/sambaSamAccount.inc:291
+msgid "This program is run after the login."
+msgstr "このプログラムはログオンの後に実行されます。"
+
+#: ../help/help.inc:153
 msgid "This saves your account to the LDAP database."
 msgstr "あなたのアカウントをLDAPデータベースに保存します。"
 
-#: ../help/help.inc:170
+#: ../lib/modules/sambaSamAccount.inc:315
+msgid "This specifies the reconnect policy."
+msgstr "再接続のポリシーを記述します。"
+
+#: ../lib/modules/sambaSamAccount.inc:312
+msgid "This specifies what to do when the client connection is broken."
+msgstr "クライアント接続が壊れた場合の処理を記述します。"
+
+#: ../help/help.inc:168
 msgid ""
 "This text is displayed on top of the self service login page. You can also "
 "input HTML code here."
@@ -4808,7 +5278,7 @@ msgstr ""
 "この文字列はセルフサービス・ログインページのトップに表示されます。ここには"
 "HTMLコードを書く事もできます。"
 
-#: ../help/help.inc:172
+#: ../help/help.inc:170
 msgid ""
 "This text is displayed on top of the self service main page. You can also "
 "input HTML code here."
@@ -4816,13 +5286,13 @@ msgstr ""
 "この文字列はセルフサービス・メインページのトップに表示されます。ここにはHTML"
 "コードを書く事もできます。"
 
-#: ../help/help.inc:168
+#: ../help/help.inc:166
 msgid ""
 "This text should shortly describe your selected LDAP search attribute (e.g. "
 "email or user name)."
 msgstr "この文字列はLDAP検索属性を簡単に説明します(例. emailまたはユーザ名)。"
 
-#: ../help/help.inc:111
+#: ../help/help.inc:104
 msgid "This text will appear on top of every user PDF file."
 msgstr "このテキストは、各ユーザのPDFファイルの先頭に表示されます。"
 
@@ -4836,34 +5306,39 @@ 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:94 ../lib/modules/sambaSamAccount.inc:95
-#: ../lib/modules/sambaSamAccount.inc:96 ../lib/modules/sambaSamAccount.inc:97
+#: ../lib/modules/sambaSamAccount.inc:98 ../lib/modules/sambaSamAccount.inc:99
+#: ../lib/modules/sambaSamAccount.inc:100
+#: ../lib/modules/sambaSamAccount.inc:101
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"!"
 msgstr "この値は、\"true\"または\"false\"のいずれかでなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:88
+#: ../lib/modules/posixAccount.inc:91
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"."
 msgstr "この値は、\"true\"または\"false\"のいずれかでなくてはなりません。"
 
-#: ../lib/modules/posixGroup.inc:475
+#: ../lib/modules/posixGroup.inc:466
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "この値はセミコロンで区切られたユーザ名でなくてはなりません。"
 
-#: ../help/help.inc:181
+#: ../help/help.inc:179
 msgid "This will create a new organizational unit under the selected one."
 msgstr "選択された位置の下に新しい organizational unit を作成します。"
 
-#: ../help/help.inc:183
+#: ../lib/modules/posixAccount.inc:356
+msgid "This will create the user's home directory on the specified server."
+msgstr "ユーザのホームディレクトリを指定されたサーバ上に作成します。"
+
+#: ../help/help.inc:181
 msgid ""
 "This will delete the selected organizational unit. The OU has to be empty."
 msgstr ""
 "選択された organizational unitを削除します。OUは空でなくてはなりません。"
 
-#: ../help/help.inc:120
+#: ../help/help.inc:118
 msgid "This will delete the selected profile."
 msgstr "選択されたプロファイルを削除します。"
 
-#: ../lib/modules/sambaAccount.inc:347 ../lib/modules/sambaSamAccount.inc:191
+#: ../lib/modules/sambaAccount.inc:347 ../lib/modules/sambaSamAccount.inc:195
 msgid "This will reset the host's password to a default value."
 msgstr "ホストのパスワードをデフォルト値にリセットします。"
 
@@ -4875,24 +5350,28 @@ msgstr ""
 "Kolabdに削除を命ずる特殊なフラグをセットします。Kolabアカウントを完全に削除す"
 "る場合に使用します(e.g. メールボックスは削除されます)。"
 
-#: ../lib/modules/sambaSamAccount.inc:1013
+#: ../lib/modules/sambaSamAccount.inc:1210
 msgid "Thursday"
 msgstr "木曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:1054
+#: ../lib/modules/sambaSamAccount.inc:1251
 msgid "Time"
 msgstr "時刻"
 
-#: ../lib/modules/sambaSamAccount.inc:268
-#: ../lib/modules/sambaSamAccount.inc:421
+#: ../lib/modules/sambaSamAccount.inc:296
+msgid "Time limit"
+msgstr "時間制限"
+
+#: ../lib/modules/sambaSamAccount.inc:275
+#: ../lib/modules/sambaSamAccount.inc:470
 msgid "Time zone"
 msgstr "タイムゾーン"
 
-#: ../templates/tests/lamdaemonTest.php:160 ../lib/lamdaemon.inc:133
+#: ../templates/tests/lamdaemonTest.php:78 ../lib/lamdaemon.inc:121
 msgid "Timeout while executing lamdaemon commands!"
 msgstr "lamdaemonコマンドの実行がタイムアウトしました!"
 
-#: ../lib/modules/posixAccount.inc:372
+#: ../lib/modules/posixAccount.inc:385
 msgid ""
 "To disable login use /bin/false. The list of shells is read from lam/config/"
 "shells"
@@ -4900,7 +5379,7 @@ msgstr ""
 "ログインを禁止するためには/bin/falseを使ってください。シェルの一覧は lam/"
 "config/shells から読み込まれます。"
 
-#: ../lib/modules/sambaSamAccount.inc:445
+#: ../lib/modules/sambaSamAccount.inc:494
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "東京、ソウル、大阪、ヤクーツク"
 
@@ -4916,7 +5395,7 @@ msgstr "エントリ総数"
 msgid "Translate GID number to group name"
 msgstr "GID番号をグループ名に変換"
 
-#: ../templates/config/confmain.php:157 ../help/help.inc:76
+#: ../templates/config/confmain.php:163 ../help/help.inc:77
 msgid "Tree suffix"
 msgstr "ツリーサフィックス"
 
@@ -4924,11 +5403,11 @@ msgstr "ツリーサフィックス"
 msgid "Tree view"
 msgstr "ツリービュー"
 
-#: ../templates/config/confmain.php:434
+#: ../templates/config/confmain.php:493
 msgid "TreeSuffix is invalid!"
 msgstr "ツリーサフィックスが正しくありません!"
 
-#: ../lib/modules/sambaSamAccount.inc:1013
+#: ../lib/modules/sambaSamAccount.inc:1210
 msgid "Tuesday"
 msgstr "木曜日"
 
@@ -4937,29 +5416,29 @@ msgstr "木曜日"
 msgid "Type"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:75
 msgid "UID"
 msgstr "UID"
 
-#: ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:75
 msgid "UID has changed. Do you want to change home directory?"
 msgstr "UIDが変更されました。ホームディレクトリを変更しますか?"
 
-#: ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixAccount.inc:70
 msgid ""
 "UID must be a number. It has to be inside the UID range which is defined in "
 "your configuration profile."
 msgstr "UIDは数値で、設定ファイルで定義されたUIDの範囲内でなくてはなりません。"
 
 #: ../lib/types/host.inc:86 ../lib/types/user.inc:83
-#: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:201
-#: ../lib/modules/posixAccount.inc:268 ../lib/modules/posixAccount.inc:314
-#: ../lib/modules/posixAccount.inc:318 ../lib/modules/posixAccount.inc:326
-#: ../lib/modules/posixAccount.inc:822 ../lib/modules/posixAccount.inc:1029
+#: ../lib/modules/posixAccount.inc:71 ../lib/modules/posixAccount.inc:203
+#: ../lib/modules/posixAccount.inc:277 ../lib/modules/posixAccount.inc:323
+#: ../lib/modules/posixAccount.inc:327 ../lib/modules/posixAccount.inc:335
+#: ../lib/modules/posixAccount.inc:936 ../lib/modules/posixAccount.inc:1164
 msgid "UID number"
 msgstr "UID番号"
 
-#: ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/posixAccount.inc:71
 #, php-format
 msgid ""
 "UID number has changed. To keep file ownership you have to run the following "
@@ -4969,11 +5448,11 @@ msgstr ""
 "コマンドをroot権限で実行す必要があります: 'find / -uid %s -exec chown %s {} "
 "\\;'"
 
-#: ../lib/modules/posixAccount.inc:59 ../lib/modules/posixAccount.inc:171
+#: ../lib/modules/posixAccount.inc:62
 msgid "UID ranges for Unix accounts"
 msgstr "unixアカウントに対するUIDの範囲"
 
-#: ../lib/modules/sambaAccount.inc:382 ../lib/modules/sambaSamAccount.inc:226
+#: ../lib/modules/sambaAccount.inc:382 ../lib/modules/sambaSamAccount.inc:233
 msgid ""
 "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced "
 "with user and group name."
@@ -4981,7 +5460,7 @@ msgstr ""
 "ホームディレクトリのUNCパス (\\\\サーバ\\共有)。$user と $group はユーザ名と"
 "グループ名に置換されます。"
 
-#: ../templates/selfService/selfServiceMain.php:118
+#: ../templates/selfService/selfServiceMain.php:135
 msgid ""
 "Unable to change your account. Maybe you do not have enough rights to change "
 "the settings."
@@ -4989,8 +5468,8 @@ msgstr ""
 "アカウントを変更できません。あなたはおそらく、設定を変更する権限を持っていま"
 "せん。"
 
-#: ../templates/tests/lamdaemonTest.php:138 ../lib/lamdaemon.inc:146
-#: ../lib/lamdaemon.inc:151
+#: ../templates/tests/lamdaemonTest.php:215 ../lib/lamdaemon.inc:134
+#: ../lib/lamdaemon.inc:139
 msgid "Unable to connect to remote server!"
 msgstr "リモートサーバーに接続できません!"
 
@@ -5017,15 +5496,15 @@ msgstr "PDF構成を削除できません!"
 msgid "Unable to delete profile!"
 msgstr "プロファイルを削除できません!"
 
-#: ../lib/modules/posixAccount.inc:1208 ../lib/modules/posixAccount.inc:1425
+#: ../lib/modules/posixAccount.inc:1343 ../lib/modules/posixAccount.inc:1562
 msgid "Unable to find group in LDAP."
 msgstr "LDAP内にグループが見つかりません。"
 
-#: ../lib/modules.inc:1180 ../lib/modules.inc:1184
+#: ../lib/modules.inc:1220 ../lib/modules.inc:1224
 msgid "Unable to load LDAP entry:"
 msgstr "LDAPエントリをロードできません:"
 
-#: ../templates/config/confmain.php:301
+#: ../templates/config/confmain.php:307
 msgid ""
 "Unable to load available languages. Setting English as default language. For "
 "further instructions please contact the Admin of this site."
@@ -5043,22 +5522,22 @@ msgstr "プロファイルをロードできません!"
 msgid "Unable to retrieve schema!"
 msgstr "スキーマを取得できません!"
 
-#: ../templates/selfService/adminMain.php:88
+#: ../templates/selfService/adminMain.php:123
 #: ../templates/profedit/profilepage.php:127
 msgid "Unable to save profile!"
 msgstr "プロファイルを保存できません!"
 
-#: ../lib/modules/posixGroup.inc:282 ../lib/modules/posixAccount.inc:114
+#: ../lib/modules/posixGroup.inc:282 ../lib/modules/posixAccount.inc:118
 msgid "Unix"
 msgstr "unix"
 
-#: ../templates/tests/lamdaemonTest.php:79
+#: ../templates/tests/lamdaemonTest.php:156
 msgid "Unix account"
 msgstr "unixアカウント"
 
-#: ../lib/modules/inetOrgPerson.inc:44 ../lib/modules/inetOrgPerson.inc:254
-#: ../lib/modules/inetOrgPerson.inc:352 ../lib/modules/inetOrgPerson.inc:675
-#: ../lib/modules/inetOrgPerson.inc:811
+#: ../lib/modules/inetOrgPerson.inc:44 ../lib/modules/inetOrgPerson.inc:277
+#: ../lib/modules/inetOrgPerson.inc:378 ../lib/modules/inetOrgPerson.inc:757
+#: ../lib/modules/inetOrgPerson.inc:893
 msgid "Unix workstations"
 msgstr "unixワークステーション"
 
@@ -5066,7 +5545,11 @@ msgstr "unixワークステーション"
 msgid "Unix workstations are invalid!"
 msgstr "unixワークステーションが正しくありません。"
 
-#: ../lib/modules/posixGroup.inc:173 ../lib/modules/posixAccount.inc:859
+#: ../templates/tests/lamdaemonTest.php:93
+msgid "Unknown error"
+msgstr "不明なエラー"
+
+#: ../lib/modules/posixGroup.inc:173 ../lib/modules/posixAccount.inc:990
 msgid "Unlock password"
 msgstr "パスワード・ロックの解除"
 
@@ -5086,7 +5569,7 @@ msgstr "アカウントをLDAPにアップロード"
 msgid "Upload file and create accounts"
 msgstr "ファイルをアップロードして、アカウントを作成します。"
 
-#: ../lib/modules.inc:474
+#: ../lib/modules.inc:450
 #, php-format
 msgid "Upload was stopped after errors in %s module!"
 msgstr "%s モジュールでエラーが発生したため、アプロードを中止しました。"
@@ -5097,11 +5580,11 @@ msgstr "使用方法"
 
 #: ../lib/modules/sambaAccount.inc:120 ../lib/modules/sambaAccount.inc:231
 #: ../lib/modules/sambaAccount.inc:349 ../lib/modules/sambaAccount.inc:352
-#: ../lib/modules/sambaAccount.inc:722 ../lib/modules/sambaSamAccount.inc:193
-#: ../lib/modules/sambaSamAccount.inc:196
-#: ../lib/modules/sambaSamAccount.inc:297
-#: ../lib/modules/sambaSamAccount.inc:853
-#: ../lib/modules/sambaSamAccount.inc:1081
+#: ../lib/modules/sambaAccount.inc:736 ../lib/modules/sambaSamAccount.inc:197
+#: ../lib/modules/sambaSamAccount.inc:200
+#: ../lib/modules/sambaSamAccount.inc:346
+#: ../lib/modules/sambaSamAccount.inc:981
+#: ../lib/modules/sambaSamAccount.inc:1449
 msgid "Use Unix password"
 msgstr "unixパスワードを使用"
 
@@ -5109,27 +5592,21 @@ msgstr "unixパスワードを使用"
 msgid "Use default"
 msgstr "デフォルト値を使用"
 
-#: ../help/help.inc:99 ../help/help.inc:104
-msgid ""
-"Use it at your own risk and read the documentation for lamdaemon before you "
-"use it!"
-msgstr "使う前にlamdaemonのドキュメントを読み、あなたの責任で使うこと"
-
 #: ../lib/modules/sambaAccount.inc:126 ../lib/modules/sambaAccount.inc:239
 #: ../lib/modules/sambaAccount.inc:355 ../lib/modules/sambaAccount.inc:358
-#: ../lib/modules/sambaAccount.inc:726 ../lib/modules/sambaSamAccount.inc:199
-#: ../lib/modules/sambaSamAccount.inc:202
-#: ../lib/modules/sambaSamAccount.inc:305
-#: ../lib/modules/sambaSamAccount.inc:857
-#: ../lib/modules/sambaSamAccount.inc:1087
+#: ../lib/modules/sambaAccount.inc:740 ../lib/modules/sambaSamAccount.inc:203
+#: ../lib/modules/sambaSamAccount.inc:206
+#: ../lib/modules/sambaSamAccount.inc:354
+#: ../lib/modules/sambaSamAccount.inc:986
+#: ../lib/modules/sambaSamAccount.inc:1455
 msgid "Use no password"
 msgstr "パスワードなし"
 
-#: ../lib/modules/quota.inc:90 ../lib/modules/quota.inc:311
+#: ../lib/modules/quota.inc:92 ../lib/modules/quota.inc:354
 msgid "Used blocks"
 msgstr "使用したブロック"
 
-#: ../lib/modules/quota.inc:91
+#: ../lib/modules/quota.inc:93
 msgid "Used blocks. 1000 blocks are usually 1MB"
 msgstr "使用したブロック。1000ブロックは通常1MB."
 
@@ -5146,11 +5623,11 @@ msgid "Used for calculating RIDs from UID/GID. Do not change if unsure."
 msgstr ""
 "RIDs を UID/GID から計算するために使用します。自信がないなら変更しないこと。"
 
-#: ../lib/modules/quota.inc:106 ../lib/modules/quota.inc:315
+#: ../lib/modules/quota.inc:114 ../lib/modules/quota.inc:358
 msgid "Used inodes"
 msgstr "使用したinode"
 
-#: ../lib/modules/quota.inc:107
+#: ../lib/modules/quota.inc:115
 msgid "Used inodes (files)"
 msgstr "使用したinode(ファイル)"
 
@@ -5167,87 +5644,88 @@ msgid "User accounts (e.g. Unix, Samba and Kolab)"
 msgstr "ユーザアカウント(e.g. Unix, Samba and Kolab)"
 
 #: ../lib/modules/sambaAccount.inc:263 ../lib/modules/sambaAccount.inc:373
-#: ../lib/modules/sambaAccount.inc:738 ../lib/modules/sambaSamAccount.inc:217
-#: ../lib/modules/sambaSamAccount.inc:329
-#: ../lib/modules/sambaSamAccount.inc:869
+#: ../lib/modules/sambaAccount.inc:752 ../lib/modules/sambaSamAccount.inc:224
+#: ../lib/modules/sambaSamAccount.inc:378
+#: ../lib/modules/sambaSamAccount.inc:1017
+#: ../lib/modules/sambaSamAccount.inc:1273
 msgid "User can change password"
 msgstr "ユーザはパスワードを変更可能"
 
-#: ../lib/modules/posixAccount.inc:352
+#: ../lib/modules/posixAccount.inc:365
 msgid "User description. If left empty first and last name will be used."
 msgstr ""
 "ユーザの説明。もしも空ならば、姓(last name)と名(first name)が使われます。"
 
-#: ../lib/modules/inetOrgPerson.inc:289
+#: ../lib/modules/inetOrgPerson.inc:315
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "ユーザの説明。もしも空ならば、姓(surname)と名(given)が使われます。"
 
+#: ../lib/modules/account.inc:95
+msgid "User description. If left empty user name will be used."
+msgstr "ユーザの説明。もしも空ならば、ユーザ名が使われます。"
+
 #: ../templates/schema/schema.php:209
 msgid "User modification"
 msgstr "ユーザによる変更"
 
 #: ../lib/modules/sambaAccount.inc:270 ../lib/modules/sambaAccount.inc:375
-#: ../lib/modules/sambaAccount.inc:746 ../lib/modules/sambaSamAccount.inc:219
-#: ../lib/modules/sambaSamAccount.inc:336
-#: ../lib/modules/sambaSamAccount.inc:877
+#: ../lib/modules/sambaAccount.inc:760 ../lib/modules/sambaSamAccount.inc:226
+#: ../lib/modules/sambaSamAccount.inc:385
+#: ../lib/modules/sambaSamAccount.inc:1034
+#: ../lib/modules/sambaSamAccount.inc:1278
 msgid "User must change password"
 msgstr "ユーザはパスワード変更が必要"
 
-#: ../templates/login.php:223 ../lib/types/user.inc:85
-#: ../lib/modules/account.inc:96 ../lib/modules/account.inc:116
-#: ../lib/modules/account.inc:118 ../lib/modules/account.inc:119
-#: ../lib/modules/account.inc:197 ../lib/modules/account.inc:218
-#: ../lib/modules/posixAccount.inc:73 ../lib/modules/posixAccount.inc:74
-#: ../lib/modules/posixAccount.inc:77 ../lib/modules/posixAccount.inc:187
-#: ../lib/modules/posixAccount.inc:347 ../lib/modules/posixAccount.inc:814
-#: ../lib/modules/posixAccount.inc:1027 ../lib/modules/inetOrgPerson.inc:70
-#: ../lib/modules/inetOrgPerson.inc:242 ../lib/modules/inetOrgPerson.inc:348
-#: ../lib/modules/inetOrgPerson.inc:550 ../lib/modules/inetOrgPerson.inc:826
+#: ../templates/login.php:233 ../lib/types/user.inc:85
+#: ../lib/modules/account.inc:90 ../lib/modules/account.inc:111
+#: ../lib/modules/account.inc:131 ../lib/modules/account.inc:133
+#: ../lib/modules/account.inc:134 ../lib/modules/account.inc:212
+#: ../lib/modules/account.inc:233 ../lib/modules/posixAccount.inc:76
+#: ../lib/modules/posixAccount.inc:77 ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:189 ../lib/modules/posixAccount.inc:360
+#: ../lib/modules/posixAccount.inc:924 ../lib/modules/posixAccount.inc:1162
+#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:265
+#: ../lib/modules/inetOrgPerson.inc:374 ../lib/modules/inetOrgPerson.inc:596
+#: ../lib/modules/inetOrgPerson.inc:911
 msgid "User name"
 msgstr "ユーザ名"
 
-#: ../lib/modules/posixAccount.inc:81 ../lib/modules/inetOrgPerson.inc:72
+#: ../lib/modules/posixAccount.inc:84 ../lib/modules/inetOrgPerson.inc:74
 msgid "User name already exists!"
 msgstr "ユーザ名はすでに存在しています!"
 
-#: ../lib/modules/account.inc:116 ../lib/modules/account.inc:117
-#: ../lib/modules/account.inc:119 ../lib/modules/posixAccount.inc:74
-#: ../lib/modules/posixAccount.inc:79 ../lib/modules/inetOrgPerson.inc:70
-#: ../lib/modules/inetOrgPerson.inc:71
+#: ../lib/modules/account.inc:131 ../lib/modules/account.inc:132
+#: ../lib/modules/account.inc:134 ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:82 ../lib/modules/inetOrgPerson.inc:72
+#: ../lib/modules/inetOrgPerson.inc:73
 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:77
+#: ../lib/modules/posixAccount.inc:80
 msgid "User name in use. Selected next free user name."
 msgstr "使用中のユーザ名です。次の空きユーザ名が選択されました。"
 
-#: ../lib/modules/posixAccount.inc:348 ../lib/modules/inetOrgPerson.inc:349
+#: ../lib/modules/account.inc:91 ../lib/modules/posixAccount.inc:361
+#: ../lib/modules/inetOrgPerson.inc:375
 msgid ""
-"User name of the user who should be created. Valid characters are: a-z,0-"
+"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. LAM does not allow capital letters A-Z because it can "
-"cause several problems. 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, 0-9 と .-_です。"
-"useraddコマンドで許されていないため、先頭文字に数字は使用できません。大文字 "
-"A-Zは、いくつかの問題を引き起こす可能性があるため使用できません。ユーザ名が既"
-"に使われていたならば、ユーザ名に番号が付加されます。この場合、次の空き番号が"
-"使われます。警告: 古いシステムでは、8文字より長いユーザ名で問題が発生します。"
-"16文字より長いユーザ名ではWindowsにログオンできません。"
+"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にログオンできません。"
 
-#: ../lib/types/user.inc:44 ../lib/modules/posixAccount.inc:53
-#: ../lib/modules/posixAccount.inc:54 ../lib/modules/posixAccount.inc:57
-#: ../lib/modules/posixAccount.inc:143
+#: ../lib/types/user.inc:44 ../lib/modules/posixAccount.inc:56
+#: ../lib/modules/posixAccount.inc:57 ../lib/modules/posixAccount.inc:60
+#: ../lib/modules/posixAccount.inc:156
 msgid "Users"
 msgstr "ユーザ"
 
-#: ../lib/modules/posixGroup.inc:388
+#: ../lib/modules/posixGroup.inc:379
 msgid ""
 "Users who are member of the current group. Users who have set their primary "
 "group to this group will not be shown."
@@ -5255,7 +5733,7 @@ msgstr ""
 "このグループに所属しているユーザ。このグループをプライマリに設定されている"
 "ユーザは表示されません。"
 
-#: ../lib/modules/posixGroup.inc:392
+#: ../lib/modules/posixGroup.inc:383
 msgid ""
 "Users who will become member of the current group. User names are separated "
 "by semicolons."
@@ -5263,12 +5741,12 @@ msgstr ""
 "このグループのメンバーとなるユーザ。ユーザ名はセミコロンによって区切られま"
 "す。"
 
-#: ../templates/tests/lamdaemonTest.php:71
+#: ../templates/tests/lamdaemonTest.php:148
 #, php-format
 msgid "Using %s as lamdaemon remote server."
 msgstr "lamdaemonリモートサーバとして %s を使用します。"
 
-#: ../templates/tests/lamdaemonTest.php:92
+#: ../templates/tests/lamdaemonTest.php:169
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "%sを使用してリモートサーバーに接続します。"
@@ -5277,11 +5755,11 @@ msgstr "%sを使用してリモートサーバーに接続します。"
 msgid "Using template:"
 msgstr "テンプレートを使用:"
 
-#: ../help/help.inc:87
+#: ../help/help.inc:88
 msgid "Valid users"
 msgstr "有効なユーザ"
 
-#: ../templates/login.php:182
+#: ../templates/login.php:192
 msgid "Want more features? Get LAM Pro!"
 msgstr ""
 
@@ -5289,43 +5767,48 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../templates/delete.php:184 ../lib/modules.inc:1496
+#: ../templates/delete.php:198 ../lib/modules.inc:1480
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "DN %s に属性を追加できませんでした。"
 
-#: ../lib/modules.inc:1432 ../lib/modules.inc:1445
+#: ../lib/modules.inc:1451
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "DN %s を作成できませんでした。"
 
-#: ../templates/tree/delete.php:110 ../templates/delete.php:276
-#: ../templates/delete.php:284 ../lib/modules.inc:1423
+#: ../templates/tree/delete.php:110 ../templates/delete.php:278
+#: ../templates/delete.php:286
 #, php-format
 msgid "Was unable to delete DN: %s."
 msgstr "DN %s を削除できませんでした。"
 
 #: ../templates/tree/update.php:106 ../templates/tree/add_oclass.php:90
-#: ../templates/tree/add_oclass_form.php:159 ../templates/delete.php:176
-#: ../lib/modules.inc:1484
+#: ../templates/tree/add_oclass_form.php:159 ../templates/delete.php:190
+#: ../lib/modules.inc:1468
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "DN %s の属性を変更できませんでした。"
 
-#: ../templates/delete.php:192 ../lib/modules.inc:1508
+#: ../templates/delete.php:206 ../lib/modules.inc:1492
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "DN %s の属性を削除できませんでした。"
 
-#: ../lib/modules/sambaSamAccount.inc:1013
+#: ../lib/modules.inc:1438
+#, php-format
+msgid "Was unable to rename DN: %s."
+msgstr "DNを変更できませんでした: %s。"
+
+#: ../lib/modules/sambaSamAccount.inc:1210
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:436
+#: ../lib/modules/sambaSamAccount.inc:485
 msgid "Western Europe Time, London, Lisbon"
 msgstr ""
 
-#: ../help/help.inc:69
+#: ../help/help.inc:70
 msgid ""
 "When using ldaps:// be sure to use exactly the same IP/domain name as in "
 "your certificate!"
@@ -5333,17 +5816,24 @@ msgstr ""
 "ldaps:// を使う時は、証明書のIP/ドメイン名と正確に一致するものを使用してくだ"
 "さい。"
 
-#: ../lib/modules/sambaAccount.inc:406 ../lib/modules/sambaSamAccount.inc:257
+#: ../lib/modules/neofonieInetOrgPerson.inc:73
+#: ../lib/modules/neofonieInetOrgPerson.inc:119
+#: ../lib/modules/neofonieInetOrgPerson.inc:219
+#: ../lib/modules/neofonieInetOrgPerson.inc:596
+msgid "Wiki name"
+msgstr "Wiki名"
+
+#: ../lib/modules/sambaAccount.inc:406 ../lib/modules/sambaSamAccount.inc:264
 msgid "Windows domain name of account."
 msgstr "アカウントのWindowsドメイン名"
 
-#: ../lib/modules/sambaAccount.inc:307 ../lib/modules/sambaAccount.inc:784
-#: ../lib/modules/sambaSamAccount.inc:380
-#: ../lib/modules/sambaSamAccount.inc:929
-#: ../lib/modules/sambaSamAccount.inc:1164
-#: ../lib/modules/sambaSamAccount.inc:1296
-#: ../lib/modules/sambaGroupMapping.inc:205
-#: ../lib/modules/sambaGroupMapping.inc:324
+#: ../lib/modules/sambaAccount.inc:307 ../lib/modules/sambaAccount.inc:804
+#: ../lib/modules/sambaSamAccount.inc:429
+#: ../lib/modules/sambaSamAccount.inc:1111
+#: ../lib/modules/sambaSamAccount.inc:1532
+#: ../lib/modules/sambaSamAccount.inc:1680
+#: ../lib/modules/sambaGroupMapping.inc:210
+#: ../lib/modules/sambaGroupMapping.inc:329
 msgid "Windows group"
 msgstr "Windowsグループ"
 
@@ -5352,23 +5842,23 @@ msgid "Windows group RID"
 msgstr "WindowsグループRID"
 
 #: ../lib/modules/sambaAccount.inc:396
-#: ../lib/modules/sambaGroupMapping.inc:296
+#: ../lib/modules/sambaGroupMapping.inc:301
 msgid "Windows group name"
 msgstr "Windowsグループ名"
 
-#: ../lib/modules/sambaGroupMapping.inc:309
+#: ../lib/modules/sambaGroupMapping.inc:314
 msgid "Windows group type."
 msgstr "Windowsグループタイプ"
 
-#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:247
 msgid "Windows primary group"
 msgstr "Windowsプライマリグループ"
 
-#: ../lib/modules/sambaSamAccount.inc:243
+#: ../lib/modules/sambaSamAccount.inc:250
 msgid "Windows primary group SID"
 msgstr "WindowsプライマリグループSID"
 
-#: ../lib/modules/sambaGroupMapping.inc:305
+#: ../lib/modules/sambaGroupMapping.inc:310
 msgid "Windows-Domain name of group."
 msgstr "グループのWindowsドメイン名。"
 
@@ -5376,7 +5866,21 @@ msgstr "グループのWindowsドメイン名。"
 msgid "Workgroup"
 msgstr "ワークグループ"
 
-#: ../templates/login.php:415 ../templates/selfService/selfServiceLogin.php:89
+#: ../lib/modules/sambaSamAccount.inc:293
+#: ../lib/modules/sambaSamAccount.inc:1362
+#: ../lib/modules/sambaSamAccount.inc:1700
+msgid "Working directory"
+msgstr "作業ディレクトリ"
+
+#: ../lib/modules/sambaSamAccount.inc:294
+msgid "Working directory of initial program."
+msgstr "初期プログラムの作業ディレクトリ。"
+
+#: ../templates/config/confmain.php:367
+msgid "Write"
+msgstr "書く"
+
+#: ../templates/login.php:426 ../templates/selfService/selfServiceLogin.php:89
 #: ../templates/selfService/selfServiceLogin.php:101
 msgid "Wrong password/user name combination. Please try again."
 msgstr "誤ったパスワード/ユーザ名の組み合わせです。やり直してください。"
@@ -5386,7 +5890,7 @@ msgstr "誤ったパスワード/ユーザ名の組み合わせです。やり
 msgid "Yes"
 msgstr "はい"
 
-#: ../lib/modules/posixGroup.inc:471
+#: ../lib/modules/posixGroup.inc:462
 msgid ""
 "You are using a capital letters. This can cause problems because Windows "
 "isn't case-sensitive."
@@ -5394,8 +5898,8 @@ msgstr ""
 "大文字が使われています。Windowsは大文字と小文字を区別しないため、これが原因で"
 "問題が発生する場合があります。"
 
-#: ../lib/modules/account.inc:118 ../lib/modules/posixAccount.inc:73
-#: ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/account.inc:133 ../lib/modules/posixAccount.inc:76
+#: ../lib/modules/posixAccount.inc:78
 msgid ""
 "You are using a capital letters. This can cause problems because windows "
 "isn't case-sensitive."
@@ -5428,11 +5932,22 @@ msgstr "必須属性 %s が記入されていません。"
 msgid "You made no changes."
 msgstr "変更されませんでした。"
 
-#: ../templates/tests/lamdaemonTest.php:96 ../lib/lamdaemon.inc:117
-#: ../lib/lamdaemon.inc:123
+#: ../lib/modules/groupOfNames.inc:117 ../lib/modules/groupOfNames.inc:118
+msgid "You need to add at least one member to this group."
+msgstr "少なくとも一つのメンバーをこのグループへ追加する必要があります。"
+
+#: ../templates/tests/lamdaemonTest.php:173
+#, php-format
+msgid ""
+"Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"
+msgstr "lamdaemonと連携するには、LAM管理ユーザ(%s)が有効なunixアカウントでなくてはなりません。"
+
+#: ../lib/lamdaemon.inc:105 ../lib/lamdaemon.inc:111
 msgid ""
 "Your LAM admin user must be a valid Unix account to work with lamdaemon!"
-msgstr "lamdaemonと連携するには、LAM管理ユーザが有効なunixアカウントでなくてはなりません。"
+msgstr ""
+"lamdaemonと連携するには、LAM管理ユーザが有効なunixアカウントでなくてはなりま"
+"せん。"
 
 #: ../templates/tree/add_attr_form.php:165
 msgid ""
@@ -5442,18 +5957,18 @@ msgstr ""
 "PHP設定によってファイルアップロードが禁止されています。実行前に php.ini を確"
 "認してください。"
 
-#: ../lib/security.inc:135
+#: ../lib/security.inc:134
 msgid "Your session expired, click here to go back to the login page."
 msgstr ""
 "セッションが期限切れになりました。ここをクリックしてログインページに戻ってく"
 "ださい。"
 
-#: ../templates/login.php:203
+#: ../templates/login.php:213
 msgid "Your session expired, please log in again."
 msgstr "セッションが期限切れになりました。ログインをやり直してください。"
 
 #: ../templates/config/mainmanage.php:131
-#: ../templates/selfService/adminMain.php:77 ../lib/config.inc:339
+#: ../templates/selfService/adminMain.php:112 ../lib/config.inc:386
 msgid "Your settings were successfully saved."
 msgstr "設定を保存しました。"
 
@@ -5462,11 +5977,11 @@ msgstr "設定を保存しました。"
 msgid "[attribute deleted]"
 msgstr "[削除された属性]"
 
-#: ../lib/modules/sambaAccount.inc:285 ../lib/modules/sambaSamAccount.inc:358
+#: ../lib/modules/sambaAccount.inc:285 ../lib/modules/sambaSamAccount.inc:407
 msgid "\\\\server\\homes\\smiller"
 msgstr ""
 
-#: ../lib/modules/sambaAccount.inc:291 ../lib/modules/sambaSamAccount.inc:364
+#: ../lib/modules/sambaAccount.inc:291 ../lib/modules/sambaSamAccount.inc:413
 msgid "\\\\server\\profiles\\smiller"
 msgstr ""
 
@@ -5474,7 +5989,7 @@ msgstr ""
 msgid "add value"
 msgstr "値の追加"
 
-#: ../lib/modules/posixGroup.inc:343
+#: ../lib/modules/posixGroup.inc:334 ../lib/modules/groupOfNames.inc:82
 msgid "adminstrators"
 msgstr ""
 
@@ -5486,7 +6001,7 @@ msgstr "文字"
 msgid "characters"
 msgstr "文字"
 
-#: ../help/help.inc:81
+#: ../help/help.inc:82
 msgid "dc=yourcompany,dc=com"
 msgstr ""
 
@@ -5494,6 +6009,16 @@ msgstr ""
 msgid "delete attribute"
 msgstr "属性の削除"
 
+#: ../lib/modules/sambaSamAccount.inc:1397
+#: ../lib/modules/sambaSamAccount.inc:1720
+msgid "disabled"
+msgstr "禁止"
+
+#: ../lib/modules/sambaSamAccount.inc:1409
+#: ../lib/modules/sambaSamAccount.inc:1731
+msgid "disconnect"
+msgstr "切断"
+
 #: ../templates/tree/edit.php:175 ../templates/tree/edit.php:177
 #: ../templates/tree/edit.php:304 ../templates/tree/edit.php:306
 #: ../templates/tree/add_value_form.php:107
@@ -5501,10 +6026,10 @@ msgstr "属性の削除"
 msgid "download value"
 msgstr "ダウンロード"
 
-#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:113
-#: ../lib/modules/inetOrgPerson.inc:224 ../lib/modules/inetOrgPerson.inc:340
-#: ../lib/modules/inetOrgPerson.inc:341 ../lib/modules/inetOrgPerson.inc:651
-#: ../lib/modules/inetOrgPerson.inc:824 ../lib/modules/inetOrgPerson.inc:1075
+#: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:117
+#: ../lib/modules/inetOrgPerson.inc:241 ../lib/modules/inetOrgPerson.inc:366
+#: ../lib/modules/inetOrgPerson.inc:367 ../lib/modules/inetOrgPerson.inc:723
+#: ../lib/modules/inetOrgPerson.inc:907 ../lib/modules/inetOrgPerson.inc:1186
 msgid "eMail address"
 msgstr "電子メールアドレス"
 
@@ -5512,20 +6037,49 @@ msgstr "電子メールアドレス"
 msgid "false"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:216
+#: ../lib/modules/sambaSamAccount.inc:1418
+#: ../lib/modules/sambaSamAccount.inc:1739
+msgid "from any client"
+msgstr "任意のクライアントから"
+
+#: ../lib/modules/sambaSamAccount.inc:1419
+#: ../lib/modules/sambaSamAccount.inc:1740
+msgid "from previous client only"
+msgstr "前回のクライアントからのみ"
+
+#: ../lib/modules/posixAccount.inc:218
 msgid "group01,group02"
 msgstr ""
 
-#: ../lib/modules/quota.inc:157 ../lib/modules/quota.inc:159
-#: ../lib/modules/quota.inc:208 ../lib/modules/quota.inc:210
+#: ../lib/modules/quota.inc:176 ../lib/modules/quota.inc:178
 msgid "hours"
 msgstr "時間"
 
-#: ../lib/tree.inc:1148
+#: ../lib/modules/sambaSamAccount.inc:1401
+#: ../lib/modules/sambaSamAccount.inc:1724
+msgid "input off, notify off"
+msgstr ""
+
+#: ../lib/modules/sambaSamAccount.inc:1400
+#: ../lib/modules/sambaSamAccount.inc:1723
+msgid "input off, notify on"
+msgstr ""
+
+#: ../lib/modules/sambaSamAccount.inc:1399
+#: ../lib/modules/sambaSamAccount.inc:1722
+msgid "input on, notify off"
+msgstr ""
+
+#: ../lib/modules/sambaSamAccount.inc:1398
+#: ../lib/modules/sambaSamAccount.inc:1721
+msgid "input on, notify on"
+msgstr ""
+
+#: ../lib/tree.inc:1172
 msgid "jpegPhoto contains errors"
 msgstr "jpegPhoto にエラーがあります"
 
-#: ../help/help.inc:63
+#: ../help/help.inc:64
 msgid ""
 "ldap://localhost:389 connects to localhost using a standard LDAP connection "
 "on port 389"
@@ -5533,7 +6087,7 @@ msgstr ""
 "ldaps://localhost:389 は、localhostのポート389へ標準的なLDAP接続を行ないま"
 "す。"
 
-#: ../help/help.inc:65
+#: ../help/help.inc:66
 msgid ""
 "ldaps://141.40.146.133 connects to 141.40.146.133 using an encrypted LDAP "
 "connection."
@@ -5541,20 +6095,32 @@ msgstr ""
 "ldaps://141.40.146.133 は、141.40.146.133 へ暗号化されたLDAP接続を行ないま"
 "す。"
 
-#: ../lib/modules/posixAccount.inc:276
+#: ../lib/modules/posixAccount.inc:285
 msgid "machines"
 msgstr "マシン"
 
+#: ../lib/modules/inetLocalMailRecipient.inc:106
+msgid "mail.yourdomain.org"
+msgstr ""
+
 #: ../lib/modules/sambaAccount.inc:323 ../lib/modules/sambaAccount.inc:333
-#: ../lib/modules/sambaSamAccount.inc:281
-#: ../lib/modules/sambaSamAccount.inc:407
+#: ../lib/modules/sambaSamAccount.inc:330
+#: ../lib/modules/sambaSamAccount.inc:456
 msgid "mydomain"
 msgstr "マイドメイン"
 
-#: ../lib/modules/sambaSamAccount.inc:382
+#: ../lib/modules/sambaSamAccount.inc:431
 msgid "mygroup"
 msgstr "マイグループ"
 
+#: ../lib/modules/sambaSamAccount.inc:1688
+#: ../lib/modules/sambaSamAccount.inc:1696
+#: ../lib/modules/sambaSamAccount.inc:1706
+#: ../lib/modules/sambaSamAccount.inc:1711
+#: ../lib/modules/sambaSamAccount.inc:1716
+msgid "no"
+msgstr "いいえ"
+
 #: ../templates/tree/templates/creation/custom.php:189
 #: ../templates/tree/templates/creation/custom.php:212
 #: ../templates/schema/schema.php:165 ../templates/schema/schema.php:234
@@ -5577,7 +6143,7 @@ msgstr "適用対象外"
 msgid "not specified"
 msgstr "未入力"
 
-#: ../help/help.inc:75
+#: ../help/help.inc:76
 msgid ""
 "ou=People,dc=yourcompany,dc=com will read and store all accounts in this "
 "subtree."
@@ -5585,37 +6151,58 @@ msgstr ""
 "ou=People,dc=yourcompany,dc=com は、このサブツリーのすべてのアカウントを読み"
 "書きします。"
 
-#: ../lib/modules/posixAccount.inc:262
+#: ../templates/masscreate.php:159
+msgid "ou=accounts,dc=yourdomain,dc=org"
+msgstr ""
+
+#: ../lib/modules/posixAccount.inc:271
 msgid "pc01$"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:283
+#: ../lib/modules/posixAccount.inc:292
 msgid "pc01,Room 2.34"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:256
+#: ../lib/modules/inetOrgPerson.inc:279
 msgid "pc01,pc02"
 msgstr ""
 
-#: ../templates/tree/edit.php:242 ../templates/config/confmain.php:396
-#: ../templates/selfService/adminMain.php:498 ../lib/modules.inc:1085
+#: ../templates/tree/edit.php:242 ../templates/config/confmain.php:448
+#: ../templates/selfService/adminMain.php:553 ../lib/modules.inc:1121
 msgid "required"
 msgstr "必須"
 
-#: ../templates/config/confmain.php:397
+#: ../templates/config/confmain.php:449
 msgid "required for Samba 3 accounts"
 msgstr "Samba 3アカウントにおいて必須"
 
-#: ../lib/modules/posixGroup.inc:369 ../lib/modules/sambaAccount.inc:227
-#: ../lib/modules/sambaSamAccount.inc:293 ../lib/modules/posixAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:1410
+#: ../lib/modules/sambaSamAccount.inc:1732
+msgid "reset"
+msgstr "リセット"
+
+#: ../lib/modules/posixGroup.inc:360 ../lib/modules/sambaAccount.inc:227
+#: ../lib/modules/sambaSamAccount.inc:342 ../lib/modules/posixAccount.inc:246
 msgid "secret"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:189 ../lib/modules/inetOrgPerson.inc:244
+#: ../lib/modules/posixAccount.inc:191 ../lib/modules/inetOrgPerson.inc:267
 #: ../lib/modules/nisMailAlias.inc:87
 msgid "smiller"
 msgstr ""
 
+#: ../lib/modules/inetLocalMailRecipient.inc:94
+msgid "smiller@otherdomain.org"
+msgstr ""
+
+#: ../lib/modules/inetLocalMailRecipient.inc:100
+msgid "smiller@yourdomain.org"
+msgstr ""
+
+#: ../lib/modules/ldapPublicKey.inc:72
+msgid "ssh-dss 234234 user@host"
+msgstr ""
+
 #: ../templates/tree/edit.php:433
 msgid "structural"
 msgstr "構造型"
@@ -5624,18 +6211,86 @@ msgstr "構造型"
 msgid "true"
 msgstr ""
 
-#: ../lib/modules/posixGroup.inc:363
+#: ../lib/modules/inetOrgPerson.inc:183
+msgid "uid=smiller,ou=People,dc=company,dc=com"
+msgstr ""
+
+#: ../lib/modules/posixGroup.inc:354
 msgid "user01,user02,user03"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:226
+#: ../lib/modules/inetOrgPerson.inc:243
 msgid "user@company.com"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:209
+#: ../lib/modules/posixAccount.inc:211
 msgid "users"
 msgstr "ユーザ"
 
+#: ../lib/modules/sambaSamAccount.inc:1686
+#: ../lib/modules/sambaSamAccount.inc:1694
+#: ../lib/modules/sambaSamAccount.inc:1704
+#: ../lib/modules/sambaSamAccount.inc:1709
+#: ../lib/modules/sambaSamAccount.inc:1714
+msgid "yes"
+msgstr "はい"
+
+#~ msgid "Delete domain"
+#~ msgstr "ドメインを削除"
+
+#~ msgid "Delete group"
+#~ msgstr "グループを削除"
+
+#~ msgid "Delete host"
+#~ msgstr "ホストを削除"
+
+#~ msgid "Edit logon hours"
+#~ msgstr "ログオン時間の編集"
+
+#~ msgid "GID ranges for Unix groups"
+#~ msgstr "unixグループのGID範囲"
+
+#~ msgid "Here you can define to deactivate accounts after bad logon attempts."
+#~ msgstr "アカウント無効化に至るログオン失敗回数を設定します。"
+
+#~ msgid "Maximum GID number for Unix groups"
+#~ msgstr "unixグループに対するGID番号の最大値"
+
+#~ msgid "Maximum UID number for Unix accounts (hosts)"
+#~ msgstr "ホストnounixアカウントに対するUID番号の最大値。"
+
+#~ msgid "Maximum UID number for Unix accounts (users)"
+#~ msgstr "ユーザのunixアカウントに対するUID番号の最大値。"
+
+#~ msgid "Minimum GID number for Unix groups"
+#~ msgstr "unixグループに対するGID番号の最小値"
+
+#~ msgid "Minimum UID number for Unix accounts (hosts)"
+#~ msgstr "unixアカウント(ホスト)に対するUID番号の最小値"
+
+#~ msgid "Minimum UID number for Unix accounts (users)"
+#~ msgstr "unixアカウント(ユーザ)に対するUID番号の最小値"
+
+#~ msgid "Password hash type for Unix accounts"
+#~ msgstr "unixアカウントに対するパスワードハッシュ形式"
+
+#~ msgid "Password hash type for Unix groups"
+#~ msgstr "unixグループに対するパスワードハッシュ形式"
+
+#~ msgid "Please select page:"
+#~ msgstr "ページを選択:"
+
+#~ msgid "Samba 3 settings"
+#~ msgstr "Samba 3 設定"
+
+#~ msgid "Server of external script"
+#~ msgstr "外部スクリプトのサーバ"
+
+#~ msgid ""
+#~ "Use it at your own risk and read the documentation for lamdaemon before "
+#~ "you use it!"
+#~ msgstr "使う前にlamdaemonのドキュメントを読み、あなたの責任で使うこと"
+
 #~ msgid "Create new Account"
 #~ msgstr "新しいアカウントを作成"
 
@@ -5741,15 +6396,6 @@ msgstr "ユーザ"
 #~ msgid "Create user accounts"
 #~ msgstr "ユーザアカウントを作成"
 
-#~ msgid "Delete Domain(s)"
-#~ msgstr "ドメインの削除"
-
-#~ msgid "Delete Group(s)"
-#~ msgstr "グループの削除"
-
-#~ msgid "Delete Host(s)"
-#~ msgstr "ホストの削除"
-
 #~ msgid "Do you really want to delete domain(s):"
 #~ msgstr "本当にドメインを削除しますか?"
 
@@ -5825,9 +6471,6 @@ msgstr "ユーザ"
 #~ msgid "Saving user modules failed!"
 #~ msgstr "ユーザモジュールの保存に失敗しました!"
 
-#~ msgid "The domain entry will be saved under this suffix."
-#~ msgstr "このサフィックス下でドメインエントリが保存されました。"
-
 #~ msgid "The following settings were saved to profile:"
 #~ msgstr "以下の設定はプロファイルに保存されます:"
 
@@ -5879,9 +6522,6 @@ msgstr "ユーザ"
 #~ msgid "Add after"
 #~ msgstr "後ろに追加"
 
-#~ msgid "Administrator"
-#~ msgstr "管理者"
-
 #~ msgid "Bottom"
 #~ msgstr "末尾"
 
@@ -5893,9 +6533,6 @@ msgstr "ユーザ"
 #~ msgid "Expand suffix with primary groupname"
 #~ msgstr "プライマリグループ名でサフィックスを補完"
 
-#~ msgid "Expire date"
-#~ msgstr "有効期限"
-
 #~ msgid "Group suffix"
 #~ msgstr "グループサフィックス"
 
@@ -5993,12 +6630,6 @@ msgstr "ユーザ"
 #~ msgid "Users also being member of the current group."
 #~ msgstr "このグループのメンバーとなっているユーザ。"
 
-#~ msgid "Users wich are also members of group."
-#~ msgstr "グループのメンバーとなっている他のユーザ。"
-
-#~ msgid "Width"
-#~ msgstr "幅"
-
 #~ msgid "Windows clients will show display name as group description."
 #~ msgstr "Windowsクライアントはグループの説明として名前を表示します。"
 
@@ -6063,9 +6694,6 @@ msgstr "ユーザ"
 #~ msgid "Special Group"
 #~ msgstr "特殊グループ"
 
-#~ msgid "User list"
-#~ msgstr "ユーザ一覧"
-
 #~ msgid "Wrong profilename given."
 #~ msgstr "間違ったプロファイル名が与えられました。"