update translations (it_IT)

author: Andrew Dolgov <[email protected]> 2009-03-27 20:20:29 +0300
committer: Andrew Dolgov <[email protected]> 2009-03-27 20:20:29 +0300
commit: e117ab70006c5d04901b4c21aa7ef951c8f657aa (patch)
tree: 4de9d1a2f8f48b07ae6a95f5cf7cb26e8a2b46c8 /locale
parent: 5c42194978a6938773a09c9472cee5947242d245 (diff)
16 files changed, 1687 insertions, 1642 deletions
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 380ccc87a..0ecf5ddf2 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 89ab9f596..0a226c492 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-20 15:55+0300\n"
+"POT-Creation-Date: 2009-03-27 20:20+0300\n"
 "PO-Revision-Date: 2007-11-20 23:01+0100\n"
 "Last-Translator: Thibaut Cousin <[email protected]>\n"
 "Language-Team: Français <[email protected]>\n"
@@ -81,7 +81,7 @@ msgstr "Une fois par jour"
 msgid "Weekly"
 msgstr "Une fois par semaine"
 
-#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:247 modules/pref-prefs.php:315
 msgid "Default"
 msgstr "Utiliser la valeur par défaut"
 
@@ -111,12 +111,16 @@ msgid "Unknown error"
 msgstr "Erreur inconnue"
 
 #: errors.php:5
-msgid "This program requires XmlHttpRequest "
-msgstr "Ce logiciel nécessite XmlHttpRequest "
+msgid ""
+"This program requires XmlHttpRequest to function properly. Your browser "
+"doesn't seem to support it."
+msgstr ""
 
 #: errors.php:8
-msgid "This program requires cookies "
-msgstr "Les cookies doivent être activés pour ce logiciel "
+msgid ""
+"This program requires cookies to function properly. Your browser doesn't "
+"seem to support them."
+msgstr ""
 
 #: errors.php:11
 msgid "Backend sanity check failed"
@@ -172,187 +176,192 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2841 modules/popup-dialog.php:175
+#: functions.php:2846 modules/popup-dialog.php:175
 #: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
-#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
+#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
+#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
+#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
 #: mobile/functions.php:33
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
-#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
+#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
+#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
 msgid "Labels"
 msgstr "Intitulé"
 
-#: functions.php:2919 functions.php:3342 functions.php:4127
+#: functions.php:2924 functions.php:3347 functions.php:4144
 #: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
 #: offline.js:1425
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2921 functions.php:3346 functions.php:4134
-#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
+#: functions.php:2926 functions.php:3351 functions.php:4151
+#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
+#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
 #: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: functions.php:2925 functions.php:3355 functions.php:4105
+#: functions.php:2930 functions.php:3360 functions.php:4122
 #: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
 #: offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "Tous les articles"
 
-#: functions.php:3306 functions.php:3308
+#: functions.php:3311 functions.php:3313
 msgid "Search results"
 msgstr "Résultats de recherche"
 
-#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
-#: functions.php:3353 functions.php:3356 functions.php:3364
+#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
+#: functions.php:3358 functions.php:3361 functions.php:3369
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:3984
+#: functions.php:4001
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:3989 functions.php:5253 localized_js.php:148
-#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
+#: functions.php:4006 functions.php:5292 localized_js.php:148
+#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
 #: modules/pref-filters.php:366 modules/pref-labels.php:163
 #: modules/pref-users.php:401 offline.js:409
 msgid "Select:"
 msgstr "Sélectionner&nbsp;:"
 
-#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
-#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
+#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
+#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
 #: modules/pref-labels.php:164 modules/pref-users.php:402
 #: mobile/functions.php:570
 msgid "All"
 msgstr "Tout"
 
-#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
+#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
 #: mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
+#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
 #, fuzzy
 msgid "Invert"
 msgstr "(Inverse)"
 
-#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
-#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
+#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
+#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
 #: modules/pref-labels.php:165 modules/pref-users.php:403
 #: mobile/functions.php:572
 msgid "None"
 msgstr "Aucun"
 
-#: functions.php:4001 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1371 offline.js:185
+#: functions.php:4018 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1378 offline.js:185
 msgid "Actions..."
 msgstr "Actions..."
 
-#: functions.php:4006 localized_js.php:150
+#: functions.php:4023 localized_js.php:150
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Sélection&nbsp;:"
 
-#: functions.php:4008 localized_js.php:152 tt-rss.php:239
+#: functions.php:4025 localized_js.php:152 tt-rss.php:238
 #: mobile/functions.php:459
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:4009
+#: functions.php:4026
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:4011 localized_js.php:85
+#: functions.php:4028 localized_js.php:85
 msgid "Mark as read:"
 msgstr "Marquer comme lu&nbsp;:"
 
-#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
 msgid "Selection"
 msgstr "La sélection"
 
-#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "Tout le flux"
 
-#: functions.php:4018
+#: functions.php:4035
 #, fuzzy
 msgid "Assign label:"
 msgstr "Attribuer des étiquettes"
 
-#: functions.php:4059 localized_js.php:56
+#: functions.php:4076 localized_js.php:56
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4325
+#: functions.php:4342
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:4342 mobile/functions.php:12
+#: functions.php:4359 mobile/functions.php:12
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:4578
+#: functions.php:4596
 #, fuzzy
 msgid " - "
 msgstr "- par "
 
-#: functions.php:4602 functions.php:5272
+#: functions.php:4620 functions.php:5320
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4610
+#: functions.php:4628
 #, fuzzy
 msgid "Display original article content"
 msgstr "Afficher l'heure du dernier article"
 
-#: functions.php:4617 functions.php:5263
+#: functions.php:4635 functions.php:5302
 #, fuzzy
 msgid "Show article summary in new window"
 msgstr "Ouvrir les liens des articles dans une nouvelle fenêtre"
 
-#: functions.php:4650 functions.php:5187
+#: functions.php:4642 functions.php:5309
+#, fuzzy
+msgid "Publish article with a note"
+msgstr "Publier l'article"
+
+#: functions.php:4682 functions.php:5226
 #, fuzzy
 msgid "unknown type"
 msgstr "Erreur inconnue"
 
-#: functions.php:4656 functions.php:5193
+#: functions.php:4688 functions.php:5232
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4692 functions.php:5227
+#: functions.php:4724 functions.php:5266
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4694 functions.php:5229
+#: functions.php:4726 functions.php:5268
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4714 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
+#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: functions.php:4770
+#: functions.php:4802
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:4839 mobile/functions.php:423
+#: functions.php:4871 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -360,51 +369,60 @@ msgstr ""
 "Impossible d'afficher le flux (la requête l'a pas abouti). Veuillez vérifier "
 "la syntaxe de son intitulé ou la configuration locale."
 
-#: functions.php:5161
+#: functions.php:5193
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Articles mémorisés"
 
-#: functions.php:5298
+#: functions.php:5327
+#, fuzzy
+msgid "toggle unread"
+msgstr "Marquages spéciaux&nbsp;"
+
+#: functions.php:5346
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Aucun article à marquer"
 
-#: functions.php:5301
+#: functions.php:5349
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "Aucun article à marquer"
 
-#: functions.php:5304
+#: functions.php:5352
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Aucun article à marquer"
 
-#: functions.php:5308
+#: functions.php:5356
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5310 localized_js.php:92 offline.js:444
+#: functions.php:5358 localized_js.php:92 offline.js:444
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Aucun article à marquer"
 
-#: functions.php:5984 tt-rss.php:206
+#: functions.php:6049 tt-rss.php:204
 #, fuzzy
 msgid "Create label..."
 msgstr "Créer un intitulé"
 
-#: functions.php:5997
+#: functions.php:6062
 #, fuzzy
 msgid "(remove)"
 msgstr "Supprimer"
 
-#: functions.php:6041
+#: functions.php:6106
 msgid "no tags"
 msgstr "aucune étiquette"
 
+#: functions.php:6134
+msgid "edit note"
+msgstr ""
+
 #: localized_js.php:36
 msgid "Adding feed..."
 msgstr "Ajout d'un flux..."
@@ -594,17 +612,17 @@ msgstr "Marquer tous les articles de %s comme lus ?"
 msgid "Mark all articles in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
-#: localized_js.php:84 viewfeed.js:1212
+#: localized_js.php:84 viewfeed.js:1250
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marquer tous les articles visibles de %s comme lus ?"
 
-#: localized_js.php:86 viewfeed.js:1885
+#: localized_js.php:86 viewfeed.js:1923
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "Marquer %d article(s) comme lu(s) ?"
 
-#: localized_js.php:87 viewfeed.js:1251
+#: localized_js.php:87 viewfeed.js:1289
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marquer %d articles sélectionnés de %s comme lus ?"
@@ -617,16 +635,16 @@ msgstr "Marquage de tous les flux comme lus..."
 msgid "New password cannot be blank."
 msgstr "Le nouveau mot de passe ne peut pas être vide."
 
-#: localized_js.php:90 viewfeed.js:1842
+#: localized_js.php:90 viewfeed.js:1880
 msgid "No article is selected."
 msgstr "Aucun article sélectionné."
 
-#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
-#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
+#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
+#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
 
-#: localized_js.php:93 viewfeed.js:1883
+#: localized_js.php:93 viewfeed.js:1921
 msgid "No articles found to mark"
 msgstr "Aucun article à marquer"
 
@@ -639,7 +657,7 @@ msgstr "Aucune catégorie sélectionnée."
 msgid "No feeds are selected."
 msgstr "Aucun flux sélectionné."
 
-#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
+#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
@@ -704,7 +722,7 @@ msgstr "Veuillez sélectionner un seul utilisateur."
 msgid "Please select some feed first."
 msgstr "Veuillez d'abord sélectionner un flux."
 
-#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
+#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
 msgid "Please wait..."
 msgstr "Veuillez patienter..."
 
@@ -712,8 +730,8 @@ msgstr "Veuillez patienter..."
 msgid "Please wait until operation finishes."
 msgstr ""
 
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
-#: viewfeed.js:631
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
+#: viewfeed.js:669
 msgid "Publish article"
 msgstr "Publier l'article"
 
@@ -863,7 +881,7 @@ msgstr "Enregistrement du filtre..."
 msgid "Saving user..."
 msgstr "Enregistrement de l'utilisateur..."
 
-#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
+#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
 msgid "Star article"
 msgstr "Marquer comme remarquable"
 
@@ -942,11 +960,11 @@ msgstr "Tentative de modification de l'adresse électronique..."
 msgid "Trying to change password..."
 msgstr "Tentative de modification du mot de passe..."
 
-#: localized_js.php:170 viewfeed.js:618
+#: localized_js.php:170 viewfeed.js:657
 msgid "Unpublish article"
 msgstr "Ne plus publier l'article"
 
-#: localized_js.php:172 viewfeed.js:553
+#: localized_js.php:172 viewfeed.js:586
 msgid "Unstar article"
 msgstr "Ne plus marquer comme remarquable"
 
@@ -990,8 +1008,8 @@ msgid ""
 "switch it into offline mode again. Go online?"
 msgstr ""
 
-#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
+#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
 #: mobile/functions.php:775
 msgid "Title"
 msgstr "Titre"
@@ -1017,7 +1035,7 @@ msgstr ""
 msgid "Filter article"
 msgstr "Filtrer l'article"
 
-#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
@@ -1369,12 +1387,12 @@ msgstr "Quitter la configuration"
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: prefs.php:117
+#: prefs.php:117 tt-rss.php:208
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Purger les articles"
 
-#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
 msgid "Preferences"
 msgstr "Configuration"
 
@@ -1399,7 +1417,7 @@ msgstr "Le navigateur de flux a été désactivé par l'administrateur."
 
 #: register.php:155 register.php:200 register.php:213 register.php:228
 #: register.php:246 register.php:331 register.php:341 register.php:353
-#: update.php:94 update.php:162 modules/pref-feeds.php:865
+#: update.php:94 update.php:162 modules/pref-feeds.php:869
 msgid "Return to Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
 
@@ -1499,122 +1517,117 @@ msgstr "Suppression d'un flux..."
 msgid "Search..."
 msgstr "Rechercher"
 
-#: tt-rss.php:193
+#: tt-rss.php:191
 msgid "Feed actions:"
 msgstr "Actions sur ce flux&nbsp;:"
 
-#: tt-rss.php:194
+#: tt-rss.php:192
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "S'inscrire à un flux"
 
-#: tt-rss.php:195
+#: tt-rss.php:193
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "Tout le flux"
 
-#: tt-rss.php:196
+#: tt-rss.php:194
 #, fuzzy
 msgid "Clear articles"
 msgstr "Filtrer l'article"
 
-#: tt-rss.php:197
+#: tt-rss.php:195
 #, fuzzy
 msgid "Rescore feed"
 msgstr "Suppression d'un flux..."
 
-#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
+#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
 msgid "Unsubscribe"
 msgstr "Se désinscrire"
 
-#: tt-rss.php:200
+#: tt-rss.php:198
 msgid "All feeds:"
 msgstr "Tous les flux&nbsp;:"
 
-#: tt-rss.php:202 help/3.php:44
+#: tt-rss.php:200 help/3.php:44
 #, fuzzy
 msgid "(Un)hide read feeds"
 msgstr "(Dé)Masquer les flux lus"
 
-#: tt-rss.php:204
+#: tt-rss.php:202
 msgid "Other actions:"
 msgstr "Autres actions&nbsp;:"
 
-#: tt-rss.php:207
+#: tt-rss.php:205
 #, fuzzy
 msgid "Create filter..."
 msgstr "Créer un filtre"
 
-#: tt-rss.php:208
+#: tt-rss.php:206
 #, fuzzy
 msgid "Reset UI layout"
 msgstr "&nbsp;&nbsp;S'inscrire à ce flux"
 
-#: tt-rss.php:209
+#: tt-rss.php:207
 #, fuzzy
 msgid "Reset category order"
 msgstr "Supprimer les catégories sélectionnées ?"
 
-#: tt-rss.php:210
-#, fuzzy
-msgid "&nbsp;&nbsp;Keyboard shortcuts"
-msgstr "&nbsp;&nbsp;Purger les articles"
-
-#: tt-rss.php:219
+#: tt-rss.php:218
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
 
-#: tt-rss.php:221
+#: tt-rss.php:220
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:229 mobile/functions.php:738
+#: tt-rss.php:228 mobile/functions.php:738
 msgid "Search:"
 msgstr "Rechercher&nbsp;:"
 
-#: tt-rss.php:237 mobile/functions.php:456
+#: tt-rss.php:236 mobile/functions.php:456
 msgid "Adaptive"
 msgstr "Adaptatif"
 
-#: tt-rss.php:238 mobile/functions.php:457
+#: tt-rss.php:237 mobile/functions.php:457
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: tt-rss.php:241
+#: tt-rss.php:240
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
+#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
 #: mobile/functions.php:501 mobile/functions.php:504
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: tt-rss.php:245
+#: tt-rss.php:244
 #, fuzzy
 msgid "Order:"
 msgstr "Autre&nbsp;:"
 
-#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
 #: modules/pref-filters.php:461
 #, fuzzy
 msgid "Date"
 msgstr "Mettre à jour"
 
-#: tt-rss.php:251
+#: tt-rss.php:250
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:255
+#: tt-rss.php:254
 msgid "Limit:"
 msgstr "Limite&nbsp;:"
 
-#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
 #: mobile/functions.php:436
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: tt-rss.php:298
+#: tt-rss.php:297
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1820,7 +1833,7 @@ msgstr "Annuler"
 
 #: modules/popup-dialog.php:140 modules/popup-dialog.php:152
 #: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
 #: modules/pref-labels.php:130 modules/pref-users.php:363
 #: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
 #: mobile/functions.php:783
@@ -1849,11 +1862,6 @@ msgstr "Ce flux"
 msgid "Create Filter"
 msgstr "Créer un filtre"
 
-#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
-#: modules/pref-filters.php:39 modules/pref-filters.php:96
-msgid "description"
-msgstr "description"
-
 #: modules/popup-dialog.php:245 modules/pref-filters.php:42
 #: modules/pref-filters.php:402
 msgid "Match"
@@ -2022,143 +2030,143 @@ msgstr "Enregistrer localement les images"
 msgid "Multiple Feed Editor"
 msgstr "Éditeur de flux"
 
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
+#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:836
+#: modules/pref-feeds.php:840
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Inscrit à <b>%s</b>."
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:842
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Déjà inscrit à <b>%s</b>."
 
-#: modules/pref-feeds.php:860
+#: modules/pref-feeds.php:864
 msgid "Edit subscription options"
 msgstr ""
 
-#: modules/pref-feeds.php:946
+#: modules/pref-feeds.php:950
 msgid "Category editor"
 msgstr "Éditeur de catégorie"
 
-#: modules/pref-feeds.php:969
+#: modules/pref-feeds.php:973
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La catégorie <b>%s</b> existe déjà dans la base de données."
 
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1004
 msgid "Unable to delete non empty feed categories."
 msgstr "Impossible de supprimer une catégorie de flux non vide."
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1021
 msgid "Create category"
 msgstr "Créer la catégorie"
 
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1081
 msgid "No feed categories defined."
 msgstr "Aucune catégorie de flux définie."
 
-#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
 #: modules/pref-filters.php:505 modules/pref-labels.php:225
 #: modules/pref-users.php:474
 msgid "Remove"
 msgstr "Supprimer"
 
-#: modules/pref-feeds.php:1107
+#: modules/pref-feeds.php:1114
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Des erreurs sont survenues pendant la mise à jour de certains flux (cliquez "
 "ici pour les détails)"
 
-#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1136 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "S'inscrire à un flux"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1141
 #, fuzzy
 msgid "More Feeds"
 msgstr "Suppression d'un flux..."
 
-#: modules/pref-feeds.php:1208
+#: modules/pref-feeds.php:1215
 msgid "Show last article times"
 msgstr "Afficher l'heure du dernier article"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
+#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
 msgid "Last&nbsp;Article"
 msgstr "Dernier&nbsp;article"
 
-#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
 #: modules/pref-users.php:449
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1320
+#: modules/pref-feeds.php:1327
 msgid "(Hidden)"
 msgstr ""
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1340
 #, php-format
 msgid "(linked to %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
 msgid "Selection:"
 msgstr "Sélection&nbsp;:"
 
-#: modules/pref-feeds.php:1365
+#: modules/pref-feeds.php:1372
 msgid "Recategorize"
 msgstr "Changer de catégorie"
 
-#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
 #: modules/pref-users.php:472
 msgid "Edit"
 msgstr "Modifier"
 
-#: modules/pref-feeds.php:1378
+#: modules/pref-feeds.php:1384
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: modules/pref-feeds.php:1382
+#: modules/pref-feeds.php:1388
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Articles mémorisés"
 
-#: modules/pref-feeds.php:1389
+#: modules/pref-feeds.php:1396
 msgid "Other:"
 msgstr "Autre&nbsp;:"
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1397
 msgid "Edit categories"
 msgstr "Modifier les catégories"
 
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1406
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1410
 msgid "File:"
 msgstr "Fichier&nbsp;:"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1413
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1411
+#: modules/pref-feeds.php:1420
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: modules/pref-feeds.php:1414
+#: modules/pref-feeds.php:1423
 msgid "Firefox Integration"
 msgstr "Intégration à Firefox"
 
-#: modules/pref-feeds.php:1416
+#: modules/pref-feeds.php:1425
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2166,11 +2174,11 @@ msgstr ""
 "Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox "
 "en cliquant sur le lien ci-dessous."
 
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1429
 msgid "Click here to register this site as a feed reader."
 msgstr "Cliquez ici pour enregistrer ce site comme lecteur de flux."
 
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1438
 #, fuzzy
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
@@ -2179,17 +2187,17 @@ msgstr ""
 "Les articles publiés sont exportés comme un flux RSS public et toute "
 "personne qui connaît l'adresse indiquée ci-dessous peut s'y inscrire."
 
-#: modules/pref-feeds.php:1433
+#: modules/pref-feeds.php:1442
 #, fuzzy
 msgid "Link to published articles feed."
 msgstr "Articles publiés"
 
-#: modules/pref-feeds.php:1436
+#: modules/pref-feeds.php:1445
 #, fuzzy
 msgid "Generate another link"
 msgstr "Générer une autre adresse"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1511
 #, fuzzy
 msgid "No feeds found."
 msgstr "Aucun flux auquel s'inscrire n'a été trouvé."
@@ -2213,14 +2221,6 @@ msgstr "Filtre <b>%s</b> créé"
 msgid "Create filter"
 msgstr "Créer un filtre"
 
-#: modules/pref-filters.php:392
-msgid "filter_type_descr"
-msgstr ""
-
-#: modules/pref-filters.php:393
-msgid "action_description"
-msgstr ""
-
 #: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
@@ -2366,10 +2366,6 @@ msgstr "Sélectionner un thème"
 msgid "Change theme"
 msgstr "Modifier le thème"
 
-#: modules/pref-prefs.php:388
-msgid "short_desc"
-msgstr ""
-
 #: modules/pref-prefs.php:400 modules/pref-prefs.php:405
 msgid "Yes"
 msgstr "Oui"
@@ -2759,6 +2755,24 @@ msgstr "Correspondance sur&nbsp;:"
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#: viewfeed.js:2193
+#, fuzzy
+msgid "Please enter a note for this article:"
+msgstr "Veuillez saisir le titre de l'intitulé :"
+
+#~ msgid "This program requires XmlHttpRequest "
+#~ msgstr "Ce logiciel nécessite XmlHttpRequest "
+
+#~ msgid "This program requires cookies "
+#~ msgstr "Les cookies doivent être activés pour ce logiciel "
+
+#, fuzzy
+#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
+#~ msgstr "&nbsp;&nbsp;Purger les articles"
+
+#~ msgid "description"
+#~ msgstr "description"
+
 #~ msgid "display tags"
 #~ msgstr "afficher les étiquettes"
 
@@ -2783,9 +2797,6 @@ msgstr ""
 #~ msgid "Address changed."
 #~ msgstr "Adresse modifiée."
 
-#~ msgid "Please enter label title:"
-#~ msgstr "Veuillez saisir le titre de l'intitulé :"
-
 #, fuzzy
 #~ msgid "Rescoring feeds..."
 #~ msgstr "Suppression d'un flux..."
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 1e0813bef..6b2c88eaf 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.mo
+++ b/locale/hu_HU/LC_MESSAGES/messages.mo
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index ba4acd316..ca08012c8 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-20 15:55+0300\n"
+"POT-Creation-Date: 2009-03-27 20:20+0300\n"
 "PO-Revision-Date: 2008-02-03 22:22::+0100\n"
 "Last-Translator: MiszterX <[email protected]>\n"
 "Language-Team: HUNGARIAN <[email protected]>\n"
@@ -81,7 +81,7 @@ msgstr "Napi"
 msgid "Weekly"
 msgstr "Heti"
 
-#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:247 modules/pref-prefs.php:315
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -111,11 +111,15 @@ msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
 #: errors.php:5
-msgid "This program requires XmlHttpRequest "
+msgid ""
+"This program requires XmlHttpRequest to function properly. Your browser "
+"doesn't seem to support it."
 msgstr ""
 
 #: errors.php:8
-msgid "This program requires cookies "
+msgid ""
+"This program requires cookies to function properly. Your browser doesn't "
+"seem to support them."
 msgstr ""
 
 #: errors.php:11
@@ -164,235 +168,249 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2841 modules/popup-dialog.php:175
+#: functions.php:2846 modules/popup-dialog.php:175
 #: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "Minden feed"
 
-#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
-#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
+#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
+#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
-#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
+#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
 #: mobile/functions.php:33
 msgid "Special"
 msgstr "Speciális"
 
-#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
-#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
+#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
+#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
 msgid "Labels"
 msgstr "Címkék"
 
-#: functions.php:2919 functions.php:3342 functions.php:4127
+#: functions.php:2924 functions.php:3347 functions.php:4144
 #: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
 #: offline.js:1425
 msgid "Starred articles"
 msgstr "Csillagost hírek"
 
-#: functions.php:2921 functions.php:3346 functions.php:4134
-#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
+#: functions.php:2926 functions.php:3351 functions.php:4151
+#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
 msgid "Published articles"
 msgstr "Publikált hírek"
 
-#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
+#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
 #: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "Olvasatlan hírek"
 
-#: functions.php:2925 functions.php:3355 functions.php:4105
+#: functions.php:2930 functions.php:3360 functions.php:4122
 #: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
 #: offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "Minden hír"
 
-#: functions.php:3306 functions.php:3308
+#: functions.php:3311 functions.php:3313
 msgid "Search results"
 msgstr "Keresési találatok"
 
-#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
-#: functions.php:3353 functions.php:3356 functions.php:3364
+#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
+#: functions.php:3358 functions.php:3361 functions.php:3369
 msgid "Searched for"
 msgstr ""
 
-#: functions.php:3984
+#: functions.php:4001
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3989 functions.php:5253 localized_js.php:148
-#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
+#: functions.php:4006 functions.php:5292 localized_js.php:148
+#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
 #: modules/pref-filters.php:366 modules/pref-labels.php:163
 #: modules/pref-users.php:401 offline.js:409
 msgid "Select:"
 msgstr "Kiválaszt:"
 
-#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
-#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
+#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
+#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
 #: modules/pref-labels.php:164 modules/pref-users.php:402
 #: mobile/functions.php:570
 msgid "All"
 msgstr "Mind"
 
-#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
+#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
 #: mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
+#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
 #, fuzzy
 msgid "Invert"
 msgstr "(ellentét)"
 
-#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
-#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
+#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
+#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
 #: modules/pref-labels.php:165 modules/pref-users.php:403
 #: mobile/functions.php:572
 msgid "None"
 msgstr "Egyiksem"
 
-#: functions.php:4001 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1371 offline.js:185
+#: functions.php:4018 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1378 offline.js:185
 msgid "Actions..."
 msgstr "Műveletek"
 
-#: functions.php:4006 localized_js.php:150
+#: functions.php:4023 localized_js.php:150
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Kiválaszt:"
 
-#: functions.php:4008 localized_js.php:152 tt-rss.php:239
+#: functions.php:4025 localized_js.php:152 tt-rss.php:238
 #: mobile/functions.php:459
 msgid "Starred"
 msgstr "Csillagoz"
 
-#: functions.php:4009
+#: functions.php:4026
 msgid "Published"
 msgstr "Publikál"
 
-#: functions.php:4011 localized_js.php:85
+#: functions.php:4028 localized_js.php:85
 msgid "Mark as read:"
 msgstr ""
 
-#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
 msgid "Selection"
 msgstr "Kiválasztottakat"
 
-#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "Összes feed"
 
-#: functions.php:4018
+#: functions.php:4035
 #, fuzzy
 msgid "Assign label:"
 msgstr "Tag felajánlása"
 
-#: functions.php:4059 localized_js.php:56
+#: functions.php:4076 localized_js.php:56
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4325
+#: functions.php:4342
 msgid "No feeds to display."
 msgstr ""
 
-#: functions.php:4342 mobile/functions.php:12
+#: functions.php:4359 mobile/functions.php:12
 msgid "Tags"
 msgstr ""
 
-#: functions.php:4578
+#: functions.php:4596
 msgid " - "
 msgstr ""
 
-#: functions.php:4602 functions.php:5272
+#: functions.php:4620 functions.php:5320
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4610
+#: functions.php:4628
 #, fuzzy
 msgid "Display original article content"
 msgstr "Mutasd az utolsó hír időpontját"
 
-#: functions.php:4617 functions.php:5263
+#: functions.php:4635 functions.php:5302
 msgid "Show article summary in new window"
 msgstr ""
 
-#: functions.php:4650 functions.php:5187
+#: functions.php:4642 functions.php:5309
+#, fuzzy
+msgid "Publish article with a note"
+msgstr "Hír publikálása"
+
+#: functions.php:4682 functions.php:5226
 #, fuzzy
 msgid "unknown type"
 msgstr "Ismeretlen hiba"
 
-#: functions.php:4656 functions.php:5193
+#: functions.php:4688 functions.php:5232
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4692 functions.php:5227
+#: functions.php:4724 functions.php:5266
 msgid "Attachment:"
 msgstr "Csatolmány:"
 
-#: functions.php:4694 functions.php:5229
+#: functions.php:4726 functions.php:5268
 msgid "Attachments:"
 msgstr "Csatolmányok:"
 
-#: functions.php:4714 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
+#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
 msgid "Close this window"
 msgstr ""
 
-#: functions.php:4770
+#: functions.php:4802
 msgid "Feed not found."
 msgstr "Feed nem található"
 
-#: functions.php:4839 mobile/functions.php:423
+#: functions.php:4871 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:5161
+#: functions.php:5193
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Tárolt hírek"
 
-#: functions.php:5298
+#: functions.php:5327
+#, fuzzy
+msgid "toggle unread"
+msgstr "Megjelöl"
+
+#: functions.php:5346
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
-#: functions.php:5301
+#: functions.php:5349
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
-#: functions.php:5304
+#: functions.php:5352
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
-#: functions.php:5308
+#: functions.php:5356
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5310 localized_js.php:92 offline.js:444
+#: functions.php:5358 localized_js.php:92 offline.js:444
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
-#: functions.php:5984 tt-rss.php:206
+#: functions.php:6049 tt-rss.php:204
 #, fuzzy
 msgid "Create label..."
 msgstr "Címke készítése"
 
-#: functions.php:5997
+#: functions.php:6062
 #, fuzzy
 msgid "(remove)"
 msgstr "Eltávolít"
 
-#: functions.php:6041
+#: functions.php:6106
 msgid "no tags"
 msgstr ""
 
+#: functions.php:6134
+msgid "edit note"
+msgstr ""
+
 #: localized_js.php:36
 msgid "Adding feed..."
 msgstr ""
@@ -575,17 +593,17 @@ msgstr "Minden hírt olvasottá tesz itt: %s?"
 msgid "Mark all articles in %s as read?"
 msgstr "Minden hírt olvasottá tesz itt: %s?"
 
-#: localized_js.php:84 viewfeed.js:1212
+#: localized_js.php:84 viewfeed.js:1250
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 
-#: localized_js.php:86 viewfeed.js:1885
+#: localized_js.php:86 viewfeed.js:1923
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr ""
 
-#: localized_js.php:87 viewfeed.js:1251
+#: localized_js.php:87 viewfeed.js:1289
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr ""
@@ -598,16 +616,16 @@ msgstr ""
 msgid "New password cannot be blank."
 msgstr ""
 
-#: localized_js.php:90 viewfeed.js:1842
+#: localized_js.php:90 viewfeed.js:1880
 msgid "No article is selected."
 msgstr ""
 
-#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
-#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
+#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
+#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
 msgid "No articles are selected."
 msgstr ""
 
-#: localized_js.php:93 viewfeed.js:1883
+#: localized_js.php:93 viewfeed.js:1921
 msgid "No articles found to mark"
 msgstr ""
 
@@ -620,7 +638,7 @@ msgstr "Nincs kategória kiválaszta."
 msgid "No feeds are selected."
 msgstr "Nincs feed kiválasztva."
 
-#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
+#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
 msgid "No feed selected."
 msgstr ""
 
@@ -685,7 +703,7 @@ msgstr ""
 msgid "Please select some feed first."
 msgstr ""
 
-#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
+#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
 msgid "Please wait..."
 msgstr "Kérem várjon"
 
@@ -693,8 +711,8 @@ msgstr "Kérem várjon"
 msgid "Please wait until operation finishes."
 msgstr ""
 
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
-#: viewfeed.js:631
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
+#: viewfeed.js:669
 msgid "Publish article"
 msgstr "Hír publikálása"
 
@@ -844,7 +862,7 @@ msgstr ""
 msgid "Saving user..."
 msgstr ""
 
-#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
+#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
 msgid "Star article"
 msgstr "Csillagoz hí"
 
@@ -922,11 +940,11 @@ msgstr ""
 msgid "Trying to change password..."
 msgstr ""
 
-#: localized_js.php:170 viewfeed.js:618
+#: localized_js.php:170 viewfeed.js:657
 msgid "Unpublish article"
 msgstr "Hír nem publikálása"
 
-#: localized_js.php:172 viewfeed.js:553
+#: localized_js.php:172 viewfeed.js:586
 msgid "Unstar article"
 msgstr ""
 
@@ -969,8 +987,8 @@ msgid ""
 "switch it into offline mode again. Go online?"
 msgstr ""
 
-#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
+#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
 #: mobile/functions.php:775
 msgid "Title"
 msgstr "Cím"
@@ -996,7 +1014,7 @@ msgstr ""
 msgid "Filter article"
 msgstr ""
 
-#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "Olvasottá tesz"
 
@@ -1316,12 +1334,12 @@ msgstr "Kilépés a beállításokból"
 msgid "Logout"
 msgstr "Kijelentkezés"
 
-#: prefs.php:117
+#: prefs.php:117 tt-rss.php:208
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Hírek törlése"
 
-#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
 msgid "Preferences"
 msgstr "Beállítások"
 
@@ -1346,7 +1364,7 @@ msgstr "Feed böngészése letilva az adminisztrátor által."
 
 #: register.php:155 register.php:200 register.php:213 register.php:228
 #: register.php:246 register.php:331 register.php:341 register.php:353
-#: update.php:94 update.php:162 modules/pref-feeds.php:865
+#: update.php:94 update.php:162 modules/pref-feeds.php:869
 msgid "Return to Tiny Tiny RSS"
 msgstr "Vissza az RSS olvasóhoz"
 
@@ -1445,122 +1463,117 @@ msgstr "Címke mentése"
 msgid "Search..."
 msgstr "Keresés"
 
-#: tt-rss.php:193
+#: tt-rss.php:191
 msgid "Feed actions:"
 msgstr "Feed művelet:"
 
-#: tt-rss.php:194
+#: tt-rss.php:192
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "Feliratkozás feedre"
 
-#: tt-rss.php:195
+#: tt-rss.php:193
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "Összes feed"
 
-#: tt-rss.php:196
+#: tt-rss.php:194
 #, fuzzy
 msgid "Clear articles"
 msgstr "Minden hír"
 
-#: tt-rss.php:197
+#: tt-rss.php:195
 #, fuzzy
 msgid "Rescore feed"
 msgstr "&nbsp;&nbsp;Feliratokzás a feedre"
 
-#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
+#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: tt-rss.php:200
+#: tt-rss.php:198
 msgid "All feeds:"
 msgstr "Minden feed:"
 
-#: tt-rss.php:202 help/3.php:44
+#: tt-rss.php:200 help/3.php:44
 #, fuzzy
 msgid "(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;Megmutatja/elrejti az olvasott feedeket"
 
-#: tt-rss.php:204
+#: tt-rss.php:202
 msgid "Other actions:"
 msgstr "Más művelet:"
 
-#: tt-rss.php:207
+#: tt-rss.php:205
 #, fuzzy
 msgid "Create filter..."
 msgstr "Szárő készítése"
 
-#: tt-rss.php:208
+#: tt-rss.php:206
 #, fuzzy
 msgid "Reset UI layout"
 msgstr "&nbsp;&nbsp;Feliratokzás a feedre"
 
-#: tt-rss.php:209
+#: tt-rss.php:207
 #, fuzzy
 msgid "Reset category order"
 msgstr "Kiválasztott kategória eltávolítása?"
 
-#: tt-rss.php:210
-#, fuzzy
-msgid "&nbsp;&nbsp;Keyboard shortcuts"
-msgstr "&nbsp;&nbsp;Hírek törlése"
-
-#: tt-rss.php:219
+#: tt-rss.php:218
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Minden feed"
 
-#: tt-rss.php:221
+#: tt-rss.php:220
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:229 mobile/functions.php:738
+#: tt-rss.php:228 mobile/functions.php:738
 msgid "Search:"
 msgstr "Keresés"
 
-#: tt-rss.php:237 mobile/functions.php:456
+#: tt-rss.php:236 mobile/functions.php:456
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:238 mobile/functions.php:457
+#: tt-rss.php:237 mobile/functions.php:457
 msgid "All Articles"
 msgstr "Minden hír"
 
-#: tt-rss.php:241
+#: tt-rss.php:240
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
+#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
 #: mobile/functions.php:501 mobile/functions.php:504
 msgid "Updated"
 msgstr "Frissítve"
 
-#: tt-rss.php:245
+#: tt-rss.php:244
 #, fuzzy
 msgid "Order:"
 msgstr "Más:"
 
-#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
 #: modules/pref-filters.php:461
 #, fuzzy
 msgid "Date"
 msgstr "Frissítés"
 
-#: tt-rss.php:251
+#: tt-rss.php:250
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:255
+#: tt-rss.php:254
 msgid "Limit:"
 msgstr "Limit:"
 
-#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
 #: mobile/functions.php:436
 msgid "Update"
 msgstr "Frissítés"
 
-#: tt-rss.php:298
+#: tt-rss.php:297
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1747,7 +1760,7 @@ msgstr "Mégse"
 
 #: modules/popup-dialog.php:140 modules/popup-dialog.php:152
 #: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
 #: modules/pref-labels.php:130 modules/pref-users.php:363
 #: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
 #: mobile/functions.php:783
@@ -1776,12 +1789,6 @@ msgstr "Ez a feed"
 msgid "Create Filter"
 msgstr "Szárő készítése"
 
-#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
-#: modules/pref-filters.php:39 modules/pref-filters.php:96
-#, fuzzy
-msgid "description"
-msgstr "Kiválasztottakat"
-
 #: modules/popup-dialog.php:245 modules/pref-filters.php:42
 #: modules/pref-filters.php:402
 msgid "Match"
@@ -1950,167 +1957,167 @@ msgstr "Képek helyi tárolása"
 msgid "Multiple Feed Editor"
 msgstr "Feed editor"
 
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
+#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:836
+#: modules/pref-feeds.php:840
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:842
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:860
+#: modules/pref-feeds.php:864
 msgid "Edit subscription options"
 msgstr ""
 
-#: modules/pref-feeds.php:946
+#: modules/pref-feeds.php:950
 msgid "Category editor"
 msgstr ""
 
-#: modules/pref-feeds.php:969
+#: modules/pref-feeds.php:973
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr ""
 
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1004
 msgid "Unable to delete non empty feed categories."
 msgstr ""
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1021
 msgid "Create category"
 msgstr "Kategória létrehozása"
 
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1081
 msgid "No feed categories defined."
 msgstr "Nincs feed kategória definiálva"
 
-#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
 #: modules/pref-filters.php:505 modules/pref-labels.php:225
 #: modules/pref-users.php:474
 msgid "Remove"
 msgstr "Eltávolít"
 
-#: modules/pref-feeds.php:1107
+#: modules/pref-feeds.php:1114
 msgid "Some feeds have update errors (click for details)"
 msgstr "Néhány feed frissítésével gond akadt (kattints a részletekhez)"
 
-#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1136 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Feliratkozás feedre"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1141
 #, fuzzy
 msgid "More Feeds"
 msgstr "Címke mentése"
 
-#: modules/pref-feeds.php:1208
+#: modules/pref-feeds.php:1215
 msgid "Show last article times"
 msgstr "Mutasd az utolsó hír időpontját"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
+#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
 msgid "Last&nbsp;Article"
 msgstr "Utolsó&nbsp;Hír"
 
-#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
 #: modules/pref-users.php:449
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1320
+#: modules/pref-feeds.php:1327
 msgid "(Hidden)"
 msgstr ""
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1340
 #, php-format
 msgid "(linked to %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
 msgid "Selection:"
 msgstr "Kiválaszt:"
 
-#: modules/pref-feeds.php:1365
+#: modules/pref-feeds.php:1372
 msgid "Recategorize"
 msgstr "Újrakategorizál"
 
-#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
 #: modules/pref-users.php:472
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: modules/pref-feeds.php:1378
+#: modules/pref-feeds.php:1384
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1382
+#: modules/pref-feeds.php:1388
 msgid "Clear feed data"
 msgstr "Feed adatok törlése"
 
-#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Tárolt hírek"
 
-#: modules/pref-feeds.php:1389
+#: modules/pref-feeds.php:1396
 msgid "Other:"
 msgstr "Más:"
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1397
 msgid "Edit categories"
 msgstr "Kategóriák szerkesztése"
 
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1406
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1410
 msgid "File:"
 msgstr "File:"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1413
 msgid "Import"
 msgstr "Importálás"
 
-#: modules/pref-feeds.php:1411
+#: modules/pref-feeds.php:1420
 msgid "Export OPML"
 msgstr "Exportálás OPML-be"
 
-#: modules/pref-feeds.php:1414
+#: modules/pref-feeds.php:1423
 msgid "Firefox Integration"
 msgstr "Firefox integráció"
 
-#: modules/pref-feeds.php:1416
+#: modules/pref-feeds.php:1425
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1429
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1438
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1433
+#: modules/pref-feeds.php:1442
 #, fuzzy
 msgid "Link to published articles feed."
 msgstr "Publikált hírek"
 
-#: modules/pref-feeds.php:1436
+#: modules/pref-feeds.php:1445
 #, fuzzy
 msgid "Generate another link"
 msgstr "Másik cím genrálása"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1511
 #, fuzzy
 msgid "No feeds found."
 msgstr "Nem található feed a feliratkozáshoz."
@@ -2134,14 +2141,6 @@ msgstr ""
 msgid "Create filter"
 msgstr "Szárő készítése"
 
-#: modules/pref-filters.php:392
-msgid "filter_type_descr"
-msgstr ""
-
-#: modules/pref-filters.php:393
-msgid "action_description"
-msgstr ""
-
 #: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
@@ -2285,10 +2284,6 @@ msgstr "Kinézet választó"
 msgid "Change theme"
 msgstr "Kinlzet megváltozatása"
 
-#: modules/pref-prefs.php:388
-msgid "short_desc"
-msgstr ""
-
 #: modules/pref-prefs.php:400 modules/pref-prefs.php:405
 msgid "Yes"
 msgstr "Igen"
@@ -2669,15 +2664,25 @@ msgstr "Egyezés ezzel:"
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#: viewfeed.js:2193
+#, fuzzy
+msgid "Please enter a note for this article:"
+msgstr "Add meg a címke címét:"
+
+#, fuzzy
+#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
+#~ msgstr "&nbsp;&nbsp;Hírek törlése"
+
+#, fuzzy
+#~ msgid "description"
+#~ msgstr "Kiválasztottakat"
+
 #~ msgid "Loading help..."
 #~ msgstr "Segítség betöltése..."
 
 #~ msgid "Saving label..."
 #~ msgstr "Címke mentése"
 
-#~ msgid "Please enter label title:"
-#~ 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 ac28ccb5f..ca179f4a4 100644
--- a/locale/it_IT/LC_MESSAGES/messages.mo
+++ b/locale/it_IT/LC_MESSAGES/messages.mo
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index 232b75e67..13c24fef8 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ttrss-1.2.30\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-20 15:55+0300\n"
-"PO-Revision-Date: 2009-01-03 16:43+0100\n"
+"POT-Creation-Date: 2009-03-27 20:20+0300\n"
+"PO-Revision-Date: 2009-03-27 18:10+0100\n"
 "Last-Translator: Andrea Zagli <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -78,7 +78,7 @@ msgstr "Giornalmente"
 msgid "Weekly"
 msgstr "Settimanalmente"
 
-#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:247 modules/pref-prefs.php:315
 msgid "Default"
 msgstr "Predefinito"
 
@@ -107,12 +107,20 @@ msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
 #: errors.php:5
-msgid "This program requires XmlHttpRequest "
+msgid ""
+"This program requires XmlHttpRequest to function properly. Your browser "
+"doesn't seem to support it."
 msgstr ""
+"Questo programma richiede XmlHttpRequest per funzionare correttamente. Il "
+"browser sembra non supportarla."
 
 #: errors.php:8
-msgid "This program requires cookies "
+msgid ""
+"This program requires cookies to function properly. Your browser doesn't "
+"seem to support them."
 msgstr ""
+"Questo programma richiede i cookie per funzionare correttamente. Il browser "
+"sembra non supportarli."
 
 #: errors.php:11
 msgid "Backend sanity check failed"
@@ -169,181 +177,183 @@ msgstr ""
 "Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
 "configurazione del PHP"
 
-#: functions.php:2841 modules/popup-dialog.php:175
+#: functions.php:2846 modules/popup-dialog.php:175
 #: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "Tutti i notiziari"
 
-#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
-#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
+#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
+#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
-#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
+#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
 #: mobile/functions.php:33
 msgid "Special"
 msgstr "Speciale"
 
-#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
-#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
+#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
+#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
 msgid "Labels"
 msgstr "Etichette"
 
-#: functions.php:2919 functions.php:3342 functions.php:4127
+#: functions.php:2924 functions.php:3347 functions.php:4144
 #: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
 #: offline.js:1425
 msgid "Starred articles"
 msgstr "Articoli con stella"
 
-#: functions.php:2921 functions.php:3346 functions.php:4134
-#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
+#: functions.php:2926 functions.php:3351 functions.php:4151
+#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
 msgid "Published articles"
 msgstr "Articoli pubblicati"
 
-#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
+#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
 #: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "Articoli nuovi"
 
-#: functions.php:2925 functions.php:3355 functions.php:4105
+#: functions.php:2930 functions.php:3360 functions.php:4122
 #: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
 #: offline.js:1427
-#, fuzzy
 msgid "All articles"
 msgstr "Tutti gli articoli"
 
-#: functions.php:3306 functions.php:3308
+#: functions.php:3311 functions.php:3313
 msgid "Search results"
 msgstr "Risultati della ricerca"
 
-#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
-#: functions.php:3353 functions.php:3356 functions.php:3364
+#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
+#: functions.php:3358 functions.php:3361 functions.php:3369
 msgid "Searched for"
 msgstr "Ricerca"
 
-#: functions.php:3984
+#: functions.php:4001
 msgid "Generated feed"
 msgstr "Notiziario generato"
 
-#: functions.php:3989 functions.php:5253 localized_js.php:148
-#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
+#: functions.php:4006 functions.php:5292 localized_js.php:148
+#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
 #: modules/pref-filters.php:366 modules/pref-labels.php:163
 #: modules/pref-users.php:401 offline.js:409
 msgid "Select:"
 msgstr "Seleziona:"
 
-#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
-#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
+#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
+#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
 #: modules/pref-labels.php:164 modules/pref-users.php:402
 #: mobile/functions.php:570
 msgid "All"
 msgstr "Tutti"
 
-#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
+#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
 #: mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "Non letti"
 
-#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
+#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
 msgid "Invert"
 msgstr "Inverti"
 
-#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
-#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
+#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
+#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
 #: modules/pref-labels.php:165 modules/pref-users.php:403
 #: mobile/functions.php:572
 msgid "None"
 msgstr "Nessuno"
 
-#: functions.php:4001 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1371 offline.js:185
+#: functions.php:4018 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1378 offline.js:185
 msgid "Actions..."
 msgstr "Azioni..."
 
-#: functions.php:4006 localized_js.php:150
+#: functions.php:4023 localized_js.php:150
 msgid "Selection toggle:"
 msgstr "Inverti selezione:"
 
-#: functions.php:4008 localized_js.php:152 tt-rss.php:239
+#: functions.php:4025 localized_js.php:152 tt-rss.php:238
 #: mobile/functions.php:459
 msgid "Starred"
 msgstr "Con stella"
 
-#: functions.php:4009
+#: functions.php:4026
 msgid "Published"
 msgstr "Pubblicati"
 
-#: functions.php:4011 localized_js.php:85
+#: functions.php:4028 localized_js.php:85
 msgid "Mark as read:"
 msgstr "Segna come letti:"
 
-#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
 msgid "Selection"
 msgstr "Selezione"
 
-#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "Intero notiziario"
 
-#: functions.php:4018
-#, fuzzy
+#: functions.php:4035
 msgid "Assign label:"
-msgstr "Assegna etichette"
+msgstr "Assegna etichetta:"
 
-#: functions.php:4059 localized_js.php:56
+#: functions.php:4076 localized_js.php:56
 msgid "Click to collapse category"
 msgstr "Fare clic per contrarre la categoria"
 
-#: functions.php:4325
+#: functions.php:4342
 msgid "No feeds to display."
 msgstr "Nessun notiziario da visualizzare."
 
-#: functions.php:4342 mobile/functions.php:12
+#: functions.php:4359 mobile/functions.php:12
 msgid "Tags"
 msgstr "Etichette"
 
-#: functions.php:4578
+#: functions.php:4596
 msgid " - "
 msgstr " - "
 
-#: functions.php:4602 functions.php:5272
+#: functions.php:4620 functions.php:5320
 msgid "Edit tags for this article"
 msgstr "Modifica le etichette per questo articolo"
 
-#: functions.php:4610
+#: functions.php:4628
 msgid "Display original article content"
 msgstr "Visualizza il contenuto originale dell&apos;articolo"
 
-#: functions.php:4617 functions.php:5263
+#: functions.php:4635 functions.php:5302
 msgid "Show article summary in new window"
 msgstr "Mostra il sommario dell&apos;articolo in una nuova finestra"
 
-#: functions.php:4650 functions.php:5187
+#: functions.php:4642 functions.php:5309
+msgid "Publish article with a note"
+msgstr "Pubblica articolo con una nota"
+
+#: functions.php:4682 functions.php:5226
 msgid "unknown type"
 msgstr "tipo sconosciuto"
 
-#: functions.php:4656 functions.php:5193
+#: functions.php:4688 functions.php:5232
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4692 functions.php:5227
+#: functions.php:4724 functions.php:5266
 msgid "Attachment:"
 msgstr "Allegato:"
 
-#: functions.php:4694 functions.php:5229
+#: functions.php:4726 functions.php:5268
 msgid "Attachments:"
 msgstr "Allegati:"
 
-#: functions.php:4714 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
+#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: functions.php:4770
+#: functions.php:4802
 msgid "Feed not found."
 msgstr "Notiziario non trovato."
 
-#: functions.php:4839 mobile/functions.php:423
+#: functions.php:4871 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -351,47 +361,55 @@ msgstr ""
 "Impossibile visualizzare il notiziario (interrogazione fallita). Controllare "
 "che l&apos;etichetta corrisponda alla sintassi o la configurazione locale."
 
-#: functions.php:5161
+#: functions.php:5193
 msgid "Click to expand article"
 msgstr "Fare clic per espandere l&apos;articolo"
 
-#: functions.php:5298
+#: functions.php:5327
+msgid "toggle unread"
+msgstr "inverti non letti"
+
+#: functions.php:5346
 msgid "No unread articles found to display."
 msgstr "Nessun articolo non letto trovato da visualizzare."
 
-#: functions.php:5301
-#, fuzzy
+#: functions.php:5349
 msgid "No updated articles found to display."
-msgstr "Nessun articolo non letto trovato da visualizzare."
+msgstr "Nessun articolo non aggiornato trovato da visualizzare."
 
-#: functions.php:5304
+#: functions.php:5352
 msgid "No starred articles found to display."
 msgstr "Nessun articolo con stella trovato da visualizzare."
 
-#: functions.php:5308
+#: functions.php:5356
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
+"Nessun articolo trovato da visualizzare. Si possono assegnare manualmente "
+"gli articoli alle etichette (vedere il menù «Azioni» sopra) o utilizzare un "
+"filtro."
 
-#: functions.php:5310 localized_js.php:92 offline.js:444
+#: functions.php:5358 localized_js.php:92 offline.js:444
 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
-#: functions.php:5984 tt-rss.php:206
-#, fuzzy
+#: functions.php:6049 tt-rss.php:204
 msgid "Create label..."
-msgstr "Crea etichetta"
+msgstr "Crea etichetta..."
 
-#: functions.php:5997
-#, fuzzy
+#: functions.php:6062
 msgid "(remove)"
-msgstr "Rimuovi"
+msgstr "(rimuovi)"
 
-#: functions.php:6041
+#: functions.php:6106
 msgid "no tags"
 msgstr "nessuna etichetta"
 
+#: functions.php:6134
+msgid "edit note"
+msgstr "modifica note"
+
 #: localized_js.php:36
 msgid "Adding feed..."
 msgstr "Aggiunta notiziario..."
@@ -409,14 +427,12 @@ msgid "All feeds updated."
 msgstr "Tutti i notiziari aggiornati."
 
 #: localized_js.php:42
-#, fuzzy
 msgid "Assign score to article:"
-msgstr "Cambio punteggio degli articoli"
+msgstr "Assegna punteggio all'articolo:"
 
 #: localized_js.php:43
-#, fuzzy
 msgid "Assign selected articles to label?"
-msgstr "Segnare %d articoli selezionati in «%s» come letti?"
+msgstr "Assegnare l'etichetta agli articoli selezionati?"
 
 #: localized_js.php:44 prefs.js:331
 msgid "Can't add category: no name specified."
@@ -428,20 +444,20 @@ msgstr "Impossibile aggiungere il filtro: niente a cui corrisponda."
 
 #: localized_js.php:46 prefs.js:275 tt-rss.js:1442
 msgid "Can't create label: missing caption."
-msgstr "Impossibile creare l&apos;etichetta: intestazione mancante."
+msgstr "Impossibile creare l'etichetta: intestazione mancante."
 
 #: localized_js.php:47 prefs.js:359
-#, fuzzy
 msgid "Can't create user: no login specified."
-msgstr "Impossibile aggiungere l&apos;utente: nessun accesso specificato."
+msgstr "Impossibile creare l'utente: nessun accesso specificato."
 
 #: localized_js.php:48
 msgid "Can't open article: received invalid article link"
 msgstr ""
+"Impossibile aprire l'articolo: ricevuto collegamento di articolo non valido"
 
 #: localized_js.php:49
 msgid "Can't open article: received invalid XML"
-msgstr ""
+msgstr "Impossibile aprire l'articolo: ricevuto XML non valido"
 
 #: localized_js.php:50 functions.js:1426
 msgid "Can't subscribe: no feed URL given."
@@ -462,33 +478,28 @@ msgid "Changing category of selected feeds..."
 msgstr "Cambiamento della categoria dei notiziari selezionati..."
 
 #: localized_js.php:54
-#, fuzzy
 msgid "Clearing feed..."
-msgstr "Salvataggio notiziario..."
+msgstr "Pulizia notiziario..."
 
 #: localized_js.php:55
-#, fuzzy
 msgid "Clearing selected feed..."
-msgstr "Cambiamento del punteggio ai notiziari selezionati..."
+msgstr "Pulizia del notiziario selezionato..."
 
 #: localized_js.php:57
-#, fuzzy
 msgid "comments"
-msgstr "Commenti?"
+msgstr "commenti"
 
 #: localized_js.php:58
-#, fuzzy
 msgid "Could not change feed URL."
-msgstr "Impossibile cambiare l&apos;indirizzo."
+msgstr "Impossibile cambiare l&apos;URL del notiziario."
 
 #: localized_js.php:59
 msgid "Could not display article (missing XML object)"
 msgstr "Impossibili visualizzare l&apos;articolo (manca l&apos;oggetto XML)"
 
 #: localized_js.php:60
-#, fuzzy
 msgid "Could not update headlines (missing XML data)"
-msgstr "Impossibile aggiornare i sommari (oggetto XML mancante)"
+msgstr "Impossibile aggiornare i sommari (dati XML mancanti)"
 
 #: localized_js.php:61
 msgid "Could not update headlines (missing XML object)"
@@ -497,6 +508,7 @@ msgstr "Impossibile aggiornare i sommari (oggetto XML mancante)"
 #: localized_js.php:62 offline.js:638
 msgid "Data for offline browsing has not been downloaded yet."
 msgstr ""
+"I dati per la navigazione «fuori linea» non sono ancora stati scaricati."
 
 #: localized_js.php:63 tt-rss.js:75
 msgid "display feeds"
@@ -512,56 +524,50 @@ msgid "Erase all non-starred articles in %s?"
 msgstr "Eliminare tutti gli articoli senza la stella in «%s»?"
 
 #: localized_js.php:67 prefs.js:618
-#, fuzzy
 msgid "Erase all non-starred articles in selected feed?"
-msgstr "Eliminare tutti gli articoli senza la stella in «%s»?"
+msgstr ""
+"Eliminare tutti gli articoli senza la stella nel notiziario selezionato?"
 
 #: localized_js.php:68 prefs.js:304
 msgid "Error: Invalid feed URL."
-msgstr ""
+msgstr "Errore: URL non valido del notiziario."
 
 #: localized_js.php:69 prefs.js:302
-#, fuzzy
 msgid "Error: No feed URL given."
-msgstr ""
-"Impossibile annullare la sottoscrizione: nessun URL di notiziario è stato "
-"dato."
+msgstr "Errore: non è stato fornito alcun URL di notiziario."
 
 #: localized_js.php:70
-#, fuzzy
 msgid "Error while trying to load more headlines"
-msgstr "Errore durante l&apos;analisi del documento."
+msgstr "Errore durante il tentativo di caricare altre intestazioni"
 
 #: localized_js.php:71
-#, fuzzy
 msgid "Failed to load article in new window"
-msgstr "Aprire gli articoli in una nuova finestra"
+msgstr "Fallito il caricamento dell'articolo in una nuova finestra"
 
 #: localized_js.php:72
 msgid "Failed to open window for the article"
-msgstr ""
+msgstr "Fallita l'apertura della finestra per l'articolo"
 
 #: localized_js.php:73 prefs.js:640
 msgid "How many days of articles to keep (0 - use default)?"
-msgstr ""
+msgstr "Quanti giorni di articoli tenere (0 - utilizza il valore predefinito)?"
 
 #: localized_js.php:75 offline.js:1655
 msgid "Last sync: Cancelled."
-msgstr ""
+msgstr "Ultima sinc.: annullata."
 
 #: localized_js.php:76 offline.js:837
 msgid "Last sync: Error receiving data."
-msgstr ""
+msgstr "Ultima sinc.: errore di ricezione dati."
 
 #: localized_js.php:77 offline.js:808
 #, php-format
 msgid "Last sync: %s"
-msgstr ""
+msgstr "Ultima sinc.: %s"
 
 #: localized_js.php:78
-#, fuzzy
 msgid "Loading feed list..."
-msgstr "Caricamento, attendere prego..."
+msgstr "Caricamento elenco notiziari..."
 
 #: localized_js.php:79 prefs.php:66 prefs.php:138 tt-rss.php:71
 msgid "Loading, please wait..."
@@ -569,7 +575,7 @@ msgstr "Caricamento, attendere prego..."
 
 #: localized_js.php:80
 msgid "Local data removed."
-msgstr ""
+msgstr "Dati locali rimossi."
 
 #: localized_js.php:81 prefs.js:763
 msgid "Login field cannot be blank."
@@ -584,17 +590,17 @@ msgstr "Segnare tutti gli articoli come letti?"
 msgid "Mark all articles in %s as read?"
 msgstr "Segnare tutti gli articoli in «%s» come letti?"
 
-#: localized_js.php:84 viewfeed.js:1212
+#: localized_js.php:84 viewfeed.js:1250
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "Segnare tutti gli articoli visibili in «%s» come letti?"
 
-#: localized_js.php:86 viewfeed.js:1885
+#: localized_js.php:86 viewfeed.js:1923
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "Segnare %d articolo/i come letto/i?"
 
-#: localized_js.php:87 viewfeed.js:1251
+#: localized_js.php:87 viewfeed.js:1289
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Segnare %d articoli selezionati in «%s» come letti?"
@@ -607,16 +613,16 @@ msgstr "Segnatura dei notiziari come letti..."
 msgid "New password cannot be blank."
 msgstr "La nuova password non può essere vuota."
 
-#: localized_js.php:90 viewfeed.js:1842
+#: localized_js.php:90 viewfeed.js:1880
 msgid "No article is selected."
 msgstr "Nessun articolo selezionato."
 
-#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
-#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
+#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
+#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
 msgid "No articles are selected."
 msgstr "Nessun articolo selezionato."
 
-#: localized_js.php:93 viewfeed.js:1883
+#: localized_js.php:93 viewfeed.js:1921
 msgid "No articles found to mark"
 msgstr "Nessun articolo trovato da segnare"
 
@@ -629,7 +635,7 @@ msgstr "Nessuna categoria selezionata."
 msgid "No feeds are selected."
 msgstr "Nessun notiziario selezionato."
 
-#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
+#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
 msgid "No feed selected."
 msgstr "Nessun notiziario selezionato."
 
@@ -654,24 +660,20 @@ msgid "Old password cannot be blank."
 msgstr "La vecchia password non può essere vuota."
 
 #: localized_js.php:103 prefs.js:268 tt-rss.js:1437
-#, fuzzy
 msgid "Please enter label caption:"
-msgstr "Inserire il titolo dell&apos;etichetta:"
+msgstr "Inserire l'intestazione dell'etichetta:"
 
 #: localized_js.php:104 prefs.js:352
-#, fuzzy
 msgid "Please enter login:"
-msgstr "Inserire il titolo dell&apos;etichetta:"
+msgstr "Inserire l'accesso:"
 
 #: localized_js.php:105 prefs.js:2019
-#, fuzzy
 msgid "Please enter new label background color:"
-msgstr "Inserire il titolo dell&apos;etichetta:"
+msgstr "Inserire il colore di sfondo della nuova etichetta:"
 
 #: localized_js.php:106 prefs.js:2017
-#, fuzzy
 msgid "Please enter new label foreground color:"
-msgstr "Inserire il titolo dell&apos;etichetta:"
+msgstr "Inserire il colore del testo nella nuova etichetta:"
 
 #: localized_js.php:107 prefs.js:930
 msgid "Please select one feed."
@@ -694,37 +696,35 @@ msgstr "Selezionare un solo utente."
 msgid "Please select some feed first."
 msgstr "Selezionare prima qualche notiziario."
 
-#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
+#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
 msgid "Please wait..."
 msgstr "Attendere prego..."
 
 #: localized_js.php:113
 msgid "Please wait until operation finishes."
-msgstr ""
+msgstr "Attendere fino a quando l'operazione non è finita."
 
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
-#: viewfeed.js:631
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
+#: viewfeed.js:669
 msgid "Publish article"
 msgstr "Pubblica articolo"
 
 #: localized_js.php:115
 msgid "Published feed URL changed."
-msgstr ""
+msgstr "L'URL del notiziario pubblicato è cambiata."
 
 #: localized_js.php:116
-#, fuzzy
 msgid "Purging selected feed..."
-msgstr "Cambiamento del punteggio ai notiziari selezionati..."
+msgstr "Pulizia dei notiziari selezionati..."
 
 #: localized_js.php:117 prefs.js:1849
-#, fuzzy, php-format
+#, php-format
 msgid "Remove filter %s?"
-msgstr "Rimuovere i filtri selezionati?"
+msgstr "Rimuovere il filtro «%s»?"
 
 #: localized_js.php:118
-#, fuzzy
 msgid "Remove selected articles from label?"
-msgstr "Rimuovere le etichette selezionate?"
+msgstr "Rimuovere dall'etichetta gli articoli selezionati?"
 
 #: localized_js.php:119 prefs.js:671
 msgid "Remove selected categories?"
@@ -747,14 +747,12 @@ msgid "Removing feed..."
 msgstr "Rimozione notiziario..."
 
 #: localized_js.php:124
-#, fuzzy
 msgid "Removing filter..."
-msgstr "Rimozione notiziario..."
+msgstr "Rimozione del filtro..."
 
 #: localized_js.php:125
-#, fuzzy
 msgid "Removing offline data..."
-msgstr "Rimozione notiziario..."
+msgstr "Rimozione dati «fuori linea»..."
 
 #: localized_js.php:126
 msgid "Removing selected categories..."
@@ -777,10 +775,9 @@ msgid "Replace current publishing address with a new one?"
 msgstr "Sostituire l&apos;indirizzo di pubblicazione attuale con uno nuovo?"
 
 #: localized_js.php:131 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 "
+"Cambiare il punteggio a tutti i notiziari? Questa operazione può durare "
 "molto tempo."
 
 #: localized_js.php:132 tt-rss.js:1020
@@ -793,9 +790,9 @@ msgid "Rescore articles in selected feeds?"
 msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
 
 #: localized_js.php:134
-#, fuzzy
 msgid "Rescore last 100 articles in selected feeds?"
-msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
+msgstr ""
+"Cambiare il punteggio degli ultimi 100 articoli nei notiziari selezionati?"
 
 #: localized_js.php:135
 msgid "Rescoring articles..."
@@ -806,9 +803,8 @@ msgid "Reset category order?"
 msgstr "Reimpostare l&apos;ordine dalla categoria?"
 
 #: localized_js.php:137 prefs.js:1993
-#, fuzzy
 msgid "Reset label colors to default?"
-msgstr "Reimpostare ai valori predefiniti?"
+msgstr "Reimpostare i colori delle etichette ai valori predefiniti?"
 
 #: localized_js.php:138 prefs.js:847
 msgid "Reset password of selected user?"
@@ -831,9 +827,8 @@ msgid "Save current configuration?"
 msgstr "Salvare la configurazione attuale?"
 
 #: localized_js.php:143
-#, fuzzy
 msgid "Saving article tags..."
-msgstr "Salvataggio categoria..."
+msgstr "Salvataggio etichette articolo..."
 
 #: localized_js.php:144
 msgid "Saving feed..."
@@ -851,47 +846,42 @@ msgstr "Salvataggio filtro..."
 msgid "Saving user..."
 msgstr "Salvataggio utente..."
 
-#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
+#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
 msgid "Star article"
 msgstr "Metti la stella all&apos;articolo"
 
 #: localized_js.php:154 functions.js:1430
-#, fuzzy
 msgid "Subscribing to feed..."
-msgstr "Sottoscrivi il notiziario"
+msgstr "Sottoscrizione al notiziario..."
 
 #: localized_js.php:155 offline.js:1195
 msgid "Switch Tiny Tiny RSS into offline mode?"
-msgstr ""
+msgstr "Cambiare la modalità di Tiny Tiny RSS a «fuori linea»?"
 
 #: localized_js.php:156 offline.js:890
 msgid "Synchronizing..."
-msgstr ""
+msgstr "Sincronizzazione..."
 
 #: localized_js.php:157 offline.js:735
-#, fuzzy
 msgid "Synchronizing articles..."
-msgstr "Cambiamento del punteggio degli articoli..."
+msgstr "Sincronizzazione articoli..."
 
 #: localized_js.php:158 offline.js:780
-#, fuzzy, php-format
+#, php-format
 msgid "Synchronizing articles (%d)..."
-msgstr "Cambiamento del punteggio degli articoli..."
+msgstr "Sincronizzazione articoli (%d)..."
 
 #: localized_js.php:159 offline.js:698
-#, fuzzy
 msgid "Synchronizing categories..."
-msgstr "Salvataggio categoria..."
+msgstr "Sincronizzazione categorie..."
 
 #: localized_js.php:160 offline.js:679
-#, fuzzy
 msgid "Synchronizing feeds..."
-msgstr "Salvataggio notiziari..."
+msgstr "Sincronizzazioni notiziari..."
 
 #: localized_js.php:161 offline.js:716
-#, fuzzy
 msgid "Synchronizing labels..."
-msgstr "Salvataggio etichetta..."
+msgstr "Sincronizzazione etichette..."
 
 #: localized_js.php:162 tt-rss.php:175 tt-rss.js:80
 msgid "tag cloud"
@@ -902,25 +892,27 @@ msgid ""
 "This will remove all offline data stored by Tiny Tiny RSS on this computer. "
 "Continue?"
 msgstr ""
+"Questo eliminerà tutti i dati «fuori linea» salvati da Tiny Tiny RSS su "
+"questo computer. Continuare?"
 
 #: localized_js.php:164 offline.js:1743
 msgid ""
 "Tiny Tiny RSS has trouble accessing its server. Would you like to go offline?"
 msgstr ""
+"Tiny Tiny RSS ha dei problemi a connettersi al proprio server. Si vuole "
+"andare «fuori linea»?"
 
 #: localized_js.php:165
-#, fuzzy
 msgid "Tiny Tiny RSS is in offline mode."
-msgstr "Il database di Tiny Tiny RSS è aggiornato."
+msgstr "Tiny Tiny RSS è in modalità «fuori linea»."
 
 #: localized_js.php:166 offline.js:1223
 msgid "Tiny Tiny RSS will reload. Go online?"
-msgstr ""
+msgstr "Tiny Tiny RSS verrà riavviato. Andare «in linea»?"
 
 #: localized_js.php:167
-#, fuzzy
 msgid "Trying to change address..."
-msgstr "Tentativo di cambio della password..."
+msgstr "Tentativo di cambio dell'indirizzo..."
 
 #: localized_js.php:168
 msgid "Trying to change e-mail..."
@@ -930,11 +922,11 @@ msgstr "Tentativo di cambio dell&apos;email..."
 msgid "Trying to change password..."
 msgstr "Tentativo di cambio della password..."
 
-#: localized_js.php:170 viewfeed.js:618
+#: localized_js.php:170 viewfeed.js:657
 msgid "Unpublish article"
 msgstr "Non pubblicare articolo"
 
-#: localized_js.php:172 viewfeed.js:553
+#: localized_js.php:172 viewfeed.js:586
 msgid "Unstar article"
 msgstr "Togli la stella all&apos;articolo"
 
@@ -970,15 +962,19 @@ msgstr "Impossibile annullare la sottoscrizione alla categoria."
 #: localized_js.php:180
 msgid "You have to synchronize some articles before going into offline mode."
 msgstr ""
+"Occorre sincronizzare alcuni articoli prima di andare nella modalità «fuori "
+"linea»."
 
 #: localized_js.php:181
 msgid ""
 "You won't be able to access offline version of Tiny Tiny RSS until you "
 "switch it into offline mode again. Go online?"
 msgstr ""
+"Non si potrà accedere alla versione «fuori linea» di Tiny Tiny RSS fino a "
+"quando non si cambierà la modalità a «fuori linea». Andare «in linea»?"
 
-#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
+#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
 #: mobile/functions.php:775
 msgid "Title"
 msgstr "Titolo"
@@ -1004,7 +1000,7 @@ msgstr "Data dell&apos;articolo"
 msgid "Filter article"
 msgstr "Filtra articoli"
 
-#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "Segna come letto"
 
@@ -1017,9 +1013,8 @@ msgid "Assign tags"
 msgstr "Assegna etichette"
 
 #: localized_schema.php:20
-#, fuzzy
 msgid "Assign label"
-msgstr "Assegna etichette"
+msgstr "Assegna etichetta"
 
 #: localized_schema.php:24
 msgid "General"
@@ -1362,11 +1357,11 @@ msgstr "Esci dalle preferenze"
 msgid "Logout"
 msgstr "Esci"
 
-#: prefs.php:117
+#: prefs.php:117 tt-rss.php:208
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -1375,23 +1370,21 @@ msgid "My Feeds"
 msgstr "Notiziari"
 
 #: prefs.php:127 help/4.php:11
-#, fuzzy
 msgid "Filters"
-msgstr "File:"
+msgstr "Filtri"
 
 #: prefs.php:132 help/4.php:13
-#, fuzzy
 msgid "Users"
-msgstr "Utente"
+msgstr "Utenti"
 
 #: register.php:152
-#, fuzzy
 msgid "New user registrations are administratively disabled."
-msgstr "La lettura del notiziario è bloccata dall&apos;amministratore."
+msgstr ""
+"La registrazione di nuovi utenti è disabilitata dall&apos;amministratore."
 
 #: register.php:155 register.php:200 register.php:213 register.php:228
 #: register.php:246 register.php:331 register.php:341 register.php:353
-#: update.php:94 update.php:162 modules/pref-feeds.php:865
+#: update.php:94 update.php:162 modules/pref-feeds.php:869
 msgid "Return to Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
 
@@ -1401,49 +1394,49 @@ msgid ""
 "were not logged in once, are erased automatically 24 hours after temporary "
 "password is sent."
 msgstr ""
+"La password temporanea verrà inviata all'email speficiata. Utenti, che non "
+"eseguono l'accesso almeno una volta, vengono cancellati automaticamente 24 "
+"ore dopo che la password temporanea è stata inviata."
 
 #: register.php:182
 msgid "Desired login:"
-msgstr ""
+msgstr "Accesso desiderato:"
 
 #: register.php:185
-#, fuzzy
 msgid "Check availability"
-msgstr "Controllalo"
+msgstr "Controlla disponibilità"
 
 #: register.php:187
-#, fuzzy
 msgid "Email:"
 msgstr "Email:"
 
 #: register.php:190
 msgid "How much is two plus two:"
-msgstr ""
+msgstr "Quanto fa due più due:"
 
 #: register.php:193
 msgid "Submit registration"
-msgstr ""
+msgstr "Invia registrazione"
 
 #: register.php:211
 msgid "Your registration information is incomplete."
-msgstr ""
+msgstr "Le informazioni di registrazione sono incomplete."
 
 #: register.php:226
 msgid "Sorry, this username is already taken."
-msgstr ""
+msgstr "Il nome utente esiste già."
 
 #: register.php:244
-#, fuzzy
 msgid "Registration failed."
-msgstr "Controllo della configurazione fallito"
+msgstr "Registrazione fallita."
 
 #: register.php:328
 msgid "Account created successfully."
-msgstr ""
+msgstr "Utente creato con successo."
 
 #: register.php:350
 msgid "New user registrations are currently closed."
-msgstr ""
+msgstr "La registrazione di nuovi utenti è attualmente chiusa."
 
 #: tt-rss.php:127
 msgid "Comments?"
@@ -1451,157 +1444,140 @@ msgstr "Commenti?"
 
 #: tt-rss.php:139
 msgid "Offline reading"
-msgstr ""
+msgstr "Lettura fuori linea"
 
 #: tt-rss.php:146
-#, fuzzy
 msgid "Cancel synchronization"
-msgstr "Salva configurazione"
+msgstr "Annulla sincronizzazione"
 
 #: tt-rss.php:149
 msgid "Synchronize"
-msgstr ""
+msgstr "Sincronizza"
 
 #: tt-rss.php:151
-#, fuzzy
 msgid "Remove stored data"
-msgstr "Rimuovere le etichette selezionate?"
+msgstr "Rimuovi dati salvati"
 
 #: tt-rss.php:153
-#, fuzzy
 msgid "Go offline"
-msgstr "Non collegato"
+msgstr "Vai «fuori linea»"
 
 #: tt-rss.php:157
 msgid "New version of Tiny Tiny RSS is available!"
-msgstr ""
+msgstr "È disponibile la nuova versione di Tiny Tiny RSS."
 
 #: tt-rss.php:164
-#, fuzzy
 msgid "Go online"
-msgstr "Non collegato"
+msgstr "Vai «in linea»"
 
 #: tt-rss.php:179
-#, fuzzy
 msgid "More feeds..."
-msgstr "Cambiamento del punteggio dei notiziari..."
+msgstr "Altri notiziari..."
 
 #: tt-rss.php:190
-#, fuzzy
 msgid "Search..."
-msgstr "Cerca"
+msgstr "Cerca..."
 
-#: tt-rss.php:193
+#: tt-rss.php:191
 msgid "Feed actions:"
 msgstr "Azioni notiziari:"
 
-#: tt-rss.php:194
-#, fuzzy
+#: tt-rss.php:192
 msgid "Subscribe to feed..."
-msgstr "Sottoscrivi il notiziario"
+msgstr "Sottoscrivi il notiziario..."
 
-#: tt-rss.php:195
-#, fuzzy
+#: tt-rss.php:193
 msgid "Edit this feed..."
-msgstr "Modifica notiziario"
+msgstr "Modifica questo notiziario..."
 
-#: tt-rss.php:196
-#, fuzzy
+#: tt-rss.php:194
 msgid "Clear articles"
-msgstr "Filtra articoli"
+msgstr "Pulisci articoli"
 
-#: tt-rss.php:197
-#, fuzzy
+#: tt-rss.php:195
 msgid "Rescore feed"
-msgstr "Cambiamento del punteggio dei notiziari..."
+msgstr "Cambia punteggio notiziario"
 
-#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
+#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
 
-#: tt-rss.php:200
+#: tt-rss.php:198
 msgid "All feeds:"
 msgstr "Tutti i notiziari:"
 
-#: tt-rss.php:202 help/3.php:44
+#: tt-rss.php:200 help/3.php:44
 msgid "(Un)hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
-#: tt-rss.php:204
+#: tt-rss.php:202
 msgid "Other actions:"
 msgstr "Altre azioni:"
 
-#: tt-rss.php:207
-#, fuzzy
+#: tt-rss.php:205
 msgid "Create filter..."
-msgstr "Crea filtro"
+msgstr "Crea filtro..."
 
-#: tt-rss.php:208
-#, fuzzy
+#: tt-rss.php:206
 msgid "Reset UI layout"
-msgstr "&nbsp;&nbsp;Reimposta disposizione UI"
+msgstr "Reimposta disposizione UI"
 
-#: tt-rss.php:209
-#, fuzzy
+#: tt-rss.php:207
 msgid "Reset category order"
-msgstr "Reimpostare l&apos;ordine dalla categoria?"
-
-#: tt-rss.php:210
-msgid "&nbsp;&nbsp;Keyboard shortcuts"
-msgstr "&nbsp;&nbsp;Scorciatoie da tastiera"
+msgstr "Reimposta ordine categoria"
 
-#: tt-rss.php:219
+#: tt-rss.php:218
 msgid "Collapse feedlist"
 msgstr "Contrai elenco notiziari"
 
-#: tt-rss.php:221
+#: tt-rss.php:220
 msgid "Toggle Feedlist"
 msgstr "Inverti elenco notiziari"
 
-#: tt-rss.php:229 mobile/functions.php:738
+#: tt-rss.php:228 mobile/functions.php:738
 msgid "Search:"
 msgstr "Cerca:"
 
-#: tt-rss.php:237 mobile/functions.php:456
+#: tt-rss.php:236 mobile/functions.php:456
 msgid "Adaptive"
 msgstr "Adattivo"
 
-#: tt-rss.php:238 mobile/functions.php:457
+#: tt-rss.php:237 mobile/functions.php:457
 msgid "All Articles"
 msgstr "Tutti gli articoli"
 
-#: tt-rss.php:241
+#: tt-rss.php:240
 msgid "Ignore Scoring"
 msgstr "Ignora punteggio"
 
-#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
+#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
 #: mobile/functions.php:501 mobile/functions.php:504
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: tt-rss.php:245
+#: tt-rss.php:244
 msgid "Order:"
 msgstr "Ordine:"
 
-#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
 #: modules/pref-filters.php:461
 msgid "Date"
 msgstr "Data"
 
-#: tt-rss.php:251
+#: tt-rss.php:250
 msgid "Score"
 msgstr "Punteggio"
 
-#: tt-rss.php:255
+#: tt-rss.php:254
 msgid "Limit:"
 msgstr "Limite:"
 
-#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
 #: mobile/functions.php:436
 msgid "Update"
 msgstr "Aggiorna"
 
-#: tt-rss.php:298
+#: tt-rss.php:297
 msgid "Drag me to resize panels"
 msgstr "Trascina per ridimensionare i riquadri"
 
@@ -1719,49 +1695,42 @@ msgid "Notice"
 msgstr "Notifica"
 
 #: modules/popup-dialog.php:14
-#, fuzzy
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 "process or contact instance owner."
 msgstr ""
-"Il demone per l&apos;aggiornamento è abilitato nella configurazione,\n"
-"\t\t\t\t\tma il processo del demone non è in esecuzione. Questo impedisce "
-"l&apos;aggiornameto di tutti i notiziari.\n"
-"\t\t\t\t\tAvviare il processo del demone o contattare il proprietario "
-"dell&apos;istanza."
+"Il demone per l&apos;aggiornamento è abilitato nella configurazione, ma il "
+"processo del demone non è in esecuzione. Questo impedisce l&apos;"
+"aggiornameto di tutti i notiziari. Avviare il processo del demone o "
+"contattare il proprietario dell&apos;istanza."
 
 #: modules/popup-dialog.php:18 modules/popup-dialog.php:38
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
 #: modules/popup-dialog.php:26
-#, fuzzy
 msgid ""
 "You are running the latest version of Tiny Tiny RSS. The fact that you are "
 "seeing this dialog is probably a bug."
 msgstr ""
-"Si sta eseguendo l&apos;ultima versione di Tiny Tiny RSS. Il\n"
-"\t\t\t\t\t\tmotivo per il quale di vedo questo dialogo è probabilmente un "
-"errore."
+"Si sta eseguendo l&apos;ultima versione di Tiny Tiny RSS. Il motivo per il "
+"quale si vede questo dialogo è probabilmente un errore."
 
 #: modules/popup-dialog.php:34
-#, fuzzy
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
 "contact instance owner."
 msgstr ""
-"TT-RSS ha rilevato che il demone di aggiornamento sta impiegando troppo\n"
-"\t\t\t\t\ttempo a eseguire l&apos;aggiornamento del notiziario. Questo "
-"potrebbe\n"
-"\t\t\t\t\tindicare un problema come un crash o uno stallo. Controllare il "
-"processo\n"
-"\t\t\t\t\tdel demone o contattare il proprietario dell&apos;istanza."
+"Il demone di aggiornamento sta impiegando troppo tempo a eseguire l&apos;"
+"aggiornamento del notiziario. Questo potrebbe indicare un problema come un "
+"crash o uno stallo. Controllare il processo del demone o contattare il "
+"proprietario dell&apos;istanza."
 
 #: modules/popup-dialog.php:48
 msgid "Visit official site"
-msgstr ""
+msgstr "Visita sito ufficiale"
 
 #: modules/popup-dialog.php:61
 msgid "Subscribe to Feed"
@@ -1806,7 +1775,7 @@ msgstr "Annulla"
 
 #: modules/popup-dialog.php:140 modules/popup-dialog.php:152
 #: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
 #: modules/pref-labels.php:130 modules/pref-users.php:363
 #: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
 #: mobile/functions.php:783
@@ -1833,12 +1802,6 @@ msgstr "Questo notiziario"
 msgid "Create Filter"
 msgstr "Crea filtro"
 
-#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
-#: modules/pref-filters.php:39 modules/pref-filters.php:96
-#, fuzzy
-msgid "description"
-msgstr "Selezione"
-
 #: modules/popup-dialog.php:245 modules/pref-filters.php:42
 #: modules/pref-filters.php:402
 msgid "Match"
@@ -1940,12 +1903,11 @@ msgstr "Notiziari sottoscritti:"
 
 #: modules/pref-feeds.php:59
 msgid "Feed browser is administratively disabled."
-msgstr "La lettura del notiziario è bloccata dall&apos;amministratore."
+msgstr "Lo sfoglio del notiziario è disabilitato dall&apos;amministratore."
 
 #: modules/pref-feeds.php:63
-#, fuzzy
 msgid "Feed Browser"
-msgstr "Editor notiziari"
+msgstr "Browser notiziari"
 
 #: modules/pref-feeds.php:81
 msgid "Top"
@@ -1999,141 +1961,140 @@ msgstr "Memorizzare le immagini localmente"
 msgid "Multiple Feed Editor"
 msgstr "Editor di notiziari multipli"
 
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
+#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
 msgid "All done."
 msgstr "Fatto tutto."
 
-#: modules/pref-feeds.php:836
+#: modules/pref-feeds.php:840
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Sottoscrizione avvenuta a <b>%s</b>."
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:842
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Si ha già una sottoscrizione a <b>%s</b>."
 
-#: modules/pref-feeds.php:860
+#: modules/pref-feeds.php:864
 msgid "Edit subscription options"
-msgstr ""
+msgstr "Modifica opzioni di sottoscrizione"
 
-#: modules/pref-feeds.php:946
+#: modules/pref-feeds.php:950
 msgid "Category editor"
 msgstr "Editor categorie"
 
-#: modules/pref-feeds.php:969
+#: modules/pref-feeds.php:973
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La categoria <b>%s</b> esiste già nel database."
 
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1004
 msgid "Unable to delete non empty feed categories."
 msgstr "Impossibile eliminare categorie di notiziario non vuote."
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1021
 msgid "Create category"
 msgstr "Crea categoria"
 
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1081
 msgid "No feed categories defined."
 msgstr "Nessuna categoria notiziari definita."
 
-#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
 #: modules/pref-filters.php:505 modules/pref-labels.php:225
 #: modules/pref-users.php:474
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: modules/pref-feeds.php:1107
+#: modules/pref-feeds.php:1114
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
 
-#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1136 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Sottoscrivi il notiziario"
 
-#: modules/pref-feeds.php:1134
-#, fuzzy
+#: modules/pref-feeds.php:1141
 msgid "More Feeds"
-msgstr "Cambiamento del punteggio dei notiziari..."
+msgstr "Altri notiziari"
 
-#: modules/pref-feeds.php:1208
+#: modules/pref-feeds.php:1215
 msgid "Show last article times"
 msgstr "Mostrare l&apos;ora dell&apos;ultimo articolo"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
+#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
 msgid "Last&nbsp;Article"
 msgstr "Ultimo&nbsp;articolo"
 
-#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
 #: modules/pref-users.php:449
 msgid "Click to edit"
 msgstr "Fare clic per modificare"
 
-#: modules/pref-feeds.php:1320
+#: modules/pref-feeds.php:1327
 msgid "(Hidden)"
-msgstr ""
+msgstr "(Nascosto)"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1340
 #, php-format
 msgid "(linked to %s)"
-msgstr ""
+msgstr "(collegato a %s)"
 
-#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
 msgid "Selection:"
 msgstr "Selezione:"
 
-#: modules/pref-feeds.php:1365
+#: modules/pref-feeds.php:1372
 msgid "Recategorize"
 msgstr "Reimposta categoria"
 
-#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
 #: modules/pref-users.php:472
 msgid "Edit"
 msgstr "Modifica"
 
-#: modules/pref-feeds.php:1378
+#: modules/pref-feeds.php:1384
 msgid "Manual purge"
 msgstr "Eliminazione manuale"
 
-#: modules/pref-feeds.php:1382
+#: modules/pref-feeds.php:1388
 msgid "Clear feed data"
 msgstr "Pulisci i dati del notiziario"
 
-#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
 msgid "Rescore articles"
 msgstr "Cambio punteggio degli articoli"
 
-#: modules/pref-feeds.php:1389
+#: modules/pref-feeds.php:1396
 msgid "Other:"
 msgstr "Altro:"
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1397
 msgid "Edit categories"
 msgstr "Modifica categorie"
 
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1406
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1410
 msgid "File:"
 msgstr "File:"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1413
 msgid "Import"
 msgstr "Importa"
 
-#: modules/pref-feeds.php:1411
+#: modules/pref-feeds.php:1420
 msgid "Export OPML"
 msgstr "Esporta OPML"
 
-#: modules/pref-feeds.php:1414
+#: modules/pref-feeds.php:1423
 msgid "Firefox Integration"
 msgstr "Integrazione con Firefox"
 
-#: modules/pref-feeds.php:1416
+#: modules/pref-feeds.php:1425
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2141,11 +2102,11 @@ msgstr ""
 "Questo sito di Tiny Tiny RSS può essere utilizzato come lettore di notiziari "
 "di Firefox facendo clic sul collegamento qui sotto."
 
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1429
 msgid "Click here to register this site as a feed reader."
 msgstr "Fare clic qui per registrare questo sito come lettore di notiziari."
 
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1438
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2154,15 +2115,15 @@ msgstr ""
 "possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
 "sotto."
 
-#: modules/pref-feeds.php:1433
+#: modules/pref-feeds.php:1442
 msgid "Link to published articles feed."
 msgstr "Collegamento al notiziario degli articoli pubblicati."
 
-#: modules/pref-feeds.php:1436
+#: modules/pref-feeds.php:1445
 msgid "Generate another link"
 msgstr "Genera altro collegamento"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1511
 msgid "No feeds found."
 msgstr "Nessun notiziario trovato."
 
@@ -2184,14 +2145,6 @@ msgstr "Filtro <b>%s</b> creato"
 msgid "Create filter"
 msgstr "Crea filtro"
 
-#: modules/pref-filters.php:392
-msgid "filter_type_descr"
-msgstr ""
-
-#: modules/pref-filters.php:393
-msgid "action_description"
-msgstr ""
-
 #: modules/pref-filters.php:404
 msgid "Field"
 msgstr "Campo"
@@ -2226,14 +2179,12 @@ msgid "Create label"
 msgstr "Crea etichetta"
 
 #: modules/pref-labels.php:203
-#, fuzzy
 msgid "Click to change color"
-msgstr "(Fare clic per cambiare)"
+msgstr "Fare clic per cambiare il colore"
 
 #: modules/pref-labels.php:233
-#, fuzzy
 msgid "Clear colors"
-msgstr "Filtra articoli"
+msgstr "Pulisci colori"
 
 #: modules/pref-labels.php:240
 msgid "No labels defined."
@@ -2245,15 +2196,15 @@ msgstr "Nessuna etichetta corrispondente trovata."
 
 #: modules/pref-labels.php:300
 msgid "custom color:"
-msgstr ""
+msgstr "colore personalizzato:"
 
 #: modules/pref-labels.php:301
 msgid "foreground"
-msgstr ""
+msgstr "primo piano"
 
 #: modules/pref-labels.php:302
 msgid "background"
-msgstr ""
+msgstr "sfondo"
 
 #: modules/pref-prefs.php:65
 msgid "Password has been changed."
@@ -2270,7 +2221,7 @@ msgstr "La configurazione è stata salvata."
 #: modules/pref-prefs.php:132
 #, php-format
 msgid "Unknown option: %s"
-msgstr ""
+msgstr "Opzione sconosciuta: %s"
 
 #: modules/pref-prefs.php:143
 msgid "E-mail has been changed."
@@ -2332,10 +2283,6 @@ msgstr "Seleziona tema"
 msgid "Change theme"
 msgstr "Cambia tema"
 
-#: modules/pref-prefs.php:388
-msgid "short_desc"
-msgstr ""
-
 #: modules/pref-prefs.php:400 modules/pref-prefs.php:405
 msgid "Yes"
 msgstr "Sì"
@@ -2361,9 +2308,8 @@ msgid "User details"
 msgstr "Dettagli utente"
 
 #: modules/pref-users.php:31
-#, fuzzy
 msgid "User not found"
-msgstr "Notiziario non trovato."
+msgstr "Utente non trovato"
 
 #: modules/pref-users.php:50 modules/pref-users.php:410
 msgid "Registered"
@@ -2651,6 +2597,8 @@ msgid ""
 "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
 "configuration and your access level."
 msgstr ""
+"<b>Notare:</b> non tutte le azioni potrebbero essere disponibili, in base "
+"alla configurazione di Tiny Tiny RSS e al proprio livello di accesso."
 
 #: mobile/functions.php:13
 msgid "View feeds"
@@ -2700,6 +2648,102 @@ msgstr "Corrisponde a:"
 msgid "Internal error: Function not implemented"
 msgstr "Errore interno: funzione non implementata"
 
+#: viewfeed.js:2193
+msgid "Please enter a note for this article:"
+msgstr "Inserire una nota per questo articolo:"
+
+#~ msgid "MySQL Charset Updater"
+#~ msgstr "Aggiornatore del set di caratteri di MySQL"
+
+#~ msgid ""
+#~ "This script is for Tiny Tiny RSS installations with MySQL backend only."
+#~ msgstr "Questo script è solo per installazioni di Tiny Tiny RSS su MySQL."
+
+#~ msgid ""
+#~ "This script will convert your Tiny Tiny RSS database to UTF-8. \n"
+#~ "\t\t\tDepending on current database charset you may experience data "
+#~ "corruption (lost accent characters, etc.). \n"
+#~ "\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in "
+#~ "config.php to 'utf8'."
+#~ msgstr ""
+#~ "Questo script convertirà il database di Tiny Tiny RSS a UTF-8. \n"
+#~ "\t\t\tIn base all&apos;insieme di caratteri attuale del database si "
+#~ "potrebbero avere delle corruzioni dei dati (caratteri accentati persi, "
+#~ "ecc.). \n"
+#~ "\t\t\tDopo l&apos;aggiornamento, occorre impostare l&apos;opzione a «utf8» "
+#~ "<b>MYSQL_CHARSET</b> in config.php."
+
+#~ msgid "Converting database..."
+#~ msgstr "Conversione del database..."
+
+#~ msgid "Feed information:"
+#~ msgstr "Informazioni notiziario:"
+
+#~ msgid "Site:"
+#~ msgstr "Sito:"
+
+#~ msgid "Last updated:"
+#~ msgstr "Ultimo aggiornamento:"
+
+#~ msgid "Last headlines:"
+#~ msgstr "Ultimi sommari:"
+
+#~ msgid ""
+#~ "Feed browser cache information is missing. Please refer to the <a "
+#~ "class='visibleLink' target='_blank' href='http://tt-rss.org/trac/wiki/"
+#~ "FeedBrowser'>wiki</a> for more information."
+#~ msgstr ""
+#~ "Mancano le informazioni della cache del browser notiziari. Fare "
+#~ "riferimento al <a class='visibleLink' target='_blank' href='http://tt-rss."
+#~ "org/trac/wiki/FeedBrowser'>wiki</a> per maggiori informazioni."
+
+#~ msgid "Couldn't find any feeds available for subscription."
+#~ msgstr ""
+#~ "Impossibile trovare dei notiziari disponibili per la sottoscrizione."
+
+#~ msgid "Labels and SQL Expressions"
+#~ msgstr "Etichette ed espressioni SQL"
+
+#~ msgid ""
+#~ "Label content is generated using SQL expressions. The &laquo;SQL "
+#~ "expression&raquo; is added to WHERE clause of view feed query. You can "
+#~ "match on ttrss_entries table fields and even use subselect to query "
+#~ "additional information. This \tfunctionality is considered to be advanced "
+#~ "and requires some understanding of SQL."
+#~ msgstr ""
+#~ "Il contenuto dell&apos;etichetta è generato utilizzando l&apos;"
+#~ "espressione SQL. L&apos;&laquo;espressione SQL&raquo; è aggiunta alla "
+#~ "clausola WHERE dell&apos;interrogazione di visualizzazione del "
+#~ "notiziario. Può corrispondere ai campi della tabella ttrss_entries e "
+#~ "anche utilizzare sotto selezioni per interrogare informazioni "
+#~ "addizionali. Questa \tfunzionalità è considerata avanzata e richiede "
+#~ "qualche conoscenza di SQL."
+
+#~ msgid "Examples"
+#~ msgstr "Esempi"
+
+#~ msgid "Match all unread articles:"
+#~ msgstr "Corrispondenza ad articoli non letti:"
+
+#~ msgid "Matches all articles which mention Linux in the title:"
+#~ msgstr ""
+#~ "Corrispondenza a tutti gli articoli che menzionano Linux nel titolo:"
+
+#~ msgid "Matches all articles for the last week (PostgreSQL):"
+#~ msgstr ""
+#~ "Corrispondenza a tutti gli ariticli dell&apos;ultima settimana "
+#~ "(PostgreSQL):"
+
+#~ msgid "Matches all articles with scores between 100 and 500:"
+#~ msgstr "Corrispondenza a tutti gli articoli con punteggio tra 100 e 500:"
+
+#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
+#~ msgstr "&nbsp;&nbsp;Scorciatoie da tastiera"
+
+#, fuzzy
+#~ msgid "description"
+#~ msgstr "Selezione"
+
 #~ msgid "display tags"
 #~ msgstr "visualizza etichette"
 
@@ -2724,9 +2768,6 @@ msgstr "Errore interno: funzione non implementata"
 #~ msgid "Address changed."
 #~ msgstr "Indirizzo cambiato"
 
-#~ msgid "Please enter label title:"
-#~ msgstr "Inserire il titolo dell&apos;etichetta:"
-
 #~ msgid ""
 #~ "Rescore articles in all feeds? This operation may take a lot of time."
 #~ msgstr ""
@@ -2740,30 +2781,6 @@ msgstr "Errore interno: funzione non implementata"
 #~ msgid "Restart in offline mode"
 #~ msgstr "Controllo della configurazione fallito"
 
-#~ msgid "MySQL Charset Updater"
-#~ msgstr "Aggiornatore del set di caratteri di MySQL"
-
-#~ msgid ""
-#~ "This script is for Tiny Tiny RSS installations with MySQL backend only."
-#~ msgstr "Questo script è solo per installazioni di Tiny Tiny RSS su MySQL."
-
-#~ msgid ""
-#~ "This script will convert your Tiny Tiny RSS database to UTF-8. \n"
-#~ "\t\t\tDepending on current database charset you may experience data "
-#~ "corruption (lost accent characters, etc.). \n"
-#~ "\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in "
-#~ "config.php to 'utf8'."
-#~ msgstr ""
-#~ "Questo script convertirà il database di Tiny Tiny RSS a UTF-8. \n"
-#~ "\t\t\tIn base all&apos;insieme di caratteri attuale del database si "
-#~ "potrebbero avere delle corruzioni dei dati (caratteri accentati persi, "
-#~ "ecc.). \n"
-#~ "\t\t\tDopo l&apos;aggiornamento, occorre impostare l&apos;opzione a "
-#~ "«utf8» <b>MYSQL_CHARSET</b> in config.php."
-
-#~ msgid "Converting database..."
-#~ msgstr "Conversione del database..."
-
 #~ msgid ""
 #~ "<b>Fatal Error</b>: You forgot to copy \n"
 #~ "\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
@@ -2862,18 +2879,6 @@ msgstr "Errore interno: funzione non implementata"
 #~ msgid "Published Articles"
 #~ msgstr "Articoli pubblicati"
 
-#~ msgid "Feed information:"
-#~ msgstr "Informazioni notiziario:"
-
-#~ msgid "Site:"
-#~ msgstr "Sito:"
-
-#~ msgid "Last updated:"
-#~ msgstr "Ultimo aggiornamento:"
-
-#~ msgid "Last headlines:"
-#~ msgstr "Ultimi sommari:"
-
 #~ msgid "Other feeds: Top 25"
 #~ msgstr "Altri notiziari: primi 25"
 
@@ -2996,42 +3001,6 @@ msgstr "Errore interno: funzione non implementata"
 #~ msgid "[No caption]"
 #~ msgstr "[Nessuna intestazione]"
 
-#~ msgid "Labels and SQL Expressions"
-#~ msgstr "Etichette ed espressioni SQL"
-
-#~ msgid ""
-#~ "Label content is generated using SQL expressions. The &laquo;SQL "
-#~ "expression&raquo; is added to WHERE clause of view feed query. You can "
-#~ "match on ttrss_entries table fields and even use subselect to query "
-#~ "additional information. This \tfunctionality is considered to be advanced "
-#~ "and requires some understanding of SQL."
-#~ msgstr ""
-#~ "Il contenuto dell&apos;etichetta è generato utilizzando l&apos;"
-#~ "espressione SQL. L&apos;&laquo;espressione SQL&raquo; è aggiunta alla "
-#~ "clausola WHERE dell&apos;interrogazione di visualizzazione del "
-#~ "notiziario. Può corrispondere ai campi della tabella ttrss_entries e "
-#~ "anche utilizzare sotto selezioni per interrogare informazioni "
-#~ "addizionali. Questa \tfunzionalità è considerata avanzata e richiede "
-#~ "qualche conoscenza di SQL."
-
-#~ msgid "Examples"
-#~ msgstr "Esempi"
-
-#~ msgid "Match all unread articles:"
-#~ msgstr "Corrispondenza ad articoli non letti:"
-
-#~ msgid "Matches all articles which mention Linux in the title:"
-#~ msgstr ""
-#~ "Corrispondenza a tutti gli articoli che menzionano Linux nel titolo:"
-
-#~ msgid "Matches all articles for the last week (PostgreSQL):"
-#~ msgstr ""
-#~ "Corrispondenza a tutti gli ariticli dell&apos;ultima settimana "
-#~ "(PostgreSQL):"
-
-#~ msgid "Matches all articles with scores between 100 and 500:"
-#~ msgstr "Corrispondenza a tutti gli articoli con punteggio tra 100 e 500:"
-
 #~ msgid "Search to label"
 #~ msgstr "Cerca per etichetta"
 
@@ -3047,20 +3016,6 @@ msgstr "Errore interno: funzione non implementata"
 #~ msgid "Test"
 #~ msgstr "Prova"
 
-#~ msgid ""
-#~ "This program requires XmlHttpRequest to function properly. Your browser "
-#~ "doesn't seem to support it."
-#~ msgstr ""
-#~ "Questo programma richiede XmlHttpRequest per funzionare correttamente. Il "
-#~ "browser sembra non supportarla."
-
-#~ msgid ""
-#~ "This program requires cookies to function properly. Your browser doesn't "
-#~ "seem to support them."
-#~ msgstr ""
-#~ "Questo programma richiede i cookie per funzionare correttamente. Il "
-#~ "browser sembra non supportarli."
-
 #~ msgid "Filter expression"
 #~ msgstr "Espressione del filtro"
 
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index c033df851..b0784afa7 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.mo
+++ b/locale/ja_JP/LC_MESSAGES/messages.mo
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index 111447dfc..9580fc923 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-20 15:55+0300\n"
+"POT-Creation-Date: 2009-03-27 20:20+0300\n"
 "PO-Revision-Date: 2008-09-25 12:43+0900\n"
 "Last-Translator: Tadashi Jokagi <[email protected]>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -79,7 +79,7 @@ msgstr "毎日"
 msgid "Weekly"
 msgstr "毎週"
 
-#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:247 modules/pref-prefs.php:315
 msgid "Default"
 msgstr "標準"
 
@@ -108,12 +108,16 @@ msgid "Unknown error"
 msgstr "未知のエラー"
 
 #: errors.php:5
-msgid "This program requires XmlHttpRequest "
-msgstr "このプログラムは、XmlHttpRequest を要求します"
+msgid ""
+"This program requires XmlHttpRequest to function properly. Your browser "
+"doesn't seem to support it."
+msgstr ""
 
 #: errors.php:8
-msgid "This program requires cookies "
-msgstr "このプログラムはクッキーを要求します"
+msgid ""
+"This program requires cookies to function properly. Your browser doesn't "
+"seem to support them."
+msgstr ""
 
 #: errors.php:11
 msgid "Backend sanity check failed"
@@ -166,229 +170,243 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2841 modules/popup-dialog.php:175
+#: functions.php:2846 modules/popup-dialog.php:175
 #: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
-#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
+#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
+#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
-#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
+#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
 #: mobile/functions.php:33
 msgid "Special"
 msgstr "特別"
 
-#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
-#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
+#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
+#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
 msgid "Labels"
 msgstr "ラベル"
 
-#: functions.php:2919 functions.php:3342 functions.php:4127
+#: functions.php:2924 functions.php:3347 functions.php:4144
 #: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
 #: offline.js:1425
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: functions.php:2921 functions.php:3346 functions.php:4134
-#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
+#: functions.php:2926 functions.php:3351 functions.php:4151
+#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
 msgid "Published articles"
 msgstr "公開済みの記事"
 
-#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
+#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
 #: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: functions.php:2925 functions.php:3355 functions.php:4105
+#: functions.php:2930 functions.php:3360 functions.php:4122
 #: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
 #: offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "すべての記事"
 
-#: functions.php:3306 functions.php:3308
+#: functions.php:3311 functions.php:3313
 msgid "Search results"
 msgstr "検索結果"
 
-#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
-#: functions.php:3353 functions.php:3356 functions.php:3364
+#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
+#: functions.php:3358 functions.php:3361 functions.php:3369
 #, fuzzy
 msgid "Searched for"
 msgstr "検索"
 
-#: functions.php:3984
+#: functions.php:4001
 msgid "Generated feed"
 msgstr "生成したフィード"
 
-#: functions.php:3989 functions.php:5253 localized_js.php:148
-#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
+#: functions.php:4006 functions.php:5292 localized_js.php:148
+#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
 #: modules/pref-filters.php:366 modules/pref-labels.php:163
 #: modules/pref-users.php:401 offline.js:409
 msgid "Select:"
 msgstr "選択:"
 
-#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
-#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
+#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
+#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
 #: modules/pref-labels.php:164 modules/pref-users.php:402
 #: mobile/functions.php:570
 msgid "All"
 msgstr "すべて"
 
-#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
+#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
 #: mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "未読"
 
-#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
+#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
 msgid "Invert"
 msgstr "反転"
 
-#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
-#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
+#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
+#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
 #: modules/pref-labels.php:165 modules/pref-users.php:403
 #: mobile/functions.php:572
 msgid "None"
 msgstr "なし"
 
-#: functions.php:4001 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1371 offline.js:185
+#: functions.php:4018 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1378 offline.js:185
 msgid "Actions..."
 msgstr "操作..."
 
-#: functions.php:4006 localized_js.php:150
+#: functions.php:4023 localized_js.php:150
 msgid "Selection toggle:"
 msgstr "選択の切り替え:"
 
-#: functions.php:4008 localized_js.php:152 tt-rss.php:239
+#: functions.php:4025 localized_js.php:152 tt-rss.php:238
 #: mobile/functions.php:459
 msgid "Starred"
 msgstr "お気に入り"
 
-#: functions.php:4009
+#: functions.php:4026
 msgid "Published"
 msgstr "公開済み"
 
-#: functions.php:4011 localized_js.php:85
+#: functions.php:4028 localized_js.php:85
 msgid "Mark as read:"
 msgstr "既読にする:"
 
-#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
 msgid "Selection"
 msgstr "選択"
 
-#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "フィードの入力"
 
-#: functions.php:4018
+#: functions.php:4035
 #, fuzzy
 msgid "Assign label:"
 msgstr "タグの割り当て"
 
-#: functions.php:4059 localized_js.php:56
+#: functions.php:4076 localized_js.php:56
 msgid "Click to collapse category"
 msgstr "閉じたカテゴリーのクリック"
 
-#: functions.php:4325
+#: functions.php:4342
 msgid "No feeds to display."
 msgstr "表示するフィードがありません。"
 
-#: functions.php:4342 mobile/functions.php:12
+#: functions.php:4359 mobile/functions.php:12
 msgid "Tags"
 msgstr "タグ"
 
-#: functions.php:4578
+#: functions.php:4596
 msgid " - "
 msgstr " - "
 
-#: functions.php:4602 functions.php:5272
+#: functions.php:4620 functions.php:5320
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: functions.php:4610
+#: functions.php:4628
 #, fuzzy
 msgid "Display original article content"
 msgstr "記事の内容をスクロールする"
 
-#: functions.php:4617 functions.php:5263
+#: functions.php:4635 functions.php:5302
 msgid "Show article summary in new window"
 msgstr "記事の要約を新しいウィンドウで表示する"
 
-#: functions.php:4650 functions.php:5187
+#: functions.php:4642 functions.php:5309
+#, fuzzy
+msgid "Publish article with a note"
+msgstr "公開記事"
+
+#: functions.php:4682 functions.php:5226
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: functions.php:4656 functions.php:5193
+#: functions.php:4688 functions.php:5232
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4692 functions.php:5227
+#: functions.php:4724 functions.php:5266
 msgid "Attachment:"
 msgstr "添付: "
 
-#: functions.php:4694 functions.php:5229
+#: functions.php:4726 functions.php:5268
 msgid "Attachments:"
 msgstr "添付:"
 
-#: functions.php:4714 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
+#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: functions.php:4770
+#: functions.php:4802
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: functions.php:4839 mobile/functions.php:423
+#: functions.php:4871 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:5161
+#: functions.php:5193
 msgid "Click to expand article"
 msgstr "開いた記事のクリック"
 
-#: functions.php:5298
+#: functions.php:5327
+#, fuzzy
+msgid "toggle unread"
+msgstr "未読に切り替える"
+
+#: functions.php:5346
 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: functions.php:5301
+#: functions.php:5349
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: functions.php:5304
+#: functions.php:5352
 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
-#: functions.php:5308
+#: functions.php:5356
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5310 localized_js.php:92 offline.js:444
+#: functions.php:5358 localized_js.php:92 offline.js:444
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
-#: functions.php:5984 tt-rss.php:206
+#: functions.php:6049 tt-rss.php:204
 #, fuzzy
 msgid "Create label..."
 msgstr "ラベルを作成する"
 
-#: functions.php:5997
+#: functions.php:6062
 #, fuzzy
 msgid "(remove)"
 msgstr "削除"
 
-#: functions.php:6041
+#: functions.php:6106
 msgid "no tags"
 msgstr "タグがありません"
 
+#: functions.php:6134
+msgid "edit note"
+msgstr ""
+
 #: localized_js.php:36
 msgid "Adding feed..."
 msgstr "フィードの追加中..."
@@ -577,17 +595,17 @@ msgstr "すべての記事を既読にしますか?"
 msgid "Mark all articles in %s as read?"
 msgstr "すべての記事を既読に設定しますか?"
 
-#: localized_js.php:84 viewfeed.js:1212
+#: localized_js.php:84 viewfeed.js:1250
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "%s のすべての可視記事を既読に設定しますか?"
 
-#: localized_js.php:86 viewfeed.js:1885
+#: localized_js.php:86 viewfeed.js:1923
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "%d 件のマークした記事を既読として設定しますか?"
 
-#: localized_js.php:87 viewfeed.js:1251
+#: localized_js.php:87 viewfeed.js:1289
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "選択した %d 件の記事を既読にしますか?"
@@ -600,16 +618,16 @@ msgstr "すべてのフィードを既読に設定しています..."
 msgid "New password cannot be blank."
 msgstr "新しいパスワードを空にできません。"
 
-#: localized_js.php:90 viewfeed.js:1842
+#: localized_js.php:90 viewfeed.js:1880
 msgid "No article is selected."
 msgstr "選択された記事はありません。"
 
-#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
-#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
+#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
+#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
 msgid "No articles are selected."
 msgstr "記事は選択されていません。"
 
-#: localized_js.php:93 viewfeed.js:1883
+#: localized_js.php:93 viewfeed.js:1921
 msgid "No articles found to mark"
 msgstr "マークした記事が見つかりません"
 
@@ -622,7 +640,7 @@ msgstr "選択されたカテゴリーはありません。"
 msgid "No feeds are selected."
 msgstr "選択されたフィードはありません。"
 
-#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
+#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
 msgid "No feed selected."
 msgstr "フィードは選択されていません。"
 
@@ -687,7 +705,7 @@ msgstr "ひとつだけユーザーを選択してください。"
 msgid "Please select some feed first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
+#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
 msgid "Please wait..."
 msgstr "しばらくお待ちください..."
 
@@ -695,8 +713,8 @@ msgstr "しばらくお待ちください..."
 msgid "Please wait until operation finishes."
 msgstr ""
 
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
-#: viewfeed.js:631
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
+#: viewfeed.js:669
 msgid "Publish article"
 msgstr "公開記事"
 
@@ -844,7 +862,7 @@ msgstr "フィルターの保存中..."
 msgid "Saving user..."
 msgstr "ユーザーの保存中..."
 
-#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
+#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
 msgid "Star article"
 msgstr "記事をお気に入りにする"
 
@@ -923,11 +941,11 @@ msgstr "電子メールの変更を試行中..."
 msgid "Trying to change password..."
 msgstr "パスワードの変更を試行中..."
 
-#: localized_js.php:170 viewfeed.js:618
+#: localized_js.php:170 viewfeed.js:657
 msgid "Unpublish article"
 msgstr "非公開記事"
 
-#: localized_js.php:172 viewfeed.js:553
+#: localized_js.php:172 viewfeed.js:586
 msgid "Unstar article"
 msgstr "記事のお気に入りを解除する"
 
@@ -970,8 +988,8 @@ msgid ""
 "switch it into offline mode again. Go online?"
 msgstr ""
 
-#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
+#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
 #: mobile/functions.php:775
 msgid "Title"
 msgstr "題名"
@@ -997,7 +1015,7 @@ msgstr ""
 msgid "Filter article"
 msgstr "記事フィルター"
 
-#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "既読にする"
 
@@ -1319,12 +1337,12 @@ msgstr "設定を終了する"
 msgid "Logout"
 msgstr "ログアウト"
 
-#: prefs.php:117
+#: prefs.php:117 tt-rss.php:208
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
 msgid "Preferences"
 msgstr "設定"
 
@@ -1349,7 +1367,7 @@ msgstr "フィードブラウザーは管理者によって無効になってい
 
 #: register.php:155 register.php:200 register.php:213 register.php:228
 #: register.php:246 register.php:331 register.php:341 register.php:353
-#: update.php:94 update.php:162 modules/pref-feeds.php:865
+#: update.php:94 update.php:162 modules/pref-feeds.php:869
 msgid "Return to Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
@@ -1448,117 +1466,113 @@ msgstr "フィードのスコアの再計算中..."
 msgid "Search..."
 msgstr "検索"
 
-#: tt-rss.php:193
+#: tt-rss.php:191
 msgid "Feed actions:"
 msgstr "フィード操作"
 
-#: tt-rss.php:194
+#: tt-rss.php:192
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "フィードを購読する"
 
-#: tt-rss.php:195
+#: tt-rss.php:193
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "フィードを編集する"
 
-#: tt-rss.php:196
+#: tt-rss.php:194
 #, fuzzy
 msgid "Clear articles"
 msgstr "記事フィルター"
 
-#: tt-rss.php:197
+#: tt-rss.php:195
 #, fuzzy
 msgid "Rescore feed"
 msgstr "フィードのスコアの再計算中..."
 
-#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
+#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
-#: tt-rss.php:200
+#: tt-rss.php:198
 msgid "All feeds:"
 msgstr "すべてのフィード:"
 
-#: tt-rss.php:202 help/3.php:44
+#: tt-rss.php:200 help/3.php:44
 msgid "(Un)hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: tt-rss.php:204
+#: tt-rss.php:202
 msgid "Other actions:"
 msgstr "その他の操作:"
 
-#: tt-rss.php:207
+#: tt-rss.php:205
 #, fuzzy
 msgid "Create filter..."
 msgstr "フィルターを作成する"
 
-#: tt-rss.php:208
+#: tt-rss.php:206
 #, fuzzy
 msgid "Reset UI layout"
 msgstr "&nbsp;&nbsp;UI レイアウトのリセット"
 
-#: tt-rss.php:209
+#: tt-rss.php:207
 #, fuzzy
 msgid "Reset category order"
 msgstr "選択されたカテゴリーの順序をリセットしますか?"
 
-#: tt-rss.php:210
-msgid "&nbsp;&nbsp;Keyboard shortcuts"
-msgstr "&nbsp;&nbsp;キーボードショートカット"
-
-#: tt-rss.php:219
+#: tt-rss.php:218
 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 
-#: tt-rss.php:221
+#: tt-rss.php:220
 msgid "Toggle Feedlist"
 msgstr "フィード一覧を切り替える"
 
-#: tt-rss.php:229 mobile/functions.php:738
+#: tt-rss.php:228 mobile/functions.php:738
 msgid "Search:"
 msgstr "検索:"
 
-#: tt-rss.php:237 mobile/functions.php:456
+#: tt-rss.php:236 mobile/functions.php:456
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:238 mobile/functions.php:457
+#: tt-rss.php:237 mobile/functions.php:457
 msgid "All Articles"
 msgstr "すべての記事"
 
-#: tt-rss.php:241
+#: tt-rss.php:240
 msgid "Ignore Scoring"
 msgstr "スコア計算の無効化"
 
-#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
+#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
 #: mobile/functions.php:501 mobile/functions.php:504
 msgid "Updated"
 msgstr "更新日時"
 
-#: tt-rss.php:245
+#: tt-rss.php:244
 msgid "Order:"
 msgstr "並べ替え:"
 
-#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
 #: modules/pref-filters.php:461
 msgid "Date"
 msgstr "日付"
 
-#: tt-rss.php:251
+#: tt-rss.php:250
 msgid "Score"
 msgstr "スコア"
 
-#: tt-rss.php:255
+#: tt-rss.php:254
 msgid "Limit:"
 msgstr "制限:"
 
-#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
 #: mobile/functions.php:436
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:298
+#: tt-rss.php:297
 msgid "Drag me to resize panels"
 msgstr "パネルの大きさを変更するにはここをドラッグします"
 
@@ -1747,7 +1761,7 @@ msgstr "取り消し"
 
 #: modules/popup-dialog.php:140 modules/popup-dialog.php:152
 #: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
 #: modules/pref-labels.php:130 modules/pref-users.php:363
 #: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
 #: mobile/functions.php:783
@@ -1774,11 +1788,6 @@ msgstr "このフィード"
 msgid "Create Filter"
 msgstr "フィルターを作成する"
 
-#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
-#: modules/pref-filters.php:39 modules/pref-filters.php:96
-msgid "description"
-msgstr "説明"
-
 #: modules/popup-dialog.php:245 modules/pref-filters.php:42
 #: modules/pref-filters.php:402
 msgid "Match"
@@ -1942,140 +1951,140 @@ msgstr "ローカルに画像をキャッシュする"
 msgid "Multiple Feed Editor"
 msgstr "複数フィードエディター"
 
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
+#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
 msgid "All done."
 msgstr "すべて終了しました。"
 
-#: modules/pref-feeds.php:836
+#: modules/pref-feeds.php:840
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> を購読しました。"
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:842
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:860
+#: modules/pref-feeds.php:864
 msgid "Edit subscription options"
 msgstr ""
 
-#: modules/pref-feeds.php:946
+#: modules/pref-feeds.php:950
 msgid "Category editor"
 msgstr "カテゴリーエディター"
 
-#: modules/pref-feeds.php:969
+#: modules/pref-feeds.php:973
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "カテゴリー <b>%s</b> はデータベースに既に存在します。"
 
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1004
 msgid "Unable to delete non empty feed categories."
 msgstr "殻でないフィードカテゴリーは削除できません。"
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1021
 msgid "Create category"
 msgstr "カテゴリーの作成"
 
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1081
 msgid "No feed categories defined."
 msgstr "フィードカテゴリーが定義されていません。"
 
-#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
 #: modules/pref-filters.php:505 modules/pref-labels.php:225
 #: modules/pref-users.php:474
 msgid "Remove"
 msgstr "削除"
 
-#: modules/pref-feeds.php:1107
+#: modules/pref-feeds.php:1114
 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
-#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1136 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1141
 #, fuzzy
 msgid "More Feeds"
 msgstr "フィードのスコアの再計算中..."
 
-#: modules/pref-feeds.php:1208
+#: modules/pref-feeds.php:1215
 msgid "Show last article times"
 msgstr "最後の記事の時間を表示する"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
+#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
 msgid "Last&nbsp;Article"
 msgstr "最後の記事"
 
-#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
 #: modules/pref-users.php:449
 msgid "Click to edit"
 msgstr "編集するにはクリック"
 
-#: modules/pref-feeds.php:1320
+#: modules/pref-feeds.php:1327
 msgid "(Hidden)"
 msgstr ""
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1340
 #, php-format
 msgid "(linked to %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
 msgid "Selection:"
 msgstr "選択:"
 
-#: modules/pref-feeds.php:1365
+#: modules/pref-feeds.php:1372
 msgid "Recategorize"
 msgstr "カテゴリー再設定"
 
-#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
 #: modules/pref-users.php:472
 msgid "Edit"
 msgstr "編集"
 
-#: modules/pref-feeds.php:1378
+#: modules/pref-feeds.php:1384
 msgid "Manual purge"
 msgstr "手動削除"
 
-#: modules/pref-feeds.php:1382
+#: modules/pref-feeds.php:1388
 msgid "Clear feed data"
 msgstr "フィードデータの消去"
 
-#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
 msgid "Rescore articles"
 msgstr "記事のスコアの再集計"
 
-#: modules/pref-feeds.php:1389
+#: modules/pref-feeds.php:1396
 msgid "Other:"
 msgstr "その他:"
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1397
 msgid "Edit categories"
 msgstr "カテゴリーの編集"
 
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1406
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1410
 msgid "File:"
 msgstr "ファイル:"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1413
 msgid "Import"
 msgstr "インポート"
 
-#: modules/pref-feeds.php:1411
+#: modules/pref-feeds.php:1420
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: modules/pref-feeds.php:1414
+#: modules/pref-feeds.php:1423
 msgid "Firefox Integration"
 msgstr "Firefox 統合"
 
-#: modules/pref-feeds.php:1416
+#: modules/pref-feeds.php:1425
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2083,26 +2092,26 @@ msgstr ""
 "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
 "Tiny RSS のサイトを使うことができます。"
 
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1429
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1438
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1433
+#: modules/pref-feeds.php:1442
 #, fuzzy
 msgid "Link to published articles feed."
 msgstr "公開済みの記事"
 
-#: modules/pref-feeds.php:1436
+#: modules/pref-feeds.php:1445
 msgid "Generate another link"
 msgstr "別のリンクを生成する"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1511
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
@@ -2124,14 +2133,6 @@ msgstr "フィルター <b>%s</b> を作成しました"
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
-#: modules/pref-filters.php:392
-msgid "filter_type_descr"
-msgstr "filter_type_descr"
-
-#: modules/pref-filters.php:393
-msgid "action_description"
-msgstr "action_description"
-
 #: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
@@ -2273,10 +2274,6 @@ msgstr "テーマを選択する"
 msgid "Change theme"
 msgstr "テーマを変更する"
 
-#: modules/pref-prefs.php:388
-msgid "short_desc"
-msgstr ""
-
 #: modules/pref-prefs.php:400 modules/pref-prefs.php:405
 msgid "Yes"
 msgstr "はい"
@@ -2634,6 +2631,29 @@ msgstr "対象項目:"
 msgid "Internal error: Function not implemented"
 msgstr "インターナルエラー: 機能が実装されていません"
 
+#: viewfeed.js:2193
+#, fuzzy
+msgid "Please enter a note for this article:"
+msgstr "ラベルの題名を入力してください:"
+
+#~ msgid "This program requires XmlHttpRequest "
+#~ msgstr "このプログラムは、XmlHttpRequest を要求します"
+
+#~ msgid "This program requires cookies "
+#~ msgstr "このプログラムはクッキーを要求します"
+
+#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
+#~ msgstr "&nbsp;&nbsp;キーボードショートカット"
+
+#~ msgid "description"
+#~ msgstr "説明"
+
+#~ msgid "filter_type_descr"
+#~ msgstr "filter_type_descr"
+
+#~ msgid "action_description"
+#~ msgstr "action_description"
+
 #~ msgid "display tags"
 #~ msgstr "タグの表示"
 
@@ -2658,9 +2678,6 @@ msgstr "インターナルエラー: 機能が実装されていません"
 #~ msgid "Address changed."
 #~ msgstr "アドレスを変更しました。"
 
-#~ msgid "Please enter label title:"
-#~ msgstr "ラベルの題名を入力してください:"
-
 #~ msgid ""
 #~ "Rescore articles in all feeds? This operation may take a lot of time."
 #~ msgstr ""
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 88cb33f28..8670e06fc 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.mo
+++ b/locale/nb_NO/LC_MESSAGES/messages.mo
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index 6192f638e..95c22fe8d 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-20 15:55+0300\n"
+"POT-Creation-Date: 2009-03-27 20:20+0300\n"
 "PO-Revision-Date: 2009-02-20 13:47+0100\n"
 "Last-Translator: Christian Lomsdalen <[email protected]>\n"
 "Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -79,7 +79,7 @@ msgstr "Daglig"
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:247 modules/pref-prefs.php:315
 msgid "Default"
 msgstr "Standard"
 
@@ -108,12 +108,20 @@ msgid "Unknown error"
 msgstr "Ukjent feil"
 
 #: errors.php:5
-msgid "This program requires XmlHttpRequest "
-msgstr "Dette programmet krever XmlHttpRequest "
+msgid ""
+"This program requires XmlHttpRequest to function properly. Your browser "
+"doesn't seem to support it."
+msgstr ""
+"Dette programmet krever XmlHttpRequest for å fungere slik det skal. Din "
+"nettleser ser ikke ut til å støtte dette."
 
 #: errors.php:8
-msgid "This program requires cookies "
-msgstr "Dette programmet krever informasjonskapsler påslått"
+msgid ""
+"This program requires cookies to function properly. Your browser doesn't "
+"seem to support them."
+msgstr ""
+"Dette programmet krever cookies for å fungere ordentlig. Din nettleser ser "
+"ikke ut til å støtte dette."
 
 #: errors.php:11
 msgid "Backend sanity check failed"
@@ -169,179 +177,184 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
 
-#: functions.php:2841 modules/popup-dialog.php:175
+#: functions.php:2846 modules/popup-dialog.php:175
 #: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
-#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
+#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
+#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
-#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
+#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
 #: mobile/functions.php:33
 msgid "Special"
 msgstr "Snarveier"
 
-#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
-#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
+#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
+#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
 msgid "Labels"
 msgstr "Merkelapper"
 
-#: functions.php:2919 functions.php:3342 functions.php:4127
+#: functions.php:2924 functions.php:3347 functions.php:4144
 #: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
 #: offline.js:1425
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
-#: functions.php:2921 functions.php:3346 functions.php:4134
-#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
+#: functions.php:2926 functions.php:3351 functions.php:4151
+#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
-#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
+#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
 #: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
-#: functions.php:2925 functions.php:3355 functions.php:4105
+#: functions.php:2930 functions.php:3360 functions.php:4122
 #: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
 #: offline.js:1427
 msgid "All articles"
 msgstr "Alle artikler"
 
-#: functions.php:3306 functions.php:3308
+#: functions.php:3311 functions.php:3313
 msgid "Search results"
 msgstr "Søkeresultat"
 
-#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
-#: functions.php:3353 functions.php:3356 functions.php:3364
+#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
+#: functions.php:3358 functions.php:3361 functions.php:3369
 msgid "Searched for"
 msgstr "Søkte etter"
 
-#: functions.php:3984
+#: functions.php:4001
 msgid "Generated feed"
 msgstr "Generert nyhetsstrøm"
 
-#: functions.php:3989 functions.php:5253 localized_js.php:148
-#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
+#: functions.php:4006 functions.php:5292 localized_js.php:148
+#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
 #: modules/pref-filters.php:366 modules/pref-labels.php:163
 #: modules/pref-users.php:401 offline.js:409
 msgid "Select:"
 msgstr "Velg:"
 
-#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
-#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
+#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
+#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
 #: modules/pref-labels.php:164 modules/pref-users.php:402
 #: mobile/functions.php:570
 msgid "All"
 msgstr "Alle"
 
-#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
+#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
 #: mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "Ulest"
 
-#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
+#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
 msgid "Invert"
 msgstr "Motsatt"
 
-#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
-#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
+#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
+#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
 #: modules/pref-labels.php:165 modules/pref-users.php:403
 #: mobile/functions.php:572
 msgid "None"
 msgstr "Ingen"
 
-#: functions.php:4001 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1371 offline.js:185
+#: functions.php:4018 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1378 offline.js:185
 msgid "Actions..."
 msgstr "Handlinger..."
 
-#: functions.php:4006 localized_js.php:150
+#: functions.php:4023 localized_js.php:150
 msgid "Selection toggle:"
 msgstr "Marker utvalg:"
 
-#: functions.php:4008 localized_js.php:152 tt-rss.php:239
+#: functions.php:4025 localized_js.php:152 tt-rss.php:238
 #: mobile/functions.php:459
 msgid "Starred"
 msgstr "Favoritter"
 
-#: functions.php:4009
+#: functions.php:4026
 msgid "Published"
 msgstr "Publisert"
 
-#: functions.php:4011 localized_js.php:85
+#: functions.php:4028 localized_js.php:85
 msgid "Mark as read:"
 msgstr "Marker som lest:"
 
-#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
 msgid "Selection"
 msgstr "Utvalg"
 
-#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "Hele nyhetsstrømmen"
 
-#: functions.php:4018
+#: functions.php:4035
 msgid "Assign label:"
 msgstr "Tildel stikkord:"
 
-#: functions.php:4059 localized_js.php:56
+#: functions.php:4076 localized_js.php:56
 msgid "Click to collapse category"
 msgstr "Velg for å slå sammen kategorien"
 
-#: functions.php:4325
+#: functions.php:4342
 msgid "No feeds to display."
 msgstr "Ingen nyhetstrømmer å vise"
 
-#: functions.php:4342 mobile/functions.php:12
+#: functions.php:4359 mobile/functions.php:12
 msgid "Tags"
 msgstr "Stikkord"
 
-#: functions.php:4578
+#: functions.php:4596
 msgid " - "
 msgstr "-"
 
-#: functions.php:4602 functions.php:5272
+#: functions.php:4620 functions.php:5320
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: functions.php:4610
+#: functions.php:4628
 msgid "Display original article content"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: functions.php:4617 functions.php:5263
+#: functions.php:4635 functions.php:5302
 msgid "Show article summary in new window"
 msgstr "Åpne artikkelsammendraget i nytt nettleservindu"
 
-#: functions.php:4650 functions.php:5187
+#: functions.php:4642 functions.php:5309
+#, fuzzy
+msgid "Publish article with a note"
+msgstr "Publiser artiklen"
+
+#: functions.php:4682 functions.php:5226
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: functions.php:4656 functions.php:5193
+#: functions.php:4688 functions.php:5232
 msgid "audio/mpeg"
 msgstr "Lyd/mpeg"
 
-#: functions.php:4692 functions.php:5227
+#: functions.php:4724 functions.php:5266
 msgid "Attachment:"
 msgstr "Vedlegg:"
 
-#: functions.php:4694 functions.php:5229
+#: functions.php:4726 functions.php:5268
 msgid "Attachments:"
 msgstr "Vedlegg:"
 
-#: functions.php:4714 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
+#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: functions.php:4770
+#: functions.php:4802
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: functions.php:4839 mobile/functions.php:423
+#: functions.php:4871 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -349,23 +362,28 @@ msgstr ""
 "Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
 "merkelappsyntaksen eller lokal konfigurasjon."
 
-#: functions.php:5161
+#: functions.php:5193
 msgid "Click to expand article"
 msgstr "Trykk for å utvide artikkel"
 
-#: functions.php:5298
+#: functions.php:5327
+#, fuzzy
+msgid "toggle unread"
+msgstr "Sett som ulest"
+
+#: functions.php:5346
 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 
-#: functions.php:5301
+#: functions.php:5349
 msgid "No updated articles found to display."
 msgstr "Ingen oppdaterte artikler funnet som kunne vises"
 
-#: functions.php:5304
+#: functions.php:5352
 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 
-#: functions.php:5308
+#: functions.php:5356
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -373,22 +391,26 @@ msgstr ""
 "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-"
 "menyen ovenfor) eller bruke et filter."
 
-#: functions.php:5310 localized_js.php:92 offline.js:444
+#: functions.php:5358 localized_js.php:92 offline.js:444
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: functions.php:5984 tt-rss.php:206
+#: functions.php:6049 tt-rss.php:204
 msgid "Create label..."
 msgstr "Lag merkelapp..."
 
-#: functions.php:5997
+#: functions.php:6062
 msgid "(remove)"
 msgstr "(fjern)"
 
-#: functions.php:6041
+#: functions.php:6106
 msgid "no tags"
 msgstr "Ingen stikkord"
 
+#: functions.php:6134
+msgid "edit note"
+msgstr ""
+
 #: localized_js.php:36
 msgid "Adding feed..."
 msgstr "Legger til nyhetsstrøm..."
@@ -564,17 +586,17 @@ msgstr "Marker alle artikler som leste?"
 msgid "Mark all articles in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: localized_js.php:84 viewfeed.js:1212
+#: localized_js.php:84 viewfeed.js:1250
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marker alle synlige artikler i %s som leste?"
 
-#: localized_js.php:86 viewfeed.js:1885
+#: localized_js.php:86 viewfeed.js:1923
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "Marker %d artikkel/artikler som leste?"
 
-#: localized_js.php:87 viewfeed.js:1251
+#: localized_js.php:87 viewfeed.js:1289
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marker %d valgte artikler i %s som leste?"
@@ -587,16 +609,16 @@ msgstr "Marker alle nyhetsstrømmer som lest"
 msgid "New password cannot be blank."
 msgstr "Nytt passord kan ikke vært blankt."
 
-#: localized_js.php:90 viewfeed.js:1842
+#: localized_js.php:90 viewfeed.js:1880
 msgid "No article is selected."
 msgstr "Ingen artikkel er valgt."
 
-#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
-#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
+#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
+#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
 
-#: localized_js.php:93 viewfeed.js:1883
+#: localized_js.php:93 viewfeed.js:1921
 msgid "No articles found to mark"
 msgstr "Ingen artikler funnet som kan markeres"
 
@@ -609,7 +631,7 @@ msgstr "Ingen kategorier er valgt."
 msgid "No feeds are selected."
 msgstr "Ingen nyhetsstrømmer er valgt"
 
-#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
+#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
@@ -670,7 +692,7 @@ msgstr "Vennligst velg kun en bruker"
 msgid "Please select some feed first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
+#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
 msgid "Please wait..."
 msgstr "Vennligst vent..."
 
@@ -678,8 +700,8 @@ msgstr "Vennligst vent..."
 msgid "Please wait until operation finishes."
 msgstr "Vennligst venn til operasjonen avsluttes."
 
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
-#: viewfeed.js:631
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
+#: viewfeed.js:669
 msgid "Publish article"
 msgstr "Publiser artiklen"
 
@@ -818,7 +840,7 @@ msgstr "Lagrer filter..."
 msgid "Saving user..."
 msgstr "Lagrer bruker..."
 
-#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
+#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
 msgid "Star article"
 msgstr "Marker artikkel som favoritt"
 
@@ -894,11 +916,11 @@ msgstr "Prøver å endre e-posten..."
 msgid "Trying to change password..."
 msgstr "Prøver å endre passordet..."
 
-#: localized_js.php:170 viewfeed.js:618
+#: localized_js.php:170 viewfeed.js:657
 msgid "Unpublish article"
 msgstr "Fjern publiseringen av artikkelen."
 
-#: localized_js.php:172 viewfeed.js:553
+#: localized_js.php:172 viewfeed.js:586
 msgid "Unstar article"
 msgstr "Fjern favorittmerkingen fra artiklen"
 
@@ -945,8 +967,8 @@ msgstr ""
 "Du kan ikke benytte tilgang til lesning uten internett-tilgang før du bytter "
 "til denne modusen neste gang. Les med internett-tilgang?"
 
-#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
+#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
 #: mobile/functions.php:775
 msgid "Title"
 msgstr "Tittel"
@@ -972,7 +994,7 @@ msgstr "Artikkeldato"
 msgid "Filter article"
 msgstr "Filtrer artikkel"
 
-#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "Marker som lest"
 
@@ -1323,11 +1345,11 @@ msgstr "Forlat innstillinger"
 msgid "Logout"
 msgstr "Logg ut"
 
-#: prefs.php:117
+#: prefs.php:117 tt-rss.php:208
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"
 
-#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -1349,7 +1371,7 @@ msgstr "Registrering av nye brukere er administrativt avskrudd"
 
 #: register.php:155 register.php:200 register.php:213 register.php:228
 #: register.php:246 register.php:331 register.php:341 register.php:353
-#: update.php:94 update.php:162 modules/pref-feeds.php:865
+#: update.php:94 update.php:162 modules/pref-feeds.php:869
 msgid "Return to Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
@@ -1443,110 +1465,106 @@ msgstr "Flere nyhetsstrømmer..."
 msgid "Search..."
 msgstr "Søk..."
 
-#: tt-rss.php:193
+#: tt-rss.php:191
 msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 
-#: tt-rss.php:194
+#: tt-rss.php:192
 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 
-#: tt-rss.php:195
+#: tt-rss.php:193
 msgid "Edit this feed..."
 msgstr "Rediger nyhetsstrømmen..."
 
-#: tt-rss.php:196
+#: tt-rss.php:194
 msgid "Clear articles"
 msgstr "Fjern artikler"
 
-#: tt-rss.php:197
+#: tt-rss.php:195
 msgid "Rescore feed"
 msgstr "Sett poeng på nytt for nyhetskanalene"
 
-#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
+#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
-#: tt-rss.php:200
+#: tt-rss.php:198
 msgid "All feeds:"
 msgstr "Alle nyhetsstrømmer:"
 
-#: tt-rss.php:202 help/3.php:44
+#: tt-rss.php:200 help/3.php:44
 msgid "(Un)hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: tt-rss.php:204
+#: tt-rss.php:202
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: tt-rss.php:207
+#: tt-rss.php:205
 msgid "Create filter..."
 msgstr "Lag filter..."
 
-#: tt-rss.php:208
+#: tt-rss.php:206
 msgid "Reset UI layout"
 msgstr "Tilbakestill de grafiske instillingene"
 
-#: tt-rss.php:209
+#: tt-rss.php:207
 msgid "Reset category order"
 msgstr "Tilbakestill kategorirekkefølgen"
 
-#: tt-rss.php:210
-msgid "&nbsp;&nbsp;Keyboard shortcuts"
-msgstr "&nbsp;&nbsp;Tastatursnarveier"
-
-#: tt-rss.php:219
+#: tt-rss.php:218
 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: tt-rss.php:221
+#: tt-rss.php:220
 msgid "Toggle Feedlist"
 msgstr "Vis nyhetskanallisten"
 
-#: tt-rss.php:229 mobile/functions.php:738
+#: tt-rss.php:228 mobile/functions.php:738
 msgid "Search:"
 msgstr "Søk:"
 
-#: tt-rss.php:237 mobile/functions.php:456
+#: tt-rss.php:236 mobile/functions.php:456
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: tt-rss.php:238 mobile/functions.php:457
+#: tt-rss.php:237 mobile/functions.php:457
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: tt-rss.php:241
+#: tt-rss.php:240
 msgid "Ignore Scoring"
 msgstr "Ignorer poenggivning"
 
-#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
+#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
 #: mobile/functions.php:501 mobile/functions.php:504
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: tt-rss.php:245
+#: tt-rss.php:244
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
 #: modules/pref-filters.php:461
 msgid "Date"
 msgstr "Dato"
 
-#: tt-rss.php:251
+#: tt-rss.php:250
 msgid "Score"
 msgstr "Poeng"
 
-#: tt-rss.php:255
+#: tt-rss.php:254
 msgid "Limit:"
 msgstr "Antall:"
 
-#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
 #: mobile/functions.php:436
 msgid "Update"
 msgstr "Oppdater"
 
-#: tt-rss.php:298
+#: tt-rss.php:297
 msgid "Drag me to resize panels"
 msgstr "Dra i meg for å endre størrelsen på panelene."
 
@@ -1743,7 +1761,7 @@ msgstr "Avbryt"
 
 #: modules/popup-dialog.php:140 modules/popup-dialog.php:152
 #: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
 #: modules/pref-labels.php:130 modules/pref-users.php:363
 #: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
 #: mobile/functions.php:783
@@ -1770,11 +1788,6 @@ msgstr "Denne nyhetsstrømmen"
 msgid "Create Filter"
 msgstr "Lag filter"
 
-#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
-#: modules/pref-filters.php:39 modules/pref-filters.php:96
-msgid "description"
-msgstr "beskrivelse"
-
 #: modules/popup-dialog.php:245 modules/pref-filters.php:42
 #: modules/pref-filters.php:402
 msgid "Match"
@@ -1934,139 +1947,139 @@ msgstr "Mellomlagre bilder lokalt på serveren"
 msgid "Multiple Feed Editor"
 msgstr "Nyhetsstrømsredigerer"
 
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
+#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
 msgid "All done."
 msgstr "Alt ferdig."
 
-#: modules/pref-feeds.php:836
+#: modules/pref-feeds.php:840
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonnerer på <b>%s</b>"
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:842
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:860
+#: modules/pref-feeds.php:864
 msgid "Edit subscription options"
 msgstr "Rediger abonnementsalternativer"
 
-#: modules/pref-feeds.php:946
+#: modules/pref-feeds.php:950
 msgid "Category editor"
 msgstr "Kategoriredigerer"
 
-#: modules/pref-feeds.php:969
+#: modules/pref-feeds.php:973
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Kategorien <b>$%s</b> eksisterer allerede i databasen"
 
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1004
 msgid "Unable to delete non empty feed categories."
 msgstr "Kunne ikke slette kategorien, den var ikke tom"
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1021
 msgid "Create category"
 msgstr "Lag kategori"
 
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1081
 msgid "No feed categories defined."
 msgstr "Ingen kategorier ble markert"
 
-#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
 #: modules/pref-filters.php:505 modules/pref-labels.php:225
 #: modules/pref-users.php:474
 msgid "Remove"
 msgstr "Fjern"
 
-#: modules/pref-feeds.php:1107
+#: modules/pref-feeds.php:1114
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1136 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1141
 msgid "More Feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: modules/pref-feeds.php:1208
+#: modules/pref-feeds.php:1215
 msgid "Show last article times"
 msgstr "Vis tidspunktene for siste artikkel"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
+#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
 msgid "Last&nbsp;Article"
 msgstr "Siste&nbsp;Artikkel"
 
-#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
 #: modules/pref-users.php:449
 msgid "Click to edit"
 msgstr "Trykk for å endre"
 
-#: modules/pref-feeds.php:1320
+#: modules/pref-feeds.php:1327
 msgid "(Hidden)"
 msgstr "(Skjult)"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1340
 #, php-format
 msgid "(linked to %s)"
 msgstr "(koblet til %s)"
 
-#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
 msgid "Selection:"
 msgstr "Utvalg:"
 
-#: modules/pref-feeds.php:1365
+#: modules/pref-feeds.php:1372
 msgid "Recategorize"
 msgstr "Rekategoriser"
 
-#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
 #: modules/pref-users.php:472
 msgid "Edit"
 msgstr "Rediger"
 
-#: modules/pref-feeds.php:1378
+#: modules/pref-feeds.php:1384
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: modules/pref-feeds.php:1382
+#: modules/pref-feeds.php:1388
 msgid "Clear feed data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
 msgid "Rescore articles"
 msgstr "Tilbakestill poengsummene for artiklene"
 
-#: modules/pref-feeds.php:1389
+#: modules/pref-feeds.php:1396
 msgid "Other:"
 msgstr "Andre:"
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1397
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1406
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1410
 msgid "File:"
 msgstr "Fil:"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1413
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1411
+#: modules/pref-feeds.php:1420
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: modules/pref-feeds.php:1414
+#: modules/pref-feeds.php:1423
 msgid "Firefox Integration"
 msgstr "Firefox integrering"
 
-#: modules/pref-feeds.php:1416
+#: modules/pref-feeds.php:1425
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2074,11 +2087,11 @@ msgstr ""
 "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
 "ved å trykke på lenken nedenfor."
 
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1429
 msgid "Click here to register this site as a feed reader."
 msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
 
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1438
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2086,15 +2099,15 @@ msgstr ""
 "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
 "kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
-#: modules/pref-feeds.php:1433
+#: modules/pref-feeds.php:1442
 msgid "Link to published articles feed."
 msgstr "Lenke til nyhetsstrøm for publiserte artikler"
 
-#: modules/pref-feeds.php:1436
+#: modules/pref-feeds.php:1445
 msgid "Generate another link"
 msgstr "Genererer en ny adresse"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1511
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
@@ -2116,14 +2129,6 @@ msgstr "Laget filter <b>%s</b>"
 msgid "Create filter"
 msgstr "Lag filter"
 
-#: modules/pref-filters.php:392
-msgid "filter_type_descr"
-msgstr "Beskrivelse av filtertype"
-
-#: modules/pref-filters.php:393
-msgid "action_description"
-msgstr "Handlingsbeskrivelse"
-
 #: modules/pref-filters.php:404
 msgid "Field"
 msgstr "Felt"
@@ -2262,10 +2267,6 @@ msgstr "Velg utseende"
 msgid "Change theme"
 msgstr "Endre utseende"
 
-#: modules/pref-prefs.php:388
-msgid "short_desc"
-msgstr "kort beskrivelse"
-
 #: modules/pref-prefs.php:400 modules/pref-prefs.php:405
 msgid "Yes"
 msgstr "Ja"
@@ -2630,19 +2631,31 @@ msgstr "Match på:"
 msgid "Internal error: Function not implemented"
 msgstr "Intern feil: funksjonen er ikke implementert"
 
-#~ msgid ""
-#~ "This program requires XmlHttpRequest to function properly. Your browser "
-#~ "doesn't seem to support it."
-#~ msgstr ""
-#~ "Dette programmet krever XmlHttpRequest for å fungere slik det skal. Din "
-#~ "nettleser ser ikke ut til å støtte dette."
+#: viewfeed.js:2193
+#, fuzzy
+msgid "Please enter a note for this article:"
+msgstr "Vennligst skriv inn merkelapp:"
 
-#~ msgid ""
-#~ "This program requires cookies to function properly. Your browser doesn't "
-#~ "seem to support them."
-#~ msgstr ""
-#~ "Dette programmet krever cookies for å fungere ordentlig. Din nettleser "
-#~ "ser ikke ut til å støtte dette."
+#~ msgid "This program requires XmlHttpRequest "
+#~ msgstr "Dette programmet krever XmlHttpRequest "
+
+#~ msgid "This program requires cookies "
+#~ msgstr "Dette programmet krever informasjonskapsler påslått"
+
+#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
+#~ msgstr "&nbsp;&nbsp;Tastatursnarveier"
+
+#~ msgid "description"
+#~ msgstr "beskrivelse"
+
+#~ msgid "filter_type_descr"
+#~ msgstr "Beskrivelse av filtertype"
+
+#~ msgid "action_description"
+#~ msgstr "Handlingsbeskrivelse"
+
+#~ msgid "short_desc"
+#~ msgstr "kort beskrivelse"
 
 #~ msgid "display tags"
 #~ msgstr "Vis stikkord"
@@ -2668,9 +2681,6 @@ msgstr "Intern feil: funksjonen er ikke implementert"
 #~ msgid "Address changed."
 #~ msgstr "Adresse er endret"
 
-#~ msgid "Please enter label title:"
-#~ msgstr "Vennligst skriv inn merkelapp:"
-
 #~ msgid ""
 #~ "Rescore articles in all feeds? This operation may take a lot of time."
 #~ msgstr ""
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index d6e88e467..b88ba2029 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.mo
+++ b/locale/pt_BR/LC_MESSAGES/messages.mo
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index 7bf396ee9..53b4387a4 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-20 15:55+0300\n"
+"POT-Creation-Date: 2009-03-27 20:20+0300\n"
 "PO-Revision-Date: 2007-10-24 00:47-0200\n"
 "Last-Translator: Marcelo Jorge VIeira (metal) <[email protected]>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -81,7 +81,7 @@ msgstr "Diariamente"
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:247 modules/pref-prefs.php:315
 msgid "Default"
 msgstr "Padrão"
 
@@ -111,12 +111,16 @@ msgid "Unknown error"
 msgstr "Erro desconhecido"
 
 #: errors.php:5
-msgid "This program requires XmlHttpRequest "
-msgstr "Este programa requer XmlHttpRequest"
+msgid ""
+"This program requires XmlHttpRequest to function properly. Your browser "
+"doesn't seem to support it."
+msgstr ""
 
 #: errors.php:8
-msgid "This program requires cookies "
-msgstr "Este programa requer cookies "
+msgid ""
+"This program requires cookies to function properly. Your browser doesn't "
+"seem to support them."
+msgstr ""
 
 #: errors.php:11
 msgid "Backend sanity check failed"
@@ -166,234 +170,247 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2841 modules/popup-dialog.php:175
+#: functions.php:2846 modules/popup-dialog.php:175
 #: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
-#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
+#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
+#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
-#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
+#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
 #: mobile/functions.php:33
 msgid "Special"
 msgstr "Especial"
 
-#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
-#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
+#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
+#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
 msgid "Labels"
 msgstr ""
 
-#: functions.php:2919 functions.php:3342 functions.php:4127
+#: functions.php:2924 functions.php:3347 functions.php:4144
 #: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
 #: offline.js:1425
 msgid "Starred articles"
 msgstr ""
 
-#: functions.php:2921 functions.php:3346 functions.php:4134
-#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
+#: functions.php:2926 functions.php:3351 functions.php:4151
+#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
 msgid "Published articles"
 msgstr ""
 
-#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
+#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
 #: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr ""
 
-#: functions.php:2925 functions.php:3355 functions.php:4105
+#: functions.php:2930 functions.php:3360 functions.php:4122
 #: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
 #: offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "Favoritos"
 
-#: functions.php:3306 functions.php:3308
+#: functions.php:3311 functions.php:3313
 msgid "Search results"
 msgstr ""
 
-#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
-#: functions.php:3353 functions.php:3356 functions.php:3364
+#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
+#: functions.php:3358 functions.php:3361 functions.php:3369
 msgid "Searched for"
 msgstr ""
 
-#: functions.php:3984
+#: functions.php:4001
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3989 functions.php:5253 localized_js.php:148
-#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
+#: functions.php:4006 functions.php:5292 localized_js.php:148
+#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
 #: modules/pref-filters.php:366 modules/pref-labels.php:163
 #: modules/pref-users.php:401 offline.js:409
 msgid "Select:"
 msgstr "Selecione:"
 
-#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
-#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
+#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
+#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
 #: modules/pref-labels.php:164 modules/pref-users.php:402
 #: mobile/functions.php:570
 msgid "All"
 msgstr "Todos"
 
-#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
+#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
 #: mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "Não Lido"
 
-#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
+#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
 #, fuzzy
 msgid "Invert"
 msgstr "(Inverso)"
 
-#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
-#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
+#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
+#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
 #: modules/pref-labels.php:165 modules/pref-users.php:403
 #: mobile/functions.php:572
 msgid "None"
 msgstr "Nenhum"
 
-#: functions.php:4001 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1371 offline.js:185
+#: functions.php:4018 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1378 offline.js:185
 msgid "Actions..."
 msgstr "Ações..."
 
-#: functions.php:4006 localized_js.php:150
+#: functions.php:4023 localized_js.php:150
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Seleção"
 
-#: functions.php:4008 localized_js.php:152 tt-rss.php:239
+#: functions.php:4025 localized_js.php:152 tt-rss.php:238
 #: mobile/functions.php:459
 msgid "Starred"
 msgstr "Favoritos"
 
-#: functions.php:4009
+#: functions.php:4026
 msgid "Published"
 msgstr "Publicado"
 
-#: functions.php:4011 localized_js.php:85
+#: functions.php:4028 localized_js.php:85
 msgid "Mark as read:"
 msgstr "Marcar como lido:"
 
-#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
 msgid "Selection"
 msgstr "Seleção"
 
-#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
 msgid "Entire feed"
 msgstr ""
 
-#: functions.php:4018
+#: functions.php:4035
 msgid "Assign label:"
 msgstr ""
 
-#: functions.php:4059 localized_js.php:56
+#: functions.php:4076 localized_js.php:56
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4325
+#: functions.php:4342
 msgid "No feeds to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:4342 mobile/functions.php:12
+#: functions.php:4359 mobile/functions.php:12
 msgid "Tags"
 msgstr "Tags"
 
-#: functions.php:4578
+#: functions.php:4596
 #, fuzzy
 msgid " - "
 msgstr " - por "
 
-#: functions.php:4602 functions.php:5272
+#: functions.php:4620 functions.php:5320
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4610
+#: functions.php:4628
 msgid "Display original article content"
 msgstr ""
 
-#: functions.php:4617 functions.php:5263
+#: functions.php:4635 functions.php:5302
 msgid "Show article summary in new window"
 msgstr ""
 
-#: functions.php:4650 functions.php:5187
+#: functions.php:4642 functions.php:5309
+msgid "Publish article with a note"
+msgstr ""
+
+#: functions.php:4682 functions.php:5226
 #, fuzzy
 msgid "unknown type"
 msgstr "Erro desconhecido"
 
-#: functions.php:4656 functions.php:5193
+#: functions.php:4688 functions.php:5232
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4692 functions.php:5227
+#: functions.php:4724 functions.php:5266
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4694 functions.php:5229
+#: functions.php:4726 functions.php:5268
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4714 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
+#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: functions.php:4770
+#: functions.php:4802
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
-#: functions.php:4839 mobile/functions.php:423
+#: functions.php:4871 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:5161
+#: functions.php:5193
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Favoritos"
 
-#: functions.php:5298
+#: functions.php:5327
+#, fuzzy
+msgid "toggle unread"
+msgstr "Marcar como favorito"
+
+#: functions.php:5346
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5301
+#: functions.php:5349
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5304
+#: functions.php:5352
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5308
+#: functions.php:5356
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5310 localized_js.php:92 offline.js:444
+#: functions.php:5358 localized_js.php:92 offline.js:444
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5984 tt-rss.php:206
+#: functions.php:6049 tt-rss.php:204
 #, fuzzy
 msgid "Create label..."
 msgstr "Criar um usuário"
 
-#: functions.php:5997
+#: functions.php:6062
 #, fuzzy
 msgid "(remove)"
 msgstr "Remover"
 
-#: functions.php:6041
+#: functions.php:6106
 msgid "no tags"
 msgstr "sem tags"
 
+#: functions.php:6134
+msgid "edit note"
+msgstr ""
+
 #: localized_js.php:36
 msgid "Adding feed..."
 msgstr "Adicionando o Feed..."
@@ -576,17 +593,17 @@ msgstr "Marcando todos os feeds como lidos..."
 msgid "Mark all articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: localized_js.php:84 viewfeed.js:1212
+#: localized_js.php:84 viewfeed.js:1250
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 
-#: localized_js.php:86 viewfeed.js:1885
+#: localized_js.php:86 viewfeed.js:1923
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr ""
 
-#: localized_js.php:87 viewfeed.js:1251
+#: localized_js.php:87 viewfeed.js:1289
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr ""
@@ -599,16 +616,16 @@ msgstr "Marcando todos os feeds como lidos..."
 msgid "New password cannot be blank."
 msgstr "A nova senha não pode ser vazia."
 
-#: localized_js.php:90 viewfeed.js:1842
+#: localized_js.php:90 viewfeed.js:1880
 msgid "No article is selected."
 msgstr ""
 
-#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
-#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
+#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
+#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
 msgid "No articles are selected."
 msgstr ""
 
-#: localized_js.php:93 viewfeed.js:1883
+#: localized_js.php:93 viewfeed.js:1921
 msgid "No articles found to mark"
 msgstr ""
 
@@ -621,7 +638,7 @@ msgstr "Nenhuma categoria foi selecionada."
 msgid "No feeds are selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
+#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
@@ -683,7 +700,7 @@ msgstr "Por favor selecione somente um usuário."
 msgid "Please select some feed first."
 msgstr ""
 
-#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
+#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
 msgid "Please wait..."
 msgstr ""
 
@@ -691,8 +708,8 @@ msgstr ""
 msgid "Please wait until operation finishes."
 msgstr ""
 
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
-#: viewfeed.js:631
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
+#: viewfeed.js:669
 msgid "Publish article"
 msgstr ""
 
@@ -841,7 +858,7 @@ msgstr "Salvando o filtro..."
 msgid "Saving user..."
 msgstr "Salvando usuário"
 
-#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
+#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
 #, fuzzy
 msgid "Star article"
 msgstr "Favoritos"
@@ -920,11 +937,11 @@ msgstr "Tentando mudar o E-mail..."
 msgid "Trying to change password..."
 msgstr "Tentando alterar senha ..."
 
-#: localized_js.php:170 viewfeed.js:618
+#: localized_js.php:170 viewfeed.js:657
 msgid "Unpublish article"
 msgstr ""
 
-#: localized_js.php:172 viewfeed.js:553
+#: localized_js.php:172 viewfeed.js:586
 msgid "Unstar article"
 msgstr ""
 
@@ -967,8 +984,8 @@ msgid ""
 "switch it into offline mode again. Go online?"
 msgstr ""
 
-#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
+#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
 #: mobile/functions.php:775
 msgid "Title"
 msgstr "Título"
@@ -994,7 +1011,7 @@ msgstr ""
 msgid "Filter article"
 msgstr ""
 
-#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
@@ -1316,12 +1333,12 @@ msgstr "Sair das preferências"
 msgid "Logout"
 msgstr "Sair"
 
-#: prefs.php:117
+#: prefs.php:117 tt-rss.php:208
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
-#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -1345,7 +1362,7 @@ msgstr ""
 
 #: register.php:155 register.php:200 register.php:213 register.php:228
 #: register.php:246 register.php:331 register.php:341 register.php:353
-#: update.php:94 update.php:162 modules/pref-feeds.php:865
+#: update.php:94 update.php:162 modules/pref-feeds.php:869
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
@@ -1442,121 +1459,116 @@ msgstr "Removendo o Feed..."
 msgid "Search..."
 msgstr ""
 
-#: tt-rss.php:193
+#: tt-rss.php:191
 msgid "Feed actions:"
 msgstr "Ações do Feed:"
 
-#: tt-rss.php:194
+#: tt-rss.php:192
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "Removendo o Feed..."
 
-#: tt-rss.php:195
+#: tt-rss.php:193
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "Editar"
 
-#: tt-rss.php:196
+#: tt-rss.php:194
 #, fuzzy
 msgid "Clear articles"
 msgstr "Favoritos"
 
-#: tt-rss.php:197
+#: tt-rss.php:195
 #, fuzzy
 msgid "Rescore feed"
 msgstr "Removendo o Feed..."
 
-#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
+#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
 msgid "Unsubscribe"
 msgstr ""
 
-#: tt-rss.php:200
+#: tt-rss.php:198
 msgid "All feeds:"
 msgstr "Todos os Feeds:"
 
-#: tt-rss.php:202 help/3.php:44
+#: tt-rss.php:200 help/3.php:44
 msgid "(Un)hide read feeds"
 msgstr ""
 
-#: tt-rss.php:204
+#: tt-rss.php:202
 msgid "Other actions:"
 msgstr "Outras ações:"
 
-#: tt-rss.php:207
+#: tt-rss.php:205
 #, fuzzy
 msgid "Create filter..."
 msgstr "Criar um usuário"
 
-#: tt-rss.php:208
+#: tt-rss.php:206
 #, fuzzy
 msgid "Reset UI layout"
 msgstr "&nbsp;&nbsp;Editar esse Feed"
 
-#: tt-rss.php:209
+#: tt-rss.php:207
 #, fuzzy
 msgid "Reset category order"
 msgstr "Remover as categorias selecionadas?"
 
-#: tt-rss.php:210
-#, fuzzy
-msgid "&nbsp;&nbsp;Keyboard shortcuts"
-msgstr "&nbsp;&nbsp;Criar filtro"
-
-#: tt-rss.php:219
+#: tt-rss.php:218
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Todos os feeds"
 
-#: tt-rss.php:221
+#: tt-rss.php:220
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:229 mobile/functions.php:738
+#: tt-rss.php:228 mobile/functions.php:738
 msgid "Search:"
 msgstr ""
 
-#: tt-rss.php:237 mobile/functions.php:456
+#: tt-rss.php:236 mobile/functions.php:456
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:238 mobile/functions.php:457
+#: tt-rss.php:237 mobile/functions.php:457
 msgid "All Articles"
 msgstr ""
 
-#: tt-rss.php:241
+#: tt-rss.php:240
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
+#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
 #: mobile/functions.php:501 mobile/functions.php:504
 msgid "Updated"
 msgstr "Atualizado"
 
-#: tt-rss.php:245
+#: tt-rss.php:244
 #, fuzzy
 msgid "Order:"
 msgstr "Onde:"
 
-#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
 #: modules/pref-filters.php:461
 #, fuzzy
 msgid "Date"
 msgstr "Atualizar"
 
-#: tt-rss.php:251
+#: tt-rss.php:250
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:255
+#: tt-rss.php:254
 msgid "Limit:"
 msgstr "Limite:"
 
-#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
 #: mobile/functions.php:436
 msgid "Update"
 msgstr "Atualizar"
 
-#: tt-rss.php:298
+#: tt-rss.php:297
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1743,7 +1755,7 @@ msgstr "Cancelar"
 
 #: modules/popup-dialog.php:140 modules/popup-dialog.php:152
 #: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
 #: modules/pref-labels.php:130 modules/pref-users.php:363
 #: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
 #: mobile/functions.php:783
@@ -1771,11 +1783,6 @@ msgstr ""
 msgid "Create Filter"
 msgstr "Criar um usuário"
 
-#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
-#: modules/pref-filters.php:39 modules/pref-filters.php:96
-msgid "description"
-msgstr "descrição"
-
 #: modules/popup-dialog.php:245 modules/pref-filters.php:42
 #: modules/pref-filters.php:402
 msgid "Match"
@@ -1942,168 +1949,168 @@ msgstr ""
 msgid "Multiple Feed Editor"
 msgstr "Editor de Feed"
 
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
+#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:836
+#: modules/pref-feeds.php:840
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:842
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:860
+#: modules/pref-feeds.php:864
 msgid "Edit subscription options"
 msgstr ""
 
-#: modules/pref-feeds.php:946
+#: modules/pref-feeds.php:950
 msgid "Category editor"
 msgstr "Editor de Categoria"
 
-#: modules/pref-feeds.php:969
+#: modules/pref-feeds.php:973
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "A categoria <b>$%s</b> já existe na base de dados."
 
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1004
 msgid "Unable to delete non empty feed categories."
 msgstr ""
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1021
 msgid "Create category"
 msgstr "Criar categoria"
 
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1081
 msgid "No feed categories defined."
 msgstr ""
 
-#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
 #: modules/pref-filters.php:505 modules/pref-labels.php:225
 #: modules/pref-users.php:474
 msgid "Remove"
 msgstr "Remover"
 
-#: modules/pref-feeds.php:1107
+#: modules/pref-feeds.php:1114
 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
-#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1136 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr ""
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1141
 #, fuzzy
 msgid "More Feeds"
 msgstr "Removendo o Feed..."
 
-#: modules/pref-feeds.php:1208
+#: modules/pref-feeds.php:1215
 msgid "Show last article times"
 msgstr ""
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
+#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
 msgid "Last&nbsp;Article"
 msgstr ""
 
-#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
 #: modules/pref-users.php:449
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1320
+#: modules/pref-feeds.php:1327
 msgid "(Hidden)"
 msgstr ""
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1340
 #, php-format
 msgid "(linked to %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
 #, fuzzy
 msgid "Selection:"
 msgstr "Seleção"
 
-#: modules/pref-feeds.php:1365
+#: modules/pref-feeds.php:1372
 msgid "Recategorize"
 msgstr ""
 
-#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
 #: modules/pref-users.php:472
 msgid "Edit"
 msgstr "Editar"
 
-#: modules/pref-feeds.php:1378
+#: modules/pref-feeds.php:1384
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1382
+#: modules/pref-feeds.php:1388
 msgid "Clear feed data"
 msgstr ""
 
-#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Favoritos"
 
-#: modules/pref-feeds.php:1389
+#: modules/pref-feeds.php:1396
 #, fuzzy
 msgid "Other:"
 msgstr "Onde:"
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1397
 msgid "Edit categories"
 msgstr "Editar categorias"
 
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1406
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1410
 msgid "File:"
 msgstr "Arquivo:"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1413
 msgid "Import"
 msgstr "Importar"
 
-#: modules/pref-feeds.php:1411
+#: modules/pref-feeds.php:1420
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: modules/pref-feeds.php:1414
+#: modules/pref-feeds.php:1423
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1416
+#: modules/pref-feeds.php:1425
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1429
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1438
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1433
+#: modules/pref-feeds.php:1442
 msgid "Link to published articles feed."
 msgstr ""
 
-#: modules/pref-feeds.php:1436
+#: modules/pref-feeds.php:1445
 #, fuzzy
 msgid "Generate another link"
 msgstr "Gerar um outro endereço"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1511
 #, fuzzy
 msgid "No feeds found."
 msgstr "Sem Feeds para exibir."
@@ -2127,14 +2134,6 @@ msgstr ""
 msgid "Create filter"
 msgstr ""
 
-#: modules/pref-filters.php:392
-msgid "filter_type_descr"
-msgstr "filter_type_descr"
-
-#: modules/pref-filters.php:393
-msgid "action_description"
-msgstr "action_description"
-
 #: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
@@ -2277,10 +2276,6 @@ msgstr "Selecionar o tema"
 msgid "Change theme"
 msgstr "Mudar Tema"
 
-#: modules/pref-prefs.php:388
-msgid "short_desc"
-msgstr "short_desc"
-
 #: modules/pref-prefs.php:400 modules/pref-prefs.php:405
 msgid "Yes"
 msgstr "Sim"
@@ -2665,6 +2660,32 @@ msgstr ""
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#: viewfeed.js:2193
+msgid "Please enter a note for this article:"
+msgstr ""
+
+#~ msgid "This program requires XmlHttpRequest "
+#~ msgstr "Este programa requer XmlHttpRequest"
+
+#~ msgid "This program requires cookies "
+#~ msgstr "Este programa requer cookies "
+
+#, fuzzy
+#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
+#~ msgstr "&nbsp;&nbsp;Criar filtro"
+
+#~ msgid "description"
+#~ msgstr "descrição"
+
+#~ msgid "filter_type_descr"
+#~ msgstr "filter_type_descr"
+
+#~ msgid "action_description"
+#~ msgstr "action_description"
+
+#~ msgid "short_desc"
+#~ msgstr "short_desc"
+
 #~ msgid "Please select only one category."
 #~ msgstr "Por favor selecione somente uma categoria."
 
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index a99c53073..095f31d3e 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.mo
+++ b/locale/ru_RU/LC_MESSAGES/messages.mo
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index d5d9c15d2..14f745550 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-20 15:55+0300\n"
+"POT-Creation-Date: 2009-03-27 20:20+0300\n"
 "PO-Revision-Date: 2009-01-26 08:36+0400\n"
 "Last-Translator: Max Kamashev <[email protected]>\n"
 "Language-Team: Русский <[email protected]>\n"
@@ -85,7 +85,7 @@ msgstr "Раз в день"
 msgid "Weekly"
 msgstr "Раз в неделю"
 
-#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:247 modules/pref-prefs.php:315
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -114,12 +114,18 @@ msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
 #: errors.php:5
-msgid "This program requires XmlHttpRequest "
-msgstr "Этой программе нужен XmlHttpRequest "
+msgid ""
+"This program requires XmlHttpRequest to function properly. Your browser "
+"doesn't seem to support it."
+msgstr ""
+"Программе требуется функционал XmlHttpRequest. Ваш браузер его не "
+"поддерживает."
 
 #: errors.php:8
-msgid "This program requires cookies "
-msgstr "Этой программе нужны включённые куки"
+msgid ""
+"This program requires cookies to function properly. Your browser doesn't "
+"seem to support them."
+msgstr "Для работы программы необходимы куки. Ваш браузер их не поддерживает."
 
 #: errors.php:11
 msgid "Backend sanity check failed"
@@ -175,179 +181,184 @@ msgstr ""
 "неудавшийся тест экранирования SQL, проверьте вашу базу данных и "
 "конфигурацию PHP"
 
-#: functions.php:2841 modules/popup-dialog.php:175
+#: functions.php:2846 modules/popup-dialog.php:175
 #: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
-#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
+#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
+#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
+#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
 #: mobile/functions.php:33
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
-#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
+#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
+#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2919 functions.php:3342 functions.php:4127
+#: functions.php:2924 functions.php:3347 functions.php:4144
 #: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
 #: offline.js:1425
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:2921 functions.php:3346 functions.php:4134
-#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
+#: functions.php:2926 functions.php:3351 functions.php:4151
+#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
+#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
 #: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "Свежие"
 
-#: functions.php:2925 functions.php:3355 functions.php:4105
+#: functions.php:2930 functions.php:3360 functions.php:4122
 #: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
 #: offline.js:1427
 msgid "All articles"
 msgstr "Все статьи"
 
-#: functions.php:3306 functions.php:3308
+#: functions.php:3311 functions.php:3313
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
-#: functions.php:3353 functions.php:3356 functions.php:3364
+#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
+#: functions.php:3358 functions.php:3361 functions.php:3369
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:3984
+#: functions.php:4001
 msgid "Generated feed"
 msgstr "Генерировать канал"
 
-#: functions.php:3989 functions.php:5253 localized_js.php:148
-#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
+#: functions.php:4006 functions.php:5292 localized_js.php:148
+#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
 #: modules/pref-filters.php:366 modules/pref-labels.php:163
 #: modules/pref-users.php:401 offline.js:409
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
-#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
+#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
+#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
 #: modules/pref-labels.php:164 modules/pref-users.php:402
 #: mobile/functions.php:570
 msgid "All"
 msgstr "Все"
 
-#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
+#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
 #: mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
+#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
 msgid "Invert"
 msgstr "Инвертировать"
 
-#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
-#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
+#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
+#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
 #: modules/pref-labels.php:165 modules/pref-users.php:403
 #: mobile/functions.php:572
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:4001 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1371 offline.js:185
+#: functions.php:4018 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1378 offline.js:185
 msgid "Actions..."
 msgstr "Действия..."
 
-#: functions.php:4006 localized_js.php:150
+#: functions.php:4023 localized_js.php:150
 msgid "Selection toggle:"
 msgstr "Переключить выбранное:"
 
-#: functions.php:4008 localized_js.php:152 tt-rss.php:239
+#: functions.php:4025 localized_js.php:152 tt-rss.php:238
 #: mobile/functions.php:459
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:4009
+#: functions.php:4026
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:4011 localized_js.php:85
+#: functions.php:4028 localized_js.php:85
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
 msgid "Selection"
 msgstr "Выбранные"
 
-#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:4018
+#: functions.php:4035
 msgid "Assign label:"
 msgstr "Применить метку:"
 
-#: functions.php:4059 localized_js.php:56
+#: functions.php:4076 localized_js.php:56
 msgid "Click to collapse category"
 msgstr "Щёлкните, чтобы развернуть категорию"
 
-#: functions.php:4325
+#: functions.php:4342
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:4342 mobile/functions.php:12
+#: functions.php:4359 mobile/functions.php:12
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4578
+#: functions.php:4596
 msgid " - "
 msgstr " - "
 
-#: functions.php:4602 functions.php:5272
+#: functions.php:4620 functions.php:5320
 msgid "Edit tags for this article"
 msgstr "Редактировать теги статьи"
 
-#: functions.php:4610
+#: functions.php:4628
 msgid "Display original article content"
 msgstr "Показать оригинальное содержимое статьи"
 
-#: functions.php:4617 functions.php:5263
+#: functions.php:4635 functions.php:5302
 msgid "Show article summary in new window"
 msgstr "Показать детали статьи в новом окне"
 
-#: functions.php:4650 functions.php:5187
+#: functions.php:4642 functions.php:5309
+#, fuzzy
+msgid "Publish article with a note"
+msgstr "Опубликовать"
+
+#: functions.php:4682 functions.php:5226
 msgid "unknown type"
 msgstr "Неизвестный тип"
 
-#: functions.php:4656 functions.php:5193
+#: functions.php:4688 functions.php:5232
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4692 functions.php:5227
+#: functions.php:4724 functions.php:5266
 msgid "Attachment:"
 msgstr "Вложение:"
 
-#: functions.php:4694 functions.php:5229
+#: functions.php:4726 functions.php:5268
 msgid "Attachments:"
 msgstr "Вложения:"
 
-#: functions.php:4714 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
+#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: functions.php:4770
+#: functions.php:4802
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:4839 mobile/functions.php:423
+#: functions.php:4871 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -355,23 +366,28 @@ msgstr ""
 "Не могу показать канал (ошибка в запросе). Пожалуйста проверьте синтаксис "
 "или локальную конфигурацию."
 
-#: functions.php:5161
+#: functions.php:5193
 msgid "Click to expand article"
 msgstr "Щёлкните чтобы развернуть статью"
 
-#: functions.php:5298
+#: functions.php:5327
+#, fuzzy
+msgid "toggle unread"
+msgstr "Прочитано / не прочитано"
+
+#: functions.php:5346
 msgid "No unread articles found to display."
 msgstr "Не найдено не прочитанных статей"
 
-#: functions.php:5301
+#: functions.php:5349
 msgid "No updated articles found to display."
 msgstr "Не найдено не прочитанных статей."
 
-#: functions.php:5304
+#: functions.php:5352
 msgid "No starred articles found to display."
 msgstr "Не найдено отмеченных статей"
 
-#: functions.php:5308
+#: functions.php:5356
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -379,22 +395,26 @@ msgstr ""
 "Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
 "Действия) или используйте фильтр."
 
-#: functions.php:5310 localized_js.php:92 offline.js:444
+#: functions.php:5358 localized_js.php:92 offline.js:444
 msgid "No articles found to display."
 msgstr "Статей не найдено."
 
-#: functions.php:5984 tt-rss.php:206
+#: functions.php:6049 tt-rss.php:204
 msgid "Create label..."
 msgstr "Создать метку..."
 
-#: functions.php:5997
+#: functions.php:6062
 msgid "(remove)"
 msgstr "(удалить)"
 
-#: functions.php:6041
+#: functions.php:6106
 msgid "no tags"
 msgstr "нет тегов"
 
+#: functions.php:6134
+msgid "edit note"
+msgstr ""
+
 #: localized_js.php:36
 msgid "Adding feed..."
 msgstr "Канал добавляется..."
@@ -583,17 +603,17 @@ msgstr "Пометить все статьи как прочитанные?"
 msgid "Mark all articles in %s as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 
-#: localized_js.php:84 viewfeed.js:1212
+#: localized_js.php:84 viewfeed.js:1250
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "Отметить все видимые статьи в %s как прочитанные?"
 
-#: localized_js.php:86 viewfeed.js:1885
+#: localized_js.php:86 viewfeed.js:1923
 #, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "Отметить %d статью(ей) как прочитанные?"
 
-#: localized_js.php:87 viewfeed.js:1251
+#: localized_js.php:87 viewfeed.js:1289
 #, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
@@ -606,16 +626,16 @@ msgstr "Помечаю все каналы как прочитанные..."
 msgid "New password cannot be blank."
 msgstr "Новый пароль не может быть пустым."
 
-#: localized_js.php:90 viewfeed.js:1842
+#: localized_js.php:90 viewfeed.js:1880
 msgid "No article is selected."
 msgstr "Статья не выбрана"
 
-#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
-#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
+#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
+#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
 msgid "No articles are selected."
 msgstr "Нет выбранных статей."
 
-#: localized_js.php:93 viewfeed.js:1883
+#: localized_js.php:93 viewfeed.js:1921
 msgid "No articles found to mark"
 msgstr "Статей для отметки не найдено."
 
@@ -628,7 +648,7 @@ msgstr "Нет выбранных категорий."
 msgid "No feeds are selected."
 msgstr "Нет выбранных каналов."
 
-#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
+#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
@@ -693,7 +713,7 @@ msgstr "Пожалуйста выберите только одного поль
 msgid "Please select some feed first."
 msgstr "Пожалуйста выберите какой-нибудь канал."
 
-#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
+#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
 msgid "Please wait..."
 msgstr "Пожалуйста, подождите..."
 
@@ -701,8 +721,8 @@ msgstr "Пожалуйста, подождите..."
 msgid "Please wait until operation finishes."
 msgstr ""
 
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
-#: viewfeed.js:631
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
+#: viewfeed.js:669
 msgid "Publish article"
 msgstr "Опубликовать"
 
@@ -850,7 +870,7 @@ msgstr "Идет сохранение фильтра..."
 msgid "Saving user..."
 msgstr "Идет сохранение пользователя..."
 
-#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
+#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
 msgid "Star article"
 msgstr "Отмеченные"
 
@@ -929,11 +949,11 @@ msgstr "Идет изменение e-mail..."
 msgid "Trying to change password..."
 msgstr "Идет сохранение пароля..."
 
-#: localized_js.php:170 viewfeed.js:618
+#: localized_js.php:170 viewfeed.js:657
 msgid "Unpublish article"
 msgstr "Не публиковать"
 
-#: localized_js.php:172 viewfeed.js:553
+#: localized_js.php:172 viewfeed.js:586
 msgid "Unstar article"
 msgstr "Не отмеченные"
 
@@ -976,8 +996,8 @@ msgid ""
 "switch it into offline mode again. Go online?"
 msgstr ""
 
-#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
+#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
 #: mobile/functions.php:775
 msgid "Title"
 msgstr "Заголовок"
@@ -1003,7 +1023,7 @@ msgstr "Дата Статьи"
 msgid "Filter article"
 msgstr "Отфильтровать статью"
 
-#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
@@ -1350,11 +1370,11 @@ msgstr "Закрыть настройки"
 msgid "Logout"
 msgstr "Выход"
 
-#: prefs.php:117
+#: prefs.php:117 tt-rss.php:208
 msgid "Keyboard shortcuts"
 msgstr "Горячие Клавиши"
 
-#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -1376,7 +1396,7 @@ msgstr "Регистрация новых пользователей запре�
 
 #: register.php:155 register.php:200 register.php:213 register.php:228
 #: register.php:246 register.php:331 register.php:341 register.php:353
-#: update.php:94 update.php:162 modules/pref-feeds.php:865
+#: update.php:94 update.php:162 modules/pref-feeds.php:869
 msgid "Return to Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
@@ -1473,110 +1493,106 @@ msgstr "Больше каналов..."
 msgid "Search..."
 msgstr "Поиск..."
 
-#: tt-rss.php:193
+#: tt-rss.php:191
 msgid "Feed actions:"
 msgstr "Действия над каналами:"
 
-#: tt-rss.php:194
+#: tt-rss.php:192
 msgid "Subscribe to feed..."
 msgstr "Подписаться на канал..."
 
-#: tt-rss.php:195
+#: tt-rss.php:193
 msgid "Edit this feed..."
 msgstr "Редактировать канал..."
 
-#: tt-rss.php:196
+#: tt-rss.php:194
 msgid "Clear articles"
 msgstr "Очистить статьи"
 
-#: tt-rss.php:197
+#: tt-rss.php:195
 msgid "Rescore feed"
 msgstr "Заново оценить канал"
 
-#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
+#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: tt-rss.php:200
+#: tt-rss.php:198
 msgid "All feeds:"
 msgstr "Все каналы:"
 
-#: tt-rss.php:202 help/3.php:44
+#: tt-rss.php:200 help/3.php:44
 msgid "(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
 
-#: tt-rss.php:204
+#: tt-rss.php:202
 msgid "Other actions:"
 msgstr "Другие действия:"
 
-#: tt-rss.php:207
+#: tt-rss.php:205
 msgid "Create filter..."
 msgstr "Создать фильтр..."
 
-#: tt-rss.php:208
+#: tt-rss.php:206
 msgid "Reset UI layout"
 msgstr "Сбросить панели"
 
-#: tt-rss.php:209
+#: tt-rss.php:207
 msgid "Reset category order"
 msgstr "Сбросить порядок категорий"
 
-#: tt-rss.php:210
-msgid "&nbsp;&nbsp;Keyboard shortcuts"
-msgstr "&nbsp;&nbsp;Горячие клавиши"
-
-#: tt-rss.php:219
+#: tt-rss.php:218
 msgid "Collapse feedlist"
 msgstr "Свернуть список каналов"
 
-#: tt-rss.php:221
+#: tt-rss.php:220
 msgid "Toggle Feedlist"
 msgstr "Переключить Список Каналов"
 
-#: tt-rss.php:229 mobile/functions.php:738
+#: tt-rss.php:228 mobile/functions.php:738
 msgid "Search:"
 msgstr "Искать:"
 
-#: tt-rss.php:237 mobile/functions.php:456
+#: tt-rss.php:236 mobile/functions.php:456
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: tt-rss.php:238 mobile/functions.php:457
+#: tt-rss.php:237 mobile/functions.php:457
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: tt-rss.php:241
+#: tt-rss.php:240
 msgid "Ignore Scoring"
 msgstr "Игнорировать Оценки"
 
-#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
+#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
 #: mobile/functions.php:501 mobile/functions.php:504
 msgid "Updated"
 msgstr "Обновлено"
 
-#: tt-rss.php:245
+#: tt-rss.php:244
 msgid "Order:"
 msgstr "Порядок:"
 
-#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
 #: modules/pref-filters.php:461
 msgid "Date"
 msgstr "Дата"
 
-#: tt-rss.php:251
+#: tt-rss.php:250
 msgid "Score"
 msgstr "Оценка"
 
-#: tt-rss.php:255
+#: tt-rss.php:254
 msgid "Limit:"
 msgstr "Сколько:"
 
-#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
 #: mobile/functions.php:436
 msgid "Update"
 msgstr "Обновить"
 
-#: tt-rss.php:298
+#: tt-rss.php:297
 msgid "Drag me to resize panels"
 msgstr "Потяни за меня для изменения размера панелей"
 
@@ -1772,7 +1788,7 @@ msgstr "Отмена"
 
 #: modules/popup-dialog.php:140 modules/popup-dialog.php:152
 #: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
 #: modules/pref-labels.php:130 modules/pref-users.php:363
 #: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
 #: mobile/functions.php:783
@@ -1799,11 +1815,6 @@ msgstr "Этот канал"
 msgid "Create Filter"
 msgstr "Создать фильтр"
 
-#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
-#: modules/pref-filters.php:39 modules/pref-filters.php:96
-msgid "description"
-msgstr "описание"
-
 #: modules/popup-dialog.php:245 modules/pref-filters.php:42
 #: modules/pref-filters.php:402
 msgid "Match"
@@ -1963,139 +1974,139 @@ msgstr "Кэшировать изображения локально"
 msgid "Multiple Feed Editor"
 msgstr "Редактор канала"
 
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
+#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
 msgid "All done."
 msgstr "Всё выполнено."
 
-#: modules/pref-feeds.php:836
+#: modules/pref-feeds.php:840
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Добавлена подписка на <b>%s</b>."
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:842
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:860
+#: modules/pref-feeds.php:864
 msgid "Edit subscription options"
 msgstr "Редактировать опции  подписки"
 
-#: modules/pref-feeds.php:946
+#: modules/pref-feeds.php:950
 msgid "Category editor"
 msgstr "Редактор категорий"
 
-#: modules/pref-feeds.php:969
+#: modules/pref-feeds.php:973
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Категория <b>$%s</b> уже существует."
 
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1004
 msgid "Unable to delete non empty feed categories."
 msgstr "Не могу удалить не пустую категорию"
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1021
 msgid "Create category"
 msgstr "Создать категорию"
 
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1081
 msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
-#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
 #: modules/pref-filters.php:505 modules/pref-labels.php:225
 #: modules/pref-users.php:474
 msgid "Remove"
 msgstr "Удалить"
 
-#: modules/pref-feeds.php:1107
+#: modules/pref-feeds.php:1114
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
 
-#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1136 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1141
 msgid "More Feeds"
 msgstr "Больше каналов"
 
-#: modules/pref-feeds.php:1208
+#: modules/pref-feeds.php:1215
 msgid "Show last article times"
 msgstr "Показать дату последней статьи"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
+#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
 msgid "Last&nbsp;Article"
 msgstr "Последняя&nbsp;статья"
 
-#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
 #: modules/pref-users.php:449
 msgid "Click to edit"
 msgstr "Щёлкните для редактирования"
 
-#: modules/pref-feeds.php:1320
+#: modules/pref-feeds.php:1327
 msgid "(Hidden)"
 msgstr "(Скрыт)"
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1340
 #, php-format
 msgid "(linked to %s)"
 msgstr "(ссылка на %s)"
 
-#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
 msgid "Selection:"
 msgstr "Выбрано:"
 
-#: modules/pref-feeds.php:1365
+#: modules/pref-feeds.php:1372
 msgid "Recategorize"
 msgstr "Изменить категорию"
 
-#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
 #: modules/pref-users.php:472
 msgid "Edit"
 msgstr "Редактировать"
 
-#: modules/pref-feeds.php:1378
+#: modules/pref-feeds.php:1384
 msgid "Manual purge"
 msgstr "Ручная очистка"
 
-#: modules/pref-feeds.php:1382
+#: modules/pref-feeds.php:1388
 msgid "Clear feed data"
 msgstr "Очистить данные канала."
 
-#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
 msgid "Rescore articles"
 msgstr "Заново оценить статьи"
 
-#: modules/pref-feeds.php:1389
+#: modules/pref-feeds.php:1396
 msgid "Other:"
 msgstr "Другой:"
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1397
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1406
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1410
 msgid "File:"
 msgstr "Файл:"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1413
 msgid "Import"
 msgstr "Импортировать"
 
-#: modules/pref-feeds.php:1411
+#: modules/pref-feeds.php:1420
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: modules/pref-feeds.php:1414
+#: modules/pref-feeds.php:1423
 msgid "Firefox Integration"
 msgstr "Интеграция в Firefox"
 
-#: modules/pref-feeds.php:1416
+#: modules/pref-feeds.php:1425
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2103,11 +2114,11 @@ msgstr ""
 "Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. "
 "Для этого щёлкните по ссылке ниже."
 
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1429
 msgid "Click here to register this site as a feed reader."
 msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
 
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1438
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2115,15 +2126,15 @@ msgstr ""
 "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
 "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: modules/pref-feeds.php:1433
+#: modules/pref-feeds.php:1442
 msgid "Link to published articles feed."
 msgstr "Ссылка на общий канал со статьями."
 
-#: modules/pref-feeds.php:1436
+#: modules/pref-feeds.php:1445
 msgid "Generate another link"
 msgstr "Создать другую ссылку"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1511
 msgid "No feeds found."
 msgstr "Каналы не найдены."
 
@@ -2145,14 +2156,6 @@ msgstr "Добавлен фильтр <b>%s</b>"
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: modules/pref-filters.php:392
-msgid "filter_type_descr"
-msgstr "описание типа фильтра"
-
-#: modules/pref-filters.php:393
-msgid "action_description"
-msgstr "описание действия"
-
 #: modules/pref-filters.php:404
 msgid "Field"
 msgstr "Поле"
@@ -2293,10 +2296,6 @@ msgstr "Выбор темы"
 msgid "Change theme"
 msgstr "Изменить тему"
 
-#: modules/pref-prefs.php:388
-msgid "short_desc"
-msgstr "краткое описание"
-
 #: modules/pref-prefs.php:400 modules/pref-prefs.php:405
 msgid "Yes"
 msgstr "Да"
@@ -2659,6 +2658,32 @@ msgstr "Соответствие:"
 msgid "Internal error: Function not implemented"
 msgstr "Внутренняя ошибка: Функция не реализована"
 
+#: viewfeed.js:2193
+#, fuzzy
+msgid "Please enter a note for this article:"
+msgstr "Пожалуйста, введите заголовок метки:"
+
+#~ msgid "This program requires XmlHttpRequest "
+#~ msgstr "Этой программе нужен XmlHttpRequest "
+
+#~ msgid "This program requires cookies "
+#~ msgstr "Этой программе нужны включённые куки"
+
+#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
+#~ msgstr "&nbsp;&nbsp;Горячие клавиши"
+
+#~ msgid "description"
+#~ msgstr "описание"
+
+#~ msgid "filter_type_descr"
+#~ msgstr "описание типа фильтра"
+
+#~ msgid "action_description"
+#~ msgstr "описание действия"
+
+#~ msgid "short_desc"
+#~ msgstr "краткое описание"
+
 #~ msgid "display tags"
 #~ msgstr "показать теги"
 
@@ -2683,9 +2708,6 @@ msgstr "Внутренняя ошибка: Функция не реализов�
 #~ msgid "Address changed."
 #~ msgstr "Адрес изменен."
 
-#~ msgid "Please enter label title:"
-#~ msgstr "Пожалуйста, введите заголовок метки:"
-
 #~ msgid ""
 #~ "Rescore articles in all feeds? This operation may take a lot of time."
 #~ msgstr ""
@@ -2809,19 +2831,6 @@ msgstr "Внутренняя ошибка: Функция не реализов�
 #~ msgid "Fatal Error"
 #~ msgstr "Фатальная Ошибка"
 
-#~ msgid ""
-#~ "This program requires XmlHttpRequest to function properly. Your browser "
-#~ "doesn't seem to support it."
-#~ msgstr ""
-#~ "Программе требуется функционал XmlHttpRequest. Ваш браузер его не "
-#~ "поддерживает."
-
-#~ msgid ""
-#~ "This program requires cookies to function properly. Your browser doesn't "
-#~ "seem to support them."
-#~ msgstr ""
-#~ "Для работы программы необходимы куки. Ваш браузер их не поддерживает."
-
 #~ msgid "Modify score"
 #~ msgstr "Изменить оценку"
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 2cf4755bc..78509dfdc 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.mo
+++ b/locale/zh_CN/LC_MESSAGES/messages.mo
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 77a647ed4..7d121d3cc 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-20 15:55+0300\n"
+"POT-Creation-Date: 2009-03-27 20:20+0300\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <[email protected]>\n"
 "Language-Team: hicode.org <[email protected]>\n"
@@ -77,7 +77,7 @@ msgstr "每天"
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:247 modules/pref-prefs.php:315
 msgid "Default"
 msgstr "默认"
 
@@ -107,12 +107,16 @@ msgid "Unknown error"
 msgstr "未知错误"
 
 #: errors.php:5
-msgid "This program requires XmlHttpRequest "
-msgstr "本程序需要xmlhttprequest支持"
+msgid ""
+"This program requires XmlHttpRequest to function properly. Your browser "
+"doesn't seem to support it."
+msgstr ""
 
 #: errors.php:8
-msgid "This program requires cookies "
-msgstr "本程序需要开启cookies"
+msgid ""
+"This program requires cookies to function properly. Your browser doesn't "
+"seem to support them."
+msgstr ""
 
 #: errors.php:11
 msgid "Backend sanity check failed"
@@ -162,238 +166,252 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2841 modules/popup-dialog.php:175
+#: functions.php:2846 modules/popup-dialog.php:175
 #: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
-#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
+#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
+#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
+#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
 #: mobile/functions.php:33
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
-#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
+#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
+#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:2919 functions.php:3342 functions.php:4127
+#: functions.php:2924 functions.php:3347 functions.php:4144
 #: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
 #: offline.js:1425
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2921 functions.php:3346 functions.php:4134
-#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
+#: functions.php:2926 functions.php:3351 functions.php:4151
+#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
+#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
 #: mobile/functions.php:52
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:2925 functions.php:3355 functions.php:4105
+#: functions.php:2930 functions.php:3360 functions.php:4122
 #: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
 #: offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "所有文章"
 
-#: functions.php:3306 functions.php:3308
+#: functions.php:3311 functions.php:3313
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
-#: functions.php:3353 functions.php:3356 functions.php:3364
+#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
+#: functions.php:3358 functions.php:3361 functions.php:3369
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:3984
+#: functions.php:4001
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:3989 functions.php:5253 localized_js.php:148
-#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
+#: functions.php:4006 functions.php:5292 localized_js.php:148
+#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
 #: modules/pref-filters.php:366 modules/pref-labels.php:163
 #: modules/pref-users.php:401 offline.js:409
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
-#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
+#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
+#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
 #: modules/pref-labels.php:164 modules/pref-users.php:402
 #: mobile/functions.php:570
 msgid "All"
 msgstr "所有"
 
-#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
+#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
 #: mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
+#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
 #, fuzzy
 msgid "Invert"
 msgstr "(逆)"
 
-#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
-#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
+#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
+#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
 #: modules/pref-labels.php:165 modules/pref-users.php:403
 #: mobile/functions.php:572
 msgid "None"
 msgstr "无"
 
-#: functions.php:4001 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1371 offline.js:185
+#: functions.php:4018 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1378 offline.js:185
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:4006 localized_js.php:150
+#: functions.php:4023 localized_js.php:150
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:4008 localized_js.php:152 tt-rss.php:239
+#: functions.php:4025 localized_js.php:152 tt-rss.php:238
 #: mobile/functions.php:459
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:4009
+#: functions.php:4026
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:4011 localized_js.php:85
+#: functions.php:4028 localized_js.php:85
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
 msgid "Selection"
 msgstr "选择："
 
-#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:4018
+#: functions.php:4035
 #, fuzzy
 msgid "Assign label:"
 msgstr "指定标签"
 
-#: functions.php:4059 localized_js.php:56
+#: functions.php:4076 localized_js.php:56
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4325
+#: functions.php:4342
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4342 mobile/functions.php:12
+#: functions.php:4359 mobile/functions.php:12
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4578
+#: functions.php:4596
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4602 functions.php:5272
+#: functions.php:4620 functions.php:5320
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4610
+#: functions.php:4628
 #, fuzzy
 msgid "Display original article content"
 msgstr "显示最近文章时间"
 
-#: functions.php:4617 functions.php:5263
+#: functions.php:4635 functions.php:5302
 #, fuzzy
 msgid "Show article summary in new window"
 msgstr "新窗口打开文章连结"
 
-#: functions.php:4650 functions.php:5187
+#: functions.php:4642 functions.php:5309
+#, fuzzy
+msgid "Publish article with a note"
+msgstr "发布文章"
+
+#: functions.php:4682 functions.php:5226
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:4656 functions.php:5193
+#: functions.php:4688 functions.php:5232
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4692 functions.php:5227
+#: functions.php:4724 functions.php:5266
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4694 functions.php:5229
+#: functions.php:4726 functions.php:5268
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4714 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
+#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: functions.php:4770
+#: functions.php:4802
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4839 mobile/functions.php:423
+#: functions.php:4871 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:5161
+#: functions.php:5193
 #, fuzzy
 msgid "Click to expand article"
 msgstr "星级文章"
 
-#: functions.php:5298
+#: functions.php:5327
+#, fuzzy
+msgid "toggle unread"
+msgstr "触发开关"
+
+#: functions.php:5346
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5301
+#: functions.php:5349
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5304
+#: functions.php:5352
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5308
+#: functions.php:5356
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5310 localized_js.php:92 offline.js:444
+#: functions.php:5358 localized_js.php:92 offline.js:444
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5984 tt-rss.php:206
+#: functions.php:6049 tt-rss.php:204
 #, fuzzy
 msgid "Create label..."
 msgstr "创建标记"
 
-#: functions.php:5997
+#: functions.php:6062
 #, fuzzy
 msgid "(remove)"
 msgstr "移除"
 
-#: functions.php:6041
+#: functions.php:6106
 msgid "no tags"
 msgstr "无标签"
 
+#: functions.php:6134
+msgid "edit note"
+msgstr ""
+
 #: localized_js.php:36
 msgid "Adding feed..."
 msgstr "添加feed中..."
@@ -583,17 +601,17 @@ msgstr "标记  %s 中所有访问过的主题为已读"
 msgid "Mark all articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:84 viewfeed.js:1212
+#: localized_js.php:84 viewfeed.js:1250
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:86 viewfeed.js:1885
+#: localized_js.php:86 viewfeed.js:1923
 #, fuzzy, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: localized_js.php:87 viewfeed.js:1251
+#: localized_js.php:87 viewfeed.js:1289
 #, fuzzy, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
@@ -606,17 +624,17 @@ msgstr "标记所有Feed未已读..."
 msgid "New password cannot be blank."
 msgstr "新密码不可留空."
 
-#: localized_js.php:90 viewfeed.js:1842
+#: localized_js.php:90 viewfeed.js:1880
 #, fuzzy
 msgid "No article is selected."
 msgstr "无选定文章。"
 
-#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
-#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
+#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
+#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
 msgid "No articles are selected."
 msgstr "无选定文章。"
 
-#: localized_js.php:93 viewfeed.js:1883
+#: localized_js.php:93 viewfeed.js:1921
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "未找到文章。"
@@ -630,7 +648,7 @@ msgstr "未选定分类。"
 msgid "No feeds are selected."
 msgstr "未选择feed."
 
-#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
+#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
 msgid "No feed selected."
 msgstr "无选定feed."
 
@@ -695,7 +713,7 @@ msgstr "请只选择一个用户."
 msgid "Please select some feed first."
 msgstr "请先选择若干feed"
 
-#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
+#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
 #, fuzzy
 msgid "Please wait..."
 msgstr "读取中，请等待..."
@@ -704,8 +722,8 @@ msgstr "读取中，请等待..."
 msgid "Please wait until operation finishes."
 msgstr ""
 
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
-#: viewfeed.js:631
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
+#: viewfeed.js:669
 msgid "Publish article"
 msgstr "发布文章"
 
@@ -856,7 +874,7 @@ msgstr "保存过滤器..."
 msgid "Saving user..."
 msgstr "保存用户..."
 
-#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
+#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
 #, fuzzy
 msgid "Star article"
 msgstr "星级文章"
@@ -936,12 +954,12 @@ msgstr "尝试更改e-mail..."
 msgid "Trying to change password..."
 msgstr "尝试更改密码..."
 
-#: localized_js.php:170 viewfeed.js:618
+#: localized_js.php:170 viewfeed.js:657
 #, fuzzy
 msgid "Unpublish article"
 msgstr "发布文章"
 
-#: localized_js.php:172 viewfeed.js:553
+#: localized_js.php:172 viewfeed.js:586
 #, fuzzy
 msgid "Unstar article"
 msgstr "星级文章"
@@ -987,8 +1005,8 @@ msgid ""
 "switch it into offline mode again. Go online?"
 msgstr ""
 
-#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
+#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
 #: mobile/functions.php:775
 msgid "Title"
 msgstr "标题"
@@ -1014,7 +1032,7 @@ msgstr ""
 msgid "Filter article"
 msgstr "过滤文章"
 
-#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "标记为已读"
 
@@ -1342,12 +1360,12 @@ msgstr "退出我的最爱"
 msgid "Logout"
 msgstr "注销"
 
-#: prefs.php:117
+#: prefs.php:117 tt-rss.php:208
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
 msgid "Preferences"
 msgstr "我的最爱"
 
@@ -1372,7 +1390,7 @@ msgstr "Feed 浏览器有限制"
 
 #: register.php:155 register.php:200 register.php:213 register.php:228
 #: register.php:246 register.php:331 register.php:341 register.php:353
-#: update.php:94 update.php:162 modules/pref-feeds.php:865
+#: update.php:94 update.php:162 modules/pref-feeds.php:869
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回Tiny Tiny RSS"
 
@@ -1472,122 +1490,117 @@ msgstr "移除feed中..."
 msgid "Search..."
 msgstr "搜索"
 
-#: tt-rss.php:193
+#: tt-rss.php:191
 msgid "Feed actions:"
 msgstr "Feed 操作："
 
-#: tt-rss.php:194
+#: tt-rss.php:192
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "订阅feed"
 
-#: tt-rss.php:195
+#: tt-rss.php:193
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "输入feed"
 
-#: tt-rss.php:196
+#: tt-rss.php:194
 #, fuzzy
 msgid "Clear articles"
 msgstr "过滤文章"
 
-#: tt-rss.php:197
+#: tt-rss.php:195
 #, fuzzy
 msgid "Rescore feed"
 msgstr "移除feed中..."
 
-#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
+#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: tt-rss.php:200
+#: tt-rss.php:198
 msgid "All feeds:"
 msgstr "所有feed:"
 
-#: tt-rss.php:202 help/3.php:44
+#: tt-rss.php:200 help/3.php:44
 #, fuzzy
 msgid "(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 
-#: tt-rss.php:204
+#: tt-rss.php:202
 msgid "Other actions:"
 msgstr "其他操作:"
 
-#: tt-rss.php:207
+#: tt-rss.php:205
 #, fuzzy
 msgid "Create filter..."
 msgstr "创建过滤器"
 
-#: tt-rss.php:208
+#: tt-rss.php:206
 #, fuzzy
 msgid "Reset UI layout"
 msgstr "&nbsp;&nbsp;订阅feed"
 
-#: tt-rss.php:209
+#: tt-rss.php:207
 #, fuzzy
 msgid "Reset category order"
 msgstr "移除选定分类?"
 
-#: tt-rss.php:210
-#, fuzzy
-msgid "&nbsp;&nbsp;Keyboard shortcuts"
-msgstr "&nbsp;&nbsp;创建过滤器"
-
-#: tt-rss.php:219
+#: tt-rss.php:218
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "隐藏我的Feed列表"
 
-#: tt-rss.php:221
+#: tt-rss.php:220
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:229 mobile/functions.php:738
+#: tt-rss.php:228 mobile/functions.php:738
 msgid "Search:"
 msgstr "搜索:"
 
-#: tt-rss.php:237 mobile/functions.php:456
+#: tt-rss.php:236 mobile/functions.php:456
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:238 mobile/functions.php:457
+#: tt-rss.php:237 mobile/functions.php:457
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:241
+#: tt-rss.php:240
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
+#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
 #: mobile/functions.php:501 mobile/functions.php:504
 msgid "Updated"
 msgstr "已更新"
 
-#: tt-rss.php:245
+#: tt-rss.php:244
 #, fuzzy
 msgid "Order:"
 msgstr "地点:"
 
-#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
 #: modules/pref-filters.php:461
 #, fuzzy
 msgid "Date"
 msgstr "更新"
 
-#: tt-rss.php:251
+#: tt-rss.php:250
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:255
+#: tt-rss.php:254
 msgid "Limit:"
 msgstr "限制:"
 
-#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
 #: mobile/functions.php:436
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:298
+#: tt-rss.php:297
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1785,7 +1798,7 @@ msgstr "取消"
 
 #: modules/popup-dialog.php:140 modules/popup-dialog.php:152
 #: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
 #: modules/pref-labels.php:130 modules/pref-users.php:363
 #: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
 #: mobile/functions.php:783
@@ -1814,11 +1827,6 @@ msgstr "本feed"
 msgid "Create Filter"
 msgstr "创建过滤器"
 
-#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
-#: modules/pref-filters.php:39 modules/pref-filters.php:96
-msgid "description"
-msgstr "描述"
-
 #: modules/popup-dialog.php:245 modules/pref-filters.php:42
 #: modules/pref-filters.php:402
 msgid "Match"
@@ -1987,172 +1995,172 @@ msgstr ""
 msgid "Multiple Feed Editor"
 msgstr "Feed编辑"
 
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
+#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:836
+#: modules/pref-feeds.php:840
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:842
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:860
+#: modules/pref-feeds.php:864
 msgid "Edit subscription options"
 msgstr ""
 
-#: modules/pref-feeds.php:946
+#: modules/pref-feeds.php:950
 msgid "Category editor"
 msgstr "分类编辑"
 
-#: modules/pref-feeds.php:969
+#: modules/pref-feeds.php:973
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "分类 <b>$%s</b>已经存在."
 
-#: modules/pref-feeds.php:997
+#: modules/pref-feeds.php:1004
 msgid "Unable to delete non empty feed categories."
 msgstr "不能删除非空分类。"
 
-#: modules/pref-feeds.php:1014
+#: modules/pref-feeds.php:1021
 msgid "Create category"
 msgstr "创建分类"
 
-#: modules/pref-feeds.php:1074
+#: modules/pref-feeds.php:1081
 msgid "No feed categories defined."
 msgstr "未定义feed分类"
 
-#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
 #: modules/pref-filters.php:505 modules/pref-labels.php:225
 #: modules/pref-users.php:474
 msgid "Remove"
 msgstr "移除"
 
-#: modules/pref-feeds.php:1107
+#: modules/pref-feeds.php:1114
 msgid "Some feeds have update errors (click for details)"
 msgstr "有些feed更新错误(点击了解详情) "
 
-#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1136 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "订阅feed"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1141
 #, fuzzy
 msgid "More Feeds"
 msgstr "移除feed中..."
 
-#: modules/pref-feeds.php:1208
+#: modules/pref-feeds.php:1215
 msgid "Show last article times"
 msgstr "显示最近文章时间"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
+#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
 msgid "Last&nbsp;Article"
 msgstr "最后&nbsp;文章"
 
-#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
 #: modules/pref-users.php:449
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1320
+#: modules/pref-feeds.php:1327
 msgid "(Hidden)"
 msgstr ""
 
-#: modules/pref-feeds.php:1333
+#: modules/pref-feeds.php:1340
 #, php-format
 msgid "(linked to %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: modules/pref-feeds.php:1365
+#: modules/pref-feeds.php:1372
 msgid "Recategorize"
 msgstr "再分类"
 
-#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
 #: modules/pref-users.php:472
 msgid "Edit"
 msgstr "编辑"
 
-#: modules/pref-feeds.php:1378
+#: modules/pref-feeds.php:1384
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1382
+#: modules/pref-feeds.php:1388
 #, fuzzy
 msgid "Clear feed data"
 msgstr "所有Feed已更新。"
 
-#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
 #, fuzzy
 msgid "Rescore articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1389
+#: modules/pref-feeds.php:1396
 #, fuzzy
 msgid "Other:"
 msgstr "地点:"
 
-#: modules/pref-feeds.php:1390
+#: modules/pref-feeds.php:1397
 msgid "Edit categories"
 msgstr "编辑分类"
 
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1406
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1410
 #, fuzzy
 msgid "File:"
 msgstr "标题:"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1413
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1411
+#: modules/pref-feeds.php:1420
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1414
+#: modules/pref-feeds.php:1423
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1416
+#: modules/pref-feeds.php:1425
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1429
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1438
 #, fuzzy
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
 
-#: modules/pref-feeds.php:1433
+#: modules/pref-feeds.php:1442
 #, fuzzy
 msgid "Link to published articles feed."
 msgstr "已发布文章"
 
-#: modules/pref-feeds.php:1436
+#: modules/pref-feeds.php:1445
 #, fuzzy
 msgid "Generate another link"
 msgstr "生成另一个地址"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1511
 #, fuzzy
 msgid "No feeds found."
 msgstr "无feed可订阅。"
@@ -2176,15 +2184,6 @@ msgstr "创建过滤器 <b>%s</b>"
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: modules/pref-filters.php:392
-msgid "filter_type_descr"
-msgstr ""
-
-#: modules/pref-filters.php:393
-#, fuzzy
-msgid "action_description"
-msgstr "描述"
-
 #: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
@@ -2330,10 +2329,6 @@ msgstr "选择模板"
 msgid "Change theme"
 msgstr "更改模板"
 
-#: modules/pref-prefs.php:388
-msgid "short_desc"
-msgstr "short_desc"
-
 #: modules/pref-prefs.php:400 modules/pref-prefs.php:405
 msgid "Yes"
 msgstr "是"
@@ -2726,6 +2721,31 @@ msgstr "匹配:"
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#: viewfeed.js:2193
+#, fuzzy
+msgid "Please enter a note for this article:"
+msgstr "请输入标签主题"
+
+#~ msgid "This program requires XmlHttpRequest "
+#~ msgstr "本程序需要xmlhttprequest支持"
+
+#~ msgid "This program requires cookies "
+#~ msgstr "本程序需要开启cookies"
+
+#, fuzzy
+#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
+#~ msgstr "&nbsp;&nbsp;创建过滤器"
+
+#~ msgid "description"
+#~ msgstr "描述"
+
+#, fuzzy
+#~ msgid "action_description"
+#~ msgstr "描述"
+
+#~ msgid "short_desc"
+#~ msgstr "short_desc"
+
 #~ msgid "display tags"
 #~ msgstr "显示标签"
 
@@ -2750,9 +2770,6 @@ msgstr ""
 #~ msgid "Address changed."
 #~ msgstr "地址已经变更"
 
-#~ msgid "Please enter label title:"
-#~ msgstr "请输入标签主题"
-
 #, fuzzy
 #~ msgid "Rescoring feeds..."
 #~ msgstr "移除feed中..."
author	Andrew Dolgov <[email protected]>	2009-03-27 20:20:29 +0300
committer	Andrew Dolgov <[email protected]>	2009-03-27 20:20:29 +0300
commit	e117ab70006c5d04901b4c21aa7ef951c8f657aa (patch)
tree	4de9d1a2f8f48b07ae6a95f5cf7cb26e8a2b46c8 /locale
parent	5c42194978a6938773a09c9472cee5947242d245 (diff)