From: Andrew Dolgov <fox@bah.spb.su>
Date: Thu, 17 May 2007 13:24:15 +0000 (+0100)
Subject: i18nize tag cloud, update translations
X-Git-Tag: schema_freeze_for_1.2.11~11
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=27258a90c75983fddcc1d00c9538af2dfccc219a;p=tt-rss.git

i18nize tag cloud, update translations
---

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index e8ee713b..ce423b61 100644
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 5e728d52..b6c66eaa 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-05-15 14:20+0400\n"
+"POT-Creation-Date: 2007-05-17 21:24+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -136,164 +136,152 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2110 functions.php:2149 functions.php:2446 functions.php:3142
-#: functions.php:3172 modules/pref-feeds.php:871
+#: functions.php:2142 functions.php:2181 functions.php:2478 functions.php:3185
+#: functions.php:3215 modules/pref-feeds.php:871
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2139 functions.php:2993
+#: functions.php:2171 functions.php:3033
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2141 functions.php:3019
+#: functions.php:2173 functions.php:3059
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2159 functions.php:2468 functions.php:3003
+#: functions.php:2191 functions.php:2500 functions.php:3043
 msgid "Starred articles"
 msgstr "Отмеченные статьи"
 
-#: functions.php:2432
-msgid "Global search results"
+#: functions.php:2464 functions.php:2466
+msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2434
-msgid "Tag search results"
-msgstr "Результаты поиска"
-
-#: functions.php:2450
-msgid "Category search results"
-msgstr "Результаты поиска"
-
-#: functions.php:2463
-msgid "Feed search results"
-msgstr "Результаты поиска"
-
-#: functions.php:2476
-msgid "Label search results"
-msgstr "Результаты поиска"
+#: functions.php:2482 functions.php:2495 functions.php:2508
+msgid "Searched for"
+msgstr "Поиск"
 
-#: functions.php:2671
+#: functions.php:2696
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:2715
+#: functions.php:2740
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:2717
+#: functions.php:2742
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:2900 functions.php:2929 modules/pref-feeds.php:615
+#: functions.php:2925 functions.php:2960 modules/pref-feeds.php:615
 #: modules/pref-feeds.php:836 modules/pref-filters.php:255
 #: modules/pref-labels.php:234 modules/pref-users.php:208
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:2901 functions.php:2930 modules/pref-feeds.php:616
+#: functions.php:2926 functions.php:2961 modules/pref-feeds.php:616
 #: modules/pref-feeds.php:837 modules/pref-filters.php:256
 #: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "Все"
 
-#: functions.php:2902 functions.php:2906 functions.php:2931 functions.php:2934
+#: functions.php:2927 functions.php:2931 functions.php:2962 functions.php:2965
 #: tt-rss.php:168
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:2903 functions.php:2932 modules/pref-feeds.php:617
+#: functions.php:2928 functions.php:2963 modules/pref-feeds.php:617
 #: modules/pref-feeds.php:838 modules/pref-filters.php:257
 #: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:2907 functions.php:2935 tt-rss.php:167
+#: functions.php:2932 functions.php:2966 tt-rss.php:167
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:2909
+#: functions.php:2934
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:2910
+#: functions.php:2935
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:2911
+#: functions.php:2936
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:2916
+#: functions.php:2941
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:2917
+#: functions.php:2942
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:2918
+#: functions.php:2943
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:2934
+#: functions.php:2951 functions.php:2977
+msgid "Convert to label"
+msgstr "Превратить в метку"
+
+#: functions.php:2965
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:2937
+#: functions.php:2968
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:2938
+#: functions.php:2969
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:2939 modules/pref-filters.php:263
+#: functions.php:2970 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:2948
-msgid "Convert to Label"
-msgstr "Превратить в метку"
-
-#: functions.php:2975
+#: functions.php:3015
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3212
+#: functions.php:3255
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:3229
+#: functions.php:3272
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:3439
+#: functions.php:3490
 msgid " - by "
 msgstr ", автор - "
 
-#: functions.php:3481
+#: functions.php:3532
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:3494
+#: functions.php:3545
 msgid "Tags:"
 msgstr "Теги:"
 
-#: functions.php:3546
+#: functions.php:3599
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:3599
+#: functions.php:3652
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:3797
+#: functions.php:3854
 msgid "No articles found."
 msgstr "Статей не найдено."
 
@@ -301,11 +289,11 @@ msgstr "Статей не найдено."
 msgid "display feeds"
 msgstr "показать каналы"
 
-#: localized_js.php:33 tt-rss.php:125
+#: localized_js.php:33
 msgid "display tags"
 msgstr "показать теги"
 
-#: localized_js.php:34 prefs.php:122 tt-rss.php:79
+#: localized_js.php:34 prefs.php:124 tt-rss.php:79
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
@@ -541,35 +529,35 @@ msgstr "Привет,"
 msgid "Logout"
 msgstr "Выход"
 
-#: prefs.php:97
+#: prefs.php:98
 msgid "Exit preferences"
 msgstr "Закрыть настройки"
 
-#: prefs.php:103 tt-rss.php:136
+#: prefs.php:104 tt-rss.php:136
 msgid "Preferences"
 msgstr "Настройки"
 
-#: prefs.php:105
+#: prefs.php:106
 msgid "My Feeds"
 msgstr "Мои каналы"
 
-#: prefs.php:108
+#: prefs.php:109
 msgid "Other Feeds"
 msgstr "Другие каналы"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Content Filtering"
 msgstr "Фильтры"
 
-#: prefs.php:114
+#: prefs.php:115
 msgid "Label Editor"
 msgstr "Метки"
 
-#: prefs.php:118
+#: prefs.php:119
 msgid "User Manager"
 msgstr "Пользователи"
 
-#: prefs.php:125 tt-rss.php:82
+#: prefs.php:127 tt-rss.php:82
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -636,6 +624,10 @@ msgstr ""
 msgid "Fatal Error"
 msgstr ""
 
+#: tt-rss.php:125
+msgid "tag cloud"
+msgstr ""
+
 #: tt-rss.php:134
 msgid "Actions..."
 msgstr "Действия..."
@@ -946,7 +938,7 @@ msgstr "Ошибки обновления"
 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не было обновлены из-за ошибок:"
 
-#: modules/popup-dialog.php:348
+#: modules/popup-dialog.php:348 modules/popup-dialog.php:431
 msgid "Close"
 msgstr "Закрыть"
 
@@ -968,6 +960,18 @@ msgstr "Добавить существуюший тег:"
 msgid "Save"
 msgstr "Сохранить"
 
+#: modules/popup-dialog.php:416
+msgid "Tag cloud"
+msgstr ""
+
+#: modules/popup-dialog.php:419
+msgid "Showing most popular tags for the last month"
+msgstr ""
+
+#: modules/popup-dialog.php:420
+msgid "browse all"
+msgstr ""
+
 #: modules/pref-feed-browser.php:77
 msgid ""
 "This panel shows feeds subscribed by other users of this system, just in "
@@ -1325,6 +1329,18 @@ msgstr "Подробнее..."
 msgid "Reset password"
 msgstr "Сбросить пароль"
 
+#~ msgid "Global search results"
+#~ msgstr "Результаты поиска"
+
+#~ msgid "Category search results"
+#~ msgstr "Результаты поиска"
+
+#~ msgid "Feed search results"
+#~ msgstr "Результаты поиска"
+
+#~ msgid "Label search results"
+#~ msgstr "Результаты поиска"
+
 #~ msgid "<b>Warning:</b> Please backup your database before proceeding."
 #~ msgstr "<b>Внимание:</b> Сохраните базу данных перед продолжением."
 
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 4aa498cb..98e27a6b 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -413,11 +413,11 @@
 		}
 
 		if ($id == "printTagCloud") {
-			print "<div id=\"infoBoxTitle\">".__('Tag Cloud')."</div>";
+			print "<div id=\"infoBoxTitle\">".__('Tag cloud')."</div>";
 			print "<div class=\"infoBoxContents\">";
 
-			print "Showing most popular tags for the last month (<a 
-				href='javascript:toggleTags(true)'>browse all</a>):<br/>";
+			print __("Showing most popular tags for the last month")." (<a 
+				href='javascript:toggleTags(true)'>".__('browse all')."</a>):<br/>";
 
 			print "<div class=\"tagCloudContainer\">";