update translations

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 4c04cb3ddd9cf3c57225c4a4db1ae8e09073c3c7..541560e7f8317843c48a28b456e76240eae37992 100644 (file)
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index a9fb131e25d165ecaf0015db53b00b8fd2a91b2d..b6eabf09c721a716a6346787bc576440dfaa56c2 100644 (file)
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-26 12:14+0400\n"
+"POT-Creation-Date: 2007-08-26 14:25+0400\n"
 "PO-Revision-Date: 2007-08-22 21:56+0200\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -587,8 +587,8 @@ msgid "Mark all visible articles in %s as read?"
 msgstr "Marquer tous les articles visibles de %s comme lus ?"
 
 #: localized_js.php:113
-#, php-format
-msgid "Mark all selected articles in %s as read?"
+#, fuzzy, php-format
+msgid "Mark %d selected articles in %s as read?"
 msgstr "Marquer tous les articles sélectionnés de %s comme lus ?"
 
 #: localized_js.php:114

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 0da072ae5cb344b65ebb6d7c1acb246550e63aa8..78923050d2b3ebde37a7c561b151d9c7ea4fde8b 100644 (file)
Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ

diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 737b2387aeb1a467de94a5e8fd140a286b559a10..ed3ef2c99d186bd7533d434c03b29e5e246ec921 100644 (file)
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-26 12:14+0400\n"
+"POT-Creation-Date: 2007-08-26 14:25+0400\n"
 "PO-Revision-Date: 2007-08-18 15:14+0400\n"
 "Last-Translator: Andrew Dolgov <cthulhoo@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -577,7 +577,7 @@ msgstr ""
 
 #: localized_js.php:113
 #, fuzzy, php-format
-msgid "Mark all selected articles in %s as read?"
+msgid "Mark %d selected articles in %s as read?"
 msgstr "Помечаю все каналы как прочитанные..."
 
 #: localized_js.php:114

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 39be13c0856284699294c9c4720a33bedf44eac4..c059c7db9065faa302b6657f35ab4840cddb73ef 100644 (file)
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 565c1b3c85c3809be6cdafe03d54f44b29f33577..e89dc531cb860b2d2fb3a41575bb89da8b6d9a6e 100644 (file)
--- 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: 2007-08-26 12:14+0400\n"
+"POT-Creation-Date: 2007-08-26 14:25+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -571,8 +571,8 @@ msgid "Mark all visible articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
 #: localized_js.php:113
-#, php-format
-msgid "Mark all selected articles in %s as read?"
+#, fuzzy, php-format
+msgid "Mark %d selected articles in %s as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
 #: localized_js.php:114

diff --git a/localized_js.php b/localized_js.php
index f4840bf6f99ee09aab130bdd2913b46f5d6616ca..66048433cf264af7c6b2c0562ae520bfbe0de810 100644 (file)
--- a/localized_js.php
+++ b/localized_js.php
@@ -110,7 +110,7 @@ print T_js_decl("Can't add filter: nothing to match on.");
 print T_js_decl("Can't subscribe: no feed URL given.");
 print T_js_decl("Unsubscribe from %s?");
 print T_js_decl("Mark all visible articles in %s as read?");
-print T_js_decl("Mark all selected articles in %s as read?");
+print T_js_decl("Mark %d selected articles in %s as read?");
 print T_js_decl("Please enter label title:");
 print T_js_decl("Save current configuration?");
 print T_js_decl("Old password cannot be blank.");

diff --git a/viewfeed.js b/viewfeed.js
index 9aad5e2921b38ff4f026a46e6afd0536487fddf4..24dcdd21436d4d1443769f97a07f6b197d059044 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -975,8 +975,9 @@ function catchupSelection() {
        
                var fn = getFeedName(getActiveFeedId(), active_feed_is_cat);
                
-               var str = __("Mark all selected articles in %s as read?");
+               var str = __("Mark %d selected articles in %s as read?");
        
+               str = str.replace("%d", rows.length);
                str = str.replace("%s", fn);
        
                if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {