diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 8f8a9fd34..791d85e15 100644
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index edc950a7a..e54426b4c 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-01-18 15:24+0300\n"
+"POT-Creation-Date: 2009-01-19 11:56+0300\n"
 "PO-Revision-Date: 2007-11-20 23:01+0100\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -81,7 +81,7 @@ msgstr "Une fois par jour"
 msgid "Weekly"
 msgstr "Une fois par semaine"
 
-#: backend.php:122 tt-rss.php:203 modules/pref-prefs.php:312
+#: backend.php:122 tt-rss.php:206 modules/pref-prefs.php:312
 msgid "Default"
 msgstr "Utiliser la valeur par défaut"
 
@@ -172,137 +172,144 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2883 modules/popup-dialog.php:175
-#: modules/pref-filters.php:405 mobile/functions.php:735
+#: functions.php:2847 modules/popup-dialog.php:175
+#: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
-#: functions.php:4378 modules/pref-feeds.php:1244
+#: functions.php:2876 functions.php:2915 functions.php:3304 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1237
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2941 functions.php:3508 mobile/functions.php:33
+#: functions.php:2905 functions.php:3500 mobile/functions.php:33
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
+#: functions.php:2907 functions.php:3333 functions.php:3502 prefs.php:144
+#: mobile/functions.php:83
 msgid "Labels"
 msgstr "Intitulé"
 
-#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
-#: mobile/functions.php:52
+#: functions.php:2925 functions.php:3326 functions.php:4205 help/3.php:57
+#: mobile/functions.php:61
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2963 functions.php:3344 functions.php:4212
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+#: functions.php:2927 functions.php:3330 functions.php:4212
+#: modules/pref-feeds.php:1406 help/3.php:59 mobile/functions.php:70
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
-#: mobile/functions.php:43
+#: functions.php:2929 functions.php:3336 functions.php:4190 help/3.php:58
+#: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: functions.php:3305 functions.php:3307
+#: functions.php:2931 functions.php:3339 functions.php:4183
+#: mobile/functions.php:43
+#, fuzzy
+msgid "All articles"
+msgstr "Tous les articles"
+
+#: functions.php:3290 functions.php:3292
 msgid "Search results"
 msgstr "Résultats de recherche"
 
-#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
-#: functions.php:3348 functions.php:3356
+#: functions.php:3308 functions.php:3321 functions.php:3327 functions.php:3331
+#: functions.php:3337 functions.php:3340 functions.php:3348
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:3989 functions.php:4045 functions.php:5368
-#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
-#: modules/pref-labels.php:136 modules/pref-users.php:408
+#: functions.php:3981 functions.php:4037 functions.php:5374
+#: modules/pref-feeds.php:1018 modules/pref-feeds.php:1199
+#: modules/pref-filters.php:366 modules/pref-labels.php:138
+#: modules/pref-users.php:408
 msgid "Select:"
 msgstr "Sélectionner&nbsp;:"
 
-#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
-#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
-#: modules/pref-users.php:409 mobile/functions.php:561
+#: functions.php:3982 functions.php:4038 modules/pref-feeds.php:1019
+#: modules/pref-feeds.php:1200 modules/pref-filters.php:367
+#: modules/pref-labels.php:139 modules/pref-users.php:409
+#: mobile/functions.php:570
 msgid "All"
 msgstr "Tout"
 
-#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
-#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
+#: functions.php:3983 functions.php:3989 functions.php:4039 functions.php:4042
+#: tt-rss.php:198 mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3992 mobile/functions.php:564
+#: functions.php:3984 mobile/functions.php:573
 #, fuzzy
 msgid "Invert"
 msgstr "(Inverse)"
 
-#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
-#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
-#: modules/pref-users.php:410 mobile/functions.php:563
+#: functions.php:3985 functions.php:4040 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:1201 modules/pref-filters.php:368
+#: modules/pref-labels.php:140 modules/pref-users.php:410
+#: mobile/functions.php:572
 msgid "None"
 msgstr "Aucun"
 
-#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3987 tt-rss.php:147 modules/pref-feeds.php:1360
 msgid "Actions..."
 msgstr "Actions..."
 
-#: functions.php:3996
+#: functions.php:3988
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Sélection&nbsp;:"
 
-#: functions.php:3998 functions.php:4051 tt-rss.php:195
-#: mobile/functions.php:450
+#: functions.php:3990 functions.php:4043 tt-rss.php:197
+#: mobile/functions.php:459
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:3999
+#: functions.php:3991
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:4001 functions.php:4053
+#: functions.php:3993 functions.php:4045
 msgid "Mark as read:"
 msgstr "Marquer comme lu&nbsp;:"
 
-#: functions.php:4002 mobile/functions.php:569
+#: functions.php:3994 mobile/functions.php:578
 msgid "Selection"
 msgstr "La sélection"
 
-#: functions.php:4016 mobile/functions.php:571
+#: functions.php:4008 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "Tout le flux"
 
-#: functions.php:4019
+#: functions.php:4011
 #, fuzzy
 msgid "Assign label:"
 msgstr "Attribuer des étiquettes"
 
-#: functions.php:4031
+#: functions.php:4023
 #, fuzzy
 msgid "(remove)"
 msgstr "Supprimer"
 
-#: functions.php:4050
+#: functions.php:4042
 msgid "Toggle:"
 msgstr "Marquages spéciaux&nbsp;:"
 
-#: functions.php:4054 mobile/functions.php:570
+#: functions.php:4046 mobile/functions.php:579
 msgid "Page"
 msgstr "Page"
 
-#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:395
+#: functions.php:4047 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:403
 msgid "Feed"
 msgstr "Flux"
 
-#: functions.php:4096
+#: functions.php:4088
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:4145
+#: functions.php:4137
 msgid "Click to collapse category"
 msgstr ""
 
@@ -314,56 +321,56 @@ msgstr "Aucun flux à afficher."
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:4657
+#: functions.php:4651
 #, fuzzy
 msgid " - "
 msgstr "- par "
 
-#: functions.php:4716 functions.php:4717
+#: functions.php:4706 functions.php:4707
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:4724
+#: functions.php:4714
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4732
+#: functions.php:4722
 #, fuzzy
 msgid "Display original article content"
 msgstr "Afficher l'heure du dernier article"
 
-#: functions.php:4739 functions.php:5378
+#: functions.php:4729 functions.php:5384
 #, fuzzy
 msgid "Show article summary in new window"
 msgstr "Ouvrir les liens des articles dans une nouvelle fenêtre"
 
-#: functions.php:4775 functions.php:5302
+#: functions.php:4765 functions.php:5308
 #, fuzzy
 msgid "unknown type"
 msgstr "Erreur inconnue"
 
-#: functions.php:4781 functions.php:5308
+#: functions.php:4771 functions.php:5314
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4817 functions.php:5342
+#: functions.php:4807 functions.php:5348
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4819 functions.php:5344
+#: functions.php:4809 functions.php:5350
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
+#: functions.php:4829 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1069
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: functions.php:4895 modules/pref-feed-browser.php:75
+#: functions.php:4885 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:4964 mobile/functions.php:414
+#: functions.php:4954 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -371,79 +378,37 @@ 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:5077
-msgid "(Click to change)"
-msgstr ""
-
-#: functions.php:5276
+#: functions.php:5282
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Articles mémorisés"
 
-#: functions.php:5440
+#: functions.php:5442
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Aucun article à marquer"
 
-#: functions.php:5443
+#: functions.php:5445
+#, fuzzy
+msgid "No updated articles found to display."
+msgstr "Aucun article à marquer"
+
+#: functions.php:5448
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Aucun article à marquer"
 
-#: functions.php:5446
+#: functions.php:5452
+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:5454
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Aucun article à marquer"
 
-#: functions.php:5793
-#, fuzzy
-msgid "Match "
-msgstr "Correspondance"
-
-#: functions.php:5801
-#, fuzzy
-msgid "Unread articles"
-msgstr "Articles mémorisés"
-
-#: functions.php:5802
-#, fuzzy
-msgid "Updated articles"
-msgstr "Articles mémorisés"
-
-#: functions.php:5803
-#, fuzzy
-msgid "Title contains"
-msgstr "Titre ou contenu"
-
-#: functions.php:5804
-#, fuzzy
-msgid "Content contains"
-msgstr "Filtrage de contenu"
-
-#: functions.php:5805
-msgid "Score equals"
-msgstr ""
-
-#: functions.php:5806
-msgid "Score is greater than"
-msgstr ""
-
-#: functions.php:5807
-msgid "Score is less than"
-msgstr ""
-
-#: functions.php:5808
-msgid "Articles newer than X hours"
-msgstr ""
-
-#: functions.php:5809
-msgid "Articles newer than X days"
-msgstr ""
-
-#: functions.php:5818
-msgid "Add"
-msgstr ""
-
 #: localized_js.php:35
 msgid "display feeds"
 msgstr "afficher les flux"
@@ -650,7 +615,7 @@ msgstr "Impossible de mettre à jour l'en-têtes (objet XML manquant)"
 msgid "Could not display article (missing XML object)"
 msgstr "Impossible d'afficher l'article (objet XML manquant)"
 
-#: localized_js.php:95 tt-rss.php:249 tt-rss.php:262
+#: localized_js.php:95 tt-rss.php:252 tt-rss.php:265
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
@@ -830,9 +795,9 @@ msgstr "Aucun article sélectionné."
 msgid "Saving feeds..."
 msgstr "Enregistrement d'un flux..."
 
-#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:766
+#: localized_schema.php:9 tt-rss.php:208 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1212 modules/pref-feeds.php:1273
+#: mobile/functions.php:775
 msgid "Title"
 msgstr "Titre"
 
@@ -845,7 +810,7 @@ msgid "Link"
 msgstr "Lien"
 
 #: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:767
+#: mobile/functions.php:776
 msgid "Content"
 msgstr "Contenu"
 
@@ -857,7 +822,7 @@ msgstr ""
 msgid "Filter article"
 msgstr "Filtrer l'article"
 
-#: localized_schema.php:16 mobile/functions.php:574
+#: localized_schema.php:16 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
@@ -1400,11 +1365,10 @@ msgid "tag cloud"
 msgstr "Nuage d'étiquettes"
 
 #: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
-#: modules/pref-labels.php:103 modules/pref-users.php:364
-#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
-#: mobile/functions.php:774
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:1114
+#: modules/pref-filters.php:307 modules/pref-labels.php:105
+#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:435
+#: mobile/functions.php:729 mobile/functions.php:783
 msgid "Search"
 msgstr "Rechercher"
 
@@ -1449,75 +1413,85 @@ msgstr "(Dé)Masquer les flux lus"
 msgid "Other actions:"
 msgstr "Autres actions&nbsp;:"
 
-#: tt-rss.php:163
+#: tt-rss.php:164
+#, fuzzy
+msgid "&nbsp;&nbsp;Create label"
+msgstr "&nbsp;&nbsp;Créer un filtre"
+
+#: tt-rss.php:165
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Créer un filtre"
 
-#: tt-rss.php:164
+#: tt-rss.php:166
 #, fuzzy
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;S'inscrire à ce flux"
 
-#: tt-rss.php:165
+#: tt-rss.php:167
 #, fuzzy
 msgid "&nbsp;&nbsp;Reset category order"
 msgstr "&nbsp;&nbsp;S'inscrire à ce flux"
 
-#: tt-rss.php:167
+#: tt-rss.php:169
 #, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Purger les articles"
 
-#: tt-rss.php:175
+#: tt-rss.php:177
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
 
-#: tt-rss.php:177
+#: tt-rss.php:179
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:185 mobile/functions.php:729
+#: tt-rss.php:187 mobile/functions.php:738
 msgid "Search:"
 msgstr "Rechercher&nbsp;:"
 
-#: tt-rss.php:193 mobile/functions.php:447
+#: tt-rss.php:195 mobile/functions.php:456
 msgid "Adaptive"
 msgstr "Adaptatif"
 
-#: tt-rss.php:194 mobile/functions.php:448
+#: tt-rss.php:196 mobile/functions.php:457
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: tt-rss.php:197
+#: tt-rss.php:199
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:200
+#: tt-rss.php:200 modules/pref-feeds.php:1218 modules/pref-feeds.php:1281
+#: mobile/functions.php:501 mobile/functions.php:504
+msgid "Updated"
+msgstr "Mis à jour"
+
+#: tt-rss.php:203
 #, fuzzy
 msgid "Order:"
 msgstr "Autre&nbsp;:"
 
-#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:435
+#: tt-rss.php:207 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: modules/pref-filters.php:443
 #, fuzzy
 msgid "Date"
 msgstr "Mettre à jour"
 
-#: tt-rss.php:206
+#: tt-rss.php:209
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:210
+#: tt-rss.php:213
 msgid "Limit:"
 msgstr "Limite&nbsp;:"
 
-#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:427
+#: tt-rss.php:238 modules/pref-feeds.php:261 modules/pref-feeds.php:451
+#: mobile/functions.php:436
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: tt-rss.php:253
+#: tt-rss.php:256
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1686,7 +1660,7 @@ msgid "Subscribe"
 msgstr "S'inscrire"
 
 #: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
 #: modules/pref-feeds.php:130 modules/pref-feeds.php:395
 #: modules/pref-feeds.php:546 modules/pref-filters.php:166
 #: modules/pref-users.php:184
@@ -1698,7 +1672,7 @@ msgstr "Annuler"
 msgid "match on:"
 msgstr "Correspondance sur&nbsp;:"
 
-#: modules/popup-dialog.php:167 mobile/functions.php:768
+#: modules/popup-dialog.php:167 mobile/functions.php:777
 msgid "Title or content"
 msgstr "Titre ou contenu"
 
@@ -1706,113 +1680,113 @@ msgstr "Titre ou contenu"
 msgid "Limit search to:"
 msgstr ""
 
-#: modules/popup-dialog.php:188 mobile/functions.php:748
+#: modules/popup-dialog.php:188 mobile/functions.php:757
 msgid "This feed"
 msgstr "Ce flux"
 
-#: modules/popup-dialog.php:288
+#: modules/popup-dialog.php:226
 #, fuzzy
 msgid "Create Filter"
 msgstr "Créer un filtre"
 
-#: modules/popup-dialog.php:306 modules/popup-dialog.php:405
+#: 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:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:394
+#: modules/popup-dialog.php:245 modules/pref-filters.php:42
+#: modules/pref-filters.php:402
 msgid "Match"
 msgstr "Correspondance"
 
-#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:425
+#: modules/popup-dialog.php:253 modules/pref-filters.php:54
+#: modules/pref-filters.php:433
 msgid "before"
 msgstr ""
 
-#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:426
+#: modules/popup-dialog.php:254 modules/pref-filters.php:55
+#: modules/pref-filters.php:434
 #, fuzzy
 msgid "after"
 msgstr "Mettre à jour"
 
-#: modules/popup-dialog.php:380 modules/pref-filters.php:70
+#: modules/popup-dialog.php:268 modules/pref-filters.php:70
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:383 modules/pref-filters.php:73
+#: modules/popup-dialog.php:271 modules/pref-filters.php:73
 #, fuzzy
 msgid "on field"
 msgstr "Sur le champ&nbsp;:"
 
-#: modules/popup-dialog.php:389 modules/pref-filters.php:79
+#: modules/popup-dialog.php:277 modules/pref-filters.php:79
 #, fuzzy
 msgid "in"
 msgstr "Lien"
 
-#: modules/popup-dialog.php:394 modules/pref-filters.php:84
+#: modules/popup-dialog.php:282 modules/pref-filters.php:84
 #, fuzzy
 msgid "Perform Action"
 msgstr "Exécuter les mises à jour"
 
-#: modules/popup-dialog.php:411 modules/pref-filters.php:104
+#: modules/popup-dialog.php:299 modules/pref-filters.php:104
 msgid "with parameters:"
 msgstr ""
 
-#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:308
 #: modules/pref-feeds.php:500 modules/pref-filters.php:123
 #: modules/pref-users.php:165
 #, fuzzy
 msgid "Options"
 msgstr "Options&nbsp;:"
 
-#: modules/popup-dialog.php:427 modules/pref-filters.php:135
+#: modules/popup-dialog.php:318 modules/pref-filters.php:135
 msgid "Enabled"
 msgstr "Activé"
 
-#: modules/popup-dialog.php:430 modules/pref-filters.php:144
+#: modules/popup-dialog.php:321 modules/pref-filters.php:144
 msgid "Inverse match"
 msgstr "Correspondance inverse"
 
-#: modules/popup-dialog.php:442
+#: modules/popup-dialog.php:333
 msgid "Create"
 msgstr "Créer"
 
-#: modules/popup-dialog.php:457
+#: modules/popup-dialog.php:348
 msgid "Update Errors"
 msgstr "Erreurs de mise à jour"
 
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:351
 msgid "These feeds have not been updated because of errors:"
 msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs&nbsp;:"
 
-#: modules/popup-dialog.php:478
+#: modules/popup-dialog.php:369
 msgid "Close"
 msgstr "Fermer"
 
-#: modules/popup-dialog.php:487
+#: modules/popup-dialog.php:378
 msgid "Edit Tags"
 msgstr "Modifier les étiquettes"
 
-#: modules/popup-dialog.php:492
+#: modules/popup-dialog.php:383
 msgid "Tags for this article (separated by commas):"
 msgstr "Étiquettes pour cet article (séparées par des virgules)&nbsp;:"
 
-#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:393
 #: modules/pref-feeds.php:544 modules/pref-filters.php:162
 #: modules/pref-users.php:181
 msgid "Save"
 msgstr "Enregistrer"
 
-#: modules/popup-dialog.php:550 help/3.php:60
+#: modules/popup-dialog.php:441 help/3.php:60
 msgid "Tag cloud"
 msgstr "Nuage d'étiquettes"
 
-#: modules/popup-dialog.php:553
+#: modules/popup-dialog.php:444
 msgid "Showing most popular tags "
 msgstr "Affichage des étiquettes les plus populaires "
 
-#: modules/popup-dialog.php:554
+#: modules/popup-dialog.php:445
 msgid "browse more"
 msgstr "en afficher plus"
 
@@ -1929,7 +1903,7 @@ msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 msgid "Cache images locally"
 msgstr "Enregistrer localement les images"
 
-#: modules/pref-feeds.php:390 modules/pref-feeds.php:1374
+#: modules/pref-feeds.php:390 modules/pref-feeds.php:1367
 msgid "Unsubscribe"
 msgstr "Se désinscrire"
 
@@ -1938,134 +1912,129 @@ msgstr "Se désinscrire"
 msgid "Multiple Feed Editor"
 msgstr "Éditeur de flux"
 
-#: modules/pref-feeds.php:781 modules/pref-feeds.php:828
+#: modules/pref-feeds.php:774 modules/pref-feeds.php:821
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:859
+#: modules/pref-feeds.php:852
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Inscrit à <b>%s</b>."
 
-#: modules/pref-feeds.php:861
+#: modules/pref-feeds.php:854
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Déjà inscrit à <b>%s</b>."
 
-#: modules/pref-feeds.php:943
+#: modules/pref-feeds.php:936
 msgid "Category editor"
 msgstr "Éditeur de catégorie"
 
-#: modules/pref-feeds.php:966
+#: modules/pref-feeds.php:959
 #, 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:994
+#: modules/pref-feeds.php:987
 msgid "Unable to delete non empty feed categories."
 msgstr "Impossible de supprimer une catégorie de flux non vide."
 
-#: modules/pref-feeds.php:1011
+#: modules/pref-feeds.php:1004
 msgid "Create category"
 msgstr "Créer la catégorie"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1064
 msgid "No feed categories defined."
 msgstr "Aucune catégorie de flux définie."
 
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
-#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
-#: modules/pref-labels.php:176 modules/pref-users.php:481
+#: modules/pref-feeds.php:1075 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:178
+#: modules/pref-users.php:481
 msgid "Remove"
 msgstr "Supprimer"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1097
 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:1126 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1119 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "S'inscrire à un flux"
 
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1124
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:1205
+#: modules/pref-feeds.php:1198
 msgid "Show last article times"
 msgstr "Afficher l'heure du dernier article"
 
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1284
+#: modules/pref-feeds.php:1215 modules/pref-feeds.php:1277
 msgid "Last&nbsp;Article"
 msgstr "Dernier&nbsp;article"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:492 mobile/functions.php:495
-msgid "Updated"
-msgstr "Mis à jour"
-
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
-#: modules/pref-labels-old.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1302 modules/pref-filters.php:461
+#: modules/pref-users.php:456
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1369
+#: modules/pref-feeds.php:1348 modules/pref-feeds.php:1362
 msgid "Selection:"
 msgstr "Sélection&nbsp;:"
 
-#: modules/pref-feeds.php:1361
+#: modules/pref-feeds.php:1354
 msgid "Recategorize"
 msgstr "Changer de catégorie"
 
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
-#: modules/pref-labels-old.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1363 modules/pref-filters.php:485
+#: modules/pref-users.php:479
 msgid "Edit"
 msgstr "Modifier"
 
-#: modules/pref-feeds.php:1371
+#: modules/pref-feeds.php:1364
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
+#: modules/pref-feeds.php:1366 modules/pref-filters.php:324
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Articles mémorisés"
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1372
 msgid "Other:"
 msgstr "Autre&nbsp;:"
 
-#: modules/pref-feeds.php:1380
+#: modules/pref-feeds.php:1373
 msgid "Edit categories"
 msgstr "Modifier les catégories"
 
-#: modules/pref-feeds.php:1387
+#: modules/pref-feeds.php:1380
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1384
 msgid "File:"
 msgstr "Fichier&nbsp;:"
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1387
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1394
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1397
 msgid "Firefox Integration"
 msgstr "Intégration à Firefox"
 
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1399
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2073,11 +2042,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:1410
+#: modules/pref-feeds.php:1403
 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:1419
+#: modules/pref-feeds.php:1412
 #, fuzzy
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
@@ -2086,12 +2055,12 @@ 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:1423
+#: modules/pref-feeds.php:1416
 #, fuzzy
 msgid "Link to published articles feed."
 msgstr "Articles publiés"
 
-#: modules/pref-feeds.php:1426
+#: modules/pref-feeds.php:1419
 #, fuzzy
 msgid "Generate another link"
 msgstr "Générer une autre adresse"
@@ -2106,104 +2075,64 @@ msgstr "Éditeur de filtre"
 msgid "Saved filter <b>%s</b>"
 msgstr "Filtre <b>%s</b> enregistré"
 
-#: modules/pref-filters.php:256
+#: modules/pref-filters.php:264
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filtre <b>%s</b> créé"
 
-#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:317 help/3.php:31 help/4.php:25
 msgid "Create filter"
 msgstr "Créer un filtre"
 
-#: modules/pref-filters.php:384
+#: modules/pref-filters.php:392
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:385
+#: modules/pref-filters.php:393
 msgid "action_description"
 msgstr ""
 
-#: modules/pref-filters.php:396
+#: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
 msgstr "Flux"
 
-#: modules/pref-filters.php:397
+#: modules/pref-filters.php:405
 #, fuzzy
 msgid "Params"
 msgstr "Paramètres&nbsp;:"
 
-#: modules/pref-filters.php:442
+#: modules/pref-filters.php:450
 msgid "(Disabled)"
 msgstr "(Désactivé)"
 
-#: modules/pref-filters.php:458
+#: modules/pref-filters.php:466
 msgid "(Inverse)"
 msgstr "(Inverse)"
 
-#: modules/pref-filters.php:487
+#: modules/pref-filters.php:495
 msgid "No filters defined."
 msgstr "Aucun filtre défini."
 
-#: modules/pref-filters.php:489
+#: modules/pref-filters.php:497
 #, fuzzy
 msgid "No matching filters found."
 msgstr "Aucun article trouvé."
 
-#: modules/pref-labels-old.php:9
-msgid ""
-"Sorry, labels have been administratively disabled for this installation. "
-"Please contact instance owner or edit configuration file to enable this "
-"functionality."
-msgstr ""
-
-#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
-#: modules/pref-labels.php:143
-msgid "Caption"
-msgstr "Descriptif"
-
-#: modules/pref-labels-old.php:46
-#, fuzzy
-msgid "Match SQL"
-msgstr "Correspondance"
-
-#: modules/pref-labels-old.php:68
-#, fuzzy
-msgid "Help"
-msgstr "Bonjour,"
-
-#: modules/pref-labels-old.php:99
-msgid "Error: SQL expression is blank."
-msgstr ""
-
-#: modules/pref-labels-old.php:179
-#, php-format
-msgid "Saved label <b>%s</b>"
-msgstr "Intitulé <b>%s</b> enregistré"
-
-#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
+#: modules/pref-labels.php:75
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Intitulé <b>%s</b> créé"
 
-#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
+#: modules/pref-labels.php:113 help/4.php:26
 msgid "Create label"
 msgstr "Créer un intitulé"
 
-#: modules/pref-labels-old.php:283
-msgid "SQL Expression"
-msgstr "Expression SQL"
-
-#: modules/pref-labels-old.php:308
-#, fuzzy
-msgid "[No caption]"
-msgstr "Descriptif"
-
-#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
+#: modules/pref-labels.php:184
 msgid "No labels defined."
 msgstr "Aucun intitulé défini."
 
-#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
+#: modules/pref-labels.php:186
 #, fuzzy
 msgid "No matching labels found."
 msgstr "Aucun article trouvé."
@@ -2418,41 +2347,6 @@ msgstr "Aucun filtre défini."
 msgid "No matching users found."
 msgstr "Aucun article trouvé."
 
-#: help/1.php:1
-#, fuzzy
-msgid "Labels and SQL Expressions"
-msgstr "Expression SQL"
-
-#: help/1.php:3
-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 ""
-
-#: help/1.php:5
-msgid "Examples"
-msgstr ""
-
-#: help/1.php:7
-#, fuzzy
-msgid "Match all unread articles:"
-msgstr "Articles mémorisés"
-
-#: help/1.php:11
-msgid "Matches all articles which mention Linux in the title:"
-msgstr ""
-
-#: help/1.php:15
-msgid "Matches all articles for the last week (PostgreSQL):"
-msgstr ""
-
-#: help/1.php:19
-msgid "Matches all articles with scores between 100 and 500:"
-msgstr ""
-
 #: help/2.php:1
 #, fuzzy
 msgid "Content filtering"
@@ -2677,32 +2571,32 @@ msgstr "Flux"
 msgid "View tags"
 msgstr "Modifier les étiquettes"
 
-#: mobile/functions.php:425
+#: mobile/functions.php:434
 msgid "Back"
 msgstr ""
 
-#: mobile/functions.php:435
+#: mobile/functions.php:444
 msgid "View:"
 msgstr "Afficher&nbsp;:"
 
-#: mobile/functions.php:457
+#: mobile/functions.php:466
 msgid "Refresh"
 msgstr ""
 
-#: mobile/functions.php:689
+#: mobile/functions.php:698
 #, fuzzy
 msgid "Tags:"
 msgstr "Étiquettes"
 
-#: mobile/functions.php:721
+#: mobile/functions.php:730
 msgid "Go back"
 msgstr ""
 
-#: mobile/functions.php:732
+#: mobile/functions.php:741
 msgid "Where:"
 msgstr "Emplacement&nbsp;:"
 
-#: mobile/functions.php:763
+#: mobile/functions.php:772
 #, fuzzy
 msgid "Match on:"
 msgstr "Correspondance sur&nbsp;:"
@@ -2711,6 +2605,55 @@ msgstr "Correspondance sur&nbsp;:"
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Match "
+#~ msgstr "Correspondance"
+
+#, fuzzy
+#~ msgid "Unread articles"
+#~ msgstr "Articles mémorisés"
+
+#, fuzzy
+#~ msgid "Updated articles"
+#~ msgstr "Articles mémorisés"
+
+#, fuzzy
+#~ msgid "Title contains"
+#~ msgstr "Titre ou contenu"
+
+#, fuzzy
+#~ msgid "Content contains"
+#~ msgstr "Filtrage de contenu"
+
+#~ msgid "Caption"
+#~ msgstr "Descriptif"
+
+#, fuzzy
+#~ msgid "Match SQL"
+#~ msgstr "Correspondance"
+
+#, fuzzy
+#~ msgid "Help"
+#~ msgstr "Bonjour,"
+
+#~ msgid "Saved label <b>%s</b>"
+#~ msgstr "Intitulé <b>%s</b> enregistré"
+
+#~ msgid "SQL Expression"
+#~ msgstr "Expression SQL"
+
+#, fuzzy
+#~ msgid "[No caption]"
+#~ msgstr "Descriptif"
+
+#, fuzzy
+#~ msgid "Labels and SQL Expressions"
+#~ msgstr "Expression SQL"
+
+#, fuzzy
+#~ msgid "Match all unread articles:"
+#~ msgstr "Articles mémorisés"
+
 #, fuzzy
 #~ msgid "Search to label"
 #~ msgstr "Convertir en intitulé"
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index a9fbef5c0..07eaa94c2 100644
Binary files a/locale/hu_HU/LC_MESSAGES/messages.mo and b/locale/hu_HU/LC_MESSAGES/messages.mo differ
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index 1605e57d3..c82004e0b 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-01-18 15:24+0300\n"
+"POT-Creation-Date: 2009-01-19 11:56+0300\n"
 "PO-Revision-Date: 2008-02-03 22:22::+0100\n"
 "Last-Translator: MiszterX <miszterx@miszterx.hu>\n"
 "Language-Team: HUNGARIAN <miszterx@miszterx.hu>\n"
@@ -81,7 +81,7 @@ msgstr "Napi"
 msgid "Weekly"
 msgstr "Heti"
 
-#: backend.php:122 tt-rss.php:203 modules/pref-prefs.php:312
+#: backend.php:122 tt-rss.php:206 modules/pref-prefs.php:312
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -164,137 +164,144 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2883 modules/popup-dialog.php:175
-#: modules/pref-filters.php:405 mobile/functions.php:735
+#: functions.php:2847 modules/popup-dialog.php:175
+#: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "Minden feed"
 
-#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
-#: functions.php:4378 modules/pref-feeds.php:1244
+#: functions.php:2876 functions.php:2915 functions.php:3304 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1237
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
-#: functions.php:2941 functions.php:3508 mobile/functions.php:33
+#: functions.php:2905 functions.php:3500 mobile/functions.php:33
 msgid "Special"
 msgstr "Speciális"
 
-#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
+#: functions.php:2907 functions.php:3333 functions.php:3502 prefs.php:144
+#: mobile/functions.php:83
 msgid "Labels"
 msgstr "Címkék"
 
-#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
-#: mobile/functions.php:52
+#: functions.php:2925 functions.php:3326 functions.php:4205 help/3.php:57
+#: mobile/functions.php:61
 msgid "Starred articles"
 msgstr "Csillagost hírek"
 
-#: functions.php:2963 functions.php:3344 functions.php:4212
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+#: functions.php:2927 functions.php:3330 functions.php:4212
+#: modules/pref-feeds.php:1406 help/3.php:59 mobile/functions.php:70
 msgid "Published articles"
 msgstr "Publikált hírek"
 
-#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
-#: mobile/functions.php:43
+#: functions.php:2929 functions.php:3336 functions.php:4190 help/3.php:58
+#: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "Olvasatlan hírek"
 
-#: functions.php:3305 functions.php:3307
+#: functions.php:2931 functions.php:3339 functions.php:4183
+#: mobile/functions.php:43
+#, fuzzy
+msgid "All articles"
+msgstr "Minden hír"
+
+#: functions.php:3290 functions.php:3292
 msgid "Search results"
 msgstr "Keresési találatok"
 
-#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
-#: functions.php:3348 functions.php:3356
+#: functions.php:3308 functions.php:3321 functions.php:3327 functions.php:3331
+#: functions.php:3337 functions.php:3340 functions.php:3348
 msgid "Searched for"
 msgstr ""
 
-#: functions.php:3989 functions.php:4045 functions.php:5368
-#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
-#: modules/pref-labels.php:136 modules/pref-users.php:408
+#: functions.php:3981 functions.php:4037 functions.php:5374
+#: modules/pref-feeds.php:1018 modules/pref-feeds.php:1199
+#: modules/pref-filters.php:366 modules/pref-labels.php:138
+#: modules/pref-users.php:408
 msgid "Select:"
 msgstr "Kiválaszt:"
 
-#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
-#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
-#: modules/pref-users.php:409 mobile/functions.php:561
+#: functions.php:3982 functions.php:4038 modules/pref-feeds.php:1019
+#: modules/pref-feeds.php:1200 modules/pref-filters.php:367
+#: modules/pref-labels.php:139 modules/pref-users.php:409
+#: mobile/functions.php:570
 msgid "All"
 msgstr "Mind"
 
-#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
-#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
+#: functions.php:3983 functions.php:3989 functions.php:4039 functions.php:4042
+#: tt-rss.php:198 mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: functions.php:3992 mobile/functions.php:564
+#: functions.php:3984 mobile/functions.php:573
 #, fuzzy
 msgid "Invert"
 msgstr "(ellentét)"
 
-#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
-#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
-#: modules/pref-users.php:410 mobile/functions.php:563
+#: functions.php:3985 functions.php:4040 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:1201 modules/pref-filters.php:368
+#: modules/pref-labels.php:140 modules/pref-users.php:410
+#: mobile/functions.php:572
 msgid "None"
 msgstr "Egyiksem"
 
-#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3987 tt-rss.php:147 modules/pref-feeds.php:1360
 msgid "Actions..."
 msgstr "Műveletek"
 
-#: functions.php:3996
+#: functions.php:3988
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Kiválaszt:"
 
-#: functions.php:3998 functions.php:4051 tt-rss.php:195
-#: mobile/functions.php:450
+#: functions.php:3990 functions.php:4043 tt-rss.php:197
+#: mobile/functions.php:459
 msgid "Starred"
 msgstr "Csillagoz"
 
-#: functions.php:3999
+#: functions.php:3991
 msgid "Published"
 msgstr "Publikál"
 
-#: functions.php:4001 functions.php:4053
+#: functions.php:3993 functions.php:4045
 msgid "Mark as read:"
 msgstr ""
 
-#: functions.php:4002 mobile/functions.php:569
+#: functions.php:3994 mobile/functions.php:578
 msgid "Selection"
 msgstr "Kiválasztottakat"
 
-#: functions.php:4016 mobile/functions.php:571
+#: functions.php:4008 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "Összes feed"
 
-#: functions.php:4019
+#: functions.php:4011
 #, fuzzy
 msgid "Assign label:"
 msgstr "Tag felajánlása"
 
-#: functions.php:4031
+#: functions.php:4023
 #, fuzzy
 msgid "(remove)"
 msgstr "Eltávolít"
 
-#: functions.php:4050
+#: functions.php:4042
 msgid "Toggle:"
 msgstr "Megjelöl:"
 
-#: functions.php:4054 mobile/functions.php:570
+#: functions.php:4046 mobile/functions.php:579
 msgid "Page"
 msgstr "Oldal"
 
-#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:395
+#: functions.php:4047 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:403
 msgid "Feed"
 msgstr ""
 
-#: functions.php:4096
+#: functions.php:4088
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4145
+#: functions.php:4137
 msgid "Click to collapse category"
 msgstr ""
 
@@ -306,132 +313,90 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: functions.php:4657
+#: functions.php:4651
 msgid " - "
 msgstr ""
 
-#: functions.php:4716 functions.php:4717
+#: functions.php:4706 functions.php:4707
 msgid "no tags"
 msgstr ""
 
-#: functions.php:4724
+#: functions.php:4714
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4732
+#: functions.php:4722
 #, fuzzy
 msgid "Display original article content"
 msgstr "Mutasd az utolsó hír időpontját"
 
-#: functions.php:4739 functions.php:5378
+#: functions.php:4729 functions.php:5384
 msgid "Show article summary in new window"
 msgstr ""
 
-#: functions.php:4775 functions.php:5302
+#: functions.php:4765 functions.php:5308
 #, fuzzy
 msgid "unknown type"
 msgstr "Ismeretlen hiba"
 
-#: functions.php:4781 functions.php:5308
+#: functions.php:4771 functions.php:5314
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4817 functions.php:5342
+#: functions.php:4807 functions.php:5348
 msgid "Attachment:"
 msgstr "Csatolmány:"
 
-#: functions.php:4819 functions.php:5344
+#: functions.php:4809 functions.php:5350
 msgid "Attachments:"
 msgstr "Csatolmányok:"
 
-#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
+#: functions.php:4829 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1069
 msgid "Close this window"
 msgstr ""
 
-#: functions.php:4895 modules/pref-feed-browser.php:75
+#: functions.php:4885 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Feed nem található"
 
-#: functions.php:4964 mobile/functions.php:414
+#: functions.php:4954 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:5077
-msgid "(Click to change)"
-msgstr ""
-
-#: functions.php:5276
+#: functions.php:5282
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Tárolt hírek"
 
-#: functions.php:5440
+#: functions.php:5442
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
-#: functions.php:5443
+#: functions.php:5445
+#, fuzzy
+msgid "No updated articles found to display."
+msgstr "Nincs megjeleníthető hír"
+
+#: functions.php:5448
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
-#: functions.php:5446
+#: functions.php:5452
+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:5454
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
-#: functions.php:5793
-#, fuzzy
-msgid "Match "
-msgstr "Egyezés"
-
-#: functions.php:5801
-#, fuzzy
-msgid "Unread articles"
-msgstr "Tárolt hírek"
-
-#: functions.php:5802
-#, fuzzy
-msgid "Updated articles"
-msgstr "Tárolt hírek"
-
-#: functions.php:5803
-#, fuzzy
-msgid "Title contains"
-msgstr "Cím vagy tartalom"
-
-#: functions.php:5804
-#, fuzzy
-msgid "Content contains"
-msgstr "Tartalomszűrő"
-
-#: functions.php:5805
-msgid "Score equals"
-msgstr ""
-
-#: functions.php:5806
-msgid "Score is greater than"
-msgstr ""
-
-#: functions.php:5807
-msgid "Score is less than"
-msgstr ""
-
-#: functions.php:5808
-msgid "Articles newer than X hours"
-msgstr ""
-
-#: functions.php:5809
-msgid "Articles newer than X days"
-msgstr ""
-
-#: functions.php:5818
-msgid "Add"
-msgstr ""
-
 #: localized_js.php:35
 msgid "display feeds"
 msgstr ""
@@ -638,7 +603,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:95 tt-rss.php:249 tt-rss.php:262
+#: localized_js.php:95 tt-rss.php:252 tt-rss.php:265
 msgid "No feed selected."
 msgstr ""
 
@@ -816,9 +781,9 @@ msgstr "Leiratkozik a kiválasztott feedekről?"
 msgid "Saving feeds..."
 msgstr "Címke mentése"
 
-#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:766
+#: localized_schema.php:9 tt-rss.php:208 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1212 modules/pref-feeds.php:1273
+#: mobile/functions.php:775
 msgid "Title"
 msgstr "Cím"
 
@@ -831,7 +796,7 @@ msgid "Link"
 msgstr "Link"
 
 #: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:767
+#: mobile/functions.php:776
 msgid "Content"
 msgstr "Tartalom"
 
@@ -843,7 +808,7 @@ msgstr ""
 msgid "Filter article"
 msgstr ""
 
-#: localized_schema.php:16 mobile/functions.php:574
+#: localized_schema.php:16 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "Olvasottá tesz"
 
@@ -1315,11 +1280,10 @@ msgid "tag cloud"
 msgstr "tag felhő"
 
 #: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
-#: modules/pref-labels.php:103 modules/pref-users.php:364
-#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
-#: mobile/functions.php:774
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:1114
+#: modules/pref-filters.php:307 modules/pref-labels.php:105
+#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:435
+#: mobile/functions.php:729 mobile/functions.php:783
 msgid "Search"
 msgstr "Keresés"
 
@@ -1364,75 +1328,85 @@ msgstr "&nbsp;&nbsp;Megmutatja/elrejti az olvasott feedeket"
 msgid "Other actions:"
 msgstr "Más művelet:"
 
-#: tt-rss.php:163
+#: tt-rss.php:164
+#, fuzzy
+msgid "&nbsp;&nbsp;Create label"
+msgstr "&nbsp;&nbsp;Szűrők létrehozása"
+
+#: tt-rss.php:165
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Szűrők létrehozása"
 
-#: tt-rss.php:164
+#: tt-rss.php:166
 #, fuzzy
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;Feliratokzás a feedre"
 
-#: tt-rss.php:165
+#: tt-rss.php:167
 #, fuzzy
 msgid "&nbsp;&nbsp;Reset category order"
 msgstr "&nbsp;&nbsp;Feliratokzás a feedre"
 
-#: tt-rss.php:167
+#: tt-rss.php:169
 #, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Hírek törlése"
 
-#: tt-rss.php:175
+#: tt-rss.php:177
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Minden feed"
 
-#: tt-rss.php:177
+#: tt-rss.php:179
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:185 mobile/functions.php:729
+#: tt-rss.php:187 mobile/functions.php:738
 msgid "Search:"
 msgstr "Keresés"
 
-#: tt-rss.php:193 mobile/functions.php:447
+#: tt-rss.php:195 mobile/functions.php:456
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:194 mobile/functions.php:448
+#: tt-rss.php:196 mobile/functions.php:457
 msgid "All Articles"
 msgstr "Minden hír"
 
-#: tt-rss.php:197
+#: tt-rss.php:199
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:200
+#: tt-rss.php:200 modules/pref-feeds.php:1218 modules/pref-feeds.php:1281
+#: mobile/functions.php:501 mobile/functions.php:504
+msgid "Updated"
+msgstr "Frissítve"
+
+#: tt-rss.php:203
 #, fuzzy
 msgid "Order:"
 msgstr "Más:"
 
-#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:435
+#: tt-rss.php:207 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: modules/pref-filters.php:443
 #, fuzzy
 msgid "Date"
 msgstr "Frissítés"
 
-#: tt-rss.php:206
+#: tt-rss.php:209
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:210
+#: tt-rss.php:213
 msgid "Limit:"
 msgstr "Limit:"
 
-#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:427
+#: tt-rss.php:238 modules/pref-feeds.php:261 modules/pref-feeds.php:451
+#: mobile/functions.php:436
 msgid "Update"
 msgstr "Frissítés"
 
-#: tt-rss.php:253
+#: tt-rss.php:256
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1588,7 +1562,7 @@ msgid "Subscribe"
 msgstr "Feliratkozás"
 
 #: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
 #: modules/pref-feeds.php:130 modules/pref-feeds.php:395
 #: modules/pref-feeds.php:546 modules/pref-filters.php:166
 #: modules/pref-users.php:184
@@ -1600,7 +1574,7 @@ msgstr "Mégse"
 msgid "match on:"
 msgstr "Egyezés ezzel:"
 
-#: modules/popup-dialog.php:167 mobile/functions.php:768
+#: modules/popup-dialog.php:167 mobile/functions.php:777
 msgid "Title or content"
 msgstr "Cím vagy tartalom"
 
@@ -1608,114 +1582,114 @@ msgstr "Cím vagy tartalom"
 msgid "Limit search to:"
 msgstr ""
 
-#: modules/popup-dialog.php:188 mobile/functions.php:748
+#: modules/popup-dialog.php:188 mobile/functions.php:757
 msgid "This feed"
 msgstr "Ez a feed"
 
-#: modules/popup-dialog.php:288
+#: modules/popup-dialog.php:226
 #, fuzzy
 msgid "Create Filter"
 msgstr "Szárő készítése"
 
-#: modules/popup-dialog.php:306 modules/popup-dialog.php:405
+#: 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:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:394
+#: modules/popup-dialog.php:245 modules/pref-filters.php:42
+#: modules/pref-filters.php:402
 msgid "Match"
 msgstr "Egyezés"
 
-#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:425
+#: modules/popup-dialog.php:253 modules/pref-filters.php:54
+#: modules/pref-filters.php:433
 msgid "before"
 msgstr ""
 
-#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:426
+#: modules/popup-dialog.php:254 modules/pref-filters.php:55
+#: modules/pref-filters.php:434
 #, fuzzy
 msgid "after"
 msgstr "Frissítés"
 
-#: modules/popup-dialog.php:380 modules/pref-filters.php:70
+#: modules/popup-dialog.php:268 modules/pref-filters.php:70
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:383 modules/pref-filters.php:73
+#: modules/popup-dialog.php:271 modules/pref-filters.php:73
 #, fuzzy
 msgid "on field"
 msgstr "Ebben a mezőben:"
 
-#: modules/popup-dialog.php:389 modules/pref-filters.php:79
+#: modules/popup-dialog.php:277 modules/pref-filters.php:79
 #, fuzzy
 msgid "in"
 msgstr "Link"
 
-#: modules/popup-dialog.php:394 modules/pref-filters.php:84
+#: modules/popup-dialog.php:282 modules/pref-filters.php:84
 #, fuzzy
 msgid "Perform Action"
 msgstr "Művelet"
 
-#: modules/popup-dialog.php:411 modules/pref-filters.php:104
+#: modules/popup-dialog.php:299 modules/pref-filters.php:104
 msgid "with parameters:"
 msgstr ""
 
-#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:308
 #: modules/pref-feeds.php:500 modules/pref-filters.php:123
 #: modules/pref-users.php:165
 #, fuzzy
 msgid "Options"
 msgstr "Beállítások:"
 
-#: modules/popup-dialog.php:427 modules/pref-filters.php:135
+#: modules/popup-dialog.php:318 modules/pref-filters.php:135
 msgid "Enabled"
 msgstr "Engedélyez"
 
-#: modules/popup-dialog.php:430 modules/pref-filters.php:144
+#: modules/popup-dialog.php:321 modules/pref-filters.php:144
 msgid "Inverse match"
 msgstr ""
 
-#: modules/popup-dialog.php:442
+#: modules/popup-dialog.php:333
 msgid "Create"
 msgstr "Készít"
 
-#: modules/popup-dialog.php:457
+#: modules/popup-dialog.php:348
 msgid "Update Errors"
 msgstr "Frissítési hiba"
 
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:351
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
-#: modules/popup-dialog.php:478
+#: modules/popup-dialog.php:369
 msgid "Close"
 msgstr "Bezár"
 
-#: modules/popup-dialog.php:487
+#: modules/popup-dialog.php:378
 msgid "Edit Tags"
 msgstr "Tegek szerkesztése"
 
-#: modules/popup-dialog.php:492
+#: modules/popup-dialog.php:383
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:393
 #: modules/pref-feeds.php:544 modules/pref-filters.php:162
 #: modules/pref-users.php:181
 msgid "Save"
 msgstr "Mentés"
 
-#: modules/popup-dialog.php:550 help/3.php:60
+#: modules/popup-dialog.php:441 help/3.php:60
 msgid "Tag cloud"
 msgstr "Tag felhő"
 
-#: modules/popup-dialog.php:553
+#: modules/popup-dialog.php:444
 msgid "Showing most popular tags "
 msgstr "Mutasd a legnépszerűbb tageket"
 
-#: modules/popup-dialog.php:554
+#: modules/popup-dialog.php:445
 msgid "browse more"
 msgstr "tovább böngészik"
 
@@ -1829,7 +1803,7 @@ msgstr ""
 msgid "Cache images locally"
 msgstr "Képek helyi tárolása"
 
-#: modules/pref-feeds.php:390 modules/pref-feeds.php:1374
+#: modules/pref-feeds.php:390 modules/pref-feeds.php:1367
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
@@ -1838,153 +1812,148 @@ msgstr "Leiratkozás"
 msgid "Multiple Feed Editor"
 msgstr "Feed editor"
 
-#: modules/pref-feeds.php:781 modules/pref-feeds.php:828
+#: modules/pref-feeds.php:774 modules/pref-feeds.php:821
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:859
+#: modules/pref-feeds.php:852
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:861
+#: modules/pref-feeds.php:854
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:943
+#: modules/pref-feeds.php:936
 msgid "Category editor"
 msgstr ""
 
-#: modules/pref-feeds.php:966
+#: modules/pref-feeds.php:959
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr ""
 
-#: modules/pref-feeds.php:994
+#: modules/pref-feeds.php:987
 msgid "Unable to delete non empty feed categories."
 msgstr ""
 
-#: modules/pref-feeds.php:1011
+#: modules/pref-feeds.php:1004
 msgid "Create category"
 msgstr "Kategória létrehozása"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1064
 msgid "No feed categories defined."
 msgstr "Nincs feed kategória definiálva"
 
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
-#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
-#: modules/pref-labels.php:176 modules/pref-users.php:481
+#: modules/pref-feeds.php:1075 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:178
+#: modules/pref-users.php:481
 msgid "Remove"
 msgstr "Eltávolít"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1097
 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:1126 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1119 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Feliratkozás feedre"
 
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1124
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:1205
+#: modules/pref-feeds.php:1198
 msgid "Show last article times"
 msgstr "Mutasd az utolsó hír időpontját"
 
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1284
+#: modules/pref-feeds.php:1215 modules/pref-feeds.php:1277
 msgid "Last&nbsp;Article"
 msgstr "Utolsó&nbsp;Hír"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:492 mobile/functions.php:495
-msgid "Updated"
-msgstr "Frissítve"
-
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
-#: modules/pref-labels-old.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1302 modules/pref-filters.php:461
+#: modules/pref-users.php:456
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1369
+#: modules/pref-feeds.php:1348 modules/pref-feeds.php:1362
 msgid "Selection:"
 msgstr "Kiválaszt:"
 
-#: modules/pref-feeds.php:1361
+#: modules/pref-feeds.php:1354
 msgid "Recategorize"
 msgstr "Újrakategorizál"
 
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
-#: modules/pref-labels-old.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1363 modules/pref-filters.php:485
+#: modules/pref-users.php:479
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: modules/pref-feeds.php:1371
+#: modules/pref-feeds.php:1364
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
 msgid "Clear feed data"
 msgstr "Feed adatok törlése"
 
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
+#: modules/pref-feeds.php:1366 modules/pref-filters.php:324
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Tárolt hírek"
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1372
 msgid "Other:"
 msgstr "Más:"
 
-#: modules/pref-feeds.php:1380
+#: modules/pref-feeds.php:1373
 msgid "Edit categories"
 msgstr "Kategóriák szerkesztése"
 
-#: modules/pref-feeds.php:1387
+#: modules/pref-feeds.php:1380
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1384
 msgid "File:"
 msgstr "File:"
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1387
 msgid "Import"
 msgstr "Importálás"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1394
 msgid "Export OPML"
 msgstr "Exportálás OPML-be"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1397
 msgid "Firefox Integration"
 msgstr "Firefox integráció"
 
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1399
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1403
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1412
 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:1423
+#: modules/pref-feeds.php:1416
 #, fuzzy
 msgid "Link to published articles feed."
 msgstr "Publikált hírek"
 
-#: modules/pref-feeds.php:1426
+#: modules/pref-feeds.php:1419
 #, fuzzy
 msgid "Generate another link"
 msgstr "Másik cím genrálása"
@@ -1999,103 +1968,64 @@ msgstr "Szűrő módosítása"
 msgid "Saved filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:256
+#: modules/pref-filters.php:264
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:317 help/3.php:31 help/4.php:25
 msgid "Create filter"
 msgstr "Szárő készítése"
 
-#: modules/pref-filters.php:384
+#: modules/pref-filters.php:392
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:385
+#: modules/pref-filters.php:393
 msgid "action_description"
 msgstr ""
 
-#: modules/pref-filters.php:396
+#: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
 msgstr "Ebben a mezőben:"
 
-#: modules/pref-filters.php:397
+#: modules/pref-filters.php:405
 #, fuzzy
 msgid "Params"
 msgstr "Paraméterek"
 
-#: modules/pref-filters.php:442
+#: modules/pref-filters.php:450
 msgid "(Disabled)"
 msgstr "(Kikapcsolva)"
 
-#: modules/pref-filters.php:458
+#: modules/pref-filters.php:466
 msgid "(Inverse)"
 msgstr "(ellentét)"
 
-#: modules/pref-filters.php:487
+#: modules/pref-filters.php:495
 msgid "No filters defined."
 msgstr "Nincs szűrő definiálva."
 
-#: modules/pref-filters.php:489
+#: modules/pref-filters.php:497
 #, fuzzy
 msgid "No matching filters found."
 msgstr "Nincs szűrő definiálva."
 
-#: modules/pref-labels-old.php:9
-msgid ""
-"Sorry, labels have been administratively disabled for this installation. "
-"Please contact instance owner or edit configuration file to enable this "
-"functionality."
-msgstr ""
-
-#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
-#: modules/pref-labels.php:143
-msgid "Caption"
-msgstr "Aláírás"
-
-#: modules/pref-labels-old.php:46
-#, fuzzy
-msgid "Match SQL"
-msgstr "Egyezés"
-
-#: modules/pref-labels-old.php:68
-msgid "Help"
-msgstr "Segítség"
-
-#: modules/pref-labels-old.php:99
-msgid "Error: SQL expression is blank."
-msgstr ""
-
-#: modules/pref-labels-old.php:179
-#, php-format
-msgid "Saved label <b>%s</b>"
-msgstr ""
-
-#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
+#: modules/pref-labels.php:75
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr ""
 
-#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
+#: modules/pref-labels.php:113 help/4.php:26
 msgid "Create label"
 msgstr "Címke készítése"
 
-#: modules/pref-labels-old.php:283
-msgid "SQL Expression"
-msgstr ""
-
-#: modules/pref-labels-old.php:308
-#, fuzzy
-msgid "[No caption]"
-msgstr "Aláírás"
-
-#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
+#: modules/pref-labels.php:184
 msgid "No labels defined."
 msgstr "Nincs címke definiálva."
 
-#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
+#: modules/pref-labels.php:186
 #, fuzzy
 msgid "No matching labels found."
 msgstr "Nincs címke definiálva."
@@ -2304,40 +2234,6 @@ msgstr "Nincs szűrő definiálva."
 msgid "No matching users found."
 msgstr ""
 
-#: help/1.php:1
-msgid "Labels and SQL Expressions"
-msgstr ""
-
-#: help/1.php:3
-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 ""
-
-#: help/1.php:5
-msgid "Examples"
-msgstr ""
-
-#: help/1.php:7
-#, fuzzy
-msgid "Match all unread articles:"
-msgstr "Tárolt hírek"
-
-#: help/1.php:11
-msgid "Matches all articles which mention Linux in the title:"
-msgstr ""
-
-#: help/1.php:15
-msgid "Matches all articles for the last week (PostgreSQL):"
-msgstr ""
-
-#: help/1.php:19
-msgid "Matches all articles with scores between 100 and 500:"
-msgstr ""
-
 #: help/2.php:1
 #, fuzzy
 msgid "Content filtering"
@@ -2558,31 +2454,31 @@ msgstr "Feed:"
 msgid "View tags"
 msgstr "Tegek szerkesztése"
 
-#: mobile/functions.php:425
+#: mobile/functions.php:434
 msgid "Back"
 msgstr ""
 
-#: mobile/functions.php:435
+#: mobile/functions.php:444
 msgid "View:"
 msgstr "Nézet"
 
-#: mobile/functions.php:457
+#: mobile/functions.php:466
 msgid "Refresh"
 msgstr ""
 
-#: mobile/functions.php:689
+#: mobile/functions.php:698
 msgid "Tags:"
 msgstr ""
 
-#: mobile/functions.php:721
+#: mobile/functions.php:730
 msgid "Go back"
 msgstr ""
 
-#: mobile/functions.php:732
+#: mobile/functions.php:741
 msgid "Where:"
 msgstr "Ahol:"
 
-#: mobile/functions.php:763
+#: mobile/functions.php:772
 #, fuzzy
 msgid "Match on:"
 msgstr "Egyezés ezzel:"
@@ -2591,6 +2487,44 @@ msgstr "Egyezés ezzel:"
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Match "
+#~ msgstr "Egyezés"
+
+#, fuzzy
+#~ msgid "Unread articles"
+#~ msgstr "Tárolt hírek"
+
+#, fuzzy
+#~ msgid "Updated articles"
+#~ msgstr "Tárolt hírek"
+
+#, fuzzy
+#~ msgid "Title contains"
+#~ msgstr "Cím vagy tartalom"
+
+#, fuzzy
+#~ msgid "Content contains"
+#~ msgstr "Tartalomszűrő"
+
+#~ msgid "Caption"
+#~ msgstr "Aláírás"
+
+#, fuzzy
+#~ msgid "Match SQL"
+#~ msgstr "Egyezés"
+
+#~ msgid "Help"
+#~ msgstr "Segítség"
+
+#, fuzzy
+#~ msgid "[No caption]"
+#~ msgstr "Aláírás"
+
+#, fuzzy
+#~ msgid "Match all unread articles:"
+#~ msgstr "Tárolt hírek"
+
 #, fuzzy
 #~ msgid "Search to label"
 #~ msgstr "Címke készítése"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index bb97f69b7..a56b178a6 100644
Binary files a/locale/it_IT/LC_MESSAGES/messages.mo and b/locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index 02963492a..182cb7236 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ttrss-1.2.30\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-18 15:24+0300\n"
+"POT-Creation-Date: 2009-01-19 11:56+0300\n"
 "PO-Revision-Date: 2009-01-03 16:43+0100\n"
 "Last-Translator: Andrea Zagli <azagli@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -78,7 +78,7 @@ msgstr "Giornalmente"
 msgid "Weekly"
 msgstr "Settimanalmente"
 
-#: backend.php:122 tt-rss.php:203 modules/pref-prefs.php:312
+#: backend.php:122 tt-rss.php:206 modules/pref-prefs.php:312
 msgid "Default"
 msgstr "Predefinito"
 
@@ -169,135 +169,142 @@ msgstr ""
 "Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
 "configurazione del PHP"
 
-#: functions.php:2883 modules/popup-dialog.php:175
-#: modules/pref-filters.php:405 mobile/functions.php:735
+#: functions.php:2847 modules/popup-dialog.php:175
+#: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "Tutti i notiziari"
 
-#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
-#: functions.php:4378 modules/pref-feeds.php:1244
+#: functions.php:2876 functions.php:2915 functions.php:3304 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1237
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
-#: functions.php:2941 functions.php:3508 mobile/functions.php:33
+#: functions.php:2905 functions.php:3500 mobile/functions.php:33
 msgid "Special"
 msgstr "Speciale"
 
-#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
+#: functions.php:2907 functions.php:3333 functions.php:3502 prefs.php:144
+#: mobile/functions.php:83
 msgid "Labels"
 msgstr "Etichette"
 
-#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
-#: mobile/functions.php:52
+#: functions.php:2925 functions.php:3326 functions.php:4205 help/3.php:57
+#: mobile/functions.php:61
 msgid "Starred articles"
 msgstr "Articoli con stella"
 
-#: functions.php:2963 functions.php:3344 functions.php:4212
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+#: functions.php:2927 functions.php:3330 functions.php:4212
+#: modules/pref-feeds.php:1406 help/3.php:59 mobile/functions.php:70
 msgid "Published articles"
 msgstr "Articoli pubblicati"
 
-#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
-#: mobile/functions.php:43
+#: functions.php:2929 functions.php:3336 functions.php:4190 help/3.php:58
+#: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "Articoli nuovi"
 
-#: functions.php:3305 functions.php:3307
+#: functions.php:2931 functions.php:3339 functions.php:4183
+#: mobile/functions.php:43
+#, fuzzy
+msgid "All articles"
+msgstr "Tutti gli articoli"
+
+#: functions.php:3290 functions.php:3292
 msgid "Search results"
 msgstr "Risultati della ricerca"
 
-#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
-#: functions.php:3348 functions.php:3356
+#: functions.php:3308 functions.php:3321 functions.php:3327 functions.php:3331
+#: functions.php:3337 functions.php:3340 functions.php:3348
 msgid "Searched for"
 msgstr "Ricerca"
 
-#: functions.php:3989 functions.php:4045 functions.php:5368
-#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
-#: modules/pref-labels.php:136 modules/pref-users.php:408
+#: functions.php:3981 functions.php:4037 functions.php:5374
+#: modules/pref-feeds.php:1018 modules/pref-feeds.php:1199
+#: modules/pref-filters.php:366 modules/pref-labels.php:138
+#: modules/pref-users.php:408
 msgid "Select:"
 msgstr "Seleziona:"
 
-#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
-#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
-#: modules/pref-users.php:409 mobile/functions.php:561
+#: functions.php:3982 functions.php:4038 modules/pref-feeds.php:1019
+#: modules/pref-feeds.php:1200 modules/pref-filters.php:367
+#: modules/pref-labels.php:139 modules/pref-users.php:409
+#: mobile/functions.php:570
 msgid "All"
 msgstr "Tutti"
 
-#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
-#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
+#: functions.php:3983 functions.php:3989 functions.php:4039 functions.php:4042
+#: tt-rss.php:198 mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "Non letti"
 
-#: functions.php:3992 mobile/functions.php:564
+#: functions.php:3984 mobile/functions.php:573
 msgid "Invert"
 msgstr "Inverti"
 
-#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
-#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
-#: modules/pref-users.php:410 mobile/functions.php:563
+#: functions.php:3985 functions.php:4040 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:1201 modules/pref-filters.php:368
+#: modules/pref-labels.php:140 modules/pref-users.php:410
+#: mobile/functions.php:572
 msgid "None"
 msgstr "Nessuno"
 
-#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3987 tt-rss.php:147 modules/pref-feeds.php:1360
 msgid "Actions..."
 msgstr "Azioni..."
 
-#: functions.php:3996
+#: functions.php:3988
 msgid "Selection toggle:"
 msgstr "Inverti selezione:"
 
-#: functions.php:3998 functions.php:4051 tt-rss.php:195
-#: mobile/functions.php:450
+#: functions.php:3990 functions.php:4043 tt-rss.php:197
+#: mobile/functions.php:459
 msgid "Starred"
 msgstr "Con stella"
 
-#: functions.php:3999
+#: functions.php:3991
 msgid "Published"
 msgstr "Pubblicati"
 
-#: functions.php:4001 functions.php:4053
+#: functions.php:3993 functions.php:4045
 msgid "Mark as read:"
 msgstr "Segna come letti:"
 
-#: functions.php:4002 mobile/functions.php:569
+#: functions.php:3994 mobile/functions.php:578
 msgid "Selection"
 msgstr "Selezione"
 
-#: functions.php:4016 mobile/functions.php:571
+#: functions.php:4008 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "Intero notiziario"
 
-#: functions.php:4019
+#: functions.php:4011
 #, fuzzy
 msgid "Assign label:"
 msgstr "Assegna etichette"
 
-#: functions.php:4031
+#: functions.php:4023
 #, fuzzy
 msgid "(remove)"
 msgstr "Rimuovi"
 
-#: functions.php:4050
+#: functions.php:4042
 msgid "Toggle:"
 msgstr "Inverti:"
 
-#: functions.php:4054 mobile/functions.php:570
+#: functions.php:4046 mobile/functions.php:579
 msgid "Page"
 msgstr "Pagina"
 
-#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:395
+#: functions.php:4047 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:403
 msgid "Feed"
 msgstr "Notiziario"
 
-#: functions.php:4096
+#: functions.php:4088
 msgid "Generated feed"
 msgstr "Notiziario generato"
 
-#: functions.php:4145
+#: functions.php:4137
 msgid "Click to collapse category"
 msgstr "Fare clic per contrarre la categoria"
 
@@ -309,52 +316,52 @@ msgstr "Nessun notiziario da visualizzare."
 msgid "Tags"
 msgstr "Etichette"
 
-#: functions.php:4657
+#: functions.php:4651
 msgid " - "
 msgstr " - "
 
-#: functions.php:4716 functions.php:4717
+#: functions.php:4706 functions.php:4707
 msgid "no tags"
 msgstr "nessuna etichetta"
 
-#: functions.php:4724
+#: functions.php:4714
 msgid "Edit tags for this article"
 msgstr "Modifica le etichette per questo articolo"
 
-#: functions.php:4732
+#: functions.php:4722
 msgid "Display original article content"
 msgstr "Visualizza il contenuto originale dell&apos;articolo"
 
-#: functions.php:4739 functions.php:5378
+#: functions.php:4729 functions.php:5384
 msgid "Show article summary in new window"
 msgstr "Mostra il sommario dell&apos;articolo in una nuova finestra"
 
-#: functions.php:4775 functions.php:5302
+#: functions.php:4765 functions.php:5308
 msgid "unknown type"
 msgstr "tipo sconosciuto"
 
-#: functions.php:4781 functions.php:5308
+#: functions.php:4771 functions.php:5314
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4817 functions.php:5342
+#: functions.php:4807 functions.php:5348
 msgid "Attachment:"
 msgstr "Allegato:"
 
-#: functions.php:4819 functions.php:5344
+#: functions.php:4809 functions.php:5350
 msgid "Attachments:"
 msgstr "Allegati:"
 
-#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
+#: functions.php:4829 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1069
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: functions.php:4895 modules/pref-feed-browser.php:75
+#: functions.php:4885 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Notiziario non trovato."
 
-#: functions.php:4964 mobile/functions.php:414
+#: functions.php:4954 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -362,70 +369,33 @@ msgstr ""
 "Impossibile visualizzare il notiziario (interrogazione fallita). Controllare "
 "che l&apos;etichetta corrisponda alla sintassi o la configurazione locale."
 
-#: functions.php:5077
-msgid "(Click to change)"
-msgstr "(Fare clic per cambiare)"
-
-#: functions.php:5276
+#: functions.php:5282
 msgid "Click to expand article"
 msgstr "Fare clic per espandere l&apos;articolo"
 
-#: functions.php:5440
+#: functions.php:5442
 msgid "No unread articles found to display."
 msgstr "Nessun articolo non letto trovato da visualizzare."
 
-#: functions.php:5443
+#: functions.php:5445
+#, fuzzy
+msgid "No updated articles found to display."
+msgstr "Nessun articolo non letto trovato da visualizzare."
+
+#: functions.php:5448
 msgid "No starred articles found to display."
 msgstr "Nessun articolo con stella trovato da visualizzare."
 
-#: functions.php:5446
+#: functions.php:5452
+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:5454
 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
-#: functions.php:5793
-msgid "Match "
-msgstr "Corrisponde "
-
-#: functions.php:5801
-msgid "Unread articles"
-msgstr "Articoli non letti"
-
-#: functions.php:5802
-msgid "Updated articles"
-msgstr "Articoli aggiornati"
-
-#: functions.php:5803
-msgid "Title contains"
-msgstr "Il titolo contiene"
-
-#: functions.php:5804
-msgid "Content contains"
-msgstr "Il contenuto contiene"
-
-#: functions.php:5805
-msgid "Score equals"
-msgstr "Il punteggio è"
-
-#: functions.php:5806
-msgid "Score is greater than"
-msgstr "Il punteggio è maggiore di"
-
-#: functions.php:5807
-msgid "Score is less than"
-msgstr "Il punteggio è minore di"
-
-#: functions.php:5808
-msgid "Articles newer than X hours"
-msgstr "Articoli più recenti di X ore"
-
-#: functions.php:5809
-msgid "Articles newer than X days"
-msgstr "Articoli più recenti di X giorni"
-
-#: functions.php:5818
-msgid "Add"
-msgstr "Aggiungi"
-
 #: localized_js.php:35
 msgid "display feeds"
 msgstr "visualizza notiziari"
@@ -632,7 +602,7 @@ msgstr "Impossibile aggiornare i sommari (oggetto XML mancante)"
 msgid "Could not display article (missing XML object)"
 msgstr "Impossibili visualizzare l&apos;articolo (manca l&apos;oggetto XML)"
 
-#: localized_js.php:95 tt-rss.php:249 tt-rss.php:262
+#: localized_js.php:95 tt-rss.php:252 tt-rss.php:265
 msgid "No feed selected."
 msgstr "Nessun notiziario selezionato."
 
@@ -807,9 +777,9 @@ msgstr "Salvare i cambiamenti ai notiziari selezionati?"
 msgid "Saving feeds..."
 msgstr "Salvataggio notiziari..."
 
-#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:766
+#: localized_schema.php:9 tt-rss.php:208 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1212 modules/pref-feeds.php:1273
+#: mobile/functions.php:775
 msgid "Title"
 msgstr "Titolo"
 
@@ -822,7 +792,7 @@ msgid "Link"
 msgstr "Collegamento"
 
 #: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:767
+#: mobile/functions.php:776
 msgid "Content"
 msgstr "Contenuto"
 
@@ -834,7 +804,7 @@ msgstr "Data dell&apos;articolo"
 msgid "Filter article"
 msgstr "Filtra articoli"
 
-#: localized_schema.php:16 mobile/functions.php:574
+#: localized_schema.php:16 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "Segna come letto"
 
@@ -1376,11 +1346,10 @@ msgid "tag cloud"
 msgstr "nuvola etichette"
 
 #: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
-#: modules/pref-labels.php:103 modules/pref-users.php:364
-#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
-#: mobile/functions.php:774
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:1114
+#: modules/pref-filters.php:307 modules/pref-labels.php:105
+#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:435
+#: mobile/functions.php:729 mobile/functions.php:783
 msgid "Search"
 msgstr "Cerca"
 
@@ -1424,69 +1393,79 @@ msgstr "&nbsp;&nbsp;Visualizza/Nascondi notiziari letti"
 msgid "Other actions:"
 msgstr "Altre azioni:"
 
-#: tt-rss.php:163
+#: tt-rss.php:164
+#, fuzzy
+msgid "&nbsp;&nbsp;Create label"
+msgstr "&nbsp;&nbsp;Crea filtro"
+
+#: tt-rss.php:165
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Crea filtro"
 
-#: tt-rss.php:164
+#: tt-rss.php:166
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;Reimposta disposizione UI"
 
-#: tt-rss.php:165
+#: tt-rss.php:167
 msgid "&nbsp;&nbsp;Reset category order"
 msgstr "&nbsp;&nbsp;Reimposta ordine categoria"
 
-#: tt-rss.php:167
+#: tt-rss.php:169
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Scorciatoie da tastiera"
 
-#: tt-rss.php:175
+#: tt-rss.php:177
 msgid "Collapse feedlist"
 msgstr "Contrai elenco notiziari"
 
-#: tt-rss.php:177
+#: tt-rss.php:179
 msgid "Toggle Feedlist"
 msgstr "Inverti elenco notiziari"
 
-#: tt-rss.php:185 mobile/functions.php:729
+#: tt-rss.php:187 mobile/functions.php:738
 msgid "Search:"
 msgstr "Cerca:"
 
-#: tt-rss.php:193 mobile/functions.php:447
+#: tt-rss.php:195 mobile/functions.php:456
 msgid "Adaptive"
 msgstr "Adattivo"
 
-#: tt-rss.php:194 mobile/functions.php:448
+#: tt-rss.php:196 mobile/functions.php:457
 msgid "All Articles"
 msgstr "Tutti gli articoli"
 
-#: tt-rss.php:197
+#: tt-rss.php:199
 msgid "Ignore Scoring"
 msgstr "Ignora punteggio"
 
-#: tt-rss.php:200
+#: tt-rss.php:200 modules/pref-feeds.php:1218 modules/pref-feeds.php:1281
+#: mobile/functions.php:501 mobile/functions.php:504
+msgid "Updated"
+msgstr "Aggiornato"
+
+#: tt-rss.php:203
 msgid "Order:"
 msgstr "Ordine:"
 
-#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:435
+#: tt-rss.php:207 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: modules/pref-filters.php:443
 msgid "Date"
 msgstr "Data"
 
-#: tt-rss.php:206
+#: tt-rss.php:209
 msgid "Score"
 msgstr "Punteggio"
 
-#: tt-rss.php:210
+#: tt-rss.php:213
 msgid "Limit:"
 msgstr "Limite:"
 
-#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:427
+#: tt-rss.php:238 modules/pref-feeds.php:261 modules/pref-feeds.php:451
+#: mobile/functions.php:436
 msgid "Update"
 msgstr "Aggiorna"
 
-#: tt-rss.php:253
+#: tt-rss.php:256
 msgid "Drag me to resize panels"
 msgstr "Trascina per ridimensionare i riquadri"
 
@@ -1657,7 +1636,7 @@ msgid "Subscribe"
 msgstr "Sottoscrivi"
 
 #: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
 #: modules/pref-feeds.php:130 modules/pref-feeds.php:395
 #: modules/pref-feeds.php:546 modules/pref-filters.php:166
 #: modules/pref-users.php:184
@@ -1668,7 +1647,7 @@ msgstr "Annulla"
 msgid "match on:"
 msgstr "corrisponde a:"
 
-#: modules/popup-dialog.php:167 mobile/functions.php:768
+#: modules/popup-dialog.php:167 mobile/functions.php:777
 msgid "Title or content"
 msgstr "Titolo o contenuto"
 
@@ -1676,108 +1655,108 @@ msgstr "Titolo o contenuto"
 msgid "Limit search to:"
 msgstr "Limitare la ricerca a:"
 
-#: modules/popup-dialog.php:188 mobile/functions.php:748
+#: modules/popup-dialog.php:188 mobile/functions.php:757
 msgid "This feed"
 msgstr "Questo notiziario"
 
-#: modules/popup-dialog.php:288
+#: modules/popup-dialog.php:226
 msgid "Create Filter"
 msgstr "Crea filtro"
 
-#: modules/popup-dialog.php:306 modules/popup-dialog.php:405
+#: 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:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:394
+#: modules/popup-dialog.php:245 modules/pref-filters.php:42
+#: modules/pref-filters.php:402
 msgid "Match"
 msgstr "Corrisponde"
 
-#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:425
+#: modules/popup-dialog.php:253 modules/pref-filters.php:54
+#: modules/pref-filters.php:433
 msgid "before"
 msgstr "prima"
 
-#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:426
+#: modules/popup-dialog.php:254 modules/pref-filters.php:55
+#: modules/pref-filters.php:434
 msgid "after"
 msgstr "dopo"
 
-#: modules/popup-dialog.php:380 modules/pref-filters.php:70
+#: modules/popup-dialog.php:268 modules/pref-filters.php:70
 msgid "Check it"
 msgstr "Controllalo"
 
-#: modules/popup-dialog.php:383 modules/pref-filters.php:73
+#: modules/popup-dialog.php:271 modules/pref-filters.php:73
 msgid "on field"
 msgstr "al campo"
 
-#: modules/popup-dialog.php:389 modules/pref-filters.php:79
+#: modules/popup-dialog.php:277 modules/pref-filters.php:79
 msgid "in"
 msgstr "in"
 
-#: modules/popup-dialog.php:394 modules/pref-filters.php:84
+#: modules/popup-dialog.php:282 modules/pref-filters.php:84
 msgid "Perform Action"
 msgstr "Esegui azione"
 
-#: modules/popup-dialog.php:411 modules/pref-filters.php:104
+#: modules/popup-dialog.php:299 modules/pref-filters.php:104
 msgid "with parameters:"
 msgstr "con parametri:"
 
-#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:308
 #: modules/pref-feeds.php:500 modules/pref-filters.php:123
 #: modules/pref-users.php:165
 msgid "Options"
 msgstr "Opzioni"
 
-#: modules/popup-dialog.php:427 modules/pref-filters.php:135
+#: modules/popup-dialog.php:318 modules/pref-filters.php:135
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: modules/popup-dialog.php:430 modules/pref-filters.php:144
+#: modules/popup-dialog.php:321 modules/pref-filters.php:144
 msgid "Inverse match"
 msgstr "Corrispondenza inversa"
 
-#: modules/popup-dialog.php:442
+#: modules/popup-dialog.php:333
 msgid "Create"
 msgstr "Crea"
 
-#: modules/popup-dialog.php:457
+#: modules/popup-dialog.php:348
 msgid "Update Errors"
 msgstr "Errori di aggiornamento"
 
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:351
 msgid "These feeds have not been updated because of errors:"
 msgstr "Questi notiziari non sono stati aggiornati a causa di errori:"
 
-#: modules/popup-dialog.php:478
+#: modules/popup-dialog.php:369
 msgid "Close"
 msgstr "Chiudi"
 
-#: modules/popup-dialog.php:487
+#: modules/popup-dialog.php:378
 msgid "Edit Tags"
 msgstr "Modifica etichette"
 
-#: modules/popup-dialog.php:492
+#: modules/popup-dialog.php:383
 msgid "Tags for this article (separated by commas):"
 msgstr "Etichette per questo articolo (separate da virgole):"
 
-#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:393
 #: modules/pref-feeds.php:544 modules/pref-filters.php:162
 #: modules/pref-users.php:181
 msgid "Save"
 msgstr "Salva"
 
-#: modules/popup-dialog.php:550 help/3.php:60
+#: modules/popup-dialog.php:441 help/3.php:60
 msgid "Tag cloud"
 msgstr "Nuvola etichette"
 
-#: modules/popup-dialog.php:553
+#: modules/popup-dialog.php:444
 msgid "Showing most popular tags "
 msgstr "Visualizza le etichette più popolari"
 
-#: modules/popup-dialog.php:554
+#: modules/popup-dialog.php:445
 msgid "browse more"
 msgstr "sfoglia altre"
 
@@ -1888,7 +1867,7 @@ msgstr "Includere nell&apos;email riassunto"
 msgid "Cache images locally"
 msgstr "Memorizzare le immagini localmente"
 
-#: modules/pref-feeds.php:390 modules/pref-feeds.php:1374
+#: modules/pref-feeds.php:390 modules/pref-feeds.php:1367
 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
 
@@ -1896,132 +1875,127 @@ msgstr "Annulla sottoscrizione"
 msgid "Multiple Feed Editor"
 msgstr "Editor di notiziari multipli"
 
-#: modules/pref-feeds.php:781 modules/pref-feeds.php:828
+#: modules/pref-feeds.php:774 modules/pref-feeds.php:821
 msgid "All done."
 msgstr "Fatto tutto."
 
-#: modules/pref-feeds.php:859
+#: modules/pref-feeds.php:852
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Sottoscrizione avvenuta a <b>%s</b>."
 
-#: modules/pref-feeds.php:861
+#: modules/pref-feeds.php:854
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Si ha già una sottoscrizione a <b>%s</b>."
 
-#: modules/pref-feeds.php:943
+#: modules/pref-feeds.php:936
 msgid "Category editor"
 msgstr "Editor categorie"
 
-#: modules/pref-feeds.php:966
+#: modules/pref-feeds.php:959
 #, 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:994
+#: modules/pref-feeds.php:987
 msgid "Unable to delete non empty feed categories."
 msgstr "Impossibile eliminare categorie di notiziario non vuote."
 
-#: modules/pref-feeds.php:1011
+#: modules/pref-feeds.php:1004
 msgid "Create category"
 msgstr "Crea categoria"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1064
 msgid "No feed categories defined."
 msgstr "Nessuna categoria notiziari definita."
 
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
-#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
-#: modules/pref-labels.php:176 modules/pref-users.php:481
+#: modules/pref-feeds.php:1075 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:178
+#: modules/pref-users.php:481
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1097
 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:1126 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1119 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Sottoscrivi il notiziario"
 
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1124
 msgid "Top 25"
 msgstr "Primi 25"
 
-#: modules/pref-feeds.php:1205
+#: modules/pref-feeds.php:1198
 msgid "Show last article times"
 msgstr "Mostrare l&apos;ora dell&apos;ultimo articolo"
 
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1284
+#: modules/pref-feeds.php:1215 modules/pref-feeds.php:1277
 msgid "Last&nbsp;Article"
 msgstr "Ultimo&nbsp;articolo"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:492 mobile/functions.php:495
-msgid "Updated"
-msgstr "Aggiornato"
-
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
-#: modules/pref-labels-old.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1302 modules/pref-filters.php:461
+#: modules/pref-users.php:456
 msgid "Click to edit"
 msgstr "Fare clic per modificare"
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1369
+#: modules/pref-feeds.php:1348 modules/pref-feeds.php:1362
 msgid "Selection:"
 msgstr "Selezione:"
 
-#: modules/pref-feeds.php:1361
+#: modules/pref-feeds.php:1354
 msgid "Recategorize"
 msgstr "Reimposta categoria"
 
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
-#: modules/pref-labels-old.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1363 modules/pref-filters.php:485
+#: modules/pref-users.php:479
 msgid "Edit"
 msgstr "Modifica"
 
-#: modules/pref-feeds.php:1371
+#: modules/pref-feeds.php:1364
 msgid "Manual purge"
 msgstr "Eliminazione manuale"
 
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
 msgid "Clear feed data"
 msgstr "Pulisci i dati del notiziario"
 
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
+#: modules/pref-feeds.php:1366 modules/pref-filters.php:324
 msgid "Rescore articles"
 msgstr "Cambio punteggio degli articoli"
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1372
 msgid "Other:"
 msgstr "Altro:"
 
-#: modules/pref-feeds.php:1380
+#: modules/pref-feeds.php:1373
 msgid "Edit categories"
 msgstr "Modifica categorie"
 
-#: modules/pref-feeds.php:1387
+#: modules/pref-feeds.php:1380
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1384
 msgid "File:"
 msgstr "File:"
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1387
 msgid "Import"
 msgstr "Importa"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1394
 msgid "Export OPML"
 msgstr "Esporta OPML"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1397
 msgid "Firefox Integration"
 msgstr "Integrazione con Firefox"
 
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1399
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2029,11 +2003,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:1410
+#: modules/pref-feeds.php:1403
 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:1419
+#: modules/pref-feeds.php:1412
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2042,11 +2016,11 @@ msgstr ""
 "possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
 "sotto."
 
-#: modules/pref-feeds.php:1423
+#: modules/pref-feeds.php:1416
 msgid "Link to published articles feed."
 msgstr "Collegamento al notiziario degli articoli pubblicati."
 
-#: modules/pref-feeds.php:1426
+#: modules/pref-feeds.php:1419
 msgid "Generate another link"
 msgstr "Genera altro collegamento"
 
@@ -2059,101 +2033,61 @@ msgstr "Editor filtri"
 msgid "Saved filter <b>%s</b>"
 msgstr "Filtro <b>%s</b> salvato"
 
-#: modules/pref-filters.php:256
+#: modules/pref-filters.php:264
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filtro <b>%s</b> creato"
 
-#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:317 help/3.php:31 help/4.php:25
 msgid "Create filter"
 msgstr "Crea filtro"
 
-#: modules/pref-filters.php:384
+#: modules/pref-filters.php:392
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:385
+#: modules/pref-filters.php:393
 msgid "action_description"
 msgstr ""
 
-#: modules/pref-filters.php:396
+#: modules/pref-filters.php:404
 msgid "Field"
 msgstr "Campo"
 
-#: modules/pref-filters.php:397
+#: modules/pref-filters.php:405
 msgid "Params"
 msgstr "Parametri"
 
-#: modules/pref-filters.php:442
+#: modules/pref-filters.php:450
 msgid "(Disabled)"
 msgstr "(disabilitato)"
 
-#: modules/pref-filters.php:458
+#: modules/pref-filters.php:466
 msgid "(Inverse)"
 msgstr "(inverso)"
 
-#: modules/pref-filters.php:487
+#: modules/pref-filters.php:495
 msgid "No filters defined."
 msgstr "Nessun filtro definito."
 
-#: modules/pref-filters.php:489
+#: modules/pref-filters.php:497
 msgid "No matching filters found."
 msgstr "Nessun filtro trovato che corrisponde."
 
-#: modules/pref-labels-old.php:9
-msgid ""
-"Sorry, labels have been administratively disabled for this installation. "
-"Please contact instance owner or edit configuration file to enable this "
-"functionality."
-msgstr ""
-"Le etichette sono state disabilitate dall&apos;amministratore per questa "
-"installazione. Contattare il proprietario dell&apos;istanza o modificare il "
-"file di configurazione per abilitare questa funzionalità."
-
-#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
-#: modules/pref-labels.php:143
-msgid "Caption"
-msgstr "Intestazione"
-
-#: modules/pref-labels-old.php:46
-msgid "Match SQL"
-msgstr "SQL di corrispondenza"
-
-#: modules/pref-labels-old.php:68
-msgid "Help"
-msgstr "Aiuto"
-
-#: modules/pref-labels-old.php:99
-msgid "Error: SQL expression is blank."
-msgstr "Errore: l&apos;espressione SQL è vuota."
-
-#: modules/pref-labels-old.php:179
-#, php-format
-msgid "Saved label <b>%s</b>"
-msgstr "Etichetta <b>%s</b> salvata"
-
-#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
+#: modules/pref-labels.php:75
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Etichetta <b>%s</b> creata"
 
-#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
+#: modules/pref-labels.php:113 help/4.php:26
 msgid "Create label"
 msgstr "Crea etichetta"
 
-#: modules/pref-labels-old.php:283
-msgid "SQL Expression"
-msgstr "Espressione SQL"
-
-#: modules/pref-labels-old.php:308
-msgid "[No caption]"
-msgstr "[Nessuna intestazione]"
-
-#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
+#: modules/pref-labels.php:184
 msgid "No labels defined."
 msgstr "Nessuna etichetta definita."
 
-#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
+#: modules/pref-labels.php:186
 msgid "No matching labels found."
 msgstr "Nessuna etichetta corrispondente trovata."
 
@@ -2359,46 +2293,6 @@ msgstr "Nessun utente definito."
 msgid "No matching users found."
 msgstr "Nessun utente corrispondente trovato."
 
-#: help/1.php:1
-msgid "Labels and SQL Expressions"
-msgstr "Etichette ed espressioni SQL"
-
-#: help/1.php:3
-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."
-
-#: help/1.php:5
-msgid "Examples"
-msgstr "Esempi"
-
-#: help/1.php:7
-msgid "Match all unread articles:"
-msgstr "Corrispondenza ad articoli non letti:"
-
-#: help/1.php:11
-msgid "Matches all articles which mention Linux in the title:"
-msgstr "Corrispondenza a tutti gli articoli che menzionano Linux nel titolo:"
-
-#: help/1.php:15
-msgid "Matches all articles for the last week (PostgreSQL):"
-msgstr ""
-"Corrispondenza a tutti gli ariticli dell&apos;ultima settimana (PostgreSQL):"
-
-#: help/1.php:19
-msgid "Matches all articles with scores between 100 and 500:"
-msgstr "Corrispondenza a tutti gli articoli con punteggio tra 100 e 500:"
-
 #: help/2.php:1
 msgid "Content filtering"
 msgstr "Filtro contenuti"
@@ -2606,31 +2500,31 @@ msgstr "Notiziari"
 msgid "View tags"
 msgstr "Visualizza etichette"
 
-#: mobile/functions.php:425
+#: mobile/functions.php:434
 msgid "Back"
 msgstr "Indietro"
 
-#: mobile/functions.php:435
+#: mobile/functions.php:444
 msgid "View:"
 msgstr "Vista:"
 
-#: mobile/functions.php:457
+#: mobile/functions.php:466
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: mobile/functions.php:689
+#: mobile/functions.php:698
 msgid "Tags:"
 msgstr "Etichette:"
 
-#: mobile/functions.php:721
+#: mobile/functions.php:730
 msgid "Go back"
 msgstr "Vai indietro"
 
-#: mobile/functions.php:732
+#: mobile/functions.php:741
 msgid "Where:"
 msgstr "Dove:"
 
-#: mobile/functions.php:763
+#: mobile/functions.php:772
 msgid "Match on:"
 msgstr "Corrisponde a:"
 
@@ -2638,6 +2532,108 @@ msgstr "Corrisponde a:"
 msgid "Internal error: Function not implemented"
 msgstr "Errore interno: funzione non implementata"
 
+#~ msgid "(Click to change)"
+#~ msgstr "(Fare clic per cambiare)"
+
+#~ msgid "Match "
+#~ msgstr "Corrisponde "
+
+#~ msgid "Unread articles"
+#~ msgstr "Articoli non letti"
+
+#~ msgid "Updated articles"
+#~ msgstr "Articoli aggiornati"
+
+#~ msgid "Title contains"
+#~ msgstr "Il titolo contiene"
+
+#~ msgid "Content contains"
+#~ msgstr "Il contenuto contiene"
+
+#~ msgid "Score equals"
+#~ msgstr "Il punteggio è"
+
+#~ msgid "Score is greater than"
+#~ msgstr "Il punteggio è maggiore di"
+
+#~ msgid "Score is less than"
+#~ msgstr "Il punteggio è minore di"
+
+#~ msgid "Articles newer than X hours"
+#~ msgstr "Articoli più recenti di X ore"
+
+#~ msgid "Articles newer than X days"
+#~ msgstr "Articoli più recenti di X giorni"
+
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
+
+#~ msgid ""
+#~ "Sorry, labels have been administratively disabled for this installation. "
+#~ "Please contact instance owner or edit configuration file to enable this "
+#~ "functionality."
+#~ msgstr ""
+#~ "Le etichette sono state disabilitate dall&apos;amministratore per questa "
+#~ "installazione. Contattare il proprietario dell&apos;istanza o modificare "
+#~ "il file di configurazione per abilitare questa funzionalità."
+
+#~ msgid "Caption"
+#~ msgstr "Intestazione"
+
+#~ msgid "Match SQL"
+#~ msgstr "SQL di corrispondenza"
+
+#~ msgid "Help"
+#~ msgstr "Aiuto"
+
+#~ msgid "Error: SQL expression is blank."
+#~ msgstr "Errore: l&apos;espressione SQL è vuota."
+
+#~ msgid "Saved label <b>%s</b>"
+#~ msgstr "Etichetta <b>%s</b> salvata"
+
+#~ msgid "SQL Expression"
+#~ msgstr "Espressione SQL"
+
+#~ 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"
 
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index c25b50057..0797327a8 100644
Binary files a/locale/ja_JP/LC_MESSAGES/messages.mo and b/locale/ja_JP/LC_MESSAGES/messages.mo differ
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index 13f86d4cd..ae13ab437 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-01-18 15:24+0300\n"
+"POT-Creation-Date: 2009-01-19 11:56+0300\n"
 "PO-Revision-Date: 2008-09-25 12:43+0900\n"
 "Last-Translator: Tadashi Jokagi <elf2000@users.sourceforge.net>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -79,7 +79,7 @@ msgstr "毎日"
 msgid "Weekly"
 msgstr "毎週"
 
-#: backend.php:122 tt-rss.php:203 modules/pref-prefs.php:312
+#: backend.php:122 tt-rss.php:206 modules/pref-prefs.php:312
 msgid "Default"
 msgstr "標準"
 
@@ -166,136 +166,143 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2883 modules/popup-dialog.php:175
-#: modules/pref-filters.php:405 mobile/functions.php:735
+#: functions.php:2847 modules/popup-dialog.php:175
+#: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
-#: functions.php:4378 modules/pref-feeds.php:1244
+#: functions.php:2876 functions.php:2915 functions.php:3304 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1237
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
-#: functions.php:2941 functions.php:3508 mobile/functions.php:33
+#: functions.php:2905 functions.php:3500 mobile/functions.php:33
 msgid "Special"
 msgstr "特別"
 
-#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
+#: functions.php:2907 functions.php:3333 functions.php:3502 prefs.php:144
+#: mobile/functions.php:83
 msgid "Labels"
 msgstr "ラベル"
 
-#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
-#: mobile/functions.php:52
+#: functions.php:2925 functions.php:3326 functions.php:4205 help/3.php:57
+#: mobile/functions.php:61
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: functions.php:2963 functions.php:3344 functions.php:4212
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+#: functions.php:2927 functions.php:3330 functions.php:4212
+#: modules/pref-feeds.php:1406 help/3.php:59 mobile/functions.php:70
 msgid "Published articles"
 msgstr "公開済みの記事"
 
-#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
-#: mobile/functions.php:43
+#: functions.php:2929 functions.php:3336 functions.php:4190 help/3.php:58
+#: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: functions.php:3305 functions.php:3307
+#: functions.php:2931 functions.php:3339 functions.php:4183
+#: mobile/functions.php:43
+#, fuzzy
+msgid "All articles"
+msgstr "すべての記事"
+
+#: functions.php:3290 functions.php:3292
 msgid "Search results"
 msgstr "検索結果"
 
-#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
-#: functions.php:3348 functions.php:3356
+#: functions.php:3308 functions.php:3321 functions.php:3327 functions.php:3331
+#: functions.php:3337 functions.php:3340 functions.php:3348
 #, fuzzy
 msgid "Searched for"
 msgstr "検索"
 
-#: functions.php:3989 functions.php:4045 functions.php:5368
-#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
-#: modules/pref-labels.php:136 modules/pref-users.php:408
+#: functions.php:3981 functions.php:4037 functions.php:5374
+#: modules/pref-feeds.php:1018 modules/pref-feeds.php:1199
+#: modules/pref-filters.php:366 modules/pref-labels.php:138
+#: modules/pref-users.php:408
 msgid "Select:"
 msgstr "選択:"
 
-#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
-#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
-#: modules/pref-users.php:409 mobile/functions.php:561
+#: functions.php:3982 functions.php:4038 modules/pref-feeds.php:1019
+#: modules/pref-feeds.php:1200 modules/pref-filters.php:367
+#: modules/pref-labels.php:139 modules/pref-users.php:409
+#: mobile/functions.php:570
 msgid "All"
 msgstr "すべて"
 
-#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
-#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
+#: functions.php:3983 functions.php:3989 functions.php:4039 functions.php:4042
+#: tt-rss.php:198 mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "未読"
 
-#: functions.php:3992 mobile/functions.php:564
+#: functions.php:3984 mobile/functions.php:573
 msgid "Invert"
 msgstr "反転"
 
-#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
-#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
-#: modules/pref-users.php:410 mobile/functions.php:563
+#: functions.php:3985 functions.php:4040 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:1201 modules/pref-filters.php:368
+#: modules/pref-labels.php:140 modules/pref-users.php:410
+#: mobile/functions.php:572
 msgid "None"
 msgstr "なし"
 
-#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3987 tt-rss.php:147 modules/pref-feeds.php:1360
 msgid "Actions..."
 msgstr "操作..."
 
-#: functions.php:3996
+#: functions.php:3988
 msgid "Selection toggle:"
 msgstr "選択の切り替え:"
 
-#: functions.php:3998 functions.php:4051 tt-rss.php:195
-#: mobile/functions.php:450
+#: functions.php:3990 functions.php:4043 tt-rss.php:197
+#: mobile/functions.php:459
 msgid "Starred"
 msgstr "お気に入り"
 
-#: functions.php:3999
+#: functions.php:3991
 msgid "Published"
 msgstr "公開済み"
 
-#: functions.php:4001 functions.php:4053
+#: functions.php:3993 functions.php:4045
 msgid "Mark as read:"
 msgstr "既読にする:"
 
-#: functions.php:4002 mobile/functions.php:569
+#: functions.php:3994 mobile/functions.php:578
 msgid "Selection"
 msgstr "選択"
 
-#: functions.php:4016 mobile/functions.php:571
+#: functions.php:4008 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "フィードの入力"
 
-#: functions.php:4019
+#: functions.php:4011
 #, fuzzy
 msgid "Assign label:"
 msgstr "タグの割り当て"
 
-#: functions.php:4031
+#: functions.php:4023
 #, fuzzy
 msgid "(remove)"
 msgstr "削除"
 
-#: functions.php:4050
+#: functions.php:4042
 msgid "Toggle:"
 msgstr "トグル"
 
-#: functions.php:4054 mobile/functions.php:570
+#: functions.php:4046 mobile/functions.php:579
 msgid "Page"
 msgstr "ページ"
 
-#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:395
+#: functions.php:4047 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:403
 msgid "Feed"
 msgstr "フィード"
 
-#: functions.php:4096
+#: functions.php:4088
 msgid "Generated feed"
 msgstr "生成したフィード"
 
-#: functions.php:4145
+#: functions.php:4137
 msgid "Click to collapse category"
 msgstr "閉じたカテゴリーのクリック"
 
@@ -307,122 +314,85 @@ msgstr "表示するフィードがありません。"
 msgid "Tags"
 msgstr "タグ"
 
-#: functions.php:4657
+#: functions.php:4651
 msgid " - "
 msgstr " - "
 
-#: functions.php:4716 functions.php:4717
+#: functions.php:4706 functions.php:4707
 msgid "no tags"
 msgstr "タグがありません"
 
-#: functions.php:4724
+#: functions.php:4714
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: functions.php:4732
+#: functions.php:4722
 #, fuzzy
 msgid "Display original article content"
 msgstr "記事の内容をスクロールする"
 
-#: functions.php:4739 functions.php:5378
+#: functions.php:4729 functions.php:5384
 msgid "Show article summary in new window"
 msgstr "記事の要約を新しいウィンドウで表示する"
 
-#: functions.php:4775 functions.php:5302
+#: functions.php:4765 functions.php:5308
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: functions.php:4781 functions.php:5308
+#: functions.php:4771 functions.php:5314
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4817 functions.php:5342
+#: functions.php:4807 functions.php:5348
 msgid "Attachment:"
 msgstr "添付: "
 
-#: functions.php:4819 functions.php:5344
+#: functions.php:4809 functions.php:5350
 msgid "Attachments:"
 msgstr "添付:"
 
-#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
+#: functions.php:4829 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1069
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: functions.php:4895 modules/pref-feed-browser.php:75
+#: functions.php:4885 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: functions.php:4964 mobile/functions.php:414
+#: functions.php:4954 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:5077
-msgid "(Click to change)"
-msgstr "(クリックで変更)"
-
-#: functions.php:5276
+#: functions.php:5282
 msgid "Click to expand article"
 msgstr "開いた記事のクリック"
 
-#: functions.php:5440
+#: functions.php:5442
 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: functions.php:5443
+#: functions.php:5445
+#, fuzzy
+msgid "No updated articles found to display."
+msgstr "表示する未読記事が見つかりませんでした。"
+
+#: functions.php:5448
 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
-#: functions.php:5446
+#: functions.php:5452
+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:5454
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
-#: functions.php:5793
-msgid "Match "
-msgstr "一致 "
-
-#: functions.php:5801
-msgid "Unread articles"
-msgstr "未読記事"
-
-#: functions.php:5802
-msgid "Updated articles"
-msgstr "更新済み記事"
-
-#: functions.php:5803
-msgid "Title contains"
-msgstr "題名の内容"
-
-#: functions.php:5804
-msgid "Content contains"
-msgstr "コンテンツの内容"
-
-#: functions.php:5805
-msgid "Score equals"
-msgstr "スコアと同じ"
-
-#: functions.php:5806
-msgid "Score is greater than"
-msgstr "スコア以上"
-
-#: functions.php:5807
-msgid "Score is less than"
-msgstr "スコア以下"
-
-#: functions.php:5808
-msgid "Articles newer than X hours"
-msgstr "記事が X 時間より新しい"
-
-#: functions.php:5809
-msgid "Articles newer than X days"
-msgstr "記事が X 日より新しい"
-
-#: functions.php:5818
-msgid "Add"
-msgstr "追加"
-
 #: localized_js.php:35
 msgid "display feeds"
 msgstr "フィードの表示"
@@ -629,7 +599,7 @@ msgstr "ヘッドラインを更新できません (XML オブジェクトが見
 msgid "Could not display article (missing XML object)"
 msgstr "記事を表示できません (XML オブジェクトが見当たりません)"
 
-#: localized_js.php:95 tt-rss.php:249 tt-rss.php:262
+#: localized_js.php:95 tt-rss.php:252 tt-rss.php:265
 msgid "No feed selected."
 msgstr "フィードは選択されていません。"
 
@@ -802,9 +772,9 @@ msgstr "選択されたフィードの変更を保存しますか?"
 msgid "Saving feeds..."
 msgstr "フィードの保存中..."
 
-#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:766
+#: localized_schema.php:9 tt-rss.php:208 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1212 modules/pref-feeds.php:1273
+#: mobile/functions.php:775
 msgid "Title"
 msgstr "題名"
 
@@ -817,7 +787,7 @@ msgid "Link"
 msgstr "リンク"
 
 #: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:767
+#: mobile/functions.php:776
 msgid "Content"
 msgstr "内容"
 
@@ -829,7 +799,7 @@ msgstr ""
 msgid "Filter article"
 msgstr "記事フィルター"
 
-#: localized_schema.php:16 mobile/functions.php:574
+#: localized_schema.php:16 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "既読にする"
 
@@ -1316,11 +1286,10 @@ msgid "tag cloud"
 msgstr "タグクラウド"
 
 #: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
-#: modules/pref-labels.php:103 modules/pref-users.php:364
-#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
-#: mobile/functions.php:774
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:1114
+#: modules/pref-filters.php:307 modules/pref-labels.php:105
+#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:435
+#: mobile/functions.php:729 mobile/functions.php:783
 msgid "Search"
 msgstr "検索"
 
@@ -1364,69 +1333,79 @@ msgstr "&nbsp;&nbsp;読んだフィードを隠す/再表示する"
 msgid "Other actions:"
 msgstr "その他の操作:"
 
-#: tt-rss.php:163
+#: tt-rss.php:164
+#, fuzzy
+msgid "&nbsp;&nbsp;Create label"
+msgstr "&nbsp;&nbsp;フィルターを作成する"
+
+#: tt-rss.php:165
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;フィルターを作成する"
 
-#: tt-rss.php:164
+#: tt-rss.php:166
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;UI レイアウトのリセット"
 
-#: tt-rss.php:165
+#: tt-rss.php:167
 msgid "&nbsp;&nbsp;Reset category order"
 msgstr "&nbsp;&nbsp;カテゴリーの順番のリセット"
 
-#: tt-rss.php:167
+#: tt-rss.php:169
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;キーボードショートカット"
 
-#: tt-rss.php:175
+#: tt-rss.php:177
 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 
-#: tt-rss.php:177
+#: tt-rss.php:179
 msgid "Toggle Feedlist"
 msgstr "フィード一覧を切り替える"
 
-#: tt-rss.php:185 mobile/functions.php:729
+#: tt-rss.php:187 mobile/functions.php:738
 msgid "Search:"
 msgstr "検索:"
 
-#: tt-rss.php:193 mobile/functions.php:447
+#: tt-rss.php:195 mobile/functions.php:456
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:194 mobile/functions.php:448
+#: tt-rss.php:196 mobile/functions.php:457
 msgid "All Articles"
 msgstr "すべての記事"
 
-#: tt-rss.php:197
+#: tt-rss.php:199
 msgid "Ignore Scoring"
 msgstr "スコア計算の無効化"
 
-#: tt-rss.php:200
+#: tt-rss.php:200 modules/pref-feeds.php:1218 modules/pref-feeds.php:1281
+#: mobile/functions.php:501 mobile/functions.php:504
+msgid "Updated"
+msgstr "更新日時"
+
+#: tt-rss.php:203
 msgid "Order:"
 msgstr "並べ替え:"
 
-#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:435
+#: tt-rss.php:207 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: modules/pref-filters.php:443
 msgid "Date"
 msgstr "日付"
 
-#: tt-rss.php:206
+#: tt-rss.php:209
 msgid "Score"
 msgstr "スコア"
 
-#: tt-rss.php:210
+#: tt-rss.php:213
 msgid "Limit:"
 msgstr "制限:"
 
-#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:427
+#: tt-rss.php:238 modules/pref-feeds.php:261 modules/pref-feeds.php:451
+#: mobile/functions.php:436
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:253
+#: tt-rss.php:256
 msgid "Drag me to resize panels"
 msgstr "パネルの大きさを変更するにはここをドラッグします"
 
@@ -1584,7 +1563,7 @@ msgid "Subscribe"
 msgstr "購読"
 
 #: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
 #: modules/pref-feeds.php:130 modules/pref-feeds.php:395
 #: modules/pref-feeds.php:546 modules/pref-filters.php:166
 #: modules/pref-users.php:184
@@ -1595,7 +1574,7 @@ msgstr "取り消し"
 msgid "match on:"
 msgstr "対象項目:"
 
-#: modules/popup-dialog.php:167 mobile/functions.php:768
+#: modules/popup-dialog.php:167 mobile/functions.php:777
 msgid "Title or content"
 msgstr "題名か内容"
 
@@ -1603,110 +1582,110 @@ msgstr "題名か内容"
 msgid "Limit search to:"
 msgstr "対象範囲"
 
-#: modules/popup-dialog.php:188 mobile/functions.php:748
+#: modules/popup-dialog.php:188 mobile/functions.php:757
 msgid "This feed"
 msgstr "このフィード"
 
-#: modules/popup-dialog.php:288
+#: modules/popup-dialog.php:226
 msgid "Create Filter"
 msgstr "フィルターを作成する"
 
-#: modules/popup-dialog.php:306 modules/popup-dialog.php:405
+#: 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:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:394
+#: modules/popup-dialog.php:245 modules/pref-filters.php:42
+#: modules/pref-filters.php:402
 msgid "Match"
 msgstr "一致"
 
-#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:425
+#: modules/popup-dialog.php:253 modules/pref-filters.php:54
+#: modules/pref-filters.php:433
 #, fuzzy
 msgid "before"
 msgstr "再描画"
 
-#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:426
+#: modules/popup-dialog.php:254 modules/pref-filters.php:55
+#: modules/pref-filters.php:434
 #, fuzzy
 msgid "after"
 msgstr "日付"
 
-#: modules/popup-dialog.php:380 modules/pref-filters.php:70
+#: modules/popup-dialog.php:268 modules/pref-filters.php:70
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:383 modules/pref-filters.php:73
+#: modules/popup-dialog.php:271 modules/pref-filters.php:73
 msgid "on field"
 msgstr ""
 
-#: modules/popup-dialog.php:389 modules/pref-filters.php:79
+#: modules/popup-dialog.php:277 modules/pref-filters.php:79
 #, fuzzy
 msgid "in"
 msgstr "リンク"
 
-#: modules/popup-dialog.php:394 modules/pref-filters.php:84
+#: modules/popup-dialog.php:282 modules/pref-filters.php:84
 msgid "Perform Action"
 msgstr "操作の実行"
 
-#: modules/popup-dialog.php:411 modules/pref-filters.php:104
+#: modules/popup-dialog.php:299 modules/pref-filters.php:104
 msgid "with parameters:"
 msgstr "パラメーター:"
 
-#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:308
 #: modules/pref-feeds.php:500 modules/pref-filters.php:123
 #: modules/pref-users.php:165
 msgid "Options"
 msgstr "オプション"
 
-#: modules/popup-dialog.php:427 modules/pref-filters.php:135
+#: modules/popup-dialog.php:318 modules/pref-filters.php:135
 msgid "Enabled"
 msgstr "有効にする"
 
-#: modules/popup-dialog.php:430 modules/pref-filters.php:144
+#: modules/popup-dialog.php:321 modules/pref-filters.php:144
 msgid "Inverse match"
 msgstr "一致しない"
 
-#: modules/popup-dialog.php:442
+#: modules/popup-dialog.php:333
 msgid "Create"
 msgstr "作成"
 
-#: modules/popup-dialog.php:457
+#: modules/popup-dialog.php:348
 msgid "Update Errors"
 msgstr "更新エラー"
 
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:351
 msgid "These feeds have not been updated because of errors:"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
-#: modules/popup-dialog.php:478
+#: modules/popup-dialog.php:369
 msgid "Close"
 msgstr "閉じる"
 
-#: modules/popup-dialog.php:487
+#: modules/popup-dialog.php:378
 msgid "Edit Tags"
 msgstr "タグを編集する"
 
-#: modules/popup-dialog.php:492
+#: modules/popup-dialog.php:383
 msgid "Tags for this article (separated by commas):"
 msgstr "この記事のタグ (カンマで区切ります):"
 
-#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:393
 #: modules/pref-feeds.php:544 modules/pref-filters.php:162
 #: modules/pref-users.php:181
 msgid "Save"
 msgstr "保存"
 
-#: modules/popup-dialog.php:550 help/3.php:60
+#: modules/popup-dialog.php:441 help/3.php:60
 msgid "Tag cloud"
 msgstr "タグクラウド"
 
-#: modules/popup-dialog.php:553
+#: modules/popup-dialog.php:444
 msgid "Showing most popular tags "
 msgstr "もっとも人気のあるタグを表示中 "
 
-#: modules/popup-dialog.php:554
+#: modules/popup-dialog.php:445
 msgid "browse more"
 msgstr "もっと参照する"
 
@@ -1815,7 +1794,7 @@ msgstr "電子メールダイジェストに含む"
 msgid "Cache images locally"
 msgstr "ローカルに画像をキャッシュする"
 
-#: modules/pref-feeds.php:390 modules/pref-feeds.php:1374
+#: modules/pref-feeds.php:390 modules/pref-feeds.php:1367
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
@@ -1823,131 +1802,126 @@ msgstr "購読をやめる"
 msgid "Multiple Feed Editor"
 msgstr "複数フィードエディター"
 
-#: modules/pref-feeds.php:781 modules/pref-feeds.php:828
+#: modules/pref-feeds.php:774 modules/pref-feeds.php:821
 msgid "All done."
 msgstr "すべて終了しました。"
 
-#: modules/pref-feeds.php:859
+#: modules/pref-feeds.php:852
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> を購読しました。"
 
-#: modules/pref-feeds.php:861
+#: modules/pref-feeds.php:854
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:943
+#: modules/pref-feeds.php:936
 msgid "Category editor"
 msgstr "カテゴリーエディター"
 
-#: modules/pref-feeds.php:966
+#: modules/pref-feeds.php:959
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "カテゴリー <b>%s</b> はデータベースに既に存在します。"
 
-#: modules/pref-feeds.php:994
+#: modules/pref-feeds.php:987
 msgid "Unable to delete non empty feed categories."
 msgstr "殻でないフィードカテゴリーは削除できません。"
 
-#: modules/pref-feeds.php:1011
+#: modules/pref-feeds.php:1004
 msgid "Create category"
 msgstr "カテゴリーの作成"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1064
 msgid "No feed categories defined."
 msgstr "フィードカテゴリーが定義されていません。"
 
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
-#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
-#: modules/pref-labels.php:176 modules/pref-users.php:481
+#: modules/pref-feeds.php:1075 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:178
+#: modules/pref-users.php:481
 msgid "Remove"
 msgstr "削除"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1097
 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
-#: modules/pref-feeds.php:1126 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1119 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1124
 msgid "Top 25"
 msgstr "トップ 25"
 
-#: modules/pref-feeds.php:1205
+#: modules/pref-feeds.php:1198
 msgid "Show last article times"
 msgstr "最後の記事の時間を表示する"
 
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1284
+#: modules/pref-feeds.php:1215 modules/pref-feeds.php:1277
 msgid "Last&nbsp;Article"
 msgstr "最後の記事"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:492 mobile/functions.php:495
-msgid "Updated"
-msgstr "更新日時"
-
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
-#: modules/pref-labels-old.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1302 modules/pref-filters.php:461
+#: modules/pref-users.php:456
 msgid "Click to edit"
 msgstr "編集するにはクリック"
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1369
+#: modules/pref-feeds.php:1348 modules/pref-feeds.php:1362
 msgid "Selection:"
 msgstr "選択:"
 
-#: modules/pref-feeds.php:1361
+#: modules/pref-feeds.php:1354
 msgid "Recategorize"
 msgstr "カテゴリー再設定"
 
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
-#: modules/pref-labels-old.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1363 modules/pref-filters.php:485
+#: modules/pref-users.php:479
 msgid "Edit"
 msgstr "編集"
 
-#: modules/pref-feeds.php:1371
+#: modules/pref-feeds.php:1364
 msgid "Manual purge"
 msgstr "手動削除"
 
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
 msgid "Clear feed data"
 msgstr "フィードデータの消去"
 
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
+#: modules/pref-feeds.php:1366 modules/pref-filters.php:324
 msgid "Rescore articles"
 msgstr "記事のスコアの再集計"
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1372
 msgid "Other:"
 msgstr "その他:"
 
-#: modules/pref-feeds.php:1380
+#: modules/pref-feeds.php:1373
 msgid "Edit categories"
 msgstr "カテゴリーの編集"
 
-#: modules/pref-feeds.php:1387
+#: modules/pref-feeds.php:1380
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1384
 msgid "File:"
 msgstr "ファイル:"
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1387
 msgid "Import"
 msgstr "インポート"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1394
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1397
 msgid "Firefox Integration"
 msgstr "Firefox 統合"
 
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1399
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1955,22 +1929,22 @@ msgstr ""
 "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
 "Tiny RSS のサイトを使うことができます。"
 
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1403
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1412
 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:1423
+#: modules/pref-feeds.php:1416
 #, fuzzy
 msgid "Link to published articles feed."
 msgstr "公開済みの記事"
 
-#: modules/pref-feeds.php:1426
+#: modules/pref-feeds.php:1419
 msgid "Generate another link"
 msgstr "別のリンクを生成する"
 
@@ -1983,99 +1957,62 @@ msgstr "フィルターエディター"
 msgid "Saved filter <b>%s</b>"
 msgstr "フィルター <b>%s</b> を保存しました"
 
-#: modules/pref-filters.php:256
+#: modules/pref-filters.php:264
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "フィルター <b>%s</b> を作成しました"
 
-#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:317 help/3.php:31 help/4.php:25
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
-#: modules/pref-filters.php:384
+#: modules/pref-filters.php:392
 msgid "filter_type_descr"
 msgstr "filter_type_descr"
 
-#: modules/pref-filters.php:385
+#: modules/pref-filters.php:393
 msgid "action_description"
 msgstr "action_description"
 
-#: modules/pref-filters.php:396
+#: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
 msgstr "フィード"
 
-#: modules/pref-filters.php:397
+#: modules/pref-filters.php:405
 msgid "Params"
 msgstr "パラメーター"
 
-#: modules/pref-filters.php:442
+#: modules/pref-filters.php:450
 msgid "(Disabled)"
 msgstr ""
 
-#: modules/pref-filters.php:458
+#: modules/pref-filters.php:466
 msgid "(Inverse)"
 msgstr ""
 
-#: modules/pref-filters.php:487
+#: modules/pref-filters.php:495
 msgid "No filters defined."
 msgstr "フィルターが定義されていません。"
 
-#: modules/pref-filters.php:489
+#: modules/pref-filters.php:497
 msgid "No matching filters found."
 msgstr "一致するフィルターが見つかりません。"
 
-#: modules/pref-labels-old.php:9
-msgid ""
-"Sorry, labels have been administratively disabled for this installation. "
-"Please contact instance owner or edit configuration file to enable this "
-"functionality."
-msgstr ""
-
-#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
-#: modules/pref-labels.php:143
-msgid "Caption"
-msgstr "キャプション"
-
-#: modules/pref-labels-old.php:46
-msgid "Match SQL"
-msgstr "SQL の一致"
-
-#: modules/pref-labels-old.php:68
-msgid "Help"
-msgstr "ヘルプ"
-
-#: modules/pref-labels-old.php:99
-msgid "Error: SQL expression is blank."
-msgstr "エラー: SQL 表記が空です。"
-
-#: modules/pref-labels-old.php:179
-#, php-format
-msgid "Saved label <b>%s</b>"
-msgstr "ラベル <b>%s</b> を保存しました"
-
-#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
+#: modules/pref-labels.php:75
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "ラベル <b>%s</b> を作成しました"
 
-#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
+#: modules/pref-labels.php:113 help/4.php:26
 msgid "Create label"
 msgstr "ラベルを作成する"
 
-#: modules/pref-labels-old.php:283
-msgid "SQL Expression"
-msgstr "SQL 表記"
-
-#: modules/pref-labels-old.php:308
-msgid "[No caption]"
-msgstr "[キャプションなし]"
-
-#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
+#: modules/pref-labels.php:184
 msgid "No labels defined."
 msgstr "ラベルが定義されていません。"
 
-#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
+#: modules/pref-labels.php:186
 msgid "No matching labels found."
 msgstr "一致するラベルが見つかりません。"
 
@@ -2281,39 +2218,6 @@ msgstr "ユーザーが定義されていません。"
 msgid "No matching users found."
 msgstr "ユーザーが見つかりません。"
 
-#: help/1.php:1
-msgid "Labels and SQL Expressions"
-msgstr "SQL 表現とラベル"
-
-#: help/1.php:3
-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 ""
-
-#: help/1.php:5
-msgid "Examples"
-msgstr "例"
-
-#: help/1.php:7
-msgid "Match all unread articles:"
-msgstr "一致したすべての未読記事:"
-
-#: help/1.php:11
-msgid "Matches all articles which mention Linux in the title:"
-msgstr ""
-
-#: help/1.php:15
-msgid "Matches all articles for the last week (PostgreSQL):"
-msgstr "再収集のすべての記事に一致 (PostgreSQL):"
-
-#: help/1.php:19
-msgid "Matches all articles with scores between 100 and 500:"
-msgstr "100 から 500 までのスコアのすべての記事に一致:"
-
 #: help/2.php:1
 msgid "Content filtering"
 msgstr "コンテンツフィルタリング"
@@ -2509,35 +2413,35 @@ msgstr "フィード"
 msgid "View tags"
 msgstr "タグを編集する"
 
-#: mobile/functions.php:425
+#: mobile/functions.php:434
 msgid "Back"
 msgstr ""
 
-#: mobile/functions.php:435
+#: mobile/functions.php:444
 #, fuzzy
 msgid "View:"
 msgstr "サイト:"
 
-#: mobile/functions.php:457
+#: mobile/functions.php:466
 #, fuzzy
 msgid "Refresh"
 msgstr "再描画"
 
-#: mobile/functions.php:689
+#: mobile/functions.php:698
 #, fuzzy
 msgid "Tags:"
 msgstr "タグ"
 
-#: mobile/functions.php:721
+#: mobile/functions.php:730
 msgid "Go back"
 msgstr ""
 
-#: mobile/functions.php:732
+#: mobile/functions.php:741
 #, fuzzy
 msgid "Where:"
 msgstr "その他:"
 
-#: mobile/functions.php:763
+#: mobile/functions.php:772
 #, fuzzy
 msgid "Match on:"
 msgstr "対象項目:"
@@ -2546,6 +2450,78 @@ msgstr "対象項目:"
 msgid "Internal error: Function not implemented"
 msgstr "インターナルエラー: 機能が実装されていません"
 
+#~ msgid "(Click to change)"
+#~ msgstr "(クリックで変更)"
+
+#~ msgid "Match "
+#~ msgstr "一致 "
+
+#~ msgid "Unread articles"
+#~ msgstr "未読記事"
+
+#~ msgid "Updated articles"
+#~ msgstr "更新済み記事"
+
+#~ msgid "Title contains"
+#~ msgstr "題名の内容"
+
+#~ msgid "Content contains"
+#~ msgstr "コンテンツの内容"
+
+#~ msgid "Score equals"
+#~ msgstr "スコアと同じ"
+
+#~ msgid "Score is greater than"
+#~ msgstr "スコア以上"
+
+#~ msgid "Score is less than"
+#~ msgstr "スコア以下"
+
+#~ msgid "Articles newer than X hours"
+#~ msgstr "記事が X 時間より新しい"
+
+#~ msgid "Articles newer than X days"
+#~ msgstr "記事が X 日より新しい"
+
+#~ msgid "Add"
+#~ msgstr "追加"
+
+#~ msgid "Caption"
+#~ msgstr "キャプション"
+
+#~ msgid "Match SQL"
+#~ msgstr "SQL の一致"
+
+#~ msgid "Help"
+#~ msgstr "ヘルプ"
+
+#~ msgid "Error: SQL expression is blank."
+#~ msgstr "エラー: SQL 表記が空です。"
+
+#~ msgid "Saved label <b>%s</b>"
+#~ msgstr "ラベル <b>%s</b> を保存しました"
+
+#~ msgid "SQL Expression"
+#~ msgstr "SQL 表記"
+
+#~ msgid "[No caption]"
+#~ msgstr "[キャプションなし]"
+
+#~ msgid "Labels and SQL Expressions"
+#~ msgstr "SQL 表現とラベル"
+
+#~ msgid "Examples"
+#~ msgstr "例"
+
+#~ msgid "Match all unread articles:"
+#~ msgstr "一致したすべての未読記事:"
+
+#~ msgid "Matches all articles for the last week (PostgreSQL):"
+#~ msgstr "再収集のすべての記事に一致 (PostgreSQL):"
+
+#~ msgid "Matches all articles with scores between 100 and 500:"
+#~ msgstr "100 から 500 までのスコアのすべての記事に一致:"
+
 #~ msgid "Search to label"
 #~ msgstr "ラベルの検索"
 
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 776649b53..3142f5114 100644
Binary files a/locale/nb_NO/LC_MESSAGES/messages.mo and b/locale/nb_NO/LC_MESSAGES/messages.mo differ
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index bcf8eb632..7785edd7b 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-01-18 15:24+0300\n"
+"POT-Creation-Date: 2009-01-19 11:56+0300\n"
 "PO-Revision-Date: 2008-11-29 20:45+0100\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
@@ -79,7 +79,7 @@ msgstr "Daglig"
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: backend.php:122 tt-rss.php:203 modules/pref-prefs.php:312
+#: backend.php:122 tt-rss.php:206 modules/pref-prefs.php:312
 msgid "Default"
 msgstr "Standard"
 
@@ -169,135 +169,142 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
 
-#: functions.php:2883 modules/popup-dialog.php:175
-#: modules/pref-filters.php:405 mobile/functions.php:735
+#: functions.php:2847 modules/popup-dialog.php:175
+#: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
-#: functions.php:4378 modules/pref-feeds.php:1244
+#: functions.php:2876 functions.php:2915 functions.php:3304 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1237
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
-#: functions.php:2941 functions.php:3508 mobile/functions.php:33
+#: functions.php:2905 functions.php:3500 mobile/functions.php:33
 msgid "Special"
 msgstr "Snarveier"
 
-#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
+#: functions.php:2907 functions.php:3333 functions.php:3502 prefs.php:144
+#: mobile/functions.php:83
 msgid "Labels"
 msgstr "Merkelapper"
 
-#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
-#: mobile/functions.php:52
+#: functions.php:2925 functions.php:3326 functions.php:4205 help/3.php:57
+#: mobile/functions.php:61
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
-#: functions.php:2963 functions.php:3344 functions.php:4212
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+#: functions.php:2927 functions.php:3330 functions.php:4212
+#: modules/pref-feeds.php:1406 help/3.php:59 mobile/functions.php:70
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
-#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
-#: mobile/functions.php:43
+#: functions.php:2929 functions.php:3336 functions.php:4190 help/3.php:58
+#: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
-#: functions.php:3305 functions.php:3307
+#: functions.php:2931 functions.php:3339 functions.php:4183
+#: mobile/functions.php:43
+#, fuzzy
+msgid "All articles"
+msgstr "Alle artikler"
+
+#: functions.php:3290 functions.php:3292
 msgid "Search results"
 msgstr "Søkeresultat"
 
-#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
-#: functions.php:3348 functions.php:3356
+#: functions.php:3308 functions.php:3321 functions.php:3327 functions.php:3331
+#: functions.php:3337 functions.php:3340 functions.php:3348
 msgid "Searched for"
 msgstr "Søkte etter"
 
-#: functions.php:3989 functions.php:4045 functions.php:5368
-#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
-#: modules/pref-labels.php:136 modules/pref-users.php:408
+#: functions.php:3981 functions.php:4037 functions.php:5374
+#: modules/pref-feeds.php:1018 modules/pref-feeds.php:1199
+#: modules/pref-filters.php:366 modules/pref-labels.php:138
+#: modules/pref-users.php:408
 msgid "Select:"
 msgstr "Velg:"
 
-#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
-#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
-#: modules/pref-users.php:409 mobile/functions.php:561
+#: functions.php:3982 functions.php:4038 modules/pref-feeds.php:1019
+#: modules/pref-feeds.php:1200 modules/pref-filters.php:367
+#: modules/pref-labels.php:139 modules/pref-users.php:409
+#: mobile/functions.php:570
 msgid "All"
 msgstr "Alle"
 
-#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
-#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
+#: functions.php:3983 functions.php:3989 functions.php:4039 functions.php:4042
+#: tt-rss.php:198 mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "Ulest"
 
-#: functions.php:3992 mobile/functions.php:564
+#: functions.php:3984 mobile/functions.php:573
 msgid "Invert"
 msgstr "Motsatt"
 
-#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
-#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
-#: modules/pref-users.php:410 mobile/functions.php:563
+#: functions.php:3985 functions.php:4040 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:1201 modules/pref-filters.php:368
+#: modules/pref-labels.php:140 modules/pref-users.php:410
+#: mobile/functions.php:572
 msgid "None"
 msgstr "Ingen"
 
-#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3987 tt-rss.php:147 modules/pref-feeds.php:1360
 msgid "Actions..."
 msgstr "Handlinger..."
 
-#: functions.php:3996
+#: functions.php:3988
 msgid "Selection toggle:"
 msgstr "Marker utvalg:"
 
-#: functions.php:3998 functions.php:4051 tt-rss.php:195
-#: mobile/functions.php:450
+#: functions.php:3990 functions.php:4043 tt-rss.php:197
+#: mobile/functions.php:459
 msgid "Starred"
 msgstr "Favoritter"
 
-#: functions.php:3999
+#: functions.php:3991
 msgid "Published"
 msgstr "Publisert"
 
-#: functions.php:4001 functions.php:4053
+#: functions.php:3993 functions.php:4045
 msgid "Mark as read:"
 msgstr "Marker som lest:"
 
-#: functions.php:4002 mobile/functions.php:569
+#: functions.php:3994 mobile/functions.php:578
 msgid "Selection"
 msgstr "Utvalg"
 
-#: functions.php:4016 mobile/functions.php:571
+#: functions.php:4008 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "Hele nyhetsstrømmen"
 
-#: functions.php:4019
+#: functions.php:4011
 #, fuzzy
 msgid "Assign label:"
 msgstr "Tildel stikkord"
 
-#: functions.php:4031
+#: functions.php:4023
 #, fuzzy
 msgid "(remove)"
 msgstr "Fjern"
 
-#: functions.php:4050
+#: functions.php:4042
 msgid "Toggle:"
 msgstr "Vis:"
 
-#: functions.php:4054 mobile/functions.php:570
+#: functions.php:4046 mobile/functions.php:579
 msgid "Page"
 msgstr "Side"
 
-#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:395
+#: functions.php:4047 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:403
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: functions.php:4096
+#: functions.php:4088
 msgid "Generated feed"
 msgstr "Generert nyhetsstrøm"
 
-#: functions.php:4145
+#: functions.php:4137
 msgid "Click to collapse category"
 msgstr "Velg for å slå sammen kategorien"
 
@@ -309,52 +316,52 @@ msgstr "Ingen nyhetstrømmer å vise"
 msgid "Tags"
 msgstr "Stikkord"
 
-#: functions.php:4657
+#: functions.php:4651
 msgid " - "
 msgstr "-"
 
-#: functions.php:4716 functions.php:4717
+#: functions.php:4706 functions.php:4707
 msgid "no tags"
 msgstr "Ingen stikkord"
 
-#: functions.php:4724
+#: functions.php:4714
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: functions.php:4732
+#: functions.php:4722
 msgid "Display original article content"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: functions.php:4739 functions.php:5378
+#: functions.php:4729 functions.php:5384
 msgid "Show article summary in new window"
 msgstr "Åpne artikkelsammendraget i nytt nettleservindu"
 
-#: functions.php:4775 functions.php:5302
+#: functions.php:4765 functions.php:5308
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: functions.php:4781 functions.php:5308
+#: functions.php:4771 functions.php:5314
 msgid "audio/mpeg"
 msgstr "Lyd/mpeg"
 
-#: functions.php:4817 functions.php:5342
+#: functions.php:4807 functions.php:5348
 msgid "Attachment:"
 msgstr "Vedlegg:"
 
-#: functions.php:4819 functions.php:5344
+#: functions.php:4809 functions.php:5350
 msgid "Attachments:"
 msgstr "Vedlegg:"
 
-#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
+#: functions.php:4829 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1069
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: functions.php:4895 modules/pref-feed-browser.php:75
+#: functions.php:4885 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: functions.php:4964 mobile/functions.php:414
+#: functions.php:4954 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -362,70 +369,33 @@ msgstr ""
 "Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
 "merkelappsyntaksen eller lokal konfigurasjon."
 
-#: functions.php:5077
-msgid "(Click to change)"
-msgstr "(Trykk for å endre)"
-
-#: functions.php:5276
+#: functions.php:5282
 msgid "Click to expand article"
 msgstr "Trykk for å utvide artikkel"
 
-#: functions.php:5440
+#: functions.php:5442
 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 
-#: functions.php:5443
+#: functions.php:5445
+#, fuzzy
+msgid "No updated articles found to display."
+msgstr "Ingen uleste artikler funnet som kunne vises"
+
+#: functions.php:5448
 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 
-#: functions.php:5446
+#: functions.php:5452
+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:5454
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: functions.php:5793
-msgid "Match "
-msgstr "Match"
-
-#: functions.php:5801
-msgid "Unread articles"
-msgstr "Uleste artikler"
-
-#: functions.php:5802
-msgid "Updated articles"
-msgstr "Oppdaterte artikler"
-
-#: functions.php:5803
-msgid "Title contains"
-msgstr "Tittel inneholder"
-
-#: functions.php:5804
-msgid "Content contains"
-msgstr "Innholdet inneholder"
-
-#: functions.php:5805
-msgid "Score equals"
-msgstr "Poeng er lik"
-
-#: functions.php:5806
-msgid "Score is greater than"
-msgstr "Fler poeng enn"
-
-#: functions.php:5807
-msgid "Score is less than"
-msgstr "Færre poeng enn"
-
-#: functions.php:5808
-msgid "Articles newer than X hours"
-msgstr "Artikler nyere enn X timer"
-
-#: functions.php:5809
-msgid "Articles newer than X days"
-msgstr "Artikler nyere enn X dager"
-
-#: functions.php:5818
-msgid "Add"
-msgstr "Legg til"
-
 #: localized_js.php:35
 msgid "display feeds"
 msgstr "Vis nyhetsstrømmer"
@@ -632,7 +602,7 @@ msgstr "Kunne ikke oppdatere overskriftene (manglende XML objekt)."
 msgid "Could not display article (missing XML object)"
 msgstr "Kunne ikke vise artikkelen (manglende XML objekt)."
 
-#: localized_js.php:95 tt-rss.php:249 tt-rss.php:262
+#: localized_js.php:95 tt-rss.php:252 tt-rss.php:265
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
@@ -804,9 +774,9 @@ msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
 msgid "Saving feeds..."
 msgstr "Lagrer Nyhetsstrømmene..."
 
-#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:766
+#: localized_schema.php:9 tt-rss.php:208 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1212 modules/pref-feeds.php:1273
+#: mobile/functions.php:775
 msgid "Title"
 msgstr "Tittel"
 
@@ -819,7 +789,7 @@ msgid "Link"
 msgstr "Lenke"
 
 #: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:767
+#: mobile/functions.php:776
 msgid "Content"
 msgstr "Innhold"
 
@@ -831,7 +801,7 @@ msgstr ""
 msgid "Filter article"
 msgstr "Filtrer artikkel"
 
-#: localized_schema.php:16 mobile/functions.php:574
+#: localized_schema.php:16 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "Marker som lest"
 
@@ -1363,11 +1333,10 @@ msgid "tag cloud"
 msgstr "Tag-sky"
 
 #: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
-#: modules/pref-labels.php:103 modules/pref-users.php:364
-#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
-#: mobile/functions.php:774
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:1114
+#: modules/pref-filters.php:307 modules/pref-labels.php:105
+#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:435
+#: mobile/functions.php:729 mobile/functions.php:783
 msgid "Search"
 msgstr "Søk"
 
@@ -1411,69 +1380,79 @@ msgstr "&nbsp;&nbsp;Skjul/vis leste nyhetsstrømmer"
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: tt-rss.php:163
+#: tt-rss.php:164
+#, fuzzy
+msgid "&nbsp;&nbsp;Create label"
+msgstr "&nbsp;&nbsp;Lag filter"
+
+#: tt-rss.php:165
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Lag filter"
 
-#: tt-rss.php:164
+#: tt-rss.php:166
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;Tilbakestill de grafiske instillingene"
 
-#: tt-rss.php:165
+#: tt-rss.php:167
 msgid "&nbsp;&nbsp;Reset category order"
 msgstr "&nbsp;&nbsp;Endre rekkefølgen på kategoriene"
 
-#: tt-rss.php:167
+#: tt-rss.php:169
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Tastatursnarveier"
 
-#: tt-rss.php:175
+#: tt-rss.php:177
 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: tt-rss.php:177
+#: tt-rss.php:179
 msgid "Toggle Feedlist"
 msgstr "Vis nyhetskanallisten"
 
-#: tt-rss.php:185 mobile/functions.php:729
+#: tt-rss.php:187 mobile/functions.php:738
 msgid "Search:"
 msgstr "Søk:"
 
-#: tt-rss.php:193 mobile/functions.php:447
+#: tt-rss.php:195 mobile/functions.php:456
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: tt-rss.php:194 mobile/functions.php:448
+#: tt-rss.php:196 mobile/functions.php:457
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: tt-rss.php:197
+#: tt-rss.php:199
 msgid "Ignore Scoring"
 msgstr "Ignorer poenggivning"
 
-#: tt-rss.php:200
+#: tt-rss.php:200 modules/pref-feeds.php:1218 modules/pref-feeds.php:1281
+#: mobile/functions.php:501 mobile/functions.php:504
+msgid "Updated"
+msgstr "Oppdatert"
+
+#: tt-rss.php:203
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:435
+#: tt-rss.php:207 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: modules/pref-filters.php:443
 msgid "Date"
 msgstr "Dato"
 
-#: tt-rss.php:206
+#: tt-rss.php:209
 msgid "Score"
 msgstr "Poeng"
 
-#: tt-rss.php:210
+#: tt-rss.php:213
 msgid "Limit:"
 msgstr "Antall:"
 
-#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:427
+#: tt-rss.php:238 modules/pref-feeds.php:261 modules/pref-feeds.php:451
+#: mobile/functions.php:436
 msgid "Update"
 msgstr "Oppdater"
 
-#: tt-rss.php:253
+#: tt-rss.php:256
 msgid "Drag me to resize panels"
 msgstr "Dra i meg for å endre størrelsen på panelene."
 
@@ -1640,7 +1619,7 @@ msgid "Subscribe"
 msgstr "Abonner"
 
 #: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
 #: modules/pref-feeds.php:130 modules/pref-feeds.php:395
 #: modules/pref-feeds.php:546 modules/pref-filters.php:166
 #: modules/pref-users.php:184
@@ -1651,7 +1630,7 @@ msgstr "Avbryt"
 msgid "match on:"
 msgstr "Match på:"
 
-#: modules/popup-dialog.php:167 mobile/functions.php:768
+#: modules/popup-dialog.php:167 mobile/functions.php:777
 msgid "Title or content"
 msgstr "Tittel eller innhold"
 
@@ -1659,108 +1638,108 @@ msgstr "Tittel eller innhold"
 msgid "Limit search to:"
 msgstr "Begrens søket til:"
 
-#: modules/popup-dialog.php:188 mobile/functions.php:748
+#: modules/popup-dialog.php:188 mobile/functions.php:757
 msgid "This feed"
 msgstr "Denne nyhetsstrømmen"
 
-#: modules/popup-dialog.php:288
+#: modules/popup-dialog.php:226
 msgid "Create Filter"
 msgstr "Lag filter"
 
-#: modules/popup-dialog.php:306 modules/popup-dialog.php:405
+#: 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:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:394
+#: modules/popup-dialog.php:245 modules/pref-filters.php:42
+#: modules/pref-filters.php:402
 msgid "Match"
 msgstr "Match"
 
-#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:425
+#: modules/popup-dialog.php:253 modules/pref-filters.php:54
+#: modules/pref-filters.php:433
 msgid "before"
 msgstr ""
 
-#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:426
+#: modules/popup-dialog.php:254 modules/pref-filters.php:55
+#: modules/pref-filters.php:434
 #, fuzzy
 msgid "after"
 msgstr "Dato"
 
-#: modules/popup-dialog.php:380 modules/pref-filters.php:70
+#: modules/popup-dialog.php:268 modules/pref-filters.php:70
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:383 modules/pref-filters.php:73
+#: modules/popup-dialog.php:271 modules/pref-filters.php:73
 msgid "on field"
 msgstr "På felt:"
 
-#: modules/popup-dialog.php:389 modules/pref-filters.php:79
+#: modules/popup-dialog.php:277 modules/pref-filters.php:79
 msgid "in"
 msgstr "i"
 
-#: modules/popup-dialog.php:394 modules/pref-filters.php:84
+#: modules/popup-dialog.php:282 modules/pref-filters.php:84
 msgid "Perform Action"
 msgstr "Utfør handlingen"
 
-#: modules/popup-dialog.php:411 modules/pref-filters.php:104
+#: modules/popup-dialog.php:299 modules/pref-filters.php:104
 msgid "with parameters:"
 msgstr "med parametrene:"
 
-#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:308
 #: modules/pref-feeds.php:500 modules/pref-filters.php:123
 #: modules/pref-users.php:165
 msgid "Options"
 msgstr "Alternativer:"
 
-#: modules/popup-dialog.php:427 modules/pref-filters.php:135
+#: modules/popup-dialog.php:318 modules/pref-filters.php:135
 msgid "Enabled"
 msgstr "Tillatt"
 
-#: modules/popup-dialog.php:430 modules/pref-filters.php:144
+#: modules/popup-dialog.php:321 modules/pref-filters.php:144
 msgid "Inverse match"
 msgstr "Motsatt markering"
 
-#: modules/popup-dialog.php:442
+#: modules/popup-dialog.php:333
 msgid "Create"
 msgstr "Lag"
 
-#: modules/popup-dialog.php:457
+#: modules/popup-dialog.php:348
 msgid "Update Errors"
 msgstr "Oppdaterer feil"
 
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:351
 msgid "These feeds have not been updated because of errors:"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
-#: modules/popup-dialog.php:478
+#: modules/popup-dialog.php:369
 msgid "Close"
 msgstr "Steng"
 
-#: modules/popup-dialog.php:487
+#: modules/popup-dialog.php:378
 msgid "Edit Tags"
 msgstr "Endre Stikkord"
 
-#: modules/popup-dialog.php:492
+#: modules/popup-dialog.php:383
 msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
-#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:393
 #: modules/pref-feeds.php:544 modules/pref-filters.php:162
 #: modules/pref-users.php:181
 msgid "Save"
 msgstr "Lagre"
 
-#: modules/popup-dialog.php:550 help/3.php:60
+#: modules/popup-dialog.php:441 help/3.php:60
 msgid "Tag cloud"
 msgstr "Tag-sky"
 
-#: modules/popup-dialog.php:553
+#: modules/popup-dialog.php:444
 msgid "Showing most popular tags "
 msgstr "Vis mest populære stikkord"
 
-#: modules/popup-dialog.php:554
+#: modules/popup-dialog.php:445
 msgid "browse more"
 msgstr "utforsk videre"
 
@@ -1871,7 +1850,7 @@ msgstr "Inkluder i e-postsammendraget"
 msgid "Cache images locally"
 msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: modules/pref-feeds.php:390 modules/pref-feeds.php:1374
+#: modules/pref-feeds.php:390 modules/pref-feeds.php:1367
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
@@ -1879,131 +1858,126 @@ msgstr "Avabonner"
 msgid "Multiple Feed Editor"
 msgstr "Nyhetsstrømsredigerer"
 
-#: modules/pref-feeds.php:781 modules/pref-feeds.php:828
+#: modules/pref-feeds.php:774 modules/pref-feeds.php:821
 msgid "All done."
 msgstr "Alt ferdig."
 
-#: modules/pref-feeds.php:859
+#: modules/pref-feeds.php:852
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonnerer på <b>%s</b>"
 
-#: modules/pref-feeds.php:861
+#: modules/pref-feeds.php:854
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:943
+#: modules/pref-feeds.php:936
 msgid "Category editor"
 msgstr "Kategoriredigerer"
 
-#: modules/pref-feeds.php:966
+#: modules/pref-feeds.php:959
 #, 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:994
+#: modules/pref-feeds.php:987
 msgid "Unable to delete non empty feed categories."
 msgstr "Kunne ikke slette kategorien, den var ikke tom"
 
-#: modules/pref-feeds.php:1011
+#: modules/pref-feeds.php:1004
 msgid "Create category"
 msgstr "Lag kategori"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1064
 msgid "No feed categories defined."
 msgstr "Ingen kategorier ble markert"
 
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
-#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
-#: modules/pref-labels.php:176 modules/pref-users.php:481
+#: modules/pref-feeds.php:1075 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:178
+#: modules/pref-users.php:481
 msgid "Remove"
 msgstr "Fjern"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1097
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: modules/pref-feeds.php:1126 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1119 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1124
 msgid "Top 25"
 msgstr "Topp 25"
 
-#: modules/pref-feeds.php:1205
+#: modules/pref-feeds.php:1198
 msgid "Show last article times"
 msgstr "Vis tidspunktene for siste artikkel"
 
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1284
+#: modules/pref-feeds.php:1215 modules/pref-feeds.php:1277
 msgid "Last&nbsp;Article"
 msgstr "Siste&nbsp;Artikkel"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:492 mobile/functions.php:495
-msgid "Updated"
-msgstr "Oppdatert"
-
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
-#: modules/pref-labels-old.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1302 modules/pref-filters.php:461
+#: modules/pref-users.php:456
 msgid "Click to edit"
 msgstr "Trykk for å endre"
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1369
+#: modules/pref-feeds.php:1348 modules/pref-feeds.php:1362
 msgid "Selection:"
 msgstr "Utvalg:"
 
-#: modules/pref-feeds.php:1361
+#: modules/pref-feeds.php:1354
 msgid "Recategorize"
 msgstr "Rekategoriser"
 
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
-#: modules/pref-labels-old.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1363 modules/pref-filters.php:485
+#: modules/pref-users.php:479
 msgid "Edit"
 msgstr "Rediger"
 
-#: modules/pref-feeds.php:1371
+#: modules/pref-feeds.php:1364
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
 msgid "Clear feed data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
+#: modules/pref-feeds.php:1366 modules/pref-filters.php:324
 msgid "Rescore articles"
 msgstr "Tilbakestill poengsummene for artiklene"
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1372
 msgid "Other:"
 msgstr "Andre:"
 
-#: modules/pref-feeds.php:1380
+#: modules/pref-feeds.php:1373
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: modules/pref-feeds.php:1387
+#: modules/pref-feeds.php:1380
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1384
 msgid "File:"
 msgstr "Fil:"
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1387
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1394
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1397
 msgid "Firefox Integration"
 msgstr "Firefox integrering"
 
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1399
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -2011,11 +1985,11 @@ msgstr ""
 "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
 "ved å trykke på lenken nedenfor."
 
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1403
 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:1419
+#: modules/pref-feeds.php:1412
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2023,12 +1997,12 @@ 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:1423
+#: modules/pref-feeds.php:1416
 #, fuzzy
 msgid "Link to published articles feed."
 msgstr "Publiserte artikler"
 
-#: modules/pref-feeds.php:1426
+#: modules/pref-feeds.php:1419
 msgid "Generate another link"
 msgstr "Genererer en ny adresse"
 
@@ -2041,102 +2015,62 @@ msgstr "Filteradministrering"
 msgid "Saved filter <b>%s</b>"
 msgstr "Lagret filter <b>%s</b>"
 
-#: modules/pref-filters.php:256
+#: modules/pref-filters.php:264
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Laget filter <b>%s</b>"
 
-#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:317 help/3.php:31 help/4.php:25
 msgid "Create filter"
 msgstr "Lag filter"
 
-#: modules/pref-filters.php:384
+#: modules/pref-filters.php:392
 msgid "filter_type_descr"
 msgstr "Beskrivelse av filtertype"
 
-#: modules/pref-filters.php:385
+#: modules/pref-filters.php:393
 msgid "action_description"
 msgstr "Handlingsbeskrivelse"
 
-#: modules/pref-filters.php:396
+#: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
 msgstr "Nyhetsstrøm"
 
-#: modules/pref-filters.php:397
+#: modules/pref-filters.php:405
 msgid "Params"
 msgstr "Parametre"
 
-#: modules/pref-filters.php:442
+#: modules/pref-filters.php:450
 msgid "(Disabled)"
 msgstr "(Avskrudd)"
 
-#: modules/pref-filters.php:458
+#: modules/pref-filters.php:466
 msgid "(Inverse)"
 msgstr "(Motsatt)"
 
-#: modules/pref-filters.php:487
+#: modules/pref-filters.php:495
 msgid "No filters defined."
 msgstr "Ingen filtre er valgt"
 
-#: modules/pref-filters.php:489
+#: modules/pref-filters.php:497
 msgid "No matching filters found."
 msgstr "Ingen filtre ble funnet."
 
-#: modules/pref-labels-old.php:9
-msgid ""
-"Sorry, labels have been administratively disabled for this installation. "
-"Please contact instance owner or edit configuration file to enable this "
-"functionality."
-msgstr ""
-"Beklager, merkelapper har blitt administrativt avskrudd for denne "
-"installasjonen. Vennligst kontakt sideadministratoren eller rediger "
-"konfigurasjonsfilen for å åpne for denne funksjonaliteten."
-
-#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
-#: modules/pref-labels.php:143
-msgid "Caption"
-msgstr "Overskrift"
-
-#: modules/pref-labels-old.php:46
-msgid "Match SQL"
-msgstr "Match SQL"
-
-#: modules/pref-labels-old.php:68
-msgid "Help"
-msgstr "Hjelp"
-
-#: modules/pref-labels-old.php:99
-msgid "Error: SQL expression is blank."
-msgstr "Feil: SQL uttrykket er blankt."
-
-#: modules/pref-labels-old.php:179
-#, php-format
-msgid "Saved label <b>%s</b>"
-msgstr "Lagret merkelapp <b>%s</b>"
-
-#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
+#: modules/pref-labels.php:75
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Laget merkelappen <b>%s</b>"
 
-#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
+#: modules/pref-labels.php:113 help/4.php:26
 msgid "Create label"
 msgstr "Lag merkelapp"
 
-#: modules/pref-labels-old.php:283
-msgid "SQL Expression"
-msgstr "SQL-uttrykk"
-
-#: modules/pref-labels-old.php:308
-msgid "[No caption]"
-msgstr "Ingen bildetekst"
-
-#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
+#: modules/pref-labels.php:184
 msgid "No labels defined."
 msgstr "Ingen merkelapper er valgt"
 
-#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
+#: modules/pref-labels.php:186
 msgid "No matching labels found."
 msgstr "Ingen passende merkelapper ble funnet."
 
@@ -2342,44 +2276,6 @@ msgstr "Ingen brukere er valgt"
 msgid "No matching users found."
 msgstr "Ingen matchende brukere ble funnet"
 
-#: help/1.php:1
-msgid "Labels and SQL Expressions"
-msgstr "Navnelapper og SQL-uttrykk"
-
-#: help/1.php:3
-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 ""
-"Navnelapper blir generert ut i fra SQL-uttrykk. &laquoSQL-uttrykket&raquo "
-"blir lagt til i WHERE-klausulen i nyhetsstrømsforespørselen. Du kan matche "
-"mot ttrss_entries tabellen felter og til og med bruke &laquosubselect&raquo "
-"for å etterspørre ytterligere informasjon. Denne funksjonaliteten bllir "
-"regnet som avansert og forutsetter noe kjennskap til SQL."
-
-#: help/1.php:5
-msgid "Examples"
-msgstr "Eksempler"
-
-#: help/1.php:7
-msgid "Match all unread articles:"
-msgstr "Match alle uleste artikler:"
-
-#: help/1.php:11
-msgid "Matches all articles which mention Linux in the title:"
-msgstr "Viser alle artikler som nevner Linux i tittelen:"
-
-#: help/1.php:15
-msgid "Matches all articles for the last week (PostgreSQL):"
-msgstr "Viser alle artiklene fra den siste uken (PostgreSQL):"
-
-#: help/1.php:19
-msgid "Matches all articles with scores between 100 and 500:"
-msgstr "Viser alle artikler med mellom 100 og 500 poeng:"
-
 #: help/2.php:1
 msgid "Content filtering"
 msgstr "Innholdsfiltering"
@@ -2589,32 +2485,32 @@ msgstr "Nyhetsstrøm"
 msgid "View tags"
 msgstr "Endre stikkord"
 
-#: mobile/functions.php:425
+#: mobile/functions.php:434
 msgid "Back"
 msgstr ""
 
-#: mobile/functions.php:435
+#: mobile/functions.php:444
 msgid "View:"
 msgstr "Vis:"
 
-#: mobile/functions.php:457
+#: mobile/functions.php:466
 msgid "Refresh"
 msgstr ""
 
-#: mobile/functions.php:689
+#: mobile/functions.php:698
 #, fuzzy
 msgid "Tags:"
 msgstr "Stikkord"
 
-#: mobile/functions.php:721
+#: mobile/functions.php:730
 msgid "Go back"
 msgstr ""
 
-#: mobile/functions.php:732
+#: mobile/functions.php:741
 msgid "Where:"
 msgstr "Hvor:"
 
-#: mobile/functions.php:763
+#: mobile/functions.php:772
 #, fuzzy
 msgid "Match on:"
 msgstr "Match på:"
@@ -2623,6 +2519,104 @@ msgstr "Match på:"
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#~ msgid "(Click to change)"
+#~ msgstr "(Trykk for å endre)"
+
+#~ msgid "Match "
+#~ msgstr "Match"
+
+#~ msgid "Unread articles"
+#~ msgstr "Uleste artikler"
+
+#~ msgid "Updated articles"
+#~ msgstr "Oppdaterte artikler"
+
+#~ msgid "Title contains"
+#~ msgstr "Tittel inneholder"
+
+#~ msgid "Content contains"
+#~ msgstr "Innholdet inneholder"
+
+#~ msgid "Score equals"
+#~ msgstr "Poeng er lik"
+
+#~ msgid "Score is greater than"
+#~ msgstr "Fler poeng enn"
+
+#~ msgid "Score is less than"
+#~ msgstr "Færre poeng enn"
+
+#~ msgid "Articles newer than X hours"
+#~ msgstr "Artikler nyere enn X timer"
+
+#~ msgid "Articles newer than X days"
+#~ msgstr "Artikler nyere enn X dager"
+
+#~ msgid "Add"
+#~ msgstr "Legg til"
+
+#~ msgid ""
+#~ "Sorry, labels have been administratively disabled for this installation. "
+#~ "Please contact instance owner or edit configuration file to enable this "
+#~ "functionality."
+#~ msgstr ""
+#~ "Beklager, merkelapper har blitt administrativt avskrudd for denne "
+#~ "installasjonen. Vennligst kontakt sideadministratoren eller rediger "
+#~ "konfigurasjonsfilen for å åpne for denne funksjonaliteten."
+
+#~ msgid "Caption"
+#~ msgstr "Overskrift"
+
+#~ msgid "Match SQL"
+#~ msgstr "Match SQL"
+
+#~ msgid "Help"
+#~ msgstr "Hjelp"
+
+#~ msgid "Error: SQL expression is blank."
+#~ msgstr "Feil: SQL uttrykket er blankt."
+
+#~ msgid "Saved label <b>%s</b>"
+#~ msgstr "Lagret merkelapp <b>%s</b>"
+
+#~ msgid "SQL Expression"
+#~ msgstr "SQL-uttrykk"
+
+#~ msgid "[No caption]"
+#~ msgstr "Ingen bildetekst"
+
+#~ msgid "Labels and SQL Expressions"
+#~ msgstr "Navnelapper og SQL-uttrykk"
+
+#~ 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 ""
+#~ "Navnelapper blir generert ut i fra SQL-uttrykk. &laquoSQL-uttrykket&raquo "
+#~ "blir lagt til i WHERE-klausulen i nyhetsstrømsforespørselen. Du kan "
+#~ "matche mot ttrss_entries tabellen felter og til og med bruke "
+#~ "&laquosubselect&raquo for å etterspørre ytterligere informasjon. Denne "
+#~ "funksjonaliteten bllir regnet som avansert og forutsetter noe kjennskap "
+#~ "til SQL."
+
+#~ msgid "Examples"
+#~ msgstr "Eksempler"
+
+#~ msgid "Match all unread articles:"
+#~ msgstr "Match alle uleste artikler:"
+
+#~ msgid "Matches all articles which mention Linux in the title:"
+#~ msgstr "Viser alle artikler som nevner Linux i tittelen:"
+
+#~ msgid "Matches all articles for the last week (PostgreSQL):"
+#~ msgstr "Viser alle artiklene fra den siste uken (PostgreSQL):"
+
+#~ msgid "Matches all articles with scores between 100 and 500:"
+#~ msgstr "Viser alle artikler med mellom 100 og 500 poeng:"
+
 #~ msgid "Search to label"
 #~ msgstr "Søk etter merkelapp"
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index ea54b3de0..8c1f4af7a 100644
Binary files a/locale/pt_BR/LC_MESSAGES/messages.mo and b/locale/pt_BR/LC_MESSAGES/messages.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index c9441e595..db1d90807 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-01-18 15:24+0300\n"
+"POT-Creation-Date: 2009-01-19 11:56+0300\n"
 "PO-Revision-Date: 2007-10-24 00:47-0200\n"
 "Last-Translator: Marcelo Jorge VIeira (metal) <metal@alucinados.com>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -81,7 +81,7 @@ msgstr "Diariamente"
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: backend.php:122 tt-rss.php:203 modules/pref-prefs.php:312
+#: backend.php:122 tt-rss.php:206 modules/pref-prefs.php:312
 msgid "Default"
 msgstr "Padrão"
 
@@ -166,136 +166,143 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2883 modules/popup-dialog.php:175
-#: modules/pref-filters.php:405 mobile/functions.php:735
+#: functions.php:2847 modules/popup-dialog.php:175
+#: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
-#: functions.php:4378 modules/pref-feeds.php:1244
+#: functions.php:2876 functions.php:2915 functions.php:3304 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1237
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
-#: functions.php:2941 functions.php:3508 mobile/functions.php:33
+#: functions.php:2905 functions.php:3500 mobile/functions.php:33
 msgid "Special"
 msgstr "Especial"
 
-#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
+#: functions.php:2907 functions.php:3333 functions.php:3502 prefs.php:144
+#: mobile/functions.php:83
 msgid "Labels"
 msgstr ""
 
-#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
-#: mobile/functions.php:52
+#: functions.php:2925 functions.php:3326 functions.php:4205 help/3.php:57
+#: mobile/functions.php:61
 msgid "Starred articles"
 msgstr ""
 
-#: functions.php:2963 functions.php:3344 functions.php:4212
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+#: functions.php:2927 functions.php:3330 functions.php:4212
+#: modules/pref-feeds.php:1406 help/3.php:59 mobile/functions.php:70
 msgid "Published articles"
 msgstr ""
 
-#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
-#: mobile/functions.php:43
+#: functions.php:2929 functions.php:3336 functions.php:4190 help/3.php:58
+#: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr ""
 
-#: functions.php:3305 functions.php:3307
+#: functions.php:2931 functions.php:3339 functions.php:4183
+#: mobile/functions.php:43
+#, fuzzy
+msgid "All articles"
+msgstr "Favoritos"
+
+#: functions.php:3290 functions.php:3292
 msgid "Search results"
 msgstr ""
 
-#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
-#: functions.php:3348 functions.php:3356
+#: functions.php:3308 functions.php:3321 functions.php:3327 functions.php:3331
+#: functions.php:3337 functions.php:3340 functions.php:3348
 msgid "Searched for"
 msgstr ""
 
-#: functions.php:3989 functions.php:4045 functions.php:5368
-#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
-#: modules/pref-labels.php:136 modules/pref-users.php:408
+#: functions.php:3981 functions.php:4037 functions.php:5374
+#: modules/pref-feeds.php:1018 modules/pref-feeds.php:1199
+#: modules/pref-filters.php:366 modules/pref-labels.php:138
+#: modules/pref-users.php:408
 msgid "Select:"
 msgstr "Selecione:"
 
-#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
-#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
-#: modules/pref-users.php:409 mobile/functions.php:561
+#: functions.php:3982 functions.php:4038 modules/pref-feeds.php:1019
+#: modules/pref-feeds.php:1200 modules/pref-filters.php:367
+#: modules/pref-labels.php:139 modules/pref-users.php:409
+#: mobile/functions.php:570
 msgid "All"
 msgstr "Todos"
 
-#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
-#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
+#: functions.php:3983 functions.php:3989 functions.php:4039 functions.php:4042
+#: tt-rss.php:198 mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "Não Lido"
 
-#: functions.php:3992 mobile/functions.php:564
+#: functions.php:3984 mobile/functions.php:573
 #, fuzzy
 msgid "Invert"
 msgstr "(Inverso)"
 
-#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
-#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
-#: modules/pref-users.php:410 mobile/functions.php:563
+#: functions.php:3985 functions.php:4040 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:1201 modules/pref-filters.php:368
+#: modules/pref-labels.php:140 modules/pref-users.php:410
+#: mobile/functions.php:572
 msgid "None"
 msgstr "Nenhum"
 
-#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3987 tt-rss.php:147 modules/pref-feeds.php:1360
 msgid "Actions..."
 msgstr "Ações..."
 
-#: functions.php:3996
+#: functions.php:3988
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Seleção"
 
-#: functions.php:3998 functions.php:4051 tt-rss.php:195
-#: mobile/functions.php:450
+#: functions.php:3990 functions.php:4043 tt-rss.php:197
+#: mobile/functions.php:459
 msgid "Starred"
 msgstr "Favoritos"
 
-#: functions.php:3999
+#: functions.php:3991
 msgid "Published"
 msgstr "Publicado"
 
-#: functions.php:4001 functions.php:4053
+#: functions.php:3993 functions.php:4045
 msgid "Mark as read:"
 msgstr "Marcar como lido:"
 
-#: functions.php:4002 mobile/functions.php:569
+#: functions.php:3994 mobile/functions.php:578
 msgid "Selection"
 msgstr "Seleção"
 
-#: functions.php:4016 mobile/functions.php:571
+#: functions.php:4008 mobile/functions.php:580
 msgid "Entire feed"
 msgstr ""
 
-#: functions.php:4019
+#: functions.php:4011
 msgid "Assign label:"
 msgstr ""
 
-#: functions.php:4031
+#: functions.php:4023
 #, fuzzy
 msgid "(remove)"
 msgstr "Remover"
 
-#: functions.php:4050
+#: functions.php:4042
 msgid "Toggle:"
 msgstr ""
 
-#: functions.php:4054 mobile/functions.php:570
+#: functions.php:4046 mobile/functions.php:579
 msgid "Page"
 msgstr "Página"
 
-#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:395
+#: functions.php:4047 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:403
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:4096
+#: functions.php:4088
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4145
+#: functions.php:4137
 msgid "Click to collapse category"
 msgstr ""
 
@@ -307,131 +314,90 @@ msgstr "Sem Feeds para exibir."
 msgid "Tags"
 msgstr "Tags"
 
-#: functions.php:4657
+#: functions.php:4651
 #, fuzzy
 msgid " - "
 msgstr " - por "
 
-#: functions.php:4716 functions.php:4717
+#: functions.php:4706 functions.php:4707
 msgid "no tags"
 msgstr "sem tags"
 
-#: functions.php:4724
+#: functions.php:4714
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4732
+#: functions.php:4722
 msgid "Display original article content"
 msgstr ""
 
-#: functions.php:4739 functions.php:5378
+#: functions.php:4729 functions.php:5384
 msgid "Show article summary in new window"
 msgstr ""
 
-#: functions.php:4775 functions.php:5302
+#: functions.php:4765 functions.php:5308
 #, fuzzy
 msgid "unknown type"
 msgstr "Erro desconhecido"
 
-#: functions.php:4781 functions.php:5308
+#: functions.php:4771 functions.php:5314
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4817 functions.php:5342
+#: functions.php:4807 functions.php:5348
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4819 functions.php:5344
+#: functions.php:4809 functions.php:5350
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
+#: functions.php:4829 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1069
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: functions.php:4895 modules/pref-feed-browser.php:75
+#: functions.php:4885 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
-#: functions.php:4964 mobile/functions.php:414
+#: functions.php:4954 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:5077
-msgid "(Click to change)"
-msgstr ""
-
-#: functions.php:5276
+#: functions.php:5282
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Favoritos"
 
-#: functions.php:5440
+#: functions.php:5442
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5443
+#: functions.php:5445
+#, fuzzy
+msgid "No updated articles found to display."
+msgstr "Sem Feeds para exibir."
+
+#: functions.php:5448
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5446
+#: functions.php:5452
+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:5454
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5793
-msgid "Match "
-msgstr ""
-
-#: functions.php:5801
-#, fuzzy
-msgid "Unread articles"
-msgstr "Favoritos"
-
-#: functions.php:5802
-#, fuzzy
-msgid "Updated articles"
-msgstr "Favoritos"
-
-#: functions.php:5803
-#, fuzzy
-msgid "Title contains"
-msgstr "Título ou conteúdo"
-
-#: functions.php:5804
-#, fuzzy
-msgid "Content contains"
-msgstr "Filtrando o conteúdo"
-
-#: functions.php:5805
-msgid "Score equals"
-msgstr ""
-
-#: functions.php:5806
-msgid "Score is greater than"
-msgstr ""
-
-#: functions.php:5807
-msgid "Score is less than"
-msgstr ""
-
-#: functions.php:5808
-msgid "Articles newer than X hours"
-msgstr ""
-
-#: functions.php:5809
-msgid "Articles newer than X days"
-msgstr ""
-
-#: functions.php:5818
-msgid "Add"
-msgstr ""
-
 #: localized_js.php:35
 msgid "display feeds"
 msgstr ""
@@ -638,7 +604,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:95 tt-rss.php:249 tt-rss.php:262
+#: localized_js.php:95 tt-rss.php:252 tt-rss.php:265
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
@@ -818,9 +784,9 @@ msgstr "Remover os filtros selecionados?"
 msgid "Saving feeds..."
 msgstr "Salvando o Feed..."
 
-#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:766
+#: localized_schema.php:9 tt-rss.php:208 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1212 modules/pref-feeds.php:1273
+#: mobile/functions.php:775
 msgid "Title"
 msgstr "Título"
 
@@ -833,7 +799,7 @@ msgid "Link"
 msgstr "Link"
 
 #: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:767
+#: mobile/functions.php:776
 msgid "Content"
 msgstr "Conteúdo"
 
@@ -845,7 +811,7 @@ msgstr ""
 msgid "Filter article"
 msgstr ""
 
-#: localized_schema.php:16 mobile/functions.php:574
+#: localized_schema.php:16 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
@@ -1323,11 +1289,10 @@ msgid "tag cloud"
 msgstr "núvem de tags"
 
 #: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
-#: modules/pref-labels.php:103 modules/pref-users.php:364
-#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
-#: mobile/functions.php:774
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:1114
+#: modules/pref-filters.php:307 modules/pref-labels.php:105
+#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:435
+#: mobile/functions.php:729 mobile/functions.php:783
 msgid "Search"
 msgstr ""
 
@@ -1373,75 +1338,85 @@ msgstr ""
 msgid "Other actions:"
 msgstr "Outras ações:"
 
-#: tt-rss.php:163
+#: tt-rss.php:164
+#, fuzzy
+msgid "&nbsp;&nbsp;Create label"
+msgstr "&nbsp;&nbsp;Criar filtro"
+
+#: tt-rss.php:165
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
-#: tt-rss.php:164
+#: tt-rss.php:166
 #, fuzzy
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;Editar esse Feed"
 
-#: tt-rss.php:165
+#: tt-rss.php:167
 #, fuzzy
 msgid "&nbsp;&nbsp;Reset category order"
 msgstr "&nbsp;&nbsp;Editar esse Feed"
 
-#: tt-rss.php:167
+#: tt-rss.php:169
 #, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
-#: tt-rss.php:175
+#: tt-rss.php:177
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Todos os feeds"
 
-#: tt-rss.php:177
+#: tt-rss.php:179
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:185 mobile/functions.php:729
+#: tt-rss.php:187 mobile/functions.php:738
 msgid "Search:"
 msgstr ""
 
-#: tt-rss.php:193 mobile/functions.php:447
+#: tt-rss.php:195 mobile/functions.php:456
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:194 mobile/functions.php:448
+#: tt-rss.php:196 mobile/functions.php:457
 msgid "All Articles"
 msgstr ""
 
-#: tt-rss.php:197
+#: tt-rss.php:199
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:200
+#: tt-rss.php:200 modules/pref-feeds.php:1218 modules/pref-feeds.php:1281
+#: mobile/functions.php:501 mobile/functions.php:504
+msgid "Updated"
+msgstr "Atualizado"
+
+#: tt-rss.php:203
 #, fuzzy
 msgid "Order:"
 msgstr "Onde:"
 
-#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:435
+#: tt-rss.php:207 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: modules/pref-filters.php:443
 #, fuzzy
 msgid "Date"
 msgstr "Atualizar"
 
-#: tt-rss.php:206
+#: tt-rss.php:209
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:210
+#: tt-rss.php:213
 msgid "Limit:"
 msgstr "Limite:"
 
-#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:427
+#: tt-rss.php:238 modules/pref-feeds.php:261 modules/pref-feeds.php:451
+#: mobile/functions.php:436
 msgid "Update"
 msgstr "Atualizar"
 
-#: tt-rss.php:253
+#: tt-rss.php:256
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1596,7 +1571,7 @@ msgid "Subscribe"
 msgstr ""
 
 #: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
 #: modules/pref-feeds.php:130 modules/pref-feeds.php:395
 #: modules/pref-feeds.php:546 modules/pref-filters.php:166
 #: modules/pref-users.php:184
@@ -1607,7 +1582,7 @@ msgstr "Cancelar"
 msgid "match on:"
 msgstr ""
 
-#: modules/popup-dialog.php:167 mobile/functions.php:768
+#: modules/popup-dialog.php:167 mobile/functions.php:777
 msgid "Title or content"
 msgstr "Título ou conteúdo"
 
@@ -1615,112 +1590,112 @@ msgstr "Título ou conteúdo"
 msgid "Limit search to:"
 msgstr ""
 
-#: modules/popup-dialog.php:188 mobile/functions.php:748
+#: modules/popup-dialog.php:188 mobile/functions.php:757
 msgid "This feed"
 msgstr ""
 
-#: modules/popup-dialog.php:288
+#: modules/popup-dialog.php:226
 #, fuzzy
 msgid "Create Filter"
 msgstr "Criar um usuário"
 
-#: modules/popup-dialog.php:306 modules/popup-dialog.php:405
+#: 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:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:394
+#: modules/popup-dialog.php:245 modules/pref-filters.php:42
+#: modules/pref-filters.php:402
 msgid "Match"
 msgstr ""
 
-#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:425
+#: modules/popup-dialog.php:253 modules/pref-filters.php:54
+#: modules/pref-filters.php:433
 msgid "before"
 msgstr ""
 
-#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:426
+#: modules/popup-dialog.php:254 modules/pref-filters.php:55
+#: modules/pref-filters.php:434
 #, fuzzy
 msgid "after"
 msgstr "Atualizar"
 
-#: modules/popup-dialog.php:380 modules/pref-filters.php:70
+#: modules/popup-dialog.php:268 modules/pref-filters.php:70
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:383 modules/pref-filters.php:73
+#: modules/popup-dialog.php:271 modules/pref-filters.php:73
 msgid "on field"
 msgstr ""
 
-#: modules/popup-dialog.php:389 modules/pref-filters.php:79
+#: modules/popup-dialog.php:277 modules/pref-filters.php:79
 #, fuzzy
 msgid "in"
 msgstr "Link"
 
-#: modules/popup-dialog.php:394 modules/pref-filters.php:84
+#: modules/popup-dialog.php:282 modules/pref-filters.php:84
 #, fuzzy
 msgid "Perform Action"
 msgstr "Ação"
 
-#: modules/popup-dialog.php:411 modules/pref-filters.php:104
+#: modules/popup-dialog.php:299 modules/pref-filters.php:104
 msgid "with parameters:"
 msgstr ""
 
-#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:308
 #: modules/pref-feeds.php:500 modules/pref-filters.php:123
 #: modules/pref-users.php:165
 #, fuzzy
 msgid "Options"
 msgstr "Opções:"
 
-#: modules/popup-dialog.php:427 modules/pref-filters.php:135
+#: modules/popup-dialog.php:318 modules/pref-filters.php:135
 msgid "Enabled"
 msgstr "Ativado"
 
-#: modules/popup-dialog.php:430 modules/pref-filters.php:144
+#: modules/popup-dialog.php:321 modules/pref-filters.php:144
 msgid "Inverse match"
 msgstr ""
 
-#: modules/popup-dialog.php:442
+#: modules/popup-dialog.php:333
 msgid "Create"
 msgstr "Criar"
 
-#: modules/popup-dialog.php:457
+#: modules/popup-dialog.php:348
 msgid "Update Errors"
 msgstr ""
 
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:351
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
-#: modules/popup-dialog.php:478
+#: modules/popup-dialog.php:369
 msgid "Close"
 msgstr "Fechar"
 
-#: modules/popup-dialog.php:487
+#: modules/popup-dialog.php:378
 msgid "Edit Tags"
 msgstr "Editar Tags"
 
-#: modules/popup-dialog.php:492
+#: modules/popup-dialog.php:383
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:393
 #: modules/pref-feeds.php:544 modules/pref-filters.php:162
 #: modules/pref-users.php:181
 msgid "Save"
 msgstr "Salvar"
 
-#: modules/popup-dialog.php:550 help/3.php:60
+#: modules/popup-dialog.php:441 help/3.php:60
 msgid "Tag cloud"
 msgstr "Núvem de tags"
 
-#: modules/popup-dialog.php:553
+#: modules/popup-dialog.php:444
 msgid "Showing most popular tags "
 msgstr "Exibir as Tags mais populares."
 
-#: modules/popup-dialog.php:554
+#: modules/popup-dialog.php:445
 msgid "browse more"
 msgstr ""
 
@@ -1833,7 +1808,7 @@ msgstr ""
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:390 modules/pref-feeds.php:1374
+#: modules/pref-feeds.php:390 modules/pref-feeds.php:1367
 msgid "Unsubscribe"
 msgstr ""
 
@@ -1842,154 +1817,149 @@ msgstr ""
 msgid "Multiple Feed Editor"
 msgstr "Editor de Feed"
 
-#: modules/pref-feeds.php:781 modules/pref-feeds.php:828
+#: modules/pref-feeds.php:774 modules/pref-feeds.php:821
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:859
+#: modules/pref-feeds.php:852
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:861
+#: modules/pref-feeds.php:854
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:943
+#: modules/pref-feeds.php:936
 msgid "Category editor"
 msgstr "Editor de Categoria"
 
-#: modules/pref-feeds.php:966
+#: modules/pref-feeds.php:959
 #, 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:994
+#: modules/pref-feeds.php:987
 msgid "Unable to delete non empty feed categories."
 msgstr ""
 
-#: modules/pref-feeds.php:1011
+#: modules/pref-feeds.php:1004
 msgid "Create category"
 msgstr "Criar categoria"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1064
 msgid "No feed categories defined."
 msgstr ""
 
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
-#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
-#: modules/pref-labels.php:176 modules/pref-users.php:481
+#: modules/pref-feeds.php:1075 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:178
+#: modules/pref-users.php:481
 msgid "Remove"
 msgstr "Remover"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1097
 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
-#: modules/pref-feeds.php:1126 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1119 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr ""
 
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1124
 msgid "Top 25"
 msgstr ""
 
-#: modules/pref-feeds.php:1205
+#: modules/pref-feeds.php:1198
 msgid "Show last article times"
 msgstr ""
 
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1284
+#: modules/pref-feeds.php:1215 modules/pref-feeds.php:1277
 msgid "Last&nbsp;Article"
 msgstr ""
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:492 mobile/functions.php:495
-msgid "Updated"
-msgstr "Atualizado"
-
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
-#: modules/pref-labels-old.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1302 modules/pref-filters.php:461
+#: modules/pref-users.php:456
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1369
+#: modules/pref-feeds.php:1348 modules/pref-feeds.php:1362
 #, fuzzy
 msgid "Selection:"
 msgstr "Seleção"
 
-#: modules/pref-feeds.php:1361
+#: modules/pref-feeds.php:1354
 msgid "Recategorize"
 msgstr ""
 
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
-#: modules/pref-labels-old.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1363 modules/pref-filters.php:485
+#: modules/pref-users.php:479
 msgid "Edit"
 msgstr "Editar"
 
-#: modules/pref-feeds.php:1371
+#: modules/pref-feeds.php:1364
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
 msgid "Clear feed data"
 msgstr ""
 
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
+#: modules/pref-feeds.php:1366 modules/pref-filters.php:324
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Favoritos"
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1372
 #, fuzzy
 msgid "Other:"
 msgstr "Onde:"
 
-#: modules/pref-feeds.php:1380
+#: modules/pref-feeds.php:1373
 msgid "Edit categories"
 msgstr "Editar categorias"
 
-#: modules/pref-feeds.php:1387
+#: modules/pref-feeds.php:1380
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1384
 msgid "File:"
 msgstr "Arquivo:"
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1387
 msgid "Import"
 msgstr "Importar"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1394
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1397
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1399
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1403
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1412
 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:1423
+#: modules/pref-feeds.php:1416
 msgid "Link to published articles feed."
 msgstr ""
 
-#: modules/pref-feeds.php:1426
+#: modules/pref-feeds.php:1419
 #, fuzzy
 msgid "Generate another link"
 msgstr "Gerar um outro endereço"
@@ -2004,100 +1974,62 @@ msgstr "Editor de Feed"
 msgid "Saved filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:256
+#: modules/pref-filters.php:264
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:317 help/3.php:31 help/4.php:25
 msgid "Create filter"
 msgstr ""
 
-#: modules/pref-filters.php:384
+#: modules/pref-filters.php:392
 msgid "filter_type_descr"
 msgstr "filter_type_descr"
 
-#: modules/pref-filters.php:385
+#: modules/pref-filters.php:393
 msgid "action_description"
 msgstr "action_description"
 
-#: modules/pref-filters.php:396
+#: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
 msgstr "Feed"
 
-#: modules/pref-filters.php:397
+#: modules/pref-filters.php:405
 msgid "Params"
 msgstr ""
 
-#: modules/pref-filters.php:442
+#: modules/pref-filters.php:450
 msgid "(Disabled)"
 msgstr "(Desativado)"
 
-#: modules/pref-filters.php:458
+#: modules/pref-filters.php:466
 msgid "(Inverse)"
 msgstr "(Inverso)"
 
-#: modules/pref-filters.php:487
+#: modules/pref-filters.php:495
 msgid "No filters defined."
 msgstr ""
 
-#: modules/pref-filters.php:489
+#: modules/pref-filters.php:497
 msgid "No matching filters found."
 msgstr ""
 
-#: modules/pref-labels-old.php:9
-msgid ""
-"Sorry, labels have been administratively disabled for this installation. "
-"Please contact instance owner or edit configuration file to enable this "
-"functionality."
-msgstr ""
-
-#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
-#: modules/pref-labels.php:143
-msgid "Caption"
-msgstr ""
-
-#: modules/pref-labels-old.php:46
-msgid "Match SQL"
-msgstr ""
-
-#: modules/pref-labels-old.php:68
-#, fuzzy
-msgid "Help"
-msgstr "Olá,"
-
-#: modules/pref-labels-old.php:99
-msgid "Error: SQL expression is blank."
-msgstr ""
-
-#: modules/pref-labels-old.php:179
-#, php-format
-msgid "Saved label <b>%s</b>"
-msgstr ""
-
-#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
+#: modules/pref-labels.php:75
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr ""
 
-#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
+#: modules/pref-labels.php:113 help/4.php:26
 msgid "Create label"
 msgstr ""
 
-#: modules/pref-labels-old.php:283
-msgid "SQL Expression"
-msgstr "Expressão SQL"
-
-#: modules/pref-labels-old.php:308
-msgid "[No caption]"
-msgstr ""
-
-#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
+#: modules/pref-labels.php:184
 msgid "No labels defined."
 msgstr ""
 
-#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
+#: modules/pref-labels.php:186
 msgid "No matching labels found."
 msgstr ""
 
@@ -2312,41 +2244,6 @@ msgstr "Nenhum usuário foi selecionado."
 msgid "No matching users found."
 msgstr ""
 
-#: help/1.php:1
-#, fuzzy
-msgid "Labels and SQL Expressions"
-msgstr "Expressão SQL"
-
-#: help/1.php:3
-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 ""
-
-#: help/1.php:5
-msgid "Examples"
-msgstr ""
-
-#: help/1.php:7
-#, fuzzy
-msgid "Match all unread articles:"
-msgstr "Favoritos"
-
-#: help/1.php:11
-msgid "Matches all articles which mention Linux in the title:"
-msgstr ""
-
-#: help/1.php:15
-msgid "Matches all articles for the last week (PostgreSQL):"
-msgstr ""
-
-#: help/1.php:19
-msgid "Matches all articles with scores between 100 and 500:"
-msgstr ""
-
 #: help/2.php:1
 #, fuzzy
 msgid "Content filtering"
@@ -2565,33 +2462,33 @@ msgstr "Feed"
 msgid "View tags"
 msgstr "Editar Tags"
 
-#: mobile/functions.php:425
+#: mobile/functions.php:434
 msgid "Back"
 msgstr ""
 
-#: mobile/functions.php:435
+#: mobile/functions.php:444
 #, fuzzy
 msgid "View:"
 msgstr "Título"
 
-#: mobile/functions.php:457
+#: mobile/functions.php:466
 msgid "Refresh"
 msgstr ""
 
-#: mobile/functions.php:689
+#: mobile/functions.php:698
 #, fuzzy
 msgid "Tags:"
 msgstr "Tags"
 
-#: mobile/functions.php:721
+#: mobile/functions.php:730
 msgid "Go back"
 msgstr ""
 
-#: mobile/functions.php:732
+#: mobile/functions.php:741
 msgid "Where:"
 msgstr "Onde:"
 
-#: mobile/functions.php:763
+#: mobile/functions.php:772
 msgid "Match on:"
 msgstr ""
 
@@ -2599,6 +2496,33 @@ msgstr ""
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Updated articles"
+#~ msgstr "Favoritos"
+
+#, fuzzy
+#~ msgid "Title contains"
+#~ msgstr "Título ou conteúdo"
+
+#, fuzzy
+#~ msgid "Content contains"
+#~ msgstr "Filtrando o conteúdo"
+
+#, fuzzy
+#~ msgid "Help"
+#~ msgstr "Olá,"
+
+#~ msgid "SQL Expression"
+#~ msgstr "Expressão SQL"
+
+#, fuzzy
+#~ msgid "Labels and SQL Expressions"
+#~ msgstr "Expressão SQL"
+
+#, fuzzy
+#~ msgid "Match all unread articles:"
+#~ msgstr "Favoritos"
+
 #, fuzzy
 #~ msgid "Create Label"
 #~ msgstr "Criar um usuário"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index eb151161b..9497c6466 100644
Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 20414ff16..d6e54fc08 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-01-18 15:24+0300\n"
+"POT-Creation-Date: 2009-01-19 11:56+0300\n"
 "PO-Revision-Date: 2008-12-16 13:32+0400\n"
 "Last-Translator: Max Kamashev <max.kamashev@floscoeli.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -85,7 +85,7 @@ msgstr "Раз в день"
 msgid "Weekly"
 msgstr "Раз в неделю"
 
-#: backend.php:122 tt-rss.php:203 modules/pref-prefs.php:312
+#: backend.php:122 tt-rss.php:206 modules/pref-prefs.php:312
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -173,135 +173,142 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2883 modules/popup-dialog.php:175
-#: modules/pref-filters.php:405 mobile/functions.php:735
+#: functions.php:2847 modules/popup-dialog.php:175
+#: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
-#: functions.php:4378 modules/pref-feeds.php:1244
+#: functions.php:2876 functions.php:2915 functions.php:3304 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1237
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2941 functions.php:3508 mobile/functions.php:33
+#: functions.php:2905 functions.php:3500 mobile/functions.php:33
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
+#: functions.php:2907 functions.php:3333 functions.php:3502 prefs.php:144
+#: mobile/functions.php:83
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
-#: mobile/functions.php:52
+#: functions.php:2925 functions.php:3326 functions.php:4205 help/3.php:57
+#: mobile/functions.php:61
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:2963 functions.php:3344 functions.php:4212
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+#: functions.php:2927 functions.php:3330 functions.php:4212
+#: modules/pref-feeds.php:1406 help/3.php:59 mobile/functions.php:70
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
-#: mobile/functions.php:43
+#: functions.php:2929 functions.php:3336 functions.php:4190 help/3.php:58
+#: mobile/functions.php:52
 msgid "Fresh articles"
 msgstr "Свежие"
 
-#: functions.php:3305 functions.php:3307
+#: functions.php:2931 functions.php:3339 functions.php:4183
+#: mobile/functions.php:43
+#, fuzzy
+msgid "All articles"
+msgstr "Все статьи"
+
+#: functions.php:3290 functions.php:3292
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
-#: functions.php:3348 functions.php:3356
+#: functions.php:3308 functions.php:3321 functions.php:3327 functions.php:3331
+#: functions.php:3337 functions.php:3340 functions.php:3348
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:3989 functions.php:4045 functions.php:5368
-#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
-#: modules/pref-labels.php:136 modules/pref-users.php:408
+#: functions.php:3981 functions.php:4037 functions.php:5374
+#: modules/pref-feeds.php:1018 modules/pref-feeds.php:1199
+#: modules/pref-filters.php:366 modules/pref-labels.php:138
+#: modules/pref-users.php:408
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
-#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
-#: modules/pref-users.php:409 mobile/functions.php:561
+#: functions.php:3982 functions.php:4038 modules/pref-feeds.php:1019
+#: modules/pref-feeds.php:1200 modules/pref-filters.php:367
+#: modules/pref-labels.php:139 modules/pref-users.php:409
+#: mobile/functions.php:570
 msgid "All"
 msgstr "Все"
 
-#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
-#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
+#: functions.php:3983 functions.php:3989 functions.php:4039 functions.php:4042
+#: tt-rss.php:198 mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3992 mobile/functions.php:564
+#: functions.php:3984 mobile/functions.php:573
 msgid "Invert"
 msgstr "Инвертировать"
 
-#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
-#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
-#: modules/pref-users.php:410 mobile/functions.php:563
+#: functions.php:3985 functions.php:4040 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:1201 modules/pref-filters.php:368
+#: modules/pref-labels.php:140 modules/pref-users.php:410
+#: mobile/functions.php:572
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3987 tt-rss.php:147 modules/pref-feeds.php:1360
 msgid "Actions..."
 msgstr "Действия..."
 
-#: functions.php:3996
+#: functions.php:3988
 msgid "Selection toggle:"
 msgstr "Переключить выбранное:"
 
-#: functions.php:3998 functions.php:4051 tt-rss.php:195
-#: mobile/functions.php:450
+#: functions.php:3990 functions.php:4043 tt-rss.php:197
+#: mobile/functions.php:459
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:3999
+#: functions.php:3991
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:4001 functions.php:4053
+#: functions.php:3993 functions.php:4045
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:4002 mobile/functions.php:569
+#: functions.php:3994 mobile/functions.php:578
 msgid "Selection"
 msgstr "Выбранные"
 
-#: functions.php:4016 mobile/functions.php:571
+#: functions.php:4008 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:4019
+#: functions.php:4011
 #, fuzzy
 msgid "Assign label:"
 msgstr "Применить теги"
 
-#: functions.php:4031
+#: functions.php:4023
 #, fuzzy
 msgid "(remove)"
 msgstr "Удалить"
 
-#: functions.php:4050
+#: functions.php:4042
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:4054 mobile/functions.php:570
+#: functions.php:4046 mobile/functions.php:579
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:395
+#: functions.php:4047 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:403
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:4096
+#: functions.php:4088
 msgid "Generated feed"
 msgstr "Генерировать канал"
 
-#: functions.php:4145
+#: functions.php:4137
 msgid "Click to collapse category"
 msgstr "Щёлкните, чтобы развернуть категорию"
 
@@ -313,52 +320,52 @@ msgstr "Нет каналов для отображения."
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4657
+#: functions.php:4651
 msgid " - "
 msgstr " - "
 
-#: functions.php:4716 functions.php:4717
+#: functions.php:4706 functions.php:4707
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:4724
+#: functions.php:4714
 msgid "Edit tags for this article"
 msgstr "Редактировать теги статьи"
 
-#: functions.php:4732
+#: functions.php:4722
 msgid "Display original article content"
 msgstr "Показать оригинальное содержимое статьи"
 
-#: functions.php:4739 functions.php:5378
+#: functions.php:4729 functions.php:5384
 msgid "Show article summary in new window"
 msgstr "Показать детали статьи в новом окне"
 
-#: functions.php:4775 functions.php:5302
+#: functions.php:4765 functions.php:5308
 msgid "unknown type"
 msgstr "Неизвестный тип"
 
-#: functions.php:4781 functions.php:5308
+#: functions.php:4771 functions.php:5314
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4817 functions.php:5342
+#: functions.php:4807 functions.php:5348
 msgid "Attachment:"
 msgstr "Вложение:"
 
-#: functions.php:4819 functions.php:5344
+#: functions.php:4809 functions.php:5350
 msgid "Attachments:"
 msgstr "Вложения:"
 
-#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
+#: functions.php:4829 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1069
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: functions.php:4895 modules/pref-feed-browser.php:75
+#: functions.php:4885 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:4964 mobile/functions.php:414
+#: functions.php:4954 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -366,70 +373,33 @@ msgstr ""
 "Не могу показать канал (ошибка в запросе). Пожалуйста проверьте синтаксис "
 "или локальную конфигурацию."
 
-#: functions.php:5077
-msgid "(Click to change)"
-msgstr "(Щёлкните для изменения)"
-
-#: functions.php:5276
+#: functions.php:5282
 msgid "Click to expand article"
 msgstr "Щёлкните чтобы развернуть статью"
 
-#: functions.php:5440
+#: functions.php:5442
 msgid "No unread articles found to display."
 msgstr "Не найдено не прочитанных статей"
 
-#: functions.php:5443
+#: functions.php:5445
+#, fuzzy
+msgid "No updated articles found to display."
+msgstr "Не найдено не прочитанных статей"
+
+#: functions.php:5448
 msgid "No starred articles found to display."
 msgstr "Не найдено отмеченных статей"
 
-#: functions.php:5446
+#: functions.php:5452
+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:5454
 msgid "No articles found to display."
 msgstr "Статей не найдено."
 
-#: functions.php:5793
-msgid "Match "
-msgstr "Соответствие"
-
-#: functions.php:5801
-msgid "Unread articles"
-msgstr "Отмеченные"
-
-#: functions.php:5802
-msgid "Updated articles"
-msgstr "Обновлённые статьи"
-
-#: functions.php:5803
-msgid "Title contains"
-msgstr "Заголовок содержит"
-
-#: functions.php:5804
-msgid "Content contains"
-msgstr "В содержимом"
-
-#: functions.php:5805
-msgid "Score equals"
-msgstr "Оценка равна"
-
-#: functions.php:5806
-msgid "Score is greater than"
-msgstr "Оценка выше чем"
-
-#: functions.php:5807
-msgid "Score is less than"
-msgstr "Оценка меньше чем"
-
-#: functions.php:5808
-msgid "Articles newer than X hours"
-msgstr "Статье меньше X часов"
-
-#: functions.php:5809
-msgid "Articles newer than X days"
-msgstr "Статье меньше X дней"
-
-#: functions.php:5818
-msgid "Add"
-msgstr "Добавить"
-
 #: localized_js.php:35
 msgid "display feeds"
 msgstr "показать каналы"
@@ -636,7 +606,7 @@ msgstr "Не могу обновить заголовки (отсутствуе
 msgid "Could not display article (missing XML object)"
 msgstr "Не могу показать статью (отсутствует XML объект)"
 
-#: localized_js.php:95 tt-rss.php:249 tt-rss.php:262
+#: localized_js.php:95 tt-rss.php:252 tt-rss.php:265
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
@@ -810,9 +780,9 @@ msgstr "Сохранить изменения выбранных каналов?
 msgid "Saving feeds..."
 msgstr "Сохраняются каналы..."
 
-#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:766
+#: localized_schema.php:9 tt-rss.php:208 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1212 modules/pref-feeds.php:1273
+#: mobile/functions.php:775
 msgid "Title"
 msgstr "Заголовок"
 
@@ -825,7 +795,7 @@ msgid "Link"
 msgstr "Ссылка"
 
 #: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:767
+#: mobile/functions.php:776
 msgid "Content"
 msgstr "Содержимое"
 
@@ -837,7 +807,7 @@ msgstr "Дата Статьи"
 msgid "Filter article"
 msgstr "Отфильтровать статью"
 
-#: localized_schema.php:16 mobile/functions.php:574
+#: localized_schema.php:16 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
@@ -1359,11 +1329,10 @@ msgid "tag cloud"
 msgstr "облако тегов"
 
 #: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
-#: modules/pref-labels.php:103 modules/pref-users.php:364
-#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
-#: mobile/functions.php:774
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:1114
+#: modules/pref-filters.php:307 modules/pref-labels.php:105
+#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:435
+#: mobile/functions.php:729 mobile/functions.php:783
 msgid "Search"
 msgstr "Поиск"
 
@@ -1407,69 +1376,79 @@ msgstr "&nbsp;&nbsp;Спрятать прочитанные"
 msgid "Other actions:"
 msgstr "Другие действия:"
 
-#: tt-rss.php:163
+#: tt-rss.php:164
+#, fuzzy
+msgid "&nbsp;&nbsp;Create label"
+msgstr "&nbsp;&nbsp;Создать фильтр"
+
+#: tt-rss.php:165
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;Создать фильтр"
 
-#: tt-rss.php:164
+#: tt-rss.php:166
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;Сбросить UI расположение"
 
-#: tt-rss.php:165
+#: tt-rss.php:167
 msgid "&nbsp;&nbsp;Reset category order"
 msgstr "&nbsp;&nbsp;Сбросить порядок категорий"
 
-#: tt-rss.php:167
+#: tt-rss.php:169
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Горячие клавиши"
 
-#: tt-rss.php:175
+#: tt-rss.php:177
 msgid "Collapse feedlist"
 msgstr "Свернуть список каналов"
 
-#: tt-rss.php:177
+#: tt-rss.php:179
 msgid "Toggle Feedlist"
 msgstr "Переключить Список Каналов"
 
-#: tt-rss.php:185 mobile/functions.php:729
+#: tt-rss.php:187 mobile/functions.php:738
 msgid "Search:"
 msgstr "Искать:"
 
-#: tt-rss.php:193 mobile/functions.php:447
+#: tt-rss.php:195 mobile/functions.php:456
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: tt-rss.php:194 mobile/functions.php:448
+#: tt-rss.php:196 mobile/functions.php:457
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: tt-rss.php:197
+#: tt-rss.php:199
 msgid "Ignore Scoring"
 msgstr "Игнорировать Оценки"
 
-#: tt-rss.php:200
+#: tt-rss.php:200 modules/pref-feeds.php:1218 modules/pref-feeds.php:1281
+#: mobile/functions.php:501 mobile/functions.php:504
+msgid "Updated"
+msgstr "Обновлено"
+
+#: tt-rss.php:203
 msgid "Order:"
 msgstr "Порядок:"
 
-#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:435
+#: tt-rss.php:207 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: modules/pref-filters.php:443
 msgid "Date"
 msgstr "Дата"
 
-#: tt-rss.php:206
+#: tt-rss.php:209
 msgid "Score"
 msgstr "Оценка"
 
-#: tt-rss.php:210
+#: tt-rss.php:213
 msgid "Limit:"
 msgstr "Сколько:"
 
-#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:427
+#: tt-rss.php:238 modules/pref-feeds.php:261 modules/pref-feeds.php:451
+#: mobile/functions.php:436
 msgid "Update"
 msgstr "Обновить"
 
-#: tt-rss.php:253
+#: tt-rss.php:256
 msgid "Drag me to resize panels"
 msgstr "Потяни за меня изменения размера панелей"
 
@@ -1624,7 +1603,7 @@ msgid "Subscribe"
 msgstr "Подписаться"
 
 #: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
 #: modules/pref-feeds.php:130 modules/pref-feeds.php:395
 #: modules/pref-feeds.php:546 modules/pref-filters.php:166
 #: modules/pref-users.php:184
@@ -1635,7 +1614,7 @@ msgstr "Отмена"
 msgid "match on:"
 msgstr "соответствие:"
 
-#: modules/popup-dialog.php:167 mobile/functions.php:768
+#: modules/popup-dialog.php:167 mobile/functions.php:777
 msgid "Title or content"
 msgstr "Заголовок или содержимое"
 
@@ -1643,107 +1622,107 @@ msgstr "Заголовок или содержимое"
 msgid "Limit search to:"
 msgstr "Ограничить поиск:"
 
-#: modules/popup-dialog.php:188 mobile/functions.php:748
+#: modules/popup-dialog.php:188 mobile/functions.php:757
 msgid "This feed"
 msgstr "Этот канал"
 
-#: modules/popup-dialog.php:288
+#: modules/popup-dialog.php:226
 msgid "Create Filter"
 msgstr "Создать фильтр"
 
-#: modules/popup-dialog.php:306 modules/popup-dialog.php:405
+#: 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:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:394
+#: modules/popup-dialog.php:245 modules/pref-filters.php:42
+#: modules/pref-filters.php:402
 msgid "Match"
 msgstr "Искать"
 
-#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:425
+#: modules/popup-dialog.php:253 modules/pref-filters.php:54
+#: modules/pref-filters.php:433
 msgid "before"
 msgstr "перед"
 
-#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:426
+#: modules/popup-dialog.php:254 modules/pref-filters.php:55
+#: modules/pref-filters.php:434
 msgid "after"
 msgstr "после"
 
-#: modules/popup-dialog.php:380 modules/pref-filters.php:70
+#: modules/popup-dialog.php:268 modules/pref-filters.php:70
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:383 modules/pref-filters.php:73
+#: modules/popup-dialog.php:271 modules/pref-filters.php:73
 msgid "on field"
 msgstr "по полю:"
 
-#: modules/popup-dialog.php:389 modules/pref-filters.php:79
+#: modules/popup-dialog.php:277 modules/pref-filters.php:79
 msgid "in"
 msgstr "в"
 
-#: modules/popup-dialog.php:394 modules/pref-filters.php:84
+#: modules/popup-dialog.php:282 modules/pref-filters.php:84
 msgid "Perform Action"
 msgstr "Выполнить действия"
 
-#: modules/popup-dialog.php:411 modules/pref-filters.php:104
+#: modules/popup-dialog.php:299 modules/pref-filters.php:104
 msgid "with parameters:"
 msgstr "с параметрами:"
 
-#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:308
 #: modules/pref-feeds.php:500 modules/pref-filters.php:123
 #: modules/pref-users.php:165
 msgid "Options"
 msgstr "Опции:"
 
-#: modules/popup-dialog.php:427 modules/pref-filters.php:135
+#: modules/popup-dialog.php:318 modules/pref-filters.php:135
 msgid "Enabled"
 msgstr "Включен"
 
-#: modules/popup-dialog.php:430 modules/pref-filters.php:144
+#: modules/popup-dialog.php:321 modules/pref-filters.php:144
 msgid "Inverse match"
 msgstr "Инвертировать фильтр"
 
-#: modules/popup-dialog.php:442
+#: modules/popup-dialog.php:333
 msgid "Create"
 msgstr "Создать"
 
-#: modules/popup-dialog.php:457
+#: modules/popup-dialog.php:348
 msgid "Update Errors"
 msgstr "Ошибки обновления"
 
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:351
 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не были обновлены из-за ошибок:"
 
-#: modules/popup-dialog.php:478
+#: modules/popup-dialog.php:369
 msgid "Close"
 msgstr "Закрыть"
 
-#: modules/popup-dialog.php:487
+#: modules/popup-dialog.php:378
 msgid "Edit Tags"
 msgstr "Редактировать теги"
 
-#: modules/popup-dialog.php:492
+#: modules/popup-dialog.php:383
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
-#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:393
 #: modules/pref-feeds.php:544 modules/pref-filters.php:162
 #: modules/pref-users.php:181
 msgid "Save"
 msgstr "Сохранить"
 
-#: modules/popup-dialog.php:550 help/3.php:60
+#: modules/popup-dialog.php:441 help/3.php:60
 msgid "Tag cloud"
 msgstr "Облако тегов"
 
-#: modules/popup-dialog.php:553
+#: modules/popup-dialog.php:444
 msgid "Showing most popular tags "
 msgstr "Самые популярные теги "
 
-#: modules/popup-dialog.php:554
+#: modules/popup-dialog.php:445
 msgid "browse more"
 msgstr "еще"
 
@@ -1852,7 +1831,7 @@ msgstr "Включить в e-mail дайджест"
 msgid "Cache images locally"
 msgstr "Кэшировать изображения локально"
 
-#: modules/pref-feeds.php:390 modules/pref-feeds.php:1374
+#: modules/pref-feeds.php:390 modules/pref-feeds.php:1367
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
@@ -1861,133 +1840,128 @@ msgstr "Отписаться"
 msgid "Multiple Feed Editor"
 msgstr "Редактор канала"
 
-#: modules/pref-feeds.php:781 modules/pref-feeds.php:828
+#: modules/pref-feeds.php:774 modules/pref-feeds.php:821
 msgid "All done."
 msgstr "Всё выполнено."
 
-#: modules/pref-feeds.php:859
+#: modules/pref-feeds.php:852
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Добавлена подписка на <b>%s</b>."
 
-#: modules/pref-feeds.php:861
+#: modules/pref-feeds.php:854
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:943
+#: modules/pref-feeds.php:936
 msgid "Category editor"
 msgstr "Редактор категорий"
 
-#: modules/pref-feeds.php:966
+#: modules/pref-feeds.php:959
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Категория <b>$%s</b> уже существует."
 
-#: modules/pref-feeds.php:994
+#: modules/pref-feeds.php:987
 msgid "Unable to delete non empty feed categories."
 msgstr "Не могу удалить не пустую категорию"
 
-#: modules/pref-feeds.php:1011
+#: modules/pref-feeds.php:1004
 msgid "Create category"
 msgstr "Создать категорию"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1064
 msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
-#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
-#: modules/pref-labels.php:176 modules/pref-users.php:481
+#: modules/pref-feeds.php:1075 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:178
+#: modules/pref-users.php:481
 msgid "Remove"
 msgstr "Удалить"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1097
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
 
-#: modules/pref-feeds.php:1126 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1119 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1124
 msgid "Top 25"
 msgstr "Топ 25"
 
-#: modules/pref-feeds.php:1205
+#: modules/pref-feeds.php:1198
 msgid "Show last article times"
 msgstr "Показать дату последней статьи"
 
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1284
+#: modules/pref-feeds.php:1215 modules/pref-feeds.php:1277
 msgid "Last&nbsp;Article"
 msgstr "Последняя&nbsp;статья"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:492 mobile/functions.php:495
-msgid "Updated"
-msgstr "Обновлено"
-
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
-#: modules/pref-labels-old.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1302 modules/pref-filters.php:461
+#: modules/pref-users.php:456
 msgid "Click to edit"
 msgstr "Щёлкните для редактирования"
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1369
+#: modules/pref-feeds.php:1348 modules/pref-feeds.php:1362
 #, fuzzy
 msgid "Selection:"
 msgstr "Выбрать:"
 
-#: modules/pref-feeds.php:1361
+#: modules/pref-feeds.php:1354
 msgid "Recategorize"
 msgstr "Изменить категорию"
 
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
-#: modules/pref-labels-old.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1363 modules/pref-filters.php:485
+#: modules/pref-users.php:479
 msgid "Edit"
 msgstr "Редактировать"
 
-#: modules/pref-feeds.php:1371
+#: modules/pref-feeds.php:1364
 msgid "Manual purge"
 msgstr "Ручная очистка"
 
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
 msgid "Clear feed data"
 msgstr "Очистить данные канала."
 
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
+#: modules/pref-feeds.php:1366 modules/pref-filters.php:324
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Отмеченные"
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1372
 msgid "Other:"
 msgstr "Другой:"
 
-#: modules/pref-feeds.php:1380
+#: modules/pref-feeds.php:1373
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: modules/pref-feeds.php:1387
+#: modules/pref-feeds.php:1380
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1384
 msgid "File:"
 msgstr "Файл:"
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1387
 msgid "Import"
 msgstr "Импортировать"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1394
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1397
 msgid "Firefox Integration"
 msgstr "Интеграция в Firefox"
 
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1399
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1995,11 +1969,11 @@ msgstr ""
 "Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. "
 "Для этого щёлкните по ссылке ниже."
 
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1403
 msgid "Click here to register this site as a feed reader."
 msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
 
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1412
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -2007,11 +1981,11 @@ msgstr ""
 "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
 "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: modules/pref-feeds.php:1423
+#: modules/pref-feeds.php:1416
 msgid "Link to published articles feed."
 msgstr "Ссылка на общий канал со статьями."
 
-#: modules/pref-feeds.php:1426
+#: modules/pref-feeds.php:1419
 msgid "Generate another link"
 msgstr "Создать другую ссылку"
 
@@ -2024,99 +1998,62 @@ msgstr "Редактор фильтров"
 msgid "Saved filter <b>%s</b>"
 msgstr "Фильтр <b>%s</b> сохранен"
 
-#: modules/pref-filters.php:256
+#: modules/pref-filters.php:264
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Добавлен фильтр <b>%s</b>"
 
-#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:317 help/3.php:31 help/4.php:25
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: modules/pref-filters.php:384
+#: modules/pref-filters.php:392
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:385
+#: modules/pref-filters.php:393
 #, fuzzy
 msgid "action_description"
 msgstr "описание"
 
-#: modules/pref-filters.php:396
+#: modules/pref-filters.php:404
 msgid "Field"
 msgstr "Поле"
 
-#: modules/pref-filters.php:397
+#: modules/pref-filters.php:405
 msgid "Params"
 msgstr "Параметры:"
 
-#: modules/pref-filters.php:442
+#: modules/pref-filters.php:450
 msgid "(Disabled)"
 msgstr "(Отключен)"
 
-#: modules/pref-filters.php:458
+#: modules/pref-filters.php:466
 msgid "(Inverse)"
 msgstr "(Инвертирован)"
 
-#: modules/pref-filters.php:487
+#: modules/pref-filters.php:495
 msgid "No filters defined."
 msgstr "Фильтры отсутствуют."
 
-#: modules/pref-filters.php:489
+#: modules/pref-filters.php:497
 msgid "No matching filters found."
 msgstr "Не найдено совпадений с фильтром."
 
-#: modules/pref-labels-old.php:9
-msgid ""
-"Sorry, labels have been administratively disabled for this installation. "
-"Please contact instance owner or edit configuration file to enable this "
-"functionality."
-msgstr ""
-
-#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
-#: modules/pref-labels.php:143
-msgid "Caption"
-msgstr "Заголовок"
-
-#: modules/pref-labels-old.php:46
-msgid "Match SQL"
-msgstr "Совпадение SQL"
-
-#: modules/pref-labels-old.php:68
-msgid "Help"
-msgstr "Помощь"
-
-#: modules/pref-labels-old.php:99
-msgid "Error: SQL expression is blank."
-msgstr "Ошибка: пустое SQL выражение."
-
-#: modules/pref-labels-old.php:179
-#, php-format
-msgid "Saved label <b>%s</b>"
-msgstr "Метка <b>%s</b> сохранена"
-
-#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
+#: modules/pref-labels.php:75
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Добавлена метка <b>%s</b>"
 
-#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
+#: modules/pref-labels.php:113 help/4.php:26
 msgid "Create label"
 msgstr "Создать метку"
 
-#: modules/pref-labels-old.php:283
-msgid "SQL Expression"
-msgstr "SQL выражение"
-
-#: modules/pref-labels-old.php:308
-msgid "[No caption]"
-msgstr "[Нет заголовка]"
-
-#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
+#: modules/pref-labels.php:184
 msgid "No labels defined."
 msgstr "Метки отсутствуют."
 
-#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
+#: modules/pref-labels.php:186
 msgid "No matching labels found."
 msgstr "Не найдено совпадений с метками."
 
@@ -2321,40 +2258,6 @@ msgstr "Пользователи не определены."
 msgid "No matching users found."
 msgstr "Подходящих пользователей не найдено."
 
-#: help/1.php:1
-msgid "Labels and SQL Expressions"
-msgstr "Метки и SQL выражения"
-
-#: help/1.php:3
-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 ""
-
-#: help/1.php:5
-msgid "Examples"
-msgstr "Примеры"
-
-#: help/1.php:7
-#, fuzzy
-msgid "Match all unread articles:"
-msgstr "Отмеченные"
-
-#: help/1.php:11
-msgid "Matches all articles which mention Linux in the title:"
-msgstr ""
-
-#: help/1.php:15
-msgid "Matches all articles for the last week (PostgreSQL):"
-msgstr ""
-
-#: help/1.php:19
-msgid "Matches all articles with scores between 100 and 500:"
-msgstr ""
-
 #: help/2.php:1
 msgid "Content filtering"
 msgstr "Фильтровать содержимое"
@@ -2548,31 +2451,31 @@ msgstr "Каналы"
 msgid "View tags"
 msgstr "Теги"
 
-#: mobile/functions.php:425
+#: mobile/functions.php:434
 msgid "Back"
 msgstr "Назад"
 
-#: mobile/functions.php:435
+#: mobile/functions.php:444
 msgid "View:"
 msgstr "Показать:"
 
-#: mobile/functions.php:457
+#: mobile/functions.php:466
 msgid "Refresh"
 msgstr "Обновить"
 
-#: mobile/functions.php:689
+#: mobile/functions.php:698
 msgid "Tags:"
 msgstr "Теги:"
 
-#: mobile/functions.php:721
+#: mobile/functions.php:730
 msgid "Go back"
 msgstr "Идти назад"
 
-#: mobile/functions.php:732
+#: mobile/functions.php:741
 msgid "Where:"
 msgstr "Где:"
 
-#: mobile/functions.php:763
+#: mobile/functions.php:772
 msgid "Match on:"
 msgstr "Соответствие:"
 
@@ -2580,6 +2483,73 @@ msgstr "Соответствие:"
 msgid "Internal error: Function not implemented"
 msgstr "Внутренняя ошибка: Функция не реализована"
 
+#~ msgid "(Click to change)"
+#~ msgstr "(Щёлкните для изменения)"
+
+#~ msgid "Match "
+#~ msgstr "Соответствие"
+
+#~ msgid "Unread articles"
+#~ msgstr "Отмеченные"
+
+#~ msgid "Updated articles"
+#~ msgstr "Обновлённые статьи"
+
+#~ msgid "Title contains"
+#~ msgstr "Заголовок содержит"
+
+#~ msgid "Content contains"
+#~ msgstr "В содержимом"
+
+#~ msgid "Score equals"
+#~ msgstr "Оценка равна"
+
+#~ msgid "Score is greater than"
+#~ msgstr "Оценка выше чем"
+
+#~ msgid "Score is less than"
+#~ msgstr "Оценка меньше чем"
+
+#~ msgid "Articles newer than X hours"
+#~ msgstr "Статье меньше X часов"
+
+#~ msgid "Articles newer than X days"
+#~ msgstr "Статье меньше X дней"
+
+#~ msgid "Add"
+#~ msgstr "Добавить"
+
+#~ msgid "Caption"
+#~ msgstr "Заголовок"
+
+#~ msgid "Match SQL"
+#~ msgstr "Совпадение SQL"
+
+#~ msgid "Help"
+#~ msgstr "Помощь"
+
+#~ msgid "Error: SQL expression is blank."
+#~ msgstr "Ошибка: пустое SQL выражение."
+
+#~ msgid "Saved label <b>%s</b>"
+#~ msgstr "Метка <b>%s</b> сохранена"
+
+#~ msgid "SQL Expression"
+#~ msgstr "SQL выражение"
+
+#~ msgid "[No caption]"
+#~ msgstr "[Нет заголовка]"
+
+#~ msgid "Labels and SQL Expressions"
+#~ msgstr "Метки и SQL выражения"
+
+#~ msgid "Examples"
+#~ msgstr "Примеры"
+
+#, fuzzy
+#~ msgid "Match all unread articles:"
+#~ msgstr "Отмеченные"
+
 #~ msgid "Search to label"
 #~ msgstr "Искать метку"
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 930acbaef..a9f85f455 100644
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 511493a03..ef0f10703 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-01-18 15:24+0300\n"
+"POT-Creation-Date: 2009-01-19 11:56+0300\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -77,7 +77,7 @@ msgstr "每天"
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:122 tt-rss.php:203 modules/pref-prefs.php:312
+#: backend.php:122 tt-rss.php:206 modules/pref-prefs.php:312
 msgid "Default"
 msgstr "默认"
 
@@ -162,138 +162,145 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2883 modules/popup-dialog.php:175
-#: modules/pref-filters.php:405 mobile/functions.php:735
+#: functions.php:2847 modules/popup-dialog.php:175
+#: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2912 functions.php:2951 functions.php:3319 functions.php:4348
-#: functions.php:4378 modules/pref-feeds.php:1244
+#: functions.php:2876 functions.php:2915 functions.php:3304 functions.php:4348
+#: functions.php:4378 modules/pref-feeds.php:1237
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2941 functions.php:3508 mobile/functions.php:33
+#: functions.php:2905 functions.php:3500 mobile/functions.php:33
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2943 functions.php:3510 prefs.php:144 mobile/functions.php:74
+#: functions.php:2907 functions.php:3333 functions.php:3502 prefs.php:144
+#: mobile/functions.php:83
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:2961 functions.php:3341 functions.php:4205 help/3.php:57
-#: mobile/functions.php:52
+#: functions.php:2925 functions.php:3326 functions.php:4205 help/3.php:57
+#: mobile/functions.php:61
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2963 functions.php:3344 functions.php:4212
-#: modules/pref-feeds.php:1413 help/3.php:59 mobile/functions.php:61
+#: functions.php:2927 functions.php:3330 functions.php:4212
+#: modules/pref-feeds.php:1406 help/3.php:59 mobile/functions.php:70
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2965 functions.php:3347 functions.php:4190 help/3.php:58
-#: mobile/functions.php:43
+#: functions.php:2929 functions.php:3336 functions.php:4190 help/3.php:58
+#: mobile/functions.php:52
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:3305 functions.php:3307
+#: functions.php:2931 functions.php:3339 functions.php:4183
+#: mobile/functions.php:43
+#, fuzzy
+msgid "All articles"
+msgstr "所有文章"
+
+#: functions.php:3290 functions.php:3292
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:3323 functions.php:3336 functions.php:3342 functions.php:3345
-#: functions.php:3348 functions.php:3356
+#: functions.php:3308 functions.php:3321 functions.php:3327 functions.php:3331
+#: functions.php:3337 functions.php:3340 functions.php:3348
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:3989 functions.php:4045 functions.php:5368
-#: modules/pref-feeds.php:1025 modules/pref-feeds.php:1206
-#: modules/pref-filters.php:358 modules/pref-labels-old.php:275
-#: modules/pref-labels.php:136 modules/pref-users.php:408
+#: functions.php:3981 functions.php:4037 functions.php:5374
+#: modules/pref-feeds.php:1018 modules/pref-feeds.php:1199
+#: modules/pref-filters.php:366 modules/pref-labels.php:138
+#: modules/pref-users.php:408
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:3990 functions.php:4046 modules/pref-feeds.php:1026
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:359
-#: modules/pref-labels-old.php:276 modules/pref-labels.php:137
-#: modules/pref-users.php:409 mobile/functions.php:561
+#: functions.php:3982 functions.php:4038 modules/pref-feeds.php:1019
+#: modules/pref-feeds.php:1200 modules/pref-filters.php:367
+#: modules/pref-labels.php:139 modules/pref-users.php:409
+#: mobile/functions.php:570
 msgid "All"
 msgstr "所有"
 
-#: functions.php:3991 functions.php:3997 functions.php:4047 functions.php:4050
-#: tt-rss.php:196 mobile/functions.php:449 mobile/functions.php:562
+#: functions.php:3983 functions.php:3989 functions.php:4039 functions.php:4042
+#: tt-rss.php:198 mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3992 mobile/functions.php:564
+#: functions.php:3984 mobile/functions.php:573
 #, fuzzy
 msgid "Invert"
 msgstr "(逆)"
 
-#: functions.php:3993 functions.php:4048 modules/pref-feeds.php:1027
-#: modules/pref-feeds.php:1208 modules/pref-filters.php:360
-#: modules/pref-labels-old.php:277 modules/pref-labels.php:138
-#: modules/pref-users.php:410 mobile/functions.php:563
+#: functions.php:3985 functions.php:4040 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:1201 modules/pref-filters.php:368
+#: modules/pref-labels.php:140 modules/pref-users.php:410
+#: mobile/functions.php:572
 msgid "None"
 msgstr "无"
 
-#: functions.php:3995 tt-rss.php:147 modules/pref-feeds.php:1367
+#: functions.php:3987 tt-rss.php:147 modules/pref-feeds.php:1360
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:3996
+#: functions.php:3988
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:3998 functions.php:4051 tt-rss.php:195
-#: mobile/functions.php:450
+#: functions.php:3990 functions.php:4043 tt-rss.php:197
+#: mobile/functions.php:459
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:3999
+#: functions.php:3991
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:4001 functions.php:4053
+#: functions.php:3993 functions.php:4045
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:4002 mobile/functions.php:569
+#: functions.php:3994 mobile/functions.php:578
 msgid "Selection"
 msgstr "选择："
 
-#: functions.php:4016 mobile/functions.php:571
+#: functions.php:4008 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:4019
+#: functions.php:4011
 #, fuzzy
 msgid "Assign label:"
 msgstr "指定标签"
 
-#: functions.php:4031
+#: functions.php:4023
 #, fuzzy
 msgid "(remove)"
 msgstr "移除"
 
-#: functions.php:4050
+#: functions.php:4042
 msgid "Toggle:"
 msgstr "触发:"
 
-#: functions.php:4054 mobile/functions.php:570
+#: functions.php:4046 mobile/functions.php:579
 msgid "Page"
 msgstr "页"
 
-#: functions.php:4055 modules/popup-dialog.php:70 modules/pref-feeds.php:165
-#: modules/pref-feeds.php:415 modules/pref-filters.php:395
+#: functions.php:4047 modules/popup-dialog.php:70 modules/pref-feeds.php:165
+#: modules/pref-feeds.php:415 modules/pref-filters.php:403
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:4096
+#: functions.php:4088
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4145
+#: functions.php:4137
 msgid "Click to collapse category"
 msgstr ""
 
@@ -305,134 +312,92 @@ msgstr "无feed显示。"
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4657
+#: functions.php:4651
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4716 functions.php:4717
+#: functions.php:4706 functions.php:4707
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:4724
+#: functions.php:4714
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4732
+#: functions.php:4722
 #, fuzzy
 msgid "Display original article content"
 msgstr "显示最近文章时间"
 
-#: functions.php:4739 functions.php:5378
+#: functions.php:4729 functions.php:5384
 #, fuzzy
 msgid "Show article summary in new window"
 msgstr "新窗口打开文章连结"
 
-#: functions.php:4775 functions.php:5302
+#: functions.php:4765 functions.php:5308
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:4781 functions.php:5308
+#: functions.php:4771 functions.php:5314
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4817 functions.php:5342
+#: functions.php:4807 functions.php:5348
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4819 functions.php:5344
+#: functions.php:4809 functions.php:5350
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4839 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:565 modules/pref-feeds.php:1076
+#: functions.php:4829 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1069
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: functions.php:4895 modules/pref-feed-browser.php:75
+#: functions.php:4885 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4964 mobile/functions.php:414
+#: functions.php:4954 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:5077
-msgid "(Click to change)"
-msgstr ""
-
-#: functions.php:5276
+#: functions.php:5282
 #, fuzzy
 msgid "Click to expand article"
 msgstr "星级文章"
 
-#: functions.php:5440
+#: functions.php:5442
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5443
+#: functions.php:5445
+#, fuzzy
+msgid "No updated articles found to display."
+msgstr "未找到文章。"
+
+#: functions.php:5448
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5446
+#: functions.php:5452
+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:5454
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5793
-#, fuzzy
-msgid "Match "
-msgstr "匹配"
-
-#: functions.php:5801
-#, fuzzy
-msgid "Unread articles"
-msgstr "星级文章"
-
-#: functions.php:5802
-#, fuzzy
-msgid "Updated articles"
-msgstr "星级文章"
-
-#: functions.php:5803
-#, fuzzy
-msgid "Title contains"
-msgstr "标题或内容"
-
-#: functions.php:5804
-#, fuzzy
-msgid "Content contains"
-msgstr "内容过滤器"
-
-#: functions.php:5805
-msgid "Score equals"
-msgstr ""
-
-#: functions.php:5806
-msgid "Score is greater than"
-msgstr ""
-
-#: functions.php:5807
-msgid "Score is less than"
-msgstr ""
-
-#: functions.php:5808
-msgid "Articles newer than X hours"
-msgstr ""
-
-#: functions.php:5809
-msgid "Articles newer than X days"
-msgstr ""
-
-#: functions.php:5818
-msgid "Add"
-msgstr ""
-
 #: localized_js.php:35
 msgid "display feeds"
 msgstr "显示Feed"
@@ -639,7 +604,7 @@ msgstr "更新提要失败（缺少XML支持）"
 msgid "Could not display article (missing XML object)"
 msgstr "显示条目失败（缺少XML支持）"
 
-#: localized_js.php:95 tt-rss.php:249 tt-rss.php:262
+#: localized_js.php:95 tt-rss.php:252 tt-rss.php:265
 msgid "No feed selected."
 msgstr "无选定feed."
 
@@ -827,9 +792,9 @@ msgstr "无选定文章。"
 msgid "Saving feeds..."
 msgstr "保存feed中..."
 
-#: localized_schema.php:9 tt-rss.php:205 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1219 modules/pref-feeds.php:1280
-#: mobile/functions.php:766
+#: localized_schema.php:9 tt-rss.php:208 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1212 modules/pref-feeds.php:1273
+#: mobile/functions.php:775
 msgid "Title"
 msgstr "标题"
 
@@ -842,7 +807,7 @@ msgid "Link"
 msgstr "链接"
 
 #: localized_schema.php:12 modules/popup-dialog.php:166
-#: mobile/functions.php:767
+#: mobile/functions.php:776
 msgid "Content"
 msgstr "内容"
 
@@ -854,7 +819,7 @@ msgstr ""
 msgid "Filter article"
 msgstr "过滤文章"
 
-#: localized_schema.php:16 mobile/functions.php:574
+#: localized_schema.php:16 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "标记为已读"
 
@@ -1345,11 +1310,10 @@ msgid "tag cloud"
 msgstr "标签簇"
 
 #: tt-rss.php:148 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:1121
-#: modules/pref-filters.php:299 modules/pref-labels-old.php:239
-#: modules/pref-labels.php:103 modules/pref-users.php:364
-#: mobile/functions.php:19 mobile/functions.php:426 mobile/functions.php:720
-#: mobile/functions.php:774
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:1114
+#: modules/pref-filters.php:307 modules/pref-labels.php:105
+#: modules/pref-users.php:364 mobile/functions.php:19 mobile/functions.php:435
+#: mobile/functions.php:729 mobile/functions.php:783
 msgid "Search"
 msgstr "搜索"
 
@@ -1395,75 +1359,85 @@ msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 msgid "Other actions:"
 msgstr "其他操作:"
 
-#: tt-rss.php:163
+#: tt-rss.php:164
+#, fuzzy
+msgid "&nbsp;&nbsp;Create label"
+msgstr "&nbsp;&nbsp;创建过滤器"
+
+#: tt-rss.php:165
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: tt-rss.php:164
+#: tt-rss.php:166
 #, fuzzy
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;订阅feed"
 
-#: tt-rss.php:165
+#: tt-rss.php:167
 #, fuzzy
 msgid "&nbsp;&nbsp;Reset category order"
 msgstr "&nbsp;&nbsp;订阅feed"
 
-#: tt-rss.php:167
+#: tt-rss.php:169
 #, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: tt-rss.php:175
+#: tt-rss.php:177
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "隐藏我的Feed列表"
 
-#: tt-rss.php:177
+#: tt-rss.php:179
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:185 mobile/functions.php:729
+#: tt-rss.php:187 mobile/functions.php:738
 msgid "Search:"
 msgstr "搜索:"
 
-#: tt-rss.php:193 mobile/functions.php:447
+#: tt-rss.php:195 mobile/functions.php:456
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:194 mobile/functions.php:448
+#: tt-rss.php:196 mobile/functions.php:457
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:197
+#: tt-rss.php:199
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:200
+#: tt-rss.php:200 modules/pref-feeds.php:1218 modules/pref-feeds.php:1281
+#: mobile/functions.php:501 mobile/functions.php:504
+msgid "Updated"
+msgstr "已更新"
+
+#: tt-rss.php:203
 #, fuzzy
 msgid "Order:"
 msgstr "地点:"
 
-#: tt-rss.php:204 modules/popup-dialog.php:362 modules/pref-filters.php:51
-#: modules/pref-filters.php:435
+#: tt-rss.php:207 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: modules/pref-filters.php:443
 #, fuzzy
 msgid "Date"
 msgstr "更新"
 
-#: tt-rss.php:206
+#: tt-rss.php:209
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:210
+#: tt-rss.php:213
 msgid "Limit:"
 msgstr "限制:"
 
-#: tt-rss.php:235 modules/pref-feeds.php:261 modules/pref-feeds.php:451
-#: mobile/functions.php:427
+#: tt-rss.php:238 modules/pref-feeds.php:261 modules/pref-feeds.php:451
+#: mobile/functions.php:436
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:253
+#: tt-rss.php:256
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1626,7 +1600,7 @@ msgid "Subscribe"
 msgstr "订阅"
 
 #: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:446 modules/popup-dialog.php:541
+#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
 #: modules/pref-feeds.php:130 modules/pref-feeds.php:395
 #: modules/pref-feeds.php:546 modules/pref-filters.php:166
 #: modules/pref-users.php:184
@@ -1638,7 +1612,7 @@ msgstr "取消"
 msgid "match on:"
 msgstr "匹配:"
 
-#: modules/popup-dialog.php:167 mobile/functions.php:768
+#: modules/popup-dialog.php:167 mobile/functions.php:777
 msgid "Title or content"
 msgstr "标题或内容"
 
@@ -1646,113 +1620,113 @@ msgstr "标题或内容"
 msgid "Limit search to:"
 msgstr ""
 
-#: modules/popup-dialog.php:188 mobile/functions.php:748
+#: modules/popup-dialog.php:188 mobile/functions.php:757
 msgid "This feed"
 msgstr "本feed"
 
-#: modules/popup-dialog.php:288
+#: modules/popup-dialog.php:226
 #, fuzzy
 msgid "Create Filter"
 msgstr "创建过滤器"
 
-#: modules/popup-dialog.php:306 modules/popup-dialog.php:405
+#: 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:357 modules/pref-filters.php:42
-#: modules/pref-filters.php:394
+#: modules/popup-dialog.php:245 modules/pref-filters.php:42
+#: modules/pref-filters.php:402
 msgid "Match"
 msgstr "匹配"
 
-#: modules/popup-dialog.php:365 modules/pref-filters.php:54
-#: modules/pref-filters.php:425
+#: modules/popup-dialog.php:253 modules/pref-filters.php:54
+#: modules/pref-filters.php:433
 msgid "before"
 msgstr ""
 
-#: modules/popup-dialog.php:366 modules/pref-filters.php:55
-#: modules/pref-filters.php:426
+#: modules/popup-dialog.php:254 modules/pref-filters.php:55
+#: modules/pref-filters.php:434
 #, fuzzy
 msgid "after"
 msgstr "更新"
 
-#: modules/popup-dialog.php:380 modules/pref-filters.php:70
+#: modules/popup-dialog.php:268 modules/pref-filters.php:70
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:383 modules/pref-filters.php:73
+#: modules/popup-dialog.php:271 modules/pref-filters.php:73
 #, fuzzy
 msgid "on field"
 msgstr "于:"
 
-#: modules/popup-dialog.php:389 modules/pref-filters.php:79
+#: modules/popup-dialog.php:277 modules/pref-filters.php:79
 #, fuzzy
 msgid "in"
 msgstr "链接"
 
-#: modules/popup-dialog.php:394 modules/pref-filters.php:84
+#: modules/popup-dialog.php:282 modules/pref-filters.php:84
 #, fuzzy
 msgid "Perform Action"
 msgstr "完成更新"
 
-#: modules/popup-dialog.php:411 modules/pref-filters.php:104
+#: modules/popup-dialog.php:299 modules/pref-filters.php:104
 msgid "with parameters:"
 msgstr ""
 
-#: modules/popup-dialog.php:421 modules/pref-feeds.php:308
+#: modules/popup-dialog.php:312 modules/pref-feeds.php:308
 #: modules/pref-feeds.php:500 modules/pref-filters.php:123
 #: modules/pref-users.php:165
 #, fuzzy
 msgid "Options"
 msgstr "选项:"
 
-#: modules/popup-dialog.php:427 modules/pref-filters.php:135
+#: modules/popup-dialog.php:318 modules/pref-filters.php:135
 msgid "Enabled"
 msgstr "可用"
 
-#: modules/popup-dialog.php:430 modules/pref-filters.php:144
+#: modules/popup-dialog.php:321 modules/pref-filters.php:144
 msgid "Inverse match"
 msgstr "逆匹配"
 
-#: modules/popup-dialog.php:442
+#: modules/popup-dialog.php:333
 msgid "Create"
 msgstr "创建"
 
-#: modules/popup-dialog.php:457
+#: modules/popup-dialog.php:348
 msgid "Update Errors"
 msgstr "更新错误"
 
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:351
 msgid "These feeds have not been updated because of errors:"
 msgstr "这些feed更新错误:"
 
-#: modules/popup-dialog.php:478
+#: modules/popup-dialog.php:369
 msgid "Close"
 msgstr "关闭"
 
-#: modules/popup-dialog.php:487
+#: modules/popup-dialog.php:378
 msgid "Edit Tags"
 msgstr "编辑标签"
 
-#: modules/popup-dialog.php:492
+#: modules/popup-dialog.php:383
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开:"
 
-#: modules/popup-dialog.php:537 modules/pref-feeds.php:393
+#: modules/popup-dialog.php:428 modules/pref-feeds.php:393
 #: modules/pref-feeds.php:544 modules/pref-filters.php:162
 #: modules/pref-users.php:181
 msgid "Save"
 msgstr "保存"
 
-#: modules/popup-dialog.php:550 help/3.php:60
+#: modules/popup-dialog.php:441 help/3.php:60
 msgid "Tag cloud"
 msgstr "标签簇"
 
-#: modules/popup-dialog.php:553
+#: modules/popup-dialog.php:444
 msgid "Showing most popular tags "
 msgstr "显示最热标签"
 
-#: modules/popup-dialog.php:554
+#: modules/popup-dialog.php:445
 msgid "browse more"
 msgstr "浏览更多"
 
@@ -1866,7 +1840,7 @@ msgstr "包括电子邮件文摘"
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:390 modules/pref-feeds.php:1374
+#: modules/pref-feeds.php:390 modules/pref-feeds.php:1367
 msgid "Unsubscribe"
 msgstr "退订"
 
@@ -1875,158 +1849,153 @@ msgstr "退订"
 msgid "Multiple Feed Editor"
 msgstr "Feed编辑"
 
-#: modules/pref-feeds.php:781 modules/pref-feeds.php:828
+#: modules/pref-feeds.php:774 modules/pref-feeds.php:821
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:859
+#: modules/pref-feeds.php:852
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:861
+#: modules/pref-feeds.php:854
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:943
+#: modules/pref-feeds.php:936
 msgid "Category editor"
 msgstr "分类编辑"
 
-#: modules/pref-feeds.php:966
+#: modules/pref-feeds.php:959
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "分类 <b>$%s</b>已经存在."
 
-#: modules/pref-feeds.php:994
+#: modules/pref-feeds.php:987
 msgid "Unable to delete non empty feed categories."
 msgstr "不能删除非空分类。"
 
-#: modules/pref-feeds.php:1011
+#: modules/pref-feeds.php:1004
 msgid "Create category"
 msgstr "创建分类"
 
-#: modules/pref-feeds.php:1071
+#: modules/pref-feeds.php:1064
 msgid "No feed categories defined."
 msgstr "未定义feed分类"
 
-#: modules/pref-feeds.php:1082 modules/pref-filters.php:156
-#: modules/pref-filters.php:479 modules/pref-labels-old.php:330
-#: modules/pref-labels.php:176 modules/pref-users.php:481
+#: modules/pref-feeds.php:1075 modules/pref-filters.php:156
+#: modules/pref-filters.php:487 modules/pref-labels.php:178
+#: modules/pref-users.php:481
 msgid "Remove"
 msgstr "移除"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1097
 msgid "Some feeds have update errors (click for details)"
 msgstr "有些feed更新错误(点击了解详情) "
 
-#: modules/pref-feeds.php:1126 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1119 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "订阅feed"
 
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1124
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:1205
+#: modules/pref-feeds.php:1198
 msgid "Show last article times"
 msgstr "显示最近文章时间"
 
-#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1284
+#: modules/pref-feeds.php:1215 modules/pref-feeds.php:1277
 msgid "Last&nbsp;Article"
 msgstr "最后&nbsp;文章"
 
-#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1288
-#: mobile/functions.php:492 mobile/functions.php:495
-msgid "Updated"
-msgstr "已更新"
-
-#: modules/pref-feeds.php:1309 modules/pref-filters.php:453
-#: modules/pref-labels-old.php:310 modules/pref-users.php:456
+#: modules/pref-feeds.php:1302 modules/pref-filters.php:461
+#: modules/pref-users.php:456
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1369
+#: modules/pref-feeds.php:1348 modules/pref-feeds.php:1362
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: modules/pref-feeds.php:1361
+#: modules/pref-feeds.php:1354
 msgid "Recategorize"
 msgstr "再分类"
 
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:477
-#: modules/pref-labels-old.php:328 modules/pref-users.php:479
+#: modules/pref-feeds.php:1363 modules/pref-filters.php:485
+#: modules/pref-users.php:479
 msgid "Edit"
 msgstr "编辑"
 
-#: modules/pref-feeds.php:1371
+#: modules/pref-feeds.php:1364
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
 #, fuzzy
 msgid "Clear feed data"
 msgstr "所有Feed已更新。"
 
-#: modules/pref-feeds.php:1373 modules/pref-filters.php:316
+#: modules/pref-feeds.php:1366 modules/pref-filters.php:324
 #, fuzzy
 msgid "Rescore articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1372
 #, fuzzy
 msgid "Other:"
 msgstr "地点:"
 
-#: modules/pref-feeds.php:1380
+#: modules/pref-feeds.php:1373
 msgid "Edit categories"
 msgstr "编辑分类"
 
-#: modules/pref-feeds.php:1387
+#: modules/pref-feeds.php:1380
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1384
 #, fuzzy
 msgid "File:"
 msgstr "标题:"
 
-#: modules/pref-feeds.php:1394
+#: modules/pref-feeds.php:1387
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1401
+#: modules/pref-feeds.php:1394
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1397
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1399
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1403
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1419
+#: modules/pref-feeds.php:1412
 #, 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:1423
+#: modules/pref-feeds.php:1416
 #, fuzzy
 msgid "Link to published articles feed."
 msgstr "已发布文章"
 
-#: modules/pref-feeds.php:1426
+#: modules/pref-feeds.php:1419
 #, fuzzy
 msgid "Generate another link"
 msgstr "生成另一个地址"
@@ -2041,105 +2010,65 @@ msgstr "过滤器编辑"
 msgid "Saved filter <b>%s</b>"
 msgstr "保存过滤器<b>%s</b>"
 
-#: modules/pref-filters.php:256
+#: modules/pref-filters.php:264
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "创建过滤器 <b>%s</b>"
 
-#: modules/pref-filters.php:309 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:317 help/3.php:31 help/4.php:25
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: modules/pref-filters.php:384
+#: modules/pref-filters.php:392
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:385
+#: modules/pref-filters.php:393
 #, fuzzy
 msgid "action_description"
 msgstr "描述"
 
-#: modules/pref-filters.php:396
+#: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
 msgstr "Feed"
 
-#: modules/pref-filters.php:397
+#: modules/pref-filters.php:405
 #, fuzzy
 msgid "Params"
 msgstr "参数:"
 
-#: modules/pref-filters.php:442
+#: modules/pref-filters.php:450
 msgid "(Disabled)"
 msgstr "(不可用)"
 
-#: modules/pref-filters.php:458
+#: modules/pref-filters.php:466
 msgid "(Inverse)"
 msgstr "(逆)"
 
-#: modules/pref-filters.php:487
+#: modules/pref-filters.php:495
 msgid "No filters defined."
 msgstr "未定义过滤器。"
 
-#: modules/pref-filters.php:489
+#: modules/pref-filters.php:497
 #, fuzzy
 msgid "No matching filters found."
 msgstr "未找到文章。"
 
-#: modules/pref-labels-old.php:9
-msgid ""
-"Sorry, labels have been administratively disabled for this installation. "
-"Please contact instance owner or edit configuration file to enable this "
-"functionality."
-msgstr ""
-
-#: modules/pref-labels-old.php:36 modules/pref-labels-old.php:282
-#: modules/pref-labels.php:143
-msgid "Caption"
-msgstr "标题"
-
-#: modules/pref-labels-old.php:46
-#, fuzzy
-msgid "Match SQL"
-msgstr "匹配"
-
-#: modules/pref-labels-old.php:68
-#, fuzzy
-msgid "Help"
-msgstr "你好,"
-
-#: modules/pref-labels-old.php:99
-msgid "Error: SQL expression is blank."
-msgstr ""
-
-#: modules/pref-labels-old.php:179
-#, php-format
-msgid "Saved label <b>%s</b>"
-msgstr "已保存标记<b>%s</b>"
-
-#: modules/pref-labels-old.php:211 modules/pref-labels.php:73
+#: modules/pref-labels.php:75
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "创建标记 <b>%s</b>"
 
-#: modules/pref-labels-old.php:249 modules/pref-labels.php:111 help/4.php:26
+#: modules/pref-labels.php:113 help/4.php:26
 msgid "Create label"
 msgstr "创建标记"
 
-#: modules/pref-labels-old.php:283
-msgid "SQL Expression"
-msgstr "SQL 表达式"
-
-#: modules/pref-labels-old.php:308
-#, fuzzy
-msgid "[No caption]"
-msgstr "标题"
-
-#: modules/pref-labels-old.php:335 modules/pref-labels.php:182
+#: modules/pref-labels.php:184
 msgid "No labels defined."
 msgstr "未定义标记."
 
-#: modules/pref-labels-old.php:337 modules/pref-labels.php:184
+#: modules/pref-labels.php:186
 #, fuzzy
 msgid "No matching labels found."
 msgstr "未找到文章。"
@@ -2358,41 +2287,6 @@ msgstr "未定义过滤器。"
 msgid "No matching users found."
 msgstr "未找到文章。"
 
-#: help/1.php:1
-#, fuzzy
-msgid "Labels and SQL Expressions"
-msgstr "SQL 表达式"
-
-#: help/1.php:3
-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 ""
-
-#: help/1.php:5
-msgid "Examples"
-msgstr ""
-
-#: help/1.php:7
-#, fuzzy
-msgid "Match all unread articles:"
-msgstr "星级文章"
-
-#: help/1.php:11
-msgid "Matches all articles which mention Linux in the title:"
-msgstr ""
-
-#: help/1.php:15
-msgid "Matches all articles for the last week (PostgreSQL):"
-msgstr ""
-
-#: help/1.php:19
-msgid "Matches all articles with scores between 100 and 500:"
-msgstr ""
-
 #: help/2.php:1
 #, fuzzy
 msgid "Content filtering"
@@ -2617,32 +2511,32 @@ msgstr "Feed"
 msgid "View tags"
 msgstr "编辑标签"
 
-#: mobile/functions.php:425
+#: mobile/functions.php:434
 msgid "Back"
 msgstr ""
 
-#: mobile/functions.php:435
+#: mobile/functions.php:444
 msgid "View:"
 msgstr "浏览:"
 
-#: mobile/functions.php:457
+#: mobile/functions.php:466
 msgid "Refresh"
 msgstr ""
 
-#: mobile/functions.php:689
+#: mobile/functions.php:698
 #, fuzzy
 msgid "Tags:"
 msgstr "标签"
 
-#: mobile/functions.php:721
+#: mobile/functions.php:730
 msgid "Go back"
 msgstr ""
 
-#: mobile/functions.php:732
+#: mobile/functions.php:741
 msgid "Where:"
 msgstr "地点:"
 
-#: mobile/functions.php:763
+#: mobile/functions.php:772
 #, fuzzy
 msgid "Match on:"
 msgstr "匹配:"
@@ -2651,6 +2545,55 @@ msgstr "匹配:"
 msgid "Internal error: Function not implemented"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Match "
+#~ msgstr "匹配"
+
+#, fuzzy
+#~ msgid "Unread articles"
+#~ msgstr "星级文章"
+
+#, fuzzy
+#~ msgid "Updated articles"
+#~ msgstr "星级文章"
+
+#, fuzzy
+#~ msgid "Title contains"
+#~ msgstr "标题或内容"
+
+#, fuzzy
+#~ msgid "Content contains"
+#~ msgstr "内容过滤器"
+
+#~ msgid "Caption"
+#~ msgstr "标题"
+
+#, fuzzy
+#~ msgid "Match SQL"
+#~ msgstr "匹配"
+
+#, fuzzy
+#~ msgid "Help"
+#~ msgstr "你好,"
+
+#~ msgid "Saved label <b>%s</b>"
+#~ msgstr "已保存标记<b>%s</b>"
+
+#~ msgid "SQL Expression"
+#~ msgstr "SQL 表达式"
+
+#, fuzzy
+#~ msgid "[No caption]"
+#~ msgstr "标题"
+
+#, fuzzy
+#~ msgid "Labels and SQL Expressions"
+#~ msgstr "SQL 表达式"
+
+#, fuzzy
+#~ msgid "Match all unread articles:"
+#~ msgstr "星级文章"
+
 #, fuzzy
 #~ msgid "Search to label"
 #~ msgstr "转换标签"