diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 703860974..d05b4d75c 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 37922f22a..0d7e48e6e 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-09-30 11:48+0400\n"
+"POT-Creation-Date: 2007-10-18 11:11+0400\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:2277 functions.php:2616 functions.php:2975 functions.php:3734
+#: functions.php:2289 functions.php:2628 functions.php:2988 functions.php:3769
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2286 functions.php:2618 functions.php:2977 functions.php:3741
+#: functions.php:2298 functions.php:2630 functions.php:2990 functions.php:3776
 #: modules/pref-feeds.php:1047
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2295 functions.php:2620 functions.php:2979 functions.php:3719
+#: functions.php:2307 functions.php:2632 functions.php:2992 functions.php:3754
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: functions.php:2538 modules/popup-dialog.php:151
+#: functions.php:2550 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2567 functions.php:2606 functions.php:2953 functions.php:3898
-#: functions.php:3928 modules/pref-feeds.php:880
+#: functions.php:2579 functions.php:2618 functions.php:2966 functions.php:3933
+#: functions.php:3963 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2596 functions.php:3119
+#: functions.php:2608 functions.php:3132
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2598 functions.php:3121
+#: functions.php:2610 functions.php:3134
 msgid "Labels"
 msgstr "Intitulé"
 
-#: functions.php:2939 functions.php:2941
+#: functions.php:2952 functions.php:2954
 msgid "Search results"
 msgstr "Résultats de recherche"
 
-#: functions.php:2957 functions.php:2970 functions.php:2987
+#: functions.php:2970 functions.php:2983 functions.php:3000
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:3251
+#: functions.php:3280
 msgid "New headlines for last 24 hours, as of "
 msgstr "Nouveaux en-têtes dans les dernières 24 heures, à compter de "
 
-#: functions.php:3296
+#: functions.php:3331
 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:3298
+#: functions.php:3333
 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:3529 functions.php:3576 functions.php:4596
+#: functions.php:3564 functions.php:3611 functions.php:4651
 #: 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:3530 functions.php:3577 modules/pref-feeds.php:656
+#: functions.php:3565 functions.php:3612 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:3531 functions.php:3535 functions.php:3578 functions.php:3581
+#: functions.php:3566 functions.php:3570 functions.php:3613 functions.php:3616
 #: tt-rss.php:165
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3532 functions.php:3579 modules/pref-feeds.php:657
+#: functions.php:3567 functions.php:3614 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:3534
+#: functions.php:3569
 msgid "Toggle"
 msgstr "Marquages spéciaux&nbsp;"
 
-#: functions.php:3536 functions.php:3582 tt-rss.php:164
+#: functions.php:3571 functions.php:3617 tt-rss.php:164
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:3537
+#: functions.php:3572
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:3540 localized_schema.php:15
+#: functions.php:3575 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: functions.php:3541
+#: functions.php:3576
 msgid "Selection"
 msgstr "La sélection"
 
-#: functions.php:3542
+#: functions.php:3577
 msgid "This page"
 msgstr "Cette page"
 
-#: functions.php:3544
+#: functions.php:3579
 msgid "Above active article"
 msgstr "Au-dessus de l'article courant"
 
-#: functions.php:3545
+#: functions.php:3580
 msgid "Below active article"
 msgstr "En dessous de l'article courant"
 
-#: functions.php:3547
+#: functions.php:3582
 msgid "Entire feed"
 msgstr "Tout le flux"
 
-#: functions.php:3555
+#: functions.php:3590
 msgid "Next page"
 msgstr "Page suivante"
 
-#: functions.php:3556
+#: functions.php:3591
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: functions.php:3557
+#: functions.php:3592
 msgid "First page"
 msgstr "Première page"
 
-#: functions.php:3567 functions.php:3593
+#: functions.php:3602 functions.php:3628
 msgid "Convert to label"
 msgstr "Convertir en intitulé"
 
-#: functions.php:3581
+#: functions.php:3616
 msgid "Toggle:"
 msgstr "Marquages spéciaux&nbsp;:"
 
-#: functions.php:3584
+#: functions.php:3619
 msgid "Mark as read:"
 msgstr "Marquer comme lu&nbsp;:"
 
-#: functions.php:3585
+#: functions.php:3620
 msgid "Page"
 msgstr "Page"
 
-#: functions.php:3586 modules/pref-filters.php:263
+#: functions.php:3621 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Flux"
 
-#: functions.php:3632
+#: functions.php:3667
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:3968
+#: functions.php:4003
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:3985
+#: functions.php:4020
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:4210
+#: functions.php:4245
 msgid " - by "
 msgstr "- par "
 
-#: functions.php:4259
+#: functions.php:4294
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:4330
+#: functions.php:4365
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:4392
+#: functions.php:4427
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -328,7 +328,7 @@ 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:4659
+#: functions.php:4714
 msgid "No articles found."
 msgstr "Aucun article trouvé."
 
@@ -890,6 +890,10 @@ msgstr ""
 msgid "Use more accessible date/time format for headlines"
 msgstr "Afficher la date et l'heure de manière plus lisible dans les en-têtes"
 
+#: localized_schema.php:68
+msgid "Automatically expand articles in combined mode"
+msgstr ""
+
 #: login_form.php:83 modules/popup-dialog.php:100 modules/pref-feeds.php:264
 #: modules/pref-users.php:29
 msgid "Login:"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 5f9561677..268554115 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 9380c8e19..d96ecd3e3 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-09-30 11:48+0400\n"
+"POT-Creation-Date: 2007-10-18 11:11+0400\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,186 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2277 functions.php:2616 functions.php:2975 functions.php:3734
+#: functions.php:2289 functions.php:2628 functions.php:2988 functions.php:3769
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:2286 functions.php:2618 functions.php:2977 functions.php:3741
+#: functions.php:2298 functions.php:2630 functions.php:2990 functions.php:3776
 #: modules/pref-feeds.php:1047
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:2295 functions.php:2620 functions.php:2979 functions.php:3719
+#: functions.php:2307 functions.php:2632 functions.php:2992 functions.php:3754
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Отмеченные"
 
-#: functions.php:2538 modules/popup-dialog.php:151
+#: functions.php:2550 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2567 functions.php:2606 functions.php:2953 functions.php:3898
-#: functions.php:3928 modules/pref-feeds.php:880
+#: functions.php:2579 functions.php:2618 functions.php:2966 functions.php:3933
+#: functions.php:3963 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2596 functions.php:3119
+#: functions.php:2608 functions.php:3132
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2598 functions.php:3121
+#: functions.php:2610 functions.php:3134
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2939 functions.php:2941
+#: functions.php:2952 functions.php:2954
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2957 functions.php:2970 functions.php:2987
+#: functions.php:2970 functions.php:2983 functions.php:3000
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:3251
+#: functions.php:3280
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:3296
+#: functions.php:3331
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:3298
+#: functions.php:3333
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:3529 functions.php:3576 functions.php:4596
+#: functions.php:3564 functions.php:3611 functions.php:4651
 #: 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:3530 functions.php:3577 modules/pref-feeds.php:656
+#: functions.php:3565 functions.php:3612 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:3531 functions.php:3535 functions.php:3578 functions.php:3581
+#: functions.php:3566 functions.php:3570 functions.php:3613 functions.php:3616
 #: tt-rss.php:165
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3532 functions.php:3579 modules/pref-feeds.php:657
+#: functions.php:3567 functions.php:3614 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:3534
+#: functions.php:3569
 msgid "Toggle"
 msgstr "Изменить:"
 
-#: functions.php:3536 functions.php:3582 tt-rss.php:164
+#: functions.php:3571 functions.php:3617 tt-rss.php:164
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:3537
+#: functions.php:3572
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:3540 localized_schema.php:15
+#: functions.php:3575 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:3541
+#: functions.php:3576
 #, fuzzy
 msgid "Selection"
 msgstr "Выбрать:"
 
-#: functions.php:3542
+#: functions.php:3577
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:3544
+#: functions.php:3579
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3545
+#: functions.php:3580
 #, fuzzy
 msgid "Below active article"
 msgstr "Отфильтровать статью"
 
-#: functions.php:3547
+#: functions.php:3582
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:3555
+#: functions.php:3590
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:3556
+#: functions.php:3591
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:3557
+#: functions.php:3592
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:3567 functions.php:3593
+#: functions.php:3602 functions.php:3628
 msgid "Convert to label"
 msgstr "Превратить в метку"
 
-#: functions.php:3581
+#: functions.php:3616
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:3584
+#: functions.php:3619
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:3585
+#: functions.php:3620
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:3586 modules/pref-filters.php:263
+#: functions.php:3621 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:3632
+#: functions.php:3667
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3968
+#: functions.php:4003
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:3985
+#: functions.php:4020
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4210
+#: functions.php:4245
 msgid " - by "
 msgstr ", автор - "
 
-#: functions.php:4259
+#: functions.php:4294
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:4330
+#: functions.php:4365
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:4392
+#: functions.php:4427
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4659
+#: functions.php:4714
 msgid "No articles found."
 msgstr "Статей не найдено."
 
@@ -866,6 +866,10 @@ msgstr "Вырезать все, кроме основных HTML тегов п
 msgid "Use more accessible date/time format for headlines"
 msgstr "Использовать более удобный формат отображения даты/времени"
 
+#: localized_schema.php:68
+msgid "Automatically expand articles in combined mode"
+msgstr ""
+
 #: login_form.php:83 modules/popup-dialog.php:100 modules/pref-feeds.php:264
 #: modules/pref-users.php:29
 msgid "Login:"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 2d45c36aa..e5980722f 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 b0dc76c3a..6a6c75101 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-09-30 11:48+0400\n"
+"POT-Creation-Date: 2007-10-18 11:11+0400\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,185 @@ msgstr ""
 "不支持你的MySQL版本. 请访问 \n"
 "\t\t官方网站获取更多信息。"
 
-#: functions.php:2277 functions.php:2616 functions.php:2975 functions.php:3734
+#: functions.php:2289 functions.php:2628 functions.php:2988 functions.php:3769
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2286 functions.php:2618 functions.php:2977 functions.php:3741
+#: functions.php:2298 functions.php:2630 functions.php:2990 functions.php:3776
 #: modules/pref-feeds.php:1047
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2295 functions.php:2620 functions.php:2979 functions.php:3719
+#: functions.php:2307 functions.php:2632 functions.php:2992 functions.php:3754
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:2538 modules/popup-dialog.php:151
+#: functions.php:2550 modules/popup-dialog.php:151
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2567 functions.php:2606 functions.php:2953 functions.php:3898
-#: functions.php:3928 modules/pref-feeds.php:880
+#: functions.php:2579 functions.php:2618 functions.php:2966 functions.php:3933
+#: functions.php:3963 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2596 functions.php:3119
+#: functions.php:2608 functions.php:3132
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2598 functions.php:3121
+#: functions.php:2610 functions.php:3134
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:2939 functions.php:2941
+#: functions.php:2952 functions.php:2954
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:2957 functions.php:2970 functions.php:2987
+#: functions.php:2970 functions.php:2983 functions.php:3000
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:3251
+#: functions.php:3280
 msgid "New headlines for last 24 hours, as of "
 msgstr "24小时最新提要,截至"
 
-#: functions.php:3296
+#: functions.php:3331
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr "由于您启用了Tiny Tiny RSS每日文摘，会收到此邮件。"
 
-#: functions.php:3298
+#: functions.php:3333
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr "若要退订,访问你的配置选项或联络管理员。\n"
 
-#: functions.php:3529 functions.php:3576 functions.php:4596
+#: functions.php:3564 functions.php:3611 functions.php:4651
 #: 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:3530 functions.php:3577 modules/pref-feeds.php:656
+#: functions.php:3565 functions.php:3612 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:3531 functions.php:3535 functions.php:3578 functions.php:3581
+#: functions.php:3566 functions.php:3570 functions.php:3613 functions.php:3616
 #: tt-rss.php:165
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3532 functions.php:3579 modules/pref-feeds.php:657
+#: functions.php:3567 functions.php:3614 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:3534
+#: functions.php:3569
 msgid "Toggle"
 msgstr "触发开关"
 
-#: functions.php:3536 functions.php:3582 tt-rss.php:164
+#: functions.php:3571 functions.php:3617 tt-rss.php:164
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:3537
+#: functions.php:3572
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:3540 localized_schema.php:15
+#: functions.php:3575 localized_schema.php:15
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:3541
+#: functions.php:3576
 msgid "Selection"
 msgstr "选择："
 
-#: functions.php:3542
+#: functions.php:3577
 msgid "This page"
 msgstr "本页"
 
-#: functions.php:3544
+#: functions.php:3579
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3545
+#: functions.php:3580
 #, fuzzy
 msgid "Below active article"
 msgstr "过滤文章"
 
-#: functions.php:3547
+#: functions.php:3582
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:3555
+#: functions.php:3590
 msgid "Next page"
 msgstr "下页"
 
-#: functions.php:3556
+#: functions.php:3591
 msgid "Previous page"
 msgstr "上页"
 
-#: functions.php:3557
+#: functions.php:3592
 msgid "First page"
 msgstr "首页"
 
-#: functions.php:3567 functions.php:3593
+#: functions.php:3602 functions.php:3628
 msgid "Convert to label"
 msgstr "转换标签"
 
-#: functions.php:3581
+#: functions.php:3616
 msgid "Toggle:"
 msgstr "触发:"
 
-#: functions.php:3584
+#: functions.php:3619
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:3585
+#: functions.php:3620
 msgid "Page"
 msgstr "页"
 
-#: functions.php:3586 modules/pref-filters.php:263
+#: functions.php:3621 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3632
+#: functions.php:3667
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:3968
+#: functions.php:4003
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:3985
+#: functions.php:4020
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4210
+#: functions.php:4245
 msgid " - by "
 msgstr ", 由 - "
 
-#: functions.php:4259
+#: functions.php:4294
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:4330
+#: functions.php:4365
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4392
+#: functions.php:4427
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4659
+#: functions.php:4714
 msgid "No articles found."
 msgstr "未找到文章。"
 
@@ -864,6 +864,10 @@ msgstr "阅读文章时过滤所有常见html标签"
 msgid "Use more accessible date/time format for headlines"
 msgstr "提要使用更方便的 日期／时间 格式"
 
+#: localized_schema.php:68
+msgid "Automatically expand articles in combined mode"
+msgstr ""
+
 #: login_form.php:83 modules/popup-dialog.php:100 modules/pref-feeds.php:264
 #: modules/pref-users.php:29
 msgid "Login:"
diff --git a/localized_schema.php b/localized_schema.php
index 7993f0a3c..080042281 100644
--- a/localized_schema.php
+++ b/localized_schema.php
@@ -65,5 +65,6 @@
 	__("Strip unsafe tags from articles");
 	__("Strip all but most common HTML tags when reading articles.");
 	__("Use more accessible date/time format for headlines");
+	__("Automatically expand articles in combined mode");
 
 ?>