5 files changed, 111 insertions, 104 deletions
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index e2eb92b6806..0668a44ddc3 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -162,55 +162,55 @@ msgstr "12月"
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:759
+#: js/js.js:760
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:760
+#: js/js.js:761
 msgid "1 minute ago"
 msgstr "1 分前"
 
-#: js/js.js:761
+#: js/js.js:762
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分前"
 
-#: js/js.js:762
+#: js/js.js:763
 msgid "1 hour ago"
 msgstr "1 時間前"
 
-#: js/js.js:763
+#: js/js.js:764
 msgid "{hours} hours ago"
 msgstr "{hours} 時間前"
 
-#: js/js.js:764
+#: js/js.js:765
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:765
+#: js/js.js:766
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:766
+#: js/js.js:767
 msgid "{days} days ago"
 msgstr "{days} 日前"
 
-#: js/js.js:767
+#: js/js.js:768
 msgid "last month"
 msgstr "一月前"
 
-#: js/js.js:768
+#: js/js.js:769
 msgid "{months} months ago"
 msgstr "{months} 月前"
 
-#: js/js.js:769
+#: js/js.js:770
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:770
+#: js/js.js:771
 msgid "last year"
 msgstr "一年前"
 
-#: js/js.js:771
+#: js/js.js:772
 msgid "years ago"
 msgstr "年前"
 
@@ -565,14 +565,18 @@ msgstr "アカウント保護の為、パスワードを再度の変更をお願
 msgid "Lost your password?"
 msgstr "パスワードを忘れましたか？"
 
-#: templates/login.php:39
+#: templates/login.php:41
 msgid "remember"
 msgstr "パスワードを記憶する"
 
-#: templates/login.php:41
+#: templates/login.php:43
 msgid "Log in"
 msgstr "ログイン"
 
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "前"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 97f0b6b3b73..cd42db946c4 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:04+0100\n"
-"PO-Revision-Date: 2013-02-03 04:30+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,11 +73,15 @@ msgstr "ファイル"
 msgid "Unshare"
 msgstr "共有しない"
 
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "削除"
 
-#: js/fileactions.js:185
+#: js/fileactions.js:187
 msgid "Rename"
 msgstr "名前の変更"
 
@@ -182,31 +186,31 @@ msgstr "URLは空にできません。"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。"
 
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
 msgid "Modified"
 msgstr "更新日時"
 
-#: js/files.js:970
+#: js/files.js:974
 msgid "1 folder"
 msgstr "1 フォルダ"
 
-#: js/files.js:972
+#: js/files.js:976
 msgid "{count} folders"
 msgstr "{count} フォルダ"
 
-#: js/files.js:980
+#: js/files.js:984
 msgid "1 file"
 msgstr "1 ファイル"
 
-#: js/files.js:982
+#: js/files.js:986
 msgid "{count} files"
 msgstr "{count} ファイル"
 
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 2c42c902059..95a52309047 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-24 00:06+0100\n"
-"PO-Revision-Date: 2013-01-23 03:07+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-02-06 00:05+0100\n"
+"PO-Revision-Date: 2013-02-05 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,44 +41,22 @@ msgstr "パスワードを確認してもう一度行なってください。"
 msgid "Could not change your file encryption password to your login password"
 msgstr "ファイル暗号化パスワードをログインパスワードに変更できませんでした。"
 
-#: templates/settings-personal.php:3 templates/settings.php:5
-msgid "Choose encryption mode:"
-msgstr "暗号化モードを選択:"
-
-#: templates/settings-personal.php:20 templates/settings.php:24
-msgid ""
-"Client side encryption (most secure but makes it impossible to access your "
-"data from the web interface)"
-msgstr "クライアントサイドの暗号化（最もセキュアですが、WEBインターフェースからデータにアクセスできなくなります）"
-
-#: templates/settings-personal.php:30 templates/settings.php:36
-msgid ""
-"Server side encryption (allows you to access your files from the web "
-"interface and the desktop client)"
-msgstr "サーバサイド暗号化（WEBインターフェースおよびデスクトップクライアントからファイルにアクセスすることができます）"
-
-#: templates/settings-personal.php:41 templates/settings.php:60
-msgid "None (no encryption at all)"
-msgstr "暗号化無し（何も暗号化しません）"
-
-#: templates/settings.php:10
-msgid ""
-"Important: Once you selected an encryption mode there is no way to change it"
-" back"
-msgstr "重要: 一度暗号化を選択してしまうと、もとに戻す方法はありません"
-
-#: templates/settings.php:48
-msgid "User specific (let the user decide)"
-msgstr "ユーザ指定（ユーザが選べるようにする）"
-
-#: templates/settings.php:65
+#: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
 msgstr "暗号化"
 
-#: templates/settings.php:67
-msgid "Exclude the following file types from encryption"
-msgstr "暗号化から除外するファイルタイプ"
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:12
 msgid "None"
 msgstr "なし"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index fb4805b52db..f5fcfbe9a02 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:09+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -18,31 +18,35 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/trash.js:7 js/trash.js:69
+#: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
 msgstr "復元操作を実行する"
 
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
 msgid "Name"
 msgstr "名前"
 
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
 msgid "Deleted"
 msgstr "削除済み"
 
-#: js/trash.js:110
+#: js/trash.js:135
 msgid "1 folder"
 msgstr "1 フォルダ"
 
-#: js/trash.js:112
+#: js/trash.js:137
 msgid "{count} folders"
 msgstr "{count} フォルダ"
 
-#: js/trash.js:120
+#: js/trash.js:145
 msgid "1 file"
 msgstr "1 ファイル"
 
-#: js/trash.js:122
+#: js/trash.js:147
 msgid "{count} files"
 msgstr "{count} ファイル"
 
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 80f56e5c654..1774eebf3f3 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 04:30+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,6 +26,15 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "アプリストアからリストをロードできません"
 
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "認証エラー"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
 #: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "グループは既に存在しています"
@@ -50,10 +59,6 @@ msgstr "無効なメールアドレス"
 msgid "Unable to delete group"
 msgstr "グループを削除できません"
 
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "認証エラー"
-
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "ユーザを削除できません"
@@ -116,7 +121,7 @@ msgstr "エラー"
 msgid "Updated"
 msgstr "更新済み"
 
-#: js/personal.js:69
+#: js/personal.js:96
 msgid "Saving..."
 msgstr "保存中..."
 
@@ -193,67 +198,83 @@ msgstr "Androidクライアントをダウンロード"
 msgid "Download iOS Client"
 msgstr "iOSクライアントをダウンロード"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/personal.php:22
+#: templates/personal.php:24
 msgid "Your password was changed"
 msgstr "パスワードを変更しました"
 
-#: templates/personal.php:23
+#: templates/personal.php:25
 msgid "Unable to change your password"
 msgstr "パスワードを変更することができません"
 
-#: templates/personal.php:24
+#: templates/personal.php:26
 msgid "Current password"
 msgstr "現在のパスワード"
 
-#: templates/personal.php:25
+#: templates/personal.php:27
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: templates/personal.php:26
+#: templates/personal.php:28
 msgid "show"
 msgstr "表示"
 
-#: templates/personal.php:27
+#: templates/personal.php:29
 msgid "Change password"
 msgstr "パスワードを変更"
 
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "表示名"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:34
+#: templates/personal.php:56
 msgid "Your email address"
 msgstr "あなたのメールアドレス"
 
-#: templates/personal.php:35
+#: templates/personal.php:57
 msgid "Fill in an email address to enable password recovery"
 msgstr "※パスワード回復を有効にするにはメールアドレスの入力が必要です"
 
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
 msgid "Language"
 msgstr "言語"
 
-#: templates/personal.php:47
+#: templates/personal.php:69
 msgid "Help translate"
 msgstr "翻訳に協力する"
 
-#: templates/personal.php:52
+#: templates/personal.php:74
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:54
+#: templates/personal.php:76
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください"
 
-#: templates/personal.php:63
+#: templates/personal.php:85
 msgid "Version"
 msgstr "バージョン"
 
-#: templates/personal.php:65
+#: templates/personal.php:87
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -287,10 +308,6 @@ msgstr "無制限"
 msgid "Other"
 msgstr "その他"
 
-#: templates/users.php:80
-msgid "Display Name"
-msgstr "表示名"
-
 #: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "グループ管理者"