diff --git a/include/localized_schema.php b/include/localized_schema.php
index e6da6f0e..a13a7f58 100644
--- a/include/localized_schema.php
+++ b/include/localized_schema.php
@@ -1,4 +1,4 @@
-<?php # This file has been generated at:  Mon Jan 30 16:39:34 MSK 2012
+<?php # This file has been generated at:  Mon Mar 12 13:59:27 MSK 2012
 
 __("Title");
 __("Title or Content");
@@ -29,7 +29,7 @@ __('When this option is enabled, headlines in Special feeds and Labels are group
 __('Use feed-specified date to sort headlines instead of local import date.');
 __('Customize CSS stylesheet to your liking');
 __('Click to register your SSL client certificate with tt-rss');
-__('Uses server timezone');
+__('Uses UTC timezone');
 __('Purge old posts after this number of days (0 - disables)');
 __('Default interval between feed updates');
 __('Amount of articles to display at once');
diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index 8ae625fe..c786350a 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 a6bce3ce..6013f3ec 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-01-30 16:39+0400\n"
+"POT-Creation-Date: 2012-03-12 13:59+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"
@@ -81,7 +81,7 @@ msgstr "Diàriament"
 msgid "Weekly"
 msgstr "Setmanalment"
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr "Per defecte"
 
@@ -137,7 +137,7 @@ msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
@@ -215,9 +215,9 @@ msgstr ""
 "/t/t paràmetres del navegador."
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
 msgstr "S'està obrint, preneu paciència..."
 
@@ -304,7 +304,7 @@ msgstr ""
 "bases de dades i de PHP"
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -362,7 +362,7 @@ msgstr "Actualitzat"
 msgid "Sort articles"
 msgstr "Articles mémorisés"
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 msgid "Date"
 msgstr "Data"
 
@@ -374,13 +374,13 @@ msgstr "Títol"
 msgid "Score"
 msgstr "Puntuació"
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr "Actualitza"
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr "Marca'l com a llegit"
 
@@ -408,7 +408,7 @@ msgstr "Edita aquest canal..."
 msgid "Rescore feed"
 msgstr "Canvia la puntuació del canal"
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr "Dóna't de baixa"
 
@@ -520,11 +520,11 @@ msgid "Exit preferences"
 msgstr "Surt de les preferències"
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 msgid "Feeds"
 msgstr "Canals"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 msgid "Filters"
 msgstr "Filtres"
 
@@ -613,7 +613,7 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 #, fuzzy
 msgid "Register"
 msgstr "Registrat"
@@ -698,7 +698,7 @@ msgstr "Seleccioneu un article mitjançant el ratolí."
 msgid "Create label"
 msgstr "Crea una etiqueta"
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr "Crea un filtre"
 
@@ -744,11 +744,11 @@ msgstr "Accions dels canals"
 msgid "Refresh active feed"
 msgstr "Actualitza els canals actius"
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr "Subscriu-te al canal"
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 msgid "Edit feed"
 msgstr "Edita el canal"
 
@@ -905,7 +905,7 @@ msgstr "Ordena els canals per articles no llegits"
 msgid "Article not found."
 msgstr "No s'ha trobat el canal."
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr "No s'ha trobat el tema a l'ajuda."
 
@@ -918,9 +918,9 @@ msgstr "Desa"
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr "Tanca la finestra"
 
@@ -940,7 +940,7 @@ msgstr "Crea un filtre"
 msgid "(active)"
 msgstr "Adaptatiu"
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 #, fuzzy
 msgid "Default profile"
@@ -999,18 +999,18 @@ msgstr ""
 "un problema com la caiguda. Si us plau, reviseu dels processos del daemon o "
 "contacteu amb el seu propietari."
 
-#: classes/dlg.php:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr "Canal"
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 #, fuzzy
 msgid "Feed URL"
 msgstr "Canal"
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 msgid "Place in category:"
 msgstr "Posa'l a la categoria:"
 
@@ -1019,18 +1019,18 @@ msgstr "Posa'l a la categoria:"
 msgid "Available feeds"
 msgstr "Tots els canals"
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Autenticació"
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr "Entra"
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 #, fuzzy
 msgid "Password"
 msgstr "Contrasenya:"
@@ -1055,14 +1055,14 @@ msgstr "Més canals"
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr "Cerca"
@@ -1082,8 +1082,8 @@ msgstr "Accions dels canals"
 msgid "limit:"
 msgstr "Límit:"
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr "Suprimeix"
@@ -1116,58 +1116,58 @@ msgstr "Tots els canals"
 msgid "This feed"
 msgstr "Aquest canal"
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr "Coincidència"
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr "abans"
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 msgid "after"
 msgstr "després"
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr "Revisa-ho"
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr "al camp"
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "a"
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 msgid "Perform Action"
 msgstr "Acció a realitzar:"
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr "amb els paràmetres:"
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 msgid "Options"
 msgstr "Opcions"
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr "Activat"
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr "Coincidència inversa"
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
+#: classes/dlg.php:539 classes/pref_filters.php:371
 #, fuzzy
 msgid "Apply to category"
 msgstr "Posa'l a la categoria:"
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
 msgstr "Tester"
 
@@ -1201,8 +1201,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetes per aquest article (separades per comes):"
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Desa"
@@ -1264,7 +1264,7 @@ msgstr ""
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL:"
@@ -1319,7 +1319,7 @@ msgstr ""
 msgid "Feeds require authentication."
 msgstr "Aquest canal requereix autenticació."
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 #, fuzzy
 msgid "Visit the website"
 msgstr "Visiteu el web oficial"
@@ -1333,8 +1333,8 @@ msgstr "Visualitza els canals"
 msgid "Select:"
 msgstr "Selecciona:"
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr "Tot"
@@ -1343,8 +1343,8 @@ msgstr "Tot"
 msgid "Invert"
 msgstr "Inverteix"
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr "Cap"
@@ -1389,21 +1389,21 @@ msgstr "No s'ha trobat el canal."
 msgid "mark as read"
 msgstr "Marca'l com a llegit"
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 #, fuzzy
 msgid "Originally from:"
 msgstr "Mostra el contingut original de l'article"
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 msgid "Edit tags for this article"
 msgstr "Edita les etiquetes d'aquest article"
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Obre l'article en una finestra nova"
 
-#: classes/feeds.php:723 include/functions.php:3350
+#: classes/feeds.php:723 include/functions.php:3380
 #, fuzzy
 msgid "Close article"
 msgstr "Buida els articles"
@@ -1432,20 +1432,20 @@ msgstr ""
 msgid "No articles found to display."
 msgstr "No s'han trobat articles per a mostrar."
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Erreurs de mise à jour"
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 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)"
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr "Sense categoria"
 
@@ -1486,235 +1486,245 @@ msgstr "Edita les etiquetes"
 msgid "Check to enable field"
 msgstr "Seleccioneu-ho per activar els camps"
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Edita el canal"
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 #, fuzzy
 msgid "Feed Title"
 msgstr "Títol"
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr "s'està utilitzant"
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr "Neteja d'articles:"
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Amaga-ho de la llista de canals"
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr "Contingut escrit de dreta a esquerra"
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr "Mostra les imatges adjuntes"
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr "Emmagatzema les imatges localment"
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 #, fuzzy
 msgid "Icon"
 msgstr "Action"
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr ""
 
-#: classes/pref_feeds.php:518
+#: classes/pref_feeds.php:524
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Subscrit als canals:"
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr "Fet!"
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Subscrit a <b>%s</b>."
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: classes/pref_feeds.php:1017
+#: classes/pref_feeds.php:1024
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "No s'ha trobat cap canal."
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: classes/pref_feeds.php:1028
+#: classes/pref_feeds.php:1030
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "L'adreça URL del canal ha canviat."
+
+#: classes/pref_feeds.php:1035
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1057
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
 msgstr "Edita les opcions de les subscripcions"
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La categoria <b>%s</b> ja existeix a la base de dades."
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr "Crea una categoria"
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr "No s'ha definit cap categoria per als canals."
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de canals"
 
-#: classes/pref_feeds.php:1280
+#: classes/pref_feeds.php:1287
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Tots els canals"
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 #, fuzzy
 msgid "Select"
 msgstr "Selecciona:"
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "S'estan purgant els canals seleccionats..."
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Reinicia la contrasenya"
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Dóna't de baixa"
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 #, fuzzy
 msgid "Categories"
 msgstr "Catégorie&nbsp;:"
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
 msgstr "Edita les categories"
 
-#: classes/pref_feeds.php:1345
+#: classes/pref_feeds.php:1338
+#, fuzzy
+msgid "(Un)hide empty categories"
+msgstr "Edita les categories"
+
+#: classes/pref_feeds.php:1354
 #, fuzzy
 msgid "More actions..."
 msgstr "Accions..."
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 msgid "Clear feed data"
 msgstr "Esborra les dades del canal"
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 msgid "Rescore articles"
 msgstr "Canvia la puntuació dels articles"
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
 msgstr ""
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref_feeds.php:1408
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref_feeds.php:1410
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref_feeds.php:1423
+#: classes/pref_feeds.php:1432
 #, fuzzy
 msgid "Import my OPML"
 msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
 
-#: classes/pref_feeds.php:1427
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref_feeds.php:1429
+#: classes/pref_feeds.php:1438
 #, fuzzy
 msgid "Include settings"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: classes/pref_feeds.php:1433
+#: classes/pref_feeds.php:1442
 #, fuzzy
 msgid "Export OPML"
 msgstr "Exporta en format OPML"
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1723,42 +1733,42 @@ msgstr ""
 "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot "
 "subscriure qualsevol que en conegui l'adreça URL."
 
-#: classes/pref_feeds.php:1439
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1442
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1445
+#: classes/pref_feeds.php:1454
 #, fuzzy
 msgid "Article archive"
 msgstr "Data de l'article"
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
+#: classes/pref_feeds.php:1459
 #, fuzzy
 msgid "Export my data"
 msgstr "Exporta en format OPML"
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr "Importeu"
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Integració al Firefox"
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1766,45 +1776,45 @@ msgstr ""
 "Podeu utilitzar Tiny Tiny RSS  com a lector de canals amb el Firefox fent "
 "clic en el següent enllaç."
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr "Feu clic aquí per a desar aquesta pàgina web com un canal."
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Torna a Tiny Tiny RSS"
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
-#: classes/pref_feeds.php:1503
+#: classes/pref_feeds.php:1512
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
 "personalitzades?"
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr ""
 "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
 "personalitzades?"
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1812,69 +1822,73 @@ msgstr ""
 "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot "
 "subscriure qualsevol que en conegui l'adreça URL."
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 #, fuzzy
 msgid "Display URL"
 msgstr "afficher les étiquettes"
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1520
+#: classes/pref_feeds.php:1529
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref_feeds.php:1523
+#: classes/pref_feeds.php:1532
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Articles mémorisés"
 
-#: classes/pref_feeds.php:1529
+#: classes/pref_feeds.php:1538
 #, fuzzy
 msgid "Twitter"
 msgstr "Títol"
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Esborra les dades del canal"
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: classes/pref_filters.php:84
+#: classes/pref_filters.php:89
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "No s'ha trobat cap fitxer que coincideixi."
 
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
+msgstr ""
+
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "S'ha creat el filtre <b>%s</b>"
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
 msgstr "Edita"
@@ -1954,99 +1968,99 @@ msgstr "S'ha modificat la contrasenya."
 msgid "Old password is incorrect."
 msgstr "La contrasenya antiga és incorrecta."
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr "S'ha desat la configuració"
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Es desconeix l'opció %s"
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref_prefs.php:159
+#: classes/pref_prefs.php:168
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Autenticació"
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr ""
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr "Adreça electrònica"
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 msgid "Access level"
 msgstr "Nivell d'accés"
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 #, fuzzy
 msgid "Save data"
 msgstr "Desa"
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "La contrasenya actual és la predeterminada,\n"
 "\t\t\t\t\t\t penseu en modificar-la."
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr "Contrasenya antiga"
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr "Confirmeu la contrasenya"
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr "Seleccioneu una interfície"
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr ""
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr "Sí"
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr "No"
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
 msgstr ""
 
-#: classes/pref_prefs.php:468
+#: classes/pref_prefs.php:477
 #, php-format
-msgid "Current server time: %s"
+msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr "Desa la configuració"
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr ""
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr "Torna als paràmetres per defecte"
 
@@ -2143,29 +2157,25 @@ msgstr "No s'han definit els usuaris."
 msgid "No matching users found."
 msgstr "No s'ha trobat cap usuari que coinicideixi. "
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr "sense etiqueta"
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "La vostra informació de registre és incompleta."
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "S'ha modificat la contrasenya."
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "No podeu editar aquest tipus de canal."
@@ -2197,65 +2207,65 @@ msgstr "El nom d'usuari o la contrasenya és incorrecte"
 msgid "Archived articles"
 msgstr "Articles mémorisés"
 
-#: include/functions.php:3158 js/viewfeed.js:1945
+#: include/functions.php:3188 js/viewfeed.js:1954
 #, fuzzy
 msgid "Click to play"
 msgstr "Feu clic per editar"
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:4104
+#: include/functions.php:4134
 #, fuzzy
 msgid "(edit note)"
 msgstr "edita la nota"
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr "No heu seleccionat cap canal."
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 msgid "unknown type"
 msgstr "tipus desconegut"
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr "Adjunció:"
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 msgid "Attachments:"
 msgstr "Adjuncions:"
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Articles marcats"
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 msgid "No feeds found."
 msgstr "No s'ha trobat cap canal."
 
-#: include/functions.php:5241
+#: include/functions.php:5287
 #, 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:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
 msgstr ""
 
@@ -2289,7 +2299,7 @@ msgstr "Publica l'article"
 msgid "Assign tags"
 msgstr "Assigna etiquetes"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr "Assigna-li l'etiqueta"
 
@@ -2387,7 +2397,7 @@ msgid "Click to register your SSL client certificate with tt-rss"
 msgstr ""
 
 #: include/localized_schema.php:32
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
@@ -2510,7 +2520,7 @@ msgstr ""
 msgid "Sort headlines by feed date"
 msgstr "Ordena els canals per articles no llegits"
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL de la fulla d'estils personalitzada."
@@ -2536,7 +2546,7 @@ msgstr "Fitxer:"
 msgid "Use less traffic"
 msgstr ""
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 msgid "Mark all articles in %s as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
@@ -2596,7 +2606,7 @@ msgstr "Ouverture de l'aide..."
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 #, fuzzy
 msgid "Update feed"
 msgstr "Actualitza tots els canals"
@@ -2674,69 +2684,69 @@ msgstr "No esteu subscrit a cap canal."
 msgid "Create Filter"
 msgstr "Crea un filtre"
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 #, fuzzy
 msgid "Filter Test Results"
 msgstr "Expression du filtre"
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 msgid "Unsubscribe from %s?"
 msgstr "Us voleu donar de baixa de %s ?"
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 msgid "You can't edit this kind of feed."
 msgstr "No podeu editar aquest tipus de canal."
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Edita el canal"
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 #, fuzzy
 msgid "More Feeds"
 msgstr "Més canals"
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr "No heu seleccionat cap canal."
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Erreurs de mise à jour"
 
-#: js/functions.js:1597 js/prefs.js:1232
+#: js/functions.js:1617 js/prefs.js:1232
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 msgid "No articles are selected."
 msgstr "No hi ha cap article seleccionat."
 
@@ -2929,57 +2939,57 @@ msgstr ""
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 msgid "Label Editor"
 msgstr "Éditeur d'intitulé"
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1807
+#: js/prefs.js:1822
 #, fuzzy
 msgid "Link Instance"
 msgstr "Edita les etiquetes"
 
-#: js/prefs.js:1858
+#: js/prefs.js:1873
 #, fuzzy
 msgid "Edit Instance"
 msgstr "Edita les etiquetes"
 
-#: js/prefs.js:1907
+#: js/prefs.js:1922
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: js/prefs.js:1924 js/prefs.js:1936
+#: js/prefs.js:1939 js/prefs.js:1951
 #, fuzzy
 msgid "No instances are selected."
 msgstr "No heu seleccionat cap filtre."
 
-#: js/prefs.js:1941
+#: js/prefs.js:1956
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Si us plau, seleccioneu només un filtre."
 
-#: js/prefs.js:1976
+#: js/prefs.js:1991
 #, fuzzy
 msgid "Export Data"
 msgstr "Exporta en format OPML"
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
-#: js/prefs.js:2056
+#: js/prefs.js:2071
 #, fuzzy
 msgid "Data Import"
 msgstr "Importeu"
 
-#: js/prefs.js:2091
+#: js/prefs.js:2106
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "S'està subscrivint a un canal..."
@@ -2993,116 +3003,116 @@ msgstr "Marca l'article"
 msgid "Mark all articles as read?"
 msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr "No us podeu donar de baixa de la categoria."
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 msgid "Please select some feed first."
 msgstr "Primerament heu de seleccionar un canal."
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 msgid "You can't rescore this kind of feed."
 msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 msgid "Rescore articles in %s?"
 msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 #, fuzzy
 msgid "New version available!"
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 "Esteu segur que voleu marcar tots els articles visibles de %s com a llegits ?"
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr ""
 "Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
 "llegits?"
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr ""
 "Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr ""
 "Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
 "llegits?"
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Articles marcats"
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 msgid "Mark %d selected articles in %s as read?"
 msgstr ""
 "Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
 "llegits?"
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Edita les etiquetes"
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 msgid "No article is selected."
 msgstr "No hi ha cap article seleccionat."
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 msgid "No articles found to mark"
 msgstr "No s'han trobat articles per a marcar."
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 msgid "Mark %d article(s) as read?"
 msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 #, fuzzy
 msgid "Loading..."
 msgstr "S'està carregant la llista de canals..."
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 #, fuzzy
 msgid "Open original article"
 msgstr "Mostra el contingut original de l'article"
 
-#: js/viewfeed.js:1854
+#: js/viewfeed.js:1863
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Obre l'article en una finestra nova"
 
-#: js/viewfeed.js:1862
+#: js/viewfeed.js:1871
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marca'l com a llegit"
 
-#: js/viewfeed.js:1868
+#: js/viewfeed.js:1877
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marca'l com a llegit"
 
-#: js/viewfeed.js:1914
+#: js/viewfeed.js:1923
 #, fuzzy
 msgid "Remove label"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1947
 #, fuzzy
 msgid "Playing..."
 msgstr "S'està carregant la llista de canals..."
 
-#: js/viewfeed.js:1939
+#: js/viewfeed.js:1948
 #, fuzzy
 msgid "Click to pause"
 msgstr "Feu clic per editar"
@@ -3762,9 +3772,6 @@ msgstr "Feu clic per editar"
 #~ msgstr ""
 #~ "Segur que voleu eliminar tots els articles que no estan marcats a %s ?"
 
-#~ msgid "Published feed URL changed."
-#~ msgstr "L'adreça URL del canal ha canviat."
-
 #~ msgid "Trying to change address..."
 #~ msgstr "S'està intentant canviar l'adreça..."
 
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index ee5c8d38..214c131e 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 ffe03874..65dbf79d 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -1,16 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+# Translators:
+#   <ailbone@gmail.com>, 2012.
+# gothfox <cthulhoo@gmail.com>, 2011.
+# joschi <joschi.studispam@googlemail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 16:39+0400\n"
-"PO-Revision-Date: 2011-04-22 14:45+0000\n"
-"Last-Translator: joschi <joschi.studispam@googlemail.com>\n"
-"Language-Team: German <None>\n"
+"POT-Creation-Date: 2012-03-12 13:59+0400\n"
+"PO-Revision-Date: 2012-03-10 16:51+0000\n"
+"Last-Translator: poitzorg <ailbone@gmail.com>\n"
+"Language-Team: German (http://www.transifex.net/projects/p/tt-rss/language/"
+"de/)\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,7 +85,7 @@ msgstr "Täglich"
 msgid "Weekly"
 msgstr "Wöchentlich"
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr "Standard"
 
@@ -136,7 +140,7 @@ msgstr "Tiny Tiny RSS Datenbank ist auf dem neusten Stand."
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr "Zu Tiny Tiny RSS zurückkehren"
 
@@ -215,9 +219,9 @@ msgstr ""
 "\tBitte überprüfen Sie Ihre Browser Einstellungen."
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
 msgstr "Ladevorgang, bitte warten..."
 
@@ -236,7 +240,7 @@ msgid ""
 "doesn't seem to support it."
 msgstr ""
 "Dieses Programm benötigt XmlHttpRequest um ordnungsgemäß zu funktionieren. "
-"Ihr Browser scheint dies nicht zu unterstüzen."
+"Ihr Browser scheint dies nicht zu unterstützen."
 
 #: errors.php:12
 msgid ""
@@ -244,7 +248,7 @@ msgid ""
 "seem to support them."
 msgstr ""
 "Dieses Programm benötigt Cookies um ordungsgemäß zu funktionieren. Ihr "
-"Browser scheint diese nicht zu unterstüzen."
+"Browser scheint diese nicht zu unterstützen."
 
 #: errors.php:15
 msgid "Backend sanity check failed"
@@ -303,7 +307,7 @@ msgstr ""
 "Konfiguration"
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -359,7 +363,7 @@ msgstr "Aktualisiert"
 msgid "Sort articles"
 msgstr "Artikel sortieren"
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 msgid "Date"
 msgstr "Datum"
 
@@ -371,13 +375,13 @@ msgstr "Titel"
 msgid "Score"
 msgstr "Bewertung"
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr "Aktualisieren"
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
@@ -405,7 +409,7 @@ msgstr "Diesen Feed bearbeiten..."
 msgid "Rescore feed"
 msgstr "Feed neu bewerten"
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
@@ -431,7 +435,7 @@ msgstr "Tagwolke anzeigen..."
 
 #: index.php:195
 msgid "Select by tags..."
-msgstr ""
+msgstr "Artikel nach Tag filtern.."
 
 #: index.php:196
 msgid "Create label..."
@@ -456,24 +460,24 @@ msgid "Setting preference key %s to %s"
 msgstr "Setze Konfigurationsoption %s auf %s"
 
 #: opml.php:112
-#, fuzzy, php-format
+#, php-format
 msgid "Adding label %s"
-msgstr "Label zuweisen"
+msgstr "Füge Label %s hinzu"
 
 #: opml.php:115
 #, php-format
 msgid "Duplicate label: %s"
-msgstr ""
+msgstr "Label %s kopieren."
 
 #: opml.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Adding filter %s"
-msgstr "Filter entfernen %s?"
+msgstr "Füge Filter %s hinzu"
 
 #: opml.php:185
-#, fuzzy, php-format
+#, php-format
 msgid "Duplicate filter %s"
-msgstr "Filter erstellen"
+msgstr "Doppelter Filter %s"
 
 #: opml.php:230
 msgid "is already imported."
@@ -512,11 +516,11 @@ msgid "Exit preferences"
 msgstr "Einstellungen verlassen"
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 msgid "Feeds"
 msgstr "Feeds"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 msgid "Filters"
 msgstr "Filter"
 
@@ -606,7 +610,7 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr "Glückwunsch! Sie haben sich erfolgreich mit Twitter verbunden."
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 msgid "Register"
 msgstr "Registrieren"
 
@@ -636,7 +640,7 @@ msgstr "Aktionen für aktiven Artikel"
 
 #: help/main.php:16
 msgid "Toggle starred"
-msgstr "Umschalten bewertet"
+msgstr "Bewertung umschalten"
 
 #: help/main.php:17
 msgid "Toggle published"
@@ -671,9 +675,8 @@ msgid "Scroll article content"
 msgstr "Artikelinhalt scrollen"
 
 #: help/main.php:25
-#, fuzzy
 msgid "Email article"
-msgstr "Alle Artikel"
+msgstr "Artikel per Email versenden"
 
 #: help/main.php:29 help/prefs.php:30
 msgid "Other actions"
@@ -687,7 +690,7 @@ msgstr "Artikel unter Mauszeiger auswählen"
 msgid "Create label"
 msgstr "Label erstellen"
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr "Filter erstellen"
 
@@ -700,29 +703,24 @@ msgid "Display this help dialog"
 msgstr "Diesen Hilfe-Dialog anzeigen"
 
 #: help/main.php:41
-#, fuzzy
 msgid "Multiple articles actions"
-msgstr "Mehrere Artikel"
+msgstr ""
 
 #: help/main.php:44
-#, fuzzy
 msgid "Select all articles"
-msgstr "Artikel löschen"
+msgstr "Alle Artikel auswählen"
 
 #: help/main.php:45
-#, fuzzy
 msgid "Select unread articles"
-msgstr "Ungelesene Artikel löschen"
+msgstr "Ungelesene Artikel auswählen"
 
 #: help/main.php:46
-#, fuzzy
 msgid "Invert article selection"
-msgstr "Aktionen für aktiven Artikel"
+msgstr "Artikel auswahl umkehren"
 
 #: help/main.php:47
-#, fuzzy
 msgid "Deselect all articles"
-msgstr "Artikel löschen"
+msgstr "Alle Artikel abwählen"
 
 #: help/main.php:50
 msgid "Feed actions"
@@ -732,11 +730,11 @@ msgstr "Feed-Aktionen"
 msgid "Refresh active feed"
 msgstr "Aktiven Feed aktualisieren"
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr "Feed abonnieren"
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 msgid "Edit feed"
 msgstr "Feed bearbeiten"
 
@@ -876,9 +874,8 @@ msgid "Show images in posts"
 msgstr "Keine Bilder in Artikeln anzeigen"
 
 #: mobile/prefs.php:40
-#, fuzzy
 msgid "Hide read articles and feeds"
-msgstr "Gelesene ein-/ausblenden"
+msgstr "Gelesene Artikel und Feeds nicht anzeigen"
 
 #: mobile/prefs.php:45
 msgid "Sort feeds by unread count"
@@ -888,22 +885,21 @@ msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
 msgid "Article not found."
 msgstr "Artikel nicht gefunden."
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr "Hilfe Thema nicht gefunden."
 
 #: classes/dlg.php:26
-#, fuzzy
 msgid "Prepare data"
-msgstr "Speichern"
+msgstr "Bereite Daten vor"
 
 #: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
@@ -912,6 +908,8 @@ msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
 msgstr ""
+"Wenn Label und/oder Filter importiert wurden, müssen die Einstellungen "
+"erneut geladen werden um alle neuen Einstellungen zu sehen."
 
 #: classes/dlg.php:87
 msgid "Create profile"
@@ -921,7 +919,7 @@ msgstr "Profil erstellen"
 msgid "(active)"
 msgstr "(aktiv)"
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 msgid "Default profile"
 msgstr "Standard Profil"
@@ -976,17 +974,17 @@ msgstr ""
 "Blockierung hinweisen. Bitte überprüfen Sie den Prozess des Daemons oder "
 "benachrichtigen Sie den Besitzer des Instanz."
 
-#: classes/dlg.php:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr "Feed"
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 msgid "Feed URL"
 msgstr "Feed URL"
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 msgid "Place in category:"
 msgstr "In Kategorie einordnen:"
 
@@ -994,24 +992,24 @@ msgstr "In Kategorie einordnen:"
 msgid "Available feeds"
 msgstr "Verfügbare Feeds"
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr "Anmelden"
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 msgid "Password"
 msgstr "Passwort"
 
 #: classes/dlg.php:288 classes/dlg.php:1009
 msgid "OAuth will be used automatically for Twitter feeds."
-msgstr ""
+msgstr "OAuth wird automatisch für Twitter Feeds verwendet"
 
 #: classes/dlg.php:296
 msgid "This feed requires authentication."
@@ -1028,14 +1026,14 @@ msgstr "Weitere Feeds"
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr "Suchen"
@@ -1052,8 +1050,8 @@ msgstr "Feed-Archiv"
 msgid "limit:"
 msgstr "Grenzwert:"
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr "Entfernen"
@@ -1086,58 +1084,57 @@ msgstr "Alle Feeds"
 msgid "This feed"
 msgstr "Diesen Feed"
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr "Übereinstimmung"
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr "vorher"
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 msgid "after"
 msgstr "nacher"
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr "Überprüfen"
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr "in Feld"
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "in"
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 msgid "Perform Action"
 msgstr "Aktion ausführen"
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr "mit Parametern:"
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 msgid "Options"
 msgstr "Optionen"
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr "Invertierte Übereinstimmung"
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
-#, fuzzy
+#: classes/dlg.php:539 classes/pref_filters.php:371
 msgid "Apply to category"
-msgstr "In Kategorie einordnen:"
+msgstr "Auf Kategorie anwenden"
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
 msgstr "Test"
 
@@ -1170,8 +1167,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Tags für diesen Artikel (komma-getrennt)"
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Speichern"
@@ -1185,18 +1182,16 @@ msgid "Select item(s) by tags"
 msgstr ""
 
 #: classes/dlg.php:792
-#, fuzzy
 msgid "Match:"
-msgstr "Übereinstimmung"
+msgstr "Suche: "
 
 #: classes/dlg.php:797
 msgid "Which Tags?"
-msgstr ""
+msgstr "Welche Tags?"
 
 #: classes/dlg.php:810
-#, fuzzy
 msgid "Display entries"
-msgstr "Zeige URL an"
+msgstr "Einträge anzeigen"
 
 #: classes/dlg.php:822 classes/feeds.php:152
 msgid "View as RSS"
@@ -1235,7 +1230,7 @@ msgstr ""
 msgid "Instance"
 msgstr "Instanz"
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL:"
@@ -1273,21 +1268,22 @@ msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 "\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
+"Datei konnte nicht hochgeladen werden. Bitte upload_max_filesize \n"
+"in PHP.ini anpassen. (Aktueller Wert = %s)"
 
 #: classes/dlg.php:986
 msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
+msgstr "Einen gültigen RSS Feed pro Zeile hinzufügen (Keine Feederkennung)"
 
 #: classes/dlg.php:995
 msgid "Feeds to subscribe, One per line"
-msgstr ""
+msgstr "Zu abonierende Feeds, Einen pro Zeile"
 
 #: classes/dlg.php:1018
-#, fuzzy
 msgid "Feeds require authentication."
-msgstr "Dieser Feed benötigt eine Authentifizierung."
+msgstr "Feeds benötigen Anmeldung."
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 msgid "Visit the website"
 msgstr "Offizielle Website besuchen"
 
@@ -1299,8 +1295,8 @@ msgstr "Als RSS-Feed anzeigen"
 msgid "Select:"
 msgstr "Auswahl:"
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr "Alle"
@@ -1309,8 +1305,8 @@ msgstr "Alle"
 msgid "Invert"
 msgstr "Invertieren"
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr "Keine"
@@ -1351,22 +1347,21 @@ msgstr "Feed nicht gefunden."
 msgid "mark as read"
 msgstr "als gelesen markieren"
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 msgid "Originally from:"
 msgstr "Original von:"
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 msgid "Edit tags for this article"
 msgstr "Tags für diesen Artikel bearbeiten"
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 msgid "Open article in new tab"
 msgstr "Artikel in neuem Reiter öffnen"
 
-#: classes/feeds.php:723 include/functions.php:3350
-#, fuzzy
+#: classes/feeds.php:723 include/functions.php:3380
 msgid "Close article"
-msgstr "Artikel löschen"
+msgstr "Artikel schließen"
 
 #: classes/feeds.php:744
 msgid "No unread articles found to display."
@@ -1392,18 +1387,18 @@ msgstr ""
 msgid "No articles found to display."
 msgstr "Keine Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Feeds zuletzt aktualisiert am %s"
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 msgid "Some feeds have update errors (click for details)"
 msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr "Unkategorisiert"
 
@@ -1439,25 +1434,25 @@ msgstr "Artikelnotizen bearbeiten"
 msgid "Check to enable field"
 msgstr "Ankreuzen um das Feld zu aktivieren"
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
-#, fuzzy, php-format
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
+#, php-format
 msgid "(%d feeds)"
-msgstr "Feeds"
+msgstr "(%d) Feeds"
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 msgid "Feed Title"
 msgstr "Feed-Titel"
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr "verwende"
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr "Artikel löschen:"
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -1465,205 +1460,207 @@ msgstr ""
 "<b>Hinweise:</b> Sie müssen Ihre Login-Informationen eingeben, wenn Ihr Feed "
 "eine Authentifizierung erfordert (außer Twitter-Feeds)."
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 msgid "Hide from Popular feeds"
 msgstr "Auf meiner Feedliste verbergen"
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr "Rechts-nach-links Inhalt"
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr "In E-Mail-Zusammenfassung aufnehmen"
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr "Angehängte Bilder immer anzeigen"
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr "Bilder lokal zwischenspeichern"
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 msgid "Mark updated articles as unread"
 msgstr "Alle Artikel als ungelesen markieren"
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
 msgstr "Artikel als aktualisiert markieren bei Inhaltsänderung"
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 msgid "Icon"
 msgstr "Icon"
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr "Ersetze"
 
-#: classes/pref_feeds.php:518
+#: classes/pref_feeds.php:524
 msgid "Resubscribe to push updates"
 msgstr "Abonnierte Feeds:"
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "PubSubHubbub-Abonnementstatus für push-enabled Feeds zurücksetzen"
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr "Alle fertig."
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> abonniert."
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b> bereits abonniert."
 
-#: classes/pref_feeds.php:1017
-#, fuzzy, php-format
+#: classes/pref_feeds.php:1024
+#, php-format
 msgid "No feeds found in <b>%s</b>."
-msgstr "Keine Feeds gefunden."
+msgstr "Keine Feeds in <b>%s</b> gefunden."
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> bereits abonniert."
 
-#: classes/pref_feeds.php:1028
+#: classes/pref_feeds.php:1030
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "Keine Feeds gefunden."
+
+#: classes/pref_feeds.php:1035
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 "Konnte <b>%s</b> nicht abonnieren.<br>Kann die Feed-URL nicht herunterladen."
 
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1057
 msgid "Subscribe to selected feed"
-msgstr "Ausgewählte Feed abonnieren"
+msgstr "Ausgewählte Feeds abonnieren"
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
 msgstr "Abonnementoptionen bearbeiten"
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Kategorie <b>$%s</b> existiert bereits in der Datenbank."
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr "Kategorie erstellen"
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr "Keine Feedkategorien definiert."
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 msgid "Remove selected categories"
 msgstr "Ausgewählte Kategorien entfernen?"
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 msgid "Feeds with errors"
 msgstr "Feeds mit Fehlern"
 
-#: classes/pref_feeds.php:1280
+#: classes/pref_feeds.php:1287
 msgid "Inactive feeds"
 msgstr "Inaktive Feed"
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 msgid "Select"
 msgstr "Auswahl"
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 msgid "Edit selected feeds"
 msgstr "Bearbeite gewählten Feed..."
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 msgid "Reset sort order"
 msgstr "Sortierreihenfolge zurücksetzen"
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
-#, fuzzy
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 msgid "Batch subscribe"
-msgstr "Abbestellen"
+msgstr "Mehrere Feeds abonnieren"
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 msgid "Categories"
 msgstr "Kategorien"
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
 msgstr "Kategorien bearbeiten"
 
-#: classes/pref_feeds.php:1345
+#: classes/pref_feeds.php:1338
+#, fuzzy
+msgid "(Un)hide empty categories"
+msgstr "Kategorien bearbeiten"
+
+#: classes/pref_feeds.php:1354
 msgid "More actions..."
 msgstr "Mehr Aktionen..."
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr "Manuelle Säuberung"
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 msgid "Clear feed data"
 msgstr "Feed-Daten löschen"
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 msgid "Rescore articles"
 msgstr "Artikel neu bewerten"
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 "<b>Hinweis</b>: Sie können Feeds und Kategorien mit der Maus herumziehen."
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
-msgstr ""
+msgstr "Import und Export"
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref_feeds.php:1408
-#, fuzzy
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
-"Mit OPML können Sie Ihre Feeds und Tiny Tiny RSS Einstellungen im- und "
-"exportieren."
+"Über OPML können Feeds, Filter, Label und Tiny Tiny RSS Einstellungen "
+"importiert und export werden."
 
-#: classes/pref_feeds.php:1410
-#, fuzzy
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-"Hinweis: Nur das Haupteinstellungsprofil kann mit OPML migriert werden."
+msgstr "Nur das Hauptprofil kann mit OPML gesichert werden."
 
-#: classes/pref_feeds.php:1423
-#, fuzzy
+#: classes/pref_feeds.php:1432
 msgid "Import my OPML"
-msgstr "Importiere OPML..."
+msgstr "OPML importieren"
 
-#: classes/pref_feeds.php:1427
-#, fuzzy
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
-msgstr "Vollständiger Name"
+msgstr "Dateiname"
 
-#: classes/pref_feeds.php:1429
-#, fuzzy
+#: classes/pref_feeds.php:1438
 msgid "Include settings"
-msgstr "In E-Mail-Zusammenfassung aufnehmen"
+msgstr "Einstellungen hinzufügen"
 
-#: classes/pref_feeds.php:1433
-#, fuzzy
+#: classes/pref_feeds.php:1442
 msgid "Export OPML"
 msgstr "OPML exportieren"
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
@@ -1671,46 +1668,42 @@ msgstr ""
 "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
 "können von jedem abonniert werden, der die folgende URL kennt."
 
-#: classes/pref_feeds.php:1439
-#, fuzzy
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
-"Hinweis: Veröffentlichte Artikel enthalten weder Ihre Tiny Tiny RSS "
-"Einstellungen, noch Feeds welche eine Authentifizierung benötigen oder von "
-"der Feedliste versteckte Feeds."
+"Eine öffentliche OPMl enthält keine Tiny Tiny RSS Einstellungen, Feeds die "
+"eine Anmeldung benötigen oder Feeds die nicht in den Favoriten enthalten "
+"sind."
 
-#: classes/pref_feeds.php:1442
-#, fuzzy
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
-msgstr "Öffentliche OPML-URL"
+msgstr "Zeige öffentliche OPML URL an."
 
-#: classes/pref_feeds.php:1445
-#, fuzzy
+#: classes/pref_feeds.php:1454
 msgid "Article archive"
-msgstr "Artikeldatum"
+msgstr "Artikelarchiv"
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
-#, fuzzy
+#: classes/pref_feeds.php:1459
 msgid "Export my data"
-msgstr "OPML exportieren"
+msgstr "Meine Daten exportieren"
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr "Importieren"
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 msgid "Firefox integration"
 msgstr "Firefox Integration"
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1718,15 +1711,15 @@ msgstr ""
 "Tiny Tiny RSS kann durch den folgenden Link als Feedreader für Firefox "
 "verwendet werden."
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr "Diese Website als Feedreader registrieren."
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr "Mit Bookmarklet abonnieren"
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
@@ -1735,25 +1728,24 @@ msgstr ""
 "dem Sie interessiert sind in Ihren Browser und klicken auf den Link, um ihn "
 "zu abonnieren."
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "%s in Tiny Tiny RSS abonnieren?"
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Abonnieren in Tiny Tiny RSS"
 
-#: classes/pref_feeds.php:1503
-#, fuzzy
+#: classes/pref_feeds.php:1512
 msgid "Published & shared articles / Generated feeds"
-msgstr "Veröffentlichte Artikel und erzeugte Feeds"
+msgstr "Veröffentlichte & gesendete Artikel / erzeugte Feeds"
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 msgid "Published articles and generated feeds"
 msgstr "Veröffentlichte Artikel und erzeugte Feeds"
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1761,32 +1753,31 @@ msgstr ""
 "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
 "können von jedem abonniert werden, der die nachstehende URL kennt."
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 msgid "Display URL"
 msgstr "Zeige URL an"
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr "Alle generierten URLs löschen"
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1520
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: classes/pref_feeds.php:1523
-#, fuzzy
-msgid "Unshare all articles"
-msgstr "Artikelbewertung zurücknehmen"
+msgstr "Per URL geteilte Artikel"
 
 #: classes/pref_feeds.php:1529
+msgid "You can disable all articles shared by unique URLs here."
+msgstr "Du kannst alle über URL geteilten Artikel hier deaktivieren."
+
+#: classes/pref_feeds.php:1532
+msgid "Unshare all articles"
+msgstr "Alle veröffentlichten Artikel zurückziehen"
+
+#: classes/pref_feeds.php:1538
 msgid "Twitter"
 msgstr "Twitter"
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
@@ -1794,7 +1785,7 @@ msgstr ""
 "Bevor Sie Ihre Twitter-Feeds aktualisieren können, müssen Sie diese Instanz "
 "von Tiny Tiny RSS bei Twitter registrieren."
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
@@ -1802,28 +1793,32 @@ msgstr ""
 "Sie haben diese Instanz erfolgreich mit Twitter verbunden und sollten nun "
 "auf Ihre Twitter-Feeds zugreifen können."
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr "Mit Twitter registrieren"
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 msgid "Clear stored credentials"
 msgstr "Gespeicherte Zugangsdaten löschen"
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
 msgstr "Artikel, die auf diesen Filter passen: "
 
-#: classes/pref_filters.php:84
+#: classes/pref_filters.php:89
 msgid "No articles matching this filter has been found."
 msgstr "Keine übereinstimmenden Artikel für diesen Filter gefunden."
 
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
+msgstr ""
+
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filter <b>%s</b> erstellt"
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -1903,95 +1898,94 @@ msgstr "Passwort wurde geändert."
 msgid "Old password is incorrect."
 msgstr "Altes Passwort ist falsch."
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr "Die Einstellungen wurden gespeichert."
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Unbekannte Option: %s"
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr "Ihre persönlichen Daten wurden gespeichert."
 
-#: classes/pref_prefs.php:159
-#, fuzzy
+#: classes/pref_prefs.php:168
 msgid "Personal data / Authentication"
-msgstr "Authentifizierung"
+msgstr "Persönliche Daten / Anmeldung"
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 msgid "Access level"
 msgstr "Zugriffsberechtigung"
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 msgid "Save data"
 msgstr "Speichern"
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 msgid "Your password is at default value, please change it."
 msgstr "Sie nutzen das Standard Passwort, bitte ändern Sie es."
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr "Passwort bestätigen"
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr "Thema auswählen"
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr "Personalisieren"
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr "Ja"
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr "Nein"
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
 msgstr "Löschen"
 
-#: classes/pref_prefs.php:468
-#, php-format
-msgid "Current server time: %s"
-msgstr ""
+#: classes/pref_prefs.php:477
+#, fuzzy, php-format
+msgid "Current server time: %s (UTC)"
+msgstr "Aktuelle Serverzeit: %s"
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr "Einstellungen speichern"
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr "Profile verwalten"
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr "Auf Standardwerte zurücksetzen"
 
@@ -2051,13 +2045,11 @@ msgid "User <b>%s</b> already exists."
 msgstr "Benutzer <b>%s</b> existiert bereits."
 
 #: classes/pref_users.php:291
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
 "\t\t\t\t to <b>%s</b>"
-msgstr ""
-"Passwort von Benutzer <b>%s</b>\n"
-"\t\t\t\t\t geändert in <b>%s</b>"
+msgstr "Passwort für Benutzer <b>%s</b> auf <b>%s</b> geändert."
 
 #: classes/pref_users.php:298
 #, php-format
@@ -2088,39 +2080,33 @@ msgstr "Keine Benutzer definiert."
 msgid "No matching users found."
 msgstr "Keine zugehörigen Benutzer gefunden."
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr "Keine Tags"
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 msgid "Your request could not be completed."
 msgstr "Ihre Anfrage konnte nicht bearbeitet werden."
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr "Feed-Aktualisierung wurde eingeplant."
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 msgid "Category update has been scheduled."
 msgstr "Kategorieaktualisierung wurde eingeplant."
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 msgid "Can't update this kind of feed."
 msgstr "Sie können diese Art von Feed nicht aktualisieren."
 
 #: classes/share_button.php:7
-#, fuzzy
 msgid "Share by URL"
-msgstr "Artikel bewerten"
+msgstr "Per URL teilen"
 
 #: classes/share_button.php:29
-#, fuzzy
 msgid "You can share this article by the following unique URL:"
-msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
+msgstr "Du kannst diesen Artikel über folgende URL teilen"
 
 #: classes/tweet_button.php:7
 msgid "Share on Twitter"
@@ -2138,64 +2124,63 @@ msgstr "Falscher Benutzername oder Passwort"
 msgid "Archived articles"
 msgstr "Bewertete Artikel"
 
-#: include/functions.php:3158 js/viewfeed.js:1945
+#: include/functions.php:3188 js/viewfeed.js:1954
 msgid "Click to play"
 msgstr "Zum Abspielen klicken"
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
 msgstr "Abspielen"
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:4104
+#: include/functions.php:4134
 msgid "(edit note)"
 msgstr "(Notiz bearbeiten)"
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr "Kein Feed ausgewählt."
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 msgid "unknown type"
 msgstr "unbekannter Typ"
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr "Anhang:"
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 msgid "Attachments:"
 msgstr "Anhänge:"
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, php-format
 msgid "%d archived articles"
 msgstr "%d archivierte Artikel"
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 msgid "No feeds found."
 msgstr "Keine Feeds gefunden."
 
-#: include/functions.php:5241
-#, fuzzy
+#: include/functions.php:5287
 msgid "Could not import: incorrect schema version."
-msgstr "Konnte die notwendige Schema Datei nicht finden, benötige Version:"
+msgstr "Import fehlgeschlagen: Falsche Schemaversion"
 
-#: include/functions.php:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
-msgstr ""
+msgstr "Import fehlgeschlagen: Unbekanntes Format"
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr ""
+msgstr "Fertig: %d Artikel bearbeitet, %d importiert, %d Feeds erstellt."
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
-msgstr ""
+msgstr "Konnte XML-Datei nicht laden."
 
 #: include/localized_schema.php:4
 msgid "Title or Content"
@@ -2226,25 +2211,25 @@ msgstr "Artikel veröffentlichen"
 msgid "Assign tags"
 msgstr "Tags zuweisen"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr "Label zuweisen"
 
 #: include/localized_schema.php:15
 msgid "Modify score"
-msgstr ""
+msgstr "Bewertung ändern"
 
 #: include/localized_schema.php:17
 msgid "General"
-msgstr ""
+msgstr "Allgemeines"
 
 #: include/localized_schema.php:18
 msgid "Interface"
-msgstr ""
+msgstr "Oberfläche"
 
 #: include/localized_schema.php:19
 msgid "Advanced"
-msgstr ""
+msgstr "Erweiterte Einstellungen"
 
 #: include/localized_schema.php:21
 msgid ""
@@ -2252,16 +2237,16 @@ msgid ""
 "with partially colliding userbase. When disabled, it forces same posts from "
 "different feeds to appear only once."
 msgstr ""
-"Diese Option dient zum Lesen mehrerer planet-artiger Aggregatoren mit "
-"teilweise überdeckender Userbase. Ist diese Option deaktiviert, werden die "
-"selben Nachrichten von unterschiedlichen Feeds nur einmal erscheinen."
+"Diese Option dient zum Lesen mehrerer ähnlicher Feeds mit teilweise gleichen "
+"Artikeln. Ist diese Option deaktiviert, werden die selben Artikel von "
+"unterschiedlichen Feeds nur einmal erscheinen."
 
 #: include/localized_schema.php:22
 msgid ""
 "Display expanded list of feed articles, instead of separate displays for "
 "headlines and article content"
 msgstr ""
-"Erweiterte Anzeigeliste für Feedartikel, anstelle von separater Anzeige für "
+"Erweiterte Anzeigeliste für Artikel, anstatt einzelne Fenster für "
 "Schlagzeilen und Artikelinhalt"
 
 #: include/localized_schema.php:23
@@ -2325,7 +2310,7 @@ msgstr "Klicken um Ihr SSL Clientzertifikat bei tt-rss zu registrieren"
 
 #: include/localized_schema.php:32
 #, fuzzy
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr "Zeitzone des Benutzers"
 
 #: include/localized_schema.php:33
@@ -2440,7 +2425,7 @@ msgstr "Zeitzone des Benutzers"
 msgid "Sort headlines by feed date"
 msgstr "Feeds nach Feed-Datum sortieren"
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 msgid "Customize stylesheet"
 msgstr "Benutzer Stylesheet"
 
@@ -2450,7 +2435,7 @@ msgstr "Mit SSL-Zertifikat anmelden"
 
 #: include/localized_schema.php:63
 msgid "Try to send digests around specified time"
-msgstr ""
+msgstr "Zusammenfassungen zu einer bestimmten Uhrzeit zu senden"
 
 #: include/login_form.php:139
 msgid "Language:"
@@ -2464,7 +2449,7 @@ msgstr "Profil:"
 msgid "Use less traffic"
 msgstr "Weniger Datenverkehr nutzen"
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 msgid "Mark all articles in %s as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
 
@@ -2485,9 +2470,8 @@ msgid "Unpublish article"
 msgstr "Artikelveröffentlichung widerrufen"
 
 #: js/digest.js:265
-#, fuzzy
 msgid "Original article"
-msgstr "Originalartikel öffnen"
+msgstr "Originalartikel"
 
 #: js/digest.js:267
 msgid "Close this panel"
@@ -2517,7 +2501,7 @@ msgstr "Gehe zu..."
 msgid "New articles available in this feed (click to show)"
 msgstr "Neue Artikel verfügbar (klicken zum anzeigen)"
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 msgid "Update feed"
 msgstr "Alle Feeds aktualisieren"
 
@@ -2590,11 +2574,11 @@ msgstr "Sie haben diesen Feed bereits abonniert."
 msgid "Create Filter"
 msgstr "Filter erstellen"
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 msgid "Filter Test Results"
 msgstr "Filtertestergebnis"
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
@@ -2602,37 +2586,37 @@ msgstr ""
 "Abonnement zurücksetzen? Tiny Tiny RSS wird versuchen, sich bei der nächsten "
 "Feed-Aktualisierung erneut beim Benachrichtigungs-Hub anzumelden."
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 msgid "Unsubscribe from %s?"
 msgstr "%s abbestellen?"
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 msgid "Please enter category title:"
 msgstr "Bitte geben Sie den Kategorietitel ein:"
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr "Neue Veröffentlichungsadresse für diesen Feed erzeugen?"
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 msgid "You can't edit this kind of feed."
 msgstr "Sie können diese Art von Feed nicht bearbeiten."
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 msgid "Edit Feed"
 msgstr "Feed bearbeiten"
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 msgid "More Feeds"
 msgstr "Weitere Feeds"
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr "Keine Feeds ausgewählt."
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2640,17 +2624,17 @@ msgstr ""
 "Die ausgewählten Feeds aus dem Archiv löschen? Feeds mit gespeicherten "
 "Artikeln werden nicht gelöscht"
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 msgid "Feeds with update errors"
 msgstr "Feeds mit Aktualisierungsfehlern"
 
-#: js/functions.js:1597 js/prefs.js:1232
+#: js/functions.js:1617 js/prefs.js:1232
 msgid "Remove selected feeds?"
 msgstr "Ausgewählte Feeds entfernen?"
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 msgid "No articles are selected."
 msgstr "Keine Artikel ausgewählt."
 
@@ -2755,9 +2739,8 @@ msgid "Please choose an OPML file first."
 msgstr "Bitte zuerst eine OPML-Datei auswählen."
 
 #: js/prefs.js:814
-#, fuzzy
 msgid "Please choose the file first."
-msgstr "Bitte zuerst eine OPML-Datei auswählen."
+msgstr "Bitte zuerst die Datei auswählen."
 
 #: js/prefs.js:941
 msgid "Reset to defaults?"
@@ -2824,293 +2807,162 @@ msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Dies wird alle zuvor erstellten Feed-URLs ungültig machen. Fortfahren?"
 
 #: js/prefs.js:1590
-#, fuzzy
 msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr "Dies wird alle zuvor erstellten Feed-URLs ungültig machen. Fortfahren?"
+msgstr "Alle bisher geteilten Artikel URLs werden ungültig Weiter?"
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 msgid "Label Editor"
 msgstr "Label-Editor"
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Dies wird Ihre gespeicherten Authentifizierungsinformationen für Twitter "
 "löschen. Fortfahren?"
 
-#: js/prefs.js:1807
+#: js/prefs.js:1822
 msgid "Link Instance"
 msgstr "Instanz verbinden"
 
-#: js/prefs.js:1858
+#: js/prefs.js:1873
 msgid "Edit Instance"
 msgstr "Instanz bearbeiten"
 
-#: js/prefs.js:1907
+#: js/prefs.js:1922
 msgid "Remove selected instances?"
 msgstr "Ausgewählte Instanzen entfernen?"
 
-#: js/prefs.js:1924 js/prefs.js:1936
+#: js/prefs.js:1939 js/prefs.js:1951
 msgid "No instances are selected."
 msgstr "Keine Instanzen ausgewählt."
 
-#: js/prefs.js:1941
+#: js/prefs.js:1956
 msgid "Please select only one instance."
 msgstr "Bitte nur eine Instanz auswählen."
 
-#: js/prefs.js:1976
-#, fuzzy
+#: js/prefs.js:1991
 msgid "Export Data"
-msgstr "OPML exportieren"
+msgstr "Daten exportieren"
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
+"Fertig, %d Artikel exportiert. <a class='visibleLink' href='%u'>Hier</a> "
+"herunterladen."
 
-#: js/prefs.js:2056
-#, fuzzy
+#: js/prefs.js:2071
 msgid "Data Import"
-msgstr "Importieren"
+msgstr "Daten importieren"
 
-#: js/prefs.js:2091
-#, fuzzy
+#: js/prefs.js:2106
 msgid "Subscribing to feeds..."
-msgstr "Abonniere Feed..."
+msgstr "Abonniere Feeds..."
 
 #: js/share_button.js:10
-#, fuzzy
 msgid "Share article by URL"
-msgstr "Artikel bewerten"
+msgstr "Artikel über URL teilen"
 
 #: js/tt-rss.js:146
 msgid "Mark all articles as read?"
 msgstr "Alle Artikel als gelesen markieren?"
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr "Sie können die Kategorie nicht abbestellen."
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 msgid "Please select some feed first."
 msgstr "Bitte erst einen Feed auswählen."
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 msgid "You can't rescore this kind of feed."
 msgstr "Sie können diese Art von Feed nicht neu bewerten."
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 msgid "Rescore articles in %s?"
 msgstr "Artikel in %s neu bewerten?"
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 msgid "New version available!"
 msgstr "Neue Version verfügbar!"
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 msgid "Mark all visible articles in %s as read?"
 msgstr "Alle sichtbaren Artikel in %s als gelesen markieren?"
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 msgid "Delete %d selected articles in %s?"
 msgstr "%d ausgewählte Artikel in %s löschen?"
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 msgid "Delete %d selected articles?"
 msgstr "%d ausgewählte Artikel löschen?"
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 msgid "Archive %d selected articles in %s?"
 msgstr "%d ausgewählte Artikel in %s archivieren?"
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 msgid "Move %d archived articles back?"
 msgstr "%d archivierte Artikel zurück verschieben"
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 msgid "Mark %d selected articles in %s as read?"
 msgstr "%d ausgewählte Artikel in %s als gelesen markieren?"
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 msgid "Edit article Tags"
 msgstr "Artikel-Tags bearbeiten"
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 msgid "No article is selected."
 msgstr "Kein Artikel ausgewählt."
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 msgid "No articles found to mark"
 msgstr "Keine Artikel zum markieren gefunden."
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 msgid "Mark %d article(s) as read?"
 msgstr "%d Artikel als gelesen markieren?"
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 msgid "Loading..."
 msgstr "Lade..."
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 msgid "Open original article"
 msgstr "Originalartikel öffnen"
 
-#: js/viewfeed.js:1854
+#: js/viewfeed.js:1863
 msgid "View in a tt-rss tab"
 msgstr "Artikel in neuem Reiter öffnen"
 
-#: js/viewfeed.js:1862
-#, fuzzy
+#: js/viewfeed.js:1871
 msgid "Mark above as read"
-msgstr "Als gelesen markieren"
+msgstr "Obrige als gelesen markieren"
 
-#: js/viewfeed.js:1868
-#, fuzzy
+#: js/viewfeed.js:1877
 msgid "Mark below as read"
-msgstr "Als gelesen markieren"
+msgstr "Untere als gelesen markieren"
 
-#: js/viewfeed.js:1914
+#: js/viewfeed.js:1923
 msgid "Remove label"
 msgstr "Ausgewähltes Label entfernen?"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1947
 msgid "Playing..."
 msgstr "Abspielen..."
 
-#: js/viewfeed.js:1939
+#: js/viewfeed.js:1948
 msgid "Click to pause"
 msgstr "Zum Pausieren klicken"
 
-#~ msgid "Personal data"
-#~ msgstr "Persönliche Daten"
+#~ msgid "Read it later"
+#~ msgstr "Read it later"
 
-#~ msgid "About..."
-#~ msgstr "Über..."
-
-#~ msgid "Help"
-#~ msgstr "Hilfe"
-
-#~ msgid "Importing using DOMXML."
-#~ msgstr "Importiere OPML (verwende DOMXML Erweiterung)..."
-
-#~ msgid "Importing using DOMDocument."
-#~ msgstr "Importiere OPML (verwende DOMDocument Erweiterung)..."
-
-#~ msgid ""
-#~ "DOMXML extension is not found. It is required for PHP versions below 5."
-#~ msgstr ""
-#~ "Die DOMXML Erweiterung wurde nicht gefunden. Sie wird benötigt für PHP "
-#~ "vor Version 5."
-
-#~ msgid "Cache images locally (SimplePie only)"
-#~ msgstr "Bilder lokal zwischenspeichern (nur SimplePie)"
-
-#~ msgid ""
-#~ "Using OPML you can export and import your feeds and Tiny Tiny RSS "
-#~ "settings."
-#~ msgstr ""
-#~ "Mit OPML können Sie Ihre Feeds und Tiny Tiny RSS Einstellungen im- und "
-#~ "exportieren."
-
-#~ msgid "Note: Only main settings profile can be migrated using OPML."
-#~ msgstr ""
-#~ "Hinweis: Nur das Haupteinstellungsprofil kann mit OPML migriert werden."
-
-#, fuzzy
-#~ msgid "Publish"
-#~ msgstr "Veröffentlicht"
-
-#~ msgid ""
-#~ "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-#~ "that require authentication or feeds hidden from Popular feeds."
-#~ msgstr ""
-#~ "Hinweis: Veröffentlichte Artikel enthalten weder Ihre Tiny Tiny RSS "
-#~ "Einstellungen, noch Feeds welche eine Authentifizierung benötigen oder "
-#~ "von der Feedliste versteckte Feeds."
-
-#~ msgid "Changed password of user <b>%s</b>."
-#~ msgstr "Passwort von Benutzer <b>%s</b> geändert."
-
-#~ msgid "Content filtering"
-#~ msgstr "Inhaltsfilterung"
-
-#~ msgid ""
-#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
-#~ "Filtering is done once, when new article is imported to the database from "
-#~ "the newsfeed, specified field is matched against regular expression and "
-#~ "some action is taken. Regular expression matching is case-insensitive."
-#~ msgstr ""
-#~ "Tiny Tiny RSS bietet das Filtern (oder Verarbeiten) von Artikeln an. Die "
-#~ "Filterung wird einmalig ausgeführt, wenn der neue Artikel vom Feed in die "
-#~ "Datenbank importiert wird, das angegebene Feld wird mit einem Regulären "
-#~ "Ausdruck verglichen und eine Aktion ausgeführt. Die Regulären Ausdrücke "
-#~ "unterscheiden nicht zwischen Groß- und Kleinschreibung."
-
-#~ msgid ""
-#~ "Supported actions are: filter (do not import) article, mark article as "
-#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
-#~ "globally and for some specific feed."
-#~ msgstr ""
-#~ "Unterstützte Aktionen sind: Artikel filtern (ohne zu importieren), "
-#~ "Artikel als gelesen markieren, als bewertet markieren, Tags zuweisen und "
-#~ "bewerten. Filter können global und für einen einzigen Feed definiert "
-#~ "werden."
-
-#~ msgid ""
-#~ "Multiple and inverse matching are supported. All matching filters are "
-#~ "considered when article is being imported and all actions executed in "
-#~ "sequence. Inverse matching reverts matching result, e.g. filter matching "
-#~ "XYZZY in title with inverse flag will match all articles, except those "
-#~ "containing string XYZZY in title."
-#~ msgstr ""
-#~ "Mehrfach und invertierte Übereinstimmungen werden unterstützt. Alle "
-#~ "übereinstimmenden Filter werden berücksichtigt wenn ein Artikel "
-#~ "importiert wird und alle Aktionen werden nacheinander ausgeführt. "
-#~ "Invertierte Übereinstimmungen kehren das Ergebnis um, z.B. "
-#~ "Filterübereinstimmung XYZZY im Titel mit invert Flag markiert alle "
-#~ "Artikel, außer diejenigen, welche den String XYZZY im Titel haben."
-
-#~ msgid "See also:"
-#~ msgstr "Siehe auch:"
-
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "Kategorie erstellen"
-
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "Label erstellen..."
-
-#~ msgid "Dismiss article"
-#~ msgstr "Artikel abweisen"
-
-#~ msgid "Remove:"
-#~ msgstr "Entfernen:"
-
-#~ msgid "Assign:"
-#~ msgstr "Label zuweisen:"
-
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "In den Sortiermodus für Kategorien wechseln"
-
-#~ msgid "Update all feeds"
-#~ msgstr "Alle Feeds aktualisieren"
-
-#~ msgid "Sort by name or unread count"
-#~ msgstr "Nach Namen oder Anzahl ungelesener Artikel sortieren"
-
-#~ msgid "headlines"
-#~ msgstr "Schlagzeilen"
-
-#~ msgid "You are viewing the digest page. Click to open full version."
-#~ msgstr ""
-#~ "Sie sehen die Zusammenfassungsseite. Klicken Sie darauf, um die "
-#~ "vollständige Version zu öffnen."
-
-#~ msgid "Click to expand article"
-#~ msgstr "Klicken um den Artikel aufzuklappen"
-
-#~ msgid "Unable to load article."
-#~ msgstr "Kann Artikel nicht laden."
+#~ msgid "Uses server timezone"
+#~ msgstr "Zeitzone des Servers wird benutzt"
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index 497e9607..14335bf7 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 f69b37a0..fcd4f07c 100644
--- a/locale/es_ES/LC_MESSAGES/messages.po
+++ b/locale/es_ES/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 16:39+0400\n"
+"POT-Creation-Date: 2012-03-12 13:59+0400\n"
 "PO-Revision-Date: 2009-11-10 00:12+0100\n"
 "Last-Translator: Manuel Gualda Caballero <manuel@utopiaverde.org>\n"
 "Language-Team: Español <manuel@utopiaverde.org>\n"
@@ -78,7 +78,7 @@ msgstr "Diariamente"
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr "Por defecto"
 
@@ -134,7 +134,7 @@ msgstr "La base de datos de Tiny Tiny RSS está actualizada."
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr "Volver a Tiny Tiny RSS"
 
@@ -214,9 +214,9 @@ msgstr ""
 "configuración de su navegador."
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
 msgstr "Cargando. Por favor, espere..."
 
@@ -303,7 +303,7 @@ msgstr ""
 "base de datos y PHP."
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -361,7 +361,7 @@ msgstr "Actualizados"
 msgid "Sort articles"
 msgstr "Marcar el artículo como favorito"
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 msgid "Date"
 msgstr "Fecha"
 
@@ -373,13 +373,13 @@ msgstr "Título"
 msgid "Score"
 msgstr "Puntos"
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr "Actualizar"
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
@@ -407,7 +407,7 @@ msgstr "Editar esta fuente..."
 msgid "Rescore feed"
 msgstr "Reiniciar la puntuación"
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
 
@@ -519,11 +519,11 @@ msgid "Exit preferences"
 msgstr "Salir de las preferencias"
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 msgid "Feeds"
 msgstr "Fuentes"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 msgid "Filters"
 msgstr "Filtros"
 
@@ -613,7 +613,7 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 #, fuzzy
 msgid "Register"
 msgstr "Registrado"
@@ -697,7 +697,7 @@ msgstr "Seleccionar el artículo que esté detrás del cursor del ratón"
 msgid "Create label"
 msgstr "Crear etiqueta"
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr "Crear filtro"
 
@@ -743,11 +743,11 @@ msgstr "Acciones de las fuentes"
 msgid "Refresh active feed"
 msgstr "Actualizar las fuentes activas"
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr "Suscribir a la fuente"
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 msgid "Edit feed"
 msgstr "Editar la fuente"
 
@@ -904,7 +904,7 @@ msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 msgid "Article not found."
 msgstr "Fuente no encontrada."
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr "Tema de ayuda no encontrado."
 
@@ -917,9 +917,9 @@ msgstr "Guardar"
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
@@ -939,7 +939,7 @@ msgstr "Crear filtro"
 msgid "(active)"
 msgstr "Adaptable"
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 #, fuzzy
 msgid "Default profile"
@@ -999,18 +999,18 @@ msgstr ""
 "(rotura, cuelgue,...). Por favor, compruebe el proceso del demonio o avise "
 "al propietario de la instancia."
 
-#: classes/dlg.php:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr "Fuente"
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 #, fuzzy
 msgid "Feed URL"
 msgstr "Fuente"
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 msgid "Place in category:"
 msgstr "Colocar en la categoría:"
 
@@ -1019,18 +1019,18 @@ msgstr "Colocar en la categoría:"
 msgid "Available feeds"
 msgstr "Todas las fuentes"
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 #, fuzzy
 msgid "Password"
 msgstr "Contraseña:"
@@ -1055,14 +1055,14 @@ msgstr "Más fuentes"
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr "Buscar"
@@ -1082,8 +1082,8 @@ msgstr "Acciones de las fuentes"
 msgid "limit:"
 msgstr "Límite:"
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr "Eliminar"
@@ -1116,58 +1116,58 @@ msgstr "Todas las fuentes"
 msgid "This feed"
 msgstr "Esta fuente"
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr "Coincidir"
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr "antes"
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 msgid "after"
 msgstr "después"
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr "Comprobarlo"
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr "en el campo"
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "en"
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 msgid "Perform Action"
 msgstr "Realizar la acción"
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr "con los parámetros:"
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 msgid "Options"
 msgstr "Opciones"
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr "coincidencia inversa"
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
+#: classes/dlg.php:539 classes/pref_filters.php:371
 #, fuzzy
 msgid "Apply to category"
 msgstr "Colocar en la categoría:"
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
 msgstr ""
 
@@ -1203,8 +1203,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetas para este artículo (separadas por comas):"
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Guardar"
@@ -1267,7 +1267,7 @@ msgstr ""
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL:"
@@ -1322,7 +1322,7 @@ msgstr ""
 msgid "Feeds require authentication."
 msgstr "Esta fuente requiere autenticación."
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 #, fuzzy
 msgid "Visit the website"
 msgstr "Visitar el sitio oficial"
@@ -1336,8 +1336,8 @@ msgstr "Ver fuentes"
 msgid "Select:"
 msgstr "Seleccione:"
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr "No"
@@ -1346,8 +1346,8 @@ msgstr "No"
 msgid "Invert"
 msgstr "Invertir"
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr "Ninguno"
@@ -1393,21 +1393,21 @@ msgstr "Fuente no encontrada."
 msgid "mark as read"
 msgstr "marcar como leído"
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 #, fuzzy
 msgid "Originally from:"
 msgstr "Desplegar el contenido original del artículo"
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 msgid "Edit tags for this article"
 msgstr "Editar las etiquetas de este artículo"
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Abrir el artículo en una nueva pestaña o ventana"
 
-#: classes/feeds.php:723 include/functions.php:3350
+#: classes/feeds.php:723 include/functions.php:3380
 #, fuzzy
 msgid "Close article"
 msgstr "Limpiar los artículos"
@@ -1437,19 +1437,19 @@ msgstr ""
 msgid "No articles found to display."
 msgstr "No se han encontrado artículos que desplegar."
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr "Sin clasificar"
 
@@ -1490,234 +1490,244 @@ msgstr "Editar etiquetas"
 msgid "Check to enable field"
 msgstr "Marcar para habilitar el campo"
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Editar la fuente"
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 #, fuzzy
 msgid "Feed Title"
 msgstr "Título"
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr "usando"
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr "Purgando el artículo"
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Ocultar en mi lista de fuentes"
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr "Contenido de derecha a izquierda"
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr "Incluir en el correo recopilatorio"
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr "Desplegar siempre las imágenes adjuntas"
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr "Guardar las imágenes en la memoria caché local"
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "¿Marcar todos los artículos como leídos?"
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 msgid "Icon"
 msgstr ""
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr ""
 
-#: classes/pref_feeds.php:518
+#: classes/pref_feeds.php:524
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Suscrito a las fuentes:"
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr "Hecho."
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Suscrito a <strong>%s</strong>."
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: classes/pref_feeds.php:1017
+#: classes/pref_feeds.php:1024
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "No se han encontrado fuentes."
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: classes/pref_feeds.php:1028
+#: classes/pref_feeds.php:1030
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "La URL de la fuente publicada ha sido cambiada."
+
+#: classes/pref_feeds.php:1035
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1057
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
 msgstr "Editar las opciones de suscripción"
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La categoría <strong>$%s</strong> ya existe en la base de datos."
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr "Crear categoría"
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr "No se han definido categorías de fuentes."
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "¿Eliminar las categorías seleccionadas?"
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de fuente"
 
-#: classes/pref_feeds.php:1280
+#: classes/pref_feeds.php:1287
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Fuente completa"
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 #, fuzzy
 msgid "Select"
 msgstr "Seleccione:"
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Purgando la fuente seleccionada..."
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Redefinir contraseña"
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Cancelar la suscripción"
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 #, fuzzy
 msgid "Categories"
 msgstr "Volver a categorizar"
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
 msgstr "Editar categorías"
 
-#: classes/pref_feeds.php:1345
+#: classes/pref_feeds.php:1338
+#, fuzzy
+msgid "(Un)hide empty categories"
+msgstr "Editar categorías"
+
+#: classes/pref_feeds.php:1354
 #, fuzzy
 msgid "More actions..."
 msgstr "Acciones..."
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr "Purga manual"
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 msgid "Clear feed data"
 msgstr "Limpiar los datos de la fuente"
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 msgid "Rescore articles"
 msgstr "Reiniciar la puntuación de los artículos"
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
 msgstr ""
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref_feeds.php:1408
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref_feeds.php:1410
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref_feeds.php:1423
+#: classes/pref_feeds.php:1432
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importando OPML (usando la extensión DOMXML)..."
 
-#: classes/pref_feeds.php:1427
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref_feeds.php:1429
+#: classes/pref_feeds.php:1438
 #, fuzzy
 msgid "Include settings"
 msgstr "Incluir en el correo recopilatorio"
 
-#: classes/pref_feeds.php:1433
+#: classes/pref_feeds.php:1442
 #, fuzzy
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1727,42 +1737,42 @@ msgstr ""
 "cual podrá suscribirse cualquiera que conozca la URL especificada a "
 "continuación."
 
-#: classes/pref_feeds.php:1439
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1442
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1445
+#: classes/pref_feeds.php:1454
 #, fuzzy
 msgid "Article archive"
 msgstr "Fecha del artículo"
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
+#: classes/pref_feeds.php:1459
 #, fuzzy
 msgid "Export my data"
 msgstr "Exportar OPML"
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr "Importar"
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Integración con Firefox"
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1770,43 +1780,43 @@ msgstr ""
 "Este sitio Tiny tiny RSS puede ser usado como un lector de fuentes de "
 "Firefox si pulsa en el enlace de abajo."
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr "Pulse aquí para registrar este sitio como un lector de fuentes."
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Volver a Tiny Tiny RSS"
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Volver a Tiny Tiny RSS"
 
-#: classes/pref_feeds.php:1503
+#: classes/pref_feeds.php:1512
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr ""
 "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1815,68 +1825,72 @@ msgstr ""
 "cual podrá suscribirse cualquiera que conozca la URL especificada a "
 "continuación."
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1520
+#: classes/pref_feeds.php:1529
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref_feeds.php:1523
+#: classes/pref_feeds.php:1532
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Quitar el artículo de los favoritos"
 
-#: classes/pref_feeds.php:1529
+#: classes/pref_feeds.php:1538
 #, fuzzy
 msgid "Twitter"
 msgstr "Título"
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Limpiar los datos de la fuente"
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: classes/pref_filters.php:84
+#: classes/pref_filters.php:89
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "No se han encontrado filtros coincidentes."
 
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
+msgstr ""
+
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Se ha creado el filtro <strong>%s</strong>"
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
 msgstr "Editar"
@@ -1957,97 +1971,97 @@ msgstr "La contraseña ha sido cambiada."
 msgid "Old password is incorrect."
 msgstr "La contraseña antigua es incorrecta."
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr "La configuración ha sido guardada."
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Opción desconocida: %s"
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref_prefs.php:159
+#: classes/pref_prefs.php:168
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Autenticación"
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr ""
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr "Correo electrónico"
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 msgid "Access level"
 msgstr "Nivel de acceso"
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 #, fuzzy
 msgid "Save data"
 msgstr "Guardar"
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr "Su contraseña tiene el valor por defecto. Por favor, modifíquela."
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr "Antigua contraseña"
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr "Confirme la nueva contraseña"
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr "Seleccionar plantilla"
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr ""
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr "Sí"
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr "No"
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
 msgstr ""
 
-#: classes/pref_prefs.php:468
+#: classes/pref_prefs.php:477
 #, php-format
-msgid "Current server time: %s"
+msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr "Guardar la configuración"
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr ""
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr "Opciones por defecto"
 
@@ -2146,29 +2160,25 @@ msgstr "No se han definido usuarios."
 msgid "No matching users found."
 msgstr "No se han encontrado usuarios coincidentes."
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr "sin etiquetas"
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "Su información de registro está incompleta"
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "La contraseña ha sido cambiada."
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "No puede editar esta clase de fuente."
@@ -2200,65 +2210,65 @@ msgstr "Nombre de usuario o contraseña incorrecta"
 msgid "Archived articles"
 msgstr "Favoritos"
 
-#: include/functions.php:3158 js/viewfeed.js:1945
+#: include/functions.php:3188 js/viewfeed.js:1954
 #, fuzzy
 msgid "Click to play"
 msgstr "Pulse aquí para editar"
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:4104
+#: include/functions.php:4134
 #, fuzzy
 msgid "(edit note)"
 msgstr "editar nota"
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr "No se ha seleccionado ninguna fuente."
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 msgid "unknown type"
 msgstr "tipo desconocido"
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr "Adjunto:"
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 msgid "Attachments:"
 msgstr "Adjuntos:"
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favoritos"
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: include/functions.php:5241
+#: include/functions.php:5287
 #, fuzzy
 msgid "Could not import: incorrect schema version."
 msgstr ""
 "No se puede encontrar el fichero de esquema necesario. Versión necesaria:"
 
-#: include/functions.php:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
 msgstr ""
 
@@ -2292,7 +2302,7 @@ msgstr "Publicar artículo"
 msgid "Assign tags"
 msgstr "Asignar etiquetas"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr "Asignar etiqueta"
 
@@ -2394,7 +2404,7 @@ msgid "Click to register your SSL client certificate with tt-rss"
 msgstr ""
 
 #: include/localized_schema.php:32
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
@@ -2515,7 +2525,7 @@ msgstr ""
 msgid "Sort headlines by feed date"
 msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL de la hoja de estilo del usuario"
@@ -2541,7 +2551,7 @@ msgstr "Fichero:"
 msgid "Use less traffic"
 msgstr ""
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 msgid "Mark all articles in %s as read?"
 msgstr "¿Marcar todos los artículos de %s como leídos?"
 
@@ -2601,7 +2611,7 @@ msgstr "Ir a..."
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 #, fuzzy
 msgid "Update feed"
 msgstr "Actualizar todas las fuentes"
@@ -2679,68 +2689,68 @@ msgstr "No está suscrito a ninguna fuente."
 msgid "Create Filter"
 msgstr "Crear filtro"
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 msgid "Filter Test Results"
 msgstr ""
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 msgid "Unsubscribe from %s?"
 msgstr "¿Cancelar la suscripción a %s?"
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Por favor, introduzca una nota para este artículo:"
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 msgid "You can't edit this kind of feed."
 msgstr "No puede editar esta clase de fuente."
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Editar la fuente"
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 #, fuzzy
 msgid "More Feeds"
 msgstr "Más fuentes"
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr "No se han seleccionado fuentes."
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Editor de fuente"
 
-#: js/functions.js:1597 js/prefs.js:1232
+#: js/functions.js:1617 js/prefs.js:1232
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "¿Eliminar los filtros seleccionados?"
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 msgid "No articles are selected."
 msgstr "No se han seleccionado artículos."
 
@@ -2929,58 +2939,58 @@ msgstr ""
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 #, fuzzy
 msgid "Label Editor"
 msgstr "Editor de fuente"
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1807
+#: js/prefs.js:1822
 #, fuzzy
 msgid "Link Instance"
 msgstr "Editar etiquetas"
 
-#: js/prefs.js:1858
+#: js/prefs.js:1873
 #, fuzzy
 msgid "Edit Instance"
 msgstr "Editar etiquetas"
 
-#: js/prefs.js:1907
+#: js/prefs.js:1922
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "¿Eliminar los filtros seleccionados?"
 
-#: js/prefs.js:1924 js/prefs.js:1936
+#: js/prefs.js:1939 js/prefs.js:1951
 #, fuzzy
 msgid "No instances are selected."
 msgstr "No se han seleccionado filtros."
 
-#: js/prefs.js:1941
+#: js/prefs.js:1956
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Por favor, seleccione un único filtro."
 
-#: js/prefs.js:1976
+#: js/prefs.js:1991
 #, fuzzy
 msgid "Export Data"
 msgstr "Exportar OPML"
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
-#: js/prefs.js:2056
+#: js/prefs.js:2071
 #, fuzzy
 msgid "Data Import"
 msgstr "Importar"
 
-#: js/prefs.js:2091
+#: js/prefs.js:2106
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Suscribiéndose a la fuente..."
@@ -2994,108 +3004,108 @@ msgstr "Marcar el artículo como favorito"
 msgid "Mark all articles as read?"
 msgstr "¿Marcar todos los artículos como leídos?"
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr "No puede cancelar la suscripción a la categoría."
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 msgid "Please select some feed first."
 msgstr "Por favor, seleccione alguna fuente primero."
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 msgid "You can't rescore this kind of feed."
 msgstr "No puede reiniciar la puntuación de esta clase de fuente."
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 msgid "Rescore articles in %s?"
 msgstr "¿Reiniciar la puntuación de los artículos de %s?"
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 #, fuzzy
 msgid "New version available!"
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 msgid "Mark all visible articles in %s as read?"
 msgstr "¿Marcar todos los artículos visibles de %s como leídos?"
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "¿Eliminar de la etiqueta los artículos seleccionados?"
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 msgid "Mark %d selected articles in %s as read?"
 msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Editar etiquetas"
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 msgid "No article is selected."
 msgstr "No se ha seleccionado ningún artículo."
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 msgid "No articles found to mark"
 msgstr "No se han encontrado artículos que marcar"
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 msgid "Mark %d article(s) as read?"
 msgstr "¿Marcar %d artículo(s) como leído(s)?"
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 #, fuzzy
 msgid "Loading..."
 msgstr "Cargando la lista de la fuente..."
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 #, fuzzy
 msgid "Open original article"
 msgstr "Desplegar el contenido original del artículo"
 
-#: js/viewfeed.js:1854
+#: js/viewfeed.js:1863
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Abrir el artículo en una nueva pestaña o ventana"
 
-#: js/viewfeed.js:1862
+#: js/viewfeed.js:1871
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marcar como leído"
 
-#: js/viewfeed.js:1868
+#: js/viewfeed.js:1877
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marcar como leído"
 
-#: js/viewfeed.js:1914
+#: js/viewfeed.js:1923
 #, fuzzy
 msgid "Remove label"
 msgstr "¿Eliminar las etiquetas seleccionadas?"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1947
 #, fuzzy
 msgid "Playing..."
 msgstr "Cargando la lista de la fuente..."
 
-#: js/viewfeed.js:1939
+#: js/viewfeed.js:1948
 #, fuzzy
 msgid "Click to pause"
 msgstr "Pulse aquí para editar"
@@ -3756,9 +3766,6 @@ msgstr "Pulse aquí para editar"
 #~ msgid "Erase all non-starred articles in %s?"
 #~ msgstr "¿Borrar todos los artículos no favoritos de %s?"
 
-#~ msgid "Published feed URL changed."
-#~ msgstr "La URL de la fuente publicada ha sido cambiada."
-
 #~ msgid "Trying to change address..."
 #~ msgstr "Intentando cambiar la dirección..."
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 53a8f552..63fdc0c1 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 930dc154..0d9372fa 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,23 +1,25 @@
-# translation of messages.po to Français
-# Copyright (C) 2009
-# This file is distributed under the same license as the Tiny Tiny RSS package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Thibaut Cousin <informatique@thibaut-cousin.net>, 2007.
-# Ploc, 2009, 2010.
-# Poupoul2 <gilles@coulais.net>, 2010.
+# Translators:
+# gothfox <cthulhoo@gmail.com>, 2011.
+#   <raphael.huck@gmail.com>, 2011.
+# Thomas Jost <schnouki@schnouki.net>, 2011, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: messages\n"
+"Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 16:39+0400\n"
-"PO-Revision-Date: 2007-11-20 23:01+0100\n"
-"Last-Translator: Ploc\n"
-"Language-Team: Français <fr@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2012-03-12 13:59+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/"
+"language/fr_FR/)\n"
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: backend.php:82
 msgid "Use default"
@@ -83,7 +85,7 @@ msgstr "Une fois par jour"
 msgid "Weekly"
 msgstr "Une fois par semaine"
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr "Utiliser la valeur par défaut"
 
@@ -138,7 +140,7 @@ msgstr "La base de données de Tiny Tiny RSS est à jour."
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
 
@@ -190,17 +192,21 @@ msgstr "Terminé. Le schéma est passé de la version <b>%d</b> à <b>%d</b>."
 #: db-updater.php:166
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr ""
+"Votre schéma de base de données provient d'une version plus récente de Tiny "
+"Tiny RSS."
 
 #: db-updater.php:168
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
-msgstr ""
+msgstr "Version du schéma trouvée : <b>%d</b>, requise : <b>%d</b>."
 
 #: db-updater.php:170
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
 msgstr ""
+"Mise à jour du schéma impossible. Veuillez mettre à jour les fichiers de "
+"Tiny Tiny RSS vers une version plus récente et continuer."
 
 #: digest.php:58
 msgid ""
@@ -213,9 +219,9 @@ msgstr ""
 "\t\t\tconfiguration de votre navigateur."
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
 msgstr "Chargement en cours, veuillez patienter..."
 
@@ -289,22 +295,21 @@ msgid "Configuration check failed"
 msgstr "Échec du test de configuration"
 
 #: errors.php:31
-#, fuzzy
 msgid ""
 "Your version of MySQL is not currently supported. Please see\n"
 "\t\tofficial site for more information."
 msgstr ""
-"Votre version de MySQL n'est pas gérée pour le moment. Reportez-vous au \n"
-"\t\tsite officiel pour plus d'informations."
+"Votre version de MySQL n'est actuellement pas supportée. Veuillez\n"
+"\t\tconsulter le site officiel pour plus d'informations."
 
 #: errors.php:36
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
-"Le test d'échappement sql a échoué, vérifier votre base de donnée et votre "
+"Le test d'échappement SQL a échoué, vérifiez votre base de donnée et votre "
 "configuration de PHP."
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr "Configuration"
 
@@ -318,7 +323,7 @@ msgstr "Une nouvelle version de Tiny Tiny RSS est disponible !"
 
 #: index.php:136
 msgid "News"
-msgstr ""
+msgstr "Actualités"
 
 #: index.php:145
 msgid "Collapse feedlist"
@@ -360,7 +365,7 @@ msgstr "Mis à jour"
 msgid "Sort articles"
 msgstr "Classer les articles"
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 msgid "Date"
 msgstr "Date"
 
@@ -372,13 +377,13 @@ msgstr "Titre"
 msgid "Score"
 msgstr "Score"
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr "Mettre à jour"
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
@@ -400,13 +405,13 @@ msgstr "S'abonner au flux..."
 
 #: index.php:186
 msgid "Edit this feed..."
-msgstr "Editer ce flux..."
+msgstr "Modifier ce flux..."
 
 #: index.php:187
 msgid "Rescore feed"
 msgstr "Recalculer le score du flux"
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
@@ -432,7 +437,7 @@ msgstr "Afficher le nuage d'étiquettes"
 
 #: index.php:195
 msgid "Select by tags..."
-msgstr ""
+msgstr "Sélectionner par tags..."
 
 #: index.php:196
 msgid "Create label..."
@@ -457,24 +462,24 @@ msgid "Setting preference key %s to %s"
 msgstr "Paramétrage de la préférence %s à %s"
 
 #: opml.php:112
-#, fuzzy, php-format
+#, php-format
 msgid "Adding label %s"
-msgstr "Assigner l'étiquette"
+msgstr "Ajout de l'étiquette %s"
 
 #: opml.php:115
 #, php-format
 msgid "Duplicate label: %s"
-msgstr ""
+msgstr "Etiquette identique : %s"
 
 #: opml.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Adding filter %s"
-msgstr "Supprimer le filtre %s ?"
+msgstr "Ajout du filtre %s"
 
 #: opml.php:185
-#, fuzzy, php-format
+#, php-format
 msgid "Duplicate filter %s"
-msgstr "Créer un filtre"
+msgstr "Filtre identique : %s"
 
 #: opml.php:230
 msgid "is already imported."
@@ -497,9 +502,8 @@ msgid "OPML Utility"
 msgstr "Outil OPML"
 
 #: opml.php:492
-#, fuzzy
 msgid "Importing OPML..."
-msgstr "Import en utilisant DOMXML."
+msgstr "Import OPML en cours..."
 
 #: opml.php:496
 msgid "Return to preferences"
@@ -514,11 +518,11 @@ msgid "Exit preferences"
 msgstr "Quitter la configuration"
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 msgid "Feeds"
 msgstr "Flux"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 msgid "Filters"
 msgstr "Filtres"
 
@@ -533,9 +537,8 @@ msgid "Users"
 msgstr "Utilisateurs"
 
 #: prefs.php:108
-#, fuzzy
 msgid "Linked"
-msgstr "Lien"
+msgstr "Instances liées"
 
 #: register.php:186 include/login_form.php:164
 msgid "Create new account"
@@ -610,7 +613,7 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr "Félicitation ! Vous vous êtes inscrit via Twitter avec succès."
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 msgid "Register"
 msgstr "S'inscrire"
 
@@ -652,7 +655,7 @@ msgstr "Marquages comme non-lu"
 
 #: help/main.php:19
 msgid "Edit tags"
-msgstr "Editer les tags"
+msgstr "Modifier les tags"
 
 #: help/main.php:20
 msgid "Dismiss selected articles"
@@ -675,9 +678,8 @@ msgid "Scroll article content"
 msgstr "Faire déflier le contenu de l'article"
 
 #: help/main.php:25
-#, fuzzy
 msgid "Email article"
-msgstr "Tous les articles"
+msgstr "Envoyer l'article par e-mail"
 
 #: help/main.php:29 help/prefs.php:30
 msgid "Other actions"
@@ -691,7 +693,7 @@ msgstr "Selectionner l'article sous le curseur de la souris"
 msgid "Create label"
 msgstr "Créer une étiquette"
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr "Créer un filtre"
 
@@ -704,29 +706,24 @@ msgid "Display this help dialog"
 msgstr "Afficher cette aide"
 
 #: help/main.php:41
-#, fuzzy
 msgid "Multiple articles actions"
-msgstr "Articles multiples"
+msgstr "Actions sur plusieurs articles"
 
 #: help/main.php:44
-#, fuzzy
 msgid "Select all articles"
-msgstr "Filtrer l'article"
+msgstr "Sélectionner tous les articles"
 
 #: help/main.php:45
-#, fuzzy
 msgid "Select unread articles"
-msgstr "Purger les articles non lus"
+msgstr "Sélectionner les articles non lus"
 
 #: help/main.php:46
-#, fuzzy
 msgid "Invert article selection"
-msgstr "Activer les actions de l'article"
+msgstr "Inverser la sélection"
 
 #: help/main.php:47
-#, fuzzy
 msgid "Deselect all articles"
-msgstr "Filtrer l'article"
+msgstr "Tout déselectionner"
 
 #: help/main.php:50
 msgid "Feed actions"
@@ -736,13 +733,13 @@ msgstr "Actions sur ce flux"
 msgid "Refresh active feed"
 msgstr "Mettre à jour le flux actif"
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr "S'abonner au flux"
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 msgid "Edit feed"
-msgstr "Editer le flux"
+msgstr "Modifier le flux"
 
 #: help/main.php:57
 msgid "Mark feed as read"
@@ -812,7 +809,7 @@ msgstr "Top 25 des flux"
 
 #: help/prefs.php:24
 msgid "Edit feed categories"
-msgstr "Editer les catégories des flux"
+msgstr "Modifier les catégories des flux"
 
 #: help/prefs.php:27 classes/pref_users.php:385
 msgid "Create user"
@@ -874,16 +871,15 @@ msgstr "Arrêt"
 
 #: mobile/prefs.php:29
 msgid "Browse categories like folders"
-msgstr ""
+msgstr "Parcourir les catégories comme des dossiers"
 
 #: mobile/prefs.php:35
 msgid "Show images in posts"
 msgstr "Afficher les images dans les articles"
 
 #: mobile/prefs.php:40
-#, fuzzy
 msgid "Hide read articles and feeds"
-msgstr "Masquer les flux lus"
+msgstr "Cacher les articles et flux lus"
 
 #: mobile/prefs.php:45
 msgid "Sort feeds by unread count"
@@ -893,22 +889,21 @@ msgstr "Trier les flux par nombre d'articles non lus"
 msgid "Article not found."
 msgstr "Article non trouvé."
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr "Sujet non trouvé dans l'aide."
 
 #: classes/dlg.php:26
-#, fuzzy
 msgid "Prepare data"
-msgstr "Enregistrer les données"
+msgstr ""
 
 #: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
@@ -917,6 +912,8 @@ msgid ""
 "If you have imported labels and/or filters, you might need to reload "
 "preferences to see your new data."
 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:87
 msgid "Create profile"
@@ -926,7 +923,7 @@ msgstr "Création d'un profil"
 msgid "(active)"
 msgstr "(actif)"
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 msgid "Default profile"
 msgstr "Profil par défaut"
@@ -979,17 +976,17 @@ 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:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr "Flux"
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 msgid "Feed URL"
 msgstr "URL du flux"
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 msgid "Place in category:"
 msgstr "Placer dans la catégorie :"
 
@@ -997,24 +994,24 @@ msgstr "Placer dans la catégorie :"
 msgid "Available feeds"
 msgstr "Flux disponibles"
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Identification"
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr "Se connecter"
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 msgid "Password"
 msgstr "Mot de passe"
 
 #: classes/dlg.php:288 classes/dlg.php:1009
 msgid "OAuth will be used automatically for Twitter feeds."
-msgstr ""
+msgstr "OAuth sera utilisé automatiquement pour les flux Twitter."
 
 #: classes/dlg.php:296
 msgid "This feed requires authentication."
@@ -1031,14 +1028,14 @@ msgstr "D'autres flux"
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Annuler"
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr "Rechercher"
@@ -1055,8 +1052,8 @@ msgstr "Archive du flux"
 msgid "limit:"
 msgstr "limite :"
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr "Supprimer"
@@ -1089,81 +1086,79 @@ msgstr "Tous les flux"
 msgid "This feed"
 msgstr "Ce flux"
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr "Correspondance"
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr "avant"
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 msgid "after"
 msgstr "après"
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr "Vérifier"
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr "sur le champ"
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "dans"
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 msgid "Perform Action"
 msgstr "Exécuter l'action"
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr "avec les paramètres :"
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 msgid "Options"
 msgstr "Options"
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr "Activé"
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr "Correspondance inverse"
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
-#, fuzzy
+#: classes/dlg.php:539 classes/pref_filters.php:371
 msgid "Apply to category"
-msgstr "Placer dans la catégorie :"
+msgstr "Appliquer à une catégorie"
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: classes/dlg.php:550
 msgid "Create"
 msgstr "Créer"
 
 #: classes/dlg.php:578
-#, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
-msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs :"
+msgstr ""
+"Les flux suivants n'ont pas été mis à jour depuis 3 mois (par âge "
+"décroissant) :"
 
 #: classes/dlg.php:602 classes/dlg.php:658
-#, fuzzy
 msgid "Click to edit feed"
-msgstr "Cliquer pour éditer"
+msgstr "Cliquez pour modifier le flux"
 
 #: classes/dlg.php:620 classes/dlg.php:678
-#, fuzzy
 msgid "Unsubscribe from selected feeds"
-msgstr "Se désabonner des flux sélectionnés ?"
+msgstr "Se désabonner des flux sélectionnés"
 
 #: classes/dlg.php:631
 msgid "These feeds have not been updated because of errors:"
@@ -1174,8 +1169,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Tags pour cet article (séparés par des virgules) :"
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Enregistrer"
@@ -1186,21 +1181,19 @@ msgstr "Nuage d'étiquettes"
 
 #: classes/dlg.php:789
 msgid "Select item(s) by tags"
-msgstr ""
+msgstr "Sélectionner des éléments par tags"
 
 #: classes/dlg.php:792
-#, fuzzy
 msgid "Match:"
-msgstr "Correspondance"
+msgstr "Correspondance :"
 
 #: classes/dlg.php:797
 msgid "Which Tags?"
-msgstr ""
+msgstr "Quels tags ?"
 
 #: classes/dlg.php:810
-#, fuzzy
 msgid "Display entries"
-msgstr "Afficher l'URL"
+msgstr "Afficher les entrées"
 
 #: classes/dlg.php:822 classes/feeds.php:152
 msgid "View as RSS"
@@ -1237,9 +1230,9 @@ msgstr ""
 
 #: classes/dlg.php:912 classes/pref_instances.php:59
 msgid "Instance"
-msgstr ""
+msgstr "Instance"
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL du flux :"
@@ -1247,32 +1240,28 @@ msgstr "URL du flux :"
 #: classes/dlg.php:921 classes/pref_instances.php:70
 #: classes/pref_instances.php:167
 msgid "Instance URL"
-msgstr ""
+msgstr "URL de l'instance"
 
 #: classes/dlg.php:931 classes/pref_instances.php:81
-#, fuzzy
 msgid "Access key:"
-msgstr "Permissions :"
+msgstr "Clef d'accès :"
 
 #: classes/dlg.php:934 classes/pref_instances.php:84
 #: classes/pref_instances.php:168
-#, fuzzy
 msgid "Access key"
-msgstr "Permissions"
+msgstr "Clef d'accès"
 
 #: classes/dlg.php:938 classes/pref_instances.php:88
 msgid "Use one access key for both linked instances."
-msgstr ""
+msgstr "Utilisez une clef d'accès pour les deux instances liées."
 
 #: classes/dlg.php:946 classes/pref_instances.php:96
-#, fuzzy
 msgid "Generate new key"
-msgstr "Générer une nouvelle URL"
+msgstr "Générer une nouvelle clef"
 
 #: classes/dlg.php:950
-#, fuzzy
 msgid "Create link"
-msgstr "Créer"
+msgstr "Créer un lien"
 
 #: classes/dlg.php:968
 #, php-format
@@ -1280,21 +1269,24 @@ msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 "\t\t\t\tin PHP.ini (current value = %s)"
 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:986
 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:995
 msgid "Feeds to subscribe, One per line"
-msgstr ""
+msgstr "Flux auxquels s'abonner, un par ligne"
 
 #: classes/dlg.php:1018
-#, fuzzy
 msgid "Feeds require authentication."
-msgstr "Ce flux nécessite une identification."
+msgstr ""
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 msgid "Visit the website"
 msgstr "Visiter le site web"
 
@@ -1306,8 +1298,8 @@ msgstr "Voir comme flux RSS"
 msgid "Select:"
 msgstr "Sélectionner :"
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr "Tout"
@@ -1316,8 +1308,8 @@ msgstr "Tout"
 msgid "Invert"
 msgstr "Inverse"
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr "Aucun"
@@ -1358,22 +1350,21 @@ msgstr "Flux non trouvé."
 msgid "mark as read"
 msgstr "marquer comme lu"
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 msgid "Originally from:"
 msgstr "Origine :"
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 msgid "Edit tags for this article"
-msgstr "Editer les tags pour cet article"
+msgstr "Modifier les tags pour cet article"
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 msgid "Open article in new tab"
 msgstr "Ouvrir les articles dans un nouvel onglet"
 
-#: classes/feeds.php:723 include/functions.php:3350
-#, fuzzy
+#: classes/feeds.php:723 include/functions.php:3380
 msgid "Close article"
-msgstr "Filtrer l'article"
+msgstr "Fermer l'article"
 
 #: classes/feeds.php:744
 msgid "No unread articles found to display."
@@ -1392,28 +1383,27 @@ msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
-"Aucun article trouvé à afficher. Vous pouvez assigner des étiquettes aux "
-"articles manuellement (voir les actions du menu ci-dessus) ou utiliser un "
-"filtre."
+"Aucun article à afficher. Vous pouvez assigner des étiquettes aux articles "
+"manuellement (voir les actions du menu ci-dessus) ou utiliser un filtre."
 
 #: classes/feeds.php:756
 msgid "No articles found to display."
 msgstr "Aucun article à afficher"
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Flux mis à jour à %s"
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 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)"
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
@@ -1442,33 +1432,32 @@ msgid "Send e-mail"
 msgstr "Envoyer l'email"
 
 #: classes/note_button.php:7 js/note_button.js:11
-#, fuzzy
 msgid "Edit article note"
-msgstr "Editer les étiquettes de l'article"
+msgstr "Modifier l'annotation de l'article"
 
 #: classes/pref_feeds.php:12
 msgid "Check to enable field"
 msgstr "Cocher pour activer le champ"
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
-#, fuzzy, php-format
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
+#, php-format
 msgid "(%d feeds)"
-msgstr "flux"
+msgstr "(%d flux)"
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 msgid "Feed Title"
 msgstr "Titre du flux"
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr "en utilisant"
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr "Purge des articles :"
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -1476,208 +1465,210 @@ msgstr ""
 "<b>Astuce :</b> vous devez renseigner vos informations d'identification si "
 "le flux nécessite une authentification, sauf pour les flux Twitter."
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 msgid "Hide from Popular feeds"
 msgstr "Masquer dans la liste des flux populaires"
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr "Contenu écrit de droite à gauche"
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr "Toujours afficher les images jointes"
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr "Enregistrer localement les images"
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
-#, fuzzy
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 msgid "Mark updated articles as unread"
-msgstr "Marquer tous les articles comme lus ?"
+msgstr "Marquer les article mis à jour comme non lus"
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
-msgstr ""
+msgstr "Marquer les articles comme mis à jour quand leur contenu change"
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 msgid "Icon"
 msgstr "Icône"
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr "Remplacer"
 
-#: classes/pref_feeds.php:518
-#, fuzzy
+#: classes/pref_feeds.php:524
 msgid "Resubscribe to push updates"
-msgstr "Abonné à %s"
+msgstr "Réinscription aux mises à jour en push"
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
+"Réinitialiser l'état de l'inscription PubSubHubbub pour les flux en mise à "
+"jour push."
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr "Tout est terminé."
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonné à <b>%s</b>."
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Impossible de s'abonner à <b>%s</b>."
 
-#: classes/pref_feeds.php:1017
-#, fuzzy, php-format
+#: classes/pref_feeds.php:1024
+#, php-format
 msgid "No feeds found in <b>%s</b>."
-msgstr "Aucun flux trouvé."
+msgstr "Aucun flux trouvé dans <b>%s</b>."
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Déjà abonné à <b>%s</b>."
 
-#: classes/pref_feeds.php:1028
-#, fuzzy, php-format
-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
-msgstr "Impossible de s'abonner à <b>%s</b>."
-
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1030
 #, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "Aucun flux trouvé."
+
+#: classes/pref_feeds.php:1035
+#, php-format
+msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+msgstr ""
+"Impossible de s'abonner à <b>%s</b>.<br>Impossible de télécharger l'URL du "
+"flux."
+
+#: classes/pref_feeds.php:1057
 msgid "Subscribe to selected feed"
-msgstr "Se désabonner des flux sélectionnés ?"
+msgstr "S'abonner au flux sélectionné"
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
-msgstr "Editer les options d'abonnement"
+msgstr "Modifier les options d'abonnement"
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La catégorie <b>%s</b> existe déjà dans la base de données."
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr "Créer la catégorie"
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr "Aucune catégorie de flux définie."
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 msgid "Remove selected categories"
 msgstr "Supprimer les catégories sélectionnées"
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 msgid "Feeds with errors"
 msgstr "Flux avec des erreurs"
 
-#: classes/pref_feeds.php:1280
-#, fuzzy
+#: classes/pref_feeds.php:1287
 msgid "Inactive feeds"
-msgstr "Mettre à jour le flux actif"
+msgstr "Flux inactifs"
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 msgid "Select"
 msgstr "Sélectionner"
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 msgid "Edit selected feeds"
-msgstr "Editer les flux sélectionnés"
+msgstr "Modifier les flux sélectionnés"
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 msgid "Reset sort order"
 msgstr "Réinitialiser le critère de tri"
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
-#, fuzzy
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 msgid "Batch subscribe"
-msgstr "Se désabonner"
+msgstr "Abonnement par lots"
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 msgid "Categories"
 msgstr "Catégories"
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
-msgstr "Editer les catégories"
+msgstr "Modifier les catégories"
 
-#: classes/pref_feeds.php:1345
+#: classes/pref_feeds.php:1338
+#, fuzzy
+msgid "(Un)hide empty categories"
+msgstr "Modifier les catégories"
+
+#: classes/pref_feeds.php:1354
 msgid "More actions..."
 msgstr "Autres actions..."
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 msgid "Rescore articles"
 msgstr "Recalculer le score des articles"
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr "<b>Astuce :</b> vous pouvez faire glisser les flux et les catagories."
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
-msgstr ""
+msgstr "Importer et exporter"
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref_feeds.php:1408
-#, fuzzy
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
-"En utilisant OPML, vous pouvez exporter et importer vos flux et vos "
-"paramètres de Tiny Tiny RSS."
+"Avec OPML, vous pouvez exporter et importer vos flux, filtrer, étiquettes et "
+"réglages de Tiny Tiny RSS."
 
-#: classes/pref_feeds.php:1410
-#, fuzzy
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
-"Note : seul les paramètres principaux du profil peuvent être migrés en "
-"utilisant OPML."
+"Seul le profil de réglages principal peut être migré en utilisant OPML."
 
-#: classes/pref_feeds.php:1423
-#, fuzzy
+#: classes/pref_feeds.php:1432
 msgid "Import my OPML"
-msgstr "Import en utilisant DOMXML."
+msgstr "Importer mon OPML"
 
-#: classes/pref_feeds.php:1427
-#, fuzzy
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
-msgstr "Nom"
+msgstr "Nom du fichier :"
 
-#: classes/pref_feeds.php:1429
-#, fuzzy
+#: classes/pref_feeds.php:1438
 msgid "Include settings"
-msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
+msgstr "Inclure les paramètres"
 
-#: classes/pref_feeds.php:1433
-#, fuzzy
+#: classes/pref_feeds.php:1442
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
@@ -1685,46 +1676,41 @@ msgstr ""
 "Les articles publiés sont exportés comme un flux RSS public et toute "
 "personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
 
-#: classes/pref_feeds.php:1439
-#, fuzzy
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
-"Note : l'OPML publié n'inclue ni vos paramètres Tiny Tiny RSS, ni les flux "
-"qui requièrent une authentification, ni les flux masqués parmi flux "
-"populaires."
+"Les OPML publiés n'incluent pas vos réglages de Tiny Tiny RSS, les flux qui "
+"nécessitent une authentification, ou les flux cachés des Flux Populaires."
 
-#: classes/pref_feeds.php:1442
-#, fuzzy
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
-msgstr "URL OPML publique"
+msgstr "Afficher l'URL de l'OPML public"
 
-#: classes/pref_feeds.php:1445
-#, fuzzy
+#: classes/pref_feeds.php:1454
 msgid "Article archive"
-msgstr "Date de l'article"
+msgstr ""
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
-#, fuzzy
+#: classes/pref_feeds.php:1459
 msgid "Export my data"
-msgstr "Exporter en OPML"
+msgstr "Exporter mes données"
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr "Importer"
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 msgid "Firefox integration"
 msgstr "Intégration à Firefox"
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1732,15 +1718,15 @@ msgstr ""
 "Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox "
 "en cliquant sur le lien ci-dessous."
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr "Cliquer ici pour enregistrer ce site comme lecteur de flux."
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr "S'abonner via bookmarklet"
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
@@ -1749,25 +1735,24 @@ msgstr ""
 "le flux qui vous intéresse et cliquez sur le lien pour vous abonner à ce "
 "flux."
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "S'abonner à %s dans Tiny Tiny RSS ?"
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "S'abonner dans Tiny Tiny RSS"
 
-#: classes/pref_feeds.php:1503
-#, fuzzy
+#: classes/pref_feeds.php:1512
 msgid "Published & shared articles / Generated feeds"
-msgstr "Articles publiés et flux générés"
+msgstr "Articles publiés et partagés / Flux générés"
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 msgid "Published articles and generated feeds"
 msgstr "Articles publiés et flux générés"
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1775,32 +1760,31 @@ msgstr ""
 "Les articles publiés sont exportés comme un flux RSS public et toute "
 "personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 msgid "Display URL"
 msgstr "Afficher l'URL"
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr "Supprimer toutes les URL générées"
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1520
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: classes/pref_feeds.php:1523
-#, fuzzy
-msgid "Unshare all articles"
-msgstr "Ne plus marquer comme remarquable"
+msgstr "Articles publiés par URL"
 
 #: classes/pref_feeds.php:1529
+msgid "You can disable all articles shared by unique URLs here."
+msgstr "Vous pouvez désactiver tous les articles partagés par URL unique ici."
+
+#: classes/pref_feeds.php:1532
+msgid "Unshare all articles"
+msgstr "Départager tous les articles"
+
+#: classes/pref_feeds.php:1538
 msgid "Twitter"
 msgstr "Twitter"
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
@@ -1808,7 +1792,7 @@ msgstr ""
 "Avant de mettre à jour vos flux Twitter, vous devez enregistrer cette "
 "instance de Tiny Tiny RSS avec Twitter.com."
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
@@ -1816,32 +1800,35 @@ msgstr ""
 "Vous vous êtes inscrit avec succès sur Twitter.com et vous devriez être en "
 "mesure d'accéder à vos flux Twitter."
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr "S'inscrire sur Twitter.com"
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 msgid "Clear stored credentials"
 msgstr "Effacer les données d'authentification stockées"
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
+msgstr "Articles correspondant à ce filtre :"
+
+#: classes/pref_filters.php:89
+msgid "No articles matching this filter has been found."
+msgstr "Aucun article correspondant à ce filtre n'a été trouvé."
+
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
 msgstr ""
 
-#: classes/pref_filters.php:84
-#, fuzzy
-msgid "No articles matching this filter has been found."
-msgstr "Aucun utilisateur correspondant trouvé."
-
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filtre <b>%s</b> créé"
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
-msgstr "Editer"
+msgstr "Modifier"
 
 #: classes/pref_instances.php:13 classes/pref_users.php:6
 msgid "Your access level is insufficient to open this tab."
@@ -1849,26 +1836,27 @@ msgstr "Vous n'avez pas les permissions nécessaires pour ouvrir cet onglet."
 
 #: classes/pref_instances.php:147
 msgid "Link instance"
-msgstr ""
+msgstr "Lier une instance"
 
 #: classes/pref_instances.php:159
 msgid ""
 "You can connect other instances of Tiny Tiny RSS to this one to share "
 "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
 msgstr ""
+"Vous pouvez connecter d'autres instances de Tiny Tiny RSS à celle-ci pour "
+"partager les Flux Populaires. Pour cela utilisez l'URL suivante :"
 
 #: classes/pref_instances.php:169
 msgid "Last connected"
-msgstr ""
+msgstr "Dernière connexion"
 
 #: classes/pref_instances.php:170
-#, fuzzy
 msgid "Stored feeds"
-msgstr "D'autres flux"
+msgstr "Flux stockés"
 
 #: classes/pref_instances.php:188 classes/pref_users.php:460
 msgid "Click to edit"
-msgstr "Cliquer pour éditer"
+msgstr "Cliquer pour modifier"
 
 #: classes/pref_labels.php:22
 msgid "Caption"
@@ -1915,95 +1903,94 @@ msgstr "Le mot de passe a été modifié."
 msgid "Old password is incorrect."
 msgstr "L'ancien mot de passe n'est pas correct."
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr "La configuration a été enregistrée."
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Option inconnue : %s"
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr "Vos données personnelles ont été sauvegardées."
 
-#: classes/pref_prefs.php:159
-#, fuzzy
+#: classes/pref_prefs.php:168
 msgid "Personal data / Authentication"
-msgstr "Identification"
+msgstr "Données personnelles / Authentification"
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr "Nom"
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr "Adresse électronique"
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 msgid "Access level"
 msgstr "Permissions"
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 msgid "Save data"
 msgstr "Enregistrer les données"
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 msgid "Your password is at default value, please change it."
 msgstr "Votre mot de passe est celui par défaut, veuillez le modifier."
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr "Confirmation du mot de passe"
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr "Sélectionner un thème"
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr "Personnaliser"
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr "Oui"
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr "Non"
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
-msgstr ""
+msgstr "Effacer"
 
-#: classes/pref_prefs.php:468
-#, php-format
-msgid "Current server time: %s"
-msgstr ""
+#: classes/pref_prefs.php:477
+#, fuzzy, php-format
+msgid "Current server time: %s (UTC)"
+msgstr "Heure actuelle du serveur : %s"
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr "Enregistrer la configuration"
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr "Gérer les profils"
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr "Revenir aux valeurs par défaut"
 
@@ -2063,13 +2050,11 @@ msgid "User <b>%s</b> already exists."
 msgstr "L'utilisateur <b>%s</b> existe déjà."
 
 #: classes/pref_users.php:291
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
 "\t\t\t\t to <b>%s</b>"
 msgstr ""
-"Mot de passe de l'utilisateur <b>%s</b>\n"
-"\t\t\t\t\tmodifié en <b>%s</b>"
 
 #: classes/pref_users.php:298
 #, php-format
@@ -2100,39 +2085,33 @@ msgstr "Aucun utilisateur défini."
 msgid "No matching users found."
 msgstr "Aucun utilisateur correspondant trouvé."
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr "aucun tag"
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 msgid "Your request could not be completed."
 msgstr "Votre requête ne peut être traitée."
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr "La mise à jour des flux a été planifiée."
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 msgid "Category update has been scheduled."
 msgstr "La mise à jour des catégories a été planifiée."
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 msgid "Can't update this kind of feed."
 msgstr "Impossible de mettre à jour ce type de flux."
 
 #: classes/share_button.php:7
-#, fuzzy
 msgid "Share by URL"
-msgstr "Marquer comme remarquable"
+msgstr "Partager par URL"
 
 #: classes/share_button.php:29
-#, fuzzy
 msgid "You can share this article by the following unique URL:"
-msgstr "Vous pouvez consulter ce flux comme RSS en utilisant l'URL suivante :"
+msgstr "Vous pouvez partager cet article avec l'URL unique suivante :"
 
 #: classes/tweet_button.php:7
 msgid "Share on Twitter"
@@ -2150,66 +2129,63 @@ msgstr "Login ou mot de passe incorrect"
 msgid "Archived articles"
 msgstr "Articles archivés"
 
-#: include/functions.php:3158 js/viewfeed.js:1945
-#, fuzzy
+#: include/functions.php:3188 js/viewfeed.js:1954
 msgid "Click to play"
-msgstr "Cliquer pour éditer"
+msgstr "Cliquez pour lancer la lecture"
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
-msgstr ""
+msgstr "Lecture"
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:4104
-#, fuzzy
+#: include/functions.php:4134
 msgid "(edit note)"
-msgstr "éditer la note"
+msgstr "(modifier l'annotation)"
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 msgid "unknown type"
 msgstr "type inconnu"
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr "Fichier attaché :"
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 msgid "Attachments:"
 msgstr "Fichiers attachés :"
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, php-format
 msgid "%d archived articles"
 msgstr "%d articles archivés"
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 msgid "No feeds found."
 msgstr "Aucun flux trouvé."
 
-#: include/functions.php:5241
-#, fuzzy
+#: include/functions.php:5287
 msgid "Could not import: incorrect schema version."
-msgstr "Impossible de trouver le fichier de schéma, version requise :"
+msgstr "Importation impossible : version du schéma incorrecte."
 
-#: include/functions.php:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
-msgstr ""
+msgstr "Importation impossible : format de document non reconnu."
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr ""
+msgstr "Terminé : %d articles traités, %d importés, %d flux créés."
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
-msgstr ""
+msgstr "Impossible de charger le document XML."
 
 #: include/localized_schema.php:4
 msgid "Title or Content"
@@ -2224,9 +2200,8 @@ msgid "Article Date"
 msgstr "Date de l'article"
 
 #: include/localized_schema.php:9
-#, fuzzy
 msgid "Delete article"
-msgstr "Filtrer l'article"
+msgstr "Supprimer l'article"
 
 #: include/localized_schema.php:11
 msgid "Set starred"
@@ -2241,25 +2216,25 @@ msgstr "Publier l'article"
 msgid "Assign tags"
 msgstr "Assigner des tags"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr "Assigner l'étiquette"
 
 #: include/localized_schema.php:15
 msgid "Modify score"
-msgstr ""
+msgstr "Modifier le score"
 
 #: include/localized_schema.php:17
 msgid "General"
-msgstr ""
+msgstr "Général"
 
 #: include/localized_schema.php:18
 msgid "Interface"
-msgstr ""
+msgstr "Interface"
 
 #: include/localized_schema.php:19
 msgid "Advanced"
-msgstr ""
+msgstr "Avancé"
 
 #: include/localized_schema.php:21
 msgid ""
@@ -2297,14 +2272,12 @@ msgstr ""
 "nouveaux et non lus à l'adresse électronique donnée"
 
 #: include/localized_schema.php:25
-#, fuzzy
 msgid ""
 "This option enables marking articles as read automatically while you scroll "
 "article list."
 msgstr ""
-"Cette option active le marquage automatique des articles comme lus en "
-"affichage combiné (sauf dans le flux virtuel Nouveaux articles) pendant que "
-"vous faites défiler la liste des articles"
+"Cette option permet de marquer automatiquement les articles comme lus "
+"lorsque vous naviguez dans la liste d'articles."
 
 #: include/localized_schema.php:26
 msgid "Strip all but most common HTML tags when reading articles."
@@ -2340,11 +2313,11 @@ msgstr "Personnaliser les feuilles de style CSS"
 
 #: include/localized_schema.php:31
 msgid "Click to register your SSL client certificate with tt-rss"
-msgstr ""
+msgstr "Cliquez pour enregistrer votre certificat client SSL dans tt-rss"
 
 #: include/localized_schema.php:32
 #, fuzzy
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr "Fuseau horaire de l'utilisateur"
 
 #: include/localized_schema.php:33
@@ -2410,9 +2383,8 @@ msgid "Confirm marking feed as read"
 msgstr "Demander confirmation pour marquer un flux comme lu"
 
 #: include/localized_schema.php:48
-#, fuzzy
 msgid "Automatically mark articles as read"
-msgstr "Développer automatiquement les articles en affichage combiné"
+msgstr "Automatiquement marquer les articles comme lus"
 
 #: include/localized_schema.php:49
 msgid "Strip unsafe tags from articles"
@@ -2462,13 +2434,13 @@ msgstr "Fuseau horaire de l'utilisateur"
 msgid "Sort headlines by feed date"
 msgstr "Trier les en-têtes par date de flux"
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 msgid "Customize stylesheet"
 msgstr "Personnaliser la feuille de style"
 
 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
-msgstr ""
+msgstr "Connexion avec un certificat SSL"
 
 #: include/localized_schema.php:63
 msgid "Try to send digests around specified time"
@@ -2486,7 +2458,7 @@ msgstr "Profil :"
 msgid "Use less traffic"
 msgstr "Minimiser l'usage du trafic"
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 msgid "Mark all articles in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
@@ -2507,9 +2479,8 @@ msgid "Unpublish article"
 msgstr "Ne plus publier l'article"
 
 #: js/digest.js:265
-#, fuzzy
 msgid "Original article"
-msgstr "Ouvrir l'article original"
+msgstr "Article original"
 
 #: js/digest.js:267
 msgid "Close this panel"
@@ -2539,7 +2510,7 @@ msgstr "Charger plus..."
 msgid "New articles available in this feed (click to show)"
 msgstr "Nouveaux articles disponible dans ce flux (cliquer pour les afficher)"
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 msgid "Update feed"
 msgstr "Mettre à jour le flux"
 
@@ -2548,11 +2519,13 @@ msgid ""
 "Are you sure to report this exception to tt-rss.org? The report will include "
 "your browser information. Your IP would be saved in the database."
 msgstr ""
+"Êtes-vous sûr de vouloir signaler cette erreur sur tt-rss.org ? Le rapport "
+"incluera des informations sur votre navigateur. Votre adresse IP sera "
+"sauvegardée dans la base de données."
 
 #: js/functions.js:647
-#, fuzzy
 msgid "Date syntax appears to be correct:"
-msgstr "La syntaxe des dates semble correcte."
+msgstr "La syntaxe des dates semble être correcte :"
 
 #: js/functions.js:650
 msgid "Date syntax is incorrect."
@@ -2610,47 +2583,49 @@ msgstr "Vous êtes déjà abonné à ce flux."
 msgid "Create Filter"
 msgstr "Créer un filtre"
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 msgid "Filter Test Results"
-msgstr ""
+msgstr "Résultats du test du filtre"
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
+"Réinitialiser l'inscription ? Tiny Tiny RSS essayera de se réinscrire au hub "
+"de notification lors de la prochaine mise à jour du flux."
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 msgid "Unsubscribe from %s?"
 msgstr "Se désabonner de %s ?"
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 msgid "Please enter category title:"
 msgstr "Veuillez saisir un titre pour cette catégorie :"
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 msgid "You can't edit this kind of feed."
-msgstr "Vous ne pouvez pas éditer ce type de flux."
+msgstr "Vous ne pouvez pas modifier ce type de flux."
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 msgid "Edit Feed"
-msgstr "Editer le flux"
+msgstr "Modifier le flux"
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 msgid "More Feeds"
 msgstr "D'autres flux"
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr "Aucun flux sélectionné."
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2658,18 +2633,17 @@ msgstr ""
 "Supprimer les flux sélectionnés de l'archive ? Les flux contenant des "
 "articles stockés ne seront pas supprimés."
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 msgid "Feeds with update errors"
 msgstr "Flux avec des erreurs de mise à jour"
 
-#: js/functions.js:1597 js/prefs.js:1232
-#, fuzzy
+#: js/functions.js:1617 js/prefs.js:1232
 msgid "Remove selected feeds?"
-msgstr "Supprimer les filtres sélectionnés ?"
+msgstr "Supprimer les flux sélectionnés ?"
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
 
@@ -2691,7 +2665,7 @@ msgstr "Impossible de créer l'utilisateur : aucun login spécifié."
 
 #: js/prefs.js:137
 msgid "Edit Filter"
-msgstr "Editer le filtres"
+msgstr "Modifier le filtre"
 
 #: js/prefs.js:141
 msgid "Remove filter %s?"
@@ -2762,7 +2736,7 @@ msgstr "Veuillez sélectionner un seul filtre."
 
 #: js/prefs.js:655
 msgid "Edit Multiple Feeds"
-msgstr "Editer plusieurs flux"
+msgstr "Modifier plusieurs flux"
 
 #: js/prefs.js:679
 msgid "Save changes to selected feeds?"
@@ -2777,9 +2751,8 @@ msgid "Please choose an OPML file first."
 msgstr "Veuillez d'abord sélectionner un fichier OPML."
 
 #: js/prefs.js:814
-#, fuzzy
 msgid "Please choose the file first."
-msgstr "Veuillez d'abord sélectionner un fichier OPML."
+msgstr "Veuillez d'abord choisir le fichier."
 
 #: js/prefs.js:941
 msgid "Reset to defaults?"
@@ -2798,9 +2771,8 @@ msgid "No categories are selected."
 msgstr "Aucune catégorie sélectionnée."
 
 #: js/prefs.js:1221
-#, fuzzy
 msgid "Feeds without recent updates"
-msgstr "Flux avec des erreurs de mise à jour"
+msgstr "Flux sans mise à jour récente"
 
 #: js/prefs.js:1270
 msgid "Replace current OPML publishing address with a new one?"
@@ -2846,362 +2818,168 @@ msgstr "Veuillez sélectionner un profil à activer"
 #: js/prefs.js:1571
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
-"Cela va invalider toutes les URL de flux générées auparavant. Souhaitez-vous "
+"Ceci va invalider toutes les URL de flux générées auparavant. Souhaitez-vous "
 "continuer ?"
 
 #: js/prefs.js:1590
-#, fuzzy
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
-"Cela va invalider toutes les URL de flux générées auparavant. Souhaitez-vous "
+"Ceci va invalider tous les articles partagés par URL. Souhaitez-vous "
 "continuer ?"
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 msgid "Label Editor"
 msgstr "Editeur d'étiquette"
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Cela va effacer les informations d'authentification pour Twitter. Voulez-"
 "vous continuer ?"
 
-#: js/prefs.js:1807
-#, fuzzy
+#: js/prefs.js:1822
 msgid "Link Instance"
-msgstr "Editer les tags"
+msgstr "Lier l'instance"
 
-#: js/prefs.js:1858
-#, fuzzy
+#: js/prefs.js:1873
 msgid "Edit Instance"
-msgstr "Editer les tags"
+msgstr "Modifier l'instance"
 
-#: js/prefs.js:1907
-#, fuzzy
+#: js/prefs.js:1922
 msgid "Remove selected instances?"
-msgstr "Supprimer les filtres sélectionnés ?"
+msgstr "Supprimer les instances sélectionnées ?"
 
-#: js/prefs.js:1924 js/prefs.js:1936
-#, fuzzy
+#: js/prefs.js:1939 js/prefs.js:1951
 msgid "No instances are selected."
-msgstr "Aucun filtre sélectionné."
+msgstr "Aucune instance sélectionnée."
 
-#: js/prefs.js:1941
-#, fuzzy
+#: js/prefs.js:1956
 msgid "Please select only one instance."
-msgstr "Veuillez sélectionner un seul filtre."
+msgstr "Veuillez ne sélectionner qu'une instance."
 
-#: js/prefs.js:1976
-#, fuzzy
+#: js/prefs.js:1991
 msgid "Export Data"
-msgstr "Exporter en OPML"
+msgstr "Exporer les données"
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
+"Terminé, %d articles exportés. Vous pouvez télécharger les données <a class="
+"\"visibleLink\" href=\"%u\">ici</a>."
 
-#: js/prefs.js:2056
-#, fuzzy
+#: js/prefs.js:2071
 msgid "Data Import"
-msgstr "Importer"
+msgstr ""
 
-#: js/prefs.js:2091
-#, fuzzy
+#: js/prefs.js:2106
 msgid "Subscribing to feeds..."
-msgstr "Abonnement au flux..."
+msgstr "Abonnement aux flux..."
 
 #: js/share_button.js:10
-#, fuzzy
 msgid "Share article by URL"
-msgstr "Marquer comme remarquable"
+msgstr "Partager l'article par URL"
 
 #: js/tt-rss.js:146
 msgid "Mark all articles as read?"
 msgstr "Marquer tous les articles comme lus ?"
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr "Vous ne pouvez pas vous désabonner de la catégorie."
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 msgid "Please select some feed first."
 msgstr "Veuillez d'abord sélectionner un flux."
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 msgid "You can't rescore this kind of feed."
 msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 msgid "Rescore articles in %s?"
 msgstr "Recalculer le score des articles de %s ?"
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 msgid "New version available!"
 msgstr "Une nouvelle version est disponible !"
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marquer tous les articles visibles de %s comme lus ?"
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 msgid "Delete %d selected articles in %s?"
 msgstr "Supprimer les %d articles sélectionnés de %s ?"
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 msgid "Delete %d selected articles?"
 msgstr "Supprimer les %d articles sélectionnés ?"
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 msgid "Archive %d selected articles in %s?"
 msgstr "Archiver les %d articles sélectionnés de %s ?"
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 msgid "Move %d archived articles back?"
 msgstr "Restaurer les articles archivés ?"
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marquer %d articles sélectionnés de %s comme lus ?"
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 msgid "Edit article Tags"
-msgstr "Editer les étiquettes de l'article"
+msgstr "Modifier les étiquettes de l'article"
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 msgid "No article is selected."
 msgstr "Aucun article sélectionné."
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 msgid "No articles found to mark"
 msgstr "Aucun article à marquer"
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 msgid "Mark %d article(s) as read?"
 msgstr "Marquer %d article(s) comme lu(s) ?"
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 msgid "Loading..."
 msgstr "Chargement en cours..."
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 msgid "Open original article"
 msgstr "Ouvrir l'article original"
 
-#: js/viewfeed.js:1854
-#, fuzzy
+#: js/viewfeed.js:1863
 msgid "View in a tt-rss tab"
-msgstr "Voir dans un nouvel onglet"
+msgstr "Voir dans un onglet de tt-rss"
 
-#: js/viewfeed.js:1862
-#, fuzzy
+#: js/viewfeed.js:1871
 msgid "Mark above as read"
-msgstr "Marquer comme lu"
+msgstr "Marquer les articles au-dessus comme lus"
 
-#: js/viewfeed.js:1868
-#, fuzzy
+#: js/viewfeed.js:1877
 msgid "Mark below as read"
-msgstr "Marquer comme lu"
+msgstr "Marquer les articles en-dessous comme lus"
 
-#: js/viewfeed.js:1914
-#, fuzzy
+#: js/viewfeed.js:1923
 msgid "Remove label"
-msgstr "Supprimer les étiquettes sélectionnées ?"
+msgstr "Supprimer l'étiquette"
 
-#: js/viewfeed.js:1938
-#, fuzzy
+#: js/viewfeed.js:1947
 msgid "Playing..."
-msgstr "Chargement en cours..."
+msgstr "Lecture..."
 
-#: js/viewfeed.js:1939
-#, fuzzy
+#: js/viewfeed.js:1948
 msgid "Click to pause"
-msgstr "Cliquer pour éditer"
+msgstr "Cliquez pour mettre en pause"
 
-#~ msgid "Personal data"
-#~ msgstr "Données personnelles"
+#~ msgid "Read it later"
+#~ msgstr "Lire plus tard"
 
-#~ msgid "Help"
-#~ msgstr "Aide"
-
-#~ msgid "Importing using DOMXML."
-#~ msgstr "Import en utilisant DOMXML."
-
-#~ msgid "Importing using DOMDocument."
-#~ msgstr "Import en utilisant DOMDocument."
-
-#~ msgid ""
-#~ "DOMXML extension is not found. It is required for PHP versions below 5."
-#~ msgstr ""
-#~ "Extension DOMXML non trouvée. Cette extension est requise pour les "
-#~ "versions de php inférieures à 5.Extension DOMXML non trouvée. Elle est "
-#~ "nécessaire pour les versions de PHP antérieures à la 5."
-
-#~ msgid "Cache images locally (SimplePie only)"
-#~ msgstr ""
-#~ "Enregistrer les images dans le cache local (seulement avec SimplePie)"
-
-#~ msgid ""
-#~ "Using OPML you can export and import your feeds and Tiny Tiny RSS "
-#~ "settings."
-#~ msgstr ""
-#~ "En utilisant OPML, vous pouvez exporter et importer vos flux et vos "
-#~ "paramètres de Tiny Tiny RSS."
-
-#~ msgid "Note: Only main settings profile can be migrated using OPML."
-#~ msgstr ""
-#~ "Note : seul les paramètres principaux du profil peuvent être migrés en "
-#~ "utilisant OPML."
-
-#, fuzzy
-#~ msgid "Publish"
-#~ msgstr "Publiés"
-
-#~ msgid ""
-#~ "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-#~ "that require authentication or feeds hidden from Popular feeds."
-#~ msgstr ""
-#~ "Note : l'OPML publié n'inclue ni vos paramètres Tiny Tiny RSS, ni les "
-#~ "flux qui requièrent une authentification, ni les flux masqués parmi flux "
-#~ "populaires."
-
-#~ msgid "Changed password of user <b>%s</b>."
-#~ msgstr "Mot de passe de l'utilisateur <b>%s</b> modifié."
-
-#~ msgid "Content filtering"
-#~ msgstr "Filtrage de contenu"
-
-#~ msgid ""
-#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
-#~ "Filtering is done once, when new article is imported to the database from "
-#~ "the newsfeed, specified field is matched against regular expression and "
-#~ "some action is taken. Regular expression matching is case-insensitive."
-#~ msgstr ""
-#~ "Tiny Tiny RSS permet le filtrage (ou le traitement) d'articles. Le "
-#~ "filtrage est effectué une seule foi, lors le nouvel article est importé "
-#~ "en base depuis le flux rss le champ spécifié est comparé à l'expression "
-#~ "régulière et une action est effectuée.La comparaison des expressions "
-#~ "régulières est insensible à la casse."
-
-#~ msgid ""
-#~ "Supported actions are: filter (do not import) article, mark article as "
-#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
-#~ "globally and for some specific feed."
-#~ msgstr ""
-#~ "Les actions possibles sont : filtrer (ne pas importer) l'article, marquer "
-#~ "l'article comme lu, marquer comme remarquable, assigner un ou plusieurs "
-#~ "tags et assigner un score. Les filtres peuvent être définis globalement "
-#~ "ou pour un flux uniquement."
-
-#~ msgid ""
-#~ "Multiple and inverse matching are supported. All matching filters are "
-#~ "considered when article is being imported and all actions executed in "
-#~ "sequence. Inverse matching reverts matching result, e.g. filter matching "
-#~ "XYZZY in title with inverse flag will match all articles, except those "
-#~ "containing string XYZZY in title."
-#~ msgstr ""
-#~ "Les correspondances multiples et inverses sont possibles. Tous les "
-#~ "filtres de correspondance sont activés quand un article est importé et "
-#~ "les actions sont exécutées de manière séquentielle. La correspondance "
-#~ "inverse a pour effet d'inverser le résultat de la correspondance. Par "
-#~ "exemple le filtre de correspondance XYZZY dans le titre avec l'option "
-#~ "d'inversion sélectionnera tous les articles sauf ceux dont le titre "
-#~ "contiendra XYZZY."
-
-#~ msgid "See also:"
-#~ msgstr "Voir également :"
-
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "Créer la catégorie"
-
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "Créer une étiquette..."
-
-#~ msgid "Dismiss article"
-#~ msgstr "Exclure l'article"
-
-#~ msgid "Remove:"
-#~ msgstr "Supprimer :"
-
-#~ msgid "Assign:"
-#~ msgstr "Assigner :"
-
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "Activer le classement selon la catégorie"
-
-#~ msgid "Update all feeds"
-#~ msgstr "Mettre à jour tous les flux"
-
-#~ msgid "Sort by name or unread count"
-#~ msgstr "Trier les flux par nom ou par nombre d'articles non lus"
-
-#~ msgid "headlines"
-#~ msgstr "titres"
-
-#~ msgid "You are viewing the digest page. Click to open full version."
-#~ msgstr ""
-#~ "Vous consultez la page résumée. Cliquez pour ouvrir une version complète."
-
-#~ msgid "Click to expand article"
-#~ msgstr "Cliquer pour développer l'article"
-
-#~ msgid "Unable to load article."
-#~ msgstr "Chargement de l'article impossible."
-
-#~ msgid "Update post on checksum change"
-#~ msgstr "Mettre à jour lors d'un changement du code de contrôle"
-
-#~ msgid "Use more accessible date/time format for headlines"
-#~ msgstr ""
-#~ "Afficher la date et l'heure de manière plus lisible dans les en-têtes"
-
-#~ msgid "Set articles as unread on update"
-#~ msgstr "Marquer les articles comme non lus lors des mises à jour"
-
-#~ msgid "Importing OPML (using DOMXML extension)..."
-#~ msgstr "Importation OPML (utilisant l'extension DOMXML)..."
-
-#~ msgid "Importing OPML (using DOMDocument extension)..."
-#~ msgstr "Importation OPML (utilisation l'extension DOMDocument)..."
-
-#~ msgid "Error: can't find body element."
-#~ msgstr "Erreur : impossible de trouver la balise body."
-
-#~ msgid "No profiles selected."
-#~ msgstr "Aucun profil sélectionné."
-
-#~ msgid "Unknown error"
-#~ msgstr "Erreur inconnue"
-
-#~ msgid ""
-#~ "Could not display feed (query failed). Please check label match syntax or "
-#~ "local configuration."
-#~ msgstr ""
-#~ "Impossible d'afficher le flux (la requête l'a pas abouti). Veuillez "
-#~ "vérifier la syntaxe de l'étiquette de correspondance ou la configuration "
-#~ "locale."
-
-#~ msgid "Mark articles as read automatically"
-#~ msgstr "Marquer les articles comme lus automatiquement"
-
-#~ msgid "Publish article with a note"
-#~ msgstr "Publier l'article avec une note"
-
-#~ msgid "Please enter a note for this article:"
-#~ msgstr "Veuillez saisir une note pour cet article :"
-
-#~ msgid "View article"
-#~ msgstr "Voir l'article"
-
-#~ msgid "Server error while trying to subscribe to specified feed."
-#~ msgstr "Erreur du serveur en essayant de s'abonner au flux spécifié."
-
-#~ msgid "Server error while trying to query feed URLs."
-#~ msgstr "Erreur du serveur en essayant d'interroger l'URL du flux."
-
-#~ msgid "Subscribed to %d feed(s)."
-#~ msgstr "Abonné au(x) flux %d."
+#~ msgid "Uses server timezone"
+#~ msgstr "Utilise le fuseau horaire du serveur"
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 3351b1a1..3659c3b0 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 5974bde7..82ead830 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-01-30 16:39+0400\n"
+"POT-Creation-Date: 2012-03-12 13:59+0400\n"
 "PO-Revision-Date: 2009-08-17 23:04+0100\n"
 "Last-Translator: MoJo2009\n"
 "Language-Team: HUNGARIAN\n"
@@ -82,7 +82,7 @@ msgstr "Napi"
 msgid "Weekly"
 msgstr "Heti"
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -137,7 +137,7 @@ msgstr "A Tiny Tiny RSS adatbázis friss."
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr "Vissza az RSS-olvasóhoz"
 
@@ -213,9 +213,9 @@ msgstr ""
 "\t\tKérem ellenőrizze böngészőbeállításait, és engedélyezze a Javascriptet!"
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
 msgstr "Töltés, kérem várjon..."
 
@@ -295,7 +295,7 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr "Beállítások"
 
@@ -353,7 +353,7 @@ msgstr "Frissített"
 msgid "Sort articles"
 msgstr "Tárolt hírek"
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 msgid "Date"
 msgstr "Dátum"
 
@@ -365,13 +365,13 @@ msgstr "Cím"
 msgid "Score"
 msgstr ""
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr "Frissítés"
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr "Olvasottá tesz"
 
@@ -399,7 +399,7 @@ msgstr "Hírcsatorna szerkesztése..."
 msgid "Rescore feed"
 msgstr ""
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
@@ -511,11 +511,11 @@ msgid "Exit preferences"
 msgstr "Kilépés a beállításokból"
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 msgid "Feeds"
 msgstr "Hírcsatornák"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 msgid "Filters"
 msgstr "Szűrők"
 
@@ -604,7 +604,7 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 #, fuzzy
 msgid "Register"
 msgstr "Regisztrált"
@@ -688,7 +688,7 @@ msgstr "Az egérkurzor alatti hír kiválasztása"
 msgid "Create label"
 msgstr "Címke létrehozása"
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr "Szűrő létrehozása"
 
@@ -734,11 +734,11 @@ msgstr "Hírcsatorna-műveletek"
 msgid "Refresh active feed"
 msgstr "Aktív hírcsatorna frissítése"
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr "Feliratkozás hírcsatornára"
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 msgid "Edit feed"
 msgstr "Hírcsatorna szerkesztése"
 
@@ -893,7 +893,7 @@ msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 msgid "Article not found."
 msgstr "Hírcsatorna nem található"
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr "Súgótéma nem tlálható."
 
@@ -906,9 +906,9 @@ msgstr "Mentés"
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr "Ablak bezárása"
 
@@ -928,7 +928,7 @@ msgstr "Szűrő létrehozása"
 msgid "(active)"
 msgstr "Adaptív"
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 #, fuzzy
 msgid "Default profile"
@@ -986,18 +986,18 @@ msgstr ""
 "összeomlás vagy hiba jele is lehet, kérem lépjen kapcsolatba az oldal/"
 "szerver tulajdonosával!"
 
-#: classes/dlg.php:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr "Hírcsatorna"
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 #, fuzzy
 msgid "Feed URL"
 msgstr "Hírcsatorna"
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 msgid "Place in category:"
 msgstr "Hozzáadás a következő kategóriához:"
 
@@ -1006,18 +1006,18 @@ msgstr "Hozzáadás a következő kategóriához:"
 msgid "Available feeds"
 msgstr "Összes hírcsatorna"
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Azonosítás"
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr "Belépés"
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 #, fuzzy
 msgid "Password"
 msgstr "Jelszó:"
@@ -1042,14 +1042,14 @@ msgstr "Hírcsatornák..."
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Mégse"
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr "Keresés"
@@ -1069,8 +1069,8 @@ msgstr "Hírcsatorna-műveletek"
 msgid "limit:"
 msgstr "Határ:"
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr "Eltávolít"
@@ -1104,58 +1104,58 @@ msgstr "Összes hírcsatorna"
 msgid "This feed"
 msgstr "Ez a hírcsatorna"
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr "Egyezés"
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr ""
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 msgid "after"
 msgstr "elteltével"
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr ""
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr "...szerepeljen ebben a mezőben: "
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "itt"
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 msgid "Perform Action"
 msgstr "Műveletek"
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr "Beállítás:"
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 msgid "Options"
 msgstr "Beállítások"
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr "Fordított egyezés"
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
+#: classes/dlg.php:539 classes/pref_filters.php:371
 #, fuzzy
 msgid "Apply to category"
 msgstr "Hozzáadás a következő kategóriához:"
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
 msgstr "Teszt"
 
@@ -1189,8 +1189,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr "A hír címkéi (vesszőkkel elválasztva):"
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Mentés"
@@ -1252,7 +1252,7 @@ msgstr ""
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "Hírcsatorna URL:"
@@ -1307,7 +1307,7 @@ msgstr ""
 msgid "Feeds require authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 #, fuzzy
 msgid "Visit the website"
 msgstr "Hivatalos weboldal megtekintése"
@@ -1321,8 +1321,8 @@ msgstr "Hírcsatornák megtekintése"
 msgid "Select:"
 msgstr "Kiválaszt:"
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr "Mind"
@@ -1331,8 +1331,8 @@ msgstr "Mind"
 msgid "Invert"
 msgstr "Fordított"
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr "Kijelölés törlése"
@@ -1378,21 +1378,21 @@ msgstr "Hírcsatorna nem található"
 msgid "mark as read"
 msgstr "olvasottként jelöl"
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 #, fuzzy
 msgid "Originally from:"
 msgstr "Eredeti hír tartalmának megjelenítése"
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 msgid "Edit tags for this article"
 msgstr "Címkék hozzáadása a hírhez"
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Hír megnyitása új ablakban"
 
-#: classes/feeds.php:723 include/functions.php:3350
+#: classes/feeds.php:723 include/functions.php:3380
 #, fuzzy
 msgid "Close article"
 msgstr "Hírek törlése"
@@ -1422,19 +1422,19 @@ msgstr ""
 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír."
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Frissítési hiba"
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 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!)"
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
@@ -1475,235 +1475,245 @@ msgstr "Címkék szerkesztése"
 msgid "Check to enable field"
 msgstr ""
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Hírcsatornák"
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 #, fuzzy
 msgid "Feed Title"
 msgstr "Cím"
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr ""
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr "Régi hírek törlése:"
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Elrejtés a hírcsatornalistámról"
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr "Jobbról balra tartó tartalom"
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr "Hozzáadás az e-mail összefoglalóhou"
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr "Képek helyi tárolása"
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Minden hírt olvasottá tesz?"
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 #, fuzzy
 msgid "Icon"
 msgstr "Művelet"
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr ""
 
-#: classes/pref_feeds.php:518
+#: classes/pref_feeds.php:524
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Feliratkozva a következő hírcsatornákra:"
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr "Kész."
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Feliratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: classes/pref_feeds.php:1017
+#: classes/pref_feeds.php:1024
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Nem található hírcsatorna."
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: classes/pref_feeds.php:1028
+#: classes/pref_feeds.php:1030
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "A publikált hírek hírcsatornájának címe megváltozott."
+
+#: classes/pref_feeds.php:1035
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1057
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
 msgstr "Feliratkozási beállítások szerkesztése"
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "A következő kategória <b>$%s</b> már létezik az adatbázisban."
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr "Kategória létrehozása"
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr "Nincs megadva hírcsatorna-kategória."
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Kiválasztott kategóriák eltávolítása?"
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Hírcsatornaszerkesztő"
 
-#: classes/pref_feeds.php:1280
+#: classes/pref_feeds.php:1287
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Egész hírcsatornát"
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 #, fuzzy
 msgid "Select"
 msgstr "Kiválaszt:"
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Kijelölt hírcsatorna takarítása..."
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Jelszó reset"
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Leiratkozás"
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 #, fuzzy
 msgid "Categories"
 msgstr "Kategória:"
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
 msgstr "Kategóriák szerkesztése"
 
-#: classes/pref_feeds.php:1345
+#: classes/pref_feeds.php:1338
+#, fuzzy
+msgid "(Un)hide empty categories"
+msgstr "Kategóriák szerkesztése"
+
+#: classes/pref_feeds.php:1354
 #, fuzzy
 msgid "More actions..."
 msgstr "Műveletek"
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr "Kézi takarítás (régi hírek törlése)"
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 msgid "Clear feed data"
 msgstr "Hírcsatorna-adatok törlése"
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 msgid "Rescore articles"
 msgstr ""
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
 msgstr ""
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref_feeds.php:1408
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref_feeds.php:1410
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref_feeds.php:1423
+#: classes/pref_feeds.php:1432
 #, fuzzy
 msgid "Import my OPML"
 msgstr "OPML importálása (DOMXML kiterjesztés használatával)"
 
-#: classes/pref_feeds.php:1427
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref_feeds.php:1429
+#: classes/pref_feeds.php:1438
 #, fuzzy
 msgid "Include settings"
 msgstr "Hozzáadás az e-mail összefoglalóhou"
 
-#: classes/pref_feeds.php:1433
+#: classes/pref_feeds.php:1442
 #, fuzzy
 msgid "Export OPML"
 msgstr "Exportálás OPML-be"
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1712,42 +1722,42 @@ msgstr ""
 "A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre "
 "bárki feliratkozhat, aki tudja a lenti címet."
 
-#: classes/pref_feeds.php:1439
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1442
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1445
+#: classes/pref_feeds.php:1454
 #, fuzzy
 msgid "Article archive"
 msgstr "Hír dátuma"
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
+#: classes/pref_feeds.php:1459
 #, fuzzy
 msgid "Export my data"
 msgstr "Exportálás OPML-be"
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr "Importálás"
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox-integráció"
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1755,41 +1765,41 @@ msgstr ""
 "Ez a Tiny Tiny RSS oldal beállítható a Firefox böngésző alapértelmezett "
 "hírcsatorna-olvasójaként. Ehhez kattintson az alábbi linkre!"
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr "Kattintson ide az oldal hírcsatorna-olvasóként való beállításához!"
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Vissza az RSS-olvasóhoz"
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Vissza az RSS-olvasóhoz"
 
-#: classes/pref_feeds.php:1503
+#: classes/pref_feeds.php:1512
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Link a publikált hírek hírcsatornájához"
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Link a publikált hírek hírcsatornájához"
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1797,68 +1807,72 @@ msgstr ""
 "A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre "
 "bárki feliratkozhat, aki tudja a lenti címet."
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1520
+#: classes/pref_feeds.php:1529
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref_feeds.php:1523
+#: classes/pref_feeds.php:1532
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Tárolt hírek"
 
-#: classes/pref_feeds.php:1529
+#: classes/pref_feeds.php:1538
 #, fuzzy
 msgid "Twitter"
 msgstr "Cím"
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Hírcsatorna-adatok törlése"
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: classes/pref_filters.php:84
+#: classes/pref_filters.php:89
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "Nem található a feltételeknek megfelelő szűrő."
 
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
+msgstr ""
+
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Szűrő létrehozva: <b>%s</b>"
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
 msgstr "Szerkesztése"
@@ -1938,99 +1952,99 @@ msgstr "A jelszó megváltoztatva."
 msgid "Old password is incorrect."
 msgstr "A régi jelszó helytelen."
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr "Beállítások elmentve."
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Ismeretlen beállítás: %s"
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref_prefs.php:159
+#: classes/pref_prefs.php:168
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Azonosítás"
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr ""
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr "E-mail"
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 msgid "Access level"
 msgstr "Hozzáférési szint"
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 #, fuzzy
 msgid "Save data"
 msgstr "Mentés"
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "A jelszava alapértelmezett értékén van, \n"
 "\t\t\t\t\t\tkérem változtassa meg!"
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr "Régi jelszó"
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr "Új jelszó"
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr "Jelszó még egyszer"
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr "Stílusválasztó"
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr ""
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr "Igen"
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr "Nem"
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
 msgstr ""
 
-#: classes/pref_prefs.php:468
+#: classes/pref_prefs.php:477
 #, php-format
-msgid "Current server time: %s"
+msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr "Beállítások mentése"
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr ""
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr "Alapértelmezett beállítások"
 
@@ -2128,29 +2142,25 @@ msgstr "Nincs megadva felhasználó."
 msgid "No matching users found."
 msgstr "Nem található a feltételeknek megfelelő felhasználó."
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr "nincs címke"
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "Regisztrációs adatai hiányosak"
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "A jelszó megváltoztatva."
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
@@ -2182,63 +2192,63 @@ msgstr "Hibás felhasználói név vagy jelszó"
 msgid "Archived articles"
 msgstr "Tárolt hírek"
 
-#: include/functions.php:3158 js/viewfeed.js:1945
+#: include/functions.php:3188 js/viewfeed.js:1954
 #, fuzzy
 msgid "Click to play"
 msgstr "Kattintson ide a szerkesztéshez"
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 msgid " - "
 msgstr "-"
 
-#: include/functions.php:4104
+#: include/functions.php:4134
 #, fuzzy
 msgid "(edit note)"
 msgstr "jegyzet szerkesztése"
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 msgid "unknown type"
 msgstr "ismeretlen hírcsatornatípus"
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr "Csatolmány:"
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 msgid "Attachments:"
 msgstr "Csatolmányok:"
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Csillagos hírek"
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 msgid "No feeds found."
 msgstr "Nem található hírcsatorna."
 
-#: include/functions.php:5241
+#: include/functions.php:5287
 msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: include/functions.php:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
 msgstr ""
 
@@ -2272,7 +2282,7 @@ msgstr "Hír publikálása"
 msgid "Assign tags"
 msgstr "Címke hozzáadása"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr "Címke hozzáadása"
 
@@ -2368,7 +2378,7 @@ msgid "Click to register your SSL client certificate with tt-rss"
 msgstr ""
 
 #: include/localized_schema.php:32
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
@@ -2487,7 +2497,7 @@ msgstr ""
 msgid "Sort headlines by feed date"
 msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "Felhasználói stíluslap URL-je"
@@ -2513,7 +2523,7 @@ msgstr "Fájl:"
 msgid "Use less traffic"
 msgstr ""
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 msgid "Mark all articles in %s as read?"
 msgstr "Minden hírt olvasottá tesz itt: %s?"
 
@@ -2573,7 +2583,7 @@ msgstr "Segítség betöltése..."
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 #, fuzzy
 msgid "Update feed"
 msgstr "Összes hírcsatorna frissítése"
@@ -2652,68 +2662,68 @@ msgstr "Ebből a kategóriából nem ."
 msgid "Create Filter"
 msgstr "Szárő létrehozása"
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 msgid "Filter Test Results"
 msgstr ""
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 msgid "Unsubscribe from %s?"
 msgstr "Leiratkozik innen: %s?"
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Megyjegyzés csatolása ehhez a hírhez:"
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 msgid "You can't edit this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Hírcsatorna szerkesztése"
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 #, fuzzy
 msgid "More Feeds"
 msgstr "Hírcsatornák..."
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Frissítési hiba"
 
-#: js/functions.js:1597 js/prefs.js:1232
+#: js/functions.js:1617 js/prefs.js:1232
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 msgid "No articles are selected."
 msgstr "Nincsen kiválasztott hír."
 
@@ -2902,57 +2912,57 @@ msgstr ""
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 msgid "Label Editor"
 msgstr "Címke Szerkesztő"
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1807
+#: js/prefs.js:1822
 #, fuzzy
 msgid "Link Instance"
 msgstr "Címkék szerkesztése"
 
-#: js/prefs.js:1858
+#: js/prefs.js:1873
 #, fuzzy
 msgid "Edit Instance"
 msgstr "Címkék szerkesztése"
 
-#: js/prefs.js:1907
+#: js/prefs.js:1922
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
-#: js/prefs.js:1924 js/prefs.js:1936
+#: js/prefs.js:1939 js/prefs.js:1951
 #, fuzzy
 msgid "No instances are selected."
 msgstr "Nincs kiválasztott szűrő."
 
-#: js/prefs.js:1941
+#: js/prefs.js:1956
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Kérem csak egy szűrőt jelöljön meg!"
 
-#: js/prefs.js:1976
+#: js/prefs.js:1991
 #, fuzzy
 msgid "Export Data"
 msgstr "Exportálás OPML-be"
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
-#: js/prefs.js:2056
+#: js/prefs.js:2071
 #, fuzzy
 msgid "Data Import"
 msgstr "Importálás"
 
-#: js/prefs.js:2091
+#: js/prefs.js:2106
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Feliratkozás a hírcsatornára..."
@@ -2966,110 +2976,110 @@ msgstr "Hír csillagozása"
 msgid "Mark all articles as read?"
 msgstr "Minden hírt olvasottá tesz?"
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr "Ebből a kategóriából nem ."
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 msgid "Please select some feed first."
 msgstr "Válasszon hírcsatorná(ka)t!"
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 #, fuzzy
 msgid "Rescore articles in %s?"
 msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 #, fuzzy
 msgid "New version available!"
 msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 msgid "Mark all visible articles in %s as read?"
 msgstr "Olvasottá teszi az összes látható hírt itt: %s?"
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "Eltávolítja a kijelölt híreket a címke alól?"
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Csillagos hírek"
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Címkék szerkesztése"
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 msgid "No article is selected."
 msgstr "Nincs kiválasztott hír."
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 msgid "No articles found to mark"
 msgstr "Nincs megjelölendő hír."
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 msgid "Mark %d article(s) as read?"
 msgstr "Olvasottá teszi a következő hír(eke)t: %d?"
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 #, fuzzy
 msgid "Loading..."
 msgstr "Hírcsatornák töltése, kérem várjon..."
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 #, fuzzy
 msgid "Open original article"
 msgstr "Eredeti hír tartalmának megjelenítése"
 
-#: js/viewfeed.js:1854
+#: js/viewfeed.js:1863
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Hír megnyitása új ablakban"
 
-#: js/viewfeed.js:1862
+#: js/viewfeed.js:1871
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Olvasottá tesz"
 
-#: js/viewfeed.js:1868
+#: js/viewfeed.js:1877
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Olvasottá tesz"
 
-#: js/viewfeed.js:1914
+#: js/viewfeed.js:1923
 #, fuzzy
 msgid "Remove label"
 msgstr "Eltávolítja a kiválasztott címkéket?"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1947
 #, fuzzy
 msgid "Playing..."
 msgstr "Hírcsatornák töltése, kérem várjon..."
 
-#: js/viewfeed.js:1939
+#: js/viewfeed.js:1948
 #, fuzzy
 msgid "Click to pause"
 msgstr "Kattintson ide a szerkesztéshez"
@@ -3669,9 +3679,6 @@ msgstr "Kattintson ide a szerkesztéshez"
 #~ msgid "Erase all non-starred articles in %s?"
 #~ msgstr "Eltávolítja az összes nem csillagos hírt itt: %s ?"
 
-#~ msgid "Published feed URL changed."
-#~ msgstr "A publikált hírek hírcsatornájának címe megváltozott."
-
 #~ msgid "Trying to change address..."
 #~ msgstr "Próba a címek megváltoztatására..."
 
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 73e307dc..322f36c2 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 1cbf371b..45cc7d86 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -1,21 +1,22 @@
-# Italian translation of Tiny Tiny RSS.
-# Copyright (C) YEAR THE Tiny Tiny RSS'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the Tiny Tiny RSS package.
-# Andrea Zagli <azagli@libero.it>, 2008, 2009, 2010, 2011.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# gothfox <cthulhoo@gmail.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: ttrss-1.4.1\n"
+"Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 16:39+0400\n"
-"PO-Revision-Date: 2011-05-04 17:31+0200\n"
-"Last-Translator: Andrea Zagli <azagli@libero.it>\n"
-"Language-Team: Italian <tp@lists.linux.it>\n"
+"POT-Creation-Date: 2012-03-12 13:59+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"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: backend.php:82
 msgid "Use default"
@@ -81,7 +82,7 @@ msgstr "Giornalmente"
 msgid "Weekly"
 msgstr "Settimanalmente"
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr "Predefinito"
 
@@ -136,7 +137,7 @@ msgstr "Il database di Tiny Tiny RSS è aggiornato."
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
 
@@ -215,9 +216,9 @@ msgstr ""
 "\t\t\tle impostazioni del browser."
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
 msgstr "Caricamento, attendere prego..."
 
@@ -302,7 +303,7 @@ msgstr ""
 "configurazione del PHP"
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -358,7 +359,7 @@ msgstr "Aggiornato"
 msgid "Sort articles"
 msgstr "Ordina articoli"
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 msgid "Date"
 msgstr "Data"
 
@@ -370,13 +371,13 @@ msgstr "Titolo"
 msgid "Score"
 msgstr "Punteggio"
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr "Aggiorna"
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr "Segna come letto"
 
@@ -404,7 +405,7 @@ msgstr "Modifica questo notiziario..."
 msgid "Rescore feed"
 msgstr "Cambia punteggio notiziario"
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
 
@@ -455,9 +456,9 @@ msgid "Setting preference key %s to %s"
 msgstr "Impostazione della voce delle preferenze %s a %s"
 
 #: opml.php:112
-#, fuzzy, php-format
+#, php-format
 msgid "Adding label %s"
-msgstr "Assegna etichetta"
+msgstr ""
 
 #: opml.php:115
 #, php-format
@@ -465,14 +466,14 @@ msgid "Duplicate label: %s"
 msgstr ""
 
 #: opml.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Adding filter %s"
-msgstr "Aggiunta notiziario..."
+msgstr ""
 
 #: opml.php:185
-#, fuzzy, php-format
+#, php-format
 msgid "Duplicate filter %s"
-msgstr "Crea filtro"
+msgstr ""
 
 #: opml.php:230
 msgid "is already imported."
@@ -511,11 +512,11 @@ msgid "Exit preferences"
 msgstr "Esci dalle preferenze"
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 msgid "Feeds"
 msgstr "Notiziari"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 msgid "Filters"
 msgstr "Filtri"
 
@@ -605,7 +606,7 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr "Registrazione su Twitter effettuata con successo."
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 msgid "Register"
 msgstr "Registro"
 
@@ -670,9 +671,8 @@ msgid "Scroll article content"
 msgstr "Scorri il contenuto dell&apos;articolo"
 
 #: help/main.php:25
-#, fuzzy
 msgid "Email article"
-msgstr "Tutti gli articoli"
+msgstr ""
 
 #: help/main.php:29 help/prefs.php:30
 msgid "Other actions"
@@ -686,7 +686,7 @@ msgstr "Seleziona l&apos;articolo sotto il cursore del mouse"
 msgid "Create label"
 msgstr "Crea etichetta"
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr "Crea filtro"
 
@@ -699,29 +699,24 @@ msgid "Display this help dialog"
 msgstr "Visualizza questo dialogo di aiuto"
 
 #: help/main.php:41
-#, fuzzy
 msgid "Multiple articles actions"
-msgstr "Articoli multipli"
+msgstr ""
 
 #: help/main.php:44
-#, fuzzy
 msgid "Select all articles"
-msgstr "Elimina articolo"
+msgstr ""
 
 #: help/main.php:45
-#, fuzzy
 msgid "Select unread articles"
-msgstr "Eliminare articoli non letti"
+msgstr ""
 
 #: help/main.php:46
-#, fuzzy
 msgid "Invert article selection"
-msgstr "Azioni sull&apos;articolo attivo"
+msgstr ""
 
 #: help/main.php:47
-#, fuzzy
 msgid "Deselect all articles"
-msgstr "Elimina articolo"
+msgstr ""
 
 #: help/main.php:50
 msgid "Feed actions"
@@ -731,11 +726,11 @@ msgstr "Azioni notiziari"
 msgid "Refresh active feed"
 msgstr "Aggiorna notiziario attivo"
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr "Sottoscrivi il notiziario"
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 msgid "Edit feed"
 msgstr "Modifica notiziario"
 
@@ -876,9 +871,8 @@ msgid "Show images in posts"
 msgstr "Mostrare le immagini negli articoli"
 
 #: mobile/prefs.php:40
-#, fuzzy
 msgid "Hide read articles and feeds"
-msgstr "Nascondi notiziari letti"
+msgstr ""
 
 #: mobile/prefs.php:45
 msgid "Sort feeds by unread count"
@@ -888,22 +882,21 @@ msgstr "Ordinare i notiziari per numero di non letti"
 msgid "Article not found."
 msgstr "Articolo non trovato."
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr "Argomento dell&apos;aiuto non trovato."
 
 #: classes/dlg.php:26
-#, fuzzy
 msgid "Prepare data"
-msgstr "Salva dati"
+msgstr ""
 
 #: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
@@ -921,7 +914,7 @@ msgstr "Crea profilo"
 msgid "(active)"
 msgstr "(attivo)"
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 msgid "Default profile"
 msgstr "Profilo predefinito"
@@ -976,17 +969,17 @@ msgstr ""
 "crash o uno stallo. Controllare il processo del demone o contattare il "
 "proprietario dell&apos;istanza."
 
-#: classes/dlg.php:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr "Notiziario"
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 msgid "Feed URL"
 msgstr "URL del notiziario"
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 msgid "Place in category:"
 msgstr "Mettere nella categoria:"
 
@@ -994,18 +987,18 @@ msgstr "Mettere nella categoria:"
 msgid "Available feeds"
 msgstr "Notiziari disponibili"
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr "Accesso"
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 msgid "Password"
 msgstr "Password"
 
@@ -1028,14 +1021,14 @@ msgstr "Altri notiziari"
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Annulla"
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr "Cerca"
@@ -1052,8 +1045,8 @@ msgstr "Archivio notiziari"
 msgid "limit:"
 msgstr "limite:"
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr "Rimuovi"
@@ -1086,58 +1079,57 @@ msgstr "Tutti i notiziari"
 msgid "This feed"
 msgstr "Questo notiziario"
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr "Corrisponde"
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr "prima"
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 msgid "after"
 msgstr "dopo"
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr "Controllalo"
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr "al campo"
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "in"
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 msgid "Perform Action"
 msgstr "Esegui azione"
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr "con parametri:"
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 msgid "Options"
 msgstr "Opzioni"
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr "Corrispondenza inversa"
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
-#, fuzzy
+#: classes/dlg.php:539 classes/pref_filters.php:371
 msgid "Apply to category"
-msgstr "Mettere nella categoria:"
+msgstr ""
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
 msgstr "Prova"
 
@@ -1170,8 +1162,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Etichette per questo articolo (separate da virgole):"
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Salva"
@@ -1185,18 +1177,16 @@ msgid "Select item(s) by tags"
 msgstr ""
 
 #: classes/dlg.php:792
-#, fuzzy
 msgid "Match:"
-msgstr "Corrisponde"
+msgstr ""
 
 #: classes/dlg.php:797
 msgid "Which Tags?"
 msgstr ""
 
 #: classes/dlg.php:810
-#, fuzzy
 msgid "Display entries"
-msgstr "visualizza notiziari"
+msgstr ""
 
 #: classes/dlg.php:822 classes/feeds.php:152
 msgid "View as RSS"
@@ -1236,7 +1226,7 @@ msgstr ""
 msgid "Instance"
 msgstr "Istanza"
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL:"
@@ -1283,11 +1273,10 @@ msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 #: classes/dlg.php:1018
-#, fuzzy
 msgid "Feeds require authentication."
-msgstr "Questo notiziario richiede l&apos;autenticazione"
+msgstr ""
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 msgid "Visit the website"
 msgstr "Visita il sito web"
 
@@ -1299,8 +1288,8 @@ msgstr "Visualizza come RSS del notiziario"
 msgid "Select:"
 msgstr "Seleziona:"
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr "Tutti"
@@ -1309,8 +1298,8 @@ msgstr "Tutti"
 msgid "Invert"
 msgstr "Inverti"
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr "Nessuno"
@@ -1351,22 +1340,21 @@ msgstr "Notiziario non trovato."
 msgid "mark as read"
 msgstr "segna come letto"
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 msgid "Originally from:"
 msgstr "Originariamente da:"
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 msgid "Edit tags for this article"
 msgstr "Modifica le etichette per questo articolo"
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 msgid "Open article in new tab"
 msgstr "Apri articolo in una nuova scheda"
 
-#: classes/feeds.php:723 include/functions.php:3350
-#, fuzzy
+#: classes/feeds.php:723 include/functions.php:3380
 msgid "Close article"
-msgstr "Elimina articolo"
+msgstr ""
 
 #: classes/feeds.php:744
 msgid "No unread articles found to display."
@@ -1393,19 +1381,19 @@ msgstr ""
 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Ultimo aggiornamento notiziari alle %s"
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
@@ -1441,25 +1429,25 @@ msgstr "Modifica note articolo"
 msgid "Check to enable field"
 msgstr "Spuntare per abilitare il campo"
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
-#, fuzzy, php-format
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
+#, php-format
 msgid "(%d feeds)"
-msgstr "Modifica notiziari"
+msgstr ""
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 msgid "Feed Title"
 msgstr "Titolo notiziario"
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr "utilizzando"
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr "Eliminazione articoli:"
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -1468,210 +1456,209 @@ msgstr ""
 "proprio notiziario richiede l'autenticazione, eccetto per i notiziari di "
 "Twitter."
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 msgid "Hide from Popular feeds"
 msgstr "Nascondere nei notiziari popolari"
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr "Contenuto da destra a sinistra"
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr "Includere nell&apos;email riassunto"
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr "Mostrare sempre le immagini allegate"
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr "Memorizzare le immagini localmente"
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 msgid "Mark updated articles as unread"
 msgstr "Segnare gli articoli aggiornati come non letti"
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
 msgstr "Segnare gli articoli come aggiornati al cambiamento del contenuto"
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 msgid "Icon"
 msgstr "Icona"
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: classes/pref_feeds.php:518
+#: classes/pref_feeds.php:524
 msgid "Resubscribe to push updates"
 msgstr "Sottoscrivi per inviare aggiornamenti"
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 "Reimposta lo stato di sottoscrizione a PubSubHubbub per notiziari abilitati "
 "all'invio."
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr "Fatto tutto."
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Sottoscrizione avvenuta a <b>%s</b>."
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Impossibile sottoscrivere <b>%s</b>."
 
-#: classes/pref_feeds.php:1017
-#, fuzzy, php-format
+#: classes/pref_feeds.php:1024
+#, php-format
 msgid "No feeds found in <b>%s</b>."
-msgstr "Nessun notiziario trovato."
+msgstr ""
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Si ha già una sottoscrizione a <b>%s</b>."
 
-#: classes/pref_feeds.php:1028
+#: classes/pref_feeds.php:1030
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "Nessun notiziario trovato."
+
+#: classes/pref_feeds.php:1035
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 "Impossibile sottoscrivere <b>%s</b>.<br>Impossibile scaricare l'URL del "
 "notiziario."
 
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1057
 msgid "Subscribe to selected feed"
 msgstr "Sottoscrivi il notiziario selezionato"
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
 msgstr "Modifica opzioni di sottoscrizione"
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La categoria <b>%s</b> esiste già nel database."
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr "Crea categoria"
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr "Nessuna categoria notiziari definita."
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 msgid "Remove selected categories"
 msgstr "Rimuovi le categorie selezionate"
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 msgid "Feeds with errors"
 msgstr "Notiziari con errori"
 
-#: classes/pref_feeds.php:1280
+#: classes/pref_feeds.php:1287
 msgid "Inactive feeds"
 msgstr "Notiziari non attivi"
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 msgid "Select"
 msgstr "Seleziona"
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 msgid "Edit selected feeds"
 msgstr "Modifica i notiziari selezionati"
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 msgid "Reset sort order"
 msgstr "Reimposta ordinamento"
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
-#, fuzzy
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 msgid "Batch subscribe"
-msgstr "Annulla sottoscrizione"
+msgstr ""
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 msgid "Categories"
 msgstr "Categorie"
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
 msgstr "Modifica categorie"
 
-#: classes/pref_feeds.php:1345
+#: classes/pref_feeds.php:1338
+#, fuzzy
+msgid "(Un)hide empty categories"
+msgstr "Modifica categorie"
+
+#: classes/pref_feeds.php:1354
 msgid "More actions..."
 msgstr "Altre azioni..."
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr "Eliminazione manuale"
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 msgid "Clear feed data"
 msgstr "Pulisci i dati del notiziario"
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 msgid "Rescore articles"
 msgstr "Cambio punteggio degli articoli"
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 "<b>Suggerimento:</b> si possono trascinare in giro i notiziari e le "
 "categorie."
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
 msgstr ""
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref_feeds.php:1408
-#, fuzzy
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
-"Utilizzando OPML si possono esportare e importare le impostazioni dei "
-"notiziari e di Tiny Tiny RSS."
 
-#: classes/pref_feeds.php:1410
-#, fuzzy
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
-"Nota: solo le impostazioni del profilo principale possono essere migrate "
-"utilizzando OPML."
 
-#: classes/pref_feeds.php:1423
-#, fuzzy
+#: classes/pref_feeds.php:1432
 msgid "Import my OPML"
-msgstr "Importazione OPML..."
+msgstr ""
 
-#: classes/pref_feeds.php:1427
-#, fuzzy
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
-msgstr "Nome completo"
+msgstr ""
 
-#: classes/pref_feeds.php:1429
-#, fuzzy
+#: classes/pref_feeds.php:1438
 msgid "Include settings"
-msgstr "Includere nell&apos;email riassunto"
+msgstr ""
 
-#: classes/pref_feeds.php:1433
-#, fuzzy
+#: classes/pref_feeds.php:1442
 msgid "Export OPML"
-msgstr "Esporta OPML"
+msgstr ""
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
@@ -1679,46 +1666,39 @@ msgstr ""
 "OPML può essere pubblicato e può essere sottoscritto da chiunque conosca "
 "l&apos;URL seguente."
 
-#: classes/pref_feeds.php:1439
-#, fuzzy
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
-"Nota: l'OPML pubblicato non contiene le impostazioni di Tiny Tiny RSS, i "
-"notiziari che richiedono l'autenticazione o i notiziari nascosti dai "
-"notiziari popolari."
 
-#: classes/pref_feeds.php:1442
-#, fuzzy
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
-msgstr "URL OPML pubblico"
+msgstr ""
 
-#: classes/pref_feeds.php:1445
-#, fuzzy
+#: classes/pref_feeds.php:1454
 msgid "Article archive"
-msgstr "Data dell&apos;articolo"
+msgstr ""
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
-#, fuzzy
+#: classes/pref_feeds.php:1459
 msgid "Export my data"
-msgstr "Esporta OPML"
+msgstr ""
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr "Importa"
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 msgid "Firefox integration"
 msgstr "Integrazione con Firefox"
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1726,15 +1706,15 @@ msgstr ""
 "Questo sito di Tiny Tiny RSS può essere utilizzato come lettore di notiziari "
 "di Firefox facendo clic sul collegamento qui sotto."
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr "Fare clic qui per registrare questo sito come lettore di notiziari."
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr "Sottoscrizione utilizzando bookmarklet"
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
@@ -1743,25 +1723,24 @@ msgstr ""
 "aprire il notiziario al quale si è interessati nel browser a fare clic sul "
 "collegamento per sottoscriverlo."
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Sottoscrivere %s in Tiny Tiny RSS?"
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Sottoscrive in Tiny Tiny RSS"
 
-#: classes/pref_feeds.php:1503
-#, fuzzy
+#: classes/pref_feeds.php:1512
 msgid "Published & shared articles / Generated feeds"
-msgstr "Articoli pubblicati e notiziari generati"
+msgstr ""
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 msgid "Published articles and generated feeds"
 msgstr "Articoli pubblicati e notiziari generati"
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1770,32 +1749,31 @@ msgstr ""
 "possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
 "sotto."
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 msgid "Display URL"
 msgstr "Visualizza URL"
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr "Pulisci tutti gli URL generati"
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1520
+#: classes/pref_feeds.php:1529
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref_feeds.php:1523
-#, fuzzy
+#: classes/pref_feeds.php:1532
 msgid "Unshare all articles"
-msgstr "Articoli non letti"
+msgstr ""
 
-#: classes/pref_feeds.php:1529
+#: classes/pref_feeds.php:1538
 msgid "Twitter"
 msgstr "Twitter"
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
@@ -1803,7 +1781,7 @@ msgstr ""
 "Prima di poter aggiornare i notiziari di Twitter, occorre registrare questa "
 "instanza di Tiny Tiny RSS su Twitter.com."
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
@@ -1811,28 +1789,32 @@ msgstr ""
 "La registrazione su Twitter.com è avvenuta con successo; adesso si è in "
 "grado di accedere a notiziari di Twitter."
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr "Registra su Twitter.com"
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 msgid "Clear stored credentials"
 msgstr "Pulisci le credenziali memorizzate"
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
 msgstr "Articoli che corrispondono a questo filtro:"
 
-#: classes/pref_filters.php:84
+#: classes/pref_filters.php:89
 msgid "No articles matching this filter has been found."
 msgstr "Nessun articolo trovato che corrisponde a questo filtro."
 
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
+msgstr ""
+
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filtro <b>%s</b> creato"
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
 msgstr "Modifica"
@@ -1911,95 +1893,94 @@ msgstr "La password è stata cambiata"
 msgid "Old password is incorrect."
 msgstr "La vecchia password non è corretta."
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr "La configurazione è stata salvata."
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Opzione sconosciuta: %s"
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr "I dati personali sono stati salvati."
 
-#: classes/pref_prefs.php:159
-#, fuzzy
+#: classes/pref_prefs.php:168
 msgid "Personal data / Authentication"
-msgstr "Autenticazione"
+msgstr ""
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr "Nome completo"
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr "Email"
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 msgid "Access level"
 msgstr "Livello di accesso"
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 msgid "Save data"
 msgstr "Salva dati"
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 msgid "Your password is at default value, please change it."
 msgstr "La password è impostata al valore predefinito: cambiarla."
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr "Vecchia password"
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr "Nuova password"
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr "Conferma password"
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr "Cambia password"
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr "Seleziona tema"
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr "Personalizza"
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr "Sì"
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr "No"
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
 msgstr "Pulisci"
 
-#: classes/pref_prefs.php:468
+#: classes/pref_prefs.php:477
 #, php-format
-msgid "Current server time: %s"
+msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr "Salva configurazione"
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr "Gestisci profili"
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr "Reimposta ai valori predefiniti"
 
@@ -2059,13 +2040,11 @@ msgid "User <b>%s</b> already exists."
 msgstr "L&apos;utente <b>%s</b> esiste già."
 
 #: classes/pref_users.php:291
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
 "\t\t\t\t to <b>%s</b>"
 msgstr ""
-"Password cambiata all&apos;utente <b>%s</b>\n"
-"\t\t\t\t\t a <b>%s</b>"
 
 #: classes/pref_users.php:298
 #, php-format
@@ -2096,40 +2075,33 @@ msgstr "Nessun utente definito."
 msgid "No matching users found."
 msgstr "Nessun utente corrispondente trovato."
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr "nessuna etichetta"
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 msgid "Your request could not be completed."
 msgstr "La richiesta non può essere completata."
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr "L'aggiornamento del notiziario è stato pianificato con successo."
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 msgid "Category update has been scheduled."
 msgstr "Pianificato l'aggiornamento della categoria."
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 msgid "Can't update this kind of feed."
 msgstr "Impossibile aggiornare questo tipo di notiziario."
 
 #: classes/share_button.php:7
-#, fuzzy
 msgid "Share by URL"
-msgstr "Metti la stella all&apos;articolo"
+msgstr ""
 
 #: classes/share_button.php:29
-#, fuzzy
 msgid "You can share this article by the following unique URL:"
 msgstr ""
-"È possibile vedere questo notiziario come RSS utilizzando il seguente URL:"
 
 #: classes/tweet_button.php:7
 msgid "Share on Twitter"
@@ -2147,62 +2119,61 @@ msgstr "Nome utente o password sbagliati"
 msgid "Archived articles"
 msgstr "Articoli archiviati"
 
-#: include/functions.php:3158 js/viewfeed.js:1945
+#: include/functions.php:3188 js/viewfeed.js:1954
 msgid "Click to play"
 msgstr "Fare clic per riprodurre"
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
 msgstr "Riproduci"
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:4104
+#: include/functions.php:4134
 msgid "(edit note)"
 msgstr "(modifica note)"
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr "Nessun notiziario selezionato."
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 msgid "unknown type"
 msgstr "tipo sconosciuto"
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr "Allegato:"
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 msgid "Attachments:"
 msgstr "Allegati:"
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, php-format
 msgid "%d archived articles"
 msgstr "%d articoli archiviati"
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 msgid "No feeds found."
 msgstr "Nessun notiziario trovato."
 
-#: include/functions.php:5241
-#, fuzzy
+#: include/functions.php:5287
 msgid "Could not import: incorrect schema version."
-msgstr "Impossibile trovare il file schema necessario; serve la versione:"
+msgstr ""
 
-#: include/functions.php:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
 msgstr ""
 
@@ -2235,7 +2206,7 @@ msgstr "Pubblica articolo"
 msgid "Assign tags"
 msgstr "Assegna etichette"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr "Assegna etichetta"
 
@@ -2245,15 +2216,15 @@ msgstr ""
 
 #: include/localized_schema.php:17
 msgid "General"
-msgstr "Generali"
+msgstr ""
 
 #: include/localized_schema.php:18
 msgid "Interface"
-msgstr "Interfaccia"
+msgstr ""
 
 #: include/localized_schema.php:19
 msgid "Advanced"
-msgstr "Avanzate"
+msgstr ""
 
 #: include/localized_schema.php:21
 msgid ""
@@ -2336,7 +2307,7 @@ msgstr "Fare clic per registrare il certificato SSL client su tt-rss"
 
 #: include/localized_schema.php:32
 #, fuzzy
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr "Fuso orario dell'utente"
 
 #: include/localized_schema.php:33
@@ -2453,7 +2424,7 @@ msgstr "Fuso orario dell'utente"
 msgid "Sort headlines by feed date"
 msgstr "Ordinare i sommari per data del notiziario"
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 msgid "Customize stylesheet"
 msgstr "Personalizza il foglio di stile"
 
@@ -2477,7 +2448,7 @@ msgstr "Profilo:"
 msgid "Use less traffic"
 msgstr "Utilizzare minor traffico"
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 msgid "Mark all articles in %s as read?"
 msgstr "Segnare tutti gli articoli in «%s» come letti?"
 
@@ -2498,9 +2469,8 @@ msgid "Unpublish article"
 msgstr "Non pubblicare articolo"
 
 #: js/digest.js:265
-#, fuzzy
 msgid "Original article"
-msgstr "Apri articolo di origine"
+msgstr ""
 
 #: js/digest.js:267
 msgid "Close this panel"
@@ -2531,7 +2501,7 @@ msgid "New articles available in this feed (click to show)"
 msgstr ""
 "Nuovi articoli disponibili per questo notiziario (fare clic per mostrarli)"
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 msgid "Update feed"
 msgstr "Aggiorna notiziario"
 
@@ -2603,11 +2573,11 @@ msgstr "La sottoscrizione a questo notiziario è già stata effettuata."
 msgid "Create Filter"
 msgstr "Crea filtro"
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 msgid "Filter Test Results"
 msgstr "Filtra risultati di prova"
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
@@ -2615,37 +2585,37 @@ msgstr ""
 "Reimpostare la sottoscrizione? Tiny Tiny RSS proverà ancora al prossimo "
 "aggiornamento del notiziario a sottoscrivere il centro notifiche."
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 msgid "Unsubscribe from %s?"
 msgstr "Annullare la sottoscrizione a «%s»?"
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 msgid "Please enter category title:"
 msgstr "Inserire il titolo della categoria:"
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr "Generare un nuovo indirizzo per questo notiziario?"
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 msgid "You can't edit this kind of feed."
 msgstr "Impossibile modificare questo tipo di notiziario."
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 msgid "Edit Feed"
 msgstr "Modifica notiziario"
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 msgid "More Feeds"
 msgstr "Altri notiziari"
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr "Nessun notiziario selezionato."
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2653,17 +2623,17 @@ msgstr ""
 "Rimuovere i notiziari selezionati dall'archivio? I notiziari con articoli "
 "archiviati non saranno rimossi."
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 msgid "Feeds with update errors"
 msgstr "Notiziari con errori di aggiornamento"
 
-#: js/functions.js:1597 js/prefs.js:1232
+#: js/functions.js:1617 js/prefs.js:1232
 msgid "Remove selected feeds?"
 msgstr "Rimuovere i notiziari selezionati?"
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 msgid "No articles are selected."
 msgstr "Nessun articolo selezionato."
 
@@ -2769,9 +2739,8 @@ msgid "Please choose an OPML file first."
 msgstr "Scegliere prima un file OPML."
 
 #: js/prefs.js:814
-#, fuzzy
 msgid "Please choose the file first."
-msgstr "Scegliere prima un file OPML."
+msgstr ""
 
 #: js/prefs.js:941
 msgid "Reset to defaults?"
@@ -2842,1294 +2811,154 @@ msgstr ""
 "Continuare?"
 
 #: js/prefs.js:1590
-#, fuzzy
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
-"Questo invaliderà tutti gli URL di notiziari generati precedentemente. "
-"Continuare?"
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 msgid "Label Editor"
 msgstr "Editor etichette"
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Questo pulirà le informazioni di autenticazione memorizzate per Twitter. "
 "Continuare?"
 
-#: js/prefs.js:1807
+#: js/prefs.js:1822
 msgid "Link Instance"
 msgstr "Collega istanza"
 
-#: js/prefs.js:1858
+#: js/prefs.js:1873
 msgid "Edit Instance"
 msgstr "Modifica istanza"
 
-#: js/prefs.js:1907
+#: js/prefs.js:1922
 msgid "Remove selected instances?"
 msgstr "Rimuovere le istanze selezionate?"
 
-#: js/prefs.js:1924 js/prefs.js:1936
+#: js/prefs.js:1939 js/prefs.js:1951
 msgid "No instances are selected."
 msgstr "Nessun istanza selezionata."
 
-#: js/prefs.js:1941
+#: js/prefs.js:1956
 msgid "Please select only one instance."
 msgstr "Selezionare solo un'istanza."
 
-#: js/prefs.js:1976
-#, fuzzy
+#: js/prefs.js:1991
 msgid "Export Data"
-msgstr "Esporta OPML"
+msgstr ""
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
-#: js/prefs.js:2056
-#, fuzzy
+#: js/prefs.js:2071
 msgid "Data Import"
-msgstr "Importa"
+msgstr ""
 
-#: js/prefs.js:2091
-#, fuzzy
+#: js/prefs.js:2106
 msgid "Subscribing to feeds..."
-msgstr "Sottoscrizione al notiziario..."
+msgstr ""
 
 #: js/share_button.js:10
-#, fuzzy
 msgid "Share article by URL"
-msgstr "Metti la stella all&apos;articolo"
+msgstr ""
 
 #: js/tt-rss.js:146
 msgid "Mark all articles as read?"
 msgstr "Segnare tutti gli articoli come letti?"
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr "Impossibile annullare la sottoscrizione alla categoria."
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 msgid "Please select some feed first."
 msgstr "Selezionare prima qualche notiziario."
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 msgid "You can't rescore this kind of feed."
 msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 msgid "Rescore articles in %s?"
 msgstr "Cambiare il punteggio degli articoli in «%s»?"
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 msgid "New version available!"
 msgstr "Nuova versione disponibile."
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 msgid "Mark all visible articles in %s as read?"
 msgstr "Segnare tutti gli articoli visibili in «%s» come letti?"
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 msgid "Delete %d selected articles in %s?"
 msgstr "Eliminare i %d articoli selezionati in «%s»?"
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 msgid "Delete %d selected articles?"
 msgstr "Eliminare i %d articoli selezionati?"
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 msgid "Archive %d selected articles in %s?"
 msgstr "Archiviare i %d articoli selezionati in «%s»?"
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 msgid "Move %d archived articles back?"
 msgstr "Spostare %d articoli archiviati indietro?"
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Segnare %d articoli selezionati in «%s» come letti?"
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 msgid "Edit article Tags"
 msgstr "Modifica etichette articolo"
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 msgid "No article is selected."
 msgstr "Nessun articolo selezionato."
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 msgid "No articles found to mark"
 msgstr "Nessun articolo trovato da segnare"
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 msgid "Mark %d article(s) as read?"
 msgstr "Segnare %d articolo/i come letto/i?"
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 msgid "Loading..."
 msgstr "Caricamento..."
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 msgid "Open original article"
 msgstr "Apri articolo di origine"
 
-#: js/viewfeed.js:1854
+#: js/viewfeed.js:1863
 msgid "View in a tt-rss tab"
 msgstr "Visualizza in una scheda tt-rss"
 
-#: js/viewfeed.js:1862
-#, fuzzy
+#: js/viewfeed.js:1871
 msgid "Mark above as read"
-msgstr "Segna come letto"
+msgstr ""
 
-#: js/viewfeed.js:1868
-#, fuzzy
+#: js/viewfeed.js:1877
 msgid "Mark below as read"
-msgstr "Segna come letto"
+msgstr ""
 
-#: js/viewfeed.js:1914
+#: js/viewfeed.js:1923
 msgid "Remove label"
 msgstr "Rimuovi etichetta"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1947
 msgid "Playing..."
 msgstr "In riproduzione..."
 
-#: js/viewfeed.js:1939
+#: js/viewfeed.js:1948
 msgid "Click to pause"
 msgstr "Fare clic per mettere in pausa"
-
-#~ msgid "Personal data"
-#~ msgstr "Dati personali"
-
-#~ msgid "About..."
-#~ msgstr "Informazioni su..."
-
-#~ msgid "Help"
-#~ msgstr "Aiuto"
-
-#~ msgid "Importing using DOMXML."
-#~ msgstr "Importazione utilizzando DOMXML."
-
-#~ msgid "Importing using DOMDocument."
-#~ msgstr "Importazione utilizzando DOMDocument."
-
-#~ msgid ""
-#~ "DOMXML extension is not found. It is required for PHP versions below 5."
-#~ msgstr ""
-#~ "L&apos;estensione DOMXML non è stata trovata. È richiesta per versioni di "
-#~ "PHP inferiori alla 5."
-
-#~ msgid "Cache images locally (SimplePie only)"
-#~ msgstr "Memorizzare le immagini localmente (solo SimplePie)"
-
-#~ msgid ""
-#~ "Using OPML you can export and import your feeds and Tiny Tiny RSS "
-#~ "settings."
-#~ msgstr ""
-#~ "Utilizzando OPML si possono esportare e importare le impostazioni dei "
-#~ "notiziari e di Tiny Tiny RSS."
-
-#~ msgid "Note: Only main settings profile can be migrated using OPML."
-#~ msgstr ""
-#~ "Nota: solo le impostazioni del profilo principale possono essere migrate "
-#~ "utilizzando OPML."
-
-#, fuzzy
-#~ msgid "Publish"
-#~ msgstr "Pubblicati"
-
-#~ msgid ""
-#~ "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-#~ "that require authentication or feeds hidden from Popular feeds."
-#~ msgstr ""
-#~ "Nota: l'OPML pubblicato non contiene le impostazioni di Tiny Tiny RSS, i "
-#~ "notiziari che richiedono l'autenticazione o i notiziari nascosti dai "
-#~ "notiziari popolari."
-
-#~ msgid "Changed password of user <b>%s</b>."
-#~ msgstr "Password dell&apos;utente <b>%s</b> cambiata."
-
-#~ msgid "Content filtering"
-#~ msgstr "Filtro contenuti"
-
-#~ msgid ""
-#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
-#~ "Filtering is done once, when new article is imported to the database from "
-#~ "the newsfeed, specified field is matched against regular expression and "
-#~ "some action is taken. Regular expression matching is case-insensitive."
-#~ msgstr ""
-#~ "Tiny Tiny RSS ha il supporto per il filtraggio (o il processamento) degli "
-#~ "articoli. Il filtro viene fatto una volta quando i nuovi articoli vengono "
-#~ "importati nel database dal notiziario, il campo specificato viene "
-#~ "confrontato con l&apos;espressione regolare e viene effettuata qualche "
-#~ "azione. La corrispondenza all&apos;espressione regolare tiene conto di "
-#~ "maiuscole e minuscole."
-
-#~ msgid ""
-#~ "Supported actions are: filter (do not import) article, mark article as "
-#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
-#~ "globally and for some specific feed."
-#~ msgstr ""
-#~ "Le azioni supportate sono: filtra articolo (non importare), segna "
-#~ "articolo come letto, imposta con stella, assegna etichetta(e) e imposta "
-#~ "punteggio. I filtri possono essere definiti globalmente e per ogni "
-#~ "notiziario specifico."
-
-#~ msgid ""
-#~ "Multiple and inverse matching are supported. All matching filters are "
-#~ "considered when article is being imported and all actions executed in "
-#~ "sequence. Inverse matching reverts matching result, e.g. filter matching "
-#~ "XYZZY in title with inverse flag will match all articles, except those "
-#~ "containing string XYZZY in title."
-#~ msgstr ""
-#~ "Sono supportate le corrispondenze multiple e inverse. Tutti i filtri di "
-#~ "corrispondenza vengono considerati quando gli articoli vengono importati "
-#~ "e tutte le azioni vengono poi eseguite in sequenza. La corrispondenza "
-#~ "inversa inverte il risultato della corrispondenza; es. il filtro con "
-#~ "corrispondenza XYZZY nel titolo con l&apos;opzione di inversione troverà "
-#~ "tutti gli articoli, eccetto quelli che contengono la stringa XYZZY nel "
-#~ "titolo."
-
-#~ msgid "See also:"
-#~ msgstr "Vedere anche:"
-
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "Aggiunta categoria notiziario..."
-
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "Aggiunta categoria notiziario..."
-
-#, fuzzy
-#~ msgid "description"
-#~ msgstr "Selezione"
-
-#~ msgid "Dismiss article"
-#~ msgstr "Rimuovi articolo"
-
-#~ msgid "Remove:"
-#~ msgstr "Rimuovi:"
-
-#~ msgid "Assign:"
-#~ msgstr "Assegna:"
-
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "Inverti modalità riordinamento categoria"
-
-#~ msgid "Update all feeds"
-#~ msgstr "Aggiorna tutti i notiziari"
-
-#~ msgid "Sort by name or unread count"
-#~ msgstr "Ordinare per nome o numero non letti"
-
-#~ msgid "feeds"
-#~ msgstr "notiziari"
-
-#~ msgid "headlines"
-#~ msgstr "sommari"
-
-#~ msgid "You are viewing the digest page. Click to open full version."
-#~ msgstr ""
-#~ "Si sta visualizzando la pagina di sommario. Fare clic per aprire la "
-#~ "versione completa."
-
-#~ msgid "Click to expand article"
-#~ msgstr "Fare clic per espandere l&apos;articolo"
-
-#~ msgid "Unable to load article."
-#~ msgstr "Impossibile caricare l'articolo."
-
-#~ msgid "Limit bandwidth usage"
-#~ msgstr "Limitare l&apos;uso della banda"
-
-#~ msgid "MySQL Charset Updater"
-#~ msgstr "Aggiornatore del set di caratteri di MySQL"
-
-#~ msgid ""
-#~ "This script is for Tiny Tiny RSS installations with MySQL backend only."
-#~ msgstr "Questo script è solo per installazioni di Tiny Tiny RSS su MySQL."
-
-#~ msgid ""
-#~ "This script will convert your Tiny Tiny RSS database to UTF-8. \n"
-#~ "\t\t\tDepending on current database charset you may experience data "
-#~ "corruption (lost accent characters, etc.). \n"
-#~ "\t\t\tAfter update, you'll have to set <b>MYSQL_CHARSET</b> option in "
-#~ "config.php to 'utf8'."
-#~ msgstr ""
-#~ "Questo script convertirà il database di Tiny Tiny RSS a UTF-8. \n"
-#~ "\t\t\tIn base all&apos;insieme di caratteri attuale del database si "
-#~ "potrebbero avere delle corruzioni dei dati (caratteri accentati persi, "
-#~ "ecc.). \n"
-#~ "\t\t\tDopo l&apos;aggiornamento, occorre impostare l&apos;opzione a "
-#~ "«utf8» <b>MYSQL_CHARSET</b> in config.php."
-
-#~ msgid "Converting database..."
-#~ msgstr "Conversione del database..."
-
-#~ msgid "Error: can't find body element."
-#~ msgstr "Errore: impossibile trovare l&apos;elemento body"
-
-#~ msgid "Feed browser is administratively disabled."
-#~ msgstr "Lo sfoglio del notiziario è disabilitato dall&apos;amministratore."
-
-#~ msgid "Feed information:"
-#~ msgstr "Informazioni notiziario:"
-
-#~ msgid "Site:"
-#~ msgstr "Sito:"
-
-#~ msgid "Last updated:"
-#~ msgstr "Ultimo aggiornamento:"
-
-#~ msgid "Last headlines:"
-#~ msgstr "Ultimi sommari:"
-
-#~ msgid ""
-#~ "Feed browser cache information is missing. Please refer to the <a "
-#~ "class='visibleLink' target='_blank' href='http://tt-rss.org/trac/wiki/"
-#~ "FeedBrowser'>wiki</a> for more information."
-#~ msgstr ""
-#~ "Mancano le informazioni della cache del browser notiziari. Fare "
-#~ "riferimento al <a class='visibleLink' target='_blank' href='http://tt-rss."
-#~ "org/trac/wiki/FeedBrowser'>wiki</a> per maggiori informazioni."
-
-#~ msgid "Top"
-#~ msgstr "Massimo"
-
-#~ msgid "Show"
-#~ msgstr "Mostra"
-
-#~ msgid "Couldn't find any feeds available for subscription."
-#~ msgstr ""
-#~ "Impossibile trovare dei notiziari disponibili per la sottoscrizione."
-
-#~ msgid "Labels and SQL Expressions"
-#~ msgstr "Etichette ed espressioni SQL"
-
-#~ msgid ""
-#~ "Label content is generated using SQL expressions. The &laquo;SQL "
-#~ "expression&raquo; is added to WHERE clause of view feed query. You can "
-#~ "match on ttrss_entries table fields and even use subselect to query "
-#~ "additional information. This \tfunctionality is considered to be advanced "
-#~ "and requires some understanding of SQL."
-#~ msgstr ""
-#~ "Il contenuto dell&apos;etichetta è generato utilizzando l&apos;"
-#~ "espressione SQL. L&apos;&laquo;espressione SQL&raquo; è aggiunta alla "
-#~ "clausola WHERE dell&apos;interrogazione di visualizzazione del "
-#~ "notiziario. Può corrispondere ai campi della tabella ttrss_entries e "
-#~ "anche utilizzare sotto selezioni per interrogare informazioni "
-#~ "addizionali. Questa \tfunzionalità è considerata avanzata e richiede "
-#~ "qualche conoscenza di SQL."
-
-#~ msgid "Examples"
-#~ msgstr "Esempi"
-
-#~ msgid "Match all unread articles:"
-#~ msgstr "Corrispondenza ad articoli non letti:"
-
-#~ msgid "Matches all articles which mention Linux in the title:"
-#~ msgstr ""
-#~ "Corrispondenza a tutti gli articoli che menzionano Linux nel titolo:"
-
-#~ msgid "Matches all articles for the last week (PostgreSQL):"
-#~ msgstr ""
-#~ "Corrispondenza a tutti gli ariticli dell&apos;ultima settimana "
-#~ "(PostgreSQL):"
-
-#~ msgid "Matches all articles with scores between 100 and 500:"
-#~ msgstr "Corrispondenza a tutti gli articoli con punteggio tra 100 e 500:"
-
-#~ msgid "Internal error: Function not implemented"
-#~ msgstr "Errore interno: funzione non implementata"
-
-#~ msgid "Data for offline browsing has not been downloaded yet."
-#~ msgstr ""
-#~ "I dati per la navigazione «fuori linea» non sono ancora stati scaricati."
-
-#~ msgid "Synchronizing feeds..."
-#~ msgstr "Sincronizzazioni notiziari..."
-
-#~ msgid "Synchronizing categories..."
-#~ msgstr "Sincronizzazione categorie..."
-
-#~ msgid "Synchronizing labels..."
-#~ msgstr "Sincronizzazione etichette..."
-
-#~ msgid "Synchronizing articles..."
-#~ msgstr "Sincronizzazione articoli..."
-
-#~ msgid "Synchronizing articles (%d)..."
-#~ msgstr "Sincronizzazione articoli (%d)..."
-
-#~ msgid "Last sync: %s"
-#~ msgstr "Ultima sinc.: %s"
-
-#~ msgid "Last sync: Error receiving data."
-#~ msgstr "Ultima sinc.: errore di ricezione dati."
-
-#~ msgid "Synchronizing..."
-#~ msgstr "Sincronizzazione..."
-
-#~ msgid "Switch Tiny Tiny RSS into offline mode?"
-#~ msgstr "Cambiare la modalità di Tiny Tiny RSS a «fuori linea»?"
-
-#~ msgid "Tiny Tiny RSS will reload. Go online?"
-#~ msgstr "Tiny Tiny RSS verrà riavviato. Andare «in linea»?"
-
-#~ msgid "Last sync: Cancelled."
-#~ msgstr "Ultima sinc.: annullata."
-
-#~ msgid ""
-#~ "This will remove all offline data stored by Tiny Tiny RSS on this "
-#~ "computer. Continue?"
-#~ msgstr ""
-#~ "Questo eliminerà tutti i dati «fuori linea» salvati da Tiny Tiny RSS su "
-#~ "questo computer. Continuare?"
-
-#~ msgid ""
-#~ "Tiny Tiny RSS has trouble accessing its server. Would you like to go "
-#~ "offline?"
-#~ msgstr ""
-#~ "Tiny Tiny RSS ha dei problemi a connettersi al proprio server. Si vuole "
-#~ "andare «fuori linea»?"
-
-#~ msgid "Update post on checksum change"
-#~ msgstr "Aggiornare la notizia al cambiamento della somma di controllo"
-
-#~ msgid "Use more accessible date/time format for headlines"
-#~ msgstr "Utilizzare un formato data/ora più accessibile per i sommari"
-
-#~ msgid "Set articles as unread on update"
-#~ msgstr "Impostare gli articoli come non letti durante l&apos;aggiornamento"
-
-#~ msgid "Importing OPML (using DOMXML extension)..."
-#~ msgstr "Importazione OPML (utilizzando l&apos;estensione DOMXML)..."
-
-#~ msgid "Importing OPML (using DOMDocument extension)..."
-#~ msgstr "Importazione OPML (utilizzando l&apos;estensione DOMDocument)..."
-
-#~ msgid "No profiles selected."
-#~ msgstr "Nessun profilo selezionato."
-
-#~ msgid "Unknown error"
-#~ msgstr "Errore sconosciuto"
-
-#~ msgid ""
-#~ "Could not display feed (query failed). Please check label match syntax or "
-#~ "local configuration."
-#~ msgstr ""
-#~ "Impossibile visualizzare il notiziario (interrogazione fallita). "
-#~ "Controllare che l&apos;etichetta corrisponda alla sintassi o la "
-#~ "configurazione locale."
-
-#~ msgid "Mark articles as read automatically"
-#~ msgstr "Segnare gli articoli automaticamente come letti"
-
-#~ msgid "Publish article with a note"
-#~ msgstr "Pubblica articolo con una nota"
-
-#~ msgid "Please enter a note for this article:"
-#~ msgstr "Inserire una nota per questo articolo:"
-
-#, fuzzy
-#~ msgid "View article"
-#~ msgstr "Filtra articoli"
-
-#, fuzzy
-#~ msgid "Server error while trying to query feed URLs."
-#~ msgstr "Errore durante il tentativo di caricare altre intestazioni"
-
-#~ msgid "Subscribed to %d feed(s)."
-#~ msgstr "Sottoscrizione effettuata a %d notiziari."
-
-#~ msgid "Fatal Exception"
-#~ msgstr "Errore fatale"
-
-#~ msgid "audio/mpeg"
-#~ msgstr "audio/mpeg"
-
-#~ msgid "Enable offline reading"
-#~ msgstr "Abilitare lettura fuori linea"
-
-#~ msgid "Synchronize new articles for offline reading using Google Gears."
-#~ msgstr ""
-#~ "Sincronizzare i nuovi articoli per la lettura fuori linea utilizzando "
-#~ "Google Gears."
-
-#~ msgid "Default article limit"
-#~ msgstr "Limite articoli predefinito"
-
-#~ msgid ""
-#~ "Default limit for articles to display, any custom number you like (0 - "
-#~ "disables)."
-#~ msgstr ""
-#~ "Limite predefinito per gli articoli da visualizzare (qualunque numero) (0 "
-#~ "- disabilitato)"
-
-#~ msgid "Enable search toolbar"
-#~ msgstr "Abilitare la barra degli strumenti di ricerca"
-
-#~ msgid "Open article links in new browser window"
-#~ msgstr ""
-#~ "Aprire i collegamenti degli articoli in una nuova finestra del browser"
-
-#~ msgid ""
-#~ "Link to user stylesheet to override default style, disabled if empty."
-#~ msgstr ""
-#~ "Collegamento al foglio di stile utente per scavalcare lo stile "
-#~ "predefinito. Disabilitato se vuoto."
-
-#~ msgid "Hide feedlist"
-#~ msgstr "Nascondere l&apos;elenco dei notiziari"
-
-#~ msgid ""
-#~ "This option hides feedlist and allows it to be toggled on the fly, useful "
-#~ "for small screens."
-#~ msgstr ""
-#~ "Questa opzione nasconde l&apos;elenco dei notiziari e permette di "
-#~ "mostrarlo al volo. Utile per schermi piccoli."
-
-#~ msgid "Enable feed icons"
-#~ msgstr "Abilitare icone notiziari"
-
-#~ msgid "Enable labels"
-#~ msgstr "Abilitare etichette"
-
-#~ msgid ""
-#~ "Experimental support for virtual feeds based on user crafted SQL queries. "
-#~ "This feature is highly experimental and at this point not user friendly. "
-#~ "Use with caution."
-#~ msgstr ""
-#~ "Supporto sperimentale per notiziari virtuali basato su interrogazioni SQL "
-#~ "artigianali dell&apos;utente. Questa caratteristica è molto sperimentale  "
-#~ "e a questo punto non amichevole per l&apos;utente. Utilizzare con cautela."
-
-#~ msgid "Show additional information in feedlist"
-#~ msgstr "Mostrare informazioni addizionali nell&apos;elenco notiziari"
-
-#~ msgid "Prefer more accurate feedlist counters to UI speed"
-#~ msgstr ""
-#~ "Preferire contatori di elenco notiziari più accurati per velocizzare "
-#~ "l&apos;interfaccia grafica"
-
-#~ msgid "Enable inline MP3 player"
-#~ msgstr "Abilitare riproduttore MP3 in linea"
-
-#~ msgid ""
-#~ "Enable the Flash-based XSPF Player to play MP3-format podcast enclosures."
-#~ msgstr ""
-#~ "Abilitare il riproduttore XSPF basato su Flash per riprodurre le custodie "
-#~ "podcast in formato MP3."
-
-#~ msgid ""
-#~ "Your browser doesn't support Javascript, which is required\n"
-#~ "\t\tfor this application to function properly. Please check your\n"
-#~ "\t\tbrowser settings."
-#~ msgstr ""
-#~ "Il browser non supporta Javascript, che è richiesto\n"
-#~ "\t\tda questa applicazione per funzionare correttamente. Controllare\n"
-#~ "\t\tle impostazioni del browser."
-
-#~ msgid "Activate"
-#~ msgstr "Attiva"
-
-#~ msgid ""
-#~ "You are running the latest version of Tiny Tiny RSS. The fact that you "
-#~ "are seeing this dialog is probably a bug."
-#~ msgstr ""
-#~ "Si sta eseguendo l&apos;ultima versione di Tiny Tiny RSS. Il motivo per "
-#~ "il quale si vede questo dialogo è probabilmente un errore."
-
-#~ msgid "Feed Browser"
-#~ msgstr "Browser notiziari"
-
-#~ msgid "Update Errors"
-#~ msgstr "Errori di aggiornamento"
-
-#~ msgid "Category editor"
-#~ msgstr "Editor categorie"
-
-#~ msgid "Show last article times"
-#~ msgstr "Mostrare l&apos;ora dell&apos;ultimo articolo"
-
-#~ msgid "Last&nbsp;Article"
-#~ msgstr "Ultimo&nbsp;articolo"
-
-#~ msgid "You don't have any subscribed feeds."
-#~ msgstr "Non ci sono notiziari sottoscritti."
-
-#~ msgid "No matching feeds found."
-#~ msgstr "Nessun articolo trovato che corrisponde."
-
-#~ msgid "Filter Editor"
-#~ msgstr "Editor filtri"
-
-#~ msgid "Field"
-#~ msgstr "Campo"
-
-#~ msgid "Params"
-#~ msgstr "Parametri"
-
-#~ msgid "(Disabled)"
-#~ msgstr "(disabilitato)"
-
-#~ msgid "No filters defined."
-#~ msgstr "Nessun filtro definito."
-
-#~ msgid "Click to change color"
-#~ msgstr "Fare clic per cambiare il colore"
-
-#~ msgid "No labels defined."
-#~ msgstr "Nessuna etichetta definita."
-
-#~ msgid "No matching labels found."
-#~ msgstr "Nessuna etichetta corrispondente trovata."
-
-#~ msgid "custom color:"
-#~ msgstr "colore personalizzato:"
-
-#~ msgid "Can't add filter: nothing to match on."
-#~ msgstr "Impossibile aggiungere il filtro: niente a cui corrisponda."
-
-#~ msgid "Can't subscribe: no feed URL given."
-#~ msgstr ""
-#~ "Impossibile annullare la sottoscrizione: nessun URL di notiziario è stato "
-#~ "dato."
-
-#~ msgid "Error: No feed URL given."
-#~ msgstr "Errore: non è stato fornito alcun URL di notiziario."
-
-#~ msgid "Error: Invalid feed URL."
-#~ msgstr "Errore: URL non valido del notiziario."
-
-#~ msgid "Can't add profile: no name specified."
-#~ msgstr "Impossibile aggiungere il profilo: nessun nome specificato."
-
-#~ msgid "Can't add category: no name specified."
-#~ msgstr "Impossibile aggiungere la categoria: nessun nome specificato."
-
-#~ msgid "No OPML file to upload."
-#~ msgstr "Nessun file OPML da caricare."
-
-#~ msgid "Save current configuration?"
-#~ msgstr "Salvare la configurazione attuale?"
-
-#~ msgid "Please enter new label foreground color:"
-#~ msgstr "Inserire il colore del testo nella nuova etichetta:"
-
-#~ msgid "Please enter new label background color:"
-#~ msgstr "Inserire il colore di sfondo della nuova etichetta:"
-
-#~ msgid "Saved filter <b>%s</b>"
-#~ msgstr "Filtro <b>%s</b> salvato"
-
-#, fuzzy
-#~ msgid "Tiny Tiny RSS"
-#~ msgstr "Ritorna a Tiny Tiny RSS"
-
-#~ msgid "Click to collapse category"
-#~ msgstr "Fare clic per contrarre la categoria"
-
-#~ msgid "Tags"
-#~ msgstr "Etichette"
-
-#~ msgid "Show article summary in new window"
-#~ msgstr "Mostra il sommario dell&apos;articolo in una nuova finestra"
-
-#~ msgid "toggle unread"
-#~ msgstr "inverti non letti"
-
-#~ msgid "(remove)"
-#~ msgstr "(rimuovi)"
-
-#~ msgid "Offline reading"
-#~ msgstr "Lettura fuori linea"
-
-#~ msgid "Cancel synchronization"
-#~ msgstr "Annulla sincronizzazione"
-
-#~ msgid "Synchronize"
-#~ msgstr "Sincronizza"
-
-#~ msgid "Remove stored data"
-#~ msgstr "Rimuovi dati salvati"
-
-#~ msgid "Go offline"
-#~ msgstr "Vai «fuori linea»"
-
-#~ msgid "Go online"
-#~ msgstr "Vai «in linea»"
-
-#, fuzzy
-#~ msgid "Toggle reordering mode"
-#~ msgstr "Inverti modalità riordinamento categoria"
-
-#~ msgid "Reset UI layout"
-#~ msgstr "Reimposta disposizione UI"
-
-#~ msgid "Drag me to resize panels"
-#~ msgstr "Trascina per ridimensionare i riquadri"
-
-#~ msgid "Showing most popular tags "
-#~ msgstr "Visualizza le etichette più popolari"
-
-#~ msgid "more tags"
-#~ msgstr "altre etichette"
-
-#~ msgid "Link to feed:"
-#~ msgstr "Collega al notiziario:"
-
-#~ msgid "Not linked"
-#~ msgstr "Non collegato"
-
-#~ msgid "(linked to %s)"
-#~ msgstr "(collegato a %s)"
-
-#~ msgid "E-mail has been changed."
-#~ msgstr "L&apos;email è stata cambiata."
-
-#~ msgid "Change e-mail"
-#~ msgstr "Cambia email"
-
-#~ msgid "Please wait..."
-#~ msgstr "Attendere prego..."
-
-#~ msgid "Reset category order?"
-#~ msgstr "Reimpostare l&apos;ordine dalla categoria?"
-
-#~ msgid "Generated feed"
-#~ msgstr "Notiziario generato"
-
-#~ msgid "No feeds to display."
-#~ msgstr "Nessun notiziario da visualizzare."
-
-#~ msgid "Published Articles"
-#~ msgstr "Articoli pubblicati"
-
-#~ msgid "Your Published articles feed URL is:"
-#~ msgstr "L'URL degli articoli pubblicati è:"
-
-#~ msgid "Replace current publishing address with a new one?"
-#~ msgstr "Sostituire l&apos;indirizzo di pubblicazione attuale con uno nuovo?"
-
-#~ msgid "Remove selected users?"
-#~ msgstr "Rimuovere gli utenti selezionati?"
-
-#~ msgid "Adding feed..."
-#~ msgstr "Aggiunta notiziario..."
-
-#~ msgid "Adding user..."
-#~ msgstr "Aggiunta utente..."
-
-#~ msgid "Assign score to article:"
-#~ msgstr "Assegna punteggio all'articolo:"
-
-#~ msgid "Assign selected articles to label?"
-#~ msgstr "Assegnare l'etichetta agli articoli selezionati?"
-
-#~ msgid "Can't open article: received invalid article link"
-#~ msgstr ""
-#~ "Impossibile aprire l'articolo: ricevuto collegamento di articolo non "
-#~ "valido"
-
-#~ msgid "Category reordering disabled"
-#~ msgstr "Riordinamento categoria disabilitato"
-
-#~ msgid "Category reordering enabled"
-#~ msgstr "Riordinamento categoria abilitato"
-
-#, fuzzy
-#~ msgid "Changing password..."
-#~ msgstr "Cambia password"
-
-#~ msgid "Clearing feed..."
-#~ msgstr "Pulizia notiziario..."
-
-#~ msgid "Clearing selected feed..."
-#~ msgstr "Pulizia del notiziario selezionato..."
-
-#~ msgid "comments"
-#~ msgstr "commenti"
-
-#~ msgid "Could not change feed URL."
-#~ msgstr "Impossibile cambiare l&apos;URL del notiziario."
-
-#~ msgid "Could not display article (missing XML object)"
-#~ msgstr "Impossibili visualizzare l&apos;articolo (manca l&apos;oggetto XML)"
-
-#~ msgid "Could not update headlines (missing XML data)"
-#~ msgstr "Impossibile aggiornare i sommari (dati XML mancanti)"
-
-#~ msgid "Could not update headlines (missing XML object)"
-#~ msgstr "Impossibile aggiornare i sommari (oggetto XML mancante)"
-
-#~ msgid "Failed to load article in new window"
-#~ msgstr "Fallito il caricamento dell'articolo in una nuova finestra"
-
-#~ msgid "Failed to open window for the article"
-#~ msgstr "Fallita l'apertura della finestra per l'articolo"
-
-#, fuzzy
-#~ msgid "Feed icon removed."
-#~ msgstr "Notiziario non trovato."
-
-#~ msgid "Local data removed."
-#~ msgstr "Dati locali rimossi."
-
-#~ msgid "Mark as read:"
-#~ msgstr "Segna come letti:"
-
-#~ msgid "Marking all feeds as read..."
-#~ msgstr "Segnatura dei notiziari come letti..."
-
-#~ msgid "Please wait until operation finishes."
-#~ msgstr "Attendere fino a quando l'operazione non è finita."
-
-#~ msgid "Remove selected articles from label?"
-#~ msgstr "Rimuovere dall'etichetta gli articoli selezionati?"
-
-#~ msgid "Removing feed..."
-#~ msgstr "Rimozione notiziario..."
-
-#~ msgid "Removing filter..."
-#~ msgstr "Rimozione del filtro..."
-
-#~ msgid "Removing offline data..."
-#~ msgstr "Rimozione dati «fuori linea»..."
-
-#~ msgid "Removing selected categories..."
-#~ msgstr "Rimozione delle categorie selezionate..."
-
-#~ msgid "Removing selected filters..."
-#~ msgstr "Rimozione dei filtri selezionati..."
-
-#~ msgid "Removing selected labels..."
-#~ msgstr "Rimozione delle etichette selezionate..."
-
-#, fuzzy
-#~ msgid "Removing selected profiles..."
-#~ msgstr "Rimozione dei filtri selezionati..."
-
-#~ msgid "Removing selected users..."
-#~ msgstr "Rimozione degli utenti selezionati..."
-
-#~ msgid "Rescore last 100 articles in selected feeds?"
-#~ msgstr ""
-#~ "Cambiare il punteggio degli ultimi 100 articoli nei notiziari selezionati?"
-
-#~ msgid "Rescoring articles..."
-#~ msgstr "Cambiamento del punteggio degli articoli..."
-
-#~ msgid "Resetting password for selected user..."
-#~ msgstr "Reimpostazione della password per l&apos;utente selezionato..."
-
-#~ msgid "Saving article tags..."
-#~ msgstr "Salvataggio etichette articolo..."
-
-#~ msgid "Saving feed..."
-#~ msgstr "Salvataggio notiziario..."
-
-#~ msgid "Saving feeds..."
-#~ msgstr "Salvataggio notiziari..."
-
-#~ msgid "Saving filter..."
-#~ msgstr "Salvataggio filtro..."
-
-#~ msgid "Saving user..."
-#~ msgstr "Salvataggio utente..."
-
-#~ msgid "Selection"
-#~ msgstr "Selezione"
-
-#~ msgid "Tiny Tiny RSS is in offline mode."
-#~ msgstr "Tiny Tiny RSS è in modalità «fuori linea»."
-
-#~ msgid "Trying to change e-mail..."
-#~ msgstr "Tentativo di cambio dell&apos;email..."
-
-#, fuzzy
-#~ msgid "Upload failed."
-#~ msgstr "Articoli aggiornati"
-
-#~ msgid ""
-#~ "You have to synchronize some articles before going into offline mode."
-#~ msgstr ""
-#~ "Occorre sincronizzare alcuni articoli prima di andare nella modalità "
-#~ "«fuori linea»."
-
-#~ msgid ""
-#~ "You won't be able to access offline version of Tiny Tiny RSS until you "
-#~ "switch it into offline mode again. Go online?"
-#~ msgstr ""
-#~ "Non si potrà accedere alla versione «fuori linea» di Tiny Tiny RSS fino a "
-#~ "quando non si cambierà la modalità a «fuori linea». Andare «in linea»?"
-
-#~ msgid "All feeds updated."
-#~ msgstr "Tutti i notiziari aggiornati."
-
-#~ msgid "Can't open article: received invalid XML"
-#~ msgstr "Impossibile aprire l'articolo: ricevuto XML non valido"
-
-#~ msgid "Changing category of selected feeds..."
-#~ msgstr "Cambiamento della categoria dei notiziari selezionati..."
-
-#~ msgid "Erase all non-starred articles in %s?"
-#~ msgstr "Eliminare tutti gli articoli senza la stella in «%s»?"
-
-#~ msgid "Published feed URL changed."
-#~ msgstr "L'URL del notiziario pubblicato è cambiata."
-
-#~ msgid "Trying to change address..."
-#~ msgstr "Tentativo di cambio dell'indirizzo..."
-
-#~ msgid "Trying to change password..."
-#~ msgstr "Tentativo di cambio della password..."
-
-#~ msgid "Unsubscribing from selected feeds..."
-#~ msgstr "Annullamento della sottoscrizione dai notiziari selezionati..."
-
-#~ msgid "You can't clear this type of feed."
-#~ msgstr "Impossibile pulire questo tipo di notiziario."
-
-#~ msgid "Adding category <b>%s</b>...<br>"
-#~ msgstr "Aggiunta della categoria <b>%s</b>...<br />"
-
-#~ msgid "Done."
-#~ msgstr "Fatto."
-
-#~ msgid "The configuration was reset to defaults."
-#~ msgstr "Questa configurazione è stata reimpostata ai valori predefiniti."
-
-#~ msgid "Themes"
-#~ msgstr "Temi"
-
-#~ msgid "Change theme"
-#~ msgstr "Cambia tema"
-
-#, fuzzy
-#~ msgid "Hide read items"
-#~ msgstr "Visualizza/Nascondi notiziari letti"
-
-#, fuzzy
-#~ msgid "Remove selected feeds from archive?"
-#~ msgstr "Rimuovere dall'etichetta gli articoli selezionati?"
-
-#~ msgid "Search results"
-#~ msgstr "Risultati della ricerca"
-
-#~ msgid "Searched for"
-#~ msgstr "Ricerca"
-
-#~ msgid "More feeds..."
-#~ msgstr "Altri notiziari..."
-
-#~ msgid "Toggle Feedlist"
-#~ msgstr "Inverti elenco notiziari"
-
-#~ msgid "Search:"
-#~ msgstr "Cerca:"
-
-#~ msgid "Order:"
-#~ msgstr "Ordine:"
-
-#~ msgid "browse more"
-#~ msgstr "sfoglia altre"
-
-#~ msgid "Hide from \"Other Feeds\""
-#~ msgstr "Nascondere in \"Altri notiziari\""
-
-#~ msgid "Unable to delete non empty feed categories."
-#~ msgstr "Impossibile eliminare categorie di notiziario non vuote."
-
-#~ msgid "(Hidden)"
-#~ msgstr "(Nascosto)"
-
-#~ msgid "Other:"
-#~ msgstr "Altro:"
-
-#~ msgid "Generate another link"
-#~ msgstr "Genera altro collegamento"
-
-#~ msgid "Back"
-#~ msgstr "Indietro"
-
-#~ msgid "View:"
-#~ msgstr "Vista:"
-
-#~ msgid "Refresh"
-#~ msgstr "Aggiorna"
-
-#~ msgid "Page"
-#~ msgstr "Pagina"
-
-#, fuzzy
-#~ msgid "Back to feedlist"
-#~ msgstr "Fare clic per modificare"
-
-#~ msgid "Tags:"
-#~ msgstr "Etichette:"
-
-#, fuzzy
-#~ msgid "Mark as unread"
-#~ msgstr "Segna come letto"
-
-#~ msgid "Where:"
-#~ msgstr "Dove:"
-
-#~ msgid "Match on:"
-#~ msgstr "Corrisponde a:"
-
-#, fuzzy
-#~ msgid "Click to view"
-#~ msgstr "Fare clic per modificare"
-
-#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
-#~ msgstr "&nbsp;&nbsp;Scorciatoie da tastiera"
-
-#~ msgid "Can't add user: no login specified."
-#~ msgstr "Impossibile aggiungere l&apos;utente: nessun accesso specificato."
-
-#~ msgid "Can't create label: missing SQL expression."
-#~ msgstr "Impossibile creare l&apos;etichetta: espressione SQL mancante."
-
-#~ msgid "Saving label..."
-#~ msgstr "Salvataggio etichetta..."
-
-#~ msgid "Please select only one label."
-#~ msgstr "Selezionare una sola etichetta."
-
-#~ msgid "Please select only one category."
-#~ msgstr "Selezionare una sola categoria."
-
-#~ msgid "Address changed."
-#~ msgstr "Indirizzo cambiato"
-
-#~ msgid ""
-#~ "Rescore articles in all feeds? This operation may take a lot of time."
-#~ msgstr ""
-#~ "Cambiare il punteggio in tutti i notiziari? Questa operazione può durare "
-#~ "molto tempo."
-
-#~ msgid "Rescoring feeds..."
-#~ msgstr "Cambiamento del punteggio dei notiziari..."
-
-#, fuzzy
-#~ msgid "Restart in offline mode"
-#~ msgstr "Controllo della configurazione fallito"
-
-#~ msgid ""
-#~ "<b>Fatal Error</b>: You forgot to copy \n"
-#~ "\t\t<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"
-#~ msgstr ""
-#~ "<b>Errore fatale</b>: non è stato copiato \n"
-#~ "\t\t<b>config.php-dist</b> in <b>config.php</b> e modificato.\n"
-
-#~ msgid ""
-#~ "config: your config file version is incorrect. See config.php-dist.\n"
-#~ msgstr ""
-#~ "config: la versione del file config non è corretta. Vedere config.php-"
-#~ "dist.\n"
-
-#~ msgid ""
-#~ "<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this\n"
-#~ "\t\t\toption from config.php\n"
-#~ msgstr ""
-#~ "<b>Errore fatale</b>: RSS_BACKEND_TYPE è deprecata. Rimuovere\n"
-#~ "\t\tquesta opzione da config.php\n"
-
-#~ msgid ""
-#~ "<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>\n"
-#~ "\t\tand <b>xml-import.php</b>) could be used maliciously. Please remove "
-#~ "them \n"
-#~ "\t\tfrom your TT-RSS instance.\n"
-#~ msgstr ""
-#~ "<b>Errore fatale</b>: gli strumenti di importazione/esportazione XML\n"
-#~ "\t\t(<b>xml-export.php</b> e <b>xml-import.php</b>) potrebbero essere "
-#~ "utilizzati\n"
-#~ "\t\tmalevolmente. Rimuoverli\n"
-
-#~ msgid ""
-#~ "<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT\n"
-#~ "\t\t\tto 0 in single user mode.\n"
-#~ msgstr ""
-#~ "<b>Errore fatale</b>: impostare DAEMON_UPDATE_LOGIN_LIMIT\n"
-#~ "\t\t\ta 0 nella modalità singolo utente.\n"
-
-#~ msgid ""
-#~ "<b>Fatal Error</b>: You have enabled USE_CURL_FOR_ICONS, but your PHP \n"
-#~ "\t\t\tdoesn't seem to support CURL functions."
-#~ msgstr ""
-#~ "<b>Errore fatale</b>: è stato abilitato USE_CURL_FOR_ICONS, ma PHP \n"
-#~ "\t\t\tnon sembra supportare le funzioni di CURL."
-
-#~ msgid "config: SESSION_EXPIRE_TIME is undefined"
-#~ msgstr "configurazione: SESSION_EXPIRE_TIME non è definita."
-
-#~ msgid "config: SESSION_EXPIRE_TIME is too low (less than 60)"
-#~ msgstr "configurazione: SESSION_EXPIRE_TIME è troppo bassa (meno di 60)"
-
-#, fuzzy
-#~ msgid "config: SESSION_EXPIRE_TIME should be greater or equal to"
-#~ msgstr ""
-#~ "configurazione: SESSION_EXPIRE_TIME dovrebbe essere maggiore o uguale a "
-#~ "SESSION_COOKIE_LIFETIME"
-
-#~ msgid ""
-#~ "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"
-#~ msgstr ""
-#~ "configurazione: DATABASE_BACKED_SESSIONS non è compatibile con "
-#~ "SINGLE_USER_MODE"
-
-#~ msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
-#~ msgstr ""
-#~ "configurazione: DATABASE_BACKED_SESSIONS sono attualmente non funzionanti "
-#~ "con MySQL"
-
-#~ msgid ""
-#~ "config: MAIL_FROM has been split into DIGEST_FROM_NAME and "
-#~ "DIGEST_FROM_ADDRESS"
-#~ msgstr ""
-#~ "configurazione: MAIL_FROM è stata divisa in DIGEST_FROM_NAME e "
-#~ "DIGEST_FROM_ADDRESS"
-
-#~ msgid "config: option COUNTERS_MAX_AGE expected, but not defined"
-#~ msgstr ""
-#~ "configurazione: è attesa l&apos;opzione COUNTERS_MAX_AGE, ma non è stata "
-#~ "definita"
-
-#~ msgid ""
-#~ "config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option "
-#~ "and read about other ways to update feeds on the <a href='http://tt-rss."
-#~ "spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-#~ msgstr ""
-#~ "configurazione: l&apos;opzione DAEMON_REFRESH_ONLY è obsoleta. Rimuovere "
-#~ "questa opzione e leggere per altri modi di aggiornare i notiziari sul <a "
-#~ "href='http://tt-rss.spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>."
-
-#~ msgid "Unknown Error"
-#~ msgstr "Errore sconosciuto"
-
-#~ msgid "Other feeds: Top 25"
-#~ msgstr "Altri notiziari: primi 25"
-
-#~ msgid "Showing top 25 registered feeds, sorted by popularity:"
-#~ msgstr "Mostra i primi 25 notiziari registrati, ordinati per popolarità:"
-
-#~ msgid "Top 25"
-#~ msgstr "Primi 25"
-
-#~ msgid "Content Filtering"
-#~ msgstr "Filtro contenuti"
-
-#~ msgid "User Manager"
-#~ msgstr "Gestore utenti"
-
-#~ msgid "Toggle:"
-#~ msgstr "Inverti:"
-
-#~ msgid "&nbsp;&nbsp;Subscribe to feed"
-#~ msgstr "&nbsp;&nbsp;Sottoscrivi il notiziario"
-
-#~ msgid "&nbsp;&nbsp;Edit this feed"
-#~ msgstr "&nbsp;&nbsp;Modifica questo notiziario"
-
-#~ msgid "&nbsp;&nbsp;Clear articles"
-#~ msgstr "&nbsp;&nbsp;Pulisci articoli"
-
-#~ msgid "&nbsp;&nbsp;Rescore feed"
-#~ msgstr "&nbsp;&nbsp;Cambio punteggio al notiziario"
-
-#~ msgid "&nbsp;&nbsp;Unsubscribe"
-#~ msgstr "&nbsp;&nbsp;Annullare sottoscrizione"
-
-#~ msgid "&nbsp;&nbsp;Mark as read"
-#~ msgstr "&nbsp;&nbsp;Segna come letto"
-
-#~ msgid "&nbsp;&nbsp;(Un)hide read feeds"
-#~ msgstr "&nbsp;&nbsp;Visualizza/Nascondi notiziari letti"
-
-#, fuzzy
-#~ msgid "&nbsp;&nbsp;Create label"
-#~ msgstr "&nbsp;&nbsp;Crea filtro"
-
-#~ msgid "&nbsp;&nbsp;Create filter"
-#~ msgstr "&nbsp;&nbsp;Crea filtro"
-
-#~ msgid "&nbsp;&nbsp;Reset category order"
-#~ msgstr "&nbsp;&nbsp;Reimposta ordine categoria"
-
-#~ msgid ""
-#~ "This panel shows feeds subscribed by other users of this system, just in "
-#~ "case you are interested in them too."
-#~ msgstr ""
-#~ "Questo riquadro mostra i notiziari sottoscritti da altri utenti di questo "
-#~ "sistema, in caso si sia interessati anche a questi."
-
-#~ msgid "Match "
-#~ msgstr "Corrisponde "
-
-#~ msgid "Title contains"
-#~ msgstr "Il titolo contiene"
-
-#~ msgid "Content contains"
-#~ msgstr "Il contenuto contiene"
-
-#~ msgid "Score equals"
-#~ msgstr "Il punteggio è"
-
-#~ msgid "Score is greater than"
-#~ msgstr "Il punteggio è maggiore di"
-
-#~ msgid "Score is less than"
-#~ msgstr "Il punteggio è minore di"
-
-#~ msgid "Articles newer than X hours"
-#~ msgstr "Articoli più recenti di X ore"
-
-#~ msgid "Articles newer than X days"
-#~ msgstr "Articoli più recenti di X giorni"
-
-#~ msgid "Add"
-#~ msgstr "Aggiungi"
-
-#~ msgid ""
-#~ "Sorry, labels have been administratively disabled for this installation. "
-#~ "Please contact instance owner or edit configuration file to enable this "
-#~ "functionality."
-#~ msgstr ""
-#~ "Le etichette sono state disabilitate dall&apos;amministratore per questa "
-#~ "installazione. Contattare il proprietario dell&apos;istanza o modificare "
-#~ "il file di configurazione per abilitare questa funzionalità."
-
-#~ msgid "Match SQL"
-#~ msgstr "SQL di corrispondenza"
-
-#~ msgid "Error: SQL expression is blank."
-#~ msgstr "Errore: l&apos;espressione SQL è vuota."
-
-#~ msgid "Saved label <b>%s</b>"
-#~ msgstr "Etichetta <b>%s</b> salvata"
-
-#~ msgid "SQL Expression"
-#~ msgstr "Espressione SQL"
-
-#~ msgid "[No caption]"
-#~ msgstr "[Nessuna intestazione]"
-
-#~ msgid "Search to label"
-#~ msgstr "Cerca per etichetta"
-
-#~ msgid "Convert to label"
-#~ msgstr "Converti a etichetta"
-
-#~ msgid "Dashboard"
-#~ msgstr "Bacheca"
-
-#~ msgid "Create Label"
-#~ msgstr "Crea etichetta"
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index cd92af8e..50d3585e 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 b882a91d..0c1cb546 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-01-30 16:39+0400\n"
+"POT-Creation-Date: 2012-03-12 13:59+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"
@@ -80,7 +80,7 @@ msgstr "毎日"
 msgid "Weekly"
 msgstr "毎週"
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr "標準"
 
@@ -136,7 +136,7 @@ msgstr "Tiny Tiny RSS のデータベースを更新しました。"
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
@@ -210,9 +210,9 @@ msgid ""
 msgstr ""
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
 msgstr "読み込みんでいます。しばらくお待ちください..."
 
@@ -299,7 +299,7 @@ msgstr ""
 "確認してください。"
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr "設定"
 
@@ -357,7 +357,7 @@ msgstr "更新日時"
 msgid "Sort articles"
 msgstr "記事を保管しました"
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 msgid "Date"
 msgstr "日付"
 
@@ -369,13 +369,13 @@ msgstr "題名"
 msgid "Score"
 msgstr "スコア"
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr "更新"
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr "既読にする"
 
@@ -403,7 +403,7 @@ msgstr "フィードを編集する..."
 msgid "Rescore feed"
 msgstr "フィードのスコアを再計算しています..."
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
@@ -515,11 +515,11 @@ msgid "Exit preferences"
 msgstr "設定を終了する"
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 msgid "Feeds"
 msgstr "フィード"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 msgid "Filters"
 msgstr "フィルター"
 
@@ -605,7 +605,7 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 #, fuzzy
 msgid "Register"
 msgstr "登録済み"
@@ -689,7 +689,7 @@ msgstr "マウスカーソルの下の記事を選択する"
 msgid "Create label"
 msgstr "ラベルを作成する"
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
@@ -735,11 +735,11 @@ msgstr "フィード操作"
 msgid "Refresh active feed"
 msgstr "有効なフィードの更新"
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 msgid "Edit feed"
 msgstr "フィードを編集する"
 
@@ -894,7 +894,7 @@ msgstr "未読記事数によるフィードの並び替え"
 msgid "Article not found."
 msgstr "フィードが見つかりません。"
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr "ヘルプのトピックが見つかりません。"
 
@@ -907,9 +907,9 @@ msgstr "保存"
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
@@ -928,7 +928,7 @@ msgstr "フィルターを作成する"
 msgid "(active)"
 msgstr ""
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 #, fuzzy
 msgid "Default profile"
@@ -980,18 +980,18 @@ msgid ""
 "contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr "フィード"
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 #, fuzzy
 msgid "Feed URL"
 msgstr "フィード"
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 msgid "Place in category:"
 msgstr "カテゴリーの場所:"
 
@@ -1000,18 +1000,18 @@ msgstr "カテゴリーの場所:"
 msgid "Available feeds"
 msgstr "すべてのフィード"
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr "認証"
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr "ログイン"
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 #, fuzzy
 msgid "Password"
 msgstr "パスワード:"
@@ -1036,14 +1036,14 @@ msgstr "さらなるフィード"
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr "取り消し"
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr "検索"
@@ -1063,8 +1063,8 @@ msgstr "フィード操作"
 msgid "limit:"
 msgstr "制限:"
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr "削除"
@@ -1098,58 +1098,58 @@ msgstr "すべてのフィード"
 msgid "This feed"
 msgstr "このフィード"
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr "一致"
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr "前"
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 msgid "after"
 msgstr "後"
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr ""
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr ""
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 msgid "in"
 msgstr ""
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 msgid "Perform Action"
 msgstr "操作の実行"
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr "パラメーター:"
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 msgid "Options"
 msgstr "オプション"
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr "有効にする"
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr "一致しない"
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
+#: classes/dlg.php:539 classes/pref_filters.php:371
 #, fuzzy
 msgid "Apply to category"
 msgstr "カテゴリーの場所:"
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
 msgstr "テスト"
 
@@ -1183,8 +1183,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr "この記事のタグ (カンマで区切ります):"
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "保存"
@@ -1247,7 +1247,7 @@ msgstr ""
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL:"
@@ -1302,7 +1302,7 @@ msgstr ""
 msgid "Feeds require authentication."
 msgstr "このフィードは認証を要求します。"
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 #, fuzzy
 msgid "Visit the website"
 msgstr "オフィシャルサイトに訪問する"
@@ -1316,8 +1316,8 @@ msgstr "フィードを閲覧する"
 msgid "Select:"
 msgstr "選択:"
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr "すべて"
@@ -1326,8 +1326,8 @@ msgstr "すべて"
 msgid "Invert"
 msgstr "反転"
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr "なし"
@@ -1372,21 +1372,21 @@ msgstr "フィードが見つかりません。"
 msgid "mark as read"
 msgstr "既読にする"
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 #, fuzzy
 msgid "Originally from:"
 msgstr "元の記事内容を表示する"
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "新しいウィンドウで記事を開く"
 
-#: classes/feeds.php:723 include/functions.php:3350
+#: classes/feeds.php:723 include/functions.php:3380
 #, fuzzy
 msgid "Close article"
 msgstr "記事を消去する"
@@ -1415,18 +1415,18 @@ msgstr ""
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
@@ -1467,276 +1467,286 @@ msgstr "タグを編集する"
 msgid "Check to enable field"
 msgstr ""
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "フィードを編集する"
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 #, fuzzy
 msgid "Feed Title"
 msgstr "題名"
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr ""
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr "記事の削除:"
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "自分のフィード一覧から隠す"
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr "右から左のコンテンツ"
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr "電子メールダイジェストに含む"
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr "ローカルに画像をキャッシュする"
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "すべての記事を既読にしますか?"
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 #, fuzzy
 msgid "Icon"
 msgstr "操作"
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr ""
 
-#: classes/pref_feeds.php:518
+#: classes/pref_feeds.php:524
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "フィードを購読する:"
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr "すべて終了しました。"
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> を購読しました。"
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: classes/pref_feeds.php:1017
+#: classes/pref_feeds.php:1024
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "フィードがありません。"
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: classes/pref_feeds.php:1028
+#: classes/pref_feeds.php:1030
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "公開フィードの URL を変更しました。"
+
+#: classes/pref_feeds.php:1035
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1057
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
 msgstr "購読オプションの編集"
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "カテゴリー <b>%s</b> はデータベースに既に存在します。"
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr "カテゴリーの作成"
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr "フィードカテゴリーが定義されていません。"
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "選択されたカテゴリーを削除しますか?"
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "フィードエディター"
 
-#: classes/pref_feeds.php:1280
+#: classes/pref_feeds.php:1287
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "元のフィード"
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 #, fuzzy
 msgid "Select"
 msgstr "選択:"
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "選択したフィードを削除しています..."
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 #, fuzzy
 msgid "Reset sort order"
 msgstr "パスワードのリセット"
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "購読をやめる"
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 #, fuzzy
 msgid "Categories"
 msgstr "カテゴリー:"
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
 msgstr "カテゴリーの編集"
 
-#: classes/pref_feeds.php:1345
+#: classes/pref_feeds.php:1338
+#, fuzzy
+msgid "(Un)hide empty categories"
+msgstr "カテゴリーの編集"
+
+#: classes/pref_feeds.php:1354
 #, fuzzy
 msgid "More actions..."
 msgstr "操作..."
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr "手動削除"
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 msgid "Clear feed data"
 msgstr "フィードデータの消去"
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 msgid "Rescore articles"
 msgstr "記事のスコアの再集計"
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
 msgstr ""
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref_feeds.php:1408
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref_feeds.php:1410
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref_feeds.php:1423
+#: classes/pref_feeds.php:1432
 #, fuzzy
 msgid "Import my OPML"
 msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 
-#: classes/pref_feeds.php:1427
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref_feeds.php:1429
+#: classes/pref_feeds.php:1438
 #, fuzzy
 msgid "Include settings"
 msgstr "電子メールダイジェストに含む"
 
-#: classes/pref_feeds.php:1433
+#: classes/pref_feeds.php:1442
 #, fuzzy
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: classes/pref_feeds.php:1439
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1442
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1445
+#: classes/pref_feeds.php:1454
 #, fuzzy
 msgid "Article archive"
 msgstr "記事の日付"
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
+#: classes/pref_feeds.php:1459
 #, fuzzy
 msgid "Export my data"
 msgstr "OPML エクスポート"
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr "インポート"
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox 統合"
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1744,109 +1754,113 @@ msgstr ""
 "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
 "Tiny RSS のサイトを使うことができます。"
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: classes/pref_feeds.php:1503
+#: classes/pref_feeds.php:1512
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 #, fuzzy
 msgid "Display URL"
 msgstr "タグの表示"
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1520
+#: classes/pref_feeds.php:1529
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref_feeds.php:1523
+#: classes/pref_feeds.php:1532
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "記事のお気に入りを解除する"
 
-#: classes/pref_feeds.php:1529
+#: classes/pref_feeds.php:1538
 #, fuzzy
 msgid "Twitter"
 msgstr "題名"
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "フィードデータの消去"
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: classes/pref_filters.php:84
+#: classes/pref_filters.php:89
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "一致するフィルターが見つかりません。"
 
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
+msgstr ""
+
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "フィルター <b>%s</b> を作成しました"
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
 msgstr "編集"
@@ -1926,99 +1940,99 @@ msgstr "パスワードを変更しました。"
 msgid "Old password is incorrect."
 msgstr "古いパスワードが不正確です。"
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr "設定を保存しました。"
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr "不明なオプション: %s"
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref_prefs.php:159
+#: classes/pref_prefs.php:168
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "認証"
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr ""
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr "電子メール"
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 msgid "Access level"
 msgstr "アクセスレベル"
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 #, fuzzy
 msgid "Save data"
 msgstr "保存"
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "パスワードが標準のままです。\n"
 "                                                変更してください。"
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr "現在のパスワード"
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr "新しいパスワード(確認)"
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr "パスワードを変更する"
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr "テーマを選択する"
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr ""
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr "はい"
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr "いいえ"
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
 msgstr ""
 
-#: classes/pref_prefs.php:468
+#: classes/pref_prefs.php:477
 #, php-format
-msgid "Current server time: %s"
+msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr "設定を保存する"
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr ""
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr "標準に戻す"
 
@@ -2115,29 +2129,25 @@ msgstr "ユーザーが定義されていません。"
 msgid "No matching users found."
 msgstr "ユーザーが見つかりません。"
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr "タグがありません"
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "登録情報が完成していません。"
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "パスワードを変更しました。"
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
@@ -2169,65 +2179,65 @@ msgstr "ユーザー名かパスワードが正しくありません"
 msgid "Archived articles"
 msgstr "未読記事"
 
-#: include/functions.php:3158 js/viewfeed.js:1945
+#: include/functions.php:3188 js/viewfeed.js:1954
 #, fuzzy
 msgid "Click to play"
 msgstr "編集するにはクリック"
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:4104
+#: include/functions.php:4134
 #, fuzzy
 msgid "(edit note)"
 msgstr "ノートの編集"
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr "フィードは選択されていません。"
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr "添付:"
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 msgid "Attachments:"
 msgstr "添付:"
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "お気に入りの記事"
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
-#: include/functions.php:5241
+#: include/functions.php:5287
 #, fuzzy
 msgid "Could not import: incorrect schema version."
 msgstr ""
 "必要なスキーマファイルを見つけられませんでした。次のバージョンが必要です:"
 
-#: include/functions.php:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
 msgstr ""
 
@@ -2261,7 +2271,7 @@ msgstr "公開記事"
 msgid "Assign tags"
 msgstr "タグの割り当て"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr "ラベルの割り当て"
 
@@ -2343,7 +2353,7 @@ msgid "Click to register your SSL client certificate with tt-rss"
 msgstr ""
 
 #: include/localized_schema.php:32
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
@@ -2462,7 +2472,7 @@ msgstr ""
 msgid "Sort headlines by feed date"
 msgstr "未読記事数によるフィードの並び替え"
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "ユーザースタイルシートの URL"
@@ -2488,7 +2498,7 @@ msgstr "ファイル:"
 msgid "Use less traffic"
 msgstr ""
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 msgid "Mark all articles in %s as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
@@ -2548,7 +2558,7 @@ msgstr "ヘルプを読み込んでいます..."
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 #, fuzzy
 msgid "Update feed"
 msgstr "すべてのフィードの更新"
@@ -2626,70 +2636,70 @@ msgstr "カテゴリーから購読をやめることができません。"
 msgid "Create Filter"
 msgstr "フィルターを作成する"
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 #, fuzzy
 msgid "Filter Test Results"
 msgstr "フィルター表現"
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 msgid "Unsubscribe from %s?"
 msgstr "%s の購読をやめますか?"
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "このアーティクルのノートを入力してください:"
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 #, fuzzy
 msgid "You can't edit this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 #, fuzzy
 msgid "Edit Feed"
 msgstr "フィードを編集する"
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 #, fuzzy
 msgid "More Feeds"
 msgstr "さらなるフィード"
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr "選択されたフィードはありません。"
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "フィードエディター"
 
-#: js/functions.js:1597 js/prefs.js:1232
+#: js/functions.js:1617 js/prefs.js:1232
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 msgid "No articles are selected."
 msgstr "記事は選択されていません。"
 
@@ -2875,57 +2885,57 @@ msgstr ""
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 msgid "Label Editor"
 msgstr "ラベルエディター"
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1807
+#: js/prefs.js:1822
 #, fuzzy
 msgid "Link Instance"
 msgstr "タグを編集する"
 
-#: js/prefs.js:1858
+#: js/prefs.js:1873
 #, fuzzy
 msgid "Edit Instance"
 msgstr "タグを編集する"
 
-#: js/prefs.js:1907
+#: js/prefs.js:1922
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: js/prefs.js:1924 js/prefs.js:1936
+#: js/prefs.js:1939 js/prefs.js:1951
 #, fuzzy
 msgid "No instances are selected."
 msgstr "選択されたフィルターはありません。"
 
-#: js/prefs.js:1941
+#: js/prefs.js:1956
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "フィルターをひとつだけ選択してください。"
 
-#: js/prefs.js:1976
+#: js/prefs.js:1991
 #, fuzzy
 msgid "Export Data"
 msgstr "OPML エクスポート"
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
-#: js/prefs.js:2056
+#: js/prefs.js:2071
 #, fuzzy
 msgid "Data Import"
 msgstr "インポート"
 
-#: js/prefs.js:2091
+#: js/prefs.js:2106
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "フィードを購読しています..."
@@ -2939,109 +2949,109 @@ msgstr "記事をお気に入りにする"
 msgid "Mark all articles as read?"
 msgstr "すべての記事を既読にしますか?"
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr "カテゴリーから購読をやめることができません。"
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 msgid "Please select some feed first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 msgid "Rescore articles in %s?"
 msgstr "%s の記事のスコアを再計算しますか?"
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 #, fuzzy
 msgid "New version available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 msgid "Mark all visible articles in %s as read?"
 msgstr "「%s」のすべての可視記事を既読に設定しますか?"
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "ラベルから選択した記事を削除しますか?"
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "お気に入りの記事"
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 msgid "Mark %d selected articles in %s as read?"
 msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "タグを編集する"
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 msgid "No article is selected."
 msgstr "選択された記事はありません。"
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 msgid "No articles found to mark"
 msgstr "マークした記事が見つかりません"
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 msgid "Mark %d article(s) as read?"
 msgstr "%d 件のマークした記事を既読として設定しますか?"
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 #, fuzzy
 msgid "Loading..."
 msgstr "フィード一覧を読み込んでいます..."
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 #, fuzzy
 msgid "Open original article"
 msgstr "元の記事内容を表示する"
 
-#: js/viewfeed.js:1854
+#: js/viewfeed.js:1863
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "新しいウィンドウで記事を開く"
 
-#: js/viewfeed.js:1862
+#: js/viewfeed.js:1871
 #, fuzzy
 msgid "Mark above as read"
 msgstr "既読にする"
 
-#: js/viewfeed.js:1868
+#: js/viewfeed.js:1877
 #, fuzzy
 msgid "Mark below as read"
 msgstr "既読にする"
 
-#: js/viewfeed.js:1914
+#: js/viewfeed.js:1923
 #, fuzzy
 msgid "Remove label"
 msgstr "選択したラベルを削除しますか?"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1947
 #, fuzzy
 msgid "Playing..."
 msgstr "フィード一覧を読み込んでいます..."
 
-#: js/viewfeed.js:1939
+#: js/viewfeed.js:1948
 #, fuzzy
 msgid "Click to pause"
 msgstr "編集するにはクリック"
@@ -3607,9 +3617,6 @@ msgstr "編集するにはクリック"
 #~ msgid "Erase all non-starred articles in %s?"
 #~ msgstr "%s にあるお気に入りに設定していない記事をすべて削除しますか?"
 
-#~ msgid "Published feed URL changed."
-#~ msgstr "公開フィードの URL を変更しました。"
-
 #~ msgid "Trying to change address..."
 #~ msgstr "アドレスの変更を試みています..."
 
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 06e9c5dc..c4597f55 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 3057d20c..081b6ce9 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-01-30 16:39+0400\n"
+"POT-Creation-Date: 2012-03-12 13:59+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"
@@ -80,7 +80,7 @@ msgstr "Daglig"
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr "Standard"
 
@@ -135,7 +135,7 @@ msgstr "Tiny Tiny RSS-databasen er oppdatert"
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
@@ -213,9 +213,9 @@ msgstr ""
 "\t\tnettlesers instillinger."
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
 msgstr "laster, vennligst vent"
 
@@ -301,7 +301,7 @@ msgstr ""
 "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -359,7 +359,7 @@ msgstr "Oppdatert"
 msgid "Sort articles"
 msgstr "Lagrede artikler"
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 msgid "Date"
 msgstr "Dato"
 
@@ -371,13 +371,13 @@ msgstr "Tittel"
 msgid "Score"
 msgstr "Poeng"
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr "Oppdater"
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr "Marker som lest"
 
@@ -405,7 +405,7 @@ msgstr "Rediger nyhetsstrømmen..."
 msgid "Rescore feed"
 msgstr "Sett poeng på nytt for nyhetskanalene"
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
@@ -517,11 +517,11 @@ msgid "Exit preferences"
 msgstr "Forlat innstillinger"
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 msgid "Filters"
 msgstr "Filtre"
 
@@ -610,7 +610,7 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 #, fuzzy
 msgid "Register"
 msgstr "Registrert"
@@ -694,7 +694,7 @@ msgstr "Velg artikkelen under musepekeren"
 msgid "Create label"
 msgstr "Lag merkelapp"
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr "Lag filter"
 
@@ -740,11 +740,11 @@ msgstr "Nyhetsstrømshandlinger"
 msgid "Refresh active feed"
 msgstr "Oppdater aktive nyhetsstrømmer"
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 msgid "Edit feed"
 msgstr "Rediger nyhetsstrømmen"
 
@@ -901,7 +901,7 @@ msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 msgid "Article not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr "Hjelp-emne kunne ikke bli funnet"
 
@@ -914,9 +914,9 @@ msgstr "Lagre"
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
@@ -936,7 +936,7 @@ msgstr "Lag filter"
 msgid "(active)"
 msgstr "Tilpasset"
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 #, fuzzy
 msgid "Default profile"
@@ -995,18 +995,18 @@ msgstr ""
 "sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
 "nyhetsstrømmen."
 
-#: classes/dlg.php:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 msgid "Place in category:"
 msgstr "Plasser i kategori..."
 
@@ -1015,18 +1015,18 @@ msgstr "Plasser i kategori..."
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Autentifisering"
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr "Logg inn"
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 #, fuzzy
 msgid "Password"
 msgstr "Passord:"
@@ -1051,14 +1051,14 @@ msgstr "Flere nyhetsstrømmer"
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr "Søk"
@@ -1078,8 +1078,8 @@ msgstr "Nyhetsstrømshandlinger"
 msgid "limit:"
 msgstr "Antall:"
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr "Fjern"
@@ -1113,58 +1113,58 @@ msgstr "Alle Nyhetsstrømmer"
 msgid "This feed"
 msgstr "Denne nyhetsstrømmen"
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr "Match"
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr "før"
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 msgid "after"
 msgstr "etter"
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr "Sjekk det"
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr "På felt:"
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "i"
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 msgid "Perform Action"
 msgstr "Utfør handlingen"
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr "med parametrene:"
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 msgid "Options"
 msgstr "Alternativer:"
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr "Tillatt"
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr "Motsatt markering"
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
+#: classes/dlg.php:539 classes/pref_filters.php:371
 #, fuzzy
 msgid "Apply to category"
 msgstr "Plasser i kategori..."
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
 msgstr "Test"
 
@@ -1198,8 +1198,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Lagre"
@@ -1261,7 +1261,7 @@ msgstr ""
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "Nettadresse:"
@@ -1316,7 +1316,7 @@ msgstr ""
 msgid "Feeds require authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 #, fuzzy
 msgid "Visit the website"
 msgstr "Besøk den offisielle siden"
@@ -1330,8 +1330,8 @@ msgstr "Se nyhetsstrømmene"
 msgid "Select:"
 msgstr "Velg:"
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr "Alle"
@@ -1340,8 +1340,8 @@ msgstr "Alle"
 msgid "Invert"
 msgstr "Motsatt"
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr "Ingen"
@@ -1386,21 +1386,21 @@ msgstr "Nyhetsstrømmen ble ikke funnet"
 msgid "mark as read"
 msgstr "marker som lest"
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 #, fuzzy
 msgid "Originally from:"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: classes/feeds.php:723 include/functions.php:3350
+#: classes/feeds.php:723 include/functions.php:3380
 #, fuzzy
 msgid "Close article"
 msgstr "Fjern artikler"
@@ -1429,18 +1429,18 @@ msgstr ""
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Oppdateringsfeil"
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
@@ -1481,235 +1481,245 @@ msgstr "Endre Stikkord"
 msgid "Check to enable field"
 msgstr "Marker for å tillate felt"
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Rediger nyhetsstrømmen"
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 #, fuzzy
 msgid "Feed Title"
 msgstr "Tittel"
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr "bruker"
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr "Slett artikler:"
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Skjul fra min nyhetsstrømslisten"
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr "Innhold som vises fra høyre til venstre"
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marker alle artikler som leste?"
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 #, fuzzy
 msgid "Icon"
 msgstr "Handling"
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr ""
 
-#: classes/pref_feeds.php:518
+#: classes/pref_feeds.php:524
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr "Alt ferdig."
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonnerer på <b>%s</b>"
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/pref_feeds.php:1017
+#: classes/pref_feeds.php:1024
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/pref_feeds.php:1028
+#: classes/pref_feeds.php:1030
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "Adresse for nyhetsstrømmen for offentliggjorte innlegg har endret seg."
+
+#: classes/pref_feeds.php:1035
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1057
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
 msgstr "Rediger abonnementsalternativer"
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Kategorien <b>$%s</b> eksisterer allerede i databasen"
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr "Lag kategori"
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr "Ingen kategorier ble markert"
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Fjerne valgte kategorier?"
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Nyhetsstrømsredigerer"
 
-#: classes/pref_feeds.php:1280
+#: classes/pref_feeds.php:1287
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Hele nyhetsstrømmen"
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 #, fuzzy
 msgid "Select"
 msgstr "Velg:"
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Sletter den valgte nyhetsstrømmen..."
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Nullstill passordet"
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Avabonner"
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 #, fuzzy
 msgid "Categories"
 msgstr "Kategori:"
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: classes/pref_feeds.php:1345
+#: classes/pref_feeds.php:1338
+#, fuzzy
+msgid "(Un)hide empty categories"
+msgstr "Rediger kategorier"
+
+#: classes/pref_feeds.php:1354
 #, fuzzy
 msgid "More actions..."
 msgstr "Handlinger..."
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 msgid "Clear feed data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 msgid "Rescore articles"
 msgstr "Tilbakestill poengsummene for artiklene"
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
 msgstr ""
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref_feeds.php:1408
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref_feeds.php:1410
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref_feeds.php:1423
+#: classes/pref_feeds.php:1432
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: classes/pref_feeds.php:1427
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref_feeds.php:1429
+#: classes/pref_feeds.php:1438
 #, fuzzy
 msgid "Include settings"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref_feeds.php:1433
+#: classes/pref_feeds.php:1442
 #, fuzzy
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1718,42 +1728,42 @@ msgstr ""
 "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
 "kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
-#: classes/pref_feeds.php:1439
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1442
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1445
+#: classes/pref_feeds.php:1454
 #, fuzzy
 msgid "Article archive"
 msgstr "Artikkeldato"
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
+#: classes/pref_feeds.php:1459
 #, fuzzy
 msgid "Export my data"
 msgstr "Eksporter OPML"
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr "Importer"
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox integrering"
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1761,41 +1771,41 @@ msgstr ""
 "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
 "ved å trykke på lenken nedenfor."
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: classes/pref_feeds.php:1503
+#: classes/pref_feeds.php:1512
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1803,69 +1813,73 @@ msgstr ""
 "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
 "kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 #, fuzzy
 msgid "Display URL"
 msgstr "Vis stikkord"
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1520
+#: classes/pref_feeds.php:1529
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref_feeds.php:1523
+#: classes/pref_feeds.php:1532
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Uleste artikler"
 
-#: classes/pref_feeds.php:1529
+#: classes/pref_feeds.php:1538
 #, fuzzy
 msgid "Twitter"
 msgstr "Tittel"
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Slett nyhetsstrømsdata"
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: classes/pref_filters.php:84
+#: classes/pref_filters.php:89
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "Ingen filtre ble funnet."
 
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
+msgstr ""
+
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Laget filter <b>%s</b>"
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
 msgstr "Rediger"
@@ -1945,99 +1959,99 @@ msgstr "Passord har blitt endret."
 msgid "Old password is incorrect."
 msgstr "Gammelt passord er feil"
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr "Konfigurasjonen er lagret."
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Ukjent valg: %s"
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref_prefs.php:159
+#: classes/pref_prefs.php:168
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Autentifisering"
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr ""
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr "E-post"
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 msgid "Access level"
 msgstr "Tilgangsnivå"
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 #, fuzzy
 msgid "Save data"
 msgstr "Lagre"
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "Passordet ditt er et standardpassord, \n"
 "\t\t\t\t\t\tVennligst bytt."
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr "Nytt passord"
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr "Bekreft passord"
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr "Endre passord"
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr "Velg utseende"
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr ""
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr "Ja"
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr "Nei"
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
 msgstr ""
 
-#: classes/pref_prefs.php:468
+#: classes/pref_prefs.php:477
 #, php-format
-msgid "Current server time: %s"
+msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr "Lagre konfigurasjonen"
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr ""
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr "Tilbake til standard"
 
@@ -2134,29 +2148,25 @@ msgstr "Ingen brukere er valgt"
 msgid "No matching users found."
 msgstr "Ingen matchende brukere ble funnet"
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr "Ingen stikkord"
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "Registreringsinformasjonen din er ufullstendig."
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "Passord har blitt endret."
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
@@ -2188,64 +2198,64 @@ msgstr "Feil brukernavn og/eller passord"
 msgid "Archived articles"
 msgstr "Lagrede artikler"
 
-#: include/functions.php:3158 js/viewfeed.js:1945
+#: include/functions.php:3188 js/viewfeed.js:1954
 #, fuzzy
 msgid "Click to play"
 msgstr "Trykk for å endre"
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 msgid " - "
 msgstr "-"
 
-#: include/functions.php:4104
+#: include/functions.php:4134
 #, fuzzy
 msgid "(edit note)"
 msgstr "Rediger notat"
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr "Vedlegg:"
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 msgid "Attachments:"
 msgstr "Vedlegg:"
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favorittartikler"
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: include/functions.php:5241
+#: include/functions.php:5287
 #, fuzzy
 msgid "Could not import: incorrect schema version."
 msgstr "Kunne ikke finne den nødvendige skjemafilen, nødvendig versjon:"
 
-#: include/functions.php:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
 msgstr ""
 
@@ -2279,7 +2289,7 @@ msgstr "Publiser artiklen"
 msgid "Assign tags"
 msgstr "Tildel stikkord"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr "Tildel stikkord"
 
@@ -2377,7 +2387,7 @@ msgid "Click to register your SSL client certificate with tt-rss"
 msgstr ""
 
 #: include/localized_schema.php:32
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
@@ -2496,7 +2506,7 @@ msgstr ""
 msgid "Sort headlines by feed date"
 msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
@@ -2522,7 +2532,7 @@ msgstr "Fil:"
 msgid "Use less traffic"
 msgstr ""
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 msgid "Mark all articles in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
@@ -2582,7 +2592,7 @@ msgstr "Laster hjelp..."
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 #, fuzzy
 msgid "Update feed"
 msgstr "Oppdater alle nyhetsstrømmer"
@@ -2660,69 +2670,69 @@ msgstr "Du kan ikke fjerne abonnement fra kategorien."
 msgid "Create Filter"
 msgstr "Lag filter"
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 #, fuzzy
 msgid "Filter Test Results"
 msgstr "Filteruttrykk"
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 msgid "Unsubscribe from %s?"
 msgstr "Fjerne abonnement på %s?"
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 msgid "You can't edit this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Rediger nyhetsstrømmen"
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 #, fuzzy
 msgid "More Feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr "Ingen nyhetsstrømmer er valgt"
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Oppdateringsfeil"
 
-#: js/functions.js:1597 js/prefs.js:1232
+#: js/functions.js:1617 js/prefs.js:1232
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
 
@@ -2907,57 +2917,57 @@ msgstr ""
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 msgid "Label Editor"
 msgstr "Merkelappredigerer"
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1807
+#: js/prefs.js:1822
 #, fuzzy
 msgid "Link Instance"
 msgstr "Endre stikkord"
 
-#: js/prefs.js:1858
+#: js/prefs.js:1873
 #, fuzzy
 msgid "Edit Instance"
 msgstr "Endre stikkord"
 
-#: js/prefs.js:1907
+#: js/prefs.js:1922
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Fjerne valgte filtre?"
 
-#: js/prefs.js:1924 js/prefs.js:1936
+#: js/prefs.js:1939 js/prefs.js:1951
 #, fuzzy
 msgid "No instances are selected."
 msgstr "Ingen filtre er valgt"
 
-#: js/prefs.js:1941
+#: js/prefs.js:1956
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Vennligst velg kun et filter"
 
-#: js/prefs.js:1976
+#: js/prefs.js:1991
 #, fuzzy
 msgid "Export Data"
 msgstr "Eksporter OPML"
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
-#: js/prefs.js:2056
+#: js/prefs.js:2071
 #, fuzzy
 msgid "Data Import"
 msgstr "Importer"
 
-#: js/prefs.js:2091
+#: js/prefs.js:2106
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Abonnerer på nyhetsstrømmen..."
@@ -2971,108 +2981,108 @@ msgstr "Marker artikkel som favoritt"
 msgid "Mark all articles as read?"
 msgstr "Marker alle artikler som leste?"
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 msgid "Please select some feed first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 msgid "You can't rescore this kind of feed."
 msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 msgid "Rescore articles in %s?"
 msgstr "Endre poengene for artiklene i %s?"
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 #, fuzzy
 msgid "New version available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marker alle synlige artikler i %s som leste?"
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "Fjerne merkede artikler fra merkelappen?"
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Favorittartikler"
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Endre Stikkord"
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 msgid "No article is selected."
 msgstr "Ingen artikkel er valgt."
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 msgid "No articles found to mark"
 msgstr "Ingen artikler funnet som kan markeres"
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 msgid "Mark %d article(s) as read?"
 msgstr "Marker %d artikkel/artikler som leste?"
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 #, fuzzy
 msgid "Loading..."
 msgstr "Laster nyhetsstrømmer..."
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 #, fuzzy
 msgid "Open original article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: js/viewfeed.js:1854
+#: js/viewfeed.js:1863
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: js/viewfeed.js:1862
+#: js/viewfeed.js:1871
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marker som lest"
 
-#: js/viewfeed.js:1868
+#: js/viewfeed.js:1877
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marker som lest"
 
-#: js/viewfeed.js:1914
+#: js/viewfeed.js:1923
 #, fuzzy
 msgid "Remove label"
 msgstr "Fjerne merkede merkelapper?"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1947
 #, fuzzy
 msgid "Playing..."
 msgstr "Laster nyhetsstrømmer..."
 
-#: js/viewfeed.js:1939
+#: js/viewfeed.js:1948
 #, fuzzy
 msgid "Click to pause"
 msgstr "Trykk for å endre"
@@ -3745,10 +3755,6 @@ msgstr "Trykk for å endre"
 #~ msgid "Erase all non-starred articles in %s?"
 #~ msgstr "Fjern alle ikke-favoriserte artikler i %s?"
 
-#~ msgid "Published feed URL changed."
-#~ msgstr ""
-#~ "Adresse for nyhetsstrømmen for offentliggjorte innlegg har endret seg."
-
 #~ msgid "Trying to change address..."
 #~ msgstr "Prøver å endre adressen..."
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index eda8b587..66ddf627 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 b2dd213e..4f80c70b 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-01-30 16:39+0400\n"
+"POT-Creation-Date: 2012-03-12 13:59+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"
@@ -82,7 +82,7 @@ msgstr "Diariamente"
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr "Padrão"
 
@@ -138,7 +138,7 @@ msgstr ""
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
@@ -208,9 +208,9 @@ msgid ""
 msgstr ""
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
 msgstr ""
 
@@ -285,7 +285,7 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -345,7 +345,7 @@ msgstr "Atualizado"
 msgid "Sort articles"
 msgstr "Favoritos"
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 #, fuzzy
 msgid "Date"
 msgstr "Atualizar"
@@ -358,13 +358,13 @@ msgstr "Título"
 msgid "Score"
 msgstr ""
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr "Atualizar"
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
@@ -395,7 +395,7 @@ msgstr "Editar"
 msgid "Rescore feed"
 msgstr "Removendo o Feed..."
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr ""
 
@@ -509,12 +509,12 @@ msgid "Exit preferences"
 msgstr "Sair das preferências"
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 #, fuzzy
 msgid "Feeds"
 msgstr "Feed"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 #, fuzzy
 msgid "Filters"
 msgstr "Arquivo:"
@@ -604,7 +604,7 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 #, fuzzy
 msgid "Register"
 msgstr "Remover as categorias selecionadas?"
@@ -698,7 +698,7 @@ msgstr ""
 msgid "Create label"
 msgstr ""
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr ""
 
@@ -746,11 +746,11 @@ msgstr "Ações do Feed:"
 msgid "Refresh active feed"
 msgstr "Favoritos"
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr ""
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 #, fuzzy
 msgid "Edit feed"
 msgstr "Editar"
@@ -910,7 +910,7 @@ msgstr ""
 msgid "Article not found."
 msgstr "Feed não encontrado."
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr "Tópico de ajuda não encontrado."
 
@@ -923,9 +923,9 @@ msgstr "Salvar"
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
@@ -944,7 +944,7 @@ msgstr "Criar um usuário"
 msgid "(active)"
 msgstr ""
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 #, fuzzy
 msgid "Default profile"
@@ -995,18 +995,18 @@ msgid ""
 "contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr "Feed"
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 #, fuzzy
 msgid "Place in category:"
 msgstr "Salvando categoria..."
@@ -1016,18 +1016,18 @@ msgstr "Salvando categoria..."
 msgid "Available feeds"
 msgstr "Todos os feeds"
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr ""
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr "Login"
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
@@ -1052,14 +1052,14 @@ msgstr "Removendo o Feed..."
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr ""
@@ -1079,8 +1079,8 @@ msgstr "Ações do Feed:"
 msgid "limit:"
 msgstr "Limite:"
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr "Remover"
@@ -1113,62 +1113,62 @@ msgstr "Todos os feeds"
 msgid "This feed"
 msgstr ""
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr ""
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr ""
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 #, fuzzy
 msgid "after"
 msgstr "Atualizar"
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr ""
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr ""
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 #, fuzzy
 msgid "in"
 msgstr "Link"
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 #, fuzzy
 msgid "Perform Action"
 msgstr "Ação"
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr ""
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 #, fuzzy
 msgid "Options"
 msgstr "Opções:"
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr "Ativado"
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr ""
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
+#: classes/dlg.php:539 classes/pref_filters.php:371
 #, fuzzy
 msgid "Apply to category"
 msgstr "Salvando categoria..."
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
 msgstr "Teste"
 
@@ -1201,8 +1201,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr ""
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Salvar"
@@ -1263,7 +1263,7 @@ msgstr ""
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 #, fuzzy
 msgid "URL:"
@@ -1319,7 +1319,7 @@ msgstr ""
 msgid "Feeds require authentication."
 msgstr "Este feed requer autenticação."
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 msgid "Visit the website"
 msgstr ""
 
@@ -1332,8 +1332,8 @@ msgstr "Todos os feeds"
 msgid "Select:"
 msgstr "Selecione:"
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr "Todos"
@@ -1343,8 +1343,8 @@ msgstr "Todos"
 msgid "Invert"
 msgstr "(Inverso)"
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr "Nenhum"
@@ -1391,21 +1391,21 @@ msgstr "Feed não encontrado."
 msgid "mark as read"
 msgstr "Marcar como lido"
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 #, fuzzy
 msgid "Originally from:"
 msgstr "Favoritos"
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 #, fuzzy
 msgid "Edit tags for this article"
 msgstr "Favoritos"
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 msgid "Open article in new tab"
 msgstr ""
 
-#: classes/feeds.php:723 include/functions.php:3350
+#: classes/feeds.php:723 include/functions.php:3380
 #, fuzzy
 msgid "Close article"
 msgstr "Favoritos"
@@ -1436,18 +1436,18 @@ msgstr ""
 msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Atualizar"
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
@@ -1487,381 +1487,395 @@ msgstr "Editar Tags"
 msgid "Check to enable field"
 msgstr ""
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Editar"
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 #, fuzzy
 msgid "Feed Title"
 msgstr "Título"
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr ""
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr ""
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 msgid "Hide from Popular feeds"
 msgstr ""
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr ""
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr ""
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 #, fuzzy
 msgid "Icon"
 msgstr "Ação"
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr ""
 
-#: classes/pref_feeds.php:518
+#: classes/pref_feeds.php:524
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Removendo o Feed..."
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr ""
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Não pode criar o usuário <b>%s</b>"
 
-#: classes/pref_feeds.php:1017
+#: classes/pref_feeds.php:1024
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Sem Feeds para exibir."
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/pref_feeds.php:1028
+#: classes/pref_feeds.php:1030
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "Sem Feeds para exibir."
+
+#: classes/pref_feeds.php:1035
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Não pode criar o usuário <b>%s</b>"
 
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1057
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Removendo o Feed..."
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
 msgstr ""
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "A categoria <b>$%s</b> já existe na base de dados."
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr "Criar categoria"
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr ""
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Remover as categorias selecionadas?"
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de Feed"
 
-#: classes/pref_feeds.php:1280
+#: classes/pref_feeds.php:1287
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Editar"
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 #, fuzzy
 msgid "Select"
 msgstr "Selecione:"
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Removendo filtros selecionados…"
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Remover as categorias selecionadas?"
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 #, fuzzy
 msgid "Categories"
 msgstr "Categoria:"
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
 msgstr "Editar categorias"
 
-#: classes/pref_feeds.php:1345
+#: classes/pref_feeds.php:1338
+#, fuzzy
+msgid "(Un)hide empty categories"
+msgstr "Editar categorias"
+
+#: classes/pref_feeds.php:1354
 #, fuzzy
 msgid "More actions..."
 msgstr "Ações..."
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr ""
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 #, fuzzy
 msgid "Clear feed data"
 msgstr "Salvando o Feed..."
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Favoritos"
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
 msgstr ""
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref_feeds.php:1408
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref_feeds.php:1410
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref_feeds.php:1423
+#: classes/pref_feeds.php:1432
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importando OPML (usando a extensão DOMXML)..."
 
-#: classes/pref_feeds.php:1427
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref_feeds.php:1429
+#: classes/pref_feeds.php:1438
 msgid "Include settings"
 msgstr ""
 
-#: classes/pref_feeds.php:1433
+#: classes/pref_feeds.php:1442
 #, fuzzy
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: classes/pref_feeds.php:1439
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1442
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1445
+#: classes/pref_feeds.php:1454
 #, fuzzy
 msgid "Article archive"
 msgstr "Feed não encontrado."
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
+#: classes/pref_feeds.php:1459
 #, fuzzy
 msgid "Export my data"
 msgstr "Exportar OPML"
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr "Importar"
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Informações do Feed:"
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Removendo o Feed..."
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr ""
 
-#: classes/pref_feeds.php:1503
+#: classes/pref_feeds.php:1512
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Remover os filtros selecionados?"
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Remover os filtros selecionados?"
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1520
+#: classes/pref_feeds.php:1529
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref_feeds.php:1523
+#: classes/pref_feeds.php:1532
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Favoritos"
 
-#: classes/pref_feeds.php:1529
+#: classes/pref_feeds.php:1538
 #, fuzzy
 msgid "Twitter"
 msgstr "Título"
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Salvando o Feed..."
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: classes/pref_filters.php:84
+#: classes/pref_filters.php:89
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "Sem Feeds para exibir."
 
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
+msgstr ""
+
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr ""
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
 msgstr "Editar"
@@ -1942,99 +1956,99 @@ msgstr ""
 msgid "Old password is incorrect."
 msgstr "Senha antiga incorreta"
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr ""
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr ""
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref_prefs.php:159
+#: classes/pref_prefs.php:168
 msgid "Personal data / Authentication"
 msgstr ""
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr ""
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr "E-mail"
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 #, fuzzy
 msgid "Access level"
 msgstr "Nível de acesso:"
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 #, fuzzy
 msgid "Save data"
 msgstr "Salvar"
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "Sua senha é a padrão, \n"
 "\t\t\t\t\t\tvocê deve mudá-la."
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr "Senha nova"
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr "Confirmar senha"
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr "Mudar senha"
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr "Selecionar o tema"
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr ""
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr "Sim"
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr "Não"
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
 msgstr ""
 
-#: classes/pref_prefs.php:468
+#: classes/pref_prefs.php:477
 #, php-format
-msgid "Current server time: %s"
+msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr "Salvar configuração"
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr ""
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr ""
 
@@ -2138,27 +2152,23 @@ msgstr "Nenhum usuário foi selecionado."
 msgid "No matching users found."
 msgstr ""
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr "sem tags"
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 msgid "Your request could not be completed."
 msgstr ""
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 msgid "Category update has been scheduled."
 msgstr ""
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 msgid "Can't update this kind of feed."
 msgstr ""
 
@@ -2189,66 +2199,66 @@ msgstr ""
 msgid "Archived articles"
 msgstr "Favoritos"
 
-#: include/functions.php:3158 js/viewfeed.js:1945
+#: include/functions.php:3188 js/viewfeed.js:1954
 #, fuzzy
 msgid "Click to play"
 msgstr "Favoritos"
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 #, fuzzy
 msgid " - "
 msgstr " - por "
 
-#: include/functions.php:4104
+#: include/functions.php:4134
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 #, fuzzy
 msgid "unknown type"
 msgstr "Erro desconhecido"
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr ""
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 #, fuzzy
 msgid "Attachments:"
 msgstr "Conteúdo"
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favoritos"
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 #, fuzzy
 msgid "No feeds found."
 msgstr "Sem Feeds para exibir."
 
-#: include/functions.php:5241
+#: include/functions.php:5287
 msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: include/functions.php:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
 msgstr ""
 
@@ -2284,7 +2294,7 @@ msgstr ""
 msgid "Assign tags"
 msgstr "sem tags"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr ""
 
@@ -2364,7 +2374,7 @@ msgid "Click to register your SSL client certificate with tt-rss"
 msgstr ""
 
 #: include/localized_schema.php:32
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
@@ -2483,7 +2493,7 @@ msgstr ""
 msgid "Sort headlines by feed date"
 msgstr ""
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 msgid "Customize stylesheet"
 msgstr ""
 
@@ -2508,7 +2518,7 @@ msgstr "Arquivo:"
 msgid "Use less traffic"
 msgstr ""
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
@@ -2571,7 +2581,7 @@ msgstr "Salvando o Feed..."
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 #, fuzzy
 msgid "Update feed"
 msgstr "Favoritos"
@@ -2651,69 +2661,69 @@ msgstr ""
 msgid "Create Filter"
 msgstr "Criar um usuário"
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 msgid "Filter Test Results"
 msgstr ""
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 #, fuzzy
 msgid "Unsubscribe from %s?"
 msgstr "Removendo o Feed..."
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Salvando categoria..."
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Editar"
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 #, fuzzy
 msgid "More Feeds"
 msgstr "Removendo o Feed..."
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Atualizar"
 
-#: js/functions.js:1597 js/prefs.js:1232
+#: js/functions.js:1617 js/prefs.js:1232
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 #, fuzzy
 msgid "No articles are selected."
 msgstr "Nenhum filtro foi selecionado."
@@ -2907,58 +2917,58 @@ msgstr ""
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 #, fuzzy
 msgid "Label Editor"
 msgstr "Editor de Feed"
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1807
+#: js/prefs.js:1822
 #, fuzzy
 msgid "Link Instance"
 msgstr "Editar Tags"
 
-#: js/prefs.js:1858
+#: js/prefs.js:1873
 #, fuzzy
 msgid "Edit Instance"
 msgstr "Editar Tags"
 
-#: js/prefs.js:1907
+#: js/prefs.js:1922
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/prefs.js:1924 js/prefs.js:1936
+#: js/prefs.js:1939 js/prefs.js:1951
 #, fuzzy
 msgid "No instances are selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: js/prefs.js:1941
+#: js/prefs.js:1956
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Por favor selecione somente um filtro."
 
-#: js/prefs.js:1976
+#: js/prefs.js:1991
 #, fuzzy
 msgid "Export Data"
 msgstr "Exportar OPML"
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
-#: js/prefs.js:2056
+#: js/prefs.js:2071
 #, fuzzy
 msgid "Data Import"
 msgstr "Importar"
 
-#: js/prefs.js:2091
+#: js/prefs.js:2106
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Removendo o Feed..."
@@ -2973,113 +2983,113 @@ msgstr "Favoritos"
 msgid "Mark all articles as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 #, fuzzy
 msgid "Please select some feed first."
 msgstr "Por favor selecione somente um feed"
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 #, fuzzy
 msgid "Rescore articles in %s?"
 msgstr "Favoritos"
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 msgid "New version available!"
 msgstr ""
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 #, fuzzy
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "Remover os filtros selecionados?"
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 #, fuzzy
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Editar Tags"
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 #, fuzzy
 msgid "No article is selected."
 msgstr "Nenhum filtro foi selecionado."
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "Sem Feeds para exibir."
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 #, fuzzy
 msgid "Mark %d article(s) as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 #, fuzzy
 msgid "Loading..."
 msgstr "Salvando o Feed..."
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 #, fuzzy
 msgid "Open original article"
 msgstr "Favoritos"
 
-#: js/viewfeed.js:1854
+#: js/viewfeed.js:1863
 msgid "View in a tt-rss tab"
 msgstr ""
 
-#: js/viewfeed.js:1862
+#: js/viewfeed.js:1871
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marcar como lido"
 
-#: js/viewfeed.js:1868
+#: js/viewfeed.js:1877
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marcar como lido"
 
-#: js/viewfeed.js:1914
+#: js/viewfeed.js:1923
 #, fuzzy
 msgid "Remove label"
 msgstr "Remover"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1947
 #, fuzzy
 msgid "Playing..."
 msgstr "Salvando o Feed..."
 
-#: js/viewfeed.js:1939
+#: js/viewfeed.js:1948
 #, fuzzy
 msgid "Click to pause"
 msgstr "Favoritos"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 97067e30..a6fe360c 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 4f4dca3a..569ee589 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-01-30 16:39+0400\n"
+"POT-Creation-Date: 2012-03-12 13:59+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"
@@ -86,7 +86,7 @@ msgstr "Раз в день"
 msgid "Weekly"
 msgstr "Раз в неделю"
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -141,7 +141,7 @@ msgstr "Tiny Tiny RSS база данных обновлена."
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
@@ -218,9 +218,9 @@ msgstr ""
 "\t\tнастройки вашего браузера."
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
@@ -302,7 +302,7 @@ msgstr ""
 "конфигурацию PHP"
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -358,7 +358,7 @@ msgstr "Обновлено"
 msgid "Sort articles"
 msgstr "Сортировать статьи"
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 msgid "Date"
 msgstr "Дата"
 
@@ -370,13 +370,13 @@ msgstr "Заголовок"
 msgid "Score"
 msgstr "Оценка"
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr "Обновить"
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
@@ -404,7 +404,7 @@ msgstr "Редактировать канал..."
 msgid "Rescore feed"
 msgstr "Заново оценить канал"
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
@@ -511,11 +511,11 @@ msgid "Exit preferences"
 msgstr "Закрыть настройки"
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 msgid "Feeds"
 msgstr "Каналы"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 msgid "Filters"
 msgstr "Фильтры"
 
@@ -602,7 +602,7 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 msgid "Register"
 msgstr "Регистрация"
 
@@ -682,7 +682,7 @@ msgstr "Выбрать статью под курсором мыши"
 msgid "Create label"
 msgstr "Создать метку"
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr "Создать фильтр"
 
@@ -722,11 +722,11 @@ msgstr "Действия над каналом"
 msgid "Refresh active feed"
 msgstr "Обновить активный канал"
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 msgid "Edit feed"
 msgstr "Редактировать канал"
 
@@ -881,7 +881,7 @@ msgstr "Сортировать каналы по количеству непро
 msgid "Article not found."
 msgstr "Статья не найдена"
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr "Раздел помощи не найден."
 
@@ -894,9 +894,9 @@ msgstr "Сохранить"
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
@@ -917,7 +917,7 @@ msgstr "Создать профиль"
 msgid "(active)"
 msgstr "Адаптивно"
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 msgid "Default profile"
 msgstr "Профиль по умолчанию"
@@ -970,18 +970,18 @@ msgstr ""
 "Это обозначает что существует проблема подобная краху или зависанию демона.\n"
 "Пожалуйста проверьте процесс демона или сообщите администратору."
 
-#: classes/dlg.php:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr "Канал"
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 #, fuzzy
 msgid "Feed URL"
 msgstr "Канал"
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 msgid "Place in category:"
 msgstr "Поместить в категорию:"
 
@@ -989,18 +989,18 @@ msgstr "Поместить в категорию:"
 msgid "Available feeds"
 msgstr "Доступные каналы"
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Авторизация"
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr "Пользователь:"
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 msgid "Password"
 msgstr "Пароль"
 
@@ -1023,14 +1023,14 @@ msgstr "Другие каналы"
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Отмена"
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr "Поиск"
@@ -1050,8 +1050,8 @@ msgstr "Действия над каналом:"
 msgid "limit:"
 msgstr "Сколько:"
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr "Удалить"
@@ -1085,57 +1085,57 @@ msgstr "Все каналы"
 msgid "This feed"
 msgstr "Этот канал"
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr "Искать"
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr "перед"
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 msgid "after"
 msgstr "после"
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr "Проверить"
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr "по полю:"
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "в"
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 msgid "Perform Action"
 msgstr "Выполнить действия"
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr "с параметрами:"
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 msgid "Options"
 msgstr "Опции:"
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr "Включен"
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr "Инвертировать фильтр"
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
+#: classes/dlg.php:539 classes/pref_filters.php:371
 msgid "Apply to category"
 msgstr "Применить к категории"
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
 msgstr "Проверить"
 
@@ -1166,8 +1166,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Сохранить"
@@ -1227,7 +1227,7 @@ msgstr ""
 msgid "Instance"
 msgstr "Инсталляция"
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL:"
@@ -1281,7 +1281,7 @@ msgstr ""
 msgid "Feeds require authentication."
 msgstr "Этот канал требует авторизации."
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 msgid "Visit the website"
 msgstr "Посетить официальный сайт"
 
@@ -1293,8 +1293,8 @@ msgstr "Показать в формате RSS"
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr "Все"
@@ -1303,8 +1303,8 @@ msgstr "Все"
 msgid "Invert"
 msgstr "Инвертировать"
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr "Ничего"
@@ -1345,19 +1345,19 @@ msgstr "Канал не найден."
 msgid "mark as read"
 msgstr "Отметить как прочитанные"
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 msgid "Originally from:"
 msgstr "Оригинал:"
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 msgid "Edit tags for this article"
 msgstr "Редактировать теги статьи"
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 msgid "Open article in new tab"
 msgstr "Открыть статью в новом табе"
 
-#: classes/feeds.php:723 include/functions.php:3350
+#: classes/feeds.php:723 include/functions.php:3380
 msgid "Close article"
 msgstr "Закрыть статью"
 
@@ -1385,18 +1385,18 @@ msgstr ""
 msgid "No articles found to display."
 msgstr "Статей не найдено."
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Последнее обновление в %s"
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr "Нет категории"
 
@@ -1432,223 +1432,233 @@ msgstr "Редактировать заметку"
 msgid "Check to enable field"
 msgstr "Проверить доступность поля"
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
 #, php-format
 msgid "(%d feeds)"
 msgstr "(%d каналов)"
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 msgid "Feed Title"
 msgstr "Заголовок"
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr "использование"
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr "Удаление сообщений:"
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 msgid "Hide from Popular feeds"
 msgstr "Спрятать из списка популярных каналов"
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr "Язык канала пишется справа налево"
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr "Включить в e-mail дайджест"
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr "Всегда показывать вложенные изображения"
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr "Кэшировать изображения локально"
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 msgid "Mark updated articles as unread"
 msgstr "Пометить все статьи как прочитанные?"
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
 msgstr "При изменении текста статьи, помечать ее как обновленную"
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 msgid "Icon"
 msgstr "Иконка"
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr "Заменить"
 
-#: classes/pref_feeds.php:518
+#: classes/pref_feeds.php:524
 msgid "Resubscribe to push updates"
 msgstr "Переподписаться на PUSH обновления"
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Сбрасывает статусподписки с помощью механизма PubSubHubbub"
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr "Всё выполнено."
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Добавлена подписка на <b>%s</b>."
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: classes/pref_feeds.php:1017
+#: classes/pref_feeds.php:1024
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Каналы не найдены."
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: classes/pref_feeds.php:1028
+#: classes/pref_feeds.php:1030
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "Опубликованный URL канала изменён."
+
+#: classes/pref_feeds.php:1035
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1057
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Отписаться от выбранных каналов?"
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
 msgstr "Редактировать опции  подписки"
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Категория <b>$%s</b> уже существует."
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr "Создать категорию"
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Удалить выбранные категории?"
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 msgid "Feeds with errors"
 msgstr "Каналы с ошибками"
 
-#: classes/pref_feeds.php:1280
+#: classes/pref_feeds.php:1287
 msgid "Inactive feeds"
 msgstr "Неактивные каналы"
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 msgid "Select"
 msgstr "Выбрать"
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 msgid "Edit selected feeds"
 msgstr "Редактировать выбранные каналы"
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 msgid "Reset sort order"
 msgstr "Сбросить сортировку"
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Отписаться"
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 msgid "Categories"
 msgstr "Категории"
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: classes/pref_feeds.php:1345
+#: classes/pref_feeds.php:1338
+#, fuzzy
+msgid "(Un)hide empty categories"
+msgstr "Редактировать категории"
+
+#: classes/pref_feeds.php:1354
 msgid "More actions..."
 msgstr "Действия..."
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr "Ручная очистка"
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 msgid "Clear feed data"
 msgstr "Очистить данные канала."
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 msgid "Rescore articles"
 msgstr "Заново оценить статьи"
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr "Вы можете менять категории и каналы местами"
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
 msgstr ""
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref_feeds.php:1408
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref_feeds.php:1410
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Только главный профиль настроек будет экспортирован в OPML."
 
-#: classes/pref_feeds.php:1423
+#: classes/pref_feeds.php:1432
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Импортирую OPML..."
 
-#: classes/pref_feeds.php:1427
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref_feeds.php:1429
+#: classes/pref_feeds.php:1438
 #, fuzzy
 msgid "Include settings"
 msgstr "Включить в e-mail дайджест"
 
-#: classes/pref_feeds.php:1433
+#: classes/pref_feeds.php:1442
 #, fuzzy
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1657,41 +1667,41 @@ msgstr ""
 "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
 "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: classes/pref_feeds.php:1439
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1442
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1445
+#: classes/pref_feeds.php:1454
 msgid "Article archive"
 msgstr "Архив статей"
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
+#: classes/pref_feeds.php:1459
 #, fuzzy
 msgid "Export my data"
 msgstr "Экспортировать данные"
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr "Импортировать"
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Интеграция в Firefox"
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1699,41 +1709,41 @@ msgstr ""
 "Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. "
 "Для этого щёлкните по ссылке ниже."
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Вернуться к Tiny Tiny RSS"
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
-#: classes/pref_feeds.php:1503
+#: classes/pref_feeds.php:1512
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1741,69 +1751,73 @@ msgstr ""
 "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
 "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 #, fuzzy
 msgid "Display URL"
 msgstr "показать теги"
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1520
+#: classes/pref_feeds.php:1529
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref_feeds.php:1523
+#: classes/pref_feeds.php:1532
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Отмеченные"
 
-#: classes/pref_feeds.php:1529
+#: classes/pref_feeds.php:1538
 #, fuzzy
 msgid "Twitter"
 msgstr "Заголовок"
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Очистить данные канала."
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: classes/pref_filters.php:84
+#: classes/pref_filters.php:89
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "Не найдено совпадений с фильтром."
 
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
+msgstr ""
+
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Добавлен фильтр <b>%s</b>"
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
 msgstr "Редактировать"
@@ -1880,95 +1894,95 @@ msgstr "Пароль был изменен."
 msgid "Old password is incorrect."
 msgstr "Старый пароль неправилен."
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr "Конфигурация сохранена."
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Неизвестная опция: %s"
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref_prefs.php:159
+#: classes/pref_prefs.php:168
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "Авторизация"
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr "Полное имя"
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr "E-mail"
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 msgid "Access level"
 msgstr "Уровень доступа:"
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 msgid "Save data"
 msgstr "Сохранить"
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 msgid "Your password is at default value, please change it."
 msgstr "Используется пароль по умолчанию, пожалуйста, измените его."
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr "Новый пароль"
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr "Подтверждение пароля"
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr "Выбор темы"
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr ""
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr "Да"
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr "Нет"
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
 msgstr ""
 
-#: classes/pref_prefs.php:468
+#: classes/pref_prefs.php:477
 #, php-format
-msgid "Current server time: %s"
+msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr "Сохранить конфигурацию"
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr "Управление профилями"
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr "Сбросить настройки"
 
@@ -2063,29 +2077,25 @@ msgstr "Пользователи не определены."
 msgid "No matching users found."
 msgstr "Подходящих пользователей не найдено."
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr "нет тегов"
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 #, fuzzy
 msgid "Your request could not be completed."
 msgstr "Не полностью заполнена ваша регистрационная информация."
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr "Обновление канала запланировано"
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "Пароль был изменен."
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 msgid "Can't update this kind of feed."
 msgstr "Вы не можете обновить этот канал."
 
@@ -2115,62 +2125,62 @@ msgstr "Некорректное имя пользователя или паро
 msgid "Archived articles"
 msgstr "Архив статей"
 
-#: include/functions.php:3158 js/viewfeed.js:1945
+#: include/functions.php:3188 js/viewfeed.js:1954
 msgid "Click to play"
 msgstr "Щёлкните для проигрывания"
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
 msgstr "Играть"
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:4104
+#: include/functions.php:4134
 #, fuzzy
 msgid "(edit note)"
 msgstr "править заметку"
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 msgid "unknown type"
 msgstr "неизвестный тип"
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr "Вложение:"
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 msgid "Attachments:"
 msgstr "Вложения:"
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Отмеченные"
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 msgid "No feeds found."
 msgstr "Каналы не найдены."
 
-#: include/functions.php:5241
+#: include/functions.php:5287
 msgid "Could not import: incorrect schema version."
 msgstr "Не могу импортировать данные: некорректная версия схемы."
 
-#: include/functions.php:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
 msgstr "Не могу импортировать данные: неизвестынй формат данных."
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
 msgstr "Не могу загрузить XML документ."
 
@@ -2203,7 +2213,7 @@ msgstr "Опубликовать"
 msgid "Assign tags"
 msgstr "Применить теги"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr "Применить метку"
 
@@ -2300,7 +2310,7 @@ msgstr ""
 
 #: include/localized_schema.php:32
 #, fuzzy
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr "Часовой пояс"
 
 #: include/localized_schema.php:33
@@ -2415,7 +2425,7 @@ msgstr "Часовой пояс"
 msgid "Sort headlines by feed date"
 msgstr "Сортировать каналы по дате, указанной в канале"
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 msgid "Customize stylesheet"
 msgstr "Изменить пользовательские стили"
 
@@ -2439,7 +2449,7 @@ msgstr "Профиль:"
 msgid "Use less traffic"
 msgstr "Использовать меньше трафика"
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 msgid "Mark all articles in %s as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 
@@ -2499,7 +2509,7 @@ msgstr "Идет загрузка помощи..."
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 #, fuzzy
 msgid "Update feed"
 msgstr "Обновить все каналы"
@@ -2577,69 +2587,69 @@ msgstr "Нельзя отписаться от категории."
 msgid "Create Filter"
 msgstr "Создать фильтр"
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 #, fuzzy
 msgid "Filter Test Results"
 msgstr "Выражение"
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 msgid "Unsubscribe from %s?"
 msgstr "Отписаться от %s?"
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Пожалуйста, укажите заметку для статьи:"
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 msgid "You can't edit this kind of feed."
 msgstr "Вы не можете редактировать этот канал."
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Редактировать канал"
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 #, fuzzy
 msgid "More Feeds"
 msgstr "Больше каналов"
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr "Нет выбранных каналов."
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Ошибки обновления"
 
-#: js/functions.js:1597 js/prefs.js:1232
+#: js/functions.js:1617 js/prefs.js:1232
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Удалить выбранные фильтры?"
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 msgid "No articles are selected."
 msgstr "Нет выбранных статей."
 
@@ -2816,55 +2826,55 @@ msgstr ""
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 msgid "Label Editor"
 msgstr "Редактор Меток"
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1807
+#: js/prefs.js:1822
 #, fuzzy
 msgid "Link Instance"
 msgstr "Редактировать теги"
 
-#: js/prefs.js:1858
+#: js/prefs.js:1873
 #, fuzzy
 msgid "Edit Instance"
 msgstr "Редактировать теги"
 
-#: js/prefs.js:1907
+#: js/prefs.js:1922
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Удалить выбранные фильтры?"
 
-#: js/prefs.js:1924 js/prefs.js:1936
+#: js/prefs.js:1939 js/prefs.js:1951
 #, fuzzy
 msgid "No instances are selected."
 msgstr "Нет выбранных фильтров."
 
-#: js/prefs.js:1941
+#: js/prefs.js:1956
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Пожалуйста выберите только один фильтр."
 
-#: js/prefs.js:1976
+#: js/prefs.js:1991
 msgid "Export Data"
 msgstr "Экспортировать данные"
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
-#: js/prefs.js:2056
+#: js/prefs.js:2071
 msgid "Data Import"
 msgstr "Импортировать данные"
 
-#: js/prefs.js:2091
+#: js/prefs.js:2106
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Подписаться на канал..."
@@ -2877,100 +2887,104 @@ msgstr "Расшарить статью по ссылке"
 msgid "Mark all articles as read?"
 msgstr "Пометить все статьи как прочитанные?"
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr "Нельзя отписаться от категории."
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 msgid "Please select some feed first."
 msgstr "Пожалуйста выберите какой-нибудь канал."
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 msgid "You can't rescore this kind of feed."
 msgstr "Вы не можете снова оценить этот канал."
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 msgid "Rescore articles in %s?"
 msgstr "Установить оценку статьям в %s?"
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 #, fuzzy
 msgid "New version available!"
 msgstr "Доступная новая версия Tiny Tiny RSS!"
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 msgid "Mark all visible articles in %s as read?"
 msgstr "Отметить все видимые статьи в %s как прочитанные?"
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 msgid "Delete %d selected articles?"
 msgstr "Удалить %d выбранных статей?"
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 msgid "Archive %d selected articles in %s?"
 msgstr "Архивировать %d выбранных статей в %s?"
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 msgid "Move %d archived articles back?"
 msgstr "Переместить %d архивированных статей назад?"
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 msgid "Edit article Tags"
 msgstr "Редактировать теги"
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 msgid "No article is selected."
 msgstr "Статья не выбрана"
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 msgid "No articles found to mark"
 msgstr "Статей для отметки не найдено."
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 msgid "Mark %d article(s) as read?"
 msgstr "Отметить %d статью(ей) как прочитанные?"
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 msgid "Loading..."
 msgstr "Идет загрузка..."
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 msgid "Open original article"
 msgstr "Показать оригинальное содержимое статьи"
 
-#: js/viewfeed.js:1854
+#: js/viewfeed.js:1863
 msgid "View in a tt-rss tab"
 msgstr "Открыть статью в новой закладке tt-rss"
 
-#: js/viewfeed.js:1862
+#: js/viewfeed.js:1871
 msgid "Mark above as read"
 msgstr "Отметить статьи выше как прочитанные"
 
-#: js/viewfeed.js:1868
+#: js/viewfeed.js:1877
 msgid "Mark below as read"
 msgstr "Отметить статьи ниже как прочитанные"
 
-#: js/viewfeed.js:1914
+#: js/viewfeed.js:1923
 msgid "Remove label"
 msgstr "Удалить метку"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1947
 msgid "Playing..."
 msgstr "Проигрываю..."
 
-#: js/viewfeed.js:1939
+#: js/viewfeed.js:1948
 msgid "Click to pause"
 msgstr "Пауза"
 
+#, fuzzy
+#~ msgid "Uses server timezone"
+#~ msgstr "Часовой пояс"
+
 #~ msgid "Personal data"
 #~ msgstr "Личные данные"
 
@@ -3630,9 +3644,6 @@ msgstr "Пауза"
 #~ msgid "Erase all non-starred articles in %s?"
 #~ msgstr "Стереть все не отмеченные статьи в %s?"
 
-#~ msgid "Published feed URL changed."
-#~ msgstr "Опубликованный URL канала изменён."
-
 #~ msgid "Trying to change address..."
 #~ msgstr "Попытка изменить адрес.."
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 0b9e4fc5..bb13639c 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 1893ab50..212fcdc8 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 16:39+0400\n"
-"PO-Revision-Date: 2011-11-23 00:49+0800\n"
-"Last-Translator: lazycai <lazycai.ffsky@gmail.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2012-03-12 13:59+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/"
+"language/zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +83,7 @@ msgstr "每天"
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr "默认"
 
@@ -137,7 +138,7 @@ msgstr "Tiny Tiny RSS 数据库是最新版。"
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回 Tiny Tiny RSS"
 
@@ -211,15 +212,15 @@ msgstr ""
 "\t\t\t请检查您的浏览器设置。"
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
-msgstr "读取中，请稍等……"
+msgstr "读取中，请稍候……"
 
 #: digest.php:72 index.php:97
 msgid "Hello,"
-msgstr "你好，"
+msgstr "您好，"
 
 #: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
@@ -288,7 +289,7 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。"
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr "偏好设置"
 
@@ -306,7 +307,7 @@ msgstr "新闻"
 
 #: index.php:145
 msgid "Collapse feedlist"
-msgstr "收缩信息列表"
+msgstr "收缩侧边栏"
 
 #: index.php:148
 msgid "Show articles"
@@ -344,7 +345,7 @@ msgstr "有更新的"
 msgid "Sort articles"
 msgstr "排序文章"
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 msgid "Date"
 msgstr "日期"
 
@@ -356,23 +357,23 @@ msgstr "标题"
 msgid "Score"
 msgstr "评分"
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr "更新列表"
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr "标记为已读"
 
 #: index.php:181 classes/feeds.php:125
 msgid "Actions..."
-msgstr "动作……"
+msgstr "动作"
 
 #: index.php:183
 msgid "Search..."
-msgstr "搜索……"
+msgstr "搜索"
 
 #: index.php:184
 msgid "Feed actions:"
@@ -380,17 +381,17 @@ msgstr "信息源操作："
 
 #: index.php:185
 msgid "Subscribe to feed..."
-msgstr "订阅信息源……"
+msgstr "订阅信息源"
 
 #: index.php:186
 msgid "Edit this feed..."
-msgstr "编辑信息源……"
+msgstr "编辑信息源"
 
 #: index.php:187
 msgid "Rescore feed"
 msgstr "为信息源重新评分"
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
@@ -408,23 +409,23 @@ msgstr "其他操作："
 
 #: index.php:193
 msgid "Switch to digest..."
-msgstr "切换至摘要……"
+msgstr "切换至摘要模式"
 
 #: index.php:194
 msgid "Show tag cloud..."
-msgstr "显示标签云……"
+msgstr "显示标签云"
 
 #: index.php:195
 msgid "Select by tags..."
-msgstr "通过自定义标签选择……"
+msgstr "通过自定义标签选择"
 
 #: index.php:196
 msgid "Create label..."
-msgstr "创建预定义标签……"
+msgstr "创建预定义标签"
 
 #: index.php:197
 msgid "Create filter..."
-msgstr "创建过滤器……"
+msgstr "创建过滤器"
 
 #: index.php:198
 msgid "Keyboard shortcuts help"
@@ -441,9 +442,9 @@ msgid "Setting preference key %s to %s"
 msgstr "将偏好按键从 %s 设置为 %s"
 
 #: opml.php:112
-#, fuzzy, php-format
+#, php-format
 msgid "Adding label %s"
-msgstr "添加预定义标签"
+msgstr ""
 
 #: opml.php:115
 #, php-format
@@ -451,14 +452,14 @@ msgid "Duplicate label: %s"
 msgstr ""
 
 #: opml.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Adding filter %s"
-msgstr "移除这个过滤器： %s ？"
+msgstr ""
 
 #: opml.php:185
-#, fuzzy, php-format
+#, php-format
 msgid "Duplicate filter %s"
-msgstr "创建过滤器"
+msgstr ""
 
 #: opml.php:230
 msgid "is already imported."
@@ -482,7 +483,7 @@ msgstr "OPML 工具"
 
 #: opml.php:492
 msgid "Importing OPML..."
-msgstr "导入 OPML ……"
+msgstr "正在导入 OPML ……"
 
 #: opml.php:496
 msgid "Return to preferences"
@@ -497,11 +498,11 @@ msgid "Exit preferences"
 msgstr "退出偏好设置"
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 msgid "Feeds"
 msgstr "信息源"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 msgid "Filters"
 msgstr "过滤器"
 
@@ -586,7 +587,7 @@ msgstr "无法连接 Twitter 。请刷新页面或过会儿重试。"
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr "恭喜！您已经成功通过 Twitter 注册。"
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 msgid "Register"
 msgstr "注册"
 
@@ -666,7 +667,7 @@ msgstr "选择鼠标指向的文章"
 msgid "Create label"
 msgstr "创建预定义标签"
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr "创建过滤器"
 
@@ -706,11 +707,11 @@ msgstr "信息源动作"
 msgid "Refresh active feed"
 msgstr "刷新活动的信息源"
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 msgid "Edit feed"
 msgstr "编辑信息源"
 
@@ -860,22 +861,21 @@ msgstr "以未读文章数量排列信息源"
 msgid "Article not found."
 msgstr "找不到文章。"
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr "未找到帮助主题。"
 
 #: classes/dlg.php:26
-#, fuzzy
 msgid "Prepare data"
-msgstr "保存信息"
+msgstr ""
 
 #: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr "关闭本窗口"
 
@@ -893,7 +893,7 @@ msgstr "创建偏好文件"
 msgid "(active)"
 msgstr "（当前使用的）"
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 msgid "Default profile"
 msgstr "默认偏好设置"
@@ -944,17 +944,17 @@ msgstr ""
 "更新进程在抓取信息更新时花费了太长时间，可能已经崩溃。请检查守护进程或联系管"
 "理员。"
 
-#: classes/dlg.php:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr "信息源"
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 msgid "Feed URL"
 msgstr "信息源 URL"
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 msgid "Place in category:"
 msgstr "加入到类别："
 
@@ -962,18 +962,18 @@ msgstr "加入到类别："
 msgid "Available feeds"
 msgstr "可用的信息源"
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr "登录密码"
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr "登陆"
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 msgid "Password"
 msgstr "密码"
 
@@ -996,14 +996,14 @@ msgstr "更多信息源"
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr "取消"
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr "搜索"
@@ -1020,8 +1020,8 @@ msgstr "信息源存档"
 msgid "limit:"
 msgstr "限制："
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr "移除"
@@ -1054,58 +1054,57 @@ msgstr "全部信息源"
 msgid "This feed"
 msgstr "本信息源"
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr "匹配"
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr "之前"
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 msgid "after"
 msgstr "之后"
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr "检查一下"
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr "on field"
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "在"
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 msgid "Perform Action"
 msgstr "执行动作"
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr "指定参数："
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 msgid "Options"
 msgstr "选项"
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr "已启用"
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr "反向匹配"
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
-#, fuzzy
+#: classes/dlg.php:539 classes/pref_filters.php:371
 msgid "Apply to category"
-msgstr "加入到类别："
+msgstr ""
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
 msgstr "测试"
 
@@ -1136,8 +1135,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开："
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "保存"
@@ -1197,7 +1196,7 @@ msgstr ""
 msgid "Instance"
 msgstr "实例"
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL："
@@ -1244,11 +1243,10 @@ msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 #: classes/dlg.php:1018
-#, fuzzy
 msgid "Feeds require authentication."
-msgstr "这个信息源需要认证"
+msgstr ""
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 msgid "Visit the website"
 msgstr "访问网站"
 
@@ -1260,8 +1258,8 @@ msgstr "以RSS信息源方式阅读"
 msgid "Select:"
 msgstr "选择："
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr "全部"
@@ -1270,8 +1268,8 @@ msgstr "全部"
 msgid "Invert"
 msgstr "反选"
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr "无"
@@ -1312,22 +1310,21 @@ msgstr "找不到信息源。"
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 msgid "Originally from:"
 msgstr "来源："
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 msgid "Open article in new tab"
 msgstr "在新标签页中打开文章"
 
-#: classes/feeds.php:723 include/functions.php:3350
-#, fuzzy
+#: classes/feeds.php:723 include/functions.php:3380
 msgid "Close article"
-msgstr "删除文章"
+msgstr ""
 
 #: classes/feeds.php:744
 msgid "No unread articles found to display."
@@ -1347,24 +1344,24 @@ msgid ""
 "(see the Actions menu above) or use a filter."
 msgstr ""
 "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方"
-"活动菜单）。"
+"动作菜单）。"
 
 #: classes/feeds.php:756
 msgid "No articles found to display."
 msgstr "暂时没有文章。"
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次信息源更新时间：%s"
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 msgid "Some feeds have update errors (click for details)"
 msgstr "部分信息源更新错误（点击了解详情）"
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr "未分类"
 
@@ -1400,25 +1397,25 @@ msgstr "编辑文章注记"
 msgid "Check to enable field"
 msgstr "勾选以启用"
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
 #, php-format
 msgid "(%d feeds)"
 msgstr "(%d 个信息源)"
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 msgid "Feed Title"
 msgstr "信息源标题"
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr "使用"
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr "文章清理："
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -1426,256 +1423,255 @@ msgstr ""
 "<b>提示：</b>如果您的信息源需要验证，那么您需要填写登录信息。Twitter 信息源除"
 "外。"
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 msgid "Hide from Popular feeds"
 msgstr "从最受欢迎的信息源中隐藏"
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr "右至左的内容"
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr "包含电子邮件摘要"
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr "始终显示图片附件"
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr "本地缓存图片"
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 msgid "Mark updated articles as unread"
 msgstr "将已更新的文章标记为未读"
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
 msgstr "将内容更改过的文章标记为已更新状态"
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 msgid "Icon"
 msgstr "图标"
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr "替换"
 
-#: classes/pref_feeds.php:518
+#: classes/pref_feeds.php:524
 msgid "Resubscribe to push updates"
 msgstr "重新订阅以推送更新"
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "为启用推送的信息源重置 PubSubHubbub 订阅。"
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr "全部完成。"
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "无法订阅 <b>%s</b>。"
 
-#: classes/pref_feeds.php:1017
+#: classes/pref_feeds.php:1024
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "在 <b>%s</b> 中没有找到信息源。"
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: classes/pref_feeds.php:1028
+#: classes/pref_feeds.php:1030
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "未找到信息源。"
+
+#: classes/pref_feeds.php:1035
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "无法订阅 <b>%s</b>。<br>无法下载信息源的 URL。"
 
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1057
 msgid "Subscribe to selected feed"
 msgstr "订阅选中的信息源"
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
 msgstr "编辑订阅选项"
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "数据库中已经有 <b>$%s</b> 这个类别。"
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr "创建类别"
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr "没有定义过的信息源类别。"
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 msgid "Remove selected categories"
 msgstr "移除选定的类别"
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 msgid "Feeds with errors"
 msgstr "有错误的信息源"
 
-#: classes/pref_feeds.php:1280
+#: classes/pref_feeds.php:1287
 msgid "Inactive feeds"
 msgstr "很久不活跃的信息源"
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 msgid "Select"
 msgstr "选择"
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 msgid "Edit selected feeds"
 msgstr "编辑选定的信息源"
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 msgid "Reset sort order"
 msgstr "重置排序"
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
-#, fuzzy
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 msgid "Batch subscribe"
-msgstr "取消订阅"
+msgstr ""
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 msgid "Categories"
 msgstr "类别"
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
 msgstr "编辑类别"
 
-#: classes/pref_feeds.php:1345
-msgid "More actions..."
-msgstr "更多动作……"
+#: classes/pref_feeds.php:1338
+#, fuzzy
+msgid "(Un)hide empty categories"
+msgstr "编辑类别"
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1354
+msgid "More actions..."
+msgstr "更多动作"
+
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr "手动清除"
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 msgid "Clear feed data"
 msgstr "清空信息源数据"
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 msgid "Rescore articles"
 msgstr "为文章重新评分"
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr "<b>提示：</b> 您可以拖拽信息源和类别。"
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
 msgstr ""
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref_feeds.php:1408
-#, fuzzy
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
-msgstr "您可以用 OPML 进行信息源和 Tiny Tiny RSS 偏好设置的导出导入。"
+msgstr ""
 
-#: classes/pref_feeds.php:1410
-#, fuzzy
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
-msgstr "提醒：OPML 仅可用于默认偏好文件的迁移。"
+msgstr ""
 
-#: classes/pref_feeds.php:1423
-#, fuzzy
+#: classes/pref_feeds.php:1432
 msgid "Import my OPML"
-msgstr "导入 OPML ……"
+msgstr ""
 
-#: classes/pref_feeds.php:1427
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
 msgstr "文件名："
 
-#: classes/pref_feeds.php:1429
+#: classes/pref_feeds.php:1438
 msgid "Include settings"
 msgstr "包含设置"
 
-#: classes/pref_feeds.php:1433
-#, fuzzy
+#: classes/pref_feeds.php:1442
 msgid "Export OPML"
-msgstr "导出"
+msgstr ""
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr "您可以公开发布您的 OPML 。网上的任何人都可以通过如下 URL 订阅该文件。"
 
-#: classes/pref_feeds.php:1439
-#, fuzzy
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
-"提醒：公开发布的 OPML 不会包含您的 Tiny Tiny RSS 配置文件、需要认证才能获取的"
-"信息源、以及从最受欢迎的信息源中隐藏的信息源。"
 
-#: classes/pref_feeds.php:1442
-#, fuzzy
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
-msgstr "公开的 OPML URL"
+msgstr ""
 
-#: classes/pref_feeds.php:1445
-#, fuzzy
+#: classes/pref_feeds.php:1454
 msgid "Article archive"
-msgstr "文章发布时间"
+msgstr ""
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
-#, fuzzy
+#: classes/pref_feeds.php:1459
 msgid "Export my data"
-msgstr "导出"
+msgstr ""
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr "导入"
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 msgid "Firefox integration"
 msgstr "Firefox 集成"
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr "点击如下链接，可以将本 Tiny Tiny RSS 站点作为一个 Firefox 阅读器使用。"
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr "点击此处将本站注册为信息源阅读器。"
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr "通过书签订阅"
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
@@ -1683,25 +1679,24 @@ msgstr ""
 "将以下链接拖拽至您的浏览器工具条，在浏览器中打开您想看的信息源，然后点击链接"
 "以订阅。"
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "在 Tiny Tiny RSS 中订阅 %s ？"
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "在 Tiny Tiny RSS 中订阅"
 
-#: classes/pref_feeds.php:1503
-#, fuzzy
+#: classes/pref_feeds.php:1512
 msgid "Published & shared articles / Generated feeds"
-msgstr "已发布、已分享的文章和生成的信息源"
+msgstr ""
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 msgid "Published articles and generated feeds"
 msgstr "已发布的文章和生成的信息源"
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1709,31 +1704,31 @@ msgstr ""
 "已发布的文章将会输出为公开的 RSS 信息源，网上的任何人可以通过如下 URL 进行订"
 "阅。"
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 msgid "Display URL"
 msgstr "显示 URL"
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr "清空所有生成的 URL"
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
 msgstr "通过 URL 分享的文章"
 
-#: classes/pref_feeds.php:1520
+#: classes/pref_feeds.php:1529
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "您可以取消所有通过 URL 分享的文章。"
 
-#: classes/pref_feeds.php:1523
+#: classes/pref_feeds.php:1532
 msgid "Unshare all articles"
 msgstr "取消所有分享"
 
-#: classes/pref_feeds.php:1529
+#: classes/pref_feeds.php:1538
 msgid "Twitter"
 msgstr "Twitter"
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
@@ -1741,34 +1736,38 @@ msgstr ""
 "更新 Twitter 信息源之前，您必须在 Twitter.com 上注册这个 Tiny Tiny RSS 的实"
 "例。"
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr "您已经成功在 Twitter.com 上注册并获取您的 Twitter 信息源的访问权。"
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr "在 Twitter.com 上注册"
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 msgid "Clear stored credentials"
 msgstr "清空保存的个人信息"
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
 msgstr "符合本过滤器条件的文章："
 
-#: classes/pref_filters.php:84
+#: classes/pref_filters.php:89
 msgid "No articles matching this filter has been found."
 msgstr "本过滤器下没有匹配到文章。"
 
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
+msgstr ""
+
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "创建过滤器 <b>%s</b>"
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
 msgstr "编辑"
@@ -1846,95 +1845,94 @@ msgstr "密码更改成功。"
 msgid "Old password is incorrect."
 msgstr "原密码输入错误。"
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr "设置已保存。"
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr "未知选项： %s"
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr "您的个人数据已保存。"
 
-#: classes/pref_prefs.php:159
-#, fuzzy
+#: classes/pref_prefs.php:168
 msgid "Personal data / Authentication"
-msgstr "登录密码"
+msgstr ""
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr "姓名"
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 msgid "Access level"
 msgstr "访问级别"
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 msgid "Save data"
 msgstr "保存信息"
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 msgid "Your password is at default value, please change it."
 msgstr "您还在使用系统默认的密码，请修改。"
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr "原密码"
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr "新密码"
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr "确认密码"
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr "更改密码"
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr "选择主题"
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr "自定义"
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr "是"
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr "否"
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
 msgstr "清空"
 
-#: classes/pref_prefs.php:468
+#: classes/pref_prefs.php:477
 #, php-format
-msgid "Current server time: %s"
+msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr "管理偏好文件"
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr "恢复到默认"
 
@@ -1994,13 +1992,11 @@ msgid "User <b>%s</b> already exists."
 msgstr "用户 <b>%s</b> 已存在。"
 
 #: classes/pref_users.php:291
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
 "\t\t\t\t to <b>%s</b>"
 msgstr ""
-"更改用户 <b>%s</b>\n"
-"\t\t\t\t\t 的密码为 <b>%s</b>"
 
 #: classes/pref_users.php:298
 #, php-format
@@ -2031,27 +2027,23 @@ msgstr "没有定义用户。"
 msgid "No matching users found."
 msgstr "没有匹配的用户。"
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr "无标签"
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 msgid "Your request could not be completed."
 msgstr "您的请求无法完成。"
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr "信息源更新的任务计划已制定。"
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 msgid "Category update has been scheduled."
 msgstr "分类更新已列入任务计划。"
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 msgid "Can't update this kind of feed."
 msgstr "无法更新这种类型的信息源。"
 
@@ -2079,62 +2071,61 @@ msgstr "用户名或密码错误"
 msgid "Archived articles"
 msgstr "存档的文章"
 
-#: include/functions.php:3158 js/viewfeed.js:1945
+#: include/functions.php:3188 js/viewfeed.js:1954
 msgid "Click to play"
 msgstr "点击播放"
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
 msgstr "播放"
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:4104
+#: include/functions.php:4134
 msgid "(edit note)"
 msgstr "（编辑注记）"
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr "没有选中的信息源。"
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 msgid "unknown type"
 msgstr "未知类型"
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr "附件："
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 msgid "Attachments:"
 msgstr "附件："
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, php-format
 msgid "%d archived articles"
 msgstr "%d 个存档的文章"
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:5241
-#, fuzzy
+#: include/functions.php:5287
 msgid "Could not import: incorrect schema version."
-msgstr "无法找到必要的表结构文件，需要版本："
+msgstr ""
 
-#: include/functions.php:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
 msgstr ""
 
@@ -2167,7 +2158,7 @@ msgstr "发布文章"
 msgid "Assign tags"
 msgstr "添加自定义标签"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr "添加预定义标签"
 
@@ -2251,7 +2242,7 @@ msgstr "在 tt-rss 处注册您的 SSL 证书"
 
 #: include/localized_schema.php:32
 #, fuzzy
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr "用户所在时区"
 
 #: include/localized_schema.php:33
@@ -2366,7 +2357,7 @@ msgstr "用户所在时区"
 msgid "Sort headlines by feed date"
 msgstr "以信息源的日期排序"
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 msgid "Customize stylesheet"
 msgstr "自定义样式"
 
@@ -2390,7 +2381,7 @@ msgstr "偏好："
 msgid "Use less traffic"
 msgstr "使用较少流量"
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 msgid "Mark all articles in %s as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
 
@@ -2442,7 +2433,7 @@ msgstr "加载更多……"
 msgid "New articles available in this feed (click to show)"
 msgstr "本信息源中的最新文章（点击显示）"
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 msgid "Update feed"
 msgstr "更新信息源"
 
@@ -2514,64 +2505,64 @@ msgstr "您已经订阅过这个信息源啦。"
 msgid "Create Filter"
 msgstr "创建过滤器"
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 msgid "Filter Test Results"
 msgstr "过滤器测试结果"
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 "重置订阅？ Tiny Tiny RSS 将会在下次信息源更新的时候尝试再次订阅信息提醒中心。"
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 msgid "Unsubscribe from %s?"
 msgstr "从 %s 取消订阅？"
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 msgid "Please enter category title:"
 msgstr "请填写类别名称："
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr "为本信息源生成新的群地址？"
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 msgid "You can't edit this kind of feed."
 msgstr "您无法编辑这种类型的信息源。"
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 msgid "Edit Feed"
 msgstr "编辑信息源"
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 msgid "More Feeds"
 msgstr "更多信息源"
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr "没有选择任何信息源。"
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr "将选中的信息源从存档中移除？包含已保存文章的信息源不会被移除。"
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 msgid "Feeds with update errors"
 msgstr "更新错误的信息源"
 
-#: js/functions.js:1597 js/prefs.js:1232
+#: js/functions.js:1617 js/prefs.js:1232
 msgid "Remove selected feeds?"
 msgstr "移除选中的信息源？"
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 msgid "No articles are selected."
 msgstr "没有选中任何文章。"
 
@@ -2674,9 +2665,8 @@ msgid "Please choose an OPML file first."
 msgstr "请先选择一个 OPML 文件。"
 
 #: js/prefs.js:814
-#, fuzzy
 msgid "Please choose the file first."
-msgstr "请先选择一个 OPML 文件。"
+msgstr ""
 
 #: js/prefs.js:941
 msgid "Reset to defaults?"
@@ -2743,55 +2733,52 @@ msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 msgid "Label Editor"
 msgstr "编辑预定义标签"
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr "这将会清空所有保存过的 Twitter 认证信息。是否继续？"
 
-#: js/prefs.js:1807
+#: js/prefs.js:1822
 msgid "Link Instance"
 msgstr "链接实例"
 
-#: js/prefs.js:1858
+#: js/prefs.js:1873
 msgid "Edit Instance"
 msgstr "编辑实例"
 
-#: js/prefs.js:1907
+#: js/prefs.js:1922
 msgid "Remove selected instances?"
 msgstr "移除选中的实例？"
 
-#: js/prefs.js:1924 js/prefs.js:1936
+#: js/prefs.js:1939 js/prefs.js:1951
 msgid "No instances are selected."
 msgstr "未选中任何实例。"
 
-#: js/prefs.js:1941
+#: js/prefs.js:1956
 msgid "Please select only one instance."
 msgstr "请仅选择一个实例。"
 
-#: js/prefs.js:1976
-#, fuzzy
+#: js/prefs.js:1991
 msgid "Export Data"
-msgstr "导出"
+msgstr ""
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
-#: js/prefs.js:2056
-#, fuzzy
+#: js/prefs.js:2071
 msgid "Data Import"
-msgstr "导入"
+msgstr ""
 
-#: js/prefs.js:2091
-#, fuzzy
+#: js/prefs.js:2106
 msgid "Subscribing to feeds..."
-msgstr "正在订阅信息源……"
+msgstr ""
 
 #: js/share_button.js:10
 msgid "Share article by URL"
@@ -2801,199 +2788,94 @@ msgstr "通过 URL 分享文章"
 msgid "Mark all articles as read?"
 msgstr "将所有文章标记为已读？"
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消订阅一个类别。"
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 msgid "Please select some feed first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 msgid "You can't rescore this kind of feed."
 msgstr "无法重置本类信息源的评分。"
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的评分？"
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 msgid "New version available!"
 msgstr "有可用的新版本啦！"
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 msgid "Mark all visible articles in %s as read?"
 msgstr "标记 %s 中所有可见的文章为已读？"
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 msgid "Delete %d selected articles in %s?"
 msgstr "删除 %s 中选择的 %d 篇文章？"
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 msgid "Delete %d selected articles?"
 msgstr "删除选中的 %d 篇文章？"
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 msgid "Archive %d selected articles in %s?"
 msgstr "将 %s 中的 %d 篇选中的文章存档？"
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 msgid "Move %d archived articles back?"
 msgstr "将存档的 %d 篇文章移回原处？"
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 msgid "Mark %d selected articles in %s as read?"
 msgstr "将 %s 中选中的 %d 篇文章标记为已读？"
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 msgid "Edit article Tags"
 msgstr "编辑文章的自定义标签"
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 msgid "No article is selected."
 msgstr "未选中任何文章。"
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 msgid "No articles found to mark"
 msgstr "未找到需要标记的文章"
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 msgid "Mark %d article(s) as read?"
 msgstr "将 %d 篇文章标记为已读？"
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 msgid "Loading..."
 msgstr "加载中……"
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 msgid "Open original article"
 msgstr "打开原文"
 
-#: js/viewfeed.js:1854
+#: js/viewfeed.js:1863
 msgid "View in a tt-rss tab"
 msgstr "在 tt-rss 舌签中查看"
 
-#: js/viewfeed.js:1862
-#, fuzzy
+#: js/viewfeed.js:1871
 msgid "Mark above as read"
-msgstr "标记为已读"
+msgstr ""
 
-#: js/viewfeed.js:1868
-#, fuzzy
+#: js/viewfeed.js:1877
 msgid "Mark below as read"
-msgstr "标记为已读"
+msgstr ""
 
-#: js/viewfeed.js:1914
+#: js/viewfeed.js:1923
 msgid "Remove label"
 msgstr "移除预定义标签"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1947
 msgid "Playing..."
 msgstr "播放中……"
 
-#: js/viewfeed.js:1939
+#: js/viewfeed.js:1948
 msgid "Click to pause"
 msgstr "点击暂停"
-
-#~ msgid "Personal data"
-#~ msgstr "个人信息"
-
-#~ msgid "About..."
-#~ msgstr "关于……"
-
-#~ msgid "Help"
-#~ msgstr "帮助"
-
-#~ msgid "Importing using DOMXML."
-#~ msgstr "通过 DOMXML 导入。"
-
-#~ msgid "Importing using DOMDocument."
-#~ msgstr "通过 DOMDocument 导入。"
-
-#~ msgid ""
-#~ "DOMXML extension is not found. It is required for PHP versions below 5."
-#~ msgstr "未检测到 DOMXML 扩展。PHP 5以下的版本需要用到本扩展。"
-
-#~ msgid "Cache images locally (SimplePie only)"
-#~ msgstr "在本地缓存图片（仅针对SimplePie）"
-
-#~ msgid ""
-#~ "Using OPML you can export and import your feeds and Tiny Tiny RSS "
-#~ "settings."
-#~ msgstr "您可以用 OPML 进行信息源和 Tiny Tiny RSS 偏好设置的导出导入。"
-
-#~ msgid "Note: Only main settings profile can be migrated using OPML."
-#~ msgstr "提醒：OPML 仅可用于默认偏好文件的迁移。"
-
-#~ msgid "Publish"
-#~ msgstr "发布"
-
-#~ msgid ""
-#~ "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-#~ "that require authentication or feeds hidden from Popular feeds."
-#~ msgstr ""
-#~ "提醒：公开发布的 OPML 不会包含您的 Tiny Tiny RSS 配置文件、需要认证才能获"
-#~ "取的信息源、以及从最受欢迎的信息源中隐藏的信息源。"
-
-#~ msgid "Changed password of user <b>%s</b>."
-#~ msgstr "用户 <b>%s</b> 的密码已更改。"
-
-#~ msgid "Content filtering"
-#~ msgstr "内容过滤"
-
-#~ msgid ""
-#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
-#~ "Filtering is done once, when new article is imported to the database from "
-#~ "the newsfeed, specified field is matched against regular expression and "
-#~ "some action is taken. Regular expression matching is case-insensitive."
-#~ msgstr ""
-#~ "Tiny Tiny RSS 支持文章过滤。过滤在文章导入数据库的时候完成，指定的内容在与"
-#~ "正则表达式匹配后会执行指定的动作。正则表达式区分大小写。"
-
-#~ msgid ""
-#~ "Supported actions are: filter (do not import) article, mark article as "
-#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
-#~ "globally and for some specific feed."
-#~ msgstr ""
-#~ "支持的动作包括：过滤文章（不导入），标记文章为已读，加注星标，加注自定义标"
-#~ "签，进行评分。过滤器可以全局设置，也可以针对指定的信息源设置。"
-
-#~ msgid ""
-#~ "Multiple and inverse matching are supported. All matching filters are "
-#~ "considered when article is being imported and all actions executed in "
-#~ "sequence. Inverse matching reverts matching result, e.g. filter matching "
-#~ "XYZZY in title with inverse flag will match all articles, except those "
-#~ "containing string XYZZY in title."
-#~ msgstr ""
-#~ "支持多项匹配和反向匹配。当文章被导入时，所有的匹配过滤器会被依次执行。反向"
-#~ "匹配会将匹配结果反转，比如反向匹配 XYZZY 这个关键字的情况将会匹配所有标题"
-#~ "中不包含 XYZZY 的文章。"
-
-#~ msgid "See also:"
-#~ msgstr "另请参考："
-
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "创建类别"
-
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "创建预定义标签……"
-
-#~ msgid "Dismiss article"
-#~ msgstr "不再显示本文章"
-
-#~ msgid "Remove:"
-#~ msgstr "移除："
-
-#~ msgid "Assign:"
-#~ msgstr "应用于："
-
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "锁定类别重新排序模式"
-
-#~ msgid "Update all feeds"
-#~ msgstr "更新全部信息源"
-
-#~ msgid "Sort by name or unread count"
-#~ msgstr "通过名称或未读的数量排序"
diff --git a/messages.pot b/messages.pot
index b37d2fbb..adbd443e 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-01-30 16:39+0400\n"
+"POT-Creation-Date: 2012-03-12 13:59+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"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Weekly"
 msgstr ""
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr ""
 
@@ -136,7 +136,7 @@ msgstr ""
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
@@ -206,9 +206,9 @@ msgid ""
 msgstr ""
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
 msgstr ""
 
@@ -280,7 +280,7 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr ""
 
@@ -336,7 +336,7 @@ msgstr ""
 msgid "Sort articles"
 msgstr ""
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 msgid "Date"
 msgstr ""
 
@@ -348,13 +348,13 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr ""
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr ""
 
@@ -382,7 +382,7 @@ msgstr ""
 msgid "Rescore feed"
 msgstr ""
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr ""
 
@@ -489,11 +489,11 @@ msgid "Exit preferences"
 msgstr ""
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 msgid "Feeds"
 msgstr ""
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 msgid "Filters"
 msgstr ""
 
@@ -578,7 +578,7 @@ msgstr ""
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 msgid "Register"
 msgstr ""
 
@@ -658,7 +658,7 @@ msgstr ""
 msgid "Create label"
 msgstr ""
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr ""
 
@@ -698,11 +698,11 @@ msgstr ""
 msgid "Refresh active feed"
 msgstr ""
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr ""
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 msgid "Edit feed"
 msgstr ""
 
@@ -850,7 +850,7 @@ msgstr ""
 msgid "Article not found."
 msgstr ""
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr ""
 
@@ -862,9 +862,9 @@ msgstr ""
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr ""
 
@@ -882,7 +882,7 @@ msgstr ""
 msgid "(active)"
 msgstr ""
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 msgid "Default profile"
 msgstr ""
@@ -929,17 +929,17 @@ msgid ""
 "contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr ""
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 msgid "Feed URL"
 msgstr ""
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 msgid "Place in category:"
 msgstr ""
 
@@ -947,18 +947,18 @@ msgstr ""
 msgid "Available feeds"
 msgstr ""
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr ""
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr ""
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 msgid "Password"
 msgstr ""
 
@@ -981,14 +981,14 @@ msgstr ""
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr ""
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr ""
@@ -1005,8 +1005,8 @@ msgstr ""
 msgid "limit:"
 msgstr ""
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr ""
@@ -1039,57 +1039,57 @@ msgstr ""
 msgid "This feed"
 msgstr ""
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr ""
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr ""
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 msgid "after"
 msgstr ""
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr ""
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr ""
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 msgid "in"
 msgstr ""
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 msgid "Perform Action"
 msgstr ""
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr ""
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 msgid "Options"
 msgstr ""
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr ""
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr ""
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
+#: classes/dlg.php:539 classes/pref_filters.php:371
 msgid "Apply to category"
 msgstr ""
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
 msgstr ""
 
@@ -1120,8 +1120,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr ""
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr ""
@@ -1179,7 +1179,7 @@ msgstr ""
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 msgid "URL:"
 msgstr ""
@@ -1229,7 +1229,7 @@ msgstr ""
 msgid "Feeds require authentication."
 msgstr ""
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 msgid "Visit the website"
 msgstr ""
 
@@ -1241,8 +1241,8 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr ""
@@ -1251,8 +1251,8 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr ""
@@ -1293,19 +1293,19 @@ msgstr ""
 msgid "mark as read"
 msgstr ""
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 msgid "Originally from:"
 msgstr ""
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 msgid "Edit tags for this article"
 msgstr ""
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 msgid "Open article in new tab"
 msgstr ""
 
-#: classes/feeds.php:723 include/functions.php:3350
+#: classes/feeds.php:723 include/functions.php:3380
 msgid "Close article"
 msgstr ""
 
@@ -1331,18 +1331,18 @@ msgstr ""
 msgid "No articles found to display."
 msgstr ""
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr ""
 
@@ -1378,355 +1378,367 @@ msgstr ""
 msgid "Check to enable field"
 msgstr ""
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
 #, php-format
 msgid "(%d feeds)"
 msgstr ""
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 msgid "Feed Title"
 msgstr ""
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr ""
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr ""
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 msgid "Hide from Popular feeds"
 msgstr ""
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr ""
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr ""
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 msgid "Mark updated articles as unread"
 msgstr ""
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 msgid "Icon"
 msgstr ""
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr ""
 
-#: classes/pref_feeds.php:518
+#: classes/pref_feeds.php:524
 msgid "Resubscribe to push updates"
 msgstr ""
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr ""
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/pref_feeds.php:1017
+#: classes/pref_feeds.php:1024
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr ""
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/pref_feeds.php:1028
+#: classes/pref_feeds.php:1030
+msgid "Multiple feed URLs found."
+msgstr ""
+
+#: classes/pref_feeds.php:1035
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1057
 msgid "Subscribe to selected feed"
 msgstr ""
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
 msgstr ""
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr ""
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr ""
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr ""
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 msgid "Remove selected categories"
 msgstr ""
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 msgid "Feeds with errors"
 msgstr ""
 
-#: classes/pref_feeds.php:1280
+#: classes/pref_feeds.php:1287
 msgid "Inactive feeds"
 msgstr ""
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 msgid "Select"
 msgstr ""
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 msgid "Edit selected feeds"
 msgstr ""
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 msgid "Reset sort order"
 msgstr ""
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 msgid "Categories"
 msgstr ""
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
 msgstr ""
 
-#: classes/pref_feeds.php:1345
+#: classes/pref_feeds.php:1338
+msgid "(Un)hide empty categories"
+msgstr ""
+
+#: classes/pref_feeds.php:1354
 msgid "More actions..."
 msgstr ""
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr ""
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 msgid "Clear feed data"
 msgstr ""
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 msgid "Rescore articles"
 msgstr ""
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
 msgstr ""
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr ""
 
-#: classes/pref_feeds.php:1408
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref_feeds.php:1410
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref_feeds.php:1423
+#: classes/pref_feeds.php:1432
 msgid "Import my OPML"
 msgstr ""
 
-#: classes/pref_feeds.php:1427
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref_feeds.php:1429
+#: classes/pref_feeds.php:1438
 msgid "Include settings"
 msgstr ""
 
-#: classes/pref_feeds.php:1433
+#: classes/pref_feeds.php:1442
 msgid "Export OPML"
 msgstr ""
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: classes/pref_feeds.php:1439
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1442
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1445
+#: classes/pref_feeds.php:1454
 msgid "Article archive"
 msgstr ""
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
+#: classes/pref_feeds.php:1459
 msgid "Export my data"
 msgstr ""
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr ""
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 msgid "Firefox integration"
 msgstr ""
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr ""
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr ""
 
-#: classes/pref_feeds.php:1503
+#: classes/pref_feeds.php:1512
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 msgid "Published articles and generated feeds"
 msgstr ""
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref_feeds.php:1520
+#: classes/pref_feeds.php:1529
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref_feeds.php:1523
+#: classes/pref_feeds.php:1532
 msgid "Unshare all articles"
 msgstr ""
 
-#: classes/pref_feeds.php:1529
+#: classes/pref_feeds.php:1538
 msgid "Twitter"
 msgstr ""
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 msgid "Clear stored credentials"
 msgstr ""
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: classes/pref_filters.php:84
+#: classes/pref_filters.php:89
 msgid "No articles matching this filter has been found."
 msgstr ""
 
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
+msgstr ""
+
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr ""
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
 msgstr ""
@@ -1802,94 +1814,94 @@ msgstr ""
 msgid "Old password is incorrect."
 msgstr ""
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr ""
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr ""
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: classes/pref_prefs.php:159
+#: classes/pref_prefs.php:168
 msgid "Personal data / Authentication"
 msgstr ""
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr ""
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr ""
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 msgid "Access level"
 msgstr ""
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 msgid "Save data"
 msgstr ""
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 msgid "Your password is at default value, please change it."
 msgstr ""
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr ""
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr ""
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr ""
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr ""
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr ""
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr ""
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr ""
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr ""
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
 msgstr ""
 
-#: classes/pref_prefs.php:468
+#: classes/pref_prefs.php:477
 #, php-format
-msgid "Current server time: %s"
+msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr ""
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr ""
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr ""
 
@@ -1984,27 +1996,23 @@ msgstr ""
 msgid "No matching users found."
 msgstr ""
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr ""
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 msgid "Your request could not be completed."
 msgstr ""
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 msgid "Category update has been scheduled."
 msgstr ""
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 msgid "Can't update this kind of feed."
 msgstr ""
 
@@ -2032,61 +2040,61 @@ msgstr ""
 msgid "Archived articles"
 msgstr ""
 
-#: include/functions.php:3158 js/viewfeed.js:1945
+#: include/functions.php:3188 js/viewfeed.js:1954
 msgid "Click to play"
 msgstr ""
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 msgid " - "
 msgstr ""
 
-#: include/functions.php:4104
+#: include/functions.php:4134
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr ""
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 msgid "unknown type"
 msgstr ""
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr ""
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 msgid "Attachments:"
 msgstr ""
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, php-format
 msgid "%d archived articles"
 msgstr ""
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 msgid "No feeds found."
 msgstr ""
 
-#: include/functions.php:5241
+#: include/functions.php:5287
 msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: include/functions.php:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
 msgstr ""
 
@@ -2119,7 +2127,7 @@ msgstr ""
 msgid "Assign tags"
 msgstr ""
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr ""
 
@@ -2199,7 +2207,7 @@ msgid "Click to register your SSL client certificate with tt-rss"
 msgstr ""
 
 #: include/localized_schema.php:32
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
@@ -2314,7 +2322,7 @@ msgstr ""
 msgid "Sort headlines by feed date"
 msgstr ""
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 msgid "Customize stylesheet"
 msgstr ""
 
@@ -2338,7 +2346,7 @@ msgstr ""
 msgid "Use less traffic"
 msgstr ""
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 msgid "Mark all articles in %s as read?"
 msgstr ""
 
@@ -2390,7 +2398,7 @@ msgstr ""
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 msgid "Update feed"
 msgstr ""
 
@@ -2460,63 +2468,63 @@ msgstr ""
 msgid "Create Filter"
 msgstr ""
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 msgid "Filter Test Results"
 msgstr ""
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 msgid "Unsubscribe from %s?"
 msgstr ""
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 msgid "Please enter category title:"
 msgstr ""
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 msgid "Edit Feed"
 msgstr ""
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 msgid "More Feeds"
 msgstr ""
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr ""
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 msgid "Feeds with update errors"
 msgstr ""
 
-#: js/functions.js:1597 js/prefs.js:1232
+#: js/functions.js:1617 js/prefs.js:1232
 msgid "Remove selected feeds?"
 msgstr ""
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 msgid "No articles are selected."
 msgstr ""
 
@@ -2687,50 +2695,50 @@ msgstr ""
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 msgid "Label Editor"
 msgstr ""
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
-#: js/prefs.js:1807
+#: js/prefs.js:1822
 msgid "Link Instance"
 msgstr ""
 
-#: js/prefs.js:1858
+#: js/prefs.js:1873
 msgid "Edit Instance"
 msgstr ""
 
-#: js/prefs.js:1907
+#: js/prefs.js:1922
 msgid "Remove selected instances?"
 msgstr ""
 
-#: js/prefs.js:1924 js/prefs.js:1936
+#: js/prefs.js:1939 js/prefs.js:1951
 msgid "No instances are selected."
 msgstr ""
 
-#: js/prefs.js:1941
+#: js/prefs.js:1956
 msgid "Please select only one instance."
 msgstr ""
 
-#: js/prefs.js:1976
+#: js/prefs.js:1991
 msgid "Export Data"
 msgstr ""
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
-#: js/prefs.js:2056
+#: js/prefs.js:2071
 msgid "Data Import"
 msgstr ""
 
-#: js/prefs.js:2091
+#: js/prefs.js:2106
 msgid "Subscribing to feeds..."
 msgstr ""
 
@@ -2742,94 +2750,94 @@ msgstr ""
 msgid "Mark all articles as read?"
 msgstr ""
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 msgid "Please select some feed first."
 msgstr ""
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 msgid "Rescore articles in %s?"
 msgstr ""
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 msgid "New version available!"
 msgstr ""
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 msgid "Delete %d selected articles in %s?"
 msgstr ""
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 msgid "Delete %d selected articles?"
 msgstr ""
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 msgid "Archive %d selected articles in %s?"
 msgstr ""
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 msgid "Move %d archived articles back?"
 msgstr ""
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 msgid "Mark %d selected articles in %s as read?"
 msgstr ""
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 msgid "Edit article Tags"
 msgstr ""
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 msgid "No article is selected."
 msgstr ""
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 msgid "No articles found to mark"
 msgstr ""
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 msgid "Mark %d article(s) as read?"
 msgstr ""
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 msgid "Loading..."
 msgstr ""
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 msgid "Open original article"
 msgstr ""
 
-#: js/viewfeed.js:1854
+#: js/viewfeed.js:1863
 msgid "View in a tt-rss tab"
 msgstr ""
 
-#: js/viewfeed.js:1862
+#: js/viewfeed.js:1871
 msgid "Mark above as read"
 msgstr ""
 
-#: js/viewfeed.js:1868
+#: js/viewfeed.js:1877
 msgid "Mark below as read"
 msgstr ""
 
-#: js/viewfeed.js:1914
+#: js/viewfeed.js:1923
 msgid "Remove label"
 msgstr ""
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1947
 msgid "Playing..."
 msgstr ""
 
-#: js/viewfeed.js:1939
+#: js/viewfeed.js:1948
 msgid "Click to pause"
 msgstr ""