diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 8488c63a9..1e928e708 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 0b11543f2..b00b33f0b 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: 2008-05-16 13:35+0400\n"
+"POT-Creation-Date: 2008-05-18 15:43+0400\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"
@@ -97,23 +97,23 @@ msgstr ""
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: backend.php:396
+#: backend.php:400 modules/pref-users.php:295
 msgid "Registered"
 msgstr "Abonné"
 
-#: backend.php:397
+#: backend.php:401
 msgid "Last logged in"
 msgstr "Dernière connexion"
 
-#: backend.php:398
+#: backend.php:402
 msgid "Stored articles"
 msgstr "Articles mémorisés"
 
-#: backend.php:405
+#: backend.php:409
 msgid "Subscribed feeds count"
 msgstr "Nombre d'abonnements à des flux"
 
-#: backend.php:420
+#: backend.php:424
 msgid "Subscribed feeds"
 msgstr "Abonnements à des flux"
 
@@ -179,34 +179,34 @@ msgstr ""
 "Votre version de MySQL n'est pas gérée pour le moment. Reportez-vous au \n"
 "\t\tsite officiel pour plus d'informations."
 
-#: functions.php:2524 functions.php:2863 functions.php:3233 functions.php:4083
+#: functions.php:2524 functions.php:2863 functions.php:3233 functions.php:4085
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:2533 functions.php:2865 functions.php:3236 functions.php:4090
-#: modules/pref-feeds.php:1173
+#: functions.php:2533 functions.php:2865 functions.php:3236 functions.php:4092
+#: modules/pref-feeds.php:1146
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:2542 functions.php:2867 functions.php:3239 functions.php:4068
+#: functions.php:2542 functions.php:2867 functions.php:3239 functions.php:4070
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
 #: functions.php:2785 modules/popup-dialog.php:151
-#: modules/pref-filters.php:312
+#: modules/pref-filters.php:340
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2814 functions.php:2853 functions.php:3211 functions.php:4247
-#: functions.php:4277 modules/pref-feeds.php:984
+#: functions.php:2814 functions.php:2853 functions.php:3211 functions.php:4249
+#: functions.php:4279 modules/pref-feeds.php:977
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:2843 functions.php:3395
+#: functions.php:2843 functions.php:3397
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2845 functions.php:3397
+#: functions.php:2845 functions.php:3399
 msgid "Labels"
 msgstr "Intitulé"
 
@@ -219,127 +219,127 @@ msgstr "Résultats de recherche"
 msgid "Searched for"
 msgstr "Recherché"
 
-#: functions.php:3859 functions.php:3908 functions.php:5107
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:946
-#: modules/pref-filters.php:264 modules/pref-labels.php:239
-#: modules/pref-users.php:211
+#: functions.php:3861 functions.php:3910 functions.php:5132
+#: modules/pref-feeds.php:758 modules/pref-feeds.php:939
+#: modules/pref-filters.php:292 modules/pref-labels.php:269
+#: modules/pref-users.php:286
 msgid "Select:"
 msgstr "Sélectionner&nbsp;:"
 
-#: functions.php:3860 functions.php:3909 modules/pref-feeds.php:760
-#: modules/pref-feeds.php:947 modules/pref-filters.php:265
-#: modules/pref-labels.php:240 modules/pref-users.php:212
+#: functions.php:3862 functions.php:3911 modules/pref-feeds.php:759
+#: modules/pref-feeds.php:940 modules/pref-filters.php:293
+#: modules/pref-labels.php:270 modules/pref-users.php:287
 msgid "All"
 msgstr "Tout"
 
-#: functions.php:3861 functions.php:3866 functions.php:3910 functions.php:3913
+#: functions.php:3863 functions.php:3868 functions.php:3912 functions.php:3915
 #: tt-rss.php:193
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3862 functions.php:3911 modules/pref-feeds.php:761
-#: modules/pref-feeds.php:948 modules/pref-filters.php:266
-#: modules/pref-labels.php:241 modules/pref-users.php:213
+#: functions.php:3864 functions.php:3913 modules/pref-feeds.php:760
+#: modules/pref-feeds.php:941 modules/pref-filters.php:294
+#: modules/pref-labels.php:271 modules/pref-users.php:288
 msgid "None"
 msgstr "Aucun"
 
-#: functions.php:3864 tt-rss.php:146 modules/pref-feeds.php:1107
+#: functions.php:3866 tt-rss.php:146 modules/pref-feeds.php:1100
 msgid "Actions..."
 msgstr "Actions..."
 
-#: functions.php:3865
+#: functions.php:3867
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Sélection&nbsp;:"
 
-#: functions.php:3867 functions.php:3914 tt-rss.php:192
+#: functions.php:3869 functions.php:3916 tt-rss.php:192
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:3868
+#: functions.php:3870
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:3870 functions.php:3916
+#: functions.php:3872 functions.php:3918
 msgid "Mark as read:"
 msgstr "Marquer comme lu&nbsp;:"
 
-#: functions.php:3871
+#: functions.php:3873
 msgid "Selection"
 msgstr "La sélection"
 
-#: functions.php:3885
+#: functions.php:3887
 msgid "Entire feed"
 msgstr "Tout le flux"
 
-#: functions.php:3888 tt-rss.php:161
+#: functions.php:3890 tt-rss.php:161
 msgid "Other actions:"
 msgstr "Autres actions&nbsp;:"
 
-#: functions.php:3895 functions.php:3897
+#: functions.php:3897 functions.php:3899
 #, fuzzy
 msgid "Search to label"
 msgstr "Convertir en intitulé"
 
-#: functions.php:3913
+#: functions.php:3915
 msgid "Toggle:"
 msgstr "Marquages spéciaux&nbsp;:"
 
-#: functions.php:3917
+#: functions.php:3919
 msgid "Page"
 msgstr "Page"
 
-#: functions.php:3918 modules/pref-filters.php:301
+#: functions.php:3920 modules/pref-filters.php:329
 msgid "Feed"
 msgstr "Flux"
 
-#: functions.php:3925
+#: functions.php:3927
 msgid "Convert to label"
 msgstr "Convertir en intitulé"
 
-#: functions.php:3972
+#: functions.php:3974
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:4056
+#: functions.php:4058
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4317
+#: functions.php:4319
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:4334
+#: functions.php:4336
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:4559
+#: functions.php:4561
 #, fuzzy
 msgid " - "
 msgstr "- par "
 
-#: functions.php:4614
+#: functions.php:4616
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:4645 functions.php:5066
+#: functions.php:4647 functions.php:5091
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4647 functions.php:5068
+#: functions.php:4649 functions.php:5093
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5077
+#: functions.php:4659 functions.php:5102
 #, fuzzy
 msgid "unknown type"
 msgstr "Erreur inconnue"
 
-#: functions.php:4723 modules/pref-feed-browser.php:74
+#: functions.php:4732 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:4790
+#: functions.php:4801
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -347,25 +347,25 @@ 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:4901
+#: functions.php:4912
 msgid "(Click to change)"
 msgstr ""
 
-#: functions.php:5036
+#: functions.php:5061
 msgid "Show article"
 msgstr "Afficher l'article"
 
-#: functions.php:5174
+#: functions.php:5199
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Aucun article à marquer"
 
-#: functions.php:5177
+#: functions.php:5202
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Aucun article à marquer"
 
-#: functions.php:5180
+#: functions.php:5205
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Aucun article à marquer"
@@ -378,7 +378,7 @@ msgstr "afficher les flux"
 msgid "display tags"
 msgstr "afficher les étiquettes"
 
-#: localized_js.php:37 prefs.php:135 tt-rss.php:75
+#: localized_js.php:37 prefs.php:141 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr "Ouverture en cours, veuillez patienter..."
 
@@ -734,7 +734,7 @@ msgid "Rescoring articles..."
 msgstr "Articles mémorisés"
 
 #: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:959 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:952 modules/pref-feeds.php:1013
 msgid "Title"
 msgstr "Titre"
 
@@ -994,12 +994,12 @@ msgstr "Purger les articles non lus"
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
-#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:279
-#: modules/pref-users.php:29
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:274
+#: modules/pref-users.php:34
 msgid "Login:"
 msgstr "Nom&nbsp;:"
 
-#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:285
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:280
 msgid "Password:"
 msgstr "Mot de passe&nbsp;:"
 
@@ -1082,51 +1082,51 @@ msgstr ""
 msgid "Return to preferences"
 msgstr "Revenir à la configuration"
 
-#: prefs.php:89
+#: prefs.php:91
 msgid "Unknown Error"
 msgstr "Erreur inconnue"
 
-#: prefs.php:95 tt-rss.php:114
+#: prefs.php:97 tt-rss.php:114
 msgid "Hello,"
 msgstr "Bonjour,"
 
-#: prefs.php:97 prefs.php:107
+#: prefs.php:99 prefs.php:109
 msgid "Exit preferences"
 msgstr "Quitter la configuration"
 
-#: prefs.php:99 tt-rss.php:124
+#: prefs.php:101 tt-rss.php:124
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: prefs.php:113 tt-rss.php:116 tt-rss.php:148
+#: prefs.php:119 tt-rss.php:116 tt-rss.php:148
 msgid "Preferences"
 msgstr "Configuration"
 
-#: prefs.php:115
+#: prefs.php:121
 msgid "My Feeds"
 msgstr "Mes flux"
 
-#: prefs.php:118
+#: prefs.php:124
 msgid "Other Feeds"
 msgstr "Autres flux"
 
-#: prefs.php:121
+#: prefs.php:127
 msgid "Published Articles"
 msgstr "Articles publiés"
 
-#: prefs.php:123
+#: prefs.php:129
 msgid "Content Filtering"
 msgstr "Filtrage de contenu"
 
-#: prefs.php:126
+#: prefs.php:132
 msgid "Label Editor"
 msgstr "Éditeur d'intitulé"
 
-#: prefs.php:130
+#: prefs.php:136
 msgid "User Manager"
 msgstr "Gestionnaire d'utilisateurs"
 
-#: prefs.php:138 tt-rss.php:78
+#: prefs.php:144 tt-rss.php:78
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -1251,7 +1251,8 @@ msgid "tag cloud"
 msgstr "Nuage d'étiquettes"
 
 #: tt-rss.php:147 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:853
+#: modules/pref-feeds.php:854 modules/pref-filters.php:235
+#: modules/pref-labels.php:233 modules/pref-users.php:242
 msgid "Search"
 msgstr "Rechercher"
 
@@ -1397,7 +1398,7 @@ msgid "Help topic not found."
 msgstr "Sujet non trouvé dans l'aide."
 
 #: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:463 modules/pref-feeds.php:810
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:809
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
@@ -1471,28 +1472,28 @@ msgstr ""
 "\t\t\t\t\tVeuillez vérifier son état ou bien contacter l'administrateur de "
 "votre Tiny Tiny RSS."
 
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:866
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:859
 msgid "Subscribe to feed"
 msgstr "S'inscrire à un flux"
 
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:166
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:161
 msgid "Feed URL:"
 msgstr "URL du flux&nbsp;:"
 
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:174
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:169
 msgid "Category:"
 msgstr "Catégorie&nbsp;:"
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:115
-#: modules/pref-feeds.php:119
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:117
+#: modules/pref-feeds.php:114
 msgid "Subscribe"
 msgstr "S'inscrire"
 
 #: modules/popup-dialog.php:114 modules/popup-dialog.php:199
 #: modules/popup-dialog.php:256 modules/popup-dialog.php:343
-#: modules/popup-dialog.php:439 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:367 modules/pref-filters.php:118
-#: modules/pref-users.php:58
+#: modules/popup-dialog.php:439 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:362 modules/pref-filters.php:116
+#: modules/pref-users.php:63
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1516,7 +1517,7 @@ msgstr "Correspondance sur&nbsp;:"
 msgid "Title or content"
 msgstr "Titre ou contenu"
 
-#: modules/popup-dialog.php:208 modules/pref-labels.php:221
+#: modules/popup-dialog.php:208 modules/pref-labels.php:243
 msgid "Create label"
 msgstr "Créer un intitulé"
 
@@ -1541,40 +1542,40 @@ msgstr "Tester"
 msgid "Create"
 msgstr "Créer"
 
-#: modules/popup-dialog.php:265 modules/pref-filters.php:229
+#: modules/popup-dialog.php:265 modules/pref-filters.php:245
 msgid "Create filter"
 msgstr "Créer un filtre"
 
 #: modules/popup-dialog.php:283 modules/popup-dialog.php:314
-#: modules/pref-filters.php:40 modules/pref-filters.php:72
+#: modules/pref-filters.php:38 modules/pref-filters.php:70
 msgid "description"
 msgstr "description"
 
-#: modules/popup-dialog.php:288 modules/pref-filters.php:45
+#: modules/popup-dialog.php:288 modules/pref-filters.php:43
 msgid "Match:"
 msgstr "Correspondance&nbsp;:"
 
-#: modules/popup-dialog.php:294 modules/pref-filters.php:51
+#: modules/popup-dialog.php:294 modules/pref-filters.php:49
 msgid "On field:"
 msgstr "Sur le champ&nbsp;:"
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:56
+#: modules/popup-dialog.php:299 modules/pref-filters.php:54
 msgid "Feed:"
 msgstr "Flux&nbsp;:"
 
-#: modules/popup-dialog.php:305 modules/pref-filters.php:62
+#: modules/popup-dialog.php:305 modules/pref-filters.php:60
 msgid "Action:"
 msgstr "Action&nbsp;:"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:79
+#: modules/popup-dialog.php:321 modules/pref-filters.php:77
 msgid "Params:"
 msgstr "Paramètres&nbsp;:"
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:298
+#: modules/popup-dialog.php:325 modules/pref-feeds.php:293
 msgid "Options:"
 msgstr "Options&nbsp;:"
 
-#: modules/popup-dialog.php:328 modules/pref-filters.php:103
+#: modules/popup-dialog.php:328 modules/pref-filters.php:101
 msgid "Inverse match"
 msgstr "Correspondance inverse"
 
@@ -1598,8 +1599,8 @@ msgstr "Modifier les étiquettes"
 msgid "Tags for this article (separated by commas):"
 msgstr "Étiquettes pour cet article (séparées par des virgules)&nbsp;:"
 
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:365
-#: modules/pref-filters.php:114 modules/pref-users.php:55
+#: modules/popup-dialog.php:435 modules/pref-feeds.php:360
+#: modules/pref-filters.php:112 modules/pref-users.php:60
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -1623,21 +1624,21 @@ msgstr "Le navigateur de flux a été désactivé par l'administrateur."
 msgid "Feed information:"
 msgstr "Information sur le flux&nbsp;:"
 
-#: modules/pref-feed-browser.php:38
+#: modules/pref-feed-browser.php:39
 #, fuzzy
 msgid "Site:"
 msgstr "Titre&nbsp;:"
 
-#: modules/pref-feed-browser.php:40
+#: modules/pref-feed-browser.php:41
 #, fuzzy
 msgid "Last updated:"
 msgstr "Dernière mise à jour&nbsp;:"
 
-#: modules/pref-feed-browser.php:55
+#: modules/pref-feed-browser.php:56
 msgid "Last headlines:"
 msgstr "Derniers en-têtes&nbsp;:"
 
-#: modules/pref-feed-browser.php:84
+#: modules/pref-feed-browser.php:85
 msgid ""
 "This panel shows feeds subscribed by other users of this system, just in "
 "case you are interested in them too."
@@ -1645,15 +1646,15 @@ msgstr ""
 "Ce panneau affiche les flux auxquels d'autres utilisateurs du même système "
 "se sont inscrits, au cas où cela présenterait un intérêt pour vous."
 
-#: modules/pref-feed-browser.php:101
+#: modules/pref-feed-browser.php:103
 msgid "Top"
 msgstr "Top"
 
-#: modules/pref-feed-browser.php:110
+#: modules/pref-feed-browser.php:112
 msgid "Show"
 msgstr "Afficher"
 
-#: modules/pref-feed-browser.php:164 modules/pref-feeds.php:112
+#: modules/pref-feed-browser.php:166 modules/pref-feeds.php:107
 msgid "No feeds found to subscribe."
 msgstr "Aucun flux auquel s'inscrire n'a été trouvé."
 
@@ -1670,176 +1671,181 @@ msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr ""
 "Affichage des 25 meilleurs flux enregistrés, classés par popularité&nbsp;:"
 
-#: modules/pref-feeds.php:146
+#: modules/pref-feeds.php:141
 msgid "Feed editor"
 msgstr "Éditeur de flux"
 
-#: modules/pref-feeds.php:158
+#: modules/pref-feeds.php:153
 msgid "Title:"
 msgstr "Titre&nbsp;:"
 
-#: modules/pref-feeds.php:194
+#: modules/pref-feeds.php:189
 msgid "Update Interval:"
 msgstr "Fréquence de mise à jour&nbsp;:"
 
-#: modules/pref-feeds.php:203
+#: modules/pref-feeds.php:198
 msgid "Link to:"
 msgstr "Lier à&nbsp;:"
 
-#: modules/pref-feeds.php:220
+#: modules/pref-feeds.php:215
 msgid "Not linked"
 msgstr "Non lié"
 
-#: modules/pref-feeds.php:254
+#: modules/pref-feeds.php:249
 msgid "Article purging:"
 msgstr "Purge des articles&nbsp;:"
 
-#: modules/pref-feeds.php:267
+#: modules/pref-feeds.php:262
 #, fuzzy
 msgid "Update using:"
 msgstr "Mettre à jour"
 
-#: modules/pref-feeds.php:300
+#: modules/pref-feeds.php:295
 msgid "Hide from \"Other Feeds\""
 msgstr "Masquer dans «&nbsp;Autres flux&nbsp;»"
 
-#: modules/pref-feeds.php:311
+#: modules/pref-feeds.php:306
 msgid "Right-to-left content"
 msgstr "Contenu écrit de droite à gauche"
 
-#: modules/pref-feeds.php:322
+#: modules/pref-feeds.php:317
 msgid "Hide from my feed list"
 msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
 
-#: modules/pref-feeds.php:334
+#: modules/pref-feeds.php:329
 msgid "Include in e-mail digest"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: modules/pref-feeds.php:355
+#: modules/pref-feeds.php:350
 msgid "Cache images locally"
 msgstr "Enregistrer localement les images"
 
-#: modules/pref-feeds.php:515 modules/pref-feeds.php:562
+#: modules/pref-feeds.php:514 modules/pref-feeds.php:561
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:593
+#: modules/pref-feeds.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Inscrit à <b>%s</b>."
 
-#: modules/pref-feeds.php:595
+#: modules/pref-feeds.php:594
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Déjà inscrit à <b>%s</b>."
 
-#: modules/pref-feeds.php:677
+#: modules/pref-feeds.php:676
 msgid "Category editor"
 msgstr "Éditeur de catégorie"
 
-#: modules/pref-feeds.php:700
+#: modules/pref-feeds.php:699
 #, 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:728
+#: modules/pref-feeds.php:727
 msgid "Unable to delete non empty feed categories."
 msgstr "Impossible de supprimer une catégorie de flux non vide."
 
-#: modules/pref-feeds.php:745
+#: modules/pref-feeds.php:744
 msgid "Create category"
 msgstr "Créer la catégorie"
 
-#: modules/pref-feeds.php:805
+#: modules/pref-feeds.php:804
 msgid "No feed categories defined."
 msgstr "Aucune catégorie de flux définie."
 
-#: modules/pref-feeds.php:816 modules/pref-filters.php:381
-#: modules/pref-labels.php:299 modules/pref-users.php:320
+#: modules/pref-feeds.php:815 modules/pref-filters.php:398
+#: modules/pref-labels.php:324 modules/pref-users.php:359
 msgid "Remove"
 msgstr "Supprimer"
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:837
 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:871
+#: modules/pref-feeds.php:864
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:945
+#: modules/pref-feeds.php:938
 msgid "Show last article times"
 msgstr "Afficher l'heure du dernier article"
 
-#: modules/pref-feeds.php:962 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:955 modules/pref-feeds.php:1017
 msgid "Last&nbsp;Article"
 msgstr "Dernier&nbsp;article"
 
-#: modules/pref-feeds.php:965 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:958 modules/pref-feeds.php:1021
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: modules/pref-feeds.php:1095 modules/pref-feeds.php:1109
+#: modules/pref-feeds.php:1042 modules/pref-filters.php:372
+#: modules/pref-labels.php:304 modules/pref-users.php:334
+msgid "Click to edit"
+msgstr ""
+
+#: modules/pref-feeds.php:1088 modules/pref-feeds.php:1102
 msgid "Selection:"
 msgstr "Sélection&nbsp;:"
 
-#: modules/pref-feeds.php:1101
+#: modules/pref-feeds.php:1094
 msgid "Recategorize"
 msgstr "Changer de catégorie"
 
-#: modules/pref-feeds.php:1110 modules/pref-filters.php:379
-#: modules/pref-labels.php:297 modules/pref-users.php:318
+#: modules/pref-feeds.php:1103 modules/pref-filters.php:396
+#: modules/pref-labels.php:322 modules/pref-users.php:357
 msgid "Edit"
 msgstr "Modifier"
 
-#: modules/pref-feeds.php:1111
+#: modules/pref-feeds.php:1104
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: modules/pref-feeds.php:1112
+#: modules/pref-feeds.php:1105
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: modules/pref-feeds.php:1113 modules/pref-filters.php:236
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:252
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Articles mémorisés"
 
-#: modules/pref-feeds.php:1114
+#: modules/pref-feeds.php:1107
 msgid "Unsubscribe"
 msgstr "Se désinscrire"
 
-#: modules/pref-feeds.php:1119
+#: modules/pref-feeds.php:1112
 msgid "Other:"
 msgstr "Autre&nbsp;:"
 
-#: modules/pref-feeds.php:1120
+#: modules/pref-feeds.php:1113
 msgid "Edit categories"
 msgstr "Modifier les catégories"
 
-#: modules/pref-feeds.php:1147
+#: modules/pref-feeds.php:1120
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1151
+#: modules/pref-feeds.php:1124
 msgid "File:"
 msgstr "Fichier&nbsp;:"
 
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1127
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1161
+#: modules/pref-feeds.php:1134
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: modules/pref-feeds.php:1164
+#: modules/pref-feeds.php:1137
 msgid "Firefox Integration"
 msgstr "Intégration à Firefox"
 
-#: modules/pref-feeds.php:1166
+#: modules/pref-feeds.php:1139
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1847,11 +1853,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:1170
+#: modules/pref-feeds.php:1143
 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:1179
+#: modules/pref-feeds.php:1152
 #, fuzzy
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
@@ -1860,7 +1866,7 @@ msgstr ""
 "Les articles publiés sont exportés comme un flux RSS public et toute "
 "personne qui connaît l'adresse indiquée ci-dessous peut s'y inscrire."
 
-#: modules/pref-feeds.php:1186
+#: modules/pref-feeds.php:1159
 #, fuzzy
 msgid "Generate another link"
 msgstr "Générer une autre adresse"
@@ -1869,79 +1875,101 @@ msgstr "Générer une autre adresse"
 msgid "Filter editor"
 msgstr "Éditeur de filtre"
 
-#: modules/pref-filters.php:94
+#: modules/pref-filters.php:92
 msgid "Enabled"
 msgstr "Activé"
 
-#: modules/pref-filters.php:154
+#: modules/pref-filters.php:152
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr "Filtre <b>%s</b> enregistré"
 
-#: modules/pref-filters.php:194
+#: modules/pref-filters.php:192
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filtre <b>%s</b> créé"
 
-#: modules/pref-filters.php:290
+#: modules/pref-filters.php:318
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:291
+#: modules/pref-filters.php:319
 msgid "action_description"
 msgstr ""
 
-#: modules/pref-filters.php:300
+#: modules/pref-filters.php:328
 msgid "Filter expression"
 msgstr "Expression du filtre"
 
-#: modules/pref-filters.php:302
+#: modules/pref-filters.php:330
 msgid "Match"
 msgstr "Correspondance"
 
-#: modules/pref-filters.php:303
+#: modules/pref-filters.php:331
 msgid "Action"
 msgstr "Action"
 
-#: modules/pref-filters.php:304
+#: modules/pref-filters.php:332
 #, fuzzy
 msgid "Params"
 msgstr "Paramètres&nbsp;:"
 
-#: modules/pref-filters.php:333
+#: modules/pref-filters.php:361
 msgid "(Disabled)"
 msgstr "(Désactivé)"
 
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:380
 msgid "(Inverse)"
 msgstr "(Inverse)"
 
-#: modules/pref-filters.php:371 modules/pref-filters.php:392
+#: modules/pref-filters.php:406
 msgid "No filters defined."
 msgstr "Aucun filtre défini."
 
-#: modules/pref-labels.php:169
+#: modules/pref-filters.php:408
+#, fuzzy
+msgid "No matching filters found."
+msgstr "Aucun article trouvé."
+
+#: modules/pref-labels.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.php:173
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr "Intitulé <b>%s</b> enregistré"
 
-#: modules/pref-labels.php:199
+#: modules/pref-labels.php:205
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Intitulé <b>%s</b> créé"
 
-#: modules/pref-labels.php:246
+#: modules/pref-labels.php:276
 msgid "Caption"
 msgstr "Descriptif"
 
-#: modules/pref-labels.php:247
+#: modules/pref-labels.php:277
 msgid "SQL Expression"
 msgstr "Expression SQL"
 
-#: modules/pref-labels.php:289 modules/pref-labels.php:302
+#: modules/pref-labels.php:302
+#, fuzzy
+msgid "[No caption]"
+msgstr "Descriptif"
+
+#: modules/pref-labels.php:329
 msgid "No labels defined."
 msgstr "Aucun intitulé défini."
 
+#: modules/pref-labels.php:331
+#, fuzzy
+msgid "No matching labels found."
+msgstr "Aucun article trouvé."
+
 #: modules/pref-prefs.php:60
 msgid "Password has been changed."
 msgstr "Le mot de passe a été modifié."
@@ -1962,7 +1990,7 @@ msgstr "L'adresse électronique a été modifiée."
 msgid "The configuration was reset to defaults."
 msgstr "La configuration a été réinitialisée à ses valeurs par défaut."
 
-#: modules/pref-prefs.php:154 modules/pref-prefs.php:320
+#: modules/pref-prefs.php:154 modules/pref-prefs.php:328
 msgid "Change theme"
 msgstr "Modifier le thème"
 
@@ -1982,104 +2010,109 @@ msgstr "Données personnelles"
 msgid "E-mail"
 msgstr "Adresse électronique"
 
-#: modules/pref-prefs.php:238
+#: modules/pref-prefs.php:240
 #, fuzzy
 msgid "Access level"
 msgstr "Permissions&nbsp;:"
 
-#: modules/pref-prefs.php:251
+#: modules/pref-prefs.php:253
 msgid "Change e-mail"
 msgstr "Modifier l'adresse électronique"
 
-#: modules/pref-prefs.php:257
+#: modules/pref-prefs.php:259
 msgid "Authentication"
 msgstr "Identification"
 
-#: modules/pref-prefs.php:259
+#: modules/pref-prefs.php:261
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: modules/pref-prefs.php:264
+#: modules/pref-prefs.php:268
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: modules/pref-prefs.php:270
+#: modules/pref-prefs.php:276
 msgid "Confirm password"
 msgstr "Confirmation du mot de passe"
 
-#: modules/pref-prefs.php:285
+#: modules/pref-prefs.php:293
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: modules/pref-prefs.php:301
+#: modules/pref-prefs.php:309
 msgid "Themes"
 msgstr "Thèmes"
 
-#: modules/pref-prefs.php:302
+#: modules/pref-prefs.php:310
 msgid "Select theme"
 msgstr "Sélectionner un thème"
 
-#: modules/pref-prefs.php:304
+#: modules/pref-prefs.php:312
 msgid "Default"
 msgstr "Utiliser la valeur par défaut"
 
-#: modules/pref-prefs.php:377
+#: modules/pref-prefs.php:385
 msgid "short_desc"
 msgstr ""
 
-#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
+#: modules/pref-prefs.php:397 modules/pref-prefs.php:402
 msgid "Yes"
 msgstr "Oui"
 
-#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
+#: modules/pref-prefs.php:399 modules/pref-prefs.php:402
 msgid "No"
 msgstr "Non"
 
-#: modules/pref-prefs.php:413
+#: modules/pref-prefs.php:424
 msgid "Save configuration"
 msgstr "Enregistrer la configuration"
 
-#: modules/pref-prefs.php:417
+#: modules/pref-prefs.php:428
 msgid "Reset to defaults"
 msgstr "Revenir aux valeurs par défaut"
 
-#: modules/pref-users.php:12
+#: modules/pref-users.php:7
+#, fuzzy
+msgid "Your access level is insufficient to open this tab."
+msgstr "Vous n'avez pas les permissions nécessaires pour exécuter ce script."
+
+#: modules/pref-users.php:17
 msgid "User editor"
 msgstr "Éditeur d'utilisateur"
 
-#: modules/pref-users.php:33
+#: modules/pref-users.php:38
 msgid "Change password:"
 msgstr "Modifier le mot de passe&nbsp;:"
 
-#: modules/pref-users.php:37
+#: modules/pref-users.php:42
 msgid "E-mail:"
 msgstr "Adresse électronique&nbsp;:"
 
-#: modules/pref-users.php:43
+#: modules/pref-users.php:48
 msgid "Access level:"
 msgstr "Permissions&nbsp;:"
 
-#: modules/pref-users.php:78
+#: modules/pref-users.php:83
 #, php-format
 msgid "Changed password of user <b>%s</b>."
 msgstr "Mot de passe de l'utilisateur <b>%s</b> modifié."
 
-#: modules/pref-users.php:126
+#: modules/pref-users.php:131
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "Utilisateur <b>%s</b> ajouté avec le mot de passe <b>%s</b>"
 
-#: modules/pref-users.php:133
+#: modules/pref-users.php:138
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Impossible de créer l'utilisateur <b>%s</b>"
 
-#: modules/pref-users.php:137
+#: modules/pref-users.php:142
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "L'utilisateur <b>%s</b> existe déjà."
 
-#: modules/pref-users.php:157
+#: modules/pref-users.php:162
 #, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
@@ -2088,35 +2121,49 @@ msgstr ""
 "Mot de passe de l'utilisateur <b>%s</b>\n"
 "\t\t\t\t\tmodifié en <b>%s</b>"
 
-#: modules/pref-users.php:161
+#: modules/pref-users.php:166
 #, fuzzy, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Ajout de la catégorie <b>%s</b>."
 
-#: modules/pref-users.php:196
+#: modules/pref-users.php:202
+msgid "[tt-rss] Password change notification"
+msgstr ""
+
+#: modules/pref-users.php:259
 msgid "Create user"
 msgstr "Créer l'utilisateur"
 
-#: modules/pref-users.php:218
+#: modules/pref-users.php:293
 msgid "Login"
 msgstr "Se connecter"
 
-#: modules/pref-users.php:219
+#: modules/pref-users.php:294
 msgid "Access Level"
 msgstr "Permissions"
 
-#: modules/pref-users.php:220
+#: modules/pref-users.php:296
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: modules/pref-users.php:316
+#: modules/pref-users.php:355
 msgid "User details"
 msgstr "Détails de l'utilisateur"
 
-#: modules/pref-users.php:322
+#: modules/pref-users.php:361
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
+#: modules/pref-users.php:366
+#, fuzzy
+msgid "No users defined."
+msgstr "Aucun filtre défini."
+
+#: modules/pref-users.php:368
+#, fuzzy
+msgid "No matching users found."
+msgstr "Aucun article trouvé."
+
 #, fuzzy
 #~ msgid "Update errors"
 #~ msgstr "Erreurs de mise à jour"
@@ -2141,6 +2188,3 @@ msgstr "Réinitialiser le mot de passe"
 
 #~ msgid "First page"
 #~ msgstr "Première page"
-
-#~ msgid "No articles found."
-#~ msgstr "Aucun article trouvé."
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 4f5831114..a77d7c9e3 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 449ad48d1..6c35a0f1d 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: 2008-05-16 13:35+0400\n"
+"POT-Creation-Date: 2008-05-18 15:43+0400\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"
@@ -97,23 +97,23 @@ msgstr ""
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
-#: backend.php:396
+#: backend.php:400 modules/pref-users.php:295
 msgid "Registered"
 msgstr "Regisztrált"
 
-#: backend.php:397
+#: backend.php:401
 msgid "Last logged in"
 msgstr "Utolsó belépés"
 
-#: backend.php:398
+#: backend.php:402
 msgid "Stored articles"
 msgstr "Tárolt hírek"
 
-#: backend.php:405
+#: backend.php:409
 msgid "Subscribed feeds count"
 msgstr ""
 
-#: backend.php:420
+#: backend.php:424
 msgid "Subscribed feeds"
 msgstr "Feliratkozott feedek"
 
@@ -171,34 +171,34 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2524 functions.php:2863 functions.php:3233 functions.php:4083
+#: functions.php:2524 functions.php:2863 functions.php:3233 functions.php:4085
 msgid "Starred articles"
 msgstr "Csillagost hírek"
 
-#: functions.php:2533 functions.php:2865 functions.php:3236 functions.php:4090
-#: modules/pref-feeds.php:1173
+#: functions.php:2533 functions.php:2865 functions.php:3236 functions.php:4092
+#: modules/pref-feeds.php:1146
 msgid "Published articles"
 msgstr "Publikált hírek"
 
-#: functions.php:2542 functions.php:2867 functions.php:3239 functions.php:4068
+#: functions.php:2542 functions.php:2867 functions.php:3239 functions.php:4070
 msgid "Fresh articles"
 msgstr "Olvasatlan hírek"
 
 #: functions.php:2785 modules/popup-dialog.php:151
-#: modules/pref-filters.php:312
+#: modules/pref-filters.php:340
 msgid "All feeds"
 msgstr "Minden feed"
 
-#: functions.php:2814 functions.php:2853 functions.php:3211 functions.php:4247
-#: functions.php:4277 modules/pref-feeds.php:984
+#: functions.php:2814 functions.php:2853 functions.php:3211 functions.php:4249
+#: functions.php:4279 modules/pref-feeds.php:977
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
-#: functions.php:2843 functions.php:3395
+#: functions.php:2843 functions.php:3397
 msgid "Special"
 msgstr "Speciális"
 
-#: functions.php:2845 functions.php:3397
+#: functions.php:2845 functions.php:3399
 msgid "Labels"
 msgstr "Címkék"
 
@@ -211,150 +211,150 @@ msgstr "Keresési találatok"
 msgid "Searched for"
 msgstr ""
 
-#: functions.php:3859 functions.php:3908 functions.php:5107
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:946
-#: modules/pref-filters.php:264 modules/pref-labels.php:239
-#: modules/pref-users.php:211
+#: functions.php:3861 functions.php:3910 functions.php:5132
+#: modules/pref-feeds.php:758 modules/pref-feeds.php:939
+#: modules/pref-filters.php:292 modules/pref-labels.php:269
+#: modules/pref-users.php:286
 msgid "Select:"
 msgstr "Kiválaszt:"
 
-#: functions.php:3860 functions.php:3909 modules/pref-feeds.php:760
-#: modules/pref-feeds.php:947 modules/pref-filters.php:265
-#: modules/pref-labels.php:240 modules/pref-users.php:212
+#: functions.php:3862 functions.php:3911 modules/pref-feeds.php:759
+#: modules/pref-feeds.php:940 modules/pref-filters.php:293
+#: modules/pref-labels.php:270 modules/pref-users.php:287
 msgid "All"
 msgstr "Mind"
 
-#: functions.php:3861 functions.php:3866 functions.php:3910 functions.php:3913
+#: functions.php:3863 functions.php:3868 functions.php:3912 functions.php:3915
 #: tt-rss.php:193
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: functions.php:3862 functions.php:3911 modules/pref-feeds.php:761
-#: modules/pref-feeds.php:948 modules/pref-filters.php:266
-#: modules/pref-labels.php:241 modules/pref-users.php:213
+#: functions.php:3864 functions.php:3913 modules/pref-feeds.php:760
+#: modules/pref-feeds.php:941 modules/pref-filters.php:294
+#: modules/pref-labels.php:271 modules/pref-users.php:288
 msgid "None"
 msgstr "Egyiksem"
 
-#: functions.php:3864 tt-rss.php:146 modules/pref-feeds.php:1107
+#: functions.php:3866 tt-rss.php:146 modules/pref-feeds.php:1100
 msgid "Actions..."
 msgstr "Műveletek"
 
-#: functions.php:3865
+#: functions.php:3867
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Kiválaszt:"
 
-#: functions.php:3867 functions.php:3914 tt-rss.php:192
+#: functions.php:3869 functions.php:3916 tt-rss.php:192
 msgid "Starred"
 msgstr "Csillagoz"
 
-#: functions.php:3868
+#: functions.php:3870
 msgid "Published"
 msgstr "Publikál"
 
-#: functions.php:3870 functions.php:3916
+#: functions.php:3872 functions.php:3918
 msgid "Mark as read:"
 msgstr ""
 
-#: functions.php:3871
+#: functions.php:3873
 msgid "Selection"
 msgstr "Kiválasztottakat"
 
-#: functions.php:3885
+#: functions.php:3887
 msgid "Entire feed"
 msgstr "Összes feed"
 
-#: functions.php:3888 tt-rss.php:161
+#: functions.php:3890 tt-rss.php:161
 msgid "Other actions:"
 msgstr "Más művelet:"
 
-#: functions.php:3895 functions.php:3897
+#: functions.php:3897 functions.php:3899
 #, fuzzy
 msgid "Search to label"
 msgstr "Címke készítése"
 
-#: functions.php:3913
+#: functions.php:3915
 msgid "Toggle:"
 msgstr "Megjelöl:"
 
-#: functions.php:3917
+#: functions.php:3919
 msgid "Page"
 msgstr "Oldal"
 
-#: functions.php:3918 modules/pref-filters.php:301
+#: functions.php:3920 modules/pref-filters.php:329
 msgid "Feed"
 msgstr ""
 
-#: functions.php:3925
+#: functions.php:3927
 msgid "Convert to label"
 msgstr ""
 
-#: functions.php:3972
+#: functions.php:3974
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4056
+#: functions.php:4058
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4317
+#: functions.php:4319
 msgid "No feeds to display."
 msgstr ""
 
-#: functions.php:4334
+#: functions.php:4336
 msgid "Tags"
 msgstr ""
 
-#: functions.php:4559
+#: functions.php:4561
 msgid " - "
 msgstr ""
 
-#: functions.php:4614
+#: functions.php:4616
 msgid "no tags"
 msgstr ""
 
-#: functions.php:4645 functions.php:5066
+#: functions.php:4647 functions.php:5091
 msgid "Attachment:"
 msgstr "Csatolmány:"
 
-#: functions.php:4647 functions.php:5068
+#: functions.php:4649 functions.php:5093
 msgid "Attachments:"
 msgstr "Csatolmányok:"
 
-#: functions.php:4657 functions.php:5077
+#: functions.php:4659 functions.php:5102
 #, fuzzy
 msgid "unknown type"
 msgstr "Ismeretlen hiba"
 
-#: functions.php:4723 modules/pref-feed-browser.php:74
+#: functions.php:4732 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Feed nem található"
 
-#: functions.php:4790
+#: functions.php:4801
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4901
+#: functions.php:4912
 msgid "(Click to change)"
 msgstr ""
 
-#: functions.php:5036
+#: functions.php:5061
 msgid "Show article"
 msgstr ""
 
-#: functions.php:5174
+#: functions.php:5199
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
-#: functions.php:5177
+#: functions.php:5202
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Nincs megjeleníthető hír"
 
-#: functions.php:5180
+#: functions.php:5205
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír"
@@ -367,7 +367,7 @@ msgstr ""
 msgid "display tags"
 msgstr ""
 
-#: localized_js.php:37 prefs.php:135 tt-rss.php:75
+#: localized_js.php:37 prefs.php:141 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr "Töltés, kérem várjon..."
 
@@ -721,7 +721,7 @@ msgid "Rescoring articles..."
 msgstr "Tárolt hírek"
 
 #: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:959 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:952 modules/pref-feeds.php:1013
 msgid "Title"
 msgstr "Cím"
 
@@ -957,12 +957,12 @@ msgstr ""
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
-#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:279
-#: modules/pref-users.php:29
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:274
+#: modules/pref-users.php:34
 msgid "Login:"
 msgstr "Felhasználó:"
 
-#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:285
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:280
 msgid "Password:"
 msgstr "Jelszó:"
 
@@ -1032,51 +1032,51 @@ msgstr ""
 msgid "Return to preferences"
 msgstr "VIssza a beállításokhoz"
 
-#: prefs.php:89
+#: prefs.php:91
 msgid "Unknown Error"
 msgstr "Ismeretlen Hiba"
 
-#: prefs.php:95 tt-rss.php:114
+#: prefs.php:97 tt-rss.php:114
 msgid "Hello,"
 msgstr "Üdv,"
 
-#: prefs.php:97 prefs.php:107
+#: prefs.php:99 prefs.php:109
 msgid "Exit preferences"
 msgstr "Kilépés a beállításokból"
 
-#: prefs.php:99 tt-rss.php:124
+#: prefs.php:101 tt-rss.php:124
 msgid "Logout"
 msgstr "Kijelentkezés"
 
-#: prefs.php:113 tt-rss.php:116 tt-rss.php:148
+#: prefs.php:119 tt-rss.php:116 tt-rss.php:148
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: prefs.php:115
+#: prefs.php:121
 msgid "My Feeds"
 msgstr "Saját Feedek"
 
-#: prefs.php:118
+#: prefs.php:124
 msgid "Other Feeds"
 msgstr "Mások Feedjei"
 
-#: prefs.php:121
+#: prefs.php:127
 msgid "Published Articles"
 msgstr "Publikált Hírek"
 
-#: prefs.php:123
+#: prefs.php:129
 msgid "Content Filtering"
 msgstr "Tartalomszűrő"
 
-#: prefs.php:126
+#: prefs.php:132
 msgid "Label Editor"
 msgstr "Címke Szerkesztő"
 
-#: prefs.php:130
+#: prefs.php:136
 msgid "User Manager"
 msgstr "Felhasználók kezelése"
 
-#: prefs.php:138 tt-rss.php:78
+#: prefs.php:144 tt-rss.php:78
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -1169,7 +1169,8 @@ msgid "tag cloud"
 msgstr "tag felhő"
 
 #: tt-rss.php:147 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:853
+#: modules/pref-feeds.php:854 modules/pref-filters.php:235
+#: modules/pref-labels.php:233 modules/pref-users.php:242
 msgid "Search"
 msgstr "Keresés"
 
@@ -1312,7 +1313,7 @@ msgid "Help topic not found."
 msgstr ""
 
 #: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:463 modules/pref-feeds.php:810
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:809
 msgid "Close this window"
 msgstr ""
 
@@ -1376,28 +1377,28 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr ""
 
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:866
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:859
 msgid "Subscribe to feed"
 msgstr "Feliratkozás feedre"
 
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:166
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:161
 msgid "Feed URL:"
 msgstr "Feed URL:"
 
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:174
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:169
 msgid "Category:"
 msgstr "Kategória:"
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:115
-#: modules/pref-feeds.php:119
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:117
+#: modules/pref-feeds.php:114
 msgid "Subscribe"
 msgstr "Feliratkozás"
 
 #: modules/popup-dialog.php:114 modules/popup-dialog.php:199
 #: modules/popup-dialog.php:256 modules/popup-dialog.php:343
-#: modules/popup-dialog.php:439 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:367 modules/pref-filters.php:118
-#: modules/pref-users.php:58
+#: modules/popup-dialog.php:439 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:362 modules/pref-filters.php:116
+#: modules/pref-users.php:63
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -1421,7 +1422,7 @@ msgstr "Egyezés ezzel:"
 msgid "Title or content"
 msgstr "Cím vagy tartalom"
 
-#: modules/popup-dialog.php:208 modules/pref-labels.php:221
+#: modules/popup-dialog.php:208 modules/pref-labels.php:243
 msgid "Create label"
 msgstr "Címke készítése"
 
@@ -1445,41 +1446,41 @@ msgstr "Teszt"
 msgid "Create"
 msgstr "Készít"
 
-#: modules/popup-dialog.php:265 modules/pref-filters.php:229
+#: modules/popup-dialog.php:265 modules/pref-filters.php:245
 msgid "Create filter"
 msgstr "Szárő készítése"
 
 #: modules/popup-dialog.php:283 modules/popup-dialog.php:314
-#: modules/pref-filters.php:40 modules/pref-filters.php:72
+#: modules/pref-filters.php:38 modules/pref-filters.php:70
 #, fuzzy
 msgid "description"
 msgstr "Kiválasztottakat"
 
-#: modules/popup-dialog.php:288 modules/pref-filters.php:45
+#: modules/popup-dialog.php:288 modules/pref-filters.php:43
 msgid "Match:"
 msgstr "Egyezés"
 
-#: modules/popup-dialog.php:294 modules/pref-filters.php:51
+#: modules/popup-dialog.php:294 modules/pref-filters.php:49
 msgid "On field:"
 msgstr "Ebben a mezőben:"
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:56
+#: modules/popup-dialog.php:299 modules/pref-filters.php:54
 msgid "Feed:"
 msgstr "Feed:"
 
-#: modules/popup-dialog.php:305 modules/pref-filters.php:62
+#: modules/popup-dialog.php:305 modules/pref-filters.php:60
 msgid "Action:"
 msgstr "Művelet:"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:79
+#: modules/popup-dialog.php:321 modules/pref-filters.php:77
 msgid "Params:"
 msgstr "Paraméterek"
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:298
+#: modules/popup-dialog.php:325 modules/pref-feeds.php:293
 msgid "Options:"
 msgstr "Beállítások:"
 
-#: modules/popup-dialog.php:328 modules/pref-filters.php:103
+#: modules/popup-dialog.php:328 modules/pref-filters.php:101
 msgid "Inverse match"
 msgstr ""
 
@@ -1503,8 +1504,8 @@ msgstr "Tegek szerkesztése"
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:365
-#: modules/pref-filters.php:114 modules/pref-users.php:55
+#: modules/popup-dialog.php:435 modules/pref-feeds.php:360
+#: modules/pref-filters.php:112 modules/pref-users.php:60
 msgid "Save"
 msgstr "Mentés"
 
@@ -1528,35 +1529,35 @@ msgstr "Feed böngészése letilva az adminisztrátor által."
 msgid "Feed information:"
 msgstr "Feed információ:"
 
-#: modules/pref-feed-browser.php:38
+#: modules/pref-feed-browser.php:39
 #, fuzzy
 msgid "Site:"
 msgstr "Cím:"
 
-#: modules/pref-feed-browser.php:40
+#: modules/pref-feed-browser.php:41
 #, fuzzy
 msgid "Last updated:"
 msgstr "Frissítve"
 
-#: modules/pref-feed-browser.php:55
+#: modules/pref-feed-browser.php:56
 msgid "Last headlines:"
 msgstr ""
 
-#: modules/pref-feed-browser.php:84
+#: modules/pref-feed-browser.php:85
 msgid ""
 "This panel shows feeds subscribed by other users of this system, just in "
 "case you are interested in them too."
 msgstr ""
 
-#: modules/pref-feed-browser.php:101
+#: modules/pref-feed-browser.php:103
 msgid "Top"
 msgstr "Top"
 
-#: modules/pref-feed-browser.php:110
+#: modules/pref-feed-browser.php:112
 msgid "Show"
 msgstr "Mutasd"
 
-#: modules/pref-feed-browser.php:164 modules/pref-feeds.php:112
+#: modules/pref-feed-browser.php:166 modules/pref-feeds.php:107
 msgid "No feeds found to subscribe."
 msgstr "Nem található feed a feliratkozáshoz."
 
@@ -1572,190 +1573,195 @@ msgstr "Más feedek: Top 25"
 msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr "Mutasd a top 25 regisztrált feedet, népszerűség szerint:"
 
-#: modules/pref-feeds.php:146
+#: modules/pref-feeds.php:141
 msgid "Feed editor"
 msgstr "Feed editor"
 
-#: modules/pref-feeds.php:158
+#: modules/pref-feeds.php:153
 msgid "Title:"
 msgstr "Cím:"
 
-#: modules/pref-feeds.php:194
+#: modules/pref-feeds.php:189
 msgid "Update Interval:"
 msgstr "Frissítési intervallum:"
 
-#: modules/pref-feeds.php:203
+#: modules/pref-feeds.php:198
 msgid "Link to:"
 msgstr "Linkel ehhez:"
 
-#: modules/pref-feeds.php:220
+#: modules/pref-feeds.php:215
 msgid "Not linked"
 msgstr "Nem linkelt"
 
-#: modules/pref-feeds.php:254
+#: modules/pref-feeds.php:249
 msgid "Article purging:"
 msgstr ""
 
-#: modules/pref-feeds.php:267
+#: modules/pref-feeds.php:262
 #, fuzzy
 msgid "Update using:"
 msgstr "Frissítés"
 
-#: modules/pref-feeds.php:300
+#: modules/pref-feeds.php:295
 msgid "Hide from \"Other Feeds\""
 msgstr ""
 
-#: modules/pref-feeds.php:311
+#: modules/pref-feeds.php:306
 msgid "Right-to-left content"
 msgstr ""
 
-#: modules/pref-feeds.php:322
+#: modules/pref-feeds.php:317
 msgid "Hide from my feed list"
 msgstr ""
 
-#: modules/pref-feeds.php:334
+#: modules/pref-feeds.php:329
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: modules/pref-feeds.php:355
+#: modules/pref-feeds.php:350
 msgid "Cache images locally"
 msgstr "Képek helyi tárolása"
 
-#: modules/pref-feeds.php:515 modules/pref-feeds.php:562
+#: modules/pref-feeds.php:514 modules/pref-feeds.php:561
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:593
+#: modules/pref-feeds.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:595
+#: modules/pref-feeds.php:594
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:677
+#: modules/pref-feeds.php:676
 msgid "Category editor"
 msgstr ""
 
-#: modules/pref-feeds.php:700
+#: modules/pref-feeds.php:699
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr ""
 
-#: modules/pref-feeds.php:728
+#: modules/pref-feeds.php:727
 msgid "Unable to delete non empty feed categories."
 msgstr ""
 
-#: modules/pref-feeds.php:745
+#: modules/pref-feeds.php:744
 msgid "Create category"
 msgstr "Kategória létrehozása"
 
-#: modules/pref-feeds.php:805
+#: modules/pref-feeds.php:804
 msgid "No feed categories defined."
 msgstr "Nincs feed kategória definiálva"
 
-#: modules/pref-feeds.php:816 modules/pref-filters.php:381
-#: modules/pref-labels.php:299 modules/pref-users.php:320
+#: modules/pref-feeds.php:815 modules/pref-filters.php:398
+#: modules/pref-labels.php:324 modules/pref-users.php:359
 msgid "Remove"
 msgstr "Eltávolít"
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:837
 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:871
+#: modules/pref-feeds.php:864
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:945
+#: modules/pref-feeds.php:938
 msgid "Show last article times"
 msgstr "Mutasd az utolsó hír időpontját"
 
-#: modules/pref-feeds.php:962 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:955 modules/pref-feeds.php:1017
 msgid "Last&nbsp;Article"
 msgstr "Utolsó&nbsp;Hír"
 
-#: modules/pref-feeds.php:965 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:958 modules/pref-feeds.php:1021
 msgid "Updated"
 msgstr "Frissítve"
 
-#: modules/pref-feeds.php:1095 modules/pref-feeds.php:1109
+#: modules/pref-feeds.php:1042 modules/pref-filters.php:372
+#: modules/pref-labels.php:304 modules/pref-users.php:334
+msgid "Click to edit"
+msgstr ""
+
+#: modules/pref-feeds.php:1088 modules/pref-feeds.php:1102
 msgid "Selection:"
 msgstr "Kiválaszt:"
 
-#: modules/pref-feeds.php:1101
+#: modules/pref-feeds.php:1094
 msgid "Recategorize"
 msgstr "Újrakategorizál"
 
-#: modules/pref-feeds.php:1110 modules/pref-filters.php:379
-#: modules/pref-labels.php:297 modules/pref-users.php:318
+#: modules/pref-feeds.php:1103 modules/pref-filters.php:396
+#: modules/pref-labels.php:322 modules/pref-users.php:357
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: modules/pref-feeds.php:1111
+#: modules/pref-feeds.php:1104
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1112
+#: modules/pref-feeds.php:1105
 msgid "Clear feed data"
 msgstr "Feed adatok törlése"
 
-#: modules/pref-feeds.php:1113 modules/pref-filters.php:236
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:252
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Tárolt hírek"
 
-#: modules/pref-feeds.php:1114
+#: modules/pref-feeds.php:1107
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: modules/pref-feeds.php:1119
+#: modules/pref-feeds.php:1112
 msgid "Other:"
 msgstr "Más:"
 
-#: modules/pref-feeds.php:1120
+#: modules/pref-feeds.php:1113
 msgid "Edit categories"
 msgstr "Kategóriák szerkesztése"
 
-#: modules/pref-feeds.php:1147
+#: modules/pref-feeds.php:1120
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1151
+#: modules/pref-feeds.php:1124
 msgid "File:"
 msgstr "File:"
 
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1127
 msgid "Import"
 msgstr "Importálás"
 
-#: modules/pref-feeds.php:1161
+#: modules/pref-feeds.php:1134
 msgid "Export OPML"
 msgstr "Exportálás OPML-be"
 
-#: modules/pref-feeds.php:1164
+#: modules/pref-feeds.php:1137
 msgid "Firefox Integration"
 msgstr "Firefox integráció"
 
-#: modules/pref-feeds.php:1166
+#: modules/pref-feeds.php:1139
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1170
+#: modules/pref-feeds.php:1143
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1179
+#: modules/pref-feeds.php:1152
 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:1186
+#: modules/pref-feeds.php:1159
 #, fuzzy
 msgid "Generate another link"
 msgstr "Másik cím genrálása"
@@ -1764,79 +1770,101 @@ msgstr "Másik cím genrálása"
 msgid "Filter editor"
 msgstr "Szűrő módosítása"
 
-#: modules/pref-filters.php:94
+#: modules/pref-filters.php:92
 msgid "Enabled"
 msgstr "Engedélyez"
 
-#: modules/pref-filters.php:154
+#: modules/pref-filters.php:152
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:194
+#: modules/pref-filters.php:192
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:290
+#: modules/pref-filters.php:318
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:291
+#: modules/pref-filters.php:319
 msgid "action_description"
 msgstr ""
 
-#: modules/pref-filters.php:300
+#: modules/pref-filters.php:328
 msgid "Filter expression"
 msgstr ""
 
-#: modules/pref-filters.php:302
+#: modules/pref-filters.php:330
 msgid "Match"
 msgstr "Egyezés"
 
-#: modules/pref-filters.php:303
+#: modules/pref-filters.php:331
 msgid "Action"
 msgstr "Művelet"
 
-#: modules/pref-filters.php:304
+#: modules/pref-filters.php:332
 #, fuzzy
 msgid "Params"
 msgstr "Paraméterek"
 
-#: modules/pref-filters.php:333
+#: modules/pref-filters.php:361
 msgid "(Disabled)"
 msgstr "(Kikapcsolva)"
 
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:380
 msgid "(Inverse)"
 msgstr "(ellentét)"
 
-#: modules/pref-filters.php:371 modules/pref-filters.php:392
+#: modules/pref-filters.php:406
 msgid "No filters defined."
 msgstr "Nincs szűrő definiálva."
 
-#: modules/pref-labels.php:169
+#: modules/pref-filters.php:408
+#, fuzzy
+msgid "No matching filters found."
+msgstr "Nincs szűrő definiálva."
+
+#: modules/pref-labels.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.php:173
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr ""
 
-#: modules/pref-labels.php:199
+#: modules/pref-labels.php:205
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr ""
 
-#: modules/pref-labels.php:246
+#: modules/pref-labels.php:276
 msgid "Caption"
 msgstr "Aláírás"
 
-#: modules/pref-labels.php:247
+#: modules/pref-labels.php:277
 msgid "SQL Expression"
 msgstr ""
 
-#: modules/pref-labels.php:289 modules/pref-labels.php:302
+#: modules/pref-labels.php:302
+#, fuzzy
+msgid "[No caption]"
+msgstr "Aláírás"
+
+#: modules/pref-labels.php:329
 msgid "No labels defined."
 msgstr "Nincs címke definiálva."
 
+#: modules/pref-labels.php:331
+#, fuzzy
+msgid "No matching labels found."
+msgstr "Nincs címke definiálva."
+
 #: modules/pref-prefs.php:60
 msgid "Password has been changed."
 msgstr "A jelszó meg lett változtatva."
@@ -1857,7 +1885,7 @@ msgstr "E-mail megváltoztatva."
 msgid "The configuration was reset to defaults."
 msgstr "A konfiguráció visszaállítva az alapértelmezettre."
 
-#: modules/pref-prefs.php:154 modules/pref-prefs.php:320
+#: modules/pref-prefs.php:154 modules/pref-prefs.php:328
 msgid "Change theme"
 msgstr "Kinlzet megváltozatása"
 
@@ -1875,139 +1903,156 @@ msgstr "Személyes adatok"
 msgid "E-mail"
 msgstr "E-mail"
 
-#: modules/pref-prefs.php:238
+#: modules/pref-prefs.php:240
 #, fuzzy
 msgid "Access level"
 msgstr "Hozzáférési szint:"
 
-#: modules/pref-prefs.php:251
+#: modules/pref-prefs.php:253
 msgid "Change e-mail"
 msgstr "E-mail megváltoztatása"
 
-#: modules/pref-prefs.php:257
+#: modules/pref-prefs.php:259
 msgid "Authentication"
 msgstr "Azonosítás"
 
-#: modules/pref-prefs.php:259
+#: modules/pref-prefs.php:261
 msgid "Old password"
 msgstr "Régi jelszó"
 
-#: modules/pref-prefs.php:264
+#: modules/pref-prefs.php:268
 msgid "New password"
 msgstr "Új jelszó"
 
-#: modules/pref-prefs.php:270
+#: modules/pref-prefs.php:276
 msgid "Confirm password"
 msgstr "Jelszó jóváhagyása"
 
-#: modules/pref-prefs.php:285
+#: modules/pref-prefs.php:293
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: modules/pref-prefs.php:301
+#: modules/pref-prefs.php:309
 msgid "Themes"
 msgstr "Kinézetek"
 
-#: modules/pref-prefs.php:302
+#: modules/pref-prefs.php:310
 msgid "Select theme"
 msgstr "Kinézet választó"
 
-#: modules/pref-prefs.php:304
+#: modules/pref-prefs.php:312
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: modules/pref-prefs.php:377
+#: modules/pref-prefs.php:385
 msgid "short_desc"
 msgstr ""
 
-#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
+#: modules/pref-prefs.php:397 modules/pref-prefs.php:402
 msgid "Yes"
 msgstr "Igen"
 
-#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
+#: modules/pref-prefs.php:399 modules/pref-prefs.php:402
 msgid "No"
 msgstr "Nem"
 
-#: modules/pref-prefs.php:413
+#: modules/pref-prefs.php:424
 msgid "Save configuration"
 msgstr "Konfiguráció mentése"
 
-#: modules/pref-prefs.php:417
+#: modules/pref-prefs.php:428
 msgid "Reset to defaults"
 msgstr "Visszaállítás az alapértelmezettre"
 
-#: modules/pref-users.php:12
+#: modules/pref-users.php:7
+msgid "Your access level is insufficient to open this tab."
+msgstr ""
+
+#: modules/pref-users.php:17
 msgid "User editor"
 msgstr "Felhasználó szerkesztő"
 
-#: modules/pref-users.php:33
+#: modules/pref-users.php:38
 msgid "Change password:"
 msgstr "Jelszó megváltoztatása:"
 
-#: modules/pref-users.php:37
+#: modules/pref-users.php:42
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: modules/pref-users.php:43
+#: modules/pref-users.php:48
 msgid "Access level:"
 msgstr "Hozzáférési szint:"
 
-#: modules/pref-users.php:78
+#: modules/pref-users.php:83
 #, php-format
 msgid "Changed password of user <b>%s</b>."
 msgstr ""
 
-#: modules/pref-users.php:126
+#: modules/pref-users.php:131
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr ""
 
-#: modules/pref-users.php:133
+#: modules/pref-users.php:138
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr ""
 
-#: modules/pref-users.php:137
+#: modules/pref-users.php:142
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr ""
 
-#: modules/pref-users.php:157
+#: modules/pref-users.php:162
 #, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
 "\t\t\t\t\t to <b>%s</b>"
 msgstr ""
 
-#: modules/pref-users.php:161
+#: modules/pref-users.php:166
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr ""
 
-#: modules/pref-users.php:196
+#: modules/pref-users.php:202
+msgid "[tt-rss] Password change notification"
+msgstr ""
+
+#: modules/pref-users.php:259
 msgid "Create user"
 msgstr "Felhasználó létrehozása"
 
-#: modules/pref-users.php:218
+#: modules/pref-users.php:293
 msgid "Login"
 msgstr "Belépés"
 
-#: modules/pref-users.php:219
+#: modules/pref-users.php:294
 msgid "Access Level"
 msgstr "Hozzáférési szint"
 
-#: modules/pref-users.php:220
+#: modules/pref-users.php:296
 msgid "Last login"
 msgstr "Utolsó belépés"
 
-#: modules/pref-users.php:316
+#: modules/pref-users.php:355
 msgid "User details"
 msgstr "Részletek a felhasználórol "
 
-#: modules/pref-users.php:322
+#: modules/pref-users.php:361
 msgid "Reset password"
 msgstr "Jelszó reset"
 
+#: modules/pref-users.php:366
+#, fuzzy
+msgid "No users defined."
+msgstr "Nincs szűrő definiálva."
+
+#: modules/pref-users.php:368
+msgid "No matching users found."
+msgstr ""
+
 #, fuzzy
 #~ msgid "Update errors"
 #~ msgstr "Frissítési hiba"
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index ed81595be..ed7527e9f 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 a555d9d10..023b05491 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: 2008-05-16 13:35+0400\n"
+"POT-Creation-Date: 2008-05-18 15:43+0400\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
 "MIME-Version: 1.0\n"
@@ -94,23 +94,23 @@ msgstr "Superbruker"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: backend.php:396
+#: backend.php:400 modules/pref-users.php:295
 msgid "Registered"
 msgstr "Registrert"
 
-#: backend.php:397
+#: backend.php:401
 msgid "Last logged in"
 msgstr "Sist innlogget"
 
-#: backend.php:398
+#: backend.php:402
 msgid "Stored articles"
 msgstr "Lagrede artikler"
 
-#: backend.php:405
+#: backend.php:409
 msgid "Subscribed feeds count"
 msgstr "Antall nyhetsstrømmer som abonneres på"
 
-#: backend.php:420
+#: backend.php:424
 msgid "Subscribed feeds"
 msgstr "Nyhetsstrømmer som abonneres på"
 
@@ -175,34 +175,34 @@ msgstr ""
 "Din utgave av MySQL er i øyeblikket ikke støttet. Vennligst besøk den \n"
 "\t\toffisielle siden for mer informasjon."
 
-#: functions.php:2524 functions.php:2863 functions.php:3233 functions.php:4083
+#: functions.php:2524 functions.php:2863 functions.php:3233 functions.php:4085
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
-#: functions.php:2533 functions.php:2865 functions.php:3236 functions.php:4090
-#: modules/pref-feeds.php:1173
+#: functions.php:2533 functions.php:2865 functions.php:3236 functions.php:4092
+#: modules/pref-feeds.php:1146
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
-#: functions.php:2542 functions.php:2867 functions.php:3239 functions.php:4068
+#: functions.php:2542 functions.php:2867 functions.php:3239 functions.php:4070
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
 #: functions.php:2785 modules/popup-dialog.php:151
-#: modules/pref-filters.php:312
+#: modules/pref-filters.php:340
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: functions.php:2814 functions.php:2853 functions.php:3211 functions.php:4247
-#: functions.php:4277 modules/pref-feeds.php:984
+#: functions.php:2814 functions.php:2853 functions.php:3211 functions.php:4249
+#: functions.php:4279 modules/pref-feeds.php:977
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
-#: functions.php:2843 functions.php:3395
+#: functions.php:2843 functions.php:3397
 msgid "Special"
 msgstr "Snarveier"
 
-#: functions.php:2845 functions.php:3397
+#: functions.php:2845 functions.php:3399
 msgid "Labels"
 msgstr "Merkelapper"
 
@@ -215,125 +215,125 @@ msgstr "Søkeresultat"
 msgid "Searched for"
 msgstr "Søkte etter"
 
-#: functions.php:3859 functions.php:3908 functions.php:5107
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:946
-#: modules/pref-filters.php:264 modules/pref-labels.php:239
-#: modules/pref-users.php:211
+#: functions.php:3861 functions.php:3910 functions.php:5132
+#: modules/pref-feeds.php:758 modules/pref-feeds.php:939
+#: modules/pref-filters.php:292 modules/pref-labels.php:269
+#: modules/pref-users.php:286
 msgid "Select:"
 msgstr "Velg:"
 
-#: functions.php:3860 functions.php:3909 modules/pref-feeds.php:760
-#: modules/pref-feeds.php:947 modules/pref-filters.php:265
-#: modules/pref-labels.php:240 modules/pref-users.php:212
+#: functions.php:3862 functions.php:3911 modules/pref-feeds.php:759
+#: modules/pref-feeds.php:940 modules/pref-filters.php:293
+#: modules/pref-labels.php:270 modules/pref-users.php:287
 msgid "All"
 msgstr "Alle"
 
-#: functions.php:3861 functions.php:3866 functions.php:3910 functions.php:3913
+#: functions.php:3863 functions.php:3868 functions.php:3912 functions.php:3915
 #: tt-rss.php:193
 msgid "Unread"
 msgstr "Ulest"
 
-#: functions.php:3862 functions.php:3911 modules/pref-feeds.php:761
-#: modules/pref-feeds.php:948 modules/pref-filters.php:266
-#: modules/pref-labels.php:241 modules/pref-users.php:213
+#: functions.php:3864 functions.php:3913 modules/pref-feeds.php:760
+#: modules/pref-feeds.php:941 modules/pref-filters.php:294
+#: modules/pref-labels.php:271 modules/pref-users.php:288
 msgid "None"
 msgstr "Ingen"
 
-#: functions.php:3864 tt-rss.php:146 modules/pref-feeds.php:1107
+#: functions.php:3866 tt-rss.php:146 modules/pref-feeds.php:1100
 msgid "Actions..."
 msgstr "Handlinger..."
 
-#: functions.php:3865
+#: functions.php:3867
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Utvalg:"
 
-#: functions.php:3867 functions.php:3914 tt-rss.php:192
+#: functions.php:3869 functions.php:3916 tt-rss.php:192
 msgid "Starred"
 msgstr "Favoritter"
 
-#: functions.php:3868
+#: functions.php:3870
 msgid "Published"
 msgstr "Publisert"
 
-#: functions.php:3870 functions.php:3916
+#: functions.php:3872 functions.php:3918
 msgid "Mark as read:"
 msgstr "Marker som lest:"
 
-#: functions.php:3871
+#: functions.php:3873
 msgid "Selection"
 msgstr "Utvalg"
 
-#: functions.php:3885
+#: functions.php:3887
 msgid "Entire feed"
 msgstr "Hele nyhetsstrømmen"
 
-#: functions.php:3888 tt-rss.php:161
+#: functions.php:3890 tt-rss.php:161
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: functions.php:3895 functions.php:3897
+#: functions.php:3897 functions.php:3899
 #, fuzzy
 msgid "Search to label"
 msgstr "Konverter til merkelapp"
 
-#: functions.php:3913
+#: functions.php:3915
 msgid "Toggle:"
 msgstr "Vis:"
 
-#: functions.php:3917
+#: functions.php:3919
 msgid "Page"
 msgstr "Side"
 
-#: functions.php:3918 modules/pref-filters.php:301
+#: functions.php:3920 modules/pref-filters.php:329
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: functions.php:3925
+#: functions.php:3927
 msgid "Convert to label"
 msgstr "Konverter til merkelapp"
 
-#: functions.php:3972
+#: functions.php:3974
 msgid "Generated feed"
 msgstr "Generert nyhetsstrøm"
 
-#: functions.php:4056
+#: functions.php:4058
 msgid "Dashboard"
 msgstr "Skrivebord"
 
-#: functions.php:4317
+#: functions.php:4319
 msgid "No feeds to display."
 msgstr "Ingen nyhetstrømmer å vise"
 
-#: functions.php:4334
+#: functions.php:4336
 msgid "Tags"
 msgstr "Tagger"
 
-#: functions.php:4559
+#: functions.php:4561
 msgid " - "
 msgstr "-"
 
-#: functions.php:4614
+#: functions.php:4616
 msgid "no tags"
 msgstr "Ingen tagger"
 
-#: functions.php:4645 functions.php:5066
+#: functions.php:4647 functions.php:5091
 msgid "Attachment:"
 msgstr "Vedlegg:"
 
-#: functions.php:4647 functions.php:5068
+#: functions.php:4649 functions.php:5093
 msgid "Attachments:"
 msgstr "Vedlegg:"
 
-#: functions.php:4657 functions.php:5077
+#: functions.php:4659 functions.php:5102
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: functions.php:4723 modules/pref-feed-browser.php:74
+#: functions.php:4732 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: functions.php:4790
+#: functions.php:4801
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -341,23 +341,23 @@ msgstr ""
 "Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
 "merkelappsyntaksen eller lokal konfigurasjon."
 
-#: functions.php:4901
+#: functions.php:4912
 msgid "(Click to change)"
 msgstr ""
 
-#: functions.php:5036
+#: functions.php:5061
 msgid "Show article"
 msgstr "Vis artikkelen"
 
-#: functions.php:5174
+#: functions.php:5199
 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 
-#: functions.php:5177
+#: functions.php:5202
 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 
-#: functions.php:5180
+#: functions.php:5205
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
@@ -369,7 +369,7 @@ msgstr "Vis nyhetsstrømmer"
 msgid "display tags"
 msgstr "Vis tagger"
 
-#: localized_js.php:37 prefs.php:135 tt-rss.php:75
+#: localized_js.php:37 prefs.php:141 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr "laster, vennligst vent"
 
@@ -724,7 +724,7 @@ msgid "Rescoring articles..."
 msgstr "Lagrede artikler"
 
 #: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:959 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:952 modules/pref-feeds.php:1013
 msgid "Title"
 msgstr "Tittel"
 
@@ -983,12 +983,12 @@ msgstr "Slett uleste artikler"
 msgid "Show special feeds when hiding read feeds"
 msgstr "Vis snarveier selv om leste nyhetskanaler skjules"
 
-#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:279
-#: modules/pref-users.php:29
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:274
+#: modules/pref-users.php:34
 msgid "Login:"
 msgstr "Brukernavn:"
 
-#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:285
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:280
 msgid "Password:"
 msgstr "Passord:"
 
@@ -1065,51 +1065,51 @@ msgstr ""
 msgid "Return to preferences"
 msgstr "Returner til innstillinger"
 
-#: prefs.php:89
+#: prefs.php:91
 msgid "Unknown Error"
 msgstr "Ukjent feil"
 
-#: prefs.php:95 tt-rss.php:114
+#: prefs.php:97 tt-rss.php:114
 msgid "Hello,"
 msgstr "Hei, "
 
-#: prefs.php:97 prefs.php:107
+#: prefs.php:99 prefs.php:109
 msgid "Exit preferences"
 msgstr "Forlat innstillinger"
 
-#: prefs.php:99 tt-rss.php:124
+#: prefs.php:101 tt-rss.php:124
 msgid "Logout"
 msgstr "Logg ut"
 
-#: prefs.php:113 tt-rss.php:116 tt-rss.php:148
+#: prefs.php:119 tt-rss.php:116 tt-rss.php:148
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: prefs.php:115
+#: prefs.php:121
 msgid "My Feeds"
 msgstr "Mine nyhetsstrømmer"
 
-#: prefs.php:118
+#: prefs.php:124
 msgid "Other Feeds"
 msgstr "Andres nyhetsstrømmer"
 
-#: prefs.php:121
+#: prefs.php:127
 msgid "Published Articles"
 msgstr "Publiserte artikler"
 
-#: prefs.php:123
+#: prefs.php:129
 msgid "Content Filtering"
 msgstr "Innholdsfilter"
 
-#: prefs.php:126
+#: prefs.php:132
 msgid "Label Editor"
 msgstr "Merkelappredigerer"
 
-#: prefs.php:130
+#: prefs.php:136
 msgid "User Manager"
 msgstr "Brukeradministrering"
 
-#: prefs.php:138 tt-rss.php:78
+#: prefs.php:144 tt-rss.php:78
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -1224,7 +1224,8 @@ msgid "tag cloud"
 msgstr "Tag-sky"
 
 #: tt-rss.php:147 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:853
+#: modules/pref-feeds.php:854 modules/pref-filters.php:235
+#: modules/pref-labels.php:233 modules/pref-users.php:242
 msgid "Search"
 msgstr "Søk"
 
@@ -1370,7 +1371,7 @@ msgid "Help topic not found."
 msgstr "Hjelp-emne kunne ikke bli funnet"
 
 #: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:463 modules/pref-feeds.php:810
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:809
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
@@ -1444,28 +1445,28 @@ msgstr ""
 "sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
 "nyhetsstrømmen"
 
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:866
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:859
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:166
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:161
 msgid "Feed URL:"
 msgstr "Nyhetsstrømsadresse:"
 
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:174
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:169
 msgid "Category:"
 msgstr "Kategori:"
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:115
-#: modules/pref-feeds.php:119
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:117
+#: modules/pref-feeds.php:114
 msgid "Subscribe"
 msgstr "Abonner"
 
 #: modules/popup-dialog.php:114 modules/popup-dialog.php:199
 #: modules/popup-dialog.php:256 modules/popup-dialog.php:343
-#: modules/popup-dialog.php:439 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:367 modules/pref-filters.php:118
-#: modules/pref-users.php:58
+#: modules/popup-dialog.php:439 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:362 modules/pref-filters.php:116
+#: modules/pref-users.php:63
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1489,7 +1490,7 @@ msgstr "Matcher:"
 msgid "Title or content"
 msgstr "Tittel eller innhold"
 
-#: modules/popup-dialog.php:208 modules/pref-labels.php:221
+#: modules/popup-dialog.php:208 modules/pref-labels.php:243
 msgid "Create label"
 msgstr "Lag merkelapp"
 
@@ -1513,40 +1514,40 @@ msgstr "Test"
 msgid "Create"
 msgstr "Lag"
 
-#: modules/popup-dialog.php:265 modules/pref-filters.php:229
+#: modules/popup-dialog.php:265 modules/pref-filters.php:245
 msgid "Create filter"
 msgstr "Lag filter"
 
 #: modules/popup-dialog.php:283 modules/popup-dialog.php:314
-#: modules/pref-filters.php:40 modules/pref-filters.php:72
+#: modules/pref-filters.php:38 modules/pref-filters.php:70
 msgid "description"
 msgstr "beskrivelse"
 
-#: modules/popup-dialog.php:288 modules/pref-filters.php:45
+#: modules/popup-dialog.php:288 modules/pref-filters.php:43
 msgid "Match:"
 msgstr "Matcher:"
 
-#: modules/popup-dialog.php:294 modules/pref-filters.php:51
+#: modules/popup-dialog.php:294 modules/pref-filters.php:49
 msgid "On field:"
 msgstr "På felt:"
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:56
+#: modules/popup-dialog.php:299 modules/pref-filters.php:54
 msgid "Feed:"
 msgstr "Nyhetsstrøm:"
 
-#: modules/popup-dialog.php:305 modules/pref-filters.php:62
+#: modules/popup-dialog.php:305 modules/pref-filters.php:60
 msgid "Action:"
 msgstr "Handling:"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:79
+#: modules/popup-dialog.php:321 modules/pref-filters.php:77
 msgid "Params:"
 msgstr "Parametre:"
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:298
+#: modules/popup-dialog.php:325 modules/pref-feeds.php:293
 msgid "Options:"
 msgstr "Valg:"
 
-#: modules/popup-dialog.php:328 modules/pref-filters.php:103
+#: modules/popup-dialog.php:328 modules/pref-filters.php:101
 msgid "Inverse match"
 msgstr "Motsatt markering"
 
@@ -1570,8 +1571,8 @@ msgstr "Endre tagger"
 msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens tagger (separert med kommaer):"
 
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:365
-#: modules/pref-filters.php:114 modules/pref-users.php:55
+#: modules/popup-dialog.php:435 modules/pref-feeds.php:360
+#: modules/pref-filters.php:112 modules/pref-users.php:60
 msgid "Save"
 msgstr "Lagre"
 
@@ -1595,19 +1596,19 @@ msgstr "Nyhetsstrømsutforsker er administrativt avskrudd"
 msgid "Feed information:"
 msgstr "Nyhetsstrømsinformasjon:"
 
-#: modules/pref-feed-browser.php:38
+#: modules/pref-feed-browser.php:39
 msgid "Site:"
 msgstr "Side:"
 
-#: modules/pref-feed-browser.php:40
+#: modules/pref-feed-browser.php:41
 msgid "Last updated:"
 msgstr "Siste oppdatering:"
 
-#: modules/pref-feed-browser.php:55
+#: modules/pref-feed-browser.php:56
 msgid "Last headlines:"
 msgstr "Siste artikler:"
 
-#: modules/pref-feed-browser.php:84
+#: modules/pref-feed-browser.php:85
 msgid ""
 "This panel shows feeds subscribed by other users of this system, just in "
 "case you are interested in them too."
@@ -1615,15 +1616,15 @@ msgstr ""
 "Denne siden viser nyhetsstrømmer som andre brukere av systemet abonnerer på, "
 "i tilfelle du skulle være interessert i de også."
 
-#: modules/pref-feed-browser.php:101
+#: modules/pref-feed-browser.php:103
 msgid "Top"
 msgstr "Topp"
 
-#: modules/pref-feed-browser.php:110
+#: modules/pref-feed-browser.php:112
 msgid "Show"
 msgstr "Vis"
 
-#: modules/pref-feed-browser.php:164 modules/pref-feeds.php:112
+#: modules/pref-feed-browser.php:166 modules/pref-feeds.php:107
 msgid "No feeds found to subscribe."
 msgstr "Ingen nyhetsstrømmer ble funnet for å abonneres på"
 
@@ -1639,173 +1640,178 @@ msgstr "Andre nyhetsstrømmer: Topp 25"
 msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr "Viser topp 25 nyhetsstrømmer, sortert etter popularitet:"
 
-#: modules/pref-feeds.php:146
+#: modules/pref-feeds.php:141
 msgid "Feed editor"
 msgstr "Nyhetsstrømsredigerer"
 
-#: modules/pref-feeds.php:158
+#: modules/pref-feeds.php:153
 msgid "Title:"
 msgstr "Tittel:"
 
-#: modules/pref-feeds.php:194
+#: modules/pref-feeds.php:189
 msgid "Update Interval:"
 msgstr "Oppdateringsintervall:"
 
-#: modules/pref-feeds.php:203
+#: modules/pref-feeds.php:198
 msgid "Link to:"
 msgstr "Link til:"
 
-#: modules/pref-feeds.php:220
+#: modules/pref-feeds.php:215
 msgid "Not linked"
 msgstr "Ikke linket til"
 
-#: modules/pref-feeds.php:254
+#: modules/pref-feeds.php:249
 msgid "Article purging:"
 msgstr "Slett artikler:"
 
-#: modules/pref-feeds.php:267
+#: modules/pref-feeds.php:262
 msgid "Update using:"
 msgstr "Oppdater med:"
 
-#: modules/pref-feeds.php:300
+#: modules/pref-feeds.php:295
 msgid "Hide from \"Other Feeds\""
 msgstr "Skjul fra \"Andre nyhetsstrømmer\""
 
-#: modules/pref-feeds.php:311
+#: modules/pref-feeds.php:306
 msgid "Right-to-left content"
 msgstr "Innhold som vises fra høyre til venstre"
 
-#: modules/pref-feeds.php:322
+#: modules/pref-feeds.php:317
 msgid "Hide from my feed list"
 msgstr "Skjul fra min nyhetsstrømslisten"
 
-#: modules/pref-feeds.php:334
+#: modules/pref-feeds.php:329
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-postsammendraget"
 
-#: modules/pref-feeds.php:355
+#: modules/pref-feeds.php:350
 msgid "Cache images locally"
 msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: modules/pref-feeds.php:515 modules/pref-feeds.php:562
+#: modules/pref-feeds.php:514 modules/pref-feeds.php:561
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:593
+#: modules/pref-feeds.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonnerer på <b>%s</b>"
 
-#: modules/pref-feeds.php:595
+#: modules/pref-feeds.php:594
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:677
+#: modules/pref-feeds.php:676
 msgid "Category editor"
 msgstr "Kategoriredigerer"
 
-#: modules/pref-feeds.php:700
+#: modules/pref-feeds.php:699
 #, 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:728
+#: modules/pref-feeds.php:727
 msgid "Unable to delete non empty feed categories."
 msgstr "Kunne ikke slette kategorien, den var ikke tom"
 
-#: modules/pref-feeds.php:745
+#: modules/pref-feeds.php:744
 msgid "Create category"
 msgstr "Lag kategori"
 
-#: modules/pref-feeds.php:805
+#: modules/pref-feeds.php:804
 msgid "No feed categories defined."
 msgstr "Ingen kategorier ble markert"
 
-#: modules/pref-feeds.php:816 modules/pref-filters.php:381
-#: modules/pref-labels.php:299 modules/pref-users.php:320
+#: modules/pref-feeds.php:815 modules/pref-filters.php:398
+#: modules/pref-labels.php:324 modules/pref-users.php:359
 msgid "Remove"
 msgstr "Fjern"
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:837
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: modules/pref-feeds.php:871
+#: modules/pref-feeds.php:864
 msgid "Top 25"
 msgstr "Topp 25"
 
-#: modules/pref-feeds.php:945
+#: modules/pref-feeds.php:938
 msgid "Show last article times"
 msgstr "Vis tidspunktene for siste artikkel"
 
-#: modules/pref-feeds.php:962 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:955 modules/pref-feeds.php:1017
 msgid "Last&nbsp;Article"
 msgstr "Siste&nbsp;Artikkel"
 
-#: modules/pref-feeds.php:965 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:958 modules/pref-feeds.php:1021
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: modules/pref-feeds.php:1095 modules/pref-feeds.php:1109
+#: modules/pref-feeds.php:1042 modules/pref-filters.php:372
+#: modules/pref-labels.php:304 modules/pref-users.php:334
+msgid "Click to edit"
+msgstr ""
+
+#: modules/pref-feeds.php:1088 modules/pref-feeds.php:1102
 msgid "Selection:"
 msgstr "Utvalg:"
 
-#: modules/pref-feeds.php:1101
+#: modules/pref-feeds.php:1094
 msgid "Recategorize"
 msgstr "Rekategoriser"
 
-#: modules/pref-feeds.php:1110 modules/pref-filters.php:379
-#: modules/pref-labels.php:297 modules/pref-users.php:318
+#: modules/pref-feeds.php:1103 modules/pref-filters.php:396
+#: modules/pref-labels.php:322 modules/pref-users.php:357
 msgid "Edit"
 msgstr "Rediger"
 
-#: modules/pref-feeds.php:1111
+#: modules/pref-feeds.php:1104
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: modules/pref-feeds.php:1112
+#: modules/pref-feeds.php:1105
 msgid "Clear feed data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: modules/pref-feeds.php:1113 modules/pref-filters.php:236
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:252
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Lagrede artikler"
 
-#: modules/pref-feeds.php:1114
+#: modules/pref-feeds.php:1107
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
-#: modules/pref-feeds.php:1119
+#: modules/pref-feeds.php:1112
 msgid "Other:"
 msgstr "Andre:"
 
-#: modules/pref-feeds.php:1120
+#: modules/pref-feeds.php:1113
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: modules/pref-feeds.php:1147
+#: modules/pref-feeds.php:1120
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1151
+#: modules/pref-feeds.php:1124
 msgid "File:"
 msgstr "Fil:"
 
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1127
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1161
+#: modules/pref-feeds.php:1134
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: modules/pref-feeds.php:1164
+#: modules/pref-feeds.php:1137
 msgid "Firefox Integration"
 msgstr "Firefox integrering"
 
-#: modules/pref-feeds.php:1166
+#: modules/pref-feeds.php:1139
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1813,11 +1819,11 @@ msgstr ""
 "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
 "ved å trykke på lenken nedenfor."
 
-#: modules/pref-feeds.php:1170
+#: modules/pref-feeds.php:1143
 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:1179
+#: modules/pref-feeds.php:1152
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1825,7 +1831,7 @@ 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:1186
+#: modules/pref-feeds.php:1159
 msgid "Generate another link"
 msgstr "Genererer en ny adresse"
 
@@ -1833,79 +1839,101 @@ msgstr "Genererer en ny adresse"
 msgid "Filter editor"
 msgstr "Filterredigering"
 
-#: modules/pref-filters.php:94
+#: modules/pref-filters.php:92
 msgid "Enabled"
 msgstr "Tillatt"
 
-#: modules/pref-filters.php:154
+#: modules/pref-filters.php:152
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr "Lagret filter <b>%s</b>"
 
-#: modules/pref-filters.php:194
+#: modules/pref-filters.php:192
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Laget filter <b>%s</b>"
 
-#: modules/pref-filters.php:290
+#: modules/pref-filters.php:318
 msgid "filter_type_descr"
 msgstr "Beskrivelse av filtertype"
 
-#: modules/pref-filters.php:291
+#: modules/pref-filters.php:319
 msgid "action_description"
 msgstr "Handlingsbeskrivelse"
 
-#: modules/pref-filters.php:300
+#: modules/pref-filters.php:328
 msgid "Filter expression"
 msgstr "Filteruttrykk"
 
-#: modules/pref-filters.php:302
+#: modules/pref-filters.php:330
 msgid "Match"
 msgstr "Match"
 
-#: modules/pref-filters.php:303
+#: modules/pref-filters.php:331
 msgid "Action"
 msgstr "Handling"
 
-#: modules/pref-filters.php:304
+#: modules/pref-filters.php:332
 #, fuzzy
 msgid "Params"
 msgstr "Parametre:"
 
-#: modules/pref-filters.php:333
+#: modules/pref-filters.php:361
 msgid "(Disabled)"
 msgstr "(Avskrudd)"
 
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:380
 msgid "(Inverse)"
 msgstr "(Motsatt)"
 
-#: modules/pref-filters.php:371 modules/pref-filters.php:392
+#: modules/pref-filters.php:406
 msgid "No filters defined."
 msgstr "Ingen filtre er valgt"
 
-#: modules/pref-labels.php:169
+#: modules/pref-filters.php:408
+#, fuzzy
+msgid "No matching filters found."
+msgstr "Ingen filtre er valgt"
+
+#: modules/pref-labels.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.php:173
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr "Lagret merkelapp <b>%s</b>"
 
-#: modules/pref-labels.php:199
+#: modules/pref-labels.php:205
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Laget merkelappen <b>%s</b>"
 
-#: modules/pref-labels.php:246
+#: modules/pref-labels.php:276
 msgid "Caption"
 msgstr "Overskrift"
 
-#: modules/pref-labels.php:247
+#: modules/pref-labels.php:277
 msgid "SQL Expression"
 msgstr "SQL-uttrykk"
 
-#: modules/pref-labels.php:289 modules/pref-labels.php:302
+#: modules/pref-labels.php:302
+#, fuzzy
+msgid "[No caption]"
+msgstr "Overskrift"
+
+#: modules/pref-labels.php:329
 msgid "No labels defined."
 msgstr "Ingen merkelapper er valgt"
 
+#: modules/pref-labels.php:331
+#, fuzzy
+msgid "No matching labels found."
+msgstr "Ingen merkelapper er valgt"
+
 #: modules/pref-prefs.php:60
 msgid "Password has been changed."
 msgstr "Passord har blitt endret."
@@ -1926,7 +1954,7 @@ msgstr "E-post har blitt endret."
 msgid "The configuration was reset to defaults."
 msgstr "Konfigurasjonen er satt tilbake til standard"
 
-#: modules/pref-prefs.php:154 modules/pref-prefs.php:320
+#: modules/pref-prefs.php:154 modules/pref-prefs.php:328
 msgid "Change theme"
 msgstr "Endre utseende"
 
@@ -1946,103 +1974,108 @@ msgstr "Personlig informasjon"
 msgid "E-mail"
 msgstr "E-post"
 
-#: modules/pref-prefs.php:238
+#: modules/pref-prefs.php:240
 msgid "Access level"
 msgstr "Tilgangsnivå"
 
-#: modules/pref-prefs.php:251
+#: modules/pref-prefs.php:253
 msgid "Change e-mail"
 msgstr "Skift e-post"
 
-#: modules/pref-prefs.php:257
+#: modules/pref-prefs.php:259
 msgid "Authentication"
 msgstr "Autentifisering"
 
-#: modules/pref-prefs.php:259
+#: modules/pref-prefs.php:261
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: modules/pref-prefs.php:264
+#: modules/pref-prefs.php:268
 msgid "New password"
 msgstr "Nytt passord"
 
-#: modules/pref-prefs.php:270
+#: modules/pref-prefs.php:276
 msgid "Confirm password"
 msgstr "Bekreft passord"
 
-#: modules/pref-prefs.php:285
+#: modules/pref-prefs.php:293
 msgid "Change password"
 msgstr "Endre passord"
 
-#: modules/pref-prefs.php:301
+#: modules/pref-prefs.php:309
 msgid "Themes"
 msgstr "Utseender"
 
-#: modules/pref-prefs.php:302
+#: modules/pref-prefs.php:310
 msgid "Select theme"
 msgstr "Velg utseende"
 
-#: modules/pref-prefs.php:304
+#: modules/pref-prefs.php:312
 msgid "Default"
 msgstr "Standard"
 
-#: modules/pref-prefs.php:377
+#: modules/pref-prefs.php:385
 msgid "short_desc"
 msgstr "kort beskrivelse"
 
-#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
+#: modules/pref-prefs.php:397 modules/pref-prefs.php:402
 msgid "Yes"
 msgstr "Ja"
 
-#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
+#: modules/pref-prefs.php:399 modules/pref-prefs.php:402
 msgid "No"
 msgstr "Nei"
 
-#: modules/pref-prefs.php:413
+#: modules/pref-prefs.php:424
 msgid "Save configuration"
 msgstr "Lagre konfigurasjonen"
 
-#: modules/pref-prefs.php:417
+#: modules/pref-prefs.php:428
 msgid "Reset to defaults"
 msgstr "Tilbake til standard"
 
-#: modules/pref-users.php:12
+#: modules/pref-users.php:7
+#, fuzzy
+msgid "Your access level is insufficient to open this tab."
+msgstr "Adgangsnivået ditt er for lavt for å kjøre dette scriptet"
+
+#: modules/pref-users.php:17
 msgid "User editor"
 msgstr "Brukeradministrering"
 
-#: modules/pref-users.php:33
+#: modules/pref-users.php:38
 msgid "Change password:"
 msgstr "Bytt passord:"
 
-#: modules/pref-users.php:37
+#: modules/pref-users.php:42
 msgid "E-mail:"
 msgstr "E-post:"
 
-#: modules/pref-users.php:43
+#: modules/pref-users.php:48
 msgid "Access level:"
 msgstr "Tilgangsnivå:"
 
-#: modules/pref-users.php:78
+#: modules/pref-users.php:83
 #, php-format
 msgid "Changed password of user <b>%s</b>."
 msgstr "Byttet passord for bruker <b>%s</b>."
 
-#: modules/pref-users.php:126
+#: modules/pref-users.php:131
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "La til bruker <b>%s</b> med passordet <b>%s</b>"
 
-#: modules/pref-users.php:133
+#: modules/pref-users.php:138
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Kunne ikke lage brukeren <b>%s</b>"
 
-#: modules/pref-users.php:137
+#: modules/pref-users.php:142
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "Brukeren <b>%s</b> finnes allerede."
 
-#: modules/pref-users.php:157
+#: modules/pref-users.php:162
 #, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
@@ -2051,35 +2084,48 @@ msgstr ""
 "Byttet passord forbruker <b>%s</b>\n"
 "\t\t\t\t\t til <b>%s</b>"
 
-#: modules/pref-users.php:161
+#: modules/pref-users.php:166
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Gir beskjed til <b>%s</b>"
 
-#: modules/pref-users.php:196
+#: modules/pref-users.php:202
+msgid "[tt-rss] Password change notification"
+msgstr ""
+
+#: modules/pref-users.php:259
 msgid "Create user"
 msgstr "Lag bruker"
 
-#: modules/pref-users.php:218
+#: modules/pref-users.php:293
 msgid "Login"
 msgstr "Logg inn"
 
-#: modules/pref-users.php:219
+#: modules/pref-users.php:294
 msgid "Access Level"
 msgstr "Tilgangsnivå"
 
-#: modules/pref-users.php:220
+#: modules/pref-users.php:296
 msgid "Last login"
 msgstr "Siste innlogging"
 
-#: modules/pref-users.php:316
+#: modules/pref-users.php:355
 msgid "User details"
 msgstr "Brukerdetaljer"
 
-#: modules/pref-users.php:322
+#: modules/pref-users.php:361
 msgid "Reset password"
 msgstr "Nullstill passordet"
 
+#: modules/pref-users.php:366
+#, fuzzy
+msgid "No users defined."
+msgstr "Ingen filtre er valgt"
+
+#: modules/pref-users.php:368
+msgid "No matching users found."
+msgstr ""
+
 #~ msgid "Placeholder"
 #~ msgstr "Navneholder"
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index e15c7cc3e..9ce09c488 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 556f6a9d8..7d275952d 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: 2008-05-16 13:35+0400\n"
+"POT-Creation-Date: 2008-05-18 15:43+0400\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"
@@ -97,25 +97,25 @@ msgstr ""
 msgid "Administrator"
 msgstr "Administrador"
 
-#: backend.php:396
+#: backend.php:400 modules/pref-users.php:295
 msgid "Registered"
 msgstr ""
 
-#: backend.php:397
+#: backend.php:401
 #, fuzzy
 msgid "Last logged in"
 msgstr "Último Login"
 
-#: backend.php:398
+#: backend.php:402
 #, fuzzy
 msgid "Stored articles"
 msgstr "Favoritos"
 
-#: backend.php:405
+#: backend.php:409
 msgid "Subscribed feeds count"
 msgstr ""
 
-#: backend.php:420
+#: backend.php:424
 msgid "Subscribed feeds"
 msgstr ""
 
@@ -175,34 +175,34 @@ msgstr ""
 "Sua versão do MySQL não é atualmente suportada. Por favor acesse \n"
 "\t\to site oficial para mais informações."
 
-#: functions.php:2524 functions.php:2863 functions.php:3233 functions.php:4083
+#: functions.php:2524 functions.php:2863 functions.php:3233 functions.php:4085
 msgid "Starred articles"
 msgstr ""
 
-#: functions.php:2533 functions.php:2865 functions.php:3236 functions.php:4090
-#: modules/pref-feeds.php:1173
+#: functions.php:2533 functions.php:2865 functions.php:3236 functions.php:4092
+#: modules/pref-feeds.php:1146
 msgid "Published articles"
 msgstr ""
 
-#: functions.php:2542 functions.php:2867 functions.php:3239 functions.php:4068
+#: functions.php:2542 functions.php:2867 functions.php:3239 functions.php:4070
 msgid "Fresh articles"
 msgstr ""
 
 #: functions.php:2785 modules/popup-dialog.php:151
-#: modules/pref-filters.php:312
+#: modules/pref-filters.php:340
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: functions.php:2814 functions.php:2853 functions.php:3211 functions.php:4247
-#: functions.php:4277 modules/pref-feeds.php:984
+#: functions.php:2814 functions.php:2853 functions.php:3211 functions.php:4249
+#: functions.php:4279 modules/pref-feeds.php:977
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
-#: functions.php:2843 functions.php:3395
+#: functions.php:2843 functions.php:3397
 msgid "Special"
 msgstr "Especial"
 
-#: functions.php:2845 functions.php:3397
+#: functions.php:2845 functions.php:3399
 msgid "Labels"
 msgstr ""
 
@@ -215,151 +215,151 @@ msgstr ""
 msgid "Searched for"
 msgstr ""
 
-#: functions.php:3859 functions.php:3908 functions.php:5107
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:946
-#: modules/pref-filters.php:264 modules/pref-labels.php:239
-#: modules/pref-users.php:211
+#: functions.php:3861 functions.php:3910 functions.php:5132
+#: modules/pref-feeds.php:758 modules/pref-feeds.php:939
+#: modules/pref-filters.php:292 modules/pref-labels.php:269
+#: modules/pref-users.php:286
 msgid "Select:"
 msgstr "Selecione:"
 
-#: functions.php:3860 functions.php:3909 modules/pref-feeds.php:760
-#: modules/pref-feeds.php:947 modules/pref-filters.php:265
-#: modules/pref-labels.php:240 modules/pref-users.php:212
+#: functions.php:3862 functions.php:3911 modules/pref-feeds.php:759
+#: modules/pref-feeds.php:940 modules/pref-filters.php:293
+#: modules/pref-labels.php:270 modules/pref-users.php:287
 msgid "All"
 msgstr "Todos"
 
-#: functions.php:3861 functions.php:3866 functions.php:3910 functions.php:3913
+#: functions.php:3863 functions.php:3868 functions.php:3912 functions.php:3915
 #: tt-rss.php:193
 msgid "Unread"
 msgstr "Não Lido"
 
-#: functions.php:3862 functions.php:3911 modules/pref-feeds.php:761
-#: modules/pref-feeds.php:948 modules/pref-filters.php:266
-#: modules/pref-labels.php:241 modules/pref-users.php:213
+#: functions.php:3864 functions.php:3913 modules/pref-feeds.php:760
+#: modules/pref-feeds.php:941 modules/pref-filters.php:294
+#: modules/pref-labels.php:271 modules/pref-users.php:288
 msgid "None"
 msgstr "Nenhum"
 
-#: functions.php:3864 tt-rss.php:146 modules/pref-feeds.php:1107
+#: functions.php:3866 tt-rss.php:146 modules/pref-feeds.php:1100
 msgid "Actions..."
 msgstr "Ações..."
 
-#: functions.php:3865
+#: functions.php:3867
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Seleção"
 
-#: functions.php:3867 functions.php:3914 tt-rss.php:192
+#: functions.php:3869 functions.php:3916 tt-rss.php:192
 msgid "Starred"
 msgstr "Favoritos"
 
-#: functions.php:3868
+#: functions.php:3870
 msgid "Published"
 msgstr "Publicado"
 
-#: functions.php:3870 functions.php:3916
+#: functions.php:3872 functions.php:3918
 msgid "Mark as read:"
 msgstr "Marcar como lido:"
 
-#: functions.php:3871
+#: functions.php:3873
 msgid "Selection"
 msgstr "Seleção"
 
-#: functions.php:3885
+#: functions.php:3887
 msgid "Entire feed"
 msgstr ""
 
-#: functions.php:3888 tt-rss.php:161
+#: functions.php:3890 tt-rss.php:161
 msgid "Other actions:"
 msgstr "Outras ações:"
 
-#: functions.php:3895 functions.php:3897
+#: functions.php:3897 functions.php:3899
 msgid "Search to label"
 msgstr ""
 
-#: functions.php:3913
+#: functions.php:3915
 msgid "Toggle:"
 msgstr ""
 
-#: functions.php:3917
+#: functions.php:3919
 msgid "Page"
 msgstr "Página"
 
-#: functions.php:3918 modules/pref-filters.php:301
+#: functions.php:3920 modules/pref-filters.php:329
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3925
+#: functions.php:3927
 msgid "Convert to label"
 msgstr ""
 
-#: functions.php:3972
+#: functions.php:3974
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4056
+#: functions.php:4058
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4317
+#: functions.php:4319
 msgid "No feeds to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:4334
+#: functions.php:4336
 msgid "Tags"
 msgstr "Tags"
 
-#: functions.php:4559
+#: functions.php:4561
 #, fuzzy
 msgid " - "
 msgstr " - por "
 
-#: functions.php:4614
+#: functions.php:4616
 msgid "no tags"
 msgstr "sem tags"
 
-#: functions.php:4645 functions.php:5066
+#: functions.php:4647 functions.php:5091
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4647 functions.php:5068
+#: functions.php:4649 functions.php:5093
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5077
+#: functions.php:4659 functions.php:5102
 #, fuzzy
 msgid "unknown type"
 msgstr "Erro desconhecido"
 
-#: functions.php:4723 modules/pref-feed-browser.php:74
+#: functions.php:4732 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
-#: functions.php:4790
+#: functions.php:4801
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4901
+#: functions.php:4912
 msgid "(Click to change)"
 msgstr ""
 
-#: functions.php:5036
+#: functions.php:5061
 #, fuzzy
 msgid "Show article"
 msgstr "Favoritos"
 
-#: functions.php:5174
+#: functions.php:5199
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5177
+#: functions.php:5202
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5180
+#: functions.php:5205
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
@@ -372,7 +372,7 @@ msgstr ""
 msgid "display tags"
 msgstr ""
 
-#: localized_js.php:37 prefs.php:135 tt-rss.php:75
+#: localized_js.php:37 prefs.php:141 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr ""
 
@@ -728,7 +728,7 @@ msgid "Rescoring articles..."
 msgstr "Favoritos"
 
 #: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:959 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:952 modules/pref-feeds.php:1013
 msgid "Title"
 msgstr "Título"
 
@@ -964,12 +964,12 @@ msgstr ""
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
-#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:279
-#: modules/pref-users.php:29
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:274
+#: modules/pref-users.php:34
 msgid "Login:"
 msgstr "Login:"
 
-#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:285
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:280
 msgid "Password:"
 msgstr "Senha:"
 
@@ -1042,51 +1042,51 @@ msgstr ""
 msgid "Return to preferences"
 msgstr "Retornar às preferências"
 
-#: prefs.php:89
+#: prefs.php:91
 msgid "Unknown Error"
 msgstr "Erro desconhecido"
 
-#: prefs.php:95 tt-rss.php:114
+#: prefs.php:97 tt-rss.php:114
 msgid "Hello,"
 msgstr "Olá,"
 
-#: prefs.php:97 prefs.php:107
+#: prefs.php:99 prefs.php:109
 msgid "Exit preferences"
 msgstr "Sair das preferências"
 
-#: prefs.php:99 tt-rss.php:124
+#: prefs.php:101 tt-rss.php:124
 msgid "Logout"
 msgstr "Sair"
 
-#: prefs.php:113 tt-rss.php:116 tt-rss.php:148
+#: prefs.php:119 tt-rss.php:116 tt-rss.php:148
 msgid "Preferences"
 msgstr "Preferências"
 
-#: prefs.php:115
+#: prefs.php:121
 msgid "My Feeds"
 msgstr "Meus Feeds"
 
-#: prefs.php:118
+#: prefs.php:124
 msgid "Other Feeds"
 msgstr "Outros Feeds"
 
-#: prefs.php:121
+#: prefs.php:127
 msgid "Published Articles"
 msgstr ""
 
-#: prefs.php:123
+#: prefs.php:129
 msgid "Content Filtering"
 msgstr "Filtrando o conteúdo"
 
-#: prefs.php:126
+#: prefs.php:132
 msgid "Label Editor"
 msgstr ""
 
-#: prefs.php:130
+#: prefs.php:136
 msgid "User Manager"
 msgstr "Gerência de usuário"
 
-#: prefs.php:138 tt-rss.php:78
+#: prefs.php:144 tt-rss.php:78
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -1182,7 +1182,8 @@ msgid "tag cloud"
 msgstr "núvem de tags"
 
 #: tt-rss.php:147 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:853
+#: modules/pref-feeds.php:854 modules/pref-filters.php:235
+#: modules/pref-labels.php:233 modules/pref-users.php:242
 msgid "Search"
 msgstr ""
 
@@ -1326,7 +1327,7 @@ msgid "Help topic not found."
 msgstr "Tópico de ajuda não encontrado."
 
 #: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:463 modules/pref-feeds.php:810
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:809
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
@@ -1390,28 +1391,28 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr ""
 
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:866
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:859
 msgid "Subscribe to feed"
 msgstr ""
 
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:166
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:161
 msgid "Feed URL:"
 msgstr "Feed URL:"
 
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:174
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:169
 msgid "Category:"
 msgstr "Categoria:"
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:115
-#: modules/pref-feeds.php:119
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:117
+#: modules/pref-feeds.php:114
 msgid "Subscribe"
 msgstr ""
 
 #: modules/popup-dialog.php:114 modules/popup-dialog.php:199
 #: modules/popup-dialog.php:256 modules/popup-dialog.php:343
-#: modules/popup-dialog.php:439 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:367 modules/pref-filters.php:118
-#: modules/pref-users.php:58
+#: modules/popup-dialog.php:439 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:362 modules/pref-filters.php:116
+#: modules/pref-users.php:63
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1435,7 +1436,7 @@ msgstr ""
 msgid "Title or content"
 msgstr "Título ou conteúdo"
 
-#: modules/popup-dialog.php:208 modules/pref-labels.php:221
+#: modules/popup-dialog.php:208 modules/pref-labels.php:243
 msgid "Create label"
 msgstr ""
 
@@ -1460,40 +1461,40 @@ msgstr "Teste"
 msgid "Create"
 msgstr "Criar"
 
-#: modules/popup-dialog.php:265 modules/pref-filters.php:229
+#: modules/popup-dialog.php:265 modules/pref-filters.php:245
 msgid "Create filter"
 msgstr ""
 
 #: modules/popup-dialog.php:283 modules/popup-dialog.php:314
-#: modules/pref-filters.php:40 modules/pref-filters.php:72
+#: modules/pref-filters.php:38 modules/pref-filters.php:70
 msgid "description"
 msgstr "descrição"
 
-#: modules/popup-dialog.php:288 modules/pref-filters.php:45
+#: modules/popup-dialog.php:288 modules/pref-filters.php:43
 msgid "Match:"
 msgstr ""
 
-#: modules/popup-dialog.php:294 modules/pref-filters.php:51
+#: modules/popup-dialog.php:294 modules/pref-filters.php:49
 msgid "On field:"
 msgstr ""
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:56
+#: modules/popup-dialog.php:299 modules/pref-filters.php:54
 msgid "Feed:"
 msgstr "Feed:"
 
-#: modules/popup-dialog.php:305 modules/pref-filters.php:62
+#: modules/popup-dialog.php:305 modules/pref-filters.php:60
 msgid "Action:"
 msgstr "Ação:"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:79
+#: modules/popup-dialog.php:321 modules/pref-filters.php:77
 msgid "Params:"
 msgstr ""
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:298
+#: modules/popup-dialog.php:325 modules/pref-feeds.php:293
 msgid "Options:"
 msgstr "Opções:"
 
-#: modules/popup-dialog.php:328 modules/pref-filters.php:103
+#: modules/popup-dialog.php:328 modules/pref-filters.php:101
 msgid "Inverse match"
 msgstr ""
 
@@ -1517,8 +1518,8 @@ msgstr "Editar Tags"
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:365
-#: modules/pref-filters.php:114 modules/pref-users.php:55
+#: modules/popup-dialog.php:435 modules/pref-feeds.php:360
+#: modules/pref-filters.php:112 modules/pref-users.php:60
 msgid "Save"
 msgstr "Salvar"
 
@@ -1542,35 +1543,35 @@ msgstr ""
 msgid "Feed information:"
 msgstr "Informações do Feed:"
 
-#: modules/pref-feed-browser.php:38
+#: modules/pref-feed-browser.php:39
 #, fuzzy
 msgid "Site:"
 msgstr "Título"
 
-#: modules/pref-feed-browser.php:40
+#: modules/pref-feed-browser.php:41
 #, fuzzy
 msgid "Last updated:"
 msgstr "Atualizado"
 
-#: modules/pref-feed-browser.php:55
+#: modules/pref-feed-browser.php:56
 msgid "Last headlines:"
 msgstr ""
 
-#: modules/pref-feed-browser.php:84
+#: modules/pref-feed-browser.php:85
 msgid ""
 "This panel shows feeds subscribed by other users of this system, just in "
 "case you are interested in them too."
 msgstr ""
 
-#: modules/pref-feed-browser.php:101
+#: modules/pref-feed-browser.php:103
 msgid "Top"
 msgstr ""
 
-#: modules/pref-feed-browser.php:110
+#: modules/pref-feed-browser.php:112
 msgid "Show"
 msgstr ""
 
-#: modules/pref-feed-browser.php:164 modules/pref-feeds.php:112
+#: modules/pref-feed-browser.php:166 modules/pref-feeds.php:107
 msgid "No feeds found to subscribe."
 msgstr ""
 
@@ -1586,192 +1587,197 @@ msgstr ""
 msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr ""
 
-#: modules/pref-feeds.php:146
+#: modules/pref-feeds.php:141
 msgid "Feed editor"
 msgstr "Editor de Feed"
 
-#: modules/pref-feeds.php:158
+#: modules/pref-feeds.php:153
 msgid "Title:"
 msgstr "Título"
 
-#: modules/pref-feeds.php:194
+#: modules/pref-feeds.php:189
 msgid "Update Interval:"
 msgstr ""
 
-#: modules/pref-feeds.php:203
+#: modules/pref-feeds.php:198
 msgid "Link to:"
 msgstr ""
 
-#: modules/pref-feeds.php:220
+#: modules/pref-feeds.php:215
 msgid "Not linked"
 msgstr ""
 
-#: modules/pref-feeds.php:254
+#: modules/pref-feeds.php:249
 msgid "Article purging:"
 msgstr ""
 
-#: modules/pref-feeds.php:267
+#: modules/pref-feeds.php:262
 #, fuzzy
 msgid "Update using:"
 msgstr "Atualizar"
 
-#: modules/pref-feeds.php:300
+#: modules/pref-feeds.php:295
 msgid "Hide from \"Other Feeds\""
 msgstr ""
 
-#: modules/pref-feeds.php:311
+#: modules/pref-feeds.php:306
 msgid "Right-to-left content"
 msgstr ""
 
-#: modules/pref-feeds.php:322
+#: modules/pref-feeds.php:317
 msgid "Hide from my feed list"
 msgstr ""
 
-#: modules/pref-feeds.php:334
+#: modules/pref-feeds.php:329
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: modules/pref-feeds.php:355
+#: modules/pref-feeds.php:350
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:515 modules/pref-feeds.php:562
+#: modules/pref-feeds.php:514 modules/pref-feeds.php:561
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:593
+#: modules/pref-feeds.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:595
+#: modules/pref-feeds.php:594
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:677
+#: modules/pref-feeds.php:676
 msgid "Category editor"
 msgstr "Editor de Categoria"
 
-#: modules/pref-feeds.php:700
+#: modules/pref-feeds.php:699
 #, 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:728
+#: modules/pref-feeds.php:727
 msgid "Unable to delete non empty feed categories."
 msgstr ""
 
-#: modules/pref-feeds.php:745
+#: modules/pref-feeds.php:744
 msgid "Create category"
 msgstr "Criar categoria"
 
-#: modules/pref-feeds.php:805
+#: modules/pref-feeds.php:804
 msgid "No feed categories defined."
 msgstr ""
 
-#: modules/pref-feeds.php:816 modules/pref-filters.php:381
-#: modules/pref-labels.php:299 modules/pref-users.php:320
+#: modules/pref-feeds.php:815 modules/pref-filters.php:398
+#: modules/pref-labels.php:324 modules/pref-users.php:359
 msgid "Remove"
 msgstr "Remover"
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:837
 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
-#: modules/pref-feeds.php:871
+#: modules/pref-feeds.php:864
 msgid "Top 25"
 msgstr ""
 
-#: modules/pref-feeds.php:945
+#: modules/pref-feeds.php:938
 msgid "Show last article times"
 msgstr ""
 
-#: modules/pref-feeds.php:962 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:955 modules/pref-feeds.php:1017
 msgid "Last&nbsp;Article"
 msgstr ""
 
-#: modules/pref-feeds.php:965 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:958 modules/pref-feeds.php:1021
 msgid "Updated"
 msgstr "Atualizado"
 
-#: modules/pref-feeds.php:1095 modules/pref-feeds.php:1109
+#: modules/pref-feeds.php:1042 modules/pref-filters.php:372
+#: modules/pref-labels.php:304 modules/pref-users.php:334
+msgid "Click to edit"
+msgstr ""
+
+#: modules/pref-feeds.php:1088 modules/pref-feeds.php:1102
 #, fuzzy
 msgid "Selection:"
 msgstr "Seleção"
 
-#: modules/pref-feeds.php:1101
+#: modules/pref-feeds.php:1094
 msgid "Recategorize"
 msgstr ""
 
-#: modules/pref-feeds.php:1110 modules/pref-filters.php:379
-#: modules/pref-labels.php:297 modules/pref-users.php:318
+#: modules/pref-feeds.php:1103 modules/pref-filters.php:396
+#: modules/pref-labels.php:322 modules/pref-users.php:357
 msgid "Edit"
 msgstr "Editar"
 
-#: modules/pref-feeds.php:1111
+#: modules/pref-feeds.php:1104
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1112
+#: modules/pref-feeds.php:1105
 msgid "Clear feed data"
 msgstr ""
 
-#: modules/pref-feeds.php:1113 modules/pref-filters.php:236
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:252
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Favoritos"
 
-#: modules/pref-feeds.php:1114
+#: modules/pref-feeds.php:1107
 msgid "Unsubscribe"
 msgstr ""
 
-#: modules/pref-feeds.php:1119
+#: modules/pref-feeds.php:1112
 #, fuzzy
 msgid "Other:"
 msgstr "Onde:"
 
-#: modules/pref-feeds.php:1120
+#: modules/pref-feeds.php:1113
 msgid "Edit categories"
 msgstr "Editar categorias"
 
-#: modules/pref-feeds.php:1147
+#: modules/pref-feeds.php:1120
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1151
+#: modules/pref-feeds.php:1124
 msgid "File:"
 msgstr "Arquivo:"
 
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1127
 msgid "Import"
 msgstr "Importar"
 
-#: modules/pref-feeds.php:1161
+#: modules/pref-feeds.php:1134
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: modules/pref-feeds.php:1164
+#: modules/pref-feeds.php:1137
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1166
+#: modules/pref-feeds.php:1139
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1170
+#: modules/pref-feeds.php:1143
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1179
+#: modules/pref-feeds.php:1152
 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:1186
+#: modules/pref-feeds.php:1159
 #, fuzzy
 msgid "Generate another link"
 msgstr "Gerar um outro endereço"
@@ -1780,78 +1786,97 @@ msgstr "Gerar um outro endereço"
 msgid "Filter editor"
 msgstr ""
 
-#: modules/pref-filters.php:94
+#: modules/pref-filters.php:92
 msgid "Enabled"
 msgstr "Ativado"
 
-#: modules/pref-filters.php:154
+#: modules/pref-filters.php:152
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:194
+#: modules/pref-filters.php:192
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:290
+#: modules/pref-filters.php:318
 msgid "filter_type_descr"
 msgstr "filter_type_descr"
 
-#: modules/pref-filters.php:291
+#: modules/pref-filters.php:319
 msgid "action_description"
 msgstr "action_description"
 
-#: modules/pref-filters.php:300
+#: modules/pref-filters.php:328
 msgid "Filter expression"
 msgstr ""
 
-#: modules/pref-filters.php:302
+#: modules/pref-filters.php:330
 msgid "Match"
 msgstr ""
 
-#: modules/pref-filters.php:303
+#: modules/pref-filters.php:331
 msgid "Action"
 msgstr "Ação"
 
-#: modules/pref-filters.php:304
+#: modules/pref-filters.php:332
 msgid "Params"
 msgstr ""
 
-#: modules/pref-filters.php:333
+#: modules/pref-filters.php:361
 msgid "(Disabled)"
 msgstr "(Desativado)"
 
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:380
 msgid "(Inverse)"
 msgstr "(Inverso)"
 
-#: modules/pref-filters.php:371 modules/pref-filters.php:392
+#: modules/pref-filters.php:406
 msgid "No filters defined."
 msgstr ""
 
-#: modules/pref-labels.php:169
+#: modules/pref-filters.php:408
+msgid "No matching filters found."
+msgstr ""
+
+#: modules/pref-labels.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.php:173
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr ""
 
-#: modules/pref-labels.php:199
+#: modules/pref-labels.php:205
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr ""
 
-#: modules/pref-labels.php:246
+#: modules/pref-labels.php:276
 msgid "Caption"
 msgstr ""
 
-#: modules/pref-labels.php:247
+#: modules/pref-labels.php:277
 msgid "SQL Expression"
 msgstr "Expressão SQL"
 
-#: modules/pref-labels.php:289 modules/pref-labels.php:302
+#: modules/pref-labels.php:302
+msgid "[No caption]"
+msgstr ""
+
+#: modules/pref-labels.php:329
 msgid "No labels defined."
 msgstr ""
 
+#: modules/pref-labels.php:331
+msgid "No matching labels found."
+msgstr ""
+
 #: modules/pref-prefs.php:60
 msgid "Password has been changed."
 msgstr ""
@@ -1872,7 +1897,7 @@ msgstr "E-mail alterado."
 msgid "The configuration was reset to defaults."
 msgstr ""
 
-#: modules/pref-prefs.php:154 modules/pref-prefs.php:320
+#: modules/pref-prefs.php:154 modules/pref-prefs.php:328
 msgid "Change theme"
 msgstr "Mudar Tema"
 
@@ -1892,104 +1917,109 @@ msgstr ""
 msgid "E-mail"
 msgstr "E-mail"
 
-#: modules/pref-prefs.php:238
+#: modules/pref-prefs.php:240
 #, fuzzy
 msgid "Access level"
 msgstr "Nível de acesso:"
 
-#: modules/pref-prefs.php:251
+#: modules/pref-prefs.php:253
 msgid "Change e-mail"
 msgstr "Mudar E-mail"
 
-#: modules/pref-prefs.php:257
+#: modules/pref-prefs.php:259
 msgid "Authentication"
 msgstr ""
 
-#: modules/pref-prefs.php:259
+#: modules/pref-prefs.php:261
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: modules/pref-prefs.php:264
+#: modules/pref-prefs.php:268
 msgid "New password"
 msgstr "Senha nova"
 
-#: modules/pref-prefs.php:270
+#: modules/pref-prefs.php:276
 msgid "Confirm password"
 msgstr "Confirmar senha"
 
-#: modules/pref-prefs.php:285
+#: modules/pref-prefs.php:293
 msgid "Change password"
 msgstr "Mudar senha"
 
-#: modules/pref-prefs.php:301
+#: modules/pref-prefs.php:309
 msgid "Themes"
 msgstr "Temas"
 
-#: modules/pref-prefs.php:302
+#: modules/pref-prefs.php:310
 msgid "Select theme"
 msgstr "Selecionar o tema"
 
-#: modules/pref-prefs.php:304
+#: modules/pref-prefs.php:312
 msgid "Default"
 msgstr "Padrão"
 
-#: modules/pref-prefs.php:377
+#: modules/pref-prefs.php:385
 msgid "short_desc"
 msgstr "short_desc"
 
-#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
+#: modules/pref-prefs.php:397 modules/pref-prefs.php:402
 msgid "Yes"
 msgstr "Sim"
 
-#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
+#: modules/pref-prefs.php:399 modules/pref-prefs.php:402
 msgid "No"
 msgstr "Não"
 
-#: modules/pref-prefs.php:413
+#: modules/pref-prefs.php:424
 msgid "Save configuration"
 msgstr "Salvar configuração"
 
-#: modules/pref-prefs.php:417
+#: modules/pref-prefs.php:428
 msgid "Reset to defaults"
 msgstr ""
 
-#: modules/pref-users.php:12
+#: modules/pref-users.php:7
+#, fuzzy
+msgid "Your access level is insufficient to open this tab."
+msgstr "Seu nível de acesso é insuficiente para executar esse script."
+
+#: modules/pref-users.php:17
 msgid "User editor"
 msgstr "Editor de usuário"
 
-#: modules/pref-users.php:33
+#: modules/pref-users.php:38
 msgid "Change password:"
 msgstr "Mudar senha:"
 
-#: modules/pref-users.php:37
+#: modules/pref-users.php:42
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: modules/pref-users.php:43
+#: modules/pref-users.php:48
 msgid "Access level:"
 msgstr "Nível de acesso:"
 
-#: modules/pref-users.php:78
+#: modules/pref-users.php:83
 #, php-format
 msgid "Changed password of user <b>%s</b>."
 msgstr "Alterada a senha do usuário <b>%s</b>."
 
-#: modules/pref-users.php:126
+#: modules/pref-users.php:131
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "Adicionado usuário  <b>%s</b> com senha <b>%s</b>"
 
-#: modules/pref-users.php:133
+#: modules/pref-users.php:138
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Não pode criar o usuário <b>%s</b>"
 
-#: modules/pref-users.php:137
+#: modules/pref-users.php:142
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "O usuário <b>%s</b> já existe."
 
-#: modules/pref-users.php:157
+#: modules/pref-users.php:162
 #, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
@@ -1998,35 +2028,48 @@ msgstr ""
 "Alterada a senha do usuário <b>%s</b>\n"
 "\t\t\t\t\t para <b>%s</b>"
 
-#: modules/pref-users.php:161
+#: modules/pref-users.php:166
 #, fuzzy, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Adicionando a categoria <b>%s</b>."
 
-#: modules/pref-users.php:196
+#: modules/pref-users.php:202
+msgid "[tt-rss] Password change notification"
+msgstr ""
+
+#: modules/pref-users.php:259
 msgid "Create user"
 msgstr "Criar um usuário"
 
-#: modules/pref-users.php:218
+#: modules/pref-users.php:293
 msgid "Login"
 msgstr "Login"
 
-#: modules/pref-users.php:219
+#: modules/pref-users.php:294
 msgid "Access Level"
 msgstr "Nível de acesso"
 
-#: modules/pref-users.php:220
+#: modules/pref-users.php:296
 msgid "Last login"
 msgstr "Último Login"
 
-#: modules/pref-users.php:316
+#: modules/pref-users.php:355
 msgid "User details"
 msgstr "Detalhes do usuário"
 
-#: modules/pref-users.php:322
+#: modules/pref-users.php:361
 msgid "Reset password"
 msgstr ""
 
+#: modules/pref-users.php:366
+#, fuzzy
+msgid "No users defined."
+msgstr "Nenhum usuário foi selecionado."
+
+#: modules/pref-users.php:368
+msgid "No matching users found."
+msgstr ""
+
 #, fuzzy
 #~ msgid "Update errors"
 #~ msgstr "Atualizar"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index ffc94242a..0c7b72b00 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 140c73d7f..4b8222151 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: 2008-05-16 13:35+0400\n"
+"POT-Creation-Date: 2008-05-18 15:43+0400\n"
 "PO-Revision-Date: 2007-08-18 15:14+0400\n"
 "Last-Translator: Andrew Dolgov <cthulhoo@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -97,26 +97,26 @@ msgstr ""
 msgid "Administrator"
 msgstr "Администратор"
 
-#: backend.php:396
+#: backend.php:400 modules/pref-users.php:295
 msgid "Registered"
 msgstr ""
 
-#: backend.php:397
+#: backend.php:401
 #, fuzzy
 msgid "Last logged in"
 msgstr "Последний вход"
 
-#: backend.php:398
+#: backend.php:402
 #, fuzzy
 msgid "Stored articles"
 msgstr "Отмеченные"
 
-#: backend.php:405
+#: backend.php:409
 #, fuzzy
 msgid "Subscribed feeds count"
 msgstr "Подписаны каналы:"
 
-#: backend.php:420
+#: backend.php:424
 #, fuzzy
 msgid "Subscribed feeds"
 msgstr "Подписаны каналы:"
@@ -177,35 +177,35 @@ msgid ""
 "\t\tofficial site for more information."
 msgstr ""
 
-#: functions.php:2524 functions.php:2863 functions.php:3233 functions.php:4083
+#: functions.php:2524 functions.php:2863 functions.php:3233 functions.php:4085
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:2533 functions.php:2865 functions.php:3236 functions.php:4090
-#: modules/pref-feeds.php:1173
+#: functions.php:2533 functions.php:2865 functions.php:3236 functions.php:4092
+#: modules/pref-feeds.php:1146
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:2542 functions.php:2867 functions.php:3239 functions.php:4068
+#: functions.php:2542 functions.php:2867 functions.php:3239 functions.php:4070
 #, fuzzy
 msgid "Fresh articles"
 msgstr "Отмеченные"
 
 #: functions.php:2785 modules/popup-dialog.php:151
-#: modules/pref-filters.php:312
+#: modules/pref-filters.php:340
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2814 functions.php:2853 functions.php:3211 functions.php:4247
-#: functions.php:4277 modules/pref-feeds.php:984
+#: functions.php:2814 functions.php:2853 functions.php:3211 functions.php:4249
+#: functions.php:4279 modules/pref-feeds.php:977
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:2843 functions.php:3395
+#: functions.php:2843 functions.php:3397
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2845 functions.php:3397
+#: functions.php:2845 functions.php:3399
 msgid "Labels"
 msgstr "Метки"
 
@@ -218,153 +218,153 @@ msgstr "Результаты поиска"
 msgid "Searched for"
 msgstr "Поиск"
 
-#: functions.php:3859 functions.php:3908 functions.php:5107
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:946
-#: modules/pref-filters.php:264 modules/pref-labels.php:239
-#: modules/pref-users.php:211
+#: functions.php:3861 functions.php:3910 functions.php:5132
+#: modules/pref-feeds.php:758 modules/pref-feeds.php:939
+#: modules/pref-filters.php:292 modules/pref-labels.php:269
+#: modules/pref-users.php:286
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:3860 functions.php:3909 modules/pref-feeds.php:760
-#: modules/pref-feeds.php:947 modules/pref-filters.php:265
-#: modules/pref-labels.php:240 modules/pref-users.php:212
+#: functions.php:3862 functions.php:3911 modules/pref-feeds.php:759
+#: modules/pref-feeds.php:940 modules/pref-filters.php:293
+#: modules/pref-labels.php:270 modules/pref-users.php:287
 msgid "All"
 msgstr "Все"
 
-#: functions.php:3861 functions.php:3866 functions.php:3910 functions.php:3913
+#: functions.php:3863 functions.php:3868 functions.php:3912 functions.php:3915
 #: tt-rss.php:193
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3862 functions.php:3911 modules/pref-feeds.php:761
-#: modules/pref-feeds.php:948 modules/pref-filters.php:266
-#: modules/pref-labels.php:241 modules/pref-users.php:213
+#: functions.php:3864 functions.php:3913 modules/pref-feeds.php:760
+#: modules/pref-feeds.php:941 modules/pref-filters.php:294
+#: modules/pref-labels.php:271 modules/pref-users.php:288
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:3864 tt-rss.php:146 modules/pref-feeds.php:1107
+#: functions.php:3866 tt-rss.php:146 modules/pref-feeds.php:1100
 msgid "Actions..."
 msgstr "Действия..."
 
-#: functions.php:3865
+#: functions.php:3867
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Выбрать:"
 
-#: functions.php:3867 functions.php:3914 tt-rss.php:192
+#: functions.php:3869 functions.php:3916 tt-rss.php:192
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:3868
+#: functions.php:3870
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:3870 functions.php:3916
+#: functions.php:3872 functions.php:3918
 msgid "Mark as read:"
 msgstr "Пометить как прочит.:"
 
-#: functions.php:3871
+#: functions.php:3873
 #, fuzzy
 msgid "Selection"
 msgstr "Выбрать:"
 
-#: functions.php:3885
+#: functions.php:3887
 msgid "Entire feed"
 msgstr "Весь канал"
 
-#: functions.php:3888 tt-rss.php:161
+#: functions.php:3890 tt-rss.php:161
 msgid "Other actions:"
 msgstr "Другие действия:"
 
-#: functions.php:3895 functions.php:3897
+#: functions.php:3897 functions.php:3899
 #, fuzzy
 msgid "Search to label"
 msgstr "Превратить в метку"
 
-#: functions.php:3913
+#: functions.php:3915
 msgid "Toggle:"
 msgstr "Изменить:"
 
-#: functions.php:3917
+#: functions.php:3919
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:3918 modules/pref-filters.php:301
+#: functions.php:3920 modules/pref-filters.php:329
 msgid "Feed"
 msgstr "Канал"
 
-#: functions.php:3925
+#: functions.php:3927
 msgid "Convert to label"
 msgstr "Превратить в метку"
 
-#: functions.php:3972
+#: functions.php:3974
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4056
+#: functions.php:4058
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4317
+#: functions.php:4319
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:4334
+#: functions.php:4336
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4559
+#: functions.php:4561
 #, fuzzy
 msgid " - "
 msgstr ", автор - "
 
-#: functions.php:4614
+#: functions.php:4616
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:4645 functions.php:5066
+#: functions.php:4647 functions.php:5091
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4647 functions.php:5068
+#: functions.php:4649 functions.php:5093
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5077
+#: functions.php:4659 functions.php:5102
 #, fuzzy
 msgid "unknown type"
 msgstr "Неизвестная ошибка"
 
-#: functions.php:4723 modules/pref-feed-browser.php:74
+#: functions.php:4732 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:4790
+#: functions.php:4801
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4901
+#: functions.php:4912
 msgid "(Click to change)"
 msgstr ""
 
-#: functions.php:5036
+#: functions.php:5061
 #, fuzzy
 msgid "Show article"
 msgstr "Отмеченные"
 
-#: functions.php:5174
+#: functions.php:5199
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Статей не найдено."
 
-#: functions.php:5177
+#: functions.php:5202
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Статей не найдено."
 
-#: functions.php:5180
+#: functions.php:5205
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Статей не найдено."
@@ -377,7 +377,7 @@ msgstr "показать каналы"
 msgid "display tags"
 msgstr "показать теги"
 
-#: localized_js.php:37 prefs.php:135 tt-rss.php:75
+#: localized_js.php:37 prefs.php:141 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
@@ -741,7 +741,7 @@ msgid "Rescoring articles..."
 msgstr "Отмеченные"
 
 #: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:959 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:952 modules/pref-feeds.php:1013
 msgid "Title"
 msgstr "Заголовок"
 
@@ -979,12 +979,12 @@ msgstr "Отмеченные"
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
-#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:279
-#: modules/pref-users.php:29
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:274
+#: modules/pref-users.php:34
 msgid "Login:"
 msgstr "Пользователь:"
 
-#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:285
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:280
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -1057,51 +1057,51 @@ msgstr "Расширение DOMXML не найдено. Оно необходи
 msgid "Return to preferences"
 msgstr "Вернуться к настройкам"
 
-#: prefs.php:89
+#: prefs.php:91
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
-#: prefs.php:95 tt-rss.php:114
+#: prefs.php:97 tt-rss.php:114
 msgid "Hello,"
 msgstr "Привет,"
 
-#: prefs.php:97 prefs.php:107
+#: prefs.php:99 prefs.php:109
 msgid "Exit preferences"
 msgstr "Закрыть настройки"
 
-#: prefs.php:99 tt-rss.php:124
+#: prefs.php:101 tt-rss.php:124
 msgid "Logout"
 msgstr "Выход"
 
-#: prefs.php:113 tt-rss.php:116 tt-rss.php:148
+#: prefs.php:119 tt-rss.php:116 tt-rss.php:148
 msgid "Preferences"
 msgstr "Настройки"
 
-#: prefs.php:115
+#: prefs.php:121
 msgid "My Feeds"
 msgstr "Мои каналы"
 
-#: prefs.php:118
+#: prefs.php:124
 msgid "Other Feeds"
 msgstr "Другие каналы"
 
-#: prefs.php:121
+#: prefs.php:127
 msgid "Published Articles"
 msgstr "Опубликованные статьи"
 
-#: prefs.php:123
+#: prefs.php:129
 msgid "Content Filtering"
 msgstr "Фильтры"
 
-#: prefs.php:126
+#: prefs.php:132
 msgid "Label Editor"
 msgstr "Метки"
 
-#: prefs.php:130
+#: prefs.php:136
 msgid "User Manager"
 msgstr "Пользователи"
 
-#: prefs.php:138 tt-rss.php:78
+#: prefs.php:144 tt-rss.php:78
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -1195,7 +1195,8 @@ msgid "tag cloud"
 msgstr "облако тегов"
 
 #: tt-rss.php:147 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:853
+#: modules/pref-feeds.php:854 modules/pref-filters.php:235
+#: modules/pref-labels.php:233 modules/pref-users.php:242
 msgid "Search"
 msgstr "Поиск"
 
@@ -1340,7 +1341,7 @@ msgid "Help topic not found."
 msgstr "Раздел помощи не найден."
 
 #: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:463 modules/pref-feeds.php:810
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:809
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
@@ -1404,28 +1405,28 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr ""
 
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:866
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:859
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:166
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:161
 msgid "Feed URL:"
 msgstr "URL канала:"
 
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:174
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:169
 msgid "Category:"
 msgstr "Категория:"
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:115
-#: modules/pref-feeds.php:119
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:117
+#: modules/pref-feeds.php:114
 msgid "Subscribe"
 msgstr "Подписаться"
 
 #: modules/popup-dialog.php:114 modules/popup-dialog.php:199
 #: modules/popup-dialog.php:256 modules/popup-dialog.php:343
-#: modules/popup-dialog.php:439 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:367 modules/pref-filters.php:118
-#: modules/pref-users.php:58
+#: modules/popup-dialog.php:439 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:362 modules/pref-filters.php:116
+#: modules/pref-users.php:63
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -1449,7 +1450,7 @@ msgstr "Искать по:"
 msgid "Title or content"
 msgstr "Заголовок или содержимое"
 
-#: modules/popup-dialog.php:208 modules/pref-labels.php:221
+#: modules/popup-dialog.php:208 modules/pref-labels.php:243
 msgid "Create label"
 msgstr "Создать метку"
 
@@ -1473,40 +1474,40 @@ msgstr "Проверить"
 msgid "Create"
 msgstr "Создать"
 
-#: modules/popup-dialog.php:265 modules/pref-filters.php:229
+#: modules/popup-dialog.php:265 modules/pref-filters.php:245
 msgid "Create filter"
 msgstr "Создать фильтр"
 
 #: modules/popup-dialog.php:283 modules/popup-dialog.php:314
-#: modules/pref-filters.php:40 modules/pref-filters.php:72
+#: modules/pref-filters.php:38 modules/pref-filters.php:70
 msgid "description"
 msgstr "описание"
 
-#: modules/popup-dialog.php:288 modules/pref-filters.php:45
+#: modules/popup-dialog.php:288 modules/pref-filters.php:43
 msgid "Match:"
 msgstr "Поиск:"
 
-#: modules/popup-dialog.php:294 modules/pref-filters.php:51
+#: modules/popup-dialog.php:294 modules/pref-filters.php:49
 msgid "On field:"
 msgstr "По полю:"
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:56
+#: modules/popup-dialog.php:299 modules/pref-filters.php:54
 msgid "Feed:"
 msgstr "Канал:"
 
-#: modules/popup-dialog.php:305 modules/pref-filters.php:62
+#: modules/popup-dialog.php:305 modules/pref-filters.php:60
 msgid "Action:"
 msgstr "Действие:"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:79
+#: modules/popup-dialog.php:321 modules/pref-filters.php:77
 msgid "Params:"
 msgstr "Параметры:"
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:298
+#: modules/popup-dialog.php:325 modules/pref-feeds.php:293
 msgid "Options:"
 msgstr "Дополнительно:"
 
-#: modules/popup-dialog.php:328 modules/pref-filters.php:103
+#: modules/popup-dialog.php:328 modules/pref-filters.php:101
 msgid "Inverse match"
 msgstr "Инвертировать фильтр"
 
@@ -1530,8 +1531,8 @@ msgstr "Редактировать теги"
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:365
-#: modules/pref-filters.php:114 modules/pref-users.php:55
+#: modules/popup-dialog.php:435 modules/pref-feeds.php:360
+#: modules/pref-filters.php:112 modules/pref-users.php:60
 msgid "Save"
 msgstr "Сохранить"
 
@@ -1555,35 +1556,35 @@ msgstr "Другие каналы отключены администратор
 msgid "Feed information:"
 msgstr "Информация о канале:"
 
-#: modules/pref-feed-browser.php:38
+#: modules/pref-feed-browser.php:39
 #, fuzzy
 msgid "Site:"
 msgstr "Заголовок:"
 
-#: modules/pref-feed-browser.php:40
+#: modules/pref-feed-browser.php:41
 #, fuzzy
 msgid "Last updated:"
 msgstr "Обновлено"
 
-#: modules/pref-feed-browser.php:55
+#: modules/pref-feed-browser.php:56
 msgid "Last headlines:"
 msgstr "Последние заголовки:"
 
-#: modules/pref-feed-browser.php:84
+#: modules/pref-feed-browser.php:85
 msgid ""
 "This panel shows feeds subscribed by other users of this system, just in "
 "case you are interested in them too."
 msgstr ""
 
-#: modules/pref-feed-browser.php:101
+#: modules/pref-feed-browser.php:103
 msgid "Top"
 msgstr "Топ"
 
-#: modules/pref-feed-browser.php:110
+#: modules/pref-feed-browser.php:112
 msgid "Show"
 msgstr "Показать"
 
-#: modules/pref-feed-browser.php:164 modules/pref-feeds.php:112
+#: modules/pref-feed-browser.php:166 modules/pref-feeds.php:107
 msgid "No feeds found to subscribe."
 msgstr "Каналы для подписки не найдены."
 
@@ -1599,194 +1600,199 @@ msgstr "Топ 25 каналов"
 msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr "Топ 25 популярных каналов:"
 
-#: modules/pref-feeds.php:146
+#: modules/pref-feeds.php:141
 msgid "Feed editor"
 msgstr "Редактор канала"
 
-#: modules/pref-feeds.php:158
+#: modules/pref-feeds.php:153
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: modules/pref-feeds.php:194
+#: modules/pref-feeds.php:189
 msgid "Update Interval:"
 msgstr "Интервал обновления:"
 
-#: modules/pref-feeds.php:203
+#: modules/pref-feeds.php:198
 msgid "Link to:"
 msgstr "Связать с:"
 
-#: modules/pref-feeds.php:220
+#: modules/pref-feeds.php:215
 msgid "Not linked"
 msgstr "Нет связей"
 
-#: modules/pref-feeds.php:254
+#: modules/pref-feeds.php:249
 msgid "Article purging:"
 msgstr "Удаление сообщений:"
 
-#: modules/pref-feeds.php:267
+#: modules/pref-feeds.php:262
 #, fuzzy
 msgid "Update using:"
 msgstr "Обновить"
 
-#: modules/pref-feeds.php:300
+#: modules/pref-feeds.php:295
 msgid "Hide from \"Other Feeds\""
 msgstr "Спрятать из \"Других каналов\""
 
-#: modules/pref-feeds.php:311
+#: modules/pref-feeds.php:306
 msgid "Right-to-left content"
 msgstr "Язык канала пишется справа налево"
 
-#: modules/pref-feeds.php:322
+#: modules/pref-feeds.php:317
 msgid "Hide from my feed list"
 msgstr "Спрятать из моего списка каналов"
 
-#: modules/pref-feeds.php:334
+#: modules/pref-feeds.php:329
 msgid "Include in e-mail digest"
 msgstr "Включить в дайджест"
 
-#: modules/pref-feeds.php:355
+#: modules/pref-feeds.php:350
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:515 modules/pref-feeds.php:562
+#: modules/pref-feeds.php:514 modules/pref-feeds.php:561
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:593
+#: modules/pref-feeds.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Добавлена подписка на <b>%s</b>."
 
-#: modules/pref-feeds.php:595
+#: modules/pref-feeds.php:594
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:677
+#: modules/pref-feeds.php:676
 msgid "Category editor"
 msgstr "Редактор категорий"
 
-#: modules/pref-feeds.php:700
+#: modules/pref-feeds.php:699
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Категория <b>$%s</b> уже существует."
 
-#: modules/pref-feeds.php:728
+#: modules/pref-feeds.php:727
 msgid "Unable to delete non empty feed categories."
 msgstr "Не могу удалить не пустую категорию"
 
-#: modules/pref-feeds.php:745
+#: modules/pref-feeds.php:744
 msgid "Create category"
 msgstr "Создать категорию"
 
-#: modules/pref-feeds.php:805
+#: modules/pref-feeds.php:804
 msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
-#: modules/pref-feeds.php:816 modules/pref-filters.php:381
-#: modules/pref-labels.php:299 modules/pref-users.php:320
+#: modules/pref-feeds.php:815 modules/pref-filters.php:398
+#: modules/pref-labels.php:324 modules/pref-users.php:359
 msgid "Remove"
 msgstr "Удалить"
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:837
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могли быть обновлены (щелкните для подробностей)"
 
-#: modules/pref-feeds.php:871
+#: modules/pref-feeds.php:864
 msgid "Top 25"
 msgstr "Топ 25"
 
-#: modules/pref-feeds.php:945
+#: modules/pref-feeds.php:938
 msgid "Show last article times"
 msgstr "Показать дату последней статьи"
 
-#: modules/pref-feeds.php:962 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:955 modules/pref-feeds.php:1017
 msgid "Last&nbsp;Article"
 msgstr "Последняя&nbsp;статья"
 
-#: modules/pref-feeds.php:965 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:958 modules/pref-feeds.php:1021
 msgid "Updated"
 msgstr "Обновлено"
 
-#: modules/pref-feeds.php:1095 modules/pref-feeds.php:1109
+#: modules/pref-feeds.php:1042 modules/pref-filters.php:372
+#: modules/pref-labels.php:304 modules/pref-users.php:334
+msgid "Click to edit"
+msgstr ""
+
+#: modules/pref-feeds.php:1088 modules/pref-feeds.php:1102
 #, fuzzy
 msgid "Selection:"
 msgstr "Выбрать:"
 
-#: modules/pref-feeds.php:1101
+#: modules/pref-feeds.php:1094
 msgid "Recategorize"
 msgstr "Изменить категорию"
 
-#: modules/pref-feeds.php:1110 modules/pref-filters.php:379
-#: modules/pref-labels.php:297 modules/pref-users.php:318
+#: modules/pref-feeds.php:1103 modules/pref-filters.php:396
+#: modules/pref-labels.php:322 modules/pref-users.php:357
 msgid "Edit"
 msgstr "Редактировать"
 
-#: modules/pref-feeds.php:1111
+#: modules/pref-feeds.php:1104
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1112
+#: modules/pref-feeds.php:1105
 #, fuzzy
 msgid "Clear feed data"
 msgstr "Все каналы обновлены."
 
-#: modules/pref-feeds.php:1113 modules/pref-filters.php:236
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:252
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Отмеченные"
 
-#: modules/pref-feeds.php:1114
+#: modules/pref-feeds.php:1107
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: modules/pref-feeds.php:1119
+#: modules/pref-feeds.php:1112
 #, fuzzy
 msgid "Other:"
 msgstr "Где:"
 
-#: modules/pref-feeds.php:1120
+#: modules/pref-feeds.php:1113
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: modules/pref-feeds.php:1147
+#: modules/pref-feeds.php:1120
 msgid "OPML"
 msgstr ""
 
-#: modules/pref-feeds.php:1151
+#: modules/pref-feeds.php:1124
 #, fuzzy
 msgid "File:"
 msgstr "Заголовок:"
 
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1127
 msgid "Import"
 msgstr "Импортировать"
 
-#: modules/pref-feeds.php:1161
+#: modules/pref-feeds.php:1134
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: modules/pref-feeds.php:1164
+#: modules/pref-feeds.php:1137
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1166
+#: modules/pref-feeds.php:1139
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1170
+#: modules/pref-feeds.php:1143
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1179
+#: modules/pref-feeds.php:1152
 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:1186
+#: modules/pref-feeds.php:1159
 #, fuzzy
 msgid "Generate another link"
 msgstr "Создать другой адрес"
@@ -1795,80 +1801,102 @@ msgstr "Создать другой адрес"
 msgid "Filter editor"
 msgstr "Редактор фильтров"
 
-#: modules/pref-filters.php:94
+#: modules/pref-filters.php:92
 msgid "Enabled"
 msgstr "Включен"
 
-#: modules/pref-filters.php:154
+#: modules/pref-filters.php:152
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr "Фильтр <b>%s</b> сохранен"
 
-#: modules/pref-filters.php:194
+#: modules/pref-filters.php:192
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Добавлен фильтр <b>%s</b>"
 
-#: modules/pref-filters.php:290
+#: modules/pref-filters.php:318
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:291
+#: modules/pref-filters.php:319
 #, fuzzy
 msgid "action_description"
 msgstr "описание"
 
-#: modules/pref-filters.php:300
+#: modules/pref-filters.php:328
 msgid "Filter expression"
 msgstr "Выражение"
 
-#: modules/pref-filters.php:302
+#: modules/pref-filters.php:330
 msgid "Match"
 msgstr "Искать"
 
-#: modules/pref-filters.php:303
+#: modules/pref-filters.php:331
 msgid "Action"
 msgstr "Действие"
 
-#: modules/pref-filters.php:304
+#: modules/pref-filters.php:332
 #, fuzzy
 msgid "Params"
 msgstr "Параметры:"
 
-#: modules/pref-filters.php:333
+#: modules/pref-filters.php:361
 msgid "(Disabled)"
 msgstr "(Отключен)"
 
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:380
 msgid "(Inverse)"
 msgstr "(Инвертирован)"
 
-#: modules/pref-filters.php:371 modules/pref-filters.php:392
+#: modules/pref-filters.php:406
 msgid "No filters defined."
 msgstr "Фильтры отсутствуют."
 
-#: modules/pref-labels.php:169
+#: modules/pref-filters.php:408
+#, fuzzy
+msgid "No matching filters found."
+msgstr "Статей не найдено."
+
+#: modules/pref-labels.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.php:173
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr "Метка <b>%s</b> сохранена"
 
-#: modules/pref-labels.php:199
+#: modules/pref-labels.php:205
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Добавлена метка <b>%s</b>"
 
-#: modules/pref-labels.php:246
+#: modules/pref-labels.php:276
 msgid "Caption"
 msgstr "Заголовок"
 
-#: modules/pref-labels.php:247
+#: modules/pref-labels.php:277
 msgid "SQL Expression"
 msgstr "SQL выражение"
 
-#: modules/pref-labels.php:289 modules/pref-labels.php:302
+#: modules/pref-labels.php:302
+#, fuzzy
+msgid "[No caption]"
+msgstr "Заголовок"
+
+#: modules/pref-labels.php:329
 msgid "No labels defined."
 msgstr "Метки отсутствуют."
 
+#: modules/pref-labels.php:331
+#, fuzzy
+msgid "No matching labels found."
+msgstr "Статей не найдено."
+
 #: modules/pref-prefs.php:60
 msgid "Password has been changed."
 msgstr "Пароль был изменен."
@@ -1890,7 +1918,7 @@ msgstr "Пароль был изменен."
 msgid "The configuration was reset to defaults."
 msgstr "Настройки были сброшены по-умолчанию."
 
-#: modules/pref-prefs.php:154 modules/pref-prefs.php:320
+#: modules/pref-prefs.php:154 modules/pref-prefs.php:328
 msgid "Change theme"
 msgstr "Изменить тему"
 
@@ -1908,139 +1936,158 @@ msgstr "Личные данные"
 msgid "E-mail"
 msgstr ""
 
-#: modules/pref-prefs.php:238
+#: modules/pref-prefs.php:240
 #, fuzzy
 msgid "Access level"
 msgstr "Уровень доступа:"
 
-#: modules/pref-prefs.php:251
+#: modules/pref-prefs.php:253
 msgid "Change e-mail"
 msgstr "Изменить e-mail"
 
-#: modules/pref-prefs.php:257
+#: modules/pref-prefs.php:259
 msgid "Authentication"
 msgstr "Авторизация"
 
-#: modules/pref-prefs.php:259
+#: modules/pref-prefs.php:261
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: modules/pref-prefs.php:264
+#: modules/pref-prefs.php:268
 msgid "New password"
 msgstr "Новый пароль"
 
-#: modules/pref-prefs.php:270
+#: modules/pref-prefs.php:276
 msgid "Confirm password"
 msgstr "Подтверждение пароля"
 
-#: modules/pref-prefs.php:285
+#: modules/pref-prefs.php:293
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: modules/pref-prefs.php:301
+#: modules/pref-prefs.php:309
 msgid "Themes"
 msgstr "Темы"
 
-#: modules/pref-prefs.php:302
+#: modules/pref-prefs.php:310
 msgid "Select theme"
 msgstr "Выбор темы"
 
-#: modules/pref-prefs.php:304
+#: modules/pref-prefs.php:312
 msgid "Default"
 msgstr "По умолчанию"
 
-#: modules/pref-prefs.php:377
+#: modules/pref-prefs.php:385
 msgid "short_desc"
 msgstr ""
 
-#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
+#: modules/pref-prefs.php:397 modules/pref-prefs.php:402
 msgid "Yes"
 msgstr "Да"
 
-#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
+#: modules/pref-prefs.php:399 modules/pref-prefs.php:402
 msgid "No"
 msgstr "Нет"
 
-#: modules/pref-prefs.php:413
+#: modules/pref-prefs.php:424
 msgid "Save configuration"
 msgstr "Сохранить конфигурацию"
 
-#: modules/pref-prefs.php:417
+#: modules/pref-prefs.php:428
 msgid "Reset to defaults"
 msgstr "Сбросить настройки"
 
-#: modules/pref-users.php:12
+#: modules/pref-users.php:7
+#, fuzzy
+msgid "Your access level is insufficient to open this tab."
+msgstr "В доступе отказано - недостаточный уровень привилегий."
+
+#: modules/pref-users.php:17
 msgid "User editor"
 msgstr "Редактор пользователей"
 
-#: modules/pref-users.php:33
+#: modules/pref-users.php:38
 msgid "Change password:"
 msgstr "Изменить пароль:"
 
-#: modules/pref-users.php:37
+#: modules/pref-users.php:42
 msgid "E-mail:"
 msgstr ""
 
-#: modules/pref-users.php:43
+#: modules/pref-users.php:48
 msgid "Access level:"
 msgstr "Уровень доступа:"
 
-#: modules/pref-users.php:78
+#: modules/pref-users.php:83
 #, php-format
 msgid "Changed password of user <b>%s</b>."
 msgstr "Пароль пользователя <b>%s</b> изменен."
 
-#: modules/pref-users.php:126
+#: modules/pref-users.php:131
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "Добавлен пользователь <b>%s</b> с паролем <b>%s</b>"
 
-#: modules/pref-users.php:133
+#: modules/pref-users.php:138
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Не могу добавить пользователя <b>%s</b>"
 
-#: modules/pref-users.php:137
+#: modules/pref-users.php:142
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "Пользователь <b>%s</b> уже существует."
 
-#: modules/pref-users.php:157
+#: modules/pref-users.php:162
 #, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
 "\t\t\t\t\t to <b>%s</b>"
 msgstr "Пароль пользователя <b>%s</b> изменен на <b>%s</b>"
 
-#: modules/pref-users.php:161
+#: modules/pref-users.php:166
 #, fuzzy, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Добавляется категория <b>%s</b>."
 
-#: modules/pref-users.php:196
+#: modules/pref-users.php:202
+msgid "[tt-rss] Password change notification"
+msgstr ""
+
+#: modules/pref-users.php:259
 msgid "Create user"
 msgstr "Добавить пользователя"
 
-#: modules/pref-users.php:218
+#: modules/pref-users.php:293
 msgid "Login"
 msgstr "Пользователь:"
 
-#: modules/pref-users.php:219
+#: modules/pref-users.php:294
 msgid "Access Level"
 msgstr "Уровень доступа:"
 
-#: modules/pref-users.php:220
+#: modules/pref-users.php:296
 msgid "Last login"
 msgstr "Последний вход"
 
-#: modules/pref-users.php:316
+#: modules/pref-users.php:355
 msgid "User details"
 msgstr "Подробнее..."
 
-#: modules/pref-users.php:322
+#: modules/pref-users.php:361
 msgid "Reset password"
 msgstr "Сбросить пароль"
 
+#: modules/pref-users.php:366
+#, fuzzy
+msgid "No users defined."
+msgstr "Фильтры отсутствуют."
+
+#: modules/pref-users.php:368
+#, fuzzy
+msgid "No matching users found."
+msgstr "Статей не найдено."
+
 #, fuzzy
 #~ msgid "Update errors"
 #~ msgstr "Ошибки обновления"
@@ -2064,9 +2111,6 @@ msgstr "Сбросить пароль"
 #~ msgid "First page"
 #~ msgstr "На первую"
 
-#~ msgid "No articles found."
-#~ msgstr "Статей не найдено."
-
 #~ msgid "New headlines for last 24 hours, as of "
 #~ msgstr "Новые заголовки за последние 24 часа, на "
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 5272cc4e0..4cf97c25e 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 a71bfee35..e9500fd45 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: 2008-05-16 13:35+0400\n"
+"POT-Creation-Date: 2008-05-18 15:43+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -93,26 +93,26 @@ msgstr ""
 msgid "Administrator"
 msgstr "管理员"
 
-#: backend.php:396
+#: backend.php:400 modules/pref-users.php:295
 msgid "Registered"
 msgstr ""
 
-#: backend.php:397
+#: backend.php:401
 #, fuzzy
 msgid "Last logged in"
 msgstr "最后登陆"
 
-#: backend.php:398
+#: backend.php:402
 #, fuzzy
 msgid "Stored articles"
 msgstr "星级文章"
 
-#: backend.php:405
+#: backend.php:409
 #, fuzzy
 msgid "Subscribed feeds count"
 msgstr "订阅feed:"
 
-#: backend.php:420
+#: backend.php:424
 #, fuzzy
 msgid "Subscribed feeds"
 msgstr "订阅feed:"
@@ -173,35 +173,35 @@ msgstr ""
 "不支持你的MySQL版本. 请访问 \n"
 "\t\t官方网站获取更多信息。"
 
-#: functions.php:2524 functions.php:2863 functions.php:3233 functions.php:4083
+#: functions.php:2524 functions.php:2863 functions.php:3233 functions.php:4085
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2533 functions.php:2865 functions.php:3236 functions.php:4090
-#: modules/pref-feeds.php:1173
+#: functions.php:2533 functions.php:2865 functions.php:3236 functions.php:4092
+#: modules/pref-feeds.php:1146
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2542 functions.php:2867 functions.php:3239 functions.php:4068
+#: functions.php:2542 functions.php:2867 functions.php:3239 functions.php:4070
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
 #: functions.php:2785 modules/popup-dialog.php:151
-#: modules/pref-filters.php:312
+#: modules/pref-filters.php:340
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2814 functions.php:2853 functions.php:3211 functions.php:4247
-#: functions.php:4277 modules/pref-feeds.php:984
+#: functions.php:2814 functions.php:2853 functions.php:3211 functions.php:4249
+#: functions.php:4279 modules/pref-feeds.php:977
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2843 functions.php:3395
+#: functions.php:2843 functions.php:3397
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2845 functions.php:3397
+#: functions.php:2845 functions.php:3399
 msgid "Labels"
 msgstr "标记"
 
@@ -214,152 +214,152 @@ msgstr "搜索结果"
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:3859 functions.php:3908 functions.php:5107
-#: modules/pref-feeds.php:759 modules/pref-feeds.php:946
-#: modules/pref-filters.php:264 modules/pref-labels.php:239
-#: modules/pref-users.php:211
+#: functions.php:3861 functions.php:3910 functions.php:5132
+#: modules/pref-feeds.php:758 modules/pref-feeds.php:939
+#: modules/pref-filters.php:292 modules/pref-labels.php:269
+#: modules/pref-users.php:286
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:3860 functions.php:3909 modules/pref-feeds.php:760
-#: modules/pref-feeds.php:947 modules/pref-filters.php:265
-#: modules/pref-labels.php:240 modules/pref-users.php:212
+#: functions.php:3862 functions.php:3911 modules/pref-feeds.php:759
+#: modules/pref-feeds.php:940 modules/pref-filters.php:293
+#: modules/pref-labels.php:270 modules/pref-users.php:287
 msgid "All"
 msgstr "所有"
 
-#: functions.php:3861 functions.php:3866 functions.php:3910 functions.php:3913
+#: functions.php:3863 functions.php:3868 functions.php:3912 functions.php:3915
 #: tt-rss.php:193
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3862 functions.php:3911 modules/pref-feeds.php:761
-#: modules/pref-feeds.php:948 modules/pref-filters.php:266
-#: modules/pref-labels.php:241 modules/pref-users.php:213
+#: functions.php:3864 functions.php:3913 modules/pref-feeds.php:760
+#: modules/pref-feeds.php:941 modules/pref-filters.php:294
+#: modules/pref-labels.php:271 modules/pref-users.php:288
 msgid "None"
 msgstr "无"
 
-#: functions.php:3864 tt-rss.php:146 modules/pref-feeds.php:1107
+#: functions.php:3866 tt-rss.php:146 modules/pref-feeds.php:1100
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:3865
+#: functions.php:3867
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:3867 functions.php:3914 tt-rss.php:192
+#: functions.php:3869 functions.php:3916 tt-rss.php:192
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:3868
+#: functions.php:3870
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:3870 functions.php:3916
+#: functions.php:3872 functions.php:3918
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:3871
+#: functions.php:3873
 msgid "Selection"
 msgstr "选择："
 
-#: functions.php:3885
+#: functions.php:3887
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:3888 tt-rss.php:161
+#: functions.php:3890 tt-rss.php:161
 msgid "Other actions:"
 msgstr "其他操作:"
 
-#: functions.php:3895 functions.php:3897
+#: functions.php:3897 functions.php:3899
 #, fuzzy
 msgid "Search to label"
 msgstr "转换标签"
 
-#: functions.php:3913
+#: functions.php:3915
 msgid "Toggle:"
 msgstr "触发:"
 
-#: functions.php:3917
+#: functions.php:3919
 msgid "Page"
 msgstr "页"
 
-#: functions.php:3918 modules/pref-filters.php:301
+#: functions.php:3920 modules/pref-filters.php:329
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3925
+#: functions.php:3927
 msgid "Convert to label"
 msgstr "转换标签"
 
-#: functions.php:3972
+#: functions.php:3974
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4056
+#: functions.php:4058
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4317
+#: functions.php:4319
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4334
+#: functions.php:4336
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4559
+#: functions.php:4561
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4614
+#: functions.php:4616
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:4645 functions.php:5066
+#: functions.php:4647 functions.php:5091
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4647 functions.php:5068
+#: functions.php:4649 functions.php:5093
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4657 functions.php:5077
+#: functions.php:4659 functions.php:5102
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:4723 modules/pref-feed-browser.php:74
+#: functions.php:4732 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4790
+#: functions.php:4801
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4901
+#: functions.php:4912
 msgid "(Click to change)"
 msgstr ""
 
-#: functions.php:5036
+#: functions.php:5061
 #, fuzzy
 msgid "Show article"
 msgstr "星级文章"
 
-#: functions.php:5174
+#: functions.php:5199
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5177
+#: functions.php:5202
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5180
+#: functions.php:5205
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
@@ -372,7 +372,7 @@ msgstr "显示Feed"
 msgid "display tags"
 msgstr "显示标签"
 
-#: localized_js.php:37 prefs.php:135 tt-rss.php:75
+#: localized_js.php:37 prefs.php:141 tt-rss.php:75
 msgid "Loading, please wait..."
 msgstr "读取中，请等待..."
 
@@ -736,7 +736,7 @@ msgid "Rescoring articles..."
 msgstr "星级文章"
 
 #: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:959 modules/pref-feeds.php:1020
+#: modules/pref-feeds.php:952 modules/pref-feeds.php:1013
 msgid "Title"
 msgstr "标题"
 
@@ -977,12 +977,12 @@ msgstr "星级文章"
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
-#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:279
-#: modules/pref-users.php:29
+#: login_form.php:85 modules/popup-dialog.php:100 modules/pref-feeds.php:274
+#: modules/pref-users.php:34
 msgid "Login:"
 msgstr "登陆:"
 
-#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:285
+#: login_form.php:87 modules/popup-dialog.php:101 modules/pref-feeds.php:280
 msgid "Password:"
 msgstr "密码:"
 
@@ -1054,51 +1054,51 @@ msgstr "未检测到DOMXML 扩展， 要求PHP5以下版本。"
 msgid "Return to preferences"
 msgstr "返回 我的最爱"
 
-#: prefs.php:89
+#: prefs.php:91
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: prefs.php:95 tt-rss.php:114
+#: prefs.php:97 tt-rss.php:114
 msgid "Hello,"
 msgstr "你好,"
 
-#: prefs.php:97 prefs.php:107
+#: prefs.php:99 prefs.php:109
 msgid "Exit preferences"
 msgstr "退出我的最爱"
 
-#: prefs.php:99 tt-rss.php:124
+#: prefs.php:101 tt-rss.php:124
 msgid "Logout"
 msgstr "注销"
 
-#: prefs.php:113 tt-rss.php:116 tt-rss.php:148
+#: prefs.php:119 tt-rss.php:116 tt-rss.php:148
 msgid "Preferences"
 msgstr "我的最爱"
 
-#: prefs.php:115
+#: prefs.php:121
 msgid "My Feeds"
 msgstr "我的feed"
 
-#: prefs.php:118
+#: prefs.php:124
 msgid "Other Feeds"
 msgstr "其他feed"
 
-#: prefs.php:121
+#: prefs.php:127
 msgid "Published Articles"
 msgstr "已发布文章"
 
-#: prefs.php:123
+#: prefs.php:129
 msgid "Content Filtering"
 msgstr "内容过滤器"
 
-#: prefs.php:126
+#: prefs.php:132
 msgid "Label Editor"
 msgstr "标记编辑"
 
-#: prefs.php:130
+#: prefs.php:136
 msgid "User Manager"
 msgstr "用户管理"
 
-#: prefs.php:138 tt-rss.php:78
+#: prefs.php:144 tt-rss.php:78
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
@@ -1201,7 +1201,8 @@ msgid "tag cloud"
 msgstr "标签簇"
 
 #: tt-rss.php:147 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:853
+#: modules/pref-feeds.php:854 modules/pref-filters.php:235
+#: modules/pref-labels.php:233 modules/pref-users.php:242
 msgid "Search"
 msgstr "搜索"
 
@@ -1347,7 +1348,7 @@ msgid "Help topic not found."
 msgstr "未找到帮助主题。"
 
 #: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:463 modules/pref-feeds.php:810
+#: modules/popup-dialog.php:463 modules/pref-feeds.php:809
 msgid "Close this window"
 msgstr "关闭此窗口"
 
@@ -1416,28 +1417,28 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr "TT-RSS检测到更新时间过长，请刷新或者检查RSS源地址。"
 
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:866
+#: modules/popup-dialog.php:61 modules/pref-feeds.php:859
 msgid "Subscribe to feed"
 msgstr "订阅feed"
 
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:166
+#: modules/popup-dialog.php:72 modules/pref-feeds.php:161
 msgid "Feed URL:"
 msgstr "Feed URL:"
 
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:174
+#: modules/popup-dialog.php:80 modules/pref-feeds.php:169
 msgid "Category:"
 msgstr "分类:"
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:115
-#: modules/pref-feeds.php:119
+#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:117
+#: modules/pref-feeds.php:114
 msgid "Subscribe"
 msgstr "订阅"
 
 #: modules/popup-dialog.php:114 modules/popup-dialog.php:199
 #: modules/popup-dialog.php:256 modules/popup-dialog.php:343
-#: modules/popup-dialog.php:439 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:367 modules/pref-filters.php:118
-#: modules/pref-users.php:58
+#: modules/popup-dialog.php:439 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:362 modules/pref-filters.php:116
+#: modules/pref-users.php:63
 msgid "Cancel"
 msgstr "取消"
 
@@ -1461,7 +1462,7 @@ msgstr "匹配:"
 msgid "Title or content"
 msgstr "标题或内容"
 
-#: modules/popup-dialog.php:208 modules/pref-labels.php:221
+#: modules/popup-dialog.php:208 modules/pref-labels.php:243
 msgid "Create label"
 msgstr "创建标记"
 
@@ -1486,40 +1487,40 @@ msgstr "测试"
 msgid "Create"
 msgstr "创建"
 
-#: modules/popup-dialog.php:265 modules/pref-filters.php:229
+#: modules/popup-dialog.php:265 modules/pref-filters.php:245
 msgid "Create filter"
 msgstr "创建过滤器"
 
 #: modules/popup-dialog.php:283 modules/popup-dialog.php:314
-#: modules/pref-filters.php:40 modules/pref-filters.php:72
+#: modules/pref-filters.php:38 modules/pref-filters.php:70
 msgid "description"
 msgstr "描述"
 
-#: modules/popup-dialog.php:288 modules/pref-filters.php:45
+#: modules/popup-dialog.php:288 modules/pref-filters.php:43
 msgid "Match:"
 msgstr "匹配："
 
-#: modules/popup-dialog.php:294 modules/pref-filters.php:51
+#: modules/popup-dialog.php:294 modules/pref-filters.php:49
 msgid "On field:"
 msgstr "于:"
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:56
+#: modules/popup-dialog.php:299 modules/pref-filters.php:54
 msgid "Feed:"
 msgstr "Feed:"
 
-#: modules/popup-dialog.php:305 modules/pref-filters.php:62
+#: modules/popup-dialog.php:305 modules/pref-filters.php:60
 msgid "Action:"
 msgstr "操作:"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:79
+#: modules/popup-dialog.php:321 modules/pref-filters.php:77
 msgid "Params:"
 msgstr "参数:"
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:298
+#: modules/popup-dialog.php:325 modules/pref-feeds.php:293
 msgid "Options:"
 msgstr "选项:"
 
-#: modules/popup-dialog.php:328 modules/pref-filters.php:103
+#: modules/popup-dialog.php:328 modules/pref-filters.php:101
 msgid "Inverse match"
 msgstr "逆匹配"
 
@@ -1543,8 +1544,8 @@ msgstr "编辑标签"
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开:"
 
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:365
-#: modules/pref-filters.php:114 modules/pref-users.php:55
+#: modules/popup-dialog.php:435 modules/pref-feeds.php:360
+#: modules/pref-filters.php:112 modules/pref-users.php:60
 msgid "Save"
 msgstr "保存"
 
@@ -1568,35 +1569,35 @@ msgstr "Feed 浏览器有限制"
 msgid "Feed information:"
 msgstr "Feed 信息："
 
-#: modules/pref-feed-browser.php:38
+#: modules/pref-feed-browser.php:39
 #, fuzzy
 msgid "Site:"
 msgstr "标题:"
 
-#: modules/pref-feed-browser.php:40
+#: modules/pref-feed-browser.php:41
 #, fuzzy
 msgid "Last updated:"
 msgstr "已更新"
 
-#: modules/pref-feed-browser.php:55
+#: modules/pref-feed-browser.php:56
 msgid "Last headlines:"
 msgstr "最新提要："
 
-#: modules/pref-feed-browser.php:84
+#: modules/pref-feed-browser.php:85
 msgid ""
 "This panel shows feeds subscribed by other users of this system, just in "
 "case you are interested in them too."
 msgstr "本控制面板显示系统其他用户订阅的feed，如果您感兴趣。"
 
-#: modules/pref-feed-browser.php:101
+#: modules/pref-feed-browser.php:103
 msgid "Top"
 msgstr "Top"
 
-#: modules/pref-feed-browser.php:110
+#: modules/pref-feed-browser.php:112
 msgid "Show"
 msgstr "显示"
 
-#: modules/pref-feed-browser.php:164 modules/pref-feeds.php:112
+#: modules/pref-feed-browser.php:166 modules/pref-feeds.php:107
 msgid "No feeds found to subscribe."
 msgstr "无feed可订阅。"
 
@@ -1612,195 +1613,200 @@ msgstr " 其他feed: Top 25"
 msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr "显示按受欢迎度排序的25个注册feed:"
 
-#: modules/pref-feeds.php:146
+#: modules/pref-feeds.php:141
 msgid "Feed editor"
 msgstr "Feed编辑"
 
-#: modules/pref-feeds.php:158
+#: modules/pref-feeds.php:153
 msgid "Title:"
 msgstr "标题:"
 
-#: modules/pref-feeds.php:194
+#: modules/pref-feeds.php:189
 msgid "Update Interval:"
 msgstr "更新间隔:"
 
-#: modules/pref-feeds.php:203
+#: modules/pref-feeds.php:198
 msgid "Link to:"
 msgstr "链接:"
 
-#: modules/pref-feeds.php:220
+#: modules/pref-feeds.php:215
 msgid "Not linked"
 msgstr "无链接"
 
-#: modules/pref-feeds.php:254
+#: modules/pref-feeds.php:249
 msgid "Article purging:"
 msgstr "文章清理:"
 
-#: modules/pref-feeds.php:267
+#: modules/pref-feeds.php:262
 #, fuzzy
 msgid "Update using:"
 msgstr "更新"
 
-#: modules/pref-feeds.php:300
+#: modules/pref-feeds.php:295
 msgid "Hide from \"Other Feeds\""
 msgstr "隐藏\"其他 Feed\""
 
-#: modules/pref-feeds.php:311
+#: modules/pref-feeds.php:306
 msgid "Right-to-left content"
 msgstr "由右-左阅读习惯"
 
-#: modules/pref-feeds.php:322
+#: modules/pref-feeds.php:317
 msgid "Hide from my feed list"
 msgstr "隐藏我的Feed列表"
 
-#: modules/pref-feeds.php:334
+#: modules/pref-feeds.php:329
 msgid "Include in e-mail digest"
 msgstr "包括电子邮件文摘"
 
-#: modules/pref-feeds.php:355
+#: modules/pref-feeds.php:350
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:515 modules/pref-feeds.php:562
+#: modules/pref-feeds.php:514 modules/pref-feeds.php:561
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:593
+#: modules/pref-feeds.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:595
+#: modules/pref-feeds.php:594
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:677
+#: modules/pref-feeds.php:676
 msgid "Category editor"
 msgstr "分类编辑"
 
-#: modules/pref-feeds.php:700
+#: modules/pref-feeds.php:699
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "分类 <b>$%s</b>已经存在."
 
-#: modules/pref-feeds.php:728
+#: modules/pref-feeds.php:727
 msgid "Unable to delete non empty feed categories."
 msgstr "不能删除非空分类。"
 
-#: modules/pref-feeds.php:745
+#: modules/pref-feeds.php:744
 msgid "Create category"
 msgstr "创建分类"
 
-#: modules/pref-feeds.php:805
+#: modules/pref-feeds.php:804
 msgid "No feed categories defined."
 msgstr "未定义feed分类"
 
-#: modules/pref-feeds.php:816 modules/pref-filters.php:381
-#: modules/pref-labels.php:299 modules/pref-users.php:320
+#: modules/pref-feeds.php:815 modules/pref-filters.php:398
+#: modules/pref-labels.php:324 modules/pref-users.php:359
 msgid "Remove"
 msgstr "移除"
 
-#: modules/pref-feeds.php:838
+#: modules/pref-feeds.php:837
 msgid "Some feeds have update errors (click for details)"
 msgstr "有些feed更新错误(点击了解详情) "
 
-#: modules/pref-feeds.php:871
+#: modules/pref-feeds.php:864
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:945
+#: modules/pref-feeds.php:938
 msgid "Show last article times"
 msgstr "显示最近文章时间"
 
-#: modules/pref-feeds.php:962 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:955 modules/pref-feeds.php:1017
 msgid "Last&nbsp;Article"
 msgstr "最后&nbsp;文章"
 
-#: modules/pref-feeds.php:965 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:958 modules/pref-feeds.php:1021
 msgid "Updated"
 msgstr "已更新"
 
-#: modules/pref-feeds.php:1095 modules/pref-feeds.php:1109
+#: modules/pref-feeds.php:1042 modules/pref-filters.php:372
+#: modules/pref-labels.php:304 modules/pref-users.php:334
+msgid "Click to edit"
+msgstr ""
+
+#: modules/pref-feeds.php:1088 modules/pref-feeds.php:1102
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: modules/pref-feeds.php:1101
+#: modules/pref-feeds.php:1094
 msgid "Recategorize"
 msgstr "再分类"
 
-#: modules/pref-feeds.php:1110 modules/pref-filters.php:379
-#: modules/pref-labels.php:297 modules/pref-users.php:318
+#: modules/pref-feeds.php:1103 modules/pref-filters.php:396
+#: modules/pref-labels.php:322 modules/pref-users.php:357
 msgid "Edit"
 msgstr "编辑"
 
-#: modules/pref-feeds.php:1111
+#: modules/pref-feeds.php:1104
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1112
+#: modules/pref-feeds.php:1105
 #, fuzzy
 msgid "Clear feed data"
 msgstr "所有Feed已更新。"
 
-#: modules/pref-feeds.php:1113 modules/pref-filters.php:236
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:252
 #, fuzzy
 msgid "Rescore articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1114
+#: modules/pref-feeds.php:1107
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: modules/pref-feeds.php:1119
+#: modules/pref-feeds.php:1112
 #, fuzzy
 msgid "Other:"
 msgstr "地点:"
 
-#: modules/pref-feeds.php:1120
+#: modules/pref-feeds.php:1113
 msgid "Edit categories"
 msgstr "编辑分类"
 
-#: modules/pref-feeds.php:1147
+#: modules/pref-feeds.php:1120
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1151
+#: modules/pref-feeds.php:1124
 #, fuzzy
 msgid "File:"
 msgstr "标题:"
 
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1127
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1161
+#: modules/pref-feeds.php:1134
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1164
+#: modules/pref-feeds.php:1137
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1166
+#: modules/pref-feeds.php:1139
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1170
+#: modules/pref-feeds.php:1143
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1179
+#: modules/pref-feeds.php:1152
 #, 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:1186
+#: modules/pref-feeds.php:1159
 #, fuzzy
 msgid "Generate another link"
 msgstr "生成另一个地址"
@@ -1809,80 +1815,102 @@ msgstr "生成另一个地址"
 msgid "Filter editor"
 msgstr "过滤器编辑"
 
-#: modules/pref-filters.php:94
+#: modules/pref-filters.php:92
 msgid "Enabled"
 msgstr "可用"
 
-#: modules/pref-filters.php:154
+#: modules/pref-filters.php:152
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr "保存过滤器<b>%s</b>"
 
-#: modules/pref-filters.php:194
+#: modules/pref-filters.php:192
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "创建过滤器 <b>%s</b>"
 
-#: modules/pref-filters.php:290
+#: modules/pref-filters.php:318
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:291
+#: modules/pref-filters.php:319
 #, fuzzy
 msgid "action_description"
 msgstr "描述"
 
-#: modules/pref-filters.php:300
+#: modules/pref-filters.php:328
 msgid "Filter expression"
 msgstr "过滤器表达式"
 
-#: modules/pref-filters.php:302
+#: modules/pref-filters.php:330
 msgid "Match"
 msgstr "匹配"
 
-#: modules/pref-filters.php:303
+#: modules/pref-filters.php:331
 msgid "Action"
 msgstr "操作"
 
-#: modules/pref-filters.php:304
+#: modules/pref-filters.php:332
 #, fuzzy
 msgid "Params"
 msgstr "参数:"
 
-#: modules/pref-filters.php:333
+#: modules/pref-filters.php:361
 msgid "(Disabled)"
 msgstr "(不可用)"
 
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:380
 msgid "(Inverse)"
 msgstr "(逆)"
 
-#: modules/pref-filters.php:371 modules/pref-filters.php:392
+#: modules/pref-filters.php:406
 msgid "No filters defined."
 msgstr "未定义过滤器。"
 
-#: modules/pref-labels.php:169
+#: modules/pref-filters.php:408
+#, fuzzy
+msgid "No matching filters found."
+msgstr "未找到文章。"
+
+#: modules/pref-labels.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.php:173
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr "已保存标记<b>%s</b>"
 
-#: modules/pref-labels.php:199
+#: modules/pref-labels.php:205
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "创建标记 <b>%s</b>"
 
-#: modules/pref-labels.php:246
+#: modules/pref-labels.php:276
 msgid "Caption"
 msgstr "标题"
 
-#: modules/pref-labels.php:247
+#: modules/pref-labels.php:277
 msgid "SQL Expression"
 msgstr "SQL 表达式"
 
-#: modules/pref-labels.php:289 modules/pref-labels.php:302
+#: modules/pref-labels.php:302
+#, fuzzy
+msgid "[No caption]"
+msgstr "标题"
+
+#: modules/pref-labels.php:329
 msgid "No labels defined."
 msgstr "未定义标记."
 
+#: modules/pref-labels.php:331
+#, fuzzy
+msgid "No matching labels found."
+msgstr "未找到文章。"
+
 #: modules/pref-prefs.php:60
 msgid "Password has been changed."
 msgstr "密码已更改."
@@ -1904,7 +1932,7 @@ msgstr "密码已更改."
 msgid "The configuration was reset to defaults."
 msgstr "设置重置为默认"
 
-#: modules/pref-prefs.php:154 modules/pref-prefs.php:320
+#: modules/pref-prefs.php:154 modules/pref-prefs.php:328
 msgid "Change theme"
 msgstr "更改模板"
 
@@ -1923,104 +1951,109 @@ msgstr "个人数据"
 msgid "E-mail"
 msgstr "E-mail:"
 
-#: modules/pref-prefs.php:238
+#: modules/pref-prefs.php:240
 #, fuzzy
 msgid "Access level"
 msgstr "等级:"
 
-#: modules/pref-prefs.php:251
+#: modules/pref-prefs.php:253
 msgid "Change e-mail"
 msgstr "更改 e-mail"
 
-#: modules/pref-prefs.php:257
+#: modules/pref-prefs.php:259
 msgid "Authentication"
 msgstr "认证"
 
-#: modules/pref-prefs.php:259
+#: modules/pref-prefs.php:261
 msgid "Old password"
 msgstr "原密码"
 
-#: modules/pref-prefs.php:264
+#: modules/pref-prefs.php:268
 msgid "New password"
 msgstr "新密码"
 
-#: modules/pref-prefs.php:270
+#: modules/pref-prefs.php:276
 msgid "Confirm password"
 msgstr "验证密码"
 
-#: modules/pref-prefs.php:285
+#: modules/pref-prefs.php:293
 msgid "Change password"
 msgstr "更改密码"
 
-#: modules/pref-prefs.php:301
+#: modules/pref-prefs.php:309
 msgid "Themes"
 msgstr "模板"
 
-#: modules/pref-prefs.php:302
+#: modules/pref-prefs.php:310
 msgid "Select theme"
 msgstr "选择模板"
 
-#: modules/pref-prefs.php:304
+#: modules/pref-prefs.php:312
 msgid "Default"
 msgstr "默认"
 
-#: modules/pref-prefs.php:377
+#: modules/pref-prefs.php:385
 msgid "short_desc"
 msgstr "short_desc"
 
-#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
+#: modules/pref-prefs.php:397 modules/pref-prefs.php:402
 msgid "Yes"
 msgstr "是"
 
-#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
+#: modules/pref-prefs.php:399 modules/pref-prefs.php:402
 msgid "No"
 msgstr "否"
 
-#: modules/pref-prefs.php:413
+#: modules/pref-prefs.php:424
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: modules/pref-prefs.php:417
+#: modules/pref-prefs.php:428
 msgid "Reset to defaults"
 msgstr "恢复到默认？"
 
-#: modules/pref-users.php:12
+#: modules/pref-users.php:7
+#, fuzzy
+msgid "Your access level is insufficient to open this tab."
+msgstr "权限不足。"
+
+#: modules/pref-users.php:17
 msgid "User editor"
 msgstr "用户编辑"
 
-#: modules/pref-users.php:33
+#: modules/pref-users.php:38
 msgid "Change password:"
 msgstr "更改密码:"
 
-#: modules/pref-users.php:37
+#: modules/pref-users.php:42
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: modules/pref-users.php:43
+#: modules/pref-users.php:48
 msgid "Access level:"
 msgstr "等级:"
 
-#: modules/pref-users.php:78
+#: modules/pref-users.php:83
 #, php-format
 msgid "Changed password of user <b>%s</b>."
 msgstr "更改用<b>%s</b>密码"
 
-#: modules/pref-users.php:126
+#: modules/pref-users.php:131
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "添加用 <b>%s</b> ，密码为<b>%s</b>"
 
-#: modules/pref-users.php:133
+#: modules/pref-users.php:138
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "创建用户 <b>%s</b> 失败"
 
-#: modules/pref-users.php:137
+#: modules/pref-users.php:142
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "用户 <b>%s</b> 已存在。"
 
-#: modules/pref-users.php:157
+#: modules/pref-users.php:162
 #, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
@@ -2029,35 +2062,49 @@ msgstr ""
 "更改用户 <b>%s</b>\n"
 "\t\t\t\t\t 的密码为 <b>%s</b>"
 
-#: modules/pref-users.php:161
+#: modules/pref-users.php:166
 #, fuzzy, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "添加分类 <b>%s</b>."
 
-#: modules/pref-users.php:196
+#: modules/pref-users.php:202
+msgid "[tt-rss] Password change notification"
+msgstr ""
+
+#: modules/pref-users.php:259
 msgid "Create user"
 msgstr "创建用户"
 
-#: modules/pref-users.php:218
+#: modules/pref-users.php:293
 msgid "Login"
 msgstr "登陆"
 
-#: modules/pref-users.php:219
+#: modules/pref-users.php:294
 msgid "Access Level"
 msgstr "等级:"
 
-#: modules/pref-users.php:220
+#: modules/pref-users.php:296
 msgid "Last login"
 msgstr "最后登陆"
 
-#: modules/pref-users.php:316
+#: modules/pref-users.php:355
 msgid "User details"
 msgstr "用户详细"
 
-#: modules/pref-users.php:322
+#: modules/pref-users.php:361
 msgid "Reset password"
 msgstr "重置密码"
 
+#: modules/pref-users.php:366
+#, fuzzy
+msgid "No users defined."
+msgstr "未定义过滤器。"
+
+#: modules/pref-users.php:368
+#, fuzzy
+msgid "No matching users found."
+msgstr "未找到文章。"
+
 #, fuzzy
 #~ msgid "Update errors"
 #~ msgstr "更新错误"
@@ -2081,9 +2128,6 @@ msgstr "重置密码"
 #~ msgid "First page"
 #~ msgstr "首页"
 
-#~ msgid "No articles found."
-#~ msgstr "未找到文章。"
-
 #~ msgid "New headlines for last 24 hours, as of "
 #~ msgstr "24小时最新提要,截至"
 
diff --git a/modules/pref-users.php b/modules/pref-users.php
index d8f882f18..9a0abeb25 100644
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -199,7 +199,7 @@
 					}
 
 					$mail->IsHTML(false);
-					$mail->Subject = __("Password change notification");
+					$mail->Subject = __("[tt-rss] Password change notification");
 					$mail->Body = $message;
 
 					$rc = $mail->Send();