diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 50f663214..f6a4a9651 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 d6188bb02..2cf01890f 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: 2009-02-11 18:36+0300\n"
+"POT-Creation-Date: 2009-02-11 19:47+0300\n"
 "PO-Revision-Date: 2007-11-20 23:01+0100\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -193,7 +193,7 @@ msgid "Labels"
 msgstr "Intitulé"
 
 #: functions.php:2913 functions.php:3336 functions.php:4121 help/3.php:59
-#: mobile/functions.php:61
+#: mobile/functions.php:61 offline.js:459 offline.js:1268
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
@@ -208,7 +208,7 @@ msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
 #: functions.php:2919 functions.php:3349 functions.php:4099 help/3.php:57
-#: mobile/functions.php:43
+#: mobile/functions.php:43 offline.js:454 offline.js:1270
 #, fuzzy
 msgid "All articles"
 msgstr "Tous les articles"
@@ -228,7 +228,7 @@ msgstr "Flux généré"
 
 #: functions.php:3983 functions.php:5247 modules/pref-feeds.php:1028
 #: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:163 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401 offline.js:374
 msgid "Select:"
 msgstr "Sélectionner&nbsp;:"
 
@@ -379,7 +379,7 @@ msgid ""
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5304
+#: functions.php:5304 offline.js:409
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Aucun article à marquer"
@@ -398,7 +398,7 @@ msgstr "Supprimer"
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: localized_js.php:35
+#: localized_js.php:35 tt-rss.js:75
 msgid "display feeds"
 msgstr "afficher les flux"
 
@@ -430,7 +430,7 @@ msgstr "Suppression d'un flux..."
 msgid "Saving feed..."
 msgstr "Enregistrement d'un flux..."
 
-#: localized_js.php:43
+#: localized_js.php:43 prefs.js:331
 msgid "Can't add category: no name specified."
 msgstr "Impossible d'ajouter une catégorie : aucun nom fourni."
 
@@ -450,11 +450,11 @@ msgstr "Ajout d'un utilisateur..."
 msgid "Can't create label: missing SQL expression."
 msgstr "Impossible de créer un intitulé : expression SQL manquante."
 
-#: localized_js.php:49 localized_js.php:103
+#: localized_js.php:49 localized_js.php:103 prefs.js:275 tt-rss.js:1440
 msgid "Can't create label: missing caption."
 msgstr "Impossible de créer un intitulé : descriptif manquant."
 
-#: localized_js.php:50
+#: localized_js.php:50 prefs.js:484
 msgid "Remove selected labels?"
 msgstr "Supprimer les intitulés sélectionnés ?"
 
@@ -462,11 +462,11 @@ msgstr "Supprimer les intitulés sélectionnés ?"
 msgid "Removing selected labels..."
 msgstr "Suppression des intitulés sélectionnés..."
 
-#: localized_js.php:52 localized_js.php:71 localized_js.php:105
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105 prefs.js:499
 msgid "No labels are selected."
 msgstr "Aucun intitulé sélectionné."
 
-#: localized_js.php:53
+#: localized_js.php:53 prefs.js:513
 msgid "Remove selected users?"
 msgstr "Supprimer les utilisateurs sélectionnés ?"
 
@@ -475,11 +475,11 @@ msgid "Removing selected users..."
 msgstr "Suppression des utilisateurs sélectionnés..."
 
 #: localized_js.php:55 localized_js.php:73 localized_js.php:75
-#: localized_js.php:106
+#: localized_js.php:106 prefs.js:529 prefs.js:817 prefs.js:838 prefs.js:876
 msgid "No users are selected."
 msgstr "Aucun utilisateur sélectionné."
 
-#: localized_js.php:56
+#: localized_js.php:56 prefs.js:547
 msgid "Remove selected filters?"
 msgstr "Supprimer les filtres sélectionnés ?"
 
@@ -487,11 +487,12 @@ msgstr "Supprimer les filtres sélectionnés ?"
 msgid "Removing selected filters..."
 msgstr "Suppression des filtres sélectionnés..."
 
-#: localized_js.php:58 localized_js.php:81 localized_js.php:107
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107 prefs.js:562
+#: prefs.js:905
 msgid "No filters are selected."
 msgstr "Aucun filtre sélectionné."
 
-#: localized_js.php:59
+#: localized_js.php:59 prefs.js:581
 msgid "Unsubscribe from selected feeds?"
 msgstr "Se désinscrire des flux sélectionnés ?"
 
@@ -500,11 +501,13 @@ msgid "Unsubscribing from selected feeds..."
 msgstr "Désinscription des flux sélectionnés..."
 
 #: localized_js.php:61 localized_js.php:79 localized_js.php:83
-#: localized_js.php:108 localized_js.php:111
+#: localized_js.php:108 localized_js.php:111 prefs.js:597 prefs.js:627
+#: prefs.js:658 prefs.js:925 prefs.js:946 prefs.js:1258 prefs.js:1307
+#: prefs.js:1824 tt-rss.js:1485
 msgid "No feeds are selected."
 msgstr "Aucun flux sélectionné."
 
-#: localized_js.php:62
+#: localized_js.php:62 prefs.js:671
 msgid "Remove selected categories?"
 msgstr "Supprimer les catégories sélectionnées ?"
 
@@ -512,7 +515,7 @@ msgstr "Supprimer les catégories sélectionnées ?"
 msgid "Removing selected categories..."
 msgstr "Suppression des catégories sélectionnées..."
 
-#: localized_js.php:64 localized_js.php:85 localized_js.php:109
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109 prefs.js:688
 msgid "No categories are selected."
 msgstr "Aucune catégorie sélectionnée."
 
@@ -528,7 +531,7 @@ msgstr "Ouverture de l'aide..."
 msgid "Saving label..."
 msgstr "Enregistrement de l'intitulé..."
 
-#: localized_js.php:68 localized_js.php:110
+#: localized_js.php:68 localized_js.php:110 prefs.js:763
 msgid "Login field cannot be blank."
 msgstr "Le nom ne peut pas être vide."
 
@@ -544,11 +547,12 @@ msgstr "Enregistrement du filtre..."
 msgid "Please select only one label."
 msgstr "Veuillez sélectionner un seul intitulé."
 
-#: localized_js.php:74 localized_js.php:76
+#: localized_js.php:74 localized_js.php:76 prefs.js:822 prefs.js:843
+#: prefs.js:881
 msgid "Please select only one user."
 msgstr "Veuillez sélectionner un seul utilisateur."
 
-#: localized_js.php:77
+#: localized_js.php:77 prefs.js:847
 msgid "Reset password of selected user?"
 msgstr "Réinitialiser le mot de passe de l'utilisateur sélectionné ?"
 
@@ -556,15 +560,15 @@ msgstr "Réinitialiser le mot de passe de l'utilisateur sélectionné ?"
 msgid "Resetting password for selected user..."
 msgstr "Réinitialisation du mot de passe de l'utilisateur sélectionné..."
 
-#: localized_js.php:80
+#: localized_js.php:80 prefs.js:612
 msgid "Please select only one feed."
 msgstr "Veuillez sélectionner un seul flux."
 
-#: localized_js.php:82
+#: localized_js.php:82 prefs.js:910
 msgid "Please select only one filter."
 msgstr "Veuillez sélectionner un seul filtre."
 
-#: localized_js.php:84
+#: localized_js.php:84 prefs.js:930
 msgid "Please select one feed."
 msgstr "Veuillez sélectionner un flux."
 
@@ -572,7 +576,7 @@ msgstr "Veuillez sélectionner un flux."
 msgid "Please select only one category."
 msgstr "Veuillez sélectionner une seule catégorie."
 
-#: localized_js.php:87
+#: localized_js.php:87 prefs.js:986
 msgid "No OPML file to upload."
 msgstr "Aucun fichier OPML à envoyer."
 
@@ -580,7 +584,7 @@ msgstr "Aucun fichier OPML à envoyer."
 msgid "Changing category of selected feeds..."
 msgstr "Modification de la catégorie des flux sélectionnés..."
 
-#: localized_js.php:89
+#: localized_js.php:89 prefs.js:1266
 msgid "Reset to defaults?"
 msgstr "Revenir aux valeurs par défaut ?"
 
@@ -592,7 +596,8 @@ msgstr "Tentative de modification du mot de passe..."
 msgid "Trying to change e-mail..."
 msgstr "Tentative de modification de l'adresse électronique..."
 
-#: localized_js.php:92
+#: localized_js.php:92 viewfeed.js:874 viewfeed.js:909 viewfeed.js:949
+#: viewfeed.js:1019 viewfeed.js:1066 viewfeed.js:1218
 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
 
@@ -608,7 +613,7 @@ msgstr "Impossible d'afficher l'article (objet XML manquant)"
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
-#: localized_js.php:96
+#: localized_js.php:96 prefs.js:1693
 msgid "Replace current publishing address with a new one?"
 msgstr "Remplacer l'adresse de publication actuelle ?"
 
@@ -620,42 +625,43 @@ msgstr "Adresse modifiée."
 msgid "Could not change address."
 msgstr "Impossible de changer l'adresse."
 
-#: localized_js.php:99
+#: localized_js.php:99 tt-rss.js:596
 msgid "You can't unsubscribe from the category."
 msgstr "Vous ne pouvez pas vous désinscrire de la catégorie."
 
-#: localized_js.php:100
+#: localized_js.php:100 tt-rss.js:601 tt-rss.js:620 tt-rss.js:834
+#: tt-rss.js:1013
 msgid "Please select some feed first."
 msgstr "Veuillez d'abord sélectionner un flux."
 
-#: localized_js.php:101
+#: localized_js.php:101 tt-rss.js:839
 msgid "You can't edit this kind of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 
-#: localized_js.php:112
+#: localized_js.php:112 functions.js:1380
 msgid "Can't add filter: nothing to match on."
 msgstr "Impossible d'ajouter un filtre : aucune correspondance."
 
-#: localized_js.php:113
+#: localized_js.php:113 functions.js:1421
 msgid "Can't subscribe: no feed URL given."
 msgstr "Impossible de s'inscrire : aucune URL de flux n'a été fournie."
 
-#: localized_js.php:114
+#: localized_js.php:114 prefs.js:1879 tt-rss.js:607 tt-rss.js:702
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr "Se désinscrire de %s ?"
 
-#: localized_js.php:115
+#: localized_js.php:115 viewfeed.js:1186
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marquer tous les articles visibles de %s comme lus ?"
 
-#: localized_js.php:116
+#: localized_js.php:116 tt-rss.js:806 tt-rss.js:819
 #, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
-#: localized_js.php:117
+#: localized_js.php:117 viewfeed.js:1225
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marquer %d articles sélectionnés de %s comme lus ?"
@@ -664,7 +670,7 @@ msgstr "Marquer %d articles sélectionnés de %s comme lus ?"
 msgid "Please enter label title:"
 msgstr "Veuillez saisir le titre de l'intitulé :"
 
-#: localized_js.php:119
+#: localized_js.php:119 prefs.js:1714
 msgid "Save current configuration?"
 msgstr "Enregistrer la configuration actuelle ?"
 
@@ -680,54 +686,55 @@ msgstr "Le nouveau mot de passe ne peut pas être vide."
 msgid "Entered passwords do not match."
 msgstr "Les mots de passe saisie ne sont pas identiques."
 
-#: localized_js.php:123
+#: localized_js.php:123 viewfeed.js:1857
 msgid "No articles found to mark"
 msgstr "Aucun article à marquer"
 
-#: localized_js.php:124
+#: localized_js.php:124 viewfeed.js:1859
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "Marquer %d article(s) comme lu(s) ?"
 
-#: localized_js.php:125
+#: localized_js.php:125 viewfeed.js:1816
 msgid "No article is selected."
 msgstr "Aucun article sélectionné."
 
-#: localized_js.php:126
+#: localized_js.php:126 viewfeed.js:494 viewfeed.js:559
 msgid "Star article"
 msgstr "Marquer comme remarquable"
 
-#: localized_js.php:127
+#: localized_js.php:127 viewfeed.js:543
 msgid "Unstar article"
 msgstr "Ne plus marquer comme remarquable"
 
-#: localized_js.php:128
+#: localized_js.php:128 viewfeed.js:552 viewfeed.js:614
 msgid "Please wait..."
 msgstr "Veuillez patienter..."
 
-#: localized_js.php:129 localized_schema.php:18
+#: localized_js.php:129 localized_schema.php:18 viewfeed.js:511
+#: viewfeed.js:621
 msgid "Publish article"
 msgstr "Publier l'article"
 
-#: localized_js.php:130
+#: localized_js.php:130 viewfeed.js:608
 msgid "Unpublish article"
 msgstr "Ne plus publier l'article"
 
-#: localized_js.php:131
+#: localized_js.php:131 tt-rss.js:625
 msgid "You can't clear this type of feed."
 msgstr "Vous ne pouvez pas purger ce type de flux."
 
-#: localized_js.php:132
+#: localized_js.php:132 tt-rss.js:631
 #, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr "Supprimer tous les articles non remarquables dans %s ?"
 
-#: localized_js.php:133
+#: localized_js.php:133 tt-rss.js:277
 #, fuzzy
 msgid "Mark all articles as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
-#: localized_js.php:134
+#: localized_js.php:134 prefs.js:1809
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "Aucun article sélectionné."
@@ -746,12 +753,12 @@ msgstr ""
 msgid "Rescoring feeds..."
 msgstr "Suppression d'un flux..."
 
-#: localized_js.php:138
+#: localized_js.php:138 tt-rss.js:1008
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 
-#: localized_js.php:139
+#: localized_js.php:139 tt-rss.js:1018
 #, fuzzy, php-format
 msgid "Rescore articles in %s?"
 msgstr "Articles mémorisés"
@@ -761,7 +768,7 @@ msgstr "Articles mémorisés"
 msgid "Rescoring articles..."
 msgstr "Articles mémorisés"
 
-#: localized_js.php:141
+#: localized_js.php:141 tt-rss.js:681
 #, fuzzy
 msgid "Reset category order?"
 msgstr "Supprimer les catégories sélectionnées ?"
@@ -774,7 +781,7 @@ msgstr ""
 msgid "Category reordering disabled"
 msgstr ""
 
-#: localized_js.php:144
+#: localized_js.php:144 prefs.js:1908
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "Aucun article sélectionné."
@@ -1249,7 +1256,7 @@ msgstr ""
 msgid "Comments?"
 msgstr "Contenu"
 
-#: tt-rss.php:136
+#: tt-rss.php:136 offline.js:737
 #, fuzzy
 msgid "Restart in offline mode"
 msgstr "Échec du test de configuration"
@@ -1262,7 +1269,7 @@ msgstr ""
 msgid "Restart in online mode"
 msgstr ""
 
-#: tt-rss.php:158
+#: tt-rss.php:158 tt-rss.js:80
 msgid "tag cloud"
 msgstr "Nuage d'étiquettes"
 
@@ -2536,6 +2543,76 @@ msgstr "Correspondance sur&nbsp;:"
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#: functions.js:1425
+#, fuzzy
+msgid "Subscribing to feed..."
+msgstr "S'inscrire à un flux"
+
+#: offline.js:602
+msgid "Data for offline browsing has not been downloaded yet."
+msgstr ""
+
+#: offline.js:797
+msgid "Synchronizing offline data..."
+msgstr ""
+
+#: prefs.js:268 tt-rss.js:1435
+#, fuzzy
+msgid "Please enter label caption:"
+msgstr "Veuillez saisir le titre de l'intitulé :"
+
+#: prefs.js:302
+#, fuzzy
+msgid "Error: No feed URL given."
+msgstr "Impossible de s'inscrire : aucune URL de flux n'a été fournie."
+
+#: prefs.js:304
+msgid "Error: Invalid feed URL."
+msgstr ""
+
+#: prefs.js:352
+#, fuzzy
+msgid "Please enter login:"
+msgstr "Veuillez saisir le titre de l'intitulé :"
+
+#: prefs.js:359
+#, fuzzy
+msgid "Can't create user: no login specified."
+msgstr "Impossible d'ajouter un utilisateur : aucun nom fourni."
+
+#: prefs.js:618
+#, fuzzy
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "Supprimer tous les articles non remarquables dans %s ?"
+
+#: prefs.js:640
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr ""
+
+#: prefs.js:1831
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
+
+#: prefs.js:1849
+#, fuzzy
+msgid "Remove filter %s?"
+msgstr "Supprimer les filtres sélectionnés ?"
+
+#: prefs.js:1993
+#, fuzzy
+msgid "Reset label colors to default?"
+msgstr "Revenir aux valeurs par défaut ?"
+
+#: prefs.js:2017
+#, fuzzy
+msgid "Please enter new label foreground color:"
+msgstr "Veuillez saisir le titre de l'intitulé :"
+
+#: prefs.js:2019
+#, fuzzy
+msgid "Please enter new label background color:"
+msgstr "Veuillez saisir le titre de l'intitulé :"
+
 #~ msgid "MySQL Charset Updater"
 #~ msgstr "Outil de mise à jour du jeu de caractères MySQL"
 
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 205b9ef96..463b21a0c 100644
Binary files a/locale/hu_HU/LC_MESSAGES/messages.mo and b/locale/hu_HU/LC_MESSAGES/messages.mo differ
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index 0c727a46a..1c0ed4d76 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.2.19\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-11 18:36+0300\n"
+"POT-Creation-Date: 2009-02-11 19:47+0300\n"
 "PO-Revision-Date: 2008-02-03 22:22::+0100\n"
 "Last-Translator: MiszterX <miszterx@miszterx.hu>\n"
 "Language-Team: HUNGARIAN <miszterx@miszterx.hu>\n"
@@ -185,7 +185,7 @@ msgid "Labels"
 msgstr "Címkék"
 
 #: functions.php:2913 functions.php:3336 functions.php:4121 help/3.php:59
-#: mobile/functions.php:61
+#: mobile/functions.php:61 offline.js:459 offline.js:1268
 msgid "Starred articles"
 msgstr "Csillagost hírek"
 
@@ -200,7 +200,7 @@ msgid "Fresh articles"
 msgstr "Olvasatlan hírek"
 
 #: functions.php:2919 functions.php:3349 functions.php:4099 help/3.php:57
-#: mobile/functions.php:43
+#: mobile/functions.php:43 offline.js:454 offline.js:1270
 #, fuzzy
 msgid "All articles"
 msgstr "Minden hír"
@@ -220,7 +220,7 @@ msgstr ""
 
 #: functions.php:3983 functions.php:5247 modules/pref-feeds.php:1028
 #: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:163 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401 offline.js:374
 msgid "Select:"
 msgstr "Kiválaszt:"
 
@@ -367,7 +367,7 @@ msgid ""
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5304
+#: functions.php:5304 offline.js:409
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír"
@@ -386,7 +386,7 @@ msgstr "Eltávolít"
 msgid "no tags"
 msgstr ""
 
-#: localized_js.php:35
+#: localized_js.php:35 tt-rss.js:75
 msgid "display feeds"
 msgstr ""
 
@@ -418,7 +418,7 @@ msgstr ""
 msgid "Saving feed..."
 msgstr ""
 
-#: localized_js.php:43
+#: localized_js.php:43 prefs.js:331
 msgid "Can't add category: no name specified."
 msgstr ""
 
@@ -438,11 +438,11 @@ msgstr ""
 msgid "Can't create label: missing SQL expression."
 msgstr ""
 
-#: localized_js.php:49 localized_js.php:103
+#: localized_js.php:49 localized_js.php:103 prefs.js:275 tt-rss.js:1440
 msgid "Can't create label: missing caption."
 msgstr ""
 
-#: localized_js.php:50
+#: localized_js.php:50 prefs.js:484
 msgid "Remove selected labels?"
 msgstr ""
 
@@ -450,11 +450,11 @@ msgstr ""
 msgid "Removing selected labels..."
 msgstr ""
 
-#: localized_js.php:52 localized_js.php:71 localized_js.php:105
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105 prefs.js:499
 msgid "No labels are selected."
 msgstr ""
 
-#: localized_js.php:53
+#: localized_js.php:53 prefs.js:513
 msgid "Remove selected users?"
 msgstr ""
 
@@ -463,11 +463,11 @@ msgid "Removing selected users..."
 msgstr ""
 
 #: localized_js.php:55 localized_js.php:73 localized_js.php:75
-#: localized_js.php:106
+#: localized_js.php:106 prefs.js:529 prefs.js:817 prefs.js:838 prefs.js:876
 msgid "No users are selected."
 msgstr ""
 
-#: localized_js.php:56
+#: localized_js.php:56 prefs.js:547
 msgid "Remove selected filters?"
 msgstr ""
 
@@ -475,11 +475,12 @@ msgstr ""
 msgid "Removing selected filters..."
 msgstr ""
 
-#: localized_js.php:58 localized_js.php:81 localized_js.php:107
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107 prefs.js:562
+#: prefs.js:905
 msgid "No filters are selected."
 msgstr "Nincs szőrű kiválasztva."
 
-#: localized_js.php:59
+#: localized_js.php:59 prefs.js:581
 msgid "Unsubscribe from selected feeds?"
 msgstr "Leiratkozik a kiválasztott feedekről?"
 
@@ -488,11 +489,13 @@ msgid "Unsubscribing from selected feeds..."
 msgstr "Leiratkozás a kiválasztott feedekről..."
 
 #: localized_js.php:61 localized_js.php:79 localized_js.php:83
-#: localized_js.php:108 localized_js.php:111
+#: localized_js.php:108 localized_js.php:111 prefs.js:597 prefs.js:627
+#: prefs.js:658 prefs.js:925 prefs.js:946 prefs.js:1258 prefs.js:1307
+#: prefs.js:1824 tt-rss.js:1485
 msgid "No feeds are selected."
 msgstr "Nincs feed kiválasztva."
 
-#: localized_js.php:62
+#: localized_js.php:62 prefs.js:671
 msgid "Remove selected categories?"
 msgstr "Kiválasztott kategória eltávolítása?"
 
@@ -500,7 +503,7 @@ msgstr "Kiválasztott kategória eltávolítása?"
 msgid "Removing selected categories..."
 msgstr "Kiválasztott kategória eltávolítása..."
 
-#: localized_js.php:64 localized_js.php:85 localized_js.php:109
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109 prefs.js:688
 msgid "No categories are selected."
 msgstr "Nincs kategória kiválaszta."
 
@@ -516,7 +519,7 @@ msgstr "Segítség betöltése..."
 msgid "Saving label..."
 msgstr "Címke mentése"
 
-#: localized_js.php:68 localized_js.php:110
+#: localized_js.php:68 localized_js.php:110 prefs.js:763
 msgid "Login field cannot be blank."
 msgstr ""
 
@@ -532,11 +535,12 @@ msgstr ""
 msgid "Please select only one label."
 msgstr ""
 
-#: localized_js.php:74 localized_js.php:76
+#: localized_js.php:74 localized_js.php:76 prefs.js:822 prefs.js:843
+#: prefs.js:881
 msgid "Please select only one user."
 msgstr ""
 
-#: localized_js.php:77
+#: localized_js.php:77 prefs.js:847
 msgid "Reset password of selected user?"
 msgstr ""
 
@@ -544,15 +548,15 @@ msgstr ""
 msgid "Resetting password for selected user..."
 msgstr ""
 
-#: localized_js.php:80
+#: localized_js.php:80 prefs.js:612
 msgid "Please select only one feed."
 msgstr ""
 
-#: localized_js.php:82
+#: localized_js.php:82 prefs.js:910
 msgid "Please select only one filter."
 msgstr ""
 
-#: localized_js.php:84
+#: localized_js.php:84 prefs.js:930
 msgid "Please select one feed."
 msgstr ""
 
@@ -560,7 +564,7 @@ msgstr ""
 msgid "Please select only one category."
 msgstr ""
 
-#: localized_js.php:87
+#: localized_js.php:87 prefs.js:986
 msgid "No OPML file to upload."
 msgstr ""
 
@@ -568,7 +572,7 @@ msgstr ""
 msgid "Changing category of selected feeds..."
 msgstr ""
 
-#: localized_js.php:89
+#: localized_js.php:89 prefs.js:1266
 msgid "Reset to defaults?"
 msgstr ""
 
@@ -580,7 +584,8 @@ msgstr ""
 msgid "Trying to change e-mail..."
 msgstr ""
 
-#: localized_js.php:92
+#: localized_js.php:92 viewfeed.js:874 viewfeed.js:909 viewfeed.js:949
+#: viewfeed.js:1019 viewfeed.js:1066 viewfeed.js:1218
 msgid "No articles are selected."
 msgstr ""
 
@@ -596,7 +601,7 @@ msgstr ""
 msgid "No feed selected."
 msgstr ""
 
-#: localized_js.php:96
+#: localized_js.php:96 prefs.js:1693
 msgid "Replace current publishing address with a new one?"
 msgstr ""
 
@@ -608,42 +613,43 @@ msgstr ""
 msgid "Could not change address."
 msgstr ""
 
-#: localized_js.php:99
+#: localized_js.php:99 tt-rss.js:596
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: localized_js.php:100
+#: localized_js.php:100 tt-rss.js:601 tt-rss.js:620 tt-rss.js:834
+#: tt-rss.js:1013
 msgid "Please select some feed first."
 msgstr ""
 
-#: localized_js.php:101
+#: localized_js.php:101 tt-rss.js:839
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: localized_js.php:112
+#: localized_js.php:112 functions.js:1380
 msgid "Can't add filter: nothing to match on."
 msgstr ""
 
-#: localized_js.php:113
+#: localized_js.php:113 functions.js:1421
 msgid "Can't subscribe: no feed URL given."
 msgstr ""
 
-#: localized_js.php:114
+#: localized_js.php:114 prefs.js:1879 tt-rss.js:607 tt-rss.js:702
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr "Leiratkozás innen: %s?"
 
-#: localized_js.php:115
+#: localized_js.php:115 viewfeed.js:1186
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 
-#: localized_js.php:116
+#: localized_js.php:116 tt-rss.js:806 tt-rss.js:819
 #, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "Minden hírt olvasottá tesz itt: %s?"
 
-#: localized_js.php:117
+#: localized_js.php:117 viewfeed.js:1225
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr ""
@@ -652,7 +658,7 @@ msgstr ""
 msgid "Please enter label title:"
 msgstr "Add meg a címke címét:"
 
-#: localized_js.php:119
+#: localized_js.php:119 prefs.js:1714
 msgid "Save current configuration?"
 msgstr ""
 
@@ -668,54 +674,55 @@ msgstr ""
 msgid "Entered passwords do not match."
 msgstr ""
 
-#: localized_js.php:123
+#: localized_js.php:123 viewfeed.js:1857
 msgid "No articles found to mark"
 msgstr ""
 
-#: localized_js.php:124
+#: localized_js.php:124 viewfeed.js:1859
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr ""
 
-#: localized_js.php:125
+#: localized_js.php:125 viewfeed.js:1816
 msgid "No article is selected."
 msgstr ""
 
-#: localized_js.php:126
+#: localized_js.php:126 viewfeed.js:494 viewfeed.js:559
 msgid "Star article"
 msgstr "Csillagoz hí"
 
-#: localized_js.php:127
+#: localized_js.php:127 viewfeed.js:543
 msgid "Unstar article"
 msgstr ""
 
-#: localized_js.php:128
+#: localized_js.php:128 viewfeed.js:552 viewfeed.js:614
 msgid "Please wait..."
 msgstr "Kérem várjon"
 
-#: localized_js.php:129 localized_schema.php:18
+#: localized_js.php:129 localized_schema.php:18 viewfeed.js:511
+#: viewfeed.js:621
 msgid "Publish article"
 msgstr "Hír publikálása"
 
-#: localized_js.php:130
+#: localized_js.php:130 viewfeed.js:608
 msgid "Unpublish article"
 msgstr "Hír nem publikálása"
 
-#: localized_js.php:131
+#: localized_js.php:131 tt-rss.js:625
 msgid "You can't clear this type of feed."
 msgstr ""
 
-#: localized_js.php:132
+#: localized_js.php:132 tt-rss.js:631
 #, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr ""
 
-#: localized_js.php:133
+#: localized_js.php:133 tt-rss.js:277
 #, fuzzy
 msgid "Mark all articles as read?"
 msgstr "Minden hírt olvasottá tesz itt: %s?"
 
-#: localized_js.php:134
+#: localized_js.php:134 prefs.js:1809
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "Leiratkozik a kiválasztott feedekről?"
@@ -733,11 +740,11 @@ msgstr ""
 msgid "Rescoring feeds..."
 msgstr ""
 
-#: localized_js.php:138
+#: localized_js.php:138 tt-rss.js:1008
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: localized_js.php:139
+#: localized_js.php:139 tt-rss.js:1018
 #, fuzzy, php-format
 msgid "Rescore articles in %s?"
 msgstr "Tárolt hírek"
@@ -747,7 +754,7 @@ msgstr "Tárolt hírek"
 msgid "Rescoring articles..."
 msgstr "Tárolt hírek"
 
-#: localized_js.php:141
+#: localized_js.php:141 tt-rss.js:681
 #, fuzzy
 msgid "Reset category order?"
 msgstr "Kiválasztott kategória eltávolítása?"
@@ -760,7 +767,7 @@ msgstr ""
 msgid "Category reordering disabled"
 msgstr ""
 
-#: localized_js.php:144
+#: localized_js.php:144 prefs.js:1908
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "Leiratkozik a kiválasztott feedekről?"
@@ -1202,7 +1209,7 @@ msgstr ""
 msgid "Comments?"
 msgstr "Hozzászólás?"
 
-#: tt-rss.php:136
+#: tt-rss.php:136 offline.js:737
 #, fuzzy
 msgid "Restart in offline mode"
 msgstr "Regisztrált"
@@ -1215,7 +1222,7 @@ msgstr ""
 msgid "Restart in online mode"
 msgstr ""
 
-#: tt-rss.php:158
+#: tt-rss.php:158 tt-rss.js:80
 msgid "tag cloud"
 msgstr "tag felhő"
 
@@ -2453,6 +2460,74 @@ msgstr "Egyezés ezzel:"
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#: functions.js:1425
+#, fuzzy
+msgid "Subscribing to feed..."
+msgstr "Feliratkozás feedre"
+
+#: offline.js:602
+msgid "Data for offline browsing has not been downloaded yet."
+msgstr ""
+
+#: offline.js:797
+msgid "Synchronizing offline data..."
+msgstr ""
+
+#: prefs.js:268 tt-rss.js:1435
+#, fuzzy
+msgid "Please enter label caption:"
+msgstr "Add meg a címke címét:"
+
+#: prefs.js:302
+msgid "Error: No feed URL given."
+msgstr ""
+
+#: prefs.js:304
+msgid "Error: Invalid feed URL."
+msgstr ""
+
+#: prefs.js:352
+#, fuzzy
+msgid "Please enter login:"
+msgstr "Add meg a címke címét:"
+
+#: prefs.js:359
+msgid "Can't create user: no login specified."
+msgstr ""
+
+#: prefs.js:618
+#, fuzzy
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "Leiratkozik a kiválasztott feedekről?"
+
+#: prefs.js:640
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr ""
+
+#: prefs.js:1831
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
+
+#: prefs.js:1849
+#, fuzzy
+msgid "Remove filter %s?"
+msgstr "Tárolt hírek"
+
+#: prefs.js:1993
+#, fuzzy
+msgid "Reset label colors to default?"
+msgstr "Visszaállítás az alapértelmezettre"
+
+#: prefs.js:2017
+#, fuzzy
+msgid "Please enter new label foreground color:"
+msgstr "Add meg a címke címét:"
+
+#: prefs.js:2019
+#, fuzzy
+msgid "Please enter new label background color:"
+msgstr "Add meg a címke címét:"
+
 #~ msgid "Fatal Error"
 #~ msgstr "Végzetes Hiba"
 
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 13702cfcc..a1e8c26f1 100644
Binary files a/locale/it_IT/LC_MESSAGES/messages.mo and b/locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index 41438c1f5..53b34da68 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ttrss-1.2.30\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-11 18:36+0300\n"
+"POT-Creation-Date: 2009-02-11 19:47+0300\n"
 "PO-Revision-Date: 2009-01-03 16:43+0100\n"
 "Last-Translator: Andrea Zagli <azagli@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -190,7 +190,7 @@ msgid "Labels"
 msgstr "Etichette"
 
 #: functions.php:2913 functions.php:3336 functions.php:4121 help/3.php:59
-#: mobile/functions.php:61
+#: mobile/functions.php:61 offline.js:459 offline.js:1268
 msgid "Starred articles"
 msgstr "Articoli con stella"
 
@@ -205,7 +205,7 @@ msgid "Fresh articles"
 msgstr "Articoli nuovi"
 
 #: functions.php:2919 functions.php:3349 functions.php:4099 help/3.php:57
-#: mobile/functions.php:43
+#: mobile/functions.php:43 offline.js:454 offline.js:1270
 #, fuzzy
 msgid "All articles"
 msgstr "Tutti gli articoli"
@@ -225,7 +225,7 @@ msgstr "Notiziario generato"
 
 #: functions.php:3983 functions.php:5247 modules/pref-feeds.php:1028
 #: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:163 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401 offline.js:374
 msgid "Select:"
 msgstr "Seleziona:"
 
@@ -367,7 +367,7 @@ msgid ""
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5304
+#: functions.php:5304 offline.js:409
 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
@@ -385,7 +385,7 @@ msgstr "Rimuovi"
 msgid "no tags"
 msgstr "nessuna etichetta"
 
-#: localized_js.php:35
+#: localized_js.php:35 tt-rss.js:75
 msgid "display feeds"
 msgstr "visualizza notiziari"
 
@@ -417,7 +417,7 @@ msgstr "Rimozione notiziario..."
 msgid "Saving feed..."
 msgstr "Salvataggio notiziario..."
 
-#: localized_js.php:43
+#: localized_js.php:43 prefs.js:331
 msgid "Can't add category: no name specified."
 msgstr "Impossibile aggiungere la categoria: nessun nome specificato."
 
@@ -437,11 +437,11 @@ msgstr "Aggiunta utente..."
 msgid "Can't create label: missing SQL expression."
 msgstr "Impossibile creare l&apos;etichetta: espressione SQL mancante."
 
-#: localized_js.php:49 localized_js.php:103
+#: localized_js.php:49 localized_js.php:103 prefs.js:275 tt-rss.js:1440
 msgid "Can't create label: missing caption."
 msgstr "Impossibile creare l&apos;etichetta: intestazione mancante."
 
-#: localized_js.php:50
+#: localized_js.php:50 prefs.js:484
 msgid "Remove selected labels?"
 msgstr "Rimuovere le etichette selezionate?"
 
@@ -449,11 +449,11 @@ msgstr "Rimuovere le etichette selezionate?"
 msgid "Removing selected labels..."
 msgstr "Rimozione delle etichette selezionate..."
 
-#: localized_js.php:52 localized_js.php:71 localized_js.php:105
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105 prefs.js:499
 msgid "No labels are selected."
 msgstr "Nessuna etichetta selezionata."
 
-#: localized_js.php:53
+#: localized_js.php:53 prefs.js:513
 msgid "Remove selected users?"
 msgstr "Rimuovere gli utenti selezionati?"
 
@@ -462,11 +462,11 @@ msgid "Removing selected users..."
 msgstr "Rimozione degli utenti selezionati..."
 
 #: localized_js.php:55 localized_js.php:73 localized_js.php:75
-#: localized_js.php:106
+#: localized_js.php:106 prefs.js:529 prefs.js:817 prefs.js:838 prefs.js:876
 msgid "No users are selected."
 msgstr "Nessun utente selezionato."
 
-#: localized_js.php:56
+#: localized_js.php:56 prefs.js:547
 msgid "Remove selected filters?"
 msgstr "Rimuovere i filtri selezionati?"
 
@@ -474,11 +474,12 @@ msgstr "Rimuovere i filtri selezionati?"
 msgid "Removing selected filters..."
 msgstr "Rimozione dei filtri selezionati..."
 
-#: localized_js.php:58 localized_js.php:81 localized_js.php:107
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107 prefs.js:562
+#: prefs.js:905
 msgid "No filters are selected."
 msgstr "Nessun filtro selezionato."
 
-#: localized_js.php:59
+#: localized_js.php:59 prefs.js:581
 msgid "Unsubscribe from selected feeds?"
 msgstr "Annullare la sottoscrizione ai notiziari selezionati?"
 
@@ -487,11 +488,13 @@ msgid "Unsubscribing from selected feeds..."
 msgstr "Annullamento della sottoscrizione dai notiziari selezionati..."
 
 #: localized_js.php:61 localized_js.php:79 localized_js.php:83
-#: localized_js.php:108 localized_js.php:111
+#: localized_js.php:108 localized_js.php:111 prefs.js:597 prefs.js:627
+#: prefs.js:658 prefs.js:925 prefs.js:946 prefs.js:1258 prefs.js:1307
+#: prefs.js:1824 tt-rss.js:1485
 msgid "No feeds are selected."
 msgstr "Nessun notiziario selezionato."
 
-#: localized_js.php:62
+#: localized_js.php:62 prefs.js:671
 msgid "Remove selected categories?"
 msgstr "Rimuovere le categorie selezionate?"
 
@@ -499,7 +502,7 @@ msgstr "Rimuovere le categorie selezionate?"
 msgid "Removing selected categories..."
 msgstr "Rimozione delle categorie selezionate..."
 
-#: localized_js.php:64 localized_js.php:85 localized_js.php:109
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109 prefs.js:688
 msgid "No categories are selected."
 msgstr "Nessuna categoria selezionata."
 
@@ -515,7 +518,7 @@ msgstr "Caricamento manuale..."
 msgid "Saving label..."
 msgstr "Salvataggio etichetta..."
 
-#: localized_js.php:68 localized_js.php:110
+#: localized_js.php:68 localized_js.php:110 prefs.js:763
 msgid "Login field cannot be blank."
 msgstr "Il campo accesso non può essere vuoto."
 
@@ -531,11 +534,12 @@ msgstr "Salvataggio filtro..."
 msgid "Please select only one label."
 msgstr "Selezionare una sola etichetta."
 
-#: localized_js.php:74 localized_js.php:76
+#: localized_js.php:74 localized_js.php:76 prefs.js:822 prefs.js:843
+#: prefs.js:881
 msgid "Please select only one user."
 msgstr "Selezionare un solo utente."
 
-#: localized_js.php:77
+#: localized_js.php:77 prefs.js:847
 msgid "Reset password of selected user?"
 msgstr "Reimpostare la password per l&apos;utente selezionato?"
 
@@ -543,15 +547,15 @@ msgstr "Reimpostare la password per l&apos;utente selezionato?"
 msgid "Resetting password for selected user..."
 msgstr "Reimpostazione della password per l&apos;utente selezionato..."
 
-#: localized_js.php:80
+#: localized_js.php:80 prefs.js:612
 msgid "Please select only one feed."
 msgstr "Selezionare solo un notiziario."
 
-#: localized_js.php:82
+#: localized_js.php:82 prefs.js:910
 msgid "Please select only one filter."
 msgstr "Selezionare solo un filtro."
 
-#: localized_js.php:84
+#: localized_js.php:84 prefs.js:930
 msgid "Please select one feed."
 msgstr "Selezionare un solo notiziario."
 
@@ -559,7 +563,7 @@ msgstr "Selezionare un solo notiziario."
 msgid "Please select only one category."
 msgstr "Selezionare una sola categoria."
 
-#: localized_js.php:87
+#: localized_js.php:87 prefs.js:986
 msgid "No OPML file to upload."
 msgstr "Nessun file OPML da caricare."
 
@@ -567,7 +571,7 @@ msgstr "Nessun file OPML da caricare."
 msgid "Changing category of selected feeds..."
 msgstr "Cambiamento della categoria dei notiziari selezionati..."
 
-#: localized_js.php:89
+#: localized_js.php:89 prefs.js:1266
 msgid "Reset to defaults?"
 msgstr "Reimpostare ai valori predefiniti?"
 
@@ -579,7 +583,8 @@ msgstr "Tentativo di cambio della password..."
 msgid "Trying to change e-mail..."
 msgstr "Tentativo di cambio dell&apos;email..."
 
-#: localized_js.php:92
+#: localized_js.php:92 viewfeed.js:874 viewfeed.js:909 viewfeed.js:949
+#: viewfeed.js:1019 viewfeed.js:1066 viewfeed.js:1218
 msgid "No articles are selected."
 msgstr "Nessun articolo selezionato."
 
@@ -595,7 +600,7 @@ msgstr "Impossibili visualizzare l&apos;articolo (manca l&apos;oggetto XML)"
 msgid "No feed selected."
 msgstr "Nessun notiziario selezionato."
 
-#: localized_js.php:96
+#: localized_js.php:96 prefs.js:1693
 msgid "Replace current publishing address with a new one?"
 msgstr "Sostituire l&apos;indirizzo di pubblicazione attuale con uno nuovo?"
 
@@ -607,44 +612,45 @@ msgstr "Indirizzo cambiato"
 msgid "Could not change address."
 msgstr "Impossibile cambiare l&apos;indirizzo."
 
-#: localized_js.php:99
+#: localized_js.php:99 tt-rss.js:596
 msgid "You can't unsubscribe from the category."
 msgstr "Impossibile annullare la sottoscrizione alla categoria."
 
-#: localized_js.php:100
+#: localized_js.php:100 tt-rss.js:601 tt-rss.js:620 tt-rss.js:834
+#: tt-rss.js:1013
 msgid "Please select some feed first."
 msgstr "Selezionare prima qualche notiziario."
 
-#: localized_js.php:101
+#: localized_js.php:101 tt-rss.js:839
 msgid "You can't edit this kind of feed."
 msgstr "Impossibile modificare questo tipo di notiziario."
 
-#: localized_js.php:112
+#: localized_js.php:112 functions.js:1380
 msgid "Can't add filter: nothing to match on."
 msgstr "Impossibile aggiungere il filtro: niente a cui corrisponda."
 
-#: localized_js.php:113
+#: localized_js.php:113 functions.js:1421
 msgid "Can't subscribe: no feed URL given."
 msgstr ""
 "Impossibile annullare la sottoscrizione: nessun URL di notiziario è stato "
 "dato."
 
-#: localized_js.php:114
+#: localized_js.php:114 prefs.js:1879 tt-rss.js:607 tt-rss.js:702
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr "Annullare la sottoscrizione a «%s»?"
 
-#: localized_js.php:115
+#: localized_js.php:115 viewfeed.js:1186
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "Segnare tutti gli articoli visibili in «%s» come letti?"
 
-#: localized_js.php:116
+#: localized_js.php:116 tt-rss.js:806 tt-rss.js:819
 #, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "Segnare tutti gli articoli in «%s» come letti?"
 
-#: localized_js.php:117
+#: localized_js.php:117 viewfeed.js:1225
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Segnare %d articoli selezionati in «%s» come letti?"
@@ -653,7 +659,7 @@ msgstr "Segnare %d articoli selezionati in «%s» come letti?"
 msgid "Please enter label title:"
 msgstr "Inserire il titolo dell&apos;etichetta:"
 
-#: localized_js.php:119
+#: localized_js.php:119 prefs.js:1714
 msgid "Save current configuration?"
 msgstr "Salvare la configurazione attuale?"
 
@@ -669,53 +675,54 @@ msgstr "La nuova password non può essere vuota."
 msgid "Entered passwords do not match."
 msgstr "Le password inserite non corrispondono."
 
-#: localized_js.php:123
+#: localized_js.php:123 viewfeed.js:1857
 msgid "No articles found to mark"
 msgstr "Nessun articolo trovato da segnare"
 
-#: localized_js.php:124
+#: localized_js.php:124 viewfeed.js:1859
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "Segnare %d articolo/i come letto/i?"
 
-#: localized_js.php:125
+#: localized_js.php:125 viewfeed.js:1816
 msgid "No article is selected."
 msgstr "Nessun articolo selezionato."
 
-#: localized_js.php:126
+#: localized_js.php:126 viewfeed.js:494 viewfeed.js:559
 msgid "Star article"
 msgstr "Metti la stella all&apos;articolo"
 
-#: localized_js.php:127
+#: localized_js.php:127 viewfeed.js:543
 msgid "Unstar article"
 msgstr "Togli la stella all&apos;articolo"
 
-#: localized_js.php:128
+#: localized_js.php:128 viewfeed.js:552 viewfeed.js:614
 msgid "Please wait..."
 msgstr "Attendere prego..."
 
-#: localized_js.php:129 localized_schema.php:18
+#: localized_js.php:129 localized_schema.php:18 viewfeed.js:511
+#: viewfeed.js:621
 msgid "Publish article"
 msgstr "Pubblica articolo"
 
-#: localized_js.php:130
+#: localized_js.php:130 viewfeed.js:608
 msgid "Unpublish article"
 msgstr "Non pubblicare articolo"
 
-#: localized_js.php:131
+#: localized_js.php:131 tt-rss.js:625
 msgid "You can't clear this type of feed."
 msgstr "Impossibile pulire questo tipo di notiziario."
 
-#: localized_js.php:132
+#: localized_js.php:132 tt-rss.js:631
 #, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr "Eliminare tutti gli articoli senza la stella in «%s»?"
 
-#: localized_js.php:133
+#: localized_js.php:133 tt-rss.js:277
 msgid "Mark all articles as read?"
 msgstr "Segnare tutti gli articoli come letti?"
 
-#: localized_js.php:134
+#: localized_js.php:134 prefs.js:1809
 msgid "Rescore articles in selected feeds?"
 msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
 
@@ -733,11 +740,11 @@ msgstr ""
 msgid "Rescoring feeds..."
 msgstr "Cambiamento del punteggio dei notiziari..."
 
-#: localized_js.php:138
+#: localized_js.php:138 tt-rss.js:1008
 msgid "You can't rescore this kind of feed."
 msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
 
-#: localized_js.php:139
+#: localized_js.php:139 tt-rss.js:1018
 #, php-format
 msgid "Rescore articles in %s?"
 msgstr "Cambiare il punteggio degli articoli in «%s»?"
@@ -746,7 +753,7 @@ msgstr "Cambiare il punteggio degli articoli in «%s»?"
 msgid "Rescoring articles..."
 msgstr "Cambiamento del punteggio degli articoli..."
 
-#: localized_js.php:141
+#: localized_js.php:141 tt-rss.js:681
 msgid "Reset category order?"
 msgstr "Reimpostare l&apos;ordine dalla categoria?"
 
@@ -758,7 +765,7 @@ msgstr "Riordinamento categoria abilitato"
 msgid "Category reordering disabled"
 msgstr "Riordinamento categoria disabilitato"
 
-#: localized_js.php:144
+#: localized_js.php:144 prefs.js:1908
 msgid "Save changes to selected feeds?"
 msgstr "Salvare i cambiamenti ai notiziari selezionati?"
 
@@ -1236,7 +1243,7 @@ msgstr ""
 msgid "Comments?"
 msgstr "Commenti?"
 
-#: tt-rss.php:136
+#: tt-rss.php:136 offline.js:737
 #, fuzzy
 msgid "Restart in offline mode"
 msgstr "Controllo della configurazione fallito"
@@ -1249,7 +1256,7 @@ msgstr ""
 msgid "Restart in online mode"
 msgstr ""
 
-#: tt-rss.php:158
+#: tt-rss.php:158 tt-rss.js:80
 msgid "tag cloud"
 msgstr "nuvola etichette"
 
@@ -2472,6 +2479,81 @@ msgstr "Corrisponde a:"
 msgid "Internal error: Function not implemented"
 msgstr "Errore interno: funzione non implementata"
 
+#: functions.js:1425
+#, fuzzy
+msgid "Subscribing to feed..."
+msgstr "Sottoscrivi il notiziario"
+
+#: offline.js:602
+msgid "Data for offline browsing has not been downloaded yet."
+msgstr ""
+
+#: offline.js:797
+msgid "Synchronizing offline data..."
+msgstr ""
+
+#: prefs.js:268 tt-rss.js:1435
+#, fuzzy
+msgid "Please enter label caption:"
+msgstr "Inserire il titolo dell&apos;etichetta:"
+
+#: prefs.js:302
+#, fuzzy
+msgid "Error: No feed URL given."
+msgstr ""
+"Impossibile annullare la sottoscrizione: nessun URL di notiziario è stato "
+"dato."
+
+#: prefs.js:304
+msgid "Error: Invalid feed URL."
+msgstr ""
+
+#: prefs.js:352
+#, fuzzy
+msgid "Please enter login:"
+msgstr "Inserire il titolo dell&apos;etichetta:"
+
+#: prefs.js:359
+#, fuzzy
+msgid "Can't create user: no login specified."
+msgstr "Impossibile aggiungere l&apos;utente: nessun accesso specificato."
+
+#: prefs.js:618
+#, fuzzy
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "Eliminare tutti gli articoli senza la stella in «%s»?"
+
+#: prefs.js:640
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr ""
+
+#: prefs.js:1831
+#, fuzzy
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
+"Cambiare il punteggio in tutti i notiziari? Questa operazione può durare "
+"molto tempo."
+
+#: prefs.js:1849
+#, fuzzy
+msgid "Remove filter %s?"
+msgstr "Rimuovere i filtri selezionati?"
+
+#: prefs.js:1993
+#, fuzzy
+msgid "Reset label colors to default?"
+msgstr "Reimpostare ai valori predefiniti?"
+
+#: prefs.js:2017
+#, fuzzy
+msgid "Please enter new label foreground color:"
+msgstr "Inserire il titolo dell&apos;etichetta:"
+
+#: prefs.js:2019
+#, fuzzy
+msgid "Please enter new label background color:"
+msgstr "Inserire il titolo dell&apos;etichetta:"
+
 #~ msgid "MySQL Charset Updater"
 #~ msgstr "Aggiornatore del set di caratteri di MySQL"
 
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index fd862b17f..19fdef1a1 100644
Binary files a/locale/ja_JP/LC_MESSAGES/messages.mo and b/locale/ja_JP/LC_MESSAGES/messages.mo differ
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index 20b73e202..d8fcf95c8 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss unstable\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-11 18:36+0300\n"
+"POT-Creation-Date: 2009-02-11 19:47+0300\n"
 "PO-Revision-Date: 2008-09-25 12:43+0900\n"
 "Last-Translator: Tadashi Jokagi <elf2000@users.sourceforge.net>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -187,7 +187,7 @@ msgid "Labels"
 msgstr "ラベル"
 
 #: functions.php:2913 functions.php:3336 functions.php:4121 help/3.php:59
-#: mobile/functions.php:61
+#: mobile/functions.php:61 offline.js:459 offline.js:1268
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
@@ -202,7 +202,7 @@ msgid "Fresh articles"
 msgstr "新しい記事"
 
 #: functions.php:2919 functions.php:3349 functions.php:4099 help/3.php:57
-#: mobile/functions.php:43
+#: mobile/functions.php:43 offline.js:454 offline.js:1270
 #, fuzzy
 msgid "All articles"
 msgstr "すべての記事"
@@ -223,7 +223,7 @@ msgstr "生成したフィード"
 
 #: functions.php:3983 functions.php:5247 modules/pref-feeds.php:1028
 #: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:163 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401 offline.js:374
 msgid "Select:"
 msgstr "選択:"
 
@@ -364,7 +364,7 @@ msgid ""
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5304
+#: functions.php:5304 offline.js:409
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
@@ -382,7 +382,7 @@ msgstr "削除"
 msgid "no tags"
 msgstr "タグがありません"
 
-#: localized_js.php:35
+#: localized_js.php:35 tt-rss.js:75
 msgid "display feeds"
 msgstr "フィードの表示"
 
@@ -414,7 +414,7 @@ msgstr "フィードの削除中..."
 msgid "Saving feed..."
 msgstr "フィードの保存中..."
 
-#: localized_js.php:43
+#: localized_js.php:43 prefs.js:331
 msgid "Can't add category: no name specified."
 msgstr "カテゴリーが追加できません: 名前が指定されていません。"
 
@@ -434,11 +434,11 @@ msgstr "ユーザーの追加中..."
 msgid "Can't create label: missing SQL expression."
 msgstr "ラベルを作成できません: SQL 表現が見当たりません。"
 
-#: localized_js.php:49 localized_js.php:103
+#: localized_js.php:49 localized_js.php:103 prefs.js:275 tt-rss.js:1440
 msgid "Can't create label: missing caption."
 msgstr "ラベルが作成できません: キャプションが見当たりません。"
 
-#: localized_js.php:50
+#: localized_js.php:50 prefs.js:484
 msgid "Remove selected labels?"
 msgstr "選択したラベルを削除しますか?"
 
@@ -446,11 +446,11 @@ msgstr "選択したラベルを削除しますか?"
 msgid "Removing selected labels..."
 msgstr "選択したラベルの削除中..."
 
-#: localized_js.php:52 localized_js.php:71 localized_js.php:105
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105 prefs.js:499
 msgid "No labels are selected."
 msgstr "選択されたラベルはありません。"
 
-#: localized_js.php:53
+#: localized_js.php:53 prefs.js:513
 msgid "Remove selected users?"
 msgstr "選択されたユーザーを削除しますか?"
 
@@ -459,11 +459,11 @@ msgid "Removing selected users..."
 msgstr "選択されたユーザーの削除中..."
 
 #: localized_js.php:55 localized_js.php:73 localized_js.php:75
-#: localized_js.php:106
+#: localized_js.php:106 prefs.js:529 prefs.js:817 prefs.js:838 prefs.js:876
 msgid "No users are selected."
 msgstr "選択されたユーザーはありません。"
 
-#: localized_js.php:56
+#: localized_js.php:56 prefs.js:547
 msgid "Remove selected filters?"
 msgstr "選択されたフィルターを削除しますか?"
 
@@ -471,11 +471,12 @@ msgstr "選択されたフィルターを削除しますか?"
 msgid "Removing selected filters..."
 msgstr "選択されたフィルターの削除中..."
 
-#: localized_js.php:58 localized_js.php:81 localized_js.php:107
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107 prefs.js:562
+#: prefs.js:905
 msgid "No filters are selected."
 msgstr "選択されたフィルターはありません。"
 
-#: localized_js.php:59
+#: localized_js.php:59 prefs.js:581
 msgid "Unsubscribe from selected feeds?"
 msgstr "選択されたフィードの購読をやめますか?"
 
@@ -484,11 +485,13 @@ msgid "Unsubscribing from selected feeds..."
 msgstr "選択されたフィードの購読を解除中..."
 
 #: localized_js.php:61 localized_js.php:79 localized_js.php:83
-#: localized_js.php:108 localized_js.php:111
+#: localized_js.php:108 localized_js.php:111 prefs.js:597 prefs.js:627
+#: prefs.js:658 prefs.js:925 prefs.js:946 prefs.js:1258 prefs.js:1307
+#: prefs.js:1824 tt-rss.js:1485
 msgid "No feeds are selected."
 msgstr "選択されたフィードはありません。"
 
-#: localized_js.php:62
+#: localized_js.php:62 prefs.js:671
 msgid "Remove selected categories?"
 msgstr "選択されたカテゴリーを削除しますか?"
 
@@ -496,7 +499,7 @@ msgstr "選択されたカテゴリーを削除しますか?"
 msgid "Removing selected categories..."
 msgstr "選択されたカテゴリーを削除しますか?"
 
-#: localized_js.php:64 localized_js.php:85 localized_js.php:109
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109 prefs.js:688
 msgid "No categories are selected."
 msgstr "選択されたカテゴリーはありません。"
 
@@ -512,7 +515,7 @@ msgstr "ヘルプの読み込み中..."
 msgid "Saving label..."
 msgstr "ラベルの保存中..."
 
-#: localized_js.php:68 localized_js.php:110
+#: localized_js.php:68 localized_js.php:110 prefs.js:763
 msgid "Login field cannot be blank."
 msgstr "ログイン名の項目は空にできません。"
 
@@ -528,11 +531,12 @@ msgstr "フィルターの保存中..."
 msgid "Please select only one label."
 msgstr "ひとつだけラベルを選択してください。"
 
-#: localized_js.php:74 localized_js.php:76
+#: localized_js.php:74 localized_js.php:76 prefs.js:822 prefs.js:843
+#: prefs.js:881
 msgid "Please select only one user."
 msgstr "ひとつだけユーザーを選択してください。"
 
-#: localized_js.php:77
+#: localized_js.php:77 prefs.js:847
 msgid "Reset password of selected user?"
 msgstr "選択されたユーザーのパスワードをリセットしますか?"
 
@@ -540,15 +544,15 @@ msgstr "選択されたユーザーのパスワードをリセットしますか
 msgid "Resetting password for selected user..."
 msgstr "選択されたユーザーのパスワードのリセット中..."
 
-#: localized_js.php:80
+#: localized_js.php:80 prefs.js:612
 msgid "Please select only one feed."
 msgstr "フィードをひとつだけ選択してください。"
 
-#: localized_js.php:82
+#: localized_js.php:82 prefs.js:910
 msgid "Please select only one filter."
 msgstr "フィルターをひとつだけ選択してください。"
 
-#: localized_js.php:84
+#: localized_js.php:84 prefs.js:930
 msgid "Please select one feed."
 msgstr "フィードをひとつ選択してください"
 
@@ -556,7 +560,7 @@ msgstr "フィードをひとつ選択してください"
 msgid "Please select only one category."
 msgstr "カテゴリーをひとつだけ選択してください。"
 
-#: localized_js.php:87
+#: localized_js.php:87 prefs.js:986
 msgid "No OPML file to upload."
 msgstr "アップロードする OPML ファイルがありません。"
 
@@ -564,7 +568,7 @@ msgstr "アップロードする OPML ファイルがありません。"
 msgid "Changing category of selected feeds..."
 msgstr "選択されたカテゴリーのフィードの削除中..."
 
-#: localized_js.php:89
+#: localized_js.php:89 prefs.js:1266
 msgid "Reset to defaults?"
 msgstr "標準に戻しますか?"
 
@@ -576,7 +580,8 @@ msgstr "パスワードの変更を試行中..."
 msgid "Trying to change e-mail..."
 msgstr "電子メールの変更を試行中..."
 
-#: localized_js.php:92
+#: localized_js.php:92 viewfeed.js:874 viewfeed.js:909 viewfeed.js:949
+#: viewfeed.js:1019 viewfeed.js:1066 viewfeed.js:1218
 msgid "No articles are selected."
 msgstr "記事は選択されていません。"
 
@@ -592,7 +597,7 @@ msgstr "記事を表示できません (XML オブジェクトが見当たりま
 msgid "No feed selected."
 msgstr "フィードは選択されていません。"
 
-#: localized_js.php:96
+#: localized_js.php:96 prefs.js:1693
 msgid "Replace current publishing address with a new one?"
 msgstr "新しいもので現在の公開アドレスを置き換えますか?"
 
@@ -604,42 +609,43 @@ msgstr "アドレスを変更しました。"
 msgid "Could not change address."
 msgstr "アドレスの変更ができません。"
 
-#: localized_js.php:99
+#: localized_js.php:99 tt-rss.js:596
 msgid "You can't unsubscribe from the category."
 msgstr "カテゴリーから購読をやめることができません。"
 
-#: localized_js.php:100
+#: localized_js.php:100 tt-rss.js:601 tt-rss.js:620 tt-rss.js:834
+#: tt-rss.js:1013
 msgid "Please select some feed first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: localized_js.php:101
+#: localized_js.php:101 tt-rss.js:839
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: localized_js.php:112
+#: localized_js.php:112 functions.js:1380
 msgid "Can't add filter: nothing to match on."
 msgstr ""
 
-#: localized_js.php:113
+#: localized_js.php:113 functions.js:1421
 msgid "Can't subscribe: no feed URL given."
 msgstr "購読できません: フィード URL が入力されていません。"
 
-#: localized_js.php:114
+#: localized_js.php:114 prefs.js:1879 tt-rss.js:607 tt-rss.js:702
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr "%s の購読をやめますか?"
 
-#: localized_js.php:115
+#: localized_js.php:115 viewfeed.js:1186
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "%s のすべての可視記事を既読に設定しますか?"
 
-#: localized_js.php:116
+#: localized_js.php:116 tt-rss.js:806 tt-rss.js:819
 #, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "すべての記事を既読に設定しますか?"
 
-#: localized_js.php:117
+#: localized_js.php:117 viewfeed.js:1225
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "選択した %d 件の記事を既読にしますか?"
@@ -648,7 +654,7 @@ msgstr "選択した %d 件の記事を既読にしますか?"
 msgid "Please enter label title:"
 msgstr "ラベルの題名を入力してください:"
 
-#: localized_js.php:119
+#: localized_js.php:119 prefs.js:1714
 msgid "Save current configuration?"
 msgstr "現在の設定を保存しますか?"
 
@@ -664,53 +670,54 @@ msgstr "新しいパスワードを空にできません。"
 msgid "Entered passwords do not match."
 msgstr "パスワードが一致しません。"
 
-#: localized_js.php:123
+#: localized_js.php:123 viewfeed.js:1857
 msgid "No articles found to mark"
 msgstr "マークした記事が見つかりません"
 
-#: localized_js.php:124
+#: localized_js.php:124 viewfeed.js:1859
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "%d 件のマークした記事を既読として設定しますか?"
 
-#: localized_js.php:125
+#: localized_js.php:125 viewfeed.js:1816
 msgid "No article is selected."
 msgstr "選択された記事はありません。"
 
-#: localized_js.php:126
+#: localized_js.php:126 viewfeed.js:494 viewfeed.js:559
 msgid "Star article"
 msgstr "記事をお気に入りにする"
 
-#: localized_js.php:127
+#: localized_js.php:127 viewfeed.js:543
 msgid "Unstar article"
 msgstr "記事のお気に入りを解除する"
 
-#: localized_js.php:128
+#: localized_js.php:128 viewfeed.js:552 viewfeed.js:614
 msgid "Please wait..."
 msgstr "しばらくお待ちください..."
 
-#: localized_js.php:129 localized_schema.php:18
+#: localized_js.php:129 localized_schema.php:18 viewfeed.js:511
+#: viewfeed.js:621
 msgid "Publish article"
 msgstr "公開記事"
 
-#: localized_js.php:130
+#: localized_js.php:130 viewfeed.js:608
 msgid "Unpublish article"
 msgstr "非公開記事"
 
-#: localized_js.php:131
+#: localized_js.php:131 tt-rss.js:625
 msgid "You can't clear this type of feed."
 msgstr "フィードのこの種類を消去できません。"
 
-#: localized_js.php:132
+#: localized_js.php:132 tt-rss.js:631
 #, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr "%s のすべてのお気に入りではない記事を削除しますか?"
 
-#: localized_js.php:133
+#: localized_js.php:133 tt-rss.js:277
 msgid "Mark all articles as read?"
 msgstr "すべての記事を既読にしますか?"
 
-#: localized_js.php:134
+#: localized_js.php:134 prefs.js:1809
 msgid "Rescore articles in selected feeds?"
 msgstr "選択されたフィードの記事のスコアを再計算しますか?"
 
@@ -728,11 +735,11 @@ msgstr ""
 msgid "Rescoring feeds..."
 msgstr "フィードのスコアの再計算中..."
 
-#: localized_js.php:138
+#: localized_js.php:138 tt-rss.js:1008
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: localized_js.php:139
+#: localized_js.php:139 tt-rss.js:1018
 #, php-format
 msgid "Rescore articles in %s?"
 msgstr "%s の記事のスコアを再計算しますか?"
@@ -741,7 +748,7 @@ msgstr "%s の記事のスコアを再計算しますか?"
 msgid "Rescoring articles..."
 msgstr "記事のスコアの再計算中..."
 
-#: localized_js.php:141
+#: localized_js.php:141 tt-rss.js:681
 msgid "Reset category order?"
 msgstr "選択されたカテゴリーの順序をリセットしますか?"
 
@@ -753,7 +760,7 @@ msgstr "カテゴリーの順序変更を有効にしました"
 msgid "Category reordering disabled"
 msgstr "カテゴリーの順序変更を無効にしました"
 
-#: localized_js.php:144
+#: localized_js.php:144 prefs.js:1908
 msgid "Save changes to selected feeds?"
 msgstr "選択されたフィードの変更を保存しますか?"
 
@@ -1195,7 +1202,7 @@ msgstr ""
 msgid "Comments?"
 msgstr ""
 
-#: tt-rss.php:136
+#: tt-rss.php:136 offline.js:737
 #, fuzzy
 msgid "Restart in offline mode"
 msgstr "設定の確認で失敗"
@@ -1208,7 +1215,7 @@ msgstr ""
 msgid "Restart in online mode"
 msgstr ""
 
-#: tt-rss.php:158
+#: tt-rss.php:158 tt-rss.js:80
 msgid "tag cloud"
 msgstr "タグクラウド"
 
@@ -2408,6 +2415,79 @@ msgstr "対象項目:"
 msgid "Internal error: Function not implemented"
 msgstr "インターナルエラー: 機能が実装されていません"
 
+#: functions.js:1425
+#, fuzzy
+msgid "Subscribing to feed..."
+msgstr "フィードを購読する"
+
+#: offline.js:602
+msgid "Data for offline browsing has not been downloaded yet."
+msgstr ""
+
+#: offline.js:797
+msgid "Synchronizing offline data..."
+msgstr ""
+
+#: prefs.js:268 tt-rss.js:1435
+#, fuzzy
+msgid "Please enter label caption:"
+msgstr "ラベルの題名を入力してください:"
+
+#: prefs.js:302
+#, fuzzy
+msgid "Error: No feed URL given."
+msgstr "購読できません: フィード URL が入力されていません。"
+
+#: prefs.js:304
+msgid "Error: Invalid feed URL."
+msgstr ""
+
+#: prefs.js:352
+#, fuzzy
+msgid "Please enter login:"
+msgstr "ラベルの題名を入力してください:"
+
+#: prefs.js:359
+#, fuzzy
+msgid "Can't create user: no login specified."
+msgstr "ユーザーが追加できません: ログイン名が指定されていません。"
+
+#: prefs.js:618
+#, fuzzy
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "%s のすべてのお気に入りではない記事を削除しますか?"
+
+#: prefs.js:640
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr ""
+
+#: prefs.js:1831
+#, fuzzy
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
+"すべてのフィードの記事のスコアを再計算しますか? この操作は大量の時間を使うで"
+"しょう。"
+
+#: prefs.js:1849
+#, fuzzy
+msgid "Remove filter %s?"
+msgstr "選択されたフィルターを削除しますか?"
+
+#: prefs.js:1993
+#, fuzzy
+msgid "Reset label colors to default?"
+msgstr "標準に戻しますか?"
+
+#: prefs.js:2017
+#, fuzzy
+msgid "Please enter new label foreground color:"
+msgstr "ラベルの題名を入力してください:"
+
+#: prefs.js:2019
+#, fuzzy
+msgid "Please enter new label background color:"
+msgstr "ラベルの題名を入力してください:"
+
 #~ msgid ""
 #~ "This script is for Tiny Tiny RSS installations with MySQL backend only."
 #~ msgstr ""
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index baa6a05c1..ab15c84b0 100644
Binary files a/locale/nb_NO/LC_MESSAGES/messages.mo and b/locale/nb_NO/LC_MESSAGES/messages.mo differ
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index c97c754e0..d610f98b6 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.2.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-11 18:36+0300\n"
+"POT-Creation-Date: 2009-02-11 19:47+0300\n"
 "PO-Revision-Date: 2008-11-29 20:45+0100\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
@@ -190,7 +190,7 @@ msgid "Labels"
 msgstr "Merkelapper"
 
 #: functions.php:2913 functions.php:3336 functions.php:4121 help/3.php:59
-#: mobile/functions.php:61
+#: mobile/functions.php:61 offline.js:459 offline.js:1268
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
@@ -205,7 +205,7 @@ msgid "Fresh articles"
 msgstr "Ferske artikler"
 
 #: functions.php:2919 functions.php:3349 functions.php:4099 help/3.php:57
-#: mobile/functions.php:43
+#: mobile/functions.php:43 offline.js:454 offline.js:1270
 #, fuzzy
 msgid "All articles"
 msgstr "Alle artikler"
@@ -225,7 +225,7 @@ msgstr "Generert nyhetsstrøm"
 
 #: functions.php:3983 functions.php:5247 modules/pref-feeds.php:1028
 #: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:163 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401 offline.js:374
 msgid "Select:"
 msgstr "Velg:"
 
@@ -367,7 +367,7 @@ msgid ""
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5304
+#: functions.php:5304 offline.js:409
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
@@ -385,7 +385,7 @@ msgstr "Fjern"
 msgid "no tags"
 msgstr "Ingen stikkord"
 
-#: localized_js.php:35
+#: localized_js.php:35 tt-rss.js:75
 msgid "display feeds"
 msgstr "Vis nyhetsstrømmer"
 
@@ -417,7 +417,7 @@ msgstr "Fjerner nyhetsstrøm..."
 msgid "Saving feed..."
 msgstr "Lagrer Nyhetsstrøm"
 
-#: localized_js.php:43
+#: localized_js.php:43 prefs.js:331
 msgid "Can't add category: no name specified."
 msgstr "Kan ikke legge til kategori: mangler navn"
 
@@ -437,11 +437,11 @@ msgstr "Legger til bruker.."
 msgid "Can't create label: missing SQL expression."
 msgstr "Kan ikke lage merkelapp, SQL-uttrykk mangler"
 
-#: localized_js.php:49 localized_js.php:103
+#: localized_js.php:49 localized_js.php:103 prefs.js:275 tt-rss.js:1440
 msgid "Can't create label: missing caption."
 msgstr "Kan ikke skape merkelapp, mangler overskrift."
 
-#: localized_js.php:50
+#: localized_js.php:50 prefs.js:484
 msgid "Remove selected labels?"
 msgstr "Fjerne merkede merkelapper?"
 
@@ -449,11 +449,11 @@ msgstr "Fjerne merkede merkelapper?"
 msgid "Removing selected labels..."
 msgstr "Fjerner merkede merkelapper..."
 
-#: localized_js.php:52 localized_js.php:71 localized_js.php:105
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105 prefs.js:499
 msgid "No labels are selected."
 msgstr "Ingen merkelapper er markert"
 
-#: localized_js.php:53
+#: localized_js.php:53 prefs.js:513
 msgid "Remove selected users?"
 msgstr "Fjerne markerte brukere?"
 
@@ -462,11 +462,11 @@ msgid "Removing selected users..."
 msgstr "Fjerner markerte brukere..."
 
 #: localized_js.php:55 localized_js.php:73 localized_js.php:75
-#: localized_js.php:106
+#: localized_js.php:106 prefs.js:529 prefs.js:817 prefs.js:838 prefs.js:876
 msgid "No users are selected."
 msgstr "Ingen bruker er markert"
 
-#: localized_js.php:56
+#: localized_js.php:56 prefs.js:547
 msgid "Remove selected filters?"
 msgstr "Fjerne valgte filtre?"
 
@@ -474,11 +474,12 @@ msgstr "Fjerne valgte filtre?"
 msgid "Removing selected filters..."
 msgstr "Fjerner valgte filtre..."
 
-#: localized_js.php:58 localized_js.php:81 localized_js.php:107
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107 prefs.js:562
+#: prefs.js:905
 msgid "No filters are selected."
 msgstr "Ingen filtre er valgt"
 
-#: localized_js.php:59
+#: localized_js.php:59 prefs.js:581
 msgid "Unsubscribe from selected feeds?"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
@@ -487,11 +488,13 @@ msgid "Unsubscribing from selected feeds..."
 msgstr "Fjerner abonnementer på valgte nyhetsstrømmer..."
 
 #: localized_js.php:61 localized_js.php:79 localized_js.php:83
-#: localized_js.php:108 localized_js.php:111
+#: localized_js.php:108 localized_js.php:111 prefs.js:597 prefs.js:627
+#: prefs.js:658 prefs.js:925 prefs.js:946 prefs.js:1258 prefs.js:1307
+#: prefs.js:1824 tt-rss.js:1485
 msgid "No feeds are selected."
 msgstr "Ingen nyhetsstrømmer er valgt"
 
-#: localized_js.php:62
+#: localized_js.php:62 prefs.js:671
 msgid "Remove selected categories?"
 msgstr "Fjerne valgte kategorier?"
 
@@ -499,7 +502,7 @@ msgstr "Fjerne valgte kategorier?"
 msgid "Removing selected categories..."
 msgstr "Fjerner valgte kategorier..."
 
-#: localized_js.php:64 localized_js.php:85 localized_js.php:109
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109 prefs.js:688
 msgid "No categories are selected."
 msgstr "Ingen kategorier er valgt."
 
@@ -515,7 +518,7 @@ msgstr "Laster hjelp..."
 msgid "Saving label..."
 msgstr "Lagrer merkelapp..."
 
-#: localized_js.php:68 localized_js.php:110
+#: localized_js.php:68 localized_js.php:110 prefs.js:763
 msgid "Login field cannot be blank."
 msgstr "Brukernavn kan ikke være blankt"
 
@@ -531,11 +534,12 @@ msgstr "Lagrer filter..."
 msgid "Please select only one label."
 msgstr "Vennligst velg kun en merkelapp"
 
-#: localized_js.php:74 localized_js.php:76
+#: localized_js.php:74 localized_js.php:76 prefs.js:822 prefs.js:843
+#: prefs.js:881
 msgid "Please select only one user."
 msgstr "Vennligst velg kun en bruker"
 
-#: localized_js.php:77
+#: localized_js.php:77 prefs.js:847
 msgid "Reset password of selected user?"
 msgstr "Nullstill passordet til utvalgte bruker?"
 
@@ -543,15 +547,15 @@ msgstr "Nullstill passordet til utvalgte bruker?"
 msgid "Resetting password for selected user..."
 msgstr "Nullstiller passordet for utvalgte bruker..."
 
-#: localized_js.php:80
+#: localized_js.php:80 prefs.js:612
 msgid "Please select only one feed."
 msgstr "Vennligst velg kun en nyhetsstrøm"
 
-#: localized_js.php:82
+#: localized_js.php:82 prefs.js:910
 msgid "Please select only one filter."
 msgstr "Vennligst velg kun et filter"
 
-#: localized_js.php:84
+#: localized_js.php:84 prefs.js:930
 msgid "Please select one feed."
 msgstr "Vennligst velg en nyhetsstrøm"
 
@@ -559,7 +563,7 @@ msgstr "Vennligst velg en nyhetsstrøm"
 msgid "Please select only one category."
 msgstr "Vennligst velg kun en kategori"
 
-#: localized_js.php:87
+#: localized_js.php:87 prefs.js:986
 msgid "No OPML file to upload."
 msgstr "Ingen OPML-fil til å lastes opp."
 
@@ -567,7 +571,7 @@ msgstr "Ingen OPML-fil til å lastes opp."
 msgid "Changing category of selected feeds..."
 msgstr "Endrer kategori for utvalgte nyhetsstrømmer"
 
-#: localized_js.php:89
+#: localized_js.php:89 prefs.js:1266
 msgid "Reset to defaults?"
 msgstr "Tilbakefør til standardinnstillingene"
 
@@ -579,7 +583,8 @@ msgstr "Prøver å endre passordet..."
 msgid "Trying to change e-mail..."
 msgstr "Prøver å endre e-posten..."
 
-#: localized_js.php:92
+#: localized_js.php:92 viewfeed.js:874 viewfeed.js:909 viewfeed.js:949
+#: viewfeed.js:1019 viewfeed.js:1066 viewfeed.js:1218
 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
 
@@ -595,7 +600,7 @@ msgstr "Kunne ikke vise artikkelen (manglende XML objekt)."
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
-#: localized_js.php:96
+#: localized_js.php:96 prefs.js:1693
 msgid "Replace current publishing address with a new one?"
 msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
 
@@ -607,42 +612,43 @@ msgstr "Adresse er endret"
 msgid "Could not change address."
 msgstr "Adresse kunne ikke endres"
 
-#: localized_js.php:99
+#: localized_js.php:99 tt-rss.js:596
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#: localized_js.php:100
+#: localized_js.php:100 tt-rss.js:601 tt-rss.js:620 tt-rss.js:834
+#: tt-rss.js:1013
 msgid "Please select some feed first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: localized_js.php:101
+#: localized_js.php:101 tt-rss.js:839
 msgid "You can't edit this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
-#: localized_js.php:112
+#: localized_js.php:112 functions.js:1380
 msgid "Can't add filter: nothing to match on."
 msgstr "Kan ikke legge til filter, ingen match på kriteriene"
 
-#: localized_js.php:113
+#: localized_js.php:113 functions.js:1421
 msgid "Can't subscribe: no feed URL given."
 msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
 
-#: localized_js.php:114
+#: localized_js.php:114 prefs.js:1879 tt-rss.js:607 tt-rss.js:702
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr "Fjerne abonnement på %s?"
 
-#: localized_js.php:115
+#: localized_js.php:115 viewfeed.js:1186
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marker alle synlige artikler i %s som leste?"
 
-#: localized_js.php:116
+#: localized_js.php:116 tt-rss.js:806 tt-rss.js:819
 #, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: localized_js.php:117
+#: localized_js.php:117 viewfeed.js:1225
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marker %d valgte artikler i %s som leste?"
@@ -651,7 +657,7 @@ msgstr "Marker %d valgte artikler i %s som leste?"
 msgid "Please enter label title:"
 msgstr "Vennligst skriv inn merkelapp:"
 
-#: localized_js.php:119
+#: localized_js.php:119 prefs.js:1714
 msgid "Save current configuration?"
 msgstr "Lagre nåværende konfigurasjon?"
 
@@ -667,53 +673,54 @@ msgstr "Nytt passord kan ikke vært blankt."
 msgid "Entered passwords do not match."
 msgstr "Innskrivne passord matcher ikke."
 
-#: localized_js.php:123
+#: localized_js.php:123 viewfeed.js:1857
 msgid "No articles found to mark"
 msgstr "Ingen artikler funnet som kan markeres"
 
-#: localized_js.php:124
+#: localized_js.php:124 viewfeed.js:1859
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "Marker %d artikkel/artikler som leste?"
 
-#: localized_js.php:125
+#: localized_js.php:125 viewfeed.js:1816
 msgid "No article is selected."
 msgstr "Ingen artikkel er valgt."
 
-#: localized_js.php:126
+#: localized_js.php:126 viewfeed.js:494 viewfeed.js:559
 msgid "Star article"
 msgstr "Marker artikkel som favoritt"
 
-#: localized_js.php:127
+#: localized_js.php:127 viewfeed.js:543
 msgid "Unstar article"
 msgstr "Fjern favorittmerkingen fra artiklen"
 
-#: localized_js.php:128
+#: localized_js.php:128 viewfeed.js:552 viewfeed.js:614
 msgid "Please wait..."
 msgstr "Vennligst vent..."
 
-#: localized_js.php:129 localized_schema.php:18
+#: localized_js.php:129 localized_schema.php:18 viewfeed.js:511
+#: viewfeed.js:621
 msgid "Publish article"
 msgstr "Publiser artiklen"
 
-#: localized_js.php:130
+#: localized_js.php:130 viewfeed.js:608
 msgid "Unpublish article"
 msgstr "Fjern publiseringen av artikkelen."
 
-#: localized_js.php:131
+#: localized_js.php:131 tt-rss.js:625
 msgid "You can't clear this type of feed."
 msgstr "Du kan ikke rydde opp i denne typen nyhetsstrøm"
 
-#: localized_js.php:132
+#: localized_js.php:132 tt-rss.js:631
 #, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr "Fjern alle ikke-favoriserte artikler i %s?"
 
-#: localized_js.php:133
+#: localized_js.php:133 tt-rss.js:277
 msgid "Mark all articles as read?"
 msgstr "Marker alle artikler som leste?"
 
-#: localized_js.php:134
+#: localized_js.php:134 prefs.js:1809
 msgid "Rescore articles in selected feeds?"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
@@ -730,11 +737,11 @@ msgstr ""
 msgid "Rescoring feeds..."
 msgstr "Setter poeng på nytt for nyhetskanalene..."
 
-#: localized_js.php:138
+#: localized_js.php:138 tt-rss.js:1008
 msgid "You can't rescore this kind of feed."
 msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 
-#: localized_js.php:139
+#: localized_js.php:139 tt-rss.js:1018
 #, php-format
 msgid "Rescore articles in %s?"
 msgstr "Endre poengene for artiklene i %s?"
@@ -743,7 +750,7 @@ msgstr "Endre poengene for artiklene i %s?"
 msgid "Rescoring articles..."
 msgstr "Endrer poengsummen for artiklene..."
 
-#: localized_js.php:141
+#: localized_js.php:141 tt-rss.js:681
 msgid "Reset category order?"
 msgstr "Tilbakestill kategorirekkefølgen?"
 
@@ -755,7 +762,7 @@ msgstr "Kategorirekkefølge endring tillatt"
 msgid "Category reordering disabled"
 msgstr "Kategorirekkefølge endring er ikke tillatt"
 
-#: localized_js.php:144
+#: localized_js.php:144 prefs.js:1908
 msgid "Save changes to selected feeds?"
 msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
 
@@ -1227,7 +1234,7 @@ msgstr ""
 msgid "Comments?"
 msgstr "Kommentarer?"
 
-#: tt-rss.php:136
+#: tt-rss.php:136 offline.js:737
 #, fuzzy
 msgid "Restart in offline mode"
 msgstr "Konfigurasjonssjekken feilet"
@@ -1240,7 +1247,7 @@ msgstr ""
 msgid "Restart in online mode"
 msgstr ""
 
-#: tt-rss.php:158
+#: tt-rss.php:158 tt-rss.js:80
 msgid "tag cloud"
 msgstr "Tag-sky"
 
@@ -2463,6 +2470,78 @@ msgstr "Match på:"
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#: functions.js:1425
+#, fuzzy
+msgid "Subscribing to feed..."
+msgstr "Abonner på nyhetsstrøm"
+
+#: offline.js:602
+msgid "Data for offline browsing has not been downloaded yet."
+msgstr ""
+
+#: offline.js:797
+msgid "Synchronizing offline data..."
+msgstr ""
+
+#: prefs.js:268 tt-rss.js:1435
+#, fuzzy
+msgid "Please enter label caption:"
+msgstr "Vennligst skriv inn merkelapp:"
+
+#: prefs.js:302
+#, fuzzy
+msgid "Error: No feed URL given."
+msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
+
+#: prefs.js:304
+msgid "Error: Invalid feed URL."
+msgstr ""
+
+#: prefs.js:352
+#, fuzzy
+msgid "Please enter login:"
+msgstr "Vennligst skriv inn merkelapp:"
+
+#: prefs.js:359
+#, fuzzy
+msgid "Can't create user: no login specified."
+msgstr "Kan ikke legge til bruker: brukernavn mangler."
+
+#: prefs.js:618
+#, fuzzy
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "Fjern alle ikke-favoriserte artikler i %s?"
+
+#: prefs.js:640
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr ""
+
+#: prefs.js:1831
+#, fuzzy
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
+"Endre poengene til artiklene i alle nyhetskanalene? Dette kan ta lang tid."
+
+#: prefs.js:1849
+#, fuzzy
+msgid "Remove filter %s?"
+msgstr "Fjerne valgte filtre?"
+
+#: prefs.js:1993
+#, fuzzy
+msgid "Reset label colors to default?"
+msgstr "Tilbakefør til standardinnstillingene"
+
+#: prefs.js:2017
+#, fuzzy
+msgid "Please enter new label foreground color:"
+msgstr "Vennligst skriv inn merkelapp:"
+
+#: prefs.js:2019
+#, fuzzy
+msgid "Please enter new label background color:"
+msgstr "Vennligst skriv inn merkelapp:"
+
 #~ msgid "MySQL Charset Updater"
 #~ msgstr "MySQL tegnsettsoppdaterer"
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index b358a57dc..7ab9d2b36 100644
Binary files a/locale/pt_BR/LC_MESSAGES/messages.mo and b/locale/pt_BR/LC_MESSAGES/messages.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index 82734b733..52c70f374 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss 1.2.14.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-11 18:36+0300\n"
+"POT-Creation-Date: 2009-02-11 19:47+0300\n"
 "PO-Revision-Date: 2007-10-24 00:47-0200\n"
 "Last-Translator: Marcelo Jorge VIeira (metal) <metal@alucinados.com>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -187,7 +187,7 @@ msgid "Labels"
 msgstr ""
 
 #: functions.php:2913 functions.php:3336 functions.php:4121 help/3.php:59
-#: mobile/functions.php:61
+#: mobile/functions.php:61 offline.js:459 offline.js:1268
 msgid "Starred articles"
 msgstr ""
 
@@ -202,7 +202,7 @@ msgid "Fresh articles"
 msgstr ""
 
 #: functions.php:2919 functions.php:3349 functions.php:4099 help/3.php:57
-#: mobile/functions.php:43
+#: mobile/functions.php:43 offline.js:454 offline.js:1270
 #, fuzzy
 msgid "All articles"
 msgstr "Favoritos"
@@ -222,7 +222,7 @@ msgstr ""
 
 #: functions.php:3983 functions.php:5247 modules/pref-feeds.php:1028
 #: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:163 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401 offline.js:374
 msgid "Select:"
 msgstr "Selecione:"
 
@@ -368,7 +368,7 @@ msgid ""
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5304
+#: functions.php:5304 offline.js:409
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
@@ -387,7 +387,7 @@ msgstr "Remover"
 msgid "no tags"
 msgstr "sem tags"
 
-#: localized_js.php:35
+#: localized_js.php:35 tt-rss.js:75
 msgid "display feeds"
 msgstr ""
 
@@ -419,7 +419,7 @@ msgstr "Removendo o Feed..."
 msgid "Saving feed..."
 msgstr "Salvando o Feed..."
 
-#: localized_js.php:43
+#: localized_js.php:43 prefs.js:331
 msgid "Can't add category: no name specified."
 msgstr ""
 
@@ -439,11 +439,11 @@ msgstr "Adicionando o usuário…"
 msgid "Can't create label: missing SQL expression."
 msgstr ""
 
-#: localized_js.php:49 localized_js.php:103
+#: localized_js.php:49 localized_js.php:103 prefs.js:275 tt-rss.js:1440
 msgid "Can't create label: missing caption."
 msgstr ""
 
-#: localized_js.php:50
+#: localized_js.php:50 prefs.js:484
 msgid "Remove selected labels?"
 msgstr ""
 
@@ -451,11 +451,11 @@ msgstr ""
 msgid "Removing selected labels..."
 msgstr ""
 
-#: localized_js.php:52 localized_js.php:71 localized_js.php:105
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105 prefs.js:499
 msgid "No labels are selected."
 msgstr ""
 
-#: localized_js.php:53
+#: localized_js.php:53 prefs.js:513
 msgid "Remove selected users?"
 msgstr "Remover os usuários selecionados?"
 
@@ -464,11 +464,11 @@ msgid "Removing selected users..."
 msgstr "Removendo usuários selecionados…"
 
 #: localized_js.php:55 localized_js.php:73 localized_js.php:75
-#: localized_js.php:106
+#: localized_js.php:106 prefs.js:529 prefs.js:817 prefs.js:838 prefs.js:876
 msgid "No users are selected."
 msgstr "Nenhum usuário foi selecionado."
 
-#: localized_js.php:56
+#: localized_js.php:56 prefs.js:547
 msgid "Remove selected filters?"
 msgstr "Remover os filtros selecionados?"
 
@@ -476,11 +476,12 @@ msgstr "Remover os filtros selecionados?"
 msgid "Removing selected filters..."
 msgstr "Removendo filtros selecionados…"
 
-#: localized_js.php:58 localized_js.php:81 localized_js.php:107
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107 prefs.js:562
+#: prefs.js:905
 msgid "No filters are selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: localized_js.php:59
+#: localized_js.php:59 prefs.js:581
 msgid "Unsubscribe from selected feeds?"
 msgstr ""
 
@@ -489,11 +490,13 @@ msgid "Unsubscribing from selected feeds..."
 msgstr ""
 
 #: localized_js.php:61 localized_js.php:79 localized_js.php:83
-#: localized_js.php:108 localized_js.php:111
+#: localized_js.php:108 localized_js.php:111 prefs.js:597 prefs.js:627
+#: prefs.js:658 prefs.js:925 prefs.js:946 prefs.js:1258 prefs.js:1307
+#: prefs.js:1824 tt-rss.js:1485
 msgid "No feeds are selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: localized_js.php:62
+#: localized_js.php:62 prefs.js:671
 msgid "Remove selected categories?"
 msgstr "Remover as categorias selecionadas?"
 
@@ -501,7 +504,7 @@ msgstr "Remover as categorias selecionadas?"
 msgid "Removing selected categories..."
 msgstr "Removendo categorias selecionadas…"
 
-#: localized_js.php:64 localized_js.php:85 localized_js.php:109
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109 prefs.js:688
 msgid "No categories are selected."
 msgstr "Nenhuma categoria foi selecionada."
 
@@ -517,7 +520,7 @@ msgstr ""
 msgid "Saving label..."
 msgstr ""
 
-#: localized_js.php:68 localized_js.php:110
+#: localized_js.php:68 localized_js.php:110 prefs.js:763
 msgid "Login field cannot be blank."
 msgstr "O campo de Login não pode ser vazio."
 
@@ -533,11 +536,12 @@ msgstr "Salvando o filtro..."
 msgid "Please select only one label."
 msgstr ""
 
-#: localized_js.php:74 localized_js.php:76
+#: localized_js.php:74 localized_js.php:76 prefs.js:822 prefs.js:843
+#: prefs.js:881
 msgid "Please select only one user."
 msgstr "Por favor selecione somente um usuário."
 
-#: localized_js.php:77
+#: localized_js.php:77 prefs.js:847
 msgid "Reset password of selected user?"
 msgstr ""
 
@@ -545,15 +549,15 @@ msgstr ""
 msgid "Resetting password for selected user..."
 msgstr ""
 
-#: localized_js.php:80
+#: localized_js.php:80 prefs.js:612
 msgid "Please select only one feed."
 msgstr "Por favor selecione somente um feed"
 
-#: localized_js.php:82
+#: localized_js.php:82 prefs.js:910
 msgid "Please select only one filter."
 msgstr "Por favor selecione somente um filtro."
 
-#: localized_js.php:84
+#: localized_js.php:84 prefs.js:930
 msgid "Please select one feed."
 msgstr "Por favor selecione  um feed."
 
@@ -561,7 +565,7 @@ msgstr "Por favor selecione  um feed."
 msgid "Please select only one category."
 msgstr "Por favor selecione somente uma categoria."
 
-#: localized_js.php:87
+#: localized_js.php:87 prefs.js:986
 msgid "No OPML file to upload."
 msgstr "Nenhum arquivo OPML para upload."
 
@@ -569,7 +573,7 @@ msgstr "Nenhum arquivo OPML para upload."
 msgid "Changing category of selected feeds..."
 msgstr "Alterando a categoria dos feeds selecionados…"
 
-#: localized_js.php:89
+#: localized_js.php:89 prefs.js:1266
 msgid "Reset to defaults?"
 msgstr ""
 
@@ -581,7 +585,8 @@ msgstr "Tentando alterar senha ..."
 msgid "Trying to change e-mail..."
 msgstr "Tentando mudar o E-mail..."
 
-#: localized_js.php:92
+#: localized_js.php:92 viewfeed.js:874 viewfeed.js:909 viewfeed.js:949
+#: viewfeed.js:1019 viewfeed.js:1066 viewfeed.js:1218
 msgid "No articles are selected."
 msgstr ""
 
@@ -597,7 +602,7 @@ msgstr ""
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: localized_js.php:96
+#: localized_js.php:96 prefs.js:1693
 msgid "Replace current publishing address with a new one?"
 msgstr ""
 
@@ -609,42 +614,43 @@ msgstr "Endereço alterado."
 msgid "Could not change address."
 msgstr ""
 
-#: localized_js.php:99
+#: localized_js.php:99 tt-rss.js:596
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: localized_js.php:100
+#: localized_js.php:100 tt-rss.js:601 tt-rss.js:620 tt-rss.js:834
+#: tt-rss.js:1013
 msgid "Please select some feed first."
 msgstr ""
 
-#: localized_js.php:101
+#: localized_js.php:101 tt-rss.js:839
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: localized_js.php:112
+#: localized_js.php:112 functions.js:1380
 msgid "Can't add filter: nothing to match on."
 msgstr ""
 
-#: localized_js.php:113
+#: localized_js.php:113 functions.js:1421
 msgid "Can't subscribe: no feed URL given."
 msgstr ""
 
-#: localized_js.php:114
+#: localized_js.php:114 prefs.js:1879 tt-rss.js:607 tt-rss.js:702
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr ""
 
-#: localized_js.php:115
+#: localized_js.php:115 viewfeed.js:1186
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 
-#: localized_js.php:116
+#: localized_js.php:116 tt-rss.js:806 tt-rss.js:819
 #, fuzzy, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: localized_js.php:117
+#: localized_js.php:117 viewfeed.js:1225
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr ""
@@ -653,7 +659,7 @@ msgstr ""
 msgid "Please enter label title:"
 msgstr ""
 
-#: localized_js.php:119
+#: localized_js.php:119 prefs.js:1714
 msgid "Save current configuration?"
 msgstr "Salvar a configuração atual?"
 
@@ -669,55 +675,56 @@ msgstr "A nova senha não pode ser vazia."
 msgid "Entered passwords do not match."
 msgstr "As senhas informadas não conferem."
 
-#: localized_js.php:123
+#: localized_js.php:123 viewfeed.js:1857
 msgid "No articles found to mark"
 msgstr ""
 
-#: localized_js.php:124
+#: localized_js.php:124 viewfeed.js:1859
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr ""
 
-#: localized_js.php:125
+#: localized_js.php:125 viewfeed.js:1816
 msgid "No article is selected."
 msgstr ""
 
-#: localized_js.php:126
+#: localized_js.php:126 viewfeed.js:494 viewfeed.js:559
 #, fuzzy
 msgid "Star article"
 msgstr "Favoritos"
 
-#: localized_js.php:127
+#: localized_js.php:127 viewfeed.js:543
 msgid "Unstar article"
 msgstr ""
 
-#: localized_js.php:128
+#: localized_js.php:128 viewfeed.js:552 viewfeed.js:614
 msgid "Please wait..."
 msgstr ""
 
-#: localized_js.php:129 localized_schema.php:18
+#: localized_js.php:129 localized_schema.php:18 viewfeed.js:511
+#: viewfeed.js:621
 msgid "Publish article"
 msgstr ""
 
-#: localized_js.php:130
+#: localized_js.php:130 viewfeed.js:608
 msgid "Unpublish article"
 msgstr ""
 
-#: localized_js.php:131
+#: localized_js.php:131 tt-rss.js:625
 msgid "You can't clear this type of feed."
 msgstr ""
 
-#: localized_js.php:132
+#: localized_js.php:132 tt-rss.js:631
 #, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr ""
 
-#: localized_js.php:133
+#: localized_js.php:133 tt-rss.js:277
 #, fuzzy
 msgid "Mark all articles as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: localized_js.php:134
+#: localized_js.php:134 prefs.js:1809
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "Remover os filtros selecionados?"
@@ -736,11 +743,11 @@ msgstr ""
 msgid "Rescoring feeds..."
 msgstr "Removendo o Feed..."
 
-#: localized_js.php:138
+#: localized_js.php:138 tt-rss.js:1008
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: localized_js.php:139
+#: localized_js.php:139 tt-rss.js:1018
 #, fuzzy, php-format
 msgid "Rescore articles in %s?"
 msgstr "Favoritos"
@@ -750,7 +757,7 @@ msgstr "Favoritos"
 msgid "Rescoring articles..."
 msgstr "Favoritos"
 
-#: localized_js.php:141
+#: localized_js.php:141 tt-rss.js:681
 #, fuzzy
 msgid "Reset category order?"
 msgstr "Remover as categorias selecionadas?"
@@ -763,7 +770,7 @@ msgstr ""
 msgid "Category reordering disabled"
 msgstr ""
 
-#: localized_js.php:144
+#: localized_js.php:144 prefs.js:1908
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "Remover os filtros selecionados?"
@@ -1207,7 +1214,7 @@ msgstr ""
 msgid "Comments?"
 msgstr "Conteúdo"
 
-#: tt-rss.php:136
+#: tt-rss.php:136 offline.js:737
 #, fuzzy
 msgid "Restart in offline mode"
 msgstr "A checagem da configuração falhou"
@@ -1220,7 +1227,7 @@ msgstr ""
 msgid "Restart in online mode"
 msgstr ""
 
-#: tt-rss.php:158
+#: tt-rss.php:158 tt-rss.js:80
 msgid "tag cloud"
 msgstr "núvem de tags"
 
@@ -2456,6 +2463,70 @@ msgstr ""
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#: functions.js:1425
+#, fuzzy
+msgid "Subscribing to feed..."
+msgstr "Removendo o Feed..."
+
+#: offline.js:602
+msgid "Data for offline browsing has not been downloaded yet."
+msgstr ""
+
+#: offline.js:797
+msgid "Synchronizing offline data..."
+msgstr ""
+
+#: prefs.js:268 tt-rss.js:1435
+msgid "Please enter label caption:"
+msgstr ""
+
+#: prefs.js:302
+msgid "Error: No feed URL given."
+msgstr ""
+
+#: prefs.js:304
+msgid "Error: Invalid feed URL."
+msgstr ""
+
+#: prefs.js:352
+#, fuzzy
+msgid "Please enter login:"
+msgstr "Último Login"
+
+#: prefs.js:359
+msgid "Can't create user: no login specified."
+msgstr ""
+
+#: prefs.js:618
+#, fuzzy
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "Remover os filtros selecionados?"
+
+#: prefs.js:640
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr ""
+
+#: prefs.js:1831
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
+
+#: prefs.js:1849
+#, fuzzy
+msgid "Remove filter %s?"
+msgstr "Remover os filtros selecionados?"
+
+#: prefs.js:1993
+msgid "Reset label colors to default?"
+msgstr ""
+
+#: prefs.js:2017
+msgid "Please enter new label foreground color:"
+msgstr ""
+
+#: prefs.js:2019
+msgid "Please enter new label background color:"
+msgstr ""
+
 #~ msgid ""
 #~ "config: your config file version is incorrect. See config.php-dist.\n"
 #~ msgstr ""
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 2c1d04da4..68f40831a 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 e400287e9..3ce24bb43 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: 2009-02-11 18:36+0300\n"
+"POT-Creation-Date: 2009-02-11 19:47+0300\n"
 "PO-Revision-Date: 2009-01-26 08:36+0400\n"
 "Last-Translator: Max Kamashev <max.kamashev@floscoeli.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -196,7 +196,7 @@ msgid "Labels"
 msgstr "Метки"
 
 #: functions.php:2913 functions.php:3336 functions.php:4121 help/3.php:59
-#: mobile/functions.php:61
+#: mobile/functions.php:61 offline.js:459 offline.js:1268
 msgid "Starred articles"
 msgstr "Отмеченные"
 
@@ -211,7 +211,7 @@ msgid "Fresh articles"
 msgstr "Свежие"
 
 #: functions.php:2919 functions.php:3349 functions.php:4099 help/3.php:57
-#: mobile/functions.php:43
+#: mobile/functions.php:43 offline.js:454 offline.js:1270
 msgid "All articles"
 msgstr "Все статьи"
 
@@ -230,7 +230,7 @@ msgstr "Генерировать канал"
 
 #: functions.php:3983 functions.php:5247 modules/pref-feeds.php:1028
 #: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:163 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401 offline.js:374
 msgid "Select:"
 msgstr "Выбрать:"
 
@@ -372,7 +372,7 @@ msgstr ""
 "Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
 "Действия) или используйте фильтр."
 
-#: functions.php:5304
+#: functions.php:5304 offline.js:409
 msgid "No articles found to display."
 msgstr "Статей не найдено."
 
@@ -388,7 +388,7 @@ msgstr "(удалить)"
 msgid "no tags"
 msgstr "нет тегов"
 
-#: localized_js.php:35
+#: localized_js.php:35 tt-rss.js:75
 msgid "display feeds"
 msgstr "показать каналы"
 
@@ -420,7 +420,7 @@ msgstr "Канал удаляется..."
 msgid "Saving feed..."
 msgstr "Идёт сохранение..."
 
-#: localized_js.php:43
+#: localized_js.php:43 prefs.js:331
 msgid "Can't add category: no name specified."
 msgstr "Не могу добавить категорию без имени"
 
@@ -440,11 +440,11 @@ msgstr "Пользователь добавляется..."
 msgid "Can't create label: missing SQL expression."
 msgstr "Не могу создать метку: отсутствует SQL выражение."
 
-#: localized_js.php:49 localized_js.php:103
+#: localized_js.php:49 localized_js.php:103 prefs.js:275 tt-rss.js:1440
 msgid "Can't create label: missing caption."
 msgstr "Не могу создать метку: отсутствует заголовок."
 
-#: localized_js.php:50
+#: localized_js.php:50 prefs.js:484
 msgid "Remove selected labels?"
 msgstr "Удалить выбранные метки?"
 
@@ -452,11 +452,11 @@ msgstr "Удалить выбранные метки?"
 msgid "Removing selected labels..."
 msgstr "Выбранные метки удаляются..."
 
-#: localized_js.php:52 localized_js.php:71 localized_js.php:105
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105 prefs.js:499
 msgid "No labels are selected."
 msgstr "Нет выбранных меток."
 
-#: localized_js.php:53
+#: localized_js.php:53 prefs.js:513
 msgid "Remove selected users?"
 msgstr "Удалить выбранных пользователей?"
 
@@ -465,11 +465,11 @@ msgid "Removing selected users..."
 msgstr "Выбранные пользователи удаляются..."
 
 #: localized_js.php:55 localized_js.php:73 localized_js.php:75
-#: localized_js.php:106
+#: localized_js.php:106 prefs.js:529 prefs.js:817 prefs.js:838 prefs.js:876
 msgid "No users are selected."
 msgstr "Нет выбранных пользователей."
 
-#: localized_js.php:56
+#: localized_js.php:56 prefs.js:547
 msgid "Remove selected filters?"
 msgstr "Удалить выбранные фильтры?"
 
@@ -477,11 +477,12 @@ msgstr "Удалить выбранные фильтры?"
 msgid "Removing selected filters..."
 msgstr "Выбранные фильтры удаляются..."
 
-#: localized_js.php:58 localized_js.php:81 localized_js.php:107
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107 prefs.js:562
+#: prefs.js:905
 msgid "No filters are selected."
 msgstr "Нет выбранных фильтров."
 
-#: localized_js.php:59
+#: localized_js.php:59 prefs.js:581
 msgid "Unsubscribe from selected feeds?"
 msgstr "Отписаться от выбранных каналов?"
 
@@ -490,11 +491,13 @@ msgid "Unsubscribing from selected feeds..."
 msgstr "Выбранные каналы удаляются..."
 
 #: localized_js.php:61 localized_js.php:79 localized_js.php:83
-#: localized_js.php:108 localized_js.php:111
+#: localized_js.php:108 localized_js.php:111 prefs.js:597 prefs.js:627
+#: prefs.js:658 prefs.js:925 prefs.js:946 prefs.js:1258 prefs.js:1307
+#: prefs.js:1824 tt-rss.js:1485
 msgid "No feeds are selected."
 msgstr "Нет выбранных каналов."
 
-#: localized_js.php:62
+#: localized_js.php:62 prefs.js:671
 msgid "Remove selected categories?"
 msgstr "Удалить выбранные категории?"
 
@@ -502,7 +505,7 @@ msgstr "Удалить выбранные категории?"
 msgid "Removing selected categories..."
 msgstr "Выбранные категории удаляются..."
 
-#: localized_js.php:64 localized_js.php:85 localized_js.php:109
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109 prefs.js:688
 msgid "No categories are selected."
 msgstr "Нет выбранных категорий."
 
@@ -518,7 +521,7 @@ msgstr "Идет загрузка помощи..."
 msgid "Saving label..."
 msgstr "Идет сохранение метки..."
 
-#: localized_js.php:68 localized_js.php:110
+#: localized_js.php:68 localized_js.php:110 prefs.js:763
 msgid "Login field cannot be blank."
 msgstr "Поле логина не может быть пустым."
 
@@ -534,11 +537,12 @@ msgstr "Идет сохранение фильтра..."
 msgid "Please select only one label."
 msgstr "Пожалуйста выберите только одну метку."
 
-#: localized_js.php:74 localized_js.php:76
+#: localized_js.php:74 localized_js.php:76 prefs.js:822 prefs.js:843
+#: prefs.js:881
 msgid "Please select only one user."
 msgstr "Пожалуйста выберите только одного пользователя."
 
-#: localized_js.php:77
+#: localized_js.php:77 prefs.js:847
 msgid "Reset password of selected user?"
 msgstr "Сбросить пароль выбранного пользователя?"
 
@@ -546,15 +550,15 @@ msgstr "Сбросить пароль выбранного пользовате
 msgid "Resetting password for selected user..."
 msgstr "Пароль пользователя сбрасывается..."
 
-#: localized_js.php:80
+#: localized_js.php:80 prefs.js:612
 msgid "Please select only one feed."
 msgstr "Пожалуйста выберите только один канал."
 
-#: localized_js.php:82
+#: localized_js.php:82 prefs.js:910
 msgid "Please select only one filter."
 msgstr "Пожалуйста выберите только один фильтр."
 
-#: localized_js.php:84
+#: localized_js.php:84 prefs.js:930
 msgid "Please select one feed."
 msgstr "Пожалуйста выберите только один канал."
 
@@ -562,7 +566,7 @@ msgstr "Пожалуйста выберите только один канал."
 msgid "Please select only one category."
 msgstr "Пожалуйста выберите только одну категорию."
 
-#: localized_js.php:87
+#: localized_js.php:87 prefs.js:986
 msgid "No OPML file to upload."
 msgstr "Нет файла OPML для загрузки."
 
@@ -570,7 +574,7 @@ msgstr "Нет файла OPML для загрузки."
 msgid "Changing category of selected feeds..."
 msgstr "Идет изменение категории..."
 
-#: localized_js.php:89
+#: localized_js.php:89 prefs.js:1266
 msgid "Reset to defaults?"
 msgstr "Сбросить настройки?"
 
@@ -582,7 +586,8 @@ msgstr "Идет сохранение пароля..."
 msgid "Trying to change e-mail..."
 msgstr "Идет изменение e-mail..."
 
-#: localized_js.php:92
+#: localized_js.php:92 viewfeed.js:874 viewfeed.js:909 viewfeed.js:949
+#: viewfeed.js:1019 viewfeed.js:1066 viewfeed.js:1218
 msgid "No articles are selected."
 msgstr "Нет выбранных статей."
 
@@ -598,7 +603,7 @@ msgstr "Не могу показать статью (отсутствует XML
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
-#: localized_js.php:96
+#: localized_js.php:96 prefs.js:1693
 msgid "Replace current publishing address with a new one?"
 msgstr "Изменить текущий адрес публикации на новый?"
 
@@ -610,42 +615,43 @@ msgstr "Адрес изменен."
 msgid "Could not change address."
 msgstr "Не получилось изменить адрес."
 
-#: localized_js.php:99
+#: localized_js.php:99 tt-rss.js:596
 msgid "You can't unsubscribe from the category."
 msgstr "Нельзя отписаться от категории."
 
-#: localized_js.php:100
+#: localized_js.php:100 tt-rss.js:601 tt-rss.js:620 tt-rss.js:834
+#: tt-rss.js:1013
 msgid "Please select some feed first."
 msgstr "Пожалуйста выберите какой-нибудь канал."
 
-#: localized_js.php:101
+#: localized_js.php:101 tt-rss.js:839
 msgid "You can't edit this kind of feed."
 msgstr "Вы не можете редактировать этот канал."
 
-#: localized_js.php:112
+#: localized_js.php:112 functions.js:1380
 msgid "Can't add filter: nothing to match on."
 msgstr "Не могу добавить фильтр: нет соответствия."
 
-#: localized_js.php:113
+#: localized_js.php:113 functions.js:1421
 msgid "Can't subscribe: no feed URL given."
 msgstr "Не могу подписаться: нет URL"
 
-#: localized_js.php:114
+#: localized_js.php:114 prefs.js:1879 tt-rss.js:607 tt-rss.js:702
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr "Отписаться от %s?"
 
-#: localized_js.php:115
+#: localized_js.php:115 viewfeed.js:1186
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "Отметить все видимые статьи в %s как прочитанные?"
 
-#: localized_js.php:116
+#: localized_js.php:116 tt-rss.js:806 tt-rss.js:819
 #, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 
-#: localized_js.php:117
+#: localized_js.php:117 viewfeed.js:1225
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
@@ -654,7 +660,7 @@ msgstr "Отметить %d выбранные статьи в %s как про
 msgid "Please enter label title:"
 msgstr "Пожалуйста, введите заголовок метки:"
 
-#: localized_js.php:119
+#: localized_js.php:119 prefs.js:1714
 msgid "Save current configuration?"
 msgstr "Сохранить конфигурацию"
 
@@ -670,53 +676,54 @@ msgstr "Новый пароль не может быть пустым."
 msgid "Entered passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: localized_js.php:123
+#: localized_js.php:123 viewfeed.js:1857
 msgid "No articles found to mark"
 msgstr "Статей для отметки не найдено."
 
-#: localized_js.php:124
+#: localized_js.php:124 viewfeed.js:1859
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "Отметить %d статью(ей) как прочитанные?"
 
-#: localized_js.php:125
+#: localized_js.php:125 viewfeed.js:1816
 msgid "No article is selected."
 msgstr "Статья не выбрана"
 
-#: localized_js.php:126
+#: localized_js.php:126 viewfeed.js:494 viewfeed.js:559
 msgid "Star article"
 msgstr "Отмеченные"
 
-#: localized_js.php:127
+#: localized_js.php:127 viewfeed.js:543
 msgid "Unstar article"
 msgstr "Не отмеченные"
 
-#: localized_js.php:128
+#: localized_js.php:128 viewfeed.js:552 viewfeed.js:614
 msgid "Please wait..."
 msgstr "Пожалуйста, подождите..."
 
-#: localized_js.php:129 localized_schema.php:18
+#: localized_js.php:129 localized_schema.php:18 viewfeed.js:511
+#: viewfeed.js:621
 msgid "Publish article"
 msgstr "Опубликовать"
 
-#: localized_js.php:130
+#: localized_js.php:130 viewfeed.js:608
 msgid "Unpublish article"
 msgstr "Не публиковать"
 
-#: localized_js.php:131
+#: localized_js.php:131 tt-rss.js:625
 msgid "You can't clear this type of feed."
 msgstr "Вы не можете очистить этот канал."
 
-#: localized_js.php:132
+#: localized_js.php:132 tt-rss.js:631
 #, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr "Стереть все не отмеченные статьи в %s?"
 
-#: localized_js.php:133
+#: localized_js.php:133 tt-rss.js:277
 msgid "Mark all articles as read?"
 msgstr "Пометить все статьи как прочитанные?"
 
-#: localized_js.php:134
+#: localized_js.php:134 prefs.js:1809
 msgid "Rescore articles in selected feeds?"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
@@ -734,11 +741,11 @@ msgstr ""
 msgid "Rescoring feeds..."
 msgstr "Переоценка каналов..."
 
-#: localized_js.php:138
+#: localized_js.php:138 tt-rss.js:1008
 msgid "You can't rescore this kind of feed."
 msgstr "Вы не можете снова оценить этот канал."
 
-#: localized_js.php:139
+#: localized_js.php:139 tt-rss.js:1018
 #, php-format
 msgid "Rescore articles in %s?"
 msgstr "Установить оценку статьям в %s?"
@@ -747,7 +754,7 @@ msgstr "Установить оценку статьям в %s?"
 msgid "Rescoring articles..."
 msgstr "Переоценка статей..."
 
-#: localized_js.php:141
+#: localized_js.php:141 tt-rss.js:681
 msgid "Reset category order?"
 msgstr "Сбросить порядок категорий?"
 
@@ -759,7 +766,7 @@ msgstr "Включено изменение порядка категорий"
 msgid "Category reordering disabled"
 msgstr "Отключено изменение порядка категорий"
 
-#: localized_js.php:144
+#: localized_js.php:144 prefs.js:1908
 msgid "Save changes to selected feeds?"
 msgstr "Сохранить изменения выбранных каналов?"
 
@@ -1222,7 +1229,7 @@ msgstr "Регистрация новых пользователей време
 msgid "Comments?"
 msgstr "Комментарии?"
 
-#: tt-rss.php:136
+#: tt-rss.php:136 offline.js:737
 #, fuzzy
 msgid "Restart in offline mode"
 msgstr "Неудачная регистрация."
@@ -1235,7 +1242,7 @@ msgstr "Доступная новая версия Tiny Tiny RSS!"
 msgid "Restart in online mode"
 msgstr ""
 
-#: tt-rss.php:158
+#: tt-rss.php:158 tt-rss.js:80
 msgid "tag cloud"
 msgstr "облако тегов"
 
@@ -2433,6 +2440,79 @@ msgstr "Соответствие:"
 msgid "Internal error: Function not implemented"
 msgstr "Внутренняя ошибка: Функция не реализована"
 
+#: functions.js:1425
+#, fuzzy
+msgid "Subscribing to feed..."
+msgstr "Подписаться на канал..."
+
+#: offline.js:602
+msgid "Data for offline browsing has not been downloaded yet."
+msgstr ""
+
+#: offline.js:797
+msgid "Synchronizing offline data..."
+msgstr ""
+
+#: prefs.js:268 tt-rss.js:1435
+#, fuzzy
+msgid "Please enter label caption:"
+msgstr "Пожалуйста, введите заголовок метки:"
+
+#: prefs.js:302
+#, fuzzy
+msgid "Error: No feed URL given."
+msgstr "Не могу подписаться: нет URL"
+
+#: prefs.js:304
+msgid "Error: Invalid feed URL."
+msgstr ""
+
+#: prefs.js:352
+#, fuzzy
+msgid "Please enter login:"
+msgstr "Пожалуйста, введите заголовок метки:"
+
+#: prefs.js:359
+#, fuzzy
+msgid "Can't create user: no login specified."
+msgstr "Не могу добавить пользователя без логина"
+
+#: prefs.js:618
+#, fuzzy
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "Стереть все не отмеченные статьи в %s?"
+
+#: prefs.js:640
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr ""
+
+#: prefs.js:1831
+#, fuzzy
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
+"Оценить заново все статьи в каналах? Эта операция может продолжаться "
+"длительное время."
+
+#: prefs.js:1849
+#, fuzzy
+msgid "Remove filter %s?"
+msgstr "Удалить выбранные фильтры?"
+
+#: prefs.js:1993
+#, fuzzy
+msgid "Reset label colors to default?"
+msgstr "Сбросить настройки?"
+
+#: prefs.js:2017
+#, fuzzy
+msgid "Please enter new label foreground color:"
+msgstr "Пожалуйста, введите заголовок метки:"
+
+#: prefs.js:2019
+#, fuzzy
+msgid "Please enter new label background color:"
+msgstr "Пожалуйста, введите заголовок метки:"
+
 #~ msgid "MySQL Charset Updater"
 #~ msgstr "Кодировка обновлений MySQL"
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index d3f60d08b..430c1ca7e 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 3f0577e30..065790ae3 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: 2009-02-11 18:36+0300\n"
+"POT-Creation-Date: 2009-02-11 19:47+0300\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -183,7 +183,7 @@ msgid "Labels"
 msgstr "标记"
 
 #: functions.php:2913 functions.php:3336 functions.php:4121 help/3.php:59
-#: mobile/functions.php:61
+#: mobile/functions.php:61 offline.js:459 offline.js:1268
 msgid "Starred articles"
 msgstr "星级文章"
 
@@ -199,7 +199,7 @@ msgid "Fresh articles"
 msgstr "星级文章"
 
 #: functions.php:2919 functions.php:3349 functions.php:4099 help/3.php:57
-#: mobile/functions.php:43
+#: mobile/functions.php:43 offline.js:454 offline.js:1270
 #, fuzzy
 msgid "All articles"
 msgstr "所有文章"
@@ -219,7 +219,7 @@ msgstr "产生feed"
 
 #: functions.php:3983 functions.php:5247 modules/pref-feeds.php:1028
 #: modules/pref-feeds.php:1209 modules/pref-filters.php:366
-#: modules/pref-labels.php:163 modules/pref-users.php:401
+#: modules/pref-labels.php:163 modules/pref-users.php:401 offline.js:374
 msgid "Select:"
 msgstr "选择："
 
@@ -368,7 +368,7 @@ msgid ""
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5304
+#: functions.php:5304 offline.js:409
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
@@ -387,7 +387,7 @@ msgstr "移除"
 msgid "no tags"
 msgstr "无标签"
 
-#: localized_js.php:35
+#: localized_js.php:35 tt-rss.js:75
 msgid "display feeds"
 msgstr "显示Feed"
 
@@ -419,7 +419,7 @@ msgstr "移除feed中..."
 msgid "Saving feed..."
 msgstr "保存feed中..."
 
-#: localized_js.php:43
+#: localized_js.php:43 prefs.js:331
 msgid "Can't add category: no name specified."
 msgstr "添加分类失败：未指定分类名"
 
@@ -439,11 +439,11 @@ msgstr "添加用户..."
 msgid "Can't create label: missing SQL expression."
 msgstr "创建标签失败：缺少或错误的SQL表达式。"
 
-#: localized_js.php:49 localized_js.php:103
+#: localized_js.php:49 localized_js.php:103 prefs.js:275 tt-rss.js:1440
 msgid "Can't create label: missing caption."
 msgstr "创建标签失败：缺少标题。"
 
-#: localized_js.php:50
+#: localized_js.php:50 prefs.js:484
 msgid "Remove selected labels?"
 msgstr "移除选定标记?"
 
@@ -451,11 +451,11 @@ msgstr "移除选定标记?"
 msgid "Removing selected labels..."
 msgstr "移除选定标记..."
 
-#: localized_js.php:52 localized_js.php:71 localized_js.php:105
+#: localized_js.php:52 localized_js.php:71 localized_js.php:105 prefs.js:499
 msgid "No labels are selected."
 msgstr "未选定标记."
 
-#: localized_js.php:53
+#: localized_js.php:53 prefs.js:513
 msgid "Remove selected users?"
 msgstr "移除选定用户?"
 
@@ -464,11 +464,11 @@ msgid "Removing selected users..."
 msgstr "移除选定用户..."
 
 #: localized_js.php:55 localized_js.php:73 localized_js.php:75
-#: localized_js.php:106
+#: localized_js.php:106 prefs.js:529 prefs.js:817 prefs.js:838 prefs.js:876
 msgid "No users are selected."
 msgstr "未选定用户."
 
-#: localized_js.php:56
+#: localized_js.php:56 prefs.js:547
 msgid "Remove selected filters?"
 msgstr "移除选定的过滤器？"
 
@@ -476,11 +476,12 @@ msgstr "移除选定的过滤器？"
 msgid "Removing selected filters..."
 msgstr "移除选定的过滤器..."
 
-#: localized_js.php:58 localized_js.php:81 localized_js.php:107
+#: localized_js.php:58 localized_js.php:81 localized_js.php:107 prefs.js:562
+#: prefs.js:905
 msgid "No filters are selected."
 msgstr "未选定过滤器。"
 
-#: localized_js.php:59
+#: localized_js.php:59 prefs.js:581
 msgid "Unsubscribe from selected feeds?"
 msgstr "退订选定feed?"
 
@@ -489,11 +490,13 @@ msgid "Unsubscribing from selected feeds..."
 msgstr "退订选定feed..."
 
 #: localized_js.php:61 localized_js.php:79 localized_js.php:83
-#: localized_js.php:108 localized_js.php:111
+#: localized_js.php:108 localized_js.php:111 prefs.js:597 prefs.js:627
+#: prefs.js:658 prefs.js:925 prefs.js:946 prefs.js:1258 prefs.js:1307
+#: prefs.js:1824 tt-rss.js:1485
 msgid "No feeds are selected."
 msgstr "未选择feed."
 
-#: localized_js.php:62
+#: localized_js.php:62 prefs.js:671
 msgid "Remove selected categories?"
 msgstr "移除选定分类?"
 
@@ -501,7 +504,7 @@ msgstr "移除选定分类?"
 msgid "Removing selected categories..."
 msgstr "移除选定分类..."
 
-#: localized_js.php:64 localized_js.php:85 localized_js.php:109
+#: localized_js.php:64 localized_js.php:85 localized_js.php:109 prefs.js:688
 msgid "No categories are selected."
 msgstr "未选定分类。"
 
@@ -517,7 +520,7 @@ msgstr "读取帮助..."
 msgid "Saving label..."
 msgstr "保存标记..."
 
-#: localized_js.php:68 localized_js.php:110
+#: localized_js.php:68 localized_js.php:110 prefs.js:763
 msgid "Login field cannot be blank."
 msgstr "登陆框不能留空。"
 
@@ -533,11 +536,12 @@ msgstr "保存过滤器..."
 msgid "Please select only one label."
 msgstr "请只选择一个标记."
 
-#: localized_js.php:74 localized_js.php:76
+#: localized_js.php:74 localized_js.php:76 prefs.js:822 prefs.js:843
+#: prefs.js:881
 msgid "Please select only one user."
 msgstr "请只选择一个用户."
 
-#: localized_js.php:77
+#: localized_js.php:77 prefs.js:847
 msgid "Reset password of selected user?"
 msgstr "重置选定用户密码?"
 
@@ -545,15 +549,15 @@ msgstr "重置选定用户密码?"
 msgid "Resetting password for selected user..."
 msgstr "重置选定用户密码..."
 
-#: localized_js.php:80
+#: localized_js.php:80 prefs.js:612
 msgid "Please select only one feed."
 msgstr "请只选择一个feed."
 
-#: localized_js.php:82
+#: localized_js.php:82 prefs.js:910
 msgid "Please select only one filter."
 msgstr "请只选择一个过滤器."
 
-#: localized_js.php:84
+#: localized_js.php:84 prefs.js:930
 msgid "Please select one feed."
 msgstr "请只选择一个feed."
 
@@ -561,7 +565,7 @@ msgstr "请只选择一个feed."
 msgid "Please select only one category."
 msgstr "请只选择一个分类."
 
-#: localized_js.php:87
+#: localized_js.php:87 prefs.js:986
 msgid "No OPML file to upload."
 msgstr "无OPML文件上传."
 
@@ -569,7 +573,7 @@ msgstr "无OPML文件上传."
 msgid "Changing category of selected feeds..."
 msgstr "改变选定feed所属分类..."
 
-#: localized_js.php:89
+#: localized_js.php:89 prefs.js:1266
 msgid "Reset to defaults?"
 msgstr "重置默认项？"
 
@@ -581,7 +585,8 @@ msgstr "尝试更改密码..."
 msgid "Trying to change e-mail..."
 msgstr "尝试更改e-mail..."
 
-#: localized_js.php:92
+#: localized_js.php:92 viewfeed.js:874 viewfeed.js:909 viewfeed.js:949
+#: viewfeed.js:1019 viewfeed.js:1066 viewfeed.js:1218
 msgid "No articles are selected."
 msgstr "无选定文章。"
 
@@ -597,7 +602,7 @@ msgstr "显示条目失败（缺少XML支持）"
 msgid "No feed selected."
 msgstr "无选定feed."
 
-#: localized_js.php:96
+#: localized_js.php:96 prefs.js:1693
 msgid "Replace current publishing address with a new one?"
 msgstr "使用新地址替换当前地址？"
 
@@ -609,42 +614,43 @@ msgstr "地址已经变更"
 msgid "Could not change address."
 msgstr "未能更新地址"
 
-#: localized_js.php:99
+#: localized_js.php:99 tt-rss.js:596
 msgid "You can't unsubscribe from the category."
 msgstr "您不能从分类中取消订阅。"
 
-#: localized_js.php:100
+#: localized_js.php:100 tt-rss.js:601 tt-rss.js:620 tt-rss.js:834
+#: tt-rss.js:1013
 msgid "Please select some feed first."
 msgstr "请先选择若干feed"
 
-#: localized_js.php:101
+#: localized_js.php:101 tt-rss.js:839
 msgid "You can't edit this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: localized_js.php:112
+#: localized_js.php:112 functions.js:1380
 msgid "Can't add filter: nothing to match on."
 msgstr "未能添加过滤：无匹配。"
 
-#: localized_js.php:113
+#: localized_js.php:113 functions.js:1421
 msgid "Can't subscribe: no feed URL given."
 msgstr "未能订阅：无 feed URL。"
 
-#: localized_js.php:114
+#: localized_js.php:114 prefs.js:1879 tt-rss.js:607 tt-rss.js:702
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr "退订%s?"
 
-#: localized_js.php:115
+#: localized_js.php:115 viewfeed.js:1186
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:116
+#: localized_js.php:116 tt-rss.js:806 tt-rss.js:819
 #, fuzzy, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:117
+#: localized_js.php:117 viewfeed.js:1225
 #, fuzzy, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
@@ -653,7 +659,7 @@ msgstr "标记  %s 中所有所选Feed为已读..."
 msgid "Please enter label title:"
 msgstr "请输入标签主题"
 
-#: localized_js.php:119
+#: localized_js.php:119 prefs.js:1714
 #, fuzzy
 msgid "Save current configuration?"
 msgstr "保存设置"
@@ -670,61 +676,62 @@ msgstr "新密码不可留空."
 msgid "Entered passwords do not match."
 msgstr "两次输入密码不通."
 
-#: localized_js.php:123
+#: localized_js.php:123 viewfeed.js:1857
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "未找到文章。"
 
-#: localized_js.php:124
+#: localized_js.php:124 viewfeed.js:1859
 #, fuzzy, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: localized_js.php:125
+#: localized_js.php:125 viewfeed.js:1816
 #, fuzzy
 msgid "No article is selected."
 msgstr "无选定文章。"
 
-#: localized_js.php:126
+#: localized_js.php:126 viewfeed.js:494 viewfeed.js:559
 #, fuzzy
 msgid "Star article"
 msgstr "星级文章"
 
-#: localized_js.php:127
+#: localized_js.php:127 viewfeed.js:543
 #, fuzzy
 msgid "Unstar article"
 msgstr "星级文章"
 
-#: localized_js.php:128
+#: localized_js.php:128 viewfeed.js:552 viewfeed.js:614
 #, fuzzy
 msgid "Please wait..."
 msgstr "读取中，请等待..."
 
-#: localized_js.php:129 localized_schema.php:18
+#: localized_js.php:129 localized_schema.php:18 viewfeed.js:511
+#: viewfeed.js:621
 msgid "Publish article"
 msgstr "发布文章"
 
-#: localized_js.php:130
+#: localized_js.php:130 viewfeed.js:608
 #, fuzzy
 msgid "Unpublish article"
 msgstr "发布文章"
 
-#: localized_js.php:131
+#: localized_js.php:131 tt-rss.js:625
 #, fuzzy
 msgid "You can't clear this type of feed."
 msgstr "您不能编辑本分类feed"
 
-#: localized_js.php:132
+#: localized_js.php:132 tt-rss.js:631
 #, fuzzy, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:133
+#: localized_js.php:133 tt-rss.js:277
 #, fuzzy
 msgid "Mark all articles as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:134
+#: localized_js.php:134 prefs.js:1809
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "无选定文章。"
@@ -743,12 +750,12 @@ msgstr ""
 msgid "Rescoring feeds..."
 msgstr "移除feed中..."
 
-#: localized_js.php:138
+#: localized_js.php:138 tt-rss.js:1008
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: localized_js.php:139
+#: localized_js.php:139 tt-rss.js:1018
 #, fuzzy, php-format
 msgid "Rescore articles in %s?"
 msgstr "星级文章"
@@ -758,7 +765,7 @@ msgstr "星级文章"
 msgid "Rescoring articles..."
 msgstr "星级文章"
 
-#: localized_js.php:141
+#: localized_js.php:141 tt-rss.js:681
 #, fuzzy
 msgid "Reset category order?"
 msgstr "移除选定分类?"
@@ -771,7 +778,7 @@ msgstr ""
 msgid "Category reordering disabled"
 msgstr ""
 
-#: localized_js.php:144
+#: localized_js.php:144 prefs.js:1908
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "无选定文章。"
@@ -1222,7 +1229,7 @@ msgstr ""
 msgid "Comments?"
 msgstr "内容"
 
-#: tt-rss.php:136
+#: tt-rss.php:136 offline.js:737
 #, fuzzy
 msgid "Restart in offline mode"
 msgstr "设置检查失败"
@@ -1235,7 +1242,7 @@ msgstr ""
 msgid "Restart in online mode"
 msgstr ""
 
-#: tt-rss.php:158
+#: tt-rss.php:158 tt-rss.js:80
 msgid "tag cloud"
 msgstr "标签簇"
 
@@ -2503,6 +2510,76 @@ msgstr "匹配:"
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#: functions.js:1425
+#, fuzzy
+msgid "Subscribing to feed..."
+msgstr "订阅feed"
+
+#: offline.js:602
+msgid "Data for offline browsing has not been downloaded yet."
+msgstr ""
+
+#: offline.js:797
+msgid "Synchronizing offline data..."
+msgstr ""
+
+#: prefs.js:268 tt-rss.js:1435
+#, fuzzy
+msgid "Please enter label caption:"
+msgstr "请输入标签主题"
+
+#: prefs.js:302
+#, fuzzy
+msgid "Error: No feed URL given."
+msgstr "未能订阅：无 feed URL。"
+
+#: prefs.js:304
+msgid "Error: Invalid feed URL."
+msgstr ""
+
+#: prefs.js:352
+#, fuzzy
+msgid "Please enter login:"
+msgstr "请输入标签主题"
+
+#: prefs.js:359
+#, fuzzy
+msgid "Can't create user: no login specified."
+msgstr "添加用户失败：未登录。"
+
+#: prefs.js:618
+#, fuzzy
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "标记  %s 中所有访问过的主题为已读"
+
+#: prefs.js:640
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr ""
+
+#: prefs.js:1831
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
+
+#: prefs.js:1849
+#, fuzzy
+msgid "Remove filter %s?"
+msgstr "移除选定的过滤器？"
+
+#: prefs.js:1993
+#, fuzzy
+msgid "Reset label colors to default?"
+msgstr "重置默认项？"
+
+#: prefs.js:2017
+#, fuzzy
+msgid "Please enter new label foreground color:"
+msgstr "请输入标签主题"
+
+#: prefs.js:2019
+#, fuzzy
+msgid "Please enter new label background color:"
+msgstr "请输入标签主题"
+
 #, fuzzy
 #~ msgid "Converting database..."
 #~ msgstr "转换标签"
diff --git a/update-translations.sh b/update-translations.sh
index 561e2868e..0b78958b2 100755
--- a/update-translations.sh
+++ b/update-translations.sh
@@ -3,6 +3,8 @@ TEMPLATE=messages.pot
 
 xgettext -kT_js_decl -kT_sprintf -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php modules/*.php help/*.php mobile/*.php
 
+xgettext --from-code utf-8 -k__ -L Java -j -o $TEMPLATE *.js
+
 update_lang() {
 	if [ -f $1.po ]; then
 		TMPFILE=/tmp/update-translations.$$