update translations

2 files changed, 112 insertions, 87 deletions

diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 22c877348..a9882e91d 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.mo
+++ b/locale/ja_JP/LC_MESSAGES/messages.mo
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index a4b7a28eb..6ce7cf2a2 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss unstable\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: 2009-05-12 03:25+0900\n"
 "Last-Translator: Tadashi Jokagi <[email protected]>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -184,182 +184,182 @@ msgstr ""
 "SQL のエスケープ処理のテストに失敗しました。データベースの設定と PHP の設定を"
 "確認してください。"
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr "セッションの検査に失敗しました (IP が正しくない)"
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr "ユーザー名かパスワードが正しくありません"
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2986 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "特別"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "ラベル"
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr "公開済みの記事"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 msgid "All articles"
 msgstr "すべての記事"
 
-#: functions.php:3105
+#: functions.php:3102
 #, fuzzy
 msgid "Archived articles"
 msgstr "未読記事"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr "生成したフィード"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "選択:"
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "すべて"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "未読"
 
-#: functions.php:4219
+#: functions.php:4216
 msgid "Invert"
 msgstr "反転"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "なし"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "操作..."
 
-#: functions.php:4234
+#: functions.php:4231
 msgid "Selection toggle:"
 msgstr "選択の切り替え:"
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "お気に入り"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "公開済み"
 
-#: functions.php:4238
+#: functions.php:4235
 msgid "Selection:"
 msgstr "選択:"
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "既読にする"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4247
+#: functions.php:4244
 #, fuzzy
 msgid "Move back"
 msgstr "戻る"
 
-#: functions.php:4248
+#: functions.php:4245
 #, fuzzy
 msgid "Delete"
 msgstr "標準"
 
-#: functions.php:4253
+#: functions.php:4250
 msgid "Assign label:"
 msgstr "ラベルの割り当て:"
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr "閉じたカテゴリーのクリック"
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "表示するフィードがありません。"
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "タグ"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4806
+#: functions.php:4803
 msgid " - "
 msgstr " - "
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 msgid "Show article summary in new window"
 msgstr "記事の要約を新しいウィンドウで表示する"
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 msgid "Publish article with a note"
 msgstr "ノートと記事を公開する"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 #, fuzzy
 msgid "Feed URL"
 msgstr "フィード"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr "添付:"
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr "添付:"
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
@@ -368,11 +368,11 @@ msgstr "添付:"
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: functions.php:5101
+#: functions.php:5098
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -380,31 +380,31 @@ msgstr ""
 "フィードを表示できません (問い合わせの失敗)。ラベル一致の文法かローカルの設定"
 "を確認してください。"
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5262 functions.php:5349
 msgid "mark as read"
 msgstr "既読にする"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 msgid "Click to expand article"
 msgstr "開いた記事のクリック"
 
-#: functions.php:5598
+#: functions.php:5595
 msgid "toggle unread"
 msgstr "未読/既読を切り替える"
 
-#: functions.php:5617
+#: functions.php:5614
 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: functions.php:5620
+#: functions.php:5617
 msgid "No updated articles found to display."
 msgstr "表示する更新された記事が見つかりませんでした。"
 
-#: functions.php:5623
+#: functions.php:5620
 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
-#: functions.php:5627
+#: functions.php:5624
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -412,23 +412,23 @@ msgstr ""
 "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ"
 "ニューを参照します)、フィルターを使うことができます。"
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5626 offline.js:443
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 msgid "Create label..."
 msgstr "ラベルを作成する..."
 
-#: functions.php:6402
+#: functions.php:6399
 msgid "(remove)"
 msgstr "(削除)"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "タグがありません"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 msgstr "ノートの編集"
 
@@ -754,24 +754,24 @@ msgstr "新規アカウントの作成"
 msgid "Limit bandwidth usage"
 msgstr "帯域の制限を使う"
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "OPML ユーティリティ"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "OPML のインポート中 (DOMDocument 機能拡張を用いて)..."
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr ""
 "DOMXML 機能拡張が見つかりません。PHP バージョン 5 未満はそれを要求します。"
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "設定に戻る"
 
@@ -1096,26 +1096,31 @@ msgstr "ヘルプ"
 msgid "Help topic not found."
 msgstr "ヘルプのトピックが見つかりません。"
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "カテゴリー <b>%s</b> の追加中です。"
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 #, fuzzy
 msgid "is already imported."
 msgstr "既にインポート済みです。"
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr "ドキュメントの解析中のエラーです。"
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr "エラー: OPML ファイルをアップロードしてください。"
 
@@ -1564,19 +1569,45 @@ msgstr "一致するフィルターが見つかりません。"
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "インポート"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+
+#: modules/pref-feeds.php:1489
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1492 modules/pref-feeds.php:1521
+#, fuzzy
+msgid "Display URL"
+msgstr "タグの表示"
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr "Firefox 統合"
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1584,33 +1615,22 @@ msgstr ""
 "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
 "Tiny RSS のサイトを使うことができます。"
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1506
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
-#, fuzzy
-msgid "Display URL"
-msgstr "タグの表示"
-
-#: modules/pref-feeds.php:1507
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1624
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "お気に入りの記事"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
@@ -2306,8 +2326,10 @@ msgid "No labels are selected."
 msgstr "選択されたラベルはありません。"
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "選択されたユーザーを削除しますか?"
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2531,6 +2553,9 @@ msgstr "%d 件のマークした記事を既読として設定しますか?"
 msgid "Please enter a note for this article:"
 msgstr "このアーティクルのノートを入力してください:"
 
+#~ msgid "Remove selected users?"
+#~ msgstr "選択されたユーザーを削除しますか?"
+
 #~ msgid "Adding feed..."
 #~ msgstr "フィードを追加しています..."