update translations

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 7d7be2488a620f94664e2b9b602532e66d783b93..e8ee713b823c069f5e9b94399813f5316eedd0bb 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 0a75975c5329be97c6427fa4d571e045c13cd9b6..5e728d52ccd3fd846ab0dc4099999ab9e3c90a8f 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-05-14 15:56+0400\n"
+"POT-Creation-Date: 2007-05-15 14:20+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"
@@ -16,96 +16,70 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:81 backend.php:90
+#: backend.php:82 backend.php:91
 msgid "Use default"
 msgstr "По умолчанию"
 
-#: backend.php:82
+#: backend.php:83
 msgid "Never purge"
 msgstr "Никогда"
 
-#: backend.php:83
+#: backend.php:84
 msgid "1 week old"
 msgstr "Неделя"
 
-#: backend.php:84
+#: backend.php:85
 msgid "2 weeks old"
 msgstr "Две недели"
 
-#: backend.php:85
+#: backend.php:86
 msgid "1 month old"
 msgstr "Один месяц"
 
-#: backend.php:86
+#: backend.php:87
 msgid "2 months old"
 msgstr "Два месяца"
 
-#: backend.php:87
+#: backend.php:88
 msgid "3 months old"
 msgstr "Три месяца"
 
-#: backend.php:91
+#: backend.php:92
 msgid "Disable updates"
 msgstr "Не обновлять"
 
-#: backend.php:92
+#: backend.php:93
 msgid "Each 30 minutes"
 msgstr "Каждые 30 минут"
 
-#: backend.php:93
+#: backend.php:94
 msgid "Hourly"
 msgstr "Каждый час"
 
-#: backend.php:94
+#: backend.php:95
 msgid "Each 4 hours"
 msgstr "Каждые 4 часа"
 
-#: backend.php:95
+#: backend.php:96
 msgid "Each 12 hours"
 msgstr "Каждые 12 часов"
 
-#: backend.php:96
+#: backend.php:97
 msgid "Daily"
 msgstr "Раз в день"
 
-#: backend.php:97
+#: backend.php:98
 msgid "Weekly"
 msgstr "Раз в неделю"
 
-#: backend.php:101
+#: backend.php:102
 msgid "User"
 msgstr "Пользователь"
 
-#: backend.php:102
+#: backend.php:103
 msgid "Administrator"
 msgstr "Администратор"
 
-#: backend.php:223
-msgid " - by "
-msgstr ", автор - "
-
-#: backend.php:265
-msgid "no tags"
-msgstr "нет тегов"
-
-#: backend.php:278
-msgid "Tags:"
-msgstr "Теги:"
-
-#: backend.php:337
-msgid "Feed not found."
-msgstr "Канал не найден."
-
-#: backend.php:406
-msgid ""
-"Could not display feed (query failed). Please check label match syntax or "
-"local configuration."
-msgstr ""
-
-#: backend.php:604
-msgid "No articles found."
-msgstr "Статей не найдено."
-
 #: errors.php:3
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
@@ -162,146 +136,172 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2110 functions.php:2149 functions.php:2439 functions.php:3118
-#: functions.php:3148 modules/pref-feeds.php:871
+#: functions.php:2110 functions.php:2149 functions.php:2446 functions.php:3142
+#: functions.php:3172 modules/pref-feeds.php:871
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2139 functions.php:2969
+#: functions.php:2139 functions.php:2993
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2141 functions.php:2995
+#: functions.php:2141 functions.php:3019
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2159 functions.php:2461 functions.php:2979
+#: functions.php:2159 functions.php:2468 functions.php:3003
 msgid "Starred articles"
 msgstr "Отмеченные статьи"
 
-#: functions.php:2425
+#: functions.php:2432
 msgid "Global search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2427
+#: functions.php:2434
 msgid "Tag search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2443
+#: functions.php:2450
 msgid "Category search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2456
+#: functions.php:2463
 msgid "Feed search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2469
+#: functions.php:2476
 msgid "Label search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2664
+#: functions.php:2671
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:2708
+#: functions.php:2715
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:2710
+#: functions.php:2717
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:2876 functions.php:2905 modules/pref-feeds.php:615
+#: functions.php:2900 functions.php:2929 modules/pref-feeds.php:615
 #: modules/pref-feeds.php:836 modules/pref-filters.php:255
-#: modules/pref-labels.php:229 modules/pref-users.php:208
+#: modules/pref-labels.php:234 modules/pref-users.php:208
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:2877 functions.php:2906 modules/pref-feeds.php:616
+#: functions.php:2901 functions.php:2930 modules/pref-feeds.php:616
 #: modules/pref-feeds.php:837 modules/pref-filters.php:256
-#: modules/pref-labels.php:230 modules/pref-users.php:209
+#: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "Все"
 
-#: functions.php:2878 functions.php:2882 functions.php:2907 functions.php:2910
-#: tt-rss.php:166
+#: functions.php:2902 functions.php:2906 functions.php:2931 functions.php:2934
+#: tt-rss.php:168
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:2879 functions.php:2908 modules/pref-feeds.php:617
+#: functions.php:2903 functions.php:2932 modules/pref-feeds.php:617
 #: modules/pref-feeds.php:838 modules/pref-filters.php:257
-#: modules/pref-labels.php:231 modules/pref-users.php:210
+#: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:2883 functions.php:2911 tt-rss.php:165
+#: functions.php:2907 functions.php:2935 tt-rss.php:167
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:2885
+#: functions.php:2909
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:2886
+#: functions.php:2910
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:2887
+#: functions.php:2911
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:2892
+#: functions.php:2916
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:2893
+#: functions.php:2917
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:2894
+#: functions.php:2918
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:2910
+#: functions.php:2934
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:2913
+#: functions.php:2937
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:2914
+#: functions.php:2938
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:2915 modules/pref-filters.php:263
+#: functions.php:2939 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:2924
+#: functions.php:2948
 msgid "Convert to Label"
 msgstr "Превратить в метку"
 
-#: functions.php:2951
+#: functions.php:2975
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3188
+#: functions.php:3212
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:3205
+#: functions.php:3229
 msgid "Tags"
 msgstr "Теги"
 
+#: functions.php:3439
+msgid " - by "
+msgstr ", автор - "
+
+#: functions.php:3481
+msgid "no tags"
+msgstr "нет тегов"
+
+#: functions.php:3494
+msgid "Tags:"
+msgstr "Теги:"
+
+#: functions.php:3546
+msgid "Feed not found."
+msgstr "Канал не найден."
+
+#: functions.php:3599
+msgid ""
+"Could not display feed (query failed). Please check label match syntax or "
+"local configuration."
+msgstr ""
+
+#: functions.php:3797
+msgid "No articles found."
+msgstr "Статей не найдено."
+
 #: localized_js.php:32
 msgid "display feeds"
 msgstr "показать каналы"
 
-#: localized_js.php:33 tt-rss.php:123
+#: localized_js.php:33 tt-rss.php:125
 msgid "display tags"
 msgstr "показать теги"
 
@@ -493,6 +493,18 @@ msgstr "Идет изменение e-mail..."
 msgid "No articles are selected."
 msgstr "Нет выбранных статей."
 
+#: localized_js.php:90
+msgid "Could not update headlines (missing XML object)"
+msgstr ""
+
+#: localized_js.php:91
+msgid "Could not display article (missing XML object)"
+msgstr ""
+
+#: localized_js.php:92 tt-rss.php:210 tt-rss.php:214
+msgid "No feed selected."
+msgstr "Канал не выбран."
+
 #: login_form.php:49 modules/pref-feeds.php:264 modules/pref-users.php:29
 msgid "Login:"
 msgstr "Пользователь:"
@@ -521,11 +533,11 @@ msgstr "Вернуться к настройкам"
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
-#: prefs.php:89 tt-rss.php:110
+#: prefs.php:89 tt-rss.php:112
 msgid "Hello,"
 msgstr "Привет,"
 
-#: prefs.php:90 tt-rss.php:111
+#: prefs.php:90 tt-rss.php:113
 msgid "Logout"
 msgstr "Выход"
 
@@ -533,7 +545,7 @@ msgstr "Выход"
 msgid "Exit preferences"
 msgstr "Закрыть настройки"
 
-#: prefs.php:103 tt-rss.php:134
+#: prefs.php:103 tt-rss.php:136
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -624,83 +636,79 @@ msgstr ""
 msgid "Fatal Error"
 msgstr ""
 
-#: tt-rss.php:132
+#: tt-rss.php:134
 msgid "Actions..."
 msgstr "Действия..."
 
-#: tt-rss.php:133 modules/popup-dialog.php:104 modules/popup-dialog.php:173
+#: tt-rss.php:135 modules/popup-dialog.php:104 modules/popup-dialog.php:173
 #: modules/pref-feeds.php:759
 msgid "Search"
 msgstr "Поиск"
 
-#: tt-rss.php:136
+#: tt-rss.php:138
 msgid "Feed actions:"
 msgstr "Действия над каналами:"
 
-#: tt-rss.php:137
+#: tt-rss.php:139
 msgid "&nbsp;&nbsp;Subscribe to feed"
 msgstr "&nbsp;&nbsp;Подписаться"
 
-#: tt-rss.php:138
+#: tt-rss.php:140
 msgid "&nbsp;&nbsp;Edit this feed"
 msgstr "&nbsp;&nbsp;Редактировать канал"
 
-#: tt-rss.php:139
+#: tt-rss.php:141
 msgid "&nbsp;&nbsp;Unsubscribe"
 msgstr "&nbsp;&nbsp;Отписаться"
 
-#: tt-rss.php:142
+#: tt-rss.php:144
 msgid "All feeds:"
 msgstr "Все каналы:"
 
-#: tt-rss.php:144
+#: tt-rss.php:146
 msgid "&nbsp;&nbsp;Update"
 msgstr "&nbsp;&nbsp;Обновить"
 
-#: tt-rss.php:146
+#: tt-rss.php:148
 msgid "&nbsp;&nbsp;Mark as read"
 msgstr "&nbsp;&nbsp;Пометить как прочитанные"
 
-#: tt-rss.php:147
+#: tt-rss.php:149
 msgid "&nbsp;&nbsp;(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;Спрятать прочитанные"
 
-#: tt-rss.php:149
+#: tt-rss.php:151
 msgid "Other actions:"
 msgstr "Другие действия:"
 
-#: tt-rss.php:150
+#: tt-rss.php:152
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Создать фильтр"
 
-#: tt-rss.php:156 modules/popup-dialog.php:116
+#: tt-rss.php:158 modules/popup-dialog.php:116
 msgid "Search:"
 msgstr "Искать:"
 
-#: tt-rss.php:161
+#: tt-rss.php:163
 msgid "View:"
 msgstr "Показать:"
 
-#: tt-rss.php:163
+#: tt-rss.php:165
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: tt-rss.php:164
+#: tt-rss.php:166
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: tt-rss.php:169
+#: tt-rss.php:171
 msgid "Limit:"
 msgstr "Сколько:"
 
-#: tt-rss.php:194
+#: tt-rss.php:196
 msgid "Update"
 msgstr "Обновить"
 
-#: tt-rss.php:208 tt-rss.php:212
-msgid "No feed selected."
-msgstr "Канал не выбран."
-
 #: update.php:23
 msgid "Your access level is insufficient to run this script."
 msgstr "В доступе отказано - недостаточный уровень привилегий."
@@ -878,7 +886,7 @@ msgstr "Содержимое"
 msgid "Title or content"
 msgstr "Заголовок или содержимое"
 
-#: modules/popup-dialog.php:185 modules/pref-labels.php:211
+#: modules/popup-dialog.php:185 modules/pref-labels.php:216
 msgid "Create label"
 msgstr "Создать метку"
 
@@ -1070,13 +1078,13 @@ msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
 #: modules/pref-feeds.php:719 modules/pref-feeds.php:971
-#: modules/pref-filters.php:340 modules/pref-labels.php:288
+#: modules/pref-filters.php:340 modules/pref-labels.php:293
 #: modules/pref-users.php:317
 msgid "Edit"
 msgstr "Редактировать"
 
 #: modules/pref-feeds.php:721 modules/pref-filters.php:342
-#: modules/pref-labels.php:290 modules/pref-users.php:319
+#: modules/pref-labels.php:295 modules/pref-users.php:319
 msgid "Remove"
 msgstr "Удалить"
 
@@ -1162,25 +1170,25 @@ msgstr "(Инвертирован)"
 msgid "No filters defined."
 msgstr "Фильтры отсутствуют."
 
-#: modules/pref-labels.php:158
+#: modules/pref-labels.php:163
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr "Метка <b>%s</b> сохранена"
 
-#: modules/pref-labels.php:189
+#: modules/pref-labels.php:194
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Добавлена метка <b>%s</b>"
 
-#: modules/pref-labels.php:236
+#: modules/pref-labels.php:241
 msgid "Caption"
 msgstr "Заголовок"
 
-#: modules/pref-labels.php:237
+#: modules/pref-labels.php:242
 msgid "SQL Expression"
 msgstr "SQL выражение"
 
-#: modules/pref-labels.php:280 modules/pref-labels.php:293
+#: modules/pref-labels.php:285 modules/pref-labels.php:298
 msgid "No labels defined."
 msgstr "Метки отсутствуют."
 

diff --git a/localized_js.php b/localized_js.php
index 5ba06613983c582a8887c53b80cc3910947667c5..bfb60cba6a0439503ef30a6b71f66da5277c54a8 100644 (file)
--- a/localized_js.php
+++ b/localized_js.php
@@ -87,5 +87,8 @@ print T_js_decl("Reset to defaults?");
 print T_js_decl("Trying to change password...");
 print T_js_decl("Trying to change e-mail...");
 print T_js_decl("No articles are selected.");
+print T_js_decl("Could not update headlines (missing XML object)");
+print T_js_decl("Could not display article (missing XML object)");
+print T_js_decl("No feed selected.");
 
 ?>