summaryrefslogtreecommitdiff
path: root/locale/ru_RU/LC_MESSAGES/messages.po
diff options
context:
space:
mode:
Diffstat (limited to 'locale/ru_RU/LC_MESSAGES/messages.po')
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.po496
1 files changed, 270 insertions, 226 deletions
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 11a8c8eb5..0e47859a1 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: 2013-03-28 21:05+0400\n"
+"POT-Creation-Date: 2013-03-31 12:47+0400\n"
"PO-Revision-Date: 2009-05-29 14:38+0300\n"
"Last-Translator: Max Kamashev <[email protected]>\n"
"Language-Team: Русский <[email protected]>\n"
@@ -141,9 +141,9 @@ msgstr "Tiny Tiny RSS база данных обновлена."
#: register.php:336
#: register.php:346
#: register.php:358
-#: classes/handler/public.php:627
-#: classes/handler/public.php:715
-#: classes/handler/public.php:804
+#: classes/handler/public.php:625
+#: classes/handler/public.php:713
+#: classes/handler/public.php:795
msgid "Return to Tiny Tiny RSS"
msgstr "Вернуться к Tiny Tiny RSS"
@@ -255,7 +255,7 @@ msgstr "неудавшийся тест экранирования SQL, пров
#: index.php:135
#: index.php:154
-#: index.php:260
+#: index.php:264
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
@@ -263,7 +263,7 @@ msgstr "неудавшийся тест экранирования SQL, пров
#: classes/pref/feeds.php:1330
#: plugins/digest/digest_body.php:63
#: js/feedlist.js:128
-#: js/feedlist.js:421
+#: js/feedlist.js:448
#: js/functions.js:420
#: js/functions.js:814
#: js/functions.js:1250
@@ -282,8 +282,9 @@ msgstr "неудавшийся тест экранирования SQL, пров
#: js/prefs.js:1792
#: js/prefs.js:1808
#: js/tt-rss.js:475
-#: js/viewfeed.js:783
-#: js/viewfeed.js:1260
+#: js/tt-rss.js:492
+#: js/viewfeed.js:774
+#: js/viewfeed.js:1259
#: plugins/import_export/import_export.js:17
#: plugins/updater/updater.js:17
msgid "Loading, please wait..."
@@ -306,13 +307,13 @@ msgid "All Articles"
msgstr "Все статьи"
#: index.php:176
-#: include/functions.php:1941
+#: include/functions.php:1974
#: classes/feeds.php:106
msgid "Starred"
msgstr "Отмеченные"
#: index.php:177
-#: include/functions.php:1942
+#: include/functions.php:1975
#: classes/feeds.php:107
msgid "Published"
msgstr "Опубликован"
@@ -358,9 +359,13 @@ msgstr ""
msgid "Update"
msgstr "Обновить"
-#: index.php:199
-#: index.php:229
-#: include/functions.php:1932
+#: index.php:197
+msgid "Mark feed as read"
+msgstr "Отметить канал как прочитанный"
+
+#: index.php:200
+#: index.php:235
+#: include/functions.php:1964
#: include/localized_schema.php:10
#: classes/feeds.php:111
#: classes/feeds.php:136
@@ -371,94 +376,112 @@ msgstr "Обновить"
msgid "Mark as read"
msgstr "Как прочитанные"
-#: index.php:206
+#: index.php:201
+#: include/functions.php:1860
+#: include/functions.php:1972
+msgid "All articles"
+msgstr "Все статьи"
+
+#: index.php:202
+msgid "Older than one day"
+msgstr ""
+
+#: index.php:203
+msgid "Older than one week"
+msgstr ""
+
+#: index.php:204
+msgid "Older than two weeks"
+msgstr ""
+
+#: index.php:212
msgid "Communication problem with server."
msgstr ""
-#: index.php:214
+#: index.php:220
msgid "New version of Tiny Tiny RSS is available!"
msgstr "Доступная новая версия Tiny Tiny RSS!"
-#: index.php:219
+#: index.php:225
msgid "Actions..."
msgstr "Действия..."
-#: index.php:221
+#: index.php:227
#, fuzzy
msgid "Preferences..."
msgstr "Настройки"
-#: index.php:222
+#: index.php:228
msgid "Search..."
msgstr "Поиск..."
-#: index.php:223
+#: index.php:229
msgid "Feed actions:"
msgstr "Действия над каналами:"
-#: index.php:224
-#: classes/handler/public.php:557
+#: index.php:230
+#: classes/handler/public.php:555
msgid "Subscribe to feed..."
msgstr "Подписаться на канал..."
-#: index.php:225
+#: index.php:231
msgid "Edit this feed..."
msgstr "Редактировать канал..."
-#: index.php:226
+#: index.php:232
msgid "Rescore feed"
msgstr "Заново оценить канал"
-#: index.php:227
+#: index.php:233
#: classes/pref/feeds.php:716
#: classes/pref/feeds.php:1303
#: js/PrefFeedTree.js:73
msgid "Unsubscribe"
msgstr "Отписаться"
-#: index.php:228
+#: index.php:234
msgid "All feeds:"
msgstr "Все каналы:"
-#: index.php:230
+#: index.php:236
msgid "(Un)hide read feeds"
msgstr "Показать/скрыть прочитанные"
-#: index.php:231
+#: index.php:237
msgid "Other actions:"
msgstr "Другие действия:"
-#: index.php:233
+#: index.php:239
msgid "Switch to digest..."
msgstr "Перейти в дайджест..."
-#: index.php:235
+#: index.php:241
msgid "Show tag cloud..."
msgstr "Показать облако тегов..."
-#: index.php:237
-#: include/functions.php:1918
+#: index.php:242
+#: include/functions.php:1950
#, fuzzy
msgid "Toggle widescreen mode"
msgstr "Переключить изменение режима категории"
-#: index.php:239
+#: index.php:243
msgid "Select by tags..."
msgstr "Выбрать по тегам..."
-#: index.php:240
+#: index.php:244
msgid "Create label..."
msgstr "Создать метку..."
-#: index.php:241
+#: index.php:245
msgid "Create filter..."
msgstr "Создать фильтр..."
-#: index.php:242
+#: index.php:246
msgid "Keyboard shortcuts help"
msgstr "Горячие клавиши"
-#: index.php:244
+#: index.php:248
#: plugins/digest/digest_body.php:77
#: plugins/mobile/mobile-functions.php:62
#: plugins/mobile/mobile-functions.php:237
@@ -467,7 +490,7 @@ msgstr "Выход"
#: prefs.php:36
#: prefs.php:122
-#: include/functions.php:1944
+#: include/functions.php:1977
#: classes/pref/prefs.php:377
msgid "Preferences"
msgstr "Настройки"
@@ -493,8 +516,8 @@ msgid "Filters"
msgstr "Фильтры"
#: prefs.php:131
-#: include/functions.php:1135
-#: include/functions.php:1771
+#: include/functions.php:1167
+#: include/functions.php:1803
#: classes/pref/labels.php:90
#: plugins/mobile/mobile-functions.php:198
msgid "Labels"
@@ -526,12 +549,12 @@ msgid "Check availability"
msgstr "Проверить доступность"
#: register.php:228
-#: classes/handler/public.php:761
+#: classes/handler/public.php:753
msgid "Email:"
msgstr "E-mail: "
#: register.php:231
-#: classes/handler/public.php:766
+#: classes/handler/public.php:758
msgid "How much is two plus two:"
msgstr "Сколько будет, два плюс два:"
@@ -565,10 +588,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Tiny Tiny RSS база данных обновлена."
#: include/digest.php:109
-#: include/functions.php:1144
-#: include/functions.php:1672
-#: include/functions.php:1757
-#: include/functions.php:1779
+#: include/functions.php:1176
+#: include/functions.php:1704
+#: include/functions.php:1789
+#: include/functions.php:1811
#: classes/opml.php:416
#: classes/pref/feeds.php:221
msgid "Uncategorized"
@@ -586,325 +609,327 @@ msgstr[2] "Отмеченные"
msgid "No feeds found."
msgstr "Каналы не найдены."
-#: include/functions.php:709
+#: include/functions.php:722
msgid "Session failed to validate (incorrect IP)"
msgstr "Ошибка проверки сессии (некорректный IP)"
-#: include/functions.php:1133
-#: include/functions.php:1769
+#: include/functions.php:1165
+#: include/functions.php:1801
#: plugins/mobile/mobile-functions.php:171
msgid "Special"
msgstr "Особые"
-#: include/functions.php:1621
+#: include/functions.php:1653
#: classes/dlg.php:369
#: classes/pref/filters.php:382
msgid "All feeds"
msgstr "Все каналы"
-#: include/functions.php:1822
+#: include/functions.php:1854
msgid "Starred articles"
msgstr "Отмеченные"
-#: include/functions.php:1824
+#: include/functions.php:1856
msgid "Published articles"
msgstr "Опубликованные"
-#: include/functions.php:1826
+#: include/functions.php:1858
msgid "Fresh articles"
msgstr "Свежие"
-#: include/functions.php:1828
-#: include/functions.php:1939
-msgid "All articles"
-msgstr "Все статьи"
-
-#: include/functions.php:1830
+#: include/functions.php:1862
msgid "Archived articles"
msgstr "Архив статей"
-#: include/functions.php:1832
+#: include/functions.php:1864
msgid "Recently read"
msgstr ""
-#: include/functions.php:1895
+#: include/functions.php:1927
msgid "Navigation"
msgstr "Навигация"
-#: include/functions.php:1896
+#: include/functions.php:1928
#, fuzzy
msgid "Open next feed"
msgstr "Генерировать канал"
-#: include/functions.php:1897
+#: include/functions.php:1929
msgid "Open previous feed"
msgstr ""
-#: include/functions.php:1898
+#: include/functions.php:1930
#, fuzzy
msgid "Open next article"
msgstr "Показать оригинальное содержимое статьи"
-#: include/functions.php:1899
+#: include/functions.php:1931
#, fuzzy
msgid "Open previous article"
msgstr "Показать оригинальное содержимое статьи"
-#: include/functions.php:1900
+#: include/functions.php:1932
msgid "Open next article (don't scroll long articles)"
msgstr ""
-#: include/functions.php:1901
+#: include/functions.php:1933
msgid "Open previous article (don't scroll long articles)"
msgstr ""
-#: include/functions.php:1902
+#: include/functions.php:1934
msgid "Show search dialog"
msgstr "Показать диалог поиска"
-#: include/functions.php:1903
+#: include/functions.php:1935
#, fuzzy
msgid "Article"
msgstr "Все статьи"
-#: include/functions.php:1904
+#: include/functions.php:1936
msgid "Toggle starred"
msgstr "Изм. отмеченное"
-#: include/functions.php:1905
+#: include/functions.php:1937
+#: js/viewfeed.js:1920
msgid "Toggle published"
msgstr "Отметить / снять отметку"
-#: include/functions.php:1906
+#: include/functions.php:1938
+#: js/viewfeed.js:1898
msgid "Toggle unread"
msgstr "Прочитано / не прочитано"
-#: include/functions.php:1907
+#: include/functions.php:1939
msgid "Edit tags"
msgstr "Редактировать теги"
-#: include/functions.php:1908
+#: include/functions.php:1940
#, fuzzy
msgid "Dismiss selected"
msgstr "Скрыть выбранные статьи"
-#: include/functions.php:1909
+#: include/functions.php:1941
#, fuzzy
msgid "Dismiss read"
msgstr "Опубликовать"
-#: include/functions.php:1910
+#: include/functions.php:1942
#, fuzzy
msgid "Open in new window"
msgstr "Открыть статью в новом окне"
-#: include/functions.php:1911
-#: js/viewfeed.js:1897
+#: include/functions.php:1943
+#: js/viewfeed.js:1939
msgid "Mark below as read"
msgstr "Отметить статьи ниже как прочитанные"
-#: include/functions.php:1912
-#: js/viewfeed.js:1891
+#: include/functions.php:1944
+#: js/viewfeed.js:1933
msgid "Mark above as read"
msgstr "Отметить статьи выше как прочитанные"
-#: include/functions.php:1913
+#: include/functions.php:1945
#, fuzzy
msgid "Scroll down"
msgstr "Всё выполнено."
-#: include/functions.php:1914
+#: include/functions.php:1946
msgid "Scroll up"
msgstr ""
-#: include/functions.php:1915
+#: include/functions.php:1947
#, fuzzy
msgid "Select article under cursor"
msgstr "Выбрать статью под курсором мыши"
-#: include/functions.php:1916
+#: include/functions.php:1948
msgid "Email article"
msgstr "Отправить по почте"
-#: include/functions.php:1917
+#: include/functions.php:1949
#, fuzzy
msgid "Close/collapse article"
msgstr "Закрыть статью"
-#: include/functions.php:1919
+#: include/functions.php:1951
#: plugins/embed_original/init.php:33
#, fuzzy
msgid "Toggle embed original"
msgstr "Переключить изменение режима категории"
-#: include/functions.php:1920
+#: include/functions.php:1952
#, fuzzy
msgid "Article selection"
msgstr "Инвертировать выделение"
-#: include/functions.php:1921
+#: include/functions.php:1953
msgid "Select all articles"
msgstr "Выбрать все статьи"
-#: include/functions.php:1922
+#: include/functions.php:1954
#, fuzzy
msgid "Select unread"
msgstr "Выбрать непрочитанные статьи"
-#: include/functions.php:1923
+#: include/functions.php:1955
#, fuzzy
msgid "Select starred"
msgstr "Отметить"
-#: include/functions.php:1924
+#: include/functions.php:1956
#, fuzzy
msgid "Select published"
msgstr "Выбрать непрочитанные статьи"
-#: include/functions.php:1925
+#: include/functions.php:1957
#, fuzzy
msgid "Invert selection"
msgstr "Инвертировать выделение"
-#: include/functions.php:1926
+#: include/functions.php:1958
#, fuzzy
msgid "Deselect everything"
msgstr "Очистить выделение статей"
-#: include/functions.php:1927
+#: include/functions.php:1959
#: classes/pref/feeds.php:520
#: classes/pref/feeds.php:753
msgid "Feed"
msgstr "Канал"
-#: include/functions.php:1928
+#: include/functions.php:1960
#, fuzzy
msgid "Refresh current feed"
msgstr "Обновить активный канал"
-#: include/functions.php:1929
+#: include/functions.php:1961
#, fuzzy
msgid "Un/hide read feeds"
msgstr "Показать/скрыть прочитанные"
-#: include/functions.php:1930
+#: include/functions.php:1962
#: classes/pref/feeds.php:1274
msgid "Subscribe to feed"
msgstr "Подписаться на канал"
-#: include/functions.php:1931
+#: include/functions.php:1963
#: js/FeedTree.js:135
#: js/PrefFeedTree.js:67
msgid "Edit feed"
msgstr "Редактировать канал"
-#: include/functions.php:1933
+#: include/functions.php:1965
#, fuzzy
msgid "Reverse headlines"
msgstr "Обратный порядок заголовков"
-#: include/functions.php:1934
+#: include/functions.php:1966
#, fuzzy
msgid "Debug feed update"
msgstr "Все каналы обновлены."
-#: include/functions.php:1935
+#: include/functions.php:1967
#: js/FeedTree.js:178
msgid "Mark all feeds as read"
msgstr "Отметить все каналы как прочитанные"
-#: include/functions.php:1936
+#: include/functions.php:1968
#, fuzzy
msgid "Un/collapse current category"
msgstr "Щёлкните, чтобы развернуть категорию"
-#: include/functions.php:1937
+#: include/functions.php:1969
#, fuzzy
msgid "Toggle combined mode"
msgstr "Переключить изменение режима категории"
-#: include/functions.php:1938
+#: include/functions.php:1970
+#, fuzzy
+msgid "Toggle auto expand in combined mode"
+msgstr "Переключить изменение режима категории"
+
+#: include/functions.php:1971
#, fuzzy
msgid "Go to"
msgstr "Перейти к.."
-#: include/functions.php:1940
+#: include/functions.php:1973
#, fuzzy
msgid "Fresh"
msgstr "Обновить"
-#: include/functions.php:1943
+#: include/functions.php:1976
msgid "Tag cloud"
msgstr "Облако тегов"
-#: include/functions.php:1945
+#: include/functions.php:1978
#, fuzzy
msgid "Other"
msgstr "Другой:"
-#: include/functions.php:1946
+#: include/functions.php:1979
#: classes/pref/labels.php:281
msgid "Create label"
msgstr "Создать метку"
-#: include/functions.php:1947
+#: include/functions.php:1980
#: classes/pref/filters.php:606
msgid "Create filter"
msgstr "Создать фильтр"
-#: include/functions.php:1948
+#: include/functions.php:1981
#, fuzzy
msgid "Un/collapse sidebar"
msgstr "Развернуть боковую панель"
-#: include/functions.php:1949
+#: include/functions.php:1982
#, fuzzy
msgid "Show help dialog"
msgstr "Показать диалог поиска"
-#: include/functions.php:2441
+#: include/functions.php:2467
#, fuzzy, php-format
msgid "Search results: %s"
msgstr "Результаты поиска"
-#: include/functions.php:2932
-#: js/viewfeed.js:1984
+#: include/functions.php:2958
+#: js/viewfeed.js:2026
msgid "Click to play"
msgstr "Щёлкните для проигрывания"
-#: include/functions.php:2933
-#: js/viewfeed.js:1983
+#: include/functions.php:2959
+#: js/viewfeed.js:2025
msgid "Play"
msgstr "Играть"
-#: include/functions.php:3050
+#: include/functions.php:3076
msgid " - "
msgstr " - "
-#: include/functions.php:3072
-#: include/functions.php:3366
-#: classes/rpc.php:359
+#: include/functions.php:3098
+#: include/functions.php:3392
+#: classes/rpc.php:408
msgid "no tags"
msgstr "нет тегов"
-#: include/functions.php:3082
+#: include/functions.php:3108
#: classes/feeds.php:682
msgid "Edit tags for this article"
msgstr "Редактировать теги статьи"
-#: include/functions.php:3111
+#: include/functions.php:3137
#: classes/feeds.php:638
msgid "Originally from:"
msgstr "Оригинал:"
-#: include/functions.php:3124
+#: include/functions.php:3150
#: classes/feeds.php:651
#: classes/pref/feeds.php:539
#, fuzzy
msgid "Feed URL"
msgstr "Канал"
-#: include/functions.php:3155
+#: include/functions.php:3181
#: classes/dlg.php:43
#: classes/dlg.php:162
#: classes/dlg.php:185
@@ -921,22 +946,22 @@ msgstr "Канал"
#: classes/pref/feeds.php:1659
#: plugins/import_export/init.php:409
#: plugins/import_export/init.php:432
-#: plugins/googlereaderimport/init.php:137
+#: plugins/googlereaderimport/init.php:164
#: plugins/share/init.php:67
#: plugins/updater/init.php:357
msgid "Close this window"
msgstr "Закрыть это окно"
-#: include/functions.php:3391
+#: include/functions.php:3417
#, fuzzy
msgid "(edit note)"
msgstr "править заметку"
-#: include/functions.php:3624
+#: include/functions.php:3650
msgid "unknown type"
msgstr "неизвестный тип"
-#: include/functions.php:3680
+#: include/functions.php:3706
#, fuzzy
msgid "Attachments"
msgstr "Вложения:"
@@ -970,7 +995,7 @@ msgid "Set starred"
msgstr "Отметить"
#: include/localized_schema.php:12
-#: js/viewfeed.js:480
+#: js/viewfeed.js:483
#: plugins/digest/digest.js:265
#: plugins/digest/digest.js:754
msgid "Publish article"
@@ -981,7 +1006,7 @@ msgid "Assign tags"
msgstr "Применить теги"
#: include/localized_schema.php:14
-#: js/viewfeed.js:1948
+#: js/viewfeed.js:1990
msgid "Assign label"
msgstr "Применить метку"
@@ -1194,14 +1219,14 @@ msgid "Select theme"
msgstr "Выбор темы"
#: include/login_form.php:183
-#: classes/handler/public.php:462
-#: classes/handler/public.php:756
+#: classes/handler/public.php:460
+#: classes/handler/public.php:748
#: plugins/mobile/login_form.php:40
msgid "Login:"
msgstr "Логин:"
#: include/login_form.php:192
-#: classes/handler/public.php:465
+#: classes/handler/public.php:463
#: plugins/mobile/login_form.php:45
msgid "Password:"
msgstr "Пароль:"
@@ -1212,7 +1237,7 @@ msgid "I forgot my password"
msgstr "Некорректное имя пользователя или пароль"
#: include/login_form.php:201
-#: classes/handler/public.php:468
+#: classes/handler/public.php:466
msgid "Language:"
msgstr "Язык:"
@@ -1236,7 +1261,7 @@ msgid "Remember me"
msgstr ""
#: include/login_form.php:235
-#: classes/handler/public.php:478
+#: classes/handler/public.php:476
#: plugins/mobile/login_form.php:28
msgid "Log in"
msgstr "Войти"
@@ -1245,17 +1270,17 @@ msgstr "Войти"
msgid "Article not found."
msgstr "Статья не найдена"
-#: classes/handler/public.php:403
+#: classes/handler/public.php:401
#: plugins/bookmarklets/init.php:38
#, fuzzy
msgid "Share with Tiny Tiny RSS"
msgstr "Вернуться к Tiny Tiny RSS"
-#: classes/handler/public.php:411
+#: classes/handler/public.php:409
msgid "Title:"
msgstr "Заголовок:"
-#: classes/handler/public.php:413
+#: classes/handler/public.php:411
#: classes/dlg.php:663
#: classes/pref/feeds.php:537
#: classes/pref/feeds.php:768
@@ -1263,26 +1288,26 @@ msgstr "Заголовок:"
msgid "URL:"
msgstr "URL:"
-#: classes/handler/public.php:415
+#: classes/handler/public.php:413
#, fuzzy
msgid "Content:"
msgstr "Содержимое"
-#: classes/handler/public.php:417
+#: classes/handler/public.php:415
#, fuzzy
msgid "Labels:"
msgstr "Метки"
-#: classes/handler/public.php:436
+#: classes/handler/public.php:434
msgid "Shared article will appear in the Published feed."
msgstr ""
-#: classes/handler/public.php:438
+#: classes/handler/public.php:436
msgid "Share"
msgstr ""
-#: classes/handler/public.php:439
-#: classes/handler/public.php:481
+#: classes/handler/public.php:437
+#: classes/handler/public.php:479
#: classes/dlg.php:296
#: classes/dlg.php:348
#: classes/dlg.php:408
@@ -1304,96 +1329,91 @@ msgstr ""
msgid "Cancel"
msgstr "Отмена"
-#: classes/handler/public.php:460
+#: classes/handler/public.php:458
#, fuzzy
msgid "Not logged in"
msgstr "Последний вход"
-#: classes/handler/public.php:527
+#: classes/handler/public.php:525
msgid "Incorrect username or password"
msgstr "Некорректное имя пользователя или пароль"
-#: classes/handler/public.php:563
-#: classes/handler/public.php:660
+#: classes/handler/public.php:561
+#: classes/handler/public.php:658
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "Канал <b>%s</b> уже подписан."
-#: classes/handler/public.php:566
-#: classes/handler/public.php:651
+#: classes/handler/public.php:564
+#: classes/handler/public.php:649
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Добавлена подписка на <b>%s</b>."
-#: classes/handler/public.php:569
-#: classes/handler/public.php:654
+#: classes/handler/public.php:567
+#: classes/handler/public.php:652
#, fuzzy, php-format
msgid "Could not subscribe to <b>%s</b>."
msgstr "Канал <b>%s</b> уже подписан."
-#: classes/handler/public.php:572
-#: classes/handler/public.php:657
+#: classes/handler/public.php:570
+#: classes/handler/public.php:655
#, fuzzy, php-format
msgid "No feeds found in <b>%s</b>."
msgstr "Каналы не найдены."
-#: classes/handler/public.php:575
-#: classes/handler/public.php:663
+#: classes/handler/public.php:573
+#: classes/handler/public.php:661
#, fuzzy
msgid "Multiple feed URLs found."
msgstr "Опубликованный URL канала изменён."
-#: classes/handler/public.php:579
-#: classes/handler/public.php:668
+#: classes/handler/public.php:577
+#: classes/handler/public.php:666
#, fuzzy, php-format
msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
msgstr "Канал <b>%s</b> уже подписан."
-#: classes/handler/public.php:597
-#: classes/handler/public.php:686
+#: classes/handler/public.php:595
+#: classes/handler/public.php:684
#, fuzzy
msgid "Subscribe to selected feed"
msgstr "Отписаться от выбранных каналов?"
-#: classes/handler/public.php:622
-#: classes/handler/public.php:710
+#: classes/handler/public.php:620
+#: classes/handler/public.php:708
msgid "Edit subscription options"
msgstr "Редактировать опции подписки"
-#: classes/handler/public.php:739
+#: classes/handler/public.php:735
#, fuzzy
msgid "Password recovery"
msgstr "Пароль"
-#: classes/handler/public.php:748
+#: classes/handler/public.php:741
msgid "You will need to provide valid account name and email. New password will be sent on your email address."
msgstr ""
-#: classes/handler/public.php:771
+#: classes/handler/public.php:763
#: classes/pref/users.php:378
msgid "Reset password"
msgstr "Сбросить пароль"
-#: classes/handler/public.php:782
+#: classes/handler/public.php:773
msgid "Some of the required form parameters are missing or incorrect."
msgstr ""
-#: classes/handler/public.php:786
-#: classes/handler/public.php:812
-#: classes/handler/public.php:821
+#: classes/handler/public.php:777
+#: classes/handler/public.php:803
#: plugins/digest/digest_body.php:69
#, fuzzy
msgid "Go back"
msgstr "Переместить назад"
-#: classes/handler/public.php:808
+#: classes/handler/public.php:799
msgid "Sorry, login and email combination not found."
msgstr ""
-#: classes/handler/public.php:818
-msgid "Form secret key incorrect. Please enable cookies and try again."
-msgstr ""
-
#: classes/dlg.php:22
msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
msgstr "Если вы импортировали метки или фильтры, вам возможно придется перезагрузить настройки чтобы увидеть новые данные."
@@ -1923,7 +1943,7 @@ msgid "Error: please upload OPML file."
msgstr "Ошибка: пожалуйста загрузите OPML файл."
#: classes/opml.php:475
-#: plugins/googlereaderimport/init.php:130
+#: plugins/googlereaderimport/init.php:157
msgid "Error while parsing document."
msgstr "Ошибка при разборе документа."
@@ -2921,29 +2941,29 @@ msgstr ""
msgid "Set value"
msgstr "Отметить"
-#: plugins/googlereaderimport/init.php:70
+#: plugins/googlereaderimport/init.php:72
#, fuzzy
msgid "No file uploaded."
msgstr "Нет файла OPML для загрузки."
-#: plugins/googlereaderimport/init.php:122
+#: plugins/googlereaderimport/init.php:149
#, php-format
msgid "All done. %d out of %d articles imported."
msgstr ""
-#: plugins/googlereaderimport/init.php:126
+#: plugins/googlereaderimport/init.php:153
msgid "The document has incorrect format."
msgstr ""
-#: plugins/googlereaderimport/init.php:194
+#: plugins/googlereaderimport/init.php:322
msgid "Import starred or shared items from Google Reader"
msgstr ""
-#: plugins/googlereaderimport/init.php:198
+#: plugins/googlereaderimport/init.php:326
msgid "Paste your starred.json or shared.json into the form below."
msgstr ""
-#: plugins/googlereaderimport/init.php:212
+#: plugins/googlereaderimport/init.php:340
msgid "Import my Starred items"
msgstr ""
@@ -3008,12 +3028,27 @@ msgstr "Последнее обновление:"
msgid "Start update"
msgstr "Последнее обновление:"
-#: js/feedlist.js:392
-#: js/feedlist.js:407
+#: js/feedlist.js:404
+#: js/feedlist.js:432
#: plugins/digest/digest.js:26
msgid "Mark all articles in %s as read?"
msgstr "Отметить все статьи в %s как прочитанные?"
+#: js/feedlist.js:423
+#, fuzzy
+msgid "Mark all articles in %s older than 1 day as read?"
+msgstr "Отметить все статьи в %s как прочитанные?"
+
+#: js/feedlist.js:426
+#, fuzzy
+msgid "Mark all articles in %s older than 1 week as read?"
+msgstr "Отметить все статьи в %s как прочитанные?"
+
+#: js/feedlist.js:429
+#, fuzzy
+msgid "Mark all articles in %s older than 2 weeks as read?"
+msgstr "Отметить все статьи в %s как прочитанные?"
+
#: js/functions.js:92
msgid "Are you sure to report this exception to tt-rss.org? The report will include your browser information. Your IP would be saved in the database."
msgstr ""
@@ -3125,7 +3160,7 @@ msgid "Subscription reset."
msgstr "Подписаться на канал..."
#: js/functions.js:1268
-#: js/tt-rss.js:601
+#: js/tt-rss.js:619
msgid "Unsubscribe from %s?"
msgstr "Отписаться от %s?"
@@ -3149,7 +3184,7 @@ msgstr "Попытка изменить адрес.."
#: js/functions.js:1601
#: js/tt-rss.js:396
-#: js/tt-rss.js:582
+#: js/tt-rss.js:600
msgid "You can't edit this kind of feed."
msgstr "Вы не можете редактировать этот канал."
@@ -3365,7 +3400,6 @@ msgid "Save changes to selected feeds?"
msgstr "Сохранить изменения выбранных каналов?"
#: js/prefs.js:797
-#: plugins/googlereaderimport/init.js:18
msgid "OPML Import"
msgstr "Импорт OPML"
@@ -3535,28 +3569,28 @@ msgstr "Пожалуйста выберите какой-нибудь канал
msgid "Please enable embed_original plugin first."
msgstr "Пожалуйста выберите какой-нибудь канал."
-#: js/tt-rss.js:590
+#: js/tt-rss.js:608
msgid "You can't unsubscribe from the category."
msgstr "Нельзя отписаться от категории."
-#: js/tt-rss.js:595
-#: js/tt-rss.js:751
+#: js/tt-rss.js:613
+#: js/tt-rss.js:769
msgid "Please select some feed first."
msgstr "Пожалуйста выберите какой-нибудь канал."
-#: js/tt-rss.js:746
+#: js/tt-rss.js:764
msgid "You can't rescore this kind of feed."
msgstr "Вы не можете снова оценить этот канал."
-#: js/tt-rss.js:756
+#: js/tt-rss.js:774
msgid "Rescore articles in %s?"
msgstr "Установить оценку статьям в %s?"
-#: js/tt-rss.js:759
+#: js/tt-rss.js:777
msgid "Rescoring articles..."
msgstr "Переоценка статей..."
-#: js/tt-rss.js:893
+#: js/tt-rss.js:911
#, fuzzy
msgid "New version available!"
msgstr "Доступная новая версия Tiny Tiny RSS!"
@@ -3566,43 +3600,43 @@ msgstr "Доступная новая версия Tiny Tiny RSS!"
msgid "Cancel search"
msgstr "Отмена"
-#: js/viewfeed.js:437
+#: js/viewfeed.js:440
#: plugins/digest/digest.js:258
#: plugins/digest/digest.js:714
msgid "Unstar article"
msgstr "Не отмеченные"
-#: js/viewfeed.js:442
+#: js/viewfeed.js:445
#: plugins/digest/digest.js:260
#: plugins/digest/digest.js:718
msgid "Star article"
msgstr "Отмеченные"
-#: js/viewfeed.js:475
+#: js/viewfeed.js:478
#: plugins/digest/digest.js:263
#: plugins/digest/digest.js:749
msgid "Unpublish article"
msgstr "Не публиковать"
-#: js/viewfeed.js:688
-#: js/viewfeed.js:716
-#: js/viewfeed.js:743
-#: js/viewfeed.js:805
-#: js/viewfeed.js:837
-#: js/viewfeed.js:974
-#: js/viewfeed.js:1017
-#: js/viewfeed.js:1067
-#: js/viewfeed.js:2066
+#: js/viewfeed.js:679
+#: js/viewfeed.js:707
+#: js/viewfeed.js:734
+#: js/viewfeed.js:797
+#: js/viewfeed.js:831
+#: js/viewfeed.js:968
+#: js/viewfeed.js:1011
+#: js/viewfeed.js:1064
+#: js/viewfeed.js:2108
#: plugins/mailto/init.js:7
#: plugins/mail/mail.js:7
msgid "No articles are selected."
msgstr "Нет выбранных статей."
-#: js/viewfeed.js:954
+#: js/viewfeed.js:948
msgid "Mark all visible articles in %s as read?"
msgstr "Отметить все видимые статьи в %s как прочитанные?"
-#: js/viewfeed.js:982
+#: js/viewfeed.js:976
#, fuzzy
msgid "Delete %d selected article in %s?"
msgid_plural "Delete %d selected articles in %s?"
@@ -3610,7 +3644,7 @@ msgstr[0] "Отметить %d выбранные статьи в %s как пр
msgstr[1] "Отметить %d выбранные статьи в %s как прочитанные?"
msgstr[2] "Отметить %d выбранные статьи в %s как прочитанные?"
-#: js/viewfeed.js:984
+#: js/viewfeed.js:978
#, fuzzy
msgid "Delete %d selected article?"
msgid_plural "Delete %d selected articles?"
@@ -3618,7 +3652,7 @@ msgstr[0] "Удалить %d выбранных статей?"
msgstr[1] "Удалить %d выбранных статей?"
msgstr[2] "Удалить %d выбранных статей?"
-#: js/viewfeed.js:1026
+#: js/viewfeed.js:1020
#, fuzzy
msgid "Archive %d selected article in %s?"
msgid_plural "Archive %d selected articles in %s?"
@@ -3626,7 +3660,7 @@ msgstr[0] "Архивировать %d выбранных статей в %s?"
msgstr[1] "Архивировать %d выбранных статей в %s?"
msgstr[2] "Архивировать %d выбранных статей в %s?"
-#: js/viewfeed.js:1029
+#: js/viewfeed.js:1023
#, fuzzy
msgid "Move %d archived article back?"
msgid_plural "Move %d archived articles back?"
@@ -3634,7 +3668,11 @@ msgstr[0] "Переместить %d архивированных статей �
msgstr[1] "Переместить %d архивированных статей назад?"
msgstr[2] "Переместить %d архивированных статей назад?"
-#: js/viewfeed.js:1073
+#: js/viewfeed.js:1025
+msgid "Please note that unstarred articles might get purged on next feed update."
+msgstr ""
+
+#: js/viewfeed.js:1070
#, fuzzy
msgid "Mark %d selected article in %s as read?"
msgid_plural "Mark %d selected articles in %s as read?"
@@ -3642,23 +3680,23 @@ msgstr[0] "Отметить %d выбранные статьи в %s как пр
msgstr[1] "Отметить %d выбранные статьи в %s как прочитанные?"
msgstr[2] "Отметить %d выбранные статьи в %s как прочитанные?"
-#: js/viewfeed.js:1097
+#: js/viewfeed.js:1094
msgid "Edit article Tags"
msgstr "Редактировать теги"
-#: js/viewfeed.js:1103
+#: js/viewfeed.js:1100
msgid "Saving article tags..."
msgstr "Сохранить теги статьи..."
-#: js/viewfeed.js:1338
+#: js/viewfeed.js:1337
msgid "No article is selected."
msgstr "Статья не выбрана"
-#: js/viewfeed.js:1373
+#: js/viewfeed.js:1372
msgid "No articles found to mark"
msgstr "Статей для отметки не найдено."
-#: js/viewfeed.js:1375
+#: js/viewfeed.js:1374
#, fuzzy
msgid "Mark %d article as read?"
msgid_plural "Mark %d articles as read?"
@@ -3666,38 +3704,43 @@ msgstr[0] "Отметить %d статью(ей) как прочитанные?
msgstr[1] "Отметить %d статью(ей) как прочитанные?"
msgstr[2] "Отметить %d статью(ей) как прочитанные?"
-#: js/viewfeed.js:1877
+#: js/viewfeed.js:1884
msgid "Open original article"
msgstr "Показать оригинальное содержимое статьи"
-#: js/viewfeed.js:1883
+#: js/viewfeed.js:1890
#, fuzzy
msgid "Display article URL"
msgstr "показать теги"
-#: js/viewfeed.js:1953
+#: js/viewfeed.js:1909
+#, fuzzy
+msgid "Toggle marked"
+msgstr "Изм. отмеченное"
+
+#: js/viewfeed.js:1995
msgid "Remove label"
msgstr "Удалить метку"
-#: js/viewfeed.js:1977
+#: js/viewfeed.js:2019
msgid "Playing..."
msgstr "Проигрываю..."
-#: js/viewfeed.js:1978
+#: js/viewfeed.js:2020
msgid "Click to pause"
msgstr "Пауза"
-#: js/viewfeed.js:2035
+#: js/viewfeed.js:2077
#, fuzzy
msgid "Please enter new score for selected articles:"
msgstr "Пожалуйста, укажите заметку для статьи:"
-#: js/viewfeed.js:2077
+#: js/viewfeed.js:2119
#, fuzzy
msgid "Please enter new score for this article:"
msgstr "Пожалуйста, укажите заметку для статьи:"
-#: js/viewfeed.js:2110
+#: js/viewfeed.js:2152
#, fuzzy
msgid "Article URL:"
msgstr "Все статьи"
@@ -3772,6 +3815,10 @@ msgstr "Пожалуйста выберите файл."
msgid "Saving article note..."
msgstr "Сохранить теги статьи..."
+#: plugins/googlereaderimport/init.js:18
+msgid "Google Reader Import"
+msgstr ""
+
#: plugins/googlereaderimport/init.js:42
#, fuzzy
msgid "Please choose a file first."
@@ -3908,9 +3955,6 @@ msgstr ""
#~ msgid "Feed actions"
#~ msgstr "Действия над каналом"
-#~ msgid "Mark feed as read"
-#~ msgstr "Отметить канал как прочитанный"
-
#~ msgid "If viewing category, (un)collapse it"
#~ msgstr "Если котегория видна, (раз)свернуть её"