update fr_FR translation

2 files changed, 66 insertions, 68 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 1cbf158cf..eaece08a2 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.mo
+++ b/locale/zh_CN/LC_MESSAGES/messages.mo
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 4cbee35c8..2c32a3f80 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 15:38+0300\n"
+"POT-Creation-Date: 2010-11-17 16:11+0300\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <[email protected]>\n"
 "Language-Team: hicode.org <[email protected]>\n"
@@ -307,7 +307,7 @@ msgid "Incorrect username or password"
 msgstr ""
 
 #: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:426
+#: modules/pref-filters.php:421
 msgid "All feeds"
 msgstr "所有feed"
 
@@ -354,13 +354,13 @@ msgid "Archived articles"
 msgstr "星级文章"
 
 #: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:383
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
 #: modules/pref-labels.php:212 modules/pref-users.php:428
 msgid "Select:"
 msgstr "选择："
 
 #: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:384
+#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
 #: modules/pref-labels.php:213 modules/pref-users.php:429
 msgid "All"
 msgstr "所有"
@@ -375,7 +375,7 @@ msgid "Invert"
 msgstr "(逆)"
 
 #: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:385
+#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
 #: modules/pref-labels.php:214 modules/pref-users.php:430
 msgid "None"
 msgstr "无"
@@ -1061,7 +1061,7 @@ msgid "Sort articles"
 msgstr "星级文章"
 
 #: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:481
+#: modules/pref-filters.php:476
 #, fuzzy
 msgid "Date"
 msgstr "更新"
@@ -1220,7 +1220,7 @@ msgstr "自适应"
 
 #: modules/popup-dialog.php:151 modules/popup-dialog.php:360
 #: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:321
+#: modules/pref-filters.php:154 modules/pref-filters.php:316
 #: modules/pref-labels.php:169 modules/pref-users.php:387
 msgid "Remove"
 msgstr "移除"
@@ -1286,7 +1286,7 @@ msgid "Subscribe to Feed"
 msgstr "订阅feed"
 
 #: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:413
+#: modules/pref-feeds.php:320 modules/pref-filters.php:408
 msgid "Feed"
 msgstr "Feed"
 
@@ -1341,7 +1341,7 @@ msgstr "Feed编辑"
 
 #: modules/popup-dialog.php:331 modules/popup-dialog.php:369
 #: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:311 modules/pref-labels.php:162
+#: modules/pref-filters.php:306 modules/pref-labels.php:162
 #: modules/pref-users.php:370
 msgid "Search"
 msgstr "搜索"
@@ -1388,17 +1388,17 @@ msgid "Create Filter"
 msgstr "创建过滤器"
 
 #: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:412
+#: modules/pref-filters.php:407
 msgid "Match"
 msgstr "匹配"
 
 #: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:453
+#: modules/pref-filters.php:448
 msgid "before"
 msgstr ""
 
 #: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:454
+#: modules/pref-filters.php:449
 #, fuzzy
 msgid "after"
 msgstr "更新"
@@ -1627,7 +1627,7 @@ msgstr ""
 msgid "Clear feed data"
 msgstr "所有Feed已更新。"
 
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:325
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
 #, fuzzy
 msgid "Rescore articles"
 msgstr "星级文章"
@@ -1640,7 +1640,7 @@ msgstr "显示最近文章时间"
 msgid "Last&nbsp;Article"
 msgstr "最后&nbsp;文章"
 
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:499
+#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
 #: modules/pref-users.php:466
 msgid "Click to edit"
 msgstr ""
@@ -1760,47 +1760,42 @@ msgstr "无feed可订阅。"
 msgid "Filter Editor"
 msgstr "过滤器编辑"
 
-#: modules/pref-filters.php:213
-#, php-format
-msgid "Saved filter <b>%s</b>"
-msgstr "保存过滤器<b>%s</b>"
-
-#: modules/pref-filters.php:267
+#: modules/pref-filters.php:262
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "创建过滤器 <b>%s</b>"
 
-#: modules/pref-filters.php:315 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: modules/pref-filters.php:318 modules/pref-users.php:385
+#: modules/pref-filters.php:313 modules/pref-users.php:385
 msgid "Edit"
 msgstr "编辑"
 
-#: modules/pref-filters.php:414
+#: modules/pref-filters.php:409
 #, fuzzy
 msgid "Field"
 msgstr "Feed"
 
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:410
 #, fuzzy
 msgid "Params"
 msgstr "参数:"
 
-#: modules/pref-filters.php:488
+#: modules/pref-filters.php:483
 msgid "(Disabled)"
 msgstr "(不可用)"
 
-#: modules/pref-filters.php:504
+#: modules/pref-filters.php:499
 msgid "(Inverse)"
 msgstr "(逆)"
 
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:519
 msgid "No filters defined."
 msgstr "未定义过滤器。"
 
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:521
 #, fuzzy
 msgid "No matching filters found."
 msgstr "未找到文章。"
@@ -2415,8 +2410,8 @@ msgstr "您不能从分类中取消订阅。"
 msgid "Subscribed to %d feed(s)."
 msgstr "订阅feed:"
 
-#: functions.js:1041 functions.js:1072 prefs.js:573 prefs.js:603 prefs.js:635
-#: prefs.js:936 prefs.js:956 prefs.js:1655
+#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
+#: prefs.js:932 prefs.js:952 prefs.js:1651
 msgid "No feeds are selected."
 msgstr "未选择feed."
 
@@ -2462,173 +2457,173 @@ msgstr "请输入标签主题"
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: prefs.js:224
+#: prefs.js:220
 #, fuzzy
 msgid "Error: No feed URL given."
 msgstr "未能订阅：无 feed URL。"
 
-#: prefs.js:226
+#: prefs.js:222
 msgid "Error: Invalid feed URL."
 msgstr ""
 
-#: prefs.js:254
+#: prefs.js:250
 #, fuzzy
 msgid "Can't add profile: no name specified."
 msgstr "添加分类失败：未指定分类名"
 
-#: prefs.js:276
+#: prefs.js:272
 msgid "Can't add category: no name specified."
 msgstr "添加分类失败：未指定分类名"
 
-#: prefs.js:298
+#: prefs.js:294
 #, fuzzy
 msgid "Please enter login:"
 msgstr "请输入标签主题"
 
-#: prefs.js:305
+#: prefs.js:301
 #, fuzzy
 msgid "Can't create user: no login specified."
 msgstr "添加用户失败：未登录。"
 
-#: prefs.js:454
+#: prefs.js:450
 msgid "Remove selected labels?"
 msgstr "移除选定标记?"
 
-#: prefs.js:470
+#: prefs.js:466
 msgid "No labels are selected."
 msgstr "未选定标记."
 
-#: prefs.js:484
+#: prefs.js:480
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: prefs.js:501 prefs.js:826 prefs.js:847 prefs.js:886
+#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
 msgid "No users are selected."
 msgstr "未选定用户."
 
-#: prefs.js:519
+#: prefs.js:515
 msgid "Remove selected filters?"
 msgstr "移除选定的过滤器？"
 
-#: prefs.js:535 prefs.js:916
+#: prefs.js:531 prefs.js:912
 msgid "No filters are selected."
 msgstr "未选定过滤器。"
 
-#: prefs.js:554
+#: prefs.js:550
 msgid "Unsubscribe from selected feeds?"
 msgstr "退订选定feed?"
 
-#: prefs.js:588
+#: prefs.js:584
 msgid "Please select only one feed."
 msgstr "请只选择一个feed."
 
-#: prefs.js:594
+#: prefs.js:590
 #, fuzzy
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: prefs.js:616
+#: prefs.js:612
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 
-#: prefs.js:648
+#: prefs.js:644
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: prefs.js:664
+#: prefs.js:660
 #, fuzzy
 msgid "No profiles selected."
 msgstr "无选定文章。"
 
-#: prefs.js:676
+#: prefs.js:672
 msgid "Remove selected categories?"
 msgstr "移除选定分类?"
 
-#: prefs.js:694
+#: prefs.js:690
 msgid "No categories are selected."
 msgstr "未选定分类。"
 
-#: prefs.js:748
+#: prefs.js:744
 msgid "Login field cannot be blank."
 msgstr "登陆框不能留空。"
 
-#: prefs.js:831 prefs.js:852 prefs.js:891
+#: prefs.js:827 prefs.js:848 prefs.js:887
 msgid "Please select only one user."
 msgstr "请只选择一个用户."
 
-#: prefs.js:856
+#: prefs.js:852
 msgid "Reset password of selected user?"
 msgstr "重置选定用户密码?"
 
-#: prefs.js:921
+#: prefs.js:917
 msgid "Please select only one filter."
 msgstr "请只选择一个过滤器."
 
-#: prefs.js:997
+#: prefs.js:993
 msgid "No OPML file to upload."
 msgstr "无OPML文件上传."
 
-#: prefs.js:1174
+#: prefs.js:1170
 msgid "Reset to defaults?"
 msgstr "重置默认项？"
 
-#: prefs.js:1502
+#: prefs.js:1498
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "使用新地址替换当前地址？"
 
-#: prefs.js:1538
+#: prefs.js:1534
 #, fuzzy
 msgid "Save current configuration?"
 msgstr "保存设置"
 
-#: prefs.js:1639
+#: prefs.js:1635
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "无选定文章。"
 
-#: prefs.js:1662
+#: prefs.js:1658
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: prefs.js:1681
+#: prefs.js:1677
 #, fuzzy
 msgid "Remove filter %s?"
 msgstr "移除选定的过滤器？"
 
-#: prefs.js:1711
+#: prefs.js:1707
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "无选定文章。"
 
-#: prefs.js:1791
+#: prefs.js:1787
 #, fuzzy
 msgid "Reset label colors to default?"
 msgstr "重置默认项？"
 
-#: prefs.js:1816
+#: prefs.js:1812
 #, fuzzy
 msgid "Please enter new label foreground color:"
 msgstr "请输入标签主题"
 
-#: prefs.js:1818
+#: prefs.js:1814
 #, fuzzy
 msgid "Please enter new label background color:"
 msgstr "请输入标签主题"
 
-#: prefs.js:1950
+#: prefs.js:1946
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "移除选定的过滤器？"
 
-#: prefs.js:1966
+#: prefs.js:1962
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: prefs.js:1990
+#: prefs.js:1986
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
@@ -2723,6 +2718,9 @@ msgstr "读取中，请等待..."
 msgid "Please enter a note for this article:"
 msgstr "请输入标签主题"
 
+#~ msgid "Saved filter <b>%s</b>"
+#~ msgstr "保存过滤器<b>%s</b>"
+
 #, fuzzy
 #~ msgid "Tiny Tiny RSS"
 #~ msgstr "返回Tiny Tiny RSS"