update translations (fixed)

2 files changed, 186 insertions, 169 deletions

diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index c033df851..15ce2fe00 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 111447dfc..7a8903596 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: 2009-02-20 15:55+0300\n"
+"POT-Creation-Date: 2009-03-21 23:14+0300\n"
 "PO-Revision-Date: 2008-09-25 12:43+0900\n"
 "Last-Translator: Tadashi Jokagi <[email protected]>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -79,7 +79,7 @@ msgstr "毎日"
 msgid "Weekly"
 msgstr "毎週"
 
-#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:247 modules/pref-prefs.php:315
 msgid "Default"
 msgstr "標準"
 
@@ -108,12 +108,16 @@ msgid "Unknown error"
 msgstr "未知のエラー"
 
 #: errors.php:5
-msgid "This program requires XmlHttpRequest "
-msgstr "このプログラムは、XmlHttpRequest を要求します"
+msgid ""
+"This program requires XmlHttpRequest to function properly. Your browser "
+"doesn't seem to support it."
+msgstr ""
 
 #: errors.php:8
-msgid "This program requires cookies "
-msgstr "このプログラムはクッキーを要求します"
+msgid ""
+"This program requires cookies to function properly. Your browser doesn't "
+"seem to support them."
+msgstr ""
 
 #: errors.php:11
 msgid "Backend sanity check failed"
@@ -166,229 +170,243 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2841 modules/popup-dialog.php:175
+#: functions.php:2846 modules/popup-dialog.php:175
 #: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
-#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
+#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
+#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
-#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
+#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
 #: mobile/functions.php:33
 msgid "Special"
 msgstr "特別"
 
-#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
-#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
+#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
+#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
 msgid "Labels"
 msgstr "ラベル"
 
-#: functions.php:2919 functions.php:3342 functions.php:4127
+#: functions.php:2924 functions.php:3347 functions.php:4144
 #: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
 #: offline.js:1425
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: functions.php:2921 functions.php:3346 functions.php:4134
-#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
+#: functions.php:2926 functions.php:3351 functions.php:4151
+#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
 msgid "Published articles"
 msgstr "公開済みの記事"
 
-#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
+#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
 #: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: functions.php:2925 functions.php:3355 functions.php:4105
+#: functions.php:2930 functions.php:3360 functions.php:4122
 #: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
 #: offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "すべての記事"
 
-#: functions.php:3306 functions.php:3308
+#: functions.php:3311 functions.php:3313
 msgid "Search results"
 msgstr "検索結果"
 
-#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
-#: functions.php:3353 functions.php:3356 functions.php:3364
+#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
+#: functions.php:3358 functions.php:3361 functions.php:3369
 #, fuzzy
 msgid "Searched for"
 msgstr "検索"
 
-#: functions.php:3984
+#: functions.php:4001
 msgid "Generated feed"
 msgstr "生成したフィード"
 
-#: functions.php:3989 functions.php:5253 localized_js.php:148
-#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
+#: functions.php:4006 functions.php:5292 localized_js.php:148
+#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
 #: modules/pref-filters.php:366 modules/pref-labels.php:163
 #: modules/pref-users.php:401 offline.js:409
 msgid "Select:"
 msgstr "選択:"
 
-#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
-#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
+#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
+#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
 #: modules/pref-labels.php:164 modules/pref-users.php:402
 #: mobile/functions.php:570
 msgid "All"
 msgstr "すべて"
 
-#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
+#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
 #: mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "未読"
 
-#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
+#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
 msgid "Invert"
 msgstr "反転"
 
-#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
-#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
+#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
+#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
 #: modules/pref-labels.php:165 modules/pref-users.php:403
 #: mobile/functions.php:572
 msgid "None"
 msgstr "なし"
 
-#: functions.php:4001 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1371 offline.js:185
+#: functions.php:4018 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1378 offline.js:185
 msgid "Actions..."
 msgstr "操作..."
 
-#: functions.php:4006 localized_js.php:150
+#: functions.php:4023 localized_js.php:150
 msgid "Selection toggle:"
 msgstr "選択の切り替え:"
 
-#: functions.php:4008 localized_js.php:152 tt-rss.php:239
+#: functions.php:4025 localized_js.php:152 tt-rss.php:238
 #: mobile/functions.php:459
 msgid "Starred"
 msgstr "お気に入り"
 
-#: functions.php:4009
+#: functions.php:4026
 msgid "Published"
 msgstr "公開済み"
 
-#: functions.php:4011 localized_js.php:85
+#: functions.php:4028 localized_js.php:85
 msgid "Mark as read:"
 msgstr "既読にする:"
 
-#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
 msgid "Selection"
 msgstr "選択"
 
-#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "フィードの入力"
 
-#: functions.php:4018
+#: functions.php:4035
 #, fuzzy
 msgid "Assign label:"
 msgstr "タグの割り当て"
 
-#: functions.php:4059 localized_js.php:56
+#: functions.php:4076 localized_js.php:56
 msgid "Click to collapse category"
 msgstr "閉じたカテゴリーのクリック"
 
-#: functions.php:4325
+#: functions.php:4342
 msgid "No feeds to display."
 msgstr "表示するフィードがありません。"
 
-#: functions.php:4342 mobile/functions.php:12
+#: functions.php:4359 mobile/functions.php:12
 msgid "Tags"
 msgstr "タグ"
 
-#: functions.php:4578
+#: functions.php:4596
 msgid " - "
 msgstr " - "
 
-#: functions.php:4602 functions.php:5272
+#: functions.php:4620 functions.php:5320
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: functions.php:4610
+#: functions.php:4628
 #, fuzzy
 msgid "Display original article content"
 msgstr "記事の内容をスクロールする"
 
-#: functions.php:4617 functions.php:5263
+#: functions.php:4635 functions.php:5302
 msgid "Show article summary in new window"
 msgstr "記事の要約を新しいウィンドウで表示する"
 
-#: functions.php:4650 functions.php:5187
+#: functions.php:4642 functions.php:5309
+#, fuzzy
+msgid "Publish article with a note"
+msgstr "公開記事"
+
+#: functions.php:4682 functions.php:5226
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: functions.php:4656 functions.php:5193
+#: functions.php:4688 functions.php:5232
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4692 functions.php:5227
+#: functions.php:4724 functions.php:5266
 msgid "Attachment:"
 msgstr "添付: "
 
-#: functions.php:4694 functions.php:5229
+#: functions.php:4726 functions.php:5268
 msgid "Attachments:"
 msgstr "添付:"
 
-#: functions.php:4714 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
+#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: functions.php:4770
+#: functions.php:4802
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: functions.php:4839 mobile/functions.php:423
+#: functions.php:4871 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:5161
+#: functions.php:5193
 msgid "Click to expand article"
 msgstr "開いた記事のクリック"
 
-#: functions.php:5298
+#: functions.php:5327
+#, fuzzy
+msgid "toggle unread"
+msgstr "未読に切り替える"
+
+#: functions.php:5346
 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: functions.php:5301
+#: functions.php:5349
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: functions.php:5304
+#: functions.php:5352
 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
-#: functions.php:5308
+#: functions.php:5356
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5310 localized_js.php:92 offline.js:444
+#: functions.php:5358 localized_js.php:92 offline.js:444
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
-#: functions.php:5984 tt-rss.php:206
+#: functions.php:6049 tt-rss.php:204
 #, fuzzy
 msgid "Create label..."
 msgstr "ラベルを作成する"
 
-#: functions.php:5997
+#: functions.php:6062
 #, fuzzy
 msgid "(remove)"
 msgstr "削除"
 
-#: functions.php:6041
+#: functions.php:6106
 msgid "no tags"
 msgstr "タグがありません"
 
+#: functions.php:6134
+msgid "edit note"
+msgstr ""
+
 #: localized_js.php:36
 msgid "Adding feed..."
 msgstr "フィードの追加中..."
@@ -577,17 +595,17 @@ msgstr "すべての記事を既読にしますか?"
 msgid "Mark all articles in %s as read?"
 msgstr "すべての記事を既読に設定しますか?"
 
-#: localized_js.php:84 viewfeed.js:1212
+#: localized_js.php:84 viewfeed.js:1250
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "%s のすべての可視記事を既読に設定しますか?"
 
-#: localized_js.php:86 viewfeed.js:1885
+#: localized_js.php:86 viewfeed.js:1923
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "%d 件のマークした記事を既読として設定しますか?"
 
-#: localized_js.php:87 viewfeed.js:1251
+#: localized_js.php:87 viewfeed.js:1289
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "選択した %d 件の記事を既読にしますか?"
@@ -600,16 +618,16 @@ msgstr "すべてのフィードを既読に設定しています..."
 msgid "New password cannot be blank."
 msgstr "新しいパスワードを空にできません。"
 
-#: localized_js.php:90 viewfeed.js:1842
+#: localized_js.php:90 viewfeed.js:1880
 msgid "No article is selected."
 msgstr "選択された記事はありません。"
 
-#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
-#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
+#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
+#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
 msgid "No articles are selected."
 msgstr "記事は選択されていません。"
 
-#: localized_js.php:93 viewfeed.js:1883
+#: localized_js.php:93 viewfeed.js:1921
 msgid "No articles found to mark"
 msgstr "マークした記事が見つかりません"
 
@@ -622,7 +640,7 @@ msgstr "選択されたカテゴリーはありません。"
 msgid "No feeds are selected."
 msgstr "選択されたフィードはありません。"
 
-#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
+#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
 msgid "No feed selected."
 msgstr "フィードは選択されていません。"
 
@@ -687,7 +705,7 @@ msgstr "ひとつだけユーザーを選択してください。"
 msgid "Please select some feed first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
+#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
 msgid "Please wait..."
 msgstr "しばらくお待ちください..."
 
@@ -695,8 +713,8 @@ msgstr "しばらくお待ちください..."
 msgid "Please wait until operation finishes."
 msgstr ""
 
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
-#: viewfeed.js:631
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
+#: viewfeed.js:669
 msgid "Publish article"
 msgstr "公開記事"
 
@@ -844,7 +862,7 @@ msgstr "フィルターの保存中..."
 msgid "Saving user..."
 msgstr "ユーザーの保存中..."
 
-#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
+#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
 msgid "Star article"
 msgstr "記事をお気に入りにする"
 
@@ -923,11 +941,11 @@ msgstr "電子メールの変更を試行中..."
 msgid "Trying to change password..."
 msgstr "パスワードの変更を試行中..."
 
-#: localized_js.php:170 viewfeed.js:618
+#: localized_js.php:170 viewfeed.js:657
 msgid "Unpublish article"
 msgstr "非公開記事"
 
-#: localized_js.php:172 viewfeed.js:553
+#: localized_js.php:172 viewfeed.js:586
 msgid "Unstar article"
 msgstr "記事のお気に入りを解除する"
 
@@ -970,8 +988,8 @@ msgid ""
 "switch it into offline mode again. Go online?"
 msgstr ""
 
-#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
+#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
 #: mobile/functions.php:775
 msgid "Title"
 msgstr "題名"
@@ -997,7 +1015,7 @@ msgstr ""
 msgid "Filter article"
 msgstr "記事フィルター"
 
-#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "既読にする"
 
@@ -1319,12 +1337,12 @@ msgstr "設定を終了する"
 msgid "Logout"
 msgstr "ログアウト"
 
-#: prefs.php:117
+#: prefs.php:117 tt-rss.php:208
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
 msgid "Preferences"
 msgstr "設定"
 
@@ -1349,7 +1367,7 @@ msgstr "フィードブラウザーは管理者によって無効になってい
 
 #: register.php:155 register.php:200 register.php:213 register.php:228
 #: register.php:246 register.php:331 register.php:341 register.php:353
-#: update.php:94 update.php:162 modules/pref-feeds.php:865
+#: update.php:94 update.php:162 modules/pref-feeds.php:869
 msgid "Return to Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
@@ -1448,117 +1466,113 @@ msgstr "フィードのスコアの再計算中..."
 msgid "Search..."
 msgstr "検索"
 
-#: tt-rss.php:193
+#: tt-rss.php:191
 msgid "Feed actions:"
 msgstr "フィード操作"
 
-#: tt-rss.php:194
+#: tt-rss.php:192
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "フィードを購読する"
 
-#: tt-rss.php:195
+#: tt-rss.php:193
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "フィードを編集する"
 
-#: tt-rss.php:196
+#: tt-rss.php:194
 #, fuzzy
 msgid "Clear articles"
 msgstr "記事フィルター"
 
-#: tt-rss.php:197
+#: tt-rss.php:195
 #, fuzzy
 msgid "Rescore feed"
 msgstr "フィードのスコアの再計算中..."
 
-#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
+#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
-#: tt-rss.php:200
+#: tt-rss.php:198
 msgid "All feeds:"
 msgstr "すべてのフィード:"
 
-#: tt-rss.php:202 help/3.php:44
+#: tt-rss.php:200 help/3.php:44
 msgid "(Un)hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: tt-rss.php:204
+#: tt-rss.php:202
 msgid "Other actions:"
 msgstr "その他の操作:"
 
-#: tt-rss.php:207
+#: tt-rss.php:205
 #, fuzzy
 msgid "Create filter..."
 msgstr "フィルターを作成する"
 
-#: tt-rss.php:208
+#: tt-rss.php:206
 #, fuzzy
 msgid "Reset UI layout"
 msgstr "&nbsp;&nbsp;UI レイアウトのリセット"
 
-#: tt-rss.php:209
+#: tt-rss.php:207
 #, fuzzy
 msgid "Reset category order"
 msgstr "選択されたカテゴリーの順序をリセットしますか?"
 
-#: tt-rss.php:210
-msgid "&nbsp;&nbsp;Keyboard shortcuts"
-msgstr "&nbsp;&nbsp;キーボードショートカット"
-
-#: tt-rss.php:219
+#: tt-rss.php:218
 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 
-#: tt-rss.php:221
+#: tt-rss.php:220
 msgid "Toggle Feedlist"
 msgstr "フィード一覧を切り替える"
 
-#: tt-rss.php:229 mobile/functions.php:738
+#: tt-rss.php:228 mobile/functions.php:738
 msgid "Search:"
 msgstr "検索:"
 
-#: tt-rss.php:237 mobile/functions.php:456
+#: tt-rss.php:236 mobile/functions.php:456
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:238 mobile/functions.php:457
+#: tt-rss.php:237 mobile/functions.php:457
 msgid "All Articles"
 msgstr "すべての記事"
 
-#: tt-rss.php:241
+#: tt-rss.php:240
 msgid "Ignore Scoring"
 msgstr "スコア計算の無効化"
 
-#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
+#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
 #: mobile/functions.php:501 mobile/functions.php:504
 msgid "Updated"
 msgstr "更新日時"
 
-#: tt-rss.php:245
+#: tt-rss.php:244
 msgid "Order:"
 msgstr "並べ替え:"
 
-#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
 #: modules/pref-filters.php:461
 msgid "Date"
 msgstr "日付"
 
-#: tt-rss.php:251
+#: tt-rss.php:250
 msgid "Score"
 msgstr "スコア"
 
-#: tt-rss.php:255
+#: tt-rss.php:254
 msgid "Limit:"
 msgstr "制限:"
 
-#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
 #: mobile/functions.php:436
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:298
+#: tt-rss.php:297
 msgid "Drag me to resize panels"
 msgstr "パネルの大きさを変更するにはここをドラッグします"
 
@@ -1747,7 +1761,7 @@ msgstr "取り消し"
 
 #: modules/popup-dialog.php:140 modules/popup-dialog.php:152
 #: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
 #: modules/pref-labels.php:130 modules/pref-users.php:363
 #: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
 #: mobile/functions.php:783
@@ -1774,11 +1788,6 @@ msgstr "このフィード"
 msgid "Create Filter"
 msgstr "フィルターを作成する"
 
-#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
-#: modules/pref-filters.php:39 modules/pref-filters.php:96
-msgid "description"
-msgstr "説明"
-
 #: modules/popup-dialog.php:245 modules/pref-filters.php:42
 #: modules/pref-filters.php:402
 msgid "Match"
@@ -1942,140 +1951,140 @@ msgstr "ローカルに画像をキャッシュする"
 msgid "Multiple Feed Editor"
 msgstr "複数フィードエディター"
 
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
+#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
 msgid "All done."
 msgstr "すべて終了しました。"
 
-#: modules/pref-feeds.php:836
+#: modules/pref-feeds.php:840
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> を購読しました。"
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:842
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:860
+#: modules/pref-feeds.php:864
 msgid "Edit subscription options"
 msgstr ""
 
-#: modules/pref-feeds.php:946
+#: modules/pref-feeds.php:950
 msgid "Category editor"
 msgstr "カテゴリーエディター"
 
-#: modules/pref-feeds.php:969
+#: modules/pref-feeds.php:973
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "カテゴリー <b>%s</b> はデータベースに既に存在します。"
 
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1004
 msgid "Unable to delete non empty feed categories."
 msgstr "殻でないフィードカテゴリーは削除できません。"
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1021
 msgid "Create category"
 msgstr "カテゴリーの作成"
 
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1081
 msgid "No feed categories defined."
 msgstr "フィードカテゴリーが定義されていません。"
 
-#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
 #: modules/pref-filters.php:505 modules/pref-labels.php:225
 #: modules/pref-users.php:474
 msgid "Remove"
 msgstr "削除"
 
-#: modules/pref-feeds.php:1107
+#: modules/pref-feeds.php:1114
 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
-#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1136 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1141
 #, fuzzy
 msgid "More Feeds"
 msgstr "フィードのスコアの再計算中..."
 
-#: modules/pref-feeds.php:1208
+#: modules/pref-feeds.php:1215
 msgid "Show last article times"
 msgstr "最後の記事の時間を表示する"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
+#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
 msgid "Last&nbsp;Article"
 msgstr "最後の記事"
 
-#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
 #: modules/pref-users.php:449
 msgid "Click to edit"
 msgstr "編集するにはクリック"
 
-#: modules/pref-feeds.php:1320
+#: modules/pref-feeds.php:1327
 msgid "(Hidden)"
 msgstr ""
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1340
 #, php-format
 msgid "(linked to %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
 msgid "Selection:"
 msgstr "選択:"
 
-#: modules/pref-feeds.php:1365
+#: modules/pref-feeds.php:1372
 msgid "Recategorize"
 msgstr "カテゴリー再設定"
 
-#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
 #: modules/pref-users.php:472
 msgid "Edit"
 msgstr "編集"
 
-#: modules/pref-feeds.php:1378
+#: modules/pref-feeds.php:1384
 msgid "Manual purge"
 msgstr "手動削除"
 
-#: modules/pref-feeds.php:1382
+#: modules/pref-feeds.php:1388
 msgid "Clear feed data"
 msgstr "フィードデータの消去"
 
-#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
 msgid "Rescore articles"
 msgstr "記事のスコアの再集計"
 
-#: modules/pref-feeds.php:1389
+#: modules/pref-feeds.php:1396
 msgid "Other:"
 msgstr "その他:"
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1397
 msgid "Edit categories"
 msgstr "カテゴリーの編集"
 
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1406
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1410
 msgid "File:"
 msgstr "ファイル:"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1413
 msgid "Import"
 msgstr "インポート"
 
-#: modules/pref-feeds.php:1411
+#: modules/pref-feeds.php:1420
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: modules/pref-feeds.php:1414
+#: modules/pref-feeds.php:1423
 msgid "Firefox Integration"
 msgstr "Firefox 統合"
 
-#: modules/pref-feeds.php:1416
+#: modules/pref-feeds.php:1425
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2083,26 +2092,26 @@ msgstr ""
 "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
 "Tiny RSS のサイトを使うことができます。"
 
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1429
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1438
 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:1433
+#: modules/pref-feeds.php:1442
 #, fuzzy
 msgid "Link to published articles feed."
 msgstr "公開済みの記事"
 
-#: modules/pref-feeds.php:1436
+#: modules/pref-feeds.php:1445
 msgid "Generate another link"
 msgstr "別のリンクを生成する"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1511
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
@@ -2124,14 +2133,6 @@ msgstr "フィルター <b>%s</b> を作成しました"
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
-#: modules/pref-filters.php:392
-msgid "filter_type_descr"
-msgstr "filter_type_descr"
-
-#: modules/pref-filters.php:393
-msgid "action_description"
-msgstr "action_description"
-
 #: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
@@ -2273,10 +2274,6 @@ msgstr "テーマを選択する"
 msgid "Change theme"
 msgstr "テーマを変更する"
 
-#: modules/pref-prefs.php:388
-msgid "short_desc"
-msgstr ""
-
 #: modules/pref-prefs.php:400 modules/pref-prefs.php:405
 msgid "Yes"
 msgstr "はい"
@@ -2634,6 +2631,29 @@ msgstr "対象項目:"
 msgid "Internal error: Function not implemented"
 msgstr "インターナルエラー: 機能が実装されていません"
 
+#: viewfeed.js:2193
+#, fuzzy
+msgid "Please enter a note for this article:"
+msgstr "ラベルの題名を入力してください:"
+
+#~ msgid "This program requires XmlHttpRequest "
+#~ msgstr "このプログラムは、XmlHttpRequest を要求します"
+
+#~ msgid "This program requires cookies "
+#~ msgstr "このプログラムはクッキーを要求します"
+
+#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
+#~ msgstr "&nbsp;&nbsp;キーボードショートカット"
+
+#~ msgid "description"
+#~ msgstr "説明"
+
+#~ msgid "filter_type_descr"
+#~ msgstr "filter_type_descr"
+
+#~ msgid "action_description"
+#~ msgstr "action_description"
+
 #~ msgid "display tags"
 #~ msgstr "タグの表示"
 
@@ -2658,9 +2678,6 @@ msgstr "インターナルエラー: 機能が実装されていません"
 #~ msgid "Address changed."
 #~ msgstr "アドレスを変更しました。"
 
-#~ msgid "Please enter label title:"
-#~ msgstr "ラベルの題名を入力してください:"
-
 #~ msgid ""
 #~ "Rescore articles in all feeds? This operation may take a lot of time."
 #~ msgstr ""