From c9c9e4a9eab5739b93b15ba59b0436a44f64e1f5 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 5 Jun 2022 08:52:40 +0000
Subject: Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: Tiny Tiny RSS/messages
Translate-URL: https://weblate.tt-rss.org/projects/tt-rss/messages/
---
 locale/ja_JP/LC_MESSAGES/messages.po | 3258 ++++++++++++++++++----------------
 1 file changed, 1688 insertions(+), 1570 deletions(-)

(limited to '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 77ee9e0cb..ff776a000 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss unstable\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-18 13:34+0300\n"
+"POT-Creation-Date: 2022-06-05 11:48+0300\n"
 "PO-Revision-Date: 2019-10-04 07:56+0000\n"
 "Last-Translator: Gorfiend <gorfiend@gmail.com>\n"
 "Language-Team: Japanese <https://weblate.tt-rss.org/projects/tt-rss/messages/"
@@ -83,104 +83,114 @@ msgstr "毎日"
 msgid "Weekly"
 msgstr "毎週"
 
-#: backend.php:90 classes/pref/system.php:124
+#: backend.php:90 classes/pref/feeds.php:547 classes/pref/feeds.php:600
+#, fuzzy
+msgid "Disabled"
+msgstr "OTP を無効にする"
+
+#: backend.php:91
+#, fuzzy
+msgid "Read Only"
+msgstr "有効性の確認"
+
+#: backend.php:92 classes/pref/system.php:123
 msgid "User"
 msgstr "ユーザー"
 
-#: backend.php:91
+#: backend.php:93
 msgid "Power User"
 msgstr "パワーユーザー"
 
-#: backend.php:92
+#: backend.php:94
 msgid "Administrator"
 msgstr "管理者"
 
-#: index.php:134 index.php:148 index.php:272 prefs.php:119
-#: classes/pref/prefs.php:877 classes/pref/prefs.php:927
-#: classes/pref/system.php:219 js/Feeds.js:475 js/PrefFeedTree.js:165
-#: js/PrefFeedTree.js:172 js/PrefFeedTree.js:296 js/PrefFeedTree.js:373
-#: js/CommonDialogs.js:289 js/CommonDialogs.js:446 js/CommonDialogs.js:598
-#: js/PrefHelpers.js:27 js/PrefHelpers.js:39 js/PrefHelpers.js:62
-#: js/PrefHelpers.js:115 js/PrefHelpers.js:243 js/PrefHelpers.js:294
-#: js/PrefHelpers.js:438 js/PrefHelpers.js:449 js/Headlines.js:354
-#: js/Headlines.js:539 js/PrefFilterTree.js:100 js/Article.js:290
-#: js/Article.js:352 js/PrefUsers.js:112 js/CommonFilters.js:277
-#: js/CommonFilters.js:405 plugins/af_psql_trgm/init.js:7
-#: plugins/note/note.js:28 plugins/af_readability/init.js:19
-#: plugins/share/share.js:56 js/CommonFilters.js:181
+#: index.php:134 index.php:148 index.php:300 prefs.php:119
+#: classes/pref/prefs.php:890 classes/pref/prefs.php:940
+#: classes/pref/system.php:218 js/Article.js:290 js/Article.js:352
+#: js/CommonDialogs.js:310 js/CommonDialogs.js:467 js/CommonDialogs.js:622
+#: js/CommonFilters.js:278 js/CommonFilters.js:408 js/Feeds.js:468
+#: js/Headlines.js:354 js/Headlines.js:538 js/PrefFeedTree.js:175
+#: js/PrefFeedTree.js:182 js/PrefFeedTree.js:306 js/PrefFeedTree.js:383
+#: js/PrefFilterTree.js:117 js/PrefHelpers.js:27 js/PrefHelpers.js:39
+#: js/PrefHelpers.js:62 js/PrefHelpers.js:115 js/PrefHelpers.js:243
+#: js/PrefHelpers.js:294 js/PrefHelpers.js:445 js/PrefHelpers.js:456
+#: js/PrefUsers.js:112 plugins/af_psql_trgm/init.js:7
+#: plugins/af_readability/init.js:19 plugins/note/note.js:38
+#: plugins/share/share.js:56 js/CommonFilters.js:182
 msgid "Loading, please wait..."
 msgstr "読み込んでいます。しばらくお待ちください..."
 
-#: index.php:163 prefs.php:128 js/App.js:460
+#: index.php:173 prefs.php:128 js/App.js:494
 msgid "Communication problem with server."
 msgstr "サーバーとの通信に問題が発生しました。"
 
-#: index.php:166 prefs.php:130
+#: index.php:176 prefs.php:130
 msgid "Recent entries found in event log."
 msgstr "イベントログに最近のエントリーが見つかりました。"
 
-#: index.php:169
+#: index.php:179
 msgid "Updates are available from Git."
 msgstr "Gitからのアップデートが利用できます。"
 
-#: index.php:184
+#: index.php:189 js/Headlines.js:661
 msgid "Show articles"
 msgstr "記事を表示"
 
-#: index.php:187
+#: index.php:192
 msgid "Adaptive"
 msgstr "適応的"
 
-#: index.php:188
+#: index.php:193
 msgid "All Articles"
 msgstr "すべての記事"
 
-#: index.php:189 classes/rpc.php:623
+#: index.php:194 classes/rpc.php:643
 msgid "Starred"
 msgstr "お気に入り"
 
-#: index.php:190 classes/rpc.php:624
+#: index.php:195 classes/rpc.php:644
 msgid "Published"
 msgstr "公開済み"
 
-#: index.php:191
+#: index.php:196 js/Headlines.js:664
 msgid "Unread"
 msgstr "未読"
 
-#: index.php:192
+#: index.php:197
 msgid "With Note"
 msgstr "ノート付き"
 
-#: index.php:195
+#: index.php:200
 msgid "Sort articles"
 msgstr "記事をソート"
 
-#: index.php:199
+#: index.php:204
 msgid "Default"
 msgstr "標準"
 
-#: index.php:200
+#: index.php:205
 msgid "Newest first"
 msgstr "新しい順"
 
-#: index.php:201
+#: index.php:206
 msgid "Oldest first"
 msgstr "古い順"
 
-#: index.php:202
+#: index.php:207 js/CommonFilters.js:435
 msgid "Title"
 msgstr "題名"
 
-#: index.php:214 index.php:248 classes/rpc.php:610 js/FeedTree.js:92
-#: js/FeedTree.js:122
+#: index.php:220 index.php:271 classes/rpc.php:630 js/FeedTree.js:92
+#: js/FeedTree.js:131 js/Headlines.js:1573 js/Headlines.js:672
 msgid "Mark as read"
 msgstr "既読にする"
 
-#: index.php:217
+#: index.php:221
 msgid "Older than one day"
 msgstr "1日前より古い項目"
 
-#: index.php:220
+#: index.php:222
 msgid "Older than one week"
 msgstr "1週間前より古い項目"
 
@@ -192,57 +202,71 @@ msgstr "2週間前より古い項目"
 msgid "Actions..."
 msgstr "操作..."
 
-#: index.php:241
+#: index.php:264
 msgid "Preferences..."
 msgstr "設定..."
 
-#: index.php:242
+#: index.php:265 js/PrefHelpers.js:614
 msgid "Search..."
 msgstr "検索..."
 
-#: index.php:243
+#: index.php:266
 msgid "Feed actions:"
 msgstr "フィード操作:"
 
-#: index.php:244 plugins/bookmarklets/init.php:38
-#: plugins/bookmarklets/init.php:72
+#: index.php:267 plugins/bookmarklets/init.php:40
+#: plugins/bookmarklets/init.php:74
 msgid "Subscribe to feed..."
 msgstr "フィードを購読する..."
 
-#: index.php:245
+#: index.php:268
 msgid "Edit this feed..."
 msgstr "フィードを編集する..."
 
-#: index.php:246 classes/pref/feeds.php:925 js/PrefFeedTree.js:99
-#: js/CommonDialogs.js:585
+#: index.php:269 classes/pref/feeds.php:939 js/CommonDialogs.js:609
+#: js/PrefFeedTree.js:109
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
-#: index.php:247
+#: index.php:270
 msgid "All feeds:"
 msgstr "すべてのフィード:"
 
-#: index.php:249
+#: index.php:272
 msgid "(Un)hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: index.php:250
-msgid "Other actions:"
-msgstr "その他の操作:"
+#: index.php:273
+msgid "UI layout:"
+msgstr ""
 
-#: index.php:251 classes/rpc.php:596
+#: index.php:274 classes/rpc.php:639
+msgid "Toggle combined mode"
+msgstr "組み合わせモードの切り替え"
+
+#: index.php:276 classes/rpc.php:616
 msgid "Toggle widescreen mode"
 msgstr "ワイド表示モードの切り替え"
 
-#: index.php:252
+#: index.php:278
+#, fuzzy
+#| msgid "Always expand articles"
+msgid "Toggle expand all articles"
+msgstr "常に記事を展開する"
+
+#: index.php:279
+msgid "Other actions:"
+msgstr "その他の操作:"
+
+#: index.php:280
 msgid "Keyboard shortcuts help"
 msgstr "キーボードショートカット"
 
-#: index.php:261
+#: index.php:289
 msgid "Logout"
 msgstr "ログアウト"
 
-#: prefs.php:20 prefs.php:139 classes/rpc.php:626 classes/pref/prefs.php:929
+#: prefs.php:20 prefs.php:139 classes/pref/prefs.php:942 classes/rpc.php:646
 msgid "Preferences"
 msgstr "設定"
 
@@ -250,16 +274,16 @@ msgstr "設定"
 msgid "Exit preferences"
 msgstr "設定を終了する"
 
-#: prefs.php:142 classes/pref/prefs.php:38 classes/pref/feeds.php:127
-#: classes/pref/feeds.php:914
+#: prefs.php:142 classes/pref/feeds.php:128 classes/pref/feeds.php:928
+#: classes/pref/prefs.php:48
 msgid "Feeds"
 msgstr "フィード"
 
-#: prefs.php:146 classes/pref/filters.php:228
+#: prefs.php:146 classes/pref/filters.php:241
 msgid "Filters"
 msgstr "フィルター"
 
-#: prefs.php:150 classes/pref/labels.php:23 classes/feeds.php:1254
+#: prefs.php:150 classes/pref/labels.php:23 classes/feeds.php:1395
 msgid "Labels"
 msgstr "ラベル"
 
@@ -271,517 +295,505 @@ msgstr "ユーザー"
 msgid "System"
 msgstr "システム"
 
-#: classes/rpc.php:565
-msgid "Navigation"
-msgstr "ナビゲーション"
+#: classes/handler/public.php:287 classes/pref/prefs.php:1463
+#: include/login_form.php:132
+msgid "Default profile"
+msgstr "標準のプロファイル"
 
-#: classes/rpc.php:566
-msgid "Open next feed"
-msgstr "次のフィードを開く"
+#: classes/handler/public.php:416
+msgid "Incorrect username or password"
+msgstr "ユーザー名かパスワードが正しくありません"
 
-#: classes/rpc.php:567
-#, fuzzy
-#| msgid "Open next feed"
-msgid "Open next unread feed"
-msgstr "次のフィードを開く"
+#: classes/handler/public.php:468
+msgid "Password recovery"
+msgstr "パスワードの復旧"
 
-#: classes/rpc.php:568
-msgid "Open previous feed"
-msgstr "前のフィードを開く"
+#: classes/handler/public.php:505 classes/handler/public.php:535
+#: classes/handler/public.php:595 classes/handler/public.php:712
+#: classes/handler/public.php:719 classes/handler/public.php:742
+#: plugins/bookmarklets/init.php:93 plugins/bookmarklets/init.php:138
+#: plugins/bookmarklets/init.php:156 plugins/bookmarklets/init.php:161
+msgid "Return to Tiny Tiny RSS"
+msgstr "Tiny Tiny RSS に戻る"
 
-#: classes/rpc.php:569
-#, fuzzy
-#| msgid "Open previous feed"
-msgid "Open previous unread feed"
-msgstr "前のフィードを開く"
+#: classes/handler/public.php:508
+msgid ""
+"You will need to provide valid account name and email. Password reset link "
+"will be sent to your email address."
+msgstr ""
+"有効なアカウント名と電子メールアドレスを入力する必要があります。パスワードリ"
+"セット用のリンクを記載したメールがあなたの電子メールアドレスに送信されます。"
 
-#: classes/rpc.php:570
-#, fuzzy
-msgid "Open next article (in combined mode, scroll down)"
-msgstr "次の記事を開く(スクロールしない)"
+#: classes/handler/public.php:515 classes/pref/feeds.php:658
+#: plugins/bookmarklets/init.php:304 include/login_form.php:103
+#: js/CommonDialogs.js:567 js/PrefUsers.js:64
+msgid "Login:"
+msgstr "ログイン:"
 
-#: classes/rpc.php:571
-#, fuzzy
-msgid "Open previous article (in combined mode, scroll up)"
-msgstr "前の記事を開く(スクロールしない)"
+#: classes/handler/public.php:520
+msgid "Email:"
+msgstr "メールアドレス:"
 
-#: classes/rpc.php:572
-#, fuzzy
-msgid "Scroll headlines by one page down"
-msgstr "マウスカーソルの下の記事を選択する"
+#: classes/handler/public.php:528
+#, php-format
+msgid "How much is %d + %d:"
+msgstr "%d足す%dはいくら:"
 
-#: classes/rpc.php:573
-#, fuzzy
-msgid "Scroll headlines by one page up"
-msgstr "マウスカーソルの下の記事を選択する"
+#: classes/handler/public.php:534 classes/pref/users.php:240
+msgid "Reset password"
+msgstr "パスワードのリセット"
 
-#: classes/rpc.php:574
-msgid "Open next article"
-msgstr "次の記事を開く"
+#: classes/handler/public.php:545
+msgid "Some of the required form parameters are missing or incorrect."
+msgstr "いくつかの必須項目が入力されていないか、正しくありません。"
 
-#: classes/rpc.php:575
-msgid "Open previous article"
-msgstr "前の記事を開く"
+#: classes/handler/public.php:549 classes/handler/public.php:601
+msgid "Go back"
+msgstr "戻る"
 
-#: classes/rpc.php:576
-#, fuzzy
-msgid "Move to next article (don't expand)"
-msgstr "次の記事へ移動する(展開せず既読にもしない)"
+#: classes/handler/public.php:587
+msgid "[tt-rss] Password reset request"
+msgstr "[tt-rss] パスワードリセットの要求"
 
-#: classes/rpc.php:577
-#, fuzzy
-msgid "Move to previous article (don't expand)"
-msgstr "前の記事へ移動する(展開せず既読にもしない)"
+#: classes/handler/public.php:597
+msgid "Sorry, login and email combination not found."
+msgstr ""
+"ログイン名とメールアドレスの組み合わせが組み合わせが見つかりませんでした。"
 
-#: classes/rpc.php:578
-msgid "Show search dialog"
-msgstr "検索ダイアログを表示する"
+#: classes/handler/public.php:617
+msgid "Your access level is insufficient to run this script."
+msgstr "あなたの権限では、このスクリプトを実行できません。"
 
-#: classes/rpc.php:579
-#, fuzzy
-msgid "Cancel active search"
-msgstr "検索の取り消し"
+#: classes/handler/public.php:679
+msgid "Database Updater"
+msgstr "データベースアップデーター"
 
-#: classes/rpc.php:580
-msgid "Article"
-msgstr "記事"
+#: classes/handler/public.php:692
+#, php-format
+msgid "Performing updates to version %d"
+msgstr "バージョン %d に更新を実行している"
 
-#: classes/rpc.php:581 js/Headlines.js:1388 js/Headlines.js:658
-msgid "Toggle starred"
-msgstr "お気に入りを切り替える"
+#: classes/handler/public.php:707 classes/handler/public.php:734
+#: js/PrefHelpers.js:418 js/PrefHelpers.js:764
+msgid "Update"
+msgstr "更新"
 
-#: classes/rpc.php:582 js/Headlines.js:1400
-msgid "Toggle published"
-msgstr "公開を切り替える"
+#: classes/handler/public.php:727
+#, fuzzy, php-format
+#| msgid ""
+#| "Tiny Tiny RSS database needs update to the latest version (%d to %d)."
+msgid "Database schema needs update to the latest version (%d to %d)."
+msgstr ""
+"Tiny Tiny RSS データベースを最新のバージョンに更新必要があります（%dから%d"
+"に）。"
 
-#: classes/rpc.php:583 js/Headlines.js:1375
-msgid "Toggle unread"
-msgstr "未読/既読を切り替える"
+#: classes/pref/feeds.php:77 classes/pref/feeds.php:236
+#: classes/pref/feeds.php:285 classes/pref/feeds.php:291
+#: classes/pref/feeds.php:321
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d フィード)"
 
-#: classes/rpc.php:584
-msgid "Edit tags"
-msgstr "タグを編集する"
+#: classes/pref/feeds.php:249 classes/pref/filters.php:934
+#: classes/digest.php:119 classes/feeds.php:1391 classes/opml.php:568
+#: include/controls.php:217
+msgid "Uncategorized"
+msgstr "カテゴリー割り当てなし"
 
-#: classes/rpc.php:585
-msgid "Open in new window"
-msgstr "新しいウィンドウで開く"
+#: classes/pref/feeds.php:545
+#, fuzzy, php-format
+msgid "(%d day)"
+msgid_plural "(%d days)"
+msgstr[0] "(%d フィード)"
 
-#: classes/rpc.php:586 js/Headlines.js:1421
-msgid "Mark below as read"
-msgstr "これより下を既読にする"
+#: classes/pref/feeds.php:551
+#, php-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
 
-#: classes/rpc.php:587 js/Headlines.js:1414
-msgid "Mark above as read"
-msgstr "これより上を既読にする"
+#: classes/pref/feeds.php:582
+msgid "Check to enable field"
+msgstr "有効にするフィールドにチェック"
 
-#: classes/rpc.php:588
-msgid "Scroll down"
-msgstr "下にスクロール"
+#: classes/pref/feeds.php:598
+#, fuzzy, php-format
+msgid "(%d days)"
+msgstr "(%d フィード)"
 
-#: classes/rpc.php:589
-msgid "Scroll up"
-msgstr "上にスクロール"
+#: classes/pref/feeds.php:603 js/CommonDialogs.js:482
+msgid "Include in e-mail digest"
+msgstr "電子メールダイジェストに含む"
 
-#: classes/rpc.php:590
-#, fuzzy
-msgid "Scroll down page"
-msgstr "下にスクロール"
+#: classes/pref/feeds.php:604 js/CommonDialogs.js:483
+msgid "Always display image attachments"
+msgstr "常に添付画像を表示する"
 
-#: classes/rpc.php:591
-#, fuzzy
-msgid "Scroll up page"
-msgstr "上にスクロール"
+#: classes/pref/feeds.php:605 classes/pref/prefs.php:123
+#: js/CommonDialogs.js:484
+msgid "Do not embed media"
+msgstr "メディアを埋め込まない"
 
-#: classes/rpc.php:592
-msgid "Select article under cursor"
-msgstr "マウスカーソルの下の記事を選択する"
+#: classes/pref/feeds.php:606 js/CommonDialogs.js:485
+msgid "Cache media"
+msgstr "メディアをキャッシュする"
 
-#: classes/rpc.php:593
-msgid "Email article"
-msgstr "記事をメールする"
+#: classes/pref/feeds.php:607 js/CommonDialogs.js:486
+msgid "Mark updated articles as unread"
+msgstr "更新された記事を未読にする"
 
-#: classes/rpc.php:594
-msgid "Close/collapse article"
-msgstr "記事を閉じる"
+#: classes/pref/feeds.php:618 classes/pref/prefs.php:40 js/CommonDialogs.js:493
+msgid "General"
+msgstr "全体"
 
-#: classes/rpc.php:595
-msgid "Toggle article expansion (combined mode)"
-msgstr "記事の展開状態の切り替え(組み合わせモード)"
+#: classes/pref/feeds.php:622 js/CommonDialogs.js:61 js/CommonDialogs.js:522
+#: js/PrefFeedTree.js:436
+msgid "Place in category:"
+msgstr "カテゴリーの場所:"
 
-#: classes/rpc.php:597
-msgid "Toggle full article text via Readability"
-msgstr ""
+#: classes/pref/feeds.php:630 js/Feeds.js:619 js/CommonDialogs.js:538
+msgid "Language:"
+msgstr "言語:"
 
-#: classes/rpc.php:598
-msgid "Article selection"
-msgstr "記事の選択"
+#: classes/pref/feeds.php:641 js/CommonDialogs.js:548
+#, fuzzy
+msgid "Update interval:"
+msgstr "標準の更新間隔"
 
-#: classes/rpc.php:599
-msgid "Select all articles"
-msgstr "すべての記事を選択する"
+#: classes/pref/feeds.php:648 js/CommonDialogs.js:554
+msgid "Article purging:"
+msgstr "記事の削除:"
 
-#: classes/rpc.php:600
-msgid "Select unread"
-msgstr "未読記事を選択する"
+#: classes/pref/feeds.php:655 plugins/auth_internal/init.php:81
+#: js/PrefFeedTree.js:444 js/CommonDialogs.js:564
+msgid "Authentication"
+msgstr "認証"
 
-#: classes/rpc.php:601
-msgid "Select starred"
-msgstr "お気に入りの記事を選択する"
+#: classes/pref/feeds.php:664 plugins/bookmarklets/init.php:311
+#: include/login_form.php:112 js/CommonDialogs.js:573
+msgid "Password:"
+msgstr "パスワード:"
 
-#: classes/rpc.php:602
-msgid "Select published"
-msgstr "公開済みの記事を選択する"
+#: classes/pref/feeds.php:671 js/CommonDialogs.js:580
+msgid "Options"
+msgstr "オプション"
 
-#: classes/rpc.php:603
-msgid "Invert selection"
-msgstr "選択を反転する"
+#: classes/pref/feeds.php:687 classes/pref/prefs.php:317
+#: plugins/af_psql_trgm/init.php:199 plugins/af_readability/init.php:92
+#: plugins/af_redditimgur/init.php:124 plugins/note/init.php:49
+#: plugins/nsfw/init.php:105 js/CommonDialogs.js:610 js/CommonFilters.js:237
+#: js/CommonFilters.js:321 js/CommonFilters.js:523 js/Article.js:358
+#: js/PrefLabelTree.js:170 js/PrefUsers.js:119
+msgid "Save"
+msgstr "保存"
 
-#: classes/rpc.php:604
-msgid "Deselect everything"
-msgstr "選択を全て解除する"
+#: classes/pref/feeds.php:688 plugins/bookmarklets/init.php:284
+#: plugins/note/init.php:50 js/CommonDialogs.js:611 js/CommonFilters.js:238
+#: js/CommonFilters.js:322 js/CommonFilters.js:524 js/CommonFilters.js:528
+#: js/Article.js:361 js/CommonDialogs.js:111 js/Feeds.js:633
+#: js/PrefFeedTree.js:464 js/PrefHelpers.js:232 js/PrefHelpers.js:306
+#: js/PrefLabelTree.js:173 js/PrefUsers.js:122
+msgid "Cancel"
+msgstr "取り消し"
 
-#: classes/rpc.php:605
-msgid "Feed"
-msgstr "フィード"
+#: classes/pref/feeds.php:890
+msgid "Feeds with errors"
+msgstr "エラーのあったフィード"
 
-#: classes/rpc.php:606
-msgid "Refresh current feed"
-msgstr "現在のフィードを更新する"
+#: classes/pref/feeds.php:896
+msgid "Inactive feeds"
+msgstr "活発でないフィード"
 
-#: classes/rpc.php:607
-msgid "Un/hide read feeds"
-msgstr "読んだフィードを隠す/再表示する"
+#: classes/pref/feeds.php:914 classes/pref/filters.php:670
+#: classes/pref/prefs.php:844 classes/pref/users.php:217 js/Feeds.js:637
+#: js/Feeds.js:632
+msgid "Search"
+msgstr "検索"
+
+#: classes/pref/feeds.php:918 classes/pref/filters.php:674
+#: classes/pref/labels.php:179 classes/pref/prefs.php:849
+#: classes/pref/prefs.php:1502 classes/pref/users.php:222
+#: js/CommonFilters.js:443 js/CommonFilters.js:476 js/CommonDialogs.js:257
+#: js/PrefFeedTree.js:513 js/PrefHelpers.js:184
+msgid "Select"
+msgstr "選択"
+
+#: classes/pref/feeds.php:921 classes/pref/filters.php:677
+#: classes/pref/prefs.php:852 classes/pref/prefs.php:1505
+#: classes/pref/users.php:225 js/CommonFilters.js:447 js/CommonFilters.js:479
+#: js/CommonDialogs.js:260 js/Headlines.js:663 js/PrefFeedTree.js:516
+#: js/PrefHelpers.js:187
+msgid "All"
+msgstr "すべて"
 
-#: classes/rpc.php:608 classes/pref/feeds.php:917 js/CommonDialogs.js:19
+#: classes/pref/feeds.php:923 classes/pref/filters.php:679
+#: classes/pref/prefs.php:854 classes/pref/prefs.php:1507
+#: classes/pref/users.php:227 js/CommonFilters.js:449 js/CommonFilters.js:481
+#: js/CommonDialogs.js:262 js/Headlines.js:666 js/PrefFeedTree.js:518
+#: js/PrefHelpers.js:189
+msgid "None"
+msgstr "なし"
+
+#: classes/pref/feeds.php:931 classes/rpc.php:628 js/CommonDialogs.js:34
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: classes/rpc.php:609 js/PrefFeedTree.js:93 js/CommonDialogs.js:336
-#: js/Headlines.js:1544 js/FeedTree.js:99
-msgid "Edit feed"
-msgstr "フィードを編集する"
+#: classes/pref/feeds.php:933
+msgid "Edit selected feeds"
+msgstr "選択したフィードを編集"
 
-#: classes/rpc.php:611
-msgid "Reverse headlines"
-msgstr "ヘッドラインの順序を逆転する"
-
-#: classes/rpc.php:612
-msgid "Toggle headline grouping"
-msgstr "ヘッドラインのグループ化の切り替え"
-
-#: classes/rpc.php:613
-#, fuzzy
-#| msgid "Toggle sidebar"
-msgid "Toggle grid view"
-msgstr "サイドバーを切り替える"
-
-#: classes/rpc.php:614
-msgid "Debug feed update"
-msgstr "フィードの更新をデバッグする"
-
-#: classes/rpc.php:615
-msgid "Debug viewfeed()"
-msgstr "viewfeed() をデバッグする"
-
-#: classes/rpc.php:616 js/FeedTree.js:155
-msgid "Mark all feeds as read"
-msgstr "すべてのフィードを既読に設定する"
+#: classes/pref/feeds.php:935 classes/pref/feeds.php:950
+#: classes/pref/filters.php:690
+msgid "Reset sort order"
+msgstr "ソート順のリセット"
 
-#: classes/rpc.php:617
-msgid "Un/collapse current category"
-msgstr "カテゴリーの開閉"
+#: classes/pref/feeds.php:937 js/PrefFeedTree.js:406
+msgid "Batch subscribe"
+msgstr "一括購読"
 
-#: classes/rpc.php:618
-msgid "Toggle auto expand in combined mode"
-msgstr "組み合わせモードでの自動展開の切り替え"
+#: classes/pref/feeds.php:945
+msgid "Categories"
+msgstr "カテゴリー"
 
-#: classes/rpc.php:619
-msgid "Toggle combined mode"
-msgstr "組み合わせモードの切り替え"
+#: classes/pref/feeds.php:948
+msgid "Add category"
+msgstr "カテゴリーを追加"
 
-#: classes/rpc.php:620
-msgid "Go to"
-msgstr "移動"
+#: classes/pref/feeds.php:952 classes/pref/prefs.php:416 js/PrefHelpers.js:227
+msgid "Remove selected"
+msgstr "選択したカテゴリーを削除"
 
-#: classes/rpc.php:621 classes/feeds.php:1120
-msgid "All articles"
-msgstr "すべての記事"
+#: classes/pref/feeds.php:997
+msgid "Choose file..."
+msgstr "ファイルを選択..."
 
-#: classes/rpc.php:622
-msgid "Fresh"
-msgstr "新しい記事"
+#: classes/pref/feeds.php:1005
+msgid "Import OPML"
+msgstr "OPML インポート"
 
-#: classes/rpc.php:625 classes/feeds.php:1124
-msgid "Recently read"
-msgstr "最近読んだ"
+#: classes/pref/feeds.php:1016
+msgid "Export OPML"
+msgstr "OPML エクスポート"
 
-#: classes/rpc.php:627
-msgid "Other"
-msgstr "その他"
+#: classes/pref/feeds.php:1021
+#, fuzzy
+#| msgid "Include settings"
+msgid "Include tt-rss settings"
+msgstr "設定を含める"
 
-#: classes/rpc.php:628
-msgid "Create label"
-msgstr "ラベルを作成する"
+#: classes/pref/feeds.php:1037
+msgid "Display URL"
+msgstr "URL の表示"
 
-#: classes/rpc.php:629 classes/pref/filters.php:659
-msgid "Create filter"
-msgstr "フィルターを作成する"
+#: classes/pref/feeds.php:1042
+msgid "Clear all generated URLs"
+msgstr "生成された URL をすべて消去する"
 
-#: classes/rpc.php:630
-msgid "Un/collapse sidebar"
-msgstr "サイドバーを開閉する"
+#: classes/pref/feeds.php:1054
+#, fuzzy
+msgid "My feeds"
+msgstr "さらなるフィード"
 
-#: classes/rpc.php:631
-msgid "Show help dialog"
-msgstr "ヘルプダイアログを表示する"
+#: classes/pref/feeds.php:1059
+msgid "OPML"
+msgstr "OPML"
 
-#: classes/rpc.php:766
-msgid "Shift"
-msgstr "Shift"
+#: classes/pref/feeds.php:1064
+#, fuzzy
+msgid "Sharing"
+msgstr "共有"
 
-#: classes/rpc.php:769
-msgid "Ctrl"
-msgstr "Ctrl"
+#: classes/pref/feeds.php:1077 classes/pref/prefs.php:945
+#: js/CommonDialogs.js:604
+msgid "Plugins"
+msgstr "プラグイン"
 
-#: classes/rpc.php:794 plugins/af_psql_trgm/init.php:112
-#: plugins/share/init.php:274 js/PrefHelpers.js:491 js/Feeds.js:272
-#: js/CommonDialogs.js:273 js/PrefHelpers.js:66 js/PrefHelpers.js:814
-#: js/CommonFilters.js:101
-msgid "Close this window"
-msgstr "このウィンドウを閉じる"
+#: classes/pref/filters.php:210 classes/pref/filters.php:221
+#: classes/pref/filters.php:441 classes/pref/filters.php:881
+msgid "All feeds"
+msgstr "すべてのフィード"
 
-#: classes/handler/public.php:277 classes/pref/prefs.php:1424
-#: include/login_form.php:132
-msgid "Default profile"
-msgstr "標準のプロファイル"
+#: classes/pref/filters.php:232 classes/pref/filters.php:461
+msgid "(inverse)"
+msgstr "(反転)"
 
-#: classes/handler/public.php:389
-msgid "Incorrect username or password"
-msgstr "ユーザー名かパスワードが正しくありません"
+#: classes/pref/filters.php:228 classes/pref/filters.php:460
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "「%3$s」の %2$s に対して %1$s %4$s"
 
-#: classes/handler/public.php:441
-msgid "Password recovery"
-msgstr "パスワードの復旧"
+#: classes/pref/filters.php:684 classes/rpc.php:649
+msgid "Create filter"
+msgstr "フィルターを作成する"
 
-#: classes/handler/public.php:478 classes/handler/public.php:508
-#: classes/handler/public.php:568 classes/handler/public.php:685
-#: classes/handler/public.php:692 classes/handler/public.php:715
-#: plugins/bookmarklets/init.php:91 plugins/bookmarklets/init.php:136
-#: plugins/bookmarklets/init.php:154 plugins/bookmarklets/init.php:159
-msgid "Return to Tiny Tiny RSS"
-msgstr "Tiny Tiny RSS に戻る"
+#: classes/pref/filters.php:686
+msgid "Combine"
+msgstr "組み合わせ"
 
-#: classes/handler/public.php:481
-msgid ""
-"You will need to provide valid account name and email. Password reset link "
-"will be sent to your email address."
-msgstr ""
-"有効なアカウント名と電子メールアドレスを入力する必要があります。パスワードリ"
-"セット用のリンクを記載したメールがあなたの電子メールアドレスに送信されます。"
+#: classes/pref/filters.php:688 classes/pref/users.php:236
+#: js/CommonDialogs.js:602 js/CommonFilters.js:521
+msgid "Remove"
+msgstr "削除"
 
-#: classes/handler/public.php:488 classes/pref/feeds.php:641
-#: plugins/bookmarklets/init.php:302 include/login_form.php:103
-#: js/CommonDialogs.js:543 js/PrefUsers.js:64
-msgid "Login:"
-msgstr "ログイン:"
+#: classes/pref/filters.php:692
+#, fuzzy
+msgid "Toggle rule display"
+msgstr "フィード一覧を閉じる"
 
-#: classes/handler/public.php:493
-msgid "Email:"
-msgstr "メールアドレス:"
+#: classes/pref/filters.php:751
+msgid "[No caption]"
+msgstr "[キャプションなし]"
 
-#: classes/handler/public.php:501
+#: classes/pref/filters.php:753
 #, php-format
-msgid "How much is %d + %d:"
-msgstr "%d足す%dはいくら:"
-
-#: classes/handler/public.php:507 classes/pref/users.php:240
-msgid "Reset password"
-msgstr "パスワードのリセット"
-
-#: classes/handler/public.php:518
-msgid "Some of the required form parameters are missing or incorrect."
-msgstr "いくつかの必須項目が入力されていないか、正しくありません。"
-
-#: classes/handler/public.php:522 classes/handler/public.php:574
-msgid "Go back"
-msgstr "戻る"
-
-#: classes/handler/public.php:560
-msgid "[tt-rss] Password reset request"
-msgstr "[tt-rss] パスワードリセットの要求"
-
-#: classes/handler/public.php:570
-msgid "Sorry, login and email combination not found."
-msgstr ""
-"ログイン名とメールアドレスの組み合わせが組み合わせが見つかりませんでした。"
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "%s (%d ルール)"
 
-#: classes/handler/public.php:590
-msgid "Your access level is insufficient to run this script."
-msgstr "あなたの権限では、このスクリプトを実行できません。"
+#: classes/pref/filters.php:767
+msgid "matches any rule"
+msgstr "いずれかのルールに一致"
 
-#: classes/handler/public.php:652
-msgid "Database Updater"
-msgstr "データベースアップデーター"
+#: classes/pref/filters.php:768
+msgid "inverse"
+msgstr "反転"
 
-#: classes/handler/public.php:665
+#: classes/pref/filters.php:771
 #, php-format
-msgid "Performing updates to version %d"
-msgstr "バージョン %d に更新を実行している"
-
-#: classes/handler/public.php:680 classes/handler/public.php:707
-#: js/PrefHelpers.js:411 js/PrefHelpers.js:757
-msgid "Update"
-msgstr "更新"
-
-#: classes/handler/public.php:700
-#, fuzzy, php-format
-#| msgid ""
-#| "Tiny Tiny RSS database needs update to the latest version (%d to %d)."
-msgid "Database schema needs update to the latest version (%d to %d)."
-msgstr ""
-"Tiny Tiny RSS データベースを最新のバージョンに更新必要があります（%dから%d"
-"に）。"
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "%s (+%d 操作)"
 
-#: classes/pref/labels.php:168
+#: classes/pref/labels.php:167
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "ラベル <b>%s</b> を作成しました"
 
-#: classes/pref/labels.php:180 classes/pref/prefs.php:836
-#: classes/pref/prefs.php:1463 classes/pref/filters.php:649
-#: classes/pref/users.php:222 classes/pref/feeds.php:904
-#: js/CommonFilters.js:440 js/CommonFilters.js:473 js/CommonDialogs.js:236
-msgid "Select"
-msgstr "選択"
-
-#: classes/pref/prefs.php:30 classes/pref/feeds.php:601
-msgid "General"
-msgstr "全体"
-
-#: classes/pref/prefs.php:51
+#: classes/pref/prefs.php:61
 msgid "Articles"
 msgstr "記事"
 
-#: classes/pref/prefs.php:65
+#: classes/pref/prefs.php:75
 msgid "Digest"
 msgstr "ダイジェスト"
 
-#: classes/pref/prefs.php:70
+#: classes/pref/prefs.php:80
 msgid "Advanced"
 msgstr "高度"
 
-#: classes/pref/prefs.php:81
+#: classes/pref/prefs.php:91
 msgid "Debugging"
 msgstr ""
 
-#: classes/pref/prefs.php:87
+#: classes/pref/prefs.php:97
 msgid "Never apply these tags automatically (comma-separated list)."
 msgstr ""
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:101
 msgid "Blacklisted tags"
 msgstr "ブラックリスト化したタグ"
 
-#: classes/pref/prefs.php:92
+#: classes/pref/prefs.php:102
 msgid "Default language"
 msgstr "標準の言語"
 
-#: classes/pref/prefs.php:92
+#: classes/pref/prefs.php:102
 msgid "Used for full-text search"
 msgstr ""
 
-#: classes/pref/prefs.php:93
+#: classes/pref/prefs.php:103
 msgid "Mark read on scroll"
 msgstr "スクロールで既読にする"
 
-#: classes/pref/prefs.php:93
+#: classes/pref/prefs.php:103
 #, fuzzy
 msgid "Mark articles as read as you scroll past them"
 msgstr "すべての記事を既読にしますか?"
 
-#: classes/pref/prefs.php:94
+#: classes/pref/prefs.php:104
 msgid "Always expand articles"
 msgstr "常に記事を展開する"
 
-#: classes/pref/prefs.php:95
+#: classes/pref/prefs.php:105
 msgid "Combined mode"
 msgstr "組み合わせモード"
 
-#: classes/pref/prefs.php:95
+#: classes/pref/prefs.php:105
 #, fuzzy
 msgid "Show flat list of articles instead of separate panels"
 msgstr ""
 "ヘッドラインと記事の内容を分けて表示するのではなく、展開された記事のリストを"
 "表示する。"
 
-#: classes/pref/prefs.php:96
+#: classes/pref/prefs.php:106
 msgid "Confirm marking feeds as read"
 msgstr "フィードを既読にする際に確認する"
 
-#: classes/pref/prefs.php:97
+#: classes/pref/prefs.php:107
 msgid "Default update interval"
 msgstr "標準の更新間隔"
 
-#: classes/pref/prefs.php:98
+#: classes/pref/prefs.php:108
 msgid "Mark sent articles as read"
 msgstr "送信した記事を既読に設定する"
 
-#: classes/pref/prefs.php:99
+#: classes/pref/prefs.php:109
 msgid "Enable digest"
 msgstr "ダイジェストを有効にする"
 
-#: classes/pref/prefs.php:99
+#: classes/pref/prefs.php:109
 msgid "Send daily digest of new (and unread) headlines to your e-mail address"
 msgstr ""
 "設定された電子メールアドレスに毎日新しい(かつ未読の)ヘッドラインのダイジェス"
 "トを送る"
 
-#: classes/pref/prefs.php:100
+#: classes/pref/prefs.php:110
 #, fuzzy
 msgid "Try to send around this time"
 msgstr "指定された時刻前後にダイジェストの送信を試みる"
 
-#: classes/pref/prefs.php:100
+#: classes/pref/prefs.php:110
 msgid "Time in UTC"
 msgstr "UTCの時間"
 
-#: classes/pref/prefs.php:101
+#: classes/pref/prefs.php:111
 msgid "Enable API"
 msgstr "API を有効にする"
 
-#: classes/pref/prefs.php:101
+#: classes/pref/prefs.php:111
 msgid "Allows accessing this account through the API"
 msgstr "このアカウントに対する API 経由でアクセスを許可する"
 
-#: classes/pref/prefs.php:102
+#: classes/pref/prefs.php:112
 msgid "Enable categories"
 msgstr "カテゴリーを有効にする"
 
-#: classes/pref/prefs.php:103
+#: classes/pref/prefs.php:113
 msgid "Maximum age of fresh articles"
 msgstr "新しい記事としての取り扱い期限"
 
-#: classes/pref/prefs.php:103
+#: classes/pref/prefs.php:113
 msgid "hours"
 msgstr "時間"
 
-#: classes/pref/prefs.php:104
+#: classes/pref/prefs.php:114
 msgid "Hide read feeds"
 msgstr "読んだフィードを隠す"
 
-#: classes/pref/prefs.php:105
+#: classes/pref/prefs.php:115
 msgid "Always show special feeds"
 msgstr "特別フィードを常に表示する"
 
-#: classes/pref/prefs.php:105
+#: classes/pref/prefs.php:115
 msgid "While hiding read feeds"
 msgstr "読んだフィードを隠す場合"
 
-#: classes/pref/prefs.php:106
+#: classes/pref/prefs.php:116
 msgid "Long date format"
 msgstr "完全な日付の形式"
 
-#: classes/pref/prefs.php:106
+#: classes/pref/prefs.php:116
 msgid ""
 "Syntax is identical to PHP <a href='http://php.net/manual/function.date."
 "php'>date()</a> function."
@@ -789,273 +801,235 @@ msgstr ""
 "構文は PHP の <a href='http://php.net/manual/function.date.php'>date()</a> 関"
 "数と同じです。"
 
-#: classes/pref/prefs.php:107
+#: classes/pref/prefs.php:117
 msgid "Automatically show next feed"
 msgstr "次のフィードを自動的に表示する"
 
-#: classes/pref/prefs.php:107
+#: classes/pref/prefs.php:117
 msgid "After marking one as read"
 msgstr "フィードを既読にする際"
 
-#: classes/pref/prefs.php:108
+#: classes/pref/prefs.php:118
 msgid "Purge articles older than"
 msgstr "これより古い記事を削除する"
 
-#: classes/pref/prefs.php:108
+#: classes/pref/prefs.php:118
 msgid "<strong>days</strong> (0 disables)"
 msgstr "<strong>日</strong> (0 で無効にする)"
 
-#: classes/pref/prefs.php:109
+#: classes/pref/prefs.php:119
 msgid "Purge unread articles"
 msgstr "未読記事を削除する"
 
-#: classes/pref/prefs.php:110
+#: classes/pref/prefs.php:120
 msgid "Short date format"
 msgstr "短い日付の形式"
 
-#: classes/pref/prefs.php:111
+#: classes/pref/prefs.php:121
 msgid "Show content preview in headlines"
 msgstr "ヘッドラインに内容のプレビューを表示する"
 
-#: classes/pref/prefs.php:112
+#: classes/pref/prefs.php:122
 msgid "SSL client certificate"
 msgstr "SSL クライアント証明書"
 
-#: classes/pref/prefs.php:113 classes/pref/feeds.php:588
-#: js/CommonDialogs.js:462
-msgid "Do not embed media"
-msgstr "メディアを埋め込まない"
-
-#: classes/pref/prefs.php:114
+#: classes/pref/prefs.php:124
 msgid "Time zone"
 msgstr "タイムゾーン"
 
-#: classes/pref/prefs.php:115
+#: classes/pref/prefs.php:125
 msgid "Group by feed"
 msgstr ""
 
-#: classes/pref/prefs.php:115
+#: classes/pref/prefs.php:125
 msgid "Group multiple-feed output by originating feed"
 msgstr ""
 
-#: classes/pref/prefs.php:116
+#: classes/pref/prefs.php:126
 msgid "Language"
 msgstr "言語"
 
-#: classes/pref/prefs.php:117
+#: classes/pref/prefs.php:127
 msgid "Theme"
 msgstr "テーマ"
 
-#: classes/pref/prefs.php:118
+#: classes/pref/prefs.php:128
 msgid "Don't enforce DISTINCT headlines"
 msgstr ""
 
-#: classes/pref/prefs.php:118
+#: classes/pref/prefs.php:128
 #, fuzzy
 msgid "May produce duplicate entries"
 msgstr "重複記事の許可"
 
-#: classes/pref/prefs.php:119
+#: classes/pref/prefs.php:129
 #, fuzzy
 msgid "Show article and feed IDs"
 msgstr "記事を表示"
 
-#: classes/pref/prefs.php:119
+#: classes/pref/prefs.php:129
 #, fuzzy
 msgid "In the headlines buffer"
 msgstr "フィード日時によるヘッドラインの並び替え"
 
-#: classes/pref/prefs.php:120
+#: classes/pref/prefs.php:130
 #, fuzzy
 #| msgid "Disable updates"
 msgid "Disable conditional counter updates"
 msgstr "更新を無効にする"
 
-#: classes/pref/prefs.php:120
+#: classes/pref/prefs.php:130
 msgid "May increase server load"
 msgstr ""
 
-#: classes/pref/prefs.php:121
+#: classes/pref/prefs.php:131
 #, fuzzy
 msgid "Grid view"
 msgstr "新しい記事"
 
-#: classes/pref/prefs.php:121
+#: classes/pref/prefs.php:131
 msgid "On wider screens, if always expanded"
 msgstr ""
 
-#: classes/pref/prefs.php:222
+#: classes/pref/prefs.php:232
 msgid "The configuration was saved."
 msgstr "設定を保存しました。"
 
-#: classes/pref/prefs.php:264
+#: classes/pref/prefs.php:274
 msgid "Your personal data has been saved."
 msgstr "個人データを変更しました。"
 
-#: classes/pref/prefs.php:294
+#: classes/pref/prefs.php:304
 msgid "Full name:"
 msgstr "フルネーム:"
 
-#: classes/pref/prefs.php:299 js/PrefUsers.js:98
+#: classes/pref/prefs.php:309 js/PrefUsers.js:98
 msgid "E-mail:"
 msgstr "電子メール:"
 
-#: classes/pref/prefs.php:307 classes/pref/feeds.php:670
-#: plugins/af_psql_trgm/init.php:193 plugins/note/init.php:51
-#: plugins/af_readability/init.php:91 plugins/nsfw/init.php:98
-#: plugins/af_redditimgur/init.php:101 js/CommonDialogs.js:586
-#: js/CommonFilters.js:236 js/CommonFilters.js:320 js/CommonFilters.js:520
-#: js/PrefLabelTree.js:170 js/Article.js:358 js/PrefUsers.js:119
-msgid "Save"
-msgstr "保存"
-
-#: classes/pref/prefs.php:358
+#: classes/pref/prefs.php:368
 msgid "Old password:"
 msgstr "現在のパスワード:"
 
-#: classes/pref/prefs.php:363 js/PrefUsers.js:84
+#: classes/pref/prefs.php:373 js/PrefUsers.js:84
 msgid "New password:"
 msgstr "新しいパスワード:"
 
-#: classes/pref/prefs.php:368
+#: classes/pref/prefs.php:378
 msgid "Confirm password:"
 msgstr "新しいパスワード(確認):"
 
-#: classes/pref/prefs.php:376
+#: classes/pref/prefs.php:386 js/PrefUsers.js:86
 msgid "Change password"
 msgstr "パスワードを変更する"
 
-#: classes/pref/prefs.php:383
+#: classes/pref/prefs.php:393
 #, php-format
 msgid ""
 "Authentication module used for this session (<b>%s</b>) does not provide an "
 "ability to set passwords."
 msgstr ""
 
-#: classes/pref/prefs.php:400
+#: classes/pref/prefs.php:410
 #, fuzzy
 msgid "Generate password"
 msgstr "新しい URL を生成する"
 
-#: classes/pref/prefs.php:406 classes/pref/feeds.php:938 js/PrefHelpers.js:227
-msgid "Remove selected"
-msgstr "選択したカテゴリーを削除"
-
-#: classes/pref/prefs.php:442 classes/pref/prefs.php:494
+#: classes/pref/prefs.php:452 classes/pref/prefs.php:504
 msgid "Your password:"
 msgstr "パスワード:"
 
-#: classes/pref/prefs.php:450
+#: classes/pref/prefs.php:460
 msgid "Disable OTP"
 msgstr "OTP を無効にする"
 
-#: classes/pref/prefs.php:472
+#: classes/pref/prefs.php:482
 msgid "OTP secret:"
 msgstr ""
 
-#: classes/pref/prefs.php:499
+#: classes/pref/prefs.php:509
 msgid "Verification code:"
 msgstr ""
 
-#: classes/pref/prefs.php:507
+#: classes/pref/prefs.php:517
 msgid "Enable OTP"
 msgstr "OTP を有効にする"
 
-#: classes/pref/prefs.php:521
+#: classes/pref/prefs.php:531
 msgid "Personal data"
 msgstr "個人データ"
 
-#: classes/pref/prefs.php:524
+#: classes/pref/prefs.php:534 js/CommonDialogs.js:89 js/PrefFeedTree.js:447
 msgid "Password"
 msgstr "パスワード"
 
-#: classes/pref/prefs.php:527
+#: classes/pref/prefs.php:537
 #, fuzzy
 msgid "App passwords"
 msgstr "現在のパスワード:"
 
-#: classes/pref/prefs.php:530
+#: classes/pref/prefs.php:540
 #, fuzzy
 msgid "Authenticator (OTP)"
 msgstr "認証"
 
-#: classes/pref/prefs.php:541
+#: classes/pref/prefs.php:551
 msgid "Some preferences are only available in default profile."
 msgstr "いくつかの設定は標準プロファイルでのみ有効です。"
 
-#: classes/pref/prefs.php:630
+#: classes/pref/prefs.php:643
 msgid "default"
 msgstr "標準"
 
-#: classes/pref/prefs.php:638
+#: classes/pref/prefs.php:651
 msgid "Customize"
 msgstr "カスタマイズ"
 
-#: classes/pref/prefs.php:640
+#: classes/pref/prefs.php:653
 msgid "More themes..."
 msgstr "テーマを追加..."
 
-#: classes/pref/prefs.php:671
+#: classes/pref/prefs.php:684
 #, fuzzy
 msgid "Preview"
 msgstr "新しい記事"
 
-#: classes/pref/prefs.php:697
+#: classes/pref/prefs.php:710
 msgid "Register"
 msgstr "登録"
 
-#: classes/pref/prefs.php:701 classes/pref/system.php:101
+#: classes/pref/prefs.php:714 classes/pref/system.php:100
 msgid "Clear"
 msgstr "消去"
 
-#: classes/pref/prefs.php:705 classes/pref/prefs.php:871
-#: plugins/bookmarklets/init.php:364 js/CommonDialogs.js:641
+#: classes/pref/prefs.php:718 classes/pref/prefs.php:884
+#: plugins/bookmarklets/init.php:365 js/CommonDialogs.js:665
 msgid "More info..."
 msgstr "詳細情報..."
 
-#: classes/pref/prefs.php:713
+#: classes/pref/prefs.php:726
 #, php-format
 msgid "Current server time: %s"
 msgstr "現在のサーバー時刻: %s"
 
-#: classes/pref/prefs.php:761
+#: classes/pref/prefs.php:774
 msgid "Save configuration"
 msgstr "設定を保存する"
 
-#: classes/pref/prefs.php:764
+#: classes/pref/prefs.php:777
 #, fuzzy
 msgid "Save and exit"
 msgstr "これより上を既読にする"
 
-#: classes/pref/prefs.php:771 js/PrefHelpers.js:127
+#: classes/pref/prefs.php:784 js/PrefHelpers.js:127
 msgid "Manage profiles"
 msgstr "プロファイルを管理する"
 
-#: classes/pref/prefs.php:776
+#: classes/pref/prefs.php:789
 msgid "Reset to defaults"
 msgstr "標準に戻す"
 
-#: classes/pref/prefs.php:831 classes/pref/filters.php:645
-#: classes/pref/users.php:217 classes/pref/feeds.php:900 js/Feeds.js:644
-#: js/Feeds.js:639
-msgid "Search"
-msgstr "検索"
-
-#: classes/pref/prefs.php:839 classes/pref/prefs.php:1466
-#: classes/pref/filters.php:652 classes/pref/users.php:225
-#: classes/pref/feeds.php:907 js/CommonFilters.js:444 js/CommonFilters.js:476
-#: js/PrefFeedTree.js:506 js/PrefHelpers.js:187 js/Headlines.js:652
-msgid "All"
-msgstr "すべて"
-
-#: classes/pref/prefs.php:841 classes/pref/prefs.php:1468
-#: classes/pref/filters.php:654 classes/pref/users.php:227
-#: classes/pref/feeds.php:909 js/CommonFilters.js:446 js/CommonFilters.js:478
-#: js/CommonDialogs.js:241
-msgid "None"
-msgstr "なし"
-
-#: classes/pref/prefs.php:869
+#: classes/pref/prefs.php:882
 #, php-format
 msgid ""
 "The following plugins use per-feed content hooks. This may cause excessive "
@@ -1063,74 +1037,70 @@ msgid ""
 "%s</b>"
 msgstr ""
 
-#: classes/pref/prefs.php:885 js/CommonFilters.js:234
+#: classes/pref/prefs.php:898 js/CommonFilters.js:235
 #, fuzzy
 msgid "More info"
 msgstr "その他情報"
 
-#: classes/pref/prefs.php:888
+#: classes/pref/prefs.php:901
 #, fuzzy
 #| msgid "Enable selected plugins"
 msgid "Enable selected"
 msgstr "選択したプラグインを有効にする"
 
-#: classes/pref/prefs.php:891
+#: classes/pref/prefs.php:904
 msgid "Reload"
 msgstr ""
 
-#: classes/pref/prefs.php:898
+#: classes/pref/prefs.php:911
 #, fuzzy
 #| msgid "Perform updates"
 msgid "Check for updates"
 msgstr "更新の実行"
 
-#: classes/pref/prefs.php:905
+#: classes/pref/prefs.php:918
 #, fuzzy
 #| msgid "Mail plugin"
 msgid "Install plugin"
 msgstr "メールプラグイン"
 
-#: classes/pref/prefs.php:918
+#: classes/pref/prefs.php:931
 msgid "Personal data / Authentication"
 msgstr "個人データ / 認証"
 
-#: classes/pref/prefs.php:932 classes/pref/feeds.php:1067
-msgid "Plugins"
-msgstr "プラグイン"
-
-#: classes/pref/prefs.php:965
+#: classes/pref/prefs.php:979
 msgid "Incorrect one time password"
 msgstr "ワンタイムパスワードが正しくありません"
 
-#: classes/pref/prefs.php:968 classes/pref/prefs.php:1006
+#: classes/pref/prefs.php:982 classes/pref/prefs.php:1021
 msgid "Incorrect password"
 msgstr "パスワードが正しくありません"
 
-#: classes/pref/prefs.php:1021
+#: classes/pref/prefs.php:1036
 #, php-format
 msgid "v%.2f, by %s"
 msgstr ""
 
-#: classes/pref/prefs.php:1034
+#: classes/pref/prefs.php:1050
 #, php-format
 msgid "v%s, by %s"
 msgstr ""
 
-#: classes/pref/prefs.php:1477
+#: classes/pref/prefs.php:1516
 msgid "Description"
 msgstr "説明"
 
-#: classes/pref/prefs.php:1478
+#: classes/pref/prefs.php:1517
 #, fuzzy
 msgid "Created"
 msgstr "作成"
 
-#: classes/pref/prefs.php:1479
+#: classes/pref/prefs.php:1518
 #, fuzzy
 msgid "Last used"
 msgstr "最終更新:"
 
-#: classes/pref/prefs.php:1524
+#: classes/pref/prefs.php:1563
 #, php-format
 msgid ""
 "Generated password <strong>%s</strong> for %s. Please remember it for future "
@@ -1141,139 +1111,81 @@ msgstr ""
 msgid "Test message from tt-rss"
 msgstr ""
 
-#: classes/pref/system.php:82 js/PrefHelpers.js:615
+#: classes/pref/system.php:81 js/PrefHelpers.js:622
 msgid "Refresh"
 msgstr "再描画"
 
-#: classes/pref/system.php:87
+#: classes/pref/system.php:86
 msgid "&lt;&lt;"
 msgstr ""
 
-#: classes/pref/system.php:91
+#: classes/pref/system.php:90
 #, php-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: classes/pref/system.php:96
+#: classes/pref/system.php:95
 msgid "&gt;&gt;"
 msgstr ""
 
-#: classes/pref/system.php:105
+#: classes/pref/system.php:104
 msgid "Severity:"
 msgstr ""
 
-#: classes/pref/system.php:109
+#: classes/pref/system.php:108
 #, fuzzy
 msgid "Errors"
 msgstr "エラー"
 
-#: classes/pref/system.php:110
+#: classes/pref/system.php:109
 msgid "Warnings"
 msgstr ""
 
-#: classes/pref/system.php:111
+#: classes/pref/system.php:110
 #, fuzzy
 msgid "Everything"
 msgstr "選択を全て解除する"
 
-#: classes/pref/system.php:121
+#: classes/pref/system.php:120
 msgid "Error"
 msgstr "エラー"
 
-#: classes/pref/system.php:122
+#: classes/pref/system.php:121
 msgid "Filename"
 msgstr "ファイル名"
 
-#: classes/pref/system.php:123
+#: classes/pref/system.php:122
 msgid "Message"
 msgstr "メッセージ"
 
-#: classes/pref/system.php:125
+#: classes/pref/system.php:124
 msgid "Date"
 msgstr "日付"
 
-#: classes/pref/system.php:169
+#: classes/pref/system.php:168
 #, fuzzy
 msgid "Event log"
 msgstr "ログの消去"
 
-#: classes/pref/system.php:175
+#: classes/pref/system.php:174
 #, fuzzy
 #| msgid "Save configuration"
 msgid "Mail configuration"
 msgstr "設定を保存する"
 
-#: classes/pref/system.php:202
+#: classes/pref/system.php:201
 msgid "To:"
 msgstr "To:"
 
-#: classes/pref/system.php:204
+#: classes/pref/system.php:203
 #, fuzzy
 msgid "Send test email"
 msgstr "電子メールを送信する"
 
-#: classes/pref/system.php:210
+#: classes/pref/system.php:209
 msgid "PHP Information"
 msgstr "PHP 情報"
 
-#: classes/pref/filters.php:197 classes/pref/filters.php:208
-#: classes/pref/filters.php:426 classes/pref/filters.php:847
-msgid "All feeds"
-msgstr "すべてのフィード"
-
-#: classes/pref/filters.php:219 classes/pref/filters.php:446
-msgid "(inverse)"
-msgstr "(反転)"
-
-#: classes/pref/filters.php:215 classes/pref/filters.php:445
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "「%3$s」の %2$s に対して %1$s %4$s"
-
-#: classes/pref/filters.php:661
-msgid "Combine"
-msgstr "組み合わせ"
-
-#: classes/pref/filters.php:663 classes/pref/feeds.php:921
-#: classes/pref/feeds.php:936
-msgid "Reset sort order"
-msgstr "ソート順のリセット"
-
-#: classes/pref/filters.php:665 classes/pref/users.php:236
-#: js/CommonDialogs.js:578 js/CommonFilters.js:518
-msgid "Remove"
-msgstr "削除"
-
-#: classes/pref/filters.php:720
-msgid "[No caption]"
-msgstr "[キャプションなし]"
-
-#: classes/pref/filters.php:722
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] "%s (%d ルール)"
-
-#: classes/pref/filters.php:736
-msgid "matches any rule"
-msgstr "いずれかのルールに一致"
-
-#: classes/pref/filters.php:737
-msgid "inverse"
-msgstr "反転"
-
-#: classes/pref/filters.php:740
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "%s (+%d 操作)"
-
-#: classes/pref/filters.php:900 classes/pref/feeds.php:247
-#: classes/digest.php:116 classes/opml.php:544 classes/feeds.php:1250
-#: include/controls.php:177
-msgid "Uncategorized"
-msgstr "カテゴリー割り当てなし"
-
 #: classes/pref/users.php:56
 msgid "Registered"
 msgstr "登録済み"
@@ -1290,7 +1202,7 @@ msgstr "購読したフィード"
 msgid "Stored articles"
 msgstr "保存した記事"
 
-#: classes/pref/users.php:101 classes/userhelper.php:223
+#: classes/pref/users.php:101 classes/userhelper.php:240
 msgid "User not found"
 msgstr "ユーザーが見つかりません"
 
@@ -1317,532 +1229,688 @@ msgstr "ユーザーの作成"
 msgid "Click to edit"
 msgstr "編集するにはクリック"
 
-#: classes/pref/feeds.php:77 classes/pref/feeds.php:233
-#: classes/pref/feeds.php:281 classes/pref/feeds.php:287
-#: classes/pref/feeds.php:316
+#: classes/config.php:373
 #, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d フィード)"
-
-#: classes/pref/feeds.php:533
-#, fuzzy, php-format
-msgid "(%d day)"
-msgid_plural "(%d days)"
-msgstr[0] "(%d フィード)"
-
-#: classes/pref/feeds.php:535 classes/pref/feeds.php:583
-#, fuzzy
-msgid "Disabled"
-msgstr "OTP を無効にする"
-
-#: classes/pref/feeds.php:539
-#, php-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] ""
-
-#: classes/pref/feeds.php:565
-msgid "Check to enable field"
-msgstr "有効にするフィールドにチェック"
-
-#: classes/pref/feeds.php:581
-#, fuzzy, php-format
-msgid "(%d days)"
-msgstr "(%d フィード)"
-
-#: classes/pref/feeds.php:586 js/CommonDialogs.js:460
-msgid "Include in e-mail digest"
-msgstr "電子メールダイジェストに含む"
-
-#: classes/pref/feeds.php:587 js/CommonDialogs.js:461
-msgid "Always display image attachments"
-msgstr "常に添付画像を表示する"
-
-#: classes/pref/feeds.php:589 js/CommonDialogs.js:463
-msgid "Cache media"
-msgstr "メディアをキャッシュする"
-
-#: classes/pref/feeds.php:590 js/CommonDialogs.js:464
-msgid "Mark updated articles as unread"
-msgstr "更新された記事を未読にする"
-
-#: classes/pref/feeds.php:605 js/PrefFeedTree.js:426 js/CommonDialogs.js:500
-msgid "Place in category:"
-msgstr "カテゴリーの場所:"
-
-#: classes/pref/feeds.php:613 js/Feeds.js:626 js/CommonDialogs.js:516
-msgid "Language:"
-msgstr "言語:"
-
-#: classes/pref/feeds.php:624 js/CommonDialogs.js:526
-#, fuzzy
-msgid "Update interval:"
-msgstr "標準の更新間隔"
+msgid "Git error [RC=%d]: %s"
+msgstr ""
 
-#: classes/pref/feeds.php:631 js/CommonDialogs.js:530
-msgid "Article purging:"
-msgstr "記事の削除:"
+#: classes/feeds.php:59 classes/feeds.php:512
+msgid "Feed not found."
+msgstr "フィードが見つかりません。"
 
-#: classes/pref/feeds.php:638 plugins/auth_internal/init.php:101
-#: js/PrefFeedTree.js:434
-msgid "Authentication"
-msgstr "認証"
+#: classes/feeds.php:126
+msgid "Never"
+msgstr "未更新"
 
-#: classes/pref/feeds.php:647 plugins/bookmarklets/init.php:309
-#: include/login_form.php:112 js/CommonDialogs.js:549
-msgid "Password:"
-msgstr "パスワード:"
+#: classes/feeds.php:209 classes/feeds.php:1256
+msgid "Archived articles"
+msgstr "保管された記事"
 
-#: classes/pref/feeds.php:654
-msgid "Options"
-msgstr "オプション"
+#: classes/feeds.php:302
+msgid "Collapse article"
+msgstr "記事を閉じる"
 
-#: classes/pref/feeds.php:671 plugins/note/init.php:52
-#: plugins/bookmarklets/init.php:282 js/CommonDialogs.js:587
-#: js/CommonFilters.js:237 js/CommonFilters.js:321 js/CommonFilters.js:521
-#: js/CommonFilters.js:525 js/Feeds.js:640 js/PrefFeedTree.js:454
-#: js/PrefHelpers.js:232 js/PrefHelpers.js:306
-msgid "Cancel"
-msgstr "取り消し"
+#: classes/feeds.php:325
+#, php-format
+msgid "Imported at %s"
+msgstr "%s にインポート"
 
-#: classes/pref/feeds.php:876
-msgid "Feeds with errors"
-msgstr "エラーのあったフィード"
+#: classes/feeds.php:401
+msgid "No unread articles found to display."
+msgstr "表示する未読記事が見つかりませんでした。"
 
-#: classes/pref/feeds.php:882
-msgid "Inactive feeds"
-msgstr "活発でないフィード"
+#: classes/feeds.php:404
+msgid "No updated articles found to display."
+msgstr "表示する更新された記事が見つかりませんでした。"
 
-#: classes/pref/feeds.php:919
-msgid "Edit selected feeds"
-msgstr "選択したフィードを編集"
+#: classes/feeds.php:407
+msgid "No starred articles found to display."
+msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
-#: classes/pref/feeds.php:923 js/PrefFeedTree.js:396
-msgid "Batch subscribe"
-msgstr "一括購読"
+#: classes/feeds.php:411
+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/pref/feeds.php:931
-msgid "Categories"
-msgstr "カテゴリー"
+#: classes/feeds.php:413
+msgid "No articles found to display."
+msgstr "表示する記事が見つかりません。"
 
-#: classes/pref/feeds.php:934
-msgid "Add category"
-msgstr "カテゴリーを追加"
+#: classes/feeds.php:430 classes/feeds.php:584
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "%s に最終更新されたフィード"
 
-#: classes/pref/feeds.php:987
-msgid "Choose file..."
-msgstr "ファイルを選択..."
+#: classes/feeds.php:442 classes/feeds.php:596
+msgid "Some feeds have update errors (click for details)"
+msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
-#: classes/pref/feeds.php:995
-msgid "Import OPML"
-msgstr "OPML インポート"
+#: classes/feeds.php:573
+msgid "No feed selected."
+msgstr "フィードが選択されていません。"
 
-#: classes/pref/feeds.php:1006
-msgid "Export OPML"
-msgstr "OPML エクスポート"
+#: classes/feeds.php:1248
+msgid "Starred articles"
+msgstr "お気に入りの記事"
 
-#: classes/pref/feeds.php:1011
-#, fuzzy
-#| msgid "Include settings"
-msgid "Include tt-rss settings"
-msgstr "設定を含める"
+#: classes/feeds.php:1250
+msgid "Published articles"
+msgstr "公開済みの記事"
 
-#: classes/pref/feeds.php:1027
-msgid "Display URL"
-msgstr "URL の表示"
+#: classes/feeds.php:1252
+msgid "Fresh articles"
+msgstr "新しい記事"
 
-#: classes/pref/feeds.php:1032
-msgid "Clear all generated URLs"
-msgstr "生成された URL をすべて消去する"
+#: classes/feeds.php:1254 classes/rpc.php:641
+msgid "All articles"
+msgstr "すべての記事"
 
-#: classes/pref/feeds.php:1044
-#, fuzzy
-msgid "My feeds"
-msgstr "さらなるフィード"
+#: classes/feeds.php:1258 classes/rpc.php:645
+msgid "Recently read"
+msgstr "最近読んだ"
 
-#: classes/pref/feeds.php:1049
-msgid "OPML"
-msgstr "OPML"
+#: classes/feeds.php:1393
+msgid "Special"
+msgstr "特別"
 
-#: classes/pref/feeds.php:1054
-#, fuzzy
-msgid "Sharing"
-msgstr "共有"
+#: classes/feeds.php:1488
+#, php-format
+msgid "Incorrect search syntax: %s."
+msgstr ""
 
-#: classes/userhelper.php:221
+#: classes/feeds.php:1678
 #, php-format
-msgid "Changed password of user %s to %s"
-msgstr "ユーザー %s のパスワードを %s に変更しました"
+msgid "Search results: %s"
+msgstr "検索結果: %s"
 
-#: classes/opml.php:28 classes/opml.php:32
+#: classes/opml.php:31 classes/opml.php:35
 msgid "OPML Utility"
 msgstr "OPML ユーティリティ"
 
-#: classes/opml.php:36
+#: classes/opml.php:39
 msgid "Importing OPML..."
 msgstr "OPML のインポート中..."
 
-#: classes/opml.php:41
+#: classes/opml.php:44
 msgid "Return to preferences"
 msgstr "設定に戻る"
 
-#: classes/opml.php:321
+#: classes/opml.php:324
 #, php-format
 msgid "Adding feed: %s"
 msgstr "フィード追加: %s"
 
-#: classes/opml.php:341
+#: classes/opml.php:344
 #, php-format
 msgid "Duplicate feed: %s"
 msgstr "重複したフィード: %s"
 
-#: classes/opml.php:355
+#: classes/opml.php:358
 #, php-format
 msgid "Adding label %s"
 msgstr "ラベル %s の割り当て"
 
-#: classes/opml.php:358
+#: classes/opml.php:361
 #, php-format
 msgid "Duplicate label: %s"
 msgstr "重複したラベル: %s"
 
-#: classes/opml.php:370
+#: classes/opml.php:373
 #, php-format
 msgid "Setting preference key %s to %s"
 msgstr "%s を %s に設定"
 
-#: classes/opml.php:406
+#: classes/opml.php:409
 #, php-format
 msgid "Adding filter %s..."
 msgstr "フィルタ「%s」を追加しています..."
 
-#: classes/opml.php:544
+#: classes/opml.php:568
 #, php-format
 msgid "Processing category: %s"
 msgstr "処理中のカテゴリ: %s"
 
-#: classes/opml.php:590
+#: classes/opml.php:619
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "エラーコード %d でアップロードが失敗しました"
 
-#: classes/opml.php:602
+#: classes/opml.php:631
 msgid "Unable to move uploaded file."
 msgstr "アップロードされたファイルを移動できません。"
 
-#: classes/opml.php:606
+#: classes/opml.php:635
 msgid "Error: please upload OPML file."
 msgstr "エラー: OPML ファイルをアップロードしてください。"
 
-#: classes/opml.php:619
-msgid "Error: unable to find moved OPML file."
-msgstr "エラー: 移動された OPML ファイルが見つかりません。"
+#: classes/opml.php:643
+#, php-format
+msgid "Error: file is not readable: %s"
+msgstr ""
 
-#: classes/opml.php:628
+#: classes/opml.php:671
 msgid "Error while parsing document."
 msgstr "ドキュメントの解析中のエラーです。"
 
-#: classes/config.php:335
-#, php-format
-msgid "Git error [RC=%d]: %s"
-msgstr ""
-
-#: classes/feeds.php:54 classes/feeds.php:467
-msgid "Feed not found."
-msgstr "フィードが見つかりません。"
+#: classes/rpc.php:585
+msgid "Navigation"
+msgstr "ナビゲーション"
 
-#: classes/feeds.php:119
-msgid "Never"
-msgstr "未更新"
+#: classes/rpc.php:586
+msgid "Open next feed"
+msgstr "次のフィードを開く"
 
-#: classes/feeds.php:198 classes/feeds.php:1122
-msgid "Archived articles"
-msgstr "保管された記事"
+#: classes/rpc.php:587
+#, fuzzy
+#| msgid "Open next feed"
+msgid "Open next unread feed"
+msgstr "次のフィードを開く"
 
-#: classes/feeds.php:257
-msgid "Collapse article"
-msgstr "記事を閉じる"
+#: classes/rpc.php:588
+msgid "Open previous feed"
+msgstr "前のフィードを開く"
 
-#: classes/feeds.php:280
-#, php-format
-msgid "Imported at %s"
-msgstr "%s にインポート"
+#: classes/rpc.php:589
+#, fuzzy
+#| msgid "Open previous feed"
+msgid "Open previous unread feed"
+msgstr "前のフィードを開く"
 
-#: classes/feeds.php:356
-msgid "No unread articles found to display."
-msgstr "表示する未読記事が見つかりませんでした。"
+#: classes/rpc.php:590
+#, fuzzy
+msgid "Open next article (in combined mode, scroll down)"
+msgstr "次の記事を開く(スクロールしない)"
 
-#: classes/feeds.php:359
-msgid "No updated articles found to display."
-msgstr "表示する更新された記事が見つかりませんでした。"
+#: classes/rpc.php:591
+#, fuzzy
+msgid "Open previous article (in combined mode, scroll up)"
+msgstr "前の記事を開く(スクロールしない)"
 
-#: classes/feeds.php:362
-msgid "No starred articles found to display."
-msgstr "表示するお気に入りの記事が見つかりませんでした。"
+#: classes/rpc.php:592
+#, fuzzy
+msgid "Scroll headlines by one page down"
+msgstr "マウスカーソルの下の記事を選択する"
 
-#: classes/feeds.php:366
-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."
+#: classes/rpc.php:593
+#, fuzzy
+msgid "Scroll headlines by one page up"
+msgstr "マウスカーソルの下の記事を選択する"
+
+#: classes/rpc.php:594
+msgid "Open next article"
+msgstr "次の記事を開く"
+
+#: classes/rpc.php:595
+msgid "Open previous article"
+msgstr "前の記事を開く"
+
+#: classes/rpc.php:596
+#, fuzzy
+msgid "Move to next article (don't expand)"
+msgstr "次の記事へ移動する(展開せず既読にもしない)"
+
+#: classes/rpc.php:597
+#, fuzzy
+msgid "Move to previous article (don't expand)"
+msgstr "前の記事へ移動する(展開せず既読にもしない)"
+
+#: classes/rpc.php:598
+msgid "Show search dialog"
+msgstr "検索ダイアログを表示する"
+
+#: classes/rpc.php:599
+#, fuzzy
+msgid "Cancel active search"
+msgstr "検索の取り消し"
+
+#: classes/rpc.php:600
+msgid "Article"
+msgstr "記事"
+
+#: classes/rpc.php:601 js/Headlines.js:1446 js/Headlines.js:669
+msgid "Toggle starred"
+msgstr "お気に入りを切り替える"
+
+#: classes/rpc.php:602 js/Headlines.js:1458 js/Headlines.js:670
+msgid "Toggle published"
+msgstr "公開を切り替える"
+
+#: classes/rpc.php:603 js/Headlines.js:1433 js/Headlines.js:668
+msgid "Toggle unread"
+msgstr "未読/既読を切り替える"
+
+#: classes/rpc.php:604
+msgid "Edit tags"
+msgstr "タグを編集する"
+
+#: classes/rpc.php:605
+msgid "Open in new window"
+msgstr "新しいウィンドウで開く"
+
+#: classes/rpc.php:606 js/Headlines.js:1479
+msgid "Mark below as read"
+msgstr "これより下を既読にする"
+
+#: classes/rpc.php:607 js/Headlines.js:1472
+msgid "Mark above as read"
+msgstr "これより上を既読にする"
+
+#: classes/rpc.php:608
+msgid "Scroll down"
+msgstr "下にスクロール"
+
+#: classes/rpc.php:609
+msgid "Scroll up"
+msgstr "上にスクロール"
+
+#: classes/rpc.php:610
+#, fuzzy
+msgid "Scroll down page"
+msgstr "下にスクロール"
+
+#: classes/rpc.php:611
+#, fuzzy
+msgid "Scroll up page"
+msgstr "上にスクロール"
+
+#: classes/rpc.php:612
+msgid "Select article under cursor"
+msgstr "マウスカーソルの下の記事を選択する"
+
+#: classes/rpc.php:613
+msgid "Email article"
+msgstr "記事をメールする"
+
+#: classes/rpc.php:614
+msgid "Close/collapse article"
+msgstr "記事を閉じる"
+
+#: classes/rpc.php:615
+msgid "Toggle article expansion (combined mode)"
+msgstr "記事の展開状態の切り替え(組み合わせモード)"
+
+#: classes/rpc.php:617
+msgid "Toggle full article text via Readability"
 msgstr ""
-"表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ"
-"ニューを参照します)、フィルターを使うことができます。"
 
-#: classes/feeds.php:368
-msgid "No articles found to display."
-msgstr "表示する記事が見つかりません。"
+#: classes/rpc.php:618
+msgid "Article selection"
+msgstr "記事の選択"
 
-#: classes/feeds.php:385 classes/feeds.php:536
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "%s に最終更新されたフィード"
+#: classes/rpc.php:619
+msgid "Select all articles"
+msgstr "すべての記事を選択する"
 
-#: classes/feeds.php:397 classes/feeds.php:548
-msgid "Some feeds have update errors (click for details)"
-msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
+#: classes/rpc.php:620
+msgid "Select unread"
+msgstr "未読記事を選択する"
 
-#: classes/feeds.php:525
-msgid "No feed selected."
-msgstr "フィードが選択されていません。"
+#: classes/rpc.php:621
+msgid "Select starred"
+msgstr "お気に入りの記事を選択する"
 
-#: classes/feeds.php:1114
-msgid "Starred articles"
-msgstr "お気に入りの記事"
+#: classes/rpc.php:622
+msgid "Select published"
+msgstr "公開済みの記事を選択する"
 
-#: classes/feeds.php:1116
-msgid "Published articles"
-msgstr "公開済みの記事"
+#: classes/rpc.php:623
+msgid "Invert selection"
+msgstr "選択を反転する"
 
-#: classes/feeds.php:1118
-msgid "Fresh articles"
+#: classes/rpc.php:624
+msgid "Deselect everything"
+msgstr "選択を全て解除する"
+
+#: classes/rpc.php:625
+msgid "Feed"
+msgstr "フィード"
+
+#: classes/rpc.php:626
+msgid "Refresh current feed"
+msgstr "現在のフィードを更新する"
+
+#: classes/rpc.php:627
+msgid "Un/hide read feeds"
+msgstr "読んだフィードを隠す/再表示する"
+
+#: classes/rpc.php:629 js/CommonDialogs.js:357 js/FeedTree.js:99
+#: js/Headlines.js:1579 js/Headlines.js:1644 js/PrefFeedTree.js:103
+msgid "Edit feed"
+msgstr "フィードを編集する"
+
+#: classes/rpc.php:631
+msgid "Reverse headlines"
+msgstr "ヘッドラインの順序を逆転する"
+
+#: classes/rpc.php:632
+msgid "Toggle headline grouping"
+msgstr "ヘッドラインのグループ化の切り替え"
+
+#: classes/rpc.php:633
+#, fuzzy
+#| msgid "Toggle sidebar"
+msgid "Toggle grid view"
+msgstr "サイドバーを切り替える"
+
+#: classes/rpc.php:634
+msgid "Debug feed update"
+msgstr "フィードの更新をデバッグする"
+
+#: classes/rpc.php:635
+msgid "Debug viewfeed()"
+msgstr "viewfeed() をデバッグする"
+
+#: classes/rpc.php:636 js/FeedTree.js:164
+msgid "Mark all feeds as read"
+msgstr "すべてのフィードを既読に設定する"
+
+#: classes/rpc.php:637
+msgid "Un/collapse current category"
+msgstr "カテゴリーの開閉"
+
+#: classes/rpc.php:638
+msgid "Toggle auto expand in combined mode"
+msgstr "組み合わせモードでの自動展開の切り替え"
+
+#: classes/rpc.php:640
+msgid "Go to"
+msgstr "移動"
+
+#: classes/rpc.php:642
+msgid "Fresh"
 msgstr "新しい記事"
 
-#: classes/feeds.php:1252
-msgid "Special"
-msgstr "特別"
+#: classes/rpc.php:647
+msgid "Other"
+msgstr "その他"
 
-#: classes/feeds.php:1343
-#, php-format
-msgid "Incorrect search syntax: %s."
-msgstr ""
+#: classes/rpc.php:648
+msgid "Create label"
+msgstr "ラベルを作成する"
 
-#: classes/feeds.php:1533
-#, php-format
-msgid "Search results: %s"
-msgstr "検索結果: %s"
+#: classes/rpc.php:650
+msgid "Un/collapse sidebar"
+msgstr "サイドバーを開閉する"
+
+#: classes/rpc.php:651
+msgid "Show help dialog"
+msgstr "ヘルプダイアログを表示する"
+
+#: classes/rpc.php:790
+msgid "Shift"
+msgstr "Shift"
+
+#: classes/rpc.php:793
+msgid "Ctrl"
+msgstr "Ctrl"
+
+#: classes/rpc.php:818 plugins/af_psql_trgm/init.php:118
+#: plugins/share/init.php:283 js/PrefHelpers.js:498 js/App.js:661
+#: js/CommonDialogs.js:22 js/CommonDialogs.js:294 js/CommonDialogs.js:671
+#: js/CommonFilters.js:102 js/Feeds.js:272 js/PrefFeedTree.js:547
+#: js/PrefHelpers.js:66 js/PrefHelpers.js:821
+msgid "Close this window"
+msgstr "このウィンドウを閉じる"
 
 #: classes/timehelper.php:8
 #, php-format
 msgid "%d min"
 msgstr "%d 分"
 
-#: plugins/auth_internal/init.php:112
-#, fuzzy
-#| msgid "Please enter label caption:"
-msgid "Please enter verification code (OTP):"
-msgstr "ラベルのキャプションを入力してください:"
-
-#: plugins/auth_internal/init.php:114
-#, fuzzy
-#| msgid "Content:"
-msgid "Continue"
-msgstr "内容:"
+#: classes/userhelper.php:238
+#, php-format
+msgid "Changed password of user %s to %s"
+msgstr "ユーザー %s のパスワードを %s に変更しました"
 
-#: plugins/auth_internal/init.php:166
-msgid "Too many authentication attempts, throttled."
+#: classes/mailer.php:60
+#, php-format
+msgid "Unknown error while sending mail. Hooks tried: %d."
 msgstr ""
 
-#: plugins/auth_internal/init.php:247
-msgid "Password has been changed."
-msgstr "パスワードを変更しました。"
+#: plugins/af_comics/init.php:60
+msgid "Feeds supported by af_comics"
+msgstr ""
 
-#: plugins/auth_internal/init.php:249
-msgid "Old password is incorrect."
-msgstr "古いパスワードが不正確です。"
+#: plugins/af_comics/init.php:62
+msgid "The following comics are currently supported:"
+msgstr ""
 
-#: plugins/af_psql_trgm/init.php:31
+#: plugins/af_psql_trgm/init.php:36
 #, php-format
 msgid "Data saved (%s, %d)"
 msgstr ""
 
-#: plugins/af_psql_trgm/init.php:121
+#: plugins/af_psql_trgm/init.php:127
 msgid "Show related articles"
 msgstr "関連記事を表示する"
 
-#: plugins/af_psql_trgm/init.php:134
+#: plugins/af_psql_trgm/init.php:140
 #, fuzzy
 msgid "Mark similar articles as read (af_psql_trgm)"
 msgstr "類似記事を既読にする"
 
-#: plugins/af_psql_trgm/init.php:164
+#: plugins/af_psql_trgm/init.php:170
 msgid "Minimum similarity:"
 msgstr ""
 
-#: plugins/af_psql_trgm/init.php:172
+#: plugins/af_psql_trgm/init.php:178
 msgid ""
 "PostgreSQL trigram extension returns string similarity as a floating point "
 "number (0-1). Setting it too low might produce false positives, zero "
 "disables checking."
 msgstr ""
 
-#: plugins/af_psql_trgm/init.php:177
+#: plugins/af_psql_trgm/init.php:183
 msgid "Minimum title length:"
 msgstr ""
 
-#: plugins/af_psql_trgm/init.php:187
+#: plugins/af_psql_trgm/init.php:193
 #, fuzzy
 msgid "Enable for all feeds."
 msgstr "全フィードで有効にする:"
 
-#: plugins/af_psql_trgm/init.php:206 plugins/af_readability/init.php:108
+#: plugins/af_psql_trgm/init.php:212 plugins/af_readability/init.php:109
 msgid "Currently enabled for (click to edit):"
 msgstr ""
 
-#: plugins/af_psql_trgm/init.php:226
+#: plugins/af_psql_trgm/init.php:232
 msgid "Similarity (af_psql_trgm)"
 msgstr ""
 
-#: plugins/af_psql_trgm/init.php:232
+#: plugins/af_psql_trgm/init.php:238
 msgid "Mark similar articles as read"
 msgstr "類似記事を既読にする"
 
-#: plugins/note/init.php:26 plugins/note/note.js:6
-msgid "Edit article note"
-msgstr "記事のノートを編集する"
-
-#: plugins/af_readability/init.php:27
+#: plugins/af_readability/init.php:28
 msgid "Data saved."
 msgstr ""
 
-#: plugins/af_readability/init.php:44
+#: plugins/af_readability/init.php:45
 #, fuzzy
 msgid "Inline content"
 msgstr "記事のノートを編集する"
 
-#: plugins/af_readability/init.php:45
+#: plugins/af_readability/init.php:46
 #, fuzzy
 msgid "Append content"
 msgstr "記事のノートを編集する"
 
-#: plugins/af_readability/init.php:54
+#: plugins/af_readability/init.php:55
 #, fuzzy
 msgid "Toggle full article text"
 msgstr "記事のノートを編集する"
 
-#: plugins/af_readability/init.php:64
+#: plugins/af_readability/init.php:65
 msgid "Readability settings (af_readability)"
 msgstr ""
 
-#: plugins/af_readability/init.php:85
+#: plugins/af_readability/init.php:86
 msgid ""
 "Provide full-text services to core code (bookmarklets) and other plugins"
 msgstr ""
 
-#: plugins/af_readability/init.php:115
+#: plugins/af_readability/init.php:116
 msgid "(append)"
 msgstr ""
 
-#: plugins/af_readability/init.php:130
+#: plugins/af_readability/init.php:131
 #, fuzzy
 msgid "Readability"
 msgstr "有効性の確認"
 
-#: plugins/af_readability/init.php:135
+#: plugins/af_readability/init.php:136
 #, fuzzy
 msgid "Inline article content"
 msgstr "記事のノートを編集する"
 
-#: plugins/af_readability/init.php:141
+#: plugins/af_readability/init.php:142
 msgid "Append to summary, instead of replacing it"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:88 js/CommonDialogs.js:93
-msgid "Subscribe"
-msgstr "購読"
-
-#: plugins/bookmarklets/init.php:101
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "<b>%s</b> は既に購読しています。"
+#: plugins/af_redditimgur/init.php:68
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
 
-#: plugins/bookmarklets/init.php:104
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "<b>%s</b> を購読しました。"
+#: plugins/af_redditimgur/init.php:86
+#, fuzzy
+msgid "Apply tags to NSFW posts (comma-separated list):"
+msgstr "職場で閲覧するのが不適切だとみなすタグ (カンマ区切り)"
 
-#: plugins/bookmarklets/init.php:107
+#: plugins/af_redditimgur/init.php:95
+msgid "Extract missing content using Readability (requires af_readability)"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:102
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:109
+#, php-format
+msgid "Rewrite Reddit URLs to %s"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:117
+msgid "Import score, limit maximum to:"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:148
+msgid "Configuration saved"
+msgstr "設定を保存しました"
+
+#: plugins/auth_internal/init.php:92
+#, fuzzy
+#| msgid "Please enter label caption:"
+msgid "Please enter verification code (OTP):"
+msgstr "ラベルのキャプションを入力してください:"
+
+#: plugins/auth_internal/init.php:94
+#, fuzzy
+#| msgid "Content:"
+msgid "Continue"
+msgstr "内容:"
+
+#: plugins/auth_internal/init.php:133
+msgid "Too many authentication attempts, throttled."
+msgstr ""
+
+#: plugins/auth_internal/init.php:240
+msgid "Password has been changed."
+msgstr "パスワードを変更しました。"
+
+#: plugins/auth_internal/init.php:242
+msgid "Old password is incorrect."
+msgstr "古いパスワードが不正確です。"
+
+#: plugins/bookmarklets/init.php:90 js/CommonDialogs.js:108
+#: js/PrefFeedTree.js:461
+msgid "Subscribe"
+msgstr "購読"
+
+#: plugins/bookmarklets/init.php:103
+#, php-format
+msgid "Already subscribed to <b>%s</b>."
+msgstr "<b>%s</b> は既に購読しています。"
+
+#: plugins/bookmarklets/init.php:106
+#, php-format
+msgid "Subscribed to <b>%s</b>."
+msgstr "<b>%s</b> を購読しました。"
+
+#: plugins/bookmarklets/init.php:109
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b> は購読できませんでした。"
 
-#: plugins/bookmarklets/init.php:110
+#: plugins/bookmarklets/init.php:112
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "<b>%s</b>にフィードが見つかりません。"
 
-#: plugins/bookmarklets/init.php:116
+#: plugins/bookmarklets/init.php:118
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 "<b>%s</b> は購読できませんでした。<br>フィードの URL がダウンロードできませ"
 "ん。"
 
-#: plugins/bookmarklets/init.php:127
+#: plugins/bookmarklets/init.php:129
 msgid "Multiple feed URLs found:"
 msgstr "複数のフィードの URL が見つかりました:"
 
-#: plugins/bookmarklets/init.php:135
+#: plugins/bookmarklets/init.php:137
 msgid "Subscribe to selected feed"
 msgstr "選択したフィードを購読する"
 
-#: plugins/bookmarklets/init.php:153
+#: plugins/bookmarklets/init.php:155
 msgid "Edit subscription options"
 msgstr "購読オプションの編集"
 
-#: plugins/bookmarklets/init.php:184 plugins/bookmarklets/init.php:361
+#: plugins/bookmarklets/init.php:186 plugins/bookmarklets/init.php:362
 msgid "Share with Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS で共有する"
 
-#: plugins/bookmarklets/init.php:256
+#: plugins/bookmarklets/init.php:258
 msgid "Title:"
 msgstr "題名:"
 
-#: plugins/bookmarklets/init.php:261
+#: plugins/bookmarklets/init.php:263 js/CommonDialogs.js:507
 msgid "URL:"
 msgstr "URL:"
 
-#: plugins/bookmarklets/init.php:266
+#: plugins/bookmarklets/init.php:268
 msgid "Content:"
 msgstr "内容:"
 
-#: plugins/bookmarklets/init.php:271
+#: plugins/bookmarklets/init.php:273
 msgid "Labels:"
 msgstr "ラベル:"
 
-#: plugins/bookmarklets/init.php:281
+#: plugins/bookmarklets/init.php:283
 msgid "Share"
 msgstr "共有"
 
-#: plugins/bookmarklets/init.php:283
+#: plugins/bookmarklets/init.php:285
 msgid "Shared article will appear in the Published feed."
 msgstr "共有した記事は「公開済みの記事」に表示されます。"
 
-#: plugins/bookmarklets/init.php:322 include/login_form.php:177
+#: plugins/bookmarklets/init.php:324 include/login_form.php:177
 msgid "Log in"
 msgstr "ログイン"
 
-#: plugins/bookmarklets/init.php:343
+#: plugins/bookmarklets/init.php:344
 #, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "%s を Tiny Tiny RSS で購読しますか?"
 
-#: plugins/bookmarklets/init.php:350
+#: plugins/bookmarklets/init.php:351
 msgid "Bookmarklets"
 msgstr "ブックマークレット"
 
-#: plugins/bookmarklets/init.php:352
+#: plugins/bookmarklets/init.php:353
 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."
@@ -1850,110 +1918,80 @@ msgstr ""
 "以下のリンクをブラウザのツールバーにドラッグし、興味のあるフィードを開いてリ"
 "ンクをクリックすると購読できます。"
 
-#: plugins/bookmarklets/init.php:355
+#: plugins/bookmarklets/init.php:356
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS で購読する"
 
-#: plugins/bookmarklets/init.php:358
+#: plugins/bookmarklets/init.php:359
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 "Tiny Tiny RSS を使って任意のページを公開するためにこのブックマークレットを"
 "使ってください"
 
-#: plugins/af_comics/init.php:62
-msgid "Feeds supported by af_comics"
-msgstr ""
-
-#: plugins/af_comics/init.php:64
-msgid "The following comics are currently supported:"
-msgstr ""
+#: plugins/note/init.php:24 plugins/note/note.js:16
+msgid "Edit article note"
+msgstr "記事のノートを編集する"
 
-#: plugins/nsfw/init.php:39
+#: plugins/nsfw/init.php:46
 #, fuzzy
 #| msgid "Not work safe (click to toggle)"
 msgid "Not safe for work (click to toggle)"
 msgstr "職場閲覧不適切 (クリックで切り替え)"
 
-#: plugins/nsfw/init.php:73
+#: plugins/nsfw/init.php:80
 msgid "NSFW Plugin"
 msgstr "NSFW(Not suitable for work: 職場閲覧不適切) プラグイン"
 
-#: plugins/nsfw/init.php:88
+#: plugins/nsfw/init.php:95
 #, fuzzy
 msgid "Tags to consider NSFW (comma-separated):"
 msgstr "職場で閲覧するのが不適切だとみなすタグ (カンマ区切り)"
 
-#: plugins/nsfw/init.php:110
+#: plugins/nsfw/init.php:117
 msgid "Configuration saved."
 msgstr "設定を保存しました。"
 
-#: plugins/af_redditimgur/init.php:45
-msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:63
-#, fuzzy
-msgid "Apply tags to NSFW posts (comma-separated list):"
-msgstr "職場で閲覧するのが不適切だとみなすタグ (カンマ区切り)"
-
-#: plugins/af_redditimgur/init.php:72
-msgid "Extract missing content using Readability (requires af_readability)"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:79
-msgid "Enable additional duplicate checking"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:86
-#, php-format
-msgid "Rewrite Reddit URLs to %s"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:94
-msgid "Import score, limit maximum to:"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:125
-msgid "Configuration saved"
-msgstr "設定を保存しました"
-
-#: plugins/toggle_sidebar/init.php:27
-msgid "Toggle sidebar"
-msgstr "サイドバーを切り替える"
-
-#: plugins/share/init.php:42
+#: plugins/share/init.php:43
 #, fuzzy
 msgid "Article unshared"
 msgstr "記事"
 
-#: plugins/share/init.php:54
+#: plugins/share/init.php:58
 msgid "Unshare all articles"
 msgstr "全ての記事のお気に入りを解除する"
 
-#: plugins/share/init.php:64
+#: plugins/share/init.php:69
 msgid "Shared URLs cleared."
 msgstr "共有された URL を消去しました。"
 
-#: plugins/share/init.php:83
+#: plugins/share/init.php:93
 msgid "Share by URL"
 msgstr "URL で共有"
 
-#: plugins/share/init.php:255
+#: plugins/share/init.php:264
 msgid "You can share this article by the following unique URL:"
 msgstr "以下のユニーク URL によってこの記事を共有できます。"
 
-#: plugins/share/init.php:267
+#: plugins/share/init.php:276
 msgid "Article not found."
 msgstr "記事が見つかりません。"
 
-#: plugins/share/init.php:272
+#: plugins/share/init.php:281
 msgid "Unshare article"
 msgstr "記事の共有を解除"
 
-#: plugins/share/init.php:273 js/CommonDialogs.js:644
+#: plugins/share/init.php:282 js/CommonDialogs.js:668
 msgid "Generate new URL"
 msgstr "新しい URL を生成する"
 
+#: plugins/toggle_sidebar/init.php:23
+msgid "Toggle sidebar"
+msgstr "サイドバーを切り替える"
+
+#: include/functions.php:58
+msgid "Detect automatically"
+msgstr "自動検出"
+
 #: include/login_form.php:124
 msgid "I forgot my password"
 msgstr "パスワードを忘れた場合"
@@ -1970,7 +2008,7 @@ msgstr "トラフィックを抑制する"
 msgid "Does not display images in articles, reduces automatic refreshes."
 msgstr "記事中の画像を表示しないことで自動更新を減らす。"
 
-#: include/login_form.php:154 js/Feeds.js:282
+#: include/login_form.php:154 js/CommonDialogs.js:16
 msgid "Safe mode"
 msgstr ""
 
@@ -1982,17 +2020,383 @@ msgstr ""
 msgid "Remember me"
 msgstr "ログイン状態を記憶する"
 
-#: include/sessions.php:32
+#: include/sessions.php:44
 msgid "Session failed to validate (password changed)"
 msgstr "セッションの検査に失敗しました (パスワードが変更されました)"
 
-#: include/sessions.php:36
+#: include/sessions.php:49
+#, fuzzy
+#| msgid "Session failed to validate (user agent changed)"
+msgid "Session failed to validate (account is disabled)"
+msgstr "セッションの検査に失敗しました (ユーザーエージェントが変更されました)"
+
+#: include/sessions.php:53
 msgid "Session failed to validate (user not found)"
 msgstr "セッションの検査に失敗しました (ユーザーが見つかりません)"
 
-#: include/functions.php:49
-msgid "Detect automatically"
-msgstr "自動検出"
+#: js/App.js:314
+#, fuzzy
+#| msgid "Automatically expand articles in combined mode"
+msgid "This function is only available in combined mode."
+msgstr "組み合わせモードで記事を自動的に展開する"
+
+#: js/App.js:445
+msgid "Keyboard shortcuts"
+msgstr "キーボードショートカット"
+
+#: js/App.js:506
+msgid "Update daemon is not running."
+msgstr ""
+
+#: js/App.js:519
+msgid "Update daemon is not updating feeds."
+msgstr ""
+
+#: js/App.js:606
+#, java-printf-format
+msgid ""
+"URL scheme reported by your browser (%a) doesn't match server-configured "
+"SELF_URL_PATH (%b), check X-Forwarded-Proto."
+msgstr ""
+
+#: js/App.js:613
+msgid "Fatal error"
+msgstr ""
+
+#: js/App.js:638
+msgid "Unhandled exception"
+msgstr ""
+
+#: js/App.js:871
+#, fuzzy
+#| msgid "New version of Tiny Tiny RSS is available!"
+msgid "Updates for Tiny Tiny RSS are available."
+msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
+
+#: js/App.js:874
+msgid "Updates for some local plugins are available."
+msgstr ""
+
+#: js/App.js:917
+msgid "Widescreen is not available in combined mode."
+msgstr ""
+
+#: js/App.js:1118
+#, fuzzy
+msgid "Please enable mail or mailto plugin first."
+msgstr "はじめにメールプラグインを有効にしてください。"
+
+#: js/App.js:1169 js/App.js:1283 js/CommonDialogs.js:349
+msgid "You can't edit this kind of feed."
+msgstr "この種類のフィードは編集できません。"
+
+#: js/App.js:1241
+#, fuzzy
+msgid "Please enable af_readability first."
+msgstr "はじめにメールプラグインを有効にしてください。"
+
+#: js/App.js:1292
+msgid "Please select some feed first."
+msgstr "はじめにいくつかのフィードを選択してください。"
+
+#: js/App.js:1297
+msgid "You can't unsubscribe from the category."
+msgstr "カテゴリーから購読をやめることができません。"
+
+#: js/App.js:1303 js/CommonDialogs.js:323 js/CommonDialogs.js:364
+#, java-printf-format, javascript-format
+msgid "Unsubscribe from %s?"
+msgstr "%s の購読をやめますか?"
+
+#: js/Article.js:36
+msgid "Please enter new score for selected articles:"
+msgstr "選択した記事の新しいスコアを入力してください:"
+
+#: js/Article.js:62 js/Headlines.js:947 js/Headlines.js:973 js/Headlines.js:985
+#: js/Headlines.js:1128 js/Headlines.js:1145 js/Headlines.js:1162
+#: js/Headlines.js:1299
+msgid "No articles selected."
+msgstr "記事が選択されていません。"
+
+#: js/Article.js:70
+msgid "Please enter new score for this article:"
+msgstr "この記事の新しいスコアを入力してください:"
+
+#: js/Article.js:130
+msgid "Article URL:"
+msgstr "記事の URL:"
+
+#: js/Article.js:132
+#, fuzzy
+msgid "No URL could be displayed for this article."
+msgstr "この記事の共有を解除しますか?"
+
+#: js/Article.js:154
+msgid "no tags"
+msgstr "タグがありません"
+
+#: js/Article.js:246
+msgid "comments"
+msgstr "コメント"
+
+#: js/Article.js:249
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+
+#: js/Article.js:340
+#, fuzzy
+#| msgid "Articles"
+msgid "Article tags"
+msgstr "記事"
+
+#: js/Article.js:347
+msgid "Tags for this article (separated by commas):"
+msgstr "この記事のタグ (カンマで区切ります):"
+
+#: js/Article.js:367
+msgid "Saving article tags..."
+msgstr "記事のタグを保存しています..."
+
+#: js/CommonDialogs.js:45
+msgid ""
+"Provided URL is a HTML page referencing multiple feeds, please select "
+"required feed from the dropdown menu below."
+msgstr ""
+
+#: js/CommonDialogs.js:137
+msgid ""
+"Failed to parse output. This can indicate server timeout and/or network "
+"issues. Backend output was logged to browser console."
+msgstr ""
+
+#: js/CommonDialogs.js:150
+msgid "You are already subscribed to this feed."
+msgstr "このフィードは購読済みです。"
+
+#: js/CommonDialogs.js:154
+#, java-printf-format, javascript-format
+msgid "Subscribed to %s"
+msgstr "%s を購読しました"
+
+#: js/CommonDialogs.js:163
+msgid "Specified URL seems to be invalid."
+msgstr "指定された URL は無効のようです。"
+
+#: js/CommonDialogs.js:166
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr "指定された URL にはフィードが含まれていなようです。"
+
+#: js/CommonDialogs.js:179
+msgid "Expand to select feed"
+msgstr "選択したフィードを展開する"
+
+#: js/CommonDialogs.js:191
+#, java-printf-format, javascript-format
+msgid "Couldn't download the specified URL: %s"
+msgstr "指定された URL がダウンロードできません: %s"
+
+#: js/CommonDialogs.js:194
+#, java-printf-format, javascript-format
+msgid "XML validation failed: %s"
+msgstr "XML の検証に失敗しました: %s"
+
+#: js/CommonDialogs.js:197
+#, fuzzy
+#| msgid "Error while parsing document."
+msgid "Error while creating feed database entry."
+msgstr "ドキュメントの解析中のエラーです。"
+
+#: js/CommonDialogs.js:200
+msgid "You are not allowed to perform this operation."
+msgstr ""
+
+#: js/CommonDialogs.js:222
+msgid "Feeds with update errors"
+msgstr "更新エラーのあるフィード"
+
+#: js/CommonDialogs.js:230 js/PrefFeedTree.js:488
+msgid "Remove selected feeds?"
+msgstr "選択したフィードを削除しますか?"
+
+#: js/CommonDialogs.js:231 js/PrefFeedTree.js:489
+msgid "Removing selected feeds..."
+msgstr "選択したフィードを削除しています..."
+
+#: js/CommonDialogs.js:251 js/PrefFeedTree.js:217 js/PrefFeedTree.js:286
+#: js/PrefFeedTree.js:302 js/PrefFeedTree.js:507
+msgid "No feeds selected."
+msgstr "フィードが選択されていません。"
+
+#: js/CommonDialogs.js:304
+msgid "Please enter label caption:"
+msgstr "ラベルのキャプションを入力してください:"
+
+#: js/CommonDialogs.js:326
+msgid "Removing feed..."
+msgstr "フィードを削除しています..."
+
+#: js/CommonDialogs.js:374
+#, fuzzy
+msgid "Please select an image file."
+msgstr "アップロードする画像ファイルをひとつ選択してください。"
+
+#: js/CommonDialogs.js:394
+msgid "Icon file is too large."
+msgstr ""
+
+#: js/CommonDialogs.js:397
+msgid "Upload failed."
+msgstr "アップロードが失敗しました。"
+
+#: js/CommonDialogs.js:427
+msgid "Remove stored feed icon?"
+msgstr "保存したフィードアイコンを削除しますか?"
+
+#: js/CommonDialogs.js:428
+msgid "Removing feed icon..."
+msgstr "フィードアイコンを削除しています..."
+
+#: js/CommonDialogs.js:431
+msgid "Feed icon removed."
+msgstr "フィードアイコンを削除しました。"
+
+#: js/CommonDialogs.js:451 js/CommonFilters.js:396 js/PrefFeedTree.js:354
+#: js/PrefUsers.js:42
+msgid "Saving data..."
+msgstr "データを保存しています..."
+
+#: js/CommonDialogs.js:598
+#, fuzzy
+msgid "Upload new icon..."
+msgstr "このフィードに対して新しいアイコンをアップロードしますか?"
+
+#: js/CommonDialogs.js:627 js/Headlines.js:639
+msgid "Show as feed"
+msgstr "フィードとして表示する"
+
+#: js/CommonDialogs.js:629
+msgid "Generate new syndication address for this feed?"
+msgstr "このフィードに対して新しいシンジケートアドレスを生成しますか?"
+
+#: js/CommonDialogs.js:631
+msgid "Trying to change address..."
+msgstr "アドレスの変更をしようとしています..."
+
+#: js/CommonDialogs.js:649
+#, fuzzy
+msgid "Could not change feed URL."
+msgstr "ユーザー <b>%s</b> の追加中です。"
+
+#: js/CommonDialogs.js:656
+#, java-printf-format, javascript-format
+msgid "%s can be accessed via the following secret URL:"
+msgstr "「%s」は以下のユニーク URL によってアクセスできます:"
+
+#: js/CommonFilters.js:14
+#, fuzzy
+#| msgid "Edit Filter"
+msgid "Edit filter"
+msgstr "フィルターの編集"
+
+#: js/CommonFilters.js:14
+#, fuzzy
+#| msgid "Create filter"
+msgid "Create new filter"
+msgstr "フィルターを作成する"
+
+#: js/CommonFilters.js:45
+#, java-printf-format, javascript-format
+msgid "Looking for articles (%d processed, %f found)..."
+msgstr ""
+
+#: js/CommonFilters.js:73
+#, fuzzy
+msgid "Articles matching this filter:"
+msgstr "このフィルタに一致する記事:"
+
+#: js/CommonFilters.js:75
+#, fuzzy, java-printf-format, javascript-format
+msgid "Found %d articles matching this filter:"
+msgstr "このフィルタに一致する記事:"
+
+#: js/CommonFilters.js:84
+msgid "Error while trying to get filter test results."
+msgstr ""
+
+#: js/CommonFilters.js:96
+#, fuzzy
+#| msgid "Rescoring articles..."
+msgid "Looking for articles..."
+msgstr "記事のスコアを再計算しています..."
+
+#: js/CommonFilters.js:175
+msgid "Edit rule"
+msgstr "ルールの編集"
+
+#: js/CommonFilters.js:175
+msgid "Add rule"
+msgstr "ルールの追加"
+
+#: js/CommonFilters.js:219
+msgid "Inverse regular expression matching"
+msgstr "正規表現の一致結果を反転する"
+
+#: js/CommonFilters.js:223
+#, fuzzy
+msgid "on"
+msgstr "なし"
+
+#: js/CommonFilters.js:225 js/PrefFilterTree.js:54
+msgid "in"
+msgstr "フィード"
+
+#: js/CommonFilters.js:251
+msgid "Edit action"
+msgstr "動作の編集"
+
+#: js/CommonFilters.js:251
+msgid "Add action"
+msgstr "操作の追加"
+
+#: js/CommonFilters.js:361
+msgid "Remove filter?"
+msgstr "フィルターを削除しますか?"
+
+#: js/CommonFilters.js:366
+msgid "Removing filter..."
+msgstr "フィルターを削除しています..."
+
+#: js/CommonFilters.js:453 js/CommonFilters.js:485 js/PrefHelpers.js:195
+msgid "Add"
+msgstr "追加"
+
+#: js/CommonFilters.js:456 js/CommonFilters.js:488
+msgid "Delete"
+msgstr "削除"
+
+#: js/CommonFilters.js:522 js/CommonFilters.js:526
+msgid "Test"
+msgstr "テスト"
+
+#: js/CommonFilters.js:527
+msgid "Create"
+msgstr "作成"
+
+#: js/FeedTree.js:105 js/Headlines.js:1585
+#, fuzzy
+#| msgid "Open next feed"
+msgid "Open site"
+msgstr "次のフィードを開く"
+
+#: js/FeedTree.js:114 js/Headlines.js:1594
+msgid "Debug feed"
+msgstr "フィードをデバッグする"
+
+#: js/FeedTree.js:137
+#, fuzzy
+msgid "(Un)collapse"
+msgstr "サイドバーを開閉する"
 
 #: js/Feeds.js:262
 msgid "Your password is at default value"
@@ -2004,348 +2408,231 @@ msgid ""
 "(Personal data / Authentication)."
 msgstr ""
 
-#: js/Feeds.js:426
+#: js/Feeds.js:419
 msgid "Mark all articles as read?"
 msgstr "すべての記事を既読にしますか?"
 
-#: js/Feeds.js:430
+#: js/Feeds.js:423
 msgid "Marking all feeds as read..."
 msgstr "すべてのフィードを既読に設定しています..."
 
-#: js/Feeds.js:447
+#: js/Feeds.js:440
 msgid "Mark %w in %s older than 1 day as read?"
 msgstr "「%s」の 1 日以上前の %w を既読に設定しますか?"
 
-#: js/Feeds.js:450
+#: js/Feeds.js:443
 msgid "Mark %w in %s older than 1 week as read?"
 msgstr "「%s」の 1 週間以上前の %w を既読に設定しますか?"
 
-#: js/Feeds.js:453
+#: js/Feeds.js:446
 msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "「%s」の 2 週間以上前の %w を既読に設定しますか?"
 
-#: js/Feeds.js:456
+#: js/Feeds.js:449
 msgid "Mark %w in %s as read?"
 msgstr "「%s」の %w を既読に設定しますか?"
 
-#: js/Feeds.js:459
+#: js/Feeds.js:452
 msgid "search results"
 msgstr "検索結果"
 
-#: js/Feeds.js:459
+#: js/Feeds.js:452
 msgid "all articles"
 msgstr "すべての記事"
 
-#: js/Feeds.js:500
-#, javascript-format
+#: js/Feeds.js:493
+#, java-printf-format, javascript-format
 msgid "Mark all articles in %s as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
-#: js/Feeds.js:635
+#: js/Feeds.js:628
 msgid "Search syntax"
 msgstr "検索構文"
 
-#: js/common.js:448
-msgid "Click to close"
-msgstr "閉じるにはクリック"
-
-#: js/PrefLabelTree.js:71
-#, fuzzy
-#| msgid "Edit rule"
-msgid "Edit label"
-msgstr "ルールの編集"
-
-#: js/PrefLabelTree.js:143
-msgid "Foreground:"
-msgstr "前景色:"
-
-#: js/PrefLabelTree.js:144
-msgid "Background:"
-msgstr "背景色:"
-
-#: js/PrefLabelTree.js:189
-msgid "Reset selected labels to default colors?"
-msgstr "選択したラベルの色を標準にリセットしますか?"
-
-#: js/PrefLabelTree.js:202 js/PrefLabelTree.js:222
-msgid "No labels selected."
-msgstr "ラベルが選択されていません。"
+#: js/Headlines.js:648
+msgid "Cancel search"
+msgstr "検索の取り消し"
 
-#: js/PrefLabelTree.js:209
-msgid "Remove selected labels?"
-msgstr "選択したラベルを削除しますか?"
+#: js/Headlines.js:662
+msgid "Select..."
+msgstr "選択..."
 
-#: js/PrefLabelTree.js:210
-msgid "Removing selected labels..."
-msgstr "選択したラベルを削除しています..."
+#: js/Headlines.js:822 js/Headlines.js:876 js/Headlines.js:893
+msgid "Click to open next unread feed."
+msgstr "次の未読フィードを開くにはクリック。"
 
-#: js/App.js:411
-msgid "Keyboard shortcuts"
-msgstr "キーボードショートカット"
+#: js/Headlines.js:890
+#, fuzzy
+msgid "New articles found, reload feed to continue."
+msgstr "表示する記事が見つかりません。"
 
-#: js/App.js:472
-msgid "Update daemon is not running."
-msgstr ""
+#: js/Headlines.js:1099
+#, java-printf-format, javascript-format
+msgid "%d article selected"
+msgid_plural "%d articles selected"
+msgstr[0] "%d 件の記事を選択"
 
-#: js/App.js:485
-msgid "Update daemon is not updating feeds."
-msgstr ""
+#: js/Headlines.js:1170
+#, fuzzy, java-printf-format, javascript-format
+msgid "Delete %d selected article in %s?"
+msgid_plural "Delete %d selected articles in %s?"
+msgstr[0] "選択した「%s」の %d 件の記事を削除しますか?"
 
-#: js/App.js:572
-msgid ""
-"URL scheme reported by your browser (%a) doesn't match server-configured "
-"SELF_URL_PATH (%b), check X-Forwarded-Proto."
-msgstr ""
+#: js/Headlines.js:1172
+#, java-printf-format, javascript-format
+msgid "Delete %d selected article?"
+msgid_plural "Delete %d selected articles?"
+msgstr[0] "選択した %d 件の記事を削除しますか?"
 
-#: js/App.js:579
-msgid "Fatal error"
-msgstr ""
+#: js/Headlines.js:1305
+#, fuzzy, java-printf-format, javascript-format
+msgid "Mark %d selected article in %s as read?"
+msgid_plural "Mark %d selected articles in %s as read?"
+msgstr[0] "選択した「%s」の %d 件の記事を既読に設定しますか?"
 
-#: js/App.js:604
-msgid "Unhandled exception"
-msgstr ""
+#: js/Headlines.js:1321
+msgid "No article is selected."
+msgstr "記事が選択されていません。"
 
-#: js/App.js:833
-#, fuzzy
-#| msgid "New version of Tiny Tiny RSS is available!"
-msgid "Updates for Tiny Tiny RSS are available."
-msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
+#: js/Headlines.js:1356
+msgid "No articles found to mark"
+msgstr "設定する記事が見つかりませんでした"
 
-#: js/App.js:836
-msgid "Updates for some local plugins are available."
-msgstr ""
+#: js/Headlines.js:1358
+#, java-printf-format, javascript-format
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] "%d 件の記事を既読として設定しますか?"
 
-#: js/App.js:1065
-#, fuzzy
-msgid "Please enable mail or mailto plugin first."
-msgstr "はじめにメールプラグインを有効にしてください。"
+#: js/Headlines.js:1417
+msgid "Open original article"
+msgstr "元の記事内容を表示"
 
-#: js/App.js:1116 js/App.js:1253 js/CommonDialogs.js:328
-msgid "You can't edit this kind of feed."
-msgstr "この種類のフィードは編集できません。"
+#: js/Headlines.js:1424
+msgid "Display article URL"
+msgstr "記事の URL を表示"
 
-#: js/App.js:1188
-#, fuzzy
-msgid "Please enable af_readability first."
-msgstr "はじめにメールプラグインを有効にしてください。"
+#: js/Headlines.js:1531
+msgid "Assign label"
+msgstr "ラベルの割り当て"
 
-#: js/App.js:1201 js/App.js:1294
-msgid "Widescreen is not available in combined mode."
-msgstr ""
+#: js/Headlines.js:1536
+msgid "Remove label"
+msgstr "ラベルの削除"
 
-#: js/App.js:1262
-msgid "Please select some feed first."
-msgstr "はじめにいくつかのフィードを選択してください。"
+#: js/Headlines.js:1615
+#, fuzzy
+msgid "Select articles in group"
+msgstr "マウスカーソルの下の記事を選択する"
 
-#: js/App.js:1267
-msgid "You can't unsubscribe from the category."
-msgstr "カテゴリーから購読をやめることができません。"
+#: js/Headlines.js:1625
+msgid "Mark group as read"
+msgstr "グループを既読に設定する"
 
-#: js/App.js:1273 js/CommonDialogs.js:302 js/CommonDialogs.js:343
-#, javascript-format
-msgid "Unsubscribe from %s?"
-msgstr "%s の購読をやめますか?"
+#: js/Headlines.js:1637
+msgid "Mark feed as read"
+msgstr "フィードを既読に設定する"
 
-#: js/PrefFeedTree.js:73
+#: js/PrefFeedTree.js:83
 msgid "Edit category"
 msgstr "カテゴリーの編集"
 
-#: js/PrefFeedTree.js:80
+#: js/PrefFeedTree.js:90
 msgid "Remove category"
 msgstr "カテゴリーの削除"
 
-#: js/PrefFeedTree.js:179
-#, javascript-format
+#: js/PrefFeedTree.js:189
+#, java-printf-format, javascript-format
 msgid ""
 "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 "カテゴリー %s を削除しますか?カテゴリー内のフィードは全てカテゴリー割り当てな"
 "しに配置されます。"
 
-#: js/PrefFeedTree.js:180
+#: js/PrefFeedTree.js:190
 msgid "Removing category..."
 msgstr "カテゴリーを削除しています..."
 
-#: js/PrefFeedTree.js:192
+#: js/PrefFeedTree.js:202
 msgid "Unsubscribe from selected feeds?"
 msgstr "選択したフィードの購読をやめますか?"
 
-#: js/PrefFeedTree.js:194
+#: js/PrefFeedTree.js:204
 msgid "Unsubscribing from selected feeds..."
 msgstr "選択したフィードの購読を解除しています..."
 
-#: js/PrefFeedTree.js:207 js/PrefFeedTree.js:276 js/PrefFeedTree.js:292
-#: js/PrefFeedTree.js:497 js/CommonDialogs.js:230
-msgid "No feeds selected."
-msgstr "フィードが選択されていません。"
-
-#: js/PrefFeedTree.js:242
+#: js/PrefFeedTree.js:252
 msgid "Remove selected categories?"
 msgstr "選択したカテゴリーを削除しますか?"
 
-#: js/PrefFeedTree.js:243
+#: js/PrefFeedTree.js:253
 msgid "Removing selected categories..."
 msgstr "選択したカテゴリーを削除しています..."
 
-#: js/PrefFeedTree.js:255
+#: js/PrefFeedTree.js:265
 msgid "No categories selected."
 msgstr "カテゴリーが選択されていません。"
 
-#: js/PrefFeedTree.js:303
+#: js/PrefFeedTree.js:313
 #, fuzzy
 #| msgid "Edit Multiple Feeds"
 msgid "Edit multiple feeds"
 msgstr "複数フィードの編集"
 
-#: js/PrefFeedTree.js:332
+#: js/PrefFeedTree.js:342
 msgid "Save changes to selected feeds?"
 msgstr "選択したフィードの変更を保存しますか?"
 
-#: js/PrefFeedTree.js:344 js/CommonDialogs.js:430 js/PrefUsers.js:42
-#: js/CommonFilters.js:395
-msgid "Saving data..."
-msgstr "データを保存しています..."
-
-#: js/PrefFeedTree.js:381
+#: js/PrefFeedTree.js:391
 msgid "Category title:"
 msgstr "カテゴリーの題名:"
 
-#: js/PrefFeedTree.js:384
+#: js/PrefFeedTree.js:394
 msgid "Creating category..."
 msgstr "カテゴリーを作成しています..."
 
-#: js/PrefFeedTree.js:399
+#: js/PrefFeedTree.js:409
 msgid "Subscribing to feeds..."
 msgstr "フィードを購読しています..."
 
-#: js/PrefFeedTree.js:417
+#: js/PrefFeedTree.js:427
 #, fuzzy
 msgid "One valid feed per line (no detection is done)"
 msgstr ""
 "1 行に 1 フィードずつ有効な RSS フィードを追加(フィードの自動検出は行われませ"
 "ん)"
 
-#: js/PrefFeedTree.js:470
+#: js/PrefFeedTree.js:480
 msgid "Feeds without recent updates"
 msgstr "最近の更新がないフィード"
 
-#: js/PrefFeedTree.js:478 js/CommonDialogs.js:209
-msgid "Remove selected feeds?"
-msgstr "選択したフィードを削除しますか?"
-
-#: js/PrefFeedTree.js:479 js/CommonDialogs.js:210
-msgid "Removing selected feeds..."
-msgstr "選択したフィードを削除しています..."
-
-#: js/PrefFeedTree.js:520
+#: js/PrefFeedTree.js:530 js/CommonDialogs.js:277
 msgid "Click to edit feed"
 msgstr "編集するにはクリック"
 
-#: js/CommonDialogs.js:30
-msgid ""
-"Provided URL is a HTML page referencing multiple feeds, please select "
-"required feed from the dropdown menu below."
-msgstr ""
-
-#: js/CommonDialogs.js:122
-msgid ""
-"Failed to parse output. This can indicate server timeout and/or network "
-"issues. Backend output was logged to browser console."
-msgstr ""
-
-#: js/CommonDialogs.js:136
-#, javascript-format
-msgid "Subscribed to %s"
-msgstr "%s を購読しました"
-
-#: js/CommonDialogs.js:145
-msgid "Specified URL seems to be invalid."
-msgstr "指定された URL は無効のようです。"
-
-#: js/CommonDialogs.js:148
-msgid "Specified URL doesn't seem to contain any feeds."
-msgstr "指定された URL にはフィードが含まれていなようです。"
-
-#: js/CommonDialogs.js:161
-msgid "Expand to select feed"
-msgstr "選択したフィードを展開する"
-
-#: js/CommonDialogs.js:173
-#, javascript-format
-msgid "Couldn't download the specified URL: %s"
-msgstr "指定された URL がダウンロードできません: %s"
-
-#: js/CommonDialogs.js:176
-#, javascript-format
-msgid "XML validation failed: %s"
-msgstr "XML の検証に失敗しました: %s"
-
-#: js/CommonDialogs.js:179
-msgid "You are already subscribed to this feed."
-msgstr "このフィードは購読済みです。"
-
-#: js/CommonDialogs.js:201
-msgid "Feeds with update errors"
-msgstr "更新エラーのあるフィード"
-
-#: js/CommonDialogs.js:283
-msgid "Please enter label caption:"
-msgstr "ラベルのキャプションを入力してください:"
-
-#: js/CommonDialogs.js:305
-msgid "Removing feed..."
-msgstr "フィードを削除しています..."
-
-#: js/CommonDialogs.js:353
-#, fuzzy
-msgid "Please select an image file."
-msgstr "アップロードする画像ファイルをひとつ選択してください。"
-
-#: js/CommonDialogs.js:373
-msgid "Icon file is too large."
-msgstr ""
-
-#: js/CommonDialogs.js:376
-msgid "Upload failed."
-msgstr "アップロードが失敗しました。"
-
-#: js/CommonDialogs.js:406
-msgid "Remove stored feed icon?"
-msgstr "保存したフィードアイコンを削除しますか?"
-
-#: js/CommonDialogs.js:407
-msgid "Removing feed icon..."
-msgstr "フィードアイコンを削除しています..."
-
-#: js/CommonDialogs.js:410
-msgid "Feed icon removed."
-msgstr "フィードアイコンを削除しました。"
-
-#: js/CommonDialogs.js:574
-#, fuzzy
-msgid "Upload new icon..."
-msgstr "このフィードに対して新しいアイコンをアップロードしますか?"
+#: js/PrefFilterTree.js:57
+msgid "Inverse"
+msgstr "反転"
 
-#: js/CommonDialogs.js:603
-msgid "Show as feed"
-msgstr "フィードとして表示する"
+#: js/PrefFilterTree.js:127 js/PrefFilterTree.js:156
+msgid "No filters selected."
+msgstr "フィルターが選択されていません。"
 
-#: js/CommonDialogs.js:605
-msgid "Generate new syndication address for this feed?"
-msgstr "このフィードに対して新しいシンジケートアドレスを生成しますか?"
+#: js/PrefFilterTree.js:131
+msgid "Combine selected filters?"
+msgstr "選択したフィルターを結合しますか?"
 
-#: js/CommonDialogs.js:607
-msgid "Trying to change address..."
-msgstr "アドレスの変更をしようとしています..."
+#: js/PrefFilterTree.js:132
+msgid "Joining filters..."
+msgstr "フィルターを結合しています..."
 
-#: js/CommonDialogs.js:625
-#, fuzzy
-msgid "Could not change feed URL."
-msgstr "ユーザー <b>%s</b> の追加中です。"
+#: js/PrefFilterTree.js:143
+msgid "Remove selected filters?"
+msgstr "選択したフィルターを削除しますか?"
 
-#: js/CommonDialogs.js:632
-msgid "%s can be accessed via the following secret URL:"
-msgstr "「%s」は以下のユニーク URL によってアクセスできます:"
+#: js/PrefFilterTree.js:144
+msgid "Removing selected filters..."
+msgstr "選択したフィルターを削除しています..."
 
 #: js/PrefHelpers.js:20
 #, fuzzy
@@ -2442,142 +2729,148 @@ msgstr ""
 msgid "Reset to defaults?"
 msgstr "標準に戻しますか?"
 
-#: js/PrefHelpers.js:415
+#: js/PrefHelpers.js:373
+#, fuzzy, java-printf-format, javascript-format
+#| msgid "Error while parsing document."
+msgid "Error while loading plugins list: %s."
+msgstr "ドキュメントの解析中のエラーです。"
+
+#: js/PrefHelpers.js:422
 msgid "Clear data"
 msgstr "データの消去"
 
-#: js/PrefHelpers.js:418
+#: js/PrefHelpers.js:425
 msgid "Uninstall"
 msgstr ""
 
-#: js/PrefHelpers.js:430 js/PrefHelpers.js:589
+#: js/PrefHelpers.js:437 js/PrefHelpers.js:596
 msgid "Could not find any plugins for this search query."
 msgstr ""
 
-#: js/PrefHelpers.js:437
-#, fuzzy, javascript-format
+#: js/PrefHelpers.js:444
+#, fuzzy, java-printf-format, javascript-format
 #| msgid "Clear stored data for this plugin?"
 msgid "Clear stored data for %s?"
 msgstr "このプラグイン用に保存されたデータを消去しますか?"
 
-#: js/PrefHelpers.js:446
-#, fuzzy, javascript-format
+#: js/PrefHelpers.js:453
+#, fuzzy, java-printf-format, javascript-format
 #| msgid "User plugins"
 msgid "Uninstall plugin %s?"
 msgstr "ユーザープラグイン"
 
-#: js/PrefHelpers.js:455
+#: js/PrefHelpers.js:462
 #, fuzzy
 #| msgid "Registration failed."
 msgid "Plugin uninstallation failed."
 msgstr "登録に失敗しました。"
 
-#: js/PrefHelpers.js:471
+#: js/PrefHelpers.js:478
 #, fuzzy
 #| msgid "Mail plugin"
 msgid "Available plugins"
 msgstr "メールプラグイン"
 
-#: js/PrefHelpers.js:484
+#: js/PrefHelpers.js:491
 #, fuzzy
 #| msgid "Link instance"
 msgid "Plugin installer"
 msgstr "インスタンスのリンク"
 
-#: js/PrefHelpers.js:487
-#, fuzzy, javascript-format
+#: js/PrefHelpers.js:494
+#, fuzzy, java-printf-format, javascript-format
 #| msgid "Importing, please wait..."
 msgid "Installing %s, please wait..."
 msgstr "インポートしています。しばらくお待ちください..."
 
-#: js/PrefHelpers.js:502 js/PrefHelpers.js:544 js/PrefHelpers.js:655
+#: js/PrefHelpers.js:509 js/PrefHelpers.js:551 js/PrefHelpers.js:662
 msgid "Operation failed: check event log."
 msgstr ""
 
-#: js/PrefHelpers.js:506
+#: js/PrefHelpers.js:513
 msgid "Plugin has been installed."
 msgstr ""
 
-#: js/PrefHelpers.js:510
+#: js/PrefHelpers.js:517
 msgid "Plugin is already installed."
 msgstr ""
 
-#: js/PrefHelpers.js:520 js/PrefHelpers.js:672 js/PrefHelpers.js:738
-#, javascript-format
+#: js/PrefHelpers.js:527 js/PrefHelpers.js:679 js/PrefHelpers.js:745
+#, java-printf-format, javascript-format
 msgid "Exited with RC: %d"
 msgstr ""
 
-#: js/PrefHelpers.js:569
+#: js/PrefHelpers.js:576
 msgid "Already installed"
 msgstr ""
 
-#: js/PrefHelpers.js:580
-#, fuzzy
+#: js/PrefHelpers.js:587
+#, fuzzy, java-printf-format, javascript-format
 #| msgid "Last updated: %s"
 msgid "Updated: %s"
 msgstr "最終更新: %s"
 
-#: js/PrefHelpers.js:597
+#: js/PrefHelpers.js:604
 msgid "Looking for plugins..."
 msgstr ""
 
-#: js/PrefHelpers.js:616 js/PrefHelpers.js:758
+#: js/PrefHelpers.js:623 js/PrefHelpers.js:765
 msgid "Close"
 msgstr ""
 
-#: js/PrefHelpers.js:634
+#: js/PrefHelpers.js:641
 #, fuzzy
 #| msgid "User plugins"
 msgid "Update plugins"
 msgstr "ユーザープラグイン"
 
-#: js/PrefHelpers.js:649
+#: js/PrefHelpers.js:656
 #, fuzzy
 #| msgid "Uploading, please wait..."
 msgid "Updating, please wait..."
 msgstr "アップロードしています。しばらくお待ちください..."
 
-#: js/PrefHelpers.js:673
+#: js/PrefHelpers.js:680
 #, fuzzy
 #| msgid "Update"
 msgid "Update done."
 msgstr "更新"
 
-#: js/PrefHelpers.js:697
+#: js/PrefHelpers.js:704
 #, fuzzy
 #| msgid "No actions available"
 msgid "No updates available"
 msgstr "利用可能な操作がいない"
 
-#: js/PrefHelpers.js:709
-#, javascript-format
+#: js/PrefHelpers.js:716
+#, java-printf-format, javascript-format
 msgid "Checking: %s"
 msgstr ""
 
-#: js/PrefHelpers.js:716
-#, javascript-format
+#: js/PrefHelpers.js:723
+#, java-printf-format, javascript-format
 msgid "%s: Operation failed: check event log."
 msgstr ""
 
-#: js/PrefHelpers.js:739
+#: js/PrefHelpers.js:746
 #, fuzzy
 #| msgid "Ready to update."
 msgid "Ready to update"
 msgstr "更新準備は完了です。"
 
-#: js/PrefHelpers.js:784
+#: js/PrefHelpers.js:791
 msgid "Please choose an OPML file first."
 msgstr "はじめに OPML ファイルを選択してください。"
 
-#: js/PrefHelpers.js:787
+#: js/PrefHelpers.js:794
 msgid "Importing, please wait..."
 msgstr "インポートしています。しばらくお待ちください..."
 
-#: js/PrefHelpers.js:796
+#: js/PrefHelpers.js:803
 msgid "OPML Import"
 msgstr "OPML インポート"
 
-#: js/PrefHelpers.js:807
+#: js/PrefHelpers.js:814
 msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
@@ -2585,176 +2878,35 @@ msgstr ""
 "インポートしたラベルかフィルタがあるなら、新しいデータを見るために設定を更新"
 "(リロード)する必要があるかもしれません。"
 
-#: js/Headlines.js:642
-msgid "Cancel search"
-msgstr "検索の取り消し"
-
-#: js/Headlines.js:650
-msgid "Select..."
-msgstr "選択..."
-
-#: js/Headlines.js:764 js/Headlines.js:818 js/Headlines.js:835
-msgid "Click to open next unread feed."
-msgstr "次の未読フィードを開くにはクリック。"
-
-#: js/Headlines.js:832
-#, fuzzy
-msgid "New articles found, reload feed to continue."
-msgstr "表示する記事が見つかりません。"
-
-#: js/Headlines.js:889 js/Headlines.js:915 js/Headlines.js:927
-#: js/Headlines.js:1070 js/Headlines.js:1087 js/Headlines.js:1104
-#: js/Headlines.js:1241 js/Article.js:62
-msgid "No articles selected."
-msgstr "記事が選択されていません。"
-
-#: js/Headlines.js:1041
-#, javascript-format
-msgid "%d article selected"
-msgid_plural "%d articles selected"
-msgstr[0] "%d 件の記事を選択"
-
-#: js/Headlines.js:1112
-#, fuzzy, javascript-format
-msgid "Delete %d selected article in %s?"
-msgid_plural "Delete %d selected articles in %s?"
-msgstr[0] "選択した「%s」の %d 件の記事を削除しますか?"
-
-#: js/Headlines.js:1114
-#, javascript-format
-msgid "Delete %d selected article?"
-msgid_plural "Delete %d selected articles?"
-msgstr[0] "選択した %d 件の記事を削除しますか?"
-
-#: js/Headlines.js:1247
-#, fuzzy, javascript-format
-msgid "Mark %d selected article in %s as read?"
-msgid_plural "Mark %d selected articles in %s as read?"
-msgstr[0] "選択した「%s」の %d 件の記事を既読に設定しますか?"
-
-#: js/Headlines.js:1263
-msgid "No article is selected."
-msgstr "記事が選択されていません。"
-
-#: js/Headlines.js:1298
-msgid "No articles found to mark"
-msgstr "設定する記事が見つかりませんでした"
-
-#: js/Headlines.js:1300
-#, javascript-format
-msgid "Mark %d article as read?"
-msgid_plural "Mark %d articles as read?"
-msgstr[0] "%d 件の記事を既読として設定しますか?"
-
-#: js/Headlines.js:1359
-msgid "Open original article"
-msgstr "元の記事内容を表示"
-
-#: js/Headlines.js:1366
-msgid "Display article URL"
-msgstr "記事の URL を表示"
-
-#: js/Headlines.js:1473
-msgid "Assign label"
-msgstr "ラベルの割り当て"
-
-#: js/Headlines.js:1478
-msgid "Remove label"
-msgstr "ラベルの削除"
-
-#: js/Headlines.js:1515
-#, fuzzy
-msgid "Select articles in group"
-msgstr "マウスカーソルの下の記事を選択する"
-
-#: js/Headlines.js:1525
-msgid "Mark group as read"
-msgstr "グループを既読に設定する"
-
-#: js/Headlines.js:1537
-msgid "Mark feed as read"
-msgstr "フィードを既読に設定する"
-
-#: js/PrefFilterTree.js:47 js/CommonFilters.js:224
-msgid "in"
-msgstr "フィード"
-
-#: js/PrefFilterTree.js:50
-msgid "Inverse"
-msgstr "反転"
-
-#: js/PrefFilterTree.js:110 js/PrefFilterTree.js:139
-msgid "No filters selected."
-msgstr "フィルターが選択されていません。"
-
-#: js/PrefFilterTree.js:114
-msgid "Combine selected filters?"
-msgstr "選択したフィルターを結合しますか?"
-
-#: js/PrefFilterTree.js:115
-msgid "Joining filters..."
-msgstr "フィルターを結合しています..."
-
-#: js/PrefFilterTree.js:126
-msgid "Remove selected filters?"
-msgstr "選択したフィルターを削除しますか?"
-
-#: js/PrefFilterTree.js:127
-msgid "Removing selected filters..."
-msgstr "選択したフィルターを削除しています..."
-
-#: js/Article.js:36
-msgid "Please enter new score for selected articles:"
-msgstr "選択した記事の新しいスコアを入力してください:"
-
-#: js/Article.js:70
-msgid "Please enter new score for this article:"
-msgstr "この記事の新しいスコアを入力してください:"
-
-#: js/Article.js:130
-msgid "Article URL:"
-msgstr "記事の URL:"
-
-#: js/Article.js:132
-#, fuzzy
-msgid "No URL could be displayed for this article."
-msgstr "この記事の共有を解除しますか?"
-
-#: js/Article.js:154
-msgid "no tags"
-msgstr "タグがありません"
-
-#: js/Article.js:246
-msgid "comments"
-msgstr "コメント"
-
-#: js/Article.js:249
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-
-#: js/Article.js:340
+#: js/PrefLabelTree.js:71
 #, fuzzy
-#| msgid "Articles"
-msgid "Article tags"
-msgstr "記事"
+#| msgid "Edit rule"
+msgid "Edit label"
+msgstr "ルールの編集"
 
-#: js/Article.js:347
-msgid "Tags for this article (separated by commas):"
-msgstr "この記事のタグ (カンマで区切ります):"
+#: js/PrefLabelTree.js:143
+msgid "Foreground:"
+msgstr "前景色:"
 
-#: js/Article.js:367
-msgid "Saving article tags..."
-msgstr "記事のタグを保存しています..."
+#: js/PrefLabelTree.js:144
+msgid "Background:"
+msgstr "背景色:"
 
-#: js/FeedTree.js:105
-msgid "Debug feed"
-msgstr "フィードをデバッグする"
+#: js/PrefLabelTree.js:189
+msgid "Reset selected labels to default colors?"
+msgstr "選択したラベルの色を標準にリセットしますか?"
 
-#: js/FeedTree.js:128
-#, fuzzy
-msgid "(Un)collapse"
-msgstr "サイドバーを開閉する"
+#: js/PrefLabelTree.js:202 js/PrefLabelTree.js:222
+msgid "No labels selected."
+msgstr "ラベルが選択されていません。"
+
+#: js/PrefLabelTree.js:209
+msgid "Remove selected labels?"
+msgstr "選択したラベルを削除しますか?"
+
+#: js/PrefLabelTree.js:210
+msgid "Removing selected labels..."
+msgstr "選択したラベルを削除しています..."
 
 #: js/PrefUsers.js:19
 msgid "Please enter username:"
@@ -2764,7 +2916,7 @@ msgstr "ユーザー名を入力してください:"
 msgid "Adding user..."
 msgstr "ユーザーを追加しています..."
 
-#: js/PrefUsers.js:39
+#: js/PrefUsers.js:39 js/PrefUsers.js:60
 msgid "Edit user"
 msgstr "ユーザーの編集"
 
@@ -2796,110 +2948,22 @@ msgstr ""
 msgid "Removing selected users..."
 msgstr "選択したユーザーを削除しています..."
 
-#: js/CommonFilters.js:14
-#, fuzzy
-#| msgid "Edit Filter"
-msgid "Edit filter"
-msgstr "フィルターの編集"
-
-#: js/CommonFilters.js:14
-#, fuzzy
-#| msgid "Create filter"
-msgid "Create new filter"
-msgstr "フィルターを作成する"
-
-#: js/CommonFilters.js:44
-#, javascript-format
-msgid "Looking for articles (%d processed, %f found)..."
-msgstr ""
-
-#: js/CommonFilters.js:72
-#, fuzzy
-msgid "Articles matching this filter:"
-msgstr "このフィルタに一致する記事:"
-
-#: js/CommonFilters.js:74
-#, fuzzy
-msgid "Found %d articles matching this filter:"
-msgstr "このフィルタに一致する記事:"
-
-#: js/CommonFilters.js:83
-msgid "Error while trying to get filter test results."
-msgstr ""
-
-#: js/CommonFilters.js:95
-#, fuzzy
-#| msgid "Rescoring articles..."
-msgid "Looking for articles..."
-msgstr "記事のスコアを再計算しています..."
-
-#: js/CommonFilters.js:174
-msgid "Edit rule"
-msgstr "ルールの編集"
-
-#: js/CommonFilters.js:174
-msgid "Add rule"
-msgstr "ルールの追加"
-
-#: js/CommonFilters.js:218
-msgid "Inverse regular expression matching"
-msgstr "正規表現の一致結果を反転する"
-
-#: js/CommonFilters.js:222
-#, fuzzy
-msgid "on"
-msgstr "なし"
-
-#: js/CommonFilters.js:250
-msgid "Edit action"
-msgstr "動作の編集"
-
-#: js/CommonFilters.js:250
-msgid "Add action"
-msgstr "操作の追加"
-
-#: js/CommonFilters.js:360
-msgid "Remove filter?"
-msgstr "フィルターを削除しますか?"
-
-#: js/CommonFilters.js:365
-msgid "Removing filter..."
-msgstr "フィルターを削除しています..."
-
-#: js/CommonFilters.js:450 js/CommonFilters.js:482 js/PrefHelpers.js:195
-msgid "Add"
-msgstr "追加"
-
-#: js/CommonFilters.js:453 js/CommonFilters.js:485
-msgid "Delete"
-msgstr "削除"
-
-#: js/CommonFilters.js:519 js/CommonFilters.js:523
-msgid "Test"
-msgstr "テスト"
-
-#: js/CommonFilters.js:524
-msgid "Create"
-msgstr "作成"
+#: js/common.js:449
+msgid "Click to close"
+msgstr "閉じるにはクリック"
 
 #: plugins/af_psql_trgm/init.js:6
 msgid "Related articles"
 msgstr "関連記事"
 
-#: plugins/note/note.js:9
-msgid "Saving article note..."
-msgstr "記事のノートを保存しています..."
-
 #: plugins/af_readability/init.js:31
 #, fuzzy
 msgid "Unable to fetch full text for this article"
 msgstr "この記事の新しいスコアを入力してください:"
 
-#: plugins/shorten_expanded/init.js:32
-#, fuzzy
-#| msgid "Email article"
-msgid "Expand article"
-msgstr "記事をメールする"
+#: plugins/note/note.js:19
+msgid "Saving article note..."
+msgstr "記事のノートを保存しています..."
 
 #: plugins/share/share.js:7
 msgid "Share article by URL"
@@ -2925,41 +2989,149 @@ msgstr "この記事の共有を解除しますか?"
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "この操作は過去に共有された記事の URL 全てを無効化します。続けますか?"
 
-#: js/Feeds.js:284
-msgid ""
-"Tiny Tiny RSS is running in safe mode. All themes and plugins are disabled. "
-"You will need to log out and back in to disable it."
-msgstr ""
+#: plugins/shorten_expanded/init.js:32
+#, fuzzy
+#| msgid "Email article"
+msgid "Expand article"
+msgstr "記事をメールする"
 
-#: js/Feeds.js:628
-msgid "Used for word stemming"
+#: js/App.js:646
+msgid "Stack trace"
 msgstr ""
 
-#: js/App.js:612
-msgid "Stack trace"
+#: js/App.js:653
+msgid "Additional information"
 msgstr ""
 
-#: js/PrefFeedTree.js:369
-#, fuzzy
-msgid "Rename category to:"
-msgstr "カテゴリーの削除"
+#: js/Article.js:207
+msgid "Attachments"
+msgstr "添付"
 
-#: js/PrefFeedTree.js:534
-msgid "Unsubscribe from selected feeds"
-msgstr "選択したフィードの購読をやめる"
+#: js/Article.js:319 js/Headlines.js:551
+msgid "Edit tags for this article"
+msgstr "この記事のタグを編集する"
+
+#: js/CommonDialogs.js:18
+msgid ""
+"Tiny Tiny RSS is running in safe mode. All themes and plugins are disabled. "
+"You will need to log out and back in to disable it."
+msgstr ""
 
 #: js/CommonDialogs.js:53
+msgid "Feed or site URL"
+msgstr "フィードかサイトの URL"
+
+#: js/CommonDialogs.js:68
 msgid "Available feeds"
 msgstr "利用可能なフィード"
 
-#: js/CommonDialogs.js:86
+#: js/CommonDialogs.js:85 js/PrefFeedTree.js:446
+msgid "Login"
+msgstr "ログイン"
+
+#: js/CommonDialogs.js:101
 msgid "This feed requires authentication."
 msgstr "このフィードは認証を要求します。"
 
-#: js/CommonDialogs.js:506
+#: js/CommonDialogs.js:291 js/PrefFeedTree.js:544
+msgid "Unsubscribe from selected feeds"
+msgstr "選択したフィードの購読をやめる"
+
+#: js/CommonDialogs.js:502
+#, fuzzy
+#| msgid "Feed Title"
+msgid "Feed title"
+msgstr "フィードの題名"
+
+#: js/CommonDialogs.js:509
+msgid "Feed URL"
+msgstr "フィード URL"
+
+#: js/CommonDialogs.js:528
 msgid "Site URL:"
 msgstr "サイトの URL:"
 
+#: js/CommonDialogs.js:530
+msgid "Site URL"
+msgstr "サイトの URL"
+
+#: js/CommonDialogs.js:593
+msgid "Icon"
+msgstr "アイコン"
+
+#: js/CommonFilters.js:71
+msgid "No recent articles matching this filter have been found."
+msgstr "このフィルタに一致する最近の記事がありません。"
+
+#: js/CommonFilters.js:419
+msgid "Enabled"
+msgstr "有効にする"
+
+#: js/CommonFilters.js:420
+msgid "Match any rule"
+msgstr "いずれかのルールに一致"
+
+#: js/CommonFilters.js:421
+msgid "Inverse matching"
+msgstr "一致結果の反転"
+
+#: js/CommonFilters.js:439
+msgid "Match"
+msgstr "一致"
+
+#: js/CommonFilters.js:472
+msgid "Apply actions"
+msgstr "適用する操作"
+
+#: js/Feeds.js:269
+msgid "Open Preferences"
+msgstr "設定を開く"
+
+#: js/Feeds.js:612
+#, javascript-format
+msgid "Search %s..."
+msgstr "「%s」を検索..."
+
+#: js/Feeds.js:621
+msgid "Used for word stemming"
+msgstr ""
+
+#: js/Headlines.js:471
+#, fuzzy
+msgid "mark feed as read"
+msgstr "既読にする"
+
+#: js/Headlines.js:524
+msgid "Span all columns"
+msgstr ""
+
+#: js/Headlines.js:665
+msgid "Invert"
+msgstr "反転"
+
+#: js/Headlines.js:673
+msgid "Set score"
+msgstr "スコアを設定"
+
+#: js/Headlines.js:682
+msgid "Delete permanently"
+msgstr ""
+
+#: js/Headlines.js:913
+msgid ""
+"Could not update headlines (invalid object received - see error console for "
+"details)"
+msgstr ""
+
+#: js/PrefFeedTree.js:379
+#, fuzzy
+msgid "Rename category to:"
+msgstr "カテゴリーの削除"
+
+#: js/PrefFeedTree.js:455
+msgid "Feeds require authentication."
+msgstr "このフィードは認証を要求します。"
+
 #: js/PrefHelpers.js:229
 msgid "Clone"
 msgstr ""
@@ -2974,51 +3146,63 @@ msgstr "プロファイルを有効にする"
 msgid "Apply"
 msgstr ""
 
+#: js/PrefHelpers.js:303
+#, fuzzy
+msgid "Save and reload"
+msgstr "これより上を既読にする"
+
 #: js/PrefHelpers.js:352
 msgid "Selected plugins have been enabled. Reload?"
 msgstr ""
 
-#: js/PrefHelpers.js:680
+#: js/PrefHelpers.js:400
+msgid "System plugins are enabled using global configuration."
+msgstr ""
+
+#: js/PrefHelpers.js:577
+#, fuzzy
+#| msgid "Mail plugin"
+msgid "Install"
+msgstr "メールプラグイン"
+
+#: js/PrefHelpers.js:654
+#, fuzzy
+#| msgid "Uploading, please wait..."
+msgid "Updating..."
+msgstr "アップロードしています。しばらくお待ちください..."
+
+#: js/PrefHelpers.js:687
 #, fuzzy
 #| msgid "Upload complete."
 msgid "Updates complete"
 msgstr "アップロードが完了しました。"
 
-#: js/PrefHelpers.js:694
+#: js/PrefHelpers.js:701
 #, javascript-format
 msgid "Updates pending for %d plugin"
 msgid_plural "Updates pending for %d plugins"
 msgstr[0] ""
 
-#: js/Headlines.js:654
-msgid "Invert"
-msgstr "反転"
-
-#: js/Headlines.js:662
-msgid "Set score"
-msgstr "スコアを設定"
-
-#: js/Headlines.js:667
-msgid "Delete permanently"
-msgstr ""
-
-#: js/Headlines.js:855
-msgid ""
-"Could not update headlines (invalid object received - see error console for "
-"details)"
-msgstr ""
-
-#: js/Article.js:207
-msgid "Attachments"
-msgstr "添付"
+#: js/PrefLabelTree.js:126
+msgid "Caption"
+msgstr "キャプション"
 
 #: js/PrefUsers.js:76
 msgid "Access level: "
 msgstr "アクセスレベル: "
 
-#: js/CommonFilters.js:70
-msgid "No recent articles matching this filter have been found."
-msgstr "このフィルタに一致する最近の記事がありません。"
+#: js/PrefUsers.js:92
+#, fuzzy
+#| msgid "Enabled"
+msgid "OTP enabled"
+msgstr "有効にする"
+
+#: js/PrefUsers.js:104
+msgid "User details"
+msgstr "ユーザーの詳細"
+
+#~ msgid "Error: unable to find moved OPML file."
+#~ msgstr "エラー: 移動された OPML ファイルが見つかりません。"
 
 #~ msgid "One time password:"
 #~ msgstr "ワンタイムパスワード:"
@@ -3165,9 +3349,6 @@ msgstr "このフィルタに一致する最近の記事がありません。"
 #~ msgid "Label Editor"
 #~ msgstr "ラベルエディター"
 
-#~ msgid "Caption"
-#~ msgstr "キャプション"
-
 #~ msgid "Colors"
 #~ msgstr "色"
 
@@ -3230,15 +3411,6 @@ msgstr "このフィルタに一致する最近の記事がありません。"
 #~ msgid "Your preferences are now set to default values."
 #~ msgstr "あなたの設定は標準値に設定されました。"
 
-#~ msgid "Enabled"
-#~ msgstr "有効にする"
-
-#~ msgid "Match any rule"
-#~ msgstr "いずれかのルールに一致"
-
-#~ msgid "Inverse matching"
-#~ msgstr "一致結果の反転"
-
 #~ msgid ""
 #~ "This program requires XmlHttpRequest to function properly. Your browser "
 #~ "doesn't seem to support it."
@@ -3309,36 +3481,15 @@ msgstr "このフィルタに一致する最近の記事がありません。"
 #~ msgid "Access level:"
 #~ msgstr "アクセスレベル:"
 
-#~ msgid "Match"
-#~ msgstr "一致"
-
-#~ msgid "Apply actions"
-#~ msgstr "適用する操作"
-
 #~ msgid "on field"
 #~ msgstr "対象項目"
 
 #~ msgid "Perform Action"
 #~ msgstr "操作の実行"
 
-#~ msgid "Feed Title"
-#~ msgstr "フィードの題名"
-
-#~ msgid "Feed URL"
-#~ msgstr "フィード URL"
-
-#~ msgid "Site URL"
-#~ msgstr "サイトの URL"
-
 #~ msgid "Interval:"
 #~ msgstr "間隔:"
 
-#~ msgid "Login"
-#~ msgstr "ログイン"
-
-#~ msgid "Icon"
-#~ msgstr "アイコン"
-
 #~ msgid "Replace"
 #~ msgstr "置き換え"
 
@@ -3354,9 +3505,6 @@ msgstr "このフィルタに一致する最近の記事がありません。"
 #~ msgid "Edit"
 #~ msgstr "編集"
 
-#~ msgid "User details"
-#~ msgstr "ユーザーの詳細"
-
 #~ msgid "Subscribed feeds count"
 #~ msgstr "購読フィード数"
 
@@ -3382,19 +3530,10 @@ msgstr "このフィルタに一致する最近の記事がありません。"
 #~ msgid "Published & shared articles / Generated feeds"
 #~ msgstr "公開・共有した記事 / 生成したフィード"
 
-#~ msgid "Feeds require authentication."
-#~ msgstr "このフィードは認証を要求します。"
-
 #, fuzzy
 #~ msgid "Select articles"
 #~ msgstr "すべての記事を選択する"
 
-#~ msgid "Feed or site URL"
-#~ msgstr "フィードかサイトの URL"
-
-#~ msgid "Search %s..."
-#~ msgstr "「%s」を検索..."
-
 #~ msgid "unknown type"
 #~ msgstr "未知の種類"
 
@@ -3484,9 +3623,6 @@ msgstr "このフィルタに一致する最近の記事がありません。"
 #~ "シュかハングのような問題が起こっているのかもしれません。デーモンプロセスを"
 #~ "確認するか、管理者に連絡してください。"
 
-#~ msgid "Open Preferences"
-#~ msgstr "設定を開く"
-
 #~ msgid "Selection toggle:"
 #~ msgstr "選択の切り替え:"
 
@@ -3688,10 +3824,6 @@ msgstr "このフィルタに一致する最近の記事がありません。"
 #~ msgid "limit:"
 #~ msgstr "制限:"
 
-#, fuzzy
-#~ msgid "Toggle feedlist"
-#~ msgstr "フィード一覧を閉じる"
-
 #, fuzzy
 #~ msgid "Automatically opens next unread feed after marking one as read"
 #~ msgstr "フィードを既読にした後で自動的に未読記事のある次のフィードを開く"
@@ -3723,9 +3855,6 @@ msgstr "このフィルタに一致する最近の記事がありません。"
 #~ msgid "Automatically mark articles as read"
 #~ msgstr "自動的に記事を既読にする"
 
-#~ msgid "Automatically expand articles in combined mode"
-#~ msgstr "組み合わせモードで記事を自動的に展開する"
-
 #~ msgid "Combined feed display"
 #~ msgstr "フィード表示の組み合わせ"
 
@@ -3816,19 +3945,12 @@ msgstr "このフィルタに一致する最近の記事がありません。"
 #~ msgid " - "
 #~ msgstr " - "
 
-#~ msgid "Edit tags for this article"
-#~ msgstr "この記事のタグを編集する"
-
 #~ msgid "Originally from:"
 #~ msgstr "元の記事:"
 
 #~ msgid "(edit note)"
 #~ msgstr "(ノートの編集)"
 
-#, fuzzy
-#~ msgid "mark feed as read"
-#~ msgstr "既読にする"
-
 #~ msgid ""
 #~ "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 #~ msgstr ""
@@ -4176,10 +4298,6 @@ msgstr "このフィルタに一致する最近の記事がありません。"
 #~ msgid "Unknown option: %s"
 #~ msgstr "不明なオプション: %s"
 
-#~ msgid "Session failed to validate (user agent changed)"
-#~ msgstr ""
-#~ "セッションの検査に失敗しました (ユーザーエージェントが変更されました)"
-
 #~ msgid "Assign articles to labels automatically"
 #~ msgstr "自動的に記事にラベルを割り当てる"
 
-- 
cgit v1.2.3