update translations

2 files changed, 159 insertions, 106 deletions

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 4a073d7f2..a3b62af66 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 fabd8a521..a0486d1a2 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: 2008-08-06 16:43+0400\n"
+"POT-Creation-Date: 2008-08-07 16:13+0400\n"
 "PO-Revision-Date: 2007-08-18 15:14+0400\n"
 "Last-Translator: Andrew Dolgov <[email protected]>\n"
 "Language-Team: Русский <[email protected]>\n"
@@ -191,7 +191,7 @@ msgid "Starred articles"
 msgstr "Отмеченные"
 
 #: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1154
 msgid "Published articles"
 msgstr "Опубликованные"
 
@@ -201,12 +201,12 @@ msgid "Fresh articles"
 msgstr "Отмеченные"
 
 #: functions.php:2856 modules/popup-dialog.php:175
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:356
 msgid "All feeds"
 msgstr "Все каналы"
 
 #: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:988
+#: functions.php:4348 modules/pref-feeds.php:985
 msgid "Uncategorized"
 msgstr "Нет категории"
 
@@ -228,15 +228,15 @@ msgid "Searched for"
 msgstr "Поиск"
 
 #: functions.php:3945 functions.php:3994 functions.php:5216
-#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
-#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-feeds.php:766 modules/pref-feeds.php:947
+#: modules/pref-filters.php:308 modules/pref-labels.php:275
 #: modules/pref-users.php:302
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
-#: modules/pref-feeds.php:951 modules/pref-filters.php:306
-#: modules/pref-labels.php:272 modules/pref-users.php:303
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:767
+#: modules/pref-feeds.php:948 modules/pref-filters.php:309
+#: modules/pref-labels.php:276 modules/pref-users.php:303
 msgid "All"
 msgstr "Все"
 
@@ -245,13 +245,13 @@ msgstr "Все"
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
-#: modules/pref-feeds.php:952 modules/pref-filters.php:307
-#: modules/pref-labels.php:273 modules/pref-users.php:304
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:768
+#: modules/pref-feeds.php:949 modules/pref-filters.php:310
+#: modules/pref-labels.php:277 modules/pref-users.php:304
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1108
 msgid "Actions..."
 msgstr "Действия..."
 
@@ -299,7 +299,7 @@ msgid "Page"
 msgstr "Страница"
 
 #: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
-#: modules/pref-filters.php:342
+#: modules/pref-filters.php:345
 msgid "Feed"
 msgstr "Канал"
 
@@ -383,6 +383,55 @@ msgstr "Статей не найдено."
 msgid "No articles found to display."
 msgstr "Статей не найдено."
 
+#: functions.php:5651
+#, fuzzy
+msgid "Match "
+msgstr "Искать"
+
+#: functions.php:5659
+#, fuzzy
+msgid "Unread articles"
+msgstr "Отмеченные"
+
+#: functions.php:5660
+#, fuzzy
+msgid "Updated articles"
+msgstr "Отмеченные"
+
+#: functions.php:5661
+#, fuzzy
+msgid "Title contains"
+msgstr "Заголовок или содержимое"
+
+#: functions.php:5662
+#, fuzzy
+msgid "Content contains"
+msgstr "Фильтры"
+
+#: functions.php:5663
+msgid "Score equals"
+msgstr ""
+
+#: functions.php:5664
+msgid "Score is greater than"
+msgstr ""
+
+#: functions.php:5665
+msgid "Score is less than"
+msgstr ""
+
+#: functions.php:5666
+msgid "Articles newer than X hours"
+msgstr ""
+
+#: functions.php:5667
+msgid "Articles newer than X days"
+msgstr ""
+
+#: functions.php:5676
+msgid "Add"
+msgstr ""
+
 #: localized_js.php:35
 msgid "display feeds"
 msgstr "показать каналы"
@@ -391,7 +440,7 @@ msgstr "показать каналы"
 msgid "display tags"
 msgstr "показать теги"
 
-#: localized_js.php:37 prefs.php:65 prefs.php:150 tt-rss.php:66
+#: localized_js.php:37 prefs.php:65 prefs.php:151 tt-rss.php:66
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
@@ -755,7 +804,7 @@ msgid "Rescoring articles..."
 msgstr "Отмеченные"
 
 #: localized_schema.php:9 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:960 modules/pref-feeds.php:1021
 msgid "Title"
 msgstr "Заголовок"
 
@@ -1101,7 +1150,7 @@ msgstr "Расширение DOMXML не найдено. Оно необходи
 msgid "Return to preferences"
 msgstr "Вернуться к настройкам"
 
-#: prefs.php:73 prefs.php:153 tt-rss.php:74
+#: prefs.php:73 prefs.php:154 tt-rss.php:74
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -1239,8 +1288,8 @@ msgid "tag cloud"
 msgstr "облако тегов"
 
 #: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
-#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:862
+#: modules/pref-filters.php:251 modules/pref-labels.php:239
 #: modules/pref-users.php:258
 msgid "Search"
 msgstr "Поиск"
@@ -1395,7 +1444,7 @@ msgid "Help topic not found."
 msgstr "Раздел помощи не найден."
 
 #: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
+#: modules/popup-dialog.php:547 modules/pref-feeds.php:817
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
@@ -1489,9 +1538,9 @@ msgid "Subscribe"
 msgstr "Подписаться"
 
 #: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
-#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
-#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/popup-dialog.php:279 modules/popup-dialog.php:427
+#: modules/popup-dialog.php:523 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:371 modules/pref-filters.php:132
 #: modules/pref-users.php:79
 msgid "Cancel"
 msgstr "Отмена"
@@ -1519,7 +1568,7 @@ msgid "Create Label"
 msgstr "Создать метку"
 
 #: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:278
+#: modules/pref-labels.php:282
 msgid "Caption"
 msgstr "Заголовок"
 
@@ -1528,100 +1577,100 @@ msgstr "Заголовок"
 msgid "Match SQL"
 msgstr "Искать"
 
-#: modules/popup-dialog.php:259 modules/pref-labels.php:64
+#: modules/popup-dialog.php:265 modules/pref-labels.php:68
 msgid "Help"
 msgstr "Помощь"
 
-#: modules/popup-dialog.php:262
+#: modules/popup-dialog.php:268
 msgid "Test"
 msgstr "Проверить"
 
-#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
+#: modules/popup-dialog.php:275 modules/popup-dialog.php:423
 msgid "Create"
 msgstr "Создать"
 
-#: modules/popup-dialog.php:282
+#: modules/popup-dialog.php:288
 #, fuzzy
 msgid "Create Filter"
 msgstr "Создать фильтр"
 
-#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/popup-dialog.php:306 modules/popup-dialog.php:387
 #: modules/pref-filters.php:38 modules/pref-filters.php:72
 msgid "description"
 msgstr "описание"
 
-#: modules/popup-dialog.php:351 modules/pref-filters.php:41
-#: modules/pref-filters.php:343
+#: modules/popup-dialog.php:357 modules/pref-filters.php:41
+#: modules/pref-filters.php:346
 msgid "Match"
 msgstr "Искать"
 
-#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+#: modules/popup-dialog.php:366 modules/pref-filters.php:50
 #, fuzzy
 msgid "on field"
 msgstr "По полю:"
 
-#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#: modules/popup-dialog.php:371 modules/pref-filters.php:55
 #, fuzzy
 msgid "in"
 msgstr "Ссылка"
 
-#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#: modules/popup-dialog.php:376 modules/pref-filters.php:60
 #, fuzzy
 msgid "Perform Action"
 msgstr "Применить обновления"
 
-#: modules/popup-dialog.php:386 modules/pref-filters.php:77
-msgid "with params"
+#: modules/popup-dialog.php:393 modules/pref-filters.php:80
+msgid "with parameters:"
 msgstr ""
 
-#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
-#: modules/pref-filters.php:86 modules/pref-users.php:60
+#: modules/popup-dialog.php:402 modules/pref-feeds.php:294
+#: modules/pref-filters.php:89 modules/pref-users.php:60
 #, fuzzy
 msgid "Options"
 msgstr "Дополнительно:"
 
-#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+#: modules/popup-dialog.php:408 modules/pref-filters.php:101
 msgid "Enabled"
 msgstr "Включен"
 
-#: modules/popup-dialog.php:402 modules/pref-filters.php:107
+#: modules/popup-dialog.php:411 modules/pref-filters.php:110
 msgid "Inverse match"
 msgstr "Инвертировать фильтр"
 
-#: modules/popup-dialog.php:429
+#: modules/popup-dialog.php:438
 msgid "Update Errors"
 msgstr "Ошибки обновления"
 
-#: modules/popup-dialog.php:432
+#: modules/popup-dialog.php:441
 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не было обновлены из-за ошибок:"
 
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:460
 msgid "Close"
 msgstr "Закрыть"
 
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:469
 msgid "Edit Tags"
 msgstr "Редактировать теги"
 
-#: modules/popup-dialog.php:465
+#: modules/popup-dialog.php:474
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
-#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
-#: modules/pref-filters.php:117 modules/pref-users.php:76
+#: modules/popup-dialog.php:519 modules/pref-feeds.php:369
+#: modules/pref-filters.php:128 modules/pref-users.php:76
 msgid "Save"
 msgstr "Сохранить"
 
-#: modules/popup-dialog.php:523
+#: modules/popup-dialog.php:532
 msgid "Tag cloud"
 msgstr "Облако тегов"
 
-#: modules/popup-dialog.php:526
+#: modules/popup-dialog.php:535
 msgid "Showing most popular tags "
 msgstr "Самые популярные теги "
 
-#: modules/popup-dialog.php:527
+#: modules/popup-dialog.php:536
 msgid "browse more"
 msgstr "еще"
 
@@ -1719,155 +1768,155 @@ msgstr "Включить в дайджест"
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+#: modules/pref-feeds.php:366 modules/pref-feeds.php:1115
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
+#: modules/pref-feeds.php:522 modules/pref-feeds.php:569
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:603
+#: modules/pref-feeds.php:600
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Добавлена подписка на <b>%s</b>."
 
-#: modules/pref-feeds.php:605
+#: modules/pref-feeds.php:602
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:687
+#: modules/pref-feeds.php:684
 msgid "Category editor"
 msgstr "Редактор категорий"
 
-#: modules/pref-feeds.php:710
+#: modules/pref-feeds.php:707
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Категория <b>$%s</b> уже существует."
 
-#: modules/pref-feeds.php:738
+#: modules/pref-feeds.php:735
 msgid "Unable to delete non empty feed categories."
 msgstr "Не могу удалить не пустую категорию"
 
-#: modules/pref-feeds.php:755
+#: modules/pref-feeds.php:752
 msgid "Create category"
 msgstr "Создать категорию"
 
-#: modules/pref-feeds.php:815
+#: modules/pref-feeds.php:812
 msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
-#: modules/pref-feeds.php:826 modules/pref-filters.php:128
-#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-feeds.php:823 modules/pref-filters.php:122
+#: modules/pref-filters.php:414 modules/pref-labels.php:330
 #: modules/pref-users.php:375
 msgid "Remove"
 msgstr "Удалить"
 
-#: modules/pref-feeds.php:848
+#: modules/pref-feeds.php:845
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могли быть обновлены (щелкните для подробностей)"
 
-#: modules/pref-feeds.php:870
+#: modules/pref-feeds.php:867
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: modules/pref-feeds.php:875
+#: modules/pref-feeds.php:872
 msgid "Top 25"
 msgstr "Топ 25"
 
-#: modules/pref-feeds.php:949
+#: modules/pref-feeds.php:946
 msgid "Show last article times"
 msgstr "Показать дату последней статьи"
 
-#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1025
 msgid "Last&nbsp;Article"
 msgstr "Последняя&nbsp;статья"
 
-#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1029
 msgid "Updated"
 msgstr "Обновлено"
 
-#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
-#: modules/pref-labels.php:306 modules/pref-users.php:350
+#: modules/pref-feeds.php:1050 modules/pref-filters.php:388
+#: modules/pref-labels.php:310 modules/pref-users.php:350
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1096 modules/pref-feeds.php:1110
 #, fuzzy
 msgid "Selection:"
 msgstr "Выбрать:"
 
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1102
 msgid "Recategorize"
 msgstr "Изменить категорию"
 
-#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
-#: modules/pref-labels.php:324 modules/pref-users.php:373
+#: modules/pref-feeds.php:1111 modules/pref-filters.php:412
+#: modules/pref-labels.php:328 modules/pref-users.php:373
 msgid "Edit"
 msgstr "Редактировать"
 
-#: modules/pref-feeds.php:1115
+#: modules/pref-feeds.php:1112
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1116
+#: modules/pref-feeds.php:1113
 #, fuzzy
 msgid "Clear feed data"
 msgstr "Все каналы обновлены."
 
-#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:268
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Отмеченные"
 
-#: modules/pref-feeds.php:1123
+#: modules/pref-feeds.php:1120
 #, fuzzy
 msgid "Other:"
 msgstr "Где:"
 
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1121
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1128
 msgid "OPML"
 msgstr ""
 
-#: modules/pref-feeds.php:1135
+#: modules/pref-feeds.php:1132
 #, fuzzy
 msgid "File:"
 msgstr "Заголовок:"
 
-#: modules/pref-feeds.php:1138
+#: modules/pref-feeds.php:1135
 msgid "Import"
 msgstr "Импортировать"
 
-#: modules/pref-feeds.php:1145
+#: modules/pref-feeds.php:1142
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: modules/pref-feeds.php:1148
+#: modules/pref-feeds.php:1145
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1150
+#: modules/pref-feeds.php:1147
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1151
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1160
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1170
+#: modules/pref-feeds.php:1167
 #, fuzzy
 msgid "Generate another link"
 msgstr "Создать другой адрес"
@@ -1877,55 +1926,55 @@ msgstr "Создать другой адрес"
 msgid "Filter Editor"
 msgstr "Редактор фильтров"
 
-#: modules/pref-filters.php:165
+#: modules/pref-filters.php:168
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr "Фильтр <b>%s</b> сохранен"
 
-#: modules/pref-filters.php:205
+#: modules/pref-filters.php:208
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Добавлен фильтр <b>%s</b>"
 
-#: modules/pref-filters.php:258
+#: modules/pref-filters.php:261
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: modules/pref-filters.php:331
+#: modules/pref-filters.php:334
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:335
 #, fuzzy
 msgid "action_description"
 msgstr "описание"
 
-#: modules/pref-filters.php:341
+#: modules/pref-filters.php:344
 msgid "Filter expression"
 msgstr "Выражение"
 
-#: modules/pref-filters.php:344
+#: modules/pref-filters.php:347
 msgid "Action"
 msgstr "Действие"
 
-#: modules/pref-filters.php:345
+#: modules/pref-filters.php:348
 #, fuzzy
 msgid "Params"
 msgstr "Параметры:"
 
-#: modules/pref-filters.php:374
+#: modules/pref-filters.php:377
 msgid "(Disabled)"
 msgstr "(Отключен)"
 
-#: modules/pref-filters.php:393
+#: modules/pref-filters.php:396
 msgid "(Inverse)"
 msgstr "(Инвертирован)"
 
-#: modules/pref-filters.php:419
+#: modules/pref-filters.php:422
 msgid "No filters defined."
 msgstr "Фильтры отсутствуют."
 
-#: modules/pref-filters.php:421
+#: modules/pref-filters.php:424
 #, fuzzy
 msgid "No matching filters found."
 msgstr "Статей не найдено."
@@ -1937,34 +1986,38 @@ msgid ""
 "functionality."
 msgstr ""
 
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:99
+msgid "Error: SQL expression is blank."
+msgstr ""
+
+#: modules/pref-labels.php:179
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr "Метка <b>%s</b> сохранена"
 
-#: modules/pref-labels.php:207
+#: modules/pref-labels.php:211
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Добавлена метка <b>%s</b>"
 
-#: modules/pref-labels.php:245
+#: modules/pref-labels.php:249
 msgid "Create label"
 msgstr "Создать метку"
 
-#: modules/pref-labels.php:279
+#: modules/pref-labels.php:283
 msgid "SQL Expression"
 msgstr "SQL выражение"
 
-#: modules/pref-labels.php:304
+#: modules/pref-labels.php:308
 #, fuzzy
 msgid "[No caption]"
 msgstr "Заголовок"
 
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:335
 msgid "No labels defined."
 msgstr "Метки отсутствуют."
 
-#: modules/pref-labels.php:333
+#: modules/pref-labels.php:337
 #, fuzzy
 msgid "No matching labels found."
 msgstr "Статей не найдено."