update translations

2 files changed, 281 insertions, 305 deletions

diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index c25b50057..0797327a8 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 13f86d4cd..ae13ab437 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-01-18 15:24+0300\n"
+"POT-Creation-Date: 2009-01-19 11:56+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:203 modules/pref-prefs.php:312
+#: backend.php:122 tt-rss.php:206 modules/pref-prefs.php:312
 msgid "Default"
 msgstr "標準"
 
@@ -166,136 +166,143 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2883 modules/popup-dialog.php:175
-#: modules/pref-filters.php:405 mobile/functions.php:735
+#: functions.php:2847 modules/popup-dialog.php:175
+#: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
-#: functions.php:4378 modules/pref-feeds.php:1244
+#: functions.php:2876 functions.php:2915 functions.php:3304 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1237
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
-#: functions.php:2941 functions.php:3508 mobile/functions.php:33
+#: functions.php:2905 functions.php:3500 mobile/functions.php:33
 msgid "Special"
 msgstr "特別"
 
-#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
+#: functions.php:2907 functions.php:3333 functions.php:3502 prefs.php:144
+#: mobile/functions.php:83
 msgid "Labels"
 msgstr "ラベル"
 
-#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
-#: mobile/functions.php:52
+#: functions.php:2925 functions.php:3326 functions.php:4205 help/3.php:57
+#: mobile/functions.php:61
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: functions.php:2963 functions.php:3344 functions.php:4212
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+#: functions.php:2927 functions.php:3330 functions.php:4212
+#: modules/pref-feeds.php:1406 help/3.php:59 mobile/functions.php:70
 msgid "Published articles"
 msgstr "公開済みの記事"
 
-#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
-#: mobile/functions.php:43
+#: functions.php:2929 functions.php:3336 functions.php:4190 help/3.php:58
+#: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: functions.php:3305 functions.php:3307
+#: functions.php:2931 functions.php:3339 functions.php:4183
+#: mobile/functions.php:43
+#, fuzzy
+msgid "All articles"
+msgstr "すべての記事"
+
+#: functions.php:3290 functions.php:3292
 msgid "Search results"
 msgstr "検索結果"
 
-#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
-#: functions.php:3348 functions.php:3356
+#: functions.php:3308 functions.php:3321 functions.php:3327 functions.php:3331
+#: functions.php:3337 functions.php:3340 functions.php:3348
 #, fuzzy
 msgid "Searched for"
 msgstr "検索"
 
-#: functions.php:3989 functions.php:4045 functions.php:5368
-#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
-#: modules/pref-labels.php:136 modules/pref-users.php:408
+#: functions.php:3981 functions.php:4037 functions.php:5374
+#: modules/pref-feeds.php:1018 modules/pref-feeds.php:1199
+#: modules/pref-filters.php:366 modules/pref-labels.php:138
+#: modules/pref-users.php:408
 msgid "Select:"
 msgstr "選択:"
 
-#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
-#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
-#: modules/pref-users.php:409 mobile/functions.php:561
+#: functions.php:3982 functions.php:4038 modules/pref-feeds.php:1019
+#: modules/pref-feeds.php:1200 modules/pref-filters.php:367
+#: modules/pref-labels.php:139 modules/pref-users.php:409
+#: mobile/functions.php:570
 msgid "All"
 msgstr "すべて"
 
-#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
-#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
+#: functions.php:3983 functions.php:3989 functions.php:4039 functions.php:4042
+#: tt-rss.php:198 mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "未読"
 
-#: functions.php:3992 mobile/functions.php:564
+#: functions.php:3984 mobile/functions.php:573
 msgid "Invert"
 msgstr "反転"
 
-#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
-#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
-#: modules/pref-users.php:410 mobile/functions.php:563
+#: functions.php:3985 functions.php:4040 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:1201 modules/pref-filters.php:368
+#: modules/pref-labels.php:140 modules/pref-users.php:410
+#: mobile/functions.php:572
 msgid "None"
 msgstr "なし"
 
-#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3987 tt-rss.php:147 modules/pref-feeds.php:1360
 msgid "Actions..."
 msgstr "操作..."
 
-#: functions.php:3996
+#: functions.php:3988
 msgid "Selection toggle:"
 msgstr "選択の切り替え:"
 
-#: functions.php:3998 functions.php:4051 tt-rss.php:195
-#: mobile/functions.php:450
+#: functions.php:3990 functions.php:4043 tt-rss.php:197
+#: mobile/functions.php:459
 msgid "Starred"
 msgstr "お気に入り"
 
-#: functions.php:3999
+#: functions.php:3991
 msgid "Published"
 msgstr "公開済み"
 
-#: functions.php:4001 functions.php:4053
+#: functions.php:3993 functions.php:4045
 msgid "Mark as read:"
 msgstr "既読にする:"
 
-#: functions.php:4002 mobile/functions.php:569
+#: functions.php:3994 mobile/functions.php:578
 msgid "Selection"
 msgstr "選択"
 
-#: functions.php:4016 mobile/functions.php:571
+#: functions.php:4008 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "フィードの入力"
 
-#: functions.php:4019
+#: functions.php:4011
 #, fuzzy
 msgid "Assign label:"
 msgstr "タグの割り当て"
 
-#: functions.php:4031
+#: functions.php:4023
 #, fuzzy
 msgid "(remove)"
 msgstr "削除"
 
-#: functions.php:4050
+#: functions.php:4042
 msgid "Toggle:"
 msgstr "トグル"
 
-#: functions.php:4054 mobile/functions.php:570
+#: functions.php:4046 mobile/functions.php:579
 msgid "Page"
 msgstr "ページ"
 
-#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:395
+#: functions.php:4047 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:403
 msgid "Feed"
 msgstr "フィード"
 
-#: functions.php:4096
+#: functions.php:4088
 msgid "Generated feed"
 msgstr "生成したフィード"
 
-#: functions.php:4145
+#: functions.php:4137
 msgid "Click to collapse category"
 msgstr "閉じたカテゴリーのクリック"
 
@@ -307,122 +314,85 @@ msgstr "表示するフィードがありません。"
 msgid "Tags"
 msgstr "タグ"
 
-#: functions.php:4657
+#: functions.php:4651
 msgid " - "
 msgstr " - "
 
-#: functions.php:4716 functions.php:4717
+#: functions.php:4706 functions.php:4707
 msgid "no tags"
 msgstr "タグがありません"
 
-#: functions.php:4724
+#: functions.php:4714
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: functions.php:4732
+#: functions.php:4722
 #, fuzzy
 msgid "Display original article content"
 msgstr "記事の内容をスクロールする"
 
-#: functions.php:4739 functions.php:5378
+#: functions.php:4729 functions.php:5384
 msgid "Show article summary in new window"
 msgstr "記事の要約を新しいウィンドウで表示する"
 
-#: functions.php:4775 functions.php:5302
+#: functions.php:4765 functions.php:5308
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: functions.php:4781 functions.php:5308
+#: functions.php:4771 functions.php:5314
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4817 functions.php:5342
+#: functions.php:4807 functions.php:5348
 msgid "Attachment:"
 msgstr "添付: "
 
-#: functions.php:4819 functions.php:5344
+#: functions.php:4809 functions.php:5350
 msgid "Attachments:"
 msgstr "添付:"
 
-#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
+#: functions.php:4829 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1069
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: functions.php:4895 modules/pref-feed-browser.php:75
+#: functions.php:4885 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: functions.php:4964 mobile/functions.php:414
+#: functions.php:4954 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:5077
-msgid "(Click to change)"
-msgstr "(クリックで変更)"
-
-#: functions.php:5276
+#: functions.php:5282
 msgid "Click to expand article"
 msgstr "開いた記事のクリック"
 
-#: functions.php:5440
+#: functions.php:5442
 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: functions.php:5443
+#: functions.php:5445
+#, fuzzy
+msgid "No updated articles found to display."
+msgstr "表示する未読記事が見つかりませんでした。"
+
+#: functions.php:5448
 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
-#: functions.php:5446
+#: functions.php:5452
+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:5454
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
-#: functions.php:5793
-msgid "Match "
-msgstr "一致 "
-
-#: functions.php:5801
-msgid "Unread articles"
-msgstr "未読記事"
-
-#: functions.php:5802
-msgid "Updated articles"
-msgstr "更新済み記事"
-
-#: functions.php:5803
-msgid "Title contains"
-msgstr "題名の内容"
-
-#: functions.php:5804
-msgid "Content contains"
-msgstr "コンテンツの内容"
-
-#: functions.php:5805
-msgid "Score equals"
-msgstr "スコアと同じ"
-
-#: functions.php:5806
-msgid "Score is greater than"
-msgstr "スコア以上"
-
-#: functions.php:5807
-msgid "Score is less than"
-msgstr "スコア以下"
-
-#: functions.php:5808
-msgid "Articles newer than X hours"
-msgstr "記事が X 時間より新しい"
-
-#: functions.php:5809
-msgid "Articles newer than X days"
-msgstr "記事が X 日より新しい"
-
-#: functions.php:5818
-msgid "Add"
-msgstr "追加"
-
 #: localized_js.php:35
 msgid "display feeds"
 msgstr "フィードの表示"
@@ -629,7 +599,7 @@ msgstr "ヘッドラインを更新できません (XML オブジェクトが見
 msgid "Could not display article (missing XML object)"
 msgstr "記事を表示できません (XML オブジェクトが見当たりません)"
 
-#: localized_js.php:95 tt-rss.php:249 tt-rss.php:262
+#: localized_js.php:95 tt-rss.php:252 tt-rss.php:265
 msgid "No feed selected."
 msgstr "フィードは選択されていません。"
 
@@ -802,9 +772,9 @@ msgstr "選択されたフィードの変更を保存しますか?"
 msgid "Saving feeds..."
 msgstr "フィードの保存中..."
 
-#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:766
+#: localized_schema.php:9 tt-rss.php:208 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1212 modules/pref-feeds.php:1273
+#: mobile/functions.php:775
 msgid "Title"
 msgstr "題名"
 
@@ -817,7 +787,7 @@ msgid "Link"
 msgstr "リンク"
 
 #: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:767
+#: mobile/functions.php:776
 msgid "Content"
 msgstr "内容"
 
@@ -829,7 +799,7 @@ msgstr ""
 msgid "Filter article"
 msgstr "記事フィルター"
 
-#: localized_schema.php:16 mobile/functions.php:574
+#: localized_schema.php:16 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "既読にする"
 
@@ -1316,11 +1286,10 @@ msgid "tag cloud"
 msgstr "タグクラウド"
 
 #: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
-#: modules/pref-labels.php:103 modules/pref-users.php:364
-#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
-#: mobile/functions.php:774
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:1114
+#: modules/pref-filters.php:307 modules/pref-labels.php:105
+#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:435
+#: mobile/functions.php:729 mobile/functions.php:783
 msgid "Search"
 msgstr "検索"
 
@@ -1364,69 +1333,79 @@ msgstr "&nbsp;&nbsp;読んだフィードを隠す/再表示する"
 msgid "Other actions:"
 msgstr "その他の操作:"
 
-#: tt-rss.php:163
+#: tt-rss.php:164
+#, fuzzy
+msgid "&nbsp;&nbsp;Create label"
+msgstr "&nbsp;&nbsp;フィルターを作成する"
+
+#: tt-rss.php:165
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;フィルターを作成する"
 
-#: tt-rss.php:164
+#: tt-rss.php:166
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;UI レイアウトのリセット"
 
-#: tt-rss.php:165
+#: tt-rss.php:167
 msgid "&nbsp;&nbsp;Reset category order"
 msgstr "&nbsp;&nbsp;カテゴリーの順番のリセット"
 
-#: tt-rss.php:167
+#: tt-rss.php:169
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;キーボードショートカット"
 
-#: tt-rss.php:175
+#: tt-rss.php:177
 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 
-#: tt-rss.php:177
+#: tt-rss.php:179
 msgid "Toggle Feedlist"
 msgstr "フィード一覧を切り替える"
 
-#: tt-rss.php:185 mobile/functions.php:729
+#: tt-rss.php:187 mobile/functions.php:738
 msgid "Search:"
 msgstr "検索:"
 
-#: tt-rss.php:193 mobile/functions.php:447
+#: tt-rss.php:195 mobile/functions.php:456
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:194 mobile/functions.php:448
+#: tt-rss.php:196 mobile/functions.php:457
 msgid "All Articles"
 msgstr "すべての記事"
 
-#: tt-rss.php:197
+#: tt-rss.php:199
 msgid "Ignore Scoring"
 msgstr "スコア計算の無効化"
 
-#: tt-rss.php:200
+#: tt-rss.php:200 modules/pref-feeds.php:1218 modules/pref-feeds.php:1281
+#: mobile/functions.php:501 mobile/functions.php:504
+msgid "Updated"
+msgstr "更新日時"
+
+#: tt-rss.php:203
 msgid "Order:"
 msgstr "並べ替え:"
 
-#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:435
+#: tt-rss.php:207 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: modules/pref-filters.php:443
 msgid "Date"
 msgstr "日付"
 
-#: tt-rss.php:206
+#: tt-rss.php:209
 msgid "Score"
 msgstr "スコア"
 
-#: tt-rss.php:210
+#: tt-rss.php:213
 msgid "Limit:"
 msgstr "制限:"
 
-#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:427
+#: tt-rss.php:238 modules/pref-feeds.php:261 modules/pref-feeds.php:451
+#: mobile/functions.php:436
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:253
+#: tt-rss.php:256
 msgid "Drag me to resize panels"
 msgstr "パネルの大きさを変更するにはここをドラッグします"
 
@@ -1584,7 +1563,7 @@ msgid "Subscribe"
 msgstr "購読"
 
 #: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
 #: modules/pref-feeds.php:130 modules/pref-feeds.php:395
 #: modules/pref-feeds.php:546 modules/pref-filters.php:166
 #: modules/pref-users.php:184
@@ -1595,7 +1574,7 @@ msgstr "取り消し"
 msgid "match on:"
 msgstr "対象項目:"
 
-#: modules/popup-dialog.php:167 mobile/functions.php:768
+#: modules/popup-dialog.php:167 mobile/functions.php:777
 msgid "Title or content"
 msgstr "題名か内容"
 
@@ -1603,110 +1582,110 @@ msgstr "題名か内容"
 msgid "Limit search to:"
 msgstr "対象範囲"
 
-#: modules/popup-dialog.php:188 mobile/functions.php:748
+#: modules/popup-dialog.php:188 mobile/functions.php:757
 msgid "This feed"
 msgstr "このフィード"
 
-#: modules/popup-dialog.php:288
+#: modules/popup-dialog.php:226
 msgid "Create Filter"
 msgstr "フィルターを作成する"
 
-#: modules/popup-dialog.php:306 modules/popup-dialog.php:405
+#: 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:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:394
+#: modules/popup-dialog.php:245 modules/pref-filters.php:42
+#: modules/pref-filters.php:402
 msgid "Match"
 msgstr "一致"
 
-#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:425
+#: modules/popup-dialog.php:253 modules/pref-filters.php:54
+#: modules/pref-filters.php:433
 #, fuzzy
 msgid "before"
 msgstr "再描画"
 
-#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:426
+#: modules/popup-dialog.php:254 modules/pref-filters.php:55
+#: modules/pref-filters.php:434
 #, fuzzy
 msgid "after"
 msgstr "日付"
 
-#: modules/popup-dialog.php:380 modules/pref-filters.php:70
+#: modules/popup-dialog.php:268 modules/pref-filters.php:70
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:383 modules/pref-filters.php:73
+#: modules/popup-dialog.php:271 modules/pref-filters.php:73
 msgid "on field"
 msgstr ""
 
-#: modules/popup-dialog.php:389 modules/pref-filters.php:79
+#: modules/popup-dialog.php:277 modules/pref-filters.php:79
 #, fuzzy
 msgid "in"
 msgstr "リンク"
 
-#: modules/popup-dialog.php:394 modules/pref-filters.php:84
+#: modules/popup-dialog.php:282 modules/pref-filters.php:84
 msgid "Perform Action"
 msgstr "操作の実行"
 
-#: modules/popup-dialog.php:411 modules/pref-filters.php:104
+#: modules/popup-dialog.php:299 modules/pref-filters.php:104
 msgid "with parameters:"
 msgstr "パラメーター:"
 
-#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:308
 #: modules/pref-feeds.php:500 modules/pref-filters.php:123
 #: modules/pref-users.php:165
 msgid "Options"
 msgstr "オプション"
 
-#: modules/popup-dialog.php:427 modules/pref-filters.php:135
+#: modules/popup-dialog.php:318 modules/pref-filters.php:135
 msgid "Enabled"
 msgstr "有効にする"
 
-#: modules/popup-dialog.php:430 modules/pref-filters.php:144
+#: modules/popup-dialog.php:321 modules/pref-filters.php:144
 msgid "Inverse match"
 msgstr "一致しない"
 
-#: modules/popup-dialog.php:442
+#: modules/popup-dialog.php:333
 msgid "Create"
 msgstr "作成"
 
-#: modules/popup-dialog.php:457
+#: modules/popup-dialog.php:348
 msgid "Update Errors"
 msgstr "更新エラー"
 
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:351
 msgid "These feeds have not been updated because of errors:"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
-#: modules/popup-dialog.php:478
+#: modules/popup-dialog.php:369
 msgid "Close"
 msgstr "閉じる"
 
-#: modules/popup-dialog.php:487
+#: modules/popup-dialog.php:378
 msgid "Edit Tags"
 msgstr "タグを編集する"
 
-#: modules/popup-dialog.php:492
+#: modules/popup-dialog.php:383
 msgid "Tags for this article (separated by commas):"
 msgstr "この記事のタグ (カンマで区切ります):"
 
-#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:393
 #: modules/pref-feeds.php:544 modules/pref-filters.php:162
 #: modules/pref-users.php:181
 msgid "Save"
 msgstr "保存"
 
-#: modules/popup-dialog.php:550 help/3.php:60
+#: modules/popup-dialog.php:441 help/3.php:60
 msgid "Tag cloud"
 msgstr "タグクラウド"
 
-#: modules/popup-dialog.php:553
+#: modules/popup-dialog.php:444
 msgid "Showing most popular tags "
 msgstr "もっとも人気のあるタグを表示中 "
 
-#: modules/popup-dialog.php:554
+#: modules/popup-dialog.php:445
 msgid "browse more"
 msgstr "もっと参照する"
 
@@ -1815,7 +1794,7 @@ msgstr "電子メールダイジェストに含む"
 msgid "Cache images locally"
 msgstr "ローカルに画像をキャッシュする"
 
-#: modules/pref-feeds.php:390 modules/pref-feeds.php:1374
+#: modules/pref-feeds.php:390 modules/pref-feeds.php:1367
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
@@ -1823,131 +1802,126 @@ msgstr "購読をやめる"
 msgid "Multiple Feed Editor"
 msgstr "複数フィードエディター"
 
-#: modules/pref-feeds.php:781 modules/pref-feeds.php:828
+#: modules/pref-feeds.php:774 modules/pref-feeds.php:821
 msgid "All done."
 msgstr "すべて終了しました。"
 
-#: modules/pref-feeds.php:859
+#: modules/pref-feeds.php:852
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> を購読しました。"
 
-#: modules/pref-feeds.php:861
+#: modules/pref-feeds.php:854
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:943
+#: modules/pref-feeds.php:936
 msgid "Category editor"
 msgstr "カテゴリーエディター"
 
-#: modules/pref-feeds.php:966
+#: modules/pref-feeds.php:959
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "カテゴリー <b>%s</b> はデータベースに既に存在します。"
 
-#: modules/pref-feeds.php:994
+#: modules/pref-feeds.php:987
 msgid "Unable to delete non empty feed categories."
 msgstr "殻でないフィードカテゴリーは削除できません。"
 
-#: modules/pref-feeds.php:1011
+#: modules/pref-feeds.php:1004
 msgid "Create category"
 msgstr "カテゴリーの作成"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1064
 msgid "No feed categories defined."
 msgstr "フィードカテゴリーが定義されていません。"
 
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
-#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
-#: modules/pref-labels.php:176 modules/pref-users.php:481
+#: modules/pref-feeds.php:1075 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:178
+#: modules/pref-users.php:481
 msgid "Remove"
 msgstr "削除"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1097
 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
-#: modules/pref-feeds.php:1126 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1119 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1124
 msgid "Top 25"
 msgstr "トップ 25"
 
-#: modules/pref-feeds.php:1205
+#: modules/pref-feeds.php:1198
 msgid "Show last article times"
 msgstr "最後の記事の時間を表示する"
 
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1284
+#: modules/pref-feeds.php:1215 modules/pref-feeds.php:1277
 msgid "Last&nbsp;Article"
 msgstr "最後の記事"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:492 mobile/functions.php:495
-msgid "Updated"
-msgstr "更新日時"
-
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
-#: modules/pref-labels-old.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1302 modules/pref-filters.php:461
+#: modules/pref-users.php:456
 msgid "Click to edit"
 msgstr "編集するにはクリック"
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1369
+#: modules/pref-feeds.php:1348 modules/pref-feeds.php:1362
 msgid "Selection:"
 msgstr "選択:"
 
-#: modules/pref-feeds.php:1361
+#: modules/pref-feeds.php:1354
 msgid "Recategorize"
 msgstr "カテゴリー再設定"
 
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
-#: modules/pref-labels-old.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1363 modules/pref-filters.php:485
+#: modules/pref-users.php:479
 msgid "Edit"
 msgstr "編集"
 
-#: modules/pref-feeds.php:1371
+#: modules/pref-feeds.php:1364
 msgid "Manual purge"
 msgstr "手動削除"
 
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
 msgid "Clear feed data"
 msgstr "フィードデータの消去"
 
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
+#: modules/pref-feeds.php:1366 modules/pref-filters.php:324
 msgid "Rescore articles"
 msgstr "記事のスコアの再集計"
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1372
 msgid "Other:"
 msgstr "その他:"
 
-#: modules/pref-feeds.php:1380
+#: modules/pref-feeds.php:1373
 msgid "Edit categories"
 msgstr "カテゴリーの編集"
 
-#: modules/pref-feeds.php:1387
+#: modules/pref-feeds.php:1380
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1384
 msgid "File:"
 msgstr "ファイル:"
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1387
 msgid "Import"
 msgstr "インポート"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1394
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1397
 msgid "Firefox Integration"
 msgstr "Firefox 統合"
 
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1399
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1955,22 +1929,22 @@ msgstr ""
 "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
 "Tiny RSS のサイトを使うことができます。"
 
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1403
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1412
 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:1423
+#: modules/pref-feeds.php:1416
 #, fuzzy
 msgid "Link to published articles feed."
 msgstr "公開済みの記事"
 
-#: modules/pref-feeds.php:1426
+#: modules/pref-feeds.php:1419
 msgid "Generate another link"
 msgstr "別のリンクを生成する"
 
@@ -1983,99 +1957,62 @@ msgstr "フィルターエディター"
 msgid "Saved filter <b>%s</b>"
 msgstr "フィルター <b>%s</b> を保存しました"
 
-#: modules/pref-filters.php:256
+#: modules/pref-filters.php:264
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "フィルター <b>%s</b> を作成しました"
 
-#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:317 help/3.php:31 help/4.php:25
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
-#: modules/pref-filters.php:384
+#: modules/pref-filters.php:392
 msgid "filter_type_descr"
 msgstr "filter_type_descr"
 
-#: modules/pref-filters.php:385
+#: modules/pref-filters.php:393
 msgid "action_description"
 msgstr "action_description"
 
-#: modules/pref-filters.php:396
+#: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
 msgstr "フィード"
 
-#: modules/pref-filters.php:397
+#: modules/pref-filters.php:405
 msgid "Params"
 msgstr "パラメーター"
 
-#: modules/pref-filters.php:442
+#: modules/pref-filters.php:450
 msgid "(Disabled)"
 msgstr ""
 
-#: modules/pref-filters.php:458
+#: modules/pref-filters.php:466
 msgid "(Inverse)"
 msgstr ""
 
-#: modules/pref-filters.php:487
+#: modules/pref-filters.php:495
 msgid "No filters defined."
 msgstr "フィルターが定義されていません。"
 
-#: modules/pref-filters.php:489
+#: modules/pref-filters.php:497
 msgid "No matching filters found."
 msgstr "一致するフィルターが見つかりません。"
 
-#: modules/pref-labels-old.php:9
-msgid ""
-"Sorry, labels have been administratively disabled for this installation. "
-"Please contact instance owner or edit configuration file to enable this "
-"functionality."
-msgstr ""
-
-#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
-#: modules/pref-labels.php:143
-msgid "Caption"
-msgstr "キャプション"
-
-#: modules/pref-labels-old.php:46
-msgid "Match SQL"
-msgstr "SQL の一致"
-
-#: modules/pref-labels-old.php:68
-msgid "Help"
-msgstr "ヘルプ"
-
-#: modules/pref-labels-old.php:99
-msgid "Error: SQL expression is blank."
-msgstr "エラー: SQL 表記が空です。"
-
-#: modules/pref-labels-old.php:179
-#, php-format
-msgid "Saved label <b>%s</b>"
-msgstr "ラベル <b>%s</b> を保存しました"
-
-#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
+#: modules/pref-labels.php:75
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "ラベル <b>%s</b> を作成しました"
 
-#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
+#: modules/pref-labels.php:113 help/4.php:26
 msgid "Create label"
 msgstr "ラベルを作成する"
 
-#: modules/pref-labels-old.php:283
-msgid "SQL Expression"
-msgstr "SQL 表記"
-
-#: modules/pref-labels-old.php:308
-msgid "[No caption]"
-msgstr "[キャプションなし]"
-
-#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
+#: modules/pref-labels.php:184
 msgid "No labels defined."
 msgstr "ラベルが定義されていません。"
 
-#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
+#: modules/pref-labels.php:186
 msgid "No matching labels found."
 msgstr "一致するラベルが見つかりません。"
 
@@ -2281,39 +2218,6 @@ msgstr "ユーザーが定義されていません。"
 msgid "No matching users found."
 msgstr "ユーザーが見つかりません。"
 
-#: help/1.php:1
-msgid "Labels and SQL Expressions"
-msgstr "SQL 表現とラベル"
-
-#: help/1.php:3
-msgid ""
-"Label content is generated using SQL expressions. The &laquo;SQL "
-"expression&raquo; is added to WHERE clause of view feed query. You can match "
-"on ttrss_entries table fields and even use subselect to query additional "
-"information. This \tfunctionality is considered to be advanced and requires "
-"some understanding of SQL."
-msgstr ""
-
-#: help/1.php:5
-msgid "Examples"
-msgstr "例"
-
-#: help/1.php:7
-msgid "Match all unread articles:"
-msgstr "一致したすべての未読記事:"
-
-#: help/1.php:11
-msgid "Matches all articles which mention Linux in the title:"
-msgstr ""
-
-#: help/1.php:15
-msgid "Matches all articles for the last week (PostgreSQL):"
-msgstr "再収集のすべての記事に一致 (PostgreSQL):"
-
-#: help/1.php:19
-msgid "Matches all articles with scores between 100 and 500:"
-msgstr "100 から 500 までのスコアのすべての記事に一致:"
-
 #: help/2.php:1
 msgid "Content filtering"
 msgstr "コンテンツフィルタリング"
@@ -2509,35 +2413,35 @@ msgstr "フィード"
 msgid "View tags"
 msgstr "タグを編集する"
 
-#: mobile/functions.php:425
+#: mobile/functions.php:434
 msgid "Back"
 msgstr ""
 
-#: mobile/functions.php:435
+#: mobile/functions.php:444
 #, fuzzy
 msgid "View:"
 msgstr "サイト:"
 
-#: mobile/functions.php:457
+#: mobile/functions.php:466
 #, fuzzy
 msgid "Refresh"
 msgstr "再描画"
 
-#: mobile/functions.php:689
+#: mobile/functions.php:698
 #, fuzzy
 msgid "Tags:"
 msgstr "タグ"
 
-#: mobile/functions.php:721
+#: mobile/functions.php:730
 msgid "Go back"
 msgstr ""
 
-#: mobile/functions.php:732
+#: mobile/functions.php:741
 #, fuzzy
 msgid "Where:"
 msgstr "その他:"
 
-#: mobile/functions.php:763
+#: mobile/functions.php:772
 #, fuzzy
 msgid "Match on:"
 msgstr "対象項目:"
@@ -2546,6 +2450,78 @@ msgstr "対象項目:"
 msgid "Internal error: Function not implemented"
 msgstr "インターナルエラー: 機能が実装されていません"
 
+#~ msgid "(Click to change)"
+#~ msgstr "(クリックで変更)"
+
+#~ msgid "Match "
+#~ msgstr "一致 "
+
+#~ msgid "Unread articles"
+#~ msgstr "未読記事"
+
+#~ msgid "Updated articles"
+#~ msgstr "更新済み記事"
+
+#~ msgid "Title contains"
+#~ msgstr "題名の内容"
+
+#~ msgid "Content contains"
+#~ msgstr "コンテンツの内容"
+
+#~ msgid "Score equals"
+#~ msgstr "スコアと同じ"
+
+#~ msgid "Score is greater than"
+#~ msgstr "スコア以上"
+
+#~ msgid "Score is less than"
+#~ msgstr "スコア以下"
+
+#~ msgid "Articles newer than X hours"
+#~ msgstr "記事が X 時間より新しい"
+
+#~ msgid "Articles newer than X days"
+#~ msgstr "記事が X 日より新しい"
+
+#~ msgid "Add"
+#~ msgstr "追加"
+
+#~ msgid "Caption"
+#~ msgstr "キャプション"
+
+#~ msgid "Match SQL"
+#~ msgstr "SQL の一致"
+
+#~ msgid "Help"
+#~ msgstr "ヘルプ"
+
+#~ msgid "Error: SQL expression is blank."
+#~ msgstr "エラー: SQL 表記が空です。"
+
+#~ msgid "Saved label <b>%s</b>"
+#~ msgstr "ラベル <b>%s</b> を保存しました"
+
+#~ msgid "SQL Expression"
+#~ msgstr "SQL 表記"
+
+#~ msgid "[No caption]"
+#~ msgstr "[キャプションなし]"
+
+#~ msgid "Labels and SQL Expressions"
+#~ msgstr "SQL 表現とラベル"
+
+#~ msgid "Examples"
+#~ msgstr "例"
+
+#~ msgid "Match all unread articles:"
+#~ msgstr "一致したすべての未読記事:"
+
+#~ msgid "Matches all articles for the last week (PostgreSQL):"
+#~ msgstr "再収集のすべての記事に一致 (PostgreSQL):"
+
+#~ msgid "Matches all articles with scores between 100 and 500:"
+#~ msgstr "100 から 500 までのスコアのすべての記事に一致:"
+
 #~ msgid "Search to label"
 #~ msgstr "ラベルの検索"