update translations

8 files changed, 76 insertions, 60 deletions

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 855ec9b12..c71cf45a4 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 64f098f66..6c939d7c4 100644
--- 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 14:27+0400\n"
+"POT-Creation-Date: 2007-08-26 14:32+0400\n"
 "PO-Revision-Date: 2007-08-22 21:56+0200\n"
 "Last-Translator: Thibaut Cousin <[email protected]>\n"
 "Language-Team: Français <[email protected]>\n"
@@ -588,77 +588,82 @@ msgstr "Marquer tous les articles visibles de %s comme lus ?"
 
 #: localized_js.php:113
 #, fuzzy, php-format
+msgid "Mark all articles in %s as read?"
+msgstr "Marquer tous les articles visibles de %s comme lus ?"
+
+#: localized_js.php:114
+#, 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
+#: localized_js.php:115
 msgid "Please enter label title:"
 msgstr "Veuillez saisir le titre de l'intitulé :"
 
-#: localized_js.php:115
+#: localized_js.php:116
 msgid "Save current configuration?"
 msgstr "Enregistrer la configuration actuelle ?"
 
-#: localized_js.php:116 modules/pref-prefs.php:20
+#: localized_js.php:117 modules/pref-prefs.php:20
 msgid "Old password cannot be blank."
 msgstr "L'ancien mot de passe ne peut pas être vide."
 
-#: localized_js.php:117 modules/pref-prefs.php:25
+#: localized_js.php:118 modules/pref-prefs.php:25
 msgid "New password cannot be blank."
 msgstr "Le nouveau mot de passe ne peut pas être vide."
 
-#: localized_js.php:118 modules/pref-prefs.php:30
+#: localized_js.php:119 modules/pref-prefs.php:30
 msgid "Entered passwords do not match."
 msgstr "Les mots de passe saisie ne sont pas identiques."
 
-#: localized_js.php:119
+#: localized_js.php:120
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "Aucun article trouvé."
 
-#: localized_js.php:120
+#: localized_js.php:121
 #, fuzzy, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "Marquer tous les articles sélectionnés de %s comme lus ?"
 
-#: localized_js.php:121
+#: localized_js.php:122
 #, fuzzy
 msgid "No article is selected."
 msgstr "Aucun article sélectionné."
 
-#: localized_js.php:122
+#: localized_js.php:123
 #, fuzzy
 msgid "Star article"
 msgstr "Articles remarquables"
 
-#: localized_js.php:123
+#: localized_js.php:124
 #, fuzzy
 msgid "Unstar article"
 msgstr "Articles remarquables"
 
-#: localized_js.php:124
+#: localized_js.php:125
 #, fuzzy
 msgid "Please wait..."
 msgstr "Ouverture en cours, veuillez patienter..."
 
-#: localized_js.php:125 localized_schema.php:17
+#: localized_js.php:126 localized_schema.php:17
 msgid "Publish article"
 msgstr "Publier l'article"
 
-#: localized_js.php:126
+#: localized_js.php:127
 #, fuzzy
 msgid "Unpublish article"
 msgstr "Publier l'article"
 
-#: localized_js.php:127
+#: localized_js.php:128
 #, fuzzy
 msgid "You can't clear this type of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 
-#: localized_js.php:128
-#, php-format
-msgid "Erase all non-starred articles for %s?"
-msgstr ""
+#: localized_js.php:129
+#, fuzzy, php-format
+msgid "Erase all non-starred articles in %s?"
+msgstr "Marquer tous les articles visibles de %s comme lus ?"
 
 #: localized_schema.php:9 modules/popup-dialog.php:172
 #: modules/pref-feeds.php:855 modules/pref-feeds.php:916
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 934ecc218..22a2ced36 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.mo
+++ b/locale/ru_RU/LC_MESSAGES/messages.mo
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 68e2acf92..f1e57b921 100644
--- 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 14:27+0400\n"
+"POT-Creation-Date: 2007-08-26 14:32+0400\n"
 "PO-Revision-Date: 2007-08-18 15:14+0400\n"
 "Last-Translator: Andrew Dolgov <[email protected]>\n"
 "Language-Team: Русский <[email protected]>\n"
@@ -577,78 +577,83 @@ msgstr ""
 
 #: localized_js.php:113
 #, fuzzy, php-format
-msgid "Mark %d selected articles in %s as read?"
+msgid "Mark all articles in %s as read?"
 msgstr "Помечаю все каналы как прочитанные..."
 
 #: localized_js.php:114
+#, fuzzy, php-format
+msgid "Mark %d selected articles in %s as read?"
+msgstr "Помечаю все каналы как прочитанные..."
+
+#: localized_js.php:115
 msgid "Please enter label title:"
 msgstr ""
 
-#: localized_js.php:115
+#: localized_js.php:116
 #, fuzzy
 msgid "Save current configuration?"
 msgstr "Сохранить конфигурацию"
 
-#: localized_js.php:116 modules/pref-prefs.php:20
+#: localized_js.php:117 modules/pref-prefs.php:20
 msgid "Old password cannot be blank."
 msgstr "Старый пароль не может быть пустым."
 
-#: localized_js.php:117 modules/pref-prefs.php:25
+#: localized_js.php:118 modules/pref-prefs.php:25
 msgid "New password cannot be blank."
 msgstr "Новый пароль не может быть пустым."
 
-#: localized_js.php:118 modules/pref-prefs.php:30
+#: localized_js.php:119 modules/pref-prefs.php:30
 msgid "Entered passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: localized_js.php:119
+#: localized_js.php:120
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "Статей не найдено."
 
-#: localized_js.php:120
+#: localized_js.php:121
 #, fuzzy, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "Помечаю все каналы как прочитанные..."
 
-#: localized_js.php:121
+#: localized_js.php:122
 #, fuzzy
 msgid "No article is selected."
 msgstr "Нет выбранных статей."
 
-#: localized_js.php:122
+#: localized_js.php:123
 #, fuzzy
 msgid "Star article"
 msgstr "Отмеченные"
 
-#: localized_js.php:123
+#: localized_js.php:124
 #, fuzzy
 msgid "Unstar article"
 msgstr "Отмеченные"
 
-#: localized_js.php:124
+#: localized_js.php:125
 #, fuzzy
 msgid "Please wait..."
 msgstr "Идет загрузка..."
 
-#: localized_js.php:125 localized_schema.php:17
+#: localized_js.php:126 localized_schema.php:17
 msgid "Publish article"
 msgstr "Опубликовать"
 
-#: localized_js.php:126
+#: localized_js.php:127
 #, fuzzy
 msgid "Unpublish article"
 msgstr "Опубликовать"
 
-#: localized_js.php:127
+#: localized_js.php:128
 #, fuzzy
 msgid "You can't clear this type of feed."
 msgstr "Вы не можете редактировать этот канал."
 
-#: localized_js.php:128
-#, php-format
-msgid "Erase all non-starred articles for %s?"
-msgstr ""
+#: localized_js.php:129
+#, fuzzy, php-format
+msgid "Erase all non-starred articles in %s?"
+msgstr "Помечаю все каналы как прочитанные..."
 
 #: localized_schema.php:9 modules/popup-dialog.php:172
 #: modules/pref-feeds.php:855 modules/pref-feeds.php:916
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 30fd7764d..efdb8799e 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 fc8f3db7a..1bcb7007c 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: 2007-08-26 14:27+0400\n"
+"POT-Creation-Date: 2007-08-26 14:32+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <[email protected]>\n"
 "Language-Team: hicode.org <[email protected]>\n"
@@ -572,78 +572,83 @@ msgstr "标记  %s 中所有访问过的主题为已读"
 
 #: localized_js.php:113
 #, fuzzy, php-format
+msgid "Mark all articles in %s as read?"
+msgstr "标记  %s 中所有访问过的主题为已读"
+
+#: localized_js.php:114
+#, fuzzy, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: localized_js.php:114
+#: localized_js.php:115
 msgid "Please enter label title:"
 msgstr "请输入标签主题"
 
-#: localized_js.php:115
+#: localized_js.php:116
 #, fuzzy
 msgid "Save current configuration?"
 msgstr "保存设置"
 
-#: localized_js.php:116 modules/pref-prefs.php:20
+#: localized_js.php:117 modules/pref-prefs.php:20
 msgid "Old password cannot be blank."
 msgstr "原密码不可留空."
 
-#: localized_js.php:117 modules/pref-prefs.php:25
+#: localized_js.php:118 modules/pref-prefs.php:25
 msgid "New password cannot be blank."
 msgstr "新密码不可留空."
 
-#: localized_js.php:118 modules/pref-prefs.php:30
+#: localized_js.php:119 modules/pref-prefs.php:30
 msgid "Entered passwords do not match."
 msgstr "两次输入密码不通."
 
-#: localized_js.php:119
+#: localized_js.php:120
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "未找到文章。"
 
-#: localized_js.php:120
+#: localized_js.php:121
 #, fuzzy, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: localized_js.php:121
+#: localized_js.php:122
 #, fuzzy
 msgid "No article is selected."
 msgstr "无选定文章。"
 
-#: localized_js.php:122
+#: localized_js.php:123
 #, fuzzy
 msgid "Star article"
 msgstr "星级文章"
 
-#: localized_js.php:123
+#: localized_js.php:124
 #, fuzzy
 msgid "Unstar article"
 msgstr "星级文章"
 
-#: localized_js.php:124
+#: localized_js.php:125
 #, fuzzy
 msgid "Please wait..."
 msgstr "读取中，请等待..."
 
-#: localized_js.php:125 localized_schema.php:17
+#: localized_js.php:126 localized_schema.php:17
 msgid "Publish article"
 msgstr "发布文章"
 
-#: localized_js.php:126
+#: localized_js.php:127
 #, fuzzy
 msgid "Unpublish article"
 msgstr "发布文章"
 
-#: localized_js.php:127
+#: localized_js.php:128
 #, fuzzy
 msgid "You can't clear this type of feed."
 msgstr "您不能编辑本分类feed"
 
-#: localized_js.php:128
-#, php-format
-msgid "Erase all non-starred articles for %s?"
-msgstr ""
+#: localized_js.php:129
+#, fuzzy, php-format
+msgid "Erase all non-starred articles in %s?"
+msgstr "标记  %s 中所有访问过的主题为已读"
 
 #: localized_schema.php:9 modules/popup-dialog.php:172
 #: modules/pref-feeds.php:855 modules/pref-feeds.php:916
diff --git a/localized_js.php b/localized_js.php
index 01f5be6e3..c05034be0 100644
--- a/localized_js.php
+++ b/localized_js.php
@@ -110,6 +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 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?");
@@ -125,7 +126,7 @@ print T_js_decl("Please wait...");
 print T_js_decl("Publish article");
 print T_js_decl("Unpublish article");
 print T_js_decl("You can't clear this type of feed.");
-print T_js_decl("Erase all non-starred articles for %s?");
+print T_js_decl("Erase all non-starred articles in %s?");
 #print T_js_decl(
 #print T_js_decl(
 #print T_js_decl(
diff --git a/tt-rss.js b/tt-rss.js
index 495b8631c..e918af0f8 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -476,7 +476,7 @@ function quickMenuGo(opid) {
 
 			var fn = getFeedName(actid);
 
-			var pr = __("Erase all non-starred articles for %s?").replace("%s", fn);
+			var pr = __("Erase all non-starred articles in %s?").replace("%s", fn);
 
 			if (confirm(pr)) {
 				clearFeedArticles(actid);
@@ -623,7 +623,7 @@ function catchupCurrentFeed() {
 
 	var fn = getFeedName(getActiveFeedId(), active_feed_is_cat);
 	
-	var str = "Mark all articles in " + fn + " as read?";
+	var str = __("Mark all articles in %s as read?").replace("%s", fn);
 
 /*	if (active_feed_is_cat) {
 		str = "Mark all articles in this category as read?";