diff --git a/functions.php b/functions.php
index 2d5003a78..f9a78b51b 100644
--- a/functions.php
+++ b/functions.php
@@ -4587,7 +4587,15 @@
 					} else {
 						$add_class = "";
 					}	
-					
+
+					$expand_cdm = get_pref($link, 'CDM_EXPANDED');
+
+					if ($expand_cdm) {
+						$cdm_cstyle = "";
+					} else {
+						$cdm_cstyle = "style=\"display : none\"";
+					}
+
 					print "<div class=\"cdmArticle$add_class\" 
 						id=\"RROW-$id\" onmouseover='cdmMouseIn(this)' 
 						onmouseout='cdmMouseOut(this)'>";
@@ -4602,6 +4610,13 @@
 
 					print $entry_author;
 
+					if (!$expand_cdm) {
+						print "&nbsp;<a id=\"CICH-$id\" 
+							href=\"javascript:cdmExpandArticle($id)\">
+							(".__('Show article').")</a>";
+					} 
+
+
 					if ($line["feed_title"]) {	
 						print "&nbsp;(<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>)";
 					}
@@ -4613,27 +4628,20 @@
 							"target=\"_new\" href=", $line["content_preview"]);
 					}
 
-					$expand_cdm = get_pref($link, 'CDM_EXPANDED');
+					print "<div class=\"cdmContent\" id=\"CICD-$id\" $cdm_cstyle>";
 
-					if ($expand_cdm) {
-						$cdm_cstyle = "";
-					} else {
-						$cdm_cstyle = "style=\"display : none\"";
-					}
-
-					print "<div class=\"cdmContent\">";
-
-					print "<div class=\"cdmInnerContent\" id=\"CICD-$id\" $cdm_cstyle>";
+//					print "<div class=\"cdmInnerContent\" id=\"CICD-$id\" $cdm_cstyle>";
 					print $line["content_preview"];
-					print "</div>";
+					print "<br clear='both'>";
+//					print "</div>";
 
-					if (!$expand_cdm) {
+/*					if (!$expand_cdm) {
 						print "<a id=\"CICH-$id\" 
 							href=\"javascript:cdmExpandArticle($id)\">
 							Show article</a>";
-					}
+					} */
 
-					print "</div><br clear=\"all\">";
+					print "</div>";
 
 					print "<div class=\"cdmFooter\"><span class='s0'>";
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index bfa218489..4802cdc11 100644
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 4ecd7797b..003545ed6 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-26 15:17+0400\n"
+"POT-Creation-Date: 2007-10-29 14:21+0300\n"
 "PO-Revision-Date: 2007-09-27 18:17+0200\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -146,50 +146,50 @@ msgstr ""
 "Votre version de MySQL n'est pas gérée pour le moment. Reportez-vous au \n"
 "\t\tsite officiel pour plus d'informations."
 
-#: functions.php:2285 functions.php:2624 functions.php:2984 functions.php:3757
+#: functions.php:2286 functions.php:2625 functions.php:2985 functions.php:3760
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2294 functions.php:2626 functions.php:2986 functions.php:3764
+#: functions.php:2295 functions.php:2627 functions.php:2987 functions.php:3767
 #: modules/pref-feeds.php:1068
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2303 functions.php:2628 functions.php:2988 functions.php:3742
+#: functions.php:2304 functions.php:2629 functions.php:2989 functions.php:3745
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: functions.php:2546 modules/popup-dialog.php:151
+#: functions.php:2547 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2575 functions.php:2614 functions.php:2962 functions.php:3921
-#: functions.php:3951 modules/pref-feeds.php:880
+#: functions.php:2576 functions.php:2615 functions.php:2963 functions.php:3924
+#: functions.php:3954 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2604 functions.php:3128
+#: functions.php:2605 functions.php:3129
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2606 functions.php:3130
+#: functions.php:2607 functions.php:3131
 msgid "Labels"
 msgstr "Intitulé"
 
-#: functions.php:2948 functions.php:2950
+#: functions.php:2949 functions.php:2951
 msgid "Search results"
 msgstr "Résultats de recherche"
 
-#: functions.php:2966 functions.php:2979 functions.php:2996
+#: functions.php:2967 functions.php:2980 functions.php:2997
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:3268
+#: functions.php:3271
 msgid "New headlines for last 24 hours, as of "
 msgstr "Nouveaux en-têtes dans les dernières 24 heures, à compter de "
 
-#: functions.php:3319
+#: functions.php:3322
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
@@ -197,130 +197,130 @@ msgstr ""
 "Vous recevez ce courrier électronique parce que vous avez activé la synthèse "
 "quotidienne dans TIny Tiny RSS sur "
 
-#: functions.php:3321
+#: functions.php:3324
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 "Pour vous désinscrire, modifiez votre configuration ou contactez "
 "l'administrateur de votre TIny Tiny RSS.\n"
 
-#: functions.php:3552 functions.php:3599 functions.php:4639
+#: functions.php:3555 functions.php:3602 functions.php:4650
 #: 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 "Sélectionner&nbsp;:"
 
-#: functions.php:3553 functions.php:3600 modules/pref-feeds.php:656
+#: functions.php:3556 functions.php:3603 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 "Tout"
 
-#: functions.php:3554 functions.php:3558 functions.php:3601 functions.php:3604
+#: functions.php:3557 functions.php:3561 functions.php:3604 functions.php:3607
 #: tt-rss.php:165
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3555 functions.php:3602 modules/pref-feeds.php:657
+#: functions.php:3558 functions.php:3605 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 "Aucun"
 
-#: functions.php:3557
+#: functions.php:3560
 msgid "Toggle"
 msgstr "Marquages spéciaux&nbsp;"
 
-#: functions.php:3559 functions.php:3605 tt-rss.php:164
+#: functions.php:3562 functions.php:3608 tt-rss.php:164
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:3560
+#: functions.php:3563
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:3563 localized_schema.php:15
+#: functions.php:3566 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: functions.php:3564
+#: functions.php:3567
 msgid "Selection"
 msgstr "La sélection"
 
-#: functions.php:3565
+#: functions.php:3568
 msgid "This page"
 msgstr "Cette page"
 
-#: functions.php:3567
+#: functions.php:3570
 msgid "Above active article"
 msgstr "Au-dessus de l'article courant"
 
-#: functions.php:3568
+#: functions.php:3571
 msgid "Below active article"
 msgstr "En dessous de l'article courant"
 
-#: functions.php:3570
+#: functions.php:3573
 msgid "Entire feed"
 msgstr "Tout le flux"
 
-#: functions.php:3578
+#: functions.php:3581
 msgid "Next page"
 msgstr "Page suivante"
 
-#: functions.php:3579
+#: functions.php:3582
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: functions.php:3580
+#: functions.php:3583
 msgid "First page"
 msgstr "Première page"
 
-#: functions.php:3590 functions.php:3616
+#: functions.php:3593 functions.php:3619
 msgid "Convert to label"
 msgstr "Convertir en intitulé"
 
-#: functions.php:3604
+#: functions.php:3607
 msgid "Toggle:"
 msgstr "Marquages spéciaux&nbsp;:"
 
-#: functions.php:3607
+#: functions.php:3610
 msgid "Mark as read:"
 msgstr "Marquer comme lu&nbsp;:"
 
-#: functions.php:3608
+#: functions.php:3611
 msgid "Page"
 msgstr "Page"
 
-#: functions.php:3609 modules/pref-filters.php:263
+#: functions.php:3612 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Flux"
 
-#: functions.php:3655
+#: functions.php:3658
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:3991
+#: functions.php:3994
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:4008
+#: functions.php:4011
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:4233
+#: functions.php:4236
 msgid " - by "
 msgstr "- par "
 
-#: functions.php:4282
+#: functions.php:4285
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:4353
+#: functions.php:4356
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:4415
+#: functions.php:4418
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -328,7 +328,12 @@ msgstr ""
 "Impossible d'afficher le flux (la requête l'a pas abouti). Veuillez vérifier "
 "la syntaxe de son intitulé ou la configuration locale."
 
-#: functions.php:4702
+#: functions.php:4616
+#, fuzzy
+msgid "Show article"
+msgstr "Marquer comme remarquable"
+
+#: functions.php:4713
 msgid "No articles found."
 msgstr "Aucun article trouvé."
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 81e637698..9b26ddc42 100644
Binary files a/locale/pt_BR/LC_MESSAGES/messages.mo and b/locale/pt_BR/LC_MESSAGES/messages.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index 8a9d20ef7..9d6406a5d 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss 1.2.14.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-26 15:17+0400\n"
+"POT-Creation-Date: 2007-10-29 14:21+0300\n"
 "PO-Revision-Date: 2007-10-24 00:47-0200\n"
 "Last-Translator: Marcelo Jorge VIeira (metal) <metal@alucinados.com>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -140,183 +140,188 @@ msgstr ""
 "Sua versão do MySQL não é atualmente suportada. Por favor acesse \n"
 "\t\to site oficial para mais informações."
 
-#: functions.php:2285 functions.php:2624 functions.php:2984 functions.php:3757
+#: functions.php:2286 functions.php:2625 functions.php:2985 functions.php:3760
 msgid "Starred articles"
 msgstr ""
 
-#: functions.php:2294 functions.php:2626 functions.php:2986 functions.php:3764
+#: functions.php:2295 functions.php:2627 functions.php:2987 functions.php:3767
 #: modules/pref-feeds.php:1068
 msgid "Published articles"
 msgstr ""
 
-#: functions.php:2303 functions.php:2628 functions.php:2988 functions.php:3742
+#: functions.php:2304 functions.php:2629 functions.php:2989 functions.php:3745
 msgid "Fresh articles"
 msgstr ""
 
-#: functions.php:2546 modules/popup-dialog.php:151
+#: functions.php:2547 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: functions.php:2575 functions.php:2614 functions.php:2962 functions.php:3921
-#: functions.php:3951 modules/pref-feeds.php:880
+#: functions.php:2576 functions.php:2615 functions.php:2963 functions.php:3924
+#: functions.php:3954 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
-#: functions.php:2604 functions.php:3128
+#: functions.php:2605 functions.php:3129
 msgid "Special"
 msgstr "Especial"
 
-#: functions.php:2606 functions.php:3130
+#: functions.php:2607 functions.php:3131
 msgid "Labels"
 msgstr ""
 
-#: functions.php:2948 functions.php:2950
+#: functions.php:2949 functions.php:2951
 msgid "Search results"
 msgstr ""
 
-#: functions.php:2966 functions.php:2979 functions.php:2996
+#: functions.php:2967 functions.php:2980 functions.php:2997
 msgid "Searched for"
 msgstr ""
 
-#: functions.php:3268
+#: functions.php:3271
 msgid "New headlines for last 24 hours, as of "
 msgstr ""
 
-#: functions.php:3319
+#: functions.php:3322
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:3321
+#: functions.php:3324
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:3552 functions.php:3599 functions.php:4639
+#: functions.php:3555 functions.php:3602 functions.php:4650
 #: 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 "Selecione:"
 
-#: functions.php:3553 functions.php:3600 modules/pref-feeds.php:656
+#: functions.php:3556 functions.php:3603 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 "Todos"
 
-#: functions.php:3554 functions.php:3558 functions.php:3601 functions.php:3604
+#: functions.php:3557 functions.php:3561 functions.php:3604 functions.php:3607
 #: tt-rss.php:165
 msgid "Unread"
 msgstr "Não Lido"
 
-#: functions.php:3555 functions.php:3602 modules/pref-feeds.php:657
+#: functions.php:3558 functions.php:3605 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 "Nenhum"
 
-#: functions.php:3557
+#: functions.php:3560
 msgid "Toggle"
 msgstr ""
 
-#: functions.php:3559 functions.php:3605 tt-rss.php:164
+#: functions.php:3562 functions.php:3608 tt-rss.php:164
 msgid "Starred"
 msgstr "Favoritos"
 
-#: functions.php:3560
+#: functions.php:3563
 msgid "Published"
 msgstr "Publicado"
 
-#: functions.php:3563 localized_schema.php:15
+#: functions.php:3566 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
-#: functions.php:3564
+#: functions.php:3567
 msgid "Selection"
 msgstr "Seleção"
 
-#: functions.php:3565
+#: functions.php:3568
 msgid "This page"
 msgstr ""
 
-#: functions.php:3567
+#: functions.php:3570
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3568
+#: functions.php:3571
 msgid "Below active article"
 msgstr ""
 
-#: functions.php:3570
+#: functions.php:3573
 msgid "Entire feed"
 msgstr ""
 
-#: functions.php:3578
+#: functions.php:3581
 msgid "Next page"
 msgstr "Próxima página"
 
-#: functions.php:3579
+#: functions.php:3582
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: functions.php:3580
+#: functions.php:3583
 msgid "First page"
 msgstr "Primeira página"
 
-#: functions.php:3590 functions.php:3616
+#: functions.php:3593 functions.php:3619
 msgid "Convert to label"
 msgstr ""
 
-#: functions.php:3604
+#: functions.php:3607
 msgid "Toggle:"
 msgstr ""
 
-#: functions.php:3607
+#: functions.php:3610
 msgid "Mark as read:"
 msgstr "Marcar como lido:"
 
-#: functions.php:3608
+#: functions.php:3611
 msgid "Page"
 msgstr "Página"
 
-#: functions.php:3609 modules/pref-filters.php:263
+#: functions.php:3612 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3655
+#: functions.php:3658
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3991
+#: functions.php:3994
 msgid "No feeds to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:4008
+#: functions.php:4011
 msgid "Tags"
 msgstr "Tags"
 
-#: functions.php:4233
+#: functions.php:4236
 msgid " - by "
 msgstr " - por "
 
-#: functions.php:4282
+#: functions.php:4285
 msgid "no tags"
 msgstr "sem tags"
 
-#: functions.php:4353
+#: functions.php:4356
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
-#: functions.php:4415
+#: functions.php:4418
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4702
+#: functions.php:4616
+#, fuzzy
+msgid "Show article"
+msgstr "Favoritos"
+
+#: functions.php:4713
 msgid "No articles found."
 msgstr ""
 
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 6bb515ca2..28efb9c4d 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 0b3d54dcc..4b5e1eb83 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-10-26 15:17+0400\n"
+"POT-Creation-Date: 2007-10-29 14:21+0300\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,191 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2285 functions.php:2624 functions.php:2984 functions.php:3757
+#: functions.php:2286 functions.php:2625 functions.php:2985 functions.php:3760
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:2294 functions.php:2626 functions.php:2986 functions.php:3764
+#: functions.php:2295 functions.php:2627 functions.php:2987 functions.php:3767
 #: modules/pref-feeds.php:1068
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:2303 functions.php:2628 functions.php:2988 functions.php:3742
+#: functions.php:2304 functions.php:2629 functions.php:2989 functions.php:3745
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Отмеченные"
 
-#: functions.php:2546 modules/popup-dialog.php:151
+#: functions.php:2547 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2575 functions.php:2614 functions.php:2962 functions.php:3921
-#: functions.php:3951 modules/pref-feeds.php:880
+#: functions.php:2576 functions.php:2615 functions.php:2963 functions.php:3924
+#: functions.php:3954 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2604 functions.php:3128
+#: functions.php:2605 functions.php:3129
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2606 functions.php:3130
+#: functions.php:2607 functions.php:3131
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2948 functions.php:2950
+#: functions.php:2949 functions.php:2951
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2966 functions.php:2979 functions.php:2996
+#: functions.php:2967 functions.php:2980 functions.php:2997
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:3268
+#: functions.php:3271
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:3319
+#: functions.php:3322
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:3321
+#: functions.php:3324
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:3552 functions.php:3599 functions.php:4639
+#: functions.php:3555 functions.php:3602 functions.php:4650
 #: 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:3553 functions.php:3600 modules/pref-feeds.php:656
+#: functions.php:3556 functions.php:3603 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:3554 functions.php:3558 functions.php:3601 functions.php:3604
+#: functions.php:3557 functions.php:3561 functions.php:3604 functions.php:3607
 #: tt-rss.php:165
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3555 functions.php:3602 modules/pref-feeds.php:657
+#: functions.php:3558 functions.php:3605 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:3557
+#: functions.php:3560
 msgid "Toggle"
 msgstr "Изменить:"
 
-#: functions.php:3559 functions.php:3605 tt-rss.php:164
+#: functions.php:3562 functions.php:3608 tt-rss.php:164
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:3560
+#: functions.php:3563
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:3563 localized_schema.php:15
+#: functions.php:3566 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:3564
+#: functions.php:3567
 #, fuzzy
 msgid "Selection"
 msgstr "Выбрать:"
 
-#: functions.php:3565
+#: functions.php:3568
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:3567
+#: functions.php:3570
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3568
+#: functions.php:3571
 #, fuzzy
 msgid "Below active article"
 msgstr "Отфильтровать статью"
 
-#: functions.php:3570
+#: functions.php:3573
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:3578
+#: functions.php:3581
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:3579
+#: functions.php:3582
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:3580
+#: functions.php:3583
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:3590 functions.php:3616
+#: functions.php:3593 functions.php:3619
 msgid "Convert to label"
 msgstr "Превратить в метку"
 
-#: functions.php:3604
+#: functions.php:3607
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:3607
+#: functions.php:3610
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:3608
+#: functions.php:3611
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:3609 modules/pref-filters.php:263
+#: functions.php:3612 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:3655
+#: functions.php:3658
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3991
+#: functions.php:3994
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:4008
+#: functions.php:4011
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4233
+#: functions.php:4236
 msgid " - by "
 msgstr ", автор - "
 
-#: functions.php:4282
+#: functions.php:4285
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:4353
+#: functions.php:4356
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:4415
+#: functions.php:4418
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4702
+#: functions.php:4616
+#, fuzzy
+msgid "Show article"
+msgstr "Отмеченные"
+
+#: functions.php:4713
 msgid "No articles found."
 msgstr "Статей не найдено."
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 83c16ea4e..fd9d4f181 100644
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index c857e9734..5a83e8897 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-26 15:17+0400\n"
+"POT-Creation-Date: 2007-10-29 14:21+0300\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -136,185 +136,190 @@ msgstr ""
 "不支持你的MySQL版本. 请访问 \n"
 "\t\t官方网站获取更多信息。"
 
-#: functions.php:2285 functions.php:2624 functions.php:2984 functions.php:3757
+#: functions.php:2286 functions.php:2625 functions.php:2985 functions.php:3760
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2294 functions.php:2626 functions.php:2986 functions.php:3764
+#: functions.php:2295 functions.php:2627 functions.php:2987 functions.php:3767
 #: modules/pref-feeds.php:1068
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2303 functions.php:2628 functions.php:2988 functions.php:3742
+#: functions.php:2304 functions.php:2629 functions.php:2989 functions.php:3745
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:2546 modules/popup-dialog.php:151
+#: functions.php:2547 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2575 functions.php:2614 functions.php:2962 functions.php:3921
-#: functions.php:3951 modules/pref-feeds.php:880
+#: functions.php:2576 functions.php:2615 functions.php:2963 functions.php:3924
+#: functions.php:3954 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2604 functions.php:3128
+#: functions.php:2605 functions.php:3129
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2606 functions.php:3130
+#: functions.php:2607 functions.php:3131
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:2948 functions.php:2950
+#: functions.php:2949 functions.php:2951
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:2966 functions.php:2979 functions.php:2996
+#: functions.php:2967 functions.php:2980 functions.php:2997
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:3268
+#: functions.php:3271
 msgid "New headlines for last 24 hours, as of "
 msgstr "24小时最新提要,截至"
 
-#: functions.php:3319
+#: functions.php:3322
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr "由于您启用了Tiny Tiny RSS每日文摘，会收到此邮件。"
 
-#: functions.php:3321
+#: functions.php:3324
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr "若要退订,访问你的配置选项或联络管理员。\n"
 
-#: functions.php:3552 functions.php:3599 functions.php:4639
+#: functions.php:3555 functions.php:3602 functions.php:4650
 #: 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:3553 functions.php:3600 modules/pref-feeds.php:656
+#: functions.php:3556 functions.php:3603 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:3554 functions.php:3558 functions.php:3601 functions.php:3604
+#: functions.php:3557 functions.php:3561 functions.php:3604 functions.php:3607
 #: tt-rss.php:165
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3555 functions.php:3602 modules/pref-feeds.php:657
+#: functions.php:3558 functions.php:3605 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:3557
+#: functions.php:3560
 msgid "Toggle"
 msgstr "触发开关"
 
-#: functions.php:3559 functions.php:3605 tt-rss.php:164
+#: functions.php:3562 functions.php:3608 tt-rss.php:164
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:3560
+#: functions.php:3563
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:3563 localized_schema.php:15
+#: functions.php:3566 localized_schema.php:15
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:3564
+#: functions.php:3567
 msgid "Selection"
 msgstr "选择："
 
-#: functions.php:3565
+#: functions.php:3568
 msgid "This page"
 msgstr "本页"
 
-#: functions.php:3567
+#: functions.php:3570
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3568
+#: functions.php:3571
 #, fuzzy
 msgid "Below active article"
 msgstr "过滤文章"
 
-#: functions.php:3570
+#: functions.php:3573
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:3578
+#: functions.php:3581
 msgid "Next page"
 msgstr "下页"
 
-#: functions.php:3579
+#: functions.php:3582
 msgid "Previous page"
 msgstr "上页"
 
-#: functions.php:3580
+#: functions.php:3583
 msgid "First page"
 msgstr "首页"
 
-#: functions.php:3590 functions.php:3616
+#: functions.php:3593 functions.php:3619
 msgid "Convert to label"
 msgstr "转换标签"
 
-#: functions.php:3604
+#: functions.php:3607
 msgid "Toggle:"
 msgstr "触发:"
 
-#: functions.php:3607
+#: functions.php:3610
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:3608
+#: functions.php:3611
 msgid "Page"
 msgstr "页"
 
-#: functions.php:3609 modules/pref-filters.php:263
+#: functions.php:3612 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3655
+#: functions.php:3658
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:3991
+#: functions.php:3994
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4008
+#: functions.php:4011
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4233
+#: functions.php:4236
 msgid " - by "
 msgstr ", 由 - "
 
-#: functions.php:4282
+#: functions.php:4285
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:4353
+#: functions.php:4356
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4415
+#: functions.php:4418
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4702
+#: functions.php:4616
+#, fuzzy
+msgid "Show article"
+msgstr "星级文章"
+
+#: functions.php:4713
 msgid "No articles found."
 msgstr "未找到文章。"