diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 8e5cc298c..79de62087 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 e489cd94a..f7655f9ec 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-08-01 11:55+0400\n"
+"POT-Creation-Date: 2008-08-06 16: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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: backend.php:108 backend.php:117 backend.php:128
+#: backend.php:108
 msgid "Use default"
 msgstr "Utiliser la valeur par défaut"
 
@@ -44,6 +44,11 @@ msgstr "Au bout de 2 mois"
 msgid "3 months old"
 msgstr "Au bout de 3 mois"
 
+#: backend.php:117
+#, fuzzy
+msgid "Default interval"
+msgstr "Fréquence de mise à jour&nbsp;:"
+
 #: backend.php:118
 msgid "Disable updates"
 msgstr "Désactiver les mises à jour"
@@ -76,6 +81,10 @@ msgstr "Une fois par jour"
 msgid "Weekly"
 msgstr "Une fois par semaine"
 
+#: backend.php:128 modules/pref-prefs.php:312
+msgid "Default"
+msgstr "Utiliser la valeur par défaut"
+
 #: backend.php:129
 #, fuzzy
 msgid "Magpie"
@@ -85,7 +94,7 @@ msgstr "Page"
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:139
+#: backend.php:139 modules/pref-users.php:35
 msgid "User"
 msgstr "Utilisateur"
 
@@ -97,7 +106,7 @@ msgstr ""
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: backend.php:424 modules/pref-users.php:295
+#: backend.php:424 modules/pref-users.php:311
 msgid "Registered"
 msgstr "Abonné"
 
@@ -184,7 +193,7 @@ msgid "Starred articles"
 msgstr "Articles remarquables"
 
 #: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1146
+#: modules/pref-feeds.php:1157
 msgid "Published articles"
 msgstr "Articles publiés"
 
@@ -192,13 +201,13 @@ msgstr "Articles publiés"
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: functions.php:2856 modules/popup-dialog.php:151
-#: modules/pref-filters.php:340
+#: functions.php:2856 modules/popup-dialog.php:175
+#: modules/pref-filters.php:353
 msgid "All feeds"
 msgstr "Tous les flux"
 
 #: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:977
+#: functions.php:4348 modules/pref-feeds.php:988
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
@@ -220,15 +229,15 @@ msgid "Searched for"
 msgstr "Recherché"
 
 #: functions.php:3945 functions.php:3994 functions.php:5216
-#: 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
+#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
+#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-users.php:302
 msgid "Select:"
 msgstr "Sélectionner&nbsp;:"
 
-#: functions.php:3946 functions.php:3995 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
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
+#: modules/pref-feeds.php:951 modules/pref-filters.php:306
+#: modules/pref-labels.php:272 modules/pref-users.php:303
 msgid "All"
 msgstr "Tout"
 
@@ -237,13 +246,13 @@ msgstr "Tout"
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:3948 functions.php:3997 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
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
+#: modules/pref-feeds.php:952 modules/pref-filters.php:307
+#: modules/pref-labels.php:273 modules/pref-users.php:304
 msgid "None"
 msgstr "Aucun"
 
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1100
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
 msgid "Actions..."
 msgstr "Actions..."
 
@@ -289,7 +298,8 @@ msgstr "Marquages spéciaux&nbsp;:"
 msgid "Page"
 msgstr "Page"
 
-#: functions.php:4004 modules/pref-filters.php:329
+#: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
+#: modules/pref-filters.php:342
 msgid "Feed"
 msgstr "Flux"
 
@@ -738,8 +748,8 @@ msgstr "Articles mémorisés"
 msgid "Rescoring articles..."
 msgstr "Articles mémorisés"
 
-#: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:952 modules/pref-feeds.php:1013
+#: localized_schema.php:9 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
 msgid "Title"
 msgstr "Titre"
 
@@ -751,7 +761,7 @@ msgstr "Titre ou contenu"
 msgid "Link"
 msgstr "Lien"
 
-#: localized_schema.php:12 modules/popup-dialog.php:183
+#: localized_schema.php:12 modules/popup-dialog.php:166
 msgid "Content"
 msgstr "Contenu"
 
@@ -1026,12 +1036,11 @@ msgstr ""
 msgid "Do not show images in articles"
 msgstr ""
 
-#: login_form.php:103 modules/popup-dialog.php:100 modules/pref-feeds.php:274
-#: modules/pref-users.php:34
+#: login_form.php:103 modules/popup-dialog.php:107 modules/pref-feeds.php:281
 msgid "Login:"
 msgstr "Nom&nbsp;:"
 
-#: login_form.php:106 modules/popup-dialog.php:101 modules/pref-feeds.php:280
+#: login_form.php:106 modules/popup-dialog.php:111 modules/pref-feeds.php:285
 msgid "Password:"
 msgstr "Mot de passe&nbsp;:"
 
@@ -1286,9 +1295,10 @@ msgstr "Contenu"
 msgid "tag cloud"
 msgstr "Nuage d'étiquettes"
 
-#: tt-rss.php:143 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:854 modules/pref-filters.php:235
-#: modules/pref-labels.php:233 modules/pref-users.php:242
+#: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
+#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/pref-users.php:258
 msgid "Search"
 msgstr "Rechercher"
 
@@ -1352,7 +1362,7 @@ msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:179 modules/popup-dialog.php:139
+#: tt-rss.php:179
 msgid "Search:"
 msgstr "Rechercher&nbsp;:"
 
@@ -1372,7 +1382,7 @@ msgstr "Tous les articles"
 msgid "Limit:"
 msgstr "Limite&nbsp;:"
 
-#: tt-rss.php:219
+#: tt-rss.php:219 modules/pref-feeds.php:247
 msgid "Update"
 msgstr "Mettre à jour"
 
@@ -1443,7 +1453,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:809
+#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
@@ -1517,147 +1527,170 @@ 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:859
-msgid "Subscribe to feed"
+#: modules/popup-dialog.php:61
+#, fuzzy
+msgid "Subscribe to Feed"
 msgstr "S'inscrire à un flux"
 
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:161
-msgid "Feed URL:"
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:167
+#, fuzzy
+msgid "URL:"
 msgstr "URL du flux&nbsp;:"
 
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:169
-msgid "Category:"
-msgstr "Catégorie&nbsp;:"
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:179
+#, fuzzy
+msgid "Place in category:"
+msgstr "Enregistrement de la catégorie..."
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:117
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:276
+#: modules/pref-prefs.php:259 modules/pref-users.php:44
+msgid "Authentication"
+msgstr "Identification"
+
+#: modules/popup-dialog.php:123
+msgid "This feed requires authentication."
+msgstr "Ce flux nécessite une identification."
+
+#: modules/popup-dialog.php:130 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:116
-#: modules/pref-feeds.php:362 modules/pref-filters.php:116
-#: modules/pref-users.php:63
+#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
+#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
+#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/pref-users.php:79
 msgid "Cancel"
 msgstr "Annuler"
 
-#: modules/popup-dialog.php:120
-msgid "This feed requires authentication."
-msgstr "Ce flux nécessite une identification."
-
-#: modules/popup-dialog.php:148
-msgid "Where:"
-msgstr "Emplacement&nbsp;:"
-
-#: modules/popup-dialog.php:164
-msgid "This feed"
-msgstr "Ce flux"
-
-#: modules/popup-dialog.php:179
-msgid "Match on:"
+#: modules/popup-dialog.php:162
+#, fuzzy
+msgid "match on:"
 msgstr "Correspondance sur&nbsp;:"
 
-#: modules/popup-dialog.php:184
+#: modules/popup-dialog.php:167
 msgid "Title or content"
 msgstr "Titre ou contenu"
 
-#: modules/popup-dialog.php:208 modules/pref-labels.php:243
-msgid "Create label"
+#: modules/popup-dialog.php:172
+msgid "Limit search to:"
+msgstr ""
+
+#: modules/popup-dialog.php:188
+msgid "This feed"
+msgstr "Ce flux"
+
+#: modules/popup-dialog.php:223
+#, fuzzy
+msgid "Create Label"
 msgstr "Créer un intitulé"
 
-#: modules/popup-dialog.php:218
-msgid "Caption:"
-msgstr "Descriptif&nbsp;:"
+#: modules/popup-dialog.php:231 modules/pref-labels.php:36
+#: modules/pref-labels.php:278
+msgid "Caption"
+msgstr "Descriptif"
 
-#: modules/popup-dialog.php:227
-msgid "SQL Expression:"
-msgstr "Expression SQL&nbsp;:"
+#: modules/popup-dialog.php:241 modules/pref-labels.php:46
+#, fuzzy
+msgid "Match SQL"
+msgstr "Correspondance"
 
-#: modules/popup-dialog.php:242 modules/pref-labels.php:62
+#: modules/popup-dialog.php:259 modules/pref-labels.php:64
 #, fuzzy
 msgid "Help"
 msgstr "Bonjour,"
 
-#: modules/popup-dialog.php:245
+#: modules/popup-dialog.php:262
 msgid "Test"
 msgstr "Tester"
 
-#: modules/popup-dialog.php:252 modules/popup-dialog.php:339
+#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
 msgid "Create"
 msgstr "Créer"
 
-#: modules/popup-dialog.php:265 modules/pref-filters.php:245
-msgid "Create filter"
+#: modules/popup-dialog.php:282
+#, fuzzy
+msgid "Create Filter"
 msgstr "Créer un filtre"
 
-#: modules/popup-dialog.php:283 modules/popup-dialog.php:314
-#: modules/pref-filters.php:38 modules/pref-filters.php:70
+#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/pref-filters.php:38 modules/pref-filters.php:72
 msgid "description"
 msgstr "description"
 
-#: modules/popup-dialog.php:288 modules/pref-filters.php:43
-msgid "Match:"
-msgstr "Correspondance&nbsp;:"
+#: modules/popup-dialog.php:351 modules/pref-filters.php:41
+#: modules/pref-filters.php:343
+msgid "Match"
+msgstr "Correspondance"
 
-#: modules/popup-dialog.php:294 modules/pref-filters.php:49
-msgid "On field:"
+#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+#, fuzzy
+msgid "on field"
 msgstr "Sur le champ&nbsp;:"
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:54
-msgid "Feed:"
-msgstr "Flux&nbsp;:"
+#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#, fuzzy
+msgid "in"
+msgstr "Lien"
 
-#: modules/popup-dialog.php:305 modules/pref-filters.php:60
-msgid "Action:"
-msgstr "Action&nbsp;:"
+#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#, fuzzy
+msgid "Perform Action"
+msgstr "Exécuter les mises à jour"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:77
-msgid "Params:"
-msgstr "Paramètres&nbsp;:"
+#: modules/popup-dialog.php:386 modules/pref-filters.php:77
+msgid "with params"
+msgstr ""
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:293
-msgid "Options:"
+#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
+#: modules/pref-filters.php:86 modules/pref-users.php:60
+#, fuzzy
+msgid "Options"
 msgstr "Options&nbsp;:"
 
-#: modules/popup-dialog.php:328 modules/pref-filters.php:101
+#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+msgid "Enabled"
+msgstr "Activé"
+
+#: modules/popup-dialog.php:402 modules/pref-filters.php:107
 msgid "Inverse match"
 msgstr "Correspondance inverse"
 
-#: modules/popup-dialog.php:354
+#: modules/popup-dialog.php:429
 msgid "Update Errors"
 msgstr "Erreurs de mise à jour"
 
-#: modules/popup-dialog.php:357
+#: modules/popup-dialog.php:432
 msgid "These feeds have not been updated because of errors:"
 msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs&nbsp;:"
 
-#: modules/popup-dialog.php:376
+#: modules/popup-dialog.php:451
 msgid "Close"
 msgstr "Fermer"
 
-#: modules/popup-dialog.php:385
+#: modules/popup-dialog.php:460
 msgid "Edit Tags"
 msgstr "Modifier les étiquettes"
 
-#: modules/popup-dialog.php:390
+#: modules/popup-dialog.php:465
 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:360
-#: modules/pref-filters.php:112 modules/pref-users.php:60
+#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
+#: modules/pref-filters.php:117 modules/pref-users.php:76
 msgid "Save"
 msgstr "Enregistrer"
 
-#: modules/popup-dialog.php:448
+#: modules/popup-dialog.php:523
 msgid "Tag cloud"
 msgstr "Nuage d'étiquettes"
 
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:526
 msgid "Showing most popular tags "
 msgstr "Affichage des étiquettes les plus populaires "
 
-#: modules/popup-dialog.php:452
+#: modules/popup-dialog.php:527
 msgid "browse more"
 msgstr "en afficher plus"
 
@@ -1717,180 +1750,178 @@ msgstr ""
 "Affichage des 25 meilleurs flux enregistrés, classés par popularité&nbsp;:"
 
 #: modules/pref-feeds.php:141
-msgid "Feed editor"
+#, fuzzy
+msgid "Feed Editor"
 msgstr "Éditeur de flux"
 
-#: modules/pref-feeds.php:153
-msgid "Title:"
-msgstr "Titre&nbsp;:"
-
-#: modules/pref-feeds.php:189
-msgid "Update Interval:"
-msgstr "Fréquence de mise à jour&nbsp;:"
-
-#: modules/pref-feeds.php:198
-msgid "Link to:"
+#: modules/pref-feeds.php:196
+#, fuzzy
+msgid "Link to feed:"
 msgstr "Lier à&nbsp;:"
 
-#: modules/pref-feeds.php:215
+#: modules/pref-feeds.php:213
 msgid "Not linked"
 msgstr "Non lié"
 
-#: modules/pref-feeds.php:249
+#: modules/pref-feeds.php:261
+msgid "using"
+msgstr ""
+
+#: modules/pref-feeds.php:271
 msgid "Article purging:"
 msgstr "Purge des articles&nbsp;:"
 
-#: modules/pref-feeds.php:262
-#, fuzzy
-msgid "Update using:"
-msgstr "Mettre à jour"
-
-#: modules/pref-feeds.php:295
+#: modules/pref-feeds.php:300
 msgid "Hide from \"Other Feeds\""
 msgstr "Masquer dans «&nbsp;Autres flux&nbsp;»"
 
-#: modules/pref-feeds.php:306
+#: modules/pref-feeds.php:311
 msgid "Right-to-left content"
 msgstr "Contenu écrit de droite à gauche"
 
-#: modules/pref-feeds.php:317
+#: modules/pref-feeds.php:322
 msgid "Hide from my feed list"
 msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
 
-#: modules/pref-feeds.php:329
+#: modules/pref-feeds.php:334
 msgid "Include in e-mail digest"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: modules/pref-feeds.php:350
+#: modules/pref-feeds.php:355
 msgid "Cache images locally"
 msgstr "Enregistrer localement les images"
 
-#: modules/pref-feeds.php:514 modules/pref-feeds.php:561
+#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+msgid "Unsubscribe"
+msgstr "Se désinscrire"
+
+#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:592
+#: modules/pref-feeds.php:603
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Inscrit à <b>%s</b>."
 
-#: modules/pref-feeds.php:594
+#: modules/pref-feeds.php:605
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Déjà inscrit à <b>%s</b>."
 
-#: modules/pref-feeds.php:676
+#: modules/pref-feeds.php:687
 msgid "Category editor"
 msgstr "Éditeur de catégorie"
 
-#: modules/pref-feeds.php:699
+#: modules/pref-feeds.php:710
 #, 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:727
+#: modules/pref-feeds.php:738
 msgid "Unable to delete non empty feed categories."
 msgstr "Impossible de supprimer une catégorie de flux non vide."
 
-#: modules/pref-feeds.php:744
+#: modules/pref-feeds.php:755
 msgid "Create category"
 msgstr "Créer la catégorie"
 
-#: modules/pref-feeds.php:804
+#: modules/pref-feeds.php:815
 msgid "No feed categories defined."
 msgstr "Aucune catégorie de flux définie."
 
-#: modules/pref-feeds.php:815 modules/pref-filters.php:398
-#: modules/pref-labels.php:324 modules/pref-users.php:359
+#: modules/pref-feeds.php:826 modules/pref-filters.php:128
+#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-users.php:375
 msgid "Remove"
 msgstr "Supprimer"
 
-#: modules/pref-feeds.php:837
+#: modules/pref-feeds.php:848
 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:864
+#: modules/pref-feeds.php:870
+msgid "Subscribe to feed"
+msgstr "S'inscrire à un flux"
+
+#: modules/pref-feeds.php:875
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:938
+#: modules/pref-feeds.php:949
 msgid "Show last article times"
 msgstr "Afficher l'heure du dernier article"
 
-#: modules/pref-feeds.php:955 modules/pref-feeds.php:1017
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
 msgid "Last&nbsp;Article"
 msgstr "Dernier&nbsp;article"
 
-#: modules/pref-feeds.php:958 modules/pref-feeds.php:1021
+#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: modules/pref-feeds.php:1042 modules/pref-filters.php:372
-#: modules/pref-labels.php:304 modules/pref-users.php:334
+#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
+#: modules/pref-labels.php:306 modules/pref-users.php:350
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1088 modules/pref-feeds.php:1102
+#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
 msgid "Selection:"
 msgstr "Sélection&nbsp;:"
 
-#: modules/pref-feeds.php:1094
+#: modules/pref-feeds.php:1105
 msgid "Recategorize"
 msgstr "Changer de catégorie"
 
-#: modules/pref-feeds.php:1103 modules/pref-filters.php:396
-#: modules/pref-labels.php:322 modules/pref-users.php:357
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
+#: modules/pref-labels.php:324 modules/pref-users.php:373
 msgid "Edit"
 msgstr "Modifier"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1115
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1116
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:252
+#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Articles mémorisés"
 
-#: modules/pref-feeds.php:1107
-msgid "Unsubscribe"
-msgstr "Se désinscrire"
-
-#: modules/pref-feeds.php:1112
+#: modules/pref-feeds.php:1123
 msgid "Other:"
 msgstr "Autre&nbsp;:"
 
-#: modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1124
 msgid "Edit categories"
 msgstr "Modifier les catégories"
 
-#: modules/pref-feeds.php:1120
+#: modules/pref-feeds.php:1131
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1135
 msgid "File:"
 msgstr "Fichier&nbsp;:"
 
-#: modules/pref-feeds.php:1127
+#: modules/pref-feeds.php:1138
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1145
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: modules/pref-feeds.php:1137
+#: modules/pref-feeds.php:1148
 msgid "Firefox Integration"
 msgstr "Intégration à Firefox"
 
-#: modules/pref-feeds.php:1139
+#: modules/pref-feeds.php:1150
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1898,11 +1929,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:1143
+#: modules/pref-feeds.php:1154
 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:1152
+#: modules/pref-feeds.php:1163
 #, fuzzy
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
@@ -1911,67 +1942,64 @@ 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:1159
+#: modules/pref-feeds.php:1170
 #, fuzzy
 msgid "Generate another link"
 msgstr "Générer une autre adresse"
 
 #: modules/pref-filters.php:22
-msgid "Filter editor"
+#, fuzzy
+msgid "Filter Editor"
 msgstr "Éditeur de filtre"
 
-#: modules/pref-filters.php:92
-msgid "Enabled"
-msgstr "Activé"
-
-#: modules/pref-filters.php:152
+#: modules/pref-filters.php:165
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr "Filtre <b>%s</b> enregistré"
 
-#: modules/pref-filters.php:192
+#: modules/pref-filters.php:205
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filtre <b>%s</b> créé"
 
-#: modules/pref-filters.php:318
+#: modules/pref-filters.php:258
+msgid "Create filter"
+msgstr "Créer un filtre"
+
+#: modules/pref-filters.php:331
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:319
+#: modules/pref-filters.php:332
 msgid "action_description"
 msgstr ""
 
-#: modules/pref-filters.php:328
+#: modules/pref-filters.php:341
 msgid "Filter expression"
 msgstr "Expression du filtre"
 
-#: modules/pref-filters.php:330
-msgid "Match"
-msgstr "Correspondance"
-
-#: modules/pref-filters.php:331
+#: modules/pref-filters.php:344
 msgid "Action"
 msgstr "Action"
 
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:345
 #, fuzzy
 msgid "Params"
 msgstr "Paramètres&nbsp;:"
 
-#: modules/pref-filters.php:361
+#: modules/pref-filters.php:374
 msgid "(Disabled)"
 msgstr "(Désactivé)"
 
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:393
 msgid "(Inverse)"
 msgstr "(Inverse)"
 
-#: modules/pref-filters.php:406
+#: modules/pref-filters.php:419
 msgid "No filters defined."
 msgstr "Aucun filtre défini."
 
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:421
 #, fuzzy
 msgid "No matching filters found."
 msgstr "Aucun article trouvé."
@@ -1983,34 +2011,34 @@ msgid ""
 "functionality."
 msgstr ""
 
-#: modules/pref-labels.php:173
+#: modules/pref-labels.php:175
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr "Intitulé <b>%s</b> enregistré"
 
-#: modules/pref-labels.php:205
+#: modules/pref-labels.php:207
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Intitulé <b>%s</b> créé"
 
-#: modules/pref-labels.php:276
-msgid "Caption"
-msgstr "Descriptif"
+#: modules/pref-labels.php:245
+msgid "Create label"
+msgstr "Créer un intitulé"
 
-#: modules/pref-labels.php:277
+#: modules/pref-labels.php:279
 msgid "SQL Expression"
 msgstr "Expression SQL"
 
-#: modules/pref-labels.php:302
+#: modules/pref-labels.php:304
 #, fuzzy
 msgid "[No caption]"
 msgstr "Descriptif"
 
-#: modules/pref-labels.php:329
+#: modules/pref-labels.php:331
 msgid "No labels defined."
 msgstr "Aucun intitulé défini."
 
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:333
 #, fuzzy
 msgid "No matching labels found."
 msgstr "Aucun article trouvé."
@@ -2060,10 +2088,6 @@ msgstr "Permissions&nbsp;:"
 msgid "Change e-mail"
 msgstr "Modifier l'adresse électronique"
 
-#: modules/pref-prefs.php:259
-msgid "Authentication"
-msgstr "Identification"
-
 #: modules/pref-prefs.php:261
 msgid "Old password"
 msgstr "Ancien mot de passe"
@@ -2088,10 +2112,6 @@ msgstr "Thèmes"
 msgid "Select theme"
 msgstr "Sélectionner un thème"
 
-#: modules/pref-prefs.php:312
-msgid "Default"
-msgstr "Utiliser la valeur par défaut"
-
 #: modules/pref-prefs.php:328
 msgid "Change theme"
 msgstr "Modifier le thème"
@@ -2122,42 +2142,46 @@ 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"
+#, fuzzy
+msgid "User Editor"
 msgstr "Éditeur d'utilisateur"
 
-#: modules/pref-users.php:38
-msgid "Change password:"
-msgstr "Modifier le mot de passe&nbsp;:"
-
-#: modules/pref-users.php:42
-msgid "E-mail:"
-msgstr "Adresse électronique&nbsp;:"
-
-#: modules/pref-users.php:48
-msgid "Access level:"
+#: modules/pref-users.php:47
+#, fuzzy
+msgid "Access level: "
 msgstr "Permissions&nbsp;:"
 
-#: modules/pref-users.php:83
+#: modules/pref-users.php:54
+#, fuzzy
+msgid "Change password to"
+msgstr "Modifier le mot de passe"
+
+#: modules/pref-users.php:63
+#, fuzzy
+msgid "E-mail: "
+msgstr "Adresse électronique&nbsp;:"
+
+#: modules/pref-users.php:99
 #, 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:131
+#: modules/pref-users.php:147
 #, 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:138
+#: modules/pref-users.php:154
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Impossible de créer l'utilisateur <b>%s</b>"
 
-#: modules/pref-users.php:142
+#: modules/pref-users.php:158
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "L'utilisateur <b>%s</b> existe déjà."
 
-#: modules/pref-users.php:162
+#: modules/pref-users.php:178
 #, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
@@ -2166,49 +2190,83 @@ msgstr ""
 "Mot de passe de l'utilisateur <b>%s</b>\n"
 "\t\t\t\t\tmodifié en <b>%s</b>"
 
-#: modules/pref-users.php:166
+#: modules/pref-users.php:182
 #, fuzzy, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Ajout de la catégorie <b>%s</b>."
 
-#: modules/pref-users.php:202
+#: modules/pref-users.php:218
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: modules/pref-users.php:259
+#: modules/pref-users.php:275
 msgid "Create user"
 msgstr "Créer l'utilisateur"
 
-#: modules/pref-users.php:293
+#: modules/pref-users.php:309
 msgid "Login"
 msgstr "Se connecter"
 
-#: modules/pref-users.php:294
+#: modules/pref-users.php:310
 msgid "Access Level"
 msgstr "Permissions"
 
-#: modules/pref-users.php:296
+#: modules/pref-users.php:312
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: modules/pref-users.php:355
+#: modules/pref-users.php:371
 msgid "User details"
 msgstr "Détails de l'utilisateur"
 
-#: modules/pref-users.php:361
+#: modules/pref-users.php:377
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
-#: modules/pref-users.php:366
+#: modules/pref-users.php:382
 #, fuzzy
 msgid "No users defined."
 msgstr "Aucun filtre défini."
 
-#: modules/pref-users.php:368
+#: modules/pref-users.php:384
 #, fuzzy
 msgid "No matching users found."
 msgstr "Aucun article trouvé."
 
+#~ msgid "Category:"
+#~ msgstr "Catégorie&nbsp;:"
+
+#~ msgid "Where:"
+#~ msgstr "Emplacement&nbsp;:"
+
+#~ msgid "Caption:"
+#~ msgstr "Descriptif&nbsp;:"
+
+#~ msgid "SQL Expression:"
+#~ msgstr "Expression SQL&nbsp;:"
+
+#~ msgid "Match:"
+#~ msgstr "Correspondance&nbsp;:"
+
+#~ msgid "Feed:"
+#~ msgstr "Flux&nbsp;:"
+
+#~ msgid "Action:"
+#~ msgstr "Action&nbsp;:"
+
+#~ msgid "Params:"
+#~ msgstr "Paramètres&nbsp;:"
+
+#~ msgid "Title:"
+#~ msgstr "Titre&nbsp;:"
+
+#, fuzzy
+#~ msgid "Update using:"
+#~ msgstr "Mettre à jour"
+
+#~ msgid "Change password:"
+#~ msgstr "Modifier le mot de passe&nbsp;:"
+
 #~ msgid "Show article"
 #~ msgstr "Afficher l'article"
 
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index a0aae9dae..a3fa4cc89 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 bd9b3f345..2db8e7b0b 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-08-01 11:55+0400\n"
+"POT-Creation-Date: 2008-08-06 16: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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:108 backend.php:117 backend.php:128
+#: backend.php:108
 msgid "Use default"
 msgstr "Használd az alapértelmezettet"
 
@@ -44,6 +44,11 @@ msgstr "2 hónapos"
 msgid "3 months old"
 msgstr "3 hónapos"
 
+#: backend.php:117
+#, fuzzy
+msgid "Default interval"
+msgstr "Frissítési intervallum:"
+
 #: backend.php:118
 msgid "Disable updates"
 msgstr "Frissítés kikapcsolása"
@@ -76,6 +81,10 @@ msgstr "Napi"
 msgid "Weekly"
 msgstr "Heti"
 
+#: backend.php:128 modules/pref-prefs.php:312
+msgid "Default"
+msgstr "Alapértelmezett"
+
 #: backend.php:129
 #, fuzzy
 msgid "Magpie"
@@ -85,7 +94,7 @@ msgstr "Oldal"
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:139
+#: backend.php:139 modules/pref-users.php:35
 msgid "User"
 msgstr "Felhasználó"
 
@@ -97,7 +106,7 @@ msgstr ""
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
-#: backend.php:424 modules/pref-users.php:295
+#: backend.php:424 modules/pref-users.php:311
 msgid "Registered"
 msgstr "Regisztrált"
 
@@ -176,7 +185,7 @@ msgid "Starred articles"
 msgstr "Csillagost hírek"
 
 #: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1146
+#: modules/pref-feeds.php:1157
 msgid "Published articles"
 msgstr "Publikált hírek"
 
@@ -184,13 +193,13 @@ msgstr "Publikált hírek"
 msgid "Fresh articles"
 msgstr "Olvasatlan hírek"
 
-#: functions.php:2856 modules/popup-dialog.php:151
-#: modules/pref-filters.php:340
+#: functions.php:2856 modules/popup-dialog.php:175
+#: modules/pref-filters.php:353
 msgid "All feeds"
 msgstr "Minden feed"
 
 #: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:977
+#: functions.php:4348 modules/pref-feeds.php:988
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
@@ -212,15 +221,15 @@ msgid "Searched for"
 msgstr ""
 
 #: functions.php:3945 functions.php:3994 functions.php:5216
-#: 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
+#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
+#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-users.php:302
 msgid "Select:"
 msgstr "Kiválaszt:"
 
-#: functions.php:3946 functions.php:3995 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
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
+#: modules/pref-feeds.php:951 modules/pref-filters.php:306
+#: modules/pref-labels.php:272 modules/pref-users.php:303
 msgid "All"
 msgstr "Mind"
 
@@ -229,13 +238,13 @@ msgstr "Mind"
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: functions.php:3948 functions.php:3997 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
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
+#: modules/pref-feeds.php:952 modules/pref-filters.php:307
+#: modules/pref-labels.php:273 modules/pref-users.php:304
 msgid "None"
 msgstr "Egyiksem"
 
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1100
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
 msgid "Actions..."
 msgstr "Műveletek"
 
@@ -281,7 +290,8 @@ msgstr "Megjelöl:"
 msgid "Page"
 msgstr "Oldal"
 
-#: functions.php:4004 modules/pref-filters.php:329
+#: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
+#: modules/pref-filters.php:342
 msgid "Feed"
 msgstr ""
 
@@ -725,8 +735,8 @@ msgstr "Tárolt hírek"
 msgid "Rescoring articles..."
 msgstr "Tárolt hírek"
 
-#: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:952 modules/pref-feeds.php:1013
+#: localized_schema.php:9 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
 msgid "Title"
 msgstr "Cím"
 
@@ -738,7 +748,7 @@ msgstr "Cím vagy Tartalom"
 msgid "Link"
 msgstr "Link"
 
-#: localized_schema.php:12 modules/popup-dialog.php:183
+#: localized_schema.php:12 modules/popup-dialog.php:166
 msgid "Content"
 msgstr "Tartalom"
 
@@ -989,12 +999,11 @@ msgstr ""
 msgid "Do not show images in articles"
 msgstr ""
 
-#: login_form.php:103 modules/popup-dialog.php:100 modules/pref-feeds.php:274
-#: modules/pref-users.php:34
+#: login_form.php:103 modules/popup-dialog.php:107 modules/pref-feeds.php:281
 msgid "Login:"
 msgstr "Felhasználó:"
 
-#: login_form.php:106 modules/popup-dialog.php:101 modules/pref-feeds.php:280
+#: login_form.php:106 modules/popup-dialog.php:111 modules/pref-feeds.php:285
 msgid "Password:"
 msgstr "Jelszó:"
 
@@ -1204,9 +1213,10 @@ msgstr "Hozzászólás?"
 msgid "tag cloud"
 msgstr "tag felhő"
 
-#: tt-rss.php:143 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:854 modules/pref-filters.php:235
-#: modules/pref-labels.php:233 modules/pref-users.php:242
+#: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
+#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/pref-users.php:258
 msgid "Search"
 msgstr "Keresés"
 
@@ -1270,7 +1280,7 @@ msgstr "Minden feed"
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:179 modules/popup-dialog.php:139
+#: tt-rss.php:179
 msgid "Search:"
 msgstr "Keresés"
 
@@ -1290,7 +1300,7 @@ msgstr "Minden hír"
 msgid "Limit:"
 msgstr "Limit:"
 
-#: tt-rss.php:219
+#: tt-rss.php:219 modules/pref-feeds.php:247
 msgid "Update"
 msgstr "Frissítés"
 
@@ -1358,7 +1368,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:809
+#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
 msgid "Close this window"
 msgstr ""
 
@@ -1422,147 +1432,170 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr ""
 
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:859
-msgid "Subscribe to feed"
+#: modules/popup-dialog.php:61
+#, fuzzy
+msgid "Subscribe to Feed"
 msgstr "Feliratkozás feedre"
 
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:161
-msgid "Feed URL:"
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:167
+#, fuzzy
+msgid "URL:"
 msgstr "Feed URL:"
 
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:169
-msgid "Category:"
-msgstr "Kategória:"
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:179
+#, fuzzy
+msgid "Place in category:"
+msgstr "Kategória mentése"
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:117
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:276
+#: modules/pref-prefs.php:259 modules/pref-users.php:44
+msgid "Authentication"
+msgstr "Azonosítás"
+
+#: modules/popup-dialog.php:123
+msgid "This feed requires authentication."
+msgstr "Ez a feed azonosítást igényel."
+
+#: modules/popup-dialog.php:130 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:116
-#: modules/pref-feeds.php:362 modules/pref-filters.php:116
-#: modules/pref-users.php:63
+#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
+#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
+#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/pref-users.php:79
 msgid "Cancel"
 msgstr "Mégse"
 
-#: modules/popup-dialog.php:120
-msgid "This feed requires authentication."
-msgstr "Ez a feed azonosítást igényel."
-
-#: modules/popup-dialog.php:148
-msgid "Where:"
-msgstr "Ahol:"
-
-#: modules/popup-dialog.php:164
-msgid "This feed"
-msgstr "Ez a feed"
-
-#: modules/popup-dialog.php:179
-msgid "Match on:"
+#: modules/popup-dialog.php:162
+#, fuzzy
+msgid "match on:"
 msgstr "Egyezés ezzel:"
 
-#: modules/popup-dialog.php:184
+#: modules/popup-dialog.php:167
 msgid "Title or content"
 msgstr "Cím vagy tartalom"
 
-#: modules/popup-dialog.php:208 modules/pref-labels.php:243
-msgid "Create label"
-msgstr "Címke készítése"
-
-#: modules/popup-dialog.php:218
-msgid "Caption:"
-msgstr "Aláírás:"
-
-#: modules/popup-dialog.php:227
-msgid "SQL Expression:"
+#: modules/popup-dialog.php:172
+msgid "Limit search to:"
 msgstr ""
 
-#: modules/popup-dialog.php:242 modules/pref-labels.php:62
+#: modules/popup-dialog.php:188
+msgid "This feed"
+msgstr "Ez a feed"
+
+#: modules/popup-dialog.php:223
+#, fuzzy
+msgid "Create Label"
+msgstr "Címke készítése"
+
+#: modules/popup-dialog.php:231 modules/pref-labels.php:36
+#: modules/pref-labels.php:278
+msgid "Caption"
+msgstr "Aláírás"
+
+#: modules/popup-dialog.php:241 modules/pref-labels.php:46
+#, fuzzy
+msgid "Match SQL"
+msgstr "Egyezés"
+
+#: modules/popup-dialog.php:259 modules/pref-labels.php:64
 msgid "Help"
 msgstr "Segítség"
 
-#: modules/popup-dialog.php:245
+#: modules/popup-dialog.php:262
 msgid "Test"
 msgstr "Teszt"
 
-#: modules/popup-dialog.php:252 modules/popup-dialog.php:339
+#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
 msgid "Create"
 msgstr "Készít"
 
-#: modules/popup-dialog.php:265 modules/pref-filters.php:245
-msgid "Create filter"
+#: modules/popup-dialog.php:282
+#, fuzzy
+msgid "Create Filter"
 msgstr "Szárő készítése"
 
-#: modules/popup-dialog.php:283 modules/popup-dialog.php:314
-#: modules/pref-filters.php:38 modules/pref-filters.php:70
+#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/pref-filters.php:38 modules/pref-filters.php:72
 #, fuzzy
 msgid "description"
 msgstr "Kiválasztottakat"
 
-#: modules/popup-dialog.php:288 modules/pref-filters.php:43
-msgid "Match:"
+#: modules/popup-dialog.php:351 modules/pref-filters.php:41
+#: modules/pref-filters.php:343
+msgid "Match"
 msgstr "Egyezés"
 
-#: modules/popup-dialog.php:294 modules/pref-filters.php:49
-msgid "On field:"
+#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+#, fuzzy
+msgid "on field"
 msgstr "Ebben a mezőben:"
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:54
-msgid "Feed:"
-msgstr "Feed:"
+#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#, fuzzy
+msgid "in"
+msgstr "Link"
 
-#: modules/popup-dialog.php:305 modules/pref-filters.php:60
-msgid "Action:"
-msgstr "Művelet:"
+#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#, fuzzy
+msgid "Perform Action"
+msgstr "Művelet"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:77
-msgid "Params:"
-msgstr "Paraméterek"
+#: modules/popup-dialog.php:386 modules/pref-filters.php:77
+msgid "with params"
+msgstr ""
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:293
-msgid "Options:"
+#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
+#: modules/pref-filters.php:86 modules/pref-users.php:60
+#, fuzzy
+msgid "Options"
 msgstr "Beállítások:"
 
-#: modules/popup-dialog.php:328 modules/pref-filters.php:101
+#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+msgid "Enabled"
+msgstr "Engedélyez"
+
+#: modules/popup-dialog.php:402 modules/pref-filters.php:107
 msgid "Inverse match"
 msgstr ""
 
-#: modules/popup-dialog.php:354
+#: modules/popup-dialog.php:429
 msgid "Update Errors"
 msgstr "Frissítési hiba"
 
-#: modules/popup-dialog.php:357
+#: modules/popup-dialog.php:432
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
-#: modules/popup-dialog.php:376
+#: modules/popup-dialog.php:451
 msgid "Close"
 msgstr "Bezár"
 
-#: modules/popup-dialog.php:385
+#: modules/popup-dialog.php:460
 msgid "Edit Tags"
 msgstr "Tegek szerkesztése"
 
-#: modules/popup-dialog.php:390
+#: modules/popup-dialog.php:465
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:360
-#: modules/pref-filters.php:112 modules/pref-users.php:60
+#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
+#: modules/pref-filters.php:117 modules/pref-users.php:76
 msgid "Save"
 msgstr "Mentés"
 
-#: modules/popup-dialog.php:448
+#: modules/popup-dialog.php:523
 msgid "Tag cloud"
 msgstr "Tag felhő"
 
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:526
 msgid "Showing most popular tags "
 msgstr "Mutasd a legnépszerűbb tageket"
 
-#: modules/popup-dialog.php:452
+#: modules/popup-dialog.php:527
 msgid "browse more"
 msgstr "tovább böngészik"
 
@@ -1619,254 +1652,249 @@ 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:141
-msgid "Feed editor"
+#, fuzzy
+msgid "Feed Editor"
 msgstr "Feed editor"
 
-#: modules/pref-feeds.php:153
-msgid "Title:"
-msgstr "Cím:"
-
-#: modules/pref-feeds.php:189
-msgid "Update Interval:"
-msgstr "Frissítési intervallum:"
-
-#: modules/pref-feeds.php:198
-msgid "Link to:"
+#: modules/pref-feeds.php:196
+#, fuzzy
+msgid "Link to feed:"
 msgstr "Linkel ehhez:"
 
-#: modules/pref-feeds.php:215
+#: modules/pref-feeds.php:213
 msgid "Not linked"
 msgstr "Nem linkelt"
 
-#: modules/pref-feeds.php:249
+#: modules/pref-feeds.php:261
+msgid "using"
+msgstr ""
+
+#: modules/pref-feeds.php:271
 msgid "Article purging:"
 msgstr ""
 
-#: modules/pref-feeds.php:262
-#, fuzzy
-msgid "Update using:"
-msgstr "Frissítés"
-
-#: modules/pref-feeds.php:295
+#: modules/pref-feeds.php:300
 msgid "Hide from \"Other Feeds\""
 msgstr ""
 
-#: modules/pref-feeds.php:306
+#: modules/pref-feeds.php:311
 msgid "Right-to-left content"
 msgstr ""
 
-#: modules/pref-feeds.php:317
+#: modules/pref-feeds.php:322
 msgid "Hide from my feed list"
 msgstr ""
 
-#: modules/pref-feeds.php:329
+#: modules/pref-feeds.php:334
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: modules/pref-feeds.php:350
+#: modules/pref-feeds.php:355
 msgid "Cache images locally"
 msgstr "Képek helyi tárolása"
 
-#: modules/pref-feeds.php:514 modules/pref-feeds.php:561
+#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+msgid "Unsubscribe"
+msgstr "Leiratkozás"
+
+#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:592
+#: modules/pref-feeds.php:603
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:594
+#: modules/pref-feeds.php:605
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:676
+#: modules/pref-feeds.php:687
 msgid "Category editor"
 msgstr ""
 
-#: modules/pref-feeds.php:699
+#: modules/pref-feeds.php:710
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr ""
 
-#: modules/pref-feeds.php:727
+#: modules/pref-feeds.php:738
 msgid "Unable to delete non empty feed categories."
 msgstr ""
 
-#: modules/pref-feeds.php:744
+#: modules/pref-feeds.php:755
 msgid "Create category"
 msgstr "Kategória létrehozása"
 
-#: modules/pref-feeds.php:804
+#: modules/pref-feeds.php:815
 msgid "No feed categories defined."
 msgstr "Nincs feed kategória definiálva"
 
-#: modules/pref-feeds.php:815 modules/pref-filters.php:398
-#: modules/pref-labels.php:324 modules/pref-users.php:359
+#: modules/pref-feeds.php:826 modules/pref-filters.php:128
+#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-users.php:375
 msgid "Remove"
 msgstr "Eltávolít"
 
-#: modules/pref-feeds.php:837
+#: modules/pref-feeds.php:848
 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:864
+#: modules/pref-feeds.php:870
+msgid "Subscribe to feed"
+msgstr "Feliratkozás feedre"
+
+#: modules/pref-feeds.php:875
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:938
+#: modules/pref-feeds.php:949
 msgid "Show last article times"
 msgstr "Mutasd az utolsó hír időpontját"
 
-#: modules/pref-feeds.php:955 modules/pref-feeds.php:1017
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
 msgid "Last&nbsp;Article"
 msgstr "Utolsó&nbsp;Hír"
 
-#: modules/pref-feeds.php:958 modules/pref-feeds.php:1021
+#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
 msgid "Updated"
 msgstr "Frissítve"
 
-#: modules/pref-feeds.php:1042 modules/pref-filters.php:372
-#: modules/pref-labels.php:304 modules/pref-users.php:334
+#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
+#: modules/pref-labels.php:306 modules/pref-users.php:350
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1088 modules/pref-feeds.php:1102
+#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
 msgid "Selection:"
 msgstr "Kiválaszt:"
 
-#: modules/pref-feeds.php:1094
+#: modules/pref-feeds.php:1105
 msgid "Recategorize"
 msgstr "Újrakategorizál"
 
-#: modules/pref-feeds.php:1103 modules/pref-filters.php:396
-#: modules/pref-labels.php:322 modules/pref-users.php:357
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
+#: modules/pref-labels.php:324 modules/pref-users.php:373
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1115
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1116
 msgid "Clear feed data"
 msgstr "Feed adatok törlése"
 
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:252
+#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Tárolt hírek"
 
-#: modules/pref-feeds.php:1107
-msgid "Unsubscribe"
-msgstr "Leiratkozás"
-
-#: modules/pref-feeds.php:1112
+#: modules/pref-feeds.php:1123
 msgid "Other:"
 msgstr "Más:"
 
-#: modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1124
 msgid "Edit categories"
 msgstr "Kategóriák szerkesztése"
 
-#: modules/pref-feeds.php:1120
+#: modules/pref-feeds.php:1131
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1135
 msgid "File:"
 msgstr "File:"
 
-#: modules/pref-feeds.php:1127
+#: modules/pref-feeds.php:1138
 msgid "Import"
 msgstr "Importálás"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1145
 msgid "Export OPML"
 msgstr "Exportálás OPML-be"
 
-#: modules/pref-feeds.php:1137
+#: modules/pref-feeds.php:1148
 msgid "Firefox Integration"
 msgstr "Firefox integráció"
 
-#: modules/pref-feeds.php:1139
+#: modules/pref-feeds.php:1150
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1143
+#: modules/pref-feeds.php:1154
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1152
+#: modules/pref-feeds.php:1163
 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:1159
+#: modules/pref-feeds.php:1170
 #, fuzzy
 msgid "Generate another link"
 msgstr "Másik cím genrálása"
 
 #: modules/pref-filters.php:22
-msgid "Filter editor"
+#, fuzzy
+msgid "Filter Editor"
 msgstr "Szűrő módosítása"
 
-#: modules/pref-filters.php:92
-msgid "Enabled"
-msgstr "Engedélyez"
-
-#: modules/pref-filters.php:152
+#: modules/pref-filters.php:165
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:192
+#: modules/pref-filters.php:205
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:318
+#: modules/pref-filters.php:258
+msgid "Create filter"
+msgstr "Szárő készítése"
+
+#: modules/pref-filters.php:331
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:319
+#: modules/pref-filters.php:332
 msgid "action_description"
 msgstr ""
 
-#: modules/pref-filters.php:328
+#: modules/pref-filters.php:341
 msgid "Filter expression"
 msgstr ""
 
-#: modules/pref-filters.php:330
-msgid "Match"
-msgstr "Egyezés"
-
-#: modules/pref-filters.php:331
+#: modules/pref-filters.php:344
 msgid "Action"
 msgstr "Művelet"
 
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:345
 #, fuzzy
 msgid "Params"
 msgstr "Paraméterek"
 
-#: modules/pref-filters.php:361
+#: modules/pref-filters.php:374
 msgid "(Disabled)"
 msgstr "(Kikapcsolva)"
 
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:393
 msgid "(Inverse)"
 msgstr "(ellentét)"
 
-#: modules/pref-filters.php:406
+#: modules/pref-filters.php:419
 msgid "No filters defined."
 msgstr "Nincs szűrő definiálva."
 
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:421
 #, fuzzy
 msgid "No matching filters found."
 msgstr "Nincs szűrő definiálva."
@@ -1878,34 +1906,34 @@ msgid ""
 "functionality."
 msgstr ""
 
-#: modules/pref-labels.php:173
+#: modules/pref-labels.php:175
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr ""
 
-#: modules/pref-labels.php:205
+#: modules/pref-labels.php:207
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr ""
 
-#: modules/pref-labels.php:276
-msgid "Caption"
-msgstr "Aláírás"
+#: modules/pref-labels.php:245
+msgid "Create label"
+msgstr "Címke készítése"
 
-#: modules/pref-labels.php:277
+#: modules/pref-labels.php:279
 msgid "SQL Expression"
 msgstr ""
 
-#: modules/pref-labels.php:302
+#: modules/pref-labels.php:304
 #, fuzzy
 msgid "[No caption]"
 msgstr "Aláírás"
 
-#: modules/pref-labels.php:329
+#: modules/pref-labels.php:331
 msgid "No labels defined."
 msgstr "Nincs címke definiálva."
 
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:333
 #, fuzzy
 msgid "No matching labels found."
 msgstr "Nincs címke definiálva."
@@ -1953,10 +1981,6 @@ msgstr "Hozzáférési szint:"
 msgid "Change e-mail"
 msgstr "E-mail megváltoztatása"
 
-#: modules/pref-prefs.php:259
-msgid "Authentication"
-msgstr "Azonosítás"
-
 #: modules/pref-prefs.php:261
 msgid "Old password"
 msgstr "Régi jelszó"
@@ -1981,10 +2005,6 @@ msgstr "Kinézetek"
 msgid "Select theme"
 msgstr "Kinézet választó"
 
-#: modules/pref-prefs.php:312
-msgid "Default"
-msgstr "Alapértelmezett"
-
 #: modules/pref-prefs.php:328
 msgid "Change theme"
 msgstr "Kinlzet megváltozatása"
@@ -2014,90 +2034,125 @@ msgid "Your access level is insufficient to open this tab."
 msgstr ""
 
 #: modules/pref-users.php:17
-msgid "User editor"
+#, fuzzy
+msgid "User Editor"
 msgstr "Felhasználó szerkesztő"
 
-#: modules/pref-users.php:38
-msgid "Change password:"
-msgstr "Jelszó megváltoztatása:"
-
-#: modules/pref-users.php:42
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#: modules/pref-users.php:48
-msgid "Access level:"
+#: modules/pref-users.php:47
+#, fuzzy
+msgid "Access level: "
 msgstr "Hozzáférési szint:"
 
-#: modules/pref-users.php:83
+#: modules/pref-users.php:54
+#, fuzzy
+msgid "Change password to"
+msgstr "Jelszó megváltoztatása"
+
+#: modules/pref-users.php:63
+#, fuzzy
+msgid "E-mail: "
+msgstr "E-mail:"
+
+#: modules/pref-users.php:99
 #, php-format
 msgid "Changed password of user <b>%s</b>."
 msgstr ""
 
-#: modules/pref-users.php:131
+#: modules/pref-users.php:147
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr ""
 
-#: modules/pref-users.php:138
+#: modules/pref-users.php:154
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr ""
 
-#: modules/pref-users.php:142
+#: modules/pref-users.php:158
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr ""
 
-#: modules/pref-users.php:162
+#: modules/pref-users.php:178
 #, 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:166
+#: modules/pref-users.php:182
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr ""
 
-#: modules/pref-users.php:202
+#: modules/pref-users.php:218
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: modules/pref-users.php:259
+#: modules/pref-users.php:275
 msgid "Create user"
 msgstr "Felhasználó létrehozása"
 
-#: modules/pref-users.php:293
+#: modules/pref-users.php:309
 msgid "Login"
 msgstr "Belépés"
 
-#: modules/pref-users.php:294
+#: modules/pref-users.php:310
 msgid "Access Level"
 msgstr "Hozzáférési szint"
 
-#: modules/pref-users.php:296
+#: modules/pref-users.php:312
 msgid "Last login"
 msgstr "Utolsó belépés"
 
-#: modules/pref-users.php:355
+#: modules/pref-users.php:371
 msgid "User details"
 msgstr "Részletek a felhasználórol "
 
-#: modules/pref-users.php:361
+#: modules/pref-users.php:377
 msgid "Reset password"
 msgstr "Jelszó reset"
 
-#: modules/pref-users.php:366
+#: modules/pref-users.php:382
 #, fuzzy
 msgid "No users defined."
 msgstr "Nincs szűrő definiálva."
 
-#: modules/pref-users.php:368
+#: modules/pref-users.php:384
 msgid "No matching users found."
 msgstr ""
 
+#~ msgid "Category:"
+#~ msgstr "Kategória:"
+
+#~ msgid "Where:"
+#~ msgstr "Ahol:"
+
+#~ msgid "Caption:"
+#~ msgstr "Aláírás:"
+
+#~ msgid "Match:"
+#~ msgstr "Egyezés"
+
+#~ msgid "Feed:"
+#~ msgstr "Feed:"
+
+#~ msgid "Action:"
+#~ msgstr "Művelet:"
+
+#~ msgid "Params:"
+#~ msgstr "Paraméterek"
+
+#~ msgid "Title:"
+#~ msgstr "Cím:"
+
+#, fuzzy
+#~ msgid "Update using:"
+#~ msgstr "Frissítés"
+
+#~ msgid "Change password:"
+#~ msgstr "Jelszó megváltoztatása:"
+
 #, 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 af93d82b5..71dc03ee1 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 abd40b267..dd8b9d1ba 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-08-01 11:55+0400\n"
+"POT-Creation-Date: 2008-08-06 16:43+0400\n"
 "PO-Revision-Date: 2008-05-26 22:15+0100\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:108 backend.php:117 backend.php:128
+#: backend.php:108
 msgid "Use default"
 msgstr "Bruk standard"
 
@@ -43,6 +43,11 @@ msgstr "2 måneder gammel"
 msgid "3 months old"
 msgstr "3 måneder gammel"
 
+#: backend.php:117
+#, fuzzy
+msgid "Default interval"
+msgstr "Oppdateringsintervall:"
+
 #: backend.php:118
 msgid "Disable updates"
 msgstr "Slå av oppdateringer"
@@ -75,6 +80,10 @@ msgstr "Daglig"
 msgid "Weekly"
 msgstr "Ukentlig"
 
+#: backend.php:128 modules/pref-prefs.php:312
+msgid "Default"
+msgstr "Standard"
+
 #: backend.php:129
 msgid "Magpie"
 msgstr "Magpie"
@@ -83,7 +92,7 @@ msgstr "Magpie"
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:139
+#: backend.php:139 modules/pref-users.php:35
 msgid "User"
 msgstr "Bruker"
 
@@ -95,7 +104,7 @@ msgstr "Superbruker"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: backend.php:424 modules/pref-users.php:295
+#: backend.php:424 modules/pref-users.php:311
 msgid "Registered"
 msgstr "Registrert"
 
@@ -181,7 +190,7 @@ msgid "Starred articles"
 msgstr "Favorittartikler"
 
 #: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1146
+#: modules/pref-feeds.php:1157
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
@@ -189,13 +198,13 @@ msgstr "Publiserte artikler"
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
-#: functions.php:2856 modules/popup-dialog.php:151
-#: modules/pref-filters.php:340
+#: functions.php:2856 modules/popup-dialog.php:175
+#: modules/pref-filters.php:353
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
 #: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:977
+#: functions.php:4348 modules/pref-feeds.php:988
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
@@ -217,15 +226,15 @@ msgid "Searched for"
 msgstr "Søkte etter"
 
 #: functions.php:3945 functions.php:3994 functions.php:5216
-#: 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
+#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
+#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-users.php:302
 msgid "Select:"
 msgstr "Velg:"
 
-#: functions.php:3946 functions.php:3995 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
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
+#: modules/pref-feeds.php:951 modules/pref-filters.php:306
+#: modules/pref-labels.php:272 modules/pref-users.php:303
 msgid "All"
 msgstr "Alle"
 
@@ -234,13 +243,13 @@ msgstr "Alle"
 msgid "Unread"
 msgstr "Ulest"
 
-#: functions.php:3948 functions.php:3997 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
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
+#: modules/pref-feeds.php:952 modules/pref-filters.php:307
+#: modules/pref-labels.php:273 modules/pref-users.php:304
 msgid "None"
 msgstr "Ingen"
 
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1100
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
 msgid "Actions..."
 msgstr "Handlinger..."
 
@@ -284,7 +293,8 @@ msgstr "Vis:"
 msgid "Page"
 msgstr "Side"
 
-#: functions.php:4004 modules/pref-filters.php:329
+#: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
+#: modules/pref-filters.php:342
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
@@ -722,8 +732,8 @@ msgstr "Endre poengene for artiklene i %s?"
 msgid "Rescoring articles..."
 msgstr "Endrer poengsummen for artiklene..."
 
-#: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:952 modules/pref-feeds.php:1013
+#: localized_schema.php:9 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
 msgid "Title"
 msgstr "Tittel"
 
@@ -735,7 +745,7 @@ msgstr "Tittel eller innhold"
 msgid "Link"
 msgstr "Lenke"
 
-#: localized_schema.php:12 modules/popup-dialog.php:183
+#: localized_schema.php:12 modules/popup-dialog.php:166
 msgid "Content"
 msgstr "Innhold"
 
@@ -1011,12 +1021,11 @@ msgstr ""
 msgid "Do not show images in articles"
 msgstr ""
 
-#: login_form.php:103 modules/popup-dialog.php:100 modules/pref-feeds.php:274
-#: modules/pref-users.php:34
+#: login_form.php:103 modules/popup-dialog.php:107 modules/pref-feeds.php:281
 msgid "Login:"
 msgstr "Brukernavn:"
 
-#: login_form.php:106 modules/popup-dialog.php:101 modules/pref-feeds.php:280
+#: login_form.php:106 modules/popup-dialog.php:111 modules/pref-feeds.php:285
 msgid "Password:"
 msgstr "Passord:"
 
@@ -1258,9 +1267,10 @@ msgstr "Kommentarer?"
 msgid "tag cloud"
 msgstr "Tag-sky"
 
-#: tt-rss.php:143 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:854 modules/pref-filters.php:235
-#: modules/pref-labels.php:233 modules/pref-users.php:242
+#: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
+#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/pref-users.php:258
 msgid "Search"
 msgstr "Søk"
 
@@ -1320,7 +1330,7 @@ msgstr "Skjul nyhetskanalsslisten"
 msgid "Toggle Feedlist"
 msgstr "Vis nyhetskanallisten"
 
-#: tt-rss.php:179 modules/popup-dialog.php:139
+#: tt-rss.php:179
 msgid "Search:"
 msgstr "Søk:"
 
@@ -1340,7 +1350,7 @@ msgstr "Alle artikler"
 msgid "Limit:"
 msgstr "Antall:"
 
-#: tt-rss.php:219
+#: tt-rss.php:219 modules/pref-feeds.php:247
 msgid "Update"
 msgstr "Oppdater"
 
@@ -1412,7 +1422,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:809
+#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
@@ -1486,146 +1496,169 @@ msgstr ""
 "sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
 "nyhetsstrømmen"
 
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:859
-msgid "Subscribe to feed"
+#: modules/popup-dialog.php:61
+#, fuzzy
+msgid "Subscribe to Feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:161
-msgid "Feed URL:"
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:167
+#, fuzzy
+msgid "URL:"
 msgstr "Nyhetsstrømsadresse:"
 
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:169
-msgid "Category:"
-msgstr "Kategori:"
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:179
+#, fuzzy
+msgid "Place in category:"
+msgstr "Lagrer kategori..."
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:117
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:276
+#: modules/pref-prefs.php:259 modules/pref-users.php:44
+msgid "Authentication"
+msgstr "Autentifisering"
+
+#: modules/popup-dialog.php:123
+msgid "This feed requires authentication."
+msgstr "Denne nyhetsstrømmen krever autentifisering"
+
+#: modules/popup-dialog.php:130 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:116
-#: modules/pref-feeds.php:362 modules/pref-filters.php:116
-#: modules/pref-users.php:63
+#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
+#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
+#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/pref-users.php:79
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: modules/popup-dialog.php:120
-msgid "This feed requires authentication."
-msgstr "Denne nyhetsstrømmen krever autentifisering"
-
-#: modules/popup-dialog.php:148
-msgid "Where:"
-msgstr "Hvor:"
-
-#: modules/popup-dialog.php:164
-msgid "This feed"
-msgstr "Denne nyhetsstrømmen"
-
-#: modules/popup-dialog.php:179
-msgid "Match on:"
+#: modules/popup-dialog.php:162
+#, fuzzy
+msgid "match on:"
 msgstr "Matcher:"
 
-#: modules/popup-dialog.php:184
+#: modules/popup-dialog.php:167
 msgid "Title or content"
 msgstr "Tittel eller innhold"
 
-#: modules/popup-dialog.php:208 modules/pref-labels.php:243
-msgid "Create label"
+#: modules/popup-dialog.php:172
+msgid "Limit search to:"
+msgstr ""
+
+#: modules/popup-dialog.php:188
+msgid "This feed"
+msgstr "Denne nyhetsstrømmen"
+
+#: modules/popup-dialog.php:223
+#, fuzzy
+msgid "Create Label"
 msgstr "Lag merkelapp"
 
-#: modules/popup-dialog.php:218
-msgid "Caption:"
-msgstr "Overskrift:"
+#: modules/popup-dialog.php:231 modules/pref-labels.php:36
+#: modules/pref-labels.php:278
+msgid "Caption"
+msgstr "Overskrift"
 
-#: modules/popup-dialog.php:227
-msgid "SQL Expression:"
-msgstr "SQL-uttrykk:"
+#: modules/popup-dialog.php:241 modules/pref-labels.php:46
+#, fuzzy
+msgid "Match SQL"
+msgstr "Match"
 
-#: modules/popup-dialog.php:242 modules/pref-labels.php:62
+#: modules/popup-dialog.php:259 modules/pref-labels.php:64
 msgid "Help"
 msgstr "Hjelp"
 
-#: modules/popup-dialog.php:245
+#: modules/popup-dialog.php:262
 msgid "Test"
 msgstr "Test"
 
-#: modules/popup-dialog.php:252 modules/popup-dialog.php:339
+#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
 msgid "Create"
 msgstr "Lag"
 
-#: modules/popup-dialog.php:265 modules/pref-filters.php:245
-msgid "Create filter"
+#: modules/popup-dialog.php:282
+#, fuzzy
+msgid "Create Filter"
 msgstr "Lag filter"
 
-#: modules/popup-dialog.php:283 modules/popup-dialog.php:314
-#: modules/pref-filters.php:38 modules/pref-filters.php:70
+#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/pref-filters.php:38 modules/pref-filters.php:72
 msgid "description"
 msgstr "beskrivelse"
 
-#: modules/popup-dialog.php:288 modules/pref-filters.php:43
-msgid "Match:"
-msgstr "Matcher:"
+#: modules/popup-dialog.php:351 modules/pref-filters.php:41
+#: modules/pref-filters.php:343
+msgid "Match"
+msgstr "Match"
 
-#: modules/popup-dialog.php:294 modules/pref-filters.php:49
-msgid "On field:"
+#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+#, fuzzy
+msgid "on field"
 msgstr "På felt:"
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:54
-msgid "Feed:"
-msgstr "Nyhetsstrøm:"
+#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#, fuzzy
+msgid "in"
+msgstr "Lenke"
 
-#: modules/popup-dialog.php:305 modules/pref-filters.php:60
-msgid "Action:"
-msgstr "Handling:"
+#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#, fuzzy
+msgid "Perform Action"
+msgstr "Utfør oppdateringene"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:77
-msgid "Params:"
-msgstr "Parametre:"
+#: modules/popup-dialog.php:386 modules/pref-filters.php:77
+msgid "with params"
+msgstr ""
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:293
-msgid "Options:"
+#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
+#: modules/pref-filters.php:86 modules/pref-users.php:60
+#, fuzzy
+msgid "Options"
 msgstr "Valg:"
 
-#: modules/popup-dialog.php:328 modules/pref-filters.php:101
+#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+msgid "Enabled"
+msgstr "Tillatt"
+
+#: modules/popup-dialog.php:402 modules/pref-filters.php:107
 msgid "Inverse match"
 msgstr "Motsatt markering"
 
-#: modules/popup-dialog.php:354
+#: modules/popup-dialog.php:429
 msgid "Update Errors"
 msgstr "Oppdaterer feil"
 
-#: modules/popup-dialog.php:357
+#: modules/popup-dialog.php:432
 msgid "These feeds have not been updated because of errors:"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
-#: modules/popup-dialog.php:376
+#: modules/popup-dialog.php:451
 msgid "Close"
 msgstr "Steng"
 
-#: modules/popup-dialog.php:385
+#: modules/popup-dialog.php:460
 msgid "Edit Tags"
 msgstr "Endre tagger"
 
-#: modules/popup-dialog.php:390
+#: modules/popup-dialog.php:465
 msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens tagger (separert med kommaer):"
 
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:360
-#: modules/pref-filters.php:112 modules/pref-users.php:60
+#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
+#: modules/pref-filters.php:117 modules/pref-users.php:76
 msgid "Save"
 msgstr "Lagre"
 
-#: modules/popup-dialog.php:448
+#: modules/popup-dialog.php:523
 msgid "Tag cloud"
 msgstr "Tag-sky"
 
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:526
 msgid "Showing most popular tags "
 msgstr "Vis mest populære tagger"
 
-#: modules/popup-dialog.php:452
+#: modules/popup-dialog.php:527
 msgid "browse more"
 msgstr "utforsk videre"
 
@@ -1682,176 +1715,175 @@ msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr "Viser topp 25 nyhetsstrømmer, sortert etter popularitet:"
 
 #: modules/pref-feeds.php:141
-msgid "Feed editor"
+#, fuzzy
+msgid "Feed Editor"
 msgstr "Nyhetsstrømsredigerer"
 
-#: modules/pref-feeds.php:153
-msgid "Title:"
-msgstr "Tittel:"
-
-#: modules/pref-feeds.php:189
-msgid "Update Interval:"
-msgstr "Oppdateringsintervall:"
-
-#: modules/pref-feeds.php:198
-msgid "Link to:"
+#: modules/pref-feeds.php:196
+#, fuzzy
+msgid "Link to feed:"
 msgstr "Link til:"
 
-#: modules/pref-feeds.php:215
+#: modules/pref-feeds.php:213
 msgid "Not linked"
 msgstr "Ikke linket til"
 
-#: modules/pref-feeds.php:249
+#: modules/pref-feeds.php:261
+msgid "using"
+msgstr ""
+
+#: modules/pref-feeds.php:271
 msgid "Article purging:"
 msgstr "Slett artikler:"
 
-#: modules/pref-feeds.php:262
-msgid "Update using:"
-msgstr "Oppdater med:"
-
-#: modules/pref-feeds.php:295
+#: modules/pref-feeds.php:300
 msgid "Hide from \"Other Feeds\""
 msgstr "Skjul fra \"Andre nyhetsstrømmer\""
 
-#: modules/pref-feeds.php:306
+#: modules/pref-feeds.php:311
 msgid "Right-to-left content"
 msgstr "Innhold som vises fra høyre til venstre"
 
-#: modules/pref-feeds.php:317
+#: modules/pref-feeds.php:322
 msgid "Hide from my feed list"
 msgstr "Skjul fra min nyhetsstrømslisten"
 
-#: modules/pref-feeds.php:329
+#: modules/pref-feeds.php:334
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-postsammendraget"
 
-#: modules/pref-feeds.php:350
+#: modules/pref-feeds.php:355
 msgid "Cache images locally"
 msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: modules/pref-feeds.php:514 modules/pref-feeds.php:561
+#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+msgid "Unsubscribe"
+msgstr "Avabonner"
+
+#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
 msgid "All done."
 msgstr "Alt ferdig."
 
-#: modules/pref-feeds.php:592
+#: modules/pref-feeds.php:603
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonnerer på <b>%s</b>"
 
-#: modules/pref-feeds.php:594
+#: modules/pref-feeds.php:605
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:676
+#: modules/pref-feeds.php:687
 msgid "Category editor"
 msgstr "Kategoriredigerer"
 
-#: modules/pref-feeds.php:699
+#: modules/pref-feeds.php:710
 #, 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:727
+#: modules/pref-feeds.php:738
 msgid "Unable to delete non empty feed categories."
 msgstr "Kunne ikke slette kategorien, den var ikke tom"
 
-#: modules/pref-feeds.php:744
+#: modules/pref-feeds.php:755
 msgid "Create category"
 msgstr "Lag kategori"
 
-#: modules/pref-feeds.php:804
+#: modules/pref-feeds.php:815
 msgid "No feed categories defined."
 msgstr "Ingen kategorier ble markert"
 
-#: modules/pref-feeds.php:815 modules/pref-filters.php:398
-#: modules/pref-labels.php:324 modules/pref-users.php:359
+#: modules/pref-feeds.php:826 modules/pref-filters.php:128
+#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-users.php:375
 msgid "Remove"
 msgstr "Fjern"
 
-#: modules/pref-feeds.php:837
+#: modules/pref-feeds.php:848
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:870
+msgid "Subscribe to feed"
+msgstr "Abonner på nyhetsstrøm"
+
+#: modules/pref-feeds.php:875
 msgid "Top 25"
 msgstr "Topp 25"
 
-#: modules/pref-feeds.php:938
+#: modules/pref-feeds.php:949
 msgid "Show last article times"
 msgstr "Vis tidspunktene for siste artikkel"
 
-#: modules/pref-feeds.php:955 modules/pref-feeds.php:1017
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
 msgid "Last&nbsp;Article"
 msgstr "Siste&nbsp;Artikkel"
 
-#: modules/pref-feeds.php:958 modules/pref-feeds.php:1021
+#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: modules/pref-feeds.php:1042 modules/pref-filters.php:372
-#: modules/pref-labels.php:304 modules/pref-users.php:334
+#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
+#: modules/pref-labels.php:306 modules/pref-users.php:350
 msgid "Click to edit"
 msgstr "Trykk for å endre"
 
-#: modules/pref-feeds.php:1088 modules/pref-feeds.php:1102
+#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
 msgid "Selection:"
 msgstr "Utvalg:"
 
-#: modules/pref-feeds.php:1094
+#: modules/pref-feeds.php:1105
 msgid "Recategorize"
 msgstr "Rekategoriser"
 
-#: modules/pref-feeds.php:1103 modules/pref-filters.php:396
-#: modules/pref-labels.php:322 modules/pref-users.php:357
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
+#: modules/pref-labels.php:324 modules/pref-users.php:373
 msgid "Edit"
 msgstr "Rediger"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1115
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1116
 msgid "Clear feed data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:252
+#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
 msgid "Rescore articles"
 msgstr "Tilbakestill poengsummene for artiklene"
 
-#: modules/pref-feeds.php:1107
-msgid "Unsubscribe"
-msgstr "Avabonner"
-
-#: modules/pref-feeds.php:1112
+#: modules/pref-feeds.php:1123
 msgid "Other:"
 msgstr "Andre:"
 
-#: modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1124
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: modules/pref-feeds.php:1120
+#: modules/pref-feeds.php:1131
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1135
 msgid "File:"
 msgstr "Fil:"
 
-#: modules/pref-feeds.php:1127
+#: modules/pref-feeds.php:1138
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1145
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: modules/pref-feeds.php:1137
+#: modules/pref-feeds.php:1148
 msgid "Firefox Integration"
 msgstr "Firefox integrering"
 
-#: modules/pref-feeds.php:1139
+#: modules/pref-feeds.php:1150
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1859,11 +1891,11 @@ msgstr ""
 "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
 "ved å trykke på lenken nedenfor."
 
-#: modules/pref-feeds.php:1143
+#: modules/pref-feeds.php:1154
 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:1152
+#: modules/pref-feeds.php:1163
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1871,65 +1903,62 @@ 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:1159
+#: modules/pref-feeds.php:1170
 msgid "Generate another link"
 msgstr "Genererer en ny adresse"
 
 #: modules/pref-filters.php:22
-msgid "Filter editor"
+#, fuzzy
+msgid "Filter Editor"
 msgstr "Filterredigering"
 
-#: modules/pref-filters.php:92
-msgid "Enabled"
-msgstr "Tillatt"
-
-#: modules/pref-filters.php:152
+#: modules/pref-filters.php:165
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr "Lagret filter <b>%s</b>"
 
-#: modules/pref-filters.php:192
+#: modules/pref-filters.php:205
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Laget filter <b>%s</b>"
 
-#: modules/pref-filters.php:318
+#: modules/pref-filters.php:258
+msgid "Create filter"
+msgstr "Lag filter"
+
+#: modules/pref-filters.php:331
 msgid "filter_type_descr"
 msgstr "Beskrivelse av filtertype"
 
-#: modules/pref-filters.php:319
+#: modules/pref-filters.php:332
 msgid "action_description"
 msgstr "Handlingsbeskrivelse"
 
-#: modules/pref-filters.php:328
+#: modules/pref-filters.php:341
 msgid "Filter expression"
 msgstr "Filteruttrykk"
 
-#: modules/pref-filters.php:330
-msgid "Match"
-msgstr "Match"
-
-#: modules/pref-filters.php:331
+#: modules/pref-filters.php:344
 msgid "Action"
 msgstr "Handling"
 
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:345
 msgid "Params"
 msgstr "Parametre"
 
-#: modules/pref-filters.php:361
+#: modules/pref-filters.php:374
 msgid "(Disabled)"
 msgstr "(Avskrudd)"
 
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:393
 msgid "(Inverse)"
 msgstr "(Motsatt)"
 
-#: modules/pref-filters.php:406
+#: modules/pref-filters.php:419
 msgid "No filters defined."
 msgstr "Ingen filtre er valgt"
 
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:421
 msgid "No matching filters found."
 msgstr "Ingen filtre ble funnet."
 
@@ -1943,33 +1972,33 @@ msgstr ""
 "installasjonen. Vennligst kontakt sideadministratoren eller rediger "
 "konfigurasjonsfilen for å åpne for denne funksjonaliteten."
 
-#: modules/pref-labels.php:173
+#: modules/pref-labels.php:175
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr "Lagret merkelapp <b>%s</b>"
 
-#: modules/pref-labels.php:205
+#: modules/pref-labels.php:207
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Laget merkelappen <b>%s</b>"
 
-#: modules/pref-labels.php:276
-msgid "Caption"
-msgstr "Overskrift"
+#: modules/pref-labels.php:245
+msgid "Create label"
+msgstr "Lag merkelapp"
 
-#: modules/pref-labels.php:277
+#: modules/pref-labels.php:279
 msgid "SQL Expression"
 msgstr "SQL-uttrykk"
 
-#: modules/pref-labels.php:302
+#: modules/pref-labels.php:304
 msgid "[No caption]"
 msgstr "Ingen bildetekst"
 
-#: modules/pref-labels.php:329
+#: modules/pref-labels.php:331
 msgid "No labels defined."
 msgstr "Ingen merkelapper er valgt"
 
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:333
 msgid "No matching labels found."
 msgstr "Ingen passende merkelapper ble funnet."
 
@@ -2017,10 +2046,6 @@ msgstr "Tilgangsnivå"
 msgid "Change e-mail"
 msgstr "Skift e-post"
 
-#: modules/pref-prefs.php:259
-msgid "Authentication"
-msgstr "Autentifisering"
-
 #: modules/pref-prefs.php:261
 msgid "Old password"
 msgstr "Gammelt passord"
@@ -2045,10 +2070,6 @@ msgstr "Utseender"
 msgid "Select theme"
 msgstr "Velg utseende"
 
-#: modules/pref-prefs.php:312
-msgid "Default"
-msgstr "Standard"
-
 #: modules/pref-prefs.php:328
 msgid "Change theme"
 msgstr "Endre utseende"
@@ -2078,42 +2099,46 @@ msgid "Your access level is insufficient to open this tab."
 msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
 
 #: modules/pref-users.php:17
-msgid "User editor"
+#, fuzzy
+msgid "User Editor"
 msgstr "Brukeradministrering"
 
-#: modules/pref-users.php:38
-msgid "Change password:"
-msgstr "Bytt passord:"
-
-#: modules/pref-users.php:42
-msgid "E-mail:"
-msgstr "E-post:"
-
-#: modules/pref-users.php:48
-msgid "Access level:"
+#: modules/pref-users.php:47
+#, fuzzy
+msgid "Access level: "
 msgstr "Tilgangsnivå:"
 
-#: modules/pref-users.php:83
+#: modules/pref-users.php:54
+#, fuzzy
+msgid "Change password to"
+msgstr "Endre passord"
+
+#: modules/pref-users.php:63
+#, fuzzy
+msgid "E-mail: "
+msgstr "E-post:"
+
+#: modules/pref-users.php:99
 #, php-format
 msgid "Changed password of user <b>%s</b>."
 msgstr "Byttet passord for bruker <b>%s</b>."
 
-#: modules/pref-users.php:131
+#: modules/pref-users.php:147
 #, 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:138
+#: modules/pref-users.php:154
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Kunne ikke lage brukeren <b>%s</b>"
 
-#: modules/pref-users.php:142
+#: modules/pref-users.php:158
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "Brukeren <b>%s</b> finnes allerede."
 
-#: modules/pref-users.php:162
+#: modules/pref-users.php:178
 #, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
@@ -2122,47 +2147,80 @@ msgstr ""
 "Byttet passord forbruker <b>%s</b>\n"
 "\t\t\t\t\t til <b>%s</b>"
 
-#: modules/pref-users.php:166
+#: modules/pref-users.php:182
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Gir beskjed til <b>%s</b>"
 
-#: modules/pref-users.php:202
+#: modules/pref-users.php:218
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Varsel om endring av passord"
 
-#: modules/pref-users.php:259
+#: modules/pref-users.php:275
 msgid "Create user"
 msgstr "Lag bruker"
 
-#: modules/pref-users.php:293
+#: modules/pref-users.php:309
 msgid "Login"
 msgstr "Logg inn"
 
-#: modules/pref-users.php:294
+#: modules/pref-users.php:310
 msgid "Access Level"
 msgstr "Tilgangsnivå"
 
-#: modules/pref-users.php:296
+#: modules/pref-users.php:312
 msgid "Last login"
 msgstr "Siste innlogging"
 
-#: modules/pref-users.php:355
+#: modules/pref-users.php:371
 msgid "User details"
 msgstr "Brukerdetaljer"
 
-#: modules/pref-users.php:361
+#: modules/pref-users.php:377
 msgid "Reset password"
 msgstr "Nullstill passordet"
 
-#: modules/pref-users.php:366
+#: modules/pref-users.php:382
 msgid "No users defined."
 msgstr "Ingen brukere er valgt"
 
-#: modules/pref-users.php:368
+#: modules/pref-users.php:384
 msgid "No matching users found."
 msgstr "Ingen matchende brukere ble funnet"
 
+#~ msgid "Category:"
+#~ msgstr "Kategori:"
+
+#~ msgid "Where:"
+#~ msgstr "Hvor:"
+
+#~ msgid "Caption:"
+#~ msgstr "Overskrift:"
+
+#~ msgid "SQL Expression:"
+#~ msgstr "SQL-uttrykk:"
+
+#~ msgid "Match:"
+#~ msgstr "Matcher:"
+
+#~ msgid "Feed:"
+#~ msgstr "Nyhetsstrøm:"
+
+#~ msgid "Action:"
+#~ msgstr "Handling:"
+
+#~ msgid "Params:"
+#~ msgstr "Parametre:"
+
+#~ msgid "Title:"
+#~ msgstr "Tittel:"
+
+#~ msgid "Update using:"
+#~ msgstr "Oppdater med:"
+
+#~ msgid "Change password:"
+#~ msgstr "Bytt passord:"
+
 #~ msgid ""
 #~ "This program requires XmlHttpRequest to function properly. Your browser "
 #~ "doesn't seem to support it."
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index b570b58c4..812eec600 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 f3192ba87..430253b22 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-08-01 11:55+0400\n"
+"POT-Creation-Date: 2008-08-06 16: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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:108 backend.php:117 backend.php:128
+#: backend.php:108
 msgid "Use default"
 msgstr "Usar o padrão"
 
@@ -44,6 +44,11 @@ msgstr "2 meses atrás"
 msgid "3 months old"
 msgstr "3 meses atrás"
 
+#: backend.php:117
+#, fuzzy
+msgid "Default interval"
+msgstr "Padrão"
+
 #: backend.php:118
 msgid "Disable updates"
 msgstr "Desabilitar updates"
@@ -76,6 +81,10 @@ msgstr "Diariamente"
 msgid "Weekly"
 msgstr "Semanalmente"
 
+#: backend.php:128 modules/pref-prefs.php:312
+msgid "Default"
+msgstr "Padrão"
+
 #: backend.php:129
 #, fuzzy
 msgid "Magpie"
@@ -85,7 +94,7 @@ msgstr "Página"
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:139
+#: backend.php:139 modules/pref-users.php:35
 msgid "User"
 msgstr "Usuário"
 
@@ -97,7 +106,7 @@ msgstr ""
 msgid "Administrator"
 msgstr "Administrador"
 
-#: backend.php:424 modules/pref-users.php:295
+#: backend.php:424 modules/pref-users.php:311
 msgid "Registered"
 msgstr ""
 
@@ -180,7 +189,7 @@ msgid "Starred articles"
 msgstr ""
 
 #: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1146
+#: modules/pref-feeds.php:1157
 msgid "Published articles"
 msgstr ""
 
@@ -188,13 +197,13 @@ msgstr ""
 msgid "Fresh articles"
 msgstr ""
 
-#: functions.php:2856 modules/popup-dialog.php:151
-#: modules/pref-filters.php:340
+#: functions.php:2856 modules/popup-dialog.php:175
+#: modules/pref-filters.php:353
 msgid "All feeds"
 msgstr "Todos os feeds"
 
 #: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:977
+#: functions.php:4348 modules/pref-feeds.php:988
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
@@ -216,15 +225,15 @@ msgid "Searched for"
 msgstr ""
 
 #: functions.php:3945 functions.php:3994 functions.php:5216
-#: 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
+#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
+#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-users.php:302
 msgid "Select:"
 msgstr "Selecione:"
 
-#: functions.php:3946 functions.php:3995 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
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
+#: modules/pref-feeds.php:951 modules/pref-filters.php:306
+#: modules/pref-labels.php:272 modules/pref-users.php:303
 msgid "All"
 msgstr "Todos"
 
@@ -233,13 +242,13 @@ msgstr "Todos"
 msgid "Unread"
 msgstr "Não Lido"
 
-#: functions.php:3948 functions.php:3997 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
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
+#: modules/pref-feeds.php:952 modules/pref-filters.php:307
+#: modules/pref-labels.php:273 modules/pref-users.php:304
 msgid "None"
 msgstr "Nenhum"
 
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1100
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
 msgid "Actions..."
 msgstr "Ações..."
 
@@ -284,7 +293,8 @@ msgstr ""
 msgid "Page"
 msgstr "Página"
 
-#: functions.php:4004 modules/pref-filters.php:329
+#: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
+#: modules/pref-filters.php:342
 msgid "Feed"
 msgstr "Feed"
 
@@ -731,8 +741,8 @@ msgstr "Favoritos"
 msgid "Rescoring articles..."
 msgstr "Favoritos"
 
-#: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:952 modules/pref-feeds.php:1013
+#: localized_schema.php:9 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
 msgid "Title"
 msgstr "Título"
 
@@ -744,7 +754,7 @@ msgstr "Título ou Conteúdo"
 msgid "Link"
 msgstr "Link"
 
-#: localized_schema.php:12 modules/popup-dialog.php:183
+#: localized_schema.php:12 modules/popup-dialog.php:166
 msgid "Content"
 msgstr "Conteúdo"
 
@@ -995,12 +1005,11 @@ msgstr ""
 msgid "Do not show images in articles"
 msgstr ""
 
-#: login_form.php:103 modules/popup-dialog.php:100 modules/pref-feeds.php:274
-#: modules/pref-users.php:34
+#: login_form.php:103 modules/popup-dialog.php:107 modules/pref-feeds.php:281
 msgid "Login:"
 msgstr "Login:"
 
-#: login_form.php:106 modules/popup-dialog.php:101 modules/pref-feeds.php:280
+#: login_form.php:106 modules/popup-dialog.php:111 modules/pref-feeds.php:285
 msgid "Password:"
 msgstr "Senha:"
 
@@ -1216,9 +1225,10 @@ msgstr "Conteúdo"
 msgid "tag cloud"
 msgstr "núvem de tags"
 
-#: tt-rss.php:143 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:854 modules/pref-filters.php:235
-#: modules/pref-labels.php:233 modules/pref-users.php:242
+#: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
+#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/pref-users.php:258
 msgid "Search"
 msgstr ""
 
@@ -1283,7 +1293,7 @@ msgstr "Todos os feeds"
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:179 modules/popup-dialog.php:139
+#: tt-rss.php:179
 msgid "Search:"
 msgstr ""
 
@@ -1303,7 +1313,7 @@ msgstr ""
 msgid "Limit:"
 msgstr "Limite:"
 
-#: tt-rss.php:219
+#: tt-rss.php:219 modules/pref-feeds.php:247
 msgid "Update"
 msgstr "Atualizar"
 
@@ -1371,7 +1381,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:809
+#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
@@ -1435,147 +1445,166 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr ""
 
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:859
-msgid "Subscribe to feed"
+#: modules/popup-dialog.php:61
+msgid "Subscribe to Feed"
 msgstr ""
 
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:161
-msgid "Feed URL:"
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:167
+#, fuzzy
+msgid "URL:"
 msgstr "Feed URL:"
 
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:169
-msgid "Category:"
-msgstr "Categoria:"
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:179
+#, fuzzy
+msgid "Place in category:"
+msgstr "Salvando categoria..."
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:117
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:276
+#: modules/pref-prefs.php:259 modules/pref-users.php:44
+msgid "Authentication"
+msgstr ""
+
+#: modules/popup-dialog.php:123
+msgid "This feed requires authentication."
+msgstr "Este feed requer autenticação."
+
+#: modules/popup-dialog.php:130 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:116
-#: modules/pref-feeds.php:362 modules/pref-filters.php:116
-#: modules/pref-users.php:63
+#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
+#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
+#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/pref-users.php:79
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: modules/popup-dialog.php:120
-msgid "This feed requires authentication."
-msgstr "Este feed requer autenticação."
-
-#: modules/popup-dialog.php:148
-msgid "Where:"
-msgstr "Onde:"
-
-#: modules/popup-dialog.php:164
-msgid "This feed"
+#: modules/popup-dialog.php:162
+msgid "match on:"
 msgstr ""
 
-#: modules/popup-dialog.php:179
-msgid "Match on:"
-msgstr ""
-
-#: modules/popup-dialog.php:184
+#: modules/popup-dialog.php:167
 msgid "Title or content"
 msgstr "Título ou conteúdo"
 
-#: modules/popup-dialog.php:208 modules/pref-labels.php:243
-msgid "Create label"
+#: modules/popup-dialog.php:172
+msgid "Limit search to:"
 msgstr ""
 
-#: modules/popup-dialog.php:218
-msgid "Caption:"
+#: modules/popup-dialog.php:188
+msgid "This feed"
 msgstr ""
 
-#: modules/popup-dialog.php:227
-msgid "SQL Expression:"
-msgstr "Expressão SQL:"
+#: modules/popup-dialog.php:223
+#, fuzzy
+msgid "Create Label"
+msgstr "Criar um usuário"
 
-#: modules/popup-dialog.php:242 modules/pref-labels.php:62
+#: modules/popup-dialog.php:231 modules/pref-labels.php:36
+#: modules/pref-labels.php:278
+msgid "Caption"
+msgstr ""
+
+#: modules/popup-dialog.php:241 modules/pref-labels.php:46
+msgid "Match SQL"
+msgstr ""
+
+#: modules/popup-dialog.php:259 modules/pref-labels.php:64
 #, fuzzy
 msgid "Help"
 msgstr "Olá,"
 
-#: modules/popup-dialog.php:245
+#: modules/popup-dialog.php:262
 msgid "Test"
 msgstr "Teste"
 
-#: modules/popup-dialog.php:252 modules/popup-dialog.php:339
+#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
 msgid "Create"
 msgstr "Criar"
 
-#: modules/popup-dialog.php:265 modules/pref-filters.php:245
-msgid "Create filter"
-msgstr ""
+#: modules/popup-dialog.php:282
+#, fuzzy
+msgid "Create Filter"
+msgstr "Criar um usuário"
 
-#: modules/popup-dialog.php:283 modules/popup-dialog.php:314
-#: modules/pref-filters.php:38 modules/pref-filters.php:70
+#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/pref-filters.php:38 modules/pref-filters.php:72
 msgid "description"
 msgstr "descrição"
 
-#: modules/popup-dialog.php:288 modules/pref-filters.php:43
-msgid "Match:"
+#: modules/popup-dialog.php:351 modules/pref-filters.php:41
+#: modules/pref-filters.php:343
+msgid "Match"
 msgstr ""
 
-#: modules/popup-dialog.php:294 modules/pref-filters.php:49
-msgid "On field:"
+#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+msgid "on field"
 msgstr ""
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:54
-msgid "Feed:"
-msgstr "Feed:"
+#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#, fuzzy
+msgid "in"
+msgstr "Link"
 
-#: modules/popup-dialog.php:305 modules/pref-filters.php:60
-msgid "Action:"
-msgstr "Ação:"
+#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#, fuzzy
+msgid "Perform Action"
+msgstr "Ação"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:77
-msgid "Params:"
+#: modules/popup-dialog.php:386 modules/pref-filters.php:77
+msgid "with params"
 msgstr ""
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:293
-msgid "Options:"
+#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
+#: modules/pref-filters.php:86 modules/pref-users.php:60
+#, fuzzy
+msgid "Options"
 msgstr "Opções:"
 
-#: modules/popup-dialog.php:328 modules/pref-filters.php:101
+#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+msgid "Enabled"
+msgstr "Ativado"
+
+#: modules/popup-dialog.php:402 modules/pref-filters.php:107
 msgid "Inverse match"
 msgstr ""
 
-#: modules/popup-dialog.php:354
+#: modules/popup-dialog.php:429
 msgid "Update Errors"
 msgstr ""
 
-#: modules/popup-dialog.php:357
+#: modules/popup-dialog.php:432
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
-#: modules/popup-dialog.php:376
+#: modules/popup-dialog.php:451
 msgid "Close"
 msgstr "Fechar"
 
-#: modules/popup-dialog.php:385
+#: modules/popup-dialog.php:460
 msgid "Edit Tags"
 msgstr "Editar Tags"
 
-#: modules/popup-dialog.php:390
+#: modules/popup-dialog.php:465
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:360
-#: modules/pref-filters.php:112 modules/pref-users.php:60
+#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
+#: modules/pref-filters.php:117 modules/pref-users.php:76
 msgid "Save"
 msgstr "Salvar"
 
-#: modules/popup-dialog.php:448
+#: modules/popup-dialog.php:523
 msgid "Tag cloud"
 msgstr "Núvem de tags"
 
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:526
 msgid "Showing most popular tags "
 msgstr "Exibir as Tags mais populares."
 
-#: modules/popup-dialog.php:452
+#: modules/popup-dialog.php:527
 msgid "browse more"
 msgstr ""
 
@@ -1632,255 +1661,249 @@ msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr ""
 
 #: modules/pref-feeds.php:141
-msgid "Feed editor"
+#, fuzzy
+msgid "Feed Editor"
 msgstr "Editor de Feed"
 
-#: modules/pref-feeds.php:153
-msgid "Title:"
-msgstr "Título"
-
-#: modules/pref-feeds.php:189
-msgid "Update Interval:"
+#: modules/pref-feeds.php:196
+msgid "Link to feed:"
 msgstr ""
 
-#: modules/pref-feeds.php:198
-msgid "Link to:"
-msgstr ""
-
-#: modules/pref-feeds.php:215
+#: modules/pref-feeds.php:213
 msgid "Not linked"
 msgstr ""
 
-#: modules/pref-feeds.php:249
+#: modules/pref-feeds.php:261
+msgid "using"
+msgstr ""
+
+#: modules/pref-feeds.php:271
 msgid "Article purging:"
 msgstr ""
 
-#: modules/pref-feeds.php:262
-#, fuzzy
-msgid "Update using:"
-msgstr "Atualizar"
-
-#: modules/pref-feeds.php:295
+#: modules/pref-feeds.php:300
 msgid "Hide from \"Other Feeds\""
 msgstr ""
 
-#: modules/pref-feeds.php:306
+#: modules/pref-feeds.php:311
 msgid "Right-to-left content"
 msgstr ""
 
-#: modules/pref-feeds.php:317
+#: modules/pref-feeds.php:322
 msgid "Hide from my feed list"
 msgstr ""
 
-#: modules/pref-feeds.php:329
+#: modules/pref-feeds.php:334
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: modules/pref-feeds.php:350
+#: modules/pref-feeds.php:355
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:514 modules/pref-feeds.php:561
+#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+msgid "Unsubscribe"
+msgstr ""
+
+#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:592
+#: modules/pref-feeds.php:603
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:594
+#: modules/pref-feeds.php:605
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:676
+#: modules/pref-feeds.php:687
 msgid "Category editor"
 msgstr "Editor de Categoria"
 
-#: modules/pref-feeds.php:699
+#: modules/pref-feeds.php:710
 #, 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:727
+#: modules/pref-feeds.php:738
 msgid "Unable to delete non empty feed categories."
 msgstr ""
 
-#: modules/pref-feeds.php:744
+#: modules/pref-feeds.php:755
 msgid "Create category"
 msgstr "Criar categoria"
 
-#: modules/pref-feeds.php:804
+#: modules/pref-feeds.php:815
 msgid "No feed categories defined."
 msgstr ""
 
-#: modules/pref-feeds.php:815 modules/pref-filters.php:398
-#: modules/pref-labels.php:324 modules/pref-users.php:359
+#: modules/pref-feeds.php:826 modules/pref-filters.php:128
+#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-users.php:375
 msgid "Remove"
 msgstr "Remover"
 
-#: modules/pref-feeds.php:837
+#: modules/pref-feeds.php:848
 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:870
+msgid "Subscribe to feed"
+msgstr ""
+
+#: modules/pref-feeds.php:875
 msgid "Top 25"
 msgstr ""
 
-#: modules/pref-feeds.php:938
+#: modules/pref-feeds.php:949
 msgid "Show last article times"
 msgstr ""
 
-#: modules/pref-feeds.php:955 modules/pref-feeds.php:1017
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
 msgid "Last&nbsp;Article"
 msgstr ""
 
-#: modules/pref-feeds.php:958 modules/pref-feeds.php:1021
+#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
 msgid "Updated"
 msgstr "Atualizado"
 
-#: modules/pref-feeds.php:1042 modules/pref-filters.php:372
-#: modules/pref-labels.php:304 modules/pref-users.php:334
+#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
+#: modules/pref-labels.php:306 modules/pref-users.php:350
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1088 modules/pref-feeds.php:1102
+#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
 #, fuzzy
 msgid "Selection:"
 msgstr "Seleção"
 
-#: modules/pref-feeds.php:1094
+#: modules/pref-feeds.php:1105
 msgid "Recategorize"
 msgstr ""
 
-#: modules/pref-feeds.php:1103 modules/pref-filters.php:396
-#: modules/pref-labels.php:322 modules/pref-users.php:357
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
+#: modules/pref-labels.php:324 modules/pref-users.php:373
 msgid "Edit"
 msgstr "Editar"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1115
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1116
 msgid "Clear feed data"
 msgstr ""
 
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:252
+#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Favoritos"
 
-#: modules/pref-feeds.php:1107
-msgid "Unsubscribe"
-msgstr ""
-
-#: modules/pref-feeds.php:1112
+#: modules/pref-feeds.php:1123
 #, fuzzy
 msgid "Other:"
 msgstr "Onde:"
 
-#: modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1124
 msgid "Edit categories"
 msgstr "Editar categorias"
 
-#: modules/pref-feeds.php:1120
+#: modules/pref-feeds.php:1131
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1135
 msgid "File:"
 msgstr "Arquivo:"
 
-#: modules/pref-feeds.php:1127
+#: modules/pref-feeds.php:1138
 msgid "Import"
 msgstr "Importar"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1145
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: modules/pref-feeds.php:1137
+#: modules/pref-feeds.php:1148
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1139
+#: modules/pref-feeds.php:1150
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1143
+#: modules/pref-feeds.php:1154
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1152
+#: modules/pref-feeds.php:1163
 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:1159
+#: modules/pref-feeds.php:1170
 #, fuzzy
 msgid "Generate another link"
 msgstr "Gerar um outro endereço"
 
 #: modules/pref-filters.php:22
-msgid "Filter editor"
-msgstr ""
+#, fuzzy
+msgid "Filter Editor"
+msgstr "Editor de Feed"
 
-#: modules/pref-filters.php:92
-msgid "Enabled"
-msgstr "Ativado"
-
-#: modules/pref-filters.php:152
+#: modules/pref-filters.php:165
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:192
+#: modules/pref-filters.php:205
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:318
-msgid "filter_type_descr"
-msgstr "filter_type_descr"
-
-#: modules/pref-filters.php:319
-msgid "action_description"
-msgstr "action_description"
-
-#: modules/pref-filters.php:328
-msgid "Filter expression"
-msgstr ""
-
-#: modules/pref-filters.php:330
-msgid "Match"
+#: modules/pref-filters.php:258
+msgid "Create filter"
 msgstr ""
 
 #: modules/pref-filters.php:331
+msgid "filter_type_descr"
+msgstr "filter_type_descr"
+
+#: modules/pref-filters.php:332
+msgid "action_description"
+msgstr "action_description"
+
+#: modules/pref-filters.php:341
+msgid "Filter expression"
+msgstr ""
+
+#: modules/pref-filters.php:344
 msgid "Action"
 msgstr "Ação"
 
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:345
 msgid "Params"
 msgstr ""
 
-#: modules/pref-filters.php:361
+#: modules/pref-filters.php:374
 msgid "(Disabled)"
 msgstr "(Desativado)"
 
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:393
 msgid "(Inverse)"
 msgstr "(Inverso)"
 
-#: modules/pref-filters.php:406
+#: modules/pref-filters.php:419
 msgid "No filters defined."
 msgstr ""
 
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:421
 msgid "No matching filters found."
 msgstr ""
 
@@ -1891,33 +1914,33 @@ msgid ""
 "functionality."
 msgstr ""
 
-#: modules/pref-labels.php:173
+#: modules/pref-labels.php:175
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr ""
 
-#: modules/pref-labels.php:205
+#: modules/pref-labels.php:207
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr ""
 
-#: modules/pref-labels.php:276
-msgid "Caption"
+#: modules/pref-labels.php:245
+msgid "Create label"
 msgstr ""
 
-#: modules/pref-labels.php:277
+#: modules/pref-labels.php:279
 msgid "SQL Expression"
 msgstr "Expressão SQL"
 
-#: modules/pref-labels.php:302
+#: modules/pref-labels.php:304
 msgid "[No caption]"
 msgstr ""
 
-#: modules/pref-labels.php:329
+#: modules/pref-labels.php:331
 msgid "No labels defined."
 msgstr ""
 
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:333
 msgid "No matching labels found."
 msgstr ""
 
@@ -1966,10 +1989,6 @@ msgstr "Nível de acesso:"
 msgid "Change e-mail"
 msgstr "Mudar E-mail"
 
-#: modules/pref-prefs.php:259
-msgid "Authentication"
-msgstr ""
-
 #: modules/pref-prefs.php:261
 msgid "Old password"
 msgstr "Senha antiga"
@@ -1994,10 +2013,6 @@ msgstr "Temas"
 msgid "Select theme"
 msgstr "Selecionar o tema"
 
-#: modules/pref-prefs.php:312
-msgid "Default"
-msgstr "Padrão"
-
 #: modules/pref-prefs.php:328
 msgid "Change theme"
 msgstr "Mudar Tema"
@@ -2028,42 +2043,46 @@ 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"
+#, fuzzy
+msgid "User Editor"
 msgstr "Editor de usuário"
 
-#: modules/pref-users.php:38
-msgid "Change password:"
-msgstr "Mudar senha:"
-
-#: modules/pref-users.php:42
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#: modules/pref-users.php:48
-msgid "Access level:"
+#: modules/pref-users.php:47
+#, fuzzy
+msgid "Access level: "
 msgstr "Nível de acesso:"
 
-#: modules/pref-users.php:83
+#: modules/pref-users.php:54
+#, fuzzy
+msgid "Change password to"
+msgstr "Mudar senha"
+
+#: modules/pref-users.php:63
+#, fuzzy
+msgid "E-mail: "
+msgstr "E-mail:"
+
+#: modules/pref-users.php:99
 #, php-format
 msgid "Changed password of user <b>%s</b>."
 msgstr "Alterada a senha do usuário <b>%s</b>."
 
-#: modules/pref-users.php:131
+#: modules/pref-users.php:147
 #, 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:138
+#: modules/pref-users.php:154
 #, 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:142
+#: modules/pref-users.php:158
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "O usuário <b>%s</b> já existe."
 
-#: modules/pref-users.php:162
+#: modules/pref-users.php:178
 #, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
@@ -2072,48 +2091,73 @@ msgstr ""
 "Alterada a senha do usuário <b>%s</b>\n"
 "\t\t\t\t\t para <b>%s</b>"
 
-#: modules/pref-users.php:166
+#: modules/pref-users.php:182
 #, fuzzy, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Adicionando a categoria <b>%s</b>."
 
-#: modules/pref-users.php:202
+#: modules/pref-users.php:218
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: modules/pref-users.php:259
+#: modules/pref-users.php:275
 msgid "Create user"
 msgstr "Criar um usuário"
 
-#: modules/pref-users.php:293
+#: modules/pref-users.php:309
 msgid "Login"
 msgstr "Login"
 
-#: modules/pref-users.php:294
+#: modules/pref-users.php:310
 msgid "Access Level"
 msgstr "Nível de acesso"
 
-#: modules/pref-users.php:296
+#: modules/pref-users.php:312
 msgid "Last login"
 msgstr "Último Login"
 
-#: modules/pref-users.php:355
+#: modules/pref-users.php:371
 msgid "User details"
 msgstr "Detalhes do usuário"
 
-#: modules/pref-users.php:361
+#: modules/pref-users.php:377
 msgid "Reset password"
 msgstr ""
 
-#: modules/pref-users.php:366
+#: modules/pref-users.php:382
 #, fuzzy
 msgid "No users defined."
 msgstr "Nenhum usuário foi selecionado."
 
-#: modules/pref-users.php:368
+#: modules/pref-users.php:384
 msgid "No matching users found."
 msgstr ""
 
+#~ msgid "Category:"
+#~ msgstr "Categoria:"
+
+#~ msgid "Where:"
+#~ msgstr "Onde:"
+
+#~ msgid "SQL Expression:"
+#~ msgstr "Expressão SQL:"
+
+#~ msgid "Feed:"
+#~ msgstr "Feed:"
+
+#~ msgid "Action:"
+#~ msgstr "Ação:"
+
+#~ msgid "Title:"
+#~ msgstr "Título"
+
+#, fuzzy
+#~ msgid "Update using:"
+#~ msgstr "Atualizar"
+
+#~ msgid "Change password:"
+#~ msgstr "Mudar senha:"
+
 #, fuzzy
 #~ msgid "Show article"
 #~ msgstr "Favoritos"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 2f3ff4523..4a073d7f2 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 b47f9b807..fabd8a521 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-08-01 11:55+0400\n"
+"POT-Creation-Date: 2008-08-06 16: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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:108 backend.php:117 backend.php:128
+#: backend.php:108
 msgid "Use default"
 msgstr "По умолчанию"
 
@@ -44,6 +44,11 @@ msgstr "Два месяца"
 msgid "3 months old"
 msgstr "Три месяца"
 
+#: backend.php:117
+#, fuzzy
+msgid "Default interval"
+msgstr "Интервал обновления:"
+
 #: backend.php:118
 msgid "Disable updates"
 msgstr "Не обновлять"
@@ -76,6 +81,10 @@ msgstr "Раз в день"
 msgid "Weekly"
 msgstr "Раз в неделю"
 
+#: backend.php:128 modules/pref-prefs.php:312
+msgid "Default"
+msgstr "По умолчанию"
+
 #: backend.php:129
 #, fuzzy
 msgid "Magpie"
@@ -85,7 +94,7 @@ msgstr "Страница"
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:139
+#: backend.php:139 modules/pref-users.php:35
 msgid "User"
 msgstr "Пользователь"
 
@@ -97,7 +106,7 @@ msgstr ""
 msgid "Administrator"
 msgstr "Администратор"
 
-#: backend.php:424 modules/pref-users.php:295
+#: backend.php:424 modules/pref-users.php:311
 msgid "Registered"
 msgstr ""
 
@@ -182,7 +191,7 @@ msgid "Starred articles"
 msgstr "Отмеченные"
 
 #: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1146
+#: modules/pref-feeds.php:1157
 msgid "Published articles"
 msgstr "Опубликованные"
 
@@ -191,13 +200,13 @@ msgstr "Опубликованные"
 msgid "Fresh articles"
 msgstr "Отмеченные"
 
-#: functions.php:2856 modules/popup-dialog.php:151
-#: modules/pref-filters.php:340
+#: functions.php:2856 modules/popup-dialog.php:175
+#: modules/pref-filters.php:353
 msgid "All feeds"
 msgstr "Все каналы"
 
 #: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:977
+#: functions.php:4348 modules/pref-feeds.php:988
 msgid "Uncategorized"
 msgstr "Нет категории"
 
@@ -219,15 +228,15 @@ msgid "Searched for"
 msgstr "Поиск"
 
 #: functions.php:3945 functions.php:3994 functions.php:5216
-#: 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
+#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
+#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-users.php:302
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:3946 functions.php:3995 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
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
+#: modules/pref-feeds.php:951 modules/pref-filters.php:306
+#: modules/pref-labels.php:272 modules/pref-users.php:303
 msgid "All"
 msgstr "Все"
 
@@ -236,13 +245,13 @@ msgstr "Все"
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:3948 functions.php:3997 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
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
+#: modules/pref-feeds.php:952 modules/pref-filters.php:307
+#: modules/pref-labels.php:273 modules/pref-users.php:304
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1100
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
 msgid "Actions..."
 msgstr "Действия..."
 
@@ -289,7 +298,8 @@ msgstr "Изменить:"
 msgid "Page"
 msgstr "Страница"
 
-#: functions.php:4004 modules/pref-filters.php:329
+#: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
+#: modules/pref-filters.php:342
 msgid "Feed"
 msgstr "Канал"
 
@@ -744,8 +754,8 @@ msgstr "Отмеченные"
 msgid "Rescoring articles..."
 msgstr "Отмеченные"
 
-#: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:952 modules/pref-feeds.php:1013
+#: localized_schema.php:9 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
 msgid "Title"
 msgstr "Заголовок"
 
@@ -757,7 +767,7 @@ msgstr "Заголовок или содержимое"
 msgid "Link"
 msgstr "Ссылка"
 
-#: localized_schema.php:12 modules/popup-dialog.php:183
+#: localized_schema.php:12 modules/popup-dialog.php:166
 msgid "Content"
 msgstr "Содержимое"
 
@@ -1010,12 +1020,11 @@ msgstr ""
 msgid "Do not show images in articles"
 msgstr ""
 
-#: login_form.php:103 modules/popup-dialog.php:100 modules/pref-feeds.php:274
-#: modules/pref-users.php:34
+#: login_form.php:103 modules/popup-dialog.php:107 modules/pref-feeds.php:281
 msgid "Login:"
 msgstr "Пользователь:"
 
-#: login_form.php:106 modules/popup-dialog.php:101 modules/pref-feeds.php:280
+#: login_form.php:106 modules/popup-dialog.php:111 modules/pref-feeds.php:285
 msgid "Password:"
 msgstr "Пароль:"
 
@@ -1229,9 +1238,10 @@ msgstr "Содержимое"
 msgid "tag cloud"
 msgstr "облако тегов"
 
-#: tt-rss.php:143 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:854 modules/pref-filters.php:235
-#: modules/pref-labels.php:233 modules/pref-users.php:242
+#: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
+#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/pref-users.php:258
 msgid "Search"
 msgstr "Поиск"
 
@@ -1297,7 +1307,7 @@ msgstr "Изм. прочитанное"
 msgid "Toggle Feedlist"
 msgstr "Изм. прочитанное"
 
-#: tt-rss.php:179 modules/popup-dialog.php:139
+#: tt-rss.php:179
 msgid "Search:"
 msgstr "Искать:"
 
@@ -1317,7 +1327,7 @@ msgstr "Все статьи"
 msgid "Limit:"
 msgstr "Сколько:"
 
-#: tt-rss.php:219
+#: tt-rss.php:219 modules/pref-feeds.php:247
 msgid "Update"
 msgstr "Обновить"
 
@@ -1385,7 +1395,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:809
+#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
@@ -1449,146 +1459,169 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr ""
 
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:859
-msgid "Subscribe to feed"
+#: modules/popup-dialog.php:61
+#, fuzzy
+msgid "Subscribe to Feed"
 msgstr "Подписаться на канал"
 
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:161
-msgid "Feed URL:"
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:167
+#, fuzzy
+msgid "URL:"
 msgstr "URL канала:"
 
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:169
-msgid "Category:"
-msgstr "Категория:"
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:179
+#, fuzzy
+msgid "Place in category:"
+msgstr "Категория сохраняется..."
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:117
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:276
+#: modules/pref-prefs.php:259 modules/pref-users.php:44
+msgid "Authentication"
+msgstr "Авторизация"
+
+#: modules/popup-dialog.php:123
+msgid "This feed requires authentication."
+msgstr "Этот канал требует авторизации."
+
+#: modules/popup-dialog.php:130 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:116
-#: modules/pref-feeds.php:362 modules/pref-filters.php:116
-#: modules/pref-users.php:63
+#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
+#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
+#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/pref-users.php:79
 msgid "Cancel"
 msgstr "Отмена"
 
-#: modules/popup-dialog.php:120
-msgid "This feed requires authentication."
-msgstr "Этот канал требует авторизации."
-
-#: modules/popup-dialog.php:148
-msgid "Where:"
-msgstr "Где:"
-
-#: modules/popup-dialog.php:164
-msgid "This feed"
-msgstr "Этот канал"
-
-#: modules/popup-dialog.php:179
-msgid "Match on:"
+#: modules/popup-dialog.php:162
+#, fuzzy
+msgid "match on:"
 msgstr "Искать по:"
 
-#: modules/popup-dialog.php:184
+#: modules/popup-dialog.php:167
 msgid "Title or content"
 msgstr "Заголовок или содержимое"
 
-#: modules/popup-dialog.php:208 modules/pref-labels.php:243
-msgid "Create label"
+#: modules/popup-dialog.php:172
+msgid "Limit search to:"
+msgstr ""
+
+#: modules/popup-dialog.php:188
+msgid "This feed"
+msgstr "Этот канал"
+
+#: modules/popup-dialog.php:223
+#, fuzzy
+msgid "Create Label"
 msgstr "Создать метку"
 
-#: modules/popup-dialog.php:218
-msgid "Caption:"
-msgstr "Заголовок:"
+#: modules/popup-dialog.php:231 modules/pref-labels.php:36
+#: modules/pref-labels.php:278
+msgid "Caption"
+msgstr "Заголовок"
 
-#: modules/popup-dialog.php:227
-msgid "SQL Expression:"
-msgstr "SQL выражение:"
+#: modules/popup-dialog.php:241 modules/pref-labels.php:46
+#, fuzzy
+msgid "Match SQL"
+msgstr "Искать"
 
-#: modules/popup-dialog.php:242 modules/pref-labels.php:62
+#: modules/popup-dialog.php:259 modules/pref-labels.php:64
 msgid "Help"
 msgstr "Помощь"
 
-#: modules/popup-dialog.php:245
+#: modules/popup-dialog.php:262
 msgid "Test"
 msgstr "Проверить"
 
-#: modules/popup-dialog.php:252 modules/popup-dialog.php:339
+#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
 msgid "Create"
 msgstr "Создать"
 
-#: modules/popup-dialog.php:265 modules/pref-filters.php:245
-msgid "Create filter"
+#: modules/popup-dialog.php:282
+#, fuzzy
+msgid "Create Filter"
 msgstr "Создать фильтр"
 
-#: modules/popup-dialog.php:283 modules/popup-dialog.php:314
-#: modules/pref-filters.php:38 modules/pref-filters.php:70
+#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/pref-filters.php:38 modules/pref-filters.php:72
 msgid "description"
 msgstr "описание"
 
-#: modules/popup-dialog.php:288 modules/pref-filters.php:43
-msgid "Match:"
-msgstr "Поиск:"
+#: modules/popup-dialog.php:351 modules/pref-filters.php:41
+#: modules/pref-filters.php:343
+msgid "Match"
+msgstr "Искать"
 
-#: modules/popup-dialog.php:294 modules/pref-filters.php:49
-msgid "On field:"
+#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+#, fuzzy
+msgid "on field"
 msgstr "По полю:"
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:54
-msgid "Feed:"
-msgstr "Канал:"
+#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#, fuzzy
+msgid "in"
+msgstr "Ссылка"
 
-#: modules/popup-dialog.php:305 modules/pref-filters.php:60
-msgid "Action:"
-msgstr "Действие:"
+#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#, fuzzy
+msgid "Perform Action"
+msgstr "Применить обновления"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:77
-msgid "Params:"
-msgstr "Параметры:"
+#: modules/popup-dialog.php:386 modules/pref-filters.php:77
+msgid "with params"
+msgstr ""
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:293
-msgid "Options:"
+#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
+#: modules/pref-filters.php:86 modules/pref-users.php:60
+#, fuzzy
+msgid "Options"
 msgstr "Дополнительно:"
 
-#: modules/popup-dialog.php:328 modules/pref-filters.php:101
+#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+msgid "Enabled"
+msgstr "Включен"
+
+#: modules/popup-dialog.php:402 modules/pref-filters.php:107
 msgid "Inverse match"
 msgstr "Инвертировать фильтр"
 
-#: modules/popup-dialog.php:354
+#: modules/popup-dialog.php:429
 msgid "Update Errors"
 msgstr "Ошибки обновления"
 
-#: modules/popup-dialog.php:357
+#: modules/popup-dialog.php:432
 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не было обновлены из-за ошибок:"
 
-#: modules/popup-dialog.php:376
+#: modules/popup-dialog.php:451
 msgid "Close"
 msgstr "Закрыть"
 
-#: modules/popup-dialog.php:385
+#: modules/popup-dialog.php:460
 msgid "Edit Tags"
 msgstr "Редактировать теги"
 
-#: modules/popup-dialog.php:390
+#: modules/popup-dialog.php:465
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:360
-#: modules/pref-filters.php:112 modules/pref-users.php:60
+#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
+#: modules/pref-filters.php:117 modules/pref-users.php:76
 msgid "Save"
 msgstr "Сохранить"
 
-#: modules/popup-dialog.php:448
+#: modules/popup-dialog.php:523
 msgid "Tag cloud"
 msgstr "Облако тегов"
 
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:526
 msgid "Showing most popular tags "
 msgstr "Самые популярные теги "
 
-#: modules/popup-dialog.php:452
+#: modules/popup-dialog.php:527
 msgid "browse more"
 msgstr "еще"
 
@@ -1645,259 +1678,254 @@ msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr "Топ 25 популярных каналов:"
 
 #: modules/pref-feeds.php:141
-msgid "Feed editor"
+#, fuzzy
+msgid "Feed Editor"
 msgstr "Редактор канала"
 
-#: modules/pref-feeds.php:153
-msgid "Title:"
-msgstr "Заголовок:"
-
-#: modules/pref-feeds.php:189
-msgid "Update Interval:"
-msgstr "Интервал обновления:"
-
-#: modules/pref-feeds.php:198
-msgid "Link to:"
+#: modules/pref-feeds.php:196
+#, fuzzy
+msgid "Link to feed:"
 msgstr "Связать с:"
 
-#: modules/pref-feeds.php:215
+#: modules/pref-feeds.php:213
 msgid "Not linked"
 msgstr "Нет связей"
 
-#: modules/pref-feeds.php:249
+#: modules/pref-feeds.php:261
+msgid "using"
+msgstr ""
+
+#: modules/pref-feeds.php:271
 msgid "Article purging:"
 msgstr "Удаление сообщений:"
 
-#: modules/pref-feeds.php:262
-#, fuzzy
-msgid "Update using:"
-msgstr "Обновить"
-
-#: modules/pref-feeds.php:295
+#: modules/pref-feeds.php:300
 msgid "Hide from \"Other Feeds\""
 msgstr "Спрятать из \"Других каналов\""
 
-#: modules/pref-feeds.php:306
+#: modules/pref-feeds.php:311
 msgid "Right-to-left content"
 msgstr "Язык канала пишется справа налево"
 
-#: modules/pref-feeds.php:317
+#: modules/pref-feeds.php:322
 msgid "Hide from my feed list"
 msgstr "Спрятать из моего списка каналов"
 
-#: modules/pref-feeds.php:329
+#: modules/pref-feeds.php:334
 msgid "Include in e-mail digest"
 msgstr "Включить в дайджест"
 
-#: modules/pref-feeds.php:350
+#: modules/pref-feeds.php:355
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:514 modules/pref-feeds.php:561
+#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+msgid "Unsubscribe"
+msgstr "Отписаться"
+
+#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:592
+#: modules/pref-feeds.php:603
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Добавлена подписка на <b>%s</b>."
 
-#: modules/pref-feeds.php:594
+#: modules/pref-feeds.php:605
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:676
+#: modules/pref-feeds.php:687
 msgid "Category editor"
 msgstr "Редактор категорий"
 
-#: modules/pref-feeds.php:699
+#: modules/pref-feeds.php:710
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Категория <b>$%s</b> уже существует."
 
-#: modules/pref-feeds.php:727
+#: modules/pref-feeds.php:738
 msgid "Unable to delete non empty feed categories."
 msgstr "Не могу удалить не пустую категорию"
 
-#: modules/pref-feeds.php:744
+#: modules/pref-feeds.php:755
 msgid "Create category"
 msgstr "Создать категорию"
 
-#: modules/pref-feeds.php:804
+#: modules/pref-feeds.php:815
 msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
-#: modules/pref-feeds.php:815 modules/pref-filters.php:398
-#: modules/pref-labels.php:324 modules/pref-users.php:359
+#: modules/pref-feeds.php:826 modules/pref-filters.php:128
+#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-users.php:375
 msgid "Remove"
 msgstr "Удалить"
 
-#: modules/pref-feeds.php:837
+#: modules/pref-feeds.php:848
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могли быть обновлены (щелкните для подробностей)"
 
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:870
+msgid "Subscribe to feed"
+msgstr "Подписаться на канал"
+
+#: modules/pref-feeds.php:875
 msgid "Top 25"
 msgstr "Топ 25"
 
-#: modules/pref-feeds.php:938
+#: modules/pref-feeds.php:949
 msgid "Show last article times"
 msgstr "Показать дату последней статьи"
 
-#: modules/pref-feeds.php:955 modules/pref-feeds.php:1017
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
 msgid "Last&nbsp;Article"
 msgstr "Последняя&nbsp;статья"
 
-#: modules/pref-feeds.php:958 modules/pref-feeds.php:1021
+#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
 msgid "Updated"
 msgstr "Обновлено"
 
-#: modules/pref-feeds.php:1042 modules/pref-filters.php:372
-#: modules/pref-labels.php:304 modules/pref-users.php:334
+#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
+#: modules/pref-labels.php:306 modules/pref-users.php:350
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1088 modules/pref-feeds.php:1102
+#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
 #, fuzzy
 msgid "Selection:"
 msgstr "Выбрать:"
 
-#: modules/pref-feeds.php:1094
+#: modules/pref-feeds.php:1105
 msgid "Recategorize"
 msgstr "Изменить категорию"
 
-#: modules/pref-feeds.php:1103 modules/pref-filters.php:396
-#: modules/pref-labels.php:322 modules/pref-users.php:357
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
+#: modules/pref-labels.php:324 modules/pref-users.php:373
 msgid "Edit"
 msgstr "Редактировать"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1115
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1116
 #, fuzzy
 msgid "Clear feed data"
 msgstr "Все каналы обновлены."
 
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:252
+#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Отмеченные"
 
-#: modules/pref-feeds.php:1107
-msgid "Unsubscribe"
-msgstr "Отписаться"
-
-#: modules/pref-feeds.php:1112
+#: modules/pref-feeds.php:1123
 #, fuzzy
 msgid "Other:"
 msgstr "Где:"
 
-#: modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1124
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: modules/pref-feeds.php:1120
+#: modules/pref-feeds.php:1131
 msgid "OPML"
 msgstr ""
 
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1135
 #, fuzzy
 msgid "File:"
 msgstr "Заголовок:"
 
-#: modules/pref-feeds.php:1127
+#: modules/pref-feeds.php:1138
 msgid "Import"
 msgstr "Импортировать"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1145
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: modules/pref-feeds.php:1137
+#: modules/pref-feeds.php:1148
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1139
+#: modules/pref-feeds.php:1150
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1143
+#: modules/pref-feeds.php:1154
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1152
+#: modules/pref-feeds.php:1163
 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:1159
+#: modules/pref-feeds.php:1170
 #, fuzzy
 msgid "Generate another link"
 msgstr "Создать другой адрес"
 
 #: modules/pref-filters.php:22
-msgid "Filter editor"
+#, fuzzy
+msgid "Filter Editor"
 msgstr "Редактор фильтров"
 
-#: modules/pref-filters.php:92
-msgid "Enabled"
-msgstr "Включен"
-
-#: modules/pref-filters.php:152
+#: modules/pref-filters.php:165
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr "Фильтр <b>%s</b> сохранен"
 
-#: modules/pref-filters.php:192
+#: modules/pref-filters.php:205
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Добавлен фильтр <b>%s</b>"
 
-#: modules/pref-filters.php:318
+#: modules/pref-filters.php:258
+msgid "Create filter"
+msgstr "Создать фильтр"
+
+#: modules/pref-filters.php:331
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:319
+#: modules/pref-filters.php:332
 #, fuzzy
 msgid "action_description"
 msgstr "описание"
 
-#: modules/pref-filters.php:328
+#: modules/pref-filters.php:341
 msgid "Filter expression"
 msgstr "Выражение"
 
-#: modules/pref-filters.php:330
-msgid "Match"
-msgstr "Искать"
-
-#: modules/pref-filters.php:331
+#: modules/pref-filters.php:344
 msgid "Action"
 msgstr "Действие"
 
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:345
 #, fuzzy
 msgid "Params"
 msgstr "Параметры:"
 
-#: modules/pref-filters.php:361
+#: modules/pref-filters.php:374
 msgid "(Disabled)"
 msgstr "(Отключен)"
 
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:393
 msgid "(Inverse)"
 msgstr "(Инвертирован)"
 
-#: modules/pref-filters.php:406
+#: modules/pref-filters.php:419
 msgid "No filters defined."
 msgstr "Фильтры отсутствуют."
 
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:421
 #, fuzzy
 msgid "No matching filters found."
 msgstr "Статей не найдено."
@@ -1909,34 +1937,34 @@ msgid ""
 "functionality."
 msgstr ""
 
-#: modules/pref-labels.php:173
+#: modules/pref-labels.php:175
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr "Метка <b>%s</b> сохранена"
 
-#: modules/pref-labels.php:205
+#: modules/pref-labels.php:207
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Добавлена метка <b>%s</b>"
 
-#: modules/pref-labels.php:276
-msgid "Caption"
-msgstr "Заголовок"
+#: modules/pref-labels.php:245
+msgid "Create label"
+msgstr "Создать метку"
 
-#: modules/pref-labels.php:277
+#: modules/pref-labels.php:279
 msgid "SQL Expression"
 msgstr "SQL выражение"
 
-#: modules/pref-labels.php:302
+#: modules/pref-labels.php:304
 #, fuzzy
 msgid "[No caption]"
 msgstr "Заголовок"
 
-#: modules/pref-labels.php:329
+#: modules/pref-labels.php:331
 msgid "No labels defined."
 msgstr "Метки отсутствуют."
 
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:333
 #, fuzzy
 msgid "No matching labels found."
 msgstr "Статей не найдено."
@@ -1985,10 +2013,6 @@ msgstr "Уровень доступа:"
 msgid "Change e-mail"
 msgstr "Изменить e-mail"
 
-#: modules/pref-prefs.php:259
-msgid "Authentication"
-msgstr "Авторизация"
-
 #: modules/pref-prefs.php:261
 msgid "Old password"
 msgstr "Старый пароль"
@@ -2013,10 +2037,6 @@ msgstr "Темы"
 msgid "Select theme"
 msgstr "Выбор темы"
 
-#: modules/pref-prefs.php:312
-msgid "Default"
-msgstr "По умолчанию"
-
 #: modules/pref-prefs.php:328
 msgid "Change theme"
 msgstr "Изменить тему"
@@ -2047,91 +2067,128 @@ msgid "Your access level is insufficient to open this tab."
 msgstr "В доступе отказано - недостаточный уровень привилегий."
 
 #: modules/pref-users.php:17
-msgid "User editor"
+#, fuzzy
+msgid "User Editor"
 msgstr "Редактор пользователей"
 
-#: modules/pref-users.php:38
-msgid "Change password:"
-msgstr "Изменить пароль:"
-
-#: modules/pref-users.php:42
-msgid "E-mail:"
-msgstr ""
-
-#: modules/pref-users.php:48
-msgid "Access level:"
+#: modules/pref-users.php:47
+#, fuzzy
+msgid "Access level: "
 msgstr "Уровень доступа:"
 
-#: modules/pref-users.php:83
+#: modules/pref-users.php:54
+#, fuzzy
+msgid "Change password to"
+msgstr "Изменить пароль"
+
+#: modules/pref-users.php:63
+msgid "E-mail: "
+msgstr ""
+
+#: modules/pref-users.php:99
 #, php-format
 msgid "Changed password of user <b>%s</b>."
 msgstr "Пароль пользователя <b>%s</b> изменен."
 
-#: modules/pref-users.php:131
+#: modules/pref-users.php:147
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "Добавлен пользователь <b>%s</b> с паролем <b>%s</b>"
 
-#: modules/pref-users.php:138
+#: modules/pref-users.php:154
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Не могу добавить пользователя <b>%s</b>"
 
-#: modules/pref-users.php:142
+#: modules/pref-users.php:158
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "Пользователь <b>%s</b> уже существует."
 
-#: modules/pref-users.php:162
+#: modules/pref-users.php:178
 #, 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:166
+#: modules/pref-users.php:182
 #, fuzzy, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Добавляется категория <b>%s</b>."
 
-#: modules/pref-users.php:202
+#: modules/pref-users.php:218
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: modules/pref-users.php:259
+#: modules/pref-users.php:275
 msgid "Create user"
 msgstr "Добавить пользователя"
 
-#: modules/pref-users.php:293
+#: modules/pref-users.php:309
 msgid "Login"
 msgstr "Пользователь:"
 
-#: modules/pref-users.php:294
+#: modules/pref-users.php:310
 msgid "Access Level"
 msgstr "Уровень доступа:"
 
-#: modules/pref-users.php:296
+#: modules/pref-users.php:312
 msgid "Last login"
 msgstr "Последний вход"
 
-#: modules/pref-users.php:355
+#: modules/pref-users.php:371
 msgid "User details"
 msgstr "Подробнее..."
 
-#: modules/pref-users.php:361
+#: modules/pref-users.php:377
 msgid "Reset password"
 msgstr "Сбросить пароль"
 
-#: modules/pref-users.php:366
+#: modules/pref-users.php:382
 #, fuzzy
 msgid "No users defined."
 msgstr "Фильтры отсутствуют."
 
-#: modules/pref-users.php:368
+#: modules/pref-users.php:384
 #, fuzzy
 msgid "No matching users found."
 msgstr "Статей не найдено."
 
+#~ msgid "Category:"
+#~ msgstr "Категория:"
+
+#~ msgid "Where:"
+#~ msgstr "Где:"
+
+#~ msgid "Caption:"
+#~ msgstr "Заголовок:"
+
+#~ msgid "SQL Expression:"
+#~ msgstr "SQL выражение:"
+
+#~ msgid "Match:"
+#~ msgstr "Поиск:"
+
+#~ msgid "Feed:"
+#~ msgstr "Канал:"
+
+#~ msgid "Action:"
+#~ msgstr "Действие:"
+
+#~ msgid "Params:"
+#~ msgstr "Параметры:"
+
+#~ msgid "Title:"
+#~ msgstr "Заголовок:"
+
+#, fuzzy
+#~ msgid "Update using:"
+#~ msgstr "Обновить"
+
+#~ msgid "Change password:"
+#~ msgstr "Изменить пароль:"
+
 #, fuzzy
 #~ msgid "Show article"
 #~ msgstr "Отмеченные"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 38c71e916..0a1d64a10 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 2b6678ec8..b76f32abd 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-08-01 11:55+0400\n"
+"POT-Creation-Date: 2008-08-06 16: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"
@@ -12,7 +12,7 @@ msgstr ""
 "X-Poedit-Country: china\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: backend.php:108 backend.php:117 backend.php:128
+#: backend.php:108
 msgid "Use default"
 msgstr "用户默认"
 
@@ -40,6 +40,11 @@ msgstr "2月前"
 msgid "3 months old"
 msgstr "3月前"
 
+#: backend.php:117
+#, fuzzy
+msgid "Default interval"
+msgstr "更新间隔:"
+
 #: backend.php:118
 msgid "Disable updates"
 msgstr "禁用更新"
@@ -72,6 +77,10 @@ msgstr "每天"
 msgid "Weekly"
 msgstr "每周"
 
+#: backend.php:128 modules/pref-prefs.php:312
+msgid "Default"
+msgstr "默认"
+
 #: backend.php:129
 #, fuzzy
 msgid "Magpie"
@@ -81,7 +90,7 @@ msgstr "页"
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:139
+#: backend.php:139 modules/pref-users.php:35
 msgid "User"
 msgstr "用户"
 
@@ -93,7 +102,7 @@ msgstr ""
 msgid "Administrator"
 msgstr "管理员"
 
-#: backend.php:424 modules/pref-users.php:295
+#: backend.php:424 modules/pref-users.php:311
 msgid "Registered"
 msgstr ""
 
@@ -178,7 +187,7 @@ msgid "Starred articles"
 msgstr "星级文章"
 
 #: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1146
+#: modules/pref-feeds.php:1157
 msgid "Published articles"
 msgstr "已发布文章"
 
@@ -187,13 +196,13 @@ msgstr "已发布文章"
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:2856 modules/popup-dialog.php:151
-#: modules/pref-filters.php:340
+#: functions.php:2856 modules/popup-dialog.php:175
+#: modules/pref-filters.php:353
 msgid "All feeds"
 msgstr "所有feed"
 
 #: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:977
+#: functions.php:4348 modules/pref-feeds.php:988
 msgid "Uncategorized"
 msgstr "未分类"
 
@@ -215,15 +224,15 @@ msgid "Searched for"
 msgstr "搜索"
 
 #: functions.php:3945 functions.php:3994 functions.php:5216
-#: 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
+#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
+#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-users.php:302
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:3946 functions.php:3995 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
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
+#: modules/pref-feeds.php:951 modules/pref-filters.php:306
+#: modules/pref-labels.php:272 modules/pref-users.php:303
 msgid "All"
 msgstr "所有"
 
@@ -232,13 +241,13 @@ msgstr "所有"
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3948 functions.php:3997 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
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
+#: modules/pref-feeds.php:952 modules/pref-filters.php:307
+#: modules/pref-labels.php:273 modules/pref-users.php:304
 msgid "None"
 msgstr "无"
 
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1100
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
 msgid "Actions..."
 msgstr "激活..."
 
@@ -284,7 +293,8 @@ msgstr "触发:"
 msgid "Page"
 msgstr "页"
 
-#: functions.php:4004 modules/pref-filters.php:329
+#: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
+#: modules/pref-filters.php:342
 msgid "Feed"
 msgstr "Feed"
 
@@ -739,8 +749,8 @@ msgstr "星级文章"
 msgid "Rescoring articles..."
 msgstr "星级文章"
 
-#: localized_schema.php:9 modules/popup-dialog.php:182
-#: modules/pref-feeds.php:952 modules/pref-feeds.php:1013
+#: localized_schema.php:9 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
 msgid "Title"
 msgstr "标题"
 
@@ -752,7 +762,7 @@ msgstr "标题或内容"
 msgid "Link"
 msgstr "链接"
 
-#: localized_schema.php:12 modules/popup-dialog.php:183
+#: localized_schema.php:12 modules/popup-dialog.php:166
 msgid "Content"
 msgstr "内容"
 
@@ -1008,12 +1018,11 @@ msgstr ""
 msgid "Do not show images in articles"
 msgstr ""
 
-#: login_form.php:103 modules/popup-dialog.php:100 modules/pref-feeds.php:274
-#: modules/pref-users.php:34
+#: login_form.php:103 modules/popup-dialog.php:107 modules/pref-feeds.php:281
 msgid "Login:"
 msgstr "登陆:"
 
-#: login_form.php:106 modules/popup-dialog.php:101 modules/pref-feeds.php:280
+#: login_form.php:106 modules/popup-dialog.php:111 modules/pref-feeds.php:285
 msgid "Password:"
 msgstr "密码:"
 
@@ -1235,9 +1244,10 @@ msgstr "内容"
 msgid "tag cloud"
 msgstr "标签簇"
 
-#: tt-rss.php:143 modules/popup-dialog.php:127 modules/popup-dialog.php:196
-#: modules/pref-feeds.php:854 modules/pref-filters.php:235
-#: modules/pref-labels.php:233 modules/pref-users.php:242
+#: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
+#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/pref-users.php:258
 msgid "Search"
 msgstr "搜索"
 
@@ -1302,7 +1312,7 @@ msgstr "隐藏我的Feed列表"
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:179 modules/popup-dialog.php:139
+#: tt-rss.php:179
 msgid "Search:"
 msgstr "搜索:"
 
@@ -1322,7 +1332,7 @@ msgstr "所有文章"
 msgid "Limit:"
 msgstr "限制:"
 
-#: tt-rss.php:219
+#: tt-rss.php:219 modules/pref-feeds.php:247
 msgid "Update"
 msgstr "更新"
 
@@ -1392,7 +1402,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:809
+#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
 msgid "Close this window"
 msgstr "关闭此窗口"
 
@@ -1461,147 +1471,170 @@ msgid ""
 "\t\t\t\t\towner."
 msgstr "TT-RSS检测到更新时间过长，请刷新或者检查RSS源地址。"
 
-#: modules/popup-dialog.php:61 modules/pref-feeds.php:859
-msgid "Subscribe to feed"
+#: modules/popup-dialog.php:61
+#, fuzzy
+msgid "Subscribe to Feed"
 msgstr "订阅feed"
 
-#: modules/popup-dialog.php:72 modules/pref-feeds.php:161
-msgid "Feed URL:"
+#: modules/popup-dialog.php:73 modules/pref-feeds.php:167
+#, fuzzy
+msgid "URL:"
 msgstr "Feed URL:"
 
-#: modules/popup-dialog.php:80 modules/pref-feeds.php:169
-msgid "Category:"
-msgstr "分类:"
+#: modules/popup-dialog.php:84 modules/pref-feeds.php:179
+#, fuzzy
+msgid "Place in category:"
+msgstr "保存分类..."
 
-#: modules/popup-dialog.php:111 modules/pref-feed-browser.php:117
+#: modules/popup-dialog.php:104 modules/pref-feeds.php:276
+#: modules/pref-prefs.php:259 modules/pref-users.php:44
+msgid "Authentication"
+msgstr "认证"
+
+#: modules/popup-dialog.php:123
+msgid "This feed requires authentication."
+msgstr "这个feed需要认证"
+
+#: modules/popup-dialog.php:130 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:116
-#: modules/pref-feeds.php:362 modules/pref-filters.php:116
-#: modules/pref-users.php:63
+#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
+#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
+#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/pref-users.php:79
 msgid "Cancel"
 msgstr "取消"
 
-#: modules/popup-dialog.php:120
-msgid "This feed requires authentication."
-msgstr "这个feed需要认证"
-
-#: modules/popup-dialog.php:148
-msgid "Where:"
-msgstr "地点:"
-
-#: modules/popup-dialog.php:164
-msgid "This feed"
-msgstr "本feed"
-
-#: modules/popup-dialog.php:179
-msgid "Match on:"
+#: modules/popup-dialog.php:162
+#, fuzzy
+msgid "match on:"
 msgstr "匹配:"
 
-#: modules/popup-dialog.php:184
+#: modules/popup-dialog.php:167
 msgid "Title or content"
 msgstr "标题或内容"
 
-#: modules/popup-dialog.php:208 modules/pref-labels.php:243
-msgid "Create label"
+#: modules/popup-dialog.php:172
+msgid "Limit search to:"
+msgstr ""
+
+#: modules/popup-dialog.php:188
+msgid "This feed"
+msgstr "本feed"
+
+#: modules/popup-dialog.php:223
+#, fuzzy
+msgid "Create Label"
 msgstr "创建标记"
 
-#: modules/popup-dialog.php:218
-msgid "Caption:"
-msgstr "说明:"
+#: modules/popup-dialog.php:231 modules/pref-labels.php:36
+#: modules/pref-labels.php:278
+msgid "Caption"
+msgstr "标题"
 
-#: modules/popup-dialog.php:227
-msgid "SQL Expression:"
-msgstr "SQL 表达式:"
+#: modules/popup-dialog.php:241 modules/pref-labels.php:46
+#, fuzzy
+msgid "Match SQL"
+msgstr "匹配"
 
-#: modules/popup-dialog.php:242 modules/pref-labels.php:62
+#: modules/popup-dialog.php:259 modules/pref-labels.php:64
 #, fuzzy
 msgid "Help"
 msgstr "你好,"
 
-#: modules/popup-dialog.php:245
+#: modules/popup-dialog.php:262
 msgid "Test"
 msgstr "测试"
 
-#: modules/popup-dialog.php:252 modules/popup-dialog.php:339
+#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
 msgid "Create"
 msgstr "创建"
 
-#: modules/popup-dialog.php:265 modules/pref-filters.php:245
-msgid "Create filter"
+#: modules/popup-dialog.php:282
+#, fuzzy
+msgid "Create Filter"
 msgstr "创建过滤器"
 
-#: modules/popup-dialog.php:283 modules/popup-dialog.php:314
-#: modules/pref-filters.php:38 modules/pref-filters.php:70
+#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/pref-filters.php:38 modules/pref-filters.php:72
 msgid "description"
 msgstr "描述"
 
-#: modules/popup-dialog.php:288 modules/pref-filters.php:43
-msgid "Match:"
-msgstr "匹配："
+#: modules/popup-dialog.php:351 modules/pref-filters.php:41
+#: modules/pref-filters.php:343
+msgid "Match"
+msgstr "匹配"
 
-#: modules/popup-dialog.php:294 modules/pref-filters.php:49
-msgid "On field:"
+#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+#, fuzzy
+msgid "on field"
 msgstr "于:"
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:54
-msgid "Feed:"
-msgstr "Feed:"
+#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#, fuzzy
+msgid "in"
+msgstr "链接"
 
-#: modules/popup-dialog.php:305 modules/pref-filters.php:60
-msgid "Action:"
-msgstr "操作:"
+#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#, fuzzy
+msgid "Perform Action"
+msgstr "完成更新"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:77
-msgid "Params:"
-msgstr "参数:"
+#: modules/popup-dialog.php:386 modules/pref-filters.php:77
+msgid "with params"
+msgstr ""
 
-#: modules/popup-dialog.php:325 modules/pref-feeds.php:293
-msgid "Options:"
+#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
+#: modules/pref-filters.php:86 modules/pref-users.php:60
+#, fuzzy
+msgid "Options"
 msgstr "选项:"
 
-#: modules/popup-dialog.php:328 modules/pref-filters.php:101
+#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+msgid "Enabled"
+msgstr "可用"
+
+#: modules/popup-dialog.php:402 modules/pref-filters.php:107
 msgid "Inverse match"
 msgstr "逆匹配"
 
-#: modules/popup-dialog.php:354
+#: modules/popup-dialog.php:429
 msgid "Update Errors"
 msgstr "更新错误"
 
-#: modules/popup-dialog.php:357
+#: modules/popup-dialog.php:432
 msgid "These feeds have not been updated because of errors:"
 msgstr "这些feed更新错误:"
 
-#: modules/popup-dialog.php:376
+#: modules/popup-dialog.php:451
 msgid "Close"
 msgstr "关闭"
 
-#: modules/popup-dialog.php:385
+#: modules/popup-dialog.php:460
 msgid "Edit Tags"
 msgstr "编辑标签"
 
-#: modules/popup-dialog.php:390
+#: modules/popup-dialog.php:465
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开:"
 
-#: modules/popup-dialog.php:435 modules/pref-feeds.php:360
-#: modules/pref-filters.php:112 modules/pref-users.php:60
+#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
+#: modules/pref-filters.php:117 modules/pref-users.php:76
 msgid "Save"
 msgstr "保存"
 
-#: modules/popup-dialog.php:448
+#: modules/popup-dialog.php:523
 msgid "Tag cloud"
 msgstr "标签簇"
 
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:526
 msgid "Showing most popular tags "
 msgstr "显示最热标签"
 
-#: modules/popup-dialog.php:452
+#: modules/popup-dialog.php:527
 msgid "browse more"
 msgstr "浏览更多"
 
@@ -1658,260 +1691,255 @@ msgid "Showing top 25 registered feeds, sorted by popularity:"
 msgstr "显示按受欢迎度排序的25个注册feed:"
 
 #: modules/pref-feeds.php:141
-msgid "Feed editor"
+#, fuzzy
+msgid "Feed Editor"
 msgstr "Feed编辑"
 
-#: modules/pref-feeds.php:153
-msgid "Title:"
-msgstr "标题:"
-
-#: modules/pref-feeds.php:189
-msgid "Update Interval:"
-msgstr "更新间隔:"
-
-#: modules/pref-feeds.php:198
-msgid "Link to:"
+#: modules/pref-feeds.php:196
+#, fuzzy
+msgid "Link to feed:"
 msgstr "链接:"
 
-#: modules/pref-feeds.php:215
+#: modules/pref-feeds.php:213
 msgid "Not linked"
 msgstr "无链接"
 
-#: modules/pref-feeds.php:249
+#: modules/pref-feeds.php:261
+msgid "using"
+msgstr ""
+
+#: modules/pref-feeds.php:271
 msgid "Article purging:"
 msgstr "文章清理:"
 
-#: modules/pref-feeds.php:262
-#, fuzzy
-msgid "Update using:"
-msgstr "更新"
-
-#: modules/pref-feeds.php:295
+#: modules/pref-feeds.php:300
 msgid "Hide from \"Other Feeds\""
 msgstr "隐藏\"其他 Feed\""
 
-#: modules/pref-feeds.php:306
+#: modules/pref-feeds.php:311
 msgid "Right-to-left content"
 msgstr "由右-左阅读习惯"
 
-#: modules/pref-feeds.php:317
+#: modules/pref-feeds.php:322
 msgid "Hide from my feed list"
 msgstr "隐藏我的Feed列表"
 
-#: modules/pref-feeds.php:329
+#: modules/pref-feeds.php:334
 msgid "Include in e-mail digest"
 msgstr "包括电子邮件文摘"
 
-#: modules/pref-feeds.php:350
+#: modules/pref-feeds.php:355
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:514 modules/pref-feeds.php:561
+#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+msgid "Unsubscribe"
+msgstr "退订"
+
+#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:592
+#: modules/pref-feeds.php:603
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:594
+#: modules/pref-feeds.php:605
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:676
+#: modules/pref-feeds.php:687
 msgid "Category editor"
 msgstr "分类编辑"
 
-#: modules/pref-feeds.php:699
+#: modules/pref-feeds.php:710
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "分类 <b>$%s</b>已经存在."
 
-#: modules/pref-feeds.php:727
+#: modules/pref-feeds.php:738
 msgid "Unable to delete non empty feed categories."
 msgstr "不能删除非空分类。"
 
-#: modules/pref-feeds.php:744
+#: modules/pref-feeds.php:755
 msgid "Create category"
 msgstr "创建分类"
 
-#: modules/pref-feeds.php:804
+#: modules/pref-feeds.php:815
 msgid "No feed categories defined."
 msgstr "未定义feed分类"
 
-#: modules/pref-feeds.php:815 modules/pref-filters.php:398
-#: modules/pref-labels.php:324 modules/pref-users.php:359
+#: modules/pref-feeds.php:826 modules/pref-filters.php:128
+#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-users.php:375
 msgid "Remove"
 msgstr "移除"
 
-#: modules/pref-feeds.php:837
+#: modules/pref-feeds.php:848
 msgid "Some feeds have update errors (click for details)"
 msgstr "有些feed更新错误(点击了解详情) "
 
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:870
+msgid "Subscribe to feed"
+msgstr "订阅feed"
+
+#: modules/pref-feeds.php:875
 msgid "Top 25"
 msgstr "Top 25"
 
-#: modules/pref-feeds.php:938
+#: modules/pref-feeds.php:949
 msgid "Show last article times"
 msgstr "显示最近文章时间"
 
-#: modules/pref-feeds.php:955 modules/pref-feeds.php:1017
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
 msgid "Last&nbsp;Article"
 msgstr "最后&nbsp;文章"
 
-#: modules/pref-feeds.php:958 modules/pref-feeds.php:1021
+#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
 msgid "Updated"
 msgstr "已更新"
 
-#: modules/pref-feeds.php:1042 modules/pref-filters.php:372
-#: modules/pref-labels.php:304 modules/pref-users.php:334
+#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
+#: modules/pref-labels.php:306 modules/pref-users.php:350
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1088 modules/pref-feeds.php:1102
+#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: modules/pref-feeds.php:1094
+#: modules/pref-feeds.php:1105
 msgid "Recategorize"
 msgstr "再分类"
 
-#: modules/pref-feeds.php:1103 modules/pref-filters.php:396
-#: modules/pref-labels.php:322 modules/pref-users.php:357
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
+#: modules/pref-labels.php:324 modules/pref-users.php:373
 msgid "Edit"
 msgstr "编辑"
 
-#: modules/pref-feeds.php:1104
+#: modules/pref-feeds.php:1115
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1116
 #, fuzzy
 msgid "Clear feed data"
 msgstr "所有Feed已更新。"
 
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:252
+#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
 #, fuzzy
 msgid "Rescore articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1107
-msgid "Unsubscribe"
-msgstr "退订"
-
-#: modules/pref-feeds.php:1112
+#: modules/pref-feeds.php:1123
 #, fuzzy
 msgid "Other:"
 msgstr "地点:"
 
-#: modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1124
 msgid "Edit categories"
 msgstr "编辑分类"
 
-#: modules/pref-feeds.php:1120
+#: modules/pref-feeds.php:1131
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1135
 #, fuzzy
 msgid "File:"
 msgstr "标题:"
 
-#: modules/pref-feeds.php:1127
+#: modules/pref-feeds.php:1138
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1134
+#: modules/pref-feeds.php:1145
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1137
+#: modules/pref-feeds.php:1148
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1139
+#: modules/pref-feeds.php:1150
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1143
+#: modules/pref-feeds.php:1154
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1152
+#: modules/pref-feeds.php:1163
 #, 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:1159
+#: modules/pref-feeds.php:1170
 #, fuzzy
 msgid "Generate another link"
 msgstr "生成另一个地址"
 
 #: modules/pref-filters.php:22
-msgid "Filter editor"
+#, fuzzy
+msgid "Filter Editor"
 msgstr "过滤器编辑"
 
-#: modules/pref-filters.php:92
-msgid "Enabled"
-msgstr "可用"
-
-#: modules/pref-filters.php:152
+#: modules/pref-filters.php:165
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr "保存过滤器<b>%s</b>"
 
-#: modules/pref-filters.php:192
+#: modules/pref-filters.php:205
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "创建过滤器 <b>%s</b>"
 
-#: modules/pref-filters.php:318
+#: modules/pref-filters.php:258
+msgid "Create filter"
+msgstr "创建过滤器"
+
+#: modules/pref-filters.php:331
 msgid "filter_type_descr"
 msgstr ""
 
-#: modules/pref-filters.php:319
+#: modules/pref-filters.php:332
 #, fuzzy
 msgid "action_description"
 msgstr "描述"
 
-#: modules/pref-filters.php:328
+#: modules/pref-filters.php:341
 msgid "Filter expression"
 msgstr "过滤器表达式"
 
-#: modules/pref-filters.php:330
-msgid "Match"
-msgstr "匹配"
-
-#: modules/pref-filters.php:331
+#: modules/pref-filters.php:344
 msgid "Action"
 msgstr "操作"
 
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:345
 #, fuzzy
 msgid "Params"
 msgstr "参数:"
 
-#: modules/pref-filters.php:361
+#: modules/pref-filters.php:374
 msgid "(Disabled)"
 msgstr "(不可用)"
 
-#: modules/pref-filters.php:380
+#: modules/pref-filters.php:393
 msgid "(Inverse)"
 msgstr "(逆)"
 
-#: modules/pref-filters.php:406
+#: modules/pref-filters.php:419
 msgid "No filters defined."
 msgstr "未定义过滤器。"
 
-#: modules/pref-filters.php:408
+#: modules/pref-filters.php:421
 #, fuzzy
 msgid "No matching filters found."
 msgstr "未找到文章。"
@@ -1923,34 +1951,34 @@ msgid ""
 "functionality."
 msgstr ""
 
-#: modules/pref-labels.php:173
+#: modules/pref-labels.php:175
 #, php-format
 msgid "Saved label <b>%s</b>"
 msgstr "已保存标记<b>%s</b>"
 
-#: modules/pref-labels.php:205
+#: modules/pref-labels.php:207
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "创建标记 <b>%s</b>"
 
-#: modules/pref-labels.php:276
-msgid "Caption"
-msgstr "标题"
+#: modules/pref-labels.php:245
+msgid "Create label"
+msgstr "创建标记"
 
-#: modules/pref-labels.php:277
+#: modules/pref-labels.php:279
 msgid "SQL Expression"
 msgstr "SQL 表达式"
 
-#: modules/pref-labels.php:302
+#: modules/pref-labels.php:304
 #, fuzzy
 msgid "[No caption]"
 msgstr "标题"
 
-#: modules/pref-labels.php:329
+#: modules/pref-labels.php:331
 msgid "No labels defined."
 msgstr "未定义标记."
 
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:333
 #, fuzzy
 msgid "No matching labels found."
 msgstr "未找到文章。"
@@ -2000,10 +2028,6 @@ msgstr "等级:"
 msgid "Change e-mail"
 msgstr "更改 e-mail"
 
-#: modules/pref-prefs.php:259
-msgid "Authentication"
-msgstr "认证"
-
 #: modules/pref-prefs.php:261
 msgid "Old password"
 msgstr "原密码"
@@ -2028,10 +2052,6 @@ msgstr "模板"
 msgid "Select theme"
 msgstr "选择模板"
 
-#: modules/pref-prefs.php:312
-msgid "Default"
-msgstr "默认"
-
 #: modules/pref-prefs.php:328
 msgid "Change theme"
 msgstr "更改模板"
@@ -2062,42 +2082,46 @@ msgid "Your access level is insufficient to open this tab."
 msgstr "权限不足。"
 
 #: modules/pref-users.php:17
-msgid "User editor"
+#, fuzzy
+msgid "User Editor"
 msgstr "用户编辑"
 
-#: modules/pref-users.php:38
-msgid "Change password:"
-msgstr "更改密码:"
-
-#: modules/pref-users.php:42
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#: modules/pref-users.php:48
-msgid "Access level:"
+#: modules/pref-users.php:47
+#, fuzzy
+msgid "Access level: "
 msgstr "等级:"
 
-#: modules/pref-users.php:83
+#: modules/pref-users.php:54
+#, fuzzy
+msgid "Change password to"
+msgstr "更改密码"
+
+#: modules/pref-users.php:63
+#, fuzzy
+msgid "E-mail: "
+msgstr "E-mail:"
+
+#: modules/pref-users.php:99
 #, php-format
 msgid "Changed password of user <b>%s</b>."
 msgstr "更改用<b>%s</b>密码"
 
-#: modules/pref-users.php:131
+#: modules/pref-users.php:147
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "添加用 <b>%s</b> ，密码为<b>%s</b>"
 
-#: modules/pref-users.php:138
+#: modules/pref-users.php:154
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "创建用户 <b>%s</b> 失败"
 
-#: modules/pref-users.php:142
+#: modules/pref-users.php:158
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "用户 <b>%s</b> 已存在。"
 
-#: modules/pref-users.php:162
+#: modules/pref-users.php:178
 #, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
@@ -2106,49 +2130,83 @@ msgstr ""
 "更改用户 <b>%s</b>\n"
 "\t\t\t\t\t 的密码为 <b>%s</b>"
 
-#: modules/pref-users.php:166
+#: modules/pref-users.php:182
 #, fuzzy, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "添加分类 <b>%s</b>."
 
-#: modules/pref-users.php:202
+#: modules/pref-users.php:218
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: modules/pref-users.php:259
+#: modules/pref-users.php:275
 msgid "Create user"
 msgstr "创建用户"
 
-#: modules/pref-users.php:293
+#: modules/pref-users.php:309
 msgid "Login"
 msgstr "登陆"
 
-#: modules/pref-users.php:294
+#: modules/pref-users.php:310
 msgid "Access Level"
 msgstr "等级:"
 
-#: modules/pref-users.php:296
+#: modules/pref-users.php:312
 msgid "Last login"
 msgstr "最后登陆"
 
-#: modules/pref-users.php:355
+#: modules/pref-users.php:371
 msgid "User details"
 msgstr "用户详细"
 
-#: modules/pref-users.php:361
+#: modules/pref-users.php:377
 msgid "Reset password"
 msgstr "重置密码"
 
-#: modules/pref-users.php:366
+#: modules/pref-users.php:382
 #, fuzzy
 msgid "No users defined."
 msgstr "未定义过滤器。"
 
-#: modules/pref-users.php:368
+#: modules/pref-users.php:384
 #, fuzzy
 msgid "No matching users found."
 msgstr "未找到文章。"
 
+#~ msgid "Category:"
+#~ msgstr "分类:"
+
+#~ msgid "Where:"
+#~ msgstr "地点:"
+
+#~ msgid "Caption:"
+#~ msgstr "说明:"
+
+#~ msgid "SQL Expression:"
+#~ msgstr "SQL 表达式:"
+
+#~ msgid "Match:"
+#~ msgstr "匹配："
+
+#~ msgid "Feed:"
+#~ msgstr "Feed:"
+
+#~ msgid "Action:"
+#~ msgstr "操作:"
+
+#~ msgid "Params:"
+#~ msgstr "参数:"
+
+#~ msgid "Title:"
+#~ msgstr "标题:"
+
+#, fuzzy
+#~ msgid "Update using:"
+#~ msgstr "更新"
+
+#~ msgid "Change password:"
+#~ msgstr "更改密码:"
+
 #, fuzzy
 #~ msgid "Show article"
 #~ msgstr "星级文章"