diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 85b739482..4cf130c87 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 a5af8f6aa..3949e7b24 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: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-11 00:14+0400\n"
+"POT-Creation-Date: 2007-08-11 00:35+0400\n"
 "PO-Revision-Date: 2007-08-10 16:30+0200\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -235,7 +235,7 @@ msgstr "Remarquables"
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:3126
+#: functions.php:3126 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
@@ -562,25 +562,218 @@ msgstr ""
 msgid "Can't subscribe: no feed URL given."
 msgstr ""
 
-#: localized_schema.php:5 modules/popup-dialog.php:166
+#: localized_schema.php:9 modules/popup-dialog.php:166
 #: modules/pref-feeds.php:865 modules/pref-feeds.php:926
 msgid "Title"
 msgstr "Titre"
 
-#: localized_schema.php:6
+#: localized_schema.php:10
 #, fuzzy
 msgid "Title or Content"
 msgstr "Titre ou contenu"
 
-#: localized_schema.php:7
+#: localized_schema.php:11
 #, fuzzy
 msgid "Link"
 msgstr "Lier à&nbsp;:"
 
-#: localized_schema.php:8 modules/popup-dialog.php:167
+#: localized_schema.php:12 modules/popup-dialog.php:167
 msgid "Content"
 msgstr "Contenu"
 
+#: localized_schema.php:14
+#, fuzzy
+msgid "Filter article"
+msgstr "Articles remarquables"
+
+#: localized_schema.php:16
+#, fuzzy
+msgid "Set starred"
+msgstr "Remarquables"
+
+#: localized_schema.php:17
+#, fuzzy
+msgid "Publish article"
+msgstr "Articles publiés"
+
+#: localized_schema.php:18
+#, fuzzy
+msgid "Assign tags"
+msgstr "aucune étiquette"
+
+#: localized_schema.php:22
+msgid "General"
+msgstr ""
+
+#: localized_schema.php:24
+msgid "Allow duplicate posts"
+msgstr ""
+
+#: localized_schema.php:25
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
+
+#: localized_schema.php:26
+msgid "Default interval between feed updates (in minutes)"
+msgstr ""
+
+#: localized_schema.php:27
+#, fuzzy
+msgid "Enable e-mail digest"
+msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
+
+#: localized_schema.php:28
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+
+#: localized_schema.php:29
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr ""
+
+#: localized_schema.php:30
+msgid "Update post on checksum change"
+msgstr ""
+
+#: localized_schema.php:32
+msgid "Interface"
+msgstr ""
+
+#: localized_schema.php:34
+#, fuzzy
+msgid "Combined feed display"
+msgstr "Aucun flux à afficher."
+
+#: localized_schema.php:35
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+
+#: localized_schema.php:36
+msgid "Default article limit"
+msgstr ""
+
+#: localized_schema.php:37
+#, fuzzy
+msgid "Enable feed categories"
+msgstr "Modifier les catégories"
+
+#: localized_schema.php:38
+msgid "Hide feeds with no unread messages"
+msgstr ""
+
+#: localized_schema.php:39
+msgid "Mark articles as read automatically"
+msgstr ""
+
+#: localized_schema.php:40
+msgid ""
+"This option enables marking articles as read automatically in combined mode "
+"while you scroll article list."
+msgstr ""
+
+#: localized_schema.php:41
+msgid "On catchup show next feed"
+msgstr ""
+
+#: localized_schema.php:42
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+
+#: localized_schema.php:43
+msgid "Open article links in new browser window"
+msgstr ""
+
+#: localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr ""
+
+#: localized_schema.php:45
+msgid "Show content preview in headlines list"
+msgstr ""
+
+#: localized_schema.php:46
+msgid "Sort feeds by unread articles count"
+msgstr ""
+
+#: localized_schema.php:47
+msgid "User stylesheet URL"
+msgstr ""
+
+#: localized_schema.php:48
+msgid "Link to user stylesheet to override default style, disabled if empty."
+msgstr ""
+
+#: localized_schema.php:50
+msgid "Advanced"
+msgstr ""
+
+#: localized_schema.php:52
+msgid "Blacklisted tags"
+msgstr ""
+
+#: localized_schema.php:53
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+
+#: localized_schema.php:54
+#, fuzzy
+msgid "Confirm marking feed as read"
+msgstr "Marquage de tous les flux comme lus..."
+
+#: localized_schema.php:55
+msgid "Enable icons in feedlist"
+msgstr ""
+
+#: localized_schema.php:56
+#, fuzzy
+msgid "Enable labels"
+msgstr "Créer un intitulé"
+
+#: localized_schema.php:57
+msgid ""
+"Experimental support for virtual feeds based on user crafted SQL queries. "
+"This feature is highly experimental and at this point not user friendly. Use "
+"with caution."
+msgstr ""
+
+#: localized_schema.php:58
+msgid "Long date format"
+msgstr ""
+
+#: localized_schema.php:59
+msgid "Set articles as unread on update"
+msgstr ""
+
+#: localized_schema.php:60
+msgid "Short date format"
+msgstr ""
+
+#: localized_schema.php:61
+msgid "Show additional information in feedlist"
+msgstr ""
+
+#: localized_schema.php:62
+msgid "Strip unsafe tags from articles"
+msgstr ""
+
+#: localized_schema.php:63
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr ""
+
+#: localized_schema.php:64
+msgid "Use more accessible date/time format for headlines"
+msgstr ""
+
 #: login_form.php:49 modules/popup-dialog.php:90 modules/pref-feeds.php:264
 #: modules/pref-users.php:29
 msgid "Login:"
@@ -1454,10 +1647,24 @@ msgstr "Modifier l'adresse électronique"
 msgid "short_desc"
 msgstr ""
 
+#: modules/pref-prefs.php:365 modules/pref-prefs.php:370
+msgid "Yes"
+msgstr ""
+
+#: modules/pref-prefs.php:367 modules/pref-prefs.php:370
+#, fuzzy
+msgid "No"
+msgstr "Aucun"
+
 #: modules/pref-users.php:12
 msgid "User editor"
 msgstr "Éditeur d'utilisateur"
 
+#: modules/pref-users.php:33
+#, fuzzy
+msgid "Change password:"
+msgstr "Modifier le mot de passe"
+
 #: modules/pref-users.php:37
 msgid "E-mail:"
 msgstr "Adresse électronique&nbsp;:"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 39e8976a1..33909c038 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 d35df9942..04ed2e14b 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-08-11 00:14+0400\n"
+"POT-Creation-Date: 2007-08-11 00:35+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"
@@ -227,7 +227,7 @@ msgstr "Отмеченные"
 msgid "Published"
 msgstr ""
 
-#: functions.php:3126
+#: functions.php:3126 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
@@ -552,25 +552,218 @@ msgstr ""
 msgid "Can't subscribe: no feed URL given."
 msgstr ""
 
-#: localized_schema.php:5 modules/popup-dialog.php:166
+#: localized_schema.php:9 modules/popup-dialog.php:166
 #: modules/pref-feeds.php:865 modules/pref-feeds.php:926
 msgid "Title"
 msgstr "Заголовок"
 
-#: localized_schema.php:6
+#: localized_schema.php:10
 #, fuzzy
 msgid "Title or Content"
 msgstr "Заголовок или содержимое"
 
-#: localized_schema.php:7
+#: localized_schema.php:11
 #, fuzzy
 msgid "Link"
 msgstr "Связать с:"
 
-#: localized_schema.php:8 modules/popup-dialog.php:167
+#: localized_schema.php:12 modules/popup-dialog.php:167
 msgid "Content"
 msgstr "Содержимое"
 
+#: localized_schema.php:14
+#, fuzzy
+msgid "Filter article"
+msgstr "Отмеченные статьи"
+
+#: localized_schema.php:16
+#, fuzzy
+msgid "Set starred"
+msgstr "Отмеченные"
+
+#: localized_schema.php:17
+#, fuzzy
+msgid "Publish article"
+msgstr "Отмеченные статьи"
+
+#: localized_schema.php:18
+#, fuzzy
+msgid "Assign tags"
+msgstr "нет тегов"
+
+#: localized_schema.php:22
+msgid "General"
+msgstr ""
+
+#: localized_schema.php:24
+msgid "Allow duplicate posts"
+msgstr ""
+
+#: localized_schema.php:25
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
+
+#: localized_schema.php:26
+msgid "Default interval between feed updates (in minutes)"
+msgstr ""
+
+#: localized_schema.php:27
+#, fuzzy
+msgid "Enable e-mail digest"
+msgstr "Включить в дайджест"
+
+#: localized_schema.php:28
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+
+#: localized_schema.php:29
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr ""
+
+#: localized_schema.php:30
+msgid "Update post on checksum change"
+msgstr ""
+
+#: localized_schema.php:32
+msgid "Interface"
+msgstr ""
+
+#: localized_schema.php:34
+#, fuzzy
+msgid "Combined feed display"
+msgstr "Нет каналов для отображения."
+
+#: localized_schema.php:35
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+
+#: localized_schema.php:36
+msgid "Default article limit"
+msgstr ""
+
+#: localized_schema.php:37
+#, fuzzy
+msgid "Enable feed categories"
+msgstr "Редактировать категории"
+
+#: localized_schema.php:38
+msgid "Hide feeds with no unread messages"
+msgstr ""
+
+#: localized_schema.php:39
+msgid "Mark articles as read automatically"
+msgstr ""
+
+#: localized_schema.php:40
+msgid ""
+"This option enables marking articles as read automatically in combined mode "
+"while you scroll article list."
+msgstr ""
+
+#: localized_schema.php:41
+msgid "On catchup show next feed"
+msgstr ""
+
+#: localized_schema.php:42
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+
+#: localized_schema.php:43
+msgid "Open article links in new browser window"
+msgstr ""
+
+#: localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr ""
+
+#: localized_schema.php:45
+msgid "Show content preview in headlines list"
+msgstr ""
+
+#: localized_schema.php:46
+msgid "Sort feeds by unread articles count"
+msgstr ""
+
+#: localized_schema.php:47
+msgid "User stylesheet URL"
+msgstr ""
+
+#: localized_schema.php:48
+msgid "Link to user stylesheet to override default style, disabled if empty."
+msgstr ""
+
+#: localized_schema.php:50
+msgid "Advanced"
+msgstr ""
+
+#: localized_schema.php:52
+msgid "Blacklisted tags"
+msgstr ""
+
+#: localized_schema.php:53
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+
+#: localized_schema.php:54
+#, fuzzy
+msgid "Confirm marking feed as read"
+msgstr "Помечаю все каналы как прочитанные..."
+
+#: localized_schema.php:55
+msgid "Enable icons in feedlist"
+msgstr ""
+
+#: localized_schema.php:56
+#, fuzzy
+msgid "Enable labels"
+msgstr "Создать метку"
+
+#: localized_schema.php:57
+msgid ""
+"Experimental support for virtual feeds based on user crafted SQL queries. "
+"This feature is highly experimental and at this point not user friendly. Use "
+"with caution."
+msgstr ""
+
+#: localized_schema.php:58
+msgid "Long date format"
+msgstr ""
+
+#: localized_schema.php:59
+msgid "Set articles as unread on update"
+msgstr ""
+
+#: localized_schema.php:60
+msgid "Short date format"
+msgstr ""
+
+#: localized_schema.php:61
+msgid "Show additional information in feedlist"
+msgstr ""
+
+#: localized_schema.php:62
+msgid "Strip unsafe tags from articles"
+msgstr ""
+
+#: localized_schema.php:63
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr ""
+
+#: localized_schema.php:64
+msgid "Use more accessible date/time format for headlines"
+msgstr ""
+
 #: login_form.php:49 modules/popup-dialog.php:90 modules/pref-feeds.php:264
 #: modules/pref-users.php:29
 msgid "Login:"
@@ -1398,10 +1591,24 @@ msgstr "Изменить e-mail"
 msgid "short_desc"
 msgstr ""
 
+#: modules/pref-prefs.php:365 modules/pref-prefs.php:370
+msgid "Yes"
+msgstr ""
+
+#: modules/pref-prefs.php:367 modules/pref-prefs.php:370
+#, fuzzy
+msgid "No"
+msgstr "Ничего"
+
 #: modules/pref-users.php:12
 msgid "User editor"
 msgstr "Редактор пользователей"
 
+#: modules/pref-users.php:33
+#, fuzzy
+msgid "Change password:"
+msgstr "Изменить пароль"
+
 #: modules/pref-users.php:37
 msgid "E-mail:"
 msgstr ""
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 951fc61bc..5d33b684f 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 706ce5314..e3fcf19ca 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-11 00:14+0400\n"
+"POT-Creation-Date: 2007-08-11 00:35+0400\n"
 "PO-Revision-Date: 2007-06-10 11:56+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -228,7 +228,7 @@ msgstr "星级"
 msgid "Published"
 msgstr ""
 
-#: functions.php:3126
+#: functions.php:3126 localized_schema.php:15
 msgid "Mark as read"
 msgstr "标记为已读"
 
@@ -554,25 +554,218 @@ msgstr ""
 msgid "Can't subscribe: no feed URL given."
 msgstr ""
 
-#: localized_schema.php:5 modules/popup-dialog.php:166
+#: localized_schema.php:9 modules/popup-dialog.php:166
 #: modules/pref-feeds.php:865 modules/pref-feeds.php:926
 msgid "Title"
 msgstr "标题"
 
-#: localized_schema.php:6
+#: localized_schema.php:10
 #, fuzzy
 msgid "Title or Content"
 msgstr "标题或内容"
 
-#: localized_schema.php:7
+#: localized_schema.php:11
 #, fuzzy
 msgid "Link"
 msgstr "链接:"
 
-#: localized_schema.php:8 modules/popup-dialog.php:167
+#: localized_schema.php:12 modules/popup-dialog.php:167
 msgid "Content"
 msgstr "内容"
 
+#: localized_schema.php:14
+#, fuzzy
+msgid "Filter article"
+msgstr "星级文章"
+
+#: localized_schema.php:16
+#, fuzzy
+msgid "Set starred"
+msgstr "星级"
+
+#: localized_schema.php:17
+#, fuzzy
+msgid "Publish article"
+msgstr "星级文章"
+
+#: localized_schema.php:18
+#, fuzzy
+msgid "Assign tags"
+msgstr "无标签"
+
+#: localized_schema.php:22
+msgid "General"
+msgstr ""
+
+#: localized_schema.php:24
+msgid "Allow duplicate posts"
+msgstr ""
+
+#: localized_schema.php:25
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
+
+#: localized_schema.php:26
+msgid "Default interval between feed updates (in minutes)"
+msgstr ""
+
+#: localized_schema.php:27
+#, fuzzy
+msgid "Enable e-mail digest"
+msgstr "包括电子邮件文摘"
+
+#: localized_schema.php:28
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+
+#: localized_schema.php:29
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr ""
+
+#: localized_schema.php:30
+msgid "Update post on checksum change"
+msgstr ""
+
+#: localized_schema.php:32
+msgid "Interface"
+msgstr ""
+
+#: localized_schema.php:34
+#, fuzzy
+msgid "Combined feed display"
+msgstr "无feed显示。"
+
+#: localized_schema.php:35
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+
+#: localized_schema.php:36
+msgid "Default article limit"
+msgstr ""
+
+#: localized_schema.php:37
+#, fuzzy
+msgid "Enable feed categories"
+msgstr "编辑分类"
+
+#: localized_schema.php:38
+msgid "Hide feeds with no unread messages"
+msgstr ""
+
+#: localized_schema.php:39
+msgid "Mark articles as read automatically"
+msgstr ""
+
+#: localized_schema.php:40
+msgid ""
+"This option enables marking articles as read automatically in combined mode "
+"while you scroll article list."
+msgstr ""
+
+#: localized_schema.php:41
+msgid "On catchup show next feed"
+msgstr ""
+
+#: localized_schema.php:42
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+
+#: localized_schema.php:43
+msgid "Open article links in new browser window"
+msgstr ""
+
+#: localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr ""
+
+#: localized_schema.php:45
+msgid "Show content preview in headlines list"
+msgstr ""
+
+#: localized_schema.php:46
+msgid "Sort feeds by unread articles count"
+msgstr ""
+
+#: localized_schema.php:47
+msgid "User stylesheet URL"
+msgstr ""
+
+#: localized_schema.php:48
+msgid "Link to user stylesheet to override default style, disabled if empty."
+msgstr ""
+
+#: localized_schema.php:50
+msgid "Advanced"
+msgstr ""
+
+#: localized_schema.php:52
+msgid "Blacklisted tags"
+msgstr ""
+
+#: localized_schema.php:53
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+
+#: localized_schema.php:54
+#, fuzzy
+msgid "Confirm marking feed as read"
+msgstr "标记所有Feed未已读..."
+
+#: localized_schema.php:55
+msgid "Enable icons in feedlist"
+msgstr ""
+
+#: localized_schema.php:56
+#, fuzzy
+msgid "Enable labels"
+msgstr "创建标记"
+
+#: localized_schema.php:57
+msgid ""
+"Experimental support for virtual feeds based on user crafted SQL queries. "
+"This feature is highly experimental and at this point not user friendly. Use "
+"with caution."
+msgstr ""
+
+#: localized_schema.php:58
+msgid "Long date format"
+msgstr ""
+
+#: localized_schema.php:59
+msgid "Set articles as unread on update"
+msgstr ""
+
+#: localized_schema.php:60
+msgid "Short date format"
+msgstr ""
+
+#: localized_schema.php:61
+msgid "Show additional information in feedlist"
+msgstr ""
+
+#: localized_schema.php:62
+msgid "Strip unsafe tags from articles"
+msgstr ""
+
+#: localized_schema.php:63
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr ""
+
+#: localized_schema.php:64
+msgid "Use more accessible date/time format for headlines"
+msgstr ""
+
 #: login_form.php:49 modules/popup-dialog.php:90 modules/pref-feeds.php:264
 #: modules/pref-users.php:29
 msgid "Login:"
@@ -1417,10 +1610,24 @@ msgstr "更改 e-mail"
 msgid "short_desc"
 msgstr ""
 
+#: modules/pref-prefs.php:365 modules/pref-prefs.php:370
+msgid "Yes"
+msgstr ""
+
+#: modules/pref-prefs.php:367 modules/pref-prefs.php:370
+#, fuzzy
+msgid "No"
+msgstr "无"
+
 #: modules/pref-users.php:12
 msgid "User editor"
 msgstr "用户编辑"
 
+#: modules/pref-users.php:33
+#, fuzzy
+msgid "Change password:"
+msgstr "更改密码"
+
 #: modules/pref-users.php:37
 msgid "E-mail:"
 msgstr "E-mail:"
diff --git a/localized_schema.php b/localized_schema.php
index fbae9b14f..aac03712c 100644
--- a/localized_schema.php
+++ b/localized_schema.php
@@ -17,5 +17,50 @@
 	__("Publish article");
 	__("Assign tags");
 
+	# prefs
+
+	__("General");
+
+	__("Allow duplicate posts");
+	__("This option is useful when you are reading several planet-type aggregators with partially colliding userbase. When disabled, it forces same posts from different feeds to appear only once.");
+	__("Default interval between feed updates (in minutes)");
+	__("Enable e-mail digest");
+	__("This option enables sending daily digest of new (and unread) headlines on your configured e-mail address");
+	__("Purge old posts after this number of days (0 - disables)");
+	__("Update post on checksum change");
+
+	__("Interface");
+
+	__("Combined feed display");
+	__("Display expanded list of feed articles, instead of separate displays for headlines and article content");
+	__("Default article limit");
+	__("Enable feed categories");
+	__("Hide feeds with no unread messages");
+	__("Mark articles as read automatically");
+	__("This option enables marking articles as read automatically in combined mode while you scroll article list.");
+	__("On catchup show next feed");
+	__("When \"Mark as read\" button is clicked in toolbar, automatically open next feed with unread articles.");
+	__("Open article links in new browser window");
+	__("Reverse headline order (oldest first)");
+	__("Show content preview in headlines list");
+	__("Sort feeds by unread articles count");
+	__("User stylesheet URL");
+	__("Link to user stylesheet to override default style, disabled if empty.");
+	
+	__("Advanced");
+
+	__("Blacklisted tags");
+	__("When auto-detecting tags in articles these tags will not be applied (comma-separated list).");
+	__("Confirm marking feed as read");
+	__("Enable icons in feedlist");
+	__("Enable labels");
+	__("Experimental support for virtual feeds based on user crafted SQL queries. This feature is highly experimental and at this point not user friendly. Use with caution.");
+	__("Long date format");
+	__("Set articles as unread on update");
+	__("Short date format");
+	__("Show additional information in feedlist");
+	__("Strip unsafe tags from articles");
+	__("Strip all but most common HTML tags when reading articles.");
+	__("Use more accessible date/time format for headlines");
 
 ?>
diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index 7ade0391b..caa5bed94 100644
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -362,12 +362,12 @@
 //					print_select($pref_name, $value, array("true", "false"));
 
 					if ($value == "true") {
-						$value = "Yes";
+						$value = __("Yes");
 					} else {
-						$value = "No";
+						$value = __("No");
 					}
 
-					print_radio($pref_name, $value, array("Yes", "No"));
+					print_radio($pref_name, $value, array(__("Yes"), __("No")));
 			
 				} else {
 					print "<input class=\"editbox\" name=\"$pref_name\" value=\"$value\">";