From 06a85fb622764961c4d4a6a81f6805905610d3b8 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Tue, 20 Sep 2005 11:46:29 +0000
Subject: [PATCH] translation update

---
 lam/locale/ja_JP/LC_MESSAGES/messages.mo |  Bin 103465 -> 106481 bytes
 lam/locale/ja_JP/LC_MESSAGES/messages.po | 1783 ++++++++++++----------
 2 files changed, 1013 insertions(+), 770 deletions(-)

diff --git a/lam/locale/ja_JP/LC_MESSAGES/messages.mo b/lam/locale/ja_JP/LC_MESSAGES/messages.mo
index f7081f6f001b1509886effac315a9869609daebf..78f2754aec4abaaf192386c960a511e8f2573097 100644
GIT binary patch
delta 22100
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
Ll(f*b)%X7aq(2RL

delta 20226
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
DxKrW$

diff --git a/lam/locale/ja_JP/LC_MESSAGES/messages.po b/lam/locale/ja_JP/LC_MESSAGES/messages.po
index 128670aa..fc30a82f 100644
--- a/lam/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/lam/locale/ja_JP/LC_MESSAGES/messages.po
@@ -8,16 +8,17 @@ msgstr ""
 "Project-Id-Version: LAM 0.4.6\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de \n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2005-08-16 14:38+0900\n"
+"PO-Revision-Date: 2005-09-20 17:00+0900\n"
 "Last-Translator: Yasuhiro Magara <gama@lifemedia.co.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:358
+#: ../lib/modules/posixAccount.inc:354
 msgid "$user and $group are replaced with user name or primary group name."
-msgstr "$user と $group はユーザ名またはプライマリグループ名に置き換えられます。"
+msgstr ""
+"$user と $group はユーザ名またはプライマリグループ名に置き換えられます。"
 
 #: ../templates/lists/listdomains.php:145
 #: ../templates/lists/listdomains.php:195
@@ -56,7 +57,7 @@ msgstr "(このエントリに対して有効な新しい属性はありませ
 msgid "(no new binary attributes available for this entry)"
 msgstr "(このエントリに対して有効な新しいバイナリ属性はありません)"
 
-#: ../lib/modules/posixAccount.inc:224
+#: ../lib/modules/posixAccount.inc:216
 msgid "/home/smiller"
 msgstr ""
 
@@ -68,7 +69,9 @@ msgstr "CSVファイル中の必須カラムが不足しています。"
 msgid ""
 "A user may define who is allowed to act on behalf of herself. This property "
 "is checked when using the Kolab smtp daemon (Postfix) to send emails."
-msgstr "ユーザは自身の代理人を指定できます。この属性はemailの送信にKolab smtpデーモン(Postfix)を使用する場合にチェックします。"
+msgstr ""
+"ユーザは自身の代理人を指定できます。この属性はemailの送信にKolab smtpデーモン"
+"(Postfix)を使用する場合にチェックします。"
 
 #: ../templates/ou_edit.php:103 ../templates/ou_edit.php:168
 #: ../templates/ou_edit.php:233 ../templates/ou_edit.php:298
@@ -78,64 +81,69 @@ msgstr "ユーザは自身の代理人を指定できます。この属性はema
 #: ../templates/profedit/profiledelete.php:85
 #: ../templates/profedit/profilepage.php:246
 #: ../templates/profedit/profilemain.php:157
-#: ../lib/modules/sambaSamAccount.inc:946
+#: ../lib/modules/sambaSamAccount.inc:977
 msgid "Abort"
 msgstr "中止"
 
-#: ../lib/modules/account.inc:50
+#: ../lib/modules/sambaSamAccount.inc:242
+msgid "Abu Dhabi, Muscat, Baku"
+msgstr ""
+
+#: ../lib/modules/account.inc:53
 msgid "Account"
 msgstr "アカウント"
 
-#: ../templates/massBuildAccounts.php:166 ../lib/modules/ieee802device.inc:84
-#: ../lib/modules/posixGroup.inc:486 ../lib/modules/posixGroup.inc:490
-#: ../lib/modules/posixGroup.inc:491 ../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:79 ../lib/modules/sambaAccount.inc:80
+#: ../templates/massBuildAccounts.php:166 ../lib/modules/account.inc:111
+#: ../lib/modules/ieee802device.inc:84 ../lib/modules/posixGroup.inc:478
+#: ../lib/modules/posixGroup.inc:482 ../lib/modules/posixGroup.inc:483
+#: ../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:79
 #: ../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/sambaAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:61 ../lib/modules/sambaSamAccount.inc:64
-#: ../lib/modules/sambaSamAccount.inc:67 ../lib/modules/sambaSamAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:72 ../lib/modules/sambaSamAccount.inc:75
-#: ../lib/modules/sambaSamAccount.inc:76 ../lib/modules/sambaSamAccount.inc:77
-#: ../lib/modules/sambaSamAccount.inc:78 ../lib/modules/sambaSamAccount.inc:79
+#: ../lib/modules/sambaAccount.inc:89 ../lib/modules/sambaSamAccount.inc:61
+#: ../lib/modules/sambaSamAccount.inc:64 ../lib/modules/sambaSamAccount.inc:67
+#: ../lib/modules/sambaSamAccount.inc:69 ../lib/modules/sambaSamAccount.inc:72
+#: ../lib/modules/sambaSamAccount.inc:75 ../lib/modules/sambaSamAccount.inc:76
+#: ../lib/modules/sambaSamAccount.inc:77 ../lib/modules/sambaSamAccount.inc:79
 #: ../lib/modules/sambaSamAccount.inc:80 ../lib/modules/sambaSamAccount.inc:81
 #: ../lib/modules/sambaSamAccount.inc:82 ../lib/modules/sambaSamAccount.inc:83
 #: ../lib/modules/sambaSamAccount.inc:84 ../lib/modules/sambaSamAccount.inc:85
-#: ../lib/modules/sambaSamAccount.inc:87 ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/posixAccount.inc:81 ../lib/modules/posixAccount.inc:85
-#: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:97
-#: ../lib/modules/posixAccount.inc:98 ../lib/modules/posixAccount.inc:99
-#: ../lib/modules/posixAccount.inc:100 ../lib/modules/posixAccount.inc:101
-#: ../lib/modules/posixAccount.inc:102 ../lib/modules/posixAccount.inc:103
-#: ../lib/modules/posixAccount.inc:104 ../lib/modules/posixAccount.inc:105
-#: ../lib/modules/posixAccount.inc:107 ../lib/modules/kolabUser.inc:223
-#: ../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/sambaGroupMapping.inc:367
-#: ../lib/modules/sambaGroupMapping.inc:368
-#: ../lib/modules/shadowAccount.inc:55 ../lib/modules/shadowAccount.inc:57
-#: ../lib/modules/shadowAccount.inc:59 ../lib/modules/shadowAccount.inc:61
-#: ../lib/modules/shadowAccount.inc:63 ../lib/modules/shadowAccount.inc:64
-#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:54
-#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:58
-#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:62
-#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:66
-#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:70
-#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:74
-#: ../lib/modules/inetOrgPerson.inc:76 ../lib/modules/inetOrgPerson.inc:78
-#: ../lib/modules/inetOrgPerson.inc:79 ../lib/modules/inetOrgPerson.inc:80
+#: ../lib/modules/sambaSamAccount.inc:86 ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:89 ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:77 ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:91 ../lib/modules/posixAccount.inc:92
+#: ../lib/modules/posixAccount.inc:93 ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:95 ../lib/modules/posixAccount.inc:96
+#: ../lib/modules/posixAccount.inc:97 ../lib/modules/posixAccount.inc:99
+#: ../lib/modules/kolabUser.inc:223 ../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/sambaGroupMapping.inc:357
+#: ../lib/modules/sambaGroupMapping.inc:358
+#: ../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/inetOrgPerson.inc:45 ../lib/modules/inetOrgPerson.inc:47
+#: ../lib/modules/inetOrgPerson.inc:49 ../lib/modules/inetOrgPerson.inc:51
+#: ../lib/modules/inetOrgPerson.inc:53 ../lib/modules/inetOrgPerson.inc:55
+#: ../lib/modules/inetOrgPerson.inc:57 ../lib/modules/inetOrgPerson.inc:59
+#: ../lib/modules/inetOrgPerson.inc:61 ../lib/modules/inetOrgPerson.inc:63
+#: ../lib/modules/inetOrgPerson.inc:65 ../lib/modules/inetOrgPerson.inc:67
+#: ../lib/modules/inetOrgPerson.inc:69 ../lib/modules/inetOrgPerson.inc:71
+#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:73
+#: ../lib/modules/inetOrgPerson.inc:76
 #: ../lib/modules/inetLocalMailRecipient.inc:120
 #: ../lib/modules/inetLocalMailRecipient.inc:122
 #: ../lib/modules/inetLocalMailRecipient.inc:124
-#: ../lib/modules/nisMailAlias.inc:99 ../lib/modules/nisMailAlias.inc:101
+#: ../lib/modules/nisMailAlias.inc:101 ../lib/modules/nisMailAlias.inc:103
 #, php-format
 msgid "Account %s:"
 msgstr "アカウント %s"
@@ -144,25 +152,25 @@ msgstr "アカウント %s"
 msgid "Account creation via file upload"
 msgstr "ファイルアップロードによるアカウント作成"
 
-#: ../lib/modules/posixAccount.inc:369
+#: ../lib/modules/posixAccount.inc:365
 msgid "Account deactivated"
 msgstr "アカウントが無効化されました"
 
-#: ../lib/modules/shadowAccount.inc:175
+#: ../lib/modules/shadowAccount.inc:166
 msgid "Account expiration date. Format: DD-MM-YYYY"
 msgstr "アカウント有効期限。形式は: DD-MM-YYYY"
 
-#: ../lib/modules/shadowAccount.inc:352
+#: ../lib/modules/shadowAccount.inc:318
 msgid "Account inactive"
 msgstr "アカウントが無効です"
 
-#: ../lib/modules/sambaAccount.inc:131 ../lib/modules/sambaAccount.inc:248
-#: ../lib/modules/sambaAccount.inc:357 ../lib/modules/sambaAccount.inc:360
-#: ../lib/modules/sambaAccount.inc:713 ../lib/modules/sambaSamAccount.inc:181
-#: ../lib/modules/sambaSamAccount.inc:184
-#: ../lib/modules/sambaSamAccount.inc:276
-#: ../lib/modules/sambaSamAccount.inc:746
-#: ../lib/modules/sambaSamAccount.inc:984
+#: ../lib/modules/sambaAccount.inc:132 ../lib/modules/sambaAccount.inc:249
+#: ../lib/modules/sambaAccount.inc:361 ../lib/modules/sambaAccount.inc:364
+#: ../lib/modules/sambaAccount.inc:731 ../lib/modules/sambaSamAccount.inc:185
+#: ../lib/modules/sambaSamAccount.inc:188
+#: ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/sambaSamAccount.inc:785
+#: ../lib/modules/sambaSamAccount.inc:1016
 msgid "Account is deactivated"
 msgstr "無効なアカウント"
 
@@ -174,28 +182,32 @@ msgstr "アカウント一覧 - フィルター"
 msgid "Account modules"
 msgstr "アカウントモジュール"
 
-#: ../templates/delete.php:85
+#: ../templates/delete.php:88
 msgid "Account name:"
 msgstr "アカウント名:"
 
-#: ../lib/modules.inc:959
+#: ../lib/modules.inc:993
 msgid "Account was created successfully."
 msgstr "アカウントが作成されました。"
 
-#: ../lib/modules.inc:962
+#: ../lib/modules.inc:996
 msgid "Account was modified successfully."
 msgstr "アカウントが変更されました。"
 
+#: ../lib/modules/posixAccount.inc:337
+msgid "Activating this checkbox will remove the user's home directory."
+msgstr "このチェックボックスを有効にした場合、ユーザのホームディレクトリを削除します。"
+
 #: ../templates/tree/add_value_form.php:156
 #: ../templates/tree/add_value_form.php:181
-#: ../templates/tree/add_oclass_form.php:137
+#: ../templates/tree/add_oclass_form.php:140
 #: ../templates/tree/add_attr_form.php:129
 #: ../templates/tree/add_attr_form.php:161
 #: ../templates/pdfedit/pdfpage.php:724 ../lib/modules/ieee802device.inc:153
-#: ../lib/modules/kolabUser.inc:363 ../lib/modules/kolabUser.inc:380
-#: ../lib/modules/kolabUser.inc:406
+#: ../lib/modules/kolabUser.inc:374 ../lib/modules/kolabUser.inc:391
+#: ../lib/modules/kolabUser.inc:417
 #: ../lib/modules/inetLocalMailRecipient.inc:215
-#: ../lib/modules/nisMailAlias.inc:181
+#: ../lib/modules/nisMailAlias.inc:187
 msgid "Add"
 msgstr "追加"
 
@@ -222,22 +234,26 @@ msgstr "セクションまた静的テキストを追加"
 msgid "Adding attribute failed!"
 msgstr "属性の追加に失敗しました!"
 
-#: ../lib/modules/posixAccount.inc:216 ../lib/modules/posixAccount.inc:336
-#: ../lib/modules/posixAccount.inc:377 ../lib/modules/posixAccount.inc:938
-#: ../lib/modules/posixAccount.inc:1026 ../lib/modules/posixAccount.inc:1090
-#: ../lib/modules/posixAccount.inc:1169
+#: ../lib/modules/posixAccount.inc:208 ../lib/modules/posixAccount.inc:328
+#: ../lib/modules/posixAccount.inc:377 ../lib/modules/posixAccount.inc:936
+#: ../lib/modules/posixAccount.inc:1020 ../lib/modules/posixAccount.inc:1082
+#: ../lib/modules/posixAccount.inc:1161
 msgid "Additional groups"
 msgstr "追加のグループ"
 
-#: ../templates/massDoUpload.php:99
+#: ../templates/massDoUpload.php:101
 msgid "Additional tasks for module:"
 msgstr "モジュールに対する追加タスク:"
 
-#: ../lib/modules/posixGroup.inc:381
+#: ../lib/modules/posixGroup.inc:384
 msgid "Administrators group"
 msgstr "管理者グループ"
 
-#: ../templates/domain.php:171 ../help/help.inc:162
+#: ../lib/modules/sambaSamAccount.inc:237
+msgid "Alaska"
+msgstr ""
+
+#: ../templates/domain.php:171 ../help/help.inc:169
 msgid "Algorithmic RID Base"
 msgstr "アルゴリズム的なRIDベース"
 
@@ -245,8 +261,8 @@ msgstr "アルゴリズム的なRIDベース"
 msgid "Algorithmic RID base is not a number!"
 msgstr "アルゴリズム的なRIDベースが数字でありません!"
 
-#: ../lib/modules/nisMailAlias.inc:60 ../lib/modules/nisMailAlias.inc:75
-#: ../lib/modules/nisMailAlias.inc:166 ../lib/modules/nisMailAlias.inc:305
+#: ../lib/modules/nisMailAlias.inc:62 ../lib/modules/nisMailAlias.inc:77
+#: ../lib/modules/nisMailAlias.inc:172 ../lib/modules/nisMailAlias.inc:328
 msgid "Alias name"
 msgstr "別名"
 
@@ -262,12 +278,16 @@ msgstr "すべての変更が成功しました。"
 msgid "Allowed hosts"
 msgstr "許可されたホスト"
 
-#: ../lib/modules/sambaAccount.inc:816 ../lib/modules/sambaAccount.inc:817
-#: ../lib/modules/sambaSamAccount.inc:861
-#: ../lib/modules/sambaSamAccount.inc:862
+#: ../lib/modules/sambaAccount.inc:829 ../lib/modules/sambaAccount.inc:830
+#: ../lib/modules/sambaSamAccount.inc:892
+#: ../lib/modules/sambaSamAccount.inc:893
 msgid "Allowed workstations"
 msgstr "許可されたワークステーション"
 
+#: ../lib/modules/sambaSamAccount.inc:243
+msgid "Almaty, Dhaka, Colombo"
+msgstr ""
+
 #: ../lib/modules/kolabUser.inc:51
 msgid "Always accept"
 msgstr "常に許可"
@@ -281,7 +301,7 @@ msgstr "常に拒否"
 msgid "An attribute (%s) was modified and is highlighted below."
 msgstr "属性(%s)が変更され、ハイライト表示されています。"
 
-#: ../lib/modules/kolabUser.inc:345 ../lib/modules/kolabUser.inc:801
+#: ../lib/modules/kolabUser.inc:356 ../lib/modules/kolabUser.inc:810
 msgid "Anyone"
 msgstr "誰か"
 
@@ -293,6 +313,10 @@ msgstr "適用"
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "本当にこのオブジェクトを削除しますか?"
 
+#: ../lib/modules/sambaSamAccount.inc:239
+msgid "Atlantic time (Canada), Caracas"
+msgstr ""
+
 #: ../templates/tree/update_confirm.php:148
 msgid "Attribute"
 msgstr "属性"
@@ -313,11 +337,15 @@ msgstr "ホストリスト中の属性"
 msgid "Attributes in User List"
 msgstr "ユーザリスト中の属性"
 
+#: ../lib/modules/sambaSamAccount.inc:245
+msgid "Auckland, Fiji, Kamchatka"
+msgstr ""
+
 #: ../templates/pdfedit/pdfpage.php:602
 msgid "Available PDF fields"
 msgstr "有効なPDFフィールド"
 
-#: ../lib/modules/posixAccount.inc:1038
+#: ../lib/modules/posixAccount.inc:1032
 msgid "Available groups"
 msgstr "有効なグループ"
 
@@ -325,23 +353,27 @@ msgstr "有効なグループ"
 msgid "Available modules"
 msgstr "有効なモジュール"
 
-#: ../lib/modules/posixGroup.inc:253
+#: ../lib/modules/posixGroup.inc:256
 msgid "Available users"
 msgstr "有効なユーザ"
 
-#: ../lib/modules/sambaAccount.inc:822 ../lib/modules/sambaSamAccount.inc:867
+#: ../lib/modules/sambaAccount.inc:835 ../lib/modules/sambaSamAccount.inc:898
 msgid "Available workstations"
 msgstr "有効なワークステーション"
 
-#: ../templates/tree/update_confirm.php:251 ../lib/modules/posixGroup.inc:259
-#: ../lib/modules/posixGroup.inc:283 ../lib/modules/sambaAccount.inc:826
-#: ../lib/modules/sambaSamAccount.inc:871 ../lib/modules/posixAccount.inc:1044
-#: ../lib/modules/posixAccount.inc:1070
+#: ../lib/modules/sambaSamAccount.inc:240
+msgid "Azores, Cape Verde Islands"
+msgstr ""
+
+#: ../templates/tree/update_confirm.php:251 ../lib/modules/posixGroup.inc:262
+#: ../lib/modules/posixGroup.inc:286 ../lib/modules/sambaAccount.inc:840
+#: ../lib/modules/sambaSamAccount.inc:902 ../lib/modules/posixAccount.inc:1038
+#: ../lib/modules/posixAccount.inc:1062 ../lib/modules/inetOrgPerson.inc:679
 msgid "Back"
 msgstr "戻る"
 
 #: ../templates/config/confsave.php:254 ../templates/config/conflogin.php:162
-#: ../templates/logout.php:71
+#: ../templates/logout.php:73
 msgid "Back to Login"
 msgstr "ログインに戻る"
 
@@ -361,7 +393,7 @@ msgstr "PDFエディタに戻る"
 msgid "Back to Profile Editor"
 msgstr "プロファイルエディタに戻る"
 
-#: ../lib/modules.inc:971
+#: ../lib/modules.inc:1005
 msgid "Back to account list"
 msgstr "アカウント一覧に戻る"
 
@@ -373,7 +405,7 @@ msgstr "ドメイン一覧に戻る"
 msgid "Back to group list"
 msgstr "グループ一覧に戻る"
 
-#: ../templates/delete.php:236
+#: ../templates/delete.php:240
 msgid "Back to list"
 msgstr "一覧に戻る"
 
@@ -394,6 +426,14 @@ msgstr "プリファレンスに戻る..."
 msgid "Back to profile login"
 msgstr "プロファイルログインに戻る"
 
+#: ../lib/modules/sambaSamAccount.inc:242
+msgid "Baghdad, Riyadh, Moscow"
+msgstr ""
+
+#: ../lib/modules/sambaSamAccount.inc:243
+msgid "Bangkok, Hanoi, Jakarta"
+msgstr ""
+
 #: ../templates/tree/export_form.php:73
 msgid "Base (base DN only)"
 msgstr "Base (ベースDNのみ)"
@@ -410,6 +450,10 @@ msgstr "ベースモジュール"
 msgid "Beginning"
 msgstr "先頭"
 
+#: ../lib/modules/sambaSamAccount.inc:243
+msgid "Beijing, Perth, Singapore"
+msgstr ""
+
 #: ../templates/tree/edit.php:171 ../templates/tree/edit.php:300
 msgid "Binary value"
 msgstr "バイナリ値"
@@ -446,6 +490,10 @@ msgstr ""
 "ブロック・ソフトクオータはブロック・ハードクオータより小さくなくてはなりませ"
 "ん。"
 
+#: ../lib/modules/sambaSamAccount.inc:239
+msgid "Brazil, Buenos Aires"
+msgstr ""
+
 #: ../lib/modules/sambaGroupMapping.inc:70
 msgid "Builtin Group"
 msgstr "既定のグループ"
@@ -463,28 +511,28 @@ msgstr "キャッシュ有効時間"
 msgid "Cache timeout is invalid!"
 msgstr "キャッシュ有効時間が正しくありません。"
 
-#: ../lib/modules/posixGroup.inc:412 ../lib/modules/sambaAccount.inc:372
-#: ../lib/modules/sambaAccount.inc:375 ../lib/modules/sambaAccount.inc:378
-#: ../lib/modules/sambaAccount.inc:381 ../lib/modules/sambaAccount.inc:393
-#: ../lib/modules/sambaSamAccount.inc:196
-#: ../lib/modules/sambaSamAccount.inc:199
-#: ../lib/modules/sambaSamAccount.inc:202
-#: ../lib/modules/sambaSamAccount.inc:205 ../lib/modules/posixAccount.inc:378
-#: ../lib/modules/sambaGroupMapping.inc:297
-#: ../lib/modules/shadowAccount.inc:159 ../lib/modules/shadowAccount.inc:163
-#: ../lib/modules/shadowAccount.inc:167 ../lib/modules/shadowAccount.inc:171
+#: ../lib/modules/posixGroup.inc:415 ../lib/modules/sambaAccount.inc:376
+#: ../lib/modules/sambaAccount.inc:379 ../lib/modules/sambaAccount.inc:382
+#: ../lib/modules/sambaAccount.inc:388 ../lib/modules/sambaAccount.inc:400
+#: ../lib/modules/sambaSamAccount.inc:200
+#: ../lib/modules/sambaSamAccount.inc:203
+#: ../lib/modules/sambaSamAccount.inc:206
+#: ../lib/modules/sambaSamAccount.inc:212 ../lib/modules/posixAccount.inc:378
+#: ../lib/modules/sambaGroupMapping.inc:287
+#: ../lib/modules/shadowAccount.inc:150 ../lib/modules/shadowAccount.inc:154
+#: ../lib/modules/shadowAccount.inc:158 ../lib/modules/shadowAccount.inc:162
 msgid "Can be left empty."
 msgstr "省略可"
 
 #: ../templates/tree/update_confirm.php:237
 #: ../templates/tree/delete_form.php:118 ../templates/tree/delete_form.php:167
 #: ../templates/domain.php:223 ../templates/domain.php:254
-#: ../templates/delete.php:104 ../templates/initsuff.php:188
-#: ../lib/modules/kolabUser.inc:591
+#: ../templates/delete.php:107 ../templates/initsuff.php:188
+#: ../lib/modules/kolabUser.inc:603
 msgid "Cancel"
 msgstr "中止"
 
-#: ../templates/login.php:345 ../templates/login.php:350
+#: ../templates/login.php:336 ../templates/login.php:341
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "指定されたLDAPサーバに接続できません。再試行してください。"
 
@@ -492,12 +540,20 @@ msgstr "指定されたLDAPサーバに接続できません。再試行して
 msgid "Cannot open config file!"
 msgstr "configファイルをオープンできません!"
 
+#: ../lib/modules/sambaSamAccount.inc:241
+msgid "Central Europe Time, Paris, Berlin"
+msgstr ""
+
+#: ../lib/modules/sambaSamAccount.inc:238
+msgid "Central Time (US & Canada), Mexico City"
+msgstr ""
+
 #: ../templates/pdfedit/pdfpage.php:498 ../templates/pdfedit/pdfpage.php:504
-#: ../lib/modules/sambaSamAccount.inc:951
+#: ../lib/modules/sambaSamAccount.inc:982
 msgid "Change"
 msgstr "変更"
 
-#: ../lib/modules/posixGroup.inc:203
+#: ../lib/modules/posixGroup.inc:211
 msgid "Change GID number of users and hosts"
 msgstr "ユーザとホストのGID番号を変更"
 
@@ -509,12 +565,12 @@ msgstr "デフォルト・プロファイルの変更"
 msgid "Change master password"
 msgstr "マスタパスワードの変更"
 
-#: ../lib/modules/posixGroup.inc:185 ../lib/modules/posixAccount.inc:966
-#: ../help/help.inc:105
+#: ../lib/modules/posixGroup.inc:193 ../lib/modules/posixAccount.inc:962
+#: ../lib/modules/inetOrgPerson.inc:560 ../help/help.inc:105
 msgid "Change password"
 msgstr "パスワードの変更"
 
-#: ../templates/login.php:281
+#: ../templates/login.php:272
 msgid "Change profile"
 msgstr "プロファイルの変更"
 
@@ -522,12 +578,12 @@ msgstr "プロファイルの変更"
 msgid "Change suffix"
 msgstr "サフィックスの変更"
 
-#: ../lib/baseModule.inc:538
+#: ../lib/baseModule.inc:569
 #, php-format
 msgid "Changed value %s because only numeric values are allowed."
 msgstr "数値だけが有効なため、%s の値を変更しました。"
 
-#: ../lib/baseModule.inc:555
+#: ../lib/baseModule.inc:600
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "ASCII文字だけが有効なため、%s の値を変更しました。"
 
@@ -547,7 +603,7 @@ msgstr "集合属性"
 msgid "Columns:"
 msgstr "カラム:"
 
-#: ../lib/modules/sambaAccount.inc:381 ../lib/modules/sambaSamAccount.inc:205
+#: ../lib/modules/sambaAccount.inc:388 ../lib/modules/sambaSamAccount.inc:212
 msgid ""
 "Comma separated list of Samba workstations the user is allowed to login. "
 "Empty means every workstation."
@@ -559,19 +615,19 @@ msgstr ""
 msgid "Commit"
 msgstr "更新"
 
-#: ../lib/modules/posixAccount.inc:106 ../lib/modules/posixAccount.inc:197
-#: ../lib/modules/posixAccount.inc:381 ../lib/modules/posixAccount.inc:918
-#: ../lib/modules/posixAccount.inc:1164 ../lib/modules/inetOrgPerson.inc:75
-#: ../lib/modules/inetOrgPerson.inc:221 ../lib/modules/inetOrgPerson.inc:330
-#: ../lib/modules/inetOrgPerson.inc:505 ../lib/modules/inetOrgPerson.inc:615
+#: ../lib/modules/posixAccount.inc:98 ../lib/modules/posixAccount.inc:189
+#: ../lib/modules/posixAccount.inc:381 ../lib/modules/posixAccount.inc:916
+#: ../lib/modules/posixAccount.inc:1156 ../lib/modules/inetOrgPerson.inc:68
+#: ../lib/modules/inetOrgPerson.inc:217 ../lib/modules/inetOrgPerson.inc:326
+#: ../lib/modules/inetOrgPerson.inc:531 ../lib/modules/inetOrgPerson.inc:705
 msgid "Common name"
 msgstr "氏名(common name)"
 
-#: ../templates/login.php:135
+#: ../templates/login.php:126
 msgid "Configuration login"
 msgstr "構成設定ログイン"
 
-#: ../templates/login.php:263
+#: ../templates/login.php:254
 msgid "Configuration profile"
 msgstr "構成プロファイル"
 
@@ -609,8 +665,8 @@ msgid "Could not save PDF profile, access denied."
 msgstr "PDFプロファイルを保存できません。アクセスが拒否されました。"
 
 #: ../lib/modules/kolabUser.inc:83 ../lib/modules/kolabUser.inc:146
-#: ../lib/modules/kolabUser.inc:175 ../lib/modules/kolabUser.inc:305
-#: ../lib/modules/kolabUser.inc:777
+#: ../lib/modules/kolabUser.inc:175 ../lib/modules/kolabUser.inc:316
+#: ../lib/modules/kolabUser.inc:786
 msgid "Country"
 msgstr "国"
 
@@ -624,7 +680,7 @@ msgstr "国名が正しくありません!"
 msgid "Create"
 msgstr "作成"
 
-#: ../lib/modules.inc:1020
+#: ../lib/modules.inc:1055
 msgid "Create Account"
 msgstr "アカウント作成"
 
@@ -633,7 +689,7 @@ msgstr "アカウント作成"
 msgid "Create Object"
 msgstr "オブジェクト作成"
 
-#: ../lib/modules.inc:979
+#: ../lib/modules.inc:1012 ../help/help.inc:146
 msgid "Create PDF file"
 msgstr "PDFファイル作成"
 
@@ -669,7 +725,7 @@ msgstr "スコープに対する新しいPDF構成を作成:"
 msgid "Create a new profile"
 msgstr "新しいプロファイルの作成"
 
-#: ../lib/modules.inc:970
+#: ../lib/modules.inc:1004
 msgid "Create another account"
 msgstr "他のアカウントを作成"
 
@@ -677,7 +733,7 @@ msgstr "他のアカウントを作成"
 msgid "Create group accounts"
 msgstr "グループアカウントを作成"
 
-#: ../lib/modules/posixAccount.inc:947
+#: ../lib/modules/posixAccount.inc:945
 msgid "Create home directory"
 msgstr "ホームディレクトリを作成"
 
@@ -685,7 +741,7 @@ msgstr "ホームディレクトリを作成"
 msgid "Create host accounts"
 msgstr "ホストアカウントを作成"
 
-#: ../lib/modules.inc:874
+#: ../lib/modules.inc:901
 msgid "Create new Account"
 msgstr "新しいアカウントを作成"
 
@@ -717,11 +773,11 @@ msgid "Custom"
 msgstr "カスタム"
 
 #: ../templates/tree/edit.php:91 ../templates/tree/add_value_form.php:98
-#: ../templates/tree/add_oclass_form.php:117
+#: ../templates/tree/add_oclass_form.php:120
 #: ../templates/tree/update_confirm.php:75
 #: ../templates/tree/add_attr_form.php:72 ../templates/tree/delete_form.php:76
-#: ../templates/tree/delete_form.php:150 ../templates/delete.php:86
-#: ../lib/modules.inc:1627
+#: ../templates/tree/delete_form.php:150 ../templates/delete.php:89
+#: ../lib/modules.inc:1620
 msgid "DN"
 msgstr ""
 
@@ -742,15 +798,15 @@ msgstr ""
 msgid "Data field for RDN is empty!"
 msgstr "RDNのデータフィールドが空です!"
 
-#: ../lib/modules/sambaAccount.inc:364 ../lib/modules/sambaSamAccount.inc:188
+#: ../lib/modules/sambaAccount.inc:368 ../lib/modules/sambaSamAccount.inc:192
 msgid "Date after the user is able to change his password. Format: DD-MM-YYYY"
 msgstr "ユーザによるパスワード変更の禁止が解かれる日付。形式は: DD-MM-YYYY"
 
-#: ../lib/modules/sambaAccount.inc:366 ../lib/modules/sambaSamAccount.inc:190
+#: ../lib/modules/sambaAccount.inc:370 ../lib/modules/sambaSamAccount.inc:194
 msgid "Date after the user must change his password. Format: DD-MM-YYYY"
 msgstr "ユーザがパスワードを変更しなければならなくなる日付。形式は: DD-MM-YYYY"
 
-#: ../lib/modules/shadowAccount.inc:159
+#: ../lib/modules/shadowAccount.inc:150
 msgid ""
 "Days before password is to expire that user is warned of pending password "
 "expiration. If set value must be 0<."
@@ -768,8 +824,8 @@ msgid "Default value"
 msgstr "既定値"
 
 #: ../lib/modules/kolabUser.inc:130 ../lib/modules/kolabUser.inc:134
-#: ../lib/modules/kolabUser.inc:194 ../lib/modules/kolabUser.inc:409
-#: ../lib/modules/kolabUser.inc:815
+#: ../lib/modules/kolabUser.inc:194 ../lib/modules/kolabUser.inc:420
+#: ../lib/modules/kolabUser.inc:824
 msgid "Delegates"
 msgstr "代理人"
 
@@ -778,7 +834,7 @@ msgid "Delegates has invalid format!"
 msgstr "代理人の形式が正しくありません。"
 
 #: ../templates/tree/edit.php:113 ../templates/tree/delete_form.php:158
-#: ../templates/domain.php:253 ../templates/delete.php:103
+#: ../templates/domain.php:253 ../templates/delete.php:106
 #: ../lib/tree.inc:1162
 msgid "Delete"
 msgstr "削除"
@@ -788,7 +844,7 @@ msgstr "削除"
 msgid "Delete %s"
 msgstr "%s を削除"
 
-#: ../templates/delete.php:71 ../templates/delete.php:120
+#: ../templates/delete.php:74 ../templates/delete.php:123
 msgid "Delete Account"
 msgstr "アカウント削除"
 
@@ -804,7 +860,7 @@ msgstr "グループの削除"
 msgid "Delete Host(s)"
 msgstr "ホストの削除"
 
-#: ../lib/modules/kolabUser.inc:418
+#: ../lib/modules/kolabUser.inc:429
 msgid "Delete Kolab account"
 msgstr "Kolabアカウントを削除"
 
@@ -821,7 +877,7 @@ msgstr "全ての %s オブジェクトを削除"
 msgid "Delete domain(s)"
 msgstr "ドメインを削除"
 
-#: ../lib/modules/posixAccount.inc:995
+#: ../lib/modules/posixAccount.inc:991
 msgid "Delete home directory"
 msgstr "ホームディレクトリを削除"
 
@@ -832,7 +888,7 @@ msgstr "削除操作がキャンセルされました。"
 
 #: ../templates/ou_edit.php:362 ../templates/ou_edit.php:399
 #: ../templates/ou_edit.php:436 ../templates/ou_edit.php:473
-#: ../help/help.inc:148
+#: ../help/help.inc:155
 msgid "Delete organizational unit"
 msgstr "organizational unitを削除"
 
@@ -850,7 +906,7 @@ msgstr "ユーザを削除"
 msgid "Deleted Account"
 msgstr "削除されたアカウント"
 
-#: ../templates/delete.php:225
+#: ../templates/delete.php:228
 #, php-format
 msgid "Deleted DN: %s"
 msgstr "削除されたDN: %s"
@@ -869,35 +925,38 @@ msgstr "削除したプロファイル:"
 msgid "Deleting %s"
 msgstr "%s を削除しています"
 
-#: ../templates/delete.php:127
+#: ../templates/delete.php:130
 msgid "Deleting. Please stand by ..."
 msgstr "削除中です。お待ちください ..."
 
 #: ../templates/tree/add_value_form.php:185 ../templates/schema/schema.php:93
 #: ../templates/schema/schema.php:147 ../templates/schema/schema.php:350
-#: ../lib/modules/account.inc:88 ../lib/modules/account.inc:164
-#: ../lib/modules/account.inc:181 ../lib/modules/posixGroup.inc:163
-#: ../lib/modules/posixGroup.inc:407 ../lib/modules/posixGroup.inc:450
-#: ../lib/modules/sambaAccount.inc:846 ../lib/modules/sambaSamAccount.inc:1106
-#: ../lib/modules/posixAccount.inc:295 ../lib/modules/posixAccount.inc:399
-#: ../lib/modules/sambaGroupMapping.inc:318
-#: ../lib/modules/shadowAccount.inc:354 ../lib/modules/inetOrgPerson.inc:144
-#: ../lib/modules/inetOrgPerson.inc:274 ../lib/modules/inetOrgPerson.inc:510
-#: ../lib/modules/inetOrgPerson.inc:600 ../lib/lists.inc:312
+#: ../lib/modules/account.inc:97 ../lib/modules/account.inc:220
+#: ../lib/modules/account.inc:233 ../lib/modules/posixGroup.inc:173
+#: ../lib/modules/posixGroup.inc:410 ../lib/modules/posixGroup.inc:453
+#: ../lib/modules/sambaAccount.inc:859 ../lib/modules/sambaSamAccount.inc:1138
+#: ../lib/modules/posixAccount.inc:287 ../lib/modules/posixAccount.inc:399
+#: ../lib/modules/sambaGroupMapping.inc:308
+#: ../lib/modules/shadowAccount.inc:320 ../lib/modules/inetOrgPerson.inc:140
+#: ../lib/modules/inetOrgPerson.inc:270 ../lib/modules/inetOrgPerson.inc:536
+#: ../lib/modules/inetOrgPerson.inc:690 ../lib/lists.inc:312
 msgid "Description"
 msgstr "説明"
 
-#: ../lib/modules/sambaAccount.inc:212 ../lib/modules/sambaAccount.inc:333
-#: ../lib/modules/sambaAccount.inc:839 ../lib/modules/sambaSamAccount.inc:157
-#: ../lib/modules/sambaSamAccount.inc:240
-#: ../lib/modules/sambaSamAccount.inc:1098
-#: ../lib/modules/sambaGroupMapping.inc:174
-#: ../lib/modules/sambaGroupMapping.inc:284
-#: ../lib/modules/sambaGroupMapping.inc:316
+#: ../lib/modules/sambaAccount.inc:80 ../lib/modules/sambaAccount.inc:213
+#: ../lib/modules/sambaAccount.inc:334 ../lib/modules/sambaAccount.inc:699
+#: ../lib/modules/sambaAccount.inc:852 ../lib/modules/sambaSamAccount.inc:78
+#: ../lib/modules/sambaSamAccount.inc:158
+#: ../lib/modules/sambaSamAccount.inc:264
+#: ../lib/modules/sambaSamAccount.inc:758
+#: ../lib/modules/sambaSamAccount.inc:1130
+#: ../lib/modules/sambaGroupMapping.inc:169
+#: ../lib/modules/sambaGroupMapping.inc:274
+#: ../lib/modules/sambaGroupMapping.inc:306
 msgid "Display name"
 msgstr "表示名"
 
-#: ../lib/modules.inc:472
+#: ../lib/modules.inc:475
 msgid ""
 "Displayed account numbers start at \"0\". Add 2 to get the row in your "
 "spreadsheet."
@@ -922,11 +981,11 @@ msgstr "本当にこのPDF構成を削除しますか?"
 msgid "Do you really want to delete this profile?"
 msgstr "本当にこのプロファイルを削除しますか?"
 
-#: ../lib/modules/kolabUser.inc:586
+#: ../lib/modules/kolabUser.inc:598
 msgid "Do you really want to mark this account for deletion?"
 msgstr "本当にこのアカウントを削除しますか?"
 
-#: ../templates/delete.php:80
+#: ../templates/delete.php:83
 msgid "Do you really want to remove the following accounts?"
 msgstr "本当にこのアカウントを削除しますか?"
 
@@ -934,27 +993,27 @@ msgstr "本当にこのアカウントを削除しますか?"
 msgid "Do you want to make these changes?"
 msgstr "これらの変更を行ないますか?"
 
-#: ../lib/modules/sambaAccount.inc:170 ../lib/modules/sambaAccount.inc:314
-#: ../lib/modules/sambaAccount.inc:324 ../lib/modules/sambaAccount.inc:392
-#: ../lib/modules/sambaAccount.inc:784 ../lib/modules/sambaAccount.inc:845
-#: ../lib/modules/sambaSamAccount.inc:217
-#: ../lib/modules/sambaSamAccount.inc:233
-#: ../lib/modules/sambaSamAccount.inc:352
-#: ../lib/modules/sambaSamAccount.inc:822
-#: ../lib/modules/sambaSamAccount.inc:1027
-#: ../lib/modules/sambaSamAccount.inc:1046
-#: ../lib/modules/sambaSamAccount.inc:1105
+#: ../lib/modules/sambaAccount.inc:171 ../lib/modules/sambaAccount.inc:315
+#: ../lib/modules/sambaAccount.inc:325 ../lib/modules/sambaAccount.inc:399
+#: ../lib/modules/sambaAccount.inc:802 ../lib/modules/sambaAccount.inc:858
+#: ../lib/modules/sambaSamAccount.inc:230
+#: ../lib/modules/sambaSamAccount.inc:257
+#: ../lib/modules/sambaSamAccount.inc:376
+#: ../lib/modules/sambaSamAccount.inc:857
+#: ../lib/modules/sambaSamAccount.inc:1059
+#: ../lib/modules/sambaSamAccount.inc:1078
+#: ../lib/modules/sambaSamAccount.inc:1137
 #: ../lib/modules/sambaGroupMapping.inc:68
-#: ../lib/modules/sambaGroupMapping.inc:202
-#: ../lib/modules/sambaGroupMapping.inc:296
-#: ../lib/modules/sambaGroupMapping.inc:338
+#: ../lib/modules/sambaGroupMapping.inc:197
+#: ../lib/modules/sambaGroupMapping.inc:286
+#: ../lib/modules/sambaGroupMapping.inc:328
 msgid "Domain"
 msgstr "ドメイン"
 
-#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaAccount.inc:309
+#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaAccount.inc:310
 #: ../lib/modules/sambaSamAccount.inc:48
 #: ../lib/modules/sambaGroupMapping.inc:55
-#: ../lib/modules/sambaGroupMapping.inc:269
+#: ../lib/modules/sambaGroupMapping.inc:259
 msgid "Domain Admins"
 msgstr "ドメイン管理者(Domain Admins)"
 
@@ -963,9 +1022,9 @@ msgstr "ドメイン管理者(Domain Admins)"
 msgid "Domain Certificate Admins"
 msgstr "ドメイン証明書管理者(Domain Certificate Admins)"
 
-#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:532
+#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:547
 #: ../lib/modules/sambaSamAccount.inc:49
-#: ../lib/modules/sambaSamAccount.inc:514
+#: ../lib/modules/sambaSamAccount.inc:547
 #: ../lib/modules/sambaGroupMapping.inc:58
 msgid "Domain Computers"
 msgstr "ドメインコンピュータ(Domain Computers)"
@@ -981,7 +1040,7 @@ msgid "Domain Enterprise Admins"
 msgstr "ドメインエンタープライズ管理者(Domain Enterprise Admins)"
 
 #: ../lib/modules/sambaGroupMapping.inc:67
-#: ../lib/modules/sambaGroupMapping.inc:194
+#: ../lib/modules/sambaGroupMapping.inc:189
 msgid "Domain Group"
 msgstr "ドメイングループ(Domain Group)"
 
@@ -996,7 +1055,7 @@ msgid "Domain Policy Admins"
 msgstr "ドメインポリシー管理者(Domain Policy Admins)"
 
 #: ../templates/lists/listdomains.php:100 ../templates/domain.php:109
-#: ../help/help.inc:154
+#: ../help/help.inc:161
 msgid "Domain SID"
 msgstr "ドメインのSID"
 
@@ -1010,12 +1069,12 @@ msgid "Domain Settings"
 msgstr "ドメインの設定"
 
 #: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaSamAccount.inc:48
-#: ../lib/modules/sambaSamAccount.inc:1349
+#: ../lib/modules/sambaSamAccount.inc:1381
 #: ../lib/modules/sambaGroupMapping.inc:56
 msgid "Domain Users"
 msgstr "ドメインユーザ(Domain Users)"
 
-#: ../lib/modules/sambaGroupMapping.inc:263
+#: ../lib/modules/sambaGroupMapping.inc:253
 msgid "Domain administrators"
 msgstr "ドメイン管理者(Domain administrator)"
 
@@ -1028,7 +1087,7 @@ msgid "Domain has been modified."
 msgstr "ドメインが変更されました。"
 
 #: ../templates/lists/listdomains.php:99 ../templates/domain.php:88
-#: ../lib/modules/sambaAccount.inc:72 ../help/help.inc:150
+#: ../lib/modules/sambaAccount.inc:72 ../help/help.inc:157
 msgid "Domain name"
 msgstr "ドメイン名"
 
@@ -1064,7 +1123,7 @@ msgstr "下へ"
 msgid "Download sample CSV file"
 msgstr "サンプルCSVファイルをダウンロード"
 
-#: ../lib/modules/sambaAccount.inc:369 ../lib/modules/sambaSamAccount.inc:193
+#: ../lib/modules/sambaAccount.inc:373 ../lib/modules/sambaSamAccount.inc:197
 msgid "Drive letter assigned on windows workstations as homedirectory."
 msgstr ""
 "Windows ワークステーションのホームディレクトリとして割り当てられたドライブ文"
@@ -1094,11 +1153,23 @@ msgstr "電子メールの別名リスト"
 msgid "EMail alias list has invalid format!"
 msgstr "電子メール別名リストの形式が正しくありません!"
 
-#: ../lib/modules/kolabUser.inc:188 ../lib/modules/kolabUser.inc:383
-#: ../lib/modules/kolabUser.inc:811
+#: ../lib/modules/kolabUser.inc:188 ../lib/modules/kolabUser.inc:394
+#: ../lib/modules/kolabUser.inc:820
 msgid "EMail aliases"
 msgstr "電子メールの別名"
 
+#: ../lib/modules/sambaSamAccount.inc:244
+msgid "East Australian Standard, Guam"
+msgstr ""
+
+#: ../lib/modules/sambaSamAccount.inc:241
+msgid "Eastern Europe Time, South Africa"
+msgstr ""
+
+#: ../lib/modules/sambaSamAccount.inc:238
+msgid "Eastern Time (US & Canada), Bogota"
+msgstr ""
+
 #: ../templates/lists/listhosts.php:175 ../templates/lists/listgroups.php:175
 #: ../templates/lists/listdomains.php:175 ../templates/lists/listusers.php:221
 msgid "Edit"
@@ -1108,15 +1179,15 @@ msgstr "編集"
 msgid "Edit PDF structure"
 msgstr "PDF構成の編集"
 
-#: ../lib/modules/posixAccount.inc:939
+#: ../lib/modules/posixAccount.inc:937
 msgid "Edit groups"
 msgstr "グループの編集"
 
-#: ../lib/modules/sambaSamAccount.inc:828
+#: ../lib/modules/sambaSamAccount.inc:863
 msgid "Edit logon hours"
 msgstr "ログオン時間の編集"
 
-#: ../lib/modules/posixGroup.inc:168
+#: ../lib/modules/posixGroup.inc:178
 msgid "Edit members"
 msgstr "メンバーの編集"
 
@@ -1128,21 +1199,21 @@ msgstr "モジュールの編集"
 msgid "Edit profile"
 msgstr "プロファイルの編集"
 
-#: ../lib/modules/sambaAccount.inc:749 ../lib/modules/sambaSamAccount.inc:782
+#: ../lib/modules/sambaAccount.inc:767 ../lib/modules/sambaSamAccount.inc:821
 msgid "Edit workstations"
 msgstr "ワークステーションの編集??"
 
-#: ../lib/modules/inetOrgPerson.inc:73 ../lib/modules/inetOrgPerson.inc:109
-#: ../lib/modules/inetOrgPerson.inc:156 ../lib/modules/inetOrgPerson.inc:290
-#: ../lib/modules/inetOrgPerson.inc:556 ../lib/modules/inetOrgPerson.inc:605
+#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:105
+#: ../lib/modules/inetOrgPerson.inc:152 ../lib/modules/inetOrgPerson.inc:286
+#: ../lib/modules/inetOrgPerson.inc:605 ../lib/modules/inetOrgPerson.inc:695
 msgid "Employee type"
 msgstr "雇用形態"
 
-#: ../lib/modules/inetOrgPerson.inc:291
+#: ../lib/modules/inetOrgPerson.inc:287
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇用形態: 正社員、実習生、臨時雇用、派遣、..."
 
-#: ../templates/login.php:318
+#: ../templates/login.php:309
 msgid "Empty password submitted. Please try again."
 msgstr "パスワードが空です。やり直してください。"
 
@@ -1150,6 +1221,10 @@ msgstr "パスワードが空です。やり直してください。"
 msgid "Encountered an error while performing search."
 msgstr "検索実行中にエラーが発生しました。"
 
+#: ../lib/modules/sambaSamAccount.inc:236
+msgid "Eniwetok, Kwajalein"
+msgstr ""
+
 #: ../templates/tree/add_value_form.php:136
 msgid "Enter the value you would like to add:"
 msgstr "追加したい値を入力してください:"
@@ -1172,7 +1247,7 @@ msgstr "エントリ %s は削除されました。"
 msgid "Equality"
 msgstr "照合規則"
 
-#: ../templates/delete.php:230
+#: ../templates/delete.php:233
 #, php-format
 msgid "Error while deleting DN: %s"
 msgstr "DN: %s の削除中にエラーが発生しました。"
@@ -1198,8 +1273,8 @@ msgstr "例"
 msgid "Examples"
 msgstr "例"
 
-#: ../lib/modules/shadowAccount.inc:108 ../lib/modules/shadowAccount.inc:174
-#: ../lib/modules/shadowAccount.inc:206 ../lib/modules/shadowAccount.inc:329
+#: ../lib/modules/shadowAccount.inc:99 ../lib/modules/shadowAccount.inc:165
+#: ../lib/modules/shadowAccount.inc:197 ../lib/modules/shadowAccount.inc:298
 msgid "Expiration date"
 msgstr "有効期限"
 
@@ -1234,19 +1309,21 @@ msgstr "エントリ %s の削除に失敗しました!"
 msgid "Failed to modify domain!"
 msgstr "ドメイン変更に失敗しました!"
 
-#: ../lib/modules/inetOrgPerson.inc:61 ../lib/modules/inetOrgPerson.inc:204
-#: ../lib/modules/inetOrgPerson.inc:322 ../lib/modules/inetOrgPerson.inc:323
-#: ../lib/modules/inetOrgPerson.inc:541 ../lib/modules/inetOrgPerson.inc:613
+#: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:200
+#: ../lib/modules/inetOrgPerson.inc:318 ../lib/modules/inetOrgPerson.inc:319
+#: ../lib/modules/inetOrgPerson.inc:590 ../lib/modules/inetOrgPerson.inc:703
 msgid "Fax number"
 msgstr "ファクス番号"
 
-#: ../lib/modules/sambaSamAccount.inc:202
+#: ../lib/modules/sambaSamAccount.inc:206
 msgid ""
 "File name and path relative to netlogon-share which should be executed on "
 "logon. $user and $group are replaced with user and group name."
-msgstr "ログオンの時に実行される、ネットログオン共有への相対的なパスとファイル名。 $user と $group はユーザとグループの名前に置き換えられます。"
+msgstr ""
+"ログオンの時に実行される、ネットログオン共有への相対的なパスとファイル名。 "
+"$user と $group はユーザとグループの名前に置き換えられます。"
 
-#: ../lib/modules/sambaAccount.inc:378
+#: ../lib/modules/sambaAccount.inc:382
 msgid ""
 "File name and path relative to the netlogon-share which should be executed "
 "on logon. $user and $group are replaced with user and group name."
@@ -1266,17 +1343,17 @@ msgstr "ファイルのアップロードに失敗しました!"
 msgid "Filter"
 msgstr "フィルタ"
 
-#: ../lib/modules/inetOrgPerson.inc:53 ../lib/modules/inetOrgPerson.inc:131
-#: ../lib/modules/inetOrgPerson.inc:282 ../lib/modules/inetOrgPerson.inc:496
-#: ../lib/modules/inetOrgPerson.inc:603 ../lib/lists.inc:307
+#: ../lib/modules/inetOrgPerson.inc:46 ../lib/modules/inetOrgPerson.inc:127
+#: ../lib/modules/inetOrgPerson.inc:278 ../lib/modules/inetOrgPerson.inc:522
+#: ../lib/modules/inetOrgPerson.inc:693 ../lib/lists.inc:307
 msgid "First name"
 msgstr "(姓でない)名"
 
-#: ../lib/modules/inetOrgPerson.inc:53 ../lib/modules/inetOrgPerson.inc:54
+#: ../lib/modules/inetOrgPerson.inc:46 ../lib/modules/inetOrgPerson.inc:47
 msgid "First name contains invalid characters!"
 msgstr "(姓でない)名前に不正な文字がある"
 
-#: ../lib/modules/inetOrgPerson.inc:283
+#: ../lib/modules/inetOrgPerson.inc:279
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "ユーザの(姓でない)名前。アルファベット, _- と空白のみ有効."
 
@@ -1285,8 +1362,8 @@ msgid "For automatic invitation handling."
 msgstr ""
 
 #: ../lib/modules/kolabUser.inc:87 ../lib/modules/kolabUser.inc:154
-#: ../lib/modules/kolabUser.inc:200 ../lib/modules/kolabUser.inc:328
-#: ../lib/modules/kolabUser.inc:789
+#: ../lib/modules/kolabUser.inc:200 ../lib/modules/kolabUser.inc:339
+#: ../lib/modules/kolabUser.inc:798
 msgid "Free/Busy interval"
 msgstr ""
 
@@ -1294,20 +1371,20 @@ msgstr ""
 msgid "Free/Busy interval must be a number!"
 msgstr "Free/Busyインターバルは数でなくてはなりません!"
 
-#: ../lib/modules/sambaSamAccount.inc:886
+#: ../lib/modules/sambaSamAccount.inc:917
 msgid "Friday"
 msgstr "金曜日"
 
-#: ../lib/modules/posixGroup.inc:159 ../lib/modules/posixGroup.inc:373
-#: ../lib/modules/posixGroup.inc:403 ../lib/modules/posixGroup.inc:428
-#: ../lib/modules/posixGroup.inc:448 ../lib/modules/posixGroup.inc:479
-#: ../lib/modules/posixAccount.inc:56 ../lib/modules/posixAccount.inc:1166
-#: ../lib/modules/sambaGroupMapping.inc:314 ../lib/lists.inc:304
+#: ../lib/modules/posixGroup.inc:169 ../lib/modules/posixGroup.inc:376
+#: ../lib/modules/posixGroup.inc:406 ../lib/modules/posixGroup.inc:431
+#: ../lib/modules/posixGroup.inc:451 ../lib/modules/posixGroup.inc:471
+#: ../lib/modules/posixAccount.inc:48 ../lib/modules/posixAccount.inc:1158
+#: ../lib/modules/sambaGroupMapping.inc:304 ../lib/lists.inc:304
 #: ../lib/lists.inc:318 ../lib/lists.inc:331
 msgid "GID number"
 msgstr "GID番号"
 
-#: ../lib/modules/posixGroup.inc:479
+#: ../lib/modules/posixGroup.inc:471
 msgid ""
 "GID number has changed. Please select checkbox to change GID number of users "
 "and hosts."
@@ -1315,7 +1392,7 @@ msgstr ""
 "GID番号が変更されました。ユーザとホストのGID番号を変更する場合は、チェック"
 "ボックスを選択してください。"
 
-#: ../lib/modules/posixAccount.inc:56
+#: ../lib/modules/posixAccount.inc:48
 #, php-format
 msgid ""
 "GID number has changed. To keep file ownership you have to run the following "
@@ -1325,22 +1402,22 @@ msgstr ""
 "のコマンドを実行しなければなりません: 'find / -gid %s -uid %s -exec chgrp %s "
 "{} \\;'"
 
-#: ../lib/modules/posixGroup.inc:486
+#: ../lib/modules/posixGroup.inc:478
 msgid "GID number has to be a numeric value!"
 msgstr "GID番号は数値でなくてはなりません。"
 
-#: ../lib/modules/posixGroup.inc:329
+#: ../lib/modules/posixGroup.inc:332
 msgid "GID ranges for Unix groups"
 msgstr "unixグループのGID範囲"
 
-#: ../lib/modules/account.inc:63 ../lib/modules/posixAccount.inc:251
-#: ../lib/modules/posixAccount.inc:283 ../lib/modules/posixAccount.inc:349
-#: ../lib/modules/posixAccount.inc:391 ../lib/modules/posixAccount.inc:927
-#: ../lib/modules/posixAccount.inc:1167
+#: ../lib/modules/account.inc:73 ../lib/modules/posixAccount.inc:243
+#: ../lib/modules/posixAccount.inc:275 ../lib/modules/posixAccount.inc:345
+#: ../lib/modules/posixAccount.inc:391 ../lib/modules/posixAccount.inc:925
+#: ../lib/modules/posixAccount.inc:1159
 msgid "Gecos"
 msgstr ""
 
-#: ../lib/modules/posixGroup.inc:174 ../lib/modules/posixAccount.inc:955
+#: ../lib/modules/posixGroup.inc:184 ../lib/modules/posixAccount.inc:953
 msgid "Generate password"
 msgstr "パスワードの作成"
 
@@ -1353,7 +1430,7 @@ msgstr "日本"
 msgid "Go"
 msgstr ""
 
-#: ../lib/modules/quota.inc:102 ../lib/modules/quota.inc:321
+#: ../lib/modules/quota.inc:102 ../lib/modules/quota.inc:323
 msgid "Grace block period"
 msgstr "ブロック猶予期間"
 
@@ -1372,15 +1449,15 @@ msgstr ""
 "iノード(ファイル)クオータの猶予期間。 ほとんどのファイルシステムは、最大値で"
 "ある7日間を固定値として使用します。"
 
-#: ../lib/modules/quota.inc:118 ../lib/modules/quota.inc:325
+#: ../lib/modules/quota.inc:118 ../lib/modules/quota.inc:327
 msgid "Grace inode period"
 msgstr "iノードクオータの猶予期間"
 
-#: ../lib/modules/posixGroup.inc:379 ../lib/lists.inc:321
+#: ../lib/modules/posixGroup.inc:382 ../lib/lists.inc:321
 msgid "Group description"
 msgstr "グループの説明"
 
-#: ../lib/modules/posixGroup.inc:408
+#: ../lib/modules/posixGroup.inc:411
 msgid "Group description. If left empty group name will be used."
 msgstr "グループの説明。もしも空ならば、グループ名が使われます。"
 
@@ -1396,9 +1473,9 @@ msgstr "グループリストの属性が正しくありません!"
 msgid "Group member DNs"
 msgstr "グループメンバのDN"
 
-#: ../lib/modules/posixGroup.inc:167 ../lib/modules/posixGroup.inc:241
-#: ../lib/modules/posixGroup.inc:385 ../lib/modules/posixGroup.inc:411
-#: ../lib/modules/posixGroup.inc:415 ../lib/modules/posixGroup.inc:449
+#: ../lib/modules/posixGroup.inc:177 ../lib/modules/posixGroup.inc:244
+#: ../lib/modules/posixGroup.inc:388 ../lib/modules/posixGroup.inc:414
+#: ../lib/modules/posixGroup.inc:418 ../lib/modules/posixGroup.inc:452
 #: ../lib/lists.inc:319
 msgid "Group members"
 msgstr "グループメンバ"
@@ -1408,14 +1485,14 @@ msgstr "グループメンバ"
 msgid "Group modules"
 msgstr "グループモジュール"
 
-#: ../lib/modules/posixGroup.inc:155 ../lib/modules/posixGroup.inc:365
-#: ../lib/modules/posixGroup.inc:399 ../lib/modules/posixGroup.inc:447
-#: ../lib/modules/posixGroup.inc:487 ../lib/modules/posixGroup.inc:488
-#: ../lib/modules/posixGroup.inc:489 ../lib/lists.inc:317
+#: ../lib/modules/posixGroup.inc:165 ../lib/modules/posixGroup.inc:368
+#: ../lib/modules/posixGroup.inc:402 ../lib/modules/posixGroup.inc:450
+#: ../lib/modules/posixGroup.inc:479 ../lib/modules/posixGroup.inc:480
+#: ../lib/modules/posixGroup.inc:481 ../lib/lists.inc:317
 msgid "Group name"
 msgstr "グループ名"
 
-#: ../lib/modules/posixGroup.inc:489 ../lib/modules/posixGroup.inc:490
+#: ../lib/modules/posixGroup.inc:481 ../lib/modules/posixGroup.inc:482
 msgid ""
 "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
@@ -1423,20 +1500,25 @@ msgstr ""
 "グループ名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ で"
 "す!"
 
-#: ../lib/modules/posixGroup.inc:488
+#: ../lib/modules/posixGroup.inc:480
 msgid "Group name in use. Selected next free group name."
 msgstr "グループ名が既に使われています。次の未使用グループ名が選択されました。"
 
-#: ../lib/modules/posixGroup.inc:400
+#: ../lib/modules/posixGroup.inc:403
 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は、いくつかの問題を引き起こす事があるため使えません。もしもグループ名が既に使われていたならば、グループ名に番号が付加されます。この場合、空いている次の番号が使われます。"
+msgstr ""
+"作成しようとしているグループのグループ名。有効な文字は: a-z,0-9, .-_ です。"
+"groupaddコマンドで許されていないため、先頭の文字として数字は使えません。大文"
+"字のA-Zは、いくつかの問題を引き起こす事があるため使えません。もしもグループ名"
+"が既に使われていたならば、グループ名に番号が付加されます。この場合、空いてい"
+"る次の番号が使われます。"
 
-#: ../lib/modules/posixGroup.inc:391 ../lib/modules/posixGroup.inc:419
+#: ../lib/modules/posixGroup.inc:394 ../lib/modules/posixGroup.inc:422
 msgid "Group password"
 msgstr "グループパスワード"
 
@@ -1444,7 +1526,7 @@ msgstr "グループパスワード"
 msgid "Group profiles"
 msgstr "グループのプロファイル"
 
-#: ../lib/modules/sambaGroupMapping.inc:199
+#: ../lib/modules/sambaGroupMapping.inc:194
 msgid "Group type"
 msgstr "グループのタイプ"
 
@@ -1461,16 +1543,16 @@ msgstr "グループサフィックスが正しくありません!"
 msgid "Groups"
 msgstr "グループ"
 
-#: ../lib/modules/quota.inc:455
+#: ../lib/modules/quota.inc:457
 msgid "Hard block"
 msgstr "ハードblock"
 
 #: ../lib/modules/quota.inc:98 ../lib/modules/quota.inc:99
-#: ../lib/modules/quota.inc:320 ../lib/modules/quota.inc:377
+#: ../lib/modules/quota.inc:322 ../lib/modules/quota.inc:379
 msgid "Hard block limit"
 msgstr "ハードブロック制限"
 
-#: ../lib/modules/quota.inc:457
+#: ../lib/modules/quota.inc:459
 msgid "Hard inode"
 msgstr "ハードinode"
 
@@ -1478,11 +1560,15 @@ msgstr "ハードinode"
 msgid "Hard inode (files) limit"
 msgstr "ハードinode(ファイル)制限"
 
-#: ../lib/modules/quota.inc:114 ../lib/modules/quota.inc:324
-#: ../lib/modules/quota.inc:379
+#: ../lib/modules/quota.inc:114 ../lib/modules/quota.inc:326
+#: ../lib/modules/quota.inc:381
 msgid "Hard inode limit"
 msgstr "ハードinode制限"
 
+#: ../lib/modules/sambaSamAccount.inc:236
+msgid "Hawaii"
+msgstr ""
+
 #: ../templates/pdfedit/pdfpage.php:414
 msgid "Headline"
 msgstr "見出し"
@@ -1517,7 +1603,7 @@ msgstr "見出し"
 #: ../templates/profedit/profilepage.php:188
 #: ../templates/profedit/profilepage.php:208
 #: ../templates/profedit/profilepage.php:239 ../lib/lists.inc:213
-#: ../lib/modules.inc:655
+#: ../lib/modules.inc:660
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -1530,11 +1616,13 @@ msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr ""
 "ここでは、CSVファイルを与える事によって、複数のアカウントを作成できます。"
 
-#: ../lib/modules/posixAccount.inc:337
+#: ../lib/modules/posixAccount.inc:329
 msgid ""
 "Here you can enter a list of additional group memberships. The group names "
 "are separated by commas."
-msgstr "ここにはメンバーとして所属する追加グループのリストを入力します。グループ名はカンマによって区切られます。"
+msgstr ""
+"ここにはメンバーとして所属する追加グループのリストを入力します。グループ名は"
+"カンマによって区切られます。"
 
 #: ../help/help.inc:130
 msgid ""
@@ -1544,10 +1632,21 @@ msgstr ""
 "ここには、簡単なフィルタ(例 'value'または'v*')を入力できます。大文字と小文字"
 "は区別されます。"
 
+#: ../help/help.inc:143
+msgid ""
+"Here you can load an account profile to set default settings for your "
+"account. The \"default\" profile is automatically loaded for new accounts."
+msgstr "ここでは、あなたのアカウントに対するデフォルト値を設定するために、アカウントプロファイルをロードできます。新しいアカウントに対しては、\"default\"プロファイルが自動的にロードされます。"
+
 #: ../templates/tools.php:54
 msgid "Here you can manage your account profiles."
 msgstr "ここで、あなたのアカウントのプロファイルを管理できます。"
 
+#: ../help/help.inc:147
+msgid ""
+"Here you can select a PDF structure and export the account to a PDF file."
+msgstr "ここでは、PDF構成の選択と、アカウントのPDFフィアルへのエクスポートを行えます。"
+
 #: ../help/help.inc:112
 msgid ""
 "Here you can select which plugins you want to use for account management."
@@ -1567,16 +1666,16 @@ msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr ""
 "複数のグループを選択(解除)する場合は、CTRLキーを押しながら操作してください。"
 
-#: ../lib/modules/posixAccount.inc:51 ../lib/modules/posixAccount.inc:79
-#: ../lib/modules/posixAccount.inc:80 ../lib/modules/posixAccount.inc:222
-#: ../lib/modules/posixAccount.inc:340 ../lib/modules/posixAccount.inc:357
-#: ../lib/modules/posixAccount.inc:781 ../lib/modules/posixAccount.inc:942
-#: ../lib/modules/posixAccount.inc:1095 ../lib/modules/posixAccount.inc:1170
-#: ../lib/lists.inc:309
+#: ../lib/modules/posixAccount.inc:43 ../lib/modules/posixAccount.inc:71
+#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:214
+#: ../lib/modules/posixAccount.inc:332 ../lib/modules/posixAccount.inc:336
+#: ../lib/modules/posixAccount.inc:353 ../lib/modules/posixAccount.inc:762
+#: ../lib/modules/posixAccount.inc:940 ../lib/modules/posixAccount.inc:1087
+#: ../lib/modules/posixAccount.inc:1162 ../lib/lists.inc:309
 msgid "Home directory"
 msgstr "ホームディレクトリ"
 
-#: ../lib/modules/posixAccount.inc:51
+#: ../lib/modules/posixAccount.inc:43
 #, php-format
 msgid ""
 "Home directory changed. To keep home directory you have to run the following "
@@ -1585,26 +1684,26 @@ msgstr ""
 "ホームディレクトリが変更されました。ホームディレクトリを維持するために、root"
 "権限で以下のコマンドを実行しなければなりません: 'mv %s %s'"
 
-#: ../lib/modules/sambaAccount.inc:139 ../lib/modules/sambaAccount.inc:270
-#: ../lib/modules/sambaAccount.inc:368 ../lib/modules/sambaAccount.inc:736
-#: ../lib/modules/sambaAccount.inc:841 ../lib/modules/sambaSamAccount.inc:192
-#: ../lib/modules/sambaSamAccount.inc:298
-#: ../lib/modules/sambaSamAccount.inc:769
-#: ../lib/modules/sambaSamAccount.inc:992
-#: ../lib/modules/sambaSamAccount.inc:1101
+#: ../lib/modules/sambaAccount.inc:140 ../lib/modules/sambaAccount.inc:271
+#: ../lib/modules/sambaAccount.inc:372 ../lib/modules/sambaAccount.inc:754
+#: ../lib/modules/sambaAccount.inc:854 ../lib/modules/sambaSamAccount.inc:196
+#: ../lib/modules/sambaSamAccount.inc:322
+#: ../lib/modules/sambaSamAccount.inc:808
+#: ../lib/modules/sambaSamAccount.inc:1024
+#: ../lib/modules/sambaSamAccount.inc:1133
 msgid "Home drive"
 msgstr "ホームドライブ"
 
 #: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaAccount.inc:62
-#: ../lib/modules/sambaAccount.inc:145 ../lib/modules/sambaAccount.inc:276
-#: ../lib/modules/sambaAccount.inc:371 ../lib/modules/sambaAccount.inc:739
-#: ../lib/modules/sambaAccount.inc:840 ../lib/modules/sambaSamAccount.inc:59
+#: ../lib/modules/sambaAccount.inc:146 ../lib/modules/sambaAccount.inc:277
+#: ../lib/modules/sambaAccount.inc:375 ../lib/modules/sambaAccount.inc:757
+#: ../lib/modules/sambaAccount.inc:853 ../lib/modules/sambaSamAccount.inc:59
 #: ../lib/modules/sambaSamAccount.inc:60
-#: ../lib/modules/sambaSamAccount.inc:195
-#: ../lib/modules/sambaSamAccount.inc:304
-#: ../lib/modules/sambaSamAccount.inc:772
-#: ../lib/modules/sambaSamAccount.inc:998
-#: ../lib/modules/sambaSamAccount.inc:1100
+#: ../lib/modules/sambaSamAccount.inc:199
+#: ../lib/modules/sambaSamAccount.inc:328
+#: ../lib/modules/sambaSamAccount.inc:811
+#: ../lib/modules/sambaSamAccount.inc:1030
+#: ../lib/modules/sambaSamAccount.inc:1132
 msgid "Home path"
 msgstr "ホームパス"
 
@@ -1613,7 +1712,7 @@ msgstr "ホームパス"
 msgid "Home path is invalid."
 msgstr "ホームパスが正しくありません。"
 
-#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:81
+#: ../lib/modules/posixAccount.inc:71 ../lib/modules/posixAccount.inc:73
 msgid "Homedirectory contains invalid characters."
 msgstr "ホームディレクトリが不正な文字を含んでいます。"
 
@@ -1621,7 +1720,7 @@ msgstr "ホームディレクトリが不正な文字を含んでいます。"
 msgid "Host description"
 msgstr "ホストの説明"
 
-#: ../lib/modules/account.inc:64 ../lib/modules/posixAccount.inc:392
+#: ../lib/modules/account.inc:74 ../lib/modules/posixAccount.inc:392
 #: ../lib/modules/posixAccount.inc:400
 msgid "Host description. If left empty host name will be used."
 msgstr "ホストの説明。もしも空ならば、ホスト名が使われます。"
@@ -1630,7 +1729,7 @@ msgstr "ホストの説明。もしも空ならば、ホスト名が使われま
 msgid "Host information page"
 msgstr "ホスト情報ページ"
 
-#: ../lib/modules/account.inc:73
+#: ../lib/modules/account.inc:83
 msgid "Host list"
 msgstr "ホスト一覧"
 
@@ -1643,24 +1742,25 @@ msgstr "ホスト一覧の属性が正しくありません!"
 msgid "Host modules"
 msgstr "ホストモジュール"
 
-#: ../lib/modules/posixAccount.inc:93 ../lib/modules/posixAccount.inc:94
-#: ../lib/modules/posixAccount.inc:96 ../lib/modules/posixAccount.inc:262
+#: ../lib/modules/posixAccount.inc:85 ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:88 ../lib/modules/posixAccount.inc:254
 #: ../lib/modules/posixAccount.inc:387 ../lib/lists.inc:326
 #: ../lib/lists.inc:327
 msgid "Host name"
 msgstr "ホスト名"
 
-#: ../lib/modules/posixAccount.inc:100
+#: ../lib/modules/posixAccount.inc:92
 msgid "Host name already exists!"
 msgstr "ホスト名は既に存在しています!"
 
-#: ../lib/modules/posixAccount.inc:98
+#: ../lib/modules/posixAccount.inc:90
 msgid ""
 "Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
-msgstr "ホスト名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です。"
+msgstr ""
+"ホスト名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です。"
 
-#: ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:86
 msgid ""
 "Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ ! Host name must end with $ !"
@@ -1668,7 +1768,7 @@ msgstr ""
 "ホスト名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です。"
 "ホスト名の末尾は$でなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:96
+#: ../lib/modules/posixAccount.inc:88
 msgid "Host name in use. Selected next free host name."
 msgstr "ホスト名がすでに使われています。次の未使用ホスト名が選択されました。"
 
@@ -1680,7 +1780,13 @@ msgid ""
 "cause several problems. 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, 0-9, .-_$ です。"
+"useraddコマンドで許されてしないため、先頭文字に数字は使えません。大文字のA-Z"
+"は、いくつかの問題を引き起こす事があるため使えません。ホスト名の末尾は必ず $ "
+"になります。もしも最後の文字が $ でなければ追加されます。もしもホスト名がすで"
+"に使われていれば、ホスト名に番号が付加されます。この場合、空いている次の番号"
+"が使われます。"
 
 #: ../templates/profedit/profilemain.php:47
 msgid "Host profiles"
@@ -1694,22 +1800,22 @@ msgstr "ホストサフィックス"
 msgid "HostSuffix is invalid!"
 msgstr "ホストサフィックスが正しくありません!"
 
-#: ../templates/main_header.php:87 ../lib/modules/posixAccount.inc:74
-#: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:77
-#: ../lib/modules/posixAccount.inc:154 ../help/help.inc:84
+#: ../templates/main_header.php:87 ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:67 ../lib/modules/posixAccount.inc:69
+#: ../lib/modules/posixAccount.inc:146 ../help/help.inc:84
 msgid "Hosts"
 msgstr "ホスト"
 
-#: ../lib/modules/posixGroup.inc:482 ../lib/modules/posixGroup.inc:597
-#: ../lib/modules/posixAccount.inc:84 ../lib/modules/posixAccount.inc:727
+#: ../lib/modules/posixGroup.inc:474 ../lib/modules/posixGroup.inc:612
+#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:709
 msgid "ID is already in use"
 msgstr "ID はすでに使用されています"
 
-#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixGroup.inc:481
-#: ../lib/modules/posixGroup.inc:482 ../lib/modules/posixGroup.inc:593
-#: ../lib/modules/posixGroup.inc:597 ../lib/modules/posixAccount.inc:82
-#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:84
-#: ../lib/modules/posixAccount.inc:723 ../lib/modules/posixAccount.inc:727
+#: ../lib/modules/posixGroup.inc:472 ../lib/modules/posixGroup.inc:473
+#: ../lib/modules/posixGroup.inc:474 ../lib/modules/posixGroup.inc:608
+#: ../lib/modules/posixGroup.inc:612 ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:76
+#: ../lib/modules/posixAccount.inc:705 ../lib/modules/posixAccount.inc:709
 msgid "ID-Number"
 msgstr "ID番号"
 
@@ -1718,60 +1824,62 @@ msgstr "ID番号"
 msgid "Identifier"
 msgstr "識別子"
 
-#: ../lib/modules/sambaAccount.inc:340 ../lib/modules/sambaSamAccount.inc:164
+#: ../lib/modules/sambaAccount.inc:344 ../lib/modules/sambaSamAccount.inc:168
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "チェックした場合、unixパスワードがSambaパスワードとしても使われます。"
 
-#: ../lib/modules/posixAccount.inc:370
+#: ../lib/modules/posixAccount.inc:366
 msgid ""
 "If checked account will be deactivated by putting a \"!\" before the "
 "encrypted password."
-msgstr "チェックした場合、暗号化パスワードの前に\"!\"が挿入され、アカウントは無効化されます。"
+msgstr ""
+"チェックした場合、暗号化パスワードの前に\"!\"が挿入され、アカウントは無効化さ"
+"れます。"
 
-#: ../lib/modules/sambaAccount.inc:358 ../lib/modules/sambaSamAccount.inc:182
+#: ../lib/modules/sambaAccount.inc:362 ../lib/modules/sambaSamAccount.inc:186
 msgid "If checked account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "チェックした場合、(D-フラグをセットすることで)アカウントは無効化されます。"
 
-#: ../lib/modules/posixGroup.inc:424 ../lib/modules/sambaAccount.inc:346
-#: ../lib/modules/sambaSamAccount.inc:170 ../lib/modules/posixAccount.inc:366
+#: ../lib/modules/posixGroup.inc:427 ../lib/modules/sambaAccount.inc:350
+#: ../lib/modules/sambaSamAccount.inc:174 ../lib/modules/posixAccount.inc:362
 msgid "If checked no password will be used."
 msgstr "チェックした場合、パスワードは使われません。"
 
-#: ../lib/modules/sambaAccount.inc:352 ../lib/modules/sambaSamAccount.inc:176
+#: ../lib/modules/sambaAccount.inc:356 ../lib/modules/sambaSamAccount.inc:180
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "チェックした場合、パスワードは無期限になります。(X-フラグをセット)"
 
-#: ../lib/modules/posixGroup.inc:404
+#: ../lib/modules/posixGroup.inc:407
 msgid ""
 "If empty GID number will be generated automaticly depending on your "
 "configuration settings."
 msgstr "未記入の場合、設定内容に従ってGID番号が自動的に生成されます。"
 
-#: ../lib/modules/posixAccount.inc:329
+#: ../lib/modules/posixAccount.inc:321
 msgid "If empty UID number will be generated automaticly."
 msgstr "未記入の場合、UID番号が自動的に生成されます。"
 
-#: ../lib/modules/sambaAccount.inc:343 ../lib/modules/sambaSamAccount.inc:167
+#: ../lib/modules/sambaAccount.inc:347 ../lib/modules/sambaSamAccount.inc:171
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr ""
 "\"true\"にセットした場合、unixパスワードがSambaパスワードとしても使われます。"
 
-#: ../lib/modules/sambaAccount.inc:361 ../lib/modules/sambaSamAccount.inc:185
+#: ../lib/modules/sambaAccount.inc:365 ../lib/modules/sambaSamAccount.inc:189
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "\"true\"にセットした場合、アカウントは無効になります。(D-フラグをセット)"
 
-#: ../lib/modules/sambaAccount.inc:349 ../lib/modules/sambaSamAccount.inc:173
+#: ../lib/modules/sambaAccount.inc:353 ../lib/modules/sambaSamAccount.inc:177
 msgid "If set to \"true\" no password will be used."
 msgstr "\"true\"にセットした場合、パスワードは使われません。"
 
-#: ../lib/modules/sambaAccount.inc:355 ../lib/modules/sambaSamAccount.inc:179
+#: ../lib/modules/sambaAccount.inc:359 ../lib/modules/sambaSamAccount.inc:183
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr ""
 "\"true\"にセットした場合、パスワードは無期限になります。(X-フラグをセット)"
 
-#: ../lib/modules/sambaSamAccount.inc:212
+#: ../lib/modules/sambaSamAccount.inc:225
 msgid ""
 "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr ""
@@ -1789,7 +1897,7 @@ msgid ""
 "here."
 msgstr "マスタ構成パスワードを変更したい場合は、ここに入力してください。"
 
-#: ../lib/modules/sambaAccount.inc:390
+#: ../lib/modules/sambaAccount.inc:397
 msgid ""
 "If you want to create domain administrators or other special users use this "
 "option."
@@ -1797,8 +1905,8 @@ msgstr ""
 "ドメイン管理者やその他の特殊アカウントを作成したい場合は、このオプションを使"
 "用してください。"
 
-#: ../lib/modules/sambaAccount.inc:384
-#: ../lib/modules/sambaGroupMapping.inc:289
+#: ../lib/modules/sambaAccount.inc:391
+#: ../lib/modules/sambaGroupMapping.inc:279
 msgid "If you want to use a well known RID you can selcet a well known group."
 msgstr ""
 "もしも、よく知られているRID(well known RID)を使いたいのであれば、よく知られた"
@@ -1852,7 +1960,7 @@ msgstr ""
 msgid "Inserted user or group name in home path."
 msgstr "ホームパス名にユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/sambaAccount.inc:68
+#: ../lib/modules/sambaAccount.inc:68 ../lib/modules/sambaSamAccount.inc:66
 msgid "Inserted user or group name in logon script."
 msgstr "ログオンスクリプトパスにユーザ又はグループ名を挿入しました。"
 
@@ -1861,10 +1969,6 @@ msgstr "ログオンスクリプトパスにユーザ又はグループ名を挿
 msgid "Inserted user or group name in profile path."
 msgstr "プロファイルパスにユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/sambaSamAccount.inc:66
-msgid "Inserted user or group name in script path."
-msgstr "スクリプトパスにユーザ又はグループ名を挿入しました。"
-
 #: ../lib/modules/sambaGroupMapping.inc:72
 msgid "Invalid Account"
 msgstr "無効なアカウントです"
@@ -1873,7 +1977,8 @@ msgstr "無効なアカウントです"
 msgid "Invalid RDN attribute!"
 msgstr "不正なRDN属性です!"
 
-#: ../lib/modules/posixGroup.inc:192 ../lib/modules/posixAccount.inc:973
+#: ../lib/modules/posixGroup.inc:200 ../lib/modules/posixAccount.inc:369
+#: ../lib/modules/posixAccount.inc:969
 msgid "Invalid password"
 msgstr "無効なパスワードです"
 
@@ -1882,7 +1987,7 @@ msgid "Invalid/Missing Message type"
 msgstr "不正な/間違ったメッセージタイプ"
 
 #: ../lib/modules/kolabUser.inc:122 ../lib/modules/kolabUser.inc:169
-#: ../lib/modules/kolabUser.inc:366 ../lib/modules/kolabUser.inc:801
+#: ../lib/modules/kolabUser.inc:377 ../lib/modules/kolabUser.inc:810
 msgid "Invitation policy"
 msgstr "不正なポリシー"
 
@@ -1890,7 +1995,11 @@ msgstr "不正なポリシー"
 msgid "Invitation policy list"
 msgstr "不正なポリシーリスト"
 
-#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/sambaSamAccount.inc:242
+msgid "Islamabad, Karachi"
+msgstr ""
+
+#: ../lib/modules/posixGroup.inc:472 ../lib/modules/posixAccount.inc:75
 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 "
@@ -1900,13 +2009,13 @@ msgstr ""
 "在するかも知れないため、これはいくつかの問題を引き起こすかもしれません。この"
 "警告を防ぐには、maxUIDをより大きな値に設定してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:71 ../lib/modules/inetOrgPerson.inc:105
-#: ../lib/modules/inetOrgPerson.inc:150 ../lib/modules/inetOrgPerson.inc:278
-#: ../lib/modules/inetOrgPerson.inc:552 ../lib/modules/inetOrgPerson.inc:602
+#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:101
+#: ../lib/modules/inetOrgPerson.inc:146 ../lib/modules/inetOrgPerson.inc:274
+#: ../lib/modules/inetOrgPerson.inc:601 ../lib/modules/inetOrgPerson.inc:692
 msgid "Job title"
 msgstr "役職"
 
-#: ../lib/modules/inetOrgPerson.inc:279
+#: ../lib/modules/inetOrgPerson.inc:275
 msgid "Job title of user: President, department manager, ..."
 msgstr "ユーザの役職: 社長、部長、..."
 
@@ -1946,7 +2055,7 @@ msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr ""
 "LAMは入力内容をチェックしました。アカウントを作成する準備ができました。"
 
-#: ../lib/modules/posixGroup.inc:433 ../lib/modules/posixAccount.inc:325
+#: ../lib/modules/posixGroup.inc:436 ../lib/modules/posixAccount.inc:317
 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 "
@@ -1957,24 +2066,24 @@ msgstr ""
 "SMD5をサポートしています。SSHAとCRYPTが最も一般的ですが、CRYPTは8文字より長い"
 "パスワードをサポートしません。平文のパスワードを使うことは推奨いたしません。"
 
-#: ../templates/tree/create.php:180 ../templates/massDoUpload.php:83
+#: ../templates/tree/create.php:180 ../templates/massDoUpload.php:85
 #, php-format
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAMはアカウント %s を作成できませんでした! LDAPエラーが発生しました。"
 
-#: ../lib/modules/sambaGroupMapping.inc:367
+#: ../lib/modules/sambaGroupMapping.inc:357
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "LAMは、この名前のSamba 3ドメインを見つけられませんでした。"
 
-#: ../lib/modules/sambaSamAccount.inc:85
+#: ../lib/modules/sambaSamAccount.inc:86
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAMは、この名前のドメインを見つけられませんでした。"
 
-#: ../lib/modules/posixAccount.inc:101
+#: ../lib/modules/posixAccount.inc:93
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAMは、この名前のグループを見つけられませんでした。"
 
-#: ../lib/modules/posixAccount.inc:1529
+#: ../lib/modules/posixAccount.inc:1521
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAMはグループ %s のグループメンバーシップを変更できませんでした。"
@@ -1997,15 +2106,15 @@ msgstr "LDAP リスト設定"
 msgid "LDAP Search failed! Please check your preferences."
 msgstr "LDAP検索に失敗しました! プリファレンスを確認してください。"
 
-#: ../templates/login.php:360
+#: ../templates/login.php:351
 msgid "LDAP error, server says:"
 msgstr "LDAP エラー、サーバからのメッセージ:"
 
-#: ../lib/modules.inc:965
+#: ../lib/modules.inc:999
 msgid "LDAP operation successful."
 msgstr "LDAP操作が完了しました。"
 
-#: ../templates/login.php:255
+#: ../templates/login.php:246
 msgid "LDAP server"
 msgstr "LDAPサーバ"
 
@@ -2018,11 +2127,11 @@ msgstr "LDAPのサイズ制限を越えました。一部のエントリのみ
 msgid "LDAP suffix"
 msgstr "LDAPサフィックス"
 
-#: ../templates/massDoUpload.php:118
+#: ../templates/massDoUpload.php:121
 msgid "LDAP upload has finished"
 msgstr "LDAPアップロードが完了しました。"
 
-#: ../templates/massDoUpload.php:67
+#: ../templates/massDoUpload.php:69
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAPアップロード中です。お待ちください。"
 
@@ -2031,7 +2140,7 @@ msgstr "LDAPアップロード中です。お待ちください。"
 msgid "LDIF Export for: %s"
 msgstr ""
 
-#: ../templates/login.php:204
+#: ../templates/login.php:195
 msgid "Language"
 msgstr "言語"
 
@@ -2043,21 +2152,21 @@ msgstr "言語が未定されていません!"
 msgid "Language settings"
 msgstr "言語の設定"
 
-#: ../lib/modules/inetOrgPerson.inc:55 ../lib/modules/inetOrgPerson.inc:137
-#: ../lib/modules/inetOrgPerson.inc:286 ../lib/modules/inetOrgPerson.inc:500
-#: ../lib/modules/inetOrgPerson.inc:604 ../lib/lists.inc:308
+#: ../lib/modules/inetOrgPerson.inc:48 ../lib/modules/inetOrgPerson.inc:133
+#: ../lib/modules/inetOrgPerson.inc:282 ../lib/modules/inetOrgPerson.inc:526
+#: ../lib/modules/inetOrgPerson.inc:694 ../lib/lists.inc:308
 msgid "Last name"
 msgstr "姓"
 
-#: ../lib/modules/inetOrgPerson.inc:55 ../lib/modules/inetOrgPerson.inc:56
+#: ../lib/modules/inetOrgPerson.inc:48 ../lib/modules/inetOrgPerson.inc:49
 msgid "Last name contains invalid characters!"
 msgstr "姓に不正な文字が含まれています!"
 
-#: ../lib/modules/inetOrgPerson.inc:287
+#: ../lib/modules/inetOrgPerson.inc:283
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "ユーザの姓。アルファベット、_ - と空白のみが使用できます。"
 
-#: ../lib/modules/shadowAccount.inc:350
+#: ../lib/modules/shadowAccount.inc:316
 msgid "Last password change"
 msgstr "パスワード最終変更時刻"
 
@@ -2069,6 +2178,14 @@ msgstr ""
 msgid "List attributes"
 msgstr "属性の一覧"
 
+#: ../lib/modules/sambaAccount.inc:385 ../lib/modules/sambaSamAccount.inc:209
+msgid ""
+"List of Samba workstations the user is allowed to login. Empty means every "
+"workstation."
+msgstr ""
+"ユーザがログインできるSambaワークステーションのリスト。未記入はすべてのワーク"
+"ステーションを意味します。"
+
 #: ../templates/config/confsave.php:102
 msgid "List of admin users is empty or invalid!"
 msgstr "管理者(admin users)のリストが空または正しくありません!"
@@ -2081,7 +2198,7 @@ msgstr "削除されるエントリ:"
 msgid "List of valid users"
 msgstr "有効なユーザのリスト"
 
-#: ../lib/modules.inc:1011 ../lib/modules.inc:1014
+#: ../lib/modules.inc:1045 ../lib/modules.inc:1048 ../help/help.inc:142
 msgid "Load profile"
 msgstr "プロファイルのロード"
 
@@ -2096,23 +2213,23 @@ msgstr "ローカルアドレス"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:64
 #: ../lib/modules/inetLocalMailRecipient.inc:97
-#: ../lib/modules/inetLocalMailRecipient.inc:372
+#: ../lib/modules/inetLocalMailRecipient.inc:366
 msgid "Local address list"
 msgstr "ローカルアドレス一覧"
 
-#: ../lib/modules/posixGroup.inc:197 ../lib/modules/posixAccount.inc:243
-#: ../lib/modules/posixAccount.inc:978 ../lib/modules/posixAccount.inc:1107
+#: ../lib/modules/posixGroup.inc:205 ../lib/modules/posixAccount.inc:235
+#: ../lib/modules/posixAccount.inc:974 ../lib/modules/posixAccount.inc:1099
 msgid "Lock password"
 msgstr "パスワードのロック"
 
-#: ../templates/login.php:230 ../templates/config/conflogin.php:68
+#: ../templates/login.php:221 ../templates/config/conflogin.php:68
 #: ../help/help.inc:45
 msgid "Login"
 msgstr "ログイン"
 
-#: ../lib/modules/posixAccount.inc:229 ../lib/modules/posixAccount.inc:373
-#: ../lib/modules/posixAccount.inc:984 ../lib/modules/posixAccount.inc:1099
-#: ../lib/modules/posixAccount.inc:1172 ../lib/lists.inc:310
+#: ../lib/modules/posixAccount.inc:221 ../lib/modules/posixAccount.inc:373
+#: ../lib/modules/posixAccount.inc:980 ../lib/modules/posixAccount.inc:1091
+#: ../lib/modules/posixAccount.inc:1164 ../lib/lists.inc:310
 msgid "Login shell"
 msgstr "ログインシェル"
 
@@ -2120,32 +2237,34 @@ msgstr "ログインシェル"
 msgid "Logo"
 msgstr "ロゴ"
 
-#: ../lib/modules/sambaSamAccount.inc:86
-#: ../lib/modules/sambaSamAccount.inc:220
-#: ../lib/modules/sambaSamAccount.inc:223
-#: ../lib/modules/sambaSamAccount.inc:342
-#: ../lib/modules/sambaSamAccount.inc:827
-#: ../lib/modules/sambaSamAccount.inc:1033
+#: ../lib/modules/sambaSamAccount.inc:87
+#: ../lib/modules/sambaSamAccount.inc:233
+#: ../lib/modules/sambaSamAccount.inc:247
+#: ../lib/modules/sambaSamAccount.inc:366
+#: ../lib/modules/sambaSamAccount.inc:862
+#: ../lib/modules/sambaSamAccount.inc:1065
 msgid "Logon hours"
 msgstr "ログオン時間"
 
 #: ../lib/modules/sambaAccount.inc:67 ../lib/modules/sambaAccount.inc:68
-#: ../lib/modules/sambaAccount.inc:157 ../lib/modules/sambaAccount.inc:288
-#: ../lib/modules/sambaAccount.inc:377 ../lib/modules/sambaAccount.inc:745
-#: ../lib/modules/sambaAccount.inc:842 ../lib/modules/sambaSamAccount.inc:201
-#: ../lib/modules/sambaSamAccount.inc:316
-#: ../lib/modules/sambaSamAccount.inc:778
-#: ../lib/modules/sambaSamAccount.inc:1010
-#: ../lib/modules/sambaSamAccount.inc:1102
+#: ../lib/modules/sambaAccount.inc:158 ../lib/modules/sambaAccount.inc:289
+#: ../lib/modules/sambaAccount.inc:381 ../lib/modules/sambaAccount.inc:763
+#: ../lib/modules/sambaAccount.inc:855 ../lib/modules/sambaSamAccount.inc:65
+#: ../lib/modules/sambaSamAccount.inc:66
+#: ../lib/modules/sambaSamAccount.inc:205
+#: ../lib/modules/sambaSamAccount.inc:340
+#: ../lib/modules/sambaSamAccount.inc:817
+#: ../lib/modules/sambaSamAccount.inc:1042
+#: ../lib/modules/sambaSamAccount.inc:1134
 msgid "Logon script"
 msgstr "ログオンスクリプト"
 
 #: ../lib/modules/sambaAccount.inc:67 ../lib/modules/sambaAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:67
+#: ../lib/modules/sambaSamAccount.inc:65 ../lib/modules/sambaSamAccount.inc:67
 msgid "Logon script is invalid!"
 msgstr "ログオンスクリプトが正しくありません!"
 
-#: ../templates/main_header.php:66 ../templates/logout.php:60
+#: ../templates/main_header.php:66 ../templates/logout.php:62
 msgid "Logout"
 msgstr "ログアウト"
 
@@ -2158,17 +2277,21 @@ msgstr "MACアドレス"
 msgid "MAC address list"
 msgstr "MACアドレス一覧"
 
-#: ../lib/modules/ieee802device.inc:257
+#: ../lib/modules/ieee802device.inc:259
 msgid "MAC address(es)"
 msgstr "MACアドレス"
 
+#: ../lib/modules/sambaSamAccount.inc:245
+msgid "Magadan, Solomon Islands"
+msgstr ""
+
 #: ../lib/modules/nisMailAlias.inc:54
 msgid "Mail aliases"
 msgstr "電子メール エイリアス"
 
 #: ../lib/modules/kolabUser.inc:91 ../lib/modules/kolabUser.inc:158
-#: ../lib/modules/kolabUser.inc:206 ../lib/modules/kolabUser.inc:323
-#: ../lib/modules/kolabUser.inc:785
+#: ../lib/modules/kolabUser.inc:206 ../lib/modules/kolabUser.inc:334
+#: ../lib/modules/kolabUser.inc:794
 msgid "Mail quota"
 msgstr "メール・クオータ"
 
@@ -2185,13 +2308,13 @@ msgstr "メール転送"
 #: ../lib/modules/inetLocalMailRecipient.inc:74
 #: ../lib/modules/inetLocalMailRecipient.inc:103
 #: ../lib/modules/inetLocalMailRecipient.inc:200
-#: ../lib/modules/inetLocalMailRecipient.inc:375
+#: ../lib/modules/inetLocalMailRecipient.inc:369
 msgid "Mail server"
 msgstr "メールサーバ"
 
 #: ../lib/modules/kolabUser.inc:150 ../lib/modules/kolabUser.inc:181
-#: ../lib/modules/kolabUser.inc:311 ../lib/modules/kolabUser.inc:317
-#: ../lib/modules/kolabUser.inc:781
+#: ../lib/modules/kolabUser.inc:322 ../lib/modules/kolabUser.inc:328
+#: ../lib/modules/kolabUser.inc:790
 msgid "Mailbox home server"
 msgstr "メールボックス・ホーム・サーバ"
 
@@ -2203,12 +2326,12 @@ msgstr "メールボックス・ホーム・サーバ名が空です。"
 msgid "Mailbox home server name is invalid!"
 msgstr "メールボックス・ホーム・サーバ名が正しくありません!"
 
-#: ../lib/modules/nisMailAlias.inc:61
+#: ../lib/modules/nisMailAlias.inc:63
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "この名前へのメールは受信者に転送されます。"
 
-#: ../templates/pdfedit/pdfpage.php:616 ../lib/modules.inc:920
-#: ../lib/modules.inc:945
+#: ../templates/pdfedit/pdfpage.php:616 ../lib/modules.inc:951
+#: ../lib/modules.inc:979
 msgid "Main"
 msgstr "メイン"
 
@@ -2216,8 +2339,8 @@ msgstr "メイン"
 msgid "Manage profiles"
 msgstr "プロファイルの操作"
 
-#: ../lib/modules/inetOrgPerson.inc:162 ../lib/modules/inetOrgPerson.inc:294
-#: ../lib/modules/inetOrgPerson.inc:583 ../lib/modules/inetOrgPerson.inc:606
+#: ../lib/modules/inetOrgPerson.inc:158 ../lib/modules/inetOrgPerson.inc:290
+#: ../lib/modules/inetOrgPerson.inc:632 ../lib/modules/inetOrgPerson.inc:696
 msgid "Manager"
 msgstr "管理者"
 
@@ -2237,7 +2360,7 @@ msgstr "手動"
 msgid "Manual if conflicts"
 msgstr "競合した場合は手動"
 
-#: ../lib/modules/kolabUser.inc:415 ../lib/modules/kolabUser.inc:590
+#: ../lib/modules/kolabUser.inc:426 ../lib/modules/kolabUser.inc:602
 msgid "Mark account for deletion"
 msgstr "アカウントを削除対象としてマークする"
 
@@ -2273,42 +2396,42 @@ msgstr "照合規則"
 msgid "Max list entries is invalid!"
 msgstr "リストエントリの最大数が正しくありません!"
 
-#: ../lib/modules/posixGroup.inc:315 ../lib/modules/posixGroup.inc:484
-#: ../lib/modules/posixGroup.inc:485
+#: ../lib/modules/posixGroup.inc:318 ../lib/modules/posixGroup.inc:476
+#: ../lib/modules/posixGroup.inc:477
 msgid "Maximum GID number"
 msgstr "GID番号の最大値"
 
-#: ../lib/modules/posixGroup.inc:332
+#: ../lib/modules/posixGroup.inc:335
 msgid "Maximum GID number for Unix groups"
 msgstr "unixグループに対するGID番号の最大値"
 
-#: ../lib/modules/posixGroup.inc:484
+#: ../lib/modules/posixGroup.inc:476
 msgid "Maximum GID number is invalid or empty!"
 msgstr "GID番号の最大値が不正または未入力です!"
 
-#: ../lib/modules/posixGroup.inc:485
+#: ../lib/modules/posixGroup.inc:477
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "GID番号の最大値は最小値よりも大きくなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:73 ../lib/modules/posixAccount.inc:75
-#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:77
-#: ../lib/modules/posixAccount.inc:148 ../lib/modules/posixAccount.inc:157
+#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:69
+#: ../lib/modules/posixAccount.inc:140 ../lib/modules/posixAccount.inc:149
 msgid "Maximum UID number"
 msgstr "UID番号の最大値"
 
-#: ../lib/modules/posixAccount.inc:178
+#: ../lib/modules/posixAccount.inc:170
 msgid "Maximum UID number for Unix accounts (hosts)"
 msgstr "ホストnounixアカウントに対するUID番号の最大値。"
 
-#: ../lib/modules/posixAccount.inc:176
+#: ../lib/modules/posixAccount.inc:168
 msgid "Maximum UID number for Unix accounts (users)"
 msgstr "ユーザのunixアカウントに対するUID番号の最大値。"
 
-#: ../lib/modules/posixAccount.inc:73 ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:67
 msgid "Maximum UID number is invalid!"
 msgstr "UID番号の最大値が不正です!"
 
-#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:69
 msgid "Maximum UID number must be greater than minimum UID number!"
 msgstr "UID番号の最大値は最小値よりも大きくなくてはなりません!"
 
@@ -2326,56 +2449,64 @@ msgstr "最大長"
 msgid "Maximum list entries"
 msgstr "リストエントリの最大数"
 
-#: ../lib/modules/shadowAccount.inc:103 ../lib/modules/shadowAccount.inc:170
-#: ../lib/modules/shadowAccount.inc:200 ../lib/modules/shadowAccount.inc:322
+#: ../lib/modules/shadowAccount.inc:94 ../lib/modules/shadowAccount.inc:161
+#: ../lib/modules/shadowAccount.inc:191 ../lib/modules/shadowAccount.inc:291
 msgid "Maximum password age"
 msgstr "パスワード期限(age)の最大値"
 
-#: ../lib/modules/inetOrgPerson.inc:139
+#: ../lib/modules/sambaSamAccount.inc:239
+msgid "Mid-Atlantic"
+msgstr ""
+
+#: ../lib/modules/sambaSamAccount.inc:236
+msgid "Midway Island, Samoa"
+msgstr ""
+
+#: ../lib/modules/inetOrgPerson.inc:135
 msgid "Miller"
 msgstr "ミラー"
 
-#: ../lib/modules/posixGroup.inc:312 ../lib/modules/posixGroup.inc:483
+#: ../lib/modules/posixGroup.inc:315 ../lib/modules/posixGroup.inc:475
 msgid "Minimum GID number"
 msgstr "GID番号の最小値"
 
-#: ../lib/modules/posixGroup.inc:331
+#: ../lib/modules/posixGroup.inc:334
 msgid "Minimum GID number for Unix groups"
 msgstr "unixグループに対するGID番号の最小値"
 
-#: ../lib/modules/posixGroup.inc:483
+#: ../lib/modules/posixGroup.inc:475
 msgid "Minimum GID number is invalid or empty!"
 msgstr "GID番号の最小値が不正または空です!"
 
-#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:74
-#: ../lib/modules/posixAccount.inc:145 ../lib/modules/posixAccount.inc:154
+#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:137 ../lib/modules/posixAccount.inc:146
 msgid "Minimum UID number"
 msgstr "UID番号の最小値"
 
-#: ../lib/modules/posixAccount.inc:177
+#: ../lib/modules/posixAccount.inc:169
 msgid "Minimum UID number for Unix accounts (hosts)"
 msgstr "unixアカウント(ホスト)に対するUID番号の最小値"
 
-#: ../lib/modules/posixAccount.inc:175
+#: ../lib/modules/posixAccount.inc:167
 msgid "Minimum UID number for Unix accounts (users)"
 msgstr "unixアカウント(ユーザ)に対するUID番号の最小値"
 
-#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:66
 msgid "Minimum UID number is invalid!"
 msgstr "UID番号の最小値が不正です!"
 
-#: ../lib/modules/shadowAccount.inc:98 ../lib/modules/shadowAccount.inc:166
-#: ../lib/modules/shadowAccount.inc:194 ../lib/modules/shadowAccount.inc:319
+#: ../lib/modules/shadowAccount.inc:89 ../lib/modules/shadowAccount.inc:157
+#: ../lib/modules/shadowAccount.inc:185 ../lib/modules/shadowAccount.inc:288
 msgid "Minimum password age"
 msgstr "パスワード期限(age)の最小値"
 
-#: ../lib/modules/inetOrgPerson.inc:59 ../lib/modules/inetOrgPerson.inc:198
-#: ../lib/modules/inetOrgPerson.inc:318 ../lib/modules/inetOrgPerson.inc:319
-#: ../lib/modules/inetOrgPerson.inc:537 ../lib/modules/inetOrgPerson.inc:612
+#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:194
+#: ../lib/modules/inetOrgPerson.inc:314 ../lib/modules/inetOrgPerson.inc:315
+#: ../lib/modules/inetOrgPerson.inc:586 ../lib/modules/inetOrgPerson.inc:702
 msgid "Mobile number"
 msgstr "携帯電話番号"
 
-#: ../lib/modules.inc:873 ../lib/modules.inc:1019
+#: ../lib/modules.inc:900 ../lib/modules.inc:1054
 msgid "Modify Account"
 msgstr "アカウント変更"
 
@@ -2387,12 +2518,16 @@ msgstr "モジュール選択"
 msgid "Module settings"
 msgstr "モジュール設定"
 
-#: ../lib/modules/sambaSamAccount.inc:885
+#: ../lib/modules/sambaSamAccount.inc:916
 msgid "Monday"
 msgstr "月曜日"
 
-#: ../lib/modules/quota.inc:86 ../lib/modules/quota.inc:317
-#: ../lib/modules/quota.inc:375 ../lib/modules/quota.inc:453
+#: ../lib/modules/sambaSamAccount.inc:237
+msgid "Mountain Time (US & Canada)"
+msgstr ""
+
+#: ../lib/modules/quota.inc:86 ../lib/modules/quota.inc:319
+#: ../lib/modules/quota.inc:377 ../lib/modules/quota.inc:455
 msgid "Mountpoint"
 msgstr "マウントポイント"
 
@@ -2400,11 +2535,11 @@ msgstr "マウントポイント"
 msgid "Mountpoint of device with enabled quotas."
 msgstr "quotaが有効になったデバイスのマウントポイント。"
 
-#: ../lib/modules/inetOrgPerson.inc:182
+#: ../lib/modules/inetOrgPerson.inc:178
 msgid "Mycity"
 msgstr "おらが市"
 
-#: ../lib/modules/inetOrgPerson.inc:170
+#: ../lib/modules/inetOrgPerson.inc:166
 msgid "Mystreetname 42"
 msgstr "おらが町42番地"
 
@@ -2468,7 +2603,7 @@ msgstr "新しいマスタパスワードが正しく設定されました。"
 #: ../templates/tree/templates/creation/new_ou_template.php:47
 #: ../templates/ou_edit.php:349 ../templates/ou_edit.php:386
 #: ../templates/ou_edit.php:423 ../templates/ou_edit.php:460
-#: ../help/help.inc:146
+#: ../help/help.inc:153
 msgid "New organizational unit"
 msgstr "新しい organizational unit"
 
@@ -2476,11 +2611,11 @@ msgstr "新しい organizational unit"
 msgid "New password set successfully."
 msgstr "新しいパスワードが正しく設定されました。"
 
-#: ../lib/modules/nisMailAlias.inc:179
+#: ../lib/modules/nisMailAlias.inc:185
 msgid "New recipient"
 msgstr "新しい受信者"
 
-#: ../templates/tree/add_oclass_form.php:127
+#: ../templates/tree/add_oclass_form.php:130
 msgid "New required attributes:"
 msgstr "新しい必須属性"
 
@@ -2498,11 +2633,11 @@ msgstr "新しい値"
 msgid "Next"
 msgstr "次"
 
-#: ../templates/domain.php:155 ../help/help.inc:160
+#: ../templates/domain.php:155 ../help/help.inc:167
 msgid "Next Group RID"
 msgstr "次のグループRID"
 
-#: ../templates/domain.php:129 ../help/help.inc:156
+#: ../templates/domain.php:129 ../help/help.inc:163
 msgid "Next RID"
 msgstr "次のRID"
 
@@ -2510,19 +2645,19 @@ msgstr "次のRID"
 msgid "Next RID is not a number!"
 msgstr "次のRIDが数字ではありません!"
 
-#: ../help/help.inc:157
+#: ../help/help.inc:164
 msgid "Next RID to use when creating accounts."
 msgstr "アカウント作成時に使われる次のRID。"
 
-#: ../help/help.inc:161
+#: ../help/help.inc:168
 msgid "Next RID to use when creating groups."
 msgstr "グループ作成時に使われる次のRID。"
 
-#: ../help/help.inc:159
+#: ../help/help.inc:166
 msgid "Next RID to use when creating user accounts."
 msgstr "ユーザアカウントを作成するときに使われる次のRID。"
 
-#: ../templates/domain.php:142 ../help/help.inc:158
+#: ../templates/domain.php:142 ../help/help.inc:165
 msgid "Next User RID"
 msgstr "次のユーザRID"
 
@@ -2545,8 +2680,8 @@ msgstr "いいえ"
 msgid "No Samba domains found!"
 msgstr "Sambaドメインが見つかりません!"
 
-#: ../lib/modules/posixAccount.inc:415 ../lib/modules/posixAccount.inc:647
-#: ../lib/modules/posixAccount.inc:908
+#: ../lib/modules/posixAccount.inc:415 ../lib/modules/posixAccount.inc:629
+#: ../lib/modules/posixAccount.inc:906
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "unixグループがLDAPに存在しません。最初に一個作成してください。"
 
@@ -2562,7 +2697,7 @@ msgstr "設定プロファイルがありません。一丁作成してくださ
 msgid "No description"
 msgstr "説明なし"
 
-#: ../lib/modules/posixGroup.inc:481 ../lib/modules/posixAccount.inc:82
+#: ../lib/modules/posixGroup.inc:473 ../lib/modules/posixAccount.inc:74
 msgid "No free ID-Number!"
 msgstr "空いているID番号がありません!"
 
@@ -2623,12 +2758,12 @@ msgstr ""
 "注意: この属性に対するあなたのLDAPサーバ上における比較ルールをセットしない場"
 "合、\"inappropriate matching\"エラーを受け取るでしょう。"
 
-#: ../lib/modules/shadowAccount.inc:163
+#: ../lib/modules/shadowAccount.inc:154
 msgid ""
 "Number of days a user can login even his password has expired. -1=always."
 msgstr "パスワードが期限切れになってもユーザがログインできる日数。-1は無期限。"
 
-#: ../lib/modules/shadowAccount.inc:167
+#: ../lib/modules/shadowAccount.inc:158
 msgid ""
 "Number of days a user has to wait until he\\'s allowed to change his "
 "password again. If set value must be 0<."
@@ -2636,7 +2771,7 @@ msgstr ""
 "再度パスワードを変更できるまで待たなければならない日数。設定するならば0より大"
 "きくなければならない。"
 
-#: ../lib/modules/shadowAccount.inc:171
+#: ../lib/modules/shadowAccount.inc:162
 msgid ""
 "Number of days after a user has to change his password again. If set value "
 "must be 0<."
@@ -2672,7 +2807,7 @@ msgstr "OU が正しくありません!"
 msgid "OU is not empty or invalid!"
 msgstr "OU が空白でないか不正!"
 
-#: ../help/help.inc:146 ../help/help.inc:148
+#: ../help/help.inc:153 ../help/help.inc:155
 msgid "OU-Editor"
 msgstr "OUエディタ"
 
@@ -2681,7 +2816,7 @@ msgstr "OUエディタ"
 msgid "Object classes"
 msgstr "オブジェクトクラス"
 
-#: ../lib/modules.inc:1050 ../lib/modules.inc:1088 ../lib/modules.inc:1209
+#: ../lib/modules.inc:1085 ../lib/modules.inc:1123 ../lib/modules.inc:1241
 #, php-format
 msgid "ObjectClass %s required but not defined in LDAP."
 msgstr "必須オブジェクトクラス %s がLDAPに定義されていません。"
@@ -2740,6 +2875,10 @@ msgstr "PDF構成"
 msgid "PDF-structure name not valid"
 msgstr "PDF構成名が正しくありません"
 
+#: ../lib/modules/sambaSamAccount.inc:237
+msgid "Pacific Time (US & Canada)"
+msgstr ""
+
 #: ../templates/pdfedit/pdfpage.php:409
 msgid "Page settings"
 msgstr "ページ設定"
@@ -2748,17 +2887,20 @@ msgstr "ページ設定"
 msgid "Parent to"
 msgstr "派生先"
 
-#: ../templates/login.php:194 ../lib/modules/posixGroup.inc:172
-#: ../lib/modules/posixGroup.inc:184 ../lib/modules/posixGroup.inc:273
-#: ../lib/modules/posixGroup.inc:476 ../lib/modules/posixGroup.inc:477
-#: ../lib/modules/posixGroup.inc:478 ../lib/modules/sambaAccount.inc:74
-#: ../lib/modules/sambaAccount.inc:75 ../lib/modules/sambaAccount.inc:218
+#: ../templates/login.php:185 ../lib/modules/posixGroup.inc:182
+#: ../lib/modules/posixGroup.inc:192 ../lib/modules/posixGroup.inc:276
+#: ../lib/modules/posixGroup.inc:468 ../lib/modules/posixGroup.inc:469
+#: ../lib/modules/posixGroup.inc:470 ../lib/modules/sambaAccount.inc:74
+#: ../lib/modules/sambaAccount.inc:75 ../lib/modules/sambaAccount.inc:219
 #: ../lib/modules/sambaSamAccount.inc:70 ../lib/modules/sambaSamAccount.inc:71
-#: ../lib/modules/sambaSamAccount.inc:246 ../lib/modules/posixAccount.inc:86
-#: ../lib/modules/posixAccount.inc:87 ../lib/modules/posixAccount.inc:88
-#: ../lib/modules/posixAccount.inc:237 ../lib/modules/posixAccount.inc:361
-#: ../lib/modules/posixAccount.inc:953 ../lib/modules/posixAccount.inc:965
-#: ../lib/modules/posixAccount.inc:1058 ../lib/modules/posixAccount.inc:1171
+#: ../lib/modules/sambaSamAccount.inc:270 ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:229 ../lib/modules/posixAccount.inc:357
+#: ../lib/modules/posixAccount.inc:951 ../lib/modules/posixAccount.inc:961
+#: ../lib/modules/posixAccount.inc:1052 ../lib/modules/posixAccount.inc:1163
+#: ../lib/modules/inetOrgPerson.inc:74 ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/inetOrgPerson.inc:338 ../lib/modules/inetOrgPerson.inc:548
+#: ../lib/modules/inetOrgPerson.inc:559 ../lib/modules/inetOrgPerson.inc:669
 msgid "Password"
 msgstr "パスワード"
 
@@ -2766,10 +2908,11 @@ msgstr "パスワード"
 msgid "Password changed!"
 msgstr "パスワードが変更されました!"
 
-#: ../lib/modules/posixGroup.inc:477 ../lib/modules/sambaAccount.inc:75
+#: ../lib/modules/posixGroup.inc:469 ../lib/modules/sambaAccount.inc:75
 #: ../lib/modules/sambaAccount.inc:76 ../lib/modules/sambaSamAccount.inc:71
-#: ../lib/modules/sambaSamAccount.inc:72 ../lib/modules/posixAccount.inc:87
-#: ../lib/modules/posixAccount.inc:89
+#: ../lib/modules/sambaSamAccount.inc:72 ../lib/modules/posixAccount.inc:79
+#: ../lib/modules/posixAccount.inc:81 ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/inetOrgPerson.inc:76
 msgid ""
 "Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and #*,.;:_-+!$%&/|?{[()]}= !"
@@ -2777,66 +2920,66 @@ msgstr ""
 "パスワードに不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, #*,.;:_-"
 "+!$%&/|?{[()]}= ! です。"
 
-#: ../lib/modules/sambaAccount.inc:125 ../lib/modules/sambaAccount.inc:240
-#: ../lib/modules/sambaAccount.inc:351 ../lib/modules/sambaAccount.inc:354
-#: ../lib/modules/sambaAccount.inc:710 ../lib/modules/sambaSamAccount.inc:175
-#: ../lib/modules/sambaSamAccount.inc:178
-#: ../lib/modules/sambaSamAccount.inc:268
-#: ../lib/modules/sambaSamAccount.inc:743
-#: ../lib/modules/sambaSamAccount.inc:978
+#: ../lib/modules/sambaAccount.inc:126 ../lib/modules/sambaAccount.inc:241
+#: ../lib/modules/sambaAccount.inc:355 ../lib/modules/sambaAccount.inc:358
+#: ../lib/modules/sambaAccount.inc:728 ../lib/modules/sambaSamAccount.inc:179
+#: ../lib/modules/sambaSamAccount.inc:182
+#: ../lib/modules/sambaSamAccount.inc:292
+#: ../lib/modules/sambaSamAccount.inc:782
+#: ../lib/modules/sambaSamAccount.inc:1010
 msgid "Password does not expire"
 msgstr "無期限のパスワード"
 
-#: ../lib/modules/shadowAccount.inc:58 ../lib/modules/shadowAccount.inc:93
-#: ../lib/modules/shadowAccount.inc:162 ../lib/modules/shadowAccount.inc:188
-#: ../lib/modules/shadowAccount.inc:316 ../lib/modules/shadowAccount.inc:353
+#: ../lib/modules/shadowAccount.inc:49 ../lib/modules/shadowAccount.inc:84
+#: ../lib/modules/shadowAccount.inc:153 ../lib/modules/shadowAccount.inc:179
+#: ../lib/modules/shadowAccount.inc:285 ../lib/modules/shadowAccount.inc:319
 msgid "Password expiration"
 msgstr "パスワード有効期限"
 
-#: ../lib/modules/shadowAccount.inc:58 ../lib/modules/shadowAccount.inc:59
+#: ../lib/modules/shadowAccount.inc:49 ../lib/modules/shadowAccount.inc:50
 msgid "Password expiration must be are natural number or -1."
 msgstr "パスワード有効期限は自然数または-1でなければなりません。"
 
-#: ../lib/modules/posixGroup.inc:319 ../lib/modules/posixGroup.inc:432
-#: ../lib/modules/posixAccount.inc:163 ../lib/modules/posixAccount.inc:324
+#: ../lib/modules/posixGroup.inc:322 ../lib/modules/posixGroup.inc:435
+#: ../lib/modules/posixAccount.inc:155 ../lib/modules/posixAccount.inc:316
 msgid "Password hash type"
 msgstr "パスワードハッシュ形式"
 
-#: ../lib/modules/posixAccount.inc:179
+#: ../lib/modules/posixAccount.inc:171
 msgid "Password hash type for Unix accounts"
 msgstr "unixアカウントに対するパスワードハッシュ形式"
 
-#: ../lib/modules/posixGroup.inc:333
+#: ../lib/modules/posixGroup.inc:336
 msgid "Password hash type for Unix groups"
 msgstr "unixグループに対するパスワードハッシュ形式"
 
-#: ../lib/modules/shadowAccount.inc:56 ../lib/modules/shadowAccount.inc:62
+#: ../lib/modules/shadowAccount.inc:47 ../lib/modules/shadowAccount.inc:53
 msgid "Password maxage"
 msgstr "パスワード寿命の最大値"
 
-#: ../lib/modules/shadowAccount.inc:56 ../lib/modules/shadowAccount.inc:57
+#: ../lib/modules/shadowAccount.inc:47 ../lib/modules/shadowAccount.inc:48
 msgid "Password maximum age must be are natural number."
 msgstr "パスワード寿命の最大値は自然数でなければなりません。"
 
-#: ../lib/modules/shadowAccount.inc:62 ../lib/modules/shadowAccount.inc:63
+#: ../lib/modules/shadowAccount.inc:53 ../lib/modules/shadowAccount.inc:54
 msgid "Password maximum age must be bigger as password minimum age."
 msgstr "パスワード寿命の最大値は最小値より大きくなければなりません。"
 
-#: ../lib/modules/shadowAccount.inc:54
+#: ../lib/modules/shadowAccount.inc:45
 msgid "Password minage"
 msgstr "パスワード寿命の最小値"
 
-#: ../lib/modules/shadowAccount.inc:54 ../lib/modules/shadowAccount.inc:55
+#: ../lib/modules/shadowAccount.inc:45 ../lib/modules/shadowAccount.inc:46
 msgid "Password minimum age must be are natural number."
 msgstr "パスワード寿命の最小値は自然数でなければなりません。"
 
-#: ../lib/modules/shadowAccount.inc:60 ../lib/modules/shadowAccount.inc:88
-#: ../lib/modules/shadowAccount.inc:158 ../lib/modules/shadowAccount.inc:182
-#: ../lib/modules/shadowAccount.inc:313 ../lib/modules/shadowAccount.inc:351
+#: ../lib/modules/shadowAccount.inc:51 ../lib/modules/shadowAccount.inc:79
+#: ../lib/modules/shadowAccount.inc:149 ../lib/modules/shadowAccount.inc:173
+#: ../lib/modules/shadowAccount.inc:282 ../lib/modules/shadowAccount.inc:317
 msgid "Password warning"
 msgstr "パスワード警告"
 
-#: ../lib/modules/shadowAccount.inc:60 ../lib/modules/shadowAccount.inc:61
+#: ../lib/modules/shadowAccount.inc:51 ../lib/modules/shadowAccount.inc:52
 msgid "Password warning must be are natural number."
 msgstr "パスワード警告期限は自然数でなければなりません。"
 
@@ -2844,11 +2987,13 @@ msgstr "パスワード警告期限は自然数でなければなりません。
 msgid "Passwords are different!"
 msgstr "パスワードが異なっています!"
 
-#: ../lib/modules/sambaAccount.inc:375 ../lib/modules/sambaSamAccount.inc:199
+#: ../lib/modules/sambaAccount.inc:379 ../lib/modules/sambaSamAccount.inc:203
 msgid ""
 "Path of the user profile. Can be a local absolute path or a UNC-path (\\"
 "\\server\\share). $user and $group are replaced with user and group name."
-msgstr "ユーザプロファイルのパス。ローカル絶対パス、または、UNCパス(\\\\サーバ\\共有)。 $use と $group はユーザとグループ名に置き換えられます。"
+msgstr ""
+"ユーザプロファイルのパス。ローカル絶対パス、または、UNCパス(\\\\サーバ\\共"
+"有)。 $use と $group はユーザとグループ名に置き換えられます。"
 
 #: ../templates/config/confmain.php:426 ../lib/config.inc:368
 msgid "Path to external script"
@@ -2858,11 +3003,11 @@ msgstr "外部スクリプトのパス"
 msgid "Permanently delete all children, too?"
 msgstr "全ての子も削除しますか?"
 
-#: ../lib/modules/inetOrgPerson.inc:93
+#: ../lib/modules/inetOrgPerson.inc:89
 msgid "Personal"
 msgstr ""
 
-#: ../templates/delete.php:77
+#: ../templates/delete.php:80
 msgid "Please confirm:"
 msgstr "確認してください:"
 
@@ -2870,92 +3015,107 @@ msgstr "確認してください:"
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "特殊アカウントのRID番号または名前を入力してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:339
+#: ../lib/modules/inetOrgPerson.inc:335
 msgid ""
 "Please enter a comma separated list of host names where this user is allowed "
 "to log in. Can be left empty."
-msgstr "ユーザがログインする事を許可されたunixワークステーショのカンマ区切りリストを入力して下さい。空のままでも構いません。"
+msgstr ""
+"ユーザがログインする事を許可されたunixワークステーショのカンマ区切りリストを"
+"入力して下さい。空のままでも構いません。"
 
 #: ../lib/modules/sambaAccount.inc:70 ../lib/modules/sambaAccount.inc:71
 #: ../lib/modules/sambaSamAccount.inc:68 ../lib/modules/sambaSamAccount.inc:69
 msgid "Please enter a comma separated list of host names!"
 msgstr "カンマで区切られたホスト名を入力してください!"
 
-#: ../lib/modules/posixAccount.inc:106 ../lib/modules/posixAccount.inc:107
-#: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:76
+#: ../lib/modules/kolabUser.inc:298 ../lib/modules/kolabUser.inc:301
+msgid "Please enter a user password on this page: %s"
+msgstr "このページに対するパスワードを入力してください: %"
+
+#: ../lib/modules/posixAccount.inc:98 ../lib/modules/posixAccount.inc:99
+#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:69
 msgid "Please enter a valid common name!"
 msgstr "正しい氏名を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:84 ../lib/modules/sambaAccount.inc:85
-#: ../lib/modules/sambaSamAccount.inc:82 ../lib/modules/sambaSamAccount.inc:83
+#: ../lib/modules/sambaAccount.inc:85 ../lib/modules/sambaAccount.inc:86
+#: ../lib/modules/sambaSamAccount.inc:83 ../lib/modules/sambaSamAccount.inc:84
 msgid "Please enter a valid date in format DD-MM-YYYY."
 msgstr "正しい日付をDD-MM-YYYYの形式で入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:79 ../lib/modules/sambaSamAccount.inc:77
+#: ../lib/modules/sambaAccount.inc:79 ../lib/modules/sambaAccount.inc:80
+#: ../lib/modules/sambaSamAccount.inc:77 ../lib/modules/sambaSamAccount.inc:78
 msgid "Please enter a valid display name!"
 msgstr "正しい表示名(display name)を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:86 ../lib/modules/sambaSamAccount.inc:84
+#: ../lib/modules/sambaAccount.inc:87 ../lib/modules/sambaSamAccount.inc:85
 msgid "Please enter a valid drive letter."
 msgstr "正しいドライブ文字を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:63 ../lib/modules/inetOrgPerson.inc:64
+#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:57
 msgid "Please enter a valid eMail address!"
 msgstr "正しい電子メールアドレスを入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:73 ../lib/modules/inetOrgPerson.inc:74
+#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:67
 msgid "Please enter a valid employee type!"
 msgstr "正しい雇用形態を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:61 ../lib/modules/inetOrgPerson.inc:62
+#: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:55
 msgid "Please enter a valid fax number!"
 msgstr "正しいファクス番号を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:87
+#: ../lib/modules/sambaAccount.inc:88
 msgid "Please enter a valid group RID."
 msgstr "正しいグループRIDを入力してください!"
 
-#: ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:89
 msgid "Please enter a valid group name!"
 msgstr "正しいグループ名を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:71 ../lib/modules/inetOrgPerson.inc:72
+#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:65
 msgid "Please enter a valid job title!"
 msgstr "正しい役職を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:59 ../lib/modules/inetOrgPerson.inc:60
+#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:53
 msgid "Please enter a valid mobile number!"
 msgstr "正しい携帯電話番号を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:67 ../lib/modules/inetOrgPerson.inc:68
+#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:61
 msgid "Please enter a valid postal address!"
 msgstr "正しい住所を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:69 ../lib/modules/inetOrgPerson.inc:70
+#: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:63
 msgid "Please enter a valid postal code!"
 msgstr "正しい郵便番号を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:88
+#: ../lib/modules/sambaAccount.inc:89
 msgid "Please enter a valid special user name."
 msgstr "正しい特殊ユーザ名(special user name)を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:65 ../lib/modules/inetOrgPerson.inc:66
+#: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:59
 msgid "Please enter a valid street name!"
 msgstr "正しい町名(street name)を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:57 ../lib/modules/inetOrgPerson.inc:58
+#: ../lib/modules/inetOrgPerson.inc:50 ../lib/modules/inetOrgPerson.inc:51
 msgid "Please enter a valid telephone number!"
 msgstr "正しい電話番号を入力してください!"
 
-#: ../lib/modules/posixGroup.inc:593 ../lib/modules/posixAccount.inc:723
+#: ../lib/modules/posixGroup.inc:608 ../lib/modules/posixAccount.inc:705
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "%s と %s の間の値を入力してください!"
 
+#: ../lib/modules/kolabUser.inc:305
+msgid "Please enter an email address on this page: %s"
+msgstr "このページに対するメールアドレスを入力してください。"
+
 #: ../templates/config/conflogin.php:98
 msgid "Please enter password to change preferences:"
 msgstr "プリファレンスを変更するためのパスワードを入力してください:"
 
+#: ../lib/modules.inc:890
+msgid "Please enter the account information on the other pages first."
+msgstr "最初に、他のページでアカウント情報を入力してください。"
+
 #: ../help/help.inc:46
 msgid ""
 "Please enter the configuration password. This is NOT your LDAP password. It "
@@ -2992,11 +3152,11 @@ msgstr ""
 "新しいプロファイル名を入力。名前にはアルファベット、数字と -/_ が使用できま"
 "す。"
 
-#: ../lib/modules/posixAccount.inc:362
+#: ../lib/modules/posixAccount.inc:358 ../lib/modules/inetOrgPerson.inc:339
 msgid "Please enter the password which you want to set for this account."
 msgstr "このアカウントに対するパスワードを入力してください。"
 
-#: ../lib/modules/posixAccount.inc:341
+#: ../lib/modules/posixAccount.inc:333
 msgid "Please enter the path to the user's home directory."
 msgstr "ユーザのホームディレクトリを入力してください。"
 
@@ -3004,10 +3164,16 @@ msgstr "ユーザのホームディレクトリを入力してください。"
 msgid ""
 "Please enter the quota settings for this mount point. The syntax is: {soft "
 "block limit},{hard block limit},{soft inode limit},{hard inode limit}"
-msgstr "このマウントポイントに対するクォータ設定を入力してください。書式は {soft block limit},{hard block limit},{soft inode limit},{hard inode limit} です。"
+msgstr ""
+"このマウントポイントに対するクォータ設定を入力してください。書式は {soft "
+"block limit},{hard block limit},{soft inode limit},{hard inode limit} です。"
 
-#: ../lib/modules/posixGroup.inc:476 ../lib/modules/sambaAccount.inc:74
-#: ../lib/modules/sambaSamAccount.inc:70 ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:78 ../lib/modules/inetOrgPerson.inc:74
+msgid "Please enter the same password in both password fields."
+msgstr "両方のパスワードフィールドに同じパスワードを入力してください。"
+
+#: ../lib/modules/posixGroup.inc:468 ../lib/modules/sambaAccount.inc:74
+#: ../lib/modules/sambaSamAccount.inc:70
 msgid "Please enter the same password in both password-fields."
 msgstr "2つのパスワードフィールドに同じパスワードを入力してください。"
 
@@ -3031,7 +3197,7 @@ msgstr ""
 "チーム{endlink}にレポートしてください。エラー番号は {bold}0001: Invalid/"
 "Missing Message type.{endbold} です。ご協力に感謝します。"
 
-#: ../lib/modules.inc:915
+#: ../lib/modules.inc:940
 msgid "Please select page:"
 msgstr "ページを選択:"
 
@@ -3039,11 +3205,11 @@ msgstr "ページを選択:"
 msgid "Please select your account type:"
 msgstr "アカウントタイプを選択してください:"
 
-#: ../templates/login.php:167
+#: ../templates/login.php:158
 msgid "Please select your user name and enter your password to log in"
 msgstr "ユーザ名を選んでからパスワードを入力してログインしてください。"
 
-#: ../lib/modules.inc:906
+#: ../lib/modules.inc:932
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "ページ %s の必須属性を全て設定してください。"
@@ -3061,29 +3227,29 @@ msgid "Position"
 msgstr "位置"
 
 #: ../templates/masscreate.php:163 ../templates/masscreate.php:301
-#: ../lib/modules/sambaGroupMapping.inc:368
+#: ../lib/modules/sambaGroupMapping.inc:358
 msgid "Possible values"
 msgstr "候補となる値"
 
-#: ../lib/modules/inetOrgPerson.inc:186 ../lib/modules/inetOrgPerson.inc:302
-#: ../lib/modules/inetOrgPerson.inc:303 ../lib/modules/inetOrgPerson.inc:521
-#: ../lib/modules/inetOrgPerson.inc:608
+#: ../lib/modules/inetOrgPerson.inc:182 ../lib/modules/inetOrgPerson.inc:298
+#: ../lib/modules/inetOrgPerson.inc:299 ../lib/modules/inetOrgPerson.inc:570
+#: ../lib/modules/inetOrgPerson.inc:698
 msgid "Post office box"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:67 ../lib/modules/inetOrgPerson.inc:180
-#: ../lib/modules/inetOrgPerson.inc:310 ../lib/modules/inetOrgPerson.inc:529
-#: ../lib/modules/inetOrgPerson.inc:610
+#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:176
+#: ../lib/modules/inetOrgPerson.inc:306 ../lib/modules/inetOrgPerson.inc:578
+#: ../lib/modules/inetOrgPerson.inc:700
 msgid "Postal address"
 msgstr "住所"
 
-#: ../lib/modules/inetOrgPerson.inc:311
+#: ../lib/modules/inetOrgPerson.inc:307
 msgid "Postal address, city"
 msgstr "住所、区市町村"
 
-#: ../lib/modules/inetOrgPerson.inc:69 ../lib/modules/inetOrgPerson.inc:174
-#: ../lib/modules/inetOrgPerson.inc:306 ../lib/modules/inetOrgPerson.inc:307
-#: ../lib/modules/inetOrgPerson.inc:525 ../lib/modules/inetOrgPerson.inc:609
+#: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:170
+#: ../lib/modules/inetOrgPerson.inc:302 ../lib/modules/inetOrgPerson.inc:303
+#: ../lib/modules/inetOrgPerson.inc:574 ../lib/modules/inetOrgPerson.inc:699
 msgid "Postal code"
 msgstr "郵便番号"
 
@@ -3091,15 +3257,15 @@ msgstr "郵便番号"
 msgid "Predefined values"
 msgstr "あらかじめ定義された値"
 
-#: ../lib/modules/inetOrgPerson.inc:152
+#: ../lib/modules/inetOrgPerson.inc:148
 msgid "President"
 msgstr "社長"
 
-#: ../lib/modules/posixGroup.inc:144 ../lib/modules/posixAccount.inc:209
-#: ../lib/modules/posixAccount.inc:276 ../lib/modules/posixAccount.inc:332
-#: ../lib/modules/posixAccount.inc:353 ../lib/modules/posixAccount.inc:395
-#: ../lib/modules/posixAccount.inc:932 ../lib/modules/posixAccount.inc:1086
-#: ../lib/modules/posixAccount.inc:1114 ../lib/modules/posixAccount.inc:1168
+#: ../lib/modules/posixGroup.inc:484 ../lib/modules/posixAccount.inc:201
+#: ../lib/modules/posixAccount.inc:268 ../lib/modules/posixAccount.inc:324
+#: ../lib/modules/posixAccount.inc:349 ../lib/modules/posixAccount.inc:395
+#: ../lib/modules/posixAccount.inc:930 ../lib/modules/posixAccount.inc:1078
+#: ../lib/modules/posixAccount.inc:1106 ../lib/modules/posixAccount.inc:1160
 msgid "Primary group"
 msgstr "プライマリグループ"
 
@@ -3140,15 +3306,15 @@ msgid "Profile passwords are different or empty!"
 msgstr "プロファイルパスワードが異なるか、または未入力です!"
 
 #: ../lib/modules/sambaAccount.inc:64 ../lib/modules/sambaAccount.inc:65
-#: ../lib/modules/sambaAccount.inc:151 ../lib/modules/sambaAccount.inc:282
-#: ../lib/modules/sambaAccount.inc:374 ../lib/modules/sambaAccount.inc:742
-#: ../lib/modules/sambaAccount.inc:843 ../lib/modules/sambaSamAccount.inc:62
+#: ../lib/modules/sambaAccount.inc:152 ../lib/modules/sambaAccount.inc:283
+#: ../lib/modules/sambaAccount.inc:378 ../lib/modules/sambaAccount.inc:760
+#: ../lib/modules/sambaAccount.inc:856 ../lib/modules/sambaSamAccount.inc:62
 #: ../lib/modules/sambaSamAccount.inc:63
-#: ../lib/modules/sambaSamAccount.inc:198
-#: ../lib/modules/sambaSamAccount.inc:310
-#: ../lib/modules/sambaSamAccount.inc:775
-#: ../lib/modules/sambaSamAccount.inc:1004
-#: ../lib/modules/sambaSamAccount.inc:1103
+#: ../lib/modules/sambaSamAccount.inc:202
+#: ../lib/modules/sambaSamAccount.inc:334
+#: ../lib/modules/sambaSamAccount.inc:814
+#: ../lib/modules/sambaSamAccount.inc:1036
+#: ../lib/modules/sambaSamAccount.inc:1135
 msgid "Profile path"
 msgstr "プロファイルパス"
 
@@ -3165,9 +3331,9 @@ msgstr "プロファイルがセーブされました。"
 msgid "Quota"
 msgstr ""
 
-#: ../lib/modules/quota.inc:498
+#: ../lib/modules/quota.inc:500
 msgid "Quota for:"
-msgstr ""
+msgstr "Quotaの対象:"
 
 #: ../lib/modules/quota.inc:57
 msgid "Quota has wrong format!"
@@ -3178,7 +3344,7 @@ msgid "RDN"
 msgstr ""
 
 #: ../templates/masscreate.php:155 ../templates/profedit/profilepage.php:193
-#: ../lib/modules.inc:1003 ../help/help.inc:134
+#: ../lib/modules.inc:1037 ../help/help.inc:134
 msgid "RDN identifier"
 msgstr "RDN識別子"
 
@@ -3194,12 +3360,12 @@ msgstr "このOUを新規作成しますか?"
 msgid "Really delete attribute?"
 msgstr "この属性を削除しますか?"
 
-#: ../lib/modules/nisMailAlias.inc:64 ../lib/modules/nisMailAlias.inc:172
+#: ../lib/modules/nisMailAlias.inc:66 ../lib/modules/nisMailAlias.inc:178
 msgid "Recipient"
 msgstr "受信者"
 
-#: ../lib/modules/nisMailAlias.inc:68 ../lib/modules/nisMailAlias.inc:82
-#: ../lib/modules/nisMailAlias.inc:308
+#: ../lib/modules/nisMailAlias.inc:70 ../lib/modules/nisMailAlias.inc:84
+#: ../lib/modules/nisMailAlias.inc:331
 msgid "Recipient list"
 msgstr "受信者リスト"
 
@@ -3234,10 +3400,10 @@ msgid "Relative distinguished name"
 msgstr "相対識別名"
 
 #: ../templates/pdfedit/pdfpage.php:474 ../lib/modules/ieee802device.inc:146
-#: ../lib/modules/kolabUser.inc:355 ../lib/modules/kolabUser.inc:374
-#: ../lib/modules/kolabUser.inc:400
+#: ../lib/modules/kolabUser.inc:366 ../lib/modules/kolabUser.inc:385
+#: ../lib/modules/kolabUser.inc:411
 #: ../lib/modules/inetLocalMailRecipient.inc:208
-#: ../lib/modules/nisMailAlias.inc:174
+#: ../lib/modules/nisMailAlias.inc:180
 msgid "Remove"
 msgstr "削除"
 
@@ -3249,13 +3415,14 @@ msgstr "プロファイル名変更"
 msgid "Renamed profile."
 msgstr "プロファイル名が変更されました。"
 
-#: ../lib/modules/posixGroup.inc:178 ../lib/modules/posixGroup.inc:277
-#: ../lib/modules/sambaAccount.inc:699 ../lib/modules/sambaSamAccount.inc:732
-#: ../lib/modules/posixAccount.inc:959 ../lib/modules/posixAccount.inc:1064
+#: ../lib/modules/posixGroup.inc:186 ../lib/modules/posixGroup.inc:280
+#: ../lib/modules/sambaAccount.inc:717 ../lib/modules/sambaSamAccount.inc:771
+#: ../lib/modules/posixAccount.inc:955 ../lib/modules/posixAccount.inc:1056
+#: ../lib/modules/inetOrgPerson.inc:552 ../lib/modules/inetOrgPerson.inc:673
 msgid "Repeat password"
 msgstr "パスワード再入力"
 
-#: ../lib/modules/posixAccount.inc:80 ../lib/modules/posixAccount.inc:781
+#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:762
 msgid "Replaced $user or $group in homedir."
 msgstr "$user または $group をホームディレクトリに置き換えました。"
 
@@ -3274,27 +3441,29 @@ msgstr "必須属性"
 msgid "Reset"
 msgstr "リセット"
 
-#: ../lib/modules.inc:937
+#: ../lib/modules.inc:943 ../lib/modules.inc:971
 msgid "Reset changes"
 msgstr "変更をリセット"
 
-#: ../lib/modules/sambaAccount.inc:789 ../lib/modules/sambaSamAccount.inc:834
+#: ../lib/modules/sambaAccount.inc:340 ../lib/modules/sambaAccount.inc:807
+#: ../lib/modules/sambaSamAccount.inc:164
+#: ../lib/modules/sambaSamAccount.inc:869
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:56
 #: ../lib/modules/inetLocalMailRecipient.inc:91
 #: ../lib/modules/inetLocalMailRecipient.inc:195
-#: ../lib/modules/inetLocalMailRecipient.inc:369
+#: ../lib/modules/inetLocalMailRecipient.inc:363
 msgid "Routing address"
 msgstr "転送アドレス"
 
-#: ../lib/modules/sambaAccount.inc:106
+#: ../lib/modules/sambaAccount.inc:107
 msgid "Samba 2"
 msgstr "Samba 2"
 
-#: ../lib/modules/sambaSamAccount.inc:105
-#: ../lib/modules/sambaGroupMapping.inc:233
+#: ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/sambaGroupMapping.inc:223
 msgid "Samba 3"
 msgstr "Samba 3"
 
@@ -3310,51 +3479,52 @@ msgstr "Samba 3 ドメイン"
 msgid "Samba Hosts"
 msgstr "Samba ホスト"
 
-#: ../lib/modules/sambaSamAccount.inc:210
-#: ../lib/modules/sambaSamAccount.inc:214
-#: ../lib/modules/sambaSamAccount.inc:335
+#: ../lib/modules/sambaSamAccount.inc:223
+#: ../lib/modules/sambaSamAccount.inc:227
 #: ../lib/modules/sambaSamAccount.inc:359
+#: ../lib/modules/sambaSamAccount.inc:383
 msgid "Samba RID"
 msgstr "Samba RID"
 
-#: ../lib/modules/sambaGroupMapping.inc:267
-#: ../lib/modules/sambaGroupMapping.inc:292
+#: ../lib/modules/sambaGroupMapping.inc:257
+#: ../lib/modules/sambaGroupMapping.inc:282
 msgid "Samba RID number"
 msgstr "Samba RID番号"
 
-#: ../lib/modules/sambaGroupMapping.inc:261
+#: ../lib/modules/sambaGroupMapping.inc:251
 msgid "Samba display name"
 msgstr "Samba表示名"
 
-#: ../lib/modules/sambaGroupMapping.inc:253
+#: ../lib/modules/sambaGroupMapping.inc:243
 msgid "Samba domain name"
 msgstr "Sambaドメイン名"
 
-#: ../lib/modules/sambaGroupMapping.inc:273
-#: ../lib/modules/sambaGroupMapping.inc:300
-#: ../lib/modules/sambaGroupMapping.inc:317
+#: ../lib/modules/sambaGroupMapping.inc:263
+#: ../lib/modules/sambaGroupMapping.inc:290
+#: ../lib/modules/sambaGroupMapping.inc:307
 msgid "Samba group type"
 msgstr "Sambaグループタイプ"
 
-#: ../lib/modules/sambaAccount.inc:336 ../lib/modules/sambaAccount.inc:696
-#: ../lib/modules/sambaSamAccount.inc:160
-#: ../lib/modules/sambaSamAccount.inc:730
+#: ../lib/modules/sambaAccount.inc:337 ../lib/modules/sambaAccount.inc:714
+#: ../lib/modules/sambaSamAccount.inc:161
+#: ../lib/modules/sambaSamAccount.inc:769
 msgid "Samba password"
 msgstr "Sambaパスワード"
 
-#: ../lib/modules/sambaAccount.inc:70 ../lib/modules/sambaAccount.inc:163
-#: ../lib/modules/sambaAccount.inc:294 ../lib/modules/sambaAccount.inc:380
-#: ../lib/modules/sambaAccount.inc:748 ../lib/modules/sambaAccount.inc:844
-#: ../lib/modules/sambaSamAccount.inc:68
-#: ../lib/modules/sambaSamAccount.inc:204
-#: ../lib/modules/sambaSamAccount.inc:322
-#: ../lib/modules/sambaSamAccount.inc:781
-#: ../lib/modules/sambaSamAccount.inc:1016
-#: ../lib/modules/sambaSamAccount.inc:1104
+#: ../lib/modules/sambaAccount.inc:70 ../lib/modules/sambaAccount.inc:164
+#: ../lib/modules/sambaAccount.inc:295 ../lib/modules/sambaAccount.inc:384
+#: ../lib/modules/sambaAccount.inc:387 ../lib/modules/sambaAccount.inc:766
+#: ../lib/modules/sambaAccount.inc:857 ../lib/modules/sambaSamAccount.inc:68
+#: ../lib/modules/sambaSamAccount.inc:208
+#: ../lib/modules/sambaSamAccount.inc:211
+#: ../lib/modules/sambaSamAccount.inc:346
+#: ../lib/modules/sambaSamAccount.inc:820
+#: ../lib/modules/sambaSamAccount.inc:1048
+#: ../lib/modules/sambaSamAccount.inc:1136
 msgid "Samba workstations"
 msgstr "Samba ワークステーション"
 
-#: ../lib/modules/sambaSamAccount.inc:886
+#: ../lib/modules/sambaSamAccount.inc:917
 msgid "Saturday"
 msgstr "土曜日"
 
@@ -3363,6 +3533,10 @@ msgstr "土曜日"
 msgid "Save"
 msgstr "保存"
 
+#: ../help/help.inc:144
+msgid "Save account"
+msgstr "アカウントを保存"
+
 #: ../templates/tree/export_form.php:123
 msgid "Save as file"
 msgstr "ファイルとして保存"
@@ -3388,12 +3562,11 @@ msgstr "スキーマブラウザ"
 msgid "Scope"
 msgstr "スコープ"
 
-#: ../lib/modules/sambaSamAccount.inc:65 ../lib/modules/sambaSamAccount.inc:66
 #: ../help/help.inc:95
 msgid "Script path"
 msgstr "スクリプトパス"
 
-#: ../templates/config/confsave.php:159 ../lib/modules/sambaSamAccount.inc:65
+#: ../templates/config/confsave.php:159
 msgid "Script path is invalid!"
 msgstr "スクリプトパスが正しくありません!"
 
@@ -3445,7 +3618,7 @@ msgstr "生成処理に対するテンプレートを選んでください"
 msgid "Select all"
 msgstr "すべてを選択"
 
-#: ../lib/modules/posixAccount.inc:1028
+#: ../lib/modules/posixAccount.inc:1022
 msgid "Selected groups"
 msgstr "選択されたグループ"
 
@@ -3453,7 +3626,7 @@ msgstr "選択されたグループ"
 msgid "Selected modules"
 msgstr "選択されたモジュール"
 
-#: ../lib/modules/posixGroup.inc:243
+#: ../lib/modules/posixGroup.inc:246
 msgid "Selected users"
 msgstr "選択されたユーザ"
 
@@ -3474,8 +3647,8 @@ msgstr "外部スクリプトのサーバ"
 msgid "Server settings"
 msgstr "サーバ設定"
 
-#: ../lib/modules/posixGroup.inc:188 ../lib/modules/posixAccount.inc:969
-#: ../lib/modules/posixAccount.inc:1103
+#: ../lib/modules/posixGroup.inc:196 ../lib/modules/posixAccount.inc:965
+#: ../lib/modules/posixAccount.inc:1095
 msgid "Set no password"
 msgstr "パスワードなし"
 
@@ -3483,11 +3656,11 @@ msgstr "パスワードなし"
 msgid "Set profile password"
 msgstr "プロファイルパスワード設定"
 
-#: ../lib/modules/posixGroup.inc:420
+#: ../lib/modules/posixGroup.inc:423
 msgid "Sets the group password."
 msgstr "グループパスワードを設定"
 
-#: ../lib/modules/shadowAccount.inc:77
+#: ../lib/modules/shadowAccount.inc:68
 msgid "Shadow"
 msgstr ""
 
@@ -3503,12 +3676,12 @@ msgstr "内部属性を表示する"
 msgid "Single valued"
 msgstr "単一の値"
 
-#: ../lib/modules/quota.inc:454
+#: ../lib/modules/quota.inc:456
 msgid "Soft block"
 msgstr "ソフトブロック"
 
-#: ../lib/modules/quota.inc:94 ../lib/modules/quota.inc:319
-#: ../lib/modules/quota.inc:376
+#: ../lib/modules/quota.inc:94 ../lib/modules/quota.inc:321
+#: ../lib/modules/quota.inc:378
 msgid "Soft block limit"
 msgstr "ソフトブロック制限"
 
@@ -3516,7 +3689,7 @@ msgstr "ソフトブロック制限"
 msgid "Soft block limit."
 msgstr "ソフトブロック制限"
 
-#: ../lib/modules/quota.inc:456
+#: ../lib/modules/quota.inc:458
 msgid "Soft inode"
 msgstr "ソフトinode"
 
@@ -3524,8 +3697,8 @@ msgstr "ソフトinode"
 msgid "Soft inode (files) limit."
 msgstr "ソフトinode(ファイル)制限。"
 
-#: ../lib/modules/quota.inc:110 ../lib/modules/quota.inc:323
-#: ../lib/modules/quota.inc:378
+#: ../lib/modules/quota.inc:110 ../lib/modules/quota.inc:325
+#: ../lib/modules/quota.inc:380
 msgid "Soft inode limit"
 msgstr "ソフトinode制限"
 
@@ -3534,11 +3707,11 @@ msgstr "ソフトinode制限"
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "いくつかの属性(%s)は変更され、ハイライト表示されています。"
 
-#: ../lib/modules.inc:905
+#: ../lib/modules.inc:931
 msgid "Some required information is missing"
 msgstr "必須項目が満たされていません。"
 
-#: ../templates/help.php:144
+#: ../templates/help.php:145
 #, php-format
 msgid ""
 "Sorry this help id ({bold}%s{endbold}) is not available for this module "
@@ -3547,16 +3720,17 @@ msgstr ""
 "このヘルプID({bold}%s{endbold})は、このモジュール({bold}%s{endbold})では無効"
 "です。"
 
-#: ../templates/help.php:157
+#: ../templates/help.php:159
 #, php-format
 msgid "Sorry this help number ({bold}%d{endbold}) is not available."
 msgstr "このヘルプ番号({bold}%d{endbold})は無効です。"
 
 #: ../lib/modules/sambaAccount.inc:77 ../lib/modules/sambaAccount.inc:78
-#: ../lib/modules/sambaAccount.inc:307 ../lib/modules/sambaAccount.inc:389
-#: ../lib/modules/sambaAccount.inc:780 ../lib/modules/sambaSamAccount.inc:73
+#: ../lib/modules/sambaAccount.inc:308 ../lib/modules/sambaAccount.inc:396
+#: ../lib/modules/sambaAccount.inc:798 ../lib/modules/sambaSamAccount.inc:73
 #: ../lib/modules/sambaSamAccount.inc:74
-#: ../lib/modules/sambaSamAccount.inc:814
+#: ../lib/modules/sambaSamAccount.inc:220
+#: ../lib/modules/sambaSamAccount.inc:853
 msgid "Special user"
 msgstr "特殊ユーザ"
 
@@ -3573,22 +3747,22 @@ msgstr "Step 1 of 2: 名前とオブジェクトクラス"
 msgid "Step 2 of 2: Specify attributes and values"
 msgstr "Step 2 of 2: 属性と値の記入"
 
-#: ../lib/modules/inetOrgPerson.inc:133
+#: ../lib/modules/inetOrgPerson.inc:129
 msgid "Steve"
 msgstr "スティーブ"
 
-#: ../lib/modules/sambaAccount.inc:214 ../lib/modules/sambaSamAccount.inc:242
-#: ../lib/modules/posixAccount.inc:199 ../lib/modules/inetOrgPerson.inc:223
+#: ../lib/modules/sambaAccount.inc:215 ../lib/modules/sambaSamAccount.inc:266
+#: ../lib/modules/posixAccount.inc:191 ../lib/modules/inetOrgPerson.inc:219
 msgid "Steve Miller"
 msgstr "スティーブ ミラー"
 
-#: ../lib/modules/posixAccount.inc:253
+#: ../lib/modules/posixAccount.inc:245
 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:65 ../lib/modules/inetOrgPerson.inc:168
-#: ../lib/modules/inetOrgPerson.inc:298 ../lib/modules/inetOrgPerson.inc:299
-#: ../lib/modules/inetOrgPerson.inc:517 ../lib/modules/inetOrgPerson.inc:607
+#: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:164
+#: ../lib/modules/inetOrgPerson.inc:294 ../lib/modules/inetOrgPerson.inc:295
+#: ../lib/modules/inetOrgPerson.inc:566 ../lib/modules/inetOrgPerson.inc:697
 msgid "Street"
 msgstr "町名"
 
@@ -3609,9 +3783,10 @@ msgstr "Sub (サブツリー全体)"
 #: ../templates/config/confmain.php:481 ../templates/pdfedit/pdfdelete.php:81
 #: ../templates/pdfedit/pdfpage.php:735 ../templates/pdfedit/pdfmain.php:152
 #: ../templates/profedit/profiledelete.php:84
-#: ../templates/profedit/profilemain.php:156 ../lib/modules/posixGroup.inc:282
-#: ../lib/modules/sambaAccount.inc:790 ../lib/modules/sambaSamAccount.inc:835
-#: ../lib/modules/sambaSamAccount.inc:945 ../lib/modules/posixAccount.inc:1069
+#: ../templates/profedit/profilemain.php:156 ../lib/modules/posixGroup.inc:285
+#: ../lib/modules/sambaAccount.inc:808 ../lib/modules/sambaSamAccount.inc:870
+#: ../lib/modules/sambaSamAccount.inc:976 ../lib/modules/posixAccount.inc:1061
+#: ../lib/modules/inetOrgPerson.inc:678
 msgid "Submit"
 msgstr "更新(Submit)"
 
@@ -3623,12 +3798,12 @@ msgstr ""
 msgid "Success"
 msgstr "成功"
 
-#: ../templates/domain.php:189 ../lib/lists.inc:349 ../lib/modules.inc:990
-#: ../help/help.inc:152
+#: ../templates/domain.php:189 ../lib/lists.inc:349 ../lib/modules.inc:1024
+#: ../help/help.inc:159
 msgid "Suffix"
 msgstr "サフィックス"
 
-#: ../lib/modules/sambaSamAccount.inc:886
+#: ../lib/modules/sambaSamAccount.inc:917
 msgid "Sunday"
 msgstr "日曜日"
 
@@ -3648,17 +3823,17 @@ msgstr ""
 msgid "Target of invitation policy is invalid!"
 msgstr "招待ポリシーのターゲット正しくありません。"
 
-#: ../lib/modules/inetOrgPerson.inc:57 ../lib/modules/inetOrgPerson.inc:192
-#: ../lib/modules/inetOrgPerson.inc:314 ../lib/modules/inetOrgPerson.inc:315
-#: ../lib/modules/inetOrgPerson.inc:533 ../lib/modules/inetOrgPerson.inc:611
+#: ../lib/modules/inetOrgPerson.inc:50 ../lib/modules/inetOrgPerson.inc:188
+#: ../lib/modules/inetOrgPerson.inc:310 ../lib/modules/inetOrgPerson.inc:311
+#: ../lib/modules/inetOrgPerson.inc:582 ../lib/modules/inetOrgPerson.inc:701
 msgid "Telephone number"
 msgstr "電話番号"
 
-#: ../lib/modules/inetOrgPerson.inc:158
+#: ../lib/modules/inetOrgPerson.inc:154
 msgid "Temp"
 msgstr "臨時雇用"
 
-#: ../lib/modules/inetOrgPerson.inc:146
+#: ../lib/modules/inetOrgPerson.inc:142
 msgid "Temp, contract until december"
 msgstr "臨時雇用、12月までの契約"
 
@@ -3675,11 +3850,11 @@ msgid ""
 "The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
 msgstr "ユーザに対するCyrusメールクォータ(MB単位)。未入力の場合は無制限。"
 
-#: ../help/help.inc:155
+#: ../help/help.inc:162
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "SambaサーバのSID。 \"net getlocalsid\" で取得してください。"
 
-#: ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:70
 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 "
@@ -3698,11 +3873,11 @@ msgstr "指定されたコンテナ(%s)が存在しません。再試行して
 msgid "The country name of the user."
 msgstr "ユーザの国名"
 
-#: ../help/help.inc:153
+#: ../help/help.inc:160
 msgid "The domain entry will be saved under this suffix."
 msgstr "このサフィックス下でドメインエントリが保存されました。"
 
-#: ../lib/modules/shadowAccount.inc:64
+#: ../lib/modules/shadowAccount.inc:55
 msgid "The expiration date is invalid."
 msgstr "有効期限が正しくありません。"
 
@@ -3715,7 +3890,7 @@ msgid ""
 "The following suffix(es) are missing in LDAP. LAM can create them for you."
 msgstr "以下のサフィックスはLDAPにありません。LAM はこれらを作成できます。"
 
-#: ../lib/modules/sambaSamAccount.inc:86 ../lib/modules/sambaSamAccount.inc:87
+#: ../lib/modules/sambaSamAccount.inc:87 ../lib/modules/sambaSamAccount.inc:88
 msgid "The format of the logon hours field is invalid!"
 msgstr "ログオン時間フィールドの形式が正しくありません!"
 
@@ -3723,6 +3898,11 @@ msgstr "ログオン時間フィールドの形式が正しくありません!"
 msgid "The headline for a new section must contain at least one character."
 msgstr "新しいセクションの見出しは、少なくとも一文字以上でなくてはなりません。"
 
+#: ../lib/modules.inc:889
+#, php-format
+msgid "The module %s is not yet ready."
+msgstr "モジュール %s は利用できません。"
+
 #: ../templates/pdfedit/pdfpage.php:103
 msgid ""
 "The name for that PDF-structure you submitted is not valid. A valid name "
@@ -3736,7 +3916,7 @@ msgstr ""
 msgid "The name of the server where the mailbox is located."
 msgstr "メールボックスがあるサーバーの名前。"
 
-#: ../help/help.inc:151
+#: ../help/help.inc:158
 msgid "The name of your Windows domain or workgroup."
 msgstr "Windowsのドメイン又はワークグループ名。"
 
@@ -3748,17 +3928,19 @@ msgstr "新しいアカウントはLDAPサフィックスの下に作成され
 msgid "The password is invalid! Please try again."
 msgstr "パスワードが正しくありません! やり直してください。"
 
-#: ../lib/modules/posixAccount.inc:333
+#: ../lib/modules/posixAccount.inc:325
 msgid ""
 "The primary group for this account. You can insert a GID number or a group "
 "name."
-msgstr "このアカウントに対するプライマリグループ。GID番号またはグループ名を入力してください。"
+msgstr ""
+"このアカウントに対するプライマリグループ。GID番号またはグループ名を入力してく"
+"ださい。"
 
 #: ../lib/modules/posixAccount.inc:396
 msgid "The primary group the host should be member of."
 msgstr "ホストがメンバでなければならないプライマリグループ。"
 
-#: ../lib/modules/posixAccount.inc:354
+#: ../lib/modules/posixAccount.inc:350
 msgid "The primary group the user should be member of."
 msgstr "ユーザがメンバでなければならないプライマリグループ。"
 
@@ -3766,11 +3948,11 @@ msgstr "ユーザがメンバでなければならないプライマリグルー
 msgid "The static text must contain at least one character."
 msgstr "静的テキストは少なくとも一文字以上でなければななりません。"
 
-#: ../templates/tree/add_oclass_form.php:118
+#: ../templates/tree/add_oclass_form.php:121
 msgid "There are new required attributes which need to be set."
 msgstr "設定すべき新しい必須属性があります。"
 
-#: ../lib/modules/posixGroup.inc:144
+#: ../lib/modules/posixGroup.inc:484
 msgid "There are still users who have this group as their primary group."
 msgstr "このグループをプライマリグループとするユーザがまだ存在します。"
 
@@ -3778,7 +3960,7 @@ msgstr "このグループをプライマリグループとするユーザがま
 msgid "There can be only one administrator per domain."
 msgstr "管理者は、ドメイン毎に一つだけ存在可能です。"
 
-#: ../lib/modules/sambaGroupMapping.inc:366
+#: ../lib/modules/sambaGroupMapping.inc:356
 msgid "There can be only one group of this type."
 msgstr "このタイプのグループを一つだけ指定できます。"
 
@@ -3786,11 +3968,11 @@ msgstr "このタイプのグループを一つだけ指定できます。"
 msgid "There can be only one guest per domain."
 msgstr "ドメイン毎にゲストアカウントを一個だけ指定できます。"
 
-#: ../templates/massDoUpload.php:120
+#: ../templates/massDoUpload.php:123
 msgid "There were errors while uploading:"
 msgstr "アップロードの際にエラーが発生しました。"
 
-#: ../lib/modules/posixGroup.inc:429
+#: ../lib/modules/posixGroup.inc:432
 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 "
@@ -3799,7 +3981,7 @@ msgstr ""
 "新しいグループアカウントを作成する際に使われるグループIDの最小値と最大値。新"
 "しいグループアカウントには、使用中の番号の最大値+1が常に割り当てられます。"
 
-#: ../lib/modules/posixAccount.inc:321
+#: ../lib/modules/posixAccount.inc:313
 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 "
@@ -3810,7 +3992,7 @@ msgstr ""
 "囲はユーザアカウントのものと異なるようにしなくてはなりません。新しいホストア"
 "カウントには、使用中の番号の最大値+1が常に割り当てられます。"
 
-#: ../lib/modules/posixAccount.inc:317
+#: ../lib/modules/posixAccount.inc:309
 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 "
@@ -3820,7 +4002,7 @@ msgstr ""
 "マシンアカウントのものとは異なるようにしなくてはなりません。新しいユーザアカ"
 "ウントには、使用中の番号の最大値+1が常に割りあてられます。"
 
-#: ../lib/modules/posixAccount.inc:102
+#: ../lib/modules/posixAccount.inc:94
 msgid ""
 "This GID number is invalid! Please provide either a number or a group name."
 msgstr ""
@@ -3831,10 +4013,16 @@ msgstr ""
 msgid "This Samba 3 domain is already present!"
 msgstr "このSamba 3 ドメインはすでに存在しています!"
 
-#: ../lib/modules/kolabUser.inc:300
+#: ../lib/modules/kolabUser.inc:311
 msgid "This account is marked for deletion."
 msgstr "このアカウントを削除対象としてマークしました。"
 
+#: ../lib/modules/sambaSamAccount.inc:221
+msgid ""
+"This allows you to define this account as a special user like administrator "
+"or guest."
+msgstr "このアカウントをadministratorやguest等の特殊ユーザとして定義する事を可能にします。"
+
 #: ../help/help.inc:120
 msgid "This changes the password of the selected profile."
 msgstr "選択されたプロファイルのパスワードを変更します。"
@@ -3870,7 +4058,7 @@ msgstr "このエントリは属性を持っていません。"
 msgid "This entry is the root of a sub-tree containing %s entries."
 msgstr "このエントリは %s エントリを含むサブツリーのルートです。"
 
-#: ../lib/modules/posixAccount.inc:103
+#: ../lib/modules/posixAccount.inc:95
 msgid "This gecos value is invalid!"
 msgstr "gecosの値が正しくありません!"
 
@@ -3890,7 +4078,7 @@ msgstr "カンマで区切られた電子メール別名のリスト。"
 msgid "This is a comma separated list of invitation policies."
 msgstr "カンマで区切られた招待ポリシーのリスト。"
 
-#: ../lib/modules/nisMailAlias.inc:69
+#: ../lib/modules/nisMailAlias.inc:71
 msgid "This is a comma separated list of recipients."
 msgstr "カンマで区切られた受信者のリスト。"
 
@@ -3913,7 +4101,7 @@ msgid ""
 msgstr ""
 "CSVに変換する前に、あなたの表計算プログラムでどのように見えるかの例です。"
 
-#: ../lib/modules/inetOrgPerson.inc:80
+#: ../lib/modules/inetOrgPerson.inc:73
 msgid "This is not a valid DN!"
 msgstr "無効なDNです!"
 
@@ -3921,7 +4109,7 @@ msgstr "無効なDNです!"
 msgid "This is not a valid RID number!"
 msgstr "無効なRID番号です!"
 
-#: ../lib/modules/sambaGroupMapping.inc:368
+#: ../lib/modules/sambaGroupMapping.inc:358
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不正なSamba 3グループタイプです!"
 
@@ -3929,15 +4117,17 @@ msgstr "不正なSamba 3グループタイプです!"
 msgid "This is one of the users public email addresses."
 msgstr "ユーザの公開メールアドレスの一つ。"
 
-#: ../lib/modules/nisMailAlias.inc:65
+#: ../lib/modules/nisMailAlias.inc:67
 msgid "This is one recipient for this alias."
 msgstr "この別名に対する1名の受信者。"
 
-#: ../lib/modules/inetOrgPerson.inc:295
+#: ../lib/modules/inetOrgPerson.inc:291
 msgid ""
 "This is the LDAP DN of the user's manager. Use this property to represent "
 "hierarchies in your company."
-msgstr "このユーザの管理者のLDAP DN。この属性は、あなたの組織の階層を表現するために使用してください。"
+msgstr ""
+"このユーザの管理者のLDAP DN。この属性は、あなたの組織の階層を表現するために使"
+"用してください。"
 
 #: ../lib/modules/ieee802device.inc:57
 msgid ""
@@ -3945,11 +4135,11 @@ msgid ""
 "EF:18)."
 msgstr "ネットワークカードデバイスのMACアドレスです(例 0:01:02:DE:EF:18)。"
 
-#: ../lib/modules/sambaAccount.inc:387
+#: ../lib/modules/sambaAccount.inc:394
 msgid "This is the RID of the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループのRIDです。"
 
-#: ../lib/modules/sambaSamAccount.inc:208
+#: ../lib/modules/sambaSamAccount.inc:218
 msgid "This is the SID of the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループのSIDです。"
 
@@ -3961,15 +4151,15 @@ msgstr ""
 "ホームディレクトリを作成し、quotaを設定するための外部スクリプトの絶対パスで"
 "す。"
 
-#: ../lib/modules/sambaAccount.inc:337 ../lib/modules/sambaSamAccount.inc:161
+#: ../lib/modules/sambaAccount.inc:338 ../lib/modules/sambaSamAccount.inc:162
 msgid "This is the account's Windows password."
 msgstr "アカウントのWindowsパスワードです。"
 
-#: ../lib/modules/sambaAccount.inc:334 ../lib/modules/sambaSamAccount.inc:158
+#: ../lib/modules/sambaAccount.inc:335 ../lib/modules/sambaSamAccount.inc:159
 msgid "This is the account's full name on Windows systems."
 msgstr "アカウントのWindowsシステム上のフルネームです。"
 
-#: ../lib/modules/sambaGroupMapping.inc:285
+#: ../lib/modules/sambaGroupMapping.inc:275
 msgid "This is the group name which will be shown in Windows."
 msgstr "Windows上で表示されるグループ名です。"
 
@@ -3997,7 +4187,7 @@ msgstr ""
 msgid "This is the mail server for the user."
 msgstr "ユーザに対するメールサーバ。"
 
-#: ../lib/modules/inetOrgPerson.inc:331
+#: ../lib/modules/inetOrgPerson.inc:327
 msgid ""
 "This is the natural name of the user. If empty, the first and last name is "
 "used."
@@ -4007,7 +4197,8 @@ msgstr "このユーザの呼称。未入力の場合は、姓と名が使用さ
 msgid ""
 "This is the natural name of the user. If empty, the first and last name or "
 "user name is used."
-msgstr "このユーザの呼称。未入力の場合は、姓と名、またはユーザ名が使用されます。"
+msgstr ""
+"このユーザの呼称。未入力の場合は、姓と名、またはユーザ名が使用されます。"
 
 #: ../help/help.inc:92
 msgid ""
@@ -4017,7 +4208,7 @@ msgstr ""
 "ユーザ/グループ/ホスト一覧に表示する行数です。もしもより多くのエントリがある"
 "ならば、リストは複数のページに分割されます。"
 
-#: ../lib/modules/sambaGroupMapping.inc:293
+#: ../lib/modules/sambaGroupMapping.inc:283
 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 "
@@ -4027,7 +4218,7 @@ msgstr ""
 "合、LAMはUIDからRIDを算出します。数値または特殊グループ名のどちらかを指定でき"
 "ます。"
 
-#: ../lib/modules/sambaSamAccount.inc:211
+#: ../lib/modules/sambaSamAccount.inc:224
 msgid ""
 "This is the relative ID number for your Windows account. You can either "
 "enter a number or one of these special accounts: "
@@ -4035,7 +4226,7 @@ msgstr ""
 "あなたのWindowsアカウントに対する相対ID番号です。数字またはこれらの特殊アカウ"
 "ントのどれか一つを指定できます: "
 
-#: ../lib/modules/sambaSamAccount.inc:215
+#: ../lib/modules/sambaSamAccount.inc:228
 msgid ""
 "This is the relative ID number for your host account. If you leave this "
 "empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
@@ -4093,9 +4284,15 @@ msgstr ""
 msgid ""
 "This is the time limit (in days) for other users who want to check future "
 "appointments. If you leave this blank the default (60 days) will be set."
-msgstr "他のユーザが将来の予定をチェックする場合の時間的上限(日数)。未入力の場合はデフォルト値(60日)がセットされます。"
+msgstr ""
+"他のユーザが将来の予定をチェックする場合の時間的上限(日数)。未入力の場合はデ"
+"フォルト値(60日)がセットされます。"
 
-#: ../lib/modules/posixAccount.inc:104
+#: ../lib/modules/sambaSamAccount.inc:215
+msgid "This is the user's primary Windows group."
+msgstr "ユーザのプライマリWindowsグループです。"
+
+#: ../lib/modules/posixAccount.inc:96
 msgid "This login shell is invalid!"
 msgstr "ログインシェルが正しくありません!"
 
@@ -4103,11 +4300,12 @@ msgstr "ログインシェルが正しくありません!"
 msgid "This object class is obsolete."
 msgstr "このオブジェクトクラスは旧式です。"
 
-#: ../lib/modules/sambaSamAccount.inc:221
+#: ../lib/modules/sambaSamAccount.inc:234
 msgid "This option defines the allowed logon hours for this account."
-msgstr "このオプションは、このアカウントがログオンを許可される時間を定義します。"
+msgstr ""
+"このオプションは、このアカウントがログオンを許可される時間を定義します。"
 
-#: ../lib/modules/sambaSamAccount.inc:224
+#: ../lib/modules/sambaSamAccount.inc:248
 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 "
@@ -4118,6 +4316,10 @@ msgstr ""
 "時間が168ビットに写影され、21桁の16進数(21*8=168)の値として保存されます。先頭"
 "の1ビットはグリニッジ標準時で日曜の0:00 - 0:59を意味します。"
 
+#: ../help/help.inc:145
+msgid "This saves your account to the LDAP database."
+msgstr "あなたのアカウントをLDAPデータベースに保存します。"
+
 #: ../help/help.inc:110
 msgid "This text will appear on top of every user PDF file."
 msgstr "このテキストは、各ユーザのPDFファイルの先頭に表示されます。"
@@ -4130,26 +4332,26 @@ msgstr "このツールで、あなたのPDFページをカスタマイズする
 msgid "This user was not found!"
 msgstr "ユーザが見つかりません!"
 
-#: ../lib/modules/sambaAccount.inc:80 ../lib/modules/sambaAccount.inc:81
-#: ../lib/modules/sambaAccount.inc:82 ../lib/modules/sambaAccount.inc:83
-#: ../lib/modules/sambaSamAccount.inc:78 ../lib/modules/sambaSamAccount.inc:79
-#: ../lib/modules/sambaSamAccount.inc:80 ../lib/modules/sambaSamAccount.inc:81
+#: ../lib/modules/sambaAccount.inc:81 ../lib/modules/sambaAccount.inc:82
+#: ../lib/modules/sambaAccount.inc:83 ../lib/modules/sambaAccount.inc:84
+#: ../lib/modules/sambaSamAccount.inc:79 ../lib/modules/sambaSamAccount.inc:80
+#: ../lib/modules/sambaSamAccount.inc:81 ../lib/modules/sambaSamAccount.inc:82
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"!"
 msgstr "この値は、\"true\"または\"false\"のいずれかでなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:105
+#: ../lib/modules/posixAccount.inc:97
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"."
 msgstr "この値は、\"true\"または\"false\"のいずれかでなくてはなりません。"
 
-#: ../lib/modules/posixGroup.inc:491
+#: ../lib/modules/posixGroup.inc:483
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "この値はセミコロンで区切られたユーザ名でなくてはなりません。"
 
-#: ../help/help.inc:147
+#: ../help/help.inc:154
 msgid "This will create a new organizational unit under the selected one."
 msgstr "選択された位置の下に新しい organizational unit を作成します。"
 
-#: ../help/help.inc:149
+#: ../help/help.inc:156
 msgid ""
 "This will delete the selected organizational unit. The OU has to be empty."
 msgstr ""
@@ -4159,24 +4361,39 @@ msgstr ""
 msgid "This will delete the selected profile."
 msgstr "選択されたプロファイルを削除します。"
 
+#: ../lib/modules/sambaAccount.inc:341 ../lib/modules/sambaSamAccount.inc:165
+msgid "This will reset the host's password to a default value."
+msgstr "ホストのパスワードをデフォルト値にリセットします。"
+
 #: ../lib/modules/kolabUser.inc:163
 msgid ""
 "This will set a special flag on the account which tells Kolabd to remove it. "
 "Use this to cleanly delete Kolab accounts (e.g. this removes mail boxes)."
-msgstr "Kolabdに削除を命ずる特殊なフラグをセットします。Kolabアカウントを完全に削除する場合に使用します(e.g. メールボックスは削除されます)。"
+msgstr ""
+"Kolabdに削除を命ずる特殊なフラグをセットします。Kolabアカウントを完全に削除す"
+"る場合に使用します(e.g. メールボックスは削除されます)。"
 
-#: ../lib/modules/sambaSamAccount.inc:885
+#: ../lib/modules/posixAccount.inc:370
+msgid ""
+"This will set an invalid password which prevents logins with this account."
+msgstr "無効なパスワードを設定する事により、このアカウントでのログインを防止します。"
+
+#: ../lib/modules/sambaSamAccount.inc:916
 msgid "Thursday"
 msgstr "木曜日"
 
-#: ../lib/modules/sambaSamAccount.inc:932
+#: ../lib/modules/sambaSamAccount.inc:963
 msgid "Time"
 msgstr "時刻"
 
-#: ../lib/modules/sambaSamAccount.inc:949
+#: ../lib/modules/sambaSamAccount.inc:980
 msgid "Time zone"
 msgstr "タイムゾーン"
 
+#: ../lib/modules/sambaSamAccount.inc:235
+msgid "Time zones:"
+msgstr "タイムゾーン:"
+
 #: ../lib/modules/posixAccount.inc:374
 msgid ""
 "To disable login use /bin/false. The list of shells is read from lam/config/"
@@ -4185,6 +4402,10 @@ msgstr ""
 "ログインを禁止するためには/bin/falseを使ってください。シェルの一覧は lam/"
 "config/shells から読み込まれます。"
 
+#: ../lib/modules/sambaSamAccount.inc:244
+msgid "Tokyo, Seoul, Osaka, Yakutsk"
+msgstr "東京、ソウル、大阪、ヤクーツク"
+
 #: ../templates/main_header.php:59
 msgid "Tools"
 msgstr "ツール"
@@ -4213,7 +4434,7 @@ msgstr "ツリーサフィックス"
 msgid "TreeSuffix is invalid!"
 msgstr "ツリーサフィックスが正しくありません!"
 
-#: ../lib/modules/sambaSamAccount.inc:885
+#: ../lib/modules/sambaSamAccount.inc:916
 msgid "Tuesday"
 msgstr "木曜日"
 
@@ -4221,29 +4442,29 @@ msgstr "木曜日"
 msgid "Type"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:82
 msgid "UID"
 msgstr "UID"
 
-#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:82
 msgid "UID has changed. Do you want to change home directory?"
 msgstr "UIDが変更されました。ホームディレクトリを変更しますか?"
 
-#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/posixAccount.inc:77
 msgid ""
 "UID must be a number. It has to be inside the UID range which is defined in "
 "your configuration profile."
 msgstr "UIDは数値で、設定ファイルで定義されたUIDの範囲内でなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:203
-#: ../lib/modules/posixAccount.inc:270 ../lib/modules/posixAccount.inc:316
-#: ../lib/modules/posixAccount.inc:320 ../lib/modules/posixAccount.inc:328
-#: ../lib/modules/posixAccount.inc:922 ../lib/modules/posixAccount.inc:1165
+#: ../lib/modules/posixAccount.inc:53 ../lib/modules/posixAccount.inc:195
+#: ../lib/modules/posixAccount.inc:262 ../lib/modules/posixAccount.inc:308
+#: ../lib/modules/posixAccount.inc:312 ../lib/modules/posixAccount.inc:320
+#: ../lib/modules/posixAccount.inc:920 ../lib/modules/posixAccount.inc:1157
 #: ../lib/lists.inc:303 ../lib/lists.inc:330
 msgid "UID number"
 msgstr "UID番号"
 
-#: ../lib/modules/posixAccount.inc:61
+#: ../lib/modules/posixAccount.inc:53
 #, php-format
 msgid ""
 "UID number has changed. To keep file ownership you have to run the following "
@@ -4253,11 +4474,11 @@ msgstr ""
 "コマンドをroot権限で実行す必要があります: 'find / -uid %s -exec chown %s {} "
 "\\;'"
 
-#: ../lib/modules/posixAccount.inc:78 ../lib/modules/posixAccount.inc:173
+#: ../lib/modules/posixAccount.inc:70 ../lib/modules/posixAccount.inc:165
 msgid "UID ranges for Unix accounts"
 msgstr "unixアカウントに対するUIDの範囲"
 
-#: ../lib/modules/sambaAccount.inc:372 ../lib/modules/sambaSamAccount.inc:196
+#: ../lib/modules/sambaAccount.inc:376 ../lib/modules/sambaSamAccount.inc:200
 msgid ""
 "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced "
 "with user and group name."
@@ -4292,7 +4513,7 @@ msgstr "ドメインを削除できません!"
 msgid "Unable to delete profile!"
 msgstr "プロファイルを削除できません!"
 
-#: ../lib/modules/posixAccount.inc:1329 ../lib/modules/posixAccount.inc:1546
+#: ../lib/modules/posixAccount.inc:1321 ../lib/modules/posixAccount.inc:1538
 msgid "Unable to find group in LDAP."
 msgstr "LDAP内にグループが見つかりません。"
 
@@ -4317,17 +4538,17 @@ msgstr "スキーマを取得できません!"
 msgid "Unable to save profile!"
 msgstr "プロファイルを保存できません!"
 
-#: ../lib/modules/posixGroup.inc:304 ../lib/modules/posixAccount.inc:131
+#: ../lib/modules/posixGroup.inc:307 ../lib/modules/posixAccount.inc:123
 msgid "Unix"
 msgstr "unix"
 
-#: ../lib/modules/inetOrgPerson.inc:51 ../lib/modules/inetOrgPerson.inc:240
-#: ../lib/modules/inetOrgPerson.inc:338 ../lib/modules/inetOrgPerson.inc:564
-#: ../lib/modules/inetOrgPerson.inc:601
+#: ../lib/modules/inetOrgPerson.inc:44 ../lib/modules/inetOrgPerson.inc:236
+#: ../lib/modules/inetOrgPerson.inc:334 ../lib/modules/inetOrgPerson.inc:613
+#: ../lib/modules/inetOrgPerson.inc:691
 msgid "Unix workstations"
 msgstr "unixワークステーション"
 
-#: ../lib/modules/inetOrgPerson.inc:51 ../lib/modules/inetOrgPerson.inc:52
+#: ../lib/modules/inetOrgPerson.inc:44 ../lib/modules/inetOrgPerson.inc:45
 msgid "Unix workstations are invalid!"
 msgstr "unixワークステーションが正しくありません。"
 
@@ -4347,7 +4568,7 @@ msgstr "アカウントをLDAPにアップロード"
 msgid "Upload file and create accounts"
 msgstr "ファイルをアップロードして、アカウントを作成します。"
 
-#: ../lib/modules.inc:473
+#: ../lib/modules.inc:476
 #, php-format
 msgid "Upload was stopped after errors in %s module!"
 msgstr "%s モジュールでエラーが発生したため、アプロードを中止しました。"
@@ -4356,11 +4577,11 @@ msgstr "%s モジュールでエラーが発生したため、アプロードを
 msgid "Usage"
 msgstr "使用方法"
 
-#: ../lib/modules/sambaAccount.inc:113 ../lib/modules/sambaAccount.inc:224
-#: ../lib/modules/sambaAccount.inc:339 ../lib/modules/sambaAccount.inc:342
-#: ../lib/modules/sambaSamAccount.inc:163
-#: ../lib/modules/sambaSamAccount.inc:166
-#: ../lib/modules/sambaSamAccount.inc:252
+#: ../lib/modules/sambaAccount.inc:114 ../lib/modules/sambaAccount.inc:225
+#: ../lib/modules/sambaAccount.inc:343 ../lib/modules/sambaAccount.inc:346
+#: ../lib/modules/sambaSamAccount.inc:167
+#: ../lib/modules/sambaSamAccount.inc:170
+#: ../lib/modules/sambaSamAccount.inc:276
 msgid "Use Unix password"
 msgstr "unixパスワードを使用"
 
@@ -4374,23 +4595,23 @@ msgid ""
 "use it!"
 msgstr "使う前にlamdaemonのドキュメントを読み、あなたの責任で使うこと"
 
-#: ../lib/modules/posixGroup.inc:423 ../lib/modules/sambaAccount.inc:119
-#: ../lib/modules/sambaAccount.inc:232 ../lib/modules/sambaAccount.inc:345
-#: ../lib/modules/sambaAccount.inc:348 ../lib/modules/sambaAccount.inc:707
-#: ../lib/modules/sambaSamAccount.inc:169
-#: ../lib/modules/sambaSamAccount.inc:172
-#: ../lib/modules/sambaSamAccount.inc:260
-#: ../lib/modules/sambaSamAccount.inc:740
-#: ../lib/modules/sambaSamAccount.inc:972 ../lib/modules/posixAccount.inc:365
+#: ../lib/modules/posixGroup.inc:426 ../lib/modules/sambaAccount.inc:120
+#: ../lib/modules/sambaAccount.inc:233 ../lib/modules/sambaAccount.inc:349
+#: ../lib/modules/sambaAccount.inc:352 ../lib/modules/sambaAccount.inc:725
+#: ../lib/modules/sambaSamAccount.inc:173
+#: ../lib/modules/sambaSamAccount.inc:176
+#: ../lib/modules/sambaSamAccount.inc:284
+#: ../lib/modules/sambaSamAccount.inc:779
+#: ../lib/modules/sambaSamAccount.inc:1004 ../lib/modules/posixAccount.inc:361
 msgid "Use no password"
 msgstr "パスワードなし"
 
-#: ../lib/modules/sambaAccount.inc:703 ../lib/modules/sambaSamAccount.inc:736
-#: ../lib/modules/sambaSamAccount.inc:966
+#: ../lib/modules/sambaAccount.inc:721 ../lib/modules/sambaSamAccount.inc:775
+#: ../lib/modules/sambaSamAccount.inc:998
 msgid "Use unix password"
 msgstr "unixパスワードを使う"
 
-#: ../lib/modules/quota.inc:90 ../lib/modules/quota.inc:318
+#: ../lib/modules/quota.inc:90 ../lib/modules/quota.inc:320
 msgid "Used blocks"
 msgstr "使用したブロック"
 
@@ -4406,12 +4627,12 @@ msgstr "使用されている属性"
 msgid "Used by object classes"
 msgstr "使用されているオブジェクトクラス"
 
-#: ../help/help.inc:163
+#: ../help/help.inc:170
 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:322
+#: ../lib/modules/quota.inc:106 ../lib/modules/quota.inc:324
 msgid "Used inodes"
 msgstr "使用したinode"
 
@@ -4427,18 +4648,19 @@ msgstr "ユーザ"
 msgid "User ID"
 msgstr "ユーザ ID"
 
-#: ../lib/modules/sambaAccount.inc:256 ../lib/modules/sambaAccount.inc:363
-#: ../lib/modules/sambaAccount.inc:719 ../lib/modules/sambaSamAccount.inc:187
-#: ../lib/modules/sambaSamAccount.inc:284
-#: ../lib/modules/sambaSamAccount.inc:752
+#: ../lib/modules/sambaAccount.inc:257 ../lib/modules/sambaAccount.inc:367
+#: ../lib/modules/sambaAccount.inc:737 ../lib/modules/sambaSamAccount.inc:191
+#: ../lib/modules/sambaSamAccount.inc:308
+#: ../lib/modules/sambaSamAccount.inc:791
 msgid "User can change password"
 msgstr "ユーザはパスワードを変更可能"
 
-#: ../lib/modules/posixAccount.inc:350
+#: ../lib/modules/posixAccount.inc:346
 msgid "User description. If left empty first and last name will be used."
-msgstr "ユーザの説明。もしも空ならば、姓(last name)と名(first name)が使われます。"
+msgstr ""
+"ユーザの説明。もしも空ならば、姓(last name)と名(first name)が使われます。"
 
-#: ../lib/modules/inetOrgPerson.inc:275
+#: ../lib/modules/inetOrgPerson.inc:271
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "ユーザの説明。もしも空ならば、姓(surname)と名(given)が使われます。"
 
@@ -4459,41 +4681,46 @@ msgstr "ユーザによる変更"
 msgid "User modules"
 msgstr "ユーザモジュール"
 
-#: ../lib/modules/sambaAccount.inc:263 ../lib/modules/sambaAccount.inc:365
-#: ../lib/modules/sambaAccount.inc:727 ../lib/modules/sambaSamAccount.inc:189
-#: ../lib/modules/sambaSamAccount.inc:291
-#: ../lib/modules/sambaSamAccount.inc:760
+#: ../lib/modules/sambaAccount.inc:264 ../lib/modules/sambaAccount.inc:369
+#: ../lib/modules/sambaAccount.inc:745 ../lib/modules/sambaSamAccount.inc:193
+#: ../lib/modules/sambaSamAccount.inc:315
+#: ../lib/modules/sambaSamAccount.inc:799
 msgid "User must change password"
 msgstr "ユーザはパスワード変更が必要"
 
-#: ../templates/login.php:173 ../lib/modules/account.inc:81
-#: ../lib/modules/sambaSamAccount.inc:1099 ../lib/modules/posixAccount.inc:91
-#: ../lib/modules/posixAccount.inc:92 ../lib/modules/posixAccount.inc:95
-#: ../lib/modules/posixAccount.inc:189 ../lib/modules/posixAccount.inc:345
-#: ../lib/modules/posixAccount.inc:914 ../lib/modules/posixAccount.inc:1163
-#: ../lib/modules/inetOrgPerson.inc:77 ../lib/modules/inetOrgPerson.inc:228
-#: ../lib/modules/inetOrgPerson.inc:334 ../lib/modules/inetOrgPerson.inc:491
-#: ../lib/modules/inetOrgPerson.inc:616 ../lib/lists.inc:305
+#: ../templates/login.php:164 ../lib/modules/account.inc:90
+#: ../lib/modules/account.inc:110 ../lib/modules/account.inc:112
+#: ../lib/modules/account.inc:113 ../lib/modules/account.inc:214
+#: ../lib/modules/account.inc:234 ../lib/modules/sambaSamAccount.inc:1131
+#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:87 ../lib/modules/posixAccount.inc:181
+#: ../lib/modules/posixAccount.inc:341 ../lib/modules/posixAccount.inc:912
+#: ../lib/modules/posixAccount.inc:1155 ../lib/modules/inetOrgPerson.inc:70
+#: ../lib/modules/inetOrgPerson.inc:224 ../lib/modules/inetOrgPerson.inc:330
+#: ../lib/modules/inetOrgPerson.inc:517 ../lib/modules/inetOrgPerson.inc:706
+#: ../lib/lists.inc:305
 msgid "User name"
 msgstr "ユーザ名"
 
-#: ../lib/modules/posixAccount.inc:99 ../lib/modules/inetOrgPerson.inc:79
+#: ../lib/modules/posixAccount.inc:91 ../lib/modules/inetOrgPerson.inc:72
 msgid "User name already exists!"
 msgstr "ユーザ名はすでに存在しています!"
 
-#: ../lib/modules/posixAccount.inc:92 ../lib/modules/posixAccount.inc:97
-#: ../lib/modules/inetOrgPerson.inc:77 ../lib/modules/inetOrgPerson.inc:78
+#: ../lib/modules/account.inc:110 ../lib/modules/account.inc:111
+#: ../lib/modules/account.inc:113 ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:89 ../lib/modules/inetOrgPerson.inc:70
+#: ../lib/modules/inetOrgPerson.inc:71
 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:95
+#: ../lib/modules/posixAccount.inc:87
 msgid "User name in use. Selected next free user name."
 msgstr "使用中のユーザ名です。次の空きユーザ名が選択されました。"
 
-#: ../lib/modules/posixAccount.inc:346 ../lib/modules/inetOrgPerson.inc:335
+#: ../lib/modules/posixAccount.inc:342 ../lib/modules/inetOrgPerson.inc:331
 msgid ""
 "User name of the user who should be created. Valid characters are: a-z,0-"
 "9, .-_. LAM does not allow a number as first character because useradd also "
@@ -4502,7 +4729,13 @@ msgid ""
 "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にログオンできません。"
+msgstr ""
+"作成しようとしているユーザのユーザ名。有効な文字は: a-z, 0-9 と .-_です。"
+"useraddコマンドで許されていないため、先頭文字に数字は使用できません。大文字 "
+"A-Zは、いくつかの問題を引き起こす可能性があるため使用できません。ユーザ名が既"
+"に使われていたならば、ユーザ名に番号が付加されます。この場合、次の空き番号が"
+"使われます。警告: 古いシステムでは、8文字より長いユーザ名で問題が発生します。"
+"16文字より長いユーザ名ではWindowsにログオンできません。"
 
 #: ../templates/profedit/profilemain.php:45
 msgid "User profiles"
@@ -4521,17 +4754,17 @@ msgid "UserSuffix is invalid!"
 msgstr "ユーザサフィックスが正しくありません!"
 
 #: ../templates/ou_edit.php:344 ../templates/main_header.php:81
-#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:73
-#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:145
+#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:65
+#: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:137
 #: ../help/help.inc:78
 msgid "Users"
 msgstr "ユーザ"
 
-#: ../lib/modules/posixGroup.inc:412
+#: ../lib/modules/posixGroup.inc:415
 msgid "Users who are member of the current group."
 msgstr "このグループに属するユーザ。"
 
-#: ../lib/modules/posixGroup.inc:416
+#: ../lib/modules/posixGroup.inc:419
 msgid ""
 "Users who will become member of the current group. User names are separated "
 "by semicolons."
@@ -4547,38 +4780,42 @@ msgstr "テンプレートを使用:"
 msgid "Valid users"
 msgstr "有効なユーザ"
 
-#: ../templates/delete.php:181 ../lib/modules.inc:1575
+#: ../templates/delete.php:184 ../lib/modules.inc:1569
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "DN %s に属性を追加できませんでした。"
 
-#: ../lib/modules.inc:1537 ../lib/modules.inc:1549
+#: ../lib/modules.inc:1531 ../lib/modules.inc:1543
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "DN %s を作成できませんでした。"
 
-#: ../templates/tree/delete.php:109 ../templates/delete.php:218
-#: ../lib/modules.inc:1530
+#: ../templates/tree/delete.php:109 ../templates/delete.php:221
+#: ../lib/modules.inc:1524
 #, php-format
 msgid "Was unable to delete DN: %s."
 msgstr "DN %s を削除できませんでした。"
 
 #: ../templates/tree/update.php:105 ../templates/tree/add_oclass.php:89
-#: ../templates/tree/add_oclass_form.php:155 ../templates/delete.php:172
-#: ../lib/modules.inc:1565
+#: ../templates/tree/add_oclass_form.php:158 ../templates/delete.php:175
+#: ../lib/modules.inc:1559
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "DN %s の属性を変更できませんでした。"
 
-#: ../templates/delete.php:190 ../lib/modules.inc:1585
+#: ../templates/delete.php:193 ../lib/modules.inc:1579
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "DN %s の属性を削除できませんでした。"
 
-#: ../lib/modules/sambaSamAccount.inc:885
+#: ../lib/modules/sambaSamAccount.inc:916
 msgid "Wednesday"
 msgstr "水曜日"
 
+#: ../lib/modules/sambaSamAccount.inc:240
+msgid "Western Europe Time, London, Lisbon"
+msgstr ""
+
 #: ../help/help.inc:58
 msgid ""
 "When using ldaps:// be sure to use exactly the same IP/domain name as in "
@@ -4587,37 +4824,41 @@ msgstr ""
 "ldaps:// を使う時は、証明書のIP/ドメイン名と正確に一致するものを使用してくだ"
 "さい。"
 
-#: ../lib/modules/sambaAccount.inc:393 ../lib/modules/sambaSamAccount.inc:218
+#: ../lib/modules/sambaAccount.inc:400 ../lib/modules/sambaSamAccount.inc:231
 msgid "Windows domain name of account."
 msgstr "アカウントのWindowsドメイン名"
 
-#: ../lib/modules/sambaAccount.inc:300 ../lib/modules/sambaAccount.inc:765
-#: ../lib/modules/sambaSamAccount.inc:328
-#: ../lib/modules/sambaSamAccount.inc:796
-#: ../lib/modules/sambaSamAccount.inc:1107
-#: ../lib/modules/sambaGroupMapping.inc:189
-#: ../lib/modules/sambaGroupMapping.inc:315
+#: ../lib/modules/sambaAccount.inc:301 ../lib/modules/sambaAccount.inc:783
+#: ../lib/modules/sambaSamAccount.inc:352
+#: ../lib/modules/sambaSamAccount.inc:835
+#: ../lib/modules/sambaSamAccount.inc:1139
+#: ../lib/modules/sambaGroupMapping.inc:184
+#: ../lib/modules/sambaGroupMapping.inc:305
 msgid "Windows group"
 msgstr "Windowsグループ"
 
-#: ../lib/modules/sambaAccount.inc:386
+#: ../lib/modules/sambaAccount.inc:393
 msgid "Windows group RID"
 msgstr "WindowsグループRID"
 
-#: ../lib/modules/sambaAccount.inc:383
-#: ../lib/modules/sambaGroupMapping.inc:288
+#: ../lib/modules/sambaAccount.inc:390
+#: ../lib/modules/sambaGroupMapping.inc:278
 msgid "Windows group name"
 msgstr "Windowsグループ名"
 
-#: ../lib/modules/sambaGroupMapping.inc:301
+#: ../lib/modules/sambaGroupMapping.inc:291
 msgid "Windows group type."
 msgstr "Windowsグループタイプ"
 
-#: ../lib/modules/sambaSamAccount.inc:207
+#: ../lib/modules/sambaSamAccount.inc:214
+msgid "Windows primary group"
+msgstr "Windowsプライマリグループ"
+
+#: ../lib/modules/sambaSamAccount.inc:217
 msgid "Windows primary group SID"
 msgstr "WindowsプライマリグループSID"
 
-#: ../lib/modules/sambaGroupMapping.inc:297
+#: ../lib/modules/sambaGroupMapping.inc:287
 msgid "Windows-Domain name of group."
 msgstr "グループのWindowsドメイン名。"
 
@@ -4626,7 +4867,7 @@ msgstr "グループのWindowsドメイン名。"
 msgid "Wrong or missing type!"
 msgstr "タイプが間違っているか、または抜けています!"
 
-#: ../templates/login.php:355
+#: ../templates/login.php:346
 msgid "Wrong password/user name combination. Please try again."
 msgstr "誤ったパスワード/ユーザ名の組み合わせです。やり直してください。"
 
@@ -4635,7 +4876,7 @@ msgstr "誤ったパスワード/ユーザ名の組み合わせです。やり
 msgid "Yes"
 msgstr "はい"
 
-#: ../lib/modules/posixGroup.inc:487
+#: ../lib/modules/posixGroup.inc:479
 msgid ""
 "You are using a capital letters. This can cause problems because Windows "
 "isn't case-sensitive."
@@ -4643,7 +4884,8 @@ msgstr ""
 "大文字が使われています。Windowsは大文字と小文字を区別しないため、これが原因で"
 "問題が発生する場合があります。"
 
-#: ../lib/modules/posixAccount.inc:91 ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/account.inc:112 ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/posixAccount.inc:85
 msgid ""
 "You are using a capital letters. This can cause problems because windows "
 "isn't case-sensitive."
@@ -4651,7 +4893,11 @@ msgstr ""
 "大文字が使われています。Windowsは大文字と小文字を区別しないため、これが原因で"
 "問題が発生する場合があります。"
 
-#: ../lib/modules/posixGroup.inc:478 ../lib/modules/posixAccount.inc:88
+#: ../lib/modules/posixAccount.inc:80
+msgid "You cannot use these password options at the same time."
+msgstr "これらのパスワードオプションは同時に指定できません。"
+
+#: ../lib/modules/posixGroup.inc:470
 msgid "You cannot use this password options at the same time."
 msgstr "このパスワードオプションは同時に指定できません。"
 
@@ -4663,7 +4909,7 @@ msgstr ""
 "このオブジェクトに対するオブジェクトクラスが選択されていません。前に戻って選"
 "択してください。"
 
-#: ../templates/logout.php:70
+#: ../templates/logout.php:72
 msgid "You have been logged off from LDAP Account Manager."
 msgstr "LDAP Account Managerからログオフしました。"
 
@@ -4693,11 +4939,11 @@ msgstr ""
 msgid "[attribute deleted]"
 msgstr "[削除された属性]"
 
-#: ../lib/modules/sambaAccount.inc:278 ../lib/modules/sambaSamAccount.inc:306
+#: ../lib/modules/sambaAccount.inc:279 ../lib/modules/sambaSamAccount.inc:330
 msgid "\\\\server\\homes\\smiller"
 msgstr ""
 
-#: ../lib/modules/sambaAccount.inc:284 ../lib/modules/sambaSamAccount.inc:312
+#: ../lib/modules/sambaAccount.inc:285 ../lib/modules/sambaSamAccount.inc:336
 msgid "\\\\server\\profiles\\smiller"
 msgstr ""
 
@@ -4705,7 +4951,7 @@ msgstr ""
 msgid "add value"
 msgstr "値の追加"
 
-#: ../lib/modules/posixGroup.inc:367
+#: ../lib/modules/posixGroup.inc:370
 msgid "adminstrators"
 msgstr ""
 
@@ -4732,9 +4978,9 @@ msgstr "属性の削除"
 msgid "download value"
 msgstr "ダウンロード"
 
-#: ../lib/modules/inetOrgPerson.inc:63 ../lib/modules/inetOrgPerson.inc:210
-#: ../lib/modules/inetOrgPerson.inc:326 ../lib/modules/inetOrgPerson.inc:327
-#: ../lib/modules/inetOrgPerson.inc:545 ../lib/modules/inetOrgPerson.inc:614
+#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:206
+#: ../lib/modules/inetOrgPerson.inc:322 ../lib/modules/inetOrgPerson.inc:323
+#: ../lib/modules/inetOrgPerson.inc:594 ../lib/modules/inetOrgPerson.inc:704
 msgid "eMail address"
 msgstr "電子メールアドレス"
 
@@ -4742,12 +4988,12 @@ msgstr "電子メールアドレス"
 msgid "false"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:218
+#: ../lib/modules/posixAccount.inc:210
 msgid "group01,group02"
 msgstr ""
 
 #: ../lib/modules/quota.inc:146 ../lib/modules/quota.inc:148
-#: ../lib/modules/quota.inc:215 ../lib/modules/quota.inc:217
+#: ../lib/modules/quota.inc:214 ../lib/modules/quota.inc:216
 msgid "hours"
 msgstr "時間"
 
@@ -4771,17 +5017,17 @@ msgstr ""
 "ldaps://141.40.146.133 は、141.40.146.133 へ暗号化されたLDAP接続を行ないま"
 "す。"
 
-#: ../lib/modules/posixAccount.inc:278
+#: ../lib/modules/posixAccount.inc:270
 msgid "machines"
 msgstr "マシン"
 
-#: ../lib/modules/sambaAccount.inc:316 ../lib/modules/sambaAccount.inc:326
-#: ../lib/modules/sambaSamAccount.inc:236
-#: ../lib/modules/sambaSamAccount.inc:355
+#: ../lib/modules/sambaAccount.inc:317 ../lib/modules/sambaAccount.inc:327
+#: ../lib/modules/sambaSamAccount.inc:260
+#: ../lib/modules/sambaSamAccount.inc:379
 msgid "mydomain"
 msgstr "マイドメイン"
 
-#: ../lib/modules/sambaSamAccount.inc:330
+#: ../lib/modules/sambaSamAccount.inc:354
 msgid "mygroup"
 msgstr "マイグループ"
 
@@ -4815,19 +5061,20 @@ msgstr ""
 "ou=People,dc=yourcompany,dc=com は、このサブツリーのすべてのアカウントを読み"
 "書きします。"
 
-#: ../lib/modules/posixAccount.inc:264
+#: ../lib/modules/posixAccount.inc:256
 msgid "pc01$"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:285
+#: ../lib/modules/posixAccount.inc:277
 msgid "pc01,Room 2.34"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:242
+#: ../lib/modules/inetOrgPerson.inc:238
 msgid "pc01,pc02"
 msgstr ""
 
 #: ../templates/tree/edit.php:241 ../templates/config/confmain.php:494
+#: ../lib/modules.inc:1066
 msgid "required"
 msgstr "必須"
 
@@ -4835,13 +5082,13 @@ msgstr "必須"
 msgid "required for Samba 3 accounts"
 msgstr "Samba 3アカウントにおいて必須"
 
-#: ../lib/modules/posixGroup.inc:393 ../lib/modules/sambaAccount.inc:220
-#: ../lib/modules/sambaSamAccount.inc:248 ../lib/modules/posixAccount.inc:239
+#: ../lib/modules/posixGroup.inc:396 ../lib/modules/sambaAccount.inc:221
+#: ../lib/modules/sambaSamAccount.inc:272 ../lib/modules/posixAccount.inc:231
 msgid "secret"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:191 ../lib/modules/inetOrgPerson.inc:230
-#: ../lib/modules/nisMailAlias.inc:84
+#: ../lib/modules/posixAccount.inc:183 ../lib/modules/inetOrgPerson.inc:226
+#: ../lib/modules/nisMailAlias.inc:86
 msgid "smiller"
 msgstr ""
 
@@ -4853,18 +5100,21 @@ msgstr "構造型"
 msgid "true"
 msgstr ""
 
-#: ../lib/modules/posixGroup.inc:387
+#: ../lib/modules/posixGroup.inc:390
 msgid "user01,user02,user03"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:212
+#: ../lib/modules/inetOrgPerson.inc:208
 msgid "user@company.com"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:211
+#: ../lib/modules/posixAccount.inc:203
 msgid "users"
 msgstr "ユーザ"
 
+#~ msgid "Inserted user or group name in script path."
+#~ msgstr "スクリプトパスにユーザ又はグループ名を挿入しました。"
+
 #~ msgid "Account expire date. Format: DD-MM-YYYY"
 #~ msgstr "アカウント有効期限。形式は: DD-MM-YYYY"
 
@@ -4936,13 +5186,6 @@ msgstr "ユーザ"
 #~ msgid "Left"
 #~ msgstr "左"
 
-#~ msgid ""
-#~ "List of Samba workstations the user is allowed to login. Empty means "
-#~ "every workstation."
-#~ msgstr ""
-#~ "ユーザがログインできるSambaワークステーションのリスト。未記入はすべての"
-#~ "ワークステーションを意味します。"
-
 #~ msgid "Margin"
 #~ msgstr "余白"