update translations

2 files changed, 641 insertions, 460 deletions

diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 43425f4d5..afc5be26c 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.mo
+++ b/locale/ja_JP/LC_MESSAGES/messages.mo
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index 72ca18af1..043512453 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: 2011-03-21 12:01+0300\n"
+"POT-Creation-Date: 2011-04-21 10:05+0400\n"
 "PO-Revision-Date: 2009-05-12 03:25+0900\n"
 "Last-Translator: Tadashi Jokagi <[email protected]>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -16,100 +16,100 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:72
+#: backend.php:71
 msgid "Use default"
 msgstr "標準を使用する"
 
-#: backend.php:73
+#: backend.php:72
 msgid "Never purge"
 msgstr "ずっと削除しない"
 
-#: backend.php:74
+#: backend.php:73
 msgid "1 week old"
 msgstr "1 週間前"
 
-#: backend.php:75
+#: backend.php:74
 msgid "2 weeks old"
 msgstr "2 週間前"
 
-#: backend.php:76
+#: backend.php:75
 msgid "1 month old"
 msgstr "1 ヶ月前"
 
-#: backend.php:77
+#: backend.php:76
 msgid "2 months old"
 msgstr "2 日月前"
 
-#: backend.php:78
+#: backend.php:77
 msgid "3 months old"
 msgstr "3 ヶ月前"
 
-#: backend.php:81
+#: backend.php:80
 msgid "Default interval"
 msgstr "更新の間隔"
 
-#: backend.php:82 backend.php:92
+#: backend.php:81 backend.php:91
 msgid "Disable updates"
 msgstr "更新を無効にする"
 
-#: backend.php:83 backend.php:93
+#: backend.php:82 backend.php:92
 msgid "Each 15 minutes"
 msgstr "各 15 分"
 
-#: backend.php:84 backend.php:94
+#: backend.php:83 backend.php:93
 msgid "Each 30 minutes"
 msgstr "各 30 分"
 
-#: backend.php:85 backend.php:95
+#: backend.php:84 backend.php:94
 msgid "Hourly"
 msgstr "毎時"
 
-#: backend.php:86 backend.php:96
+#: backend.php:85 backend.php:95
 msgid "Each 4 hours"
 msgstr "各 4 時間"
 
-#: backend.php:87 backend.php:97
+#: backend.php:86 backend.php:96
 msgid "Each 12 hours"
 msgstr "各 12 時間"
 
-#: backend.php:88 backend.php:98
+#: backend.php:87 backend.php:97
 msgid "Daily"
 msgstr "毎日"
 
-#: backend.php:89 backend.php:99
+#: backend.php:88 backend.php:98
 msgid "Weekly"
 msgstr "毎週"
 
-#: backend.php:102 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:101 tt-rss.php:142 modules/pref-prefs.php:345
 msgid "Default"
 msgstr "標準"
 
-#: backend.php:103
+#: backend.php:102
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:104
+#: backend.php:103
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:105
+#: backend.php:104
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:114 modules/pref-users.php:131
+#: backend.php:113 modules/pref-users.php:131
 msgid "User"
 msgstr "ユーザー"
 
-#: backend.php:115
+#: backend.php:114
 msgid "Power User"
 msgstr "パワーユーザー"
 
-#: backend.php:116
+#: backend.php:115
 msgid "Administrator"
 msgstr "管理者"
 
-#: backend.php:167 prefs.php:103 modules/pref-feeds.php:41
-#: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
+#: backend.php:167 prefs.php:95 modules/pref-feeds.php:45
+#: modules/pref-feeds.php:1267 modules/pref-feeds.php:1331
 msgid "Feeds"
 msgstr "フィード"
 
@@ -118,17 +118,17 @@ msgstr "フィード"
 msgid "Article not found."
 msgstr "フィードが見つかりません。"
 
-#: backend.php:273 functions.php:4756
+#: backend.php:282 functions.php:4982
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: backend.php:499 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
-#: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
+#: backend.php:510 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:108
+#: tt-rss.php:192 modules/pref-feeds.php:1381 modules/pref-filters.php:550
 #: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr "読み込みんでいます。しばらくお待ちください..."
 
-#: backend.php:512 login_form.php:151 modules/backend-rpc.php:66
+#: backend.php:524 login_form.php:151 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 #, fuzzy
 msgid "Default profile"
@@ -159,18 +159,18 @@ msgstr ""
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS のデータベースを更新しました。"
 
-#: db-updater.php:91 db-updater.php:159 register.php:152 register.php:197
-#: register.php:210 register.php:225 register.php:243 register.php:328
-#: register.php:338 register.php:350 twitter.php:108 twitter.php:120
-#: modules/pref-feeds.php:994
+#: db-updater.php:91 db-updater.php:158 db-updater.php:171 register.php:153
+#: register.php:198 register.php:211 register.php:226 register.php:244
+#: register.php:329 register.php:339 register.php:351 twitter.php:108
+#: twitter.php:120 modules/pref-feeds.php:1085
 msgid "Return to Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: db-updater.php:99
+#: db-updater.php:97
 msgid "Please backup your database before proceeding."
 msgstr "実行前にデータベースのバックアップをしてください。"
 
-#: db-updater.php:101
+#: db-updater.php:99
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -179,32 +179,32 @@ msgstr ""
 "Tiny Tiny RSS は最新のバージョンに更新する必要があります (<b>%d</b> から <b>"
 "%d</b>)。"
 
-#: db-updater.php:115
+#: db-updater.php:113
 msgid "Perform updates"
 msgstr "更新の実行"
 
-#: db-updater.php:120
+#: db-updater.php:118
 msgid "Performing updates..."
 msgstr "更新を実行しています..."
 
-#: db-updater.php:126
+#: db-updater.php:124
 #, php-format
 msgid "Updating to version %d..."
 msgstr "バージョン %d を確認しています..."
 
-#: db-updater.php:139
+#: db-updater.php:137
 msgid "Checking version... "
 msgstr "バージョンを確認しています..."
 
-#: db-updater.php:145
+#: db-updater.php:143
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:145
 msgid "ERROR!"
 msgstr "エラー!"
 
-#: db-updater.php:155
+#: db-updater.php:153
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -213,6 +213,21 @@ msgstr ""
 "完了しました。<b>%d</b> 個のテーブルをスキーマーバージョン<b>%d</b> に更新し"
 "ました。"
 
+#: db-updater.php:163
+msgid "Your database schema is from a newer version of Tiny Tiny RSS."
+msgstr ""
+
+#: db-updater.php:165
+#, php-format
+msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
+msgstr ""
+
+#: db-updater.php:167
+msgid ""
+"Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
+"version and continue."
+msgstr ""
+
 #: digest.php:55
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
@@ -220,11 +235,11 @@ msgid ""
 "\t\t\tbrowser settings."
 msgstr ""
 
-#: digest.php:70 prefs.php:88 tt-rss.php:75
+#: digest.php:70 tt-rss.php:72
 msgid "Hello,"
 msgstr "ようこそ、"
 
-#: digest.php:74 prefs.php:93 tt-rss.php:85 mobile/functions.php:59
+#: digest.php:74 tt-rss.php:82 mobile/functions.php:59
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "ログアウト"
@@ -316,214 +331,222 @@ msgstr ""
 "SQL のエスケープ処理のテストに失敗しました。データベースの設定と PHP の設定を"
 "確認してください。"
 
-#: functions.php:1879
+#: functions.php:2043
 msgid "Session failed to validate (incorrect IP)"
 msgstr "セッションの検査に失敗しました (IP が正しくない)"
 
-#: functions.php:1951
+#: functions.php:2115
 msgid "Incorrect username or password"
 msgstr "ユーザー名かパスワードが正しくありません"
 
-#: functions.php:2929 modules/popup-dialog.php:394
+#: functions.php:3096 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: functions.php:2961 functions.php:3004 functions.php:4252 functions.php:4261
-#: modules/pref-feeds.php:86
+#: functions.php:3128 functions.php:3171 functions.php:4470 functions.php:4479
+#: modules/pref-feeds.php:91
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
-#: functions.php:2994 functions.php:3596 mobile/functions.php:168
+#: functions.php:3161 functions.php:3809 mobile/functions.php:168
 msgid "Special"
 msgstr "特別"
 
-#: functions.php:2996 functions.php:3598 prefs.php:109
+#: functions.php:3163 functions.php:3811 prefs.php:101
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr "ラベル"
 
-#: functions.php:3042 help/3.php:61
+#: functions.php:3209 help/3.php:61
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: functions.php:3044 help/3.php:62
+#: functions.php:3211 help/3.php:62
 msgid "Published articles"
 msgstr "公開済みの記事"
 
-#: functions.php:3046 help/3.php:60
+#: functions.php:3213 help/3.php:60
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: functions.php:3048 help/3.php:59
+#: functions.php:3215 help/3.php:59
 msgid "All articles"
 msgstr "すべての記事"
 
-#: functions.php:3050
+#: functions.php:3217
 #, fuzzy
 msgid "Archived articles"
 msgstr "未読記事"
 
-#: functions.php:4018
+#: functions.php:4241
 msgid "Select:"
 msgstr "選択:"
 
-#: functions.php:4019 modules/pref-feeds.php:1207 modules/pref-filters.php:399
-#: modules/pref-labels.php:272 modules/pref-users.php:382
+#: functions.php:4242 modules/pref-feeds.php:1325 modules/pref-filters.php:525
+#: modules/pref-instances.php:137 modules/pref-labels.php:272
+#: modules/pref-users.php:382
 msgid "All"
 msgstr "すべて"
 
-#: functions.php:4020 functions.php:4032 tt-rss.php:139
+#: functions.php:4243 functions.php:4255 tt-rss.php:134
 msgid "Unread"
 msgstr "未読"
 
-#: functions.php:4021
+#: functions.php:4244
 msgid "Invert"
 msgstr "反転"
 
-#: functions.php:4022 modules/pref-feeds.php:1209 modules/pref-filters.php:401
-#: modules/pref-labels.php:274 modules/pref-users.php:384
+#: functions.php:4245 modules/pref-feeds.php:1327 modules/pref-filters.php:527
+#: modules/pref-instances.php:139 modules/pref-labels.php:274
+#: modules/pref-users.php:384
 msgid "None"
 msgstr "なし"
 
-#: functions.php:4028 tt-rss.php:165
+#: functions.php:4251 tt-rss.php:160
 msgid "Actions..."
 msgstr "操作..."
 
-#: functions.php:4030
+#: functions.php:4253
 msgid "Selection toggle:"
 msgstr "選択の切り替え:"
 
-#: functions.php:4033 tt-rss.php:137
+#: functions.php:4256 tt-rss.php:132
 msgid "Starred"
 msgstr "お気に入り"
 
-#: functions.php:4034 tt-rss.php:138
+#: functions.php:4257 tt-rss.php:133
 msgid "Published"
 msgstr "公開済み"
 
-#: functions.php:4036
+#: functions.php:4259
 msgid "Selection:"
 msgstr "選択:"
 
-#: functions.php:4038 functions.php:4056 localized_schema.php:10
-#: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
+#: functions.php:4261 functions.php:4281 localized_schema.php:10
+#: tt-rss.php:154 tt-rss.php:169 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "既読にする"
 
-#: functions.php:4041
+#: functions.php:4264
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4043
+#: functions.php:4266
 #, fuzzy
 msgid "Move back"
 msgstr "戻る"
 
-#: functions.php:4044
+#: functions.php:4267
 #, fuzzy
 msgid "Delete"
 msgstr "標準"
 
-#: functions.php:4048 functions.php:4614 functions.php:5216
+#: functions.php:4271 functions.php:4840 functions.php:5444
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4054 PrefFilterTree.js:29
+#: functions.php:4279 PrefFilterTree.js:29
 msgid "Feed:"
 msgstr "フィード:"
 
-#: functions.php:4058 modules/popup-dialog.php:737
+#: functions.php:4283 modules/popup-dialog.php:851
 #, fuzzy
 msgid "View as RSS"
 msgstr "タグを閲覧する"
 
-#: functions.php:4068 functions.php:4666
+#: functions.php:4293 functions.php:4898
 #, fuzzy
 msgid "Visit the website"
 msgstr "オフィシャルサイトに訪問する"
 
-#: functions.php:4114
+#: functions.php:4332
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "フィードを閲覧する"
 
-#: functions.php:4439 viewfeed.js:2243
+#: functions.php:4657 viewfeed.js:2252
 #, fuzzy
 msgid "Click to play"
 msgstr "編集するにはクリック"
 
-#: functions.php:4440 viewfeed.js:2242
+#: functions.php:4658 viewfeed.js:2251
 msgid "Play"
 msgstr ""
 
-#: functions.php:4566
+#: functions.php:4784
 msgid " - "
 msgstr " - "
 
-#: functions.php:4595 functions.php:5194
+#: functions.php:4807 functions.php:6391 modules/backend-rpc.php:380
+msgid "no tags"
+msgstr "タグがありません"
+
+#: functions.php:4817 functions.php:5422
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: functions.php:4601 functions.php:5203
+#: functions.php:4827 functions.php:5431
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "新しいウィンドウで記事を開く"
 
-#: functions.php:4608 functions.php:5210 viewfeed.js:2187
+#: functions.php:4834 functions.php:5438 viewfeed.js:2194
 #, fuzzy
 msgid "Edit article note"
 msgstr "タグを編集する"
 
-#: functions.php:4621 functions.php:5223 digest.js:435
+#: functions.php:4847 functions.php:5451 digest.js:435
 msgid "Share on Twitter"
 msgstr ""
 
-#: functions.php:4627
+#: functions.php:4853
 #, fuzzy
 msgid "Close this panel"
 msgstr "このウィンドウを閉じる"
 
-#: functions.php:4644 functions.php:5125
+#: functions.php:4870 functions.php:5353
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5138 modules/popup-dialog.php:251
-#: modules/pref-feeds.php:298
+#: functions.php:4883 functions.php:5366 modules/popup-dialog.php:251
+#: modules/pref-feeds.php:305
 #, fuzzy
 msgid "Feed URL"
 msgstr "フィード"
 
-#: functions.php:4696 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4922 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:563
-#: modules/popup-dialog.php:622 modules/popup-dialog.php:760
-#: modules/popup-dialog.php:790 modules/pref-feeds.php:1167
+#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
+#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
+#: modules/popup-dialog.php:874 modules/popup-dialog.php:904
+#: modules/popup-dialog.php:991 modules/pref-feeds.php:1258
+#: modules/pref-filters.php:405 modules/pref-filters.php:482
 #: modules/pref-users.php:99
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: functions.php:4962 functions.php:5041
+#: functions.php:5188 functions.php:5269
 msgid "mark as read"
 msgstr "既読にする"
 
-#: functions.php:5229
+#: functions.php:5457
 #, fuzzy
 msgid "Dismiss article"
 msgstr "公開記事"
 
-#: functions.php:5248
+#: functions.php:5476
 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: functions.php:5251
+#: functions.php:5479
 msgid "No updated articles found to display."
 msgstr "表示する更新された記事が見つかりませんでした。"
 
-#: functions.php:5254
+#: functions.php:5482
 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
-#: functions.php:5258
+#: functions.php:5486
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -531,58 +554,55 @@ msgstr ""
 "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ"
 "ニューを参照します)、フィルターを使うことができます。"
 
-#: functions.php:5260
+#: functions.php:5488
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
-#: functions.php:5275 functions.php:6600
+#: functions.php:5503 functions.php:6839
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5285 functions.php:6610
+#: functions.php:5513 functions.php:6849
 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
-#: functions.php:6092 tt-rss.php:179
+#: functions.php:6325 tt-rss.php:174
 msgid "Create label..."
 msgstr "ラベルを作成する..."
 
-#: functions.php:6106
+#: functions.php:6339
 #, fuzzy
 msgid "Remove:"
 msgstr "削除"
 
-#: functions.php:6110
+#: functions.php:6343
 #, fuzzy
 msgid "Assign:"
 msgstr "ラベルの割り当て:"
 
-#: functions.php:6158
-msgid "no tags"
-msgstr "タグがありません"
-
-#: functions.php:6181
-msgid "edit note"
+#: functions.php:6416
+#, fuzzy
+msgid "(edit note)"
 msgstr "ノートの編集"
 
-#: functions.php:6590
+#: functions.php:6829
 msgid "No feed selected."
 msgstr "フィードは選択されていません。"
 
-#: functions.php:6774
+#: functions.php:7013
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: functions.php:6814
+#: functions.php:7053
 msgid "Attachment:"
 msgstr "添付:"
 
-#: functions.php:6816
+#: functions.php:7055
 msgid "Attachments:"
 msgstr "添付:"
 
-#: localized_schema.php:3 tt-rss.php:149 modules/popup-dialog.php:378
+#: localized_schema.php:3 tt-rss.php:144 modules/popup-dialog.php:378
 msgid "Title"
 msgstr "題名"
 
@@ -619,7 +639,7 @@ msgstr "公開記事"
 msgid "Assign tags"
 msgstr "タグの割り当て"
 
-#: localized_schema.php:14 viewfeed.js:2128
+#: localized_schema.php:14 viewfeed.js:2135
 msgid "Assign label"
 msgstr "ラベルの割り当て"
 
@@ -681,12 +701,12 @@ msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
 #: localized_schema.php:26
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "この日数よりあとの古い投稿を削除する (0 は無効です)"
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
 
 #: localized_schema.php:27
-msgid "Update post on checksum change"
-msgstr "チェックサムの変更で投稿を更新する"
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "この日数よりあとの古い投稿を削除する (0 は無効です)"
 
 #: localized_schema.php:28
 #, fuzzy
@@ -719,100 +739,96 @@ msgid "Long date format"
 msgstr "完全な日付の形式"
 
 #: localized_schema.php:35
-msgid "Use more accessible date/time format for headlines"
-msgstr ""
-
-#: localized_schema.php:36
 msgid "Combined feed display"
 msgstr "フィード表示の組み合わせ"
 
-#: localized_schema.php:37
+#: localized_schema.php:36
 msgid "Hide feeds with no unread messages"
 msgstr "未読でないメッセージとフィードを隠す"
 
-#: localized_schema.php:38
+#: localized_schema.php:37
 msgid "On catchup show next feed"
 msgstr "次のフィードの表示をキャッチアップする"
 
-#: localized_schema.php:39
+#: localized_schema.php:38
 msgid "Sort feeds by unread articles count"
 msgstr "未読記事数によるフィードの並び替え"
 
-#: localized_schema.php:40
-msgid "Set articles as unread on update"
-msgstr "更新時に未読として記事を設定する"
-
-#: localized_schema.php:41
+#: localized_schema.php:39
 msgid "Reverse headline order (oldest first)"
 msgstr "ヘッドラインの逆順 (古いものがはじめに)"
 
-#: localized_schema.php:42
+#: localized_schema.php:40
 msgid "Enable e-mail digest"
 msgstr "電子メールでのダイジェストを有効にする"
 
-#: localized_schema.php:43
+#: localized_schema.php:41
 msgid "Confirm marking feed as read"
 msgstr "既読としてフィードのマーキングについて確認する"
 
-#: localized_schema.php:44
+#: localized_schema.php:42
 #, fuzzy
 msgid "Automatically mark articles as read"
 msgstr "組み合わせモードで記事を自動的に展開する"
 
-#: localized_schema.php:45
+#: localized_schema.php:43
 msgid "Strip unsafe tags from articles"
 msgstr "記事から安全でないタグを取り除く"
 
-#: localized_schema.php:46
+#: localized_schema.php:44
 msgid "Blacklisted tags"
 msgstr "ブラックリスト化したタグ"
 
-#: localized_schema.php:47
+#: localized_schema.php:45
 msgid "Maximum age of fresh articles (in hours)"
 msgstr "新規記事としての取り扱い期限 (単位: 時間)"
 
-#: localized_schema.php:48
+#: localized_schema.php:46
 msgid "Mark articles in e-mail digest as read"
 msgstr "既読として電子メールのダイジェストに含まれる記事を設定する"
 
-#: localized_schema.php:49
+#: localized_schema.php:47
 msgid "Automatically expand articles in combined mode"
 msgstr "組み合わせモードで記事を自動的に展開する"
 
-#: localized_schema.php:50
+#: localized_schema.php:48
 msgid "Purge unread articles"
 msgstr "未読記事を削除する"
 
-#: localized_schema.php:51
+#: localized_schema.php:49
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
-#: localized_schema.php:52
+#: localized_schema.php:50
 msgid "Group headlines in virtual feeds"
 msgstr "仮想フィードのグループヘッドライン"
 
-#: localized_schema.php:53
+#: localized_schema.php:51
 msgid "Do not show images in articles"
 msgstr "記事内に画像を表示しない"
 
-#: localized_schema.php:54
+#: localized_schema.php:52
 msgid "Enable external API"
 msgstr ""
 
-#: localized_schema.php:55
+#: localized_schema.php:53
 msgid "User timezone"
 msgstr ""
 
-#: localized_schema.php:56
+#: localized_schema.php:54
 #, fuzzy
 msgid "Sort headlines by feed date"
 msgstr "未読記事数によるフィードの並び替え"
 
-#: localized_schema.php:57 prefs.js:1676
+#: localized_schema.php:55 prefs.js:1753
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "ユーザースタイルシートの URL"
 
+#: localized_schema.php:56
+msgid "Login with an SSL certificate"
+msgstr ""
+
 #: login_form.php:131 mobile/login_form.php:38
 msgid "Login:"
 msgstr "ログイン:"
@@ -846,203 +862,204 @@ msgstr ""
 msgid "OPML Utility"
 msgstr "OPML ユーティリティ"
 
-#: opml.php:183
-msgid "Importing OPML (using DOMXML extension)..."
+#: opml.php:180
+#, fuzzy
+msgid "Importing OPML..."
 msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 
-#: opml.php:187
-msgid "Importing OPML (using DOMDocument extension)..."
-msgstr "OPML のインポート中 (DOMDocument 機能拡張を用いて)..."
-
-#: opml.php:191 modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr ""
-"DOMXML 機能拡張が見つかりません。PHP バージョン 5 未満はそれを要求します。"
-
-#: opml.php:195
+#: opml.php:185
 msgid "Return to preferences"
 msgstr "設定に戻る"
 
-#: prefs.php:90 help/4.php:14
-msgid "Exit preferences"
-msgstr "設定を終了する"
-
-#: prefs.php:91
+#: prefs.php:83
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: prefs.php:100 tt-rss.php:77 modules/pref-prefs.php:267 help/3.php:64
+#: prefs.php:84 help/4.php:14
+msgid "Exit preferences"
+msgstr "設定を終了する"
+
+#: prefs.php:92 tt-rss.php:74 modules/pref-prefs.php:265 help/3.php:64
 #: help/4.php:8
 msgid "Preferences"
 msgstr "設定"
 
-#: prefs.php:106 modules/pref-filters.php:9 help/4.php:11
+#: prefs.php:98 modules/pref-filters.php:90 help/4.php:11
 msgid "Filters"
 msgstr "フィルター"
 
-#: prefs.php:113 help/4.php:13
+#: prefs.php:105 help/4.php:13
 msgid "Users"
 msgstr "ユーザー"
 
+#: prefs.php:108
+#, fuzzy
+msgid "Linked"
+msgstr "リンク"
+
 #: register.php:149
 msgid "New user registrations are administratively disabled."
 msgstr "新規ユーザーの登録は管理者によって無効になっています。"
 
-#: register.php:173
+#: register.php:174
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
 "password is sent."
 msgstr ""
 
-#: register.php:179
+#: register.php:180
 msgid "Desired login:"
 msgstr ""
 
-#: register.php:182
+#: register.php:183
 msgid "Check availability"
 msgstr ""
 
-#: register.php:184
+#: register.php:185
 msgid "Email:"
 msgstr "電子メール:"
 
-#: register.php:187
+#: register.php:188
 msgid "How much is two plus two:"
 msgstr ""
 
-#: register.php:190
+#: register.php:191
 msgid "Submit registration"
 msgstr "登録を送信する"
 
-#: register.php:208
+#: register.php:209
 msgid "Your registration information is incomplete."
 msgstr "登録情報が完成していません。"
 
-#: register.php:223
+#: register.php:224
 msgid "Sorry, this username is already taken."
 msgstr "すみませんがこのユーザー名は既にいます。"
 
-#: register.php:241
+#: register.php:242
 msgid "Registration failed."
 msgstr "登録に失敗しました。"
 
-#: register.php:325
+#: register.php:326
 msgid "Account created successfully."
 msgstr "アカウントの作成に成功しました。"
 
-#: register.php:347
+#: register.php:348
 msgid "New user registrations are currently closed."
 msgstr "新規ユーザーの登録は現在行っていません。"
 
-#: tt-rss.php:81
+#: tt-rss.php:78
 msgid "Comments?"
 msgstr "コメントしますか?"
 
-#: tt-rss.php:91
+#: tt-rss.php:88
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: tt-rss.php:120
+#: tt-rss.php:115
 msgid "News"
 msgstr ""
 
-#: tt-rss.php:129
+#: tt-rss.php:124
 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 
-#: tt-rss.php:132
+#: tt-rss.php:127
 #, fuzzy
 msgid "Show articles"
 msgstr "記事を保管しました"
 
-#: tt-rss.php:135
+#: tt-rss.php:130
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:136
+#: tt-rss.php:131
 msgid "All Articles"
 msgstr "すべての記事"
 
-#: tt-rss.php:140
+#: tt-rss.php:135
 msgid "Ignore Scoring"
 msgstr "スコア計算の無効化"
 
-#: tt-rss.php:141
+#: tt-rss.php:136
 msgid "Updated"
 msgstr "更新日時"
 
-#: tt-rss.php:144
+#: tt-rss.php:139
 #, fuzzy
 msgid "Sort articles"
 msgstr "記事を保管しました"
 
-#: tt-rss.php:148 modules/pref-filters.php:147
+#: tt-rss.php:143 modules/pref-filters.php:228
 msgid "Date"
 msgstr "日付"
 
-#: tt-rss.php:150
+#: tt-rss.php:145
 msgid "Score"
 msgstr "スコア"
 
-#: tt-rss.php:155 modules/pref-feeds.php:318 modules/pref-feeds.php:540
+#: tt-rss.php:150 modules/pref-feeds.php:333 modules/pref-feeds.php:592
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:167
+#: tt-rss.php:162
 msgid "Search..."
 msgstr "検索..."
 
-#: tt-rss.php:168
+#: tt-rss.php:163
 msgid "Feed actions:"
 msgstr "フィード操作"
 
-#: tt-rss.php:169
+#: tt-rss.php:164
 msgid "Subscribe to feed..."
 msgstr "フィードを購読する..."
 
-#: tt-rss.php:170
+#: tt-rss.php:165
 msgid "Edit this feed..."
 msgstr "フィードを編集する..."
 
-#: tt-rss.php:171
+#: tt-rss.php:166
 msgid "Rescore feed"
 msgstr "フィードのスコアを再計算しています..."
 
-#: tt-rss.php:172 modules/pref-feeds.php:484 modules/pref-feeds.php:1238
+#: tt-rss.php:167 modules/pref-feeds.php:523 modules/pref-feeds.php:1357
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
-#: tt-rss.php:173
+#: tt-rss.php:168
 msgid "All feeds:"
 msgstr "すべてのフィード:"
 
-#: tt-rss.php:175 help/3.php:46
+#: tt-rss.php:170 help/3.php:46
 msgid "(Un)hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: tt-rss.php:176
+#: tt-rss.php:171
 msgid "Other actions:"
 msgstr "その他の操作:"
 
-#: tt-rss.php:177
+#: tt-rss.php:172
 msgid "Switch to digest..."
 msgstr ""
 
-#: tt-rss.php:178
+#: tt-rss.php:173
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "タグクラウド"
 
-#: tt-rss.php:180
+#: tt-rss.php:175
 msgid "Create filter..."
 msgstr "フィルターを作成しています..."
 
-#: tt-rss.php:181
+#: tt-rss.php:176
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "キーボードショートカット"
 
+#: tt-rss.php:177 tt-rss.js:432
+msgid "About..."
+msgstr ""
+
 #: twitter.php:95
 msgid "Register with Twitter"
 msgstr ""
@@ -1055,26 +1072,26 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:115
+#: twitter.php:115 modules/pref-prefs.php:444
 #, fuzzy
 msgid "Register"
 msgstr "登録済み"
 
-#: modules/backend-rpc.php:759
+#: modules/backend-rpc.php:816
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "登録情報が完成していません。"
 
-#: modules/backend-rpc.php:763
+#: modules/backend-rpc.php:820
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:771
+#: modules/backend-rpc.php:828
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "パスワードを変更しました。"
 
-#: modules/backend-rpc.php:784
+#: modules/backend-rpc.php:841
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
@@ -1087,7 +1104,7 @@ msgstr "ヘルプ"
 msgid "Help topic not found."
 msgstr "ヘルプのトピックが見つかりません。"
 
-#: modules/opml_domdoc.php:60 modules/opml_domxml.php:58
+#: modules/opml_domdoc.php:60
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "カテゴリー <b>%s</b> の追加中です。"
@@ -1097,28 +1114,24 @@ msgstr "カテゴリー <b>%s</b> の追加中です。"
 msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
+#: modules/opml_domdoc.php:128
 #, fuzzy
 msgid "is already imported."
 msgstr "既にインポート済みです。"
 
-#: modules/opml_domdoc.php:148 modules/opml_domxml.php:126
+#: modules/opml_domdoc.php:148
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157
 msgid "Error while parsing document."
 msgstr "ドキュメントの解析中のエラーです。"
 
-#: modules/opml_domdoc.php:161 modules/opml_domxml.php:142
+#: modules/opml_domdoc.php:161
 msgid "Error: please upload OPML file."
 msgstr "エラー: OPML ファイルをアップロードしてください。"
 
-#: modules/opml_domxml.php:135
-msgid "Error: can't find body element."
-msgstr "エラー: 本文要素を見つけることができませんでした。"
-
 #: modules/popup-dialog.php:34
 #, fuzzy
 msgid "Importing using DOMXML."
@@ -1129,6 +1142,11 @@ msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 msgid "Importing using DOMDocument."
 msgstr "OPML のインポート中 (DOMDocument 機能拡張を用いて)..."
 
+#: modules/popup-dialog.php:45
+msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+msgstr ""
+"DOMXML 機能拡張が見つかりません。PHP バージョン 5 未満はそれを要求します。"
+
 #: modules/popup-dialog.php:80
 #, fuzzy
 msgid "Create profile"
@@ -1157,7 +1175,7 @@ msgstr ""
 msgid "Your Public OPML URL is:"
 msgstr "公開記事フィードへのリンクです。"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:757
+#: modules/popup-dialog.php:193 modules/popup-dialog.php:871
 #, fuzzy
 msgid "Generate new URL"
 msgstr "生成したフィード"
@@ -1184,13 +1202,13 @@ msgid ""
 "contact instance owner."
 msgstr ""
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:279
-#: modules/pref-feeds.php:501
+#: modules/popup-dialog.php:247 modules/pref-feeds.php:286
+#: modules/pref-feeds.php:553
 msgid "Feed"
 msgstr "フィード"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:310
-#: modules/pref-feeds.php:529
+#: modules/popup-dialog.php:257 modules/pref-feeds.php:325
+#: modules/pref-feeds.php:581
 msgid "Place in category:"
 msgstr "カテゴリーの場所:"
 
@@ -1199,19 +1217,19 @@ msgstr "カテゴリーの場所:"
 msgid "Available feeds"
 msgstr "すべてのフィード"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:357
-#: modules/pref-feeds.php:572 modules/pref-prefs.php:207
+#: modules/popup-dialog.php:277 modules/pref-feeds.php:372
+#: modules/pref-feeds.php:624 modules/pref-prefs.php:205
 #: modules/pref-users.php:147
 msgid "Authentication"
 msgstr "認証"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:367
-#: modules/pref-feeds.php:576 modules/pref-users.php:438
+#: modules/popup-dialog.php:281 modules/pref-feeds.php:382
+#: modules/pref-feeds.php:628 modules/pref-users.php:438
 msgid "Login"
 msgstr "ログイン"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:375
-#: modules/pref-feeds.php:582
+#: modules/popup-dialog.php:284 modules/pref-feeds.php:390
+#: modules/pref-feeds.php:634
 #, fuzzy
 msgid "Password"
 msgstr "パスワード:"
@@ -1230,17 +1248,18 @@ msgid "More feeds"
 msgstr "さらなるフィード"
 
 #: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:426 modules/popup-dialog.php:533
-#: modules/popup-dialog.php:601 modules/popup-dialog.php:729
-#: modules/popup-dialog.php:818 modules/popup-dialog.php:845
-#: modules/pref-feeds.php:487 modules/pref-feeds.php:632
-#: modules/pref-filters.php:256 modules/pref-labels.php:80
+#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
+#: modules/popup-dialog.php:715 modules/popup-dialog.php:843
+#: modules/popup-dialog.php:932 modules/popup-dialog.php:959
+#: modules/popup-dialog.php:1041 modules/pref-feeds.php:539
+#: modules/pref-feeds.php:696 modules/pref-filters.php:340
+#: modules/pref-instances.php:98 modules/pref-labels.php:80
 #: modules/pref-users.php:186
 msgid "Cancel"
 msgstr "取り消し"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:425
-#: modules/pref-users.php:369 tt-rss.js:233
+#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
+#: modules/pref-feeds.php:1318 modules/pref-users.php:369 tt-rss.js:233
 msgid "Search"
 msgstr "検索"
 
@@ -1259,9 +1278,10 @@ msgstr "フィード操作"
 msgid "limit:"
 msgstr "制限:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:474
-#: modules/pref-filters.php:249 modules/pref-filters.php:411
-#: modules/pref-labels.php:281 modules/pref-users.php:395
+#: modules/popup-dialog.php:353 modules/pref-feeds.php:513
+#: modules/pref-filters.php:330 modules/pref-filters.php:537
+#: modules/pref-instances.php:144 modules/pref-labels.php:281
+#: modules/pref-users.php:395
 msgid "Remove"
 msgstr "削除"
 
@@ -1286,127 +1306,145 @@ msgstr "対象範囲"
 msgid "This feed"
 msgstr "このフィード"
 
-#: modules/popup-dialog.php:448 modules/pref-filters.php:138
+#: modules/popup-dialog.php:455 modules/pref-filters.php:219
 msgid "Match"
 msgstr "一致"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:150
+#: modules/popup-dialog.php:462 modules/pref-filters.php:231
 msgid "before"
 msgstr "前"
 
-#: modules/popup-dialog.php:456 modules/pref-filters.php:151
+#: modules/popup-dialog.php:463 modules/pref-filters.php:232
 msgid "after"
 msgstr "後"
 
-#: modules/popup-dialog.php:470 modules/pref-filters.php:164
+#: modules/popup-dialog.php:478 modules/pref-filters.php:245
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:473 modules/pref-filters.php:167
+#: modules/popup-dialog.php:481 modules/pref-filters.php:248
 msgid "on field"
 msgstr ""
 
-#: modules/popup-dialog.php:479 modules/pref-filters.php:173 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:254 digest.js:392
 msgid "in"
 msgstr ""
 
-#: modules/popup-dialog.php:485 modules/pref-filters.php:179
+#: modules/popup-dialog.php:493 modules/pref-filters.php:260
 msgid "Perform Action"
 msgstr "操作の実行"
 
-#: modules/popup-dialog.php:502 modules/pref-filters.php:199
+#: modules/popup-dialog.php:510 modules/pref-filters.php:280
 msgid "with parameters:"
 msgstr "パラメーター:"
 
-#: modules/popup-dialog.php:516 modules/pref-feeds.php:385
-#: modules/pref-feeds.php:588 modules/pref-filters.php:219
+#: modules/popup-dialog.php:524 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:640 modules/pref-filters.php:300
 #: modules/pref-users.php:169
 msgid "Options"
 msgstr "オプション"
 
-#: modules/popup-dialog.php:520 modules/pref-filters.php:231
+#: modules/popup-dialog.php:528 modules/pref-filters.php:312
 msgid "Enabled"
 msgstr "有効にする"
 
-#: modules/popup-dialog.php:523 modules/pref-filters.php:240
+#: modules/popup-dialog.php:531 modules/pref-filters.php:321
 msgid "Inverse match"
 msgstr "一致しない"
 
-#: modules/popup-dialog.php:530
+#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+msgid "Test"
+msgstr "テスト"
+
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "作成"
 
-#: modules/popup-dialog.php:542
-msgid "Feeds with update errors"
-msgstr ""
+#: modules/popup-dialog.php:571
+#, fuzzy
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr "エラーのため、フィードは更新されませんでした:"
+
+#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#, fuzzy
+msgid "Click to edit feed"
+msgstr "編集するにはクリック"
 
-#: modules/popup-dialog.php:545
+#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#, fuzzy
+msgid "Unsubscribe from selected feeds"
+msgstr "選択されたフィードの購読をやめますか?"
+
+#: modules/popup-dialog.php:628
 msgid "These feeds have not been updated because of errors:"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
-#: modules/popup-dialog.php:574
+#: modules/popup-dialog.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "この記事のタグ (カンマで区切ります):"
 
-#: modules/popup-dialog.php:599 modules/popup-dialog.php:816
-#: modules/popup-dialog.php:843 modules/pref-feeds.php:486
-#: modules/pref-feeds.php:629 modules/pref-filters.php:253
-#: modules/pref-labels.php:78 modules/pref-users.php:184
+#: modules/popup-dialog.php:713 modules/popup-dialog.php:930
+#: modules/popup-dialog.php:957 modules/pref-feeds.php:538
+#: modules/pref-feeds.php:693 modules/pref-filters.php:337
+#: modules/pref-instances.php:95 modules/pref-labels.php:78
+#: modules/pref-users.php:184
 msgid "Save"
 msgstr "保存"
 
-#: modules/popup-dialog.php:607
+#: modules/popup-dialog.php:721
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "タグクラウド"
 
-#: modules/popup-dialog.php:669 modules/popup-dialog.php:675
+#: modules/popup-dialog.php:783 modules/popup-dialog.php:789
 msgid "[Forwarded]"
 msgstr ""
 
-#: modules/popup-dialog.php:669
+#: modules/popup-dialog.php:783
 #, fuzzy
 msgid "Multiple articles"
 msgstr "すべての記事"
 
-#: modules/popup-dialog.php:690
+#: modules/popup-dialog.php:804
 msgid "From:"
 msgstr ""
 
-#: modules/popup-dialog.php:699
+#: modules/popup-dialog.php:813
 #, fuzzy
 msgid "To:"
 msgstr "トップ"
 
-#: modules/popup-dialog.php:712
+#: modules/popup-dialog.php:826
 #, fuzzy
 msgid "Subject:"
 msgstr "選択:"
 
-#: modules/popup-dialog.php:728
+#: modules/popup-dialog.php:842
 #, fuzzy
 msgid "Send e-mail"
 msgstr "電子メールを変更する"
 
-#: modules/popup-dialog.php:748
+#: modules/popup-dialog.php:862
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:775
+#: modules/popup-dialog.php:889
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: modules/popup-dialog.php:785 modules/pref-users.php:391
+#: modules/popup-dialog.php:899 modules/pref-users.php:391
 #, fuzzy
 msgid "Details"
 msgstr "毎日"
 
-#: modules/popup-dialog.php:787
+#: modules/popup-dialog.php:901
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:801
+#: modules/popup-dialog.php:915
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1414,218 +1452,277 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
+#: modules/popup-dialog.php:1000 modules/pref-instances.php:54
+msgid "Instance"
+msgstr ""
+
+#: modules/popup-dialog.php:1006 modules/pref-feeds.php:303
+#: modules/pref-feeds.php:568 modules/pref-instances.php:62
+msgid "URL:"
+msgstr "URL:"
+
+#: modules/popup-dialog.php:1009 modules/pref-instances.php:65
+#: modules/pref-instances.php:162
+msgid "Instance URL"
+msgstr ""
+
+#: modules/popup-dialog.php:1019 modules/pref-instances.php:76
+#, fuzzy
+msgid "Access key:"
+msgstr "アクセスレベル: "
+
+#: modules/popup-dialog.php:1022 modules/pref-instances.php:79
+#: modules/pref-instances.php:163
+#, fuzzy
+msgid "Access key"
+msgstr "アクセスレベル"
+
+#: modules/popup-dialog.php:1026 modules/pref-instances.php:83
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: modules/popup-dialog.php:1034 modules/pref-instances.php:91
+#, fuzzy
+msgid "Generate new key"
+msgstr "生成したフィード"
+
+#: modules/popup-dialog.php:1038
+#, fuzzy
+msgid "Create link"
+msgstr "作成"
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr ""
 
-#: modules/pref-feeds.php:285
+#: modules/pref-feeds.php:292
 #, fuzzy
 msgid "Feed Title"
 msgstr "題名"
 
-#: modules/pref-feeds.php:296 modules/pref-feeds.php:516
-msgid "URL:"
-msgstr "URL:"
-
-#: modules/pref-feeds.php:333 modules/pref-feeds.php:552
+#: modules/pref-feeds.php:348 modules/pref-feeds.php:604
 msgid "using"
 msgstr ""
 
-#: modules/pref-feeds.php:345 modules/pref-feeds.php:563
+#: modules/pref-feeds.php:360 modules/pref-feeds.php:615
 msgid "Article purging:"
 msgstr "記事の削除:"
 
-#: modules/pref-feeds.php:379
+#: modules/pref-feeds.php:394
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:399 modules/pref-feeds.php:592
+#: modules/pref-feeds.php:414 modules/pref-feeds.php:644
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "自分のフィード一覧から隠す"
 
-#: modules/pref-feeds.php:410 modules/pref-feeds.php:597
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:649
 msgid "Right-to-left content"
 msgstr "右から左のコンテンツ"
 
-#: modules/pref-feeds.php:422 modules/pref-feeds.php:603
+#: modules/pref-feeds.php:437 modules/pref-feeds.php:655
 msgid "Include in e-mail digest"
 msgstr "電子メールダイジェストに含む"
 
-#: modules/pref-feeds.php:435 modules/pref-feeds.php:609
+#: modules/pref-feeds.php:450 modules/pref-feeds.php:661
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:450
+#: modules/pref-feeds.php:465
 #, fuzzy
 msgid "Cache images locally (SimplePie only)"
 msgstr "ローカルに画像をキャッシュする"
 
-#: modules/pref-feeds.php:458
+#: modules/pref-feeds.php:478 modules/pref-feeds.php:678
+#, fuzzy
+msgid "Mark updated articles as unread"
+msgstr "すべての記事を既読にしますか?"
+
+#: modules/pref-feeds.php:490 modules/pref-feeds.php:684
+msgid "Mark posts as updated on content change"
+msgstr ""
+
+#: modules/pref-feeds.php:497
 #, fuzzy
 msgid "Icon"
 msgstr "操作"
 
-#: modules/pref-feeds.php:472
+#: modules/pref-feeds.php:511
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:618
+#: modules/pref-feeds.php:530
+#, fuzzy
+msgid "Resubscribe to push updates"
+msgstr "フィードを購読する:"
+
+#: modules/pref-feeds.php:536
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:670
 msgid "Cache images locally"
 msgstr "ローカルに画像をキャッシュする"
 
-#: modules/pref-feeds.php:844 modules/pref-feeds.php:897
+#: modules/pref-feeds.php:934 modules/pref-feeds.php:987
 msgid "All done."
 msgstr "すべて終了しました。"
 
-#: modules/pref-feeds.php:928
+#: modules/pref-feeds.php:1019
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> を購読しました。"
 
-#: modules/pref-feeds.php:931
+#: modules/pref-feeds.php:1022
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:934
+#: modules/pref-feeds.php:1025
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:942
+#: modules/pref-feeds.php:1033
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:964
+#: modules/pref-feeds.php:1055
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: modules/pref-feeds.php:989
+#: modules/pref-feeds.php:1080
 msgid "Edit subscription options"
 msgstr "購読オプションの編集"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1162
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "カテゴリー <b>%s</b> はデータベースに既に存在します。"
 
-#: modules/pref-feeds.php:1087
+#: modules/pref-feeds.php:1178
 msgid "Create category"
 msgstr "カテゴリーの作成"
 
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1248
 msgid "No feed categories defined."
 msgstr "フィードカテゴリーが定義されていません。"
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1254
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "選択されたカテゴリーを削除しますか?"
 
-#: modules/pref-feeds.php:1187
+#: modules/pref-feeds.php:1278
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "フィードエディター"
 
-#: modules/pref-feeds.php:1204 modules/pref-filters.php:396
-#: modules/pref-labels.php:269 modules/pref-users.php:379
+#: modules/pref-feeds.php:1301
+#, fuzzy
+msgid "Inactive feeds"
+msgstr "元のフィード"
+
+#: modules/pref-feeds.php:1322 modules/pref-filters.php:522
+#: modules/pref-instances.php:134 modules/pref-labels.php:269
+#: modules/pref-users.php:379
 #, fuzzy
 msgid "Select"
 msgstr "選択:"
 
-#: modules/pref-feeds.php:1216 help/3.php:47 help/4.php:22
+#: modules/pref-feeds.php:1334 help/3.php:47 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: modules/pref-feeds.php:1218
+#: modules/pref-feeds.php:1336
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "選択したフィードを削除しています..."
 
-#: modules/pref-feeds.php:1220 modules/pref-feeds.php:1230
+#: modules/pref-feeds.php:1338 modules/pref-feeds.php:1348
 #, fuzzy
 msgid "Reset sort order"
 msgstr "パスワードのリセット"
 
-#: modules/pref-feeds.php:1225
+#: modules/pref-feeds.php:1343
 #, fuzzy
 msgid "Categories"
 msgstr "カテゴリー:"
 
-#: modules/pref-feeds.php:1228
+#: modules/pref-feeds.php:1346
 msgid "Edit categories"
 msgstr "カテゴリーの編集"
 
-#: modules/pref-feeds.php:1243
+#: modules/pref-feeds.php:1362
 #, fuzzy
 msgid "More actions..."
 msgstr "操作..."
 
-#: modules/pref-feeds.php:1247
+#: modules/pref-feeds.php:1366
 msgid "Manual purge"
 msgstr "手動削除"
 
-#: modules/pref-feeds.php:1251
+#: modules/pref-feeds.php:1370
 msgid "Clear feed data"
 msgstr "フィードデータの消去"
 
-#: modules/pref-feeds.php:1252 modules/pref-filters.php:415
+#: modules/pref-feeds.php:1371 modules/pref-filters.php:541
 msgid "Rescore articles"
 msgstr "記事のスコアの再集計"
 
-#: modules/pref-feeds.php:1291
+#: modules/pref-feeds.php:1410
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1298
+#: modules/pref-feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1300
+#: modules/pref-feeds.php:1419
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1315
+#: modules/pref-feeds.php:1434
 msgid "Import"
 msgstr "インポート"
 
-#: modules/pref-feeds.php:1316
+#: modules/pref-feeds.php:1435
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: modules/pref-feeds.php:1319
+#: modules/pref-feeds.php:1438
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: modules/pref-feeds.php:1321
+#: modules/pref-feeds.php:1440
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1324 modules/pref-feeds.php:1370
+#: modules/pref-feeds.php:1443 modules/pref-feeds.php:1489
 #, fuzzy
 msgid "Display URL"
 msgstr "タグの表示"
 
-#: modules/pref-feeds.php:1331
+#: modules/pref-feeds.php:1450
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox 統合"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1452
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1633,93 +1730,130 @@ msgstr ""
 "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
 "Tiny RSS のサイトを使うことができます。"
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1459
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: modules/pref-feeds.php:1348
+#: modules/pref-feeds.php:1467
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1350
+#: modules/pref-feeds.php:1469
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1354
+#: modules/pref-feeds.php:1473
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: modules/pref-feeds.php:1358
+#: modules/pref-feeds.php:1477
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: modules/pref-feeds.php:1362
+#: modules/pref-feeds.php:1481
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: modules/pref-feeds.php:1364
+#: modules/pref-feeds.php:1483
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1492
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1498
 #, fuzzy
 msgid "Twitter"
 msgstr "題名"
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1507
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1509
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1513
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1400
+#: modules/pref-feeds.php:1519
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "フィードデータの消去"
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1610
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "お気に入りの記事"
 
-#: modules/pref-feeds.php:1540
+#: modules/pref-feeds.php:1634
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
-#: modules/pref-filters.php:358
+#: modules/pref-filters.php:38
+msgid "Articles matching this filter:"
+msgstr ""
+
+#: modules/pref-filters.php:75
+#, fuzzy
+msgid "No articles matching this filter has been found."
+msgstr "一致するフィルターが見つかりません。"
+
+#: modules/pref-filters.php:470
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "フィルター <b>%s</b> を作成しました"
 
-#: modules/pref-filters.php:405 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:531 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
-#: modules/pref-filters.php:408 modules/pref-users.php:393
+#: modules/pref-filters.php:534 modules/pref-instances.php:143
+#: modules/pref-users.php:393
 msgid "Edit"
 msgstr "編集"
 
+#: modules/pref-instances.php:5 modules/pref-users.php:7
+msgid "Your access level is insufficient to open this tab."
+msgstr "このタブを開くにはアクセスレベルが不十分です。"
+
+#: modules/pref-instances.php:142
+msgid "Link instance"
+msgstr ""
+
+#: modules/pref-instances.php:154
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: modules/pref-instances.php:164
+msgid "Last connected"
+msgstr ""
+
+#: modules/pref-instances.php:165
+#, fuzzy
+msgid "Stored feeds"
+msgstr "さらなるフィード"
+
+#: modules/pref-instances.php:183 modules/pref-users.php:469
+msgid "Click to edit"
+msgstr "編集するにはクリック"
+
 #: modules/pref-labels.php:21
 msgid "Caption"
 msgstr "キャプション"
@@ -1752,115 +1886,115 @@ msgstr "ラベルを作成する"
 msgid "Clear colors"
 msgstr "色の消去"
 
-#: modules/pref-prefs.php:31
+#: modules/pref-prefs.php:29
 msgid "Old password cannot be blank."
 msgstr "古いパスワードを空にできません。"
 
-#: modules/pref-prefs.php:36
+#: modules/pref-prefs.php:34
 msgid "New password cannot be blank."
 msgstr "新しいパスワードを空にできません。"
 
-#: modules/pref-prefs.php:41
+#: modules/pref-prefs.php:39
 msgid "Entered passwords do not match."
 msgstr "パスワードが一致しません。"
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:63
 msgid "Password has been changed."
 msgstr "パスワードを変更しました。"
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:65
 msgid "Old password is incorrect."
 msgstr "古いパスワードが不正確です。"
 
-#: modules/pref-prefs.php:95
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr "設定を保存しました。"
 
-#: modules/pref-prefs.php:111
+#: modules/pref-prefs.php:109
 #, php-format
 msgid "Unknown option: %s"
 msgstr "不明なオプション: %s"
 
-#: modules/pref-prefs.php:124
+#: modules/pref-prefs.php:122
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:156
+#: modules/pref-prefs.php:154
 msgid "Personal data"
 msgstr "個人データ"
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:181
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:187
+#: modules/pref-prefs.php:185
 msgid "E-mail"
 msgstr "電子メール"
 
-#: modules/pref-prefs.php:192
+#: modules/pref-prefs.php:190
 msgid "Access level"
 msgstr "アクセスレベル"
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:200
 #, fuzzy
 msgid "Save data"
 msgstr "保存"
 
-#: modules/pref-prefs.php:214
+#: modules/pref-prefs.php:212
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "パスワードが標準のままです。\n"
 "                                                変更してください。"
 
-#: modules/pref-prefs.php:242
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "現在のパスワード"
 
-#: modules/pref-prefs.php:245
+#: modules/pref-prefs.php:243
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: modules/pref-prefs.php:250
+#: modules/pref-prefs.php:248
 msgid "Confirm password"
 msgstr "新しいパスワード(確認)"
 
-#: modules/pref-prefs.php:260
+#: modules/pref-prefs.php:258
 msgid "Change password"
 msgstr "パスワードを変更する"
 
-#: modules/pref-prefs.php:341
+#: modules/pref-prefs.php:339
 msgid "Select theme"
 msgstr "テーマを選択する"
 
-#: modules/pref-prefs.php:399
+#: modules/pref-prefs.php:397
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:419 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:417 modules/pref-prefs.php:422
 msgid "Yes"
 msgstr "はい"
 
-#: modules/pref-prefs.php:421 modules/pref-prefs.php:424
+#: modules/pref-prefs.php:419 modules/pref-prefs.php:422
 msgid "No"
 msgstr "いいえ"
 
-#: modules/pref-prefs.php:456
+#: modules/pref-prefs.php:448
+msgid "Clear"
+msgstr ""
+
+#: modules/pref-prefs.php:471
 msgid "Save configuration"
 msgstr "設定を保存する"
 
-#: modules/pref-prefs.php:459
+#: modules/pref-prefs.php:474
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:462
+#: modules/pref-prefs.php:477
 msgid "Reset to defaults"
 msgstr "標準に戻す"
 
-#: modules/pref-users.php:7
-msgid "Your access level is insufficient to open this tab."
-msgstr "このタブを開くにはアクセスレベルが不十分です。"
-
 #: modules/pref-users.php:20
 msgid "User details"
 msgstr "ユーザーの詳細"
@@ -1955,10 +2089,6 @@ msgstr "アクセスレベル"
 msgid "Last login"
 msgstr "最終ログイン"
 
-#: modules/pref-users.php:469
-msgid "Click to edit"
-msgstr "編集するにはクリック"
-
 #: modules/pref-users.php:489
 msgid "No users defined."
 msgstr "ユーザーが定義されていません。"
@@ -2210,7 +2340,7 @@ msgstr "読んだフィードを隠す/再表示する"
 msgid "Sort feeds by unread count"
 msgstr "未読記事数によるフィードの並び替え"
 
-#: digest.js:24 tt-rss.js:506 tt-rss.js:519
+#: digest.js:24 tt-rss.js:516 tt-rss.js:529
 msgid "Mark all articles in %s as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
@@ -2275,8 +2405,9 @@ msgid ""
 msgstr ""
 
 #: functions.js:631
-msgid "Date syntax appears to be correct."
-msgstr ""
+#, fuzzy
+msgid "Date syntax appears to be correct:"
+msgstr "古いパスワードが不正確です。"
 
 #: functions.js:634
 #, fuzzy
@@ -2340,221 +2471,264 @@ msgstr "カテゴリーから購読をやめることができません。"
 msgid "Create Filter"
 msgstr "フィルターを作成する"
 
-#: functions.js:1020 tt-rss.js:391
+#: functions.js:980 prefs.js:214
+#, fuzzy
+msgid "Filter Test Results"
+msgstr "フィルター表現"
+
+#: functions.js:1038
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: functions.js:1059 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr "%s の購読をやめますか?"
 
-#: functions.js:1127
+#: functions.js:1166
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "このアーティクルのノートを入力してください:"
 
-#: functions.js:1158
+#: functions.js:1197
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
+#: functions.js:1381 tt-rss.js:370 tt-rss.js:853
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: functions.js:1354
+#: functions.js:1393
 #, fuzzy
 msgid "Edit Feed"
 msgstr "フィードを編集する"
 
-#: functions.js:1392
+#: functions.js:1431
 #, fuzzy
 msgid "More Feeds"
 msgstr "さらなるフィード"
 
-#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1323
+#: functions.js:1492 functions.js:1602 prefs.js:438 prefs.js:468 prefs.js:500
+#: prefs.js:658 prefs.js:678 prefs.js:1255 prefs.js:1400
 msgid "No feeds are selected."
 msgstr "選択されたフィードはありません。"
 
-#: functions.js:1473
+#: functions.js:1534
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
+#: functions.js:1573
+msgid "Feeds with update errors"
+msgstr ""
+
+#: functions.js:1584 prefs.js:1237
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "選択されたフィルターを削除しますか?"
+
 #: PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 msgstr "反転"
 
-#: prefs.js:91
+#: prefs.js:114
 msgid "Please enter login:"
 msgstr "ログイン名を入力してください:"
 
-#: prefs.js:98
+#: prefs.js:121
 msgid "Can't create user: no login specified."
 msgstr "ユーザーが追加できません: ログイン名が指定されていません。"
 
-#: prefs.js:160
+#: prefs.js:183
 #, fuzzy
 msgid "Edit Filter"
 msgstr "フィルター"
 
-#: prefs.js:164
+#: prefs.js:187
 msgid "Remove filter %s?"
 msgstr "フィルター %s を削除しますか?"
 
-#: prefs.js:280
+#: prefs.js:320
 msgid "Remove selected labels?"
 msgstr "選択したラベルを削除しますか?"
 
-#: prefs.js:296 prefs.js:1364
+#: prefs.js:336 prefs.js:1441
 msgid "No labels are selected."
 msgstr "選択されたラベルはありません。"
 
-#: prefs.js:310
+#: prefs.js:350
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: prefs.js:327 prefs.js:537 prefs.js:558 prefs.js:597
+#: prefs.js:367 prefs.js:548 prefs.js:569 prefs.js:608
 msgid "No users are selected."
 msgstr "選択されたユーザーはありません。"
 
-#: prefs.js:345
+#: prefs.js:385
 msgid "Remove selected filters?"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: prefs.js:361 prefs.js:627
+#: prefs.js:400 prefs.js:638
 msgid "No filters are selected."
 msgstr "選択されたフィルターはありません。"
 
-#: prefs.js:380
+#: prefs.js:419
 msgid "Unsubscribe from selected feeds?"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: prefs.js:414
+#: prefs.js:453
 msgid "Please select only one feed."
 msgstr "フィードをひとつだけ選択してください。"
 
-#: prefs.js:420
+#: prefs.js:459
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "選択したフィード内のすべてのお気に入りしていない記事をすべて削除しますか?"
 
-#: prefs.js:442
+#: prefs.js:481
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "記事を維持したい日数は? (0: 標準を使う)"
 
-#: prefs.js:474 prefs.js:1396
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-
-#: prefs.js:490
-#, fuzzy
-msgid "No profiles selected."
-msgstr "選択された記事はありません。"
-
-#: prefs.js:508
+#: prefs.js:519
 msgid "Login field cannot be blank."
 msgstr "ログイン名の項目は空にできません。"
 
-#: prefs.js:542 prefs.js:563 prefs.js:602
+#: prefs.js:553 prefs.js:574 prefs.js:613
 msgid "Please select only one user."
 msgstr "ひとつだけユーザーを選択してください。"
 
-#: prefs.js:567
+#: prefs.js:578
 msgid "Reset password of selected user?"
 msgstr "選択したユーザーのパスワードをリセットしますか?"
 
-#: prefs.js:632
+#: prefs.js:643
 msgid "Please select only one filter."
 msgstr "フィルターをひとつだけ選択してください。"
 
-#: prefs.js:681
+#: prefs.js:692
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "複数フィードエディター"
 
-#: prefs.js:705
+#: prefs.js:716
 msgid "Save changes to selected feeds?"
 msgstr "選択したフィードの変更を保存しますか?"
 
-#: prefs.js:776
+#: prefs.js:802
 #, fuzzy
 msgid "OPML Import"
 msgstr "インポート"
 
-#: prefs.js:795
+#: prefs.js:821
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: prefs.js:915
+#: prefs.js:941
 msgid "Reset to defaults?"
 msgstr "標準に戻しますか?"
 
-#: prefs.js:1131
+#: prefs.js:1157
 #, fuzzy
 msgid "Feed Categories"
 msgstr "カテゴリー:"
 
-#: prefs.js:1140
+#: prefs.js:1166
 msgid "Remove selected categories?"
 msgstr "選択されたカテゴリーを削除しますか?"
 
-#: prefs.js:1159
+#: prefs.js:1185
 msgid "No categories are selected."
 msgstr "選択されたカテゴリーはありません。"
 
-#: prefs.js:1198
+#: prefs.js:1226
+msgid "Feeds without recent updates"
+msgstr ""
+
+#: prefs.js:1275
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "新しいもので現在の公開アドレスを置き換えますか?"
 
-#: prefs.js:1307
+#: prefs.js:1384
 msgid "Rescore articles in selected feeds?"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: prefs.js:1330
+#: prefs.js:1407
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "すべての記事のスコアを再計算しますか? この操作は大量の時間を使うでしょう。"
 
-#: prefs.js:1350
+#: prefs.js:1427
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "ラベルの色を標準にリセットしますか?"
 
-#: prefs.js:1387
+#: prefs.js:1464
 msgid "Settings Profiles"
 msgstr ""
 
-#: prefs.js:1414
+#: prefs.js:1473
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: prefs.js:1491
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "選択された記事はありません。"
 
-#: prefs.js:1422 prefs.js:1475
+#: prefs.js:1499 prefs.js:1552
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: prefs.js:1438 prefs.js:1491
+#: prefs.js:1515 prefs.js:1568
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: prefs.js:1499
+#: prefs.js:1576
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: prefs.js:1583
+#: prefs.js:1660
 msgid "Label Editor"
 msgstr "ラベルエディター"
 
-#: prefs.js:1647
+#: prefs.js:1724
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
+#: prefs.js:1795
+msgid "Link Instance"
+msgstr ""
+
+#: prefs.js:1846
+#, fuzzy
+msgid "Edit Instance"
+msgstr "タグを編集する"
+
+#: prefs.js:1895
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "選択されたフィルターを削除しますか?"
+
+#: prefs.js:1912 prefs.js:1924
+#, fuzzy
+msgid "No instances are selected."
+msgstr "選択されたフィルターはありません。"
+
+#: prefs.js:1929
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "フィルターをひとつだけ選択してください。"
+
 #: tt-rss.js:147
 msgid "Mark all articles as read?"
 msgstr "すべての記事を既読にしますか?"
@@ -2563,26 +2737,26 @@ msgstr "すべての記事を既読にしますか?"
 msgid "You can't unsubscribe from the category."
 msgstr "カテゴリーから購読をやめることができません。"
 
-#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
+#: tt-rss.js:385 tt-rss.js:603 tt-rss.js:1016
 msgid "Please select some feed first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: tt-rss.js:588
+#: tt-rss.js:598
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: tt-rss.js:598
+#: tt-rss.js:608
 msgid "Rescore articles in %s?"
 msgstr "%s の記事のスコアを再計算しますか?"
 
-#: tt-rss.js:1050
+#: tt-rss.js:1056
 #, fuzzy
 msgid "New version available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
 #: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
 #: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
-#: viewfeed.js:1672
+#: viewfeed.js:1676
 msgid "No articles are selected."
 msgstr "記事は選択されていません。"
 
@@ -2635,40 +2809,59 @@ msgstr "%d 件のマークした記事を既読として設定しますか?"
 msgid "Unable to load article."
 msgstr "エラー: OPML ファイルをアップロードしてください。"
 
-#: viewfeed.js:1543
+#: viewfeed.js:1546
 #, fuzzy
 msgid "Loading..."
 msgstr "フィード一覧を読み込んでいます..."
 
-#: viewfeed.js:1686
+#: viewfeed.js:1690
 msgid "Forward article by email"
 msgstr ""
 
-#: viewfeed.js:2080
+#: viewfeed.js:2087
 #, fuzzy
 msgid "Open original article"
 msgstr "元の記事内容を表示する"
 
-#: viewfeed.js:2086
+#: viewfeed.js:2093
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "新しいウィンドウで記事を開く"
 
-#: viewfeed.js:2133
+#: viewfeed.js:2140
 #, fuzzy
 msgid "Remove label"
 msgstr "選択したラベルを削除しますか?"
 
-#: viewfeed.js:2236
+#: viewfeed.js:2245
 #, fuzzy
 msgid "Playing..."
 msgstr "フィード一覧を読み込んでいます..."
 
-#: viewfeed.js:2237
+#: viewfeed.js:2246
 #, fuzzy
 msgid "Click to pause"
 msgstr "編集するにはクリック"
 
+#~ msgid "Update post on checksum change"
+#~ msgstr "チェックサムの変更で投稿を更新する"
+
+#~ msgid "Set articles as unread on update"
+#~ msgstr "更新時に未読として記事を設定する"
+
+#~ msgid "Importing OPML (using DOMXML extension)..."
+#~ msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
+
+#~ msgid "Importing OPML (using DOMDocument extension)..."
+#~ msgstr "OPML のインポート中 (DOMDocument 機能拡張を用いて)..."
+
+#~ msgid "Error: can't find body element."
+#~ msgstr "エラー: 本文要素を見つけることができませんでした。"
+
+#, fuzzy
+#~ msgid "No profiles selected."
+#~ msgstr "選択された記事はありません。"
+
 #~ msgid "Unknown error"
 #~ msgstr "未知のエラー"
 
@@ -2805,9 +2998,6 @@ msgstr "編集するにはクリック"
 #~ msgid "No filters defined."
 #~ msgstr "フィルターが定義されていません。"
 
-#~ msgid "No matching filters found."
-#~ msgstr "一致するフィルターが見つかりません。"
-
 #~ msgid "Click to change color"
 #~ msgstr "色を変えるためにクリック"
 
@@ -3055,9 +3245,6 @@ msgstr "編集するにはクリック"
 #~ msgid "Could not update headlines (missing XML object)"
 #~ msgstr "ヘッドラインを更新できません (XML オブジェクトが見当たりません)"
 
-#~ msgid "Entire feed"
-#~ msgstr "元のフィード"
-
 #~ msgid "Failed to load article in new window"
 #~ msgstr "新しいウィンドウで記事を開くことができません"
 
@@ -3451,9 +3638,6 @@ msgstr "編集するにはクリック"
 #~ msgid "Match SQL"
 #~ msgstr "SQL の一致"
 
-#~ msgid "Test"
-#~ msgstr "テスト"
-
 #~ msgid "Feed information:"
 #~ msgstr "フィード情報:"
 
@@ -3518,9 +3702,6 @@ msgstr "編集するにはクリック"
 #~ msgid "Perform action"
 #~ msgstr "操作の実行"
 
-#~ msgid "Filter expression"
-#~ msgstr "フィルター表現"
-
 #~ msgid "Change password:"
 #~ msgstr "変更パスワード:"