From 1e5199952845c0cff858063e262f4fdf7ff7c8f1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Sun, 30 Sep 2007 04:48:44 +0100
Subject: merge new French translation

---
 locale/ru_RU/LC_MESSAGES/messages.mo | Bin 25533 -> 25533 bytes
 locale/ru_RU/LC_MESSAGES/messages.po | 180 ++++++++++++++++++-----------------
 2 files changed, 92 insertions(+), 88 deletions(-)

(limited to 'locale/ru_RU')

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 365e7e90c..5f9561677 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 259072611..9380c8e19 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-09-25 12:10+0400\n"
+"POT-Creation-Date: 2007-09-30 11:48+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"
@@ -140,186 +140,186 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2277 functions.php:2616 functions.php:2971 functions.php:3730
+#: functions.php:2277 functions.php:2616 functions.php:2975 functions.php:3734
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:2286 functions.php:2618 functions.php:2973 functions.php:3737
+#: functions.php:2286 functions.php:2618 functions.php:2977 functions.php:3741
 #: modules/pref-feeds.php:1047
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:2295 functions.php:2620 functions.php:2975 functions.php:3715
+#: functions.php:2295 functions.php:2620 functions.php:2979 functions.php:3719
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Отмеченные"
 
-#: functions.php:2538 modules/popup-dialog.php:141
+#: functions.php:2538 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2567 functions.php:2606 functions.php:2949 functions.php:3894
-#: functions.php:3924 modules/pref-feeds.php:880
+#: functions.php:2567 functions.php:2606 functions.php:2953 functions.php:3898
+#: functions.php:3928 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2596 functions.php:3115
+#: functions.php:2596 functions.php:3119
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2598 functions.php:3117
+#: functions.php:2598 functions.php:3121
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2935 functions.php:2937
+#: functions.php:2939 functions.php:2941
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2953 functions.php:2966 functions.php:2983
+#: functions.php:2957 functions.php:2970 functions.php:2987
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:3247
+#: functions.php:3251
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:3292
+#: functions.php:3296
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:3294
+#: functions.php:3298
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:3525 functions.php:3572 functions.php:4592
+#: functions.php:3529 functions.php:3576 functions.php:4596
 #: modules/pref-feeds.php:655 modules/pref-feeds.php:842
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:3526 functions.php:3573 modules/pref-feeds.php:656
+#: functions.php:3530 functions.php:3577 modules/pref-feeds.php:656
 #: modules/pref-feeds.php:843 modules/pref-filters.php:256
 #: modules/pref-labels.php:235 modules/pref-users.php:209
 msgid "All"
 msgstr "Все"
 
-#: functions.php:3527 functions.php:3531 functions.php:3574 functions.php:3577
+#: functions.php:3531 functions.php:3535 functions.php:3578 functions.php:3581
 #: tt-rss.php:165
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3528 functions.php:3575 modules/pref-feeds.php:657
+#: functions.php:3532 functions.php:3579 modules/pref-feeds.php:657
 #: modules/pref-feeds.php:844 modules/pref-filters.php:257
 #: modules/pref-labels.php:236 modules/pref-users.php:210
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:3530
+#: functions.php:3534
 msgid "Toggle"
 msgstr "Изменить:"
 
-#: functions.php:3532 functions.php:3578 tt-rss.php:164
+#: functions.php:3536 functions.php:3582 tt-rss.php:164
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:3533
+#: functions.php:3537
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:3536 localized_schema.php:15
+#: functions.php:3540 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:3537
+#: functions.php:3541
 #, fuzzy
 msgid "Selection"
 msgstr "Выбрать:"
 
-#: functions.php:3538
+#: functions.php:3542
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:3540
+#: functions.php:3544
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3541
+#: functions.php:3545
 #, fuzzy
 msgid "Below active article"
 msgstr "Отфильтровать статью"
 
-#: functions.php:3543
+#: functions.php:3547
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:3551
+#: functions.php:3555
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:3552
+#: functions.php:3556
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:3553
+#: functions.php:3557
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:3563 functions.php:3589
+#: functions.php:3567 functions.php:3593
 msgid "Convert to label"
 msgstr "Превратить в метку"
 
-#: functions.php:3577
+#: functions.php:3581
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:3580
+#: functions.php:3584
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:3581
+#: functions.php:3585
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:3582 modules/pref-filters.php:263
+#: functions.php:3586 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:3628
+#: functions.php:3632
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3964
+#: functions.php:3968
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:3981
+#: functions.php:3985
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4206
+#: functions.php:4210
 msgid " - by "
 msgstr ", автор - "
 
-#: functions.php:4255
+#: functions.php:4259
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:4326
+#: functions.php:4330
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:4388
+#: functions.php:4392
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4655
+#: functions.php:4659
 msgid "No articles found."
 msgstr "Статей не найдено."
 
@@ -655,7 +655,7 @@ msgstr "Вы не можете редактировать этот канал."
 msgid "Erase all non-starred articles in %s?"
 msgstr "Помечаю все каналы как прочитанные..."
 
-#: localized_schema.php:9 modules/popup-dialog.php:172
+#: localized_schema.php:9 modules/popup-dialog.php:182
 #: modules/pref-feeds.php:855 modules/pref-feeds.php:916
 msgid "Title"
 msgstr "Заголовок"
@@ -668,7 +668,7 @@ msgstr "Заголовок или содержимое"
 msgid "Link"
 msgstr "Ссылка"
 
-#: localized_schema.php:12 modules/popup-dialog.php:173
+#: localized_schema.php:12 modules/popup-dialog.php:183
 msgid "Content"
 msgstr "Содержимое"
 
@@ -866,12 +866,12 @@ msgstr "Вырезать все, кроме основных HTML тегов п
 msgid "Use more accessible date/time format for headlines"
 msgstr "Использовать более удобный формат отображения даты/времени"
 
-#: login_form.php:83 modules/popup-dialog.php:90 modules/pref-feeds.php:264
+#: login_form.php:83 modules/popup-dialog.php:100 modules/pref-feeds.php:264
 #: modules/pref-users.php:29
 msgid "Login:"
 msgstr "Пользователь:"
 
-#: login_form.php:85 modules/popup-dialog.php:91 modules/pref-feeds.php:270
+#: login_form.php:85 modules/popup-dialog.php:101 modules/pref-feeds.php:270
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -1079,7 +1079,7 @@ msgstr "облако тегов"
 msgid "Actions..."
 msgstr "Действия..."
 
-#: tt-rss.php:131 modules/popup-dialog.php:117 modules/popup-dialog.php:186
+#: tt-rss.php:131 modules/popup-dialog.php:127 modules/popup-dialog.php:196
 #: modules/pref-feeds.php:749
 msgid "Search"
 msgstr "Поиск"
@@ -1125,7 +1125,7 @@ msgstr "Другие действия:"
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Создать фильтр"
 
-#: tt-rss.php:153 modules/popup-dialog.php:129
+#: tt-rss.php:153 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr "Искать:"
 
@@ -1208,8 +1208,8 @@ msgstr ""
 msgid "Help topic not found."
 msgstr "Раздел помощи не найден."
 
-#: modules/help.php:22 modules/popup-dialog.php:42
-#: modules/popup-dialog.php:448 modules/pref-feeds.php:706
+#: modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:458 modules/pref-feeds.php:706
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
@@ -1255,13 +1255,17 @@ msgid ""
 "\t\t\t\t\tstart the daemon process or contact instance owner."
 msgstr ""
 
-#: modules/popup-dialog.php:21
+#: modules/popup-dialog.php:18 modules/popup-dialog.php:42
+msgid "Last update:"
+msgstr ""
+
+#: modules/popup-dialog.php:26
 msgid ""
 "You are running the latest version of Tiny Tiny RSS. The\n"
 "\t\t\t\t\t\tfact that you are seeing this dialog is probably a bug."
 msgstr ""
 
-#: modules/popup-dialog.php:30
+#: modules/popup-dialog.php:35
 msgid ""
 "TT-RSS has detected that update daemon is taking too long to\n"
 "\t\t\t\t\tperform a feed update. This could indicate a problem like crash\n"
@@ -1269,142 +1273,142 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr ""
 
-#: modules/popup-dialog.php:51 modules/pref-feeds.php:762
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:762
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: modules/popup-dialog.php:62 modules/pref-feeds.php:165
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:165
 msgid "Feed URL:"
 msgstr "URL канала:"
 
-#: modules/popup-dialog.php:70 modules/pref-feeds.php:173
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:173
 msgid "Category:"
 msgstr "Категория:"
 
-#: modules/popup-dialog.php:101 modules/pref-feed-browser.php:107
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:107
 #: modules/pref-feeds.php:118
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: modules/popup-dialog.php:104 modules/popup-dialog.php:189
-#: modules/popup-dialog.php:241 modules/popup-dialog.php:328
-#: modules/popup-dialog.php:424 modules/pref-feeds.php:120
+#: modules/popup-dialog.php:114 modules/popup-dialog.php:199
+#: modules/popup-dialog.php:251 modules/popup-dialog.php:338
+#: modules/popup-dialog.php:434 modules/pref-feeds.php:120
 #: modules/pref-feeds.php:352 modules/pref-filters.php:118
 #: modules/pref-users.php:58
 msgid "Cancel"
 msgstr "Отмена"
 
-#: modules/popup-dialog.php:110
+#: modules/popup-dialog.php:120
 msgid "This feed requires authentication."
 msgstr "Этот канал требует авторизации."
 
-#: modules/popup-dialog.php:138
+#: modules/popup-dialog.php:148
 msgid "Where:"
 msgstr "Где:"
 
-#: modules/popup-dialog.php:154
+#: modules/popup-dialog.php:164
 msgid "This feed"
 msgstr "Этот канал"
 
-#: modules/popup-dialog.php:169
+#: modules/popup-dialog.php:179
 msgid "Match on:"
 msgstr "Искать по:"
 
-#: modules/popup-dialog.php:174
+#: modules/popup-dialog.php:184
 msgid "Title or content"
 msgstr "Заголовок или содержимое"
 
-#: modules/popup-dialog.php:198 modules/pref-labels.php:216
+#: modules/popup-dialog.php:208 modules/pref-labels.php:216
 msgid "Create label"
 msgstr "Создать метку"
 
-#: modules/popup-dialog.php:208
+#: modules/popup-dialog.php:218
 msgid "Caption:"
 msgstr "Заголовок:"
 
-#: modules/popup-dialog.php:217
+#: modules/popup-dialog.php:227
 msgid "SQL Expression:"
 msgstr "SQL выражение:"
 
-#: modules/popup-dialog.php:230
+#: modules/popup-dialog.php:240
 msgid "Test"
 msgstr "Проверить"
 
-#: modules/popup-dialog.php:237 modules/popup-dialog.php:324
+#: modules/popup-dialog.php:247 modules/popup-dialog.php:334
 msgid "Create"
 msgstr "Создать"
 
-#: modules/popup-dialog.php:250 modules/pref-filters.php:229
+#: modules/popup-dialog.php:260 modules/pref-filters.php:229
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: modules/popup-dialog.php:268 modules/popup-dialog.php:299
+#: modules/popup-dialog.php:278 modules/popup-dialog.php:309
 #: modules/pref-filters.php:40 modules/pref-filters.php:72
 msgid "description"
 msgstr "описание"
 
-#: modules/popup-dialog.php:273 modules/pref-filters.php:45
+#: modules/popup-dialog.php:283 modules/pref-filters.php:45
 msgid "Match:"
 msgstr "Поиск:"
 
-#: modules/popup-dialog.php:279 modules/pref-filters.php:51
+#: modules/popup-dialog.php:289 modules/pref-filters.php:51
 msgid "On field:"
 msgstr "По полю:"
 
-#: modules/popup-dialog.php:284 modules/pref-filters.php:56
+#: modules/popup-dialog.php:294 modules/pref-filters.php:56
 msgid "Feed:"
 msgstr "Канал:"
 
-#: modules/popup-dialog.php:290 modules/pref-filters.php:62
+#: modules/popup-dialog.php:300 modules/pref-filters.php:62
 msgid "Action:"
 msgstr "Действие:"
 
-#: modules/popup-dialog.php:306 modules/pref-filters.php:79
+#: modules/popup-dialog.php:316 modules/pref-filters.php:79
 msgid "Params:"
 msgstr "Параметры:"
 
-#: modules/popup-dialog.php:310 modules/pref-feeds.php:283
+#: modules/popup-dialog.php:320 modules/pref-feeds.php:283
 msgid "Options:"
 msgstr "Дополнительно:"
 
-#: modules/popup-dialog.php:313 modules/pref-filters.php:103
+#: modules/popup-dialog.php:323 modules/pref-filters.php:103
 msgid "Inverse match"
 msgstr "Инвертировать фильтр"
 
-#: modules/popup-dialog.php:339
+#: modules/popup-dialog.php:349
 msgid "Update Errors"
 msgstr "Ошибки обновления"
 
-#: modules/popup-dialog.php:342
+#: modules/popup-dialog.php:352
 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не было обновлены из-за ошибок:"
 
-#: modules/popup-dialog.php:361
+#: modules/popup-dialog.php:371
 msgid "Close"
 msgstr "Закрыть"
 
-#: modules/popup-dialog.php:370
+#: modules/popup-dialog.php:380
 msgid "Edit Tags"
 msgstr "Редактировать теги"
 
-#: modules/popup-dialog.php:375
+#: modules/popup-dialog.php:385
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
-#: modules/popup-dialog.php:420 modules/pref-feeds.php:350
+#: modules/popup-dialog.php:430 modules/pref-feeds.php:350
 #: modules/pref-filters.php:114 modules/pref-users.php:55
 msgid "Save"
 msgstr "Сохранить"
 
-#: modules/popup-dialog.php:433
+#: modules/popup-dialog.php:443
 msgid "Tag cloud"
 msgstr "Облако тегов"
 
-#: modules/popup-dialog.php:436
+#: modules/popup-dialog.php:446
 msgid "Showing most popular tags "
 msgstr "Самые популярные теги "
 
-#: modules/popup-dialog.php:437
+#: modules/popup-dialog.php:447
 msgid "browse more"
 msgstr "еще"
 
-- 
cgit v1.2.3