diff --git a/classes/dlg.php b/classes/dlg.php
index b3d8af349..10b6d580e 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -533,9 +533,11 @@ class Dlg extends Handler_Protected {
 		print "<content><![CDATA[";
 
 		print __("Match:"). "&nbsp;" .
-			  "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" checked value=\"any\" name=\"tag_mode\">&nbsp;Any&nbsp;";
-		print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" value=\"all\" name=\"tag_mode\">&nbsp;All&nbsp;";
-		print "&nbsp;tags.";
+			"<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" checked value=\"any\" name=\"tag_mode\" id=\"tag_mode_any\">";
+		print "<label for=\"tag_mode_any\">".__("Any")."</label>";
+		print "&nbsp;";
+		print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" value=\"all\" name=\"tag_mode\" id=\"tag_mode_all\">";
+		print "<label for=\"tag_mode_all\">".__("All tags.")."</input>";
 
 		print "<select id=\"all_tags\" name=\"all_tags\" title=\"" . __('Which Tags?') . "\" multiple=\"multiple\" size=\"10\" style=\"width : 100%\">";
 		$result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 1f581e0e3..2eed4dee9 100644
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -139,7 +139,7 @@ class Pref_Filters extends Handler_Protected {
 
 				$folder = array();
 				$folder['id'] = $line["action_id"];
-				$folder['name'] = $line["action_name"];
+				$folder['name'] = __($line["action_name"]);
 				$folder['items'] = array();
 				$action_id = $line["action_id"];
 			}
diff --git a/include/localized_schema.php b/include/localized_schema.php
index 43cc9b368..985c1f7fc 100644
--- a/include/localized_schema.php
+++ b/include/localized_schema.php
@@ -1,4 +1,4 @@
-<?php # This file has been generated at:  Mon Nov 12 14:25:49 MSK 2012
+<?php # This file has been generated at:  Thu Nov 22 16:05:39 MSK 2012
 
 __("Title");
 __("Title or Content");
diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index ba5e699ad..12b2fef75 100644
Binary files a/locale/ca_CA/LC_MESSAGES/messages.mo and b/locale/ca_CA/LC_MESSAGES/messages.mo differ
diff --git a/locale/ca_CA/LC_MESSAGES/messages.po b/locale/ca_CA/LC_MESSAGES/messages.po
index 0a6f74b82..8c2f7f74c 100644
--- a/locale/ca_CA/LC_MESSAGES/messages.po
+++ b/locale/ca_CA/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+0400\n"
 "PO-Revision-Date: 2009-11-19 09:40+0100\n"
 "Last-Translator: Alfred Galitó <bratac@bratac.cat>\n"
 "Language-Team: Català <bratac@bratac.cat>\n"
@@ -308,7 +308,7 @@ msgstr ""
 "Ha fallat la sortida de prova de SQL, reviseu la base configuració de la "
 "bases de dades i de PHP"
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "Preferències"
@@ -474,7 +474,7 @@ msgid "Filters"
 msgstr "Filtres"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etiquetes"
@@ -716,19 +716,19 @@ msgstr "Si esteu veient les categories reduir-les/ampliar-les"
 msgid "Go to..."
 msgstr "Vés a..."
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 msgid "All articles"
 msgstr "Tots els articles"
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr "Articles nous"
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr "Articles marcats"
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr "Articles publicats"
 
@@ -806,8 +806,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr "Especial"
 
@@ -850,153 +850,153 @@ msgstr "Mostra/amaga els canals llegits"
 msgid "Sort feeds by unread count"
 msgstr "Ordena els canals per articles no llegits"
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr ""
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "Sense categoria"
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "Tots els canals"
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 #, fuzzy
 msgid "Archived articles"
 msgstr "Articles mémorisés"
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Resultats de la cerca"
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 #, fuzzy
 msgid "Click to play"
 msgstr "Feu clic per editar"
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr "sense etiqueta"
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 msgid "Edit tags for this article"
 msgstr "Edita les etiquetes d'aquest article"
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Obre l'article en una finestra nova"
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 #, fuzzy
 msgid "Close article"
 msgstr "Buida els articles"
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 #, fuzzy
 msgid "Originally from:"
 msgstr "Mostra el contingut original de l'article"
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 #, fuzzy
 msgid "Feed URL"
 msgstr "Canal"
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 #, fuzzy
 msgid "Visit the website"
 msgstr "Visiteu el web oficial"
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr "Tanca la finestra"
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 #, fuzzy
 msgid "(edit note)"
 msgstr "edita la nota"
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr "No heu seleccionat cap canal."
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Erreurs de mise à jour"
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "S'han detectat errors en alguns canals (feu clic aquí per veure'n els "
 "detalls)"
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 msgid "unknown type"
 msgstr "tipus desconegut"
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 #, fuzzy
 msgid "Attachments"
 msgstr "Adjuncions:"
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Articles marcats"
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 msgid "No feeds found."
 msgstr "No s'ha trobat cap canal."
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 #, fuzzy
 msgid "Could not import: incorrect schema version."
 msgstr ""
 "No s'ha pogut trobar el fitxer d'esquema necessari, es necessita la versió:"
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr ""
 
@@ -1281,7 +1281,7 @@ msgid "Profile:"
 msgstr "Fitxer:"
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 #, fuzzy
 msgid "Default profile"
 msgstr "Nombre maximal d'articles par défaut"
@@ -1304,7 +1304,7 @@ msgstr "Torna a Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Titre&nbsp;:"
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 msgid "URL:"
@@ -1329,9 +1329,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1412,7 +1412,7 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1422,7 +1422,7 @@ msgstr ""
 msgid "Select"
 msgstr "Selecciona:"
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1431,7 +1431,7 @@ msgstr "Selecciona:"
 msgid "All"
 msgstr "Tot"
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1440,45 +1440,45 @@ msgstr "Tot"
 msgid "None"
 msgstr "Cap"
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 #, fuzzy
 msgid "Create profile"
 msgstr "Crea un filtre"
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 #, fuzzy
 msgid "(active)"
 msgstr "Adaptatiu"
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 #, fuzzy
 msgid "Activate profile"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Enllaç als articles publicats del canal."
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Canals generats"
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr "Avís"
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1489,11 +1489,11 @@ msgstr ""
 "us plau, engegueu el procés del daemon o contacteu amb el responsable "
 "pertinent."
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr "Última actualització:"
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -1503,151 +1503,160 @@ msgstr ""
 "un problema com la caiguda. Si us plau, reviseu dels processos del daemon o "
 "contacteu amb el seu propietari."
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Canal"
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 msgid "Place in category:"
 msgstr "Posa'l a la categoria:"
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 #, fuzzy
 msgid "Available feeds"
 msgstr "Tots els canals"
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr "Autenticació"
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr "Entra"
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 #, fuzzy
 msgid "Password"
 msgstr "Contrasenya:"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr "Aquest canal requereix autenticació."
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr "Subscriu-t'hi"
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 #, fuzzy
 msgid "More feeds"
 msgstr "Més canals"
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr "Cerca"
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 #, fuzzy
 msgid "Popular feeds"
 msgstr "mostra els canals"
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 #, fuzzy
 msgid "Feed archive"
 msgstr "Accions dels canals"
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 #, fuzzy
 msgid "limit:"
 msgstr "Límit:"
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr "Mirar-ho per"
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr "Limita la cerca a:"
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr "Aquest canal"
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetes per aquest article (separades per comes):"
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr "Desa"
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Núvol d'etiquetes"
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 msgid "Match:"
 msgstr "Correspondance&nbsp;:"
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+#, fuzzy
+msgid "All tags."
+msgstr "sense etiqueta"
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 #, fuzzy
 msgid "Display entries"
 msgstr "mostra els canals"
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 #, fuzzy
 msgid "View as RSS"
 msgstr "Visualitza les etiquetes"
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 #, fuzzy
 msgid "Details"
 msgstr "Diàriament"
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1655,56 +1664,56 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 #, fuzzy
 msgid "Access key:"
 msgstr "Nivell d'accés:"
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 #, fuzzy
 msgid "Access key"
 msgstr "Nivell d'accés"
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 #, fuzzy
 msgid "Generate new key"
 msgstr "Canals generats"
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 #, fuzzy
 msgid "Create link"
 msgstr "Crea"
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 "\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Aquest canal requereix autenticació."
@@ -1887,16 +1896,16 @@ msgstr ""
 msgid "Adding filter..."
 msgstr "S'està afegint el canal..."
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, fuzzy, php-format
 msgid "Processing category: %s"
 msgstr "Posa'l a la categoria:"
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr "Error: si us plau carregueu el fitxer OPML."
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr "Error mentre s'analitza el document."
 
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 40851aabe..879f15249 100644
Binary files a/locale/de_DE/LC_MESSAGES/messages.mo and b/locale/de_DE/LC_MESSAGES/messages.mo differ
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index 4576d2988..f3d3a9f55 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+0400\n"
 "PO-Revision-Date: 2012-04-21 09:02+0000\n"
 "Last-Translator: poitzorg <ailbone@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/tt-rss/language/"
@@ -312,7 +312,7 @@ msgstr ""
 "SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PHP "
 "Konfiguration"
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -474,7 +474,7 @@ msgid "Filters"
 msgstr "Filter"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Label"
@@ -704,19 +704,19 @@ msgstr "Gewählte Kategorie auf-/zuklappen"
 msgid "Go to..."
 msgstr "Gehe zu..."
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 msgid "All articles"
 msgstr "Alle Artikel"
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr "Neue Artikel"
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr "Bewertete Artikel"
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr "Veröffentlichte Artikel"
 
@@ -796,8 +796,8 @@ msgstr "Ungültiger Regulärerausdruck"
 msgid "Home"
 msgstr "Startseite"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr "Sonderfeeds"
 
@@ -835,141 +835,141 @@ msgstr "Gelesene Artikel und Feeds nicht anzeigen"
 msgid "Sort feeds by unread count"
 msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr ""
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Session konnte nicht validiert werden (falsche IP)"
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "Unkategorisiert"
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "Alle Feeds"
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 msgid "Archived articles"
 msgstr "Archivierte Artikel"
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 msgid "Click to play"
 msgstr "Zum Abspielen klicken"
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr "Abspielen"
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr "Keine Tags"
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 msgid "Edit tags for this article"
 msgstr "Tags für diesen Artikel bearbeiten"
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 msgid "Open article in new tab"
 msgstr "Artikel in neuem Reiter öffnen"
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 msgid "Close article"
 msgstr "Artikel schließen"
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 msgid "Originally from:"
 msgstr "Original von:"
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 msgid "Feed URL"
 msgstr "Feed URL"
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Offizielle Website besuchen"
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 msgid "(edit note)"
 msgstr "(Notiz bearbeiten)"
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr "Kein Feed ausgewählt."
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Feeds zuletzt aktualisiert am %s"
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 msgid "unknown type"
 msgstr "unbekannter Typ"
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 #, fuzzy
 msgid "Attachments"
 msgstr "Anhänge:"
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, php-format
 msgid "%d archived articles"
 msgstr "%d archivierte Artikel"
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 msgid "No feeds found."
 msgstr "Keine Feeds gefunden."
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 msgid "Could not import: incorrect schema version."
 msgstr "Import fehlgeschlagen: Falsche Schemaversion"
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr "Import fehlgeschlagen: Unbekanntes Format"
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr "Fertig: %d Artikel bearbeitet, %d importiert, %d Feeds erstellt."
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr "Konnte XML-Datei nicht laden."
 
@@ -1242,7 +1242,7 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 msgid "Default profile"
 msgstr "Standard Profil"
 
@@ -1264,7 +1264,7 @@ msgstr "Abonnieren in Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Titel"
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 msgid "URL:"
@@ -1289,9 +1289,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1372,7 +1372,7 @@ msgstr ""
 "Wenn Label und/oder Filter importiert wurden, müssen die Einstellungen "
 "erneut geladen werden um alle neuen Einstellungen zu sehen."
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1381,7 +1381,7 @@ msgstr ""
 msgid "Select"
 msgstr "Auswahl"
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1390,7 +1390,7 @@ msgstr "Auswahl"
 msgid "All"
 msgstr "Alle"
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1399,39 +1399,39 @@ msgstr "Alle"
 msgid "None"
 msgstr "Keine"
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 msgid "Create profile"
 msgstr "Profil erstellen"
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 msgid "(active)"
 msgstr "(aktiv)"
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 msgid "Remove selected profiles"
 msgstr "Ausgewählte Profile entfernen"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 msgid "Activate profile"
 msgstr "Aktives Profil"
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr "Öffentliche OPML-URL"
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 msgid "Your Public OPML URL is:"
 msgstr "Ihre öffentliche OPML-URL lautet:"
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 msgid "Generate new URL"
 msgstr "Erzeuge neue URL"
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr "Anmerkung"
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1442,11 +1442,11 @@ msgstr ""
 "Bitte starten Sie den Prozess des Daemons oder benachrichtigen Sie den "
 "Besitzer der Instanz."
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -1457,141 +1457,150 @@ msgstr ""
 "Blockierung hinweisen. Bitte überprüfen Sie den Prozess des Daemons oder "
 "benachrichtigen Sie den Besitzer des Instanz."
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Feed URL"
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 msgid "Place in category:"
 msgstr "In Kategorie einordnen:"
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 msgid "Available feeds"
 msgstr "Verfügbare Feeds"
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr "Anmelden"
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 msgid "Password"
 msgstr "Passwort"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr "Dieser Feed benötigt eine Authentifizierung."
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 msgid "More feeds"
 msgstr "Weitere Feeds"
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr "Suchen"
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 msgid "Popular feeds"
 msgstr "Beliebte Feeds"
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 msgid "Feed archive"
 msgstr "Feed-Archiv"
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 msgid "limit:"
 msgstr "Grenzwert:"
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr "Entfernen"
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr "Suche nach"
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr "Suche begrenzen auf:"
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr "Diesen Feed"
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags für diesen Artikel (komma-getrennt)"
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr "Speichern"
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 msgid "Tag Cloud"
 msgstr "Tagwolke"
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr "Artikel nach Tag auswählen"
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 msgid "Match:"
 msgstr "Suche: "
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+#, fuzzy
+msgid "All tags."
+msgstr "Keine Tags"
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr "Welche Tags?"
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 msgid "Display entries"
 msgstr "Einträge anzeigen"
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 msgid "View as RSS"
 msgstr "Als RSS anzeigen"
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Neue Version von Tiny Tiny RSS verfügbar (%s)."
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 msgid "Details"
 msgstr "Details"
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr "Download"
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1603,38 +1612,38 @@ msgstr ""
 "class=\"visibleLink\" href=\"%s\">Diese Datei</a> kann als Basis benutzt "
 "werden."
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr "Instanz"
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr "Instanz-URL"
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 msgid "Access key:"
 msgstr "Zugriffsberechtigung:"
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 msgid "Access key"
 msgstr "Zugriffsberechtigung"
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr ""
 "Benutzen Sie eine Zugriffsberechtigung für beide verbundenen Instanzen."
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 msgid "Generate new key"
 msgstr "Neue Zugriffsberechtigung erstellen"
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 msgid "Create link"
 msgstr "Verbindung herstellen"
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
@@ -1643,15 +1652,15 @@ msgstr ""
 "Datei konnte nicht hochgeladen werden. Bitte upload_max_filesize \n"
 "in PHP.ini anpassen. (Aktueller Wert = %s)"
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Einen gültigen RSS Feed pro Zeile hinzufügen (Keine Feederkennung)"
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr "Zu abonierende Feeds, Einen pro Zeile"
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 msgid "Feeds require authentication."
 msgstr "Feeds benötigen Anmeldung."
 
@@ -1820,16 +1829,16 @@ msgstr "Setze Konfigurationsoption %s auf %s"
 msgid "Adding filter..."
 msgstr "Füge Filter %s hinzu"
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, fuzzy, php-format
 msgid "Processing category: %s"
 msgstr "In Kategorie einordnen:"
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr "Fehler: bitte eine OPML-Datei hochladen."
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr "Fehler beim Parsen des Dokuments."
 
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index 67f317cc9..235414888 100644
Binary files a/locale/es_ES/LC_MESSAGES/messages.mo and b/locale/es_ES/LC_MESSAGES/messages.mo differ
diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po
index 8604745cf..8cf7b5f96 100644
--- a/locale/es_ES/LC_MESSAGES/messages.po
+++ b/locale/es_ES/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+0400\n"
 "PO-Revision-Date: 2012-10-25 00:12+0100\n"
 "Last-Translator: DavidM <milarupa@yahoo.es>\n"
 "Language-Team: Español <milarupa@yahoo.es>\n"
@@ -310,7 +310,7 @@ msgstr ""
 "La prueba de escape SQL ha fallado. Por favor, revise la configuración de su "
 "base de datos y PHP."
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "Preferencias"
@@ -472,7 +472,7 @@ msgid "Filters"
 msgstr "Filtros"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Marcadores"
@@ -701,19 +701,19 @@ msgstr "Si se está viendo la categoría, (des)pliéguela"
 msgid "Go to..."
 msgstr "Ir a..."
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 msgid "All articles"
 msgstr "Todos"
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr "Recientes"
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr "Favoritos"
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr "Publicados"
 
@@ -791,8 +791,8 @@ msgstr "Abrir versión estándar"
 msgid "Home"
 msgstr "Página principal"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr "Especial"
 
@@ -830,142 +830,142 @@ msgstr "Ocultar artículos y fuentes leídos"
 msgid "Sort feeds by unread count"
 msgstr "Ordenar fuentes por número de artículos sin leer"
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr "Error fatal: no se encuentra el módulo de autenticación %s."
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr "No se pudo validar la sesión (IP incorrecta)"
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "Sin clasificar"
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "Todas las fuentes"
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 msgid "Archived articles"
 msgstr "Artículos archivados"
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr "Leídos recientemente"
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, php-format
 msgid "Search results: %s"
 msgstr "Resultados de búsqueda: %s"
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 msgid "Click to play"
 msgstr "Clic para reproducir"
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr "Reproducir"
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr "sin etiquetas"
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 msgid "Edit tags for this article"
 msgstr "Editar las etiquetas de este artículo"
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 msgid "Open article in new tab"
 msgstr "Abrir artículo en una nueva pestaña"
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 msgid "Close article"
 msgstr "Cerrar artículo"
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 msgid "Originally from:"
 msgstr "Original de:"
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 msgid "Feed URL"
 msgstr "URL de la fuente"
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Visitar el sitio oficial"
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 msgid "Related"
 msgstr "Relacionado"
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 msgid "(edit note)"
 msgstr "(editar nota)"
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr "No se ha seleccionado ninguna fuente."
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Última actualización de las fuentes: %s"
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 msgid "unknown type"
 msgstr "tipo desconocido"
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, php-format
 msgid "%d archived articles"
 msgstr "%d artículos archivados"
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 msgid "Could not import: incorrect schema version."
 msgstr "Fallo de la importación: la versión del esquema es incorrecta."
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr "Fallo de la importación: no se reconoce el formato del documento."
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 "Finalizado: %d artículos procesados, %d importados, %d fuentes creadas."
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr "No se pudo cargar documento XML."
 
@@ -1243,7 +1243,7 @@ msgid "Profile:"
 msgstr "Perfil:"
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 msgid "Default profile"
 msgstr "Perfil por defecto"
 
@@ -1265,7 +1265,7 @@ msgstr "Volver a Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Título"
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 msgid "URL:"
@@ -1290,9 +1290,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1374,7 +1374,7 @@ msgstr ""
 "Si ha importado marcadores y/o filtros, puede ser necesario recargar las "
 "preferencia para ver sus nuevos datos."
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1383,7 +1383,7 @@ msgstr ""
 msgid "Select"
 msgstr "Seleccionar"
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1392,7 +1392,7 @@ msgstr "Seleccionar"
 msgid "All"
 msgstr "Todo"
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1401,39 +1401,39 @@ msgstr "Todo"
 msgid "None"
 msgstr "Nada"
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 msgid "Create profile"
 msgstr "Crear perfil"
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 msgid "(active)"
 msgstr "(activo)"
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 msgid "Remove selected profiles"
 msgstr "Borrar los perfiles seleccionados"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 msgid "Activate profile"
 msgstr "Activar perfil"
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr "URL del archivo OPML público"
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 msgid "Your Public OPML URL is:"
 msgstr "La URL de su archivo OPML público es:"
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 msgid "Generate new URL"
 msgstr "Generar URL nueva"
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr "Aviso"
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1444,11 +1444,11 @@ msgstr ""
 "actualización de todas las fuentes. Por favor, inicie el proceso del demonio "
 "o solicítelo al propietario de la instancia."
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr "Última actualización:"
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -1459,127 +1459,136 @@ msgstr ""
 "(rotura, cuelgue,...). Por favor, compruebe el proceso del demonio o avise "
 "al propietario de la instancia."
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "URL de la fuente"
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 msgid "Place in category:"
 msgstr "Colocar en la categoría:"
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 msgid "Available feeds"
 msgstr "Fuentes disponibles"
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 msgid "Password"
 msgstr "Contraseña:"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr "Esta fuente requiere autenticación."
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr "Suscribir"
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 msgid "More feeds"
 msgstr "Más fuentes"
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr "Buscar"
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 msgid "Popular feeds"
 msgstr "Fuentes populares"
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 msgid "Feed archive"
 msgstr "Archivo de fuentes"
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 msgid "limit:"
 msgstr "límite:"
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr "Eliminar"
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr "Buscar"
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr "Limitar la búsqueda a:"
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr "Esta fuente"
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetas para este artículo (separadas por comas):"
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr "Guardar"
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 msgid "Tag Cloud"
 msgstr "Nube de etiquetas"
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr "Seleccionar artículo(s) por etiquetas"
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 msgid "Match:"
 msgstr "Coincidir:"
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+#, fuzzy
+msgid "All tags."
+msgstr "sin etiquetas"
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr "¿Cuáles etiquetas?"
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 msgid "Display entries"
 msgstr "Mostrar artículos"
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 msgid "View as RSS"
 msgstr "Ver como RSS"
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Puede ver esta fuente en formato RSS en la siguiente URL:"
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Nueva versión de Tiny Tiny RSS disponible (%s)."
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
@@ -1587,15 +1596,15 @@ msgstr ""
 "Puede actualizar usando el gestor de actualización en las preferenciaso "
 "utilizando update.php"
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 msgid "Details"
 msgstr "Detalles"
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr "Descargar"
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1606,37 +1615,37 @@ msgstr ""
 "código CSS. Puede utilizar  <a target=\"_blank\" class=\"visibleLink\" href="
 "\"%s\">este archivo</a> como referencia."
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr "Instancia"
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr "URL de la instancia"
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 msgid "Access key:"
 msgstr "Clave de acceso:"
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 msgid "Access key"
 msgstr "Clave de acceso"
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr "Usar una clave de acceso para ambas instancias enlazadas."
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 msgid "Generate new key"
 msgstr "Generar nueva clave"
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 msgid "Create link"
 msgstr "Crear enlace"
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
@@ -1645,17 +1654,17 @@ msgstr ""
 "No se puedo cargar el archivo. Puede ser necesario ajustar el parámetro "
 "upload_max_filesize en PHP.ini (valor actual = %s)"
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 "Añadir una fuente RSS válida en cada línea (no se realizará detección de "
 "fuentes)"
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr "Fuentes para suscribirse, una por línea"
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 msgid "Feeds require authentication."
 msgstr "Las fuentes requieren autenticación."
 
@@ -1831,16 +1840,16 @@ msgstr "Configurando la opción %s como %s"
 msgid "Adding filter..."
 msgstr "Añadiendo filtro..."
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, php-format
 msgid "Processing category: %s"
 msgstr "Procesando categoría: %s"
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr "Error: por favor, suba un fichero OPML."
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr "Error mientras se analizaba el documento."
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 4a33c6778..58e1658fa 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 11b821db8..5abb8d3b7 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+0400\n"
 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Thomas Jost <schnouki@schnouki.net>\n"
 "Language-Team: French (France) (http://www.transifex.net/projects/p/tt-rss/"
@@ -313,7 +313,7 @@ msgstr ""
 "Le test d'échappement SQL a échoué, vérifiez votre base de donnée et votre "
 "configuration de PHP."
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "Configuration"
@@ -475,7 +475,7 @@ msgid "Filters"
 msgstr "Filtres"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etiquettes"
@@ -706,19 +706,19 @@ msgstr "Déployer/Contracter lors de la consultation des catégories"
 msgid "Go to..."
 msgstr "Aller à..."
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 msgid "All articles"
 msgstr "Tous les articles"
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr "Articles publiés"
 
@@ -798,8 +798,8 @@ msgstr ""
 msgid "Home"
 msgstr "Accueil"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr "Spécial"
 
@@ -837,144 +837,144 @@ msgstr "Cacher les articles et flux lus"
 msgid "Sort feeds by unread count"
 msgstr "Trier les flux par nombre d'articles non lus"
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr ""
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Echec de la validation de la session (adresse ip incorrecte)"
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 msgid "Archived articles"
 msgstr "Articles archivés"
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 msgid "Click to play"
 msgstr "Cliquez pour lancer la lecture"
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr "Lecture"
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr "aucun tag"
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 msgid "Edit tags for this article"
 msgstr "Modifier les tags pour cet article"
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 msgid "Open article in new tab"
 msgstr "Ouvrir les articles dans un nouvel onglet"
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 msgid "Close article"
 msgstr "Fermer l'article"
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 msgid "Originally from:"
 msgstr "Origine :"
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 msgid "Feed URL"
 msgstr "URL du flux"
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Visiter le site web"
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 #, fuzzy
 msgid "Related"
 msgstr "Lire plus tard"
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 msgid "(edit note)"
 msgstr "(modifier l'annotation)"
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Flux mis à jour à %s"
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Des erreurs sont survenues pendant la mise à jour de certains flux (cliquer "
 "ici pour les détails)"
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 msgid "unknown type"
 msgstr "type inconnu"
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 #, fuzzy
 msgid "Attachments"
 msgstr "Fichiers attachés :"
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, php-format
 msgid "%d archived articles"
 msgstr "%d articles archivés"
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 msgid "No feeds found."
 msgstr "Aucun flux trouvé."
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 msgid "Could not import: incorrect schema version."
 msgstr "Importation impossible : version du schéma incorrecte."
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr "Importation impossible : format de document non reconnu."
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr "Terminé : %d articles traités, %d importés, %d flux créés."
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr "Impossible de charger le document XML."
 
@@ -1252,7 +1252,7 @@ msgid "Profile:"
 msgstr "Profil :"
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 msgid "Default profile"
 msgstr "Profil par défaut"
 
@@ -1274,7 +1274,7 @@ msgstr "S'abonner dans Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Titre"
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 msgid "URL:"
@@ -1299,9 +1299,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1384,7 +1384,7 @@ msgstr ""
 "Si vous avez importé des étiquettes et/ou des filtres, vous devrez peut-être "
 "recharger les préférences pour voir les nouvelles données."
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1393,7 +1393,7 @@ msgstr ""
 msgid "Select"
 msgstr "Sélectionner"
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1402,7 +1402,7 @@ msgstr "Sélectionner"
 msgid "All"
 msgstr "Tout"
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1411,39 +1411,39 @@ msgstr "Tout"
 msgid "None"
 msgstr "Aucun"
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 msgid "Create profile"
 msgstr "Création d'un profil"
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 msgid "(active)"
 msgstr "(actif)"
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 msgid "Remove selected profiles"
 msgstr "Supprimer les filtres sélectionnés"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 msgid "Activate profile"
 msgstr "Activer le profil"
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr "URL OPML publique"
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 msgid "Your Public OPML URL is:"
 msgstr "Votre URL OPML publique est :"
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 msgid "Generate new URL"
 msgstr "Générer une nouvelle URL"
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr "Avertissement"
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1453,11 +1453,11 @@ msgstr ""
 "n'est pas lancé et les flux ne sont donc pas mis à jour. Veuillez le "
 "démarrer ou contacter l'administrateur."
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr "Dernière mise à jour :"
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -1467,141 +1467,150 @@ msgstr ""
 "de flux. Cela peut indiquer un problème comme un crash ou un suspension du "
 "processus. Veuillez vérifier son état ou bien contacter l'administrateur."
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "URL du flux"
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 msgid "Place in category:"
 msgstr "Placer dans la catégorie :"
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 msgid "Available feeds"
 msgstr "Flux disponibles"
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr "Identification"
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr "Se connecter"
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 msgid "Password"
 msgstr "Mot de passe"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr "Ce flux nécessite une identification."
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr "S'abonner"
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 msgid "More feeds"
 msgstr "D'autres flux"
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr "Rechercher"
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 msgid "Popular feeds"
 msgstr "Flux populaires"
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 msgid "Feed archive"
 msgstr "Archive du flux"
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 msgid "limit:"
 msgstr "limite :"
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr "Supprimer"
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr "Rechercher"
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr "Restreindre la recherche à :"
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr "Ce flux"
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags pour cet article (séparés par des virgules) :"
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr "Enregistrer"
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 msgid "Tag Cloud"
 msgstr "Nuage d'étiquettes"
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr "Sélectionner des éléments par tags"
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 msgid "Match:"
 msgstr "Correspondance :"
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+#, fuzzy
+msgid "All tags."
+msgstr "aucun tag"
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr "Quels tags ?"
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 msgid "Display entries"
 msgstr "Afficher les entrées"
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 msgid "View as RSS"
 msgstr "Voir comme RSS"
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Vous pouvez consulter ce flux comme RSS en utilisant l'URL suivante :"
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible (%s)."
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 msgid "Details"
 msgstr "Détails"
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr "Télécharger"
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1613,37 +1622,37 @@ msgstr ""
 "target=\"_blank\" class=\"visibleLink\" href=\"%s\">Ce fichier</a> peut être "
 "utilisé comme base de départ."
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr "Instance"
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr "URL de l'instance"
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 msgid "Access key:"
 msgstr "Clef d'accès :"
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 msgid "Access key"
 msgstr "Clef d'accès"
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr "Utilisez une clef d'accès pour les deux instances liées."
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 msgid "Generate new key"
 msgstr "Générer une nouvelle clef"
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 msgid "Create link"
 msgstr "Créer un lien"
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
@@ -1652,17 +1661,17 @@ msgstr ""
 "Envoi du fichier impossible. Vous devriez peut-être modifier la valeur de "
 "upload_max_filesize dans PHP.ini (valeur courante : %s)"
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 "Ajoutez un flux RSS valide par ligne (aucune détection de flux n'est "
 "réalisée)"
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr "Flux auxquels s'abonner, un par ligne"
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 msgid "Feeds require authentication."
 msgstr ""
 
@@ -1831,16 +1840,16 @@ msgstr "Paramétrage de la préférence %s à %s"
 msgid "Adding filter..."
 msgstr "Ajout du filtre %s"
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, fuzzy, php-format
 msgid "Processing category: %s"
 msgstr "Placer dans la catégorie :"
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr "Erreur : veuillez envoyer un document OPML."
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr "Erreur lors de l'analyse du document."
 
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 71e4f2bc9..176d63003 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 df9c052ed..014065df6 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+0400\n"
 "PO-Revision-Date: 2009-08-17 23:04+0100\n"
 "Last-Translator: MoJo2009\n"
 "Language-Team: HUNGARIAN\n"
@@ -299,7 +299,7 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "Beállítások"
@@ -465,7 +465,7 @@ msgid "Filters"
 msgstr "Szűrők"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Címkék"
@@ -706,19 +706,19 @@ msgstr "Ha kategóriát böngész, csukja össze/nyissa szét"
 msgid "Go to..."
 msgstr "Ugrás ide..."
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 msgid "All articles"
 msgstr "Az összes hír"
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr "Friss hírek"
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr "Csillagos hírek"
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr "Publikált hírek"
 
@@ -794,8 +794,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr "Kiemelt"
 
@@ -838,150 +838,150 @@ msgstr "Olvasottak rejtése/mutatása"
 msgid "Sort feeds by unread count"
 msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr ""
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "Összes hírcsatorna"
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 #, fuzzy
 msgid "Archived articles"
 msgstr "Tárolt hírek"
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Keresési találatok"
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 #, fuzzy
 msgid "Click to play"
 msgstr "Kattintson ide a szerkesztéshez"
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 msgid " - "
 msgstr "-"
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr "nincs címke"
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 msgid "Edit tags for this article"
 msgstr "Címkék hozzáadása a hírhez"
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Hír megnyitása új ablakban"
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 #, fuzzy
 msgid "Close article"
 msgstr "Hírek törlése"
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 #, fuzzy
 msgid "Originally from:"
 msgstr "Eredeti hír tartalmának megjelenítése"
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 #, fuzzy
 msgid "Feed URL"
 msgstr "Hírcsatorna"
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 #, fuzzy
 msgid "Visit the website"
 msgstr "Hivatalos weboldal megtekintése"
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr "Ablak bezárása"
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 #, fuzzy
 msgid "(edit note)"
 msgstr "jegyzet szerkesztése"
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Frissítési hiba"
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Néhány hírcsatorna frissítésével gond akadt. (Kattints ide a részletekhez!)"
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 msgid "unknown type"
 msgstr "ismeretlen hírcsatornatípus"
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 #, fuzzy
 msgid "Attachments"
 msgstr "Csatolmányok:"
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Csillagos hírek"
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 msgid "No feeds found."
 msgstr "Nem található hírcsatorna."
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr ""
 
@@ -1260,7 +1260,7 @@ msgid "Profile:"
 msgstr "Fájl:"
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 #, fuzzy
 msgid "Default profile"
 msgstr "Hírek maximális száma"
@@ -1283,7 +1283,7 @@ msgstr "Vissza az RSS-olvasóhoz"
 msgid "Title:"
 msgstr "Cím:"
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 msgid "URL:"
@@ -1308,9 +1308,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1391,7 +1391,7 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1401,7 +1401,7 @@ msgstr ""
 msgid "Select"
 msgstr "Kiválaszt:"
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1410,7 +1410,7 @@ msgstr "Kiválaszt:"
 msgid "All"
 msgstr "Mind"
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1419,45 +1419,45 @@ msgstr "Mind"
 msgid "None"
 msgstr "Kijelölés törlése"
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 #, fuzzy
 msgid "Create profile"
 msgstr "Szűrő létrehozása"
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 #, fuzzy
 msgid "(active)"
 msgstr "Adaptív"
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 #, fuzzy
 msgid "Activate profile"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Link a publikált hírek hírcsatornájához"
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generált hírcsatorna"
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr ""
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1467,11 +1467,11 @@ msgstr ""
 "nem fut, így a hírcsatornák nem tudnak frissülni. Kérem indítsa el a daemon "
 "folyamatot, vagy lépjen kapcsolatba az oldal/szerver tulajdonosával."
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr "Legutóbbi frissítés:"
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -1481,151 +1481,160 @@ msgstr ""
 "összeomlás vagy hiba jele is lehet, kérem lépjen kapcsolatba az oldal/"
 "szerver tulajdonosával!"
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Hírcsatorna"
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 msgid "Place in category:"
 msgstr "Hozzáadás a következő kategóriához:"
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 #, fuzzy
 msgid "Available feeds"
 msgstr "Összes hírcsatorna"
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr "Azonosítás"
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr "Belépés"
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 #, fuzzy
 msgid "Password"
 msgstr "Jelszó:"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr "Feliratkozás"
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 #, fuzzy
 msgid "More feeds"
 msgstr "Hírcsatornák..."
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr "Keresés"
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 #, fuzzy
 msgid "Popular feeds"
 msgstr "hírcsatornák megjelenítése"
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 #, fuzzy
 msgid "Feed archive"
 msgstr "Hírcsatorna-műveletek"
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 #, fuzzy
 msgid "limit:"
 msgstr "Határ:"
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr "Eltávolít"
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr ""
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr "Keresés korlátozása ezekre:"
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr "Ez a hírcsatorna"
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr "A hír címkéi (vesszőkkel elválasztva):"
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr "Mentés"
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Címkefelhő"
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 msgid "Match:"
 msgstr "Egyezés"
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+#, fuzzy
+msgid "All tags."
+msgstr "nincs címke"
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 #, fuzzy
 msgid "Display entries"
 msgstr "hírcsatornák megjelenítése"
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 #, fuzzy
 msgid "View as RSS"
 msgstr "Címkék megtekintése"
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 #, fuzzy
 msgid "Details"
 msgstr "Napi"
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1633,56 +1642,56 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 #, fuzzy
 msgid "Access key:"
 msgstr "Hozzáférési szint:"
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 #, fuzzy
 msgid "Access key"
 msgstr "Hozzáférési szint"
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 #, fuzzy
 msgid "Generate new key"
 msgstr "Generált hírcsatorna"
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 #, fuzzy
 msgid "Create link"
 msgstr "Létrehoz"
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 "\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
@@ -1867,16 +1876,16 @@ msgstr ""
 msgid "Adding filter..."
 msgstr "Hírcsatorna hozzáadása..."
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, fuzzy, php-format
 msgid "Processing category: %s"
 msgstr "Hozzáadás a következő kategóriához:"
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr "Hiba: kérem töltse fel az OPML fájlt!"
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr "Hiba történt a dokuementum feldoglozása közben"
 
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index ac0502d17..85ed770c6 100644
Binary files a/locale/it_IT/LC_MESSAGES/messages.mo and b/locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index e9956a525..85a9ef65f 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+0400\n"
 "PO-Revision-Date: 2012-02-14 08:31+0000\n"
 "Last-Translator: gothfox <cthulhoo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -307,7 +307,7 @@ msgstr ""
 "Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
 "configurazione del PHP"
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "Preferenze"
@@ -469,7 +469,7 @@ msgid "Filters"
 msgstr "Filtri"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etichette"
@@ -700,19 +700,19 @@ msgstr "Se in visualizzazione categoria, contraila/espandila"
 msgid "Go to..."
 msgstr "Vai a..."
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 msgid "All articles"
 msgstr "Tutti gli articoli"
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr "Articoli nuovi"
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr "Articoli con stella"
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr "Articoli pubblicati"
 
@@ -792,8 +792,8 @@ msgstr ""
 msgid "Home"
 msgstr "Casa"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr "Speciale"
 
@@ -831,142 +831,142 @@ msgstr ""
 msgid "Sort feeds by unread count"
 msgstr "Ordinare i notiziari per numero di non letti"
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr ""
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr "La validazione della sessione è fallita (IP non corretto)"
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "Tutti i notiziari"
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 msgid "Archived articles"
 msgstr "Articoli archiviati"
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 msgid "Click to play"
 msgstr "Fare clic per riprodurre"
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr "Riproduci"
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr "nessuna etichetta"
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 msgid "Edit tags for this article"
 msgstr "Modifica le etichette per questo articolo"
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 msgid "Open article in new tab"
 msgstr "Apri articolo in una nuova scheda"
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 msgid "Close article"
 msgstr ""
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 msgid "Originally from:"
 msgstr "Originariamente da:"
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 msgid "Feed URL"
 msgstr "URL del notiziario"
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Visita il sito web"
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 msgid "(edit note)"
 msgstr "(modifica note)"
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr "Nessun notiziario selezionato."
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Ultimo aggiornamento notiziari alle %s"
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 msgid "unknown type"
 msgstr "tipo sconosciuto"
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 #, fuzzy
 msgid "Attachments"
 msgstr "Allegati:"
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, php-format
 msgid "%d archived articles"
 msgstr "%d articoli archiviati"
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 msgid "No feeds found."
 msgstr "Nessun notiziario trovato."
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr ""
 
@@ -1243,7 +1243,7 @@ msgid "Profile:"
 msgstr "Profilo:"
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 msgid "Default profile"
 msgstr "Profilo predefinito"
 
@@ -1265,7 +1265,7 @@ msgstr "Sottoscrive in Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Titolo"
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 msgid "URL:"
@@ -1290,9 +1290,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1373,7 +1373,7 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1382,7 +1382,7 @@ msgstr ""
 msgid "Select"
 msgstr "Seleziona"
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1391,7 +1391,7 @@ msgstr "Seleziona"
 msgid "All"
 msgstr "Tutti"
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1400,39 +1400,39 @@ msgstr "Tutti"
 msgid "None"
 msgstr "Nessuno"
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 msgid "Create profile"
 msgstr "Crea profilo"
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 msgid "(active)"
 msgstr "(attivo)"
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 msgid "Remove selected profiles"
 msgstr "Rimuovi i profili selezionati"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 msgid "Activate profile"
 msgstr "Attiva profilo"
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr "URL OPML pubblico"
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 msgid "Your Public OPML URL is:"
 msgstr "L'URL OPML pubblico è:"
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 msgid "Generate new URL"
 msgstr "Genera nuovo URL"
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr "Notifica"
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1443,11 +1443,11 @@ msgstr ""
 "aggiornameto di tutti i notiziari. Avviare il processo del demone o "
 "contattare il proprietario dell&apos;istanza."
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -1458,142 +1458,151 @@ msgstr ""
 "crash o uno stallo. Controllare il processo del demone o contattare il "
 "proprietario dell&apos;istanza."
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "URL del notiziario"
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 msgid "Place in category:"
 msgstr "Mettere nella categoria:"
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 msgid "Available feeds"
 msgstr "Notiziari disponibili"
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr "Accesso"
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 msgid "Password"
 msgstr "Password"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr "Questo notiziario richiede l&apos;autenticazione"
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr "Sottoscrivi"
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 msgid "More feeds"
 msgstr "Altri notiziari"
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr "Cerca"
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 msgid "Popular feeds"
 msgstr "Notiziari popolari"
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 msgid "Feed archive"
 msgstr "Archivio notiziari"
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 msgid "limit:"
 msgstr "limite:"
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr "Cerca"
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr "Limitare la ricerca a:"
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr "Questo notiziario"
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr "Etichette per questo articolo (separate da virgole):"
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr "Salva"
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 msgid "Tag Cloud"
 msgstr "Nuvola etichette"
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 msgid "Match:"
 msgstr ""
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+#, fuzzy
+msgid "All tags."
+msgstr "nessuna etichetta"
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 msgid "Display entries"
 msgstr ""
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 msgid "View as RSS"
 msgstr "Visualizza come RSS"
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 "È possibile vedere questo notiziario come RSS utilizzando il seguente URL:"
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "È disponibile una nuova versione di Tiny Tiny RSS (%s)."
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 msgid "Details"
 msgstr "Dettagli"
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr "Scarica"
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1605,52 +1614,52 @@ msgstr ""
 "target=\"_blank\" class=\"visibleLink\" href=\"%s\">Questo file</a> può "
 "essere utilizzato come base."
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr "Istanza"
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr "URL dell'istanza"
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 msgid "Access key:"
 msgstr "Chiave di accesso:"
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 msgid "Access key"
 msgstr "Chiave di accesso"
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr "Utilizzare una chiave di accesso per entrambe le istanze collegate."
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 msgid "Generate new key"
 msgstr "Genera nuova chiave"
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 msgid "Create link"
 msgstr "Crea collegamento"
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 "\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 msgid "Feeds require authentication."
 msgstr ""
 
@@ -1822,16 +1831,16 @@ msgstr "Impostazione della voce delle preferenze %s a %s"
 msgid "Adding filter..."
 msgstr "Crea filtro..."
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, fuzzy, php-format
 msgid "Processing category: %s"
 msgstr "Mettere nella categoria:"
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr "Errore: caricare il file OPML."
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr "Errore durante l&apos;analisi del documento."
 
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index acbc0e6cc..e44f0d022 100644
Binary files a/locale/ja_JP/LC_MESSAGES/messages.mo and b/locale/ja_JP/LC_MESSAGES/messages.mo differ
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index ae7b77e34..24b723f33 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss unstable\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+0400\n"
 "PO-Revision-Date: 2009-05-12 03:25+0900\n"
 "Last-Translator: Tadashi Jokagi <elf2000@users.sourceforge.net>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -303,7 +303,7 @@ msgstr ""
 "SQL のエスケープ処理のテストに失敗しました。データベースの設定と PHP の設定を"
 "確認してください。"
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "設定"
@@ -469,7 +469,7 @@ msgid "Filters"
 msgstr "フィルター"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "ラベル"
@@ -707,19 +707,19 @@ msgstr ""
 msgid "Go to..."
 msgstr "移動..."
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 msgid "All articles"
 msgstr "すべての記事"
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr "公開済みの記事"
 
@@ -795,8 +795,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr "特別"
 
@@ -839,151 +839,151 @@ msgstr "読んだフィードを隠す/再表示する"
 msgid "Sort feeds by unread count"
 msgstr "未読記事数によるフィードの並び替え"
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr ""
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr "セッションの検査に失敗しました (IP が正しくない)"
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 #, fuzzy
 msgid "Archived articles"
 msgstr "未読記事"
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "検索結果"
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 #, fuzzy
 msgid "Click to play"
 msgstr "編集するにはクリック"
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr "タグがありません"
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "新しいウィンドウで記事を開く"
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 #, fuzzy
 msgid "Close article"
 msgstr "記事を消去する"
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 #, fuzzy
 msgid "Originally from:"
 msgstr "元の記事内容を表示する"
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 #, fuzzy
 msgid "Feed URL"
 msgstr "フィード"
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 #, fuzzy
 msgid "Visit the website"
 msgstr "オフィシャルサイトに訪問する"
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 #, fuzzy
 msgid "(edit note)"
 msgstr "ノートの編集"
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr "フィードは選択されていません。"
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 #, fuzzy
 msgid "Attachments"
 msgstr "添付:"
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "お気に入りの記事"
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 #, fuzzy
 msgid "Could not import: incorrect schema version."
 msgstr ""
 "必要なスキーマファイルを見つけられませんでした。次のバージョンが必要です:"
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr ""
 
@@ -1248,7 +1248,7 @@ msgid "Profile:"
 msgstr "ファイル:"
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 #, fuzzy
 msgid "Default profile"
 msgstr "標準の記事制限"
@@ -1271,7 +1271,7 @@ msgstr "Tiny Tiny RSS に戻る"
 msgid "Title:"
 msgstr "題名:"
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 msgid "URL:"
@@ -1296,9 +1296,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1379,7 +1379,7 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1389,7 +1389,7 @@ msgstr ""
 msgid "Select"
 msgstr "選択:"
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1398,7 +1398,7 @@ msgstr "選択:"
 msgid "All"
 msgstr "すべて"
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1407,207 +1407,216 @@ msgstr "すべて"
 msgid "None"
 msgstr "なし"
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 #, fuzzy
 msgid "Create profile"
 msgstr "フィルターを作成する"
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 msgid "(active)"
 msgstr ""
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 #, fuzzy
 msgid "Activate profile"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "公開記事フィードへのリンクです。"
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 #, fuzzy
 msgid "Generate new URL"
 msgstr "生成したフィード"
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr "通知"
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 "process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr "最終更新:"
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
 "contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "フィード"
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 msgid "Place in category:"
 msgstr "カテゴリーの場所:"
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 #, fuzzy
 msgid "Available feeds"
 msgstr "すべてのフィード"
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr "認証"
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr "ログイン"
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 #, fuzzy
 msgid "Password"
 msgstr "パスワード:"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr "このフィードは認証を要求します。"
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr "購読"
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 #, fuzzy
 msgid "More feeds"
 msgstr "さらなるフィード"
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr "検索"
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 #, fuzzy
 msgid "Popular feeds"
 msgstr "フィードの表示"
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 #, fuzzy
 msgid "Feed archive"
 msgstr "フィード操作"
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 #, fuzzy
 msgid "limit:"
 msgstr "制限:"
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr "削除"
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr ""
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr "対象範囲"
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr "このフィード"
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr "この記事のタグ (カンマで区切ります):"
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr "保存"
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "タグクラウド"
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 #, fuzzy
 msgid "Match:"
 msgstr "一致"
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+#, fuzzy
+msgid "All tags."
+msgstr "タグがありません"
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 #, fuzzy
 msgid "Display entries"
 msgstr "フィードの表示"
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 #, fuzzy
 msgid "View as RSS"
 msgstr "タグを閲覧する"
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 #, fuzzy
 msgid "Details"
 msgstr "毎日"
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1615,56 +1624,56 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 #, fuzzy
 msgid "Access key:"
 msgstr "アクセスレベル: "
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 #, fuzzy
 msgid "Access key"
 msgstr "アクセスレベル"
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 #, fuzzy
 msgid "Generate new key"
 msgstr "生成したフィード"
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 #, fuzzy
 msgid "Create link"
 msgstr "作成"
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 "\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "このフィードは認証を要求します。"
@@ -1847,16 +1856,16 @@ msgstr ""
 msgid "Adding filter..."
 msgstr "フィードを追加しています..."
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, fuzzy, php-format
 msgid "Processing category: %s"
 msgstr "カテゴリーの場所:"
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr "エラー: OPML ファイルをアップロードしてください。"
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr "ドキュメントの解析中のエラーです。"
 
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index d425a384d..dd2a78130 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 7a0568dfe..2cba3a3ae 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.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+0400\n"
 "PO-Revision-Date: 2009-05-02 00:10+0100\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
@@ -305,7 +305,7 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "Innstillinger"
@@ -471,7 +471,7 @@ msgid "Filters"
 msgstr "Filtre"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Merkelapper"
@@ -712,19 +712,19 @@ msgstr "Hvis kategorien vises, brett ut/klapp den sammen."
 msgid "Go to..."
 msgstr "Gå til..."
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 msgid "All articles"
 msgstr "Alle artikler"
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
@@ -802,8 +802,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr "Snarveier"
 
@@ -846,150 +846,150 @@ msgstr "Skjul/vis leste nyhetsstrømmer"
 msgid "Sort feeds by unread count"
 msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr ""
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 #, fuzzy
 msgid "Archived articles"
 msgstr "Lagrede artikler"
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Søkeresultat"
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 #, fuzzy
 msgid "Click to play"
 msgstr "Trykk for å endre"
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 msgid " - "
 msgstr "-"
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr "Ingen stikkord"
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 #, fuzzy
 msgid "Close article"
 msgstr "Fjern artikler"
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 #, fuzzy
 msgid "Originally from:"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 #, fuzzy
 msgid "Visit the website"
 msgstr "Besøk den offisielle siden"
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 #, fuzzy
 msgid "(edit note)"
 msgstr "Rediger notat"
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Oppdateringsfeil"
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 #, fuzzy
 msgid "Attachments"
 msgstr "Vedlegg:"
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favorittartikler"
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 #, fuzzy
 msgid "Could not import: incorrect schema version."
 msgstr "Kunne ikke finne den nødvendige skjemafilen, nødvendig versjon:"
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr ""
 
@@ -1270,7 +1270,7 @@ msgid "Profile:"
 msgstr "Fil:"
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 #, fuzzy
 msgid "Default profile"
 msgstr "Standard artikkelbegrensning"
@@ -1293,7 +1293,7 @@ msgstr "Returner til Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Tittel:"
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 msgid "URL:"
@@ -1318,9 +1318,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1401,7 +1401,7 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1411,7 +1411,7 @@ msgstr ""
 msgid "Select"
 msgstr "Velg:"
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1420,7 +1420,7 @@ msgstr "Velg:"
 msgid "All"
 msgstr "Alle"
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1429,45 +1429,45 @@ msgstr "Alle"
 msgid "None"
 msgstr "Ingen"
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 #, fuzzy
 msgid "Create profile"
 msgstr "Lag filter"
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 #, fuzzy
 msgid "(active)"
 msgstr "Tilpasset"
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 #, fuzzy
 msgid "Activate profile"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Lenke til nyhetsstrøm for publiserte artikler"
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generert nyhetsstrøm"
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr "Notis"
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1477,11 +1477,11 @@ msgstr ""
 "ikke kjørt, noe som gjør at ingen nyhetsstrømmer blir oppdatert. Vennligst "
 "start prosessen eller konakt administratoren."
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr "Siste oppdatering:"
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -1492,151 +1492,160 @@ msgstr ""
 "sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
 "nyhetsstrømmen."
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Nyhetsstrøm"
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 msgid "Place in category:"
 msgstr "Plasser i kategori..."
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 #, fuzzy
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr "Autentifisering"
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr "Logg inn"
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 #, fuzzy
 msgid "Password"
 msgstr "Passord:"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 #, fuzzy
 msgid "More feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr "Søk"
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Vis nyhetsstrømmer"
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 #, fuzzy
 msgid "Feed archive"
 msgstr "Nyhetsstrømshandlinger"
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 #, fuzzy
 msgid "limit:"
 msgstr "Antall:"
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr "Fjern"
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr ""
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr "Begrens søket til:"
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr "Denne nyhetsstrømmen"
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr "Lagre"
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Tag-sky"
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 msgid "Match:"
 msgstr "Matcher:"
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+#, fuzzy
+msgid "All tags."
+msgstr "Ingen stikkord"
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 #, fuzzy
 msgid "Display entries"
 msgstr "Vis nyhetsstrømmer"
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 #, fuzzy
 msgid "View as RSS"
 msgstr "Se stikkord"
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 #, fuzzy
 msgid "Details"
 msgstr "Daglig"
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1644,56 +1653,56 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 #, fuzzy
 msgid "Access key:"
 msgstr "Tilgangsnivå:"
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 #, fuzzy
 msgid "Access key"
 msgstr "Tilgangsnivå"
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 #, fuzzy
 msgid "Generate new key"
 msgstr "Generert nyhetsstrøm"
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 #, fuzzy
 msgid "Create link"
 msgstr "Lag"
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 "\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
@@ -1876,16 +1885,16 @@ msgstr ""
 msgid "Adding filter..."
 msgstr "Legger til nyhetsstrøm..."
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, fuzzy, php-format
 msgid "Processing category: %s"
 msgstr "Plasser i kategori..."
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr "Feil: Kan ikke laste opp OPMLfil"
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr "Feil under behandling av dokumentet"
 
diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo
index a79ed6563..a364267b2 100644
Binary files a/locale/pl_PL/LC_MESSAGES/messages.mo and b/locale/pl_PL/LC_MESSAGES/messages.mo differ
diff --git a/locale/pl_PL/LC_MESSAGES/messages.po b/locale/pl_PL/LC_MESSAGES/messages.po
index 66f6df807..24359f350 100644
--- a/locale/pl_PL/LC_MESSAGES/messages.po
+++ b/locale/pl_PL/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+0400\n"
 "PO-Revision-Date: 2012-10-06 16:54+0100\n"
 "Last-Translator: Mirosław Lach <m.wordpress@lach.waw.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/tt-rss/language/"
@@ -313,7 +313,7 @@ msgstr ""
 "Test escape'owania SQL nie powiódł się. Sprawdź konfigurację swojej bazy "
 "danych i PHP."
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "Ustawienia"
@@ -475,7 +475,7 @@ msgid "Filters"
 msgstr "Filtry"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etykiety"
@@ -706,19 +706,19 @@ msgstr "W trybie kategorii, rozwiń/zwiń"
 msgid "Go to..."
 msgstr "Idź do..."
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 msgid "All articles"
 msgstr "Wszystkie artykuły"
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr "Świeże artykuły"
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr "Artykuły oznaczone gwiazdką"
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr "Opublikowane artykuły"
 
@@ -796,8 +796,8 @@ msgstr "Otwórz standardową wersję"
 msgid "Home"
 msgstr "Stron główna"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr "Specjalne"
 
@@ -835,144 +835,144 @@ msgstr "Ukryj przeczytane artykuły i kanały"
 msgid "Sort feeds by unread count"
 msgstr "Sortuj kanały według liczby nieprzeczytanych"
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr "Błąd fatalny: moduł uwierzytelniania %s nie został odnaleziony."
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Nie powiodła się weryfikacja sesji (nieprawidłowy adres IP)"
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "Bez kategorii"
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "Wszystkie kanały"
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 msgid "Archived articles"
 msgstr "Zarchiwizowane artykuły"
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr "Ostatnio czytane"
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, php-format
 msgid "Search results: %s"
 msgstr "Wyniki wyszukiwania: %s"
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 msgid "Click to play"
 msgstr "Wciśnij aby odtworzyć"
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr "Odtwórz"
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr "brak tagów"
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 msgid "Edit tags for this article"
 msgstr "Edytuj tagi dla tego artykułu"
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 msgid "Open article in new tab"
 msgstr "Otwórz artykuł w nowej zakładce"
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 msgid "Close article"
 msgstr "Zamknij artykuł"
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 msgid "Originally from:"
 msgstr "Oryginał pochodzi z:"
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 msgid "Feed URL"
 msgstr "Adres kanału"
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Odwiedź stronę internetową"
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 msgid "Related"
 msgstr "Pokrewne"
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr "Zamknij to okno"
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 msgid "(edit note)"
 msgstr "(edytuj notatkę)"
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr "Nie wybrano kanału."
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Kanały ostatnio uaktualnione o %s"
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Wystąpiły błędy aktualizacji niektórych kanałów (kliknij aby zobaczyć "
 "szczegóły)"
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 msgid "unknown type"
 msgstr "nieznany typ"
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 msgid "Attachments"
 msgstr "Załączniki"
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, php-format
 msgid "%d archived articles"
 msgstr "%d zarchiwizowanych artykułów"
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 msgid "No feeds found."
 msgstr "Nie znaleziono kanałów."
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 msgid "Could not import: incorrect schema version."
 msgstr "Nieudany import: nieprawidłowa wersja schematu."
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr "Nieudany import: nierozpoznany typ dokumentu."
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 "Zakończono: %d przetworzonych artykułów, %d zaimportowanych, %d kanałów "
 "utworzonych."
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr "Nie udało się wczytać dokumentu XML."
 
@@ -1249,7 +1249,7 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 msgid "Default profile"
 msgstr "Domyślny profil"
 
@@ -1271,7 +1271,7 @@ msgstr "Prenumeruj w Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Tytuł"
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 msgid "URL:"
@@ -1296,9 +1296,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1378,7 +1378,7 @@ msgstr ""
 "Jeżeli posiadasz zaimportowane etykiety i/lub filtry, aby zobaczyć nowe dane "
 "możesz musieć przeładować ustawienia."
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1387,7 +1387,7 @@ msgstr ""
 msgid "Select"
 msgstr "Wybierz"
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1396,7 +1396,7 @@ msgstr "Wybierz"
 msgid "All"
 msgstr "Wszystko"
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1405,39 +1405,39 @@ msgstr "Wszystko"
 msgid "None"
 msgstr "Nic"
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 msgid "Create profile"
 msgstr "Utwórz profil"
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 msgid "(active)"
 msgstr "(aktywny)"
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 msgid "Remove selected profiles"
 msgstr "Usuń wybrane profile"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 msgid "Activate profile"
 msgstr "Aktywuj profil"
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr "Publiczny adres OPML"
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 msgid "Your Public OPML URL is:"
 msgstr "Twój publiczny adres OPML to:"
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 msgid "Generate new URL"
 msgstr "Wygeneruj nowy adres"
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr "Uwaga"
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1448,11 +1448,11 @@ msgstr ""
 "Proszę uruchomić zewnętrzny proces aktualizacji lub skontaktować się z "
 "właścicielem tej instalacji."
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr "Ostatnia aktualizacja:"
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -1463,127 +1463,136 @@ msgstr ""
 "zawieszenie. Sprawdź poprawność działania zewnętrznego procesu aktualizacji "
 "lub skontaktuj się z właścicielem tej instalacji."
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Adres kanału"
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 msgid "Place in category:"
 msgstr "Umieść w kategorii:"
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 msgid "Available feeds"
 msgstr "Dostępne kanały"
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr "Nazwa użytkownika"
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 msgid "Password"
 msgstr "Hasło"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr "Ten kanał wymaga uwierzytelniania."
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr "Prenumeruj"
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 msgid "More feeds"
 msgstr "Więcej kanałów"
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr "Szukaj"
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 msgid "Popular feeds"
 msgstr "Popularne kanały"
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 msgid "Feed archive"
 msgstr "Archiwum kanału"
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 msgid "limit:"
 msgstr "limit:"
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr "Usuń"
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr "Szukaj napisu"
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr "Ogranicz wyszukiwanie do:"
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr "Ten kanał"
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr "Tagi dla tego artykułu (oddzielone przecinkami):"
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr "Zapisz"
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 msgid "Tag Cloud"
 msgstr "Chmura tagów"
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr "Wybierz element(y) przy użyciu tagów"
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 msgid "Match:"
 msgstr "Dopasuj:"
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+#, fuzzy
+msgid "All tags."
+msgstr "brak tagów"
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr "Które tagi?"
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 msgid "Display entries"
 msgstr "Wyświetl wpisy"
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 msgid "View as RSS"
 msgstr "Wyświetl jako RSS"
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Możesz obejrzeć ten kanał jako RSS korzystając z adresu:"
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Dostępna jest nowa wersja Tiny Tiny RSS (%s)."
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
@@ -1591,15 +1600,15 @@ msgstr ""
 "Możesz przeprowadzić aktualizację wykorzystując wbudowany aktualizator "
 "dostępny w Ustawieniach lub korzystając z update.php"
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 msgid "Details"
 msgstr "Szczegóły"
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr "Pobierz"
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1610,37 +1619,37 @@ msgstr ""
 "użyciu własnych deklaracji CSS. <a target=\"_blank\" class=\"visibleLink\" "
 "href=\"%s\">Ten plik</a> może posłużyć jako przykład."
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr "Instancja"
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr "Adres instancji:"
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 msgid "Access key:"
 msgstr "Klucz dostępu:"
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 msgid "Access key"
 msgstr "Klucz dostępu"
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr "Użyj jednego klucza dostępu dla obydwóch połączonych instancji."
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 msgid "Generate new key"
 msgstr "Wygeneruj nowy klucz"
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 msgid "Create link"
 msgstr "Utwórz łącze"
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
@@ -1650,17 +1659,17 @@ msgstr ""
 "parametru upload_max_filesize\n"
 "(maksymalny rozmiar przesyłanego pliku) w PHP.ini (obecna wartość = %s)"
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 "Wpisz jeden prawidłowy adres kanału RSS w każdej linii (nie jest "
 "przeprowadzana automatyczna detekcja adresu kanału)"
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr "Kanały do prenumeraty. Każdy w osobnej linii"
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 msgid "Feeds require authentication."
 msgstr "Kanały wymagają uwierzytelniania."
 
@@ -1828,16 +1837,16 @@ msgstr "Ustawiam wartość parametru %s na %s"
 msgid "Adding filter..."
 msgstr "Dodaję filtr..."
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, php-format
 msgid "Processing category: %s"
 msgstr "Przetwarzam kategorię: %s"
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr "Błąd: proszę wgrać plik OPML."
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr "Błąd przetwarzania dokumentu."
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 83fcf9cc4..06a6b9ec7 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 65ce79cf9..6c547cc1e 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: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+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"
@@ -289,7 +289,7 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "Preferências"
@@ -466,7 +466,7 @@ msgid "Filters"
 msgstr "Arquivo:"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr ""
@@ -721,20 +721,20 @@ msgstr ""
 msgid "Go to..."
 msgstr ""
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 #, fuzzy
 msgid "All articles"
 msgstr "Favoritos"
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr ""
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr ""
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr ""
 
@@ -814,8 +814,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr "Especial"
 
@@ -855,150 +855,150 @@ msgstr "Favoritos"
 msgid "Sort feeds by unread count"
 msgstr ""
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr ""
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 #, fuzzy
 msgid "Archived articles"
 msgstr "Favoritos"
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 #, fuzzy
 msgid "Click to play"
 msgstr "Favoritos"
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 #, fuzzy
 msgid " - "
 msgstr " - por "
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr "sem tags"
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 #, fuzzy
 msgid "Edit tags for this article"
 msgstr "Favoritos"
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 msgid "Open article in new tab"
 msgstr ""
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 #, fuzzy
 msgid "Close article"
 msgstr "Favoritos"
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 #, fuzzy
 msgid "Originally from:"
 msgstr "Favoritos"
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 msgid "Visit the website"
 msgstr ""
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Atualizar"
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 #, fuzzy
 msgid "unknown type"
 msgstr "Erro desconhecido"
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 #, fuzzy
 msgid "Attachments"
 msgstr "Conteúdo"
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favoritos"
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 #, fuzzy
 msgid "No feeds found."
 msgstr "Sem Feeds para exibir."
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr ""
 
@@ -1263,7 +1263,7 @@ msgid "Profile:"
 msgstr "Arquivo:"
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 #, fuzzy
 msgid "Default profile"
 msgstr "Padrão"
@@ -1286,7 +1286,7 @@ msgstr "Removendo o Feed..."
 msgid "Title:"
 msgstr "Título"
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 #, fuzzy
@@ -1311,9 +1311,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1395,7 +1395,7 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1405,7 +1405,7 @@ msgstr ""
 msgid "Select"
 msgstr "Selecione:"
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1414,7 +1414,7 @@ msgstr "Selecione:"
 msgid "All"
 msgstr "Todos"
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1423,205 +1423,214 @@ msgstr "Todos"
 msgid "None"
 msgstr "Nenhum"
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 #, fuzzy
 msgid "Create profile"
 msgstr "Criar um usuário"
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 msgid "(active)"
 msgstr ""
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Remover os filtros selecionados?"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 #, fuzzy
 msgid "Activate profile"
 msgstr "Remover os filtros selecionados?"
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Gerar um outro endereço"
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr ""
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 "process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr ""
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
 "contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Feed"
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 #, fuzzy
 msgid "Place in category:"
 msgstr "Salvando categoria..."
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 #, fuzzy
 msgid "Available feeds"
 msgstr "Todos os feeds"
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr ""
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr "Login"
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr "Este feed requer autenticação."
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr ""
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 #, fuzzy
 msgid "More feeds"
 msgstr "Removendo o Feed..."
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr ""
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Todos os feeds"
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 #, fuzzy
 msgid "Feed archive"
 msgstr "Ações do Feed:"
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 #, fuzzy
 msgid "limit:"
 msgstr "Limite:"
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr "Remover"
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr ""
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr ""
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr ""
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr "Salvar"
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Núvem de tags"
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 msgid "Match:"
 msgstr ""
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+#, fuzzy
+msgid "All tags."
+msgstr "sem tags"
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 msgid "Display entries"
 msgstr ""
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 #, fuzzy
 msgid "View as RSS"
 msgstr "Editar Tags"
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 #, fuzzy
 msgid "Details"
 msgstr "Diariamente"
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1629,56 +1638,56 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 #, fuzzy
 msgid "Access key:"
 msgstr "Nível de acesso:"
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 #, fuzzy
 msgid "Access key"
 msgstr "Nível de acesso:"
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 #, fuzzy
 msgid "Generate new key"
 msgstr "Gerar um outro endereço"
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 #, fuzzy
 msgid "Create link"
 msgstr "Criar"
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 "\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Este feed requer autenticação."
@@ -1865,16 +1874,16 @@ msgstr ""
 msgid "Adding filter..."
 msgstr "Adicionando o Feed..."
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, fuzzy, php-format
 msgid "Processing category: %s"
 msgstr "Salvando categoria..."
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr ""
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr ""
 
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 74b29c6e7..053d2b58c 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 b0189c811..3aee8b057 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: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+0400\n"
 "PO-Revision-Date: 2009-05-29 14:38+0300\n"
 "Last-Translator: Max Kamashev <max.kamashev@floscoeli.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -306,7 +306,7 @@ msgstr ""
 "неудавшийся тест экранирования SQL, проверьте вашу базу данных и "
 "конфигурацию PHP"
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "Настройки"
@@ -468,7 +468,7 @@ msgid "Filters"
 msgstr "Фильтры"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Метки"
@@ -697,19 +697,19 @@ msgstr "Если котегория видна, (раз)свернуть её"
 msgid "Go to..."
 msgstr "Перейти к.."
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 msgid "All articles"
 msgstr "Все статьи"
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr "Свежие"
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr "Опубликованные"
 
@@ -787,8 +787,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr "Особые"
 
@@ -831,143 +831,143 @@ msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
 msgid "Sort feeds by unread count"
 msgstr "Сортировать каналы по количеству непрочитанных статей"
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr ""
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Ошибка проверки сессии (некорректный IP)"
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 msgid "Archived articles"
 msgstr "Архив статей"
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Результаты поиска"
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 msgid "Click to play"
 msgstr "Щёлкните для проигрывания"
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr "Играть"
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr "нет тегов"
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 msgid "Edit tags for this article"
 msgstr "Редактировать теги статьи"
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 msgid "Open article in new tab"
 msgstr "Открыть статью в новом табе"
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 msgid "Close article"
 msgstr "Закрыть статью"
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 msgid "Originally from:"
 msgstr "Оригинал:"
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 #, fuzzy
 msgid "Feed URL"
 msgstr "Канал"
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Посетить официальный сайт"
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 #, fuzzy
 msgid "(edit note)"
 msgstr "править заметку"
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Последнее обновление в %s"
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 msgid "unknown type"
 msgstr "неизвестный тип"
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 #, fuzzy
 msgid "Attachments"
 msgstr "Вложения:"
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Отмеченные"
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 msgid "No feeds found."
 msgstr "Каналы не найдены."
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 msgid "Could not import: incorrect schema version."
 msgstr "Не могу импортировать данные: некорректная версия схемы."
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr "Не могу импортировать данные: неизвестынй формат данных."
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr "Не могу загрузить XML документ."
 
@@ -1240,7 +1240,7 @@ msgid "Profile:"
 msgstr "Профиль:"
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 msgid "Default profile"
 msgstr "Профиль по умолчанию"
 
@@ -1261,7 +1261,7 @@ msgstr "Вернуться к Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 msgid "URL:"
@@ -1286,9 +1286,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1371,7 +1371,7 @@ msgstr ""
 "Если вы импортировали метки или фильтры, вам возможно придется перезагрузить "
 "настройки чтобы увидеть новые данные."
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1380,7 +1380,7 @@ msgstr ""
 msgid "Select"
 msgstr "Выбрать"
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1389,7 +1389,7 @@ msgstr "Выбрать"
 msgid "All"
 msgstr "Все"
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1398,40 +1398,40 @@ msgstr "Все"
 msgid "None"
 msgstr "Ничего"
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 msgid "Create profile"
 msgstr "Создать профиль"
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 #, fuzzy
 msgid "(active)"
 msgstr "Адаптивно"
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 msgid "Remove selected profiles"
 msgstr "Удалить выбранные профили?"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 msgid "Activate profile"
 msgstr "Активировать профиль"
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr "Публичная ссылка на OPML"
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 msgid "Your Public OPML URL is:"
 msgstr "Ссылка на ваш опубликованный OPML:"
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 msgid "Generate new URL"
 msgstr "Создать новую ссылку"
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr "Сообщение"
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1441,11 +1441,11 @@ msgstr ""
 "запущен. Он необходим для обновления всех каналов.\n"
 "Пожалуйста, запустите демон обновлений или сообщите администратору."
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr "Последнее обновление:"
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -1455,146 +1455,155 @@ msgstr ""
 "Это обозначает что существует проблема подобная краху или зависанию демона.\n"
 "Пожалуйста проверьте процесс демона или сообщите администратору."
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Канал"
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 msgid "Place in category:"
 msgstr "Поместить в категорию:"
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 msgid "Available feeds"
 msgstr "Доступные каналы"
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr "Авторизация"
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr "Пользователь:"
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 msgid "Password"
 msgstr "Пароль"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr "Этот канал требует авторизации."
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 msgid "More feeds"
 msgstr "Другие каналы"
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr "Поиск"
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 #, fuzzy
 msgid "Popular feeds"
 msgstr "показать каналы"
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 #, fuzzy
 msgid "Feed archive"
 msgstr "Действия над каналом:"
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 #, fuzzy
 msgid "limit:"
 msgstr "Сколько:"
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr "Удалить"
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr ""
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr "Ограничить поиск:"
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr "Этот канал"
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr "Сохранить"
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Облако тегов"
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 msgid "Match:"
 msgstr "Поиск:"
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+#, fuzzy
+msgid "All tags."
+msgstr "нет тегов"
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 #, fuzzy
 msgid "Display entries"
 msgstr "показать каналы"
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 msgid "View as RSS"
 msgstr "Показать в формате RSS"
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Доступна новая версия Tiny Tiny RSS (%s)."
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 msgid "Details"
 msgstr "Подробнее"
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr "Скачать"
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1602,55 +1611,55 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr "Инсталляция"
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr "URL инсталляции"
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 #, fuzzy
 msgid "Access key:"
 msgstr "Уровень доступа:"
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 #, fuzzy
 msgid "Access key"
 msgstr "Уровень доступа:"
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr "Используйте один ключ доступа для обоих инсталляций"
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 #, fuzzy
 msgid "Generate new key"
 msgstr "Генерировать канал"
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 msgid "Create link"
 msgstr "Создать ссылку"
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 "\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Этот канал требует авторизации."
@@ -1822,16 +1831,16 @@ msgstr "Устанавливаю ключ настроек %s в %s"
 msgid "Adding filter..."
 msgstr "Добавляю фильтр %s"
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, fuzzy, php-format
 msgid "Processing category: %s"
 msgstr "Поместить в категорию:"
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr "Ошибка: пожалуйста загрузите OPML файл."
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr "Ошибка при разборе документа."
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 0049134be..f26c43615 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 8a058d113..dd57ce904 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+0400\n"
 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Sai <lazycai.ffsky@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/"
@@ -293,7 +293,7 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。"
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr "偏好设置"
@@ -455,7 +455,7 @@ msgid "Filters"
 msgstr "过滤器"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "预定义标签"
@@ -682,19 +682,19 @@ msgstr "查看类别时将其折叠/展开"
 msgid "Go to..."
 msgstr "跳转至……"
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 msgid "All articles"
 msgstr "全部文章"
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr "最新更新的文章"
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr "加星标文章"
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr "已发布文章"
 
@@ -772,8 +772,8 @@ msgstr ""
 msgid "Home"
 msgstr "主页"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr "特殊区域"
 
@@ -811,141 +811,141 @@ msgstr "隐藏已读的文章和信息源"
 msgid "Sort feeds by unread count"
 msgstr "以未读文章数量排列信息源"
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr ""
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr "无法验证会话（IP 错误）"
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr "全部信息源"
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 msgid "Archived articles"
 msgstr "存档的文章"
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 msgid "Click to play"
 msgstr "点击播放"
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr "播放"
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr "无标签"
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 msgid "Open article in new tab"
 msgstr "在新标签页中打开文章"
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 msgid "Close article"
 msgstr ""
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 msgid "Originally from:"
 msgstr "来源："
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 msgid "Feed URL"
 msgstr "信息源 URL"
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 msgid "Visit the website"
 msgstr "访问网站"
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr "关闭本窗口"
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 msgid "(edit note)"
 msgstr "（编辑注记）"
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr "没有选中的信息源。"
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次信息源更新时间：%s"
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr "部分信息源更新错误（点击了解详情）"
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 msgid "unknown type"
 msgstr "未知类型"
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 #, fuzzy
 msgid "Attachments"
 msgstr "附件："
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, php-format
 msgid "%d archived articles"
 msgstr "%d 个存档的文章"
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr ""
 
@@ -1205,7 +1205,7 @@ msgid "Profile:"
 msgstr "偏好："
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 msgid "Default profile"
 msgstr "默认偏好设置"
 
@@ -1227,7 +1227,7 @@ msgstr "在 Tiny Tiny RSS 中订阅"
 msgid "Title:"
 msgstr "标题"
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 msgid "URL:"
@@ -1252,9 +1252,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1333,7 +1333,7 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1342,7 +1342,7 @@ msgstr ""
 msgid "Select"
 msgstr "选择"
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1351,7 +1351,7 @@ msgstr "选择"
 msgid "All"
 msgstr "全部"
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1360,39 +1360,39 @@ msgstr "全部"
 msgid "None"
 msgstr "无"
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 msgid "Create profile"
 msgstr "创建偏好文件"
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 msgid "(active)"
 msgstr "（当前使用的）"
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 msgid "Remove selected profiles"
 msgstr "移除选中的偏好文件"
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 msgid "Activate profile"
 msgstr "启用偏好文件"
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 msgid "Your Public OPML URL is:"
 msgstr "你的公共 OPML URL 是："
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 msgid "Generate new URL"
 msgstr "生成一个新的 URL"
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr "提示"
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -1401,11 +1401,11 @@ msgstr ""
 "更新进程已在配置中启用，但守护进程没有运行，无法抓取信息。请启动守护进程，或"
 "联系管理员。"
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr "上次更新："
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -1414,141 +1414,150 @@ msgstr ""
 "更新进程在抓取信息更新时花费了太长时间，可能已经崩溃。请检查守护进程或联系管"
 "理员。"
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "信息源 URL"
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 msgid "Place in category:"
 msgstr "加入到类别："
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 msgid "Available feeds"
 msgstr "可用的信息源"
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr "登录密码"
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr "登陆"
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 msgid "Password"
 msgstr "密码"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr "这个信息源需要认证"
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr "订阅"
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 msgid "More feeds"
 msgstr "更多信息源"
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr "搜索"
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 msgid "Popular feeds"
 msgstr "最受欢迎的信息源"
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 msgid "Feed archive"
 msgstr "信息源存档"
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 msgid "limit:"
 msgstr "限制："
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr "移除"
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr "查找"
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr "限制搜索条件："
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr "本信息源"
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开："
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr "保存"
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 msgid "Tag Cloud"
 msgstr "标签云"
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr "通过自定义标签选择"
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 msgid "Match:"
 msgstr "匹配："
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+#, fuzzy
+msgid "All tags."
+msgstr "无标签"
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr "哪些标签？"
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 msgid "Display entries"
 msgstr "显示条目"
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 msgid "View as RSS"
 msgstr "以 RSS 形式阅读"
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "您可以通过如下 URL 以 RSS 方式查看本信息源："
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS 有可用的新版本 (%s)。"
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 msgid "Details"
 msgstr "详细"
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr "下载"
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1558,52 +1567,52 @@ msgstr ""
 "您可以通过自定义 CSS 来更改颜色，字体和版式。具体可参考 <a target=\"_blank\" "
 "class=\"visibleLink\" href=\"%s\">本文件</a>。"
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr "实例"
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr "实例 URL："
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 msgid "Access key:"
 msgstr "访问密钥："
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 msgid "Access key"
 msgstr "访问密钥"
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr "为两个相联的实例使用一个访问密钥。"
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 msgid "Generate new key"
 msgstr "生成新的密钥"
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 msgid "Create link"
 msgstr "创建链接"
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 "\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 msgid "Feeds require authentication."
 msgstr ""
 
@@ -1772,16 +1781,16 @@ msgstr "将偏好按键从 %s 设置为 %s"
 msgid "Adding filter..."
 msgstr "创建过滤器"
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, fuzzy, php-format
 msgid "Processing category: %s"
 msgstr "加入到类别："
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr "错误：请上传 OPML 文件。"
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr "解析文档时发生错误。"
 
diff --git a/messages.pot b/messages.pot
index 721180cb9..dae89aae7 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-12 14:25+0400\n"
+"POT-Creation-Date: 2012-11-22 16:05+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -283,7 +283,7 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: index.php:116 prefs.php:90 help/main.php:73 help/prefs.php:8
+#: index.php:116 prefs.php:29 prefs.php:90 help/main.php:73 help/prefs.php:8
 #: classes/pref/prefs.php:371
 msgid "Preferences"
 msgstr ""
@@ -445,7 +445,7 @@ msgid "Filters"
 msgstr ""
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
-#: include/functions.php:1272 include/functions.php:1921
+#: include/functions.php:1193 include/functions.php:1842
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr ""
@@ -669,19 +669,19 @@ msgstr ""
 msgid "Go to..."
 msgstr ""
 
-#: help/main.php:68 include/functions.php:1978
+#: help/main.php:68 include/functions.php:1899
 msgid "All articles"
 msgstr ""
 
-#: help/main.php:69 include/functions.php:1976
+#: help/main.php:69 include/functions.php:1897
 msgid "Fresh articles"
 msgstr ""
 
-#: help/main.php:70 include/functions.php:1972
+#: help/main.php:70 include/functions.php:1893
 msgid "Starred articles"
 msgstr ""
 
-#: help/main.php:71 include/functions.php:1974
+#: help/main.php:71 include/functions.php:1895
 msgid "Published articles"
 msgstr ""
 
@@ -757,8 +757,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: mobile/mobile-functions.php:178 include/functions.php:1270
-#: include/functions.php:1919
+#: mobile/mobile-functions.php:178 include/functions.php:1191
+#: include/functions.php:1840
 msgid "Special"
 msgstr ""
 
@@ -796,140 +796,140 @@ msgstr ""
 msgid "Sort feeds by unread count"
 msgstr ""
 
-#: include/functions.php:571
+#: include/functions.php:568
 #, php-format
 msgid "Fatal: authentication module %s not found."
 msgstr ""
 
-#: include/functions.php:689
+#: include/functions.php:686
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: include/functions.php:1281 include/functions.php:1822
-#: include/functions.php:1907 include/functions.php:1929
-#: include/functions.php:2784 classes/opml.php:413 classes/pref/feeds.php:193
+#: include/functions.php:1202 include/functions.php:1743
+#: include/functions.php:1828 include/functions.php:1850
+#: include/functions.php:2705 classes/opml.php:416 classes/pref/feeds.php:193
 msgid "Uncategorized"
 msgstr ""
 
-#: include/functions.php:1771 classes/dlg.php:385 classes/pref/filters.php:361
+#: include/functions.php:1692 classes/dlg.php:387 classes/pref/filters.php:361
 msgid "All feeds"
 msgstr ""
 
-#: include/functions.php:1980
+#: include/functions.php:1901
 msgid "Archived articles"
 msgstr ""
 
-#: include/functions.php:1982
+#: include/functions.php:1903
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:2431
+#: include/functions.php:2352
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:3152 js/viewfeed.js:1998
+#: include/functions.php:3073 js/viewfeed.js:1998
 msgid "Click to play"
 msgstr ""
 
-#: include/functions.php:3153 js/viewfeed.js:1997
+#: include/functions.php:3074 js/viewfeed.js:1997
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3206
 msgid " - "
 msgstr ""
 
-#: include/functions.php:3314 include/functions.php:4101 classes/rpc.php:414
+#: include/functions.php:3235 include/functions.php:4022 classes/rpc.php:414
 msgid "no tags"
 msgstr ""
 
-#: include/functions.php:3324 classes/feeds.php:669
+#: include/functions.php:3245 classes/feeds.php:669
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions.php:3334 classes/feeds.php:696
+#: include/functions.php:3255 classes/feeds.php:696
 msgid "Open article in new tab"
 msgstr ""
 
-#: include/functions.php:3350 classes/feeds.php:707
+#: include/functions.php:3271 classes/feeds.php:707
 msgid "Close article"
 msgstr ""
 
-#: include/functions.php:3367 classes/feeds.php:609
+#: include/functions.php:3288 classes/feeds.php:609
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions.php:3380 classes/feeds.php:622 classes/pref/feeds.php:512
+#: include/functions.php:3301 classes/feeds.php:622 classes/pref/feeds.php:512
 msgid "Feed URL"
 msgstr ""
 
-#: include/functions.php:3395 classes/feeds.php:68
+#: include/functions.php:3316 classes/feeds.php:68
 msgid "Visit the website"
 msgstr ""
 
-#: include/functions.php:3414
+#: include/functions.php:3335
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3444 classes/dlg.php:30 classes/dlg.php:59
-#: classes/dlg.php:178 classes/dlg.php:201 classes/dlg.php:238
-#: classes/dlg.php:522 classes/dlg.php:555 classes/dlg.php:586
-#: classes/dlg.php:619 classes/dlg.php:720 classes/button/share.php:47
+#: include/functions.php:3365 classes/dlg.php:30 classes/dlg.php:61
+#: classes/dlg.php:180 classes/dlg.php:203 classes/dlg.php:240
+#: classes/dlg.php:524 classes/dlg.php:559 classes/dlg.php:590
+#: classes/dlg.php:623 classes/dlg.php:724 classes/button/share.php:47
 #: classes/pref/users.php:106 classes/pref/filters.php:101
 #: classes/pref/prefs.php:669 classes/pref/feeds.php:1641
 #: classes/pref/feeds.php:1712
 msgid "Close this window"
 msgstr ""
 
-#: include/functions.php:4126
+#: include/functions.php:4047
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:4593
+#: include/functions.php:4514
 msgid "No feed selected."
 msgstr ""
 
-#: include/functions.php:4603 classes/feeds.php:755
+#: include/functions.php:4524 classes/feeds.php:755
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: include/functions.php:4613 classes/feeds.php:765
+#: include/functions.php:4534 classes/feeds.php:765
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
-#: include/functions.php:4757
+#: include/functions.php:4678
 msgid "unknown type"
 msgstr ""
 
-#: include/functions.php:4799
+#: include/functions.php:4720
 msgid "Attachments"
 msgstr ""
 
-#: include/functions.php:5259
+#: include/functions.php:5180
 #, php-format
 msgid "%d archived articles"
 msgstr ""
 
-#: include/functions.php:5283
+#: include/functions.php:5204
 msgid "No feeds found."
 msgstr ""
 
-#: include/functions.php:5329
+#: include/functions.php:5250
 msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: include/functions.php:5334
+#: include/functions.php:5255
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5493
+#: include/functions.php:5414
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5499
+#: include/functions.php:5420
 msgid "Could not load XML document."
 msgstr ""
 
@@ -1185,7 +1185,7 @@ msgid "Profile:"
 msgstr ""
 
 #: include/login_form.php:197 classes/handler/public.php:208
-#: classes/rpc.php:147 classes/dlg.php:114
+#: classes/rpc.php:147 classes/dlg.php:116
 msgid "Default profile"
 msgstr ""
 
@@ -1205,7 +1205,7 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: classes/handler/public.php:426 classes/dlg.php:663
+#: classes/handler/public.php:426 classes/dlg.php:667
 #: classes/pref/instances.php:73 classes/pref/feeds.php:510
 #: classes/pref/feeds.php:761
 msgid "URL:"
@@ -1228,9 +1228,9 @@ msgid "Share"
 msgstr ""
 
 #: classes/handler/public.php:452 classes/handler/public.php:494
-#: classes/dlg.php:313 classes/dlg.php:364 classes/dlg.php:424
-#: classes/dlg.php:455 classes/dlg.php:648 classes/dlg.php:698
-#: classes/dlg.php:770 classes/button/note.php:35 classes/button/mail.php:112
+#: classes/dlg.php:315 classes/dlg.php:366 classes/dlg.php:426
+#: classes/dlg.php:457 classes/dlg.php:652 classes/dlg.php:702
+#: classes/dlg.php:774 classes/button/note.php:35 classes/button/mail.php:112
 #: classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:342 classes/pref/filters.php:717
 #: classes/pref/filters.php:786 classes/pref/filters.php:853
@@ -1306,7 +1306,7 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:71 classes/pref/users.php:378 classes/pref/labels.php:272
+#: classes/dlg.php:73 classes/pref/users.php:378 classes/pref/labels.php:272
 #: classes/pref/filters.php:223 classes/pref/filters.php:270
 #: classes/pref/filters.php:571 classes/pref/filters.php:645
 #: classes/pref/filters.php:672 classes/pref/instances.php:145
@@ -1315,7 +1315,7 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: classes/dlg.php:74 classes/feeds.php:92 classes/pref/users.php:381
+#: classes/dlg.php:76 classes/feeds.php:92 classes/pref/users.php:381
 #: classes/pref/labels.php:275 classes/pref/filters.php:226
 #: classes/pref/filters.php:273 classes/pref/filters.php:574
 #: classes/pref/filters.php:648 classes/pref/filters.php:675
@@ -1324,7 +1324,7 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: classes/dlg.php:76 classes/feeds.php:95 classes/pref/users.php:383
+#: classes/dlg.php:78 classes/feeds.php:95 classes/pref/users.php:383
 #: classes/pref/labels.php:277 classes/pref/filters.php:228
 #: classes/pref/filters.php:275 classes/pref/filters.php:576
 #: classes/pref/filters.php:650 classes/pref/filters.php:677
@@ -1333,190 +1333,198 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: classes/dlg.php:85
+#: classes/dlg.php:87
 msgid "Create profile"
 msgstr ""
 
-#: classes/dlg.php:108 classes/dlg.php:138
+#: classes/dlg.php:110 classes/dlg.php:140
 msgid "(active)"
 msgstr ""
 
-#: classes/dlg.php:172
+#: classes/dlg.php:174
 msgid "Remove selected profiles"
 msgstr ""
 
-#: classes/dlg.php:174
+#: classes/dlg.php:176
 msgid "Activate profile"
 msgstr ""
 
-#: classes/dlg.php:184
+#: classes/dlg.php:186
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/dlg.php:189
+#: classes/dlg.php:191
 msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: classes/dlg.php:198 classes/dlg.php:583
+#: classes/dlg.php:200 classes/dlg.php:587
 msgid "Generate new URL"
 msgstr ""
 
-#: classes/dlg.php:210
+#: classes/dlg.php:212
 msgid "Notice"
 msgstr ""
 
-#: classes/dlg.php:216
+#: classes/dlg.php:218
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 "process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:220 classes/dlg.php:229
+#: classes/dlg.php:222 classes/dlg.php:231
 msgid "Last update:"
 msgstr ""
 
-#: classes/dlg.php:225
+#: classes/dlg.php:227
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
 "contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:250 classes/dlg.php:259
+#: classes/dlg.php:252 classes/dlg.php:261
 msgid "Feed or site URL"
 msgstr ""
 
-#: classes/dlg.php:265 classes/dlg.php:734 classes/pref/feeds.php:532
+#: classes/dlg.php:267 classes/dlg.php:738 classes/pref/feeds.php:532
 #: classes/pref/feeds.php:774
 msgid "Place in category:"
 msgstr ""
 
-#: classes/dlg.php:273
+#: classes/dlg.php:275
 msgid "Available feeds"
 msgstr ""
 
-#: classes/dlg.php:285 classes/pref/users.php:155 classes/pref/feeds.php:572
+#: classes/dlg.php:287 classes/pref/users.php:155 classes/pref/feeds.php:572
 #: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr ""
 
-#: classes/dlg.php:289 classes/dlg.php:748 classes/pref/users.php:438
+#: classes/dlg.php:291 classes/dlg.php:752 classes/pref/users.php:438
 #: classes/pref/feeds.php:578 classes/pref/feeds.php:821
 msgid "Login"
 msgstr ""
 
-#: classes/dlg.php:292 classes/dlg.php:751 classes/pref/prefs.php:200
+#: classes/dlg.php:294 classes/dlg.php:755 classes/pref/prefs.php:200
 #: classes/pref/feeds.php:584 classes/pref/feeds.php:827
 msgid "Password"
 msgstr ""
 
-#: classes/dlg.php:302
+#: classes/dlg.php:304
 msgid "This feed requires authentication."
 msgstr ""
 
-#: classes/dlg.php:307 classes/dlg.php:362 classes/dlg.php:769
+#: classes/dlg.php:309 classes/dlg.php:364 classes/dlg.php:773
 msgid "Subscribe"
 msgstr ""
 
-#: classes/dlg.php:310
+#: classes/dlg.php:312
 msgid "More feeds"
 msgstr ""
 
-#: classes/dlg.php:334 classes/dlg.php:423 classes/pref/users.php:368
+#: classes/dlg.php:336 classes/dlg.php:425 classes/pref/users.php:368
 #: classes/pref/filters.php:567 classes/pref/feeds.php:1277 js/tt-rss.js:234
 msgid "Search"
 msgstr ""
 
-#: classes/dlg.php:338
+#: classes/dlg.php:340
 msgid "Popular feeds"
 msgstr ""
 
-#: classes/dlg.php:339
+#: classes/dlg.php:341
 msgid "Feed archive"
 msgstr ""
 
-#: classes/dlg.php:342
+#: classes/dlg.php:344
 msgid "limit:"
 msgstr ""
 
-#: classes/dlg.php:363 classes/pref/users.php:394 classes/pref/labels.php:284
+#: classes/dlg.php:365 classes/pref/users.php:394 classes/pref/labels.php:284
 #: classes/pref/filters.php:332 classes/pref/filters.php:589
 #: classes/pref/instances.php:155 classes/pref/feeds.php:700
 msgid "Remove"
 msgstr ""
 
-#: classes/dlg.php:374
+#: classes/dlg.php:376
 msgid "Look for"
 msgstr ""
 
-#: classes/dlg.php:382
+#: classes/dlg.php:384
 msgid "Limit search to:"
 msgstr ""
 
-#: classes/dlg.php:398
+#: classes/dlg.php:400
 msgid "This feed"
 msgstr ""
 
-#: classes/dlg.php:430
+#: classes/dlg.php:432
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: classes/dlg.php:453 classes/dlg.php:646 classes/button/note.php:33
+#: classes/dlg.php:455 classes/dlg.php:650 classes/button/note.php:33
 #: classes/pref/users.php:192 classes/pref/labels.php:79
 #: classes/pref/filters.php:339 classes/pref/instances.php:106
 #: classes/pref/feeds.php:726 classes/pref/feeds.php:883
 msgid "Save"
 msgstr ""
 
-#: classes/dlg.php:461
+#: classes/dlg.php:463
 msgid "Tag Cloud"
 msgstr ""
 
-#: classes/dlg.php:530
+#: classes/dlg.php:532
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: classes/dlg.php:533
+#: classes/dlg.php:535
 msgid "Match:"
 msgstr ""
 
-#: classes/dlg.php:538
+#: classes/dlg.php:537
+msgid "Any"
+msgstr ""
+
+#: classes/dlg.php:540
+msgid "All tags."
+msgstr ""
+
+#: classes/dlg.php:542
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:551
+#: classes/dlg.php:555
 msgid "Display entries"
 msgstr ""
 
-#: classes/dlg.php:563 classes/feeds.php:129
+#: classes/dlg.php:567 classes/feeds.php:129
 msgid "View as RSS"
 msgstr ""
 
-#: classes/dlg.php:574
+#: classes/dlg.php:578
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:602 classes/pref/prefs.php:641
+#: classes/dlg.php:606 classes/pref/prefs.php:641
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
-#: classes/dlg.php:610
+#: classes/dlg.php:614
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:614 classes/pref/users.php:390
+#: classes/dlg.php:618 classes/pref/users.php:390
 msgid "Details"
 msgstr ""
 
-#: classes/dlg.php:616
+#: classes/dlg.php:620
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:630
+#: classes/dlg.php:634
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1524,52 +1532,52 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:657 classes/pref/instances.php:65
+#: classes/dlg.php:661 classes/pref/instances.php:65
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:666 classes/pref/instances.php:76
+#: classes/dlg.php:670 classes/pref/instances.php:76
 #: classes/pref/instances.php:173
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:676 classes/pref/instances.php:87
+#: classes/dlg.php:680 classes/pref/instances.php:87
 msgid "Access key:"
 msgstr ""
 
-#: classes/dlg.php:679 classes/pref/instances.php:90
+#: classes/dlg.php:683 classes/pref/instances.php:90
 #: classes/pref/instances.php:174
 msgid "Access key"
 msgstr ""
 
-#: classes/dlg.php:683 classes/pref/instances.php:94
+#: classes/dlg.php:687 classes/pref/instances.php:94
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:691 classes/pref/instances.php:102
+#: classes/dlg.php:695 classes/pref/instances.php:102
 msgid "Generate new key"
 msgstr ""
 
-#: classes/dlg.php:695
+#: classes/dlg.php:699
 msgid "Create link"
 msgstr ""
 
-#: classes/dlg.php:713
+#: classes/dlg.php:717
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 "\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: classes/dlg.php:731
+#: classes/dlg.php:735
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:740
+#: classes/dlg.php:744
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:762
+#: classes/dlg.php:766
 msgid "Feeds require authentication."
 msgstr ""
 
@@ -1734,16 +1742,16 @@ msgstr ""
 msgid "Adding filter..."
 msgstr ""
 
-#: classes/opml.php:413
+#: classes/opml.php:416
 #, php-format
 msgid "Processing category: %s"
 msgstr ""
 
-#: classes/opml.php:460
+#: classes/opml.php:467
 msgid "Error: please upload OPML file."
 msgstr ""
 
-#: classes/opml.php:467
+#: classes/opml.php:474
 msgid "Error while parsing document."
 msgstr ""
 
diff --git a/prefs.php b/prefs.php
index 1399d9f58..58a078b1f 100644
--- a/prefs.php
+++ b/prefs.php
@@ -26,7 +26,7 @@
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-	<title>Tiny Tiny RSS : Preferences</title>
+	<title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
 	<link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
 	<link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>