diff --git a/functions.php b/functions.php
index e98f36f6..ff00059e 100644
--- a/functions.php
+++ b/functions.php
@@ -2863,9 +2863,9 @@
 						<a href=\"$sel_unread_link\">".__('Unread')."</a>,
 						<a href=\"$sel_none_link\">".__('None')."</a></li>
 					<li class=\"vsep\">&nbsp;</li>
-					<li class=\"top\">Selection<ul>
-						<li onclick=\"$tog_unread_link\">".__('Toggle unread')."</li>
-						<li onclick=\"$tog_marked_link\">".__('Toggle starred')."</li></ul></li>
+					<li class=\"top\">Toggle<ul>
+						<li onclick=\"$tog_unread_link\">".__('Unread')."</li>
+						<li onclick=\"$tog_marked_link\">".__('Starred')."</li></ul></li>
 					<li class=\"vsep\">&nbsp;</li>
 					<li class=\"top\"><a href=\"$catchup_page_link\">".__('Mark as read')."</a><ul>
 						<li onclick=\"$catchup_page_link\">".__('This page')."</li>
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index ed6893ff..b239a2d6 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 a0a4a555..2ad6649e 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-03-22 12:41+0300\n"
+"POT-Creation-Date: 2007-03-26 13:31+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"
@@ -92,17 +92,17 @@ msgstr "нет тегов"
 msgid "Tags:"
 msgstr "Теги:"
 
-#: backend.php:336
+#: backend.php:339
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: backend.php:405
+#: backend.php:408
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: backend.php:603
+#: backend.php:606
 msgid "No articles found."
 msgstr "Статей не найдено."
 
@@ -162,140 +162,133 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2098 functions.php:2137 functions.php:2418 functions.php:3097
-#: functions.php:3127 modules/pref-feeds.php:857
+#: functions.php:2098 functions.php:2137 functions.php:2424 functions.php:3103
+#: functions.php:3133 modules/pref-feeds.php:857
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2127 functions.php:2948
+#: functions.php:2127 functions.php:2954
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2129 functions.php:2974
+#: functions.php:2129 functions.php:2980
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2147 functions.php:2440 functions.php:2958
+#: functions.php:2147 functions.php:2446 functions.php:2964
 msgid "Starred articles"
 msgstr "Отмеченные статьи"
 
-#: functions.php:2404
+#: functions.php:2410
 msgid "Global search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2406
+#: functions.php:2412
 msgid "Tag search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2422
+#: functions.php:2428
 msgid "Category search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2435
+#: functions.php:2441
 msgid "Feed search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2448
+#: functions.php:2454
 msgid "Label search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2643
+#: functions.php:2649
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:2687
+#: functions.php:2693
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:2689
+#: functions.php:2695
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:2855 functions.php:2884
+#: functions.php:2861 functions.php:2890
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:2856 functions.php:2885
+#: functions.php:2862 functions.php:2891
 msgid "All"
 msgstr "Все"
 
-#: functions.php:2857 functions.php:2886 functions.php:2889 tt-rss.php:164
+#: functions.php:2863 functions.php:2867 functions.php:2892 functions.php:2895
+#: tt-rss.php:164
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:2858 functions.php:2887
+#: functions.php:2864 functions.php:2893
 msgid "None"
 msgstr "Нет"
 
-#: functions.php:2861
-msgid "Toggle unread"
-msgstr "Изм. прочитанное"
-
-#: functions.php:2862
-msgid "Toggle starred"
-msgstr "Изм. отмеченное"
-
-#: functions.php:2864
-msgid "Mark as read"
-msgstr "Как прочитанные"
-
-#: functions.php:2865
-msgid "This page"
-msgstr "Эту страницу"
-
-#: functions.php:2866
-msgid "Entire feed"
-msgstr "Весь канал"
-
-#: functions.php:2871
-msgid "Next page"
-msgstr "След. стр."
-
-#: functions.php:2872
-msgid "Previous page"
-msgstr "Пред. cтр."
-
-#: functions.php:2873
-msgid "First page"
-msgstr "На первую"
-
-#: functions.php:2889
-msgid "Toggle:"
-msgstr "Изменить:"
-
-#: functions.php:2890 tt-rss.php:163
+#: functions.php:2868 functions.php:2896 tt-rss.php:163
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:2892
+#: functions.php:2870
+msgid "Mark as read"
+msgstr "Как прочитанные"
+
+#: functions.php:2871
+msgid "This page"
+msgstr "Эту страницу"
+
+#: functions.php:2872
+msgid "Entire feed"
+msgstr "Весь канал"
+
+#: functions.php:2877
+msgid "Next page"
+msgstr "След. стр."
+
+#: functions.php:2878
+msgid "Previous page"
+msgstr "Пред. cтр."
+
+#: functions.php:2879
+msgid "First page"
+msgstr "На первую"
+
+#: functions.php:2895
+msgid "Toggle:"
+msgstr "Изменить:"
+
+#: functions.php:2898
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:2893
+#: functions.php:2899
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:2894 modules/pref-feeds.php:837 modules/pref-feeds.php:890
+#: functions.php:2900 modules/pref-feeds.php:837 modules/pref-feeds.php:890
 #: modules/pref-filters.php:261
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:2903
+#: functions.php:2909
 msgid "Convert to Label"
 msgstr "Превратить в метку"
 
-#: functions.php:2930
+#: functions.php:2936
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3167
+#: functions.php:3173
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:3184
+#: functions.php:3190
 msgid "Tags"
 msgstr "Теги"
 
@@ -491,6 +484,10 @@ msgstr "Идет сохранение пароля..."
 msgid "Trying to change e-mail..."
 msgstr "Идет изменение e-mail..."
 
+#: localized_js.php:89
+msgid "No articles are selected."
+msgstr "Нет выбранных статей."
+
 #: login_form.php:49 modules/pref-feeds.php:264 modules/pref-users.php:29
 msgid "Login:"
 msgstr "Пользователь:"
@@ -1310,3 +1307,9 @@ msgstr "Подробнее..."
 #: modules/pref-users.php:319
 msgid "Reset password"
 msgstr "Сбросить пароль"
+
+#~ msgid "Toggle unread"
+#~ msgstr "Изм. прочитанное"
+
+#~ msgid "Toggle starred"
+#~ msgstr "Изм. отмеченное"
diff --git a/localized_js.php b/localized_js.php
index 0d09b8a9..5ba06613 100644
--- a/localized_js.php
+++ b/localized_js.php
@@ -86,5 +86,6 @@ print T_js_decl("Changing category of selected feeds...");
 print T_js_decl("Reset to defaults?");
 print T_js_decl("Trying to change password...");
 print T_js_decl("Trying to change e-mail...");
+print T_js_decl("No articles are selected.");
 
 ?>
diff --git a/viewfeed.js b/viewfeed.js
index 54ae82b0..2d8ff605 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -301,6 +301,11 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func) {
 			rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
 		}
 
+		if (rows.length == 0) {
+			alert(__("No articles are selected."));
+			return;
+		}
+
 		for (i = 0; i < rows.length; i++) {
 			var row = document.getElementById("RROW-" + rows[i]);
 			if (row) {
@@ -361,6 +366,11 @@ function selectionToggleMarked(cdm_mode) {
 			rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
 		}	
 
+		if (rows.length == 0) {
+			alert(__("No articles are selected."));
+			return;
+		}
+
 		for (i = 0; i < rows.length; i++) {
 			var row = document.getElementById("RROW-" + rows[i]);
 			var mark_img = document.getElementById("FMARKPIC-" + rows[i]);