diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index cf8efc04b..4c04cb3dd 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 914c90c7c..a9fb131e2 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-08-23 22:29+0400\n"
+"POT-Creation-Date: 2007-08-26 12:14+0400\n"
 "PO-Revision-Date: 2007-08-22 21:56+0200\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -146,51 +146,51 @@ 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:2153 functions.php:2477 functions.php:2830 functions.php:3556
+#: functions.php:2240 functions.php:2579 functions.php:2934 functions.php:3660
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2162 functions.php:2479 functions.php:2832 functions.php:3563
-#: modules/pref-feeds.php:1003
+#: functions.php:2249 functions.php:2581 functions.php:2936 functions.php:3667
+#: modules/pref-feeds.php:1038
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2171 functions.php:2481 functions.php:2834 functions.php:3541
+#: functions.php:2258 functions.php:2583 functions.php:2938 functions.php:3645
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2399 modules/popup-dialog.php:141
+#: functions.php:2501 modules/popup-dialog.php:141
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2428 functions.php:2467 functions.php:2808 functions.php:3717
-#: functions.php:3747 modules/pref-feeds.php:845
+#: functions.php:2530 functions.php:2569 functions.php:2912 functions.php:3824
+#: functions.php:3854 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2457 functions.php:2974
+#: functions.php:2559 functions.php:3078
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2459 functions.php:2976
+#: functions.php:2561 functions.php:3080
 msgid "Labels"
 msgstr "Intitulé"
 
-#: functions.php:2794 functions.php:2796
+#: functions.php:2898 functions.php:2900
 msgid "Search results"
 msgstr "Résultats de recherche"
 
-#: functions.php:2812 functions.php:2825 functions.php:2842
+#: functions.php:2916 functions.php:2929 functions.php:2946
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:3074
+#: functions.php:3178
 msgid "New headlines for last 24 hours, as of "
 msgstr "Nouveaux en-têtes dans les dernières 24 heures, à compter de "
 
-#: functions.php:3118
+#: functions.php:3222
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
@@ -198,131 +198,131 @@ msgstr ""
 "Vous recevez ce courrier électronique parce que vous avez activé la synthèse "
 "quotidienne dans TIny Tiny RSS sur "
 
-#: functions.php:3120
+#: functions.php:3224
 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:3351 functions.php:3398 functions.php:4396
-#: modules/pref-feeds.php:620 modules/pref-feeds.php:807
+#: functions.php:3455 functions.php:3502 functions.php:4522
+#: 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:3352 functions.php:3399 modules/pref-feeds.php:621
-#: modules/pref-feeds.php:808 modules/pref-filters.php:256
+#: functions.php:3456 functions.php:3503 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:3353 functions.php:3357 functions.php:3400 functions.php:3403
-#: tt-rss.php:168
+#: functions.php:3457 functions.php:3461 functions.php:3504 functions.php:3507
+#: tt-rss.php:169
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3354 functions.php:3401 modules/pref-feeds.php:622
-#: modules/pref-feeds.php:809 modules/pref-filters.php:257
+#: functions.php:3458 functions.php:3505 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:3356
+#: functions.php:3460
 msgid "Toggle"
 msgstr "Marquages spéciaux&nbsp;"
 
-#: functions.php:3358 functions.php:3404 tt-rss.php:167
+#: functions.php:3462 functions.php:3508 tt-rss.php:168
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:3359
+#: functions.php:3463
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:3362 localized_schema.php:15
+#: functions.php:3466 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: functions.php:3363
+#: functions.php:3467
 msgid "Selection"
 msgstr "La sélection"
 
-#: functions.php:3364
+#: functions.php:3468
 msgid "This page"
 msgstr "Cette page"
 
-#: functions.php:3366
+#: functions.php:3470
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3367
+#: functions.php:3471
 #, fuzzy
 msgid "Below active article"
 msgstr "Filtrer l'article"
 
-#: functions.php:3369
+#: functions.php:3473
 msgid "Entire feed"
 msgstr "Tout le flux"
 
-#: functions.php:3377
+#: functions.php:3481
 msgid "Next page"
 msgstr "Page suivante"
 
-#: functions.php:3378
+#: functions.php:3482
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: functions.php:3379
+#: functions.php:3483
 msgid "First page"
 msgstr "Première page"
 
-#: functions.php:3389 functions.php:3415
+#: functions.php:3493 functions.php:3519
 msgid "Convert to label"
 msgstr "Convertir en intitulé"
 
-#: functions.php:3403
+#: functions.php:3507
 msgid "Toggle:"
 msgstr "Marquages spéciaux&nbsp;:"
 
-#: functions.php:3406
+#: functions.php:3510
 msgid "Mark as read:"
 msgstr "Marquer comme lu&nbsp;:"
 
-#: functions.php:3407
+#: functions.php:3511
 msgid "Page"
 msgstr "Page"
 
-#: functions.php:3408 modules/pref-filters.php:263
+#: functions.php:3512 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Flux"
 
-#: functions.php:3454
+#: functions.php:3558
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:3787
+#: functions.php:3894
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:3804
+#: functions.php:3911
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:4026
+#: functions.php:4136
 msgid " - by "
 msgstr "- par "
 
-#: functions.php:4075
+#: functions.php:4185
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:4146
+#: functions.php:4256
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:4208
+#: functions.php:4318
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -330,7 +330,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:4459
+#: functions.php:4585
 msgid "No articles found."
 msgstr "Aucun article trouvé."
 
@@ -540,7 +540,7 @@ msgstr "Impossible de mettre à jour l'en-têtes (objet XML manquant)"
 msgid "Could not display article (missing XML object)"
 msgstr "Impossible d'afficher l'article (objet XML manquant)"
 
-#: localized_js.php:92 tt-rss.php:210 tt-rss.php:214
+#: localized_js.php:92 tt-rss.php:211 tt-rss.php:215
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
@@ -650,8 +650,18 @@ msgstr "Publier l'article"
 msgid "Unpublish article"
 msgstr "Publier l'article"
 
+#: localized_js.php:127
+#, fuzzy
+msgid "You can't clear this type of feed."
+msgstr "Vous ne pouvez pas modifier ce type de flux."
+
+#: localized_js.php:128
+#, php-format
+msgid "Remove all (except starred) stored articles for %s?"
+msgstr ""
+
 #: localized_schema.php:9 modules/popup-dialog.php:172
-#: modules/pref-feeds.php:820 modules/pref-feeds.php:881
+#: modules/pref-feeds.php:855 modules/pref-feeds.php:916
 msgid "Title"
 msgstr "Titre"
 
@@ -901,6 +911,47 @@ msgstr "Langue&nbsp;:"
 msgid "Login"
 msgstr "Se connecter"
 
+#: mysql_convert_unicode.php:28 update.php:28
+msgid "Your access level is insufficient to run this script."
+msgstr "Vous n'avez pas les permissions nécessaires pour exécuter ce script."
+
+#: mysql_convert_unicode.php:54
+msgid "MySQL Charset Updater"
+msgstr ""
+
+#: mysql_convert_unicode.php:61
+msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
+msgstr ""
+
+#: mysql_convert_unicode.php:64 mysql_convert_unicode.php:105 update.php:103
+#: update.php:171
+msgid "Return to Tiny Tiny RSS"
+msgstr "Revenir à Tiny Tiny RSS"
+
+#: mysql_convert_unicode.php:69 update.php:111
+msgid "Please backup your database before proceeding."
+msgstr ""
+"Veuillez faire une copie de sauvegarde de votre base de données avant de "
+"poursuivre."
+
+#: mysql_convert_unicode.php:71
+msgid ""
+"This script will convert your Tiny Tiny RSS database to UTF-8. \n"
+"\t\t\tDepending on current database charset you may experience data "
+"corruption (lost accent characters, etc.). \n"
+"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
+"php to 'utf8'."
+msgstr ""
+
+#: mysql_convert_unicode.php:77 update.php:127
+msgid "Perform updates"
+msgstr "Exécuter les mises à jour"
+
+#: mysql_convert_unicode.php:82
+#, fuzzy
+msgid "Converting database..."
+msgstr "Convertir en intitulé"
+
 #: opml.php:108 opml.php:112
 msgid "OPML Utility"
 msgstr "Outil OPML"
@@ -1068,7 +1119,7 @@ msgid "Actions..."
 msgstr "Actions..."
 
 #: tt-rss.php:131 modules/popup-dialog.php:117 modules/popup-dialog.php:186
-#: modules/pref-feeds.php:714
+#: modules/pref-feeds.php:749
 msgid "Search"
 msgstr "Rechercher"
 
@@ -1085,61 +1136,62 @@ msgid "&nbsp;&nbsp;Edit this feed"
 msgstr "&nbsp;&nbsp;Modifier ce flux"
 
 #: tt-rss.php:137
+#, fuzzy
+msgid "&nbsp;&nbsp;Clear articles"
+msgstr "&nbsp;&nbsp;Créer un filtre"
+
+#: tt-rss.php:138
 msgid "&nbsp;&nbsp;Unsubscribe"
 msgstr "&nbsp;&nbsp;Se désinscrire"
 
-#: tt-rss.php:140
+#: tt-rss.php:141
 msgid "All feeds:"
 msgstr "Tous les flux&nbsp;:"
 
-#: tt-rss.php:142
+#: tt-rss.php:143
 msgid "&nbsp;&nbsp;Update"
 msgstr "&nbsp;&nbsp;Mettre à jour"
 
-#: tt-rss.php:144
+#: tt-rss.php:145
 msgid "&nbsp;&nbsp;Mark as read"
 msgstr "Marquer comme lus"
 
-#: tt-rss.php:145
+#: tt-rss.php:146
 msgid "&nbsp;&nbsp;(Un)hide read feeds"
 msgstr "(Dé)Masquer les flux lus"
 
-#: tt-rss.php:147
+#: tt-rss.php:148
 msgid "Other actions:"
 msgstr "Autres actions&nbsp;:"
 
-#: tt-rss.php:148
+#: tt-rss.php:149
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Créer un filtre"
 
-#: tt-rss.php:156 modules/popup-dialog.php:129
+#: tt-rss.php:157 modules/popup-dialog.php:129
 msgid "Search:"
 msgstr "Rechercher&nbsp;:"
 
-#: tt-rss.php:163
+#: tt-rss.php:164
 msgid "View:"
 msgstr "Afficher&nbsp;:"
 
-#: tt-rss.php:165
+#: tt-rss.php:166
 msgid "Adaptive"
 msgstr "Adaptatif"
 
-#: tt-rss.php:166
+#: tt-rss.php:167
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: tt-rss.php:171
+#: tt-rss.php:172
 msgid "Limit:"
 msgstr "Limite&nbsp;:"
 
-#: tt-rss.php:196
+#: tt-rss.php:197
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: update.php:28
-msgid "Your access level is insufficient to run this script."
-msgstr "Vous n'avez pas les permissions nécessaires pour exécuter ce script."
-
 #: update.php:53
 msgid "Database Updater"
 msgstr "Outil de mise à jour de la base de données"
@@ -1161,16 +1213,6 @@ msgstr ", trouvée&nbsp;: "
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "La base de données de Tiny Tiny RSS est à jour."
 
-#: update.php:103 update.php:171
-msgid "Return to Tiny Tiny RSS"
-msgstr "Revenir à Tiny Tiny RSS"
-
-#: update.php:111
-msgid "Please backup your database before proceeding."
-msgstr ""
-"Veuillez faire une copie de sauvegarde de votre base de données avant de "
-"poursuivre."
-
 #: update.php:113
 #, php-format
 msgid ""
@@ -1180,10 +1222,6 @@ msgstr ""
 "La base de données de Tiny Tiny RSS a besoin d'être mise à jour (version <b>%"
 "d</b> à <b>%d</b>)."
 
-#: update.php:127
-msgid "Perform updates"
-msgstr "Exécuter les mises à jour"
-
 #: update.php:132
 msgid "Performing updates..."
 msgstr "Exécution des mises à jour..."
@@ -1217,7 +1255,7 @@ msgid "Help topic not found."
 msgstr "Sujet non trouvé dans l'aide."
 
 #: modules/help.php:22 modules/popup-dialog.php:42
-#: modules/popup-dialog.php:448 modules/pref-feeds.php:671
+#: modules/popup-dialog.php:448 modules/pref-feeds.php:706
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
@@ -1287,7 +1325,7 @@ msgstr ""
 "\t\t\t\t\tVeuillez vérifier son état ou bien contacter l'administrateur de "
 "votre Tiny Tiny RSS."
 
-#: modules/popup-dialog.php:51 modules/pref-feeds.php:727
+#: modules/popup-dialog.php:51 modules/pref-feeds.php:762
 msgid "Subscribe to feed"
 msgstr "S'inscrire à un flux"
 
@@ -1307,7 +1345,7 @@ msgstr "S'inscrire"
 #: modules/popup-dialog.php:104 modules/popup-dialog.php:189
 #: modules/popup-dialog.php:241 modules/popup-dialog.php:328
 #: modules/popup-dialog.php:424 modules/pref-feeds.php:120
-#: modules/pref-feeds.php:331 modules/pref-filters.php:118
+#: modules/pref-feeds.php:352 modules/pref-filters.php:118
 #: modules/pref-users.php:58
 msgid "Cancel"
 msgstr "Annuler"
@@ -1409,7 +1447,7 @@ msgstr "Modifier les étiquettes"
 msgid "Tags for this article (separated by commas):"
 msgstr "Étiquettes pour cet article (séparées par des virgules)&nbsp;:"
 
-#: modules/popup-dialog.php:420 modules/pref-feeds.php:329
+#: modules/popup-dialog.php:420 modules/pref-feeds.php:350
 #: modules/pref-filters.php:114 modules/pref-users.php:55
 msgid "Save"
 msgstr "Enregistrer"
@@ -1511,98 +1549,102 @@ msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
 msgid "Include in e-mail digest"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: modules/pref-feeds.php:451
+#: modules/pref-feeds.php:340
+msgid "Cache images locally"
+msgstr ""
+
+#: modules/pref-feeds.php:486
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Inscrit à <b>%s</b>."
 
-#: modules/pref-feeds.php:453
+#: modules/pref-feeds.php:488
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Déjà inscrit à <b>%s</b>."
 
-#: modules/pref-feeds.php:538
+#: modules/pref-feeds.php:573
 msgid "Category editor"
 msgstr "Éditeur de catégorie"
 
-#: modules/pref-feeds.php:561
+#: modules/pref-feeds.php:596
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La catégorie <b>%s</b> existe déjà dans la base de données."
 
-#: modules/pref-feeds.php:589
+#: modules/pref-feeds.php:624
 msgid "Unable to delete non empty feed categories."
 msgstr "Impossible de supprimer une catégorie de flux non vide."
 
-#: modules/pref-feeds.php:606
+#: modules/pref-feeds.php:641
 msgid "Create category"
 msgstr "Créer la catégorie"
 
-#: modules/pref-feeds.php:666
+#: modules/pref-feeds.php:701
 msgid "No feed categories defined."
 msgstr "Aucune catégorie de flux définie."
 
-#: modules/pref-feeds.php:677 modules/pref-filters.php:345
+#: modules/pref-feeds.php:712 modules/pref-filters.php:345
 #: modules/pref-labels.php:294 modules/pref-users.php:319
 msgid "Remove"
 msgstr "Supprimer"
 
-#: modules/pref-feeds.php:699
+#: modules/pref-feeds.php:734
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Des erreurs sont survenues pendant la mise à jour de certains flux (cliquez "
 "ici pour les détails)"
 
-#: modules/pref-feeds.php:732
+#: modules/pref-feeds.php:767
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:806
+#: modules/pref-feeds.php:841
 msgid "Show last article times"
 msgstr "Afficher l'heure du dernier article"
 
-#: modules/pref-feeds.php:823 modules/pref-feeds.php:885
+#: modules/pref-feeds.php:858 modules/pref-feeds.php:920
 msgid "Last&nbsp;Article"
 msgstr "Dernier&nbsp;article"
 
-#: modules/pref-feeds.php:826 modules/pref-feeds.php:889
+#: modules/pref-feeds.php:861 modules/pref-feeds.php:924
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: modules/pref-feeds.php:953 modules/pref-filters.php:343
+#: modules/pref-feeds.php:988 modules/pref-filters.php:343
 #: modules/pref-labels.php:292 modules/pref-users.php:317
 msgid "Edit"
 msgstr "Modifier"
 
-#: modules/pref-feeds.php:956
+#: modules/pref-feeds.php:991
 msgid "Unsubscribe"
 msgstr "Se désinscrire"
 
-#: modules/pref-feeds.php:966
+#: modules/pref-feeds.php:1001
 msgid "Recategorize"
 msgstr "Changer de catégorie"
 
-#: modules/pref-feeds.php:975
+#: modules/pref-feeds.php:1010
 msgid "Edit categories"
 msgstr "Modifier les catégories"
 
-#: modules/pref-feeds.php:986
+#: modules/pref-feeds.php:1021
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:990
+#: modules/pref-feeds.php:1025
 msgid "File:"
 msgstr "Fichier&nbsp;:"
 
-#: modules/pref-feeds.php:993
+#: modules/pref-feeds.php:1028
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1000
+#: modules/pref-feeds.php:1035
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: modules/pref-feeds.php:1009
+#: modules/pref-feeds.php:1044
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the address specified below."
@@ -1610,7 +1652,7 @@ msgstr ""
 "Les articles publiés sont exportés comme un flux RSS public et toute "
 "personne qui connaît l'adresse indiquée ci-dessous peut s'y inscrire."
 
-#: modules/pref-feeds.php:1016
+#: modules/pref-feeds.php:1051
 msgid "Generate another address"
 msgstr "Générer une autre adresse"
 
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index b8016acad..0da072ae5 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 0a37b4eff..737b2387a 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-23 22:29+0400\n"
+"POT-Creation-Date: 2007-08-26 12:14+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:2153 functions.php:2477 functions.php:2830 functions.php:3556
+#: functions.php:2240 functions.php:2579 functions.php:2934 functions.php:3660
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:2162 functions.php:2479 functions.php:2832 functions.php:3563
-#: modules/pref-feeds.php:1003
+#: functions.php:2249 functions.php:2581 functions.php:2936 functions.php:3667
+#: modules/pref-feeds.php:1038
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:2171 functions.php:2481 functions.php:2834 functions.php:3541
+#: functions.php:2258 functions.php:2583 functions.php:2938 functions.php:3645
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Отмеченные"
 
-#: functions.php:2399 modules/popup-dialog.php:141
+#: functions.php:2501 modules/popup-dialog.php:141
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2428 functions.php:2467 functions.php:2808 functions.php:3717
-#: functions.php:3747 modules/pref-feeds.php:845
+#: functions.php:2530 functions.php:2569 functions.php:2912 functions.php:3824
+#: functions.php:3854 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2457 functions.php:2974
+#: functions.php:2559 functions.php:3078
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2459 functions.php:2976
+#: functions.php:2561 functions.php:3080
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2794 functions.php:2796
+#: functions.php:2898 functions.php:2900
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:2812 functions.php:2825 functions.php:2842
+#: functions.php:2916 functions.php:2929 functions.php:2946
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:3074
+#: functions.php:3178
 msgid "New headlines for last 24 hours, as of "
 msgstr "Новые заголовки за последние 24 часа, на "
 
-#: functions.php:3118
+#: functions.php:3222
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr ""
 
-#: functions.php:3120
+#: functions.php:3224
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:3351 functions.php:3398 functions.php:4396
-#: modules/pref-feeds.php:620 modules/pref-feeds.php:807
+#: functions.php:3455 functions.php:3502 functions.php:4522
+#: 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:3352 functions.php:3399 modules/pref-feeds.php:621
-#: modules/pref-feeds.php:808 modules/pref-filters.php:256
+#: functions.php:3456 functions.php:3503 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:3353 functions.php:3357 functions.php:3400 functions.php:3403
-#: tt-rss.php:168
+#: functions.php:3457 functions.php:3461 functions.php:3504 functions.php:3507
+#: tt-rss.php:169
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3354 functions.php:3401 modules/pref-feeds.php:622
-#: modules/pref-feeds.php:809 modules/pref-filters.php:257
+#: functions.php:3458 functions.php:3505 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:3356
+#: functions.php:3460
 msgid "Toggle"
 msgstr "Изменить:"
 
-#: functions.php:3358 functions.php:3404 tt-rss.php:167
+#: functions.php:3462 functions.php:3508 tt-rss.php:168
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:3359
+#: functions.php:3463
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:3362 localized_schema.php:15
+#: functions.php:3466 localized_schema.php:15
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:3363
+#: functions.php:3467
 #, fuzzy
 msgid "Selection"
 msgstr "Выбрать:"
 
-#: functions.php:3364
+#: functions.php:3468
 msgid "This page"
 msgstr "Эту страницу"
 
-#: functions.php:3366
+#: functions.php:3470
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3367
+#: functions.php:3471
 #, fuzzy
 msgid "Below active article"
 msgstr "Отфильтровать статью"
 
-#: functions.php:3369
+#: functions.php:3473
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:3377
+#: functions.php:3481
 msgid "Next page"
 msgstr "След. стр."
 
-#: functions.php:3378
+#: functions.php:3482
 msgid "Previous page"
 msgstr "Пред. cтр."
 
-#: functions.php:3379
+#: functions.php:3483
 msgid "First page"
 msgstr "На первую"
 
-#: functions.php:3389 functions.php:3415
+#: functions.php:3493 functions.php:3519
 msgid "Convert to label"
 msgstr "Превратить в метку"
 
-#: functions.php:3403
+#: functions.php:3507
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:3406
+#: functions.php:3510
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:3407
+#: functions.php:3511
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:3408 modules/pref-filters.php:263
+#: functions.php:3512 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:3454
+#: functions.php:3558
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3787
+#: functions.php:3894
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:3804
+#: functions.php:3911
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4026
+#: functions.php:4136
 msgid " - by "
 msgstr ", автор - "
 
-#: functions.php:4075
+#: functions.php:4185
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:4146
+#: functions.php:4256
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:4208
+#: functions.php:4318
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4459
+#: functions.php:4585
 msgid "No articles found."
 msgstr "Статей не найдено."
 
@@ -529,7 +529,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:92 tt-rss.php:210 tt-rss.php:214
+#: localized_js.php:92 tt-rss.php:211 tt-rss.php:215
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
@@ -640,8 +640,18 @@ msgstr "Опубликовать"
 msgid "Unpublish article"
 msgstr "Опубликовать"
 
+#: localized_js.php:127
+#, fuzzy
+msgid "You can't clear this type of feed."
+msgstr "Вы не можете редактировать этот канал."
+
+#: localized_js.php:128
+#, php-format
+msgid "Remove all (except starred) stored articles for %s?"
+msgstr ""
+
 #: localized_schema.php:9 modules/popup-dialog.php:172
-#: modules/pref-feeds.php:820 modules/pref-feeds.php:881
+#: modules/pref-feeds.php:855 modules/pref-feeds.php:916
 msgid "Title"
 msgstr "Заголовок"
 
@@ -868,6 +878,46 @@ msgstr "Язык:"
 msgid "Login"
 msgstr "Пользователь:"
 
+#: mysql_convert_unicode.php:28 update.php:28
+msgid "Your access level is insufficient to run this script."
+msgstr "В доступе отказано - недостаточный уровень привилегий."
+
+#: mysql_convert_unicode.php:54
+msgid "MySQL Charset Updater"
+msgstr ""
+
+#: mysql_convert_unicode.php:61
+msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
+msgstr ""
+
+#: mysql_convert_unicode.php:64 mysql_convert_unicode.php:105 update.php:103
+#: update.php:171
+msgid "Return to Tiny Tiny RSS"
+msgstr "Вернуться к Tiny Tiny RSS"
+
+#: mysql_convert_unicode.php:69 update.php:111
+#, fuzzy
+msgid "Please backup your database before proceeding."
+msgstr "<b>Внимание:</b> Сохраните базу данных перед продолжением."
+
+#: mysql_convert_unicode.php:71
+msgid ""
+"This script will convert your Tiny Tiny RSS database to UTF-8. \n"
+"\t\t\tDepending on current database charset you may experience data "
+"corruption (lost accent characters, etc.). \n"
+"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
+"php to 'utf8'."
+msgstr ""
+
+#: mysql_convert_unicode.php:77 update.php:127
+msgid "Perform updates"
+msgstr "Применить обновления"
+
+#: mysql_convert_unicode.php:82
+#, fuzzy
+msgid "Converting database..."
+msgstr "Превратить в метку"
+
 #: opml.php:108 opml.php:112
 msgid "OPML Utility"
 msgstr "Утилита OPML"
@@ -1008,7 +1058,7 @@ msgid "Actions..."
 msgstr "Действия..."
 
 #: tt-rss.php:131 modules/popup-dialog.php:117 modules/popup-dialog.php:186
-#: modules/pref-feeds.php:714
+#: modules/pref-feeds.php:749
 msgid "Search"
 msgstr "Поиск"
 
@@ -1025,61 +1075,62 @@ msgid "&nbsp;&nbsp;Edit this feed"
 msgstr "&nbsp;&nbsp;Редактировать канал"
 
 #: tt-rss.php:137
+#, fuzzy
+msgid "&nbsp;&nbsp;Clear articles"
+msgstr "&nbsp;&nbsp;Создать фильтр"
+
+#: tt-rss.php:138
 msgid "&nbsp;&nbsp;Unsubscribe"
 msgstr "&nbsp;&nbsp;Отписаться"
 
-#: tt-rss.php:140
+#: tt-rss.php:141
 msgid "All feeds:"
 msgstr "Все каналы:"
 
-#: tt-rss.php:142
+#: tt-rss.php:143
 msgid "&nbsp;&nbsp;Update"
 msgstr "&nbsp;&nbsp;Обновить"
 
-#: tt-rss.php:144
+#: tt-rss.php:145
 msgid "&nbsp;&nbsp;Mark as read"
 msgstr "&nbsp;&nbsp;Пометить как прочитанные"
 
-#: tt-rss.php:145
+#: tt-rss.php:146
 msgid "&nbsp;&nbsp;(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;Спрятать прочитанные"
 
-#: tt-rss.php:147
+#: tt-rss.php:148
 msgid "Other actions:"
 msgstr "Другие действия:"
 
-#: tt-rss.php:148
+#: tt-rss.php:149
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Создать фильтр"
 
-#: tt-rss.php:156 modules/popup-dialog.php:129
+#: tt-rss.php:157 modules/popup-dialog.php:129
 msgid "Search:"
 msgstr "Искать:"
 
-#: tt-rss.php:163
+#: tt-rss.php:164
 msgid "View:"
 msgstr "Показать:"
 
-#: tt-rss.php:165
+#: tt-rss.php:166
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: tt-rss.php:166
+#: tt-rss.php:167
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: tt-rss.php:171
+#: tt-rss.php:172
 msgid "Limit:"
 msgstr "Сколько:"
 
-#: tt-rss.php:196
+#: tt-rss.php:197
 msgid "Update"
 msgstr "Обновить"
 
-#: update.php:28
-msgid "Your access level is insufficient to run this script."
-msgstr "В доступе отказано - недостаточный уровень привилегий."
-
 #: update.php:53
 msgid "Database Updater"
 msgstr "Обновление базы данных"
@@ -1100,15 +1151,6 @@ msgstr ", найдена: "
 msgid "Tiny Tiny RSS database is up to date."
 msgstr ""
 
-#: update.php:103 update.php:171
-msgid "Return to Tiny Tiny RSS"
-msgstr "Вернуться к Tiny Tiny RSS"
-
-#: update.php:111
-#, fuzzy
-msgid "Please backup your database before proceeding."
-msgstr "<b>Внимание:</b> Сохраните базу данных перед продолжением."
-
 #: update.php:113
 #, php-format
 msgid ""
@@ -1116,10 +1158,6 @@ msgid ""
 "<b>%d</b>)."
 msgstr ""
 
-#: update.php:127
-msgid "Perform updates"
-msgstr "Применить обновления"
-
 #: update.php:132
 msgid "Performing updates..."
 msgstr "Идет обновление..."
@@ -1153,7 +1191,7 @@ msgid "Help topic not found."
 msgstr "Раздел помощи не найден."
 
 #: modules/help.php:22 modules/popup-dialog.php:42
-#: modules/popup-dialog.php:448 modules/pref-feeds.php:671
+#: modules/popup-dialog.php:448 modules/pref-feeds.php:706
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
@@ -1213,7 +1251,7 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr ""
 
-#: modules/popup-dialog.php:51 modules/pref-feeds.php:727
+#: modules/popup-dialog.php:51 modules/pref-feeds.php:762
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
@@ -1233,7 +1271,7 @@ msgstr "Подписаться"
 #: modules/popup-dialog.php:104 modules/popup-dialog.php:189
 #: modules/popup-dialog.php:241 modules/popup-dialog.php:328
 #: modules/popup-dialog.php:424 modules/pref-feeds.php:120
-#: modules/pref-feeds.php:331 modules/pref-filters.php:118
+#: modules/pref-feeds.php:352 modules/pref-filters.php:118
 #: modules/pref-users.php:58
 msgid "Cancel"
 msgstr "Отмена"
@@ -1335,7 +1373,7 @@ msgstr "Редактировать теги"
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
-#: modules/popup-dialog.php:420 modules/pref-feeds.php:329
+#: modules/popup-dialog.php:420 modules/pref-feeds.php:350
 #: modules/pref-filters.php:114 modules/pref-users.php:55
 msgid "Save"
 msgstr "Сохранить"
@@ -1434,103 +1472,107 @@ msgstr "Спрятать из моего списка каналов"
 msgid "Include in e-mail digest"
 msgstr "Включить в дайджест"
 
-#: modules/pref-feeds.php:451
+#: modules/pref-feeds.php:340
+msgid "Cache images locally"
+msgstr ""
+
+#: modules/pref-feeds.php:486
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Добавлена подписка на <b>%s</b>."
 
-#: modules/pref-feeds.php:453
+#: modules/pref-feeds.php:488
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:538
+#: modules/pref-feeds.php:573
 msgid "Category editor"
 msgstr "Редактор категорий"
 
-#: modules/pref-feeds.php:561
+#: modules/pref-feeds.php:596
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Категория <b>$%s</b> уже существует."
 
-#: modules/pref-feeds.php:589
+#: modules/pref-feeds.php:624
 msgid "Unable to delete non empty feed categories."
 msgstr "Не могу удалить не пустую категорию"
 
-#: modules/pref-feeds.php:606
+#: modules/pref-feeds.php:641
 msgid "Create category"
 msgstr "Создать категорию"
 
-#: modules/pref-feeds.php:666
+#: modules/pref-feeds.php:701
 msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
-#: modules/pref-feeds.php:677 modules/pref-filters.php:345
+#: modules/pref-feeds.php:712 modules/pref-filters.php:345
 #: modules/pref-labels.php:294 modules/pref-users.php:319
 msgid "Remove"
 msgstr "Удалить"
 
-#: modules/pref-feeds.php:699
+#: modules/pref-feeds.php:734
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могли быть обновлены (щелкните для подробностей)"
 
-#: modules/pref-feeds.php:732
+#: modules/pref-feeds.php:767
 msgid "Top 25"
 msgstr "Топ 25"
 
-#: modules/pref-feeds.php:806
+#: modules/pref-feeds.php:841
 msgid "Show last article times"
 msgstr "Показать дату последней статьи"
 
-#: modules/pref-feeds.php:823 modules/pref-feeds.php:885
+#: modules/pref-feeds.php:858 modules/pref-feeds.php:920
 msgid "Last&nbsp;Article"
 msgstr "Последняя&nbsp;статья"
 
-#: modules/pref-feeds.php:826 modules/pref-feeds.php:889
+#: modules/pref-feeds.php:861 modules/pref-feeds.php:924
 msgid "Updated"
 msgstr "Обновлено"
 
-#: modules/pref-feeds.php:953 modules/pref-filters.php:343
+#: modules/pref-feeds.php:988 modules/pref-filters.php:343
 #: modules/pref-labels.php:292 modules/pref-users.php:317
 msgid "Edit"
 msgstr "Редактировать"
 
-#: modules/pref-feeds.php:956
+#: modules/pref-feeds.php:991
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: modules/pref-feeds.php:966
+#: modules/pref-feeds.php:1001
 msgid "Recategorize"
 msgstr "Изменить категорию"
 
-#: modules/pref-feeds.php:975
+#: modules/pref-feeds.php:1010
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: modules/pref-feeds.php:986
+#: modules/pref-feeds.php:1021
 msgid "OPML"
 msgstr ""
 
-#: modules/pref-feeds.php:990
+#: modules/pref-feeds.php:1025
 #, fuzzy
 msgid "File:"
 msgstr "Заголовок:"
 
-#: modules/pref-feeds.php:993
+#: modules/pref-feeds.php:1028
 msgid "Import"
 msgstr "Импортировать"
 
-#: modules/pref-feeds.php:1000
+#: modules/pref-feeds.php:1035
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: modules/pref-feeds.php:1009
+#: modules/pref-feeds.php:1044
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the address specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1016
+#: modules/pref-feeds.php:1051
 msgid "Generate another address"
 msgstr "Создать другой адрес"
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index c6dab4eaf..39be13c08 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 6d307482a..565c1b3c8 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-08-23 22:29+0400\n"
+"POT-Creation-Date: 2007-08-26 12:14+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:2153 functions.php:2477 functions.php:2830 functions.php:3556
+#: functions.php:2240 functions.php:2579 functions.php:2934 functions.php:3660
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2162 functions.php:2479 functions.php:2832 functions.php:3563
-#: modules/pref-feeds.php:1003
+#: functions.php:2249 functions.php:2581 functions.php:2936 functions.php:3667
+#: modules/pref-feeds.php:1038
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2171 functions.php:2481 functions.php:2834 functions.php:3541
+#: functions.php:2258 functions.php:2583 functions.php:2938 functions.php:3645
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:2399 modules/popup-dialog.php:141
+#: functions.php:2501 modules/popup-dialog.php:141
 #: modules/pref-filters.php:290
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2428 functions.php:2467 functions.php:2808 functions.php:3717
-#: functions.php:3747 modules/pref-feeds.php:845
+#: functions.php:2530 functions.php:2569 functions.php:2912 functions.php:3824
+#: functions.php:3854 modules/pref-feeds.php:880
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2457 functions.php:2974
+#: functions.php:2559 functions.php:3078
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2459 functions.php:2976
+#: functions.php:2561 functions.php:3080
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:2794 functions.php:2796
+#: functions.php:2898 functions.php:2900
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:2812 functions.php:2825 functions.php:2842
+#: functions.php:2916 functions.php:2929 functions.php:2946
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:3074
+#: functions.php:3178
 msgid "New headlines for last 24 hours, as of "
 msgstr "24小时最新提要,截至"
 
-#: functions.php:3118
+#: functions.php:3222
 msgid ""
 "You have been sent this email because you have enabled daily digests in Tiny "
 "Tiny RSS at "
 msgstr "由于您启用了Tiny Tiny RSS每日文摘，会收到此邮件。"
 
-#: functions.php:3120
+#: functions.php:3224
 msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr "若要退订,访问你的配置选项或联络管理员。\n"
 
-#: functions.php:3351 functions.php:3398 functions.php:4396
-#: modules/pref-feeds.php:620 modules/pref-feeds.php:807
+#: functions.php:3455 functions.php:3502 functions.php:4522
+#: 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:3352 functions.php:3399 modules/pref-feeds.php:621
-#: modules/pref-feeds.php:808 modules/pref-filters.php:256
+#: functions.php:3456 functions.php:3503 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:3353 functions.php:3357 functions.php:3400 functions.php:3403
-#: tt-rss.php:168
+#: functions.php:3457 functions.php:3461 functions.php:3504 functions.php:3507
+#: tt-rss.php:169
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3354 functions.php:3401 modules/pref-feeds.php:622
-#: modules/pref-feeds.php:809 modules/pref-filters.php:257
+#: functions.php:3458 functions.php:3505 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:3356
+#: functions.php:3460
 msgid "Toggle"
 msgstr "触发开关"
 
-#: functions.php:3358 functions.php:3404 tt-rss.php:167
+#: functions.php:3462 functions.php:3508 tt-rss.php:168
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:3359
+#: functions.php:3463
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:3362 localized_schema.php:15
+#: functions.php:3466 localized_schema.php:15
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:3363
+#: functions.php:3467
 msgid "Selection"
 msgstr "选择："
 
-#: functions.php:3364
+#: functions.php:3468
 msgid "This page"
 msgstr "本页"
 
-#: functions.php:3366
+#: functions.php:3470
 msgid "Above active article"
 msgstr ""
 
-#: functions.php:3367
+#: functions.php:3471
 #, fuzzy
 msgid "Below active article"
 msgstr "过滤文章"
 
-#: functions.php:3369
+#: functions.php:3473
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:3377
+#: functions.php:3481
 msgid "Next page"
 msgstr "下页"
 
-#: functions.php:3378
+#: functions.php:3482
 msgid "Previous page"
 msgstr "上页"
 
-#: functions.php:3379
+#: functions.php:3483
 msgid "First page"
 msgstr "首页"
 
-#: functions.php:3389 functions.php:3415
+#: functions.php:3493 functions.php:3519
 msgid "Convert to label"
 msgstr "转换标签"
 
-#: functions.php:3403
+#: functions.php:3507
 msgid "Toggle:"
 msgstr "触发:"
 
-#: functions.php:3406
+#: functions.php:3510
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:3407
+#: functions.php:3511
 msgid "Page"
 msgstr "页"
 
-#: functions.php:3408 modules/pref-filters.php:263
+#: functions.php:3512 modules/pref-filters.php:263
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3454
+#: functions.php:3558
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:3787
+#: functions.php:3894
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:3804
+#: functions.php:3911
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4026
+#: functions.php:4136
 msgid " - by "
 msgstr ", 由 - "
 
-#: functions.php:4075
+#: functions.php:4185
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:4146
+#: functions.php:4256
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4208
+#: functions.php:4318
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4459
+#: functions.php:4585
 msgid "No articles found."
 msgstr "未找到文章。"
 
@@ -524,7 +524,7 @@ msgstr "更新提要失败（缺少XML支持）"
 msgid "Could not display article (missing XML object)"
 msgstr "显示条目失败（缺少XML支持）"
 
-#: localized_js.php:92 tt-rss.php:210 tt-rss.php:214
+#: localized_js.php:92 tt-rss.php:211 tt-rss.php:215
 msgid "No feed selected."
 msgstr "无选定feed."
 
@@ -635,8 +635,18 @@ msgstr "发布文章"
 msgid "Unpublish article"
 msgstr "发布文章"
 
+#: localized_js.php:127
+#, fuzzy
+msgid "You can't clear this type of feed."
+msgstr "您不能编辑本分类feed"
+
+#: localized_js.php:128
+#, php-format
+msgid "Remove all (except starred) stored articles for %s?"
+msgstr ""
+
 #: localized_schema.php:9 modules/popup-dialog.php:172
-#: modules/pref-feeds.php:820 modules/pref-feeds.php:881
+#: modules/pref-feeds.php:855 modules/pref-feeds.php:916
 msgid "Title"
 msgstr "标题"
 
@@ -866,6 +876,45 @@ msgstr "语言："
 msgid "Login"
 msgstr "登陆"
 
+#: mysql_convert_unicode.php:28 update.php:28
+msgid "Your access level is insufficient to run this script."
+msgstr "权限不足。"
+
+#: mysql_convert_unicode.php:54
+msgid "MySQL Charset Updater"
+msgstr ""
+
+#: mysql_convert_unicode.php:61
+msgid "This script is for Tiny Tiny RSS installations with MySQL backend only."
+msgstr ""
+
+#: mysql_convert_unicode.php:64 mysql_convert_unicode.php:105 update.php:103
+#: update.php:171
+msgid "Return to Tiny Tiny RSS"
+msgstr "返回Tiny Tiny RSS"
+
+#: mysql_convert_unicode.php:69 update.php:111
+msgid "Please backup your database before proceeding."
+msgstr ""
+
+#: mysql_convert_unicode.php:71
+msgid ""
+"This script will convert your Tiny Tiny RSS database to UTF-8. \n"
+"\t\t\tDepending on current database charset you may experience data "
+"corruption (lost accent characters, etc.). \n"
+"\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in config."
+"php to 'utf8'."
+msgstr ""
+
+#: mysql_convert_unicode.php:77 update.php:127
+msgid "Perform updates"
+msgstr "完成更新"
+
+#: mysql_convert_unicode.php:82
+#, fuzzy
+msgid "Converting database..."
+msgstr "转换标签"
+
 #: opml.php:108 opml.php:112
 msgid "OPML Utility"
 msgstr "通用OPML"
@@ -1015,7 +1064,7 @@ msgid "Actions..."
 msgstr "激活..."
 
 #: tt-rss.php:131 modules/popup-dialog.php:117 modules/popup-dialog.php:186
-#: modules/pref-feeds.php:714
+#: modules/pref-feeds.php:749
 msgid "Search"
 msgstr "搜索"
 
@@ -1032,61 +1081,62 @@ msgid "&nbsp;&nbsp;Edit this feed"
 msgstr "&nbsp;&nbsp;编辑feed"
 
 #: tt-rss.php:137
+#, fuzzy
+msgid "&nbsp;&nbsp;Clear articles"
+msgstr "&nbsp;&nbsp;创建过滤器"
+
+#: tt-rss.php:138
 msgid "&nbsp;&nbsp;Unsubscribe"
 msgstr "&nbsp;&nbsp;退订"
 
-#: tt-rss.php:140
+#: tt-rss.php:141
 msgid "All feeds:"
 msgstr "所有feed:"
 
-#: tt-rss.php:142
+#: tt-rss.php:143
 msgid "&nbsp;&nbsp;Update"
 msgstr "&nbsp;&nbsp;更新"
 
-#: tt-rss.php:144
+#: tt-rss.php:145
 msgid "&nbsp;&nbsp;Mark as read"
 msgstr "&nbsp;&nbsp;标记未已读"
 
-#: tt-rss.php:145
+#: tt-rss.php:146
 msgid "&nbsp;&nbsp;(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 
-#: tt-rss.php:147
+#: tt-rss.php:148
 msgid "Other actions:"
 msgstr "其他操作:"
 
-#: tt-rss.php:148
+#: tt-rss.php:149
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: tt-rss.php:156 modules/popup-dialog.php:129
+#: tt-rss.php:157 modules/popup-dialog.php:129
 msgid "Search:"
 msgstr "搜索:"
 
-#: tt-rss.php:163
+#: tt-rss.php:164
 msgid "View:"
 msgstr "浏览:"
 
-#: tt-rss.php:165
+#: tt-rss.php:166
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:166
+#: tt-rss.php:167
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:171
+#: tt-rss.php:172
 msgid "Limit:"
 msgstr "限制:"
 
-#: tt-rss.php:196
+#: tt-rss.php:197
 msgid "Update"
 msgstr "更新"
 
-#: update.php:28
-msgid "Your access level is insufficient to run this script."
-msgstr "权限不足。"
-
 #: update.php:53
 msgid "Database Updater"
 msgstr "数据库更新"
@@ -1107,14 +1157,6 @@ msgstr "，找到"
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS 数据库是最新版。"
 
-#: update.php:103 update.php:171
-msgid "Return to Tiny Tiny RSS"
-msgstr "返回Tiny Tiny RSS"
-
-#: update.php:111
-msgid "Please backup your database before proceeding."
-msgstr ""
-
 #: update.php:113
 #, php-format
 msgid ""
@@ -1122,10 +1164,6 @@ msgid ""
 "<b>%d</b>)."
 msgstr "您的 Tiny Tiny RSS 数据库需要升级到 (<b>%d</b> to <b>%d</b>)."
 
-#: update.php:127
-msgid "Perform updates"
-msgstr "完成更新"
-
 #: update.php:132
 msgid "Performing updates..."
 msgstr "更新完成中..."
@@ -1161,7 +1199,7 @@ msgid "Help topic not found."
 msgstr "未找到帮助主题。"
 
 #: modules/help.php:22 modules/popup-dialog.php:42
-#: modules/popup-dialog.php:448 modules/pref-feeds.php:671
+#: modules/popup-dialog.php:448 modules/pref-feeds.php:706
 msgid "Close this window"
 msgstr "关闭此窗口"
 
@@ -1226,7 +1264,7 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr "TT-RSS检测到更新时间过长，请刷新或者检查RSS源地址。"
 
-#: modules/popup-dialog.php:51 modules/pref-feeds.php:727
+#: modules/popup-dialog.php:51 modules/pref-feeds.php:762
 msgid "Subscribe to feed"
 msgstr "订阅feed"
 
@@ -1246,7 +1284,7 @@ msgstr "订阅"
 #: modules/popup-dialog.php:104 modules/popup-dialog.php:189
 #: modules/popup-dialog.php:241 modules/popup-dialog.php:328
 #: modules/popup-dialog.php:424 modules/pref-feeds.php:120
-#: modules/pref-feeds.php:331 modules/pref-filters.php:118
+#: modules/pref-feeds.php:352 modules/pref-filters.php:118
 #: modules/pref-users.php:58
 msgid "Cancel"
 msgstr "取消"
@@ -1348,7 +1386,7 @@ msgstr "编辑标签"
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开:"
 
-#: modules/popup-dialog.php:420 modules/pref-feeds.php:329
+#: modules/popup-dialog.php:420 modules/pref-feeds.php:350
 #: modules/pref-filters.php:114 modules/pref-users.php:55
 msgid "Save"
 msgstr "保存"
@@ -1447,103 +1485,107 @@ msgstr "隐藏我的Feed列表"
 msgid "Include in e-mail digest"
 msgstr "包括电子邮件文摘"
 
-#: modules/pref-feeds.php:451
+#: modules/pref-feeds.php:340
+msgid "Cache images locally"
+msgstr ""
+
+#: modules/pref-feeds.php:486
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:453
+#: modules/pref-feeds.php:488
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:538
+#: modules/pref-feeds.php:573
 msgid "Category editor"
 msgstr "分类编辑"
 
-#: modules/pref-feeds.php:561
+#: modules/pref-feeds.php:596
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "分类 <b>$%s</b>已经存在."
 
-#: modules/pref-feeds.php:589
+#: modules/pref-feeds.php:624
 msgid "Unable to delete non empty feed categories."
 msgstr "不能删除非空分类。"
 
-#: modules/pref-feeds.php:606
+#: modules/pref-feeds.php:641
 msgid "Create category"
 msgstr "创建分类"
 
-#: modules/pref-feeds.php:666
+#: modules/pref-feeds.php:701
 msgid "No feed categories defined."
 msgstr "未定义feed分类"
 
-#: modules/pref-feeds.php:677 modules/pref-filters.php:345
+#: modules/pref-feeds.php:712 modules/pref-filters.php:345
 #: modules/pref-labels.php:294 modules/pref-users.php:319
 msgid "Remove"
 msgstr "移除"
 
-#: modules/pref-feeds.php:699
+#: modules/pref-feeds.php:734
 msgid "Some feeds have update errors (click for details)"
 msgstr "有些feed更新错误(点击了解详情) "
 
-#: modules/pref-feeds.php:732
+#: modules/pref-feeds.php:767
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:806
+#: modules/pref-feeds.php:841
 msgid "Show last article times"
 msgstr "显示最近文章时间"
 
-#: modules/pref-feeds.php:823 modules/pref-feeds.php:885
+#: modules/pref-feeds.php:858 modules/pref-feeds.php:920
 msgid "Last&nbsp;Article"
 msgstr "最后&nbsp;文章"
 
-#: modules/pref-feeds.php:826 modules/pref-feeds.php:889
+#: modules/pref-feeds.php:861 modules/pref-feeds.php:924
 msgid "Updated"
 msgstr "已更新"
 
-#: modules/pref-feeds.php:953 modules/pref-filters.php:343
+#: modules/pref-feeds.php:988 modules/pref-filters.php:343
 #: modules/pref-labels.php:292 modules/pref-users.php:317
 msgid "Edit"
 msgstr "编辑"
 
-#: modules/pref-feeds.php:956
+#: modules/pref-feeds.php:991
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: modules/pref-feeds.php:966
+#: modules/pref-feeds.php:1001
 msgid "Recategorize"
 msgstr "再分类"
 
-#: modules/pref-feeds.php:975
+#: modules/pref-feeds.php:1010
 msgid "Edit categories"
 msgstr "编辑分类"
 
-#: modules/pref-feeds.php:986
+#: modules/pref-feeds.php:1021
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:990
+#: modules/pref-feeds.php:1025
 #, fuzzy
 msgid "File:"
 msgstr "标题:"
 
-#: modules/pref-feeds.php:993
+#: modules/pref-feeds.php:1028
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1000
+#: modules/pref-feeds.php:1035
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1009
+#: modules/pref-feeds.php:1044
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the address specified below."
 msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
 
-#: modules/pref-feeds.php:1016
+#: modules/pref-feeds.php:1051
 msgid "Generate another address"
 msgstr "生成另一个地址"