diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index f5d5d9ed9..7d7be2488 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 772ce247a..0a75975c5 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-04-18 15:46+0400\n"
+"POT-Creation-Date: 2007-05-14 15:56+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,93 +16,93 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:83 backend.php:92
+#: backend.php:81 backend.php:90
 msgid "Use default"
 msgstr "По умолчанию"
 
-#: backend.php:84
+#: backend.php:82
 msgid "Never purge"
 msgstr "Никогда"
 
-#: backend.php:85
+#: backend.php:83
 msgid "1 week old"
 msgstr "Неделя"
 
-#: backend.php:86
+#: backend.php:84
 msgid "2 weeks old"
 msgstr "Две недели"
 
-#: backend.php:87
+#: backend.php:85
 msgid "1 month old"
 msgstr "Один месяц"
 
-#: backend.php:88
+#: backend.php:86
 msgid "2 months old"
 msgstr "Два месяца"
 
-#: backend.php:89
+#: backend.php:87
 msgid "3 months old"
 msgstr "Три месяца"
 
-#: backend.php:93
+#: backend.php:91
 msgid "Disable updates"
 msgstr "Не обновлять"
 
-#: backend.php:94
+#: backend.php:92
 msgid "Each 30 minutes"
 msgstr "Каждые 30 минут"
 
-#: backend.php:95
+#: backend.php:93
 msgid "Hourly"
 msgstr "Каждый час"
 
-#: backend.php:96
+#: backend.php:94
 msgid "Each 4 hours"
 msgstr "Каждые 4 часа"
 
-#: backend.php:97
+#: backend.php:95
 msgid "Each 12 hours"
 msgstr "Каждые 12 часов"
 
-#: backend.php:98
+#: backend.php:96
 msgid "Daily"
 msgstr "Раз в день"
 
-#: backend.php:99
+#: backend.php:97
 msgid "Weekly"
 msgstr "Раз в неделю"
 
-#: backend.php:103
+#: backend.php:101
 msgid "User"
 msgstr "Пользователь"
 
-#: backend.php:104
+#: backend.php:102
 msgid "Administrator"
 msgstr "Администратор"
 
-#: backend.php:225
+#: backend.php:223
 msgid " - by "
 msgstr ", автор - "
 
-#: backend.php:267
+#: backend.php:265
 msgid "no tags"
 msgstr "нет тегов"
 
-#: backend.php:280
+#: backend.php:278
 msgid "Tags:"
 msgstr "Теги:"
 
-#: backend.php:339
+#: backend.php:337
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: backend.php:408
+#: backend.php:406
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: backend.php:606
+#: backend.php:604
 msgid "No articles found."
 msgstr "Статей не найдено."
 
@@ -162,133 +162,138 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2105 functions.php:2144 functions.php:2431 functions.php:3110
-#: functions.php:3140 modules/pref-feeds.php:857
+#: functions.php:2110 functions.php:2149 functions.php:2439 functions.php:3118
+#: functions.php:3148 modules/pref-feeds.php:871
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2134 functions.php:2961
+#: functions.php:2139 functions.php:2969
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2136 functions.php:2987
+#: functions.php:2141 functions.php:2995
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2154 functions.php:2453 functions.php:2971
+#: functions.php:2159 functions.php:2461 functions.php:2979
 msgid "Starred articles"
 msgstr "Отмеченные статьи"
 
-#: functions.php:2417
+#: functions.php:2425
 msgid "Global search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2419
+#: functions.php:2427
 msgid "Tag search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2435
+#: functions.php:2443
 msgid "Category search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2448
+#: functions.php:2456
 msgid "Feed search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2461
+#: functions.php:2469
 msgid "Label search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2656
+#: functions.php:2664
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:2700
+#: functions.php:2708
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:2702
+#: functions.php:2710
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:2868 functions.php:2897
+#: functions.php:2876 functions.php:2905 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
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:2869 functions.php:2898
+#: functions.php:2877 functions.php:2906 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
 msgid "All"
 msgstr "Все"
 
-#: functions.php:2870 functions.php:2874 functions.php:2899 functions.php:2902
-#: tt-rss.php:164
+#: functions.php:2878 functions.php:2882 functions.php:2907 functions.php:2910
+#: tt-rss.php:166
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:2871 functions.php:2900
+#: functions.php:2879 functions.php:2908 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
 msgid "None"
-msgstr "Нет"
+msgstr "Ничего"
 
-#: functions.php:2875 functions.php:2903 tt-rss.php:163
+#: functions.php:2883 functions.php:2911 tt-rss.php:165
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:2877
+#: functions.php:2885
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:2878
+#: functions.php:2886
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:2879
+#: functions.php:2887
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:2884
+#: functions.php:2892
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:2885
+#: functions.php:2893
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:2886
+#: functions.php:2894
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:2902
+#: functions.php:2910
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:2905
+#: functions.php:2913
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:2906
+#: functions.php:2914
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:2907 modules/pref-feeds.php:837 modules/pref-feeds.php:890
-#: modules/pref-filters.php:261
+#: functions.php:2915 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:2916
+#: functions.php:2924
 msgid "Convert to Label"
 msgstr "Превратить в метку"
 
-#: functions.php:2943
+#: functions.php:2951
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3180
+#: functions.php:3188
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:3197
+#: functions.php:3205
 msgid "Tags"
 msgstr "Теги"
 
@@ -296,11 +301,11 @@ msgstr "Теги"
 msgid "display feeds"
 msgstr "показать каналы"
 
-#: localized_js.php:33 tt-rss.php:121
+#: localized_js.php:33 tt-rss.php:123
 msgid "display tags"
 msgstr "показать теги"
 
-#: localized_js.php:34 prefs.php:123 tt-rss.php:77
+#: localized_js.php:34 prefs.php:122 tt-rss.php:79
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
@@ -512,70 +517,70 @@ msgstr ""
 msgid "Return to preferences"
 msgstr "Вернуться к настройкам"
 
-#: prefs.php:84
+#: prefs.php:83
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
-#: prefs.php:90 tt-rss.php:108
+#: prefs.php:89 tt-rss.php:110
 msgid "Hello,"
 msgstr "Привет,"
 
-#: prefs.php:91 tt-rss.php:109
+#: prefs.php:90 tt-rss.php:111
 msgid "Logout"
 msgstr "Выход"
 
-#: prefs.php:98
+#: prefs.php:97
 msgid "Exit preferences"
 msgstr "Закрыть настройки"
 
-#: prefs.php:104 tt-rss.php:132
+#: prefs.php:103 tt-rss.php:134
 msgid "Preferences"
 msgstr "Настройки"
 
-#: prefs.php:106
+#: prefs.php:105
 msgid "My Feeds"
 msgstr "Мои каналы"
 
-#: prefs.php:109
+#: prefs.php:108
 msgid "Other Feeds"
 msgstr "Другие каналы"
 
-#: prefs.php:112
+#: prefs.php:111
 msgid "Content Filtering"
 msgstr "Фильтры"
 
-#: prefs.php:115
+#: prefs.php:114
 msgid "Label Editor"
 msgstr "Метки"
 
-#: prefs.php:119
+#: prefs.php:118
 msgid "User Manager"
 msgstr "Пользователи"
 
-#: prefs.php:126 tt-rss.php:80
+#: prefs.php:125 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"
 "\t\tbrowser settings."
 msgstr ""
 
-#: sanity_check.php:7
+#: sanity_check.php:8
 msgid ""
 "<b>Fatal Error</b>: You forgot to copy \n"
 "\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
 msgstr ""
 
-#: sanity_check.php:15
+#: sanity_check.php:16
 msgid "config: your config file version is incorrect. See config.php-dist.\n"
 msgstr ""
 
-#: sanity_check.php:19
+#: sanity_check.php:20
 msgid ""
 "<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
 "\t\t\toption from config.php\n"
 msgstr ""
 
-#: sanity_check.php:25
+#: sanity_check.php:26
 msgid ""
 "<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
 "\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
@@ -583,116 +588,116 @@ msgid ""
 "\t\tfrom your TT-RSS instance.\n"
 msgstr ""
 
-#: sanity_check.php:32
+#: sanity_check.php:33
 msgid ""
 "<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
 "\t\t\tto 0 in single user mode.\n"
 msgstr ""
 
-#: sanity_check.php:38
+#: sanity_check.php:39
 msgid ""
 "<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
 "\t\t\tdoesn't seem to support CURL functions."
 msgstr ""
 
-#: sanity_check.php:44
+#: sanity_check.php:45
 msgid "config: SESSION_EXPIRE_TIME is undefined"
 msgstr ""
 
-#: sanity_check.php:48
+#: sanity_check.php:49
 msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
 msgstr ""
 
-#: sanity_check.php:52
+#: sanity_check.php:53
 msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
 msgstr ""
 
-#: sanity_check.php:61
+#: sanity_check.php:62
 msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
 msgstr ""
 
-#: sanity_check.php:65
+#: sanity_check.php:66
 msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
 msgstr ""
 
-#: sanity_check.php:69
+#: sanity_check.php:70
 msgid "Fatal Error"
 msgstr ""
 
-#: tt-rss.php:130
+#: tt-rss.php:132
 msgid "Actions..."
 msgstr "Действия..."
 
-#: tt-rss.php:131 modules/popup-dialog.php:90 modules/popup-dialog.php:159
-#: modules/pref-feeds.php:751
+#: tt-rss.php:133 modules/popup-dialog.php:104 modules/popup-dialog.php:173
+#: modules/pref-feeds.php:759
 msgid "Search"
 msgstr "Поиск"
 
-#: tt-rss.php:134
+#: tt-rss.php:136
 msgid "Feed actions:"
 msgstr "Действия над каналами:"
 
-#: tt-rss.php:135
+#: tt-rss.php:137
 msgid "&nbsp;&nbsp;Subscribe to feed"
 msgstr "&nbsp;&nbsp;Подписаться"
 
-#: tt-rss.php:136
+#: tt-rss.php:138
 msgid "&nbsp;&nbsp;Edit this feed"
 msgstr "&nbsp;&nbsp;Редактировать канал"
 
-#: tt-rss.php:137
+#: tt-rss.php:139
 msgid "&nbsp;&nbsp;Unsubscribe"
 msgstr "&nbsp;&nbsp;Отписаться"
 
-#: tt-rss.php:140
+#: tt-rss.php:142
 msgid "All feeds:"
 msgstr "Все каналы:"
 
-#: tt-rss.php:142
+#: tt-rss.php:144
 msgid "&nbsp;&nbsp;Update"
 msgstr "&nbsp;&nbsp;Обновить"
 
-#: tt-rss.php:144
+#: tt-rss.php:146
 msgid "&nbsp;&nbsp;Mark as read"
 msgstr "&nbsp;&nbsp;Пометить как прочитанные"
 
-#: tt-rss.php:145
+#: tt-rss.php:147
 msgid "&nbsp;&nbsp;(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;Спрятать прочитанные"
 
-#: tt-rss.php:147
+#: tt-rss.php:149
 msgid "Other actions:"
 msgstr "Другие действия:"
 
-#: tt-rss.php:148
+#: tt-rss.php:150
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Создать фильтр"
 
-#: tt-rss.php:154 modules/popup-dialog.php:102
+#: tt-rss.php:156 modules/popup-dialog.php:116
 msgid "Search:"
 msgstr "Искать:"
 
-#: tt-rss.php:159
+#: tt-rss.php:161
 msgid "View:"
 msgstr "Показать:"
 
-#: tt-rss.php:161
+#: tt-rss.php:163
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: tt-rss.php:162
+#: tt-rss.php:164
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: tt-rss.php:167
+#: tt-rss.php:169
 msgid "Limit:"
 msgstr "Сколько:"
 
-#: tt-rss.php:192
+#: tt-rss.php:194
 msgid "Update"
 msgstr "Обновить"
 
-#: tt-rss.php:206 tt-rss.php:210
+#: tt-rss.php:208 tt-rss.php:212
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
@@ -700,70 +705,74 @@ msgstr "Канал не выбран."
 msgid "Your access level is insufficient to run this script."
 msgstr "В доступе отказано - недостаточный уровень привилегий."
 
-#: update.php:49
+#: update.php:48
 msgid "Database Updater"
 msgstr ""
 
-#: update.php:88
+#: update.php:89
+msgid "Could not update database"
+msgstr ""
+
+#: update.php:92
+msgid "Could not find necessary schema file, need version:"
+msgstr ""
+
+#: update.php:93
+msgid ", found: "
+msgstr ""
+
+#: update.php:96
 msgid "Tiny Tiny RSS database is up to date."
 msgstr ""
 
-#: update.php:90 update.php:157
+#: update.php:98 update.php:166
 msgid "Return to Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
-#: update.php:97
-msgid "<b>Warning:</b> Please backup your database before proceeding."
-msgstr "<b>Внимание:</b> Сохраните базу данных перед продолжением."
-
-#: update.php:99
+#: update.php:108
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
 "<b>%d</b>)."
 msgstr ""
 
-#: update.php:113
+#: update.php:122
 msgid "Perform updates"
 msgstr ""
 
-#: update.php:118
+#: update.php:127
 msgid "Performing updates..."
 msgstr ""
 
-#: update.php:124
+#: update.php:133
 #, php-format
 msgid "Updating to version %d..."
 msgstr ""
 
-#: update.php:137
+#: update.php:146
 msgid "Checking version... "
 msgstr ""
 
-#: update.php:143
+#: update.php:152
 msgid "OK!"
 msgstr ""
 
-#: update.php:145
+#: update.php:154
 msgid "ERROR!"
 msgstr "Ошибка!"
 
-#: update.php:153
+#: update.php:162
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
 "\t\t\tversion <b>%d</b>."
 msgstr ""
 
-#: modules/help.php:16
-msgid "Help"
-msgstr "Помощь"
-
-#: modules/help.php:23
+#: modules/help.php:17
 msgid "Help topic not found."
 msgstr "Раздел помощи не найден."
 
-#: modules/help.php:30 modules/popup-dialog.php:35 modules/pref-feeds.php:700
+#: modules/help.php:22 modules/popup-dialog.php:35 modules/pref-feeds.php:706
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
@@ -815,153 +824,153 @@ msgid ""
 "\t\t\t\t\t\tfact that you are seeing this dialog is probably a bug."
 msgstr ""
 
-#: modules/popup-dialog.php:44
+#: modules/popup-dialog.php:44 modules/pref-feeds.php:772
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: modules/popup-dialog.php:62 modules/pref-feeds.php:173
+#: modules/popup-dialog.php:63 modules/pref-feeds.php:173
 msgid "Category:"
 msgstr "Категория:"
 
-#: modules/popup-dialog.php:80 modules/pref-feed-browser.php:105
-#: modules/pref-feeds.php:118 modules/pref-feeds.php:760
+#: modules/popup-dialog.php:94 modules/pref-feed-browser.php:107
+#: modules/pref-feeds.php:118
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: modules/popup-dialog.php:83 modules/popup-dialog.php:162
-#: modules/popup-dialog.php:214 modules/popup-dialog.php:301
-#: modules/popup-dialog.php:393 modules/pref-feeds.php:120
-#: modules/pref-feeds.php:331 modules/pref-feeds.php:708
+#: modules/popup-dialog.php:97 modules/popup-dialog.php:176
+#: modules/popup-dialog.php:228 modules/popup-dialog.php:315
+#: modules/popup-dialog.php:407 modules/pref-feeds.php:120
+#: modules/pref-feeds.php:331 modules/pref-feeds.php:714
 #: modules/pref-filters.php:118 modules/pref-users.php:58
 msgid "Cancel"
 msgstr "Отмена"
 
-#: modules/popup-dialog.php:111
+#: modules/popup-dialog.php:125
 msgid "Where:"
 msgstr "Где:"
 
-#: modules/popup-dialog.php:114 modules/pref-filters.php:288
+#: modules/popup-dialog.php:128 modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: modules/popup-dialog.php:127
+#: modules/popup-dialog.php:141
 msgid "This feed"
 msgstr "Этот канал"
 
-#: modules/popup-dialog.php:137
+#: modules/popup-dialog.php:151
 msgid "This category"
 msgstr "Эта категория"
 
-#: modules/popup-dialog.php:142
+#: modules/popup-dialog.php:156
 msgid "Match on:"
 msgstr "Искать по:"
 
-#: modules/popup-dialog.php:145 modules/pref-feeds.php:836
-#: modules/pref-feeds.php:889
+#: modules/popup-dialog.php:159 modules/pref-feeds.php:850
+#: modules/pref-feeds.php:907
 msgid "Title"
 msgstr "Заголовок"
 
-#: modules/popup-dialog.php:146
+#: modules/popup-dialog.php:160
 msgid "Content"
 msgstr "Содержимое"
 
-#: modules/popup-dialog.php:147
+#: modules/popup-dialog.php:161
 msgid "Title or content"
 msgstr "Заголовок или содержимое"
 
-#: modules/popup-dialog.php:171 modules/pref-labels.php:209
+#: modules/popup-dialog.php:185 modules/pref-labels.php:211
 msgid "Create label"
 msgstr "Создать метку"
 
-#: modules/popup-dialog.php:181
+#: modules/popup-dialog.php:195
 msgid "Caption:"
 msgstr "Заголовок:"
 
-#: modules/popup-dialog.php:190
+#: modules/popup-dialog.php:204
 msgid "SQL Expression:"
 msgstr "SQL выражение:"
 
-#: modules/popup-dialog.php:203
+#: modules/popup-dialog.php:217
 msgid "Test"
 msgstr "Проверить"
 
-#: modules/popup-dialog.php:210 modules/popup-dialog.php:297
+#: modules/popup-dialog.php:224 modules/popup-dialog.php:311
 msgid "Create"
 msgstr "Создать"
 
-#: modules/popup-dialog.php:223 modules/pref-filters.php:227
+#: modules/popup-dialog.php:237 modules/pref-filters.php:229
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: modules/popup-dialog.php:246 modules/pref-filters.php:45
+#: modules/popup-dialog.php:260 modules/pref-filters.php:45
 msgid "Match:"
 msgstr "Поиск:"
 
-#: modules/popup-dialog.php:252 modules/pref-filters.php:51
+#: modules/popup-dialog.php:266 modules/pref-filters.php:51
 msgid "On field:"
 msgstr "По полю:"
 
-#: modules/popup-dialog.php:257 modules/pref-filters.php:56
+#: modules/popup-dialog.php:271 modules/pref-filters.php:56
 msgid "Feed:"
 msgstr "Канал:"
 
-#: modules/popup-dialog.php:263 modules/pref-filters.php:62
+#: modules/popup-dialog.php:277 modules/pref-filters.php:62
 msgid "Action:"
 msgstr "Действие:"
 
-#: modules/popup-dialog.php:279 modules/pref-filters.php:79
+#: modules/popup-dialog.php:293 modules/pref-filters.php:79
 msgid "Params:"
 msgstr "Параметры:"
 
-#: modules/popup-dialog.php:283 modules/pref-feeds.php:283
+#: modules/popup-dialog.php:297 modules/pref-feeds.php:283
 msgid "Options:"
 msgstr "Дополнительно:"
 
-#: modules/popup-dialog.php:286 modules/pref-filters.php:103
+#: modules/popup-dialog.php:300 modules/pref-filters.php:103
 msgid "Inverse match"
 msgstr "Инвертировать фильтр"
 
-#: modules/popup-dialog.php:312
+#: modules/popup-dialog.php:326
 msgid "Update Errors"
 msgstr "Ошибки обновления"
 
-#: modules/popup-dialog.php:315
+#: modules/popup-dialog.php:329
 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не было обновлены из-за ошибок:"
 
-#: modules/popup-dialog.php:334
+#: modules/popup-dialog.php:348
 msgid "Close"
 msgstr "Закрыть"
 
-#: modules/popup-dialog.php:343
+#: modules/popup-dialog.php:357
 msgid "Edit Tags"
 msgstr "Редактировать теги"
 
-#: modules/popup-dialog.php:348
+#: modules/popup-dialog.php:362
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
-#: modules/popup-dialog.php:360
+#: modules/popup-dialog.php:374
 msgid "Add existing tag:"
 msgstr "Добавить существуюший тег:"
 
-#: modules/popup-dialog.php:389 modules/pref-feeds.php:329
-#: modules/pref-feeds.php:706 modules/pref-filters.php:114
+#: modules/popup-dialog.php:403 modules/pref-feeds.php:329
+#: modules/pref-feeds.php:712 modules/pref-filters.php:114
 #: modules/pref-users.php:55
 msgid "Save"
 msgstr "Сохранить"
 
-#: modules/pref-feed-browser.php:75
+#: modules/pref-feed-browser.php:77
 msgid ""
 "This panel shows feeds subscribed by other users of this system, just in "
 "case you are interested in them too."
 msgstr ""
 
-#: modules/pref-feed-browser.php:91
+#: modules/pref-feed-browser.php:93
 msgid "Top"
 msgstr "Топ"
 
-#: modules/pref-feed-browser.php:100
+#: modules/pref-feed-browser.php:102
 msgid "Show"
 msgstr "Показать"
 
@@ -1029,85 +1038,85 @@ msgstr "Спрятать из моего списка каналов"
 msgid "Include in e-mail digest"
 msgstr "Включить в дайджест"
 
-#: modules/pref-feeds.php:446
+#: modules/pref-feeds.php:451
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Добавлена подписка на <b>%s</b>."
 
-#: modules/pref-feeds.php:448
+#: modules/pref-feeds.php:453
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:516
+#: modules/pref-feeds.php:522
 msgid "Category editor"
 msgstr "Редактор категорий"
 
-#: modules/pref-feeds.php:550
+#: modules/pref-feeds.php:556
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Категория <b>$%s</b> уже существует."
 
-#: modules/pref-feeds.php:578
+#: modules/pref-feeds.php:584
 msgid "Unable to delete non empty feed categories."
 msgstr "Не могу удалить не пустую категорию"
 
-#: modules/pref-feeds.php:595
+#: modules/pref-feeds.php:601
 msgid "Create category"
 msgstr "Создать категорию"
 
-#: modules/pref-feeds.php:695
+#: modules/pref-feeds.php:701
 msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
-#: modules/pref-feeds.php:713 modules/pref-feeds.php:955
-#: modules/pref-filters.php:338 modules/pref-labels.php:286
-#: modules/pref-users.php:315
+#: modules/pref-feeds.php:719 modules/pref-feeds.php:971
+#: modules/pref-filters.php:340 modules/pref-labels.php:288
+#: modules/pref-users.php:317
 msgid "Edit"
 msgstr "Редактировать"
 
-#: modules/pref-feeds.php:715 modules/pref-filters.php:340
-#: modules/pref-labels.php:288 modules/pref-users.php:317
+#: modules/pref-feeds.php:721 modules/pref-filters.php:342
+#: modules/pref-labels.php:290 modules/pref-users.php:319
 msgid "Remove"
 msgstr "Удалить"
 
-#: modules/pref-feeds.php:736
+#: modules/pref-feeds.php:744
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могли быть обновлены (щелкните для подробностей)"
 
-#: modules/pref-feeds.php:764
+#: modules/pref-feeds.php:777
 msgid "Top 25"
 msgstr "Топ 25"
 
-#: modules/pref-feeds.php:838 modules/pref-feeds.php:891
+#: modules/pref-feeds.php:851 modules/pref-feeds.php:908
 msgid "Last&nbsp;Article"
 msgstr "Последняя&nbsp;статья"
 
-#: modules/pref-feeds.php:839 modules/pref-feeds.php:892
+#: modules/pref-feeds.php:852 modules/pref-feeds.php:909
 msgid "Updated"
 msgstr "Обновлено"
 
-#: modules/pref-feeds.php:958
+#: modules/pref-feeds.php:974
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: modules/pref-feeds.php:968
+#: modules/pref-feeds.php:984
 msgid "Recategorize"
 msgstr "Изменить категорию"
 
-#: modules/pref-feeds.php:977
+#: modules/pref-feeds.php:993
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: modules/pref-feeds.php:988
+#: modules/pref-feeds.php:1004
 msgid "OPML"
 msgstr ""
 
-#: modules/pref-feeds.php:994
+#: modules/pref-feeds.php:1010
 msgid "Import"
 msgstr "Импортировать"
 
-#: modules/pref-feeds.php:1001
+#: modules/pref-feeds.php:1017
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
@@ -1129,27 +1138,27 @@ msgstr "Фильтр <b>%s</b> сохранен"
 msgid "Created filter <b>%s</b>"
 msgstr "Добавлен фильтр <b>%s</b>"
 
-#: modules/pref-filters.php:260
+#: modules/pref-filters.php:262
 msgid "Filter expression"
 msgstr "Выражение"
 
-#: modules/pref-filters.php:262
+#: modules/pref-filters.php:264
 msgid "Match"
 msgstr "Искать"
 
-#: modules/pref-filters.php:263
+#: modules/pref-filters.php:265
 msgid "Action"
 msgstr "Действие"
 
-#: modules/pref-filters.php:297
+#: modules/pref-filters.php:299
 msgid "(Disabled)"
 msgstr "(Отключен)"
 
-#: modules/pref-filters.php:315
+#: modules/pref-filters.php:317
 msgid "(Inverse)"
 msgstr "(Инвертирован)"
 
-#: modules/pref-filters.php:330 modules/pref-filters.php:351
+#: modules/pref-filters.php:332 modules/pref-filters.php:353
 msgid "No filters defined."
 msgstr "Фильтры отсутствуют."
 
@@ -1163,15 +1172,15 @@ msgstr "Метка <b>%s</b> сохранена"
 msgid "Created label <b>%s</b>"
 msgstr "Добавлена метка <b>%s</b>"
 
-#: modules/pref-labels.php:234
+#: modules/pref-labels.php:236
 msgid "Caption"
 msgstr "Заголовок"
 
-#: modules/pref-labels.php:235
+#: modules/pref-labels.php:237
 msgid "SQL Expression"
 msgstr "SQL выражение"
 
-#: modules/pref-labels.php:278 modules/pref-labels.php:291
+#: modules/pref-labels.php:280 modules/pref-labels.php:293
 msgid "No labels defined."
 msgstr "Метки отсутствуют."
 
@@ -1195,53 +1204,53 @@ msgstr "Пароль был изменен."
 msgid "Old password is incorrect."
 msgstr "Старый пароль неправилен."
 
-#: modules/pref-prefs.php:183
+#: modules/pref-prefs.php:185
 msgid ""
 "Your password is at default value, \n"
 "\t\t\t\t\t\tplease change it."
 msgstr ""
 
-#: modules/pref-prefs.php:198
+#: modules/pref-prefs.php:200
 msgid "The configuration was reset to defaults."
 msgstr "Настройки были сброшены по-умолчанию."
 
-#: modules/pref-prefs.php:202
+#: modules/pref-prefs.php:204
 msgid "The configuration was saved."
 msgstr "Конфигурация сохранена."
 
-#: modules/pref-prefs.php:210
+#: modules/pref-prefs.php:212
 msgid "Personal data"
 msgstr "Личные данные"
 
-#: modules/pref-prefs.php:230
+#: modules/pref-prefs.php:232
 msgid "Change e-mail"
 msgstr "Изменить e-mail"
 
-#: modules/pref-prefs.php:236
+#: modules/pref-prefs.php:238
 msgid "Authentication"
 msgstr "Авторизация"
 
-#: modules/pref-prefs.php:238
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: modules/pref-prefs.php:243
+#: modules/pref-prefs.php:245
 msgid "New password"
 msgstr "Новый пароль"
 
-#: modules/pref-prefs.php:249
+#: modules/pref-prefs.php:251
 msgid "Confirm password"
 msgstr "Подтверждение пароля"
 
-#: modules/pref-prefs.php:264
+#: modules/pref-prefs.php:266
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: modules/pref-prefs.php:280
+#: modules/pref-prefs.php:282
 msgid "Themes"
 msgstr "Темы"
 
-#: modules/pref-prefs.php:281
+#: modules/pref-prefs.php:283
 msgid "Select theme"
 msgstr "Выбор темы"
 
@@ -1284,30 +1293,36 @@ msgid ""
 "\t\t\t\t\t to <b>%s</b>"
 msgstr "Пароль пользователя <b>%s</b> изменен на <b>%s</b>"
 
-#: modules/pref-users.php:191
+#: modules/pref-users.php:193
 msgid "Create user"
 msgstr "Добавить пользователя"
 
-#: modules/pref-users.php:213
+#: modules/pref-users.php:215
 msgid "Login"
 msgstr "Пользователь:"
 
-#: modules/pref-users.php:214
+#: modules/pref-users.php:216
 msgid "Access Level"
 msgstr "Уровень доступа:"
 
-#: modules/pref-users.php:215
+#: modules/pref-users.php:217
 msgid "Last login"
 msgstr "Последний вход"
 
-#: modules/pref-users.php:313
+#: modules/pref-users.php:315
 msgid "User details"
 msgstr "Подробнее..."
 
-#: modules/pref-users.php:319
+#: modules/pref-users.php:321
 msgid "Reset password"
 msgstr "Сбросить пароль"
 
+#~ msgid "<b>Warning:</b> Please backup your database before proceeding."
+#~ msgstr "<b>Внимание:</b> Сохраните базу данных перед продолжением."
+
+#~ msgid "Help"
+#~ msgstr "Помощь"
+
 #~ msgid "Toggle unread"
 #~ msgstr "Изм. прочитанное"
 
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index ab2ac0849..9292ae40c 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -612,9 +612,9 @@
 					cellspacing=\"0\">";
 
 				print "<tr><td class=\"selectPrompt\" colspan=\"8\">
-				Select: 
-					<a href=\"javascript:selectPrefRows('fcat', true)\">All</a>,
-					<a href=\"javascript:selectPrefRows('fcat', false)\">None</a>
+				".__('Select:')." 
+					<a href=\"javascript:selectPrefRows('fcat', true)\">".__('All')."</a>,
+					<a href=\"javascript:selectPrefRows('fcat', false)\">".__('None')."</a>
 					</td></tr>";
 
 				print "</table>";
@@ -833,9 +833,9 @@
 			print "<p><table width=\"100%\" cellspacing=\"0\" 
 				class=\"prefFeedList\" id=\"prefFeedList\">";
 			print "<tr><td class=\"selectPrompt\" colspan=\"8\">
-				Select: 
-					<a href=\"javascript:selectPrefRows('feed', true)\">All</a>,
-					<a href=\"javascript:selectPrefRows('feed', false)\">None</a>
+				".__('Select:')." 
+					<a href=\"javascript:selectPrefRows('feed', true)\">".__('All')."</a>,
+					<a href=\"javascript:selectPrefRows('feed', false)\">".__('None')."</a>
 				</td</tr>";
 
 			if (!get_pref($link, 'ENABLE_FEED_CATS')) {
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 07b9eca71..db2744b28 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -252,9 +252,9 @@
 				id=\"prefFilterList\">";
 
 			print "<tr><td class=\"selectPrompt\" colspan=\"8\">
-				Select: 
-					<a href=\"javascript:selectPrefRows('filter', true)\">All</a>,
-					<a href=\"javascript:selectPrefRows('filter', false)\">None</a>
+				".__('Select:')." 
+					<a href=\"javascript:selectPrefRows('filter', true)\">".__('All')."</a>,
+					<a href=\"javascript:selectPrefRows('filter', false)\">".__('None')."</a>
 				</td</tr>";
 
 			print "<tr class=\"title\">
diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index 697263ac8..3b1f5829c 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -226,9 +226,9 @@
 				class=\"prefLabelList\" id=\"prefLabelList\">";
 
 			print "<tr><td class=\"selectPrompt\" colspan=\"8\">
-				Select: 
-					<a href=\"javascript:selectPrefRows('label', true)\">All</a>,
-					<a href=\"javascript:selectPrefRows('label', false)\">None</a>
+				".__('Select:')." 
+					<a href=\"javascript:selectPrefRows('label', true)\">".__('All')."</a>,
+					<a href=\"javascript:selectPrefRows('label', false)\">".__('None')."</a>
 				</td</tr>";
 
 			print "<tr class=\"title\">
diff --git a/modules/pref-users.php b/modules/pref-users.php
index 06ee9d22b..b61323ad4 100644
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -205,9 +205,9 @@
 			class=\"prefUserList\" id=\"prefUserList\">";
 
 		print "<tr><td class=\"selectPrompt\" colspan=\"8\">
-				Select: 
-					<a href=\"javascript:selectPrefRows('user', true)\">All</a>,
-					<a href=\"javascript:selectPrefRows('user', false)\">None</a>
+				".__('Select:')." 
+					<a href=\"javascript:selectPrefRows('user', true)\">".__('All')."</a>,
+					<a href=\"javascript:selectPrefRows('user', false)\">".__('None')."</a>
 				</td</tr>";
 
 		print "<tr class=\"title\">