merge updated hu_HU manually, rebase translations

[tt-rss.git] / locale / ja_JP / LC_MESSAGES / messages.po

diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index 0f6346d05a77eec95e9d1b2c1808ca9bac8d30aa..b575a98af9ba57f50f9d6a310e78d7be6bb3c40a 100644 (file)
--- 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: 2013-03-31 12:47+0400\n"
+"POT-Creation-Date: 2013-05-15 09:45+0400\n"
 "PO-Revision-Date: 2013-03-25 06:48+0900\n"
 "Last-Translator: skikuta <kik0220@gmail.com>\n"
 "Language-Team: \n"
@@ -16,186 +16,92 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:71
+#: backend.php:73
 msgid "Use default"
 msgstr "標準を使用する"
 
-#: backend.php:72
+#: backend.php:74
 msgid "Never purge"
 msgstr "ずっと削除しない"
 
-#: backend.php:73
+#: backend.php:75
 msgid "1 week old"
 msgstr "1 週間前"
 
-#: backend.php:74
+#: backend.php:76
 msgid "2 weeks old"
 msgstr "2 週間前"
 
-#: backend.php:75
+#: backend.php:77
 msgid "1 month old"
 msgstr "1 ヶ月前"
 
-#: backend.php:76
+#: backend.php:78
 msgid "2 months old"
 msgstr "2 日月前"
 
-#: backend.php:77
+#: backend.php:79
 msgid "3 months old"
 msgstr "3 ヶ月前"
 
-#: backend.php:80
+#: backend.php:82
 msgid "Default interval"
 msgstr "更新の間隔"
 
-#: backend.php:81
-#: backend.php:91
+#: backend.php:83
+#: backend.php:93
 msgid "Disable updates"
 msgstr "更新を無効にする"
 
-#: backend.php:82
-#: backend.php:92
+#: backend.php:84
+#: backend.php:94
 msgid "Each 15 minutes"
 msgstr "各 15 分"
 
-#: backend.php:83
-#: backend.php:93
+#: backend.php:85
+#: backend.php:95
 msgid "Each 30 minutes"
 msgstr "各 30 分"
 
-#: backend.php:84
-#: backend.php:94
+#: backend.php:86
+#: backend.php:96
 msgid "Hourly"
 msgstr "毎時"
 
-#: backend.php:85
-#: backend.php:95
+#: backend.php:87
+#: backend.php:97
 msgid "Each 4 hours"
 msgstr "各 4 時間"
 
-#: backend.php:86
-#: backend.php:96
+#: backend.php:88
+#: backend.php:98
 msgid "Each 12 hours"
 msgstr "各 12 時間"
 
-#: backend.php:87
-#: backend.php:97
+#: backend.php:89
+#: backend.php:99
 msgid "Daily"
 msgstr "毎日"
 
-#: backend.php:88
-#: backend.php:98
+#: backend.php:90
+#: backend.php:100
 msgid "Weekly"
 msgstr "毎週"
 
-#: backend.php:101
-#: classes/pref/users.php:139
+#: backend.php:103
+#: classes/pref/users.php:119
+#: classes/pref/system.php:51
 msgid "User"
 msgstr "ユーザー"
 
-#: backend.php:102
+#: backend.php:104
 msgid "Power User"
 msgstr "パワーユーザー"
 
-#: backend.php:103
+#: backend.php:105
 msgid "Administrator"
 msgstr "管理者"
 
-#: db-updater.php:19
-msgid "Your access level is insufficient to run this script."
-msgstr "このスクリプトを実行するにはアクセスレベルが不十分です。"
-
-#: db-updater.php:44
-msgid "Database Updater"
-msgstr "データベースアップデーター"
-
-#: db-updater.php:87
-msgid "Could not update database"
-msgstr "データベースを更新できません"
-
-#: db-updater.php:90
-msgid "Could not find necessary schema file, need version:"
-msgstr "必要なスキーマファイルを見つけられませんでした。次のバージョンが必要です:"
-
-#: db-updater.php:91
-msgid ", found: "
-msgstr ", 以下が見つかりました: "
-
-#: db-updater.php:94
-msgid "Tiny Tiny RSS database is up to date."
-msgstr "Tiny Tiny RSS のデータベースを更新しました。"
-
-#: db-updater.php:96
-#: db-updater.php:165
-#: db-updater.php:178
-#: register.php:196
-#: register.php:241
-#: register.php:254
-#: register.php:269
-#: register.php:288
-#: register.php:336
-#: register.php:346
-#: register.php:358
-#: classes/handler/public.php:625
-#: classes/handler/public.php:713
-#: classes/handler/public.php:795
-msgid "Return to Tiny Tiny RSS"
-msgstr "Tiny Tiny RSS に戻る"
-
-#: db-updater.php:102
-msgid "Please backup your database before proceeding."
-msgstr "実行前にデータベースのバックアップをしてください。"
-
-#: db-updater.php:104
-#, php-format
-msgid "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to <b>%d</b>)."
-msgstr "Tiny Tiny RSS は最新のバージョンに更新する必要があります (<b>%d</b> から <b>%d</b>)。"
-
-#: db-updater.php:118
-msgid "Perform updates"
-msgstr "更新の実行"
-
-#: db-updater.php:123
-msgid "Performing updates..."
-msgstr "更新を実行しています..."
-
-#: db-updater.php:129
-#, php-format
-msgid "Updating to version %d..."
-msgstr "バージョン %d を確認しています..."
-
-#: db-updater.php:144
-msgid "Checking version... "
-msgstr "バージョンを確認しています..."
-
-#: db-updater.php:150
-msgid "OK!"
-msgstr "OK!"
-
-#: db-updater.php:152
-msgid "ERROR!"
-msgstr "エラー!"
-
-#: db-updater.php:160
-#, fuzzy, php-format
-msgid "Finished. Performed <b>%d</b> update up to schema version <b>%d</b>."
-msgid_plural "Finished. Performed <b>%d</b> updates up to schema version <b>%d</b>."
-msgstr[0] "完了しました。<b>%d</b> 個のテーブルをスキーマーバージョン<b>%d</b> に更新しました。"
-msgstr[1] "完了しました。<b>%d</b> 個のテーブルをスキーマーバージョン<b>%d</b> に更新しました。"
-
-#: db-updater.php:170
-msgid "Your database schema is from a newer version of Tiny Tiny RSS."
-msgstr "Databaseスキーマは、Tiny Tiny RSSの新しいバージョンからのものです。"
-
-#: db-updater.php:172
-#, php-format
-msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
-msgstr "スキーマバージョンが: <b>%d</b>, でした。 以下が必要です: <b>%d</b>."
-
-#: db-updater.php:174
-msgid "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer version and continue."
-msgstr "スキーマアップグレードができません。Tiny Tiny RSSを新しいバージョンに更新してから続けてください。"
-
 #: errors.php:9
 msgid "This program requires XmlHttpRequest to function properly. Your browser doesn't seem to support it."
 msgstr "このプログラムは XmlHttpRequest が正しく機能することを要求します。あなたのブラウザーはそれをサポートしていないように見えます。"
@@ -247,336 +153,330 @@ msgstr "MySQL のバージョンが現在サポートされていません。オ
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr "SQLのエスケープ処理のテストに失敗しました。データベースとPHPの設定を確認してください。"
 
-#: index.php:135
-#: index.php:154
-#: index.php:264
-#: prefs.php:102
+#: index.php:128
+#: index.php:145
+#: index.php:265
+#: prefs.php:97
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
-#: classes/pref/filters.php:628
-#: classes/pref/feeds.php:1330
-#: plugins/digest/digest_body.php:63
+#: classes/pref/filters.php:678
+#: classes/pref/feeds.php:1372
 #: js/feedlist.js:128
-#: js/feedlist.js:448
-#: js/functions.js:420
-#: js/functions.js:814
-#: js/functions.js:1250
-#: js/functions.js:1385
-#: js/functions.js:1697
+#: js/feedlist.js:441
+#: js/functions.js:446
+#: js/functions.js:784
+#: js/functions.js:1194
+#: js/functions.js:1330
+#: js/functions.js:1642
 #: js/prefs.js:86
 #: js/prefs.js:576
 #: js/prefs.js:666
-#: js/prefs.js:870
-#: js/prefs.js:1457
-#: js/prefs.js:1510
-#: js/prefs.js:1568
-#: js/prefs.js:1584
-#: js/prefs.js:1600
+#: js/prefs.js:867
+#: js/prefs.js:1454
+#: js/prefs.js:1507
+#: js/prefs.js:1566
+#: js/prefs.js:1583
+#: js/prefs.js:1599
 #: js/prefs.js:1619
 #: js/prefs.js:1792
 #: js/prefs.js:1808
-#: js/tt-rss.js:475
-#: js/tt-rss.js:492
-#: js/viewfeed.js:774
-#: js/viewfeed.js:1259
+#: js/prefs.js:1826
+#: js/tt-rss.js:507
+#: js/tt-rss.js:524
+#: js/viewfeed.js:821
+#: js/viewfeed.js:1250
 #: plugins/import_export/import_export.js:17
 #: plugins/updater/updater.js:17
 msgid "Loading, please wait..."
 msgstr "読み込みんでいます。しばらくお待ちください..."
 
-#: index.php:168
+#: index.php:159
 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 
-#: index.php:171
+#: index.php:162
 #, fuzzy
 msgid "Show articles"
 msgstr "記事を保管しました"
 
-#: index.php:174
+#: index.php:165
 msgid "Adaptive"
 msgstr ""
 
-#: index.php:175
+#: index.php:166
 msgid "All Articles"
 msgstr "すべての記事"
 
-#: index.php:176
-#: include/functions.php:1974
-#: classes/feeds.php:106
+#: index.php:167
+#: include/functions.php:2008
+#: classes/feeds.php:98
 msgid "Starred"
 msgstr "お気に入り"
 
-#: index.php:177
-#: include/functions.php:1975
-#: classes/feeds.php:107
+#: index.php:168
+#: include/functions.php:2009
+#: classes/feeds.php:99
 msgid "Published"
 msgstr "公開済み"
 
-#: index.php:178
-#: classes/feeds.php:93
-#: classes/feeds.php:105
+#: index.php:169
+#: classes/feeds.php:85
+#: classes/feeds.php:97
 msgid "Unread"
 msgstr "未読"
 
-#: index.php:179
+#: index.php:170
 #, fuzzy
 msgid "Unread First"
 msgstr "未読"
 
-#: index.php:180
+#: index.php:171
 msgid "With Note"
 msgstr ""
 
-#: index.php:181
+#: index.php:172
 msgid "Ignore Scoring"
 msgstr "スコア計算の無効化"
 
-#: index.php:184
+#: index.php:175
 #, fuzzy
 msgid "Sort articles"
 msgstr "記事を保管しました"
 
-#: index.php:187
+#: index.php:178
 msgid "Default"
 msgstr "標準"
 
-#: index.php:188
+#: index.php:179
 msgid "Newest first"
 msgstr ""
 
-#: index.php:189
+#: index.php:180
 msgid "Oldest first"
 msgstr ""
 
-#: index.php:195
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
-msgid "Update"
-msgstr "更新"
-
-#: index.php:197
-msgid "Mark feed as read"
-msgstr "マークしたフィードを既読にする"
+#: index.php:181
+msgid "Title"
+msgstr "題名"
 
-#: index.php:200
-#: index.php:235
-#: include/functions.php:1964
-#: include/localized_schema.php:10
-#: classes/feeds.php:111
-#: classes/feeds.php:136
-#: classes/feeds.php:437
+#: index.php:185
+#: index.php:233
+#: include/functions.php:1998
+#: classes/feeds.php:103
+#: classes/feeds.php:424
 #: js/FeedTree.js:128
 #: js/FeedTree.js:156
-#: plugins/digest/digest.js:647
 msgid "Mark as read"
 msgstr "既読にする"
 
-#: index.php:201
-#: include/functions.php:1860
-#: include/functions.php:1972
-msgid "All articles"
-msgstr "すべての記事"
-
-#: index.php:202
+#: index.php:188
 msgid "Older than one day"
 msgstr ""
 
-#: index.php:203
+#: index.php:191
 msgid "Older than one week"
 msgstr ""
 
-#: index.php:204
+#: index.php:194
 msgid "Older than two weeks"
 msgstr ""
 
-#: index.php:212
+#: index.php:210
 msgid "Communication problem with server."
 msgstr "サーバーとの通信に問題が発生しました。"
 
-#: index.php:220
+#: index.php:218
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: index.php:225
+#: index.php:223
 msgid "Actions..."
 msgstr "操作..."
 
-#: index.php:227
+#: index.php:225
 #, fuzzy
 msgid "Preferences..."
 msgstr "設定"
 
-#: index.php:228
+#: index.php:226
 msgid "Search..."
 msgstr "検索..."
 
-#: index.php:229
+#: index.php:227
 msgid "Feed actions:"
 msgstr "フィード操作"
 
-#: index.php:230
-#: classes/handler/public.php:555
+#: index.php:228
+#: classes/handler/public.php:562
 msgid "Subscribe to feed..."
 msgstr "フィードを購読する..."
 
-#: index.php:231
+#: index.php:229
 msgid "Edit this feed..."
 msgstr "フィードを編集する..."
 
-#: index.php:232
+#: index.php:230
 msgid "Rescore feed"
 msgstr "フィードのスコアを再計算しています..."
 
-#: index.php:233
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: index.php:231
+#: classes/pref/feeds.php:746
+#: classes/pref/feeds.php:1327
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
-#: index.php:234
+#: index.php:232
 msgid "All feeds:"
 msgstr "すべてのフィード:"
 
-#: index.php:236
+#: index.php:234
 msgid "(Un)hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: index.php:237
+#: index.php:235
 msgid "Other actions:"
 msgstr "その他の操作:"
 
-#: index.php:239
-msgid "Switch to digest..."
-msgstr "ダイジェストに移行..."
-
-#: index.php:241
-#, fuzzy
-msgid "Show tag cloud..."
-msgstr "タグクラウド"
-
-#: index.php:242
-#: include/functions.php:1950
+#: index.php:236
+#: include/functions.php:1984
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "カテゴリーの並び替えモードの切り替え"
 
-#: index.php:243
+#: index.php:237
 msgid "Select by tags..."
 msgstr "タグで選択..."
 
-#: index.php:244
+#: index.php:238
 msgid "Create label..."
 msgstr "ラベルを作成する..."
 
-#: index.php:245
+#: index.php:239
 msgid "Create filter..."
 msgstr "フィルターを作成しています..."
 
-#: index.php:246
+#: index.php:240
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "キーボードショートカット"
 
-#: index.php:248
-#: plugins/digest/digest_body.php:77
-#: plugins/mobile/mobile-functions.php:62
-#: plugins/mobile/mobile-functions.php:237
+#: index.php:249
 msgid "Logout"
 msgstr "ログアウト"
 
-#: prefs.php:36
-#: prefs.php:122
-#: include/functions.php:1977
-#: classes/pref/prefs.php:377
+#: prefs.php:33
+#: prefs.php:115
+#: include/functions.php:2011
+#: classes/pref/prefs.php:440
 msgid "Preferences"
 msgstr "設定"
 
-#: prefs.php:113
+#: prefs.php:106
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: prefs.php:114
+#: prefs.php:107
 msgid "Exit preferences"
 msgstr "設定を終了する"
 
-#: prefs.php:125
+#: prefs.php:118
 #: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1253
+#: classes/pref/feeds.php:1316
 msgid "Feeds"
 msgstr "フィード"
 
-#: prefs.php:128
-#: classes/pref/filters.php:120
+#: prefs.php:121
+#: classes/pref/filters.php:154
 msgid "Filters"
 msgstr "フィルター"
 
-#: prefs.php:131
-#: include/functions.php:1167
-#: include/functions.php:1803
+#: prefs.php:124
+#: include/functions.php:1176
+#: include/functions.php:1832
 #: classes/pref/labels.php:90
-#: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "ラベル"
 
-#: prefs.php:135
+#: prefs.php:128
 msgid "Users"
 msgstr "ユーザー"
 
-#: register.php:186
+#: prefs.php:131
+msgid "System"
+msgstr ""
+
+#: register.php:184
 #: include/login_form.php:238
 msgid "Create new account"
 msgstr "新規アカウントの作成"
 
-#: register.php:192
+#: register.php:190
 msgid "New user registrations are administratively disabled."
 msgstr "新規ユーザーの登録は管理者によって無効になっています。"
 
-#: register.php:217
+#: register.php:194
+#: register.php:239
+#: register.php:252
+#: register.php:267
+#: register.php:286
+#: register.php:334
+#: register.php:344
+#: register.php:356
+#: classes/handler/public.php:632
+#: classes/handler/public.php:723
+#: classes/handler/public.php:805
+#: classes/handler/public.php:880
+#: classes/handler/public.php:894
+#: classes/handler/public.php:901
+#: classes/handler/public.php:926
+msgid "Return to Tiny Tiny RSS"
+msgstr "Tiny Tiny RSS に戻る"
+
+#: register.php:215
 msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
 msgstr "一時的なパスワードをメールで送りました。このアカウント（一度だけログイン出来ます。）は24時間後に削除されます。"
 
-#: register.php:223
+#: register.php:221
 msgid "Desired login:"
 msgstr "ご希望のlogin名:"
 
-#: register.php:226
+#: register.php:224
 msgid "Check availability"
 msgstr "有効性の確認"
 
-#: register.php:228
-#: classes/handler/public.php:753
+#: register.php:226
+#: classes/handler/public.php:763
 msgid "Email:"
 msgstr "メールアドレス:"
 
-#: register.php:231
-#: classes/handler/public.php:758
+#: register.php:229
+#: classes/handler/public.php:768
 msgid "How much is two plus two:"
 msgstr "2 + 2 = ？"
 
-#: register.php:234
+#: register.php:232
 msgid "Submit registration"
 msgstr "登録を送信する"
 
-#: register.php:252
+#: register.php:250
 msgid "Your registration information is incomplete."
 msgstr "登録情報が完成していません。"
 
-#: register.php:267
+#: register.php:265
 msgid "Sorry, this username is already taken."
 msgstr "すみませんがこのユーザー名は既にいます。"
 
-#: register.php:286
+#: register.php:284
 msgid "Registration failed."
 msgstr "登録に失敗しました。"
 
-#: register.php:333
+#: register.php:331
 msgid "Account created successfully."
 msgstr "アカウントの作成に成功しました。"
 
-#: register.php:355
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr "新規ユーザーの登録は現在行っていません。"
 
@@ -586,12 +486,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS のデータベースを更新しました。"
 
 #: include/digest.php:109
-#: include/functions.php:1176
-#: include/functions.php:1704
-#: include/functions.php:1789
-#: include/functions.php:1811
+#: include/functions.php:1185
+#: include/functions.php:1733
+#: include/functions.php:1818
+#: include/functions.php:1840
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:218
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
@@ -606,1292 +506,954 @@ msgstr[1] "お気に入りの記事"
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
-#: include/functions.php:722
-msgid "Session failed to validate (incorrect IP)"
-msgstr "セッションの検査に失敗しました (IP が正しくない)"
-
-#: include/functions.php:1165
-#: include/functions.php:1801
-#: plugins/mobile/mobile-functions.php:171
+#: include/functions.php:1174
+#: include/functions.php:1830
 msgid "Special"
 msgstr "特別"
 
-#: include/functions.php:1653
-#: classes/dlg.php:369
-#: classes/pref/filters.php:382
+#: include/functions.php:1681
+#: classes/feeds.php:1097
+#: classes/pref/filters.php:425
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: include/functions.php:1854
+#: include/functions.php:1885
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: include/functions.php:1856
+#: include/functions.php:1887
 msgid "Published articles"
 msgstr "公開済みの記事"
 
-#: include/functions.php:1858
+#: include/functions.php:1889
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: include/functions.php:1862
+#: include/functions.php:1891
+#: include/functions.php:2006
+msgid "All articles"
+msgstr "すべての記事"
+
+#: include/functions.php:1893
 #, fuzzy
 msgid "Archived articles"
 msgstr "未読記事"
 
-#: include/functions.php:1864
+#: include/functions.php:1895
 msgid "Recently read"
 msgstr "最近読んだ"
 
-#: include/functions.php:1927
+#: include/functions.php:1958
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: include/functions.php:1928
+#: include/functions.php:1959
 #, fuzzy
 msgid "Open next feed"
 msgstr "次のフィードを開く"
 
-#: include/functions.php:1929
+#: include/functions.php:1960
 msgid "Open previous feed"
 msgstr "前のフィードを開く"
 
-#: include/functions.php:1930
+#: include/functions.php:1961
 #, fuzzy
 msgid "Open next article"
 msgstr "次の記事を開く"
 
-#: include/functions.php:1931
+#: include/functions.php:1962
 #, fuzzy
 msgid "Open previous article"
 msgstr "前の記事を開く"
 
-#: include/functions.php:1932
+#: include/functions.php:1963
 msgid "Open next article (don't scroll long articles)"
 msgstr "次の記事を開く(スクロールしない)"
 
-#: include/functions.php:1933
+#: include/functions.php:1964
 msgid "Open previous article (don't scroll long articles)"
 msgstr "前の記事を開く(スクロールしない)"
 
-#: include/functions.php:1934
+#: include/functions.php:1965
+#, fuzzy
+msgid "Move to next article (don't expand or mark read)"
+msgstr "次の記事を開く(スクロールしない)"
+
+#: include/functions.php:1966
+#, fuzzy
+msgid "Move to previous article (don't expand or mark read)"
+msgstr "前の記事を開く(スクロールしない)"
+
+#: include/functions.php:1967
 msgid "Show search dialog"
 msgstr "検索ダイアログを表示する"
 
-#: include/functions.php:1935
+#: include/functions.php:1968
 #, fuzzy
 msgid "Article"
 msgstr "すべての記事"
 
-#: include/functions.php:1936
+#: include/functions.php:1969
 msgid "Toggle starred"
 msgstr "お気に入りを切り替える"
 
-#: include/functions.php:1937
-#: js/viewfeed.js:1920
+#: include/functions.php:1970
+#: js/viewfeed.js:1911
 msgid "Toggle published"
 msgstr "公開を切り替える"
 
-#: include/functions.php:1938
-#: js/viewfeed.js:1898
+#: include/functions.php:1971
+#: js/viewfeed.js:1889
 msgid "Toggle unread"
 msgstr "未読に切り替える"
 
-#: include/functions.php:1939
+#: include/functions.php:1972
 msgid "Edit tags"
 msgstr "タグを編集する"
 
-#: include/functions.php:1940
+#: include/functions.php:1973
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "ラベルから選択した記事を削除しますか?"
 
-#: include/functions.php:1941
+#: include/functions.php:1974
 #, fuzzy
 msgid "Dismiss read"
 msgstr "公開記事"
 
-#: include/functions.php:1942
+#: include/functions.php:1975
 #, fuzzy
 msgid "Open in new window"
 msgstr "新しいウィンドウで記事を開く"
 
-#: include/functions.php:1943
-#: js/viewfeed.js:1939
+#: include/functions.php:1976
+#: js/viewfeed.js:1930
 #, fuzzy
 msgid "Mark below as read"
 msgstr "既読にする"
 
-#: include/functions.php:1944
-#: js/viewfeed.js:1933
+#: include/functions.php:1977
+#: js/viewfeed.js:1924
 #, fuzzy
 msgid "Mark above as read"
 msgstr "既読にする"
 
-#: include/functions.php:1945
+#: include/functions.php:1978
 #, fuzzy
 msgid "Scroll down"
 msgstr "下にスクロール"
 
-#: include/functions.php:1946
+#: include/functions.php:1979
 msgid "Scroll up"
 msgstr "上にスクロール"
 
-#: include/functions.php:1947
+#: include/functions.php:1980
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "マウスカーソルの下の記事を選択する"
 
-#: include/functions.php:1948
+#: include/functions.php:1981
 #, fuzzy
 msgid "Email article"
 msgstr "すべての記事"
 
-#: include/functions.php:1949
+#: include/functions.php:1982
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "記事を消去する"
 
-#: include/functions.php:1951
-#: plugins/embed_original/init.php:33
+#: include/functions.php:1983
+#, fuzzy
+msgid "Toggle article expansion (combined mode)"
+msgstr "カテゴリーの並び替えモードの切り替え"
+
+#: include/functions.php:1985
+#: plugins/embed_original/init.php:31
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "カテゴリーの並び替えモードの切り替え"
 
-#: include/functions.php:1952
+#: include/functions.php:1986
 #, fuzzy
 msgid "Article selection"
 msgstr "有効な記事の操作"
 
-#: include/functions.php:1953
+#: include/functions.php:1987
 #, fuzzy
 msgid "Select all articles"
 msgstr "記事を消去する"
 
-#: include/functions.php:1954
+#: include/functions.php:1988
 #, fuzzy
 msgid "Select unread"
 msgstr "未読記事を削除する"
 
-#: include/functions.php:1955
+#: include/functions.php:1989
 #, fuzzy
 msgid "Select starred"
 msgstr "お気に入りに設定する"
 
-#: include/functions.php:1956
+#: include/functions.php:1990
 #, fuzzy
 msgid "Select published"
 msgstr "未読記事を削除する"
 
-#: include/functions.php:1957
+#: include/functions.php:1991
 #, fuzzy
 msgid "Invert selection"
 msgstr "有効な記事の操作"
 
-#: include/functions.php:1958
+#: include/functions.php:1992
 #, fuzzy
 msgid "Deselect everything"
 msgstr "記事を消去する"
 
-#: include/functions.php:1959
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1993
+#: classes/pref/feeds.php:540
+#: classes/pref/feeds.php:783
 msgid "Feed"
 msgstr "フィード"
 
-#: include/functions.php:1960
+#: include/functions.php:1994
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "有効なフィードの更新"
 
-#: include/functions.php:1961
+#: include/functions.php:1995
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: include/functions.php:1962
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1996
+#: classes/pref/feeds.php:1319
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: include/functions.php:1963
+#: include/functions.php:1997
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "フィードを編集する"
 
-#: include/functions.php:1965
+#: include/functions.php:1999
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "ヘッドラインの逆順 (古いものが上)"
 
-#: include/functions.php:1966
+#: include/functions.php:2000
 #, fuzzy
 msgid "Debug feed update"
 msgstr "すべてのフィードを更新しました。"
 
-#: include/functions.php:1967
+#: include/functions.php:2001
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "すべてのフィードを既読に設定する"
 
-#: include/functions.php:1968
+#: include/functions.php:2002
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "カテゴリーの開閉"
 
-#: include/functions.php:1969
+#: include/functions.php:2003
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "カテゴリーの並び替えモードの切り替え"
 
-#: include/functions.php:1970
+#: include/functions.php:2004
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "カテゴリーの並び替えモードの切り替え"
 
-#: include/functions.php:1971
+#: include/functions.php:2005
 #, fuzzy
 msgid "Go to"
 msgstr "移動..."
 
-#: include/functions.php:1973
+#: include/functions.php:2007
 #, fuzzy
 msgid "Fresh"
 msgstr "再描画"
 
-#: include/functions.php:1976
+#: include/functions.php:2010
+#: js/tt-rss.js:457
+#: js/tt-rss.js:642
 msgid "Tag cloud"
 msgstr "タグクラウド"
 
-#: include/functions.php:1978
+#: include/functions.php:2012
 #, fuzzy
 msgid "Other"
 msgstr "その他:"
 
-#: include/functions.php:1979
+#: include/functions.php:2013
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "ラベルを作成する"
 
-#: include/functions.php:1980
-#: classes/pref/filters.php:606
+#: include/functions.php:2014
+#: classes/pref/filters.php:652
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
-#: include/functions.php:1981
+#: include/functions.php:2015
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "サイドバーを縮小する"
 
-#: include/functions.php:1982
+#: include/functions.php:2016
 #, fuzzy
 msgid "Show help dialog"
 msgstr "検索ダイアログを表示する"
 
-#: include/functions.php:2467
+#: include/functions.php:2537
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "検索結果"
 
-#: include/functions.php:2958
-#: js/viewfeed.js:2026
-#, fuzzy
-msgid "Click to play"
-msgstr "クリックで表示"
-
-#: include/functions.php:2959
-#: js/viewfeed.js:2025
-msgid "Play"
-msgstr "表示"
-
-#: include/functions.php:3076
+#: include/functions.php:3132
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3098
-#: include/functions.php:3392
-#: classes/rpc.php:408
+#: include/functions.php:3154
+#: include/functions.php:3395
+#: classes/article.php:281
 msgid "no tags"
 msgstr "タグがありません"
 
-#: include/functions.php:3108
-#: classes/feeds.php:682
+#: include/functions.php:3164
+#: classes/feeds.php:676
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: include/functions.php:3137
-#: classes/feeds.php:638
+#: include/functions.php:3196
+#: classes/feeds.php:628
 #, fuzzy
 msgid "Originally from:"
 msgstr "元の記事内容を表示する"
 
-#: include/functions.php:3150
-#: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: include/functions.php:3209
+#: classes/feeds.php:641
+#: classes/pref/feeds.php:559
 #, fuzzy
 msgid "Feed URL"
 msgstr "フィード"
 
-#: include/functions.php:3181
-#: classes/dlg.php:43
-#: classes/dlg.php:162
-#: classes/dlg.php:185
-#: classes/dlg.php:222
-#: classes/dlg.php:506
-#: classes/dlg.php:541
-#: classes/dlg.php:572
-#: classes/dlg.php:606
-#: classes/dlg.php:618
+#: include/functions.php:3241
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
-#: classes/pref/users.php:106
-#: classes/pref/filters.php:111
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
-#: plugins/import_export/init.php:409
-#: plugins/import_export/init.php:432
-#: plugins/googlereaderimport/init.php:164
-#: plugins/share/init.php:67
-#: plugins/updater/init.php:357
+#: classes/pref/users.php:95
+#: classes/pref/filters.php:145
+#: classes/pref/prefs.php:1096
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1694
+#: plugins/import_export/init.php:407
+#: plugins/import_export/init.php:452
+#: plugins/googlereaderimport/init.php:193
+#: plugins/share/init.php:65
+#: plugins/updater/init.php:368
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: include/functions.php:3417
+#: include/functions.php:3432
 #, fuzzy
 msgid "(edit note)"
 msgstr "ノートの編集"
 
-#: include/functions.php:3650
+#: include/functions.php:3667
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: include/functions.php:3706
+#: include/functions.php:3723
 #, fuzzy
 msgid "Attachments"
 msgstr "添付:"
 
-#: include/localized_schema.php:3
-msgid "Title"
-msgstr "題名"
-
-#: include/localized_schema.php:4
-msgid "Title or Content"
-msgstr "題名か内容"
+#: include/functions.php:4222
+#, php-format
+msgid "LibXML error %s at line %d (column %d): %s"
+msgstr ""
 
-#: include/localized_schema.php:5
-msgid "Link"
-msgstr "リンク"
+#: include/login_form.php:183
+#: classes/handler/public.php:475
+#: classes/handler/public.php:758
+msgid "Login:"
+msgstr "ログイン:"
 
-#: include/localized_schema.php:6
-msgid "Content"
-msgstr "内容"
+#: include/login_form.php:194
+#: classes/handler/public.php:478
+msgid "Password:"
+msgstr "パスワード:"
 
-#: include/localized_schema.php:7
-msgid "Article Date"
-msgstr "記事の日付"
+#: include/login_form.php:199
+#, fuzzy
+msgid "I forgot my password"
+msgstr "ユーザー名かパスワードが正しくありません"
 
-#: include/localized_schema.php:9
+#: include/login_form.php:205
 #, fuzzy
-msgid "Delete article"
-msgstr "記事を消去する"
+msgid "Profile:"
+msgstr "ファイル:"
 
-#: include/localized_schema.php:11
-msgid "Set starred"
-msgstr "お気に入りに設定する"
+#: include/login_form.php:209
+#: classes/handler/public.php:233
+#: classes/rpc.php:63
+#: classes/pref/prefs.php:1034
+#, fuzzy
+msgid "Default profile"
+msgstr "標準の記事制限"
 
-#: include/localized_schema.php:12
-#: js/viewfeed.js:483
-#: plugins/digest/digest.js:265
-#: plugins/digest/digest.js:754
-msgid "Publish article"
-msgstr "公開記事"
+#: include/login_form.php:217
+msgid "Use less traffic"
+msgstr ""
 
-#: include/localized_schema.php:13
-msgid "Assign tags"
-msgstr "タグの割り当て"
-
-#: include/localized_schema.php:14
-#: js/viewfeed.js:1990
-msgid "Assign label"
-msgstr "ラベルの割り当て"
-
-#: include/localized_schema.php:15
-msgid "Modify score"
-msgstr "スコアを変更する"
-
-#: include/localized_schema.php:17
-msgid "General"
-msgstr "全体"
-
-#: include/localized_schema.php:18
-msgid "Interface"
-msgstr "インターフェース"
-
-#: include/localized_schema.php:19
-msgid "Advanced"
-msgstr "高度"
-
-#: include/localized_schema.php:21
-msgid "This option is useful when you are reading several planet-type aggregators with partially colliding userbase. When disabled, it forces same posts from different feeds to appear only once."
-msgstr ""
-
-#: include/localized_schema.php:22
-msgid "Display expanded list of feed articles, instead of separate displays for headlines and article content"
-msgstr ""
-
-#: include/localized_schema.php:23
-msgid "Automatically open next feed with unread articles after marking one as read"
-msgstr ""
-
-#: include/localized_schema.php:24
-msgid "This option enables sending daily digest of new (and unread) headlines on your configured e-mail address"
-msgstr ""
-
-#: include/localized_schema.php:25
-msgid "This option enables marking articles as read automatically while you scroll article list."
-msgstr ""
-
-#: include/localized_schema.php:26
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr ""
-
-#: include/localized_schema.php:27
-msgid "When auto-detecting tags in articles these tags will not be applied (comma-separated list)."
-msgstr ""
-
-#: include/localized_schema.php:28
-msgid "When this option is enabled, headlines in Special feeds and Labels are grouped by feeds"
-msgstr ""
-
-#: include/localized_schema.php:29
-msgid "Customize CSS stylesheet to your liking"
-msgstr ""
-
-#: include/localized_schema.php:30
-msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr ""
-
-#: include/localized_schema.php:31
-msgid "Click to register your SSL client certificate with tt-rss"
-msgstr ""
-
-#: include/localized_schema.php:32
-msgid "Uses UTC timezone"
-msgstr ""
-
-#: include/localized_schema.php:33
-msgid "Select one of the available CSS themes"
-msgstr ""
-
-#: include/localized_schema.php:34
-#, fuzzy
-msgid "Purge articles after this number of days (0 - disables)"
-msgstr "この日数よりあとの古い投稿を削除する (0 は無効です)"
-
-#: include/localized_schema.php:35
-#, fuzzy
-msgid "Default interval between feed updates"
-msgstr "フィードの更新までの標準間隔 (単位:分)"
-
-#: include/localized_schema.php:36
-#, fuzzy
-msgid "Amount of articles to display at once"
-msgstr "表示する記事が見つかりません。"
-
-#: include/localized_schema.php:37
-msgid "Allow duplicate posts"
-msgstr "複製投稿の許可"
-
-#: include/localized_schema.php:38
-msgid "Enable feed categories"
-msgstr "フィードカテゴリーを有効にする"
-
-#: include/localized_schema.php:39
-msgid "Show content preview in headlines list"
-msgstr "ヘッドライン一覧に内容のプレビューを表示する"
-
-#: include/localized_schema.php:40
-msgid "Short date format"
-msgstr "短い日付の形式"
-
-#: include/localized_schema.php:41
-msgid "Long date format"
-msgstr "完全な日付の形式"
-
-#: include/localized_schema.php:42
-msgid "Combined feed display"
-msgstr "フィード表示の組み合わせ"
-
-#: include/localized_schema.php:43
-#, fuzzy
-msgid "Hide feeds with no unread articles"
-msgstr "未読でないメッセージとフィードを隠す"
-
-#: include/localized_schema.php:44
-msgid "On catchup show next feed"
-msgstr "次のフィードの表示をキャッチアップする"
-
-#: include/localized_schema.php:45
-msgid "Sort feeds by unread articles count"
-msgstr "未読記事数によるフィードの並び替え"
-
-#: include/localized_schema.php:46
-#: plugins/mobile/prefs.php:60
-msgid "Reverse headline order (oldest first)"
-msgstr "ヘッドラインの逆順 (古いものが上)"
-
-#: include/localized_schema.php:47
-msgid "Enable e-mail digest"
-msgstr "電子メールでのダイジェストを有効にする"
-
-#: include/localized_schema.php:48
-msgid "Confirm marking feed as read"
-msgstr "既読としてフィードのマーキングについて確認する"
-
-#: include/localized_schema.php:49
-#, fuzzy
-msgid "Automatically mark articles as read"
-msgstr "組み合わせモードで記事を自動的に展開する"
-
-#: include/localized_schema.php:50
-msgid "Strip unsafe tags from articles"
-msgstr "記事から安全でないタグを取り除く"
-
-#: include/localized_schema.php:51
-msgid "Blacklisted tags"
-msgstr "ブラックリスト化したタグ"
-
-#: include/localized_schema.php:52
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "新規記事としての取り扱い期限 (単位: 時間)"
-
-#: include/localized_schema.php:53
-msgid "Mark articles in e-mail digest as read"
-msgstr "既読として電子メールのダイジェストに含まれる記事を設定する"
-
-#: include/localized_schema.php:54
-msgid "Automatically expand articles in combined mode"
-msgstr "組み合わせモードで記事を自動的に展開する"
-
-#: include/localized_schema.php:55
-msgid "Purge unread articles"
-msgstr "未読記事を削除する"
-
-#: include/localized_schema.php:56
-msgid "Show special feeds when hiding read feeds"
-msgstr ""
-
-#: include/localized_schema.php:57
-msgid "Group headlines in virtual feeds"
-msgstr "仮想フィードのグループヘッドライン"
-
-#: include/localized_schema.php:58
-#, fuzzy
-msgid "Do not embed images in articles"
-msgstr "記事内に画像を表示しない"
-
-#: include/localized_schema.php:59
-msgid "Enable external API"
-msgstr ""
-
-#: include/localized_schema.php:60
-msgid "User timezone"
-msgstr ""
-
-#: include/localized_schema.php:61
-#: js/prefs.js:1719
-#, fuzzy
-msgid "Customize stylesheet"
-msgstr "ユーザースタイルシートの URL"
-
-#: include/localized_schema.php:62
-#, fuzzy
-msgid "Sort headlines by feed date"
-msgstr "未読記事数によるフィードの並び替え"
-
-#: include/localized_schema.php:63
-msgid "Login with an SSL certificate"
-msgstr ""
-
-#: include/localized_schema.php:64
-msgid "Try to send digests around specified time"
-msgstr ""
-
-#: include/localized_schema.php:65
-#, fuzzy
-msgid "Assign articles to labels automatically"
-msgstr "自動的に既読として記事をマークする"
-
-#: include/localized_schema.php:66
-msgid "Select theme"
-msgstr "テーマを選択する"
-
-#: include/login_form.php:183
-#: classes/handler/public.php:460
-#: classes/handler/public.php:748
-#: plugins/mobile/login_form.php:40
-msgid "Login:"
-msgstr "ログイン:"
-
-#: include/login_form.php:192
-#: classes/handler/public.php:463
-#: plugins/mobile/login_form.php:45
-msgid "Password:"
-msgstr "パスワード:"
-
-#: include/login_form.php:197
-#, fuzzy
-msgid "I forgot my password"
-msgstr "ユーザー名かパスワードが正しくありません"
-
-#: include/login_form.php:201
-#: classes/handler/public.php:466
-msgid "Language:"
-msgstr "言語:"
-
-#: include/login_form.php:209
-#, fuzzy
-msgid "Profile:"
-msgstr "ファイル:"
-
-#: include/login_form.php:213
-#: classes/handler/public.php:210
-#: classes/rpc.php:64
-#: classes/dlg.php:98
-#, fuzzy
-msgid "Default profile"
-msgstr "標準の記事制限"
-
-#: include/login_form.php:221
-msgid "Use less traffic"
-msgstr ""
+#: include/login_form.php:221
+msgid "Does not display images in articles, reduces automatic refreshes."
+msgstr ""
 
 #: include/login_form.php:229
 msgid "Remember me"
 msgstr ""
 
 #: include/login_form.php:235
-#: classes/handler/public.php:476
-#: plugins/mobile/login_form.php:28
+#: classes/handler/public.php:483
 msgid "Log in"
 msgstr "ログイン"
 
+#: include/sessions.php:61
+msgid "Session failed to validate (incorrect IP)"
+msgstr "セッションの検査に失敗しました (IP が正しくない)"
+
 #: classes/article.php:25
 #, fuzzy
 msgid "Article not found."
 msgstr "フィードが見つかりません。"
 
-#: classes/handler/public.php:401
-#: plugins/bookmarklets/init.php:38
+#: classes/article.php:179
+msgid "Tags for this article (separated by commas):"
+msgstr "この記事のタグ (カンマで区切ります):"
+
+#: classes/article.php:204
+#: classes/pref/users.php:172
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:403
+#: classes/pref/prefs.php:980
+#: classes/pref/feeds.php:762
+#: classes/pref/feeds.php:910
+#: plugins/nsfw/init.php:83
+#: plugins/note/init.php:51
+#: plugins/instances/init.php:245
+msgid "Save"
+msgstr "保存"
+
+#: classes/article.php:206
+#: classes/handler/public.php:452
+#: classes/handler/public.php:486
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
+#: classes/pref/users.php:174
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:406
+#: classes/pref/filters.php:801
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:944
+#: classes/pref/prefs.php:982
+#: classes/pref/feeds.php:763
+#: classes/pref/feeds.php:913
+#: classes/pref/feeds.php:1834
+#: plugins/mail/init.php:124
+#: plugins/note/init.php:53
+#: plugins/instances/init.php:248
+#: plugins/instances/init.php:436
+msgid "Cancel"
+msgstr "取り消し"
+
+#: classes/handler/public.php:416
+#: plugins/bookmarklets/init.php:40
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: classes/handler/public.php:409
+#: classes/handler/public.php:424
 msgid "Title:"
 msgstr "題名:"
 
-#: classes/handler/public.php:411
-#: classes/dlg.php:663
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
-#: plugins/instances/init.php:215
+#: classes/handler/public.php:426
+#: classes/pref/feeds.php:557
+#: classes/pref/feeds.php:798
+#: plugins/instances/init.php:212
+#: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:413
+#: classes/handler/public.php:428
 #, fuzzy
 msgid "Content:"
 msgstr "内容"
 
-#: classes/handler/public.php:415
+#: classes/handler/public.php:430
 #, fuzzy
 msgid "Labels:"
 msgstr "ラベル"
 
-#: classes/handler/public.php:434
+#: classes/handler/public.php:449
 msgid "Shared article will appear in the Published feed."
 msgstr "共有した記事は発行したフィードに表示されます"
 
-#: classes/handler/public.php:436
+#: classes/handler/public.php:451
 msgid "Share"
 msgstr "共有"
 
-#: classes/handler/public.php:437
-#: classes/handler/public.php:479
-#: classes/dlg.php:296
-#: classes/dlg.php:348
-#: classes/dlg.php:408
-#: classes/dlg.php:439
-#: classes/dlg.php:648
-#: classes/dlg.php:698
-#: classes/dlg.php:747
-#: classes/pref/users.php:194
-#: classes/pref/labels.php:81
-#: classes/pref/filters.php:363
-#: classes/pref/filters.php:746
-#: classes/pref/filters.php:822
-#: classes/pref/filters.php:889
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
-#: plugins/mail/init.php:131
-#: plugins/note/init.php:55
-#: plugins/instances/init.php:251
-msgid "Cancel"
-msgstr "取り消し"
-
-#: classes/handler/public.php:458
+#: classes/handler/public.php:473
 #, fuzzy
 msgid "Not logged in"
 msgstr "ログインしていません"
 
-#: classes/handler/public.php:525
+#: classes/handler/public.php:532
 msgid "Incorrect username or password"
 msgstr "ユーザー名かパスワードが正しくありません"
 
-#: classes/handler/public.php:561
-#: classes/handler/public.php:658
+#: classes/handler/public.php:568
+#: classes/handler/public.php:666
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: classes/handler/public.php:564
-#: classes/handler/public.php:649
+#: classes/handler/public.php:571
+#: classes/handler/public.php:657
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> を購読しました。"
 
-#: classes/handler/public.php:567
-#: classes/handler/public.php:652
+#: classes/handler/public.php:574
+#: classes/handler/public.php:660
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: classes/handler/public.php:570
-#: classes/handler/public.php:655
+#: classes/handler/public.php:577
+#: classes/handler/public.php:663
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "フィードがありません。"
 
-#: classes/handler/public.php:573
-#: classes/handler/public.php:661
+#: classes/handler/public.php:580
+#: classes/handler/public.php:669
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "公開フィードの URL を変更しました。"
 
-#: classes/handler/public.php:577
-#: classes/handler/public.php:666
+#: classes/handler/public.php:584
+#: classes/handler/public.php:676
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: classes/handler/public.php:595
-#: classes/handler/public.php:684
+#: classes/handler/public.php:602
+#: classes/handler/public.php:694
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: classes/handler/public.php:620
-#: classes/handler/public.php:708
+#: classes/handler/public.php:627
+#: classes/handler/public.php:718
 msgid "Edit subscription options"
 msgstr "購読オプションの編集"
 
-#: classes/handler/public.php:735
+#: classes/handler/public.php:745
 #, fuzzy
 msgid "Password recovery"
 msgstr "パスワード:"
 
-#: classes/handler/public.php:741
+#: classes/handler/public.php:751
 msgid "You will need to provide valid account name and email. New password will be sent on your email address."
 msgstr ""
 
-#: classes/handler/public.php:763
-#: classes/pref/users.php:378
+#: classes/handler/public.php:773
+#: classes/pref/users.php:356
 msgid "Reset password"
 msgstr "パスワードのリセット"
 
-#: classes/handler/public.php:773
+#: classes/handler/public.php:783
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "いくつかの必須項目が入力されていないか、正しくありません"
 
-#: classes/handler/public.php:777
-#: classes/handler/public.php:803
-#: plugins/digest/digest_body.php:69
+#: classes/handler/public.php:787
+#: classes/handler/public.php:813
 #, fuzzy
 msgid "Go back"
 msgstr "戻る"
 
-#: classes/handler/public.php:799
+#: classes/handler/public.php:809
 msgid "Sorry, login and email combination not found."
 msgstr "ログイン名とメールアドレスの組み合わせが組み合わせが見つかりませんでした"
 
-#: classes/dlg.php:22
-msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
-msgstr ""
-
-#: classes/dlg.php:55
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:234
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:597
-#: classes/pref/filters.php:676
-#: classes/pref/filters.php:703
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-#, fuzzy
-msgid "Select"
-msgstr "選択:"
-
-#: classes/dlg.php:58
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:237
-#: classes/pref/filters.php:285
-#: classes/pref/filters.php:600
-#: classes/pref/filters.php:679
-#: classes/pref/filters.php:706
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "すべて"
-
-#: classes/dlg.php:60
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:287
-#: classes/pref/filters.php:602
-#: classes/pref/filters.php:681
-#: classes/pref/filters.php:708
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "なし"
-
-#: classes/dlg.php:69
-#, fuzzy
-msgid "Create profile"
-msgstr "フィルターを作成する"
-
-#: classes/dlg.php:92
-#: classes/dlg.php:122
-msgid "(active)"
-msgstr "(有効)"
+#: classes/handler/public.php:829
+msgid "Your access level is insufficient to run this script."
+msgstr "このスクリプトを実行するにはアクセスレベルが不十分です。"
 
-#: classes/dlg.php:156
-#, fuzzy
-msgid "Remove selected profiles"
-msgstr "選択されたプロファイルを削除しますか?"
+#: classes/handler/public.php:853
+msgid "Database Updater"
+msgstr "データベースアップデーター"
 
-#: classes/dlg.php:158
-#, fuzzy
-msgid "Activate profile"
-msgstr "プロファイルを有効にする"
+#: classes/handler/public.php:918
+msgid "Perform updates"
+msgstr "更新の実行"
 
-#: classes/dlg.php:168
-msgid "Public OPML URL"
+#: classes/dlg.php:16
+msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:173
+#: classes/dlg.php:48
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "公開記事フィードへのリンクです。"
 
-#: classes/dlg.php:182
-#: classes/dlg.php:569
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 #, fuzzy
 msgid "Generate new URL"
 msgstr "生成したフィード"
 
-#: classes/dlg.php:194
-msgid "Notice"
-msgstr "通知"
-
-#: classes/dlg.php:200
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:204
-#: classes/dlg.php:213
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "最終更新:"
 
-#: classes/dlg.php:209
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:234
-#: classes/dlg.php:242
-#, fuzzy
-msgid "Feed or site URL"
-msgstr "フィード"
-
-#: classes/dlg.php:248
-#: classes/dlg.php:711
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "カテゴリーの場所:"
-
-#: classes/dlg.php:256
-#, fuzzy
-msgid "Available feeds"
-msgstr "すべてのフィード"
-
-#: classes/dlg.php:268
-#: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
-msgid "Authentication"
-msgstr "認証"
-
-#: classes/dlg.php:272
-#: classes/dlg.php:725
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "ログイン"
-
-#: classes/dlg.php:275
-#: classes/dlg.php:728
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-#, fuzzy
-msgid "Password"
-msgstr "パスワード:"
-
-#: classes/dlg.php:285
-msgid "This feed requires authentication."
-msgstr "このフィードは認証を要求します。"
-
-#: classes/dlg.php:290
-#: classes/dlg.php:346
-#: classes/dlg.php:746
-msgid "Subscribe"
-msgstr "購読"
-
-#: classes/dlg.php:293
-#, fuzzy
-msgid "More feeds"
-msgstr "さらなるフィード"
-
-#: classes/dlg.php:316
-#: classes/dlg.php:407
-#: classes/pref/users.php:350
-#: classes/pref/filters.php:593
-#: classes/pref/feeds.php:1258
-#: js/tt-rss.js:170
-msgid "Search"
-msgstr "検索"
-
-#: classes/dlg.php:320
-#, fuzzy
-msgid "Popular feeds"
-msgstr "フィードの表示"
-
-#: classes/dlg.php:321
-#, fuzzy
-msgid "Feed archive"
-msgstr "フィード操作"
-
-#: classes/dlg.php:324
-#, fuzzy
-msgid "limit:"
-msgstr "制限:"
-
-#: classes/dlg.php:347
-#: classes/pref/users.php:376
-#: classes/pref/labels.php:284
-#: classes/pref/filters.php:353
-#: classes/pref/filters.php:615
-#: classes/pref/feeds.php:706
-#: plugins/instances/init.php:297
-msgid "Remove"
-msgstr "削除"
-
-#: classes/dlg.php:358
-msgid "Look for"
-msgstr ""
-
-#: classes/dlg.php:366
-msgid "Limit search to:"
-msgstr "対象範囲"
-
-#: classes/dlg.php:382
-msgid "This feed"
-msgstr "このフィード"
-
-#: classes/dlg.php:414
-msgid "Tags for this article (separated by commas):"
-msgstr "この記事のタグ (カンマで区切ります):"
-
-#: classes/dlg.php:437
-#: classes/dlg.php:646
-#: classes/pref/users.php:192
-#: classes/pref/labels.php:79
-#: classes/pref/filters.php:360
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
-#: plugins/nsfw/init.php:86
-#: plugins/note/init.php:53
-#: plugins/instances/init.php:248
-msgid "Save"
-msgstr "保存"
-
-#: classes/dlg.php:445
-#, fuzzy
-msgid "Tag Cloud"
-msgstr "タグクラウド"
-
-#: classes/dlg.php:514
-msgid "Select item(s) by tags"
-msgstr ""
-
-#: classes/dlg.php:517
+#: classes/dlg.php:166
 #, fuzzy
 msgid "Match:"
 msgstr "一致"
 
-#: classes/dlg.php:519
+#: classes/dlg.php:168
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:522
+#: classes/dlg.php:171
 #, fuzzy
 msgid "All tags."
 msgstr "タグがありません"
 
-#: classes/dlg.php:524
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:537
+#: classes/dlg.php:186
 #, fuzzy
 msgid "Display entries"
 msgstr "フィードの表示"
 
-#: classes/dlg.php:549
-#: classes/feeds.php:138
-#, fuzzy
-msgid "View as RSS"
-msgstr "タグを閲覧する"
-
-#: classes/dlg.php:560
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:589
-#: plugins/updater/init.php:327
+#: classes/dlg.php:233
+#: plugins/updater/init.php:331
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: classes/dlg.php:597
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr ""
 
-#: classes/dlg.php:601
-#: plugins/updater/init.php:331
+#: classes/dlg.php:245
+#: plugins/updater/init.php:335
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:603
+#: classes/dlg.php:247
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:611
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:631
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-
-#: classes/dlg.php:657
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr ""
-
-#: classes/dlg.php:666
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr ""
-
-#: classes/dlg.php:676
-#: plugins/instances/init.php:229
-#, fuzzy
-msgid "Access key:"
-msgstr "アクセスレベル: "
-
-#: classes/dlg.php:679
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-#, fuzzy
-msgid "Access key"
-msgstr "アクセスレベル"
-
-#: classes/dlg.php:683
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr ""
-
-#: classes/dlg.php:691
-#: plugins/instances/init.php:244
-#, fuzzy
-msgid "Generate new key"
-msgstr "生成したフィード"
-
-#: classes/dlg.php:695
-#, fuzzy
-msgid "Create link"
-msgstr "作成"
-
-#: classes/dlg.php:708
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/dlg.php:717
-msgid "Feeds to subscribe, One per line"
-msgstr ""
+#: classes/feeds.php:56
+#, fuzzy, php-format
+msgid "Last updated: %s"
+msgstr "最終更新:"
 
-#: classes/dlg.php:739
+#: classes/feeds.php:75
 #, fuzzy
-msgid "Feeds require authentication."
-msgstr "ã\81\93ã\81®ã\83\95ã\82£ã\83¼ã\83\89ã\81¯èª\8d証ã\82\92è¦\81æ±\82ã\81\97ã\81¾ã\81\99ã\80\82"
+msgid "View as RSS feed"
+msgstr "ã\83\95ã\82£ã\83¼ã\83\89ã\82\92é\96²è¦§ã\81\99ã\82\8b"
 
-#: classes/feeds.php:68
+#: classes/feeds.php:76
+#: classes/feeds.php:128
+#: classes/pref/feeds.php:1478
 #, fuzzy
-msgid "Visit the website"
-msgstr "ã\82ªã\83\95ã\82£ã\82·ã\83£ã\83«ã\82µã\82¤ã\83\88ã\81«è¨ªå\95\8fする"
+msgid "View as RSS"
+msgstr "ã\82¿ã\82°ã\82\92é\96²è¦§する"
 
 #: classes/feeds.php:83
-#, fuzzy
-msgid "View as RSS feed"
-msgstr "フィードを閲覧する"
-
-#: classes/feeds.php:91
 msgid "Select:"
 msgstr "選択:"
 
-#: classes/feeds.php:94
+#: classes/feeds.php:84
+#: classes/pref/users.php:341
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:280
+#: classes/pref/filters.php:328
+#: classes/pref/filters.php:646
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:994
+#: classes/pref/feeds.php:1310
+#: classes/pref/feeds.php:1575
+#: classes/pref/feeds.php:1641
+#: plugins/instances/init.php:287
+msgid "All"
+msgstr "すべて"
+
+#: classes/feeds.php:86
 msgid "Invert"
 msgstr "反転"
 
-#: classes/feeds.php:101
+#: classes/feeds.php:87
+#: classes/pref/users.php:343
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:736
+#: classes/pref/filters.php:763
+#: classes/pref/prefs.php:996
+#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1643
+#: plugins/instances/init.php:289
+msgid "None"
+msgstr "なし"
+
+#: classes/feeds.php:93
 #, fuzzy
 msgid "More..."
 msgstr "ヘルプを読み込んでいます..."
 
-#: classes/feeds.php:103
+#: classes/feeds.php:95
 msgid "Selection toggle:"
 msgstr "選択の切り替え:"
 
-#: classes/feeds.php:109
+#: classes/feeds.php:101
 msgid "Selection:"
 msgstr "選択:"
 
-#: classes/feeds.php:112
+#: classes/feeds.php:104
 #, fuzzy
 msgid "Set score"
 msgstr "スコア"
 
-#: classes/feeds.php:115
+#: classes/feeds.php:107
 #, fuzzy
 msgid "Archive"
 msgstr "記事の日付"
 
-#: classes/feeds.php:117
+#: classes/feeds.php:109
 #, fuzzy
 msgid "Move back"
 msgstr "戻る"
 
-#: classes/feeds.php:118
-#: classes/pref/filters.php:246
-#: classes/pref/filters.php:294
-#: classes/pref/filters.php:688
-#: classes/pref/filters.php:715
+#: classes/feeds.php:110
+#: classes/pref/filters.php:289
+#: classes/pref/filters.php:337
+#: classes/pref/filters.php:743
+#: classes/pref/filters.php:770
 #, fuzzy
 msgid "Delete"
 msgstr "標準"
 
-#: classes/feeds.php:125
-#: classes/feeds.php:130
-#: plugins/mailto/init.php:28
-#: plugins/mail/init.php:28
+#: classes/feeds.php:115
+#: classes/feeds.php:120
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:26
 #, fuzzy
 msgid "Forward by email"
 msgstr "記事をお気に入りにする"
 
-#: classes/feeds.php:134
+#: classes/feeds.php:124
 msgid "Feed:"
 msgstr "フィード:"
 
-#: classes/feeds.php:201
-#: classes/feeds.php:827
+#: classes/feeds.php:197
+#: classes/feeds.php:824
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: classes/feeds.php:384
+#: classes/feeds.php:254
+#, fuzzy
+msgid "Never"
+msgstr "ずっと削除しない"
+
+#: classes/feeds.php:360
 #, fuzzy, php-format
 msgid "Imported at %s"
 msgstr "インポート"
 
-#: classes/feeds.php:531
+#: classes/feeds.php:520
 msgid "mark as read"
 msgstr "既読にする"
 
-#: classes/feeds.php:582
+#: classes/feeds.php:570
+#, fuzzy
+msgid "Collapse article"
+msgstr "記事を消去する"
+
+#: classes/feeds.php:725
+msgid "No unread articles found to display."
+msgstr "表示する未読記事が見つかりませんでした。"
+
+#: classes/feeds.php:728
+msgid "No updated articles found to display."
+msgstr "表示する更新された記事が見つかりませんでした。"
+
+#: classes/feeds.php:731
+msgid "No starred articles found to display."
+msgstr "表示するお気に入りの記事が見つかりませんでした。"
+
+#: classes/feeds.php:735
+#, fuzzy
+msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
+msgstr "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メニューを参照します)、フィルターを使うことができます。"
+
+#: classes/feeds.php:737
+msgid "No articles found to display."
+msgstr "表示する記事が見つかりません。"
+
+#: classes/feeds.php:752
+#: classes/feeds.php:919
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr ""
+
+#: classes/feeds.php:762
+#: classes/feeds.php:929
+msgid "Some feeds have update errors (click for details)"
+msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
+
+#: classes/feeds.php:909
+msgid "No feed selected."
+msgstr "フィードは選択されていません。"
+
+#: classes/feeds.php:962
+#: classes/feeds.php:970
+#, fuzzy
+msgid "Feed or site URL"
+msgstr "フィード"
+
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:579
+#: classes/pref/feeds.php:811
+#: classes/pref/feeds.php:1798
+msgid "Place in category:"
+msgstr "カテゴリーの場所:"
+
+#: classes/feeds.php:984
+#, fuzzy
+msgid "Available feeds"
+msgstr "すべてのフィード"
+
+#: classes/feeds.php:996
+#: classes/pref/users.php:135
+#: classes/pref/feeds.php:609
+#: classes/pref/feeds.php:847
+msgid "Authentication"
+msgstr "認証"
+
+#: classes/feeds.php:1000
+#: classes/pref/users.php:398
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:851
+#: classes/pref/feeds.php:1812
+msgid "Login"
+msgstr "ログイン"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:260
+#: classes/pref/feeds.php:628
+#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:1815
+#, fuzzy
+msgid "Password"
+msgstr "パスワード:"
+
+#: classes/feeds.php:1013
+msgid "This feed requires authentication."
+msgstr "このフィードは認証を要求します。"
+
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1833
+msgid "Subscribe"
+msgstr "購読"
+
+#: classes/feeds.php:1021
 #, fuzzy
-msgid "Collapse article"
-msgstr "記事を消去する"
+msgid "More feeds"
+msgstr "さらなるフィード"
 
-#: classes/feeds.php:728
-msgid "No unread articles found to display."
-msgstr "表示する未読記事が見つかりませんでした。"
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
+#: classes/pref/users.php:328
+#: classes/pref/filters.php:639
+#: classes/pref/feeds.php:1303
+#: js/tt-rss.js:174
+msgid "Search"
+msgstr "検索"
 
-#: classes/feeds.php:731
-msgid "No updated articles found to display."
-msgstr "表示する更新された記事が見つかりませんでした。"
+#: classes/feeds.php:1048
+#, fuzzy
+msgid "Popular feeds"
+msgstr "フィードの表示"
 
-#: classes/feeds.php:734
-msgid "No starred articles found to display."
-msgstr "表示するお気に入りの記事が見つかりませんでした。"
+#: classes/feeds.php:1049
+#, fuzzy
+msgid "Feed archive"
+msgstr "フィード操作"
 
-#: classes/feeds.php:738
-msgid "No articles found to display. You can assign articles to labels manually (see the Actions menu above) or use a filter."
-msgstr "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メニューを参照します)、フィルターを使うことができます。"
+#: classes/feeds.php:1052
+#, fuzzy
+msgid "limit:"
+msgstr "制限:"
 
-#: classes/feeds.php:740
-msgid "No articles found to display."
-msgstr "表示する記事が見つかりません。"
+#: classes/feeds.php:1075
+#: classes/pref/users.php:354
+#: classes/pref/labels.php:284
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:665
+#: classes/pref/feeds.php:733
+#: plugins/instances/init.php:294
+msgid "Remove"
+msgstr "削除"
 
-#: classes/feeds.php:755
-#: classes/feeds.php:920
-#, php-format
-msgid "Feeds last updated at %s"
+#: classes/feeds.php:1086
+msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:765
-#: classes/feeds.php:930
-msgid "Some feeds have update errors (click for details)"
-msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
+#: classes/feeds.php:1094
+msgid "Limit search to:"
+msgstr "対象範囲"
 
-#: classes/feeds.php:910
-msgid "No feed selected."
-msgstr "ã\83\95ã\82£ã\83¼ã\83\89ã\81¯é\81¸æ\8a\9eã\81\95ã\82\8cã\81¦ã\81\84ã\81¾ã\81\9bã\82\93ã\80\82"
+#: classes/feeds.php:1110
+msgid "This feed"
+msgstr "ã\81\93ã\81®ã\83\95ã\82£ã\83¼ã\83\89"
 
 #: classes/backend.php:33
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
@@ -1962,919 +1524,1170 @@ msgstr "フィードを追加しています..."
 msgid "Processing category: %s"
 msgstr "カテゴリーの場所:"
 
-#: classes/opml.php:468
+#: classes/opml.php:465
+#: plugins/import_export/init.php:420
+#: plugins/googlereaderimport/init.php:66
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:479
+#: plugins/import_export/init.php:434
+#: plugins/googlereaderimport/init.php:80
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "エラー: OPML ファイルをアップロードしてください。"
+
+#: classes/opml.php:483
+#: plugins/import_export/init.php:438
+#: plugins/googlereaderimport/init.php:84
 msgid "Error: please upload OPML file."
 msgstr "エラー: OPML ファイルをアップロードしてください。"
 
-#: classes/opml.php:475
-#: plugins/googlereaderimport/init.php:157
+#: classes/opml.php:492
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "エラー: OPML ファイルをアップロードしてください。"
+
+#: classes/opml.php:499
+#: plugins/googlereaderimport/init.php:186
 msgid "Error while parsing document."
 msgstr "ドキュメントの解析中のエラーです。"
 
 #: classes/pref/users.php:6
-#: plugins/instances/init.php:157
+#: classes/pref/system.php:8
+#: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "このタブを開くにはアクセスレベルが不十分です。"
 
-#: classes/pref/users.php:27
-msgid "User details"
-msgstr "ユーザーの詳細"
-
-#: classes/pref/users.php:41
+#: classes/pref/users.php:34
 msgid "User not found"
 msgstr "ユーザーが見つかりません"
 
-#: classes/pref/users.php:60
-#: classes/pref/users.php:422
+#: classes/pref/users.php:53
+#: classes/pref/users.php:400
 msgid "Registered"
 msgstr "登録済み"
 
-#: classes/pref/users.php:61
+#: classes/pref/users.php:54
 msgid "Last logged in"
 msgstr "最終ログイン"
 
-#: classes/pref/users.php:68
+#: classes/pref/users.php:61
 msgid "Subscribed feeds count"
 msgstr "購読フィード数"
 
-#: classes/pref/users.php:72
+#: classes/pref/users.php:65
 msgid "Subscribed feeds"
 msgstr "購読したフィード"
 
-#: classes/pref/users.php:122
-msgid "User Editor"
-msgstr "ユーザーエディター"
-
-#: classes/pref/users.php:158
+#: classes/pref/users.php:138
 msgid "Access level: "
 msgstr "アクセスレベル: "
 
-#: classes/pref/users.php:171
+#: classes/pref/users.php:151
 msgid "Change password to"
 msgstr "次のパスワードに変更する:"
 
-#: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/users.php:157
+#: classes/pref/feeds.php:636
+#: classes/pref/feeds.php:863
 msgid "Options"
 msgstr "オプション"
 
-#: classes/pref/users.php:180
+#: classes/pref/users.php:160
 msgid "E-mail: "
 msgstr "電子メール: "
 
-#: classes/pref/users.php:258
+#: classes/pref/users.php:236
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "ユーザー名 <b>%s</b> とパスワード <b>%s</b> で追加しました"
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:243
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "ユーザー <b>%s</b> の追加中です。"
 
-#: classes/pref/users.php:269
+#: classes/pref/users.php:247
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "ユーザー <b>%s</b> は既に存在します。"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:269
 #, fuzzy, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 "ユーザー <b>%s</b> のパスワードを\n"
 "                                        <b>%s</b>に変更しました"
 
-#: classes/pref/users.php:293
+#: classes/pref/users.php:271
 #, fuzzy, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 "ユーザー <b>%s</b> のパスワードを\n"
 "                                        <b>%s</b>に変更しました"
 
-#: classes/pref/users.php:317
+#: classes/pref/users.php:295
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] パスワード変更通知"
 
-#: classes/pref/users.php:368
+#: classes/pref/users.php:338
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:277
+#: classes/pref/filters.php:325
+#: classes/pref/filters.php:643
+#: classes/pref/filters.php:731
+#: classes/pref/filters.php:758
+#: classes/pref/prefs.php:991
+#: classes/pref/feeds.php:1307
+#: classes/pref/feeds.php:1572
+#: classes/pref/feeds.php:1638
+#: plugins/instances/init.php:284
+#, fuzzy
+msgid "Select"
+msgstr "選択:"
+
+#: classes/pref/users.php:346
 msgid "Create user"
 msgstr "ユーザーの作成"
 
-#: classes/pref/users.php:372
+#: classes/pref/users.php:350
 #, fuzzy
 msgid "Details"
 msgstr "毎日"
 
-#: classes/pref/users.php:374
-#: classes/pref/filters.php:612
-#: plugins/instances/init.php:296
+#: classes/pref/users.php:352
+#: classes/pref/filters.php:658
+#: plugins/instances/init.php:293
 msgid "Edit"
 msgstr "編集"
 
-#: classes/pref/users.php:421
+#: classes/pref/users.php:399
 msgid "Access Level"
 msgstr "アクセスレベル"
 
-#: classes/pref/users.php:423
+#: classes/pref/users.php:401
 msgid "Last login"
 msgstr "最終ログイン"
 
-#: classes/pref/users.php:444
-#: plugins/instances/init.php:337
+#: classes/pref/users.php:420
+#: plugins/instances/init.php:334
 msgid "Click to edit"
 msgstr "編集するにはクリック"
 
-#: classes/pref/users.php:464
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "ユーザーが定義されていません。"
 
-#: classes/pref/users.php:466
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "ユーザーが見つかりません。"
 
-#: classes/pref/labels.php:22
-msgid "Caption"
-msgstr "キャプション"
+#: classes/pref/labels.php:22
+#: classes/pref/filters.php:266
+#: classes/pref/filters.php:722
+msgid "Caption"
+msgstr "キャプション"
+
+#: classes/pref/labels.php:37
+#, fuzzy
+msgid "Colors"
+msgstr "閉じる"
+
+#: classes/pref/labels.php:42
+#, fuzzy
+msgid "Foreground:"
+msgstr "前景色"
+
+#: classes/pref/labels.php:42
+#, fuzzy
+msgid "Background:"
+msgstr "背景色"
+
+#: classes/pref/labels.php:232
+#, php-format
+msgid "Created label <b>%s</b>"
+msgstr "ラベル <b>%s</b> を作成しました"
+
+#: classes/pref/labels.php:287
+msgid "Clear colors"
+msgstr "色の消去"
+
+#: classes/pref/filters.php:94
+#, fuzzy
+msgid "Articles matching this filter:"
+msgstr "一致するフィルターが見つかりません。"
+
+#: classes/pref/filters.php:131
+#, fuzzy
+msgid "No recent articles matching this filter have been found."
+msgstr "一致するフィルターが見つかりません。"
+
+#: classes/pref/filters.php:135
+msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
+msgstr ""
+
+#: classes/pref/filters.php:272
+#: classes/pref/filters.php:726
+#: classes/pref/filters.php:841
+msgid "Match"
+msgstr "一致"
+
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:334
+#: classes/pref/filters.php:740
+#: classes/pref/filters.php:767
+msgid "Add"
+msgstr "追加"
+
+#: classes/pref/filters.php:320
+#: classes/pref/filters.php:753
+#, fuzzy
+msgid "Apply actions"
+msgstr "フィード操作"
+
+#: classes/pref/filters.php:370
+#: classes/pref/filters.php:782
+msgid "Enabled"
+msgstr "有効にする"
+
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:785
+#, fuzzy
+msgid "Match any rule"
+msgstr "一致したすべての未読記事:"
+
+#: classes/pref/filters.php:388
+#: classes/pref/filters.php:788
+#, fuzzy
+msgid "Inverse matching"
+msgstr "一致しない"
+
+#: classes/pref/filters.php:400
+#: classes/pref/filters.php:795
+msgid "Test"
+msgstr "テスト"
+
+#: classes/pref/filters.php:433
+#, fuzzy
+msgid "(inverse)"
+msgstr "反転"
+
+#: classes/pref/filters.php:432
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:655
+msgid "Combine"
+msgstr ""
+
+#: classes/pref/filters.php:661
+#: classes/pref/feeds.php:1323
+#: classes/pref/feeds.php:1337
+#, fuzzy
+msgid "Reset sort order"
+msgstr "パスワードのリセット"
+
+#: classes/pref/filters.php:669
+#: classes/pref/feeds.php:1359
+msgid "Rescore articles"
+msgstr "記事のスコアの再集計"
+
+#: classes/pref/filters.php:798
+msgid "Create"
+msgstr "作成"
+
+#: classes/pref/filters.php:853
+msgid "Inverse regular expression matching"
+msgstr ""
+
+#: classes/pref/filters.php:855
+#, fuzzy
+msgid "on field"
+msgstr "項目"
+
+#: classes/pref/filters.php:861
+#: js/PrefFilterTree.js:45
+msgid "in"
+msgstr ""
+
+#: classes/pref/filters.php:874
+#, fuzzy
+msgid "Save rule"
+msgstr "保存"
+
+#: classes/pref/filters.php:874
+#: js/functions.js:1013
+#, fuzzy
+msgid "Add rule"
+msgstr "フィードカテゴリーを追加しています..."
+
+#: classes/pref/filters.php:897
+msgid "Perform Action"
+msgstr "操作の実行"
+
+#: classes/pref/filters.php:923
+msgid "with parameters:"
+msgstr "パラメーター:"
+
+#: classes/pref/filters.php:941
+#, fuzzy
+msgid "Save action"
+msgstr "パネル操作"
+
+#: classes/pref/filters.php:941
+#: js/functions.js:1039
+#, fuzzy
+msgid "Add action"
+msgstr "フィード操作"
+
+#: classes/pref/filters.php:964
+msgid "[No caption]"
+msgstr "[キャプションなし]"
+
+#: classes/pref/prefs.php:18
+msgid "General"
+msgstr "全体"
+
+#: classes/pref/prefs.php:19
+msgid "Interface"
+msgstr "インターフェース"
+
+#: classes/pref/prefs.php:20
+msgid "Advanced"
+msgstr "高度"
+
+#: classes/pref/prefs.php:21
+msgid "Digest"
+msgstr ""
+
+#: classes/pref/prefs.php:25
+#, fuzzy
+msgid "Allow duplicate articles"
+msgstr "複製投稿の許可"
+
+#: classes/pref/prefs.php:26
+#, fuzzy
+msgid "Assign articles to labels automatically"
+msgstr "自動的に既読として記事をマークする"
+
+#: classes/pref/prefs.php:27
+msgid "Blacklisted tags"
+msgstr "ブラックリスト化したタグ"
+
+#: classes/pref/prefs.php:27
+msgid "When auto-detecting tags in articles these tags will not be applied (comma-separated list)."
+msgstr ""
+
+#: classes/pref/prefs.php:28
+#, fuzzy
+msgid "Automatically mark articles as read"
+msgstr "組み合わせモードで記事を自動的に展開する"
+
+#: classes/pref/prefs.php:28
+msgid "This option enables marking articles as read automatically while you scroll article list."
+msgstr ""
+
+#: classes/pref/prefs.php:29
+msgid "Automatically expand articles in combined mode"
+msgstr "組み合わせモードで記事を自動的に展開する"
+
+#: classes/pref/prefs.php:30
+msgid "Combined feed display"
+msgstr "フィード表示の組み合わせ"
+
+#: classes/pref/prefs.php:30
+msgid "Display expanded list of feed articles, instead of separate displays for headlines and article content"
+msgstr ""
+
+#: classes/pref/prefs.php:31
+msgid "Confirm marking feed as read"
+msgstr "既読としてフィードのマーキングについて確認する"
+
+#: classes/pref/prefs.php:32
+#, fuzzy
+msgid "Amount of articles to display at once"
+msgstr "表示する記事が見つかりません。"
+
+#: classes/pref/prefs.php:33
+#, fuzzy
+msgid "Default feed update interval"
+msgstr "更新の間隔"
+
+#: classes/pref/prefs.php:33
+msgid "Shortest interval at which a feed will be checked for updates regardless of update method"
+msgstr ""
+
+#: classes/pref/prefs.php:34
+msgid "Mark articles in e-mail digest as read"
+msgstr "既読として電子メールのダイジェストに含まれる記事を設定する"
+
+#: classes/pref/prefs.php:35
+#, fuzzy
+msgid "Enable e-mail digest"
+msgstr "電子メールでのダイジェストを有効にする"
+
+#: classes/pref/prefs.php:35
+msgid "This option enables sending daily digest of new (and unread) headlines on your configured e-mail address"
+msgstr ""
+
+#: classes/pref/prefs.php:36
+msgid "Try to send digests around specified time"
+msgstr ""
 
-#: classes/pref/labels.php:37
-#, fuzzy
-msgid "Colors"
-msgstr "閉じる"
+#: classes/pref/prefs.php:36
+msgid "Uses UTC timezone"
+msgstr ""
 
-#: classes/pref/labels.php:42
+#: classes/pref/prefs.php:37
 #, fuzzy
-msgid "Foreground:"
-msgstr "前景色"
+msgid "Enable API access"
+msgstr "ラベルを有効にする"
 
-#: classes/pref/labels.php:42
-#, fuzzy
-msgid "Background:"
-msgstr "背景色"
+#: classes/pref/prefs.php:37
+msgid "Allows external clients to access this account through the API"
+msgstr ""
 
-#: classes/pref/labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr "ラベル <b>%s</b> を作成しました"
+#: classes/pref/prefs.php:38
+msgid "Enable feed categories"
+msgstr "フィードカテゴリーを有効にする"
 
-#: classes/pref/labels.php:287
-msgid "Clear colors"
-msgstr "色の消去"
+#: classes/pref/prefs.php:39
+msgid "Sort feeds by unread articles count"
+msgstr "未読記事数によるフィードの並び替え"
 
-#: classes/pref/filters.php:60
-#, fuzzy
-msgid "Articles matching this filter:"
-msgstr "一致するフィルターが見つかりません。"
+#: classes/pref/prefs.php:40
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "新規記事としての取り扱い期限 (単位: 時間)"
 
-#: classes/pref/filters.php:97
+#: classes/pref/prefs.php:41
 #, fuzzy
-msgid "No recent articles matching this filter have been found."
-msgstr "一致するフィルターが見つかりません。"
+msgid "Hide feeds with no unread articles"
+msgstr "未読でないメッセージとフィードを隠す"
 
-#: classes/pref/filters.php:101
-msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
+#: classes/pref/prefs.php:42
+msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
-#: classes/pref/filters.php:229
-#: classes/pref/filters.php:671
-#: classes/pref/filters.php:786
-msgid "Match"
-msgstr "一致"
+#: classes/pref/prefs.php:43
+msgid "Long date format"
+msgstr "完全な日付の形式"
 
-#: classes/pref/filters.php:243
-#: classes/pref/filters.php:291
-#: classes/pref/filters.php:685
-#: classes/pref/filters.php:712
-msgid "Add"
-msgstr "追加"
+#: classes/pref/prefs.php:44
+msgid "On catchup show next feed"
+msgstr "次のフィードの表示をキャッチアップする"
 
-#: classes/pref/filters.php:277
-#: classes/pref/filters.php:698
+#: classes/pref/prefs.php:44
+msgid "Automatically open next feed with unread articles after marking one as read"
+msgstr ""
+
+#: classes/pref/prefs.php:45
 #, fuzzy
-msgid "Apply actions"
-msgstr "ã\83\95ã\82£ã\83¼ã\83\89æ\93\8dä½\9c"
+msgid "Purge articles after this number of days (0 - disables)"
+msgstr "ã\81\93ã\81®æ\97¥æ\95°ã\82\88ã\82\8aã\81\82ã\81¨ã\81®å\8f¤ã\81\84æ\8a\95稿ã\82\92å\89\8aé\99¤ã\81\99ã\82\8b (0 ã\81¯ç\84¡å\8a¹ã\81§ã\81\99)"
 
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:727
-msgid "Enabled"
-msgstr "有効にする"
+#: classes/pref/prefs.php:46
+msgid "Purge unread articles"
+msgstr "未読記事を削除する"
 
-#: classes/pref/filters.php:336
-#: classes/pref/filters.php:730
-#, fuzzy
-msgid "Match any rule"
-msgstr "一致したすべての未読記事:"
+#: classes/pref/prefs.php:47
+msgid "Reverse headline order (oldest first)"
+msgstr "ヘッドラインの逆順 (古いものが上)"
 
-#: classes/pref/filters.php:345
-#: classes/pref/filters.php:733
-#, fuzzy
-msgid "Inverse matching"
-msgstr "一致しない"
+#: classes/pref/prefs.php:48
+msgid "Short date format"
+msgstr "短い日付の形式"
 
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:740
-msgid "Test"
-msgstr "テスト"
+#: classes/pref/prefs.php:49
+msgid "Show content preview in headlines list"
+msgstr "ヘッドライン一覧に内容のプレビューを表示する"
 
-#: classes/pref/filters.php:390
+#: classes/pref/prefs.php:50
 #, fuzzy
-msgid "(inverse)"
-msgstr "反転"
+msgid "Sort headlines by feed date"
+msgstr "未読記事数によるフィードの並び替え"
 
-#: classes/pref/filters.php:389
-#, php-format
-msgid "%s on %s in %s %s"
+#: classes/pref/prefs.php:50
+msgid "Use feed-specified date to sort headlines instead of local import date."
 msgstr ""
 
-#: classes/pref/filters.php:609
-msgid "Combine"
+#: classes/pref/prefs.php:51
+msgid "Login with an SSL certificate"
 msgstr ""
 
-#: classes/pref/filters.php:619
-#: classes/pref/feeds.php:1317
-msgid "Rescore articles"
-msgstr "記事のスコアの再集計"
-
-#: classes/pref/filters.php:743
-msgid "Create"
-msgstr "作成"
-
-#: classes/pref/filters.php:798
-msgid "Inverse regular expression matching"
+#: classes/pref/prefs.php:51
+msgid "Click to register your SSL client certificate with tt-rss"
 msgstr ""
 
-#: classes/pref/filters.php:800
+#: classes/pref/prefs.php:52
 #, fuzzy
-msgid "on field"
-msgstr "項目"
+msgid "Do not embed images in articles"
+msgstr "記事内に画像を表示しない"
 
-#: classes/pref/filters.php:806
-#: js/PrefFilterTree.js:29
-#: plugins/digest/digest.js:242
-msgid "in"
+#: classes/pref/prefs.php:53
+msgid "Strip unsafe tags from articles"
+msgstr "記事から安全でないタグを取り除く"
+
+#: classes/pref/prefs.php:53
+msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
-#: classes/pref/filters.php:819
+#: classes/pref/prefs.php:54
+#: js/prefs.js:1719
 #, fuzzy
-msgid "Save rule"
-msgstr "保存"
+msgid "Customize stylesheet"
+msgstr "ユーザースタイルシートの URL"
 
-#: classes/pref/filters.php:819
-#: js/functions.js:1069
-#, fuzzy
-msgid "Add rule"
-msgstr "フィードカテゴリーを追加しています..."
+#: classes/pref/prefs.php:54
+msgid "Customize CSS stylesheet to your liking"
+msgstr ""
 
-#: classes/pref/filters.php:842
-msgid "Perform Action"
-msgstr "操作の実行"
+#: classes/pref/prefs.php:55
+msgid "Time zone"
+msgstr ""
 
-#: classes/pref/filters.php:868
-msgid "with parameters:"
-msgstr "パラメーター:"
+#: classes/pref/prefs.php:56
+msgid "Group headlines in virtual feeds"
+msgstr "仮想フィードのグループヘッドライン"
+
+#: classes/pref/prefs.php:56
+msgid "Special feeds, labels, and categories are grouped by originating feeds"
+msgstr ""
 
-#: classes/pref/filters.php:886
+#: classes/pref/prefs.php:57
 #, fuzzy
-msgid "Save action"
-msgstr "パネル操作"
+msgid "Language"
+msgstr "言語:"
 
-#: classes/pref/filters.php:886
-#: js/functions.js:1095
+#: classes/pref/prefs.php:58
 #, fuzzy
-msgid "Add action"
-msgstr "フィード操作"
+msgid "Theme"
+msgstr "テーマ"
+
+#: classes/pref/prefs.php:58
+msgid "Select one of the available CSS themes"
+msgstr ""
 
-#: classes/pref/prefs.php:17
+#: classes/pref/prefs.php:69
 msgid "Old password cannot be blank."
 msgstr "古いパスワードを空にできません。"
 
-#: classes/pref/prefs.php:22
+#: classes/pref/prefs.php:74
 msgid "New password cannot be blank."
 msgstr "新しいパスワードを空にできません。"
 
-#: classes/pref/prefs.php:27
+#: classes/pref/prefs.php:79
 msgid "Entered passwords do not match."
 msgstr "パスワードが一致しません。"
 
-#: classes/pref/prefs.php:37
+#: classes/pref/prefs.php:88
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:69
+#: classes/pref/prefs.php:127
 msgid "The configuration was saved."
 msgstr "設定を保存しました。"
 
-#: classes/pref/prefs.php:83
+#: classes/pref/prefs.php:142
 #, php-format
 msgid "Unknown option: %s"
 msgstr "不明なオプション: %s"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:156
 #, fuzzy
 msgid "Your personal data has been saved."
 msgstr "パスワードを変更しました。"
 
-#: classes/pref/prefs.php:137
+#: classes/pref/prefs.php:176
+msgid "Your preferences are now set to default values."
+msgstr ""
+
+#: classes/pref/prefs.php:198
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "認証"
 
-#: classes/pref/prefs.php:157
+#: classes/pref/prefs.php:218
 msgid "Personal data"
 msgstr "個人データ"
 
-#: classes/pref/prefs.php:167
+#: classes/pref/prefs.php:228
 msgid "Full name"
 msgstr ""
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:232
 msgid "E-mail"
 msgstr "電子メール"
 
-#: classes/pref/prefs.php:177
+#: classes/pref/prefs.php:238
 msgid "Access level"
 msgstr "アクセスレベル"
 
-#: classes/pref/prefs.php:187
+#: classes/pref/prefs.php:248
 #, fuzzy
 msgid "Save data"
 msgstr "保存"
 
-#: classes/pref/prefs.php:209
+#: classes/pref/prefs.php:267
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "パスワードが標準のままです。\n"
 "                                                変更してください。"
 
-#: classes/pref/prefs.php:236
+#: classes/pref/prefs.php:294
 msgid "Changing your current password will disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:241
+#: classes/pref/prefs.php:299
 msgid "Old password"
 msgstr "現在のパスワード"
 
-#: classes/pref/prefs.php:244
+#: classes/pref/prefs.php:302
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: classes/pref/prefs.php:249
+#: classes/pref/prefs.php:307
 msgid "Confirm password"
 msgstr "新しいパスワード(確認)"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:317
 msgid "Change password"
 msgstr "パスワードを変更する"
 
-#: classes/pref/prefs.php:265
+#: classes/pref/prefs.php:323
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:269
+#: classes/pref/prefs.php:327
 msgid "One time passwords are currently enabled. Enter your current password below to disable."
 msgstr ""
 
-#: classes/pref/prefs.php:294
-#: classes/pref/prefs.php:345
+#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:403
 #, fuzzy
 msgid "Enter your password"
 msgstr "ユーザー名かパスワードが正しくありません"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:363
 #, fuzzy
 msgid "Disable OTP"
 msgstr "(無効です)"
 
-#: classes/pref/prefs.php:311
+#: classes/pref/prefs.php:369
 msgid "You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:313
+#: classes/pref/prefs.php:371
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:354
-msgid "I have scanned the code and would like to enable OTP"
-msgstr ""
+#: classes/pref/prefs.php:408
+#, fuzzy
+msgid "Enter the generated one time password"
+msgstr "このアーティクルのノートを入力してください:"
 
-#: classes/pref/prefs.php:362
+#: classes/pref/prefs.php:422
 #, fuzzy
 msgid "Enable OTP"
 msgstr "有効にする"
 
-#: classes/pref/prefs.php:400
+#: classes/pref/prefs.php:428
+msgid "PHP GD functions are required for OTP support."
+msgstr ""
+
+#: classes/pref/prefs.php:471
 msgid "Some preferences are only available in default profile."
 msgstr ""
 
-#: classes/pref/prefs.php:491
+#: classes/pref/prefs.php:569
 #, fuzzy
 msgid "Customize"
 msgstr "ユーザースタイルシートの URL"
 
-#: classes/pref/prefs.php:558
+#: classes/pref/prefs.php:629
 #, fuzzy
 msgid "Register"
 msgstr "登録済み"
 
-#: classes/pref/prefs.php:562
+#: classes/pref/prefs.php:633
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:568
+#: classes/pref/prefs.php:639
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:601
+#: classes/pref/prefs.php:671
 msgid "Save configuration"
 msgstr "設定を保存する"
 
-#: classes/pref/prefs.php:604
+#: classes/pref/prefs.php:675
+#, fuzzy
+msgid "Save and exit preferences"
+msgstr "設定を終了する"
+
+#: classes/pref/prefs.php:680
 #, fuzzy
 msgid "Manage profiles"
 msgstr "フィルターを作成する"
 
-#: classes/pref/prefs.php:607
+#: classes/pref/prefs.php:683
 msgid "Reset to defaults"
 msgstr "標準に戻す"
 
-#: classes/pref/prefs.php:631
-#: classes/pref/prefs.php:633
+#: classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:635
+#: classes/pref/prefs.php:708
 msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr ""
 
-#: classes/pref/prefs.php:637
+#: classes/pref/prefs.php:710
 msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
 msgstr ""
 
-#: classes/pref/prefs.php:663
+#: classes/pref/prefs.php:736
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:667
-#: classes/pref/prefs.php:721
+#: classes/pref/prefs.php:740
+#: classes/pref/prefs.php:794
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:668
-#: classes/pref/prefs.php:722
+#: classes/pref/prefs.php:741
+#: classes/pref/prefs.php:795
 #, fuzzy
 msgid "Description"
 msgstr "説明"
 
-#: classes/pref/prefs.php:669
-#: classes/pref/prefs.php:723
+#: classes/pref/prefs.php:742
+#: classes/pref/prefs.php:796
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:670
-#: classes/pref/prefs.php:724
+#: classes/pref/prefs.php:743
+#: classes/pref/prefs.php:797
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:699
-#: classes/pref/prefs.php:756
+#: classes/pref/prefs.php:772
+#: classes/pref/prefs.php:829
 msgid "more info"
 msgstr ""
 
-#: classes/pref/prefs.php:708
-#: classes/pref/prefs.php:765
+#: classes/pref/prefs.php:781
+#: classes/pref/prefs.php:838
 #, fuzzy
 msgid "Clear data"
 msgstr "フィードデータの消去"
 
-#: classes/pref/prefs.php:717
+#: classes/pref/prefs.php:790
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:780
+#: classes/pref/prefs.php:853
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "フィードアイコンを有効にする"
 
-#: classes/pref/prefs.php:835
-#: classes/pref/prefs.php:853
+#: classes/pref/prefs.php:920
+#, fuzzy
+msgid "Incorrect one time password"
+msgstr "ユーザー名かパスワードが正しくありません"
+
+#: classes/pref/prefs.php:923
+#: classes/pref/prefs.php:940
 #, fuzzy
 msgid "Incorrect password"
 msgstr "ユーザー名かパスワードが正しくありません"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:965
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr ""
+
+#: classes/pref/prefs.php:1005
+#, fuzzy
+msgid "Create profile"
+msgstr "フィルターを作成する"
+
+#: classes/pref/prefs.php:1028
+#: classes/pref/prefs.php:1056
+msgid "(active)"
+msgstr "(有効)"
+
+#: classes/pref/prefs.php:1090
+#, fuzzy
+msgid "Remove selected profiles"
+msgstr "選択されたプロファイルを削除しますか?"
+
+#: classes/pref/prefs.php:1092
+#, fuzzy
+msgid "Activate profile"
+msgstr "プロファイルを有効にする"
+
+#: classes/pref/feeds.php:13
 #, fuzzy
 msgid "Check to enable field"
 msgstr "編集するにはクリック"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "フィードを編集する"
-msgstr[1] "フィードを編集する"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:546
 #, fuzzy
 msgid "Feed Title"
 msgstr "題名"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:587
+#: classes/pref/feeds.php:822
+msgid "Update"
+msgstr "更新"
+
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:838
 msgid "Article purging:"
 msgstr "記事の削除:"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:632
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:648
+#: classes/pref/feeds.php:867
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "自分のフィード一覧から隠す"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:873
 msgid "Include in e-mail digest"
 msgstr "電子メールダイジェストに含む"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:879
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:686
+#: classes/pref/feeds.php:887
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:699
+#: classes/pref/feeds.php:895
 msgid "Cache images locally"
 msgstr "ローカルに画像をキャッシュする"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:711
+#: classes/pref/feeds.php:901
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "すべての記事を既読にしますか?"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:717
 #, fuzzy
 msgid "Icon"
 msgstr "操作"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:731
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:753
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "フィードを購読する:"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:760
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1156
+#: classes/pref/feeds.php:1209
 msgid "All done."
 msgstr "すべて終了しました。"
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1264
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "フィードエディター"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1284
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "元のフィード"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1321
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "選択したフィードを削除しています..."
 
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
-#, fuzzy
-msgid "Reset sort order"
-msgstr "パスワードのリセット"
-
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1325
 #: js/prefs.js:1764
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "購読をやめる"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1332
 #, fuzzy
 msgid "Categories"
 msgstr "カテゴリー:"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1335
 #, fuzzy
 msgid "Add category"
 msgstr "フィードカテゴリーを追加しています..."
 
-#: classes/pref/feeds.php:1290
-#, fuzzy
-msgid "(Un)hide empty categories"
-msgstr "カテゴリーの編集"
-
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1339
 #, fuzzy
 msgid "Remove selected"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1350
 #, fuzzy
 msgid "More actions..."
 msgstr "操作..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1354
 msgid "Manual purge"
 msgstr "手動削除"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1358
 msgid "Clear feed data"
 msgstr "フィードデータの消去"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1409
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1411
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1411
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1424
 #, fuzzy
 msgid "Import my OPML"
 msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1428
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1430
 #, fuzzy
 msgid "Include settings"
 msgstr "電子メールダイジェストに含む"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1434
 #, fuzzy
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1438
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1440
 msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1442
+msgid "Public OPML URL"
+msgstr ""
+
+#: classes/pref/feeds.php:1443
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1452
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox 統合"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1454
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny Tiny RSS のサイトを使うことができます。"
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1461
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1469
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: classes/pref/feeds.php:1432
-#, fuzzy
-msgid "Published articles and generated feeds"
-msgstr "選択したフィードの記事のスコアを再計算しますか?"
-
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1471
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr ""
 
-#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1479
 #, fuzzy
 msgid "Display URL"
 msgstr "タグの表示"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1482
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1445
-#, fuzzy
-msgid "Articles shared by URL"
-msgstr "記事をお気に入りにする"
-
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1486
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1491
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "記事のお気に入りを解除する"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1568
 #, fuzzy
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1670
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "編集するにはクリック"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1690
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: classes/pref/feeds.php:1594
-msgid "These feeds have not been updated because of errors:"
-msgstr "エラーのため、フィードは更新されませんでした:"
-
-#: plugins/digest/digest_body.php:59
-msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
+#: classes/pref/feeds.php:1795
+msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: plugins/digest/digest_body.php:74
-msgid "Hello,"
-msgstr "ようこそ、"
-
-#: plugins/digest/digest_body.php:80
-msgid "Regular version"
+#: classes/pref/feeds.php:1804
+msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: plugins/close_button/init.php:24
+#: classes/pref/feeds.php:1826
 #, fuzzy
-msgid "Close article"
-msgstr "記事を消去する"
-
-#: plugins/nsfw/init.php:32
-#: plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
-msgstr ""
-
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
-msgstr ""
+msgid "Feeds require authentication."
+msgstr "このフィードは認証を要求します。"
 
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
+#: classes/pref/system.php:29
+msgid "Error Log"
 msgstr ""
 
-#: plugins/nsfw/init.php:101
+#: classes/pref/system.php:40
 #, fuzzy
-msgid "Configuration saved."
-msgstr "設定を保存しました。"
+msgid "Refresh"
+msgstr "再描画"
 
-#: plugins/auth_internal/init.php:62
+#: classes/pref/system.php:43
 #, fuzzy
-msgid "Please enter your one time password:"
-msgstr "このアーティクルのノートを入力してください:"
-
-#: plugins/auth_internal/init.php:185
-msgid "Password has been changed."
-msgstr "パスワードを変更しました。"
-
-#: plugins/auth_internal/init.php:187
-msgid "Old password is incorrect."
-msgstr "古いパスワードが不正確です。"
+msgid "Clear log"
+msgstr "色の消去"
 
-#: plugins/mobile/mobile-functions.php:61
-#: plugins/mobile/mobile-functions.php:137
-#: plugins/mobile/mobile-functions.php:173
-#: plugins/mobile/mobile-functions.php:200
-#: plugins/mobile/mobile-functions.php:236
-#: plugins/mobile/mobile-functions.php:373
-#: plugins/mobile/prefs.php:29
-msgid "Home"
+#: classes/pref/system.php:48
+msgid "Error"
 msgstr ""
 
-#: plugins/mobile/mobile-functions.php:409
-msgid "Nothing found (click to reload feed)."
+#: classes/pref/system.php:49
+msgid "Filename"
 msgstr ""
 
-#: plugins/mobile/login_form.php:52
-msgid "Open regular version"
+#: classes/pref/system.php:50
+msgid "Message"
 msgstr ""
 
-#: plugins/mobile/prefs.php:34
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "日付"
+
+#: plugins/close_button/init.php:22
 #, fuzzy
-msgid "Enable categories"
-msgstr "フィードカテゴリーを有効にする"
+msgid "Close article"
+msgstr "記事を消去する"
+
+#: plugins/nsfw/init.php:29
+#: plugins/nsfw/init.php:40
+msgid "Not work safe (click to toggle)"
+msgstr ""
 
-#: plugins/mobile/prefs.php:35
-#: plugins/mobile/prefs.php:40
-#: plugins/mobile/prefs.php:46
-#: plugins/mobile/prefs.php:51
-#: plugins/mobile/prefs.php:56
-#: plugins/mobile/prefs.php:61
-msgid "ON"
+#: plugins/nsfw/init.php:50
+msgid "NSFW Plugin"
 msgstr ""
 
-#: plugins/mobile/prefs.php:35
-#: plugins/mobile/prefs.php:40
-#: plugins/mobile/prefs.php:46
-#: plugins/mobile/prefs.php:51
-#: plugins/mobile/prefs.php:56
-#: plugins/mobile/prefs.php:61
-msgid "OFF"
+#: plugins/nsfw/init.php:77
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
-#: plugins/mobile/prefs.php:39
+#: plugins/nsfw/init.php:98
 #, fuzzy
-msgid "Browse categories like folders"
-msgstr "カテゴリーの順序をリセットする"
+msgid "Configuration saved."
+msgstr "設定を保存しました。"
 
-#: plugins/mobile/prefs.php:45
+#: plugins/auth_internal/init.php:62
 #, fuzzy
-msgid "Show images in posts"
-msgstr "記事内に画像を表示しない"
+msgid "Please enter your one time password:"
+msgstr "このアーティクルのノートを入力してください:"
 
-#: plugins/mobile/prefs.php:50
-#, fuzzy
-msgid "Hide read articles and feeds"
-msgstr "読んだフィードを隠す/再表示する"
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr "パスワードを変更しました。"
 
-#: plugins/mobile/prefs.php:55
-#, fuzzy
-msgid "Sort feeds by unread count"
-msgstr "未読記事数によるフィードの並び替え"
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
+msgstr "古いパスワードが不正確です。"
 
-#: plugins/mailto/init.php:52
-#: plugins/mailto/init.php:58
-#: plugins/mail/init.php:71
-#: plugins/mail/init.php:77
+#: plugins/mailto/init.php:49
+#: plugins/mailto/init.php:55
+#: plugins/mail/init.php:64
+#: plugins/mail/init.php:70
 msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/mailto/init.php:52
-#: plugins/mail/init.php:71
+#: plugins/mailto/init.php:49
+#: plugins/mail/init.php:64
 #, fuzzy
 msgid "Multiple articles"
 msgstr "すべての記事"
 
-#: plugins/mailto/init.php:74
+#: plugins/mailto/init.php:71
 msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
-#: plugins/mailto/init.php:78
+#: plugins/mailto/init.php:75
 #, fuzzy
 msgid "Forward selected article(s) by email."
 msgstr "記事をお気に入りにする"
 
-#: plugins/mailto/init.php:81
+#: plugins/mailto/init.php:78
 msgid "You should be able to edit the message before sending in your mail client."
 msgstr ""
 
-#: plugins/mailto/init.php:86
+#: plugins/mailto/init.php:83
 #, fuzzy
 msgid "Close this dialog"
 msgstr "このウィンドウを閉じる"
 
-#: plugins/bookmarklets/init.php:22
+#: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:24
+#: plugins/bookmarklets/init.php:22
 msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: plugins/bookmarklets/init.php:28
+#: plugins/bookmarklets/init.php:26
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: plugins/bookmarklets/init.php:32
+#: plugins/bookmarklets/init.php:31
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
@@ -2883,415 +2696,451 @@ msgstr "Tiny Tiny RSS に戻る"
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/import_export/init.php:64
+#: plugins/import_export/init.php:58
 msgid "Import and export"
 msgstr ""
 
-#: plugins/import_export/init.php:66
-#, fuzzy
-msgid "Article archive"
-msgstr "記事の日付"
-
-#: plugins/import_export/init.php:68
-msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances."
+#: plugins/import_export/init.php:60
+msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
 msgstr ""
 
-#: plugins/import_export/init.php:71
+#: plugins/import_export/init.php:65
 #, fuzzy
 msgid "Export my data"
 msgstr "OPML エクスポート"
 
-#: plugins/import_export/init.php:87
+#: plugins/import_export/init.php:81
 msgid "Import"
 msgstr "インポート"
 
-#: plugins/import_export/init.php:221
+#: plugins/import_export/init.php:219
 #, fuzzy
 msgid "Could not import: incorrect schema version."
 msgstr "必要なスキーマファイルを見つけられませんでした。次のバージョンが必要です:"
 
-#: plugins/import_export/init.php:226
+#: plugins/import_export/init.php:224
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: plugins/import_export/init.php:385
+#: plugins/import_export/init.php:383
 msgid "Finished: "
 msgstr ""
 
-#: plugins/import_export/init.php:386
+#: plugins/import_export/init.php:384
 #, fuzzy, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "タグを編集する"
 msgstr[1] "タグを編集する"
 
-#: plugins/import_export/init.php:387
+#: plugins/import_export/init.php:385
 #, fuzzy, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "既にインポート済みです。"
 msgstr[1] "既にインポート済みです。"
 
-#: plugins/import_export/init.php:388
+#: plugins/import_export/init.php:386
 #, fuzzy, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "フィードは選択されていません。"
 msgstr[1] "フィードは選択されていません。"
 
-#: plugins/import_export/init.php:393
+#: plugins/import_export/init.php:391
 msgid "Could not load XML document."
 msgstr ""
 
-#: plugins/import_export/init.php:405
+#: plugins/import_export/init.php:403
 #, fuzzy
 msgid "Prepare data"
 msgstr "保存"
 
-#: plugins/import_export/init.php:426
-#, php-format
-msgid "Could not upload file. You might need to adjust upload_max_filesize in PHP.ini (current value = %s)"
-msgstr ""
+#: plugins/import_export/init.php:446
+#: plugins/googlereaderimport/init.php:92
+#, fuzzy
+msgid "No file uploaded."
+msgstr "アップロードする OPML ファイルがありません。"
 
-#: plugins/mail/init.php:92
+#: plugins/mail/init.php:85
 msgid "From:"
 msgstr ""
 
-#: plugins/mail/init.php:101
+#: plugins/mail/init.php:94
 #, fuzzy
 msgid "To:"
 msgstr "トップ"
 
-#: plugins/mail/init.php:114
+#: plugins/mail/init.php:107
 #, fuzzy
 msgid "Subject:"
 msgstr "選択:"
 
-#: plugins/mail/init.php:130
+#: plugins/mail/init.php:123
 #, fuzzy
 msgid "Send e-mail"
 msgstr "電子メールを変更する"
 
-#: plugins/note/init.php:28
+#: plugins/note/init.php:26
 #: plugins/note/note.js:11
 #, fuzzy
 msgid "Edit article note"
 msgstr "タグを編集する"
 
-#: plugins/example/init.php:39
-#, fuzzy
-msgid "Example Pane"
-msgstr "例"
-
-#: plugins/example/init.php:70
-msgid "Sample value"
-msgstr ""
-
-#: plugins/example/init.php:76
-#, fuzzy
-msgid "Set value"
-msgstr "お気に入りに設定する"
-
-#: plugins/googlereaderimport/init.php:72
-#, fuzzy
-msgid "No file uploaded."
-msgstr "アップロードする OPML ファイルがありません。"
-
-#: plugins/googlereaderimport/init.php:149
+#: plugins/googlereaderimport/init.php:178
 #, php-format
 msgid "All done. %d out of %d articles imported."
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:153
+#: plugins/googlereaderimport/init.php:182
 msgid "The document has incorrect format."
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:322
+#: plugins/googlereaderimport/init.php:353
 msgid "Import starred or shared items from Google Reader"
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:326
+#: plugins/googlereaderimport/init.php:357
 msgid "Paste your starred.json or shared.json into the form below."
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:340
+#: plugins/googlereaderimport/init.php:371
 msgid "Import my Starred items"
 msgstr ""
 
-#: plugins/instances/init.php:144
+#: plugins/instances/init.php:141
 #, fuzzy
 msgid "Linked"
 msgstr "リンク"
 
-#: plugins/instances/init.php:295
+#: plugins/instances/init.php:204
+#: plugins/instances/init.php:395
+msgid "Instance"
+msgstr ""
+
+#: plugins/instances/init.php:215
+#: plugins/instances/init.php:312
+#: plugins/instances/init.php:404
+msgid "Instance URL"
+msgstr ""
+
+#: plugins/instances/init.php:226
+#: plugins/instances/init.php:414
+#, fuzzy
+msgid "Access key:"
+msgstr "アクセスレベル: "
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:313
+#: plugins/instances/init.php:417
+#, fuzzy
+msgid "Access key"
+msgstr "アクセスレベル"
+
+#: plugins/instances/init.php:233
+#: plugins/instances/init.php:421
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: plugins/instances/init.php:241
+#: plugins/instances/init.php:429
+#, fuzzy
+msgid "Generate new key"
+msgstr "生成したフィード"
+
+#: plugins/instances/init.php:292
 #, fuzzy
 msgid "Link instance"
 msgstr "タグを編集する"
 
-#: plugins/instances/init.php:307
+#: plugins/instances/init.php:304
 msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
 msgstr ""
 
-#: plugins/instances/init.php:317
+#: plugins/instances/init.php:314
 msgid "Last connected"
 msgstr ""
 
-#: plugins/instances/init.php:318
+#: plugins/instances/init.php:315
 msgid "Status"
 msgstr ""
 
-#: plugins/instances/init.php:319
+#: plugins/instances/init.php:316
 #, fuzzy
 msgid "Stored feeds"
 msgstr "さらなるフィード"
 
-#: plugins/share/init.php:27
+#: plugins/instances/init.php:433
+#, fuzzy
+msgid "Create link"
+msgstr "作成"
+
+#: plugins/share/init.php:25
 #, fuzzy
 msgid "Share by URL"
 msgstr "記事をお気に入りにする"
 
-#: plugins/share/init.php:49
+#: plugins/share/init.php:47
 msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/updater/init.php:317
-#: plugins/updater/init.php:334
+#: plugins/updater/init.php:321
+#: plugins/updater/init.php:338
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: plugins/updater/init.php:337
+#: plugins/updater/init.php:341
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Tiny Tiny RSS のデータベースを更新しました。"
 
-#: plugins/updater/init.php:347
-msgid "Do not close this dialog until updating is finished. Backup your tt-rss directory before continuing."
+#: plugins/updater/init.php:349
+msgid "Do not close this dialog until updating is finished."
+msgstr ""
+
+#: plugins/updater/init.php:358
+msgid "It is suggested to backup your tt-rss directory first."
+msgstr ""
+
+#: plugins/updater/init.php:359
+msgid "Your database will not be modified."
+msgstr ""
+
+#: plugins/updater/init.php:360
+msgid "Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes."
 msgstr ""
 
-#: plugins/updater/init.php:350
+#: plugins/updater/init.php:361
 #, fuzzy
 msgid "Ready to update."
 msgstr "最終更新:"
 
-#: plugins/updater/init.php:355
+#: plugins/updater/init.php:366
 #, fuzzy
 msgid "Start update"
 msgstr "最終更新:"
 
-#: js/feedlist.js:404
-#: js/feedlist.js:432
-#: plugins/digest/digest.js:26
+#: js/feedlist.js:397
+#: js/feedlist.js:425
 msgid "Mark all articles in %s as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
-#: js/feedlist.js:423
+#: js/feedlist.js:416
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
-#: js/feedlist.js:426
+#: js/feedlist.js:419
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
-#: js/feedlist.js:429
+#: js/feedlist.js:422
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
-#: js/functions.js:92
-msgid "Are you sure to report this exception to tt-rss.org? The report will include your browser information. Your IP would be saved in the database."
+#: js/functions.js:65
+msgid "The error will be reported to the configured log destination."
 msgstr ""
 
-#: js/functions.js:214
-msgid "close"
+#: js/functions.js:107
+msgid "Are you sure to report this exception to tt-rss.org? The report will include your browser information. Your IP would be saved in the database."
 msgstr ""
 
-#: js/functions.js:627
+#: js/functions.js:236
 #, fuzzy
-msgid "Date syntax appears to be correct:"
-msgstr "古いパスワードが不正確です。"
+msgid "Click to close"
+msgstr "編集するにはクリック"
 
-#: js/functions.js:630
-#, fuzzy
-msgid "Date syntax is incorrect."
-msgstr "古いパスワードが不正確です。"
+#: js/functions.js:612
+msgid "Error explained"
+msgstr ""
 
-#: js/functions.js:724
+#: js/functions.js:694
 #, fuzzy
 msgid "Upload complete."
 msgstr "更新済み記事"
 
-#: js/functions.js:748
+#: js/functions.js:718
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "保存したデータを削除する"
 
-#: js/functions.js:753
+#: js/functions.js:723
 #, fuzzy
 msgid "Removing feed icon..."
 msgstr "フィードを削除しています..."
 
-#: js/functions.js:758
+#: js/functions.js:728
 #, fuzzy
 msgid "Feed icon removed."
 msgstr "フィードが見つかりません。"
 
-#: js/functions.js:780
+#: js/functions.js:750
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "フィードをひとつ選択してください"
 
-#: js/functions.js:782
+#: js/functions.js:752
 msgid "Upload new icon for this feed?"
 msgstr ""
 
-#: js/functions.js:783
+#: js/functions.js:753
 #, fuzzy
 msgid "Uploading, please wait..."
 msgstr "読み込みんでいます。しばらくお待ちください..."
 
-#: js/functions.js:799
+#: js/functions.js:769
 msgid "Please enter label caption:"
 msgstr "ラベルのキャプションを入力してください:"
 
-#: js/functions.js:804
+#: js/functions.js:774
 msgid "Can't create label: missing caption."
 msgstr "ラベルが作成できません: キャプションが見当たりません。"
 
-#: js/functions.js:847
+#: js/functions.js:817
 msgid "Subscribe to Feed"
 msgstr "フィードを購読する"
 
-#: js/functions.js:874
+#: js/functions.js:844
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "フィードを購読する:"
 
-#: js/functions.js:879
+#: js/functions.js:849
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:882
+#: js/functions.js:852
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:935
+#: js/functions.js:862
+#, fuzzy
+msgid "Expand to select feed"
+msgstr "選択したフィードを削除しています..."
+
+#: js/functions.js:874
 #, fuzzy
 msgid "Couldn't download the specified URL: %s"
 msgstr "購読できません: フィード URL が入力されていません。"
 
-#: js/functions.js:939
+#: js/functions.js:878
+msgid "XML validation failed: %s"
+msgstr ""
+
+#: js/functions.js:883
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "カテゴリーから購読をやめることができません。"
 
-#: js/functions.js:1069
+#: js/functions.js:1013
 #, fuzzy
 msgid "Edit rule"
 msgstr "フィルター"
 
-#: js/functions.js:1095
+#: js/functions.js:1039
 #, fuzzy
 msgid "Edit action"
 msgstr "フィード操作"
 
-#: js/functions.js:1132
+#: js/functions.js:1076
 msgid "Create Filter"
 msgstr "フィルターを作成する"
 
-#: js/functions.js:1247
+#: js/functions.js:1191
 msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1258
+#: js/functions.js:1202
 #, fuzzy
 msgid "Subscription reset."
 msgstr "フィードを購読する..."
 
-#: js/functions.js:1268
-#: js/tt-rss.js:619
+#: js/functions.js:1212
+#: js/tt-rss.js:677
 msgid "Unsubscribe from %s?"
 msgstr "%s の購読をやめますか?"
 
-#: js/functions.js:1271
+#: js/functions.js:1215
 msgid "Removing feed..."
 msgstr "フィードを削除しています..."
 
-#: js/functions.js:1379
+#: js/functions.js:1324
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "このアーティクルのノートを入力してください:"
 
-#: js/functions.js:1410
+#: js/functions.js:1355
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1414
-#: js/prefs.js:1234
+#: js/functions.js:1359
+#: js/prefs.js:1231
 msgid "Trying to change address..."
 msgstr "アドレスの変更を試みています..."
 
-#: js/functions.js:1601
-#: js/tt-rss.js:396
-#: js/tt-rss.js:600
+#: js/functions.js:1546
+#: js/tt-rss.js:422
+#: js/tt-rss.js:658
 #, fuzzy
 msgid "You can't edit this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
 
-#: js/functions.js:1616
+#: js/functions.js:1561
 #, fuzzy
 msgid "Edit Feed"
 msgstr "フィードを編集する"
 
-#: js/functions.js:1622
+#: js/functions.js:1567
 #: js/prefs.js:194
 #: js/prefs.js:749
 #, fuzzy
 msgid "Saving data..."
 msgstr "フィードを保存しています..."
 
-#: js/functions.js:1654
+#: js/functions.js:1599
 #, fuzzy
 msgid "More Feeds"
 msgstr "さらなるフィード"
 
-#: js/functions.js:1715
-#: js/functions.js:1825
+#: js/functions.js:1660
+#: js/functions.js:1770
 #: js/prefs.js:397
 #: js/prefs.js:427
 #: js/prefs.js:459
 #: js/prefs.js:642
 #: js/prefs.js:662
-#: js/prefs.js:1210
-#: js/prefs.js:1355
+#: js/prefs.js:1207
+#: js/prefs.js:1352
 msgid "No feeds are selected."
 msgstr "選択されたフィードはありません。"
 
-#: js/functions.js:1757
+#: js/functions.js:1702
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr ""
 
-#: js/functions.js:1796
+#: js/functions.js:1741
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "フィードエディター"
 
-#: js/functions.js:1807
-#: js/prefs.js:1192
+#: js/functions.js:1752
+#: js/prefs.js:1189
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: js/functions.js:1810
-#: js/prefs.js:1195
+#: js/functions.js:1755
+#: js/prefs.js:1192
 #, fuzzy
 msgid "Removing selected feeds..."
 msgstr "選択されたフィルターを削除しています..."
 
-#: js/functions.js:1908
+#: js/functions.js:1853
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -3305,7 +3154,7 @@ msgstr "カテゴリーの編集"
 msgid "Remove category"
 msgstr "カテゴリーの作成"
 
-#: js/PrefFilterTree.js:32
+#: js/PrefFilterTree.js:48
 #, fuzzy
 msgid "Inverse"
 msgstr "反転"
@@ -3322,6 +3171,10 @@ msgstr "ユーザーが追加できません: ログイン名が指定されて
 msgid "Adding user..."
 msgstr "ユーザーを追加しています..."
 
+#: js/prefs.js:94
+msgid "User Editor"
+msgstr "ユーザーエディター"
+
 #: js/prefs.js:117
 #, fuzzy
 msgid "Edit Filter"
@@ -3345,7 +3198,7 @@ msgid "Removing selected labels..."
 msgstr "選択したラベルを削除しています..."
 
 #: js/prefs.js:295
-#: js/prefs.js:1396
+#: js/prefs.js:1393
 msgid "No labels are selected."
 msgstr "選択されたラベルはありません。"
 
@@ -3429,6 +3282,10 @@ msgstr "選択したユーザーのパスワードをリセットしますか?"
 msgid "Resetting password for selected user..."
 msgstr "選択したユーザーのパスワードをリセットしています..."
 
+#: js/prefs.js:585
+msgid "User details"
+msgstr "ユーザーの詳細"
+
 #: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "フィルターをひとつだけ選択してください。"
@@ -3452,148 +3309,148 @@ msgstr "複数フィードエディター"
 msgid "Save changes to selected feeds?"
 msgstr "選択したフィードの変更を保存しますか?"
 
-#: js/prefs.js:797
+#: js/prefs.js:785
 #, fuzzy
 msgid "OPML Import"
 msgstr "インポート"
 
-#: js/prefs.js:824
+#: js/prefs.js:812
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: js/prefs.js:827
+#: js/prefs.js:815
 #: plugins/import_export/import_export.js:115
 #: plugins/googlereaderimport/init.js:45
 #, fuzzy
 msgid "Importing, please wait..."
 msgstr "読み込みんでいます。しばらくお待ちください..."
 
-#: js/prefs.js:980
+#: js/prefs.js:982
 msgid "Reset to defaults?"
 msgstr "標準に戻しますか?"
 
-#: js/prefs.js:1099
+#: js/prefs.js:1096
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1105
+#: js/prefs.js:1102
 #, fuzzy
 msgid "Removing category..."
 msgstr "カテゴリーの作成"
 
-#: js/prefs.js:1126
+#: js/prefs.js:1123
 msgid "Remove selected categories?"
 msgstr "選択されたカテゴリーを削除しますか?"
 
-#: js/prefs.js:1129
+#: js/prefs.js:1126
 msgid "Removing selected categories..."
 msgstr "選択されたカテゴリーを削除しています..."
 
-#: js/prefs.js:1142
+#: js/prefs.js:1139
 msgid "No categories are selected."
 msgstr "選択されたカテゴリーはありません。"
 
-#: js/prefs.js:1150
+#: js/prefs.js:1147
 #, fuzzy
 msgid "Category title:"
 msgstr "カテゴリーエディター"
 
-#: js/prefs.js:1154
+#: js/prefs.js:1151
 #, fuzzy
 msgid "Creating category..."
 msgstr "フィルターを作成しています..."
 
-#: js/prefs.js:1181
+#: js/prefs.js:1178
 msgid "Feeds without recent updates"
 msgstr ""
 
-#: js/prefs.js:1230
+#: js/prefs.js:1227
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "新しいもので現在の公開アドレスを置き換えますか?"
 
-#: js/prefs.js:1319
+#: js/prefs.js:1316
 msgid "Clearing feed..."
 msgstr "フィードを消去しています..."
 
-#: js/prefs.js:1339
+#: js/prefs.js:1336
 msgid "Rescore articles in selected feeds?"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: js/prefs.js:1342
+#: js/prefs.js:1339
 #, fuzzy
 msgid "Rescoring selected feeds..."
 msgstr "選択されたフィードを消去しています..."
 
-#: js/prefs.js:1362
+#: js/prefs.js:1359
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "すべての記事のスコアを再計算しますか? この操作は大量の時間を使うでしょう。"
 
-#: js/prefs.js:1365
+#: js/prefs.js:1362
 msgid "Rescoring feeds..."
 msgstr "フィードのスコアを再計算しています..."
 
-#: js/prefs.js:1382
+#: js/prefs.js:1379
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "ラベルの色を標準にリセットしますか?"
 
-#: js/prefs.js:1419
+#: js/prefs.js:1416
 msgid "Settings Profiles"
 msgstr ""
 
-#: js/prefs.js:1428
+#: js/prefs.js:1425
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: js/prefs.js:1431
+#: js/prefs.js:1428
 #, fuzzy
 msgid "Removing selected profiles..."
 msgstr "選択されたフィルターを削除しています..."
 
-#: js/prefs.js:1446
+#: js/prefs.js:1443
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "選択された記事はありません。"
 
-#: js/prefs.js:1454
-#: js/prefs.js:1507
+#: js/prefs.js:1451
+#: js/prefs.js:1504
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: js/prefs.js:1470
-#: js/prefs.js:1523
+#: js/prefs.js:1467
+#: js/prefs.js:1520
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: js/prefs.js:1475
+#: js/prefs.js:1472
 #, fuzzy
 msgid "Creating profile..."
 msgstr "フィルターを作成する"
 
-#: js/prefs.js:1531
+#: js/prefs.js:1528
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1534
-#: js/prefs.js:1553
+#: js/prefs.js:1531
+#: js/prefs.js:1550
 #, fuzzy
 msgid "Clearing URLs..."
 msgstr "フィードを消去しています..."
 
-#: js/prefs.js:1541
+#: js/prefs.js:1538
 #, fuzzy
 msgid "Generated URLs cleared."
 msgstr "生成したフィード"
 
-#: js/prefs.js:1550
+#: js/prefs.js:1547
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1560
+#: js/prefs.js:1557
 msgid "Shared URLs cleared."
 msgstr ""
 
@@ -3610,234 +3467,203 @@ msgstr "フィードを購読しています..."
 msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/tt-rss.js:124
+#: js/prefs.js:1824
+msgid "Clear all messages in the error log?"
+msgstr ""
+
+#: js/tt-rss.js:127
 msgid "Mark all articles as read?"
 msgstr "すべての記事を既読にしますか?"
 
-#: js/tt-rss.js:130
+#: js/tt-rss.js:133
 msgid "Marking all feeds as read..."
 msgstr "すべてのフィードを既読に設定しています..."
 
-#: js/tt-rss.js:355
+#: js/tt-rss.js:381
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: js/tt-rss.js:461
+#: js/tt-rss.js:493
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: js/tt-rss.js:608
+#: js/tt-rss.js:645
+msgid "Select item(s) by tags"
+msgstr ""
+
+#: js/tt-rss.js:666
 msgid "You can't unsubscribe from the category."
 msgstr "カテゴリーから購読をやめることができません。"
 
-#: js/tt-rss.js:613
-#: js/tt-rss.js:769
+#: js/tt-rss.js:671
+#: js/tt-rss.js:825
 msgid "Please select some feed first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: js/tt-rss.js:764
+#: js/tt-rss.js:820
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
 
-#: js/tt-rss.js:774
+#: js/tt-rss.js:830
 msgid "Rescore articles in %s?"
 msgstr "%s の記事のスコアを再計算しますか?"
 
-#: js/tt-rss.js:777
+#: js/tt-rss.js:833
 msgid "Rescoring articles..."
 msgstr "記事のスコアを再計算しています..."
 
-#: js/tt-rss.js:911
+#: js/tt-rss.js:967
 #, fuzzy
 msgid "New version available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: js/viewfeed.js:106
+#: js/viewfeed.js:105
 #, fuzzy
 msgid "Cancel search"
 msgstr "取り消し"
 
-#: js/viewfeed.js:440
-#: plugins/digest/digest.js:258
-#: plugins/digest/digest.js:714
+#: js/viewfeed.js:454
 msgid "Unstar article"
 msgstr "記事のお気に入りを解除する"
 
-#: js/viewfeed.js:445
-#: plugins/digest/digest.js:260
-#: plugins/digest/digest.js:718
+#: js/viewfeed.js:458
 msgid "Star article"
 msgstr "記事をお気に入りにする"
 
-#: js/viewfeed.js:478
-#: plugins/digest/digest.js:263
-#: plugins/digest/digest.js:749
+#: js/viewfeed.js:498
 msgid "Unpublish article"
 msgstr "非公開記事"
 
-#: js/viewfeed.js:679
-#: js/viewfeed.js:707
-#: js/viewfeed.js:734
-#: js/viewfeed.js:797
-#: js/viewfeed.js:831
-#: js/viewfeed.js:968
-#: js/viewfeed.js:1011
-#: js/viewfeed.js:1064
-#: js/viewfeed.js:2108
+#: js/viewfeed.js:502
+msgid "Publish article"
+msgstr "公開記事"
+
+#: js/viewfeed.js:654
+#, fuzzy
+msgid "%d article selected"
+msgid_plural "%d articles selected"
+msgstr[0] "選択された記事はありません。"
+msgstr[1] "選択された記事はありません。"
+
+#: js/viewfeed.js:726
+#: js/viewfeed.js:754
+#: js/viewfeed.js:781
+#: js/viewfeed.js:844
+#: js/viewfeed.js:878
+#: js/viewfeed.js:998
+#: js/viewfeed.js:1041
+#: js/viewfeed.js:1094
+#: js/viewfeed.js:2071
 #: plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "記事は選択されていません。"
 
-#: js/viewfeed.js:948
-msgid "Mark all visible articles in %s as read?"
-msgstr "「%s」のすべての可視記事を既読に設定しますか?"
-
-#: js/viewfeed.js:976
+#: js/viewfeed.js:1006
 #, fuzzy
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "選択した %d 件の記事を「%s」に設定しますか?"
 msgstr[1] "選択した %d 件の記事を「%s」に設定しますか?"
 
-#: js/viewfeed.js:978
+#: js/viewfeed.js:1008
 #, fuzzy
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "ラベルから選択した記事を削除しますか?"
 msgstr[1] "ラベルから選択した記事を削除しますか?"
 
-#: js/viewfeed.js:1020
+#: js/viewfeed.js:1050
 #, fuzzy
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "選択した %d 件の記事を「%s」に設定しますか?"
 msgstr[1] "選択した %d 件の記事を「%s」に設定しますか?"
 
-#: js/viewfeed.js:1023
+#: js/viewfeed.js:1053
 #, fuzzy
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "お気に入りの記事"
 msgstr[1] "お気に入りの記事"
 
-#: js/viewfeed.js:1025
+#: js/viewfeed.js:1055
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1070
+#: js/viewfeed.js:1100
 #, fuzzy
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "選択した %d 件の記事を「%s」に設定しますか?"
 msgstr[1] "選択した %d 件の記事を「%s」に設定しますか?"
 
-#: js/viewfeed.js:1094
+#: js/viewfeed.js:1124
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "タグを編集する"
 
-#: js/viewfeed.js:1100
+#: js/viewfeed.js:1130
 msgid "Saving article tags..."
 msgstr "記事のタグを保存しています..."
 
-#: js/viewfeed.js:1337
+#: js/viewfeed.js:1336
 msgid "No article is selected."
 msgstr "選択された記事はありません。"
 
-#: js/viewfeed.js:1372
+#: js/viewfeed.js:1371
 msgid "No articles found to mark"
 msgstr "マークした記事が見つかりません"
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1373
 #, fuzzy
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "%d 件のマークした記事を既読として設定しますか?"
 msgstr[1] "%d 件のマークした記事を既読として設定しますか?"
 
-#: js/viewfeed.js:1884
+#: js/viewfeed.js:1875
 #, fuzzy
 msgid "Open original article"
 msgstr "元の記事内容を表示する"
 
-#: js/viewfeed.js:1890
+#: js/viewfeed.js:1881
 #, fuzzy
 msgid "Display article URL"
 msgstr "タグの表示"
 
-#: js/viewfeed.js:1909
+#: js/viewfeed.js:1900
 #, fuzzy
 msgid "Toggle marked"
 msgstr "お気に入りを切り替える"
 
-#: js/viewfeed.js:1995
+#: js/viewfeed.js:1981
+msgid "Assign label"
+msgstr "ラベルの割り当て"
+
+#: js/viewfeed.js:1986
 #, fuzzy
 msgid "Remove label"
 msgstr "選択したラベルを削除しますか?"
 
-#: js/viewfeed.js:2019
-#, fuzzy
-msgid "Playing..."
-msgstr "フィード一覧を読み込んでいます..."
-
-#: js/viewfeed.js:2020
-#, fuzzy
-msgid "Click to pause"
-msgstr "編集するにはクリック"
-
-#: js/viewfeed.js:2077
+#: js/viewfeed.js:2040
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "このアーティクルのノートを入力してください:"
 
-#: js/viewfeed.js:2119
+#: js/viewfeed.js:2082
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "このアーティクルのノートを入力してください:"
 
-#: js/viewfeed.js:2152
+#: js/viewfeed.js:2115
 #, fuzzy
 msgid "Article URL:"
 msgstr "すべての記事"
 
-#: plugins/digest/digest.js:72
-#, fuzzy
-msgid "Mark %d displayed article as read?"
-msgid_plural "Mark %d displayed articles as read?"
-msgstr[0] "%d 件のマークした記事を既読として設定しますか?"
-msgstr[1] "%d 件のマークした記事を既読として設定しますか?"
-
-#: plugins/digest/digest.js:290
-#, fuzzy
-msgid "Error: unable to load article."
-msgstr "エラー: OPML ファイルをアップロードしてください。"
-
-#: plugins/digest/digest.js:464
-#, fuzzy
-msgid "Click to expand article."
-msgstr "開いた記事のクリック"
-
-#: plugins/digest/digest.js:535
-#, fuzzy
-msgid "%d more..."
-msgid_plural "%d more..."
-msgstr[0] "ヘルプを読み込んでいます..."
-msgstr[1] "ヘルプを読み込んでいます..."
-
-#: plugins/digest/digest.js:542
-#, fuzzy
-msgid "No unread feeds."
-msgstr "読んだフィードを隠す/再表示する"
-
-#: plugins/digest/digest.js:649
-#, fuzzy
-msgid "Load more..."
-msgstr "ヘルプを読み込んでいます..."
-
 #: plugins/embed_original/init.js:6
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
@@ -3920,15 +3746,219 @@ msgid "Share article by URL"
 msgstr "記事をお気に入りにする"
 
 #: plugins/updater/updater.js:58
-msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
+msgid "Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#, fuzzy
+#~ msgid "(Un)hide empty categories"
+#~ msgstr "カテゴリーの編集"
+
+#, fuzzy
+#~ msgid "Published articles and generated feeds"
+#~ msgstr "選択したフィードの記事のスコアを再計算しますか?"
+
+#, fuzzy
+#~ msgid "Articles shared by URL"
+#~ msgstr "記事をお気に入りにする"
+
+#~ msgid "These feeds have not been updated because of errors:"
+#~ msgstr "エラーのため、フィードは更新されませんでした:"
+
+#~ msgid "Hello,"
+#~ msgstr "ようこそ、"
+
+#, fuzzy
+#~ msgid "Enable categories"
+#~ msgstr "フィードカテゴリーを有効にする"
+
+#, fuzzy
+#~ msgid "Browse categories like folders"
+#~ msgstr "カテゴリーの順序をリセットする"
+
+#, fuzzy
+#~ msgid "Show images in posts"
+#~ msgstr "記事内に画像を表示しない"
+
+#, fuzzy
+#~ msgid "Hide read articles and feeds"
+#~ msgstr "読んだフィードを隠す/再表示する"
+
+#, fuzzy
+#~ msgid "Sort feeds by unread count"
+#~ msgstr "未読記事数によるフィードの並び替え"
+
+#, fuzzy
+#~ msgid "Article archive"
+#~ msgstr "記事の日付"
+
+#, fuzzy
+#~ msgid "Example Pane"
+#~ msgstr "例"
+
+#, fuzzy
+#~ msgid "Set value"
+#~ msgstr "お気に入りに設定する"
+
+#, fuzzy
+#~ msgid "Mark %d displayed article as read?"
+#~ msgid_plural "Mark %d displayed articles as read?"
+#~ msgstr[0] "%d 件のマークした記事を既読として設定しますか?"
+#~ msgstr[1] "%d 件のマークした記事を既読として設定しますか?"
+
+#, fuzzy
+#~ msgid "Error: unable to load article."
+#~ msgstr "エラー: OPML ファイルをアップロードしてください。"
+
+#, fuzzy
+#~ msgid "Click to expand article."
+#~ msgstr "開いた記事のクリック"
+
+#, fuzzy
+#~ msgid "%d more..."
+#~ msgid_plural "%d more..."
+#~ msgstr[0] "ヘルプを読み込んでいます..."
+#~ msgstr[1] "ヘルプを読み込んでいます..."
+
+#, fuzzy
+#~ msgid "No unread feeds."
+#~ msgstr "読んだフィードを隠す/再表示する"
+
+#, fuzzy
+#~ msgid "Load more..."
+#~ msgstr "ヘルプを読み込んでいます..."
+
+#~ msgid "Switch to digest..."
+#~ msgstr "ダイジェストに移行..."
+
+#, fuzzy
+#~ msgid "Show tag cloud..."
+#~ msgstr "タグクラウド"
+
+#, fuzzy
+#~ msgid "Click to play"
+#~ msgstr "クリックで表示"
+
+#~ msgid "Play"
+#~ msgstr "表示"
+
+#, fuzzy
+#~ msgid "Visit the website"
+#~ msgstr "オフィシャルサイトに訪問する"
+
+#~ msgid "Select theme"
+#~ msgstr "テーマを選択する"
+
+#, fuzzy
+#~ msgid "Playing..."
+#~ msgstr "フィード一覧を読み込んでいます..."
+
+#, fuzzy
+#~ msgid "Default interval between feed updates"
+#~ msgstr "フィードの更新までの標準間隔 (単位:分)"
+
+#~ msgid "Could not update database"
+#~ msgstr "データベースを更新できません"
+
+#~ msgid "Could not find necessary schema file, need version:"
+#~ msgstr "必要なスキーマファイルを見つけられませんでした。次のバージョンが必要です:"
+
+#~ msgid ", found: "
+#~ msgstr ", 以下が見つかりました: "
+
+#~ msgid "Tiny Tiny RSS database is up to date."
+#~ msgstr "Tiny Tiny RSS のデータベースを更新しました。"
+
+#~ msgid "Please backup your database before proceeding."
+#~ msgstr "実行前にデータベースのバックアップをしてください。"
+
+#~ msgid "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to <b>%d</b>)."
+#~ msgstr "Tiny Tiny RSS は最新のバージョンに更新する必要があります (<b>%d</b> から <b>%d</b>)。"
+
+#~ msgid "Performing updates..."
+#~ msgstr "更新を実行しています..."
+
+#~ msgid "Updating to version %d..."
+#~ msgstr "バージョン %d を確認しています..."
+
+#~ msgid "Checking version... "
+#~ msgstr "バージョンを確認しています..."
+
+#~ msgid "OK!"
+#~ msgstr "OK!"
+
+#~ msgid "ERROR!"
+#~ msgstr "エラー!"
+
+#, fuzzy
+#~ msgid "Finished. Performed <b>%d</b> update up to schema version <b>%d</b>."
+#~ msgid_plural "Finished. Performed <b>%d</b> updates up to schema version <b>%d</b>."
+#~ msgstr[0] "完了しました。<b>%d</b> 個のテーブルをスキーマーバージョン<b>%d</b> に更新しました。"
+#~ msgstr[1] "完了しました。<b>%d</b> 個のテーブルをスキーマーバージョン<b>%d</b> に更新しました。"
+
+#~ msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+#~ msgstr "Databaseスキーマは、Tiny Tiny RSSの新しいバージョンからのものです。"
+
+#~ msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+#~ msgstr "スキーマバージョンが: <b>%d</b>, でした。 以下が必要です: <b>%d</b>."
+
+#~ msgid "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer version and continue."
+#~ msgstr "スキーマアップグレードができません。Tiny Tiny RSSを新しいバージョンに更新してから続けてください。"
+
+#~ msgid "Mark feed as read"
+#~ msgstr "マークしたフィードを既読にする"
+
+#~ msgid "Title or Content"
+#~ msgstr "題名か内容"
+
+#~ msgid "Link"
+#~ msgstr "リンク"
+
+#~ msgid "Content"
+#~ msgstr "内容"
+
+#~ msgid "Article Date"
+#~ msgstr "記事の日付"
+
+#, fuzzy
+#~ msgid "Delete article"
+#~ msgstr "記事を消去する"
+
+#~ msgid "Set starred"
+#~ msgstr "お気に入りに設定する"
+
+#~ msgid "Assign tags"
+#~ msgstr "タグの割り当て"
+
+#~ msgid "Modify score"
+#~ msgstr "スコアを変更する"
+
+#, fuzzy
+#~ msgid "Date syntax appears to be correct:"
+#~ msgstr "古いパスワードが不正確です。"
+
+#, fuzzy
+#~ msgid "Date syntax is incorrect."
+#~ msgstr "古いパスワードが不正確です。"
+
+#, fuzzy
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "フィードを編集する"
+#~ msgstr[1] "フィードを編集する"
+
+#~ msgid "Notice"
+#~ msgstr "通知"
+
+#, fuzzy
+#~ msgid "Tag Cloud"
+#~ msgstr "タグクラウド"
+
+#~ msgid "Mark all visible articles in %s as read?"
+#~ msgstr "「%s」のすべての可視記事を既読に設定しますか?"
+
 #~ msgid "Form secret key incorrect. Please enable cookies and try again."
 #~ msgstr "シークレットキーが正しくありません。クッキーを有効にして再度実行してください。"
 
-#~ msgid "Date"
-#~ msgstr "日付"
-
 #~ msgid "Score"
 #~ msgstr "スコア"
 
@@ -4189,10 +4219,6 @@ msgstr ""
 #~ msgid "Click to expand article"
 #~ msgstr "開いた記事のクリック"
 
-#, fuzzy
-#~ msgid "Unable to load article."
-#~ msgstr "エラー: OPML ファイルをアップロードしてください。"
-
 #~ msgid "Update post on checksum change"
 #~ msgstr "チェックサムの変更で投稿を更新する"
 
@@ -4261,9 +4287,6 @@ msgstr ""
 #~ msgid "Hide feedlist"
 #~ msgstr "フィード一覧を隠す"
 
-#~ msgid "Enable labels"
-#~ msgstr "ラベルを有効にする"
-
 #~ msgid "Show additional information in feedlist"
 #~ msgstr "フィード一覧の追加情報を表示する"
 
@@ -4572,9 +4595,6 @@ msgstr ""
 #~ msgid "The configuration was reset to defaults."
 #~ msgstr "設定を標準に戻しました。"
 
-#~ msgid "Themes"
-#~ msgstr "テーマ"
-
 #~ msgid "Change theme"
 #~ msgstr "テーマを変更する"
 
@@ -4811,9 +4831,6 @@ msgstr ""
 #~ msgid "Site:"
 #~ msgstr "サイト:"
 
-#~ msgid "Last updated:"
-#~ msgstr "最終更新:"
-
 #~ msgid "Other feeds: Top 25"
 #~ msgstr "その他のフィード: トップ 25"
 
@@ -4832,9 +4849,6 @@ msgstr ""
 #~ msgid "SQL Expression"
 #~ msgstr "SQL 表記"
 
-#~ msgid "[No caption]"
-#~ msgstr "[キャプションなし]"
-
 #~ msgid "Labels and SQL Expressions"
 #~ msgstr "SQL 表現とラベル"