diff --git a/lam/locale/ja_JP/LC_MESSAGES/messages.mo b/lam/locale/ja_JP/LC_MESSAGES/messages.mo
index cf634b72..f7081f6f 100644
Binary files a/lam/locale/ja_JP/LC_MESSAGES/messages.mo and b/lam/locale/ja_JP/LC_MESSAGES/messages.mo differ
diff --git a/lam/locale/ja_JP/LC_MESSAGES/messages.po b/lam/locale/ja_JP/LC_MESSAGES/messages.po
index fdcb60b5..128670aa 100644
--- a/lam/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/lam/locale/ja_JP/LC_MESSAGES/messages.po
@@ -8,16 +8,16 @@ 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-06-10 16:31+0900\n"
+"PO-Revision-Date: 2005-08-16 14:38+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:320
-msgid "$user and $group are replaced with username or primary groupname."
-msgstr "$user と $group はユーザ名とプライマリグループ名に置き換えられます。"
+#: ../lib/modules/posixAccount.inc:358
+msgid "$user and $group are replaced with user name or primary group name."
+msgstr "$user と $group はユーザ名またはプライマリグループ名に置き換えられます。"
 
 #: ../templates/lists/listdomains.php:145
 #: ../templates/lists/listdomains.php:195
@@ -25,17 +25,17 @@ msgstr "$user と $group はユーザ名とプライマリグループ名に置
 msgid "%s Samba domain(s) found"
 msgstr "%s個のSambaドメインが見つかりました"
 
-#: ../templates/lists/listgroups.php:148 ../templates/lists/listgroups.php:224
+#: ../templates/lists/listgroups.php:148 ../templates/lists/listgroups.php:225
 #, php-format
 msgid "%s group(s) found"
 msgstr "%s個のグループが見つかりました"
 
-#: ../templates/lists/listhosts.php:148 ../templates/lists/listhosts.php:208
+#: ../templates/lists/listhosts.php:148 ../templates/lists/listhosts.php:209
 #, php-format
 msgid "%s host(s) found"
 msgstr "%s個のSamba ホストが見つかりました"
 
-#: ../templates/lists/listusers.php:179 ../templates/lists/listusers.php:254
+#: ../templates/lists/listusers.php:179 ../templates/lists/listusers.php:255
 #, php-format
 msgid "%s user(s) found"
 msgstr "%s名のユーザが見つかりました"
@@ -56,7 +56,7 @@ msgstr "(このエントリに対して有効な新しい属性はありませ
 msgid "(no new binary attributes available for this entry)"
 msgstr "(このエントリに対して有効な新しいバイナリ属性はありません)"
 
-#: ../lib/modules/posixAccount.inc:199
+#: ../lib/modules/posixAccount.inc:224
 msgid "/home/smiller"
 msgstr ""
 
@@ -64,56 +64,74 @@ msgstr ""
 msgid "A required column is missing in your CSV file."
 msgstr "CSVファイル中の必須カラムが不足しています。"
 
-#: ../templates/ou_edit.php:95 ../templates/ou_edit.php:160
-#: ../templates/ou_edit.php:225 ../templates/ou_edit.php:290
+#: ../lib/modules/kolabUser.inc:131
+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)を使用する場合にチェックします。"
+
+#: ../templates/ou_edit.php:103 ../templates/ou_edit.php:168
+#: ../templates/ou_edit.php:233 ../templates/ou_edit.php:298
 #: ../templates/config/confmodules.php:104
 #: ../templates/config/confmain.php:485 ../templates/pdfedit/pdfdelete.php:82
-#: ../templates/pdfedit/pdfpage.php:834 ../templates/pdfedit/pdfmain.php:144
+#: ../templates/pdfedit/pdfpage.php:772 ../templates/pdfedit/pdfmain.php:153
 #: ../templates/profedit/profiledelete.php:85
-#: ../templates/profedit/profilepage.php:164
+#: ../templates/profedit/profilepage.php:246
 #: ../templates/profedit/profilemain.php:157
+#: ../lib/modules/sambaSamAccount.inc:946
 msgid "Abort"
 msgstr "中止"
 
-#: ../lib/modules/account.inc:35
+#: ../lib/modules/account.inc:50
 msgid "Account"
 msgstr "アカウント"
 
-#: ../templates/massBuildAccounts.php:164 ../lib/modules/ieee802device.inc:84
-#: ../lib/modules/posixGroup.inc:470 ../lib/modules/posixGroup.inc:474
-#: ../lib/modules/posixGroup.inc:475 ../lib/modules/sambaAccount.inc:48
-#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaAccount.inc:54
-#: ../lib/modules/sambaAccount.inc:56 ../lib/modules/sambaAccount.inc:58
-#: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaAccount.inc:64
-#: ../lib/modules/sambaAccount.inc:65 ../lib/modules/sambaAccount.inc:66
-#: ../lib/modules/sambaAccount.inc:67 ../lib/modules/sambaAccount.inc:68
-#: ../lib/modules/sambaAccount.inc:69 ../lib/modules/sambaAccount.inc:70
-#: ../lib/modules/sambaAccount.inc:71 ../lib/modules/sambaAccount.inc:72
-#: ../lib/modules/sambaAccount.inc:73 ../lib/modules/sambaSamAccount.inc:46
-#: ../lib/modules/sambaSamAccount.inc:49 ../lib/modules/sambaSamAccount.inc:52
-#: ../lib/modules/sambaSamAccount.inc:54 ../lib/modules/sambaSamAccount.inc:57
-#: ../lib/modules/sambaSamAccount.inc:60 ../lib/modules/sambaSamAccount.inc:61
-#: ../lib/modules/sambaSamAccount.inc:62 ../lib/modules/sambaSamAccount.inc:63
-#: ../lib/modules/sambaSamAccount.inc:64 ../lib/modules/sambaSamAccount.inc:65
-#: ../lib/modules/sambaSamAccount.inc:66 ../lib/modules/sambaSamAccount.inc:67
-#: ../lib/modules/sambaSamAccount.inc:68 ../lib/modules/sambaSamAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:70 ../lib/modules/sambaSamAccount.inc:71
-#: ../lib/modules/sambaSamAccount.inc:72 ../lib/modules/posixAccount.inc:66
-#: ../lib/modules/posixAccount.inc:70 ../lib/modules/posixAccount.inc:74
-#: ../lib/modules/posixAccount.inc:82 ../lib/modules/posixAccount.inc:83
-#: ../lib/modules/posixAccount.inc:84 ../lib/modules/posixAccount.inc:85
-#: ../lib/modules/posixAccount.inc:86 ../lib/modules/posixAccount.inc:87
-#: ../lib/modules/posixAccount.inc:88 ../lib/modules/sambaGroupMapping.inc:352
-#: ../lib/modules/sambaGroupMapping.inc:353
-#: ../lib/modules/shadowAccount.inc:40 ../lib/modules/shadowAccount.inc:42
-#: ../lib/modules/shadowAccount.inc:44 ../lib/modules/shadowAccount.inc:46
-#: ../lib/modules/shadowAccount.inc:48 ../lib/modules/shadowAccount.inc:49
-#: ../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:73 ../lib/modules/inetOrgPerson.inc:74
+#: ../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
+#: ../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/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/inetLocalMailRecipient.inc:120
 #: ../lib/modules/inetLocalMailRecipient.inc:122
 #: ../lib/modules/inetLocalMailRecipient.inc:124
@@ -126,33 +144,33 @@ msgstr "アカウント %s"
 msgid "Account creation via file upload"
 msgstr "ファイルアップロードによるアカウント作成"
 
-#: ../lib/modules/shadowAccount.inc:163
+#: ../lib/modules/posixAccount.inc:369
+msgid "Account deactivated"
+msgstr "アカウントが無効化されました"
+
+#: ../lib/modules/shadowAccount.inc:175
 msgid "Account expiration date. Format: DD-MM-YYYY"
 msgstr "アカウント有効期限。形式は: DD-MM-YYYY"
 
-#: ../help/help.inc:181
-msgid "Account expire date. Format: DD-MM-YYYY"
-msgstr "アカウント有効期限。形式は: DD-MM-YYYY"
-
-#: ../lib/modules/shadowAccount.inc:340
+#: ../lib/modules/shadowAccount.inc:352
 msgid "Account inactive"
 msgstr "アカウントが無効です"
 
-#: ../lib/modules/sambaAccount.inc:116 ../lib/modules/sambaAccount.inc:234
-#: ../lib/modules/sambaAccount.inc:343 ../lib/modules/sambaAccount.inc:346
-#: ../lib/modules/sambaAccount.inc:704 ../lib/modules/sambaSamAccount.inc:158
-#: ../lib/modules/sambaSamAccount.inc:161
-#: ../lib/modules/sambaSamAccount.inc:250
-#: ../lib/modules/sambaSamAccount.inc:690
-#: ../lib/modules/sambaSamAccount.inc:843 ../help/help.inc:206
+#: ../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
 msgid "Account is deactivated"
 msgstr "無効なアカウント"
 
-#: ../help/help.inc:130
+#: ../help/help.inc:129
 msgid "Account lists - Filters"
 msgstr "アカウント一覧 - フィルター"
 
-#: ../templates/config/confmain.php:252 ../help/help.inc:112
+#: ../templates/config/confmain.php:252 ../help/help.inc:111
 msgid "Account modules"
 msgstr "アカウントモジュール"
 
@@ -160,11 +178,11 @@ msgstr "アカウントモジュール"
 msgid "Account name:"
 msgstr "アカウント名:"
 
-#: ../lib/modules.inc:940
+#: ../lib/modules.inc:959
 msgid "Account was created successfully."
 msgstr "アカウントが作成されました。"
 
-#: ../lib/modules.inc:943
+#: ../lib/modules.inc:962
 msgid "Account was modified successfully."
 msgstr "アカウントが変更されました。"
 
@@ -173,17 +191,15 @@ msgstr "アカウントが変更されました。"
 #: ../templates/tree/add_oclass_form.php:137
 #: ../templates/tree/add_attr_form.php:129
 #: ../templates/tree/add_attr_form.php:161
-#: ../templates/pdfedit/pdfpage.php:725 ../lib/modules/ieee802device.inc:153
+#: ../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/inetLocalMailRecipient.inc:215
 #: ../lib/modules/nisMailAlias.inc:181
 msgid "Add"
 msgstr "追加"
 
-#: ../templates/pdfedit/pdfpage.php:713
-msgid "Add after"
-msgstr "後ろに追加"
-
-#: ../templates/tree/edit.php:123 ../templates/tree/add_value_form.php:94
+#: ../templates/tree/edit.php:126 ../templates/tree/add_value_form.php:94
 #: ../templates/tree/add_attr_form.php:71
 #: ../templates/tree/add_attr_form.php:108
 #, php-format
@@ -194,11 +210,11 @@ msgstr "新しい属性の追加"
 msgid "Add new binary attribute"
 msgstr "新しいバイナリ属性の追加"
 
-#: ../templates/config/profmanage.php:172 ../help/help.inc:114
+#: ../templates/config/profmanage.php:172 ../help/help.inc:113
 msgid "Add profile"
 msgstr "プロファイル追加"
 
-#: ../templates/pdfedit/pdfpage.php:699
+#: ../templates/pdfedit/pdfpage.php:653
 msgid "Add section or static text"
 msgstr "セクションまた静的テキストを追加"
 
@@ -206,28 +222,22 @@ msgstr "セクションまた静的テキストを追加"
 msgid "Adding attribute failed!"
 msgstr "属性の追加に失敗しました!"
 
-#: ../lib/modules/posixAccount.inc:191 ../lib/modules/posixAccount.inc:336
-#: ../lib/modules/posixAccount.inc:856 ../lib/modules/posixAccount.inc:944
-#: ../lib/modules/posixAccount.inc:1008 ../lib/modules/posixAccount.inc:1085
-#: ../help/help.inc:148
+#: ../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
 msgid "Additional groups"
 msgstr "追加のグループ"
 
-#: ../templates/massDoUpload.php:98
+#: ../templates/massDoUpload.php:99
 msgid "Additional tasks for module:"
 msgstr "モジュールに対する追加タスク:"
 
-#: ../lib/modules/sambaSamAccount.inc:545
-#: ../lib/modules/sambaSamAccount.inc:748
-#: ../lib/modules/sambaSamAccount.inc:751
-msgid "Administrator"
-msgstr "管理者"
-
-#: ../lib/modules/posixGroup.inc:366
+#: ../lib/modules/posixGroup.inc:381
 msgid "Administrators group"
 msgstr "管理者グループ"
 
-#: ../templates/domain.php:171 ../help/help.inc:259
+#: ../templates/domain.php:171 ../help/help.inc:162
 msgid "Algorithmic RID Base"
 msgstr "アルゴリズム的なRIDベース"
 
@@ -240,7 +250,7 @@ msgstr "アルゴリズム的なRIDベースが数字でありません!"
 msgid "Alias name"
 msgstr "別名"
 
-#: ../templates/schema/schema.php:232
+#: ../templates/schema/schema.php:230
 msgid "Aliases"
 msgstr "別名"
 
@@ -252,18 +262,30 @@ msgstr "すべての変更が成功しました。"
 msgid "Allowed hosts"
 msgstr "許可されたホスト"
 
-#: ../lib/modules/sambaAccount.inc:810 ../lib/modules/sambaAccount.inc:811
-#: ../lib/modules/sambaSamAccount.inc:798
-#: ../lib/modules/sambaSamAccount.inc:799
+#: ../lib/modules/sambaAccount.inc:816 ../lib/modules/sambaAccount.inc:817
+#: ../lib/modules/sambaSamAccount.inc:861
+#: ../lib/modules/sambaSamAccount.inc:862
 msgid "Allowed workstations"
 msgstr "許可されたワークステーション"
 
-#: ../templates/tree/edit.php:135
+#: ../lib/modules/kolabUser.inc:51
+msgid "Always accept"
+msgstr "常に許可"
+
+#: ../lib/modules/kolabUser.inc:52
+msgid "Always reject"
+msgstr "常に拒否"
+
+#: ../templates/tree/edit.php:138
 #, php-format
 msgid "An attribute (%s) was modified and is highlighted below."
 msgstr "属性(%s)が変更され、ハイライト表示されています。"
 
-#: ../templates/lists/listusers.php:274
+#: ../lib/modules/kolabUser.inc:345 ../lib/modules/kolabUser.inc:801
+msgid "Anyone"
+msgstr "誰か"
+
+#: ../templates/lists/listusers.php:275
 msgid "Apply"
 msgstr "適用"
 
@@ -275,7 +297,7 @@ msgstr "本当にこのオブジェクトを削除しますか?"
 msgid "Attribute"
 msgstr "属性"
 
-#: ../templates/schema/schema.php:75 ../templates/schema/schema.php:76
+#: ../templates/schema/schema.php:73 ../templates/schema/schema.php:74
 msgid "Attribute types"
 msgstr "属性タイプ"
 
@@ -291,11 +313,11 @@ msgstr "ホストリスト中の属性"
 msgid "Attributes in User List"
 msgstr "ユーザリスト中の属性"
 
-#: ../templates/pdfedit/pdfpage.php:852
+#: ../templates/pdfedit/pdfpage.php:602
 msgid "Available PDF fields"
 msgstr "有効なPDFフィールド"
 
-#: ../lib/modules/posixAccount.inc:956
+#: ../lib/modules/posixAccount.inc:1038
 msgid "Available groups"
 msgstr "有効なグループ"
 
@@ -303,27 +325,27 @@ msgstr "有効なグループ"
 msgid "Available modules"
 msgstr "有効なモジュール"
 
-#: ../lib/modules/posixGroup.inc:238
+#: ../lib/modules/posixGroup.inc:253
 msgid "Available users"
 msgstr "有効なユーザ"
 
-#: ../lib/modules/sambaAccount.inc:816 ../lib/modules/sambaSamAccount.inc:804
+#: ../lib/modules/sambaAccount.inc:822 ../lib/modules/sambaSamAccount.inc:867
 msgid "Available workstations"
 msgstr "有効なワークステーション"
 
-#: ../templates/tree/update_confirm.php:251 ../lib/modules/posixGroup.inc:244
-#: ../lib/modules/posixGroup.inc:268 ../lib/modules/sambaAccount.inc:820
-#: ../lib/modules/sambaSamAccount.inc:808 ../lib/modules/posixAccount.inc:962
-#: ../lib/modules/posixAccount.inc:988
+#: ../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
 msgid "Back"
 msgstr "戻る"
 
-#: ../templates/config/confsave.php:254 ../templates/config/conflogin.php:151
+#: ../templates/config/confsave.php:254 ../templates/config/conflogin.php:162
 #: ../templates/logout.php:71
 msgid "Back to Login"
 msgstr "ログインに戻る"
 
-#: ../templates/ou_edit.php:309 ../templates/ou_edit.php:313
+#: ../templates/ou_edit.php:317 ../templates/ou_edit.php:321
 msgid "Back to OU-Editor"
 msgstr "OU-エディタに戻る"
 
@@ -332,14 +354,14 @@ msgstr "OU-エディタに戻る"
 msgid "Back to PDF Editor"
 msgstr "PDFエディタに戻る"
 
-#: ../templates/profedit/profilecreate.php:115
 #: ../templates/profedit/profiledelete.php:63
 #: ../templates/profedit/profiledelete.php:71
 #: ../templates/profedit/profiledelete.php:93
+#: ../templates/profedit/profilepage.php:120
 msgid "Back to Profile Editor"
 msgstr "プロファイルエディタに戻る"
 
-#: ../lib/modules.inc:953
+#: ../lib/modules.inc:971
 msgid "Back to account list"
 msgstr "アカウント一覧に戻る"
 
@@ -372,55 +394,59 @@ msgstr "プリファレンスに戻る..."
 msgid "Back to profile login"
 msgstr "プロファイルログインに戻る"
 
-#: ../templates/config/confmodules.php:108 ../help/help.inc:128
+#: ../templates/tree/export_form.php:73
+msgid "Base (base DN only)"
+msgstr "Base (ベースDNのみ)"
+
+#: ../templates/tree/export_form.php:98
+msgid "Base DN"
+msgstr "ベースDN"
+
+#: ../templates/config/confmodules.php:108 ../help/help.inc:127
 msgid "Base module"
 msgstr "ベースモジュール"
 
-#: ../templates/pdfedit/pdfpage.php:577
+#: ../templates/pdfedit/pdfpage.php:454
 msgid "Beginning"
 msgstr "先頭"
 
-#: ../templates/tree/edit.php:168 ../templates/tree/edit.php:297
+#: ../templates/tree/edit.php:171 ../templates/tree/edit.php:300
 msgid "Binary value"
 msgstr "バイナリ値"
 
-#: ../lib/modules/quota.inc:31
+#: ../lib/modules/quota.inc:47
 msgid "Block hard quota"
 msgstr "ブロック・ハードクオータ"
 
-#: ../lib/modules/quota.inc:31
+#: ../lib/modules/quota.inc:47 ../lib/modules/quota.inc:48
 msgid ""
 "Block hard quota contains invalid characters. Only natural numbers are "
 "allowed."
 msgstr ""
 "ブロック・ハードクォータに不正な文字が含まれています。自然数のみが有効です。"
 
-#: ../lib/modules/quota.inc:34
+#: ../lib/modules/quota.inc:53
 msgid "Block quota"
 msgstr "ブロック・クオータ"
 
-#: ../lib/modules/quota.inc:30
+#: ../lib/modules/quota.inc:45
 msgid "Block soft quota"
 msgstr "ブロック・ソフトクオータ"
 
-#: ../lib/modules/quota.inc:30
+#: ../lib/modules/quota.inc:45 ../lib/modules/quota.inc:46
 msgid ""
 "Block soft quota contains invalid characters. Only natural numbers are "
 "allowed."
 msgstr ""
 "ブロック・ソフトクオータに不正な文字が含まれています。自然数のみが有効です。"
 
-#: ../lib/modules/quota.inc:34
+#: ../lib/modules/quota.inc:53 ../lib/modules/quota.inc:54
 msgid "Block soft quota must be smaller than block hard quota."
 msgstr ""
 "ブロック・ソフトクオータはブロック・ハードクオータより小さくなくてはなりませ"
 "ん。"
 
-#: ../templates/pdfedit/pdfpage.php:524
-msgid "Bottom"
-msgstr "末尾"
-
-#: ../lib/modules/sambaGroupMapping.inc:55
+#: ../lib/modules/sambaGroupMapping.inc:70
 msgid "Builtin Group"
 msgstr "既定のグループ"
 
@@ -429,7 +455,7 @@ msgid "CSV file:"
 msgstr "CSVファイル:"
 
 #: ../templates/config/confmain.php:231 ../lib/config.inc:357
-#: ../help/help.inc:108
+#: ../help/help.inc:107
 msgid "Cache timeout"
 msgstr "キャッシュ有効時間"
 
@@ -437,21 +463,16 @@ msgstr "キャッシュ有効時間"
 msgid "Cache timeout is invalid!"
 msgstr "キャッシュ有効時間が正しくありません。"
 
-#: ../lib/modules/posixGroup.inc:397 ../lib/modules/sambaAccount.inc:358
-#: ../lib/modules/sambaAccount.inc:361 ../lib/modules/sambaAccount.inc:364
-#: ../lib/modules/sambaAccount.inc:367 ../lib/modules/sambaAccount.inc:379
-#: ../lib/modules/sambaSamAccount.inc:173
-#: ../lib/modules/sambaSamAccount.inc:176
-#: ../lib/modules/sambaSamAccount.inc:179
-#: ../lib/modules/sambaSamAccount.inc:182 ../lib/modules/posixAccount.inc:337
-#: ../lib/modules/sambaGroupMapping.inc:282
-#: ../lib/modules/shadowAccount.inc:147 ../lib/modules/shadowAccount.inc:151
-#: ../lib/modules/shadowAccount.inc:155 ../lib/modules/shadowAccount.inc:159
-#: ../help/help.inc:149 ../help/help.inc:173 ../help/help.inc:175
-#: ../help/help.inc:177 ../help/help.inc:179 ../help/help.inc:211
-#: ../help/help.inc:213 ../help/help.inc:215 ../help/help.inc:217
-#: ../help/help.inc:219 ../help/help.inc:225 ../help/help.inc:235
-#: ../help/help.inc:237 ../help/help.inc:239
+#: ../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
 msgid "Can be left empty."
 msgstr "省略可"
 
@@ -459,10 +480,11 @@ msgstr "省略可"
 #: ../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
 msgid "Cancel"
 msgstr "中止"
 
-#: ../templates/login.php:356 ../templates/login.php:361
+#: ../templates/login.php:345 ../templates/login.php:350
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "指定されたLDAPサーバに接続できません。再試行してください。"
 
@@ -470,28 +492,29 @@ msgstr "指定されたLDAPサーバに接続できません。再試行して
 msgid "Cannot open config file!"
 msgstr "configファイルをオープンできません!"
 
-#: ../templates/pdfedit/pdfpage.php:605 ../templates/pdfedit/pdfpage.php:611
+#: ../templates/pdfedit/pdfpage.php:498 ../templates/pdfedit/pdfpage.php:504
+#: ../lib/modules/sambaSamAccount.inc:951
 msgid "Change"
 msgstr "変更"
 
-#: ../lib/modules/posixGroup.inc:188
+#: ../lib/modules/posixGroup.inc:203
 msgid "Change GID number of users and hosts"
 msgstr "ユーザとホストのGID番号を変更"
 
-#: ../templates/config/profmanage.php:339 ../help/help.inc:122
+#: ../templates/config/profmanage.php:339 ../help/help.inc:121
 msgid "Change default profile"
 msgstr "デフォルト・プロファイルの変更"
 
-#: ../templates/config/profmanage.php:364 ../help/help.inc:124
+#: ../templates/config/profmanage.php:364 ../help/help.inc:123
 msgid "Change master password"
 msgstr "マスタパスワードの変更"
 
-#: ../lib/modules/posixGroup.inc:170 ../lib/modules/posixAccount.inc:884
-#: ../help/help.inc:106
+#: ../lib/modules/posixGroup.inc:185 ../lib/modules/posixAccount.inc:966
+#: ../help/help.inc:105
 msgid "Change password"
 msgstr "パスワードの変更"
 
-#: ../templates/login.php:292
+#: ../templates/login.php:281
 msgid "Change profile"
 msgstr "プロファイルの変更"
 
@@ -516,7 +539,7 @@ msgstr "テンプレートを選択"
 msgid "Click here if you are not directed to the next page."
 msgstr "自動的に次ページにジャンプしない場合はここをクリックしてください。"
 
-#: ../templates/schema/schema.php:205
+#: ../templates/schema/schema.php:203
 msgid "Collective"
 msgstr "集合属性"
 
@@ -524,7 +547,7 @@ msgstr "集合属性"
 msgid "Columns:"
 msgstr "カラム:"
 
-#: ../lib/modules/sambaAccount.inc:367 ../lib/modules/sambaSamAccount.inc:182
+#: ../lib/modules/sambaAccount.inc:381 ../lib/modules/sambaSamAccount.inc:205
 msgid ""
 "Comma separated list of Samba workstations the user is allowed to login. "
 "Empty means every workstation."
@@ -532,32 +555,31 @@ msgstr ""
 "ユーザがログインできるSambaワークステーションのコンマ区切りリスト。空入力はす"
 "べてのワークステーションを意味します。"
 
-#: ../help/help.inc:235
-msgid "Comma separated list of unix workstations the user is allowed to login."
-msgstr ""
-"ユーザがログインする事を許可されたunixワークステーショおカンマ区切りリスト。"
-
 #: ../templates/tree/update_confirm.php:230
 msgid "Commit"
 msgstr "更新"
 
-#: ../lib/modules/inetOrgPerson.inc:123
+#: ../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
 msgid "Common name"
 msgstr "氏名(common name)"
 
-#: ../templates/login.php:130
+#: ../templates/login.php:135
 msgid "Configuration login"
 msgstr "構成設定ログイン"
 
-#: ../templates/login.php:274
+#: ../templates/login.php:263
 msgid "Configuration profile"
 msgstr "構成プロファイル"
 
-#: ../help/help.inc:46 ../help/help.inc:48 ../help/help.inc:60
-#: ../help/help.inc:66 ../help/help.inc:72 ../help/help.inc:87
-#: ../help/help.inc:92 ../help/help.inc:94 ../help/help.inc:96
-#: ../help/help.inc:101 ../help/help.inc:106 ../help/help.inc:108
-#: ../help/help.inc:110 ../help/help.inc:112 ../help/help.inc:128
+#: ../help/help.inc:45 ../help/help.inc:47 ../help/help.inc:59
+#: ../help/help.inc:65 ../help/help.inc:71 ../help/help.inc:86
+#: ../help/help.inc:91 ../help/help.inc:93 ../help/help.inc:95
+#: ../help/help.inc:100 ../help/help.inc:105 ../help/help.inc:107
+#: ../help/help.inc:109 ../help/help.inc:111 ../help/help.inc:127
 msgid "Configuration wizard"
 msgstr "構成設定ウィザード"
 
@@ -582,13 +604,27 @@ msgstr "ldap_modifyオペレーションを実行できません。"
 msgid "Could not rename file!"
 msgstr "ファイル名を変更できません!"
 
+#: ../templates/pdfedit/pdfpage.php:111
+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
+msgid "Country"
+msgstr "国"
+
+#: ../lib/modules/kolabUser.inc:226 ../lib/modules/kolabUser.inc:227
+msgid "Country name is invalid!"
+msgstr "国名が正しくありません!"
+
 #: ../templates/tree/templates/creation/custom.php:234
 #: ../templates/tree/templates/creation/new_ou_template.php:107
 #: ../templates/initsuff.php:187
 msgid "Create"
 msgstr "作成"
 
-#: ../lib/modules.inc:993
+#: ../lib/modules.inc:1020
 msgid "Create Account"
 msgstr "アカウント作成"
 
@@ -597,35 +633,35 @@ msgstr "アカウント作成"
 msgid "Create Object"
 msgstr "オブジェクト作成"
 
-#: ../lib/modules.inc:952
+#: ../lib/modules.inc:979
 msgid "Create PDF file"
 msgstr "PDFファイル作成"
 
-#: ../templates/lists/listgroups.php:249
+#: ../templates/lists/listgroups.php:250
 msgid "Create PDF for all groups"
 msgstr "全グループのPDFファイル作成"
 
-#: ../templates/lists/listhosts.php:234
+#: ../templates/lists/listhosts.php:235
 msgid "Create PDF for all hosts"
 msgstr "全ホストのPDFファイル作成"
 
-#: ../templates/lists/listusers.php:294
+#: ../templates/lists/listusers.php:295
 msgid "Create PDF for all users"
 msgstr "全ユーザのPDFファイル作成"
 
-#: ../templates/lists/listgroups.php:247
+#: ../templates/lists/listgroups.php:248
 msgid "Create PDF for selected group(s)"
 msgstr "選択されたグループのPDFファイル作成"
 
-#: ../templates/lists/listhosts.php:232
+#: ../templates/lists/listhosts.php:233
 msgid "Create PDF for selected host(s)"
 msgstr "選択されたホストのPDFファイル作成"
 
-#: ../templates/lists/listusers.php:292
+#: ../templates/lists/listusers.php:293
 msgid "Create PDF for selected user(s)"
 msgstr "選択されたユーザのPDFファイル作成"
 
-#: ../templates/pdfedit/pdfmain.php:109
+#: ../templates/pdfedit/pdfmain.php:118
 msgid "Create a new PDF structure for scope: "
 msgstr "スコープに対する新しいPDF構成を作成:"
 
@@ -633,7 +669,7 @@ msgstr "スコープに対する新しいPDF構成を作成:"
 msgid "Create a new profile"
 msgstr "新しいプロファイルの作成"
 
-#: ../lib/modules.inc:951
+#: ../lib/modules.inc:970
 msgid "Create another account"
 msgstr "他のアカウントを作成"
 
@@ -641,7 +677,7 @@ msgstr "他のアカウントを作成"
 msgid "Create group accounts"
 msgstr "グループアカウントを作成"
 
-#: ../lib/modules/posixAccount.inc:865
+#: ../lib/modules/posixAccount.inc:947
 msgid "Create home directory"
 msgstr "ホームディレクトリを作成"
 
@@ -649,11 +685,11 @@ msgstr "ホームディレクトリを作成"
 msgid "Create host accounts"
 msgstr "ホストアカウントを作成"
 
-#: ../lib/modules.inc:855
+#: ../lib/modules.inc:874
 msgid "Create new Account"
 msgstr "新しいアカウントを作成"
 
-#: ../templates/tree/edit.php:121 ../templates/tree/tree.php:185
+#: ../templates/tree/edit.php:124 ../templates/tree/tree.php:185
 #: ../templates/tree/tree.php:187 ../templates/tree/tree.php:188
 #: ../lib/tree.inc:66 ../lib/tree.inc:67 ../lib/tree.inc:129
 #: ../lib/tree.inc:131 ../lib/tree.inc:132
@@ -685,7 +721,7 @@ msgstr "カスタム"
 #: ../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:1605
+#: ../lib/modules.inc:1627
 msgid "DN"
 msgstr ""
 
@@ -693,26 +729,28 @@ msgstr ""
 msgid "DN settings"
 msgstr "DN設定"
 
-#: ../templates/masscreate.php:142 ../help/help.inc:139
+#: ../templates/masscreate.php:142 ../help/help.inc:138
 msgid "DN suffix"
 msgstr "DNサフィックス"
 
+#: ../lib/export.inc:511
+#, php-format
+msgid "DSML Export for: %s"
+msgstr ""
+
 #: ../templates/tree/templates/creation/custom.php:96
-#: ../templates/massBuildAccounts.php:164
 msgid "Data field for RDN is empty!"
 msgstr "RDNのデータフィールドが空です!"
 
-#: ../lib/modules/sambaAccount.inc:350 ../lib/modules/sambaSamAccount.inc:165
-#: ../help/help.inc:203
+#: ../lib/modules/sambaAccount.inc:364 ../lib/modules/sambaSamAccount.inc:188
 msgid "Date after the user is able to change his password. Format: DD-MM-YYYY"
 msgstr "ユーザによるパスワード変更の禁止が解かれる日付。形式は: DD-MM-YYYY"
 
-#: ../lib/modules/sambaAccount.inc:352 ../lib/modules/sambaSamAccount.inc:167
-#: ../help/help.inc:205
+#: ../lib/modules/sambaAccount.inc:366 ../lib/modules/sambaSamAccount.inc:190
 msgid "Date after the user must change his password. Format: DD-MM-YYYY"
 msgstr "ユーザがパスワードを変更しなければならなくなる日付。形式は: DD-MM-YYYY"
 
-#: ../lib/modules/shadowAccount.inc:147 ../help/help.inc:173
+#: ../lib/modules/shadowAccount.inc:159
 msgid ""
 "Days before password is to expire that user is warned of pending password "
 "expiration. If set value must be 0<."
@@ -721,17 +759,27 @@ msgstr ""
 "警告する日数。もしもその値を設定するなら0より大きくなければならない。"
 
 #: ../templates/config/confmain.php:371 ../lib/config.inc:367
-#: ../help/help.inc:94
+#: ../help/help.inc:93
 msgid "Default language"
 msgstr "規定の言語"
 
-#: ../templates/masscreate.php:151 ../templates/masscreate.php:308
+#: ../templates/masscreate.php:151 ../templates/masscreate.php:309
 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
+msgid "Delegates"
+msgstr "代理人"
+
+#: ../lib/modules/kolabUser.inc:231
+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
-#: ../lib/tree.inc:1185
+#: ../lib/tree.inc:1162
 msgid "Delete"
 msgstr "削除"
 
@@ -748,15 +796,19 @@ msgstr "アカウント削除"
 msgid "Delete Domain(s)"
 msgstr "ドメインの削除"
 
-#: ../templates/lists/listgroups.php:238
+#: ../templates/lists/listgroups.php:239
 msgid "Delete Group(s)"
 msgstr "グループの削除"
 
-#: ../templates/lists/listhosts.php:223
+#: ../templates/lists/listhosts.php:224
 msgid "Delete Host(s)"
 msgstr "ホストの削除"
 
-#: ../templates/pdfedit/pdfdelete.php:48 ../templates/pdfedit/pdfmain.php:133
+#: ../lib/modules/kolabUser.inc:418
+msgid "Delete Kolab account"
+msgstr "Kolabアカウントを削除"
+
+#: ../templates/pdfedit/pdfdelete.php:48 ../templates/pdfedit/pdfmain.php:142
 msgid "Delete PDF structure"
 msgstr "PDF構成の削除"
 
@@ -769,7 +821,7 @@ msgstr "全ての %s オブジェクトを削除"
 msgid "Delete domain(s)"
 msgstr "ドメインを削除"
 
-#: ../lib/modules/posixAccount.inc:913
+#: ../lib/modules/posixAccount.inc:995
 msgid "Delete home directory"
 msgstr "ホームディレクトリを削除"
 
@@ -778,23 +830,23 @@ msgstr "ホームディレクトリを削除"
 msgid "Delete operation canceled."
 msgstr "削除操作がキャンセルされました。"
 
-#: ../templates/ou_edit.php:354 ../templates/ou_edit.php:391
-#: ../templates/ou_edit.php:428 ../templates/ou_edit.php:465
-#: ../help/help.inc:245
+#: ../templates/ou_edit.php:362 ../templates/ou_edit.php:399
+#: ../templates/ou_edit.php:436 ../templates/ou_edit.php:473
+#: ../help/help.inc:148
 msgid "Delete organizational unit"
 msgstr "organizational unitを削除"
 
 #: ../templates/config/profmanage.php:258
 #: ../templates/profedit/profiledelete.php:52
-#: ../templates/profedit/profilemain.php:145 ../help/help.inc:118
+#: ../templates/profedit/profilemain.php:145 ../help/help.inc:117
 msgid "Delete profile"
 msgstr "プロファイルを削除"
 
-#: ../templates/lists/listusers.php:283
+#: ../templates/lists/listusers.php:284
 msgid "Delete user(s)"
 msgstr "ユーザを削除"
 
-#: ../lib/modules/sambaGroupMapping.inc:56
+#: ../lib/modules/sambaGroupMapping.inc:71
 msgid "Deleted Account"
 msgstr "削除されたアカウント"
 
@@ -821,31 +873,31 @@ msgstr "%s を削除しています"
 msgid "Deleting. Please stand by ..."
 msgstr "削除中です。お待ちください ..."
 
-#: ../templates/tree/add_value_form.php:185 ../templates/schema/schema.php:95
-#: ../templates/schema/schema.php:149 ../templates/schema/schema.php:352
-#: ../lib/modules/account.inc:73 ../lib/modules/account.inc:149
-#: ../lib/modules/account.inc:166 ../lib/modules/posixGroup.inc:148
-#: ../lib/modules/posixGroup.inc:392 ../lib/modules/posixGroup.inc:434
-#: ../lib/modules/sambaAccount.inc:841 ../lib/modules/sambaSamAccount.inc:959
-#: ../lib/modules/posixAccount.inc:270
-#: ../lib/modules/sambaGroupMapping.inc:303
-#: ../lib/modules/shadowAccount.inc:342 ../lib/modules/inetOrgPerson.inc:143
-#: ../lib/modules/inetOrgPerson.inc:392 ../lib/modules/inetOrgPerson.inc:460
-#: ../lib/lists.inc:312
+#: ../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
 msgid "Description"
 msgstr "説明"
 
-#: ../lib/modules/sambaAccount.inc:198 ../lib/modules/sambaAccount.inc:319
-#: ../lib/modules/sambaAccount.inc:833 ../lib/modules/sambaSamAccount.inc:134
-#: ../lib/modules/sambaSamAccount.inc:214
-#: ../lib/modules/sambaSamAccount.inc:951
-#: ../lib/modules/sambaGroupMapping.inc:159
-#: ../lib/modules/sambaGroupMapping.inc:269
-#: ../lib/modules/sambaGroupMapping.inc:301 ../help/help.inc:184
+#: ../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
 msgid "Display name"
 msgstr "表示名"
 
-#: ../lib/modules.inc:470
+#: ../lib/modules.inc:472
 msgid ""
 "Displayed account numbers start at \"0\". Add 2 to get the row in your "
 "spreadsheet."
@@ -857,8 +909,8 @@ msgstr ""
 msgid "Do you really want to delete domain(s):"
 msgstr "本当にドメインを削除しますか?"
 
-#: ../templates/ou_edit.php:87 ../templates/ou_edit.php:152
-#: ../templates/ou_edit.php:217 ../templates/ou_edit.php:282
+#: ../templates/ou_edit.php:95 ../templates/ou_edit.php:160
+#: ../templates/ou_edit.php:225 ../templates/ou_edit.php:290
 msgid "Do you really want to delete this OU?"
 msgstr "本当にこのOUを削除しますか?"
 
@@ -870,6 +922,10 @@ msgstr "本当にこのPDF構成を削除しますか?"
 msgid "Do you really want to delete this profile?"
 msgstr "本当にこのプロファイルを削除しますか?"
 
+#: ../lib/modules/kolabUser.inc:586
+msgid "Do you really want to mark this account for deletion?"
+msgstr "本当にこのアカウントを削除しますか?"
+
 #: ../templates/delete.php:80
 msgid "Do you really want to remove the following accounts?"
 msgstr "本当にこのアカウントを削除しますか?"
@@ -878,76 +934,74 @@ msgstr "本当にこのアカウントを削除しますか?"
 msgid "Do you want to make these changes?"
 msgstr "これらの変更を行ないますか?"
 
-#: ../lib/modules/sambaAccount.inc:155 ../lib/modules/sambaAccount.inc:300
-#: ../lib/modules/sambaAccount.inc:310 ../lib/modules/sambaAccount.inc:378
-#: ../lib/modules/sambaAccount.inc:775 ../lib/modules/sambaAccount.inc:784
-#: ../lib/modules/sambaAccount.inc:840 ../lib/modules/sambaSamAccount.inc:194
-#: ../lib/modules/sambaSamAccount.inc:207
-#: ../lib/modules/sambaSamAccount.inc:326
-#: ../lib/modules/sambaSamAccount.inc:763
-#: ../lib/modules/sambaSamAccount.inc:771
-#: ../lib/modules/sambaSamAccount.inc:886
-#: ../lib/modules/sambaSamAccount.inc:899
-#: ../lib/modules/sambaSamAccount.inc:958
-#: ../lib/modules/sambaGroupMapping.inc:53
-#: ../lib/modules/sambaGroupMapping.inc:187
-#: ../lib/modules/sambaGroupMapping.inc:281
-#: ../lib/modules/sambaGroupMapping.inc:323 ../help/help.inc:218
-#: ../help/help.inc:236
+#: ../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/sambaGroupMapping.inc:68
+#: ../lib/modules/sambaGroupMapping.inc:202
+#: ../lib/modules/sambaGroupMapping.inc:296
+#: ../lib/modules/sambaGroupMapping.inc:338
 msgid "Domain"
 msgstr "ドメイン"
 
-#: ../lib/modules/sambaAccount.inc:33 ../lib/modules/sambaAccount.inc:295
-#: ../lib/modules/sambaSamAccount.inc:33
-#: ../lib/modules/sambaGroupMapping.inc:40
-#: ../lib/modules/sambaGroupMapping.inc:254
+#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaAccount.inc:309
+#: ../lib/modules/sambaSamAccount.inc:48
+#: ../lib/modules/sambaGroupMapping.inc:55
+#: ../lib/modules/sambaGroupMapping.inc:269
 msgid "Domain Admins"
 msgstr "ドメイン管理者(Domain Admins)"
 
-#: ../lib/modules/sambaAccount.inc:35 ../lib/modules/sambaSamAccount.inc:34
-#: ../lib/modules/sambaGroupMapping.inc:45
+#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaSamAccount.inc:49
+#: ../lib/modules/sambaGroupMapping.inc:60
 msgid "Domain Certificate Admins"
 msgstr "ドメイン証明書管理者(Domain Certificate Admins)"
 
-#: ../lib/modules/sambaAccount.inc:34 ../lib/modules/sambaAccount.inc:519
-#: ../lib/modules/sambaSamAccount.inc:34
-#: ../lib/modules/sambaSamAccount.inc:484
-#: ../lib/modules/sambaGroupMapping.inc:43
+#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:532
+#: ../lib/modules/sambaSamAccount.inc:49
+#: ../lib/modules/sambaSamAccount.inc:514
+#: ../lib/modules/sambaGroupMapping.inc:58
 msgid "Domain Computers"
 msgstr "ドメインコンピュータ(Domain Computers)"
 
-#: ../lib/modules/sambaAccount.inc:35 ../lib/modules/sambaSamAccount.inc:34
-#: ../lib/modules/sambaGroupMapping.inc:44
+#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaSamAccount.inc:49
+#: ../lib/modules/sambaGroupMapping.inc:59
 msgid "Domain Controllers"
 msgstr "ドメインコントローラ(Domain Controllers)"
 
-#: ../lib/modules/sambaAccount.inc:36 ../lib/modules/sambaSamAccount.inc:35
-#: ../lib/modules/sambaGroupMapping.inc:47
+#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:50
+#: ../lib/modules/sambaGroupMapping.inc:62
 msgid "Domain Enterprise Admins"
 msgstr "ドメインエンタープライズ管理者(Domain Enterprise Admins)"
 
-#: ../lib/modules/sambaGroupMapping.inc:52
-#: ../lib/modules/sambaGroupMapping.inc:179
+#: ../lib/modules/sambaGroupMapping.inc:67
+#: ../lib/modules/sambaGroupMapping.inc:194
 msgid "Domain Group"
 msgstr "ドメイングループ(Domain Group)"
 
-#: ../lib/modules/sambaAccount.inc:34 ../lib/modules/sambaSamAccount.inc:33
-#: ../lib/modules/sambaGroupMapping.inc:42
+#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaSamAccount.inc:48
+#: ../lib/modules/sambaGroupMapping.inc:57
 msgid "Domain Guests"
 msgstr "ドメインゲスト(Domain Guests)"
 
-#: ../lib/modules/sambaAccount.inc:37 ../lib/modules/sambaSamAccount.inc:35
-#: ../lib/modules/sambaGroupMapping.inc:48
+#: ../lib/modules/sambaAccount.inc:52 ../lib/modules/sambaSamAccount.inc:50
+#: ../lib/modules/sambaGroupMapping.inc:63
 msgid "Domain Policy Admins"
 msgstr "ドメインポリシー管理者(Domain Policy Admins)"
 
 #: ../templates/lists/listdomains.php:100 ../templates/domain.php:109
-#: ../help/help.inc:251
+#: ../help/help.inc:154
 msgid "Domain SID"
 msgstr "ドメインのSID"
 
-#: ../lib/modules/sambaAccount.inc:36 ../lib/modules/sambaSamAccount.inc:35
-#: ../lib/modules/sambaGroupMapping.inc:46
+#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:50
+#: ../lib/modules/sambaGroupMapping.inc:61
 msgid "Domain Schema Admins"
 msgstr "ドメインスキーマ管理者(Domain Schema Admins)"
 
@@ -955,13 +1009,13 @@ msgstr "ドメインスキーマ管理者(Domain Schema Admins)"
 msgid "Domain Settings"
 msgstr "ドメインの設定"
 
-#: ../lib/modules/sambaAccount.inc:33 ../lib/modules/sambaSamAccount.inc:33
-#: ../lib/modules/sambaSamAccount.inc:1202
-#: ../lib/modules/sambaGroupMapping.inc:41
+#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaSamAccount.inc:48
+#: ../lib/modules/sambaSamAccount.inc:1349
+#: ../lib/modules/sambaGroupMapping.inc:56
 msgid "Domain Users"
 msgstr "ドメインユーザ(Domain Users)"
 
-#: ../lib/modules/sambaGroupMapping.inc:248
+#: ../lib/modules/sambaGroupMapping.inc:263
 msgid "Domain administrators"
 msgstr "ドメイン管理者(Domain administrator)"
 
@@ -974,11 +1028,11 @@ msgid "Domain has been modified."
 msgstr "ドメインが変更されました。"
 
 #: ../templates/lists/listdomains.php:99 ../templates/domain.php:88
-#: ../lib/modules/sambaAccount.inc:57 ../help/help.inc:247
+#: ../lib/modules/sambaAccount.inc:72 ../help/help.inc:150
 msgid "Domain name"
 msgstr "ドメイン名"
 
-#: ../lib/modules/sambaAccount.inc:57 ../lib/modules/sambaAccount.inc:58
+#: ../lib/modules/sambaAccount.inc:72 ../lib/modules/sambaAccount.inc:73
 msgid ""
 "Domain name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and -."
@@ -998,11 +1052,11 @@ msgstr "ドメインサフィックス"
 msgid "DomainSuffix is invalid!"
 msgstr "ドメインサフィックスが正しくありません!"
 
-#: ../templates/ou_edit.php:447
+#: ../templates/ou_edit.php:455
 msgid "Domains"
 msgstr "ドメイン"
 
-#: ../templates/pdfedit/pdfpage.php:581
+#: ../templates/pdfedit/pdfpage.php:468
 msgid "Down"
 msgstr "下へ"
 
@@ -1010,35 +1064,59 @@ msgstr "下へ"
 msgid "Download sample CSV file"
 msgstr "サンプルCSVファイルをダウンロード"
 
-#: ../lib/modules/sambaAccount.inc:355 ../lib/modules/sambaSamAccount.inc:170
+#: ../lib/modules/sambaAccount.inc:369 ../lib/modules/sambaSamAccount.inc:193
 msgid "Drive letter assigned on windows workstations as homedirectory."
 msgstr ""
 "Windows ワークステーションのホームディレクトリとして割り当てられたドライブ文"
 "字。"
 
-#: ../help/help.inc:209
-msgid "Driveletter assigned on windows workstations as homedirectory."
-msgstr ""
-"Windowsワークステーションのホームディレクトリに割り当てられたドライブ文字。"
-
 #: ../lib/lists.inc:311
 msgid "E-Mail"
 msgstr "電子メール"
 
+#: ../lib/modules/kolabUser.inc:138
+msgid "EMail alias"
+msgstr "電子メールの別名"
+
+#: ../lib/modules/kolabUser.inc:139
+msgid "EMail alias for this account."
+msgstr "このアカウントに対する電子メールの別名"
+
+#: ../lib/modules/kolabUser.inc:224
+msgid "EMail alias is invalid!"
+msgstr "電子メールの別名が正しくありません!"
+
+#: ../lib/modules/kolabUser.inc:142
+msgid "EMail alias list"
+msgstr "電子メールの別名リスト"
+
+#: ../lib/modules/kolabUser.inc:225
+msgid "EMail alias list has invalid format!"
+msgstr "電子メール別名リストの形式が正しくありません!"
+
+#: ../lib/modules/kolabUser.inc:188 ../lib/modules/kolabUser.inc:383
+#: ../lib/modules/kolabUser.inc:811
+msgid "EMail aliases"
+msgstr "電子メールの別名"
+
 #: ../templates/lists/listhosts.php:175 ../templates/lists/listgroups.php:175
 #: ../templates/lists/listdomains.php:175 ../templates/lists/listusers.php:221
 msgid "Edit"
 msgstr "編集"
 
-#: ../templates/pdfedit/pdfmain.php:121
+#: ../templates/pdfedit/pdfmain.php:130
 msgid "Edit PDF structure"
 msgstr "PDF構成の編集"
 
-#: ../lib/modules/posixAccount.inc:857
+#: ../lib/modules/posixAccount.inc:939
 msgid "Edit groups"
 msgstr "グループの編集"
 
-#: ../lib/modules/posixGroup.inc:153
+#: ../lib/modules/sambaSamAccount.inc:828
+msgid "Edit logon hours"
+msgstr "ログオン時間の編集"
+
+#: ../lib/modules/posixGroup.inc:168
 msgid "Edit members"
 msgstr "メンバーの編集"
 
@@ -1050,21 +1128,21 @@ msgstr "モジュールの編集"
 msgid "Edit profile"
 msgstr "プロファイルの編集"
 
-#: ../lib/modules/sambaAccount.inc:740 ../lib/modules/sambaSamAccount.inc:726
+#: ../lib/modules/sambaAccount.inc:749 ../lib/modules/sambaSamAccount.inc:782
 msgid "Edit workstations"
 msgstr "ワークステーションの編集??"
 
-#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:101
-#: ../lib/modules/inetOrgPerson.inc:155 ../lib/modules/inetOrgPerson.inc:239
-#: ../lib/modules/inetOrgPerson.inc:416 ../lib/modules/inetOrgPerson.inc:465
+#: ../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
 msgid "Employee type"
 msgstr "雇用形態"
 
-#: ../lib/modules/inetOrgPerson.inc:240
+#: ../lib/modules/inetOrgPerson.inc:291
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "雇用形態: 正社員、実習生、臨時雇用、派遣、..."
 
-#: ../templates/login.php:329
+#: ../templates/login.php:318
 msgid "Empty password submitted. Please try again."
 msgstr "パスワードが空です。やり直してください。"
 
@@ -1076,6 +1154,10 @@ msgstr "検索実行中にエラーが発生しました。"
 msgid "Enter the value you would like to add:"
 msgstr "追加したい値を入力してください:"
 
+#: ../lib/export.inc:407
+msgid "Entry"
+msgstr ""
+
 #: ../templates/tree/rdelete.php:114
 #, php-format
 msgid "Entry %s and sub-tree deleted successfully."
@@ -1086,7 +1168,7 @@ msgstr "エントリ %s とサブツリーは削除されました。"
 msgid "Entry %s deleted successfully."
 msgstr "エントリ %s は削除されました。"
 
-#: ../templates/schema/schema.php:172
+#: ../templates/schema/schema.php:170
 msgid "Equality"
 msgstr "照合規則"
 
@@ -1095,7 +1177,7 @@ msgstr "照合規則"
 msgid "Error while deleting DN: %s"
 msgstr "DN: %s の削除中にエラーが発生しました。"
 
-#: ../help/help.inc:129
+#: ../help/help.inc:128
 msgid ""
 "Every account type needs exactly one base module. This module provides a "
 "structural object class."
@@ -1103,31 +1185,32 @@ msgstr ""
 "全てのアカウントタイプにはただ一つのベースモジュールが必要です。このモジュー"
 "ルは構造型のオブジェクトクラスを提供します。"
 
-#: ../help/help.inc:69 ../help/help.inc:75 ../help/help.inc:90
+#: ../help/help.inc:68 ../help/help.inc:74 ../help/help.inc:89
 msgid "Example"
 msgstr "例"
 
 #: ../templates/masscreate.php:150 ../templates/masscreate.php:164
-#: ../templates/masscreate.php:304
+#: ../templates/masscreate.php:305
 msgid "Example value"
 msgstr "例"
 
-#: ../help/help.inc:51 ../help/help.inc:63
+#: ../help/help.inc:50 ../help/help.inc:62
 msgid "Examples"
 msgstr "例"
 
-#: ../help/help.inc:188
-msgid "Expand suffix with primary groupname"
-msgstr "プライマリグループ名でサフィックスを補完"
-
-#: ../lib/modules/shadowAccount.inc:93 ../lib/modules/shadowAccount.inc:162
-#: ../lib/modules/shadowAccount.inc:194 ../lib/modules/shadowAccount.inc:317
+#: ../lib/modules/shadowAccount.inc:108 ../lib/modules/shadowAccount.inc:174
+#: ../lib/modules/shadowAccount.inc:206 ../lib/modules/shadowAccount.inc:329
 msgid "Expiration date"
 msgstr "有効期限"
 
-#: ../help/help.inc:180
-msgid "Expire date"
-msgstr "有効期限"
+#: ../templates/tree/edit.php:116 ../templates/tree/export_form.php:87
+#: ../templates/tree/export_form.php:95
+msgid "Export"
+msgstr "エクスポート"
+
+#: ../templates/tree/export_form.php:134
+msgid "Export format"
+msgstr "エクスポート形式"
 
 #: ../templates/domain.php:322
 msgid "Failed to add domain!"
@@ -1151,12 +1234,26 @@ msgstr "エントリ %s の削除に失敗しました!"
 msgid "Failed to modify domain!"
 msgstr "ドメイン変更に失敗しました!"
 
-#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:191
-#: ../lib/modules/inetOrgPerson.inc:263 ../lib/modules/inetOrgPerson.inc:264
-#: ../lib/modules/inetOrgPerson.inc:440 ../lib/modules/inetOrgPerson.inc:471
+#: ../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
 msgid "Fax number"
 msgstr "ファクス番号"
 
+#: ../lib/modules/sambaSamAccount.inc:202
+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 はユーザとグループの名前に置き換えられます。"
+
+#: ../lib/modules/sambaAccount.inc:378
+msgid ""
+"File name and path relative to the netlogon-share which should be executed "
+"on logon. $user and $group are replaced with user and group name."
+msgstr ""
+"ログオンの時に実行される、ネットログオン共有への相対的なパスとファイル名。 "
+"$user と $group はユーザとグループ名に置き換えられます。"
+
 #: ../templates/tools.php:69
 msgid "File upload"
 msgstr "ファイルのアップロード"
@@ -1165,44 +1262,52 @@ msgstr "ファイルのアップロード"
 msgid "File upload failed!"
 msgstr "ファイルのアップロードに失敗しました!"
 
-#: ../lib/modules/sambaAccount.inc:364 ../lib/modules/sambaSamAccount.inc:179
-#: ../help/help.inc:211
-msgid ""
-"Filename and -path relative to netlogon-share which should be executed on "
-"logon. $user and $group are replaced with user- and groupname."
-msgstr ""
-"ログオンの時に実行される、ネットログオン共有への相対的なパスとファイル名。 "
-"$user と $group はユーザとグループ名に置き換えられます。"
-
 #: ../lib/lists.inc:217
 msgid "Filter"
 msgstr "フィルタ"
 
-#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:130
-#: ../lib/modules/inetOrgPerson.inc:231 ../lib/modules/inetOrgPerson.inc:408
-#: ../lib/modules/inetOrgPerson.inc:463 ../lib/lists.inc:307
-#: ../help/help.inc:194
+#: ../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
 msgid "First name"
 msgstr "(姓でない)名"
 
-#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:53
+#: ../lib/modules/inetOrgPerson.inc:53 ../lib/modules/inetOrgPerson.inc:54
 msgid "First name contains invalid characters!"
 msgstr "(姓でない)名前に不正な文字がある"
 
-#: ../lib/modules/inetOrgPerson.inc:232 ../help/help.inc:195
+#: ../lib/modules/inetOrgPerson.inc:283
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "ユーザの(姓でない)名前。アルファベット, _- と空白のみ有効."
 
-#: ../lib/modules/posixGroup.inc:144 ../lib/modules/posixGroup.inc:358
-#: ../lib/modules/posixGroup.inc:388 ../lib/modules/posixGroup.inc:413
-#: ../lib/modules/posixGroup.inc:432 ../lib/modules/posixGroup.inc:463
-#: ../lib/modules/posixAccount.inc:41 ../lib/modules/posixAccount.inc:1082
-#: ../lib/modules/sambaGroupMapping.inc:299 ../lib/lists.inc:304
-#: ../lib/lists.inc:318 ../lib/lists.inc:331 ../help/help.inc:160
+#: ../lib/modules/kolabUser.inc:123
+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
+msgid "Free/Busy interval"
+msgstr ""
+
+#: ../lib/modules/kolabUser.inc:232 ../lib/modules/kolabUser.inc:233
+msgid "Free/Busy interval must be a number!"
+msgstr "Free/Busyインターバルは数でなくてはなりません!"
+
+#: ../lib/modules/sambaSamAccount.inc:886
+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/lists.inc:318 ../lib/lists.inc:331
 msgid "GID number"
 msgstr "GID番号"
 
-#: ../lib/modules/posixGroup.inc:463
+#: ../lib/modules/posixGroup.inc:479
 msgid ""
 "GID number has changed. Please select checkbox to change GID number of users "
 "and hosts."
@@ -1210,7 +1315,7 @@ msgstr ""
 "GID番号が変更されました。ユーザとホストのGID番号を変更する場合は、チェック"
 "ボックスを選択してください。"
 
-#: ../lib/modules/posixAccount.inc:41
+#: ../lib/modules/posixAccount.inc:56
 #, php-format
 msgid ""
 "GID number has changed. To keep file ownership you have to run the following "
@@ -1220,44 +1325,46 @@ msgstr ""
 "のコマンドを実行しなければなりません: 'find / -gid %s -uid %s -exec chgrp %s "
 "{} \\;'"
 
-#: ../lib/modules/posixGroup.inc:470
+#: ../lib/modules/posixGroup.inc:486
 msgid "GID number has to be a numeric value!"
 msgstr "GID番号は数値でなくてはなりません。"
 
-#: ../lib/modules/posixGroup.inc:314
+#: ../lib/modules/posixGroup.inc:329
 msgid "GID ranges for Unix groups"
 msgstr "unixグループのGID範囲"
 
-#: ../lib/modules/account.inc:48 ../lib/modules/posixAccount.inc:226
-#: ../lib/modules/posixAccount.inc:258 ../lib/modules/posixAccount.inc:311
-#: ../lib/modules/posixAccount.inc:346 ../lib/modules/posixAccount.inc:845
-#: ../lib/modules/posixAccount.inc:1083 ../lib/modules/inetOrgPerson.inc:223
-#: ../lib/modules/inetOrgPerson.inc:273 ../help/help.inc:152
-#: ../help/help.inc:162 ../help/help.inc:170
+#: ../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
 msgid "Gecos"
 msgstr ""
 
-#: ../lib/modules/posixGroup.inc:159 ../lib/modules/posixAccount.inc:873
+#: ../lib/modules/posixGroup.inc:174 ../lib/modules/posixAccount.inc:955
 msgid "Generate password"
 msgstr "パスワードの作成"
 
-#: ../templates/schema/schema.php:134 ../templates/schema/schema.php:271
-#: ../templates/schema/schema.php:302 ../templates/schema/schema.php:327
+#: ../lib/modules/kolabUser.inc:177
+msgid "Germany"
+msgstr "日本"
+
+#: ../templates/schema/schema.php:132 ../templates/schema/schema.php:269
+#: ../templates/schema/schema.php:300 ../templates/schema/schema.php:325
 msgid "Go"
 msgstr ""
 
-#: ../lib/modules/quota.inc:80 ../lib/modules/quota.inc:295
+#: ../lib/modules/quota.inc:102 ../lib/modules/quota.inc:321
 msgid "Grace block period"
 msgstr "ブロック猶予期間"
 
-#: ../lib/modules/quota.inc:81
+#: ../lib/modules/quota.inc:103
 msgid ""
 "Grace block period. Most filesystems use a fixed maximum value of 7 days."
 msgstr ""
 "ブロッククオータの猶予期間。 ほとんどのファイルシステムは、最大値である7日間"
 "を固定値として使用します。"
 
-#: ../lib/modules/quota.inc:97
+#: ../lib/modules/quota.inc:119
 msgid ""
 "Grace inode (files) period. Most filesystems use a fixed maximum value of 7 "
 "days."
@@ -1265,19 +1372,19 @@ msgstr ""
 "iノード(ファイル)クオータの猶予期間。 ほとんどのファイルシステムは、最大値で"
 "ある7日間を固定値として使用します。"
 
-#: ../lib/modules/quota.inc:96 ../lib/modules/quota.inc:299
+#: ../lib/modules/quota.inc:118 ../lib/modules/quota.inc:325
 msgid "Grace inode period"
 msgstr "iノードクオータの猶予期間"
 
-#: ../lib/modules/posixGroup.inc:364 ../lib/lists.inc:321
+#: ../lib/modules/posixGroup.inc:379 ../lib/lists.inc:321
 msgid "Group description"
 msgstr "グループの説明"
 
-#: ../lib/modules/posixGroup.inc:393 ../help/help.inc:163
+#: ../lib/modules/posixGroup.inc:408
 msgid "Group description. If left empty group name will be used."
 msgstr "グループの説明。もしも空ならば、グループ名が使われます。"
 
-#: ../lib/pdf.inc:452
+#: ../lib/pdf.inc:407
 msgid "Group information page"
 msgstr "グループ情報ページ"
 
@@ -1289,10 +1396,10 @@ msgstr "グループリストの属性が正しくありません!"
 msgid "Group member DNs"
 msgstr "グループメンバのDN"
 
-#: ../lib/modules/posixGroup.inc:152 ../lib/modules/posixGroup.inc:226
-#: ../lib/modules/posixGroup.inc:370 ../lib/modules/posixGroup.inc:396
-#: ../lib/modules/posixGroup.inc:400 ../lib/modules/posixGroup.inc:433
-#: ../lib/lists.inc:319 ../help/help.inc:182 ../help/help.inc:238
+#: ../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/lists.inc:319
 msgid "Group members"
 msgstr "グループメンバ"
 
@@ -1301,25 +1408,35 @@ msgstr "グループメンバ"
 msgid "Group modules"
 msgstr "グループモジュール"
 
-#: ../lib/modules/posixGroup.inc:350 ../lib/lists.inc:317
+#: ../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
 msgid "Group name"
 msgstr "グループ名"
 
-#: ../lib/modules/posixGroup.inc:385 ../help/help.inc:159
+#: ../lib/modules/posixGroup.inc:489 ../lib/modules/posixGroup.inc:490
+msgid ""
+"Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
+"and .-_ !"
+msgstr ""
+"グループ名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ で"
+"す!"
+
+#: ../lib/modules/posixGroup.inc:488
+msgid "Group name in use. Selected next free group name."
+msgstr "グループ名が既に使われています。次の未使用グループ名が選択されました。"
+
+#: ../lib/modules/posixGroup.inc:400
 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 groupname is already used groupname will be "
+"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は、いくつかの問題を引き起こす事があるため使えません。\n"
-"もしもグループ名が既に使われていたならば、グループ名に番号が付加されます。こ"
-"の場合、次の空き番号が使われます。"
+msgstr "作成しようとしているグループのグループ名。有効な文字は: a-z,0-9, .-_ です。groupaddコマンドで許されていないため、先頭の文字として数字は使えません。大文字のA-Zは、いくつかの問題を引き起こす事があるため使えません。もしもグループ名が既に使われていたならば、グループ名に番号が付加されます。この場合、空いている次の番号が使われます。"
 
-#: ../lib/modules/posixGroup.inc:376 ../lib/modules/posixGroup.inc:404
+#: ../lib/modules/posixGroup.inc:391 ../lib/modules/posixGroup.inc:419
 msgid "Group password"
 msgstr "グループパスワード"
 
@@ -1327,11 +1444,7 @@ msgstr "グループパスワード"
 msgid "Group profiles"
 msgstr "グループのプロファイル"
 
-#: ../help/help.inc:190
-msgid "Group suffix"
-msgstr "グループサフィックス"
-
-#: ../lib/modules/sambaGroupMapping.inc:184
+#: ../lib/modules/sambaGroupMapping.inc:199
 msgid "Group type"
 msgstr "グループのタイプ"
 
@@ -1343,75 +1456,46 @@ msgstr "グループサフィックス"
 msgid "GroupSuffix is invalid!"
 msgstr "グループサフィックスが正しくありません!"
 
-#: ../lib/modules/posixGroup.inc:140 ../lib/modules/posixGroup.inc:384
-#: ../lib/modules/posixGroup.inc:431 ../lib/modules/posixGroup.inc:471
-#: ../lib/modules/posixGroup.inc:472 ../lib/modules/posixGroup.inc:473
-#: ../help/help.inc:158
-msgid "Groupname"
-msgstr "グループ名"
-
-#: ../lib/modules/posixGroup.inc:473 ../lib/modules/posixGroup.inc:474
-msgid ""
-"Groupname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
-"and .-_ !"
-msgstr ""
-"グループ名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ で"
-"す!"
-
-#: ../lib/modules/posixGroup.inc:472
-msgid "Groupname in use. Selected next free groupname."
-msgstr "グループ名が既に使われています。次の未使用グループ名が選択されました。"
-
-#: ../templates/ou_edit.php:373 ../templates/main_header.php:84
-#: ../help/help.inc:82
+#: ../templates/ou_edit.php:381 ../templates/main_header.php:84
+#: ../help/help.inc:81
 msgid "Groups"
 msgstr "グループ"
 
-#: ../lib/modules/sambaSamAccount.inc:551
-#: ../lib/modules/sambaSamAccount.inc:753
-#: ../lib/modules/sambaSamAccount.inc:756
-msgid "Guest"
-msgstr "ゲスト"
-
-#: ../lib/modules/quota.inc:422
+#: ../lib/modules/quota.inc:455
 msgid "Hard block"
 msgstr "ハードblock"
 
-#: ../lib/modules/quota.inc:76 ../lib/modules/quota.inc:77
-#: ../lib/modules/quota.inc:294 ../lib/modules/quota.inc:351
+#: ../lib/modules/quota.inc:98 ../lib/modules/quota.inc:99
+#: ../lib/modules/quota.inc:320 ../lib/modules/quota.inc:377
 msgid "Hard block limit"
 msgstr "ハードブロック制限"
 
-#: ../lib/modules/quota.inc:422
+#: ../lib/modules/quota.inc:457
 msgid "Hard inode"
 msgstr "ハードinode"
 
-#: ../lib/modules/quota.inc:93
+#: ../lib/modules/quota.inc:115
 msgid "Hard inode (files) limit"
 msgstr "ハードinode(ファイル)制限"
 
-#: ../lib/modules/quota.inc:92 ../lib/modules/quota.inc:298
-#: ../lib/modules/quota.inc:353
+#: ../lib/modules/quota.inc:114 ../lib/modules/quota.inc:324
+#: ../lib/modules/quota.inc:379
 msgid "Hard inode limit"
 msgstr "ハードinode制限"
 
-#: ../templates/pdfedit/pdfpage.php:495
+#: ../templates/pdfedit/pdfpage.php:414
 msgid "Headline"
 msgstr "見出し"
 
-#: ../templates/pdfedit/pdfpage.php:468
-msgid "Height"
-msgstr "高さ"
-
-#: ../templates/ou_edit.php:349 ../templates/ou_edit.php:362
-#: ../templates/ou_edit.php:386 ../templates/ou_edit.php:399
-#: ../templates/ou_edit.php:423 ../templates/ou_edit.php:436
-#: ../templates/ou_edit.php:460 ../templates/ou_edit.php:473
+#: ../templates/ou_edit.php:357 ../templates/ou_edit.php:370
+#: ../templates/ou_edit.php:394 ../templates/ou_edit.php:407
+#: ../templates/ou_edit.php:431 ../templates/ou_edit.php:444
+#: ../templates/ou_edit.php:468 ../templates/ou_edit.php:481
 #: ../templates/domain.php:99 ../templates/domain.php:120
 #: ../templates/domain.php:136 ../templates/domain.php:149
 #: ../templates/domain.php:162 ../templates/domain.php:179
 #: ../templates/domain.php:202 ../templates/masscreate.php:145
-#: ../templates/masscreate.php:158 ../templates/masscreate.php:291
+#: ../templates/masscreate.php:158 ../templates/masscreate.php:292
 #: ../templates/config/profmanage.php:183
 #: ../templates/config/profmanage.php:235
 #: ../templates/config/profmanage.php:265
@@ -1428,12 +1512,12 @@ msgstr "高さ"
 #: ../templates/config/confmain.php:337 ../templates/config/confmain.php:358
 #: ../templates/config/confmain.php:403 ../templates/config/confmain.php:422
 #: ../templates/config/confmain.php:431 ../templates/config/confmain.php:449
-#: ../templates/config/confmain.php:463 ../templates/config/conflogin.php:127
-#: ../templates/pdfedit/pdfpage.php:811
-#: ../templates/profedit/profilepage.php:106
-#: ../templates/profedit/profilepage.php:126
-#: ../templates/profedit/profilepage.php:157 ../lib/lists.inc:213
-#: ../lib/modules.inc:651
+#: ../templates/config/confmain.php:463 ../templates/config/conflogin.php:138
+#: ../templates/pdfedit/pdfpage.php:749
+#: ../templates/profedit/profilepage.php:188
+#: ../templates/profedit/profilepage.php:208
+#: ../templates/profedit/profilepage.php:239 ../lib/lists.inc:213
+#: ../lib/modules.inc:655
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -1446,17 +1530,25 @@ msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr ""
 "ここでは、CSVファイルを与える事によって、複数のアカウントを作成できます。"
 
-#: ../help/help.inc:131
+#: ../lib/modules/posixAccount.inc:337
+msgid ""
+"Here you can enter a list of additional group memberships. The group names "
+"are separated by commas."
+msgstr "ここにはメンバーとして所属する追加グループのリストを入力します。グループ名はカンマによって区切られます。"
+
+#: ../help/help.inc:130
 msgid ""
 "Here you can input small filter expressions (e.g. 'value' or 'v*'). LAM will "
 "filter case-insensitive."
-msgstr "ここには、簡単なフィルタ(例 'value'または'v*')を入力できます。大文字と小文字は区別されます。"
+msgstr ""
+"ここには、簡単なフィルタ(例 'value'または'v*')を入力できます。大文字と小文字"
+"は区別されます。"
 
 #: ../templates/tools.php:54
 msgid "Here you can manage your account profiles."
 msgstr "ここで、あなたのアカウントのプロファイルを管理できます。"
 
-#: ../help/help.inc:113
+#: ../help/help.inc:112
 msgid ""
 "Here you can select which plugins you want to use for account management."
 msgstr "ここでは、アカウント管理に使用するプラグインを選択できます。"
@@ -1465,26 +1557,26 @@ msgstr "ここでは、アカウント管理に使用するプラグインを選
 msgid "Hide internal attributes"
 msgstr "内部属性を隠す"
 
-#: ../templates/tree/edit.php:117
+#: ../templates/tree/edit.php:120
 msgid "Hint: To delete an attribute, empty the text field and click save."
 msgstr ""
 "ヒント: 属性を削除するには、テキストフィールドを空にして保存してください。"
 
-#: ../lib/modules/posixAccount.inc:337 ../help/help.inc:149
+#: ../lib/modules/posixAccount.inc:378
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr ""
 "複数のグループを選択(解除)する場合は、CTRLキーを押しながら操作してください。"
 
-#: ../lib/modules/posixAccount.inc:36 ../lib/modules/posixAccount.inc:64
-#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:197
-#: ../lib/modules/posixAccount.inc:319 ../lib/modules/posixAccount.inc:709
-#: ../lib/modules/posixAccount.inc:860 ../lib/modules/posixAccount.inc:1013
-#: ../lib/modules/posixAccount.inc:1086 ../lib/lists.inc:309
-#: ../help/help.inc:150
+#: ../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
 msgid "Home directory"
 msgstr "ホームディレクトリ"
 
-#: ../lib/modules/posixAccount.inc:36
+#: ../lib/modules/posixAccount.inc:51
 #, php-format
 msgid ""
 "Home directory changed. To keep home directory you have to run the following "
@@ -1493,35 +1585,35 @@ msgstr ""
 "ホームディレクトリが変更されました。ホームディレクトリを維持するために、root"
 "権限で以下のコマンドを実行しなければなりません: 'mv %s %s'"
 
-#: ../lib/modules/sambaAccount.inc:124 ../lib/modules/sambaAccount.inc:256
-#: ../lib/modules/sambaAccount.inc:354 ../lib/modules/sambaAccount.inc:727
-#: ../lib/modules/sambaAccount.inc:836 ../lib/modules/sambaSamAccount.inc:169
-#: ../lib/modules/sambaSamAccount.inc:272
-#: ../lib/modules/sambaSamAccount.inc:713
-#: ../lib/modules/sambaSamAccount.inc:851
-#: ../lib/modules/sambaSamAccount.inc:954 ../help/help.inc:208
+#: ../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
 msgid "Home drive"
 msgstr "ホームドライブ"
 
-#: ../lib/modules/sambaAccount.inc:46 ../lib/modules/sambaAccount.inc:47
-#: ../lib/modules/sambaAccount.inc:130 ../lib/modules/sambaAccount.inc:262
-#: ../lib/modules/sambaAccount.inc:357 ../lib/modules/sambaAccount.inc:730
-#: ../lib/modules/sambaAccount.inc:835 ../lib/modules/sambaSamAccount.inc:44
-#: ../lib/modules/sambaSamAccount.inc:45
-#: ../lib/modules/sambaSamAccount.inc:172
-#: ../lib/modules/sambaSamAccount.inc:278
-#: ../lib/modules/sambaSamAccount.inc:716
-#: ../lib/modules/sambaSamAccount.inc:857
-#: ../lib/modules/sambaSamAccount.inc:953 ../help/help.inc:216
+#: ../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/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
 msgid "Home path"
 msgstr "ホームパス"
 
-#: ../lib/modules/sambaAccount.inc:46 ../lib/modules/sambaSamAccount.inc:44
-#: ../lib/modules/sambaSamAccount.inc:46
+#: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaSamAccount.inc:59
+#: ../lib/modules/sambaSamAccount.inc:61
 msgid "Home path is invalid."
 msgstr "ホームパスが正しくありません。"
 
-#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:81
 msgid "Homedirectory contains invalid characters."
 msgstr "ホームディレクトリが不正な文字を含んでいます。"
 
@@ -1529,12 +1621,16 @@ msgstr "ホームディレクトリが不正な文字を含んでいます。"
 msgid "Host description"
 msgstr "ホストの説明"
 
-#: ../lib/modules/account.inc:49 ../lib/modules/posixAccount.inc:347
-#: ../lib/modules/inetOrgPerson.inc:274 ../help/help.inc:171
+#: ../lib/modules/account.inc:64 ../lib/modules/posixAccount.inc:392
+#: ../lib/modules/posixAccount.inc:400
 msgid "Host description. If left empty host name will be used."
 msgstr "ホストの説明。もしも空ならば、ホスト名が使われます。"
 
-#: ../lib/modules/account.inc:58
+#: ../lib/pdf.inc:410
+msgid "Host information page"
+msgstr "ホスト情報ページ"
+
+#: ../lib/modules/account.inc:73
 msgid "Host list"
 msgstr "ホスト一覧"
 
@@ -1547,35 +1643,49 @@ msgstr "ホスト一覧の属性が正しくありません!"
 msgid "Host modules"
 msgstr "ホストモジュール"
 
-#: ../lib/modules/posixAccount.inc:237 ../lib/modules/posixAccount.inc:342
-#: ../lib/lists.inc:327 ../help/help.inc:164
+#: ../lib/modules/posixAccount.inc:93 ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:96 ../lib/modules/posixAccount.inc:262
+#: ../lib/modules/posixAccount.inc:387 ../lib/lists.inc:326
+#: ../lib/lists.inc:327
 msgid "Host name"
 msgstr "ホスト名"
 
-#: ../lib/modules/posixAccount.inc:343 ../help/help.inc:165
+#: ../lib/modules/posixAccount.inc:100
+msgid "Host name already exists!"
+msgstr "ホスト名は既に存在しています!"
+
+#: ../lib/modules/posixAccount.inc:98
+msgid ""
+"Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
+"and .-_ !"
+msgstr "ホスト名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です。"
+
+#: ../lib/modules/posixAccount.inc:94
+msgid ""
+"Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
+"and .-_ ! Host name must end with $ !"
+msgstr ""
+"ホスト名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です。"
+"ホスト名の末尾は$でなくてはなりません。"
+
+#: ../lib/modules/posixAccount.inc:96
+msgid "Host name in use. Selected next free host name."
+msgstr "ホスト名がすでに使われています。次の未使用ホスト名が選択されました。"
+
+#: ../lib/modules/posixAccount.inc:388
 msgid ""
 "Host name of the host which should be created. Valid characters are: a-z,0-"
-"9, .-_$. Lam does not allow a number as first character because useradd also "
-"does not allow it. Lam does not allow capital letters A-Z because it can "
-"cause several problems. Hostnames are always ending with $. If last "
-"character is not $ it will be added. If hostname is already used hostname "
+"9, .-_$. LAM does not allow a number as first character because useradd also "
+"does not allow it. LAM does not allow capital letters A-Z because it can "
+"cause several problems. Host names are always ending with $. If last "
+"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"
-"は、いくつかの問題を引き起こす事があるため使えません。ホスト名の末尾は必ず $ "
-"になります。もしも最後の文字が $ でなければ追加されます。\n"
-"もしもホスト名がすでに使われていれば、ホスト名に番号が付加されます。この場"
-"合、次の空き番号が使われます。"
+msgstr "作成しようとしているホストのホスト名。有効な文字は: a-z, 0-9, .-_$ です。useraddコマンドで許されてしないため、先頭文字に数字は使えません。大文字のA-Zは、いくつかの問題を引き起こす事があるため使えません。ホスト名の末尾は必ず $ になります。もしも最後の文字が $ でなければ追加されます。もしもホスト名がすでに使われていれば、ホスト名に番号が付加されます。この場合、空いている次の番号が使われます。"
 
 #: ../templates/profedit/profilemain.php:47
 msgid "Host profiles"
 msgstr "ホストプロファイル"
 
-#: ../lib/lists.inc:326
-msgid "Host username"
-msgstr "ホストユーザ名"
-
 #: ../templates/config/confmain.php:197 ../lib/config.inc:360
 msgid "HostSuffix"
 msgstr "ホストサフィックス"
@@ -1584,154 +1694,102 @@ msgstr "ホストサフィックス"
 msgid "HostSuffix is invalid!"
 msgstr "ホストサフィックスが正しくありません!"
 
-#: ../lib/modules/posixAccount.inc:78 ../lib/modules/posixAccount.inc:79
-#: ../lib/modules/posixAccount.inc:81
-msgid "Hostname"
-msgstr "ホスト名"
-
-#: ../lib/modules/posixAccount.inc:83
-msgid ""
-"Hostname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
-"and .-_ !"
-msgstr ""
-"ホスト名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です。"
-
-#: ../lib/modules/posixAccount.inc:79
-msgid ""
-"Hostname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
-"and .-_ ! Hostname must end with $ !"
-msgstr ""
-"ホスト名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です。"
-"ホスト名の末尾は$でなくてはなりません。"
-
-#: ../lib/modules/posixAccount.inc:81
-msgid "Hostname in use. Selected next free hostname."
-msgstr "ホスト名がすでに使われています。次の未使用ホスト名が選択されました。"
-
-#: ../templates/main_header.php:87 ../lib/modules/posixAccount.inc:59
-#: ../lib/modules/posixAccount.inc:60 ../lib/modules/posixAccount.inc:62
-#: ../lib/modules/posixAccount.inc:135 ../help/help.inc:85
+#: ../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
 msgid "Hosts"
 msgstr "ホスト"
 
-#: ../lib/modules/posixGroup.inc:466 ../lib/modules/posixGroup.inc:581
-#: ../lib/modules/posixAccount.inc:69 ../lib/modules/posixAccount.inc:655
+#: ../lib/modules/posixGroup.inc:482 ../lib/modules/posixGroup.inc:597
+#: ../lib/modules/posixAccount.inc:84 ../lib/modules/posixAccount.inc:727
 msgid "ID is already in use"
 msgstr "ID はすでに使用されています"
 
-#: ../lib/modules/posixGroup.inc:464 ../lib/modules/posixGroup.inc:465
-#: ../lib/modules/posixGroup.inc:466 ../lib/modules/posixGroup.inc:577
-#: ../lib/modules/posixGroup.inc:581 ../lib/modules/posixAccount.inc:67
-#: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:69
-#: ../lib/modules/posixAccount.inc:651 ../lib/modules/posixAccount.inc:655
+#: ../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
 msgid "ID-Number"
 msgstr "ID番号"
 
 #: ../templates/masscreate.php:149 ../templates/masscreate.php:162
-#: ../templates/masscreate.php:296
+#: ../templates/masscreate.php:297
 msgid "Identifier"
 msgstr "識別子"
 
-#: ../help/help.inc:191
-msgid ""
-"If a not yet existing group is defined in csv-file, a new group in the "
-"selected group suffix will be created."
-msgstr ""
-"もしも、csvファイル中に定義されているグループがまだ存在していなければ、選択さ"
-"れたグループサフィックス中に新しいグループが作成されます。"
-
-#: ../help/help.inc:223
-msgid ""
-"If a not yet existing group is defined in csv-file, a new group with the "
-"selected group profile will be created."
-msgstr ""
-"もしも、csvファイル中に定義されているグループがまだ存在されていなければ、選択"
-"されたグループプロファイルで新しいグループが作成されます。"
-
-#: ../lib/modules/sambaAccount.inc:326 ../lib/modules/sambaSamAccount.inc:141
+#: ../lib/modules/sambaAccount.inc:340 ../lib/modules/sambaSamAccount.inc:164
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "チェックした場合、unixパスワードがSambaパスワードとしても使われます。"
 
-#: ../lib/modules/sambaAccount.inc:344 ../lib/modules/sambaSamAccount.inc:159
-#: ../help/help.inc:207
+#: ../lib/modules/posixAccount.inc:370
+msgid ""
+"If checked account will be deactivated by putting a \"!\" before the "
+"encrypted password."
+msgstr "チェックした場合、暗号化パスワードの前に\"!\"が挿入され、アカウントは無効化されます。"
+
+#: ../lib/modules/sambaAccount.inc:358 ../lib/modules/sambaSamAccount.inc:182
 msgid "If checked account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "チェックした場合、(D-フラグをセットすることで)アカウントは無効化されます。"
 
-#: ../lib/modules/posixGroup.inc:409 ../lib/modules/sambaAccount.inc:332
-#: ../lib/modules/sambaSamAccount.inc:147 ../lib/modules/posixAccount.inc:328
-#: ../help/help.inc:197
+#: ../lib/modules/posixGroup.inc:424 ../lib/modules/sambaAccount.inc:346
+#: ../lib/modules/sambaSamAccount.inc:170 ../lib/modules/posixAccount.inc:366
 msgid "If checked no password will be used."
 msgstr "チェックした場合、パスワードは使われません。"
 
-#: ../lib/modules/sambaAccount.inc:338 ../lib/modules/sambaSamAccount.inc:153
-#: ../help/help.inc:201
+#: ../lib/modules/sambaAccount.inc:352 ../lib/modules/sambaSamAccount.inc:176
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "チェックした場合、パスワードは無期限になります。(X-フラグをセット)"
 
-#: ../help/help.inc:199
-msgid "If checked unix password will also be used as samba password."
-msgstr "チェックした場合、unixパスワードがSambaパスワードとしても使われます。"
-
-#: ../lib/modules/posixGroup.inc:389 ../help/help.inc:161
+#: ../lib/modules/posixGroup.inc:404
 msgid ""
 "If empty GID number will be generated automaticly depending on your "
 "configuration settings."
 msgstr "未記入の場合、設定内容に従ってGID番号が自動的に生成されます。"
 
-#: ../lib/modules/posixAccount.inc:303 ../help/help.inc:147
-#: ../help/help.inc:167
+#: ../lib/modules/posixAccount.inc:329
 msgid "If empty UID number will be generated automaticly."
 msgstr "未記入の場合、UID番号が自動的に生成されます。"
 
-#: ../help/help.inc:189
-msgid ""
-"If selected users will be added with OUs expanded with their primary group. "
-"E.g. if a user is in group admin the user suffix will be ou=admin,+user "
-"suffix."
-msgstr ""
-"選択した場合、ユーザはそのプライマリグループで拡張されたOUをもって追加されま"
-"す。例えば、ユーザが group admin に所属している場合、ユーザのサフィックスは "
-"ou=admin,+ユーザのサフィックスになります。"
-
-#: ../lib/modules/sambaAccount.inc:329 ../lib/modules/sambaSamAccount.inc:144
+#: ../lib/modules/sambaAccount.inc:343 ../lib/modules/sambaSamAccount.inc:167
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr ""
 "\"true\"にセットした場合、unixパスワードがSambaパスワードとしても使われます。"
 
-#: ../lib/modules/sambaAccount.inc:347 ../lib/modules/sambaSamAccount.inc:162
+#: ../lib/modules/sambaAccount.inc:361 ../lib/modules/sambaSamAccount.inc:185
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "\"true\"にセットした場合、アカウントは無効になります。(D-フラグをセット)"
 
-#: ../lib/modules/sambaAccount.inc:335 ../lib/modules/sambaSamAccount.inc:150
+#: ../lib/modules/sambaAccount.inc:349 ../lib/modules/sambaSamAccount.inc:173
 msgid "If set to \"true\" no password will be used."
 msgstr "\"true\"にセットした場合、パスワードは使われません。"
 
-#: ../lib/modules/sambaAccount.inc:341 ../lib/modules/sambaSamAccount.inc:156
+#: ../lib/modules/sambaAccount.inc:355 ../lib/modules/sambaSamAccount.inc:179
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr ""
 "\"true\"にセットした場合、パスワードは無期限になります。(X-フラグをセット)"
 
-#: ../lib/modules/sambaSamAccount.inc:189
+#: ../lib/modules/sambaSamAccount.inc:212
 msgid ""
 "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr ""
 "未入力の場合は、LAMは uidNumber*2 + sambaAlgorithmicRidBase を使用します。"
 
-#: ../help/help.inc:107
+#: ../help/help.inc:106
 msgid ""
 "If you want to change the current preferences password, please enter it here."
 msgstr ""
 "現在のプリファレンスのパスワードを変更したい場合は、ここに入力してください。"
 
-#: ../help/help.inc:125
+#: ../help/help.inc:124
 msgid ""
 "If you want to change your master configuration password, please enter it "
 "here."
 msgstr "マスタ構成パスワードを変更したい場合は、ここに入力してください。"
 
-#: ../lib/modules/sambaAccount.inc:376
+#: ../lib/modules/sambaAccount.inc:390
 msgid ""
 "If you want to create domain administrators or other special users use this "
 "option."
@@ -1739,83 +1797,100 @@ msgstr ""
 "ドメイン管理者やその他の特殊アカウントを作成したい場合は、このオプションを使"
 "用してください。"
 
-#: ../lib/modules/sambaAccount.inc:370
-#: ../lib/modules/sambaGroupMapping.inc:274 ../help/help.inc:233
+#: ../lib/modules/sambaAccount.inc:384
+#: ../lib/modules/sambaGroupMapping.inc:289
 msgid "If you want to use a well known RID you can selcet a well known group."
 msgstr ""
 "もしも、よく知られているRID(well known RID)を使いたいのであれば、よく知られた"
 "グループを選択できます。"
 
-#: ../templates/schema/schema.php:402 ../templates/schema/schema.php:423
+#: ../templates/tree/export_form.php:119
+msgid "Include system attributes"
+msgstr "システム属性を含む"
+
+#: ../templates/schema/schema.php:400 ../templates/schema/schema.php:421
 msgid "Inherited from"
 msgstr "継承元"
 
-#: ../templates/schema/schema.php:163 ../templates/schema/schema.php:359
+#: ../templates/schema/schema.php:161 ../templates/schema/schema.php:357
 msgid "Inherits from"
 msgstr "継承元"
 
-#: ../lib/modules/quota.inc:33
+#: ../lib/modules/quota.inc:51
 msgid "Inode hard quota"
 msgstr "Inode ハードquota"
 
-#: ../lib/modules/quota.inc:33
+#: ../lib/modules/quota.inc:51 ../lib/modules/quota.inc:52
 msgid ""
 "Inode hard quota contains invalid characters. Only natural numbers are "
 "allowed."
 msgstr ""
 "Inodeハードクオータに不正な文字が含まれています。自然数のみが有効です。"
 
-#: ../lib/modules/quota.inc:35
+#: ../lib/modules/quota.inc:55
 msgid "Inode quota"
 msgstr "Inodeクオータ"
 
-#: ../lib/modules/quota.inc:32
+#: ../lib/modules/quota.inc:49
 msgid "Inode soft quota"
 msgstr "Inodeソフトquota"
 
-#: ../lib/modules/quota.inc:32
+#: ../lib/modules/quota.inc:49 ../lib/modules/quota.inc:50
 msgid ""
 "Inode soft quota contains invalid characters. Only natural numbers are "
 "allowed."
 msgstr "Inode ソフトクオータに不正な文字が含まれています。自然数のみ有効です。"
 
-#: ../lib/modules/quota.inc:35
+#: ../lib/modules/quota.inc:55 ../lib/modules/quota.inc:56
 msgid "Inode soft quota must be smaller than inode hard quota."
 msgstr ""
 "iノード・ソフトクオータはiノード・ハードクオータ<より小さくなくてはなりませ"
 "ん。"
 
-#: ../lib/modules/sambaAccount.inc:47 ../lib/modules/sambaAccount.inc:48
-#: ../lib/modules/sambaSamAccount.inc:45
-msgid "Inserted user- or groupname in HomePath."
+#: ../lib/modules/sambaAccount.inc:62 ../lib/modules/sambaAccount.inc:63
+#: ../lib/modules/sambaSamAccount.inc:60
+msgid "Inserted user or group name in home path."
 msgstr "ホームパス名にユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/sambaAccount.inc:53
-msgid "Inserted user- or groupname in logon script."
+#: ../lib/modules/sambaAccount.inc:68
+msgid "Inserted user or group name in logon script."
 msgstr "ログオンスクリプトパスにユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaAccount.inc:51
-#: ../lib/modules/sambaSamAccount.inc:48
-msgid "Inserted user- or groupname in profilepath."
+#: ../lib/modules/sambaAccount.inc:65 ../lib/modules/sambaAccount.inc:66
+#: ../lib/modules/sambaSamAccount.inc:63
+msgid "Inserted user or group name in profile path."
 msgstr "プロファイルパスにユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/sambaSamAccount.inc:51
-msgid "Inserted user- or groupname in scriptpath."
+#: ../lib/modules/sambaSamAccount.inc:66
+msgid "Inserted user or group name in script path."
 msgstr "スクリプトパスにユーザ又はグループ名を挿入しました。"
 
-#: ../lib/modules/sambaGroupMapping.inc:57
+#: ../lib/modules/sambaGroupMapping.inc:72
 msgid "Invalid Account"
 msgstr "無効なアカウントです"
 
-#: ../lib/modules/posixGroup.inc:177 ../lib/modules/posixAccount.inc:891
+#: ../templates/massBuildAccounts.php:166
+msgid "Invalid RDN attribute!"
+msgstr "不正なRDN属性です!"
+
+#: ../lib/modules/posixGroup.inc:192 ../lib/modules/posixAccount.inc:973
 msgid "Invalid password"
 msgstr "無効なパスワードです"
 
-#: ../lib/status.inc:61
+#: ../lib/status.inc:65
 msgid "Invalid/Missing Message type"
 msgstr "不正な/間違ったメッセージタイプ"
 
-#: ../lib/modules/posixGroup.inc:464 ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/kolabUser.inc:122 ../lib/modules/kolabUser.inc:169
+#: ../lib/modules/kolabUser.inc:366 ../lib/modules/kolabUser.inc:801
+msgid "Invitation policy"
+msgstr "不正なポリシー"
+
+#: ../lib/modules/kolabUser.inc:126
+msgid "Invitation policy list"
+msgstr "不正なポリシーリスト"
+
+#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixAccount.inc:83
 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 "
@@ -1825,30 +1900,34 @@ msgstr ""
 "在するかも知れないため、これはいくつかの問題を引き起こすかもしれません。この"
 "警告を防ぐには、maxUIDをより大きな値に設定してください。"
 
-#: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:97
-#: ../lib/modules/inetOrgPerson.inc:149 ../lib/modules/inetOrgPerson.inc:227
-#: ../lib/modules/inetOrgPerson.inc:404 ../lib/modules/inetOrgPerson.inc:462
+#: ../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
 msgid "Job title"
 msgstr "役職"
 
-#: ../lib/modules/inetOrgPerson.inc:228
+#: ../lib/modules/inetOrgPerson.inc:279
 msgid "Job title of user: President, department manager, ..."
 msgstr "ユーザの役職: 社長、部長、..."
 
-#: ../templates/schema/schema.php:261
+#: ../templates/schema/schema.php:259
 msgid "Jump to a matching rule"
 msgstr "照合規則へジャンプ"
 
-#: ../templates/schema/schema.php:120
+#: ../templates/schema/schema.php:118
 msgid "Jump to an attribute type"
 msgstr "属性タイプへジャンプ"
 
-#: ../templates/schema/schema.php:314 ../templates/schema/schema.php:364
-#: ../templates/schema/schema.php:379
+#: ../templates/schema/schema.php:312 ../templates/schema/schema.php:362
+#: ../templates/schema/schema.php:377
 msgid "Jump to an object class"
 msgstr "オブジェクトクラスへジャンプ"
 
-#: ../lib/status.inc:60
+#: ../lib/modules/kolabUser.inc:71
+msgid "Kolab"
+msgstr ""
+
+#: ../lib/status.inc:64
 msgid "LAM Internal Error"
 msgstr "LAM 内部エラー"
 
@@ -1862,12 +1941,12 @@ msgstr ""
 "LAMはこのエントリおよび全ての子を再帰的に削除します。この操作が削除する全ての"
 "エントリのリストは下に表示されています。実行してもよろしいですか?"
 
-#: ../templates/massBuildAccounts.php:188
+#: ../templates/massBuildAccounts.php:190
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr ""
 "LAMは入力内容をチェックしました。アカウントを作成する準備ができました。"
 
-#: ../lib/modules/posixGroup.inc:418 ../lib/modules/posixAccount.inc:299
+#: ../lib/modules/posixGroup.inc:433 ../lib/modules/posixAccount.inc:325
 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 "
@@ -1878,29 +1957,29 @@ msgstr ""
 "SMD5をサポートしています。SSHAとCRYPTが最も一般的ですが、CRYPTは8文字より長い"
 "パスワードをサポートしません。平文のパスワードを使うことは推奨いたしません。"
 
-#: ../templates/tree/create.php:180 ../templates/massDoUpload.php:82
+#: ../templates/tree/create.php:180 ../templates/massDoUpload.php:83
 #, php-format
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAMはアカウント %s を作成できませんでした! LDAPエラーが発生しました。"
 
-#: ../lib/modules/sambaGroupMapping.inc:352
+#: ../lib/modules/sambaGroupMapping.inc:367
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "LAMは、この名前のSamba 3ドメインを見つけられませんでした。"
 
-#: ../lib/modules/sambaSamAccount.inc:70
+#: ../lib/modules/sambaSamAccount.inc:85
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAMは、この名前のドメインを見つけられませんでした。"
 
-#: ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:101
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAMは、この名前のグループを見つけられませんでした。"
 
-#: ../lib/modules/posixAccount.inc:1381
+#: ../lib/modules/posixAccount.inc:1529
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAMはグループ %s のグループメンバーシップを変更できませんでした。"
 
-#: ../templates/profedit/profilepage.php:87
+#: ../templates/profedit/profilepage.php:169
 msgid "LDAP"
 msgstr ""
 
@@ -1918,15 +1997,15 @@ msgstr "LDAP リスト設定"
 msgid "LDAP Search failed! Please check your preferences."
 msgstr "LDAP検索に失敗しました! プリファレンスを確認してください。"
 
-#: ../templates/login.php:371
+#: ../templates/login.php:360
 msgid "LDAP error, server says:"
 msgstr "LDAP エラー、サーバからのメッセージ:"
 
-#: ../lib/modules.inc:946
+#: ../lib/modules.inc:965
 msgid "LDAP operation successful."
 msgstr "LDAP操作が完了しました。"
 
-#: ../templates/login.php:266
+#: ../templates/login.php:255
 msgid "LDAP server"
 msgstr "LDAPサーバ"
 
@@ -1935,19 +2014,24 @@ msgstr "LDAPサーバ"
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "LDAPのサイズ制限を越えました。一部のエントリのみを表示します。"
 
-#: ../templates/profedit/profilepage.php:91
+#: ../templates/profedit/profilepage.php:173
 msgid "LDAP suffix"
 msgstr "LDAPサフィックス"
 
-#: ../templates/massDoUpload.php:117
+#: ../templates/massDoUpload.php:118
 msgid "LDAP upload has finished"
 msgstr "LDAPアップロードが完了しました。"
 
-#: ../templates/massDoUpload.php:66
+#: ../templates/massDoUpload.php:67
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAPアップロード中です。お待ちください。"
 
-#: ../templates/login.php:212
+#: ../lib/export.inc:441
+#, php-format
+msgid "LDIF Export for: %s"
+msgstr ""
+
+#: ../templates/login.php:204
 msgid "Language"
 msgstr "言語"
 
@@ -1959,41 +2043,32 @@ msgstr "言語が未定されていません!"
 msgid "Language settings"
 msgstr "言語の設定"
 
-#: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:136
-#: ../lib/modules/inetOrgPerson.inc:235 ../lib/modules/inetOrgPerson.inc:412
-#: ../lib/modules/inetOrgPerson.inc:464 ../lib/lists.inc:308
-#: ../help/help.inc:192
+#: ../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
 msgid "Last name"
 msgstr "姓"
 
-#: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:55
+#: ../lib/modules/inetOrgPerson.inc:55 ../lib/modules/inetOrgPerson.inc:56
 msgid "Last name contains invalid characters!"
 msgstr "姓に不正な文字が含まれています!"
 
-#: ../lib/modules/inetOrgPerson.inc:236 ../help/help.inc:193
+#: ../lib/modules/inetOrgPerson.inc:287
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "ユーザの姓。アルファベット、_ - と空白のみが使用できます。"
 
-#: ../lib/modules/shadowAccount.inc:338
+#: ../lib/modules/shadowAccount.inc:350
 msgid "Last password change"
 msgstr "パスワード最終変更時刻"
 
-#: ../templates/pdfedit/pdfpage.php:535
-msgid "Left"
-msgstr "左"
+#: ../templates/tree/export_form.php:147
+msgid "Line ends"
+msgstr ""
 
-#: ../help/help.inc:72
+#: ../help/help.inc:71
 msgid "List attributes"
 msgstr "属性の一覧"
 
-#: ../help/help.inc:215
-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)のリストが空または正しくありません!"
@@ -2006,11 +2081,11 @@ msgstr "削除されるエントリ:"
 msgid "List of valid users"
 msgstr "有効なユーザのリスト"
 
-#: ../lib/modules.inc:984 ../lib/modules.inc:987 ../help/help.inc:186
+#: ../lib/modules.inc:1011 ../lib/modules.inc:1014
 msgid "Load profile"
 msgstr "プロファイルのロード"
 
-#: ../lib/modules/sambaGroupMapping.inc:54
+#: ../lib/modules/sambaGroupMapping.inc:69
 msgid "Local Group"
 msgstr "ローカルグループ"
 
@@ -2025,45 +2100,48 @@ msgstr "ローカルアドレス"
 msgid "Local address list"
 msgstr "ローカルアドレス一覧"
 
-#: ../lib/modules/posixGroup.inc:182 ../lib/modules/posixAccount.inc:218
-#: ../lib/modules/posixAccount.inc:896 ../lib/modules/posixAccount.inc:1025
+#: ../lib/modules/posixGroup.inc:197 ../lib/modules/posixAccount.inc:243
+#: ../lib/modules/posixAccount.inc:978 ../lib/modules/posixAccount.inc:1107
 msgid "Lock password"
 msgstr "パスワードのロック"
 
-#: ../templates/login.php:241 ../templates/config/conflogin.php:68
-#: ../help/help.inc:46
+#: ../templates/login.php:230 ../templates/config/conflogin.php:68
+#: ../help/help.inc:45
 msgid "Login"
 msgstr "ログイン"
 
-#: ../lib/modules/posixAccount.inc:204 ../lib/modules/posixAccount.inc:332
-#: ../lib/modules/posixAccount.inc:902 ../lib/modules/posixAccount.inc:1017
-#: ../lib/modules/posixAccount.inc:1088 ../lib/lists.inc:310
-#: ../help/help.inc:154
+#: ../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
 msgid "Login shell"
 msgstr "ログインシェル"
 
-#: ../templates/pdfedit/pdfpage.php:434
+#: ../templates/pdfedit/pdfpage.php:425
 msgid "Logo"
 msgstr "ロゴ"
 
-#: ../lib/modules/sambaSamAccount.inc:197
-#: ../lib/modules/sambaSamAccount.inc:316
+#: ../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
 msgid "Logon hours"
 msgstr "ログオン時間"
 
-#: ../lib/modules/sambaAccount.inc:52 ../lib/modules/sambaAccount.inc:53
-#: ../lib/modules/sambaAccount.inc:142 ../lib/modules/sambaAccount.inc:274
-#: ../lib/modules/sambaAccount.inc:363 ../lib/modules/sambaAccount.inc:736
-#: ../lib/modules/sambaAccount.inc:837 ../lib/modules/sambaSamAccount.inc:178
-#: ../lib/modules/sambaSamAccount.inc:290
-#: ../lib/modules/sambaSamAccount.inc:722
-#: ../lib/modules/sambaSamAccount.inc:869
-#: ../lib/modules/sambaSamAccount.inc:955
+#: ../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
 msgid "Logon script"
 msgstr "ログオンスクリプト"
 
-#: ../lib/modules/sambaAccount.inc:52 ../lib/modules/sambaAccount.inc:54
-#: ../lib/modules/sambaSamAccount.inc:52
+#: ../lib/modules/sambaAccount.inc:67 ../lib/modules/sambaAccount.inc:69
+#: ../lib/modules/sambaSamAccount.inc:67
 msgid "Logon script is invalid!"
 msgstr "ログオンスクリプトが正しくありません!"
 
@@ -2076,18 +2154,33 @@ msgstr "ログアウト"
 msgid "MAC address"
 msgstr "MACアドレス"
 
-#: ../lib/modules/ieee802device.inc:60 ../lib/modules/ieee802device.inc:257
+#: ../lib/modules/ieee802device.inc:60
 msgid "MAC address list"
 msgstr "MACアドレス一覧"
 
+#: ../lib/modules/ieee802device.inc:257
+msgid "MAC address(es)"
+msgstr "MACアドレス"
+
 #: ../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
+msgid "Mail quota"
+msgstr "メール・クオータ"
+
+#: ../lib/modules/kolabUser.inc:234 ../lib/modules/kolabUser.inc:235
+msgid "Mail quota must be a number!"
+msgstr "メール・クォータは数字でなくてはなりません!"
+
 #: ../lib/modules/inetLocalMailRecipient.inc:50
 msgid "Mail routing"
 msgstr "メール転送"
 
+#: ../lib/modules/kolabUser.inc:79
 #: ../lib/modules/inetLocalMailRecipient.inc:68
 #: ../lib/modules/inetLocalMailRecipient.inc:74
 #: ../lib/modules/inetLocalMailRecipient.inc:103
@@ -2096,18 +2189,38 @@ msgstr "メール転送"
 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
+msgid "Mailbox home server"
+msgstr "メールボックス・ホーム・サーバ"
+
+#: ../lib/modules/kolabUser.inc:230
+msgid "Mailbox home server name is empty!"
+msgstr "メールボックス・ホーム・サーバ名が空です。"
+
+#: ../lib/modules/kolabUser.inc:228 ../lib/modules/kolabUser.inc:229
+msgid "Mailbox home server name is invalid!"
+msgstr "メールボックス・ホーム・サーバ名が正しくありません!"
+
 #: ../lib/modules/nisMailAlias.inc:61
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "この名前へのメールは受信者に転送されます。"
 
-#: ../lib/modules.inc:901 ../lib/modules.inc:926
+#: ../templates/pdfedit/pdfpage.php:616 ../lib/modules.inc:920
+#: ../lib/modules.inc:945
 msgid "Main"
 msgstr "メイン"
 
-#: ../templates/config/conflogin.php:138
+#: ../templates/config/conflogin.php:149
 msgid "Manage profiles"
 msgstr "プロファイルの操作"
 
+#: ../lib/modules/inetOrgPerson.inc:162 ../lib/modules/inetOrgPerson.inc:294
+#: ../lib/modules/inetOrgPerson.inc:583 ../lib/modules/inetOrgPerson.inc:606
+msgid "Manager"
+msgstr "管理者"
+
 #: ../templates/tools.php:77
 msgid "Manages OU objects in your LDAP tree."
 msgstr "LDAPツリーのOUオブジェクトを管理します。"
@@ -2116,15 +2229,27 @@ msgstr "LDAPツリーのOUオブジェクトを管理します。"
 msgid "Manages Samba 3 domain accounts."
 msgstr "Samba 3アカウントを管理します。"
 
-#: ../templates/pdfedit/pdfpage.php:508
-msgid "Margin"
-msgstr "余白"
+#: ../lib/modules/kolabUser.inc:53
+msgid "Manual"
+msgstr "手動"
+
+#: ../lib/modules/kolabUser.inc:55
+msgid "Manual if conflicts"
+msgstr "競合した場合は手動"
+
+#: ../lib/modules/kolabUser.inc:415 ../lib/modules/kolabUser.inc:590
+msgid "Mark account for deletion"
+msgstr "アカウントを削除対象としてマークする"
+
+#: ../lib/modules/kolabUser.inc:162
+msgid "Mark for deletion"
+msgstr "削除対象としてマーク"
 
 #: ../templates/config/profmanage.php:398
 msgid "Master Password:"
 msgstr "マスタパスワード:"
 
-#: ../help/help.inc:126
+#: ../help/help.inc:125
 msgid "Master password"
 msgstr "マスタパスワード"
 
@@ -2136,11 +2261,11 @@ msgstr "マスタパスワードが正しくありません!"
 msgid "Master passwords are different or empty!"
 msgstr "マスタパスワードが異なっているか、または空です!"
 
-#: ../templates/schema/schema.php:274
+#: ../templates/schema/schema.php:272
 msgid "Matching rule OID"
 msgstr "照合規則のOID"
 
-#: ../templates/schema/schema.php:83 ../templates/schema/schema.php:84
+#: ../templates/schema/schema.php:81 ../templates/schema/schema.php:82
 msgid "Matching rules"
 msgstr "照合規則"
 
@@ -2148,46 +2273,42 @@ msgstr "照合規則"
 msgid "Max list entries is invalid!"
 msgstr "リストエントリの最大数が正しくありません!"
 
-#: ../templates/pdfedit/pdfpage.php:479
-msgid "Maximize with correct ratio"
-msgstr "縦横比を維持したまま最大化"
-
-#: ../lib/modules/posixGroup.inc:300 ../lib/modules/posixGroup.inc:468
-#: ../lib/modules/posixGroup.inc:469
+#: ../lib/modules/posixGroup.inc:315 ../lib/modules/posixGroup.inc:484
+#: ../lib/modules/posixGroup.inc:485
 msgid "Maximum GID number"
 msgstr "GID番号の最大値"
 
-#: ../lib/modules/posixGroup.inc:317
+#: ../lib/modules/posixGroup.inc:332
 msgid "Maximum GID number for Unix groups"
 msgstr "unixグループに対するGID番号の最大値"
 
-#: ../lib/modules/posixGroup.inc:468
+#: ../lib/modules/posixGroup.inc:484
 msgid "Maximum GID number is invalid or empty!"
 msgstr "GID番号の最大値が不正または未入力です!"
 
-#: ../lib/modules/posixGroup.inc:469
+#: ../lib/modules/posixGroup.inc:485
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "GID番号の最大値は最小値よりも大きくなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:58 ../lib/modules/posixAccount.inc:60
-#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:62
-#: ../lib/modules/posixAccount.inc:129 ../lib/modules/posixAccount.inc:138
+#: ../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
 msgid "Maximum UID number"
 msgstr "UID番号の最大値"
 
-#: ../lib/modules/posixAccount.inc:159
+#: ../lib/modules/posixAccount.inc:178
 msgid "Maximum UID number for Unix accounts (hosts)"
 msgstr "ホストnounixアカウントに対するUID番号の最大値。"
 
-#: ../lib/modules/posixAccount.inc:157
+#: ../lib/modules/posixAccount.inc:176
 msgid "Maximum UID number for Unix accounts (users)"
 msgstr "ユーザのunixアカウントに対するUID番号の最大値。"
 
-#: ../lib/modules/posixAccount.inc:58 ../lib/modules/posixAccount.inc:60
+#: ../lib/modules/posixAccount.inc:73 ../lib/modules/posixAccount.inc:75
 msgid "Maximum UID number is invalid!"
 msgstr "UID番号の最大値が不正です!"
 
-#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:62
+#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:77
 msgid "Maximum UID number must be greater than minimum UID number!"
 msgstr "UID番号の最大値は最小値よりも大きくなくてはなりません!"
 
@@ -2196,67 +2317,65 @@ msgstr "UID番号の最大値は最小値よりも大きくなくてはなりま
 msgid "Maximum file size: %s"
 msgstr "最大ファイルサイズ: %s"
 
-#: ../templates/tree/add_value_form.php:193 ../templates/schema/schema.php:220
+#: ../templates/tree/add_value_form.php:193 ../templates/schema/schema.php:218
 msgid "Maximum length"
 msgstr "最大長"
 
 #: ../templates/config/confmain.php:346 ../lib/config.inc:366
-#: ../help/help.inc:92
+#: ../help/help.inc:91
 msgid "Maximum list entries"
 msgstr "リストエントリの最大数"
 
-#: ../lib/modules/shadowAccount.inc:88 ../lib/modules/shadowAccount.inc:158
-#: ../lib/modules/shadowAccount.inc:188 ../lib/modules/shadowAccount.inc:310
-#: ../help/help.inc:176
+#: ../lib/modules/shadowAccount.inc:103 ../lib/modules/shadowAccount.inc:170
+#: ../lib/modules/shadowAccount.inc:200 ../lib/modules/shadowAccount.inc:322
 msgid "Maximum password age"
 msgstr "パスワード期限(age)の最大値"
 
-#: ../lib/modules/inetOrgPerson.inc:138
+#: ../lib/modules/inetOrgPerson.inc:139
 msgid "Miller"
 msgstr "ミラー"
 
-#: ../lib/modules/posixGroup.inc:297 ../lib/modules/posixGroup.inc:467
+#: ../lib/modules/posixGroup.inc:312 ../lib/modules/posixGroup.inc:483
 msgid "Minimum GID number"
 msgstr "GID番号の最小値"
 
-#: ../lib/modules/posixGroup.inc:316
+#: ../lib/modules/posixGroup.inc:331
 msgid "Minimum GID number for Unix groups"
 msgstr "unixグループに対するGID番号の最小値"
 
-#: ../lib/modules/posixGroup.inc:467
+#: ../lib/modules/posixGroup.inc:483
 msgid "Minimum GID number is invalid or empty!"
 msgstr "GID番号の最小値が不正または空です!"
 
-#: ../lib/modules/posixAccount.inc:57 ../lib/modules/posixAccount.inc:59
-#: ../lib/modules/posixAccount.inc:126 ../lib/modules/posixAccount.inc:135
+#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixAccount.inc:145 ../lib/modules/posixAccount.inc:154
 msgid "Minimum UID number"
 msgstr "UID番号の最小値"
 
-#: ../lib/modules/posixAccount.inc:158
+#: ../lib/modules/posixAccount.inc:177
 msgid "Minimum UID number for Unix accounts (hosts)"
 msgstr "unixアカウント(ホスト)に対するUID番号の最小値"
 
-#: ../lib/modules/posixAccount.inc:156
+#: ../lib/modules/posixAccount.inc:175
 msgid "Minimum UID number for Unix accounts (users)"
 msgstr "unixアカウント(ユーザ)に対するUID番号の最小値"
 
-#: ../lib/modules/posixAccount.inc:57 ../lib/modules/posixAccount.inc:59
+#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:74
 msgid "Minimum UID number is invalid!"
 msgstr "UID番号の最小値が不正です!"
 
-#: ../lib/modules/shadowAccount.inc:83 ../lib/modules/shadowAccount.inc:154
-#: ../lib/modules/shadowAccount.inc:182 ../lib/modules/shadowAccount.inc:307
-#: ../help/help.inc:178
+#: ../lib/modules/shadowAccount.inc:98 ../lib/modules/shadowAccount.inc:166
+#: ../lib/modules/shadowAccount.inc:194 ../lib/modules/shadowAccount.inc:319
 msgid "Minimum password age"
 msgstr "パスワード期限(age)の最小値"
 
-#: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:185
-#: ../lib/modules/inetOrgPerson.inc:259 ../lib/modules/inetOrgPerson.inc:260
-#: ../lib/modules/inetOrgPerson.inc:436 ../lib/modules/inetOrgPerson.inc:470
+#: ../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
 msgid "Mobile number"
 msgstr "携帯電話番号"
 
-#: ../lib/modules.inc:854 ../lib/modules.inc:992
+#: ../lib/modules.inc:873 ../lib/modules.inc:1019
 msgid "Modify Account"
 msgstr "アカウント変更"
 
@@ -2268,31 +2387,36 @@ msgstr "モジュール選択"
 msgid "Module settings"
 msgstr "モジュール設定"
 
-#: ../lib/modules/quota.inc:64 ../lib/modules/quota.inc:291
-#: ../lib/modules/quota.inc:349 ../lib/modules/quota.inc:422
+#: ../lib/modules/sambaSamAccount.inc:885
+msgid "Monday"
+msgstr "月曜日"
+
+#: ../lib/modules/quota.inc:86 ../lib/modules/quota.inc:317
+#: ../lib/modules/quota.inc:375 ../lib/modules/quota.inc:453
 msgid "Mountpoint"
 msgstr "マウントポイント"
 
-#: ../lib/modules/quota.inc:65
+#: ../lib/modules/quota.inc:87
 msgid "Mountpoint of device with enabled quotas."
 msgstr "quotaが有効になったデバイスのマウントポイント。"
 
-#: ../lib/modules/inetOrgPerson.inc:175
+#: ../lib/modules/inetOrgPerson.inc:182
 msgid "Mycity"
 msgstr "おらが市"
 
-#: ../lib/modules/inetOrgPerson.inc:163
+#: ../lib/modules/inetOrgPerson.inc:170
 msgid "Mystreetname 42"
 msgstr "おらが町42番地"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:59
 #: ../templates/tree/templates/creation/new_ou_template.php:104
-#: ../templates/schema/schema.php:274 ../templates/pdfedit/pdfdelete.php:56
+#: ../templates/schema/schema.php:272 ../templates/pdfedit/pdfdelete.php:56
 #: ../templates/pdfedit/pdfdelete.php:59 ../templates/pdfedit/pdfdelete.php:78
+#: ../templates/pdfedit/pdfpage.php:668
 msgid "Name"
 msgstr "名前"
 
-#: ../help/help.inc:138
+#: ../help/help.inc:137
 msgid ""
 "Name under which the profile will be saved. If a profile with the same name "
 "exists, it will be overwritten."
@@ -2304,11 +2428,11 @@ msgstr ""
 msgid "New Domain"
 msgstr "新しいドメイン"
 
-#: ../templates/lists/listgroups.php:236
+#: ../templates/lists/listgroups.php:237
 msgid "New Group"
 msgstr "新しいグループ"
 
-#: ../templates/lists/listhosts.php:221
+#: ../templates/lists/listhosts.php:222
 msgid "New Host"
 msgstr "新しいホスト"
 
@@ -2316,8 +2440,8 @@ msgstr "新しいホスト"
 msgid "New MAC address"
 msgstr "新しいMACアドレス"
 
-#: ../templates/ou_edit.php:52 ../templates/ou_edit.php:117
-#: ../templates/ou_edit.php:182 ../templates/ou_edit.php:247
+#: ../templates/ou_edit.php:60 ../templates/ou_edit.php:125
+#: ../templates/ou_edit.php:190 ../templates/ou_edit.php:255
 msgid "New OU created successfully."
 msgstr "新しい OU が作成されました。"
 
@@ -2342,9 +2466,9 @@ msgid "New master password set successfully."
 msgstr "新しいマスタパスワードが正しく設定されました。"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:47
-#: ../templates/ou_edit.php:341 ../templates/ou_edit.php:378
-#: ../templates/ou_edit.php:415 ../templates/ou_edit.php:452
-#: ../help/help.inc:243
+#: ../templates/ou_edit.php:349 ../templates/ou_edit.php:386
+#: ../templates/ou_edit.php:423 ../templates/ou_edit.php:460
+#: ../help/help.inc:146
 msgid "New organizational unit"
 msgstr "新しい organizational unit"
 
@@ -2360,7 +2484,7 @@ msgstr "新しい受信者"
 msgid "New required attributes:"
 msgstr "新しい必須属性"
 
-#: ../templates/lists/listusers.php:281
+#: ../templates/lists/listusers.php:282
 msgid "New user"
 msgstr "新しいユーザ"
 
@@ -2374,11 +2498,11 @@ msgstr "新しい値"
 msgid "Next"
 msgstr "次"
 
-#: ../templates/domain.php:155 ../help/help.inc:257
+#: ../templates/domain.php:155 ../help/help.inc:160
 msgid "Next Group RID"
 msgstr "次のグループRID"
 
-#: ../templates/domain.php:129 ../help/help.inc:253
+#: ../templates/domain.php:129 ../help/help.inc:156
 msgid "Next RID"
 msgstr "次のRID"
 
@@ -2386,19 +2510,19 @@ msgstr "次のRID"
 msgid "Next RID is not a number!"
 msgstr "次のRIDが数字ではありません!"
 
-#: ../help/help.inc:254
+#: ../help/help.inc:157
 msgid "Next RID to use when creating accounts."
 msgstr "アカウント作成時に使われる次のRID。"
 
-#: ../help/help.inc:258
+#: ../help/help.inc:161
 msgid "Next RID to use when creating groups."
 msgstr "グループ作成時に使われる次のRID。"
 
-#: ../help/help.inc:256
+#: ../help/help.inc:159
 msgid "Next RID to use when creating user accounts."
 msgstr "ユーザアカウントを作成するときに使われる次のRID。"
 
-#: ../templates/domain.php:142 ../help/help.inc:255
+#: ../templates/domain.php:142 ../help/help.inc:158
 msgid "Next User RID"
 msgstr "次のユーザRID"
 
@@ -2410,8 +2534,8 @@ msgstr "次のグループRIDが番号ではありあせん!"
 msgid "Next user RID is not a number!"
 msgstr "次のユーザRIDが番号ではありません!"
 
-#: ../templates/schema/schema.php:159 ../templates/schema/schema.php:201
-#: ../templates/schema/schema.php:206 ../templates/schema/schema.php:211
+#: ../templates/schema/schema.php:157 ../templates/schema/schema.php:199
+#: ../templates/schema/schema.php:204 ../templates/schema/schema.php:209
 msgid "No"
 msgstr "いいえ"
 
@@ -2421,8 +2545,8 @@ msgstr "いいえ"
 msgid "No Samba domains found!"
 msgstr "Sambaドメインが見つかりません!"
 
-#: ../lib/modules/posixAccount.inc:366 ../lib/modules/posixAccount.inc:597
-#: ../lib/modules/posixAccount.inc:830
+#: ../lib/modules/posixAccount.inc:415 ../lib/modules/posixAccount.inc:647
+#: ../lib/modules/posixAccount.inc:908
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "unixグループがLDAPに存在しません。最初に一個作成してください。"
 
@@ -2430,15 +2554,15 @@ msgstr "unixグループがLDAPに存在しません。最初に一個作成し
 msgid "No changes were made."
 msgstr "変更されませんでした。"
 
-#: ../templates/config/conflogin.php:93
+#: ../templates/config/conflogin.php:104
 msgid "No configuration profiles found. Please create one."
 msgstr "設定プロファイルがありません。一丁作成してください。"
 
-#: ../templates/schema/schema.php:150
+#: ../templates/schema/schema.php:148
 msgid "No description"
 msgstr "説明なし"
 
-#: ../lib/modules/posixGroup.inc:465 ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixGroup.inc:481 ../lib/modules/posixAccount.inc:82
 msgid "No free ID-Number!"
 msgstr "空いているID番号がありません!"
 
@@ -2450,11 +2574,11 @@ msgstr "グループが見つかりません!"
 msgid "No hosts found!"
 msgstr "ホストが見つかりません!"
 
-#: ../templates/tree/edit.php:185
+#: ../templates/tree/edit.php:188
 msgid "No internal attributes"
 msgstr "内部属性なし"
 
-#: ../templates/pdfedit/pdfpage.php:409
+#: ../templates/pdfedit/pdfpage.php:389
 msgid "No logo"
 msgstr "ロゴがありません"
 
@@ -2466,11 +2590,11 @@ msgstr "ベースモジュールが選択されていないか、または複数
 msgid "No password was entered!"
 msgstr "パスワードが入力されていません!"
 
-#: ../templates/pdfedit/pdfpage.php:73
+#: ../templates/pdfedit/pdfpage.php:121
 msgid "No section text specified"
 msgstr "セクションテキストが指定されていません!"
 
-#: ../templates/pdfedit/pdfpage.php:77
+#: ../templates/pdfedit/pdfpage.php:125
 msgid "No static text specified"
 msgstr "静的テキストが指定されていません!"
 
@@ -2478,7 +2602,7 @@ msgstr "静的テキストが指定されていません!"
 msgid "No such entry!"
 msgstr "そのようなエントリはありません!"
 
-#: ../templates/schema/schema.php:443
+#: ../templates/schema/schema.php:441
 #, php-format
 msgid "No such schema item: \"%s\""
 msgstr "そのようなスキーマアイテムはありません: \"%s\""
@@ -2487,7 +2611,7 @@ msgstr "そのようなスキーマアイテムはありません: \"%s\""
 msgid "No users found!"
 msgstr "ユーザが見つかりません!"
 
-#: ../help/help.inc:57
+#: ../help/help.inc:56
 msgid "Note"
 msgstr "注"
 
@@ -2499,12 +2623,12 @@ msgstr ""
 "注意: この属性に対するあなたのLDAPサーバ上における比較ルールをセットしない場"
 "合、\"inappropriate matching\"エラーを受け取るでしょう。"
 
-#: ../lib/modules/shadowAccount.inc:151 ../help/help.inc:175
+#: ../lib/modules/shadowAccount.inc:163
 msgid ""
 "Number of days a user can login even his password has expired. -1=always."
 msgstr "パスワードが期限切れになってもユーザがログインできる日数。-1は無期限。"
 
-#: ../lib/modules/shadowAccount.inc:155 ../help/help.inc:179
+#: ../lib/modules/shadowAccount.inc:167
 msgid ""
 "Number of days a user has to wait until he\\'s allowed to change his "
 "password again. If set value must be 0<."
@@ -2512,7 +2636,7 @@ msgstr ""
 "再度パスワードを変更できるまで待たなければならない日数。設定するならば0より大"
 "きくなければならない。"
 
-#: ../lib/modules/shadowAccount.inc:159 ../help/help.inc:177
+#: ../lib/modules/shadowAccount.inc:171
 msgid ""
 "Number of days after a user has to change his password again. If set value "
 "must be 0<."
@@ -2520,17 +2644,17 @@ msgstr ""
 "再度パスワードを変更しなければならなくなる日数。設定するならば0より大きくなけ"
 "ればならない。"
 
-#: ../templates/schema/schema.php:153 ../templates/schema/schema.php:350
+#: ../templates/schema/schema.php:151 ../templates/schema/schema.php:348
 msgid "OID"
 msgstr ""
 
-#: ../templates/ou_edit.php:58 ../templates/ou_edit.php:123
-#: ../templates/ou_edit.php:188 ../templates/ou_edit.php:253
+#: ../templates/ou_edit.php:66 ../templates/ou_edit.php:131
+#: ../templates/ou_edit.php:196 ../templates/ou_edit.php:261
 msgid "OU already exists!"
 msgstr "OU はすでに存在しています!"
 
-#: ../templates/ou_edit.php:69 ../templates/ou_edit.php:134
-#: ../templates/ou_edit.php:199 ../templates/ou_edit.php:264
+#: ../templates/ou_edit.php:77 ../templates/ou_edit.php:142
+#: ../templates/ou_edit.php:207 ../templates/ou_edit.php:272
 msgid "OU deleted successfully."
 msgstr "OU は正しく削除されました。"
 
@@ -2538,35 +2662,35 @@ msgstr "OU は正しく削除されました。"
 msgid "OU editor"
 msgstr "OUエディタ"
 
-#: ../templates/ou_edit.php:62 ../templates/ou_edit.php:127
-#: ../templates/ou_edit.php:192 ../templates/ou_edit.php:257
+#: ../templates/ou_edit.php:70 ../templates/ou_edit.php:135
+#: ../templates/ou_edit.php:200 ../templates/ou_edit.php:265
 msgid "OU is invalid!"
 msgstr "OU が正しくありません!"
 
-#: ../templates/ou_edit.php:99 ../templates/ou_edit.php:164
-#: ../templates/ou_edit.php:229 ../templates/ou_edit.php:294
+#: ../templates/ou_edit.php:107 ../templates/ou_edit.php:172
+#: ../templates/ou_edit.php:237 ../templates/ou_edit.php:302
 msgid "OU is not empty or invalid!"
 msgstr "OU が空白でないか不正!"
 
-#: ../help/help.inc:243 ../help/help.inc:245
+#: ../help/help.inc:146 ../help/help.inc:148
 msgid "OU-Editor"
 msgstr "OUエディタ"
 
 #: ../templates/tree/templates/creation/custom.php:70
-#: ../templates/schema/schema.php:71 ../templates/schema/schema.php:72
+#: ../templates/schema/schema.php:69 ../templates/schema/schema.php:70
 msgid "Object classes"
 msgstr "オブジェクトクラス"
 
-#: ../lib/modules.inc:1021 ../lib/modules.inc:1059 ../lib/modules.inc:1174
+#: ../lib/modules.inc:1050 ../lib/modules.inc:1088 ../lib/modules.inc:1209
 #, php-format
 msgid "ObjectClass %s required but not defined in LDAP."
 msgstr "必須オブジェクトクラス %s がLDAPに定義されていません。"
 
-#: ../templates/schema/schema.php:158 ../templates/schema/schema.php:289
+#: ../templates/schema/schema.php:156 ../templates/schema/schema.php:287
 msgid "Obsolete"
 msgstr ""
 
-#: ../templates/config/conflogin.php:123 ../templates/config/conflogin.php:124
+#: ../templates/config/conflogin.php:134 ../templates/config/conflogin.php:135
 msgid "Ok"
 msgstr ""
 
@@ -2574,8 +2698,12 @@ msgstr ""
 msgid "Old value"
 msgstr "古い値"
 
+#: ../templates/tree/export_form.php:74
+msgid "One (one level beneath base)"
+msgstr "One (ベース直下の1階層)"
+
 #: ../templates/tree/templates/creation/custom.php:209
-#: ../templates/schema/schema.php:390
+#: ../templates/schema/schema.php:388
 msgid "Optional attributes"
 msgstr "任意属性"
 
@@ -2583,7 +2711,7 @@ msgstr "任意属性"
 msgid "Optional binary attributes"
 msgstr "任意バイナリ属性"
 
-#: ../templates/schema/schema.php:177
+#: ../templates/schema/schema.php:175
 msgid "Ordering"
 msgstr "並べ替え"
 
@@ -2595,38 +2723,42 @@ msgstr ""
 msgid "PDF editor"
 msgstr "PDFエディタ"
 
-#: ../templates/lists/listhosts.php:226 ../templates/lists/listgroups.php:241
-#: ../templates/lists/listusers.php:286 ../templates/pdfedit/pdfpage.php:573
+#: ../templates/lists/listhosts.php:227 ../templates/lists/listgroups.php:242
+#: ../templates/lists/listusers.php:287 ../templates/pdfedit/pdfpage.php:450
 msgid "PDF structure"
 msgstr "PDF構成"
 
-#: ../templates/pdfedit/pdfmain.php:101
+#: ../templates/pdfedit/pdfpage.php:108
+msgid "PDF structure was successfully saved."
+msgstr "PDF構成を保存しました。"
+
+#: ../templates/pdfedit/pdfmain.php:110
 msgid "PDF structures"
 msgstr "PDF構成"
 
-#: ../templates/pdfedit/pdfpage.php:61
+#: ../templates/pdfedit/pdfpage.php:103
 msgid "PDF-structure name not valid"
 msgstr "PDF構成名が正しくありません"
 
-#: ../templates/pdfedit/pdfpage.php:429
+#: ../templates/pdfedit/pdfpage.php:409
 msgid "Page settings"
 msgstr "ページ設定"
 
-#: ../templates/schema/schema.php:372
+#: ../templates/schema/schema.php:370
 msgid "Parent to"
 msgstr "派生先"
 
-#: ../templates/login.php:189 ../lib/modules/posixGroup.inc:157
-#: ../lib/modules/posixGroup.inc:169 ../lib/modules/posixGroup.inc:258
-#: ../lib/modules/posixGroup.inc:460 ../lib/modules/posixGroup.inc:461
-#: ../lib/modules/posixGroup.inc:462 ../lib/modules/sambaAccount.inc:59
-#: ../lib/modules/sambaAccount.inc:60 ../lib/modules/sambaAccount.inc:204
-#: ../lib/modules/sambaSamAccount.inc:55 ../lib/modules/sambaSamAccount.inc:56
-#: ../lib/modules/sambaSamAccount.inc:220 ../lib/modules/posixAccount.inc:71
-#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:73
-#: ../lib/modules/posixAccount.inc:212 ../lib/modules/posixAccount.inc:323
-#: ../lib/modules/posixAccount.inc:871 ../lib/modules/posixAccount.inc:883
-#: ../lib/modules/posixAccount.inc:976 ../lib/modules/posixAccount.inc:1087
+#: ../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
+#: ../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
 msgid "Password"
 msgstr "パスワード"
 
@@ -2634,10 +2766,10 @@ msgstr "パスワード"
 msgid "Password changed!"
 msgstr "パスワードが変更されました!"
 
-#: ../lib/modules/posixGroup.inc:461 ../lib/modules/sambaAccount.inc:60
-#: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaSamAccount.inc:56
-#: ../lib/modules/sambaSamAccount.inc:57 ../lib/modules/posixAccount.inc:72
-#: ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixGroup.inc:477 ../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
 msgid ""
 "Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and #*,.;:_-+!$%&/|?{[()]}= !"
@@ -2645,74 +2777,66 @@ msgstr ""
 "パスワードに不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, #*,.;:_-"
 "+!$%&/|?{[()]}= ! です。"
 
-#: ../lib/modules/sambaAccount.inc:110 ../lib/modules/sambaAccount.inc:226
-#: ../lib/modules/sambaAccount.inc:337 ../lib/modules/sambaAccount.inc:340
-#: ../lib/modules/sambaAccount.inc:701 ../lib/modules/sambaSamAccount.inc:152
-#: ../lib/modules/sambaSamAccount.inc:155
-#: ../lib/modules/sambaSamAccount.inc:242
-#: ../lib/modules/sambaSamAccount.inc:687
-#: ../lib/modules/sambaSamAccount.inc:837 ../help/help.inc:200
+#: ../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
 msgid "Password does not expire"
 msgstr "無期限のパスワード"
 
-#: ../lib/modules/shadowAccount.inc:43 ../lib/modules/shadowAccount.inc:78
-#: ../lib/modules/shadowAccount.inc:150 ../lib/modules/shadowAccount.inc:176
-#: ../lib/modules/shadowAccount.inc:304 ../lib/modules/shadowAccount.inc:341
+#: ../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
 msgid "Password expiration"
 msgstr "パスワード有効期限"
 
-#: ../lib/modules/shadowAccount.inc:43 ../lib/modules/shadowAccount.inc:44
+#: ../lib/modules/shadowAccount.inc:58 ../lib/modules/shadowAccount.inc:59
 msgid "Password expiration must be are natural number or -1."
 msgstr "パスワード有効期限は自然数または-1でなければなりません。"
 
-#: ../help/help.inc:174
-msgid "Password expire"
-msgstr "パスワード有効期限"
-
-#: ../lib/modules/posixGroup.inc:304 ../lib/modules/posixGroup.inc:417
-#: ../lib/modules/posixAccount.inc:144 ../lib/modules/posixAccount.inc:298
+#: ../lib/modules/posixGroup.inc:319 ../lib/modules/posixGroup.inc:432
+#: ../lib/modules/posixAccount.inc:163 ../lib/modules/posixAccount.inc:324
 msgid "Password hash type"
 msgstr "パスワードハッシュ形式"
 
-#: ../lib/modules/posixAccount.inc:160
+#: ../lib/modules/posixAccount.inc:179
 msgid "Password hash type for Unix accounts"
 msgstr "unixアカウントに対するパスワードハッシュ形式"
 
-#: ../lib/modules/posixGroup.inc:318
+#: ../lib/modules/posixGroup.inc:333
 msgid "Password hash type for Unix groups"
 msgstr "unixグループに対するパスワードハッシュ形式"
 
-#: ../lib/modules/shadowAccount.inc:41 ../lib/modules/shadowAccount.inc:47
+#: ../lib/modules/shadowAccount.inc:56 ../lib/modules/shadowAccount.inc:62
 msgid "Password maxage"
 msgstr "パスワード寿命の最大値"
 
-#: ../lib/modules/shadowAccount.inc:41 ../lib/modules/shadowAccount.inc:42
+#: ../lib/modules/shadowAccount.inc:56 ../lib/modules/shadowAccount.inc:57
 msgid "Password maximum age must be are natural number."
 msgstr "パスワード寿命の最大値は自然数でなければなりません。"
 
-#: ../lib/modules/shadowAccount.inc:47 ../lib/modules/shadowAccount.inc:48
+#: ../lib/modules/shadowAccount.inc:62 ../lib/modules/shadowAccount.inc:63
 msgid "Password maximum age must be bigger as password minimum age."
 msgstr "パスワード寿命の最大値は最小値より大きくなければなりません。"
 
-#: ../lib/modules/shadowAccount.inc:39
+#: ../lib/modules/shadowAccount.inc:54
 msgid "Password minage"
 msgstr "パスワード寿命の最小値"
 
-#: ../lib/modules/shadowAccount.inc:39 ../lib/modules/shadowAccount.inc:40
+#: ../lib/modules/shadowAccount.inc:54 ../lib/modules/shadowAccount.inc:55
 msgid "Password minimum age must be are natural number."
 msgstr "パスワード寿命の最小値は自然数でなければなりません。"
 
-#: ../help/help.inc:172
-msgid "Password warn"
-msgstr "パスワード警告"
-
-#: ../lib/modules/shadowAccount.inc:45 ../lib/modules/shadowAccount.inc:73
-#: ../lib/modules/shadowAccount.inc:146 ../lib/modules/shadowAccount.inc:170
-#: ../lib/modules/shadowAccount.inc:301 ../lib/modules/shadowAccount.inc:339
+#: ../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
 msgid "Password warning"
 msgstr "パスワード警告"
 
-#: ../lib/modules/shadowAccount.inc:45 ../lib/modules/shadowAccount.inc:46
+#: ../lib/modules/shadowAccount.inc:60 ../lib/modules/shadowAccount.inc:61
 msgid "Password warning must be are natural number."
 msgstr "パスワード警告期限は自然数でなければなりません。"
 
@@ -2720,14 +2844,11 @@ msgstr "パスワード警告期限は自然数でなければなりません。
 msgid "Passwords are different!"
 msgstr "パスワードが異なっています!"
 
-#: ../lib/modules/sambaAccount.inc:361 ../lib/modules/sambaSamAccount.inc:176
-#: ../help/help.inc:213
+#: ../lib/modules/sambaAccount.inc:375 ../lib/modules/sambaSamAccount.inc:199
 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 groupname."
-msgstr ""
-"ユーザプロファイルのパス。ローカル絶対パス、または、UNCパス(\\\\サーバ\\共"
-"有)。 $use と $group はユーザとグループに置き換えられます。"
+"\\server\\share). $user and $group are replaced with user and group name."
+msgstr "ユーザプロファイルのパス。ローカル絶対パス、または、UNCパス(\\\\サーバ\\共有)。 $use と $group はユーザとグループ名に置き換えられます。"
 
 #: ../templates/config/confmain.php:426 ../lib/config.inc:368
 msgid "Path to external script"
@@ -2737,7 +2858,7 @@ msgstr "外部スクリプトのパス"
 msgid "Permanently delete all children, too?"
 msgstr "全ての子も削除しますか?"
 
-#: ../lib/modules/inetOrgPerson.inc:87
+#: ../lib/modules/inetOrgPerson.inc:93
 msgid "Personal"
 msgstr ""
 
@@ -2745,90 +2866,97 @@ msgstr ""
 msgid "Please confirm:"
 msgstr "確認してください:"
 
-#: ../lib/modules/sambaSamAccount.inc:60
+#: ../lib/modules/sambaSamAccount.inc:75
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "特殊アカウントのRID番号または名前を入力してください。"
 
-#: ../lib/modules/sambaAccount.inc:55 ../lib/modules/sambaAccount.inc:56
-#: ../lib/modules/sambaSamAccount.inc:53 ../lib/modules/sambaSamAccount.inc:54
+#: ../lib/modules/inetOrgPerson.inc:339
+msgid ""
+"Please enter a comma separated list of host names where this user is allowed "
+"to log in. Can be left empty."
+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/inetOrgPerson.inc:74
+#: ../lib/modules/posixAccount.inc:106 ../lib/modules/posixAccount.inc:107
+#: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:76
 msgid "Please enter a valid common name!"
 msgstr "正しい氏名を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:69 ../lib/modules/sambaAccount.inc:70
-#: ../lib/modules/sambaSamAccount.inc:67 ../lib/modules/sambaSamAccount.inc:68
+#: ../lib/modules/sambaAccount.inc:84 ../lib/modules/sambaAccount.inc:85
+#: ../lib/modules/sambaSamAccount.inc:82 ../lib/modules/sambaSamAccount.inc:83
 msgid "Please enter a valid date in format DD-MM-YYYY."
 msgstr "正しい日付をDD-MM-YYYYの形式で入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:64 ../lib/modules/sambaSamAccount.inc:62
+#: ../lib/modules/sambaAccount.inc:79 ../lib/modules/sambaSamAccount.inc:77
 msgid "Please enter a valid display name!"
 msgstr "正しい表示名(display name)を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:71 ../lib/modules/sambaSamAccount.inc:69
+#: ../lib/modules/sambaAccount.inc:86 ../lib/modules/sambaSamAccount.inc:84
 msgid "Please enter a valid drive letter."
 msgstr "正しいドライブ文字を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:63
+#: ../lib/modules/inetOrgPerson.inc:63 ../lib/modules/inetOrgPerson.inc:64
 msgid "Please enter a valid eMail address!"
 msgstr "正しい電子メールアドレスを入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:73
+#: ../lib/modules/inetOrgPerson.inc:73 ../lib/modules/inetOrgPerson.inc:74
 msgid "Please enter a valid employee type!"
 msgstr "正しい雇用形態を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:61
+#: ../lib/modules/inetOrgPerson.inc:61 ../lib/modules/inetOrgPerson.inc:62
 msgid "Please enter a valid fax number!"
 msgstr "正しいファクス番号を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:72
+#: ../lib/modules/sambaAccount.inc:87
 msgid "Please enter a valid group RID."
 msgstr "正しいグループRIDを入力してください!"
 
-#: ../lib/modules/sambaSamAccount.inc:72
+#: ../lib/modules/sambaSamAccount.inc:88
 msgid "Please enter a valid group name!"
 msgstr "正しいグループ名を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:71
+#: ../lib/modules/inetOrgPerson.inc:71 ../lib/modules/inetOrgPerson.inc:72
 msgid "Please enter a valid job title!"
 msgstr "正しい役職を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:59
+#: ../lib/modules/inetOrgPerson.inc:59 ../lib/modules/inetOrgPerson.inc:60
 msgid "Please enter a valid mobile number!"
 msgstr "正しい携帯電話番号を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:67
+#: ../lib/modules/inetOrgPerson.inc:67 ../lib/modules/inetOrgPerson.inc:68
 msgid "Please enter a valid postal address!"
 msgstr "正しい住所を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:69
+#: ../lib/modules/inetOrgPerson.inc:69 ../lib/modules/inetOrgPerson.inc:70
 msgid "Please enter a valid postal code!"
 msgstr "正しい郵便番号を入力してください!"
 
-#: ../lib/modules/sambaAccount.inc:73
+#: ../lib/modules/sambaAccount.inc:88
 msgid "Please enter a valid special user name."
 msgstr "正しい特殊ユーザ名(special user name)を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:65
+#: ../lib/modules/inetOrgPerson.inc:65 ../lib/modules/inetOrgPerson.inc:66
 msgid "Please enter a valid street name!"
 msgstr "正しい町名(street name)を入力してください!"
 
-#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:57
+#: ../lib/modules/inetOrgPerson.inc:57 ../lib/modules/inetOrgPerson.inc:58
 msgid "Please enter a valid telephone number!"
 msgstr "正しい電話番号を入力してください!"
 
-#: ../lib/modules/posixGroup.inc:577 ../lib/modules/posixAccount.inc:651
+#: ../lib/modules/posixGroup.inc:593 ../lib/modules/posixAccount.inc:723
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "%s と %s の間の値を入力してください!"
 
-#: ../templates/config/conflogin.php:87
+#: ../templates/config/conflogin.php:98
 msgid "Please enter password to change preferences:"
 msgstr "プリファレンスを変更するためのパスワードを入力してください:"
 
-#: ../help/help.inc:47
+#: ../help/help.inc:46
 msgid ""
 "Please enter the configuration password. This is NOT your LDAP password. It "
 "is stored in your .conf-file. If this is the first time you log in, enter "
@@ -2838,7 +2966,7 @@ msgstr ""
 "ルに記録されます。もしもこれが最初のログインならば、\"lam\" と入力してくださ"
 "い。"
 
-#: ../help/help.inc:127
+#: ../help/help.inc:126
 msgid ""
 "Please enter the master configuration password. This is NOT your LDAP "
 "password. It is stored in your config.cfg file. If this is the first time "
@@ -2848,7 +2976,7 @@ msgstr ""
 "これはconfig.cfgファイルに保存されます。もしもこれが最初のログインならば、 "
 "\"lam\" と入力してください。"
 
-#: ../help/help.inc:115
+#: ../help/help.inc:114
 msgid ""
 "Please enter the name of the new profile and the password to change its "
 "settings. Profile names may contain letters, numbers and -/_."
@@ -2856,7 +2984,7 @@ msgstr ""
 "その設定を変更するための新しいプロファイル名とパスワードを入力。プロファイル"
 "名にはアルファベット、数字と -/_ が使用できます。"
 
-#: ../help/help.inc:117
+#: ../help/help.inc:116
 msgid ""
 "Please enter the new name of the profile. The name may contain letters, "
 "numbers and -/_."
@@ -2864,12 +2992,22 @@ msgstr ""
 "新しいプロファイル名を入力。名前にはアルファベット、数字と -/_ が使用できま"
 "す。"
 
-#: ../lib/modules/posixAccount.inc:324
+#: ../lib/modules/posixAccount.inc:362
 msgid "Please enter the password which you want to set for this account."
 msgstr "このアカウントに対するパスワードを入力してください。"
 
-#: ../lib/modules/posixGroup.inc:460 ../lib/modules/sambaAccount.inc:59
-#: ../lib/modules/sambaSamAccount.inc:55 ../lib/modules/posixAccount.inc:71
+#: ../lib/modules/posixAccount.inc:341
+msgid "Please enter the path to the user's home directory."
+msgstr "ユーザのホームディレクトリを入力してください。"
+
+#: ../lib/modules/quota.inc:123
+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} です。"
+
+#: ../lib/modules/posixGroup.inc:476 ../lib/modules/sambaAccount.inc:74
+#: ../lib/modules/sambaSamAccount.inc:70 ../lib/modules/posixAccount.inc:86
 msgid "Please enter the same password in both password-fields."
 msgstr "2つのパスワードフィールドに同じパスワードを入力してください。"
 
@@ -2883,7 +3021,7 @@ msgstr ""
 "子が記入されていなくてはなりません。後に続く行は、各々の行が一つのアカウント"
 "になります。"
 
-#: ../lib/status.inc:62
+#: ../lib/status.inc:66
 msgid ""
 "Please report this error to the Bug-Tracker at {link=http://lam.sf.net}LDAP "
 "Account Manager Development Team{endlink}. The error number is {bold}0001:"
@@ -2893,7 +3031,7 @@ msgstr ""
 "チーム{endlink}にレポートしてください。エラー番号は {bold}0001: Invalid/"
 "Missing Message type.{endbold} です。ご協力に感謝します。"
 
-#: ../lib/modules.inc:896
+#: ../lib/modules.inc:915
 msgid "Please select page:"
 msgstr "ページを選択:"
 
@@ -2901,11 +3039,11 @@ msgstr "ページを選択:"
 msgid "Please select your account type:"
 msgstr "アカウントタイプを選択してください:"
 
-#: ../templates/login.php:162
+#: ../templates/login.php:167
 msgid "Please select your user name and enter your password to log in"
 msgstr "ユーザ名を選んでからパスワードを入力してログインしてください。"
 
-#: ../lib/modules.inc:887
+#: ../lib/modules.inc:906
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "ページ %s の必須属性を全て設定してください。"
@@ -2914,57 +3052,54 @@ msgstr "ページ %s の必須属性を全て設定してください。"
 msgid "Please set up your master configuration file (config/config.cfg) first!"
 msgstr "最初に、マスター設定ファイル(config/config.cfg)を設定してください!"
 
-#: ../templates/pdfedit/pdfpage.php:708
+#: ../lib/modules/kolabUser.inc:223
+msgid "Policy list has invalid format!"
+msgstr "ポリシーリストの形式が不正です!"
+
+#: ../templates/pdfedit/pdfpage.php:711
 msgid "Position"
 msgstr "位置"
 
-#: ../help/help.inc:229
-msgid "Position in ldap-tree where the group should be created."
-msgstr "グループを作成すべきLDAPツリーの位置。"
-
-#: ../help/help.inc:231
-msgid "Position in ldap-tree where the host should be created."
-msgstr "ホストを作成すべきLDAPツリーの位置。"
-
-#: ../help/help.inc:227
-msgid "Position in ldap-tree where the user should be created."
-msgstr "ユーザを作成すべきLDAPツリーの位置。"
-
-#: ../templates/masscreate.php:163 ../templates/masscreate.php:300
-#: ../lib/modules/sambaGroupMapping.inc:353
+#: ../templates/masscreate.php:163 ../templates/masscreate.php:301
+#: ../lib/modules/sambaGroupMapping.inc:368
 msgid "Possible values"
 msgstr "候補となる値"
 
-#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:173
-#: ../lib/modules/inetOrgPerson.inc:251 ../lib/modules/inetOrgPerson.inc:428
-#: ../lib/modules/inetOrgPerson.inc:468
+#: ../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
+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
 msgid "Postal address"
 msgstr "住所"
 
-#: ../lib/modules/inetOrgPerson.inc:252
+#: ../lib/modules/inetOrgPerson.inc:311
 msgid "Postal address, city"
 msgstr "住所、区市町村"
 
-#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:167
-#: ../lib/modules/inetOrgPerson.inc:247 ../lib/modules/inetOrgPerson.inc:248
-#: ../lib/modules/inetOrgPerson.inc:424 ../lib/modules/inetOrgPerson.inc:467
+#: ../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
 msgid "Postal code"
 msgstr "郵便番号"
 
-#: ../help/help.inc:77
+#: ../help/help.inc:76
 msgid "Predefined values"
 msgstr "あらかじめ定義された値"
 
-#: ../lib/modules/inetOrgPerson.inc:151
+#: ../lib/modules/inetOrgPerson.inc:152
 msgid "President"
 msgstr "社長"
 
-#: ../lib/modules/posixGroup.inc:129 ../lib/modules/posixAccount.inc:184
-#: ../lib/modules/posixAccount.inc:251 ../lib/modules/posixAccount.inc:315
-#: ../lib/modules/posixAccount.inc:350 ../lib/modules/posixAccount.inc:850
-#: ../lib/modules/posixAccount.inc:1004 ../lib/modules/posixAccount.inc:1032
-#: ../lib/modules/posixAccount.inc:1084 ../help/help.inc:156
-#: ../help/help.inc:168
+#: ../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
 msgid "Primary group"
 msgstr "プライマリグループ"
 
@@ -2977,15 +3112,15 @@ msgid "Profile editor"
 msgstr "プロファイルエディタ"
 
 #: ../templates/config/profmanage.php:50
-#: ../templates/config/profmanage.php:161 ../help/help.inc:114
-#: ../help/help.inc:116 ../help/help.inc:118 ../help/help.inc:120
-#: ../help/help.inc:122 ../help/help.inc:124 ../help/help.inc:126
+#: ../templates/config/profmanage.php:161 ../help/help.inc:113
+#: ../help/help.inc:115 ../help/help.inc:117 ../help/help.inc:119
+#: ../help/help.inc:121 ../help/help.inc:123 ../help/help.inc:125
 msgid "Profile management"
 msgstr "プロファイル管理"
 
 #: ../templates/config/profmanage.php:176
 #: ../templates/config/profmanage.php:228
-#: ../templates/profedit/profilepage.php:152 ../help/help.inc:137
+#: ../templates/profedit/profilepage.php:234 ../help/help.inc:136
 msgid "Profile name"
 msgstr "プロファイル名"
 
@@ -3004,38 +3139,46 @@ msgstr "プロファイルパスワード"
 msgid "Profile passwords are different or empty!"
 msgstr "プロファイルパスワードが異なるか、または未入力です!"
 
-#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:50
-#: ../lib/modules/sambaAccount.inc:136 ../lib/modules/sambaAccount.inc:268
-#: ../lib/modules/sambaAccount.inc:360 ../lib/modules/sambaAccount.inc:733
-#: ../lib/modules/sambaAccount.inc:838 ../lib/modules/sambaSamAccount.inc:47
-#: ../lib/modules/sambaSamAccount.inc:48
-#: ../lib/modules/sambaSamAccount.inc:175
-#: ../lib/modules/sambaSamAccount.inc:284
-#: ../lib/modules/sambaSamAccount.inc:719
-#: ../lib/modules/sambaSamAccount.inc:863
-#: ../lib/modules/sambaSamAccount.inc:956 ../help/help.inc:212
+#: ../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/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
 msgid "Profile path"
 msgstr "プロファイルパス"
 
-#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaSamAccount.inc:47
-#: ../lib/modules/sambaSamAccount.inc:49
+#: ../lib/modules/sambaAccount.inc:64 ../lib/modules/sambaSamAccount.inc:62
+#: ../lib/modules/sambaSamAccount.inc:64
 msgid "Profile path is invalid!"
 msgstr "プロファイルパスが正しくありません!"
 
-#: ../templates/profedit/profilecreate.php:112
+#: ../templates/profedit/profilepage.php:119
 msgid "Profile was saved."
 msgstr "プロファイルがセーブされました。"
 
-#: ../lib/modules/quota.inc:48
+#: ../lib/modules/quota.inc:70 ../lib/modules/quota.inc:122
 msgid "Quota"
-msgstr "クオータ"
+msgstr ""
+
+#: ../lib/modules/quota.inc:498
+msgid "Quota for:"
+msgstr ""
+
+#: ../lib/modules/quota.inc:57
+msgid "Quota has wrong format!"
+msgstr "quotaの形式が正しくありません!"
 
 #: ../templates/tree/templates/creation/custom.php:62
 msgid "RDN"
 msgstr ""
 
-#: ../templates/masscreate.php:155 ../templates/profedit/profilepage.php:111
-#: ../lib/modules.inc:976 ../help/help.inc:135
+#: ../templates/masscreate.php:155 ../templates/profedit/profilepage.php:193
+#: ../lib/modules.inc:1003 ../help/help.inc:134
 msgid "RDN identifier"
 msgstr "RDN識別子"
 
@@ -3047,7 +3190,7 @@ msgstr "RID (Windows UID)"
 msgid "Really create this new OU?"
 msgstr "このOUを新規作成しますか?"
 
-#: ../templates/tree/edit.php:519
+#: ../templates/tree/edit.php:520
 msgid "Really delete attribute?"
 msgstr "この属性を削除しますか?"
 
@@ -3082,17 +3225,23 @@ msgstr "プロファイルパスワードを再入力"
 msgid "Refresh"
 msgstr "リフレッシュ"
 
+#: ../lib/modules/kolabUser.inc:54
+msgid "Reject if conflicts"
+msgstr "競合の場合に拒否"
+
 #: ../templates/tree/templates/creation/custom.php:62
 msgid "Relative distinguished name"
 msgstr "相対識別名"
 
-#: ../templates/pdfedit/pdfpage.php:581 ../lib/modules/ieee802device.inc:146
+#: ../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/inetLocalMailRecipient.inc:208
 #: ../lib/modules/nisMailAlias.inc:174
 msgid "Remove"
 msgstr "削除"
 
-#: ../templates/config/profmanage.php:224 ../help/help.inc:116
+#: ../templates/config/profmanage.php:224 ../help/help.inc:115
 msgid "Rename profile"
 msgstr "プロファイル名変更"
 
@@ -3100,36 +3249,36 @@ msgstr "プロファイル名変更"
 msgid "Renamed profile."
 msgstr "プロファイル名が変更されました。"
 
-#: ../lib/modules/posixGroup.inc:163 ../lib/modules/posixGroup.inc:262
-#: ../lib/modules/sambaAccount.inc:690 ../lib/modules/sambaSamAccount.inc:676
-#: ../lib/modules/posixAccount.inc:877 ../lib/modules/posixAccount.inc:982
+#: ../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
 msgid "Repeat password"
 msgstr "パスワード再入力"
 
-#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:709
+#: ../lib/modules/posixAccount.inc:80 ../lib/modules/posixAccount.inc:781
 msgid "Replaced $user or $group in homedir."
 msgstr "$user または $group をホームディレクトリに置き換えました。"
 
-#: ../templates/tree/edit.php:238
+#: ../templates/tree/edit.php:241
 #, php-format
 msgid "Required attribute for objectClass(es) %s"
 msgstr "オブジェクトクラス %s に対する必須属性"
 
 #: ../templates/tree/templates/creation/custom.php:187
-#: ../templates/schema/schema.php:389
+#: ../templates/schema/schema.php:387
 msgid "Required attributes"
 msgstr "必須属性"
 
 #: ../templates/domain.php:222 ../templates/config/confmain.php:483
-#: ../templates/profedit/profilepage.php:162
+#: ../templates/profedit/profilepage.php:244
 msgid "Reset"
 msgstr "リセット"
 
-#: ../lib/modules.inc:918
+#: ../lib/modules.inc:937
 msgid "Reset changes"
 msgstr "変更をリセット"
 
-#: ../lib/modules/sambaAccount.inc:780 ../lib/modules/sambaSamAccount.inc:768
+#: ../lib/modules/sambaAccount.inc:789 ../lib/modules/sambaSamAccount.inc:834
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
@@ -3140,12 +3289,12 @@ msgstr "パスワードをリセット"
 msgid "Routing address"
 msgstr "転送アドレス"
 
-#: ../lib/modules/sambaAccount.inc:91
+#: ../lib/modules/sambaAccount.inc:106
 msgid "Samba 2"
 msgstr "Samba 2"
 
-#: ../lib/modules/sambaSamAccount.inc:89
-#: ../lib/modules/sambaGroupMapping.inc:218
+#: ../lib/modules/sambaSamAccount.inc:105
+#: ../lib/modules/sambaGroupMapping.inc:233
 msgid "Samba 3"
 msgstr "Samba 3"
 
@@ -3157,66 +3306,66 @@ msgstr "Samba 3 ドメインのSIDが不正です!"
 msgid "Samba 3 domains"
 msgstr "Samba 3 ドメイン"
 
-#: ../templates/ou_edit.php:410
+#: ../templates/ou_edit.php:418
 msgid "Samba Hosts"
 msgstr "Samba ホスト"
 
-#: ../lib/modules/sambaSamAccount.inc:187
-#: ../lib/modules/sambaSamAccount.inc:191
-#: ../lib/modules/sambaSamAccount.inc:309
-#: ../lib/modules/sambaSamAccount.inc:333
+#: ../lib/modules/sambaSamAccount.inc:210
+#: ../lib/modules/sambaSamAccount.inc:214
+#: ../lib/modules/sambaSamAccount.inc:335
+#: ../lib/modules/sambaSamAccount.inc:359
 msgid "Samba RID"
 msgstr "Samba RID"
 
-#: ../lib/modules/sambaGroupMapping.inc:252
-#: ../lib/modules/sambaGroupMapping.inc:277
+#: ../lib/modules/sambaGroupMapping.inc:267
+#: ../lib/modules/sambaGroupMapping.inc:292
 msgid "Samba RID number"
 msgstr "Samba RID番号"
 
-#: ../lib/modules/sambaGroupMapping.inc:246
+#: ../lib/modules/sambaGroupMapping.inc:261
 msgid "Samba display name"
 msgstr "Samba表示名"
 
-#: ../lib/modules/sambaGroupMapping.inc:238
+#: ../lib/modules/sambaGroupMapping.inc:253
 msgid "Samba domain name"
 msgstr "Sambaドメイン名"
 
-#: ../lib/modules/sambaGroupMapping.inc:258
-#: ../lib/modules/sambaGroupMapping.inc:285
-#: ../lib/modules/sambaGroupMapping.inc:302
+#: ../lib/modules/sambaGroupMapping.inc:273
+#: ../lib/modules/sambaGroupMapping.inc:300
+#: ../lib/modules/sambaGroupMapping.inc:317
 msgid "Samba group type"
 msgstr "Sambaグループタイプ"
 
-#: ../lib/modules/sambaAccount.inc:322 ../lib/modules/sambaAccount.inc:687
-#: ../lib/modules/sambaSamAccount.inc:137
-#: ../lib/modules/sambaSamAccount.inc:674
+#: ../lib/modules/sambaAccount.inc:336 ../lib/modules/sambaAccount.inc:696
+#: ../lib/modules/sambaSamAccount.inc:160
+#: ../lib/modules/sambaSamAccount.inc:730
 msgid "Samba password"
 msgstr "Sambaパスワード"
 
-#: ../lib/modules/sambaAccount.inc:55 ../lib/modules/sambaAccount.inc:148
-#: ../lib/modules/sambaAccount.inc:280 ../lib/modules/sambaAccount.inc:366
-#: ../lib/modules/sambaAccount.inc:739 ../lib/modules/sambaAccount.inc:839
-#: ../lib/modules/sambaSamAccount.inc:53
-#: ../lib/modules/sambaSamAccount.inc:181
-#: ../lib/modules/sambaSamAccount.inc:296
-#: ../lib/modules/sambaSamAccount.inc:725
-#: ../lib/modules/sambaSamAccount.inc:875
-#: ../lib/modules/sambaSamAccount.inc:957 ../help/help.inc:214
+#: ../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
 msgid "Samba workstations"
 msgstr "Samba ワークステーション"
 
-#: ../lib/pdf.inc:455
-msgid "Samba-Host information page"
-msgstr "Sambaホスト情報ページ"
+#: ../lib/modules/sambaSamAccount.inc:886
+msgid "Saturday"
+msgstr "土曜日"
 
-#: ../templates/tree/edit.php:506 ../templates/pdfedit/pdfpage.php:831
-#: ../templates/profedit/profilepage.php:160
+#: ../templates/tree/edit.php:507 ../templates/pdfedit/pdfpage.php:769
+#: ../templates/profedit/profilepage.php:242
 msgid "Save"
 msgstr "保存"
 
-#: ../help/help.inc:220
-msgid "Save profile"
-msgstr "プロファイルを保存"
+#: ../templates/tree/export_form.php:123
+msgid "Save as file"
+msgstr "ファイルとして保存"
 
 #: ../templates/config/confsave.php:177
 msgid "Saving group modules failed!"
@@ -3239,16 +3388,16 @@ msgstr "スキーマブラウザ"
 msgid "Scope"
 msgstr "スコープ"
 
-#: ../lib/modules/sambaSamAccount.inc:50 ../lib/modules/sambaSamAccount.inc:51
-#: ../help/help.inc:96 ../help/help.inc:210
+#: ../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:50
+#: ../templates/config/confsave.php:159 ../lib/modules/sambaSamAccount.inc:65
 msgid "Script path is invalid!"
 msgstr "スクリプトパスが正しくありません!"
 
-#: ../help/help.inc:101
+#: ../help/help.inc:100
 msgid "Script server"
 msgstr "スクリプトサーバ"
 
@@ -3260,7 +3409,17 @@ msgstr "スクリプトサーバが正しくありません!"
 msgid "Script settings"
 msgstr "スクリプト設定"
 
-#: ../templates/pdfedit/pdfpage.php:740
+#: ../templates/tree/export_form.php:114 ../lib/export.inc:443
+#: ../lib/export.inc:513
+msgid "Search filter"
+msgstr "検索フィルタ"
+
+#: ../templates/tree/export_form.php:102 ../lib/export.inc:442
+#: ../lib/export.inc:512
+msgid "Search scope"
+msgstr "検索スコープ"
+
+#: ../templates/pdfedit/pdfpage.php:660
 msgid "Section"
 msgstr "セクション"
 
@@ -3281,16 +3440,12 @@ msgstr "参照"
 msgid "Select a template for the creation process"
 msgstr "生成処理に対するテンプレートを選んでください"
 
-#: ../templates/lists/listhosts.php:199 ../templates/lists/listgroups.php:216
-#: ../templates/lists/listusers.php:246
+#: ../templates/lists/listhosts.php:200 ../templates/lists/listgroups.php:217
+#: ../templates/lists/listusers.php:247
 msgid "Select all"
 msgstr "すべてを選択"
 
-#: ../help/help.inc:222
-msgid "Select group profile"
-msgstr "グループプロファイルの選択"
-
-#: ../lib/modules/posixAccount.inc:946
+#: ../lib/modules/posixAccount.inc:1028
 msgid "Selected groups"
 msgstr "選択されたグループ"
 
@@ -3298,7 +3453,7 @@ msgstr "選択されたグループ"
 msgid "Selected modules"
 msgstr "選択されたモジュール"
 
-#: ../lib/modules/posixGroup.inc:228
+#: ../lib/modules/posixGroup.inc:243
 msgid "Selected users"
 msgstr "選択されたユーザ"
 
@@ -3307,7 +3462,7 @@ msgid "Server Address is empty!"
 msgstr "サーバアドレスが未入力です!"
 
 #: ../templates/config/confmain.php:161 ../lib/config.inc:356
-#: ../help/help.inc:48
+#: ../help/help.inc:47
 msgid "Server address"
 msgstr "サーバアドレス"
 
@@ -3319,24 +3474,24 @@ msgstr "外部スクリプトのサーバ"
 msgid "Server settings"
 msgstr "サーバ設定"
 
-#: ../lib/modules/posixGroup.inc:173 ../lib/modules/posixAccount.inc:887
-#: ../lib/modules/posixAccount.inc:1021
+#: ../lib/modules/posixGroup.inc:188 ../lib/modules/posixAccount.inc:969
+#: ../lib/modules/posixAccount.inc:1103
 msgid "Set no password"
 msgstr "パスワードなし"
 
-#: ../templates/config/profmanage.php:288 ../help/help.inc:120
+#: ../templates/config/profmanage.php:288 ../help/help.inc:119
 msgid "Set profile password"
 msgstr "プロファイルパスワード設定"
 
-#: ../lib/modules/posixGroup.inc:405
+#: ../lib/modules/posixGroup.inc:420
 msgid "Sets the group password."
 msgstr "グループパスワードを設定"
 
-#: ../lib/modules/shadowAccount.inc:62
+#: ../lib/modules/shadowAccount.inc:77
 msgid "Shadow"
 msgstr ""
 
-#: ../templates/massBuildAccounts.php:196
+#: ../templates/massBuildAccounts.php:198
 msgid "Show LDIF file"
 msgstr "LDIFファイルを表示"
 
@@ -3344,46 +3499,42 @@ msgstr "LDIFファイルを表示"
 msgid "Show internal attributes"
 msgstr "内部属性を表示する"
 
-#: ../templates/schema/schema.php:200
+#: ../templates/schema/schema.php:198
 msgid "Single valued"
 msgstr "単一の値"
 
-#: ../templates/pdfedit/pdfpage.php:455
-msgid "Size"
-msgstr "サイズ"
-
-#: ../lib/modules/quota.inc:422
+#: ../lib/modules/quota.inc:454
 msgid "Soft block"
 msgstr "ソフトブロック"
 
-#: ../lib/modules/quota.inc:72 ../lib/modules/quota.inc:293
-#: ../lib/modules/quota.inc:350
+#: ../lib/modules/quota.inc:94 ../lib/modules/quota.inc:319
+#: ../lib/modules/quota.inc:376
 msgid "Soft block limit"
 msgstr "ソフトブロック制限"
 
-#: ../lib/modules/quota.inc:73
+#: ../lib/modules/quota.inc:95
 msgid "Soft block limit."
 msgstr "ソフトブロック制限"
 
-#: ../lib/modules/quota.inc:422
+#: ../lib/modules/quota.inc:456
 msgid "Soft inode"
 msgstr "ソフトinode"
 
-#: ../lib/modules/quota.inc:89
+#: ../lib/modules/quota.inc:111
 msgid "Soft inode (files) limit."
 msgstr "ソフトinode(ファイル)制限。"
 
-#: ../lib/modules/quota.inc:88 ../lib/modules/quota.inc:297
-#: ../lib/modules/quota.inc:352
+#: ../lib/modules/quota.inc:110 ../lib/modules/quota.inc:323
+#: ../lib/modules/quota.inc:378
 msgid "Soft inode limit"
 msgstr "ソフトinode制限"
 
-#: ../templates/tree/edit.php:133
+#: ../templates/tree/edit.php:136
 #, php-format
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "いくつかの属性(%s)は変更され、ハイライト表示されています。"
 
-#: ../lib/modules.inc:886
+#: ../lib/modules.inc:905
 msgid "Some required information is missing"
 msgstr "必須項目が満たされていません。"
 
@@ -3401,16 +3552,16 @@ msgstr ""
 msgid "Sorry this help number ({bold}%d{endbold}) is not available."
 msgstr "このヘルプ番号({bold}%d{endbold})は無効です。"
 
-#: ../lib/modules/sambaAccount.inc:62 ../lib/modules/sambaAccount.inc:63
-#: ../lib/modules/sambaAccount.inc:293 ../lib/modules/sambaAccount.inc:375
-#: ../lib/modules/sambaAccount.inc:771 ../lib/modules/sambaSamAccount.inc:58
-#: ../lib/modules/sambaSamAccount.inc:59
-#: ../lib/modules/sambaSamAccount.inc:759
+#: ../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/sambaSamAccount.inc:74
+#: ../lib/modules/sambaSamAccount.inc:814
 msgid "Special user"
 msgstr "特殊ユーザ"
 
-#: ../templates/pdfedit/pdfpage.php:645 ../templates/pdfedit/pdfpage.php:651
-#: ../templates/pdfedit/pdfpage.php:777
+#: ../templates/pdfedit/pdfpage.php:538 ../templates/pdfedit/pdfpage.php:544
+#: ../templates/pdfedit/pdfpage.php:694
 msgid "Static text"
 msgstr "静的テキスト"
 
@@ -3422,48 +3573,49 @@ msgstr "Step 1 of 2: 名前とオブジェクトクラス"
 msgid "Step 2 of 2: Specify attributes and values"
 msgstr "Step 2 of 2: 属性と値の記入"
 
-#: ../lib/modules/inetOrgPerson.inc:132
+#: ../lib/modules/inetOrgPerson.inc:133
 msgid "Steve"
 msgstr "スティーブ"
 
-#: ../lib/modules/sambaAccount.inc:200 ../lib/modules/sambaSamAccount.inc:216
-#: ../lib/modules/inetOrgPerson.inc:125
+#: ../lib/modules/sambaAccount.inc:214 ../lib/modules/sambaSamAccount.inc:242
+#: ../lib/modules/posixAccount.inc:199 ../lib/modules/inetOrgPerson.inc:223
 msgid "Steve Miller"
 msgstr "スティーブ ミラー"
 
-#: ../lib/modules/posixAccount.inc:228
+#: ../lib/modules/posixAccount.inc:253
 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:64 ../lib/modules/inetOrgPerson.inc:161
-#: ../lib/modules/inetOrgPerson.inc:243 ../lib/modules/inetOrgPerson.inc:244
-#: ../lib/modules/inetOrgPerson.inc:420 ../lib/modules/inetOrgPerson.inc:466
+#: ../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
 msgid "Street"
 msgstr "町名"
 
-#: ../templates/pdfedit/pdfpage.php:805
+#: ../templates/pdfedit/pdfpage.php:743
 msgid "Structure name"
 msgstr "構成名"
 
-#: ../templates/ou_edit.php:94 ../templates/ou_edit.php:159
-#: ../templates/ou_edit.php:224 ../templates/ou_edit.php:289
-#: ../templates/ou_edit.php:480 ../templates/domain.php:221
-#: ../templates/config/profmanage.php:403
+#: ../templates/tree/export_form.php:75
+msgid "Sub (entire subtree)"
+msgstr "Sub (サブツリー全体)"
+
+#: ../templates/tree/export_form.php:164 ../templates/ou_edit.php:102
+#: ../templates/ou_edit.php:167 ../templates/ou_edit.php:232
+#: ../templates/ou_edit.php:297 ../templates/ou_edit.php:488
+#: ../templates/domain.php:221 ../templates/config/profmanage.php:403
 #: ../templates/config/confmodules.php:98
 #: ../templates/config/confmodules.php:101
 #: ../templates/config/confmain.php:481 ../templates/pdfedit/pdfdelete.php:81
-#: ../templates/pdfedit/pdfpage.php:797 ../templates/pdfedit/pdfmain.php:143
+#: ../templates/pdfedit/pdfpage.php:735 ../templates/pdfedit/pdfmain.php:152
 #: ../templates/profedit/profiledelete.php:84
-#: ../templates/profedit/profilemain.php:156 ../lib/modules/posixGroup.inc:267
-#: ../lib/modules/posixAccount.inc:987
+#: ../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
 msgid "Submit"
 msgstr "更新(Submit)"
 
-#: ../templates/pdfedit/pdfpage.php:445 ../templates/pdfedit/pdfpage.php:490
-msgid "Submit page settings"
-msgstr "ページ設定を更新"
-
-#: ../templates/schema/schema.php:182
+#: ../templates/schema/schema.php:180
 msgid "Substring Rule"
 msgstr ""
 
@@ -3471,35 +3623,42 @@ msgstr ""
 msgid "Success"
 msgstr "成功"
 
-#: ../templates/domain.php:189 ../lib/lists.inc:349 ../lib/modules.inc:963
-#: ../help/help.inc:226 ../help/help.inc:228 ../help/help.inc:230
-#: ../help/help.inc:249
+#: ../templates/domain.php:189 ../lib/lists.inc:349 ../lib/modules.inc:990
+#: ../help/help.inc:152
 msgid "Suffix"
 msgstr "サフィックス"
 
-#: ../templates/tree/add_value_form.php:189 ../templates/schema/schema.php:187
+#: ../lib/modules/sambaSamAccount.inc:886
+msgid "Sunday"
+msgstr "日曜日"
+
+#: ../templates/tree/add_value_form.php:189 ../templates/schema/schema.php:185
 msgid "Syntax"
 msgstr ""
 
-#: ../templates/schema/schema.php:95
+#: ../templates/schema/schema.php:93
 msgid "Syntax OID"
 msgstr ""
 
-#: ../templates/schema/schema.php:79 ../templates/schema/schema.php:80
+#: ../templates/schema/schema.php:77 ../templates/schema/schema.php:78
 msgid "Syntaxes"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:179
-#: ../lib/modules/inetOrgPerson.inc:255 ../lib/modules/inetOrgPerson.inc:256
-#: ../lib/modules/inetOrgPerson.inc:432 ../lib/modules/inetOrgPerson.inc:469
+#: ../lib/modules/kolabUser.inc:222
+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
 msgid "Telephone number"
 msgstr "電話番号"
 
-#: ../lib/modules/inetOrgPerson.inc:157
+#: ../lib/modules/inetOrgPerson.inc:158
 msgid "Temp"
 msgstr "臨時雇用"
 
-#: ../lib/modules/inetOrgPerson.inc:145
+#: ../lib/modules/inetOrgPerson.inc:146
 msgid "Temp, contract until december"
 msgstr "臨時雇用、12月までの契約"
 
@@ -3507,23 +3666,20 @@ msgstr "臨時雇用、12月までの契約"
 msgid "Template"
 msgstr "テンプレート"
 
-#: ../help/help.inc:110
+#: ../help/help.inc:109
 msgid "Text for user PDF"
 msgstr "ユーザPDFのためのテキスト"
 
-#: ../lib/modules/posixAccount.inc:316 ../help/help.inc:157
-msgid "The Primary Group the user should be member of."
-msgstr "ユーザがメンバでなければならないプライマリグループ。"
+#: ../lib/modules/kolabUser.inc:159
+msgid ""
+"The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
+msgstr "ユーザに対するCyrusメールクォータ(MB単位)。未入力の場合は無制限。"
 
-#: ../lib/modules/posixAccount.inc:351 ../help/help.inc:169
-msgid "The Primary group the host should be member of."
-msgstr "ホストがメンバでなければならないプライマリグループ。"
-
-#: ../help/help.inc:252
+#: ../help/help.inc:155
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "SambaサーバのSID。 \"net getlocalsid\" で取得してください。"
 
-#: ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:78
 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 "
@@ -3538,11 +3694,15 @@ msgstr ""
 msgid "The container you specified (%s) does not exist. Please try again."
 msgstr "指定されたコンテナ(%s)が存在しません。再試行してください。"
 
-#: ../help/help.inc:250
+#: ../lib/modules/kolabUser.inc:147
+msgid "The country name of the user."
+msgstr "ユーザの国名"
+
+#: ../help/help.inc:153
 msgid "The domain entry will be saved under this suffix."
 msgstr "このサフィックス下でドメインエントリが保存されました。"
 
-#: ../lib/modules/shadowAccount.inc:49
+#: ../lib/modules/shadowAccount.inc:64
 msgid "The expiration date is invalid."
 msgstr "有効期限が正しくありません。"
 
@@ -3555,15 +3715,15 @@ msgid ""
 "The following suffix(es) are missing in LDAP. LAM can create them for you."
 msgstr "以下のサフィックスはLDAPにありません。LAM はこれらを作成できます。"
 
-#: ../lib/modules/sambaSamAccount.inc:71
+#: ../lib/modules/sambaSamAccount.inc:86 ../lib/modules/sambaSamAccount.inc:87
 msgid "The format of the logon hours field is invalid!"
 msgstr "ログオン時間フィールドの形式が正しくありません!"
 
-#: ../templates/pdfedit/pdfpage.php:73
+#: ../templates/pdfedit/pdfpage.php:121
 msgid "The headline for a new section must contain at least one character."
 msgstr "新しいセクションの見出しは、少なくとも一文字以上でなくてはなりません。"
 
-#: ../templates/pdfedit/pdfpage.php:61
+#: ../templates/pdfedit/pdfpage.php:103
 msgid ""
 "The name for that PDF-structure you submitted is not valid. A valid name "
 "must constist at least of one of the following characters 'a-z','A-Z','0-"
@@ -3572,11 +3732,15 @@ msgstr ""
 "指定されたPDF構成の名前が正しくありません。正しい名前は一文字以上の長さで、使"
 "用可能な文字は 'a-z', 'A-Z', '0-9' '_', '-', '.' です。"
 
-#: ../help/help.inc:248
+#: ../lib/modules/kolabUser.inc:151
+msgid "The name of the server where the mailbox is located."
+msgstr "メールボックスがあるサーバーの名前。"
+
+#: ../help/help.inc:151
 msgid "The name of your Windows domain or workgroup."
 msgstr "Windowsのドメイン又はワークグループ名。"
 
-#: ../help/help.inc:140
+#: ../help/help.inc:139
 msgid "The new account will be saved under this LDAP suffix."
 msgstr "新しいアカウントはLDAPサフィックスの下に作成されます。"
 
@@ -3584,7 +3748,21 @@ msgstr "新しいアカウントはLDAPサフィックスの下に作成され
 msgid "The password is invalid! Please try again."
 msgstr "パスワードが正しくありません! やり直してください。"
 
-#: ../templates/pdfedit/pdfpage.php:77
+#: ../lib/modules/posixAccount.inc:333
+msgid ""
+"The primary group for this account. You can insert a GID number or a group "
+"name."
+msgstr "このアカウントに対するプライマリグループ。GID番号またはグループ名を入力してください。"
+
+#: ../lib/modules/posixAccount.inc:396
+msgid "The primary group the host should be member of."
+msgstr "ホストがメンバでなければならないプライマリグループ。"
+
+#: ../lib/modules/posixAccount.inc:354
+msgid "The primary group the user should be member of."
+msgstr "ユーザがメンバでなければならないプライマリグループ。"
+
+#: ../templates/pdfedit/pdfpage.php:125
 msgid "The static text must contain at least one character."
 msgstr "静的テキストは少なくとも一文字以上でなければななりません。"
 
@@ -3592,27 +3770,27 @@ msgstr "静的テキストは少なくとも一文字以上でなければなな
 msgid "There are new required attributes which need to be set."
 msgstr "設定すべき新しい必須属性があります。"
 
-#: ../lib/modules/posixGroup.inc:129
+#: ../lib/modules/posixGroup.inc:144
 msgid "There are still users who have this group as their primary group."
 msgstr "このグループをプライマリグループとするユーザがまだ存在します。"
 
-#: ../lib/modules/sambaAccount.inc:62 ../lib/modules/sambaSamAccount.inc:58
+#: ../lib/modules/sambaAccount.inc:77 ../lib/modules/sambaSamAccount.inc:73
 msgid "There can be only one administrator per domain."
 msgstr "管理者は、ドメイン毎に一つだけ存在可能です。"
 
-#: ../lib/modules/sambaGroupMapping.inc:351
+#: ../lib/modules/sambaGroupMapping.inc:366
 msgid "There can be only one group of this type."
 msgstr "このタイプのグループを一つだけ指定できます。"
 
-#: ../lib/modules/sambaAccount.inc:63 ../lib/modules/sambaSamAccount.inc:59
+#: ../lib/modules/sambaAccount.inc:78 ../lib/modules/sambaSamAccount.inc:74
 msgid "There can be only one guest per domain."
 msgstr "ドメイン毎にゲストアカウントを一個だけ指定できます。"
 
-#: ../templates/massDoUpload.php:119
+#: ../templates/massDoUpload.php:120
 msgid "There were errors while uploading:"
 msgstr "アップロードの際にエラーが発生しました。"
 
-#: ../lib/modules/posixGroup.inc:414
+#: ../lib/modules/posixGroup.inc:429
 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 "
@@ -3621,7 +3799,7 @@ msgstr ""
 "新しいグループアカウントを作成する際に使われるグループIDの最小値と最大値。新"
 "しいグループアカウントには、使用中の番号の最大値+1が常に割り当てられます。"
 
-#: ../lib/modules/posixAccount.inc:295
+#: ../lib/modules/posixAccount.inc:321
 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 "
@@ -3632,7 +3810,7 @@ msgstr ""
 "囲はユーザアカウントのものと異なるようにしなくてはなりません。新しいホストア"
 "カウントには、使用中の番号の最大値+1が常に割り当てられます。"
 
-#: ../lib/modules/posixAccount.inc:291
+#: ../lib/modules/posixAccount.inc:317
 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 "
@@ -3642,7 +3820,7 @@ msgstr ""
 "マシンアカウントのものとは異なるようにしなくてはなりません。新しいユーザアカ"
 "ウントには、使用中の番号の最大値+1が常に割りあてられます。"
 
-#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/posixAccount.inc:102
 msgid ""
 "This GID number is invalid! Please provide either a number or a group name."
 msgstr ""
@@ -3653,11 +3831,15 @@ msgstr ""
 msgid "This Samba 3 domain is already present!"
 msgstr "このSamba 3 ドメインはすでに存在しています!"
 
-#: ../help/help.inc:121
+#: ../lib/modules/kolabUser.inc:300
+msgid "This account is marked for deletion."
+msgstr "このアカウントを削除対象としてマークしました。"
+
+#: ../help/help.inc:120
 msgid "This changes the password of the selected profile."
 msgstr "選択されたプロファイルのパスワードを変更します。"
 
-#: ../help/help.inc:123
+#: ../help/help.inc:122
 msgid "This changes the profile which is selected by default at login."
 msgstr "ログイン時にデフォルトで選択されるプロファイルを変更します。"
 
@@ -3667,7 +3849,7 @@ msgid ""
 msgstr ""
 "ユニークなエントリを含むものとして定義されているカラムで重複がみつかりました:"
 
-#: ../help/help.inc:95
+#: ../help/help.inc:94
 msgid ""
 "This defines the language of the login window and sets this language as the "
 "default language. Users can change the language at login."
@@ -3675,11 +3857,11 @@ msgstr ""
 "ログインウィンドウの言語を定義し、この言語を既定値の言語として設定します。"
 "ユーザはログイン時に言語を変更できます。"
 
-#: ../lib/pdf.inc:511
+#: ../lib/pdf.inc:470
 msgid "This document was automatically created by LDAP Account Manager"
 msgstr "この文書はLDAP Account Managerによって自動的に生成されました。"
 
-#: ../templates/tree/edit.php:202
+#: ../templates/tree/edit.php:205
 msgid "This entry has no attributes"
 msgstr "このエントリは属性を持っていません。"
 
@@ -3688,7 +3870,7 @@ msgstr "このエントリは属性を持っていません。"
 msgid "This entry is the root of a sub-tree containing %s entries."
 msgstr "このエントリは %s エントリを含むサブツリーのルートです。"
 
-#: ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:103
 msgid "This gecos value is invalid!"
 msgstr "gecosの値が正しくありません!"
 
@@ -3696,6 +3878,18 @@ msgstr "gecosの値が正しくありません!"
 msgid "This is a comma separated list of MAC addresses."
 msgstr "カンマで区切られたMACアドレスのリスト。"
 
+#: ../lib/modules/kolabUser.inc:135
+msgid "This is a comma separated list of delegates."
+msgstr "カンマで区切られた委任者のリスト。"
+
+#: ../lib/modules/kolabUser.inc:143
+msgid "This is a comma separated list of eMail aliases."
+msgstr "カンマで区切られた電子メール別名のリスト。"
+
+#: ../lib/modules/kolabUser.inc:127
+msgid "This is a comma separated list of invitation policies."
+msgstr "カンマで区切られた招待ポリシーのリスト。"
+
 #: ../lib/modules/nisMailAlias.inc:69
 msgid "This is a comma separated list of recipients."
 msgstr "カンマで区切られた受信者のリスト。"
@@ -3704,7 +3898,7 @@ msgstr "カンマで区切られた受信者のリスト。"
 msgid "This is a comma separated list of the users public email addresses."
 msgstr "ユーザの公開メールアドレスのカンマで区切られたリスト。"
 
-#: ../help/help.inc:88
+#: ../help/help.inc:87
 msgid ""
 "This is a list of valid DN entries of all users that are allowed to login to "
 "LDAP Account Manager. The user names have to be separated by semicolons."
@@ -3719,11 +3913,15 @@ msgid ""
 msgstr ""
 "CSVに変換する前に、あなたの表計算プログラムでどのように見えるかの例です。"
 
-#: ../lib/modules/sambaSamAccount.inc:61
+#: ../lib/modules/inetOrgPerson.inc:80
+msgid "This is not a valid DN!"
+msgstr "無効なDNです!"
+
+#: ../lib/modules/sambaSamAccount.inc:76
 msgid "This is not a valid RID number!"
 msgstr "無効なRID番号です!"
 
-#: ../lib/modules/sambaGroupMapping.inc:353
+#: ../lib/modules/sambaGroupMapping.inc:368
 msgid "This is not a valid Samba 3 group type!"
 msgstr "不正なSamba 3グループタイプです!"
 
@@ -3735,21 +3933,27 @@ msgstr "ユーザの公開メールアドレスの一つ。"
 msgid "This is one recipient for this alias."
 msgstr "この別名に対する1名の受信者。"
 
+#: ../lib/modules/inetOrgPerson.inc:295
+msgid ""
+"This is the LDAP DN of the user's manager. Use this property to represent "
+"hierarchies in your company."
+msgstr "このユーザの管理者のLDAP DN。この属性は、あなたの組織の階層を表現するために使用してください。"
+
 #: ../lib/modules/ieee802device.inc:57
 msgid ""
 "This is the MAC address of the network card of the device (e.g. 00:01:02:DE:"
 "EF:18)."
 msgstr "ネットワークカードデバイスのMACアドレスです(例 0:01:02:DE:EF:18)。"
 
-#: ../lib/modules/sambaAccount.inc:373
+#: ../lib/modules/sambaAccount.inc:387
 msgid "This is the RID of the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループのRIDです。"
 
-#: ../lib/modules/sambaSamAccount.inc:185
+#: ../lib/modules/sambaSamAccount.inc:208
 msgid "This is the SID of the user's primary Windows group."
 msgstr "ユーザのプライマリWindowsグループのSIDです。"
 
-#: ../help/help.inc:97
+#: ../help/help.inc:96
 msgid ""
 "This is the absolute path to an external script for setting quotas and "
 "creating home directories."
@@ -3757,19 +3961,19 @@ msgstr ""
 "ホームディレクトリを作成し、quotaを設定するための外部スクリプトの絶対パスで"
 "す。"
 
-#: ../lib/modules/sambaAccount.inc:323 ../lib/modules/sambaSamAccount.inc:138
+#: ../lib/modules/sambaAccount.inc:337 ../lib/modules/sambaSamAccount.inc:161
 msgid "This is the account's Windows password."
 msgstr "アカウントのWindowsパスワードです。"
 
-#: ../lib/modules/sambaAccount.inc:320 ../lib/modules/sambaSamAccount.inc:135
+#: ../lib/modules/sambaAccount.inc:334 ../lib/modules/sambaSamAccount.inc:158
 msgid "This is the account's full name on Windows systems."
 msgstr "アカウントのWindowsシステム上のフルネームです。"
 
-#: ../lib/modules/sambaGroupMapping.inc:270
+#: ../lib/modules/sambaGroupMapping.inc:285
 msgid "This is the group name which will be shown in Windows."
 msgstr "Windows上で表示されるグループ名です。"
 
-#: ../help/help.inc:136
+#: ../help/help.inc:135
 msgid ""
 "This is the identifier for the relative DN value. It must be one of the "
 "given allowed LDAP attributes (e.g. user accounts usually use \"uid\" while "
@@ -3779,7 +3983,7 @@ msgstr ""
 "てはなりません(例えば、ユーザアカウントでは通常\"uid\"を使用し、グループでは"
 "\"cn\"を使用します)。"
 
-#: ../help/help.inc:73
+#: ../help/help.inc:72
 msgid ""
 "This is the list of attributes to show in the user/group/host list. The "
 "entries can either be predefined values, \"#attribute\", or individual ones, "
@@ -3793,7 +3997,19 @@ msgstr ""
 msgid "This is the mail server for the user."
 msgstr "ユーザに対するメールサーバ。"
 
-#: ../help/help.inc:93
+#: ../lib/modules/inetOrgPerson.inc:331
+msgid ""
+"This is the natural name of the user. If empty, the first and last name is "
+"used."
+msgstr "このユーザの呼称。未入力の場合は、姓と名が使用されます。"
+
+#: ../lib/modules/posixAccount.inc:382
+msgid ""
+"This is the natural name of the user. If empty, the first and last name or "
+"user name is used."
+msgstr "このユーザの呼称。未入力の場合は、姓と名、またはユーザ名が使用されます。"
+
+#: ../help/help.inc:92
 msgid ""
 "This is the number of rows to show in the user/group/host list. If more "
 "entries are found the list will be split into several pages."
@@ -3801,7 +4017,7 @@ msgstr ""
 "ユーザ/グループ/ホスト一覧に表示する行数です。もしもより多くのエントリがある"
 "ならば、リストは複数のページに分割されます。"
 
-#: ../lib/modules/sambaGroupMapping.inc:278
+#: ../lib/modules/sambaGroupMapping.inc:293
 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 "
@@ -3811,7 +4027,7 @@ msgstr ""
 "合、LAMはUIDからRIDを算出します。数値または特殊グループ名のどちらかを指定でき"
 "ます。"
 
-#: ../lib/modules/sambaSamAccount.inc:188
+#: ../lib/modules/sambaSamAccount.inc:211
 msgid ""
 "This is the relative ID number for your Windows account. You can either "
 "enter a number or one of these special accounts: "
@@ -3819,7 +4035,7 @@ msgstr ""
 "あなたのWindowsアカウントに対する相対ID番号です。数字またはこれらの特殊アカウ"
 "ントのどれか一つを指定できます: "
 
-#: ../lib/modules/sambaSamAccount.inc:192
+#: ../lib/modules/sambaSamAccount.inc:215
 msgid ""
 "This is the relative ID number for your host account. If you leave this "
 "empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
@@ -3827,7 +4043,7 @@ msgstr ""
 "あなたのホストアカウントに対する相対ID番号です。未入力の場合、LAMは "
 "uidNumber*2 + sambaAlgorithmicRidBase を使用します。"
 
-#: ../help/help.inc:49
+#: ../help/help.inc:48
 msgid ""
 "This is the server address of your LDAP server. Use ldap:// for standard "
 "LDAP connections and ldaps:// for encrypted (require server certificates) "
@@ -3836,20 +4052,20 @@ msgstr ""
 "これはLDAPサーバのアドレスです。ldap:// を標準的なLDAP接続に、ldaps:// を暗号"
 "化された(サーバ認証が必要)接続に使用してください。ポート番号は省略できます。"
 
-#: ../help/help.inc:102
+#: ../help/help.inc:101
 msgid ""
 "This is the server where the lamdaemon script is stored. LDAP Account "
-"Manager will make a SSH connection to this server with username and password "
-"provided at login."
+"Manager will make a SSH connection to this server with user name and "
+"password provided at login."
 msgstr ""
 "これはldapdaemonスクリプトが格納されるサーバです。LDAP Account Managerは、ロ"
 "グイン時に提供されるユーザ名とパスワードでサーバにSSH接続を行ないます。"
 
-#: ../help/help.inc:67
+#: ../help/help.inc:66
 msgid "This is the suffix for the LDAP tree viewer."
 msgstr "LDAPツリービューアに対するサフィックス。"
 
-#: ../help/help.inc:61
+#: ../help/help.inc:60
 msgid ""
 "This is the suffix of the LDAP tree from where to search for user/group/host "
 "entries. Only entries in these subtrees will be displayed in the user/group/"
@@ -3863,7 +4079,7 @@ msgstr ""
 msgid "This is the target email address for the user's mails."
 msgstr "ユーザのメールの最終的なメールアドレス"
 
-#: ../help/help.inc:109
+#: ../help/help.inc:108
 msgid ""
 "This is the time in minutes which LAM caches its LDAP searches. Shorter "
 "times will stress LDAP more but decrease the possibility that changes are "
@@ -3873,15 +4089,25 @@ msgstr ""
 "短かくすると、LDAPに負荷をかける代わりに、変更が認識できなくなる可能性を減ら"
 "します。"
 
-#: ../lib/modules/posixAccount.inc:87
+#: ../lib/modules/kolabUser.inc:155
+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日)がセットされます。"
+
+#: ../lib/modules/posixAccount.inc:104
 msgid "This login shell is invalid!"
 msgstr "ログインシェルが正しくありません!"
 
-#: ../templates/schema/schema.php:356
+#: ../templates/schema/schema.php:354
 msgid "This object class is obsolete."
 msgstr "このオブジェクトクラスは旧式です。"
 
-#: ../lib/modules/sambaSamAccount.inc:198
+#: ../lib/modules/sambaSamAccount.inc:221
+msgid "This option defines the allowed logon hours for this account."
+msgstr "このオプションは、このアカウントがログオンを許可される時間を定義します。"
+
+#: ../lib/modules/sambaSamAccount.inc:224
 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 "
@@ -3892,7 +4118,7 @@ msgstr ""
 "時間が168ビットに写影され、21桁の16進数(21*8=168)の値として保存されます。先頭"
 "の1ビットはグリニッジ標準時で日曜の0:00 - 0:59を意味します。"
 
-#: ../help/help.inc:111
+#: ../help/help.inc:110
 msgid "This text will appear on top of every user PDF file."
 msgstr "このテキストは、各ユーザのPDFファイルの先頭に表示されます。"
 
@@ -3904,48 +4130,56 @@ msgstr "このツールで、あなたのPDFページをカスタマイズする
 msgid "This user was not found!"
 msgstr "ユーザが見つかりません!"
 
-#: ../lib/modules/sambaAccount.inc:65 ../lib/modules/sambaAccount.inc:66
-#: ../lib/modules/sambaAccount.inc:67 ../lib/modules/sambaAccount.inc:68
-#: ../lib/modules/sambaSamAccount.inc:63 ../lib/modules/sambaSamAccount.inc:64
-#: ../lib/modules/sambaSamAccount.inc:65 ../lib/modules/sambaSamAccount.inc:66
+#: ../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
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"!"
 msgstr "この値は、\"true\"または\"false\"のいずれかでなくてはなりません。"
 
-#: ../lib/modules/posixAccount.inc:88
+#: ../lib/modules/posixAccount.inc:105
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"."
 msgstr "この値は、\"true\"または\"false\"のいずれかでなくてはなりません。"
 
-#: ../lib/modules/posixGroup.inc:475
+#: ../lib/modules/posixGroup.inc:491
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "この値はセミコロンで区切られたユーザ名でなくてはなりません。"
 
-#: ../help/help.inc:244
+#: ../help/help.inc:147
 msgid "This will create a new organizational unit under the selected one."
 msgstr "選択された位置の下に新しい organizational unit を作成します。"
 
-#: ../help/help.inc:246
+#: ../help/help.inc:149
 msgid ""
 "This will delete the selected organizational unit. The OU has to be empty."
 msgstr ""
 "選択された organizational unitを削除します。OUは空でなくてはなりません。"
 
-#: ../help/help.inc:119
+#: ../help/help.inc:118
 msgid "This will delete the selected profile."
 msgstr "選択されたプロファイルを削除します。"
 
-#: ../help/help.inc:221
+#: ../lib/modules/kolabUser.inc:163
 msgid ""
-"This will make a profile of the current account. The saved values are the "
-"same as in the profile editor. Profile names may contain the letters a-z, 0-"
-"9 and -_."
-msgstr ""
-"現在のアカウントのプロファイルを作成します。保存された値は、プロファイルエ"
-"ディタのものと同様になります。プロファイル名は a-z, 0-9 と -_ を含むことがで"
-"きます。"
+"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. メールボックスは削除されます)。"
 
-#: ../lib/modules/posixAccount.inc:333 ../help/help.inc:155
+#: ../lib/modules/sambaSamAccount.inc:885
+msgid "Thursday"
+msgstr "木曜日"
+
+#: ../lib/modules/sambaSamAccount.inc:932
+msgid "Time"
+msgstr "時刻"
+
+#: ../lib/modules/sambaSamAccount.inc:949
+msgid "Time zone"
+msgstr "タイムゾーン"
+
+#: ../lib/modules/posixAccount.inc:374
 msgid ""
-"To disable login use /bin/false. List of shells is read from lam/config/"
+"To disable login use /bin/false. The list of shells is read from lam/config/"
 "shells"
 msgstr ""
 "ログインを禁止するためには/bin/falseを使ってください。シェルの一覧は lam/"
@@ -3955,15 +4189,15 @@ msgstr ""
 msgid "Tools"
 msgstr "ツール"
 
-#: ../templates/pdfedit/pdfpage.php:513
-msgid "Top"
-msgstr "先頭"
+#: ../lib/export.inc:444 ../lib/export.inc:514
+msgid "Total entries"
+msgstr "エントリ総数"
 
-#: ../templates/lists/listusers.php:269
+#: ../templates/lists/listusers.php:270
 msgid "Translate GID number to group name"
 msgstr "GID番号をグループ名に変換"
 
-#: ../help/help.inc:66
+#: ../help/help.inc:65
 msgid "Tree suffix"
 msgstr "ツリーサフィックス"
 
@@ -3979,34 +4213,37 @@ msgstr "ツリーサフィックス"
 msgid "TreeSuffix is invalid!"
 msgstr "ツリーサフィックスが正しくありません!"
 
-#: ../templates/schema/schema.php:354
+#: ../lib/modules/sambaSamAccount.inc:885
+msgid "Tuesday"
+msgstr "木曜日"
+
+#: ../templates/schema/schema.php:352
 msgid "Type"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:90
 msgid "UID"
 msgstr "UID"
 
-#: ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:90
 msgid "UID has changed. Do you want to change home directory?"
 msgstr "UIDが変更されました。ホームディレクトリを変更しますか?"
 
-#: ../lib/modules/posixAccount.inc:70
+#: ../lib/modules/posixAccount.inc:85
 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:46 ../lib/modules/posixAccount.inc:178
-#: ../lib/modules/posixAccount.inc:245 ../lib/modules/posixAccount.inc:290
-#: ../lib/modules/posixAccount.inc:294 ../lib/modules/posixAccount.inc:302
-#: ../lib/modules/posixAccount.inc:840 ../lib/modules/posixAccount.inc:1081
-#: ../lib/lists.inc:303 ../lib/lists.inc:330 ../help/help.inc:146
-#: ../help/help.inc:166
+#: ../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/lists.inc:303 ../lib/lists.inc:330
 msgid "UID number"
 msgstr "UID番号"
 
-#: ../lib/modules/posixAccount.inc:46
+#: ../lib/modules/posixAccount.inc:61
 #, php-format
 msgid ""
 "UID number has changed. To keep file ownership you have to run the following "
@@ -4016,25 +4253,20 @@ msgstr ""
 "コマンドをroot権限で実行す必要があります: 'find / -uid %s -exec chown %s {} "
 "\\;'"
 
-#: ../lib/modules/posixAccount.inc:63 ../lib/modules/posixAccount.inc:154
+#: ../lib/modules/posixAccount.inc:78 ../lib/modules/posixAccount.inc:173
 msgid "UID ranges for Unix accounts"
 msgstr "unixアカウントに対するUIDの範囲"
 
-#: ../lib/modules/sambaAccount.inc:358 ../lib/modules/sambaSamAccount.inc:173
-#: ../help/help.inc:217
+#: ../lib/modules/sambaAccount.inc:372 ../lib/modules/sambaSamAccount.inc:196
 msgid ""
 "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced "
-"with user- and groupname."
+"with user and group name."
 msgstr ""
 "ホームディレクトリのUNCパス (\\\\サーバ\\共有)。$user と $group はユーザ名と"
 "グループ名に置換されます。"
 
-#: ../templates/pdfedit/pdfpage.php:581
-msgid "UP"
-msgstr ""
-
-#: ../templates/ou_edit.php:55 ../templates/ou_edit.php:120
-#: ../templates/ou_edit.php:185 ../templates/ou_edit.php:250
+#: ../templates/ou_edit.php:63 ../templates/ou_edit.php:128
+#: ../templates/ou_edit.php:193 ../templates/ou_edit.php:258
 msgid "Unable to create new OU!"
 msgstr "新しいOUを作成できません!"
 
@@ -4042,8 +4274,8 @@ msgstr "新しいOUを作成できません!"
 msgid "Unable to create new profile!"
 msgstr "新しいプロファイルを作成できません!"
 
-#: ../templates/ou_edit.php:72 ../templates/ou_edit.php:137
-#: ../templates/ou_edit.php:202 ../templates/ou_edit.php:267
+#: ../templates/ou_edit.php:80 ../templates/ou_edit.php:145
+#: ../templates/ou_edit.php:210 ../templates/ou_edit.php:275
 msgid "Unable to delete OU!"
 msgstr "OUを削除できません!"
 
@@ -4060,7 +4292,7 @@ msgstr "ドメインを削除できません!"
 msgid "Unable to delete profile!"
 msgstr "プロファイルを削除できません!"
 
-#: ../lib/modules/posixAccount.inc:1398
+#: ../lib/modules/posixAccount.inc:1329 ../lib/modules/posixAccount.inc:1546
 msgid "Unable to find group in LDAP."
 msgstr "LDAP内にグループが見つかりません。"
 
@@ -4072,45 +4304,42 @@ msgstr ""
 "有効な言語をロードできません。英語を既定値の言語とします。より詳しい説明は、"
 "このサイトの管理者に連絡してください。"
 
-#: ../templates/login.php:100
-msgid ""
-"Unable to load available languages. Setting English as default language. For "
-"further instructions please contact the admin of this site."
-msgstr ""
-"有効な言語をロードできません。英語を既定値の言語とします。より詳しい説明は、"
-"このサイトの管理者に連絡してください。"
-
 #: ../lib/profiles.inc:91 ../lib/profiles.inc:95
 msgid "Unable to load profile!"
 msgstr "プロファイルをロードできません!"
 
-#: ../templates/schema/schema.php:99 ../templates/schema/schema.php:117
-#: ../templates/schema/schema.php:278 ../templates/schema/schema.php:312
+#: ../templates/schema/schema.php:97 ../templates/schema/schema.php:115
+#: ../templates/schema/schema.php:276 ../templates/schema/schema.php:310
 msgid "Unable to retrieve schema!"
 msgstr "スキーマを取得できません!"
 
-#: ../templates/profedit/profilecreate.php:114
+#: ../templates/profedit/profilepage.php:124
 msgid "Unable to save profile!"
 msgstr "プロファイルを保存できません!"
 
-#: ../lib/modules/posixGroup.inc:289 ../lib/modules/posixAccount.inc:112
+#: ../lib/modules/posixGroup.inc:304 ../lib/modules/posixAccount.inc:131
 msgid "Unix"
 msgstr "unix"
 
-#: ../lib/modules/inetOrgPerson.inc:51 ../lib/modules/inetOrgPerson.inc:399
-#: ../lib/modules/inetOrgPerson.inc:461 ../help/help.inc:234
+#: ../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
 msgid "Unix workstations"
 msgstr "unixワークステーション"
 
-#: ../lib/modules/inetOrgPerson.inc:51
-msgid "Unix workstations is invalid."
+#: ../lib/modules/inetOrgPerson.inc:51 ../lib/modules/inetOrgPerson.inc:52
+msgid "Unix workstations are invalid!"
 msgstr "unixワークステーションが正しくありません。"
 
 #: ../templates/config/confmodules.php:226
 msgid "Unsolved dependency:"
 msgstr "依存関係が解決できませんでした:"
 
-#: ../templates/massBuildAccounts.php:193
+#: ../templates/pdfedit/pdfpage.php:462
+msgid "Up"
+msgstr "上"
+
+#: ../templates/massBuildAccounts.php:195
 msgid "Upload accounts to LDAP"
 msgstr "アカウントをLDAPにアップロード"
 
@@ -4118,83 +4347,79 @@ msgstr "アカウントをLDAPにアップロード"
 msgid "Upload file and create accounts"
 msgstr "ファイルをアップロードして、アカウントを作成します。"
 
-#: ../lib/modules.inc:471
+#: ../lib/modules.inc:473
 #, php-format
 msgid "Upload was stopped after errors in %s module!"
 msgstr "%s モジュールでエラーが発生したため、アプロードを中止しました。"
 
-#: ../templates/schema/schema.php:215
+#: ../templates/schema/schema.php:213
 msgid "Usage"
 msgstr "使用方法"
 
-#: ../lib/modules/sambaAccount.inc:98 ../lib/modules/sambaAccount.inc:210
-#: ../lib/modules/sambaAccount.inc:325 ../lib/modules/sambaAccount.inc:328
-#: ../lib/modules/sambaSamAccount.inc:140
-#: ../lib/modules/sambaSamAccount.inc:143
-#: ../lib/modules/sambaSamAccount.inc:226
+#: ../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
 msgid "Use Unix password"
 msgstr "unixパスワードを使用"
 
-#: ../templates/pdfedit/pdfpage.php:442 ../templates/pdfedit/pdfpage.php:487
-#: ../templates/pdfedit/pdfpage.php:501 ../templates/pdfedit/pdfpage.php:519
-#: ../templates/pdfedit/pdfpage.php:530 ../templates/pdfedit/pdfpage.php:541
-#: ../templates/pdfedit/pdfpage.php:552
+#: ../templates/pdfedit/pdfpage.php:420 ../templates/pdfedit/pdfpage.php:433
 msgid "Use default"
 msgstr "デフォルト値を使用"
 
-#: ../help/help.inc:99 ../help/help.inc:104
+#: ../help/help.inc:98 ../help/help.inc:103
 msgid ""
 "Use it at your own risk and read the documentation for lamdaemon before you "
 "use it!"
 msgstr "使う前にlamdaemonのドキュメントを読み、あなたの責任で使うこと"
 
-#: ../lib/modules/posixGroup.inc:408 ../lib/modules/sambaAccount.inc:104
-#: ../lib/modules/sambaAccount.inc:218 ../lib/modules/sambaAccount.inc:331
-#: ../lib/modules/sambaAccount.inc:334 ../lib/modules/sambaAccount.inc:698
-#: ../lib/modules/sambaSamAccount.inc:146
-#: ../lib/modules/sambaSamAccount.inc:149
-#: ../lib/modules/sambaSamAccount.inc:234
-#: ../lib/modules/sambaSamAccount.inc:684
-#: ../lib/modules/sambaSamAccount.inc:831 ../lib/modules/posixAccount.inc:327
-#: ../help/help.inc:196
+#: ../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
 msgid "Use no password"
 msgstr "パスワードなし"
 
-#: ../lib/modules/sambaAccount.inc:694 ../lib/modules/sambaSamAccount.inc:680
-#: ../lib/modules/sambaSamAccount.inc:825 ../help/help.inc:198
+#: ../lib/modules/sambaAccount.inc:703 ../lib/modules/sambaSamAccount.inc:736
+#: ../lib/modules/sambaSamAccount.inc:966
 msgid "Use unix password"
 msgstr "unixパスワードを使う"
 
-#: ../lib/modules/quota.inc:68 ../lib/modules/quota.inc:292
+#: ../lib/modules/quota.inc:90 ../lib/modules/quota.inc:318
 msgid "Used blocks"
 msgstr "使用したブロック"
 
-#: ../lib/modules/quota.inc:69
+#: ../lib/modules/quota.inc:91
 msgid "Used blocks. 1000 blocks are usually 1MB"
 msgstr "使用したブロック。1000ブロックは通常1MB."
 
-#: ../templates/schema/schema.php:274
+#: ../templates/schema/schema.php:272
 msgid "Used by attributes"
 msgstr "使用されている属性"
 
-#: ../templates/schema/schema.php:243
+#: ../templates/schema/schema.php:241
 msgid "Used by object classes"
 msgstr "使用されているオブジェクトクラス"
 
-#: ../help/help.inc:260
+#: ../help/help.inc:163
 msgid "Used for calculating RIDs from UID/GID. Do not change if unsure."
 msgstr ""
 "RIDs を UID/GID から計算するために使用します。自信がないなら変更しないこと。"
 
-#: ../lib/modules/quota.inc:84 ../lib/modules/quota.inc:296
+#: ../lib/modules/quota.inc:106 ../lib/modules/quota.inc:322
 msgid "Used inodes"
 msgstr "使用したinode"
 
-#: ../lib/modules/quota.inc:85
+#: ../lib/modules/quota.inc:107
 msgid "Used inodes (files)"
 msgstr "使用したinode(ファイル)"
 
-#: ../lib/modules/sambaGroupMapping.inc:51
+#: ../lib/modules/sambaGroupMapping.inc:66
 msgid "User"
 msgstr "ユーザ"
 
@@ -4202,19 +4427,22 @@ msgstr "ユーザ"
 msgid "User ID"
 msgstr "ユーザ ID"
 
-#: ../lib/modules/sambaAccount.inc:242 ../lib/modules/sambaAccount.inc:349
-#: ../lib/modules/sambaAccount.inc:710 ../lib/modules/sambaSamAccount.inc:164
-#: ../lib/modules/sambaSamAccount.inc:258
-#: ../lib/modules/sambaSamAccount.inc:696 ../help/help.inc:202
+#: ../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
 msgid "User can change password"
 msgstr "ユーザはパスワードを変更可能"
 
-#: ../lib/modules/posixAccount.inc:312 ../lib/modules/inetOrgPerson.inc:224
-#: ../help/help.inc:153
+#: ../lib/modules/posixAccount.inc:350
+msgid "User description. If left empty first and last name will be used."
+msgstr "ユーザの説明。もしも空ならば、姓(last name)と名(first name)が使われます。"
+
+#: ../lib/modules/inetOrgPerson.inc:275
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "ユーザの説明。もしも空ならば、姓(surname)と名(given)が使われます。"
 
-#: ../lib/pdf.inc:449
+#: ../lib/pdf.inc:404
 msgid "User information page"
 msgstr "ユーザ情報ページ"
 
@@ -4222,7 +4450,7 @@ msgstr "ユーザ情報ページ"
 msgid "User list attributes are invalid!"
 msgstr "ユーザ一覧属性が正しくありません!"
 
-#: ../templates/schema/schema.php:210
+#: ../templates/schema/schema.php:208
 msgid "User modification"
 msgstr "ユーザによる変更"
 
@@ -4231,27 +4459,56 @@ msgstr "ユーザによる変更"
 msgid "User modules"
 msgstr "ユーザモジュール"
 
-#: ../lib/modules/sambaAccount.inc:249 ../lib/modules/sambaAccount.inc:351
-#: ../lib/modules/sambaAccount.inc:718 ../lib/modules/sambaSamAccount.inc:166
-#: ../lib/modules/sambaSamAccount.inc:265
-#: ../lib/modules/sambaSamAccount.inc:704 ../help/help.inc:204
+#: ../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
 msgid "User must change password"
 msgstr "ユーザはパスワード変更が必要"
 
-#: ../templates/login.php:168 ../lib/modules/account.inc:66
-#: ../lib/modules/posixAccount.inc:170
+#: ../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
 msgid "User name"
 msgstr "ユーザ名"
 
+#: ../lib/modules/posixAccount.inc:99 ../lib/modules/inetOrgPerson.inc:79
+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
+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
+msgid "User name in use. Selected next free user name."
+msgstr "使用中のユーザ名です。次の空きユーザ名が選択されました。"
+
+#: ../lib/modules/posixAccount.inc:346 ../lib/modules/inetOrgPerson.inc:335
+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 "
+"does not allow it. LAM does not allow capital letters A-Z because it can "
+"cause several problems. If user name is already used user name will be "
+"expanded with a number. The next free number will be used. Warning: Older "
+"systems have problems with user names longer than 8 characters. You can not "
+"log in to Windows if user name is longer than 16 characters."
+msgstr "作成しようとしているユーザのユーザ名。有効な文字は: a-z, 0-9 と .-_です。useraddコマンドで許されていないため、先頭文字に数字は使用できません。大文字 A-Zは、いくつかの問題を引き起こす可能性があるため使用できません。ユーザ名が既に使われていたならば、ユーザ名に番号が付加されます。この場合、次の空き番号が使われます。警告: 古いシステムでは、8文字より長いユーザ名で問題が発生します。16文字より長いユーザ名ではWindowsにログオンできません。"
+
 #: ../templates/profedit/profilemain.php:45
 msgid "User profiles"
 msgstr "ユーザ プロファイル"
 
-#: ../lib/modules/quota.inc:422
-msgid "User quota"
-msgstr "ユーザ クオータ"
-
-#: ../help/help.inc:60
+#: ../help/help.inc:59
 msgid "User/Group/Host suffix"
 msgstr "ユーザ/グループ/ホスト サフィックス"
 
@@ -4263,58 +4520,18 @@ msgstr "ユーザ サフィックス"
 msgid "UserSuffix is invalid!"
 msgstr "ユーザサフィックスが正しくありません!"
 
-#: ../lib/modules/sambaAccount.inc:834 ../lib/modules/sambaSamAccount.inc:952
-#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:77
-#: ../lib/modules/posixAccount.inc:80 ../lib/modules/posixAccount.inc:307
-#: ../lib/modules/posixAccount.inc:836 ../lib/modules/posixAccount.inc:1080
-#: ../lib/lists.inc:305 ../help/help.inc:144
-msgid "Username"
-msgstr "ユーザ名"
-
-#: ../lib/modules/posixAccount.inc:77 ../lib/modules/posixAccount.inc:82
-msgid ""
-"Username contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
-"and .-_ !"
-msgstr ""
-"ユーザ名に不正な文字が含まれています。有効な文字は: a-z, A-Z, 0-9, .-_ です!"
-
-#: ../lib/modules/posixAccount.inc:80
-msgid "Username in use. Selected next free username."
-msgstr "使用中のユーザ名です。次の空きユーザ名が選択されました。"
-
-#: ../lib/modules/posixAccount.inc:308 ../help/help.inc:145
-msgid ""
-"Username 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 does "
-"not allow it. Lam does not allow capital letters A-Z because it can cause "
-"several problems. If username is already used username will be expanded with "
-"a number. The next free number will be used. Warning: Older systems have "
-"problems with usernames longer than 8 characters. You can not log in to "
-"Windows if username is longer than 16 characters."
-msgstr ""
-"作成しようとしているユーザのユーザ名。有効な文字は: a-z, 0-9 と .-_です。"
-"useraddコマンドで許されていないため、先頭文字に数字は使用できません。大文字 "
-"A-Zは、いくつかの問題を引き起こす可能性があるため使用できません。ユーザ名が既"
-"に使われていたならば、ユーザ名に番号が付加されます。この場合、次の空き番号が"
-"使われます。警告: 古いシステムでは、8文字より長いユーザ名で問題が発生します。"
-"16文字より長いユーザ名ではWindowsにはログオンできません。"
-
-#: ../templates/ou_edit.php:336 ../templates/main_header.php:81
-#: ../lib/modules/posixAccount.inc:57 ../lib/modules/posixAccount.inc:58
-#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:126
-#: ../help/help.inc:79
+#: ../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
+#: ../help/help.inc:78
 msgid "Users"
 msgstr "ユーザ"
 
-#: ../help/help.inc:239
-msgid "Users also being member of the current group."
-msgstr "このグループのメンバーとなっているユーザ。"
-
-#: ../lib/modules/posixGroup.inc:397
+#: ../lib/modules/posixGroup.inc:412
 msgid "Users who are member of the current group."
 msgstr "このグループに属するユーザ。"
 
-#: ../lib/modules/posixGroup.inc:401
+#: ../lib/modules/posixGroup.inc:416
 msgid ""
 "Users who will become member of the current group. User names are separated "
 "by semicolons."
@@ -4322,47 +4539,47 @@ msgstr ""
 "このグループのメンバーとなるユーザ。ユーザ名はセミコロンによって区切られま"
 "す。"
 
-#: ../help/help.inc:183
-msgid "Users wich are also members of group."
-msgstr "グループのメンバーとなっている他のユーザ。"
-
 #: ../templates/tree/creation_template.php:85
 msgid "Using template:"
 msgstr "テンプレートを使用:"
 
-#: ../help/help.inc:87
+#: ../help/help.inc:86
 msgid "Valid users"
 msgstr "有効なユーザ"
 
-#: ../templates/delete.php:181 ../lib/modules.inc:1553
+#: ../templates/delete.php:181 ../lib/modules.inc:1575
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "DN %s に属性を追加できませんでした。"
 
-#: ../lib/modules.inc:1518 ../lib/modules.inc:1527
+#: ../lib/modules.inc:1537 ../lib/modules.inc:1549
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "DN %s を作成できませんでした。"
 
 #: ../templates/tree/delete.php:109 ../templates/delete.php:218
-#: ../lib/modules.inc:1511
+#: ../lib/modules.inc:1530
 #, 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:1543
+#: ../lib/modules.inc:1565
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "DN %s の属性を変更できませんでした。"
 
-#: ../templates/delete.php:190 ../lib/modules.inc:1563
+#: ../templates/delete.php:190 ../lib/modules.inc:1585
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "DN %s の属性を削除できませんでした。"
 
-#: ../help/help.inc:59
+#: ../lib/modules/sambaSamAccount.inc:885
+msgid "Wednesday"
+msgstr "水曜日"
+
+#: ../help/help.inc:58
 msgid ""
 "When using ldaps:// be sure to use exactly the same IP/domain name as in "
 "your certificate!"
@@ -4370,83 +4587,63 @@ msgstr ""
 "ldaps:// を使う時は、証明書のIP/ドメイン名と正確に一致するものを使用してくだ"
 "さい。"
 
-#: ../templates/pdfedit/pdfpage.php:460
-msgid "Width"
-msgstr "幅"
-
-#: ../help/help.inc:185
-msgid "Windows clients will show display name as group description."
-msgstr "Windowsクライアントはグループの説明として名前を表示します。"
-
-#: ../help/help.inc:224
-msgid "Windows domain"
-msgstr "Windowsドメイン"
-
-#: ../lib/modules/sambaAccount.inc:379 ../lib/modules/sambaSamAccount.inc:195
+#: ../lib/modules/sambaAccount.inc:393 ../lib/modules/sambaSamAccount.inc:218
 msgid "Windows domain name of account."
 msgstr "アカウントのWindowsドメイン名"
 
-#: ../help/help.inc:225
-msgid "Windows domain of host."
-msgstr "ホストのWindowsドメイン"
-
-#: ../lib/modules/sambaAccount.inc:286 ../lib/modules/sambaAccount.inc:756
-#: ../lib/modules/sambaSamAccount.inc:302
-#: ../lib/modules/sambaSamAccount.inc:740
-#: ../lib/modules/sambaSamAccount.inc:960
-#: ../lib/modules/sambaGroupMapping.inc:174
-#: ../lib/modules/sambaGroupMapping.inc:300
+#: ../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
 msgid "Windows group"
 msgstr "Windowsグループ"
 
-#: ../lib/modules/sambaAccount.inc:372
+#: ../lib/modules/sambaAccount.inc:386
 msgid "Windows group RID"
 msgstr "WindowsグループRID"
 
-#: ../lib/modules/sambaAccount.inc:369 ../help/help.inc:232
+#: ../lib/modules/sambaAccount.inc:383
+#: ../lib/modules/sambaGroupMapping.inc:288
 msgid "Windows group name"
 msgstr "Windowsグループ名"
 
-#: ../lib/modules/sambaGroupMapping.inc:286
+#: ../lib/modules/sambaGroupMapping.inc:301
 msgid "Windows group type."
 msgstr "Windowsグループタイプ"
 
-#: ../lib/modules/sambaGroupMapping.inc:273
-msgid "Windows groupname"
-msgstr "Windowsグループ名"
-
-#: ../lib/modules/sambaSamAccount.inc:184
+#: ../lib/modules/sambaSamAccount.inc:207
 msgid "Windows primary group SID"
 msgstr "WindowsプライマリグループSID"
 
-#: ../lib/modules/sambaGroupMapping.inc:282
+#: ../lib/modules/sambaGroupMapping.inc:297
 msgid "Windows-Domain name of group."
 msgstr "グループのWindowsドメイン名。"
 
-#: ../help/help.inc:237
-msgid "Windows-Domain of group."
-msgstr "グループのWindowsドメイン。"
-
-#: ../help/help.inc:219
-msgid "Windows-Domain of user."
-msgstr "ユーザのWindowsドメイン。"
-
 #: ../templates/pdfedit/pdfdelete.php:89
 #: ../templates/profedit/profiledelete.php:92
 msgid "Wrong or missing type!"
 msgstr "タイプが間違っているか、または抜けています!"
 
-#: ../templates/login.php:366
+#: ../templates/login.php:355
 msgid "Wrong password/user name combination. Please try again."
 msgstr "誤ったパスワード/ユーザ名の組み合わせです。やり直してください。"
 
-#: ../templates/schema/schema.php:159 ../templates/schema/schema.php:201
-#: ../templates/schema/schema.php:206 ../templates/schema/schema.php:211
+#: ../templates/schema/schema.php:157 ../templates/schema/schema.php:199
+#: ../templates/schema/schema.php:204 ../templates/schema/schema.php:209
 msgid "Yes"
 msgstr "はい"
 
-#: ../lib/modules/posixGroup.inc:471 ../lib/modules/posixAccount.inc:76
-#: ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixGroup.inc:487
+msgid ""
+"You are using a capital letters. This can cause problems because Windows "
+"isn't case-sensitive."
+msgstr ""
+"大文字が使われています。Windowsは大文字と小文字を区別しないため、これが原因で"
+"問題が発生する場合があります。"
+
+#: ../lib/modules/posixAccount.inc:91 ../lib/modules/posixAccount.inc:93
 msgid ""
 "You are using a capital letters. This can cause problems because windows "
 "isn't case-sensitive."
@@ -4454,15 +4651,7 @@ msgstr ""
 "大文字が使われています。Windowsは大文字と小文字を区別しないため、これが原因で"
 "問題が発生する場合があります。"
 
-#: ../help/help.inc:187
-msgid ""
-"You can select a previous defined profile here. This will set all fields to "
-"the profile values."
-msgstr ""
-"ここで、以前に定義したプロファイルを選択できます。これはすべてのフィールドを"
-"プロファイルの値に設定します。"
-
-#: ../lib/modules/posixGroup.inc:462 ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixGroup.inc:478 ../lib/modules/posixAccount.inc:88
 msgid "You cannot use this password options at the same time."
 msgstr "このパスワードオプションは同時に指定できません。"
 
@@ -4504,69 +4693,69 @@ msgstr ""
 msgid "[attribute deleted]"
 msgstr "[削除された属性]"
 
-#: ../lib/modules/sambaAccount.inc:264 ../lib/modules/sambaSamAccount.inc:280
+#: ../lib/modules/sambaAccount.inc:278 ../lib/modules/sambaSamAccount.inc:306
 msgid "\\\\server\\homes\\smiller"
 msgstr ""
 
-#: ../lib/modules/sambaAccount.inc:270 ../lib/modules/sambaSamAccount.inc:286
+#: ../lib/modules/sambaAccount.inc:284 ../lib/modules/sambaSamAccount.inc:312
 msgid "\\\\server\\profiles\\smiller"
 msgstr ""
 
-#: ../templates/tree/edit.php:488
+#: ../templates/tree/edit.php:489
 msgid "add value"
 msgstr "値の追加"
 
-#: ../lib/modules/posixGroup.inc:352
+#: ../lib/modules/posixGroup.inc:367
 msgid "adminstrators"
 msgstr ""
 
-#: ../templates/schema/schema.php:226
+#: ../templates/schema/schema.php:224
 msgid "character"
 msgstr "文字"
 
-#: ../templates/schema/schema.php:225
+#: ../templates/schema/schema.php:223
 msgid "characters"
 msgstr "文字"
 
-#: ../help/help.inc:71
+#: ../help/help.inc:70
 msgid "dc=yourcompany,dc=com"
 msgstr ""
 
-#: ../templates/tree/edit.php:306
+#: ../templates/tree/edit.php:309
 msgid "delete attribute"
 msgstr "属性の削除"
 
-#: ../templates/tree/edit.php:171 ../templates/tree/edit.php:173
-#: ../templates/tree/edit.php:300 ../templates/tree/edit.php:302
+#: ../templates/tree/edit.php:174 ../templates/tree/edit.php:176
+#: ../templates/tree/edit.php:303 ../templates/tree/edit.php:305
 #: ../templates/tree/add_value_form.php:106
 #: ../templates/tree/add_value_form.php:109
 msgid "download value"
 msgstr "ダウンロード"
 
-#: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:197
-#: ../lib/modules/inetOrgPerson.inc:267 ../lib/modules/inetOrgPerson.inc:268
-#: ../lib/modules/inetOrgPerson.inc:444 ../lib/modules/inetOrgPerson.inc:472
+#: ../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
 msgid "eMail address"
 msgstr "電子メールアドレス"
 
-#: ../templates/tree/edit.php:385
+#: ../templates/tree/edit.php:386
 msgid "false"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:193
+#: ../lib/modules/posixAccount.inc:218
 msgid "group01,group02"
 msgstr ""
 
-#: ../lib/modules/quota.inc:120 ../lib/modules/quota.inc:122
-#: ../lib/modules/quota.inc:189 ../lib/modules/quota.inc:191
+#: ../lib/modules/quota.inc:146 ../lib/modules/quota.inc:148
+#: ../lib/modules/quota.inc:215 ../lib/modules/quota.inc:217
 msgid "hours"
 msgstr "時間"
 
-#: ../lib/tree.inc:1184
+#: ../lib/tree.inc:1161
 msgid "jpegPhoto contains errors"
 msgstr "jpegPhoto にエラーがあります"
 
-#: ../help/help.inc:53
+#: ../help/help.inc:52
 msgid ""
 "ldap://localhost:389 connects to localhost using a standard LDAP connection "
 "on port 389"
@@ -4574,7 +4763,7 @@ msgstr ""
 "ldaps://localhost:389 は、localhostのポート389へ標準的なLDAP接続を行ないま"
 "す。"
 
-#: ../help/help.inc:55
+#: ../help/help.inc:54
 msgid ""
 "ldaps://141.40.146.133 connects to 141.40.146.133 using an encrypted LDAP "
 "connection."
@@ -4582,43 +4771,43 @@ msgstr ""
 "ldaps://141.40.146.133 は、141.40.146.133 へ暗号化されたLDAP接続を行ないま"
 "す。"
 
-#: ../lib/modules/posixAccount.inc:253
+#: ../lib/modules/posixAccount.inc:278
 msgid "machines"
 msgstr "マシン"
 
-#: ../lib/modules/sambaAccount.inc:302 ../lib/modules/sambaAccount.inc:312
-#: ../lib/modules/sambaSamAccount.inc:210
-#: ../lib/modules/sambaSamAccount.inc:329
+#: ../lib/modules/sambaAccount.inc:316 ../lib/modules/sambaAccount.inc:326
+#: ../lib/modules/sambaSamAccount.inc:236
+#: ../lib/modules/sambaSamAccount.inc:355
 msgid "mydomain"
 msgstr "マイドメイン"
 
-#: ../lib/modules/sambaSamAccount.inc:304
+#: ../lib/modules/sambaSamAccount.inc:330
 msgid "mygroup"
 msgstr "マイグループ"
 
 #: ../templates/tree/templates/creation/custom.php:189
 #: ../templates/tree/templates/creation/custom.php:212
-#: ../templates/schema/schema.php:166 ../templates/schema/schema.php:235
-#: ../templates/schema/schema.php:246 ../templates/schema/schema.php:295
-#: ../templates/schema/schema.php:361 ../templates/schema/schema.php:376
-#: ../templates/schema/schema.php:410 ../templates/schema/schema.php:432
+#: ../templates/schema/schema.php:164 ../templates/schema/schema.php:233
+#: ../templates/schema/schema.php:244 ../templates/schema/schema.php:293
+#: ../templates/schema/schema.php:359 ../templates/schema/schema.php:374
+#: ../templates/schema/schema.php:408 ../templates/schema/schema.php:430
 msgid "none"
 msgstr "なし"
 
-#: ../templates/tree/edit.php:386
+#: ../templates/tree/edit.php:387
 msgid "none, remove value"
 msgstr "なし, 値を削除"
 
-#: ../templates/schema/schema.php:222
+#: ../templates/schema/schema.php:220
 msgid "not applicable"
 msgstr "適用対象外"
 
-#: ../templates/schema/schema.php:173 ../templates/schema/schema.php:178
-#: ../templates/schema/schema.php:183 ../templates/schema/schema.php:216
+#: ../templates/schema/schema.php:171 ../templates/schema/schema.php:176
+#: ../templates/schema/schema.php:181 ../templates/schema/schema.php:214
 msgid "not specified"
 msgstr "未入力"
 
-#: ../help/help.inc:65
+#: ../help/help.inc:64
 msgid ""
 "ou=People,dc=yourcompany,dc=com will read and store all accounts in this "
 "subtree."
@@ -4626,15 +4815,19 @@ msgstr ""
 "ou=People,dc=yourcompany,dc=com は、このサブツリーのすべてのアカウントを読み"
 "書きします。"
 
-#: ../lib/modules/posixAccount.inc:239
+#: ../lib/modules/posixAccount.inc:264
 msgid "pc01$"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:260
+#: ../lib/modules/posixAccount.inc:285
 msgid "pc01,Room 2.34"
 msgstr ""
 
-#: ../templates/tree/edit.php:238 ../templates/config/confmain.php:494
+#: ../lib/modules/inetOrgPerson.inc:242
+msgid "pc01,pc02"
+msgstr ""
+
+#: ../templates/tree/edit.php:241 ../templates/config/confmain.php:494
 msgid "required"
 msgstr "必須"
 
@@ -4642,39 +4835,206 @@ msgstr "必須"
 msgid "required for Samba 3 accounts"
 msgstr "Samba 3アカウントにおいて必須"
 
-#: ../templates/pdfedit/pdfpage.php:546
-msgid "right"
-msgstr "右"
-
-#: ../lib/modules/posixGroup.inc:378 ../lib/modules/sambaAccount.inc:206
-#: ../lib/modules/sambaSamAccount.inc:222 ../lib/modules/posixAccount.inc:214
+#: ../lib/modules/posixGroup.inc:393 ../lib/modules/sambaAccount.inc:220
+#: ../lib/modules/sambaSamAccount.inc:248 ../lib/modules/posixAccount.inc:239
 msgid "secret"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:172 ../lib/modules/nisMailAlias.inc:84
+#: ../lib/modules/posixAccount.inc:191 ../lib/modules/inetOrgPerson.inc:230
+#: ../lib/modules/nisMailAlias.inc:84
 msgid "smiller"
 msgstr ""
 
-#: ../templates/tree/edit.php:431
+#: ../templates/tree/edit.php:432
 msgid "structural"
 msgstr "構造型"
 
-#: ../templates/tree/edit.php:383
+#: ../templates/tree/edit.php:384
 msgid "true"
 msgstr ""
 
-#: ../lib/modules/posixGroup.inc:372
+#: ../lib/modules/posixGroup.inc:387
 msgid "user01,user02,user03"
 msgstr ""
 
-#: ../lib/modules/inetOrgPerson.inc:199
+#: ../lib/modules/inetOrgPerson.inc:212
 msgid "user@company.com"
 msgstr ""
 
-#: ../lib/modules/posixAccount.inc:186
+#: ../lib/modules/posixAccount.inc:211
 msgid "users"
 msgstr "ユーザ"
 
+#~ msgid "Account expire date. Format: DD-MM-YYYY"
+#~ msgstr "アカウント有効期限。形式は: DD-MM-YYYY"
+
+#~ msgid "Add after"
+#~ msgstr "後ろに追加"
+
+#~ msgid "Administrator"
+#~ msgstr "管理者"
+
+#~ msgid "Bottom"
+#~ msgstr "末尾"
+
+#~ msgid "Driveletter assigned on windows workstations as homedirectory."
+#~ msgstr ""
+#~ "Windowsワークステーションのホームディレクトリに割り当てられたドライブ文"
+#~ "字。"
+
+#~ msgid "Expand suffix with primary groupname"
+#~ msgstr "プライマリグループ名でサフィックスを補完"
+
+#~ msgid "Expire date"
+#~ msgstr "有効期限"
+
+#~ msgid "Group suffix"
+#~ msgstr "グループサフィックス"
+
+#~ msgid "Groupname"
+#~ msgstr "グループ名"
+
+#~ msgid "Guest"
+#~ msgstr "ゲスト"
+
+#~ msgid "Height"
+#~ msgstr "高さ"
+
+#~ msgid "Host username"
+#~ msgstr "ホストユーザ名"
+
+#~ msgid "Hostname"
+#~ msgstr "ホスト名"
+
+#~ msgid ""
+#~ "If a not yet existing group is defined in csv-file, a new group in the "
+#~ "selected group suffix will be created."
+#~ msgstr ""
+#~ "もしも、csvファイル中に定義されているグループがまだ存在していなければ、選"
+#~ "択されたグループサフィックス中に新しいグループが作成されます。"
+
+#~ msgid ""
+#~ "If a not yet existing group is defined in csv-file, a new group with the "
+#~ "selected group profile will be created."
+#~ msgstr ""
+#~ "もしも、csvファイル中に定義されているグループがまだ存在されていなければ、"
+#~ "選択されたグループプロファイルで新しいグループが作成されます。"
+
+#~ msgid "If checked unix password will also be used as samba password."
+#~ msgstr ""
+#~ "チェックした場合、unixパスワードがSambaパスワードとしても使われます。"
+
+#~ msgid ""
+#~ "If selected users will be added with OUs expanded with their primary "
+#~ "group. E.g. if a user is in group admin the user suffix will be ou=admin,"
+#~ "+user suffix."
+#~ msgstr ""
+#~ "選択した場合、ユーザはそのプライマリグループで拡張されたOUをもって追加され"
+#~ "ます。例えば、ユーザが group admin に所属している場合、ユーザのサフィック"
+#~ "スは ou=admin,+ユーザのサフィックスになります。"
+
+#~ msgid "Left"
+#~ msgstr "左"
+
+#~ msgid ""
+#~ "List of Samba workstations the user is allowed to login. Empty means "
+#~ "every workstation."
+#~ msgstr ""
+#~ "ユーザがログインできるSambaワークステーションのリスト。未記入はすべての"
+#~ "ワークステーションを意味します。"
+
+#~ msgid "Margin"
+#~ msgstr "余白"
+
+#~ msgid "Maximize with correct ratio"
+#~ msgstr "縦横比を維持したまま最大化"
+
+#~ msgid "Password expire"
+#~ msgstr "パスワード有効期限"
+
+#~ msgid "Password warn"
+#~ msgstr "パスワード警告"
+
+#~ msgid "Position in ldap-tree where the group should be created."
+#~ msgstr "グループを作成すべきLDAPツリーの位置。"
+
+#~ msgid "Position in ldap-tree where the host should be created."
+#~ msgstr "ホストを作成すべきLDAPツリーの位置。"
+
+#~ msgid "Position in ldap-tree where the user should be created."
+#~ msgstr "ユーザを作成すべきLDAPツリーの位置。"
+
+#~ msgid "Select group profile"
+#~ msgstr "グループプロファイルの選択"
+
+#~ msgid "Size"
+#~ msgstr "サイズ"
+
+#~ msgid "Submit page settings"
+#~ msgstr "ページ設定を更新"
+
+#~ msgid ""
+#~ "This will make a profile of the current account. The saved values are the "
+#~ "same as in the profile editor. Profile names may contain the letters a-z, "
+#~ "0-9 and -_."
+#~ msgstr ""
+#~ "現在のアカウントのプロファイルを作成します。保存された値は、プロファイルエ"
+#~ "ディタのものと同様になります。プロファイル名は a-z, 0-9 と -_ を含むことが"
+#~ "できます。"
+
+#~ msgid "Top"
+#~ msgstr "先頭"
+
+#~ msgid ""
+#~ "Unable to load available languages. Setting English as default language. "
+#~ "For further instructions please contact the admin of this site."
+#~ msgstr ""
+#~ "有効な言語をロードできません。英語を既定値の言語とします。より詳しい説明"
+#~ "は、このサイトの管理者に連絡してください。"
+
+#~ msgid "User quota"
+#~ msgstr "ユーザ クオータ"
+
+#~ msgid "Username"
+#~ msgstr "ユーザ名"
+
+#~ msgid "Users also being member of the current group."
+#~ msgstr "このグループのメンバーとなっているユーザ。"
+
+#~ msgid "Users wich are also members of group."
+#~ msgstr "グループのメンバーとなっている他のユーザ。"
+
+#~ msgid "Width"
+#~ msgstr "幅"
+
+#~ msgid "Windows clients will show display name as group description."
+#~ msgstr "Windowsクライアントはグループの説明として名前を表示します。"
+
+#~ msgid "Windows domain"
+#~ msgstr "Windowsドメイン"
+
+#~ msgid "Windows domain of host."
+#~ msgstr "ホストのWindowsドメイン"
+
+#~ msgid "Windows groupname"
+#~ msgstr "Windowsグループ名"
+
+#~ msgid "Windows-Domain of group."
+#~ msgstr "グループのWindowsドメイン。"
+
+#~ msgid "Windows-Domain of user."
+#~ msgstr "ユーザのWindowsドメイン。"
+
+#~ msgid ""
+#~ "You can select a previous defined profile here. This will set all fields "
+#~ "to the profile values."
+#~ msgstr ""
+#~ "ここで、以前に定義したプロファイルを選択できます。これはすべてのフィールド"
+#~ "をプロファイルの値に設定します。"
+
+#~ msgid "right"
+#~ msgstr "右"
+
 #~ msgid "Attribute not defined in LDAP."
 #~ msgstr "属性がLDAPに定義されていません。"
 
@@ -4711,9 +5071,6 @@ msgstr "ユーザ"
 #~ msgid "Special Group"
 #~ msgstr "特殊グループ"
 
-#~ msgid "Up"
-#~ msgstr "上"
-
 #~ msgid "User list"
 #~ msgstr "ユーザ一覧"