diff --git a/include/localized_schema.php b/include/localized_schema.php
index b2320eb2..744140e4 100644
--- a/include/localized_schema.php
+++ b/include/localized_schema.php
@@ -1,4 +1,4 @@
-<?php # This file has been generated at:  Mon Apr 1 12:16:26 MSK 2013
+<?php # This file has been generated at:  Mon Apr 1 16:28:03 MSK 2013
 
 __("Title");
 __("Title or Content");
diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index 13154f2b..efd7fcc3 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 dc533fe1..112f3a7f 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: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+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"
@@ -253,14 +253,14 @@ msgstr "Ha fallat la sortida de prova de SQL, reviseu la base configuració de l
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -306,13 +306,13 @@ msgid "All Articles"
 msgstr "Tots els articles"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Marcats"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Publicats"
@@ -359,7 +359,7 @@ msgstr "Marca el canal com a llegit"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -370,8 +370,8 @@ msgid "Mark as read"
 msgstr "Marca'l com a llegit"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Tots els articles"
 
@@ -431,8 +431,8 @@ msgid "Rescore feed"
 msgstr "Canvia la puntuació del canal"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Dóna't de baixa"
@@ -459,7 +459,7 @@ msgid "Show tag cloud..."
 msgstr "Núvol d'etiquetes"
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Canvia al mode de reordenació de categories"
@@ -489,41 +489,41 @@ msgid "Logout"
 msgstr "Surt"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Preferències"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Surt de les preferències"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Canals"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Etiquetes"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Usuaris"
 
@@ -588,12 +588,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Sense categoria"
 
@@ -608,346 +608,346 @@ msgstr[1] "Articles marcats"
 msgid "No feeds found."
 msgstr "No s'ha trobat cap canal."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Especial"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Tots els canals"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Articles marcats"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Articles publicats"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Articles nous"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 #, fuzzy
 msgid "Archived articles"
 msgstr "Articles mémorisés"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Navegació"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 #, fuzzy
 msgid "Open next feed"
 msgstr "Canals generats"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 #, fuzzy
 msgid "Open next article"
 msgstr "Mostra el contingut original de l'article"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 #, fuzzy
 msgid "Open previous article"
 msgstr "Mostra el contingut original de l'article"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "Mostra el diàleg de cerca"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 #, fuzzy
 msgid "Article"
 msgstr "Tots els articles"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "Commuta els marcats"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "Commuta els publicats"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "Commuta els no llegits"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Edita les etiquetes"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Publica l'article"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 #, fuzzy
 msgid "Open in new window"
 msgstr "Obre l'article en una finestra nova"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marca'l com a llegit"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marca'l com a llegit"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 #, fuzzy
 msgid "Scroll down"
 msgstr "Fet!"
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Seleccioneu un article mitjançant el ratolí."
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 #, fuzzy
 msgid "Email article"
 msgstr "Tots els articles"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Buida els articles"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 #, fuzzy
 msgid "Article selection"
 msgstr "Accions actives de l'article"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 #, fuzzy
 msgid "Select all articles"
 msgstr "Buida els articles"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 #, fuzzy
 msgid "Select unread"
 msgstr "Purga els articles per llegir"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 #, fuzzy
 msgid "Select starred"
 msgstr "Marca'l com a destacat"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 #, fuzzy
 msgid "Select published"
 msgstr "Purga els articles per llegir"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 #, fuzzy
 msgid "Invert selection"
 msgstr "Accions actives de l'article"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Buida els articles"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Canal"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Actualitza els canals actius"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Mostra/amaga els canals llegits"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "Subscriu-te al canal"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Edita el canal"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 #, fuzzy
 msgid "Debug feed update"
 msgstr "S'ha acabat l'actualització dels canals."
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Marca tots els canals com a llegits"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Clica-hi per a reduir la categoria"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Canvia al mode de reordenació de categories"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 #, fuzzy
 msgid "Go to"
 msgstr "Vés a..."
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 #, fuzzy
 msgid "Fresh"
 msgstr "Actualitza"
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Núvol d'etiquetes"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 #, fuzzy
 msgid "Other"
 msgstr "Altres:"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Crea una etiqueta"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Crea un filtre"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Redueix la barra lateral"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Mostra el diàleg de cerca"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Resultats de la cerca"
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 #, fuzzy
 msgid "Click to play"
 msgstr "Feu clic per editar"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "sense etiqueta"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Edita les etiquetes d'aquest article"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 #, fuzzy
 msgid "Originally from:"
 msgstr "Mostra el contingut original de l'article"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 #, fuzzy
 msgid "Feed URL"
 msgstr "Canal"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -956,16 +956,16 @@ msgstr "Canal"
 msgid "Close this window"
 msgstr "Tanca la finestra"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 #, fuzzy
 msgid "(edit note)"
 msgstr "edita la nota"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "tipus desconegut"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 #, fuzzy
 msgid "Attachments"
 msgstr "Adjuncions:"
@@ -1258,7 +1258,7 @@ msgstr "Fitxer:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 #, fuzzy
 msgid "Default profile"
 msgstr "Nombre maximal d'articles par défaut"
@@ -1291,12 +1291,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetes per aquest article (separades per comes):"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1306,23 +1306,23 @@ msgstr "Desa"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -1337,10 +1337,10 @@ msgid "Title:"
 msgstr "Titre&nbsp;:"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "URL:"
 
@@ -1451,236 +1451,79 @@ msgstr ""
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-#, fuzzy
-msgid "Select"
-msgstr "Selecciona:"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Tot"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Cap"
-
-#: classes/dlg.php:63
-#, fuzzy
-msgid "Create profile"
-msgstr "Crea un filtre"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-#, fuzzy
-msgid "(active)"
-msgstr "Adaptatiu"
-
-#: classes/dlg.php:150
-#, fuzzy
-msgid "Remove selected profiles"
-msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
-
-#: classes/dlg.php:152
-#, fuzzy
-msgid "Activate profile"
-msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Enllaç als articles publicats del canal."
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Canals generats"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "L'actualització de daemon està activada en la configuració però el procés daemon no funciona, fet que impedeix l'actualització de tots els canals. Si us plau, engegueu el procés del daemon o contacteu amb el responsable pertinent."
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Última actualització:"
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr "L'actualització del daemon és més llarga que la d'un canal. Això pot indicar un problema com la caiguda. Si us plau, reviseu dels processos del daemon o contacteu amb el seu propietari."
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "Correspondance&nbsp;:"
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 #, fuzzy
 msgid "All tags."
 msgstr "sense etiqueta"
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 #, fuzzy
 msgid "Display entries"
 msgstr "mostra els canals"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr ""
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr ""
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr ""
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-#, fuzzy
-msgid "Access key:"
-msgstr "Nivell d'accés:"
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-#, fuzzy
-msgid "Access key"
-msgstr "Nivell d'accés"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr ""
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-#, fuzzy
-msgid "Generate new key"
-msgstr "Canals generats"
-
-#: classes/dlg.php:455
-#, fuzzy
-msgid "Create link"
-msgstr "Crea"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "Posa'l a la categoria:"
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Entra"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-#, fuzzy
-msgid "Password"
-msgstr "Contrasenya:"
-
-#: classes/dlg.php:499
-#, fuzzy
-msgid "Feeds require authentication."
-msgstr "Aquest canal requereix autenticació."
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Subscriu-t'hi"
-
 #: classes/feeds.php:68
 #, fuzzy
 msgid "Visit the website"
@@ -1693,7 +1536,7 @@ msgstr "Visualitza els canals"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 #, fuzzy
 msgid "View as RSS"
 msgstr "Visualitza les etiquetes"
@@ -1702,10 +1545,42 @@ msgstr "Visualitza les etiquetes"
 msgid "Select:"
 msgstr "Selecciona:"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Tot"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Inverteix"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Cap"
+
 #: classes/feeds.php:101
 #, fuzzy
 msgid "More..."
@@ -1795,90 +1670,120 @@ msgid "No articles found to display."
 msgstr "No s'han trobat articles per a mostrar."
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Erreurs de mise à jour"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 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:909
 msgid "No feed selected."
 msgstr "No heu seleccionat cap canal."
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Canal"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "Posa'l a la categoria:"
+
+#: classes/feeds.php:984
 #, fuzzy
 msgid "Available feeds"
 msgstr "Tots els canals"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Autenticació"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Entra"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+#, fuzzy
+msgid "Password"
+msgstr "Contrasenya:"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Aquest canal requereix autenticació."
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "Subscriu-t'hi"
+
+#: classes/feeds.php:1021
 #, fuzzy
 msgid "More feeds"
 msgstr "Més canals"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Cerca"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 #, fuzzy
 msgid "Popular feeds"
 msgstr "mostra els canals"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 #, fuzzy
 msgid "Feed archive"
 msgstr "Accions dels canals"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 #, fuzzy
 msgid "limit:"
 msgstr "Límit:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr "Mirar-ho per"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Limita la cerca a:"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Aquest canal"
 
@@ -2003,8 +1908,8 @@ msgid "Change password to"
 msgstr "Nova contrasenya"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Opcions"
 
@@ -2045,6 +1950,22 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificació de canvi de contrasenya"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+#, fuzzy
+msgid "Select"
+msgstr "Selecciona:"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Crea un usuari"
@@ -2181,14 +2102,14 @@ msgid "Combine"
 msgstr ""
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Reinicia la contrasenya"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Canvia la puntuació dels articles"
 
@@ -2240,7 +2161,7 @@ msgstr "Quadre d'accions"
 msgid "Add action"
 msgstr "Accions dels canals"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 #, fuzzy
 msgid "[No caption]"
 msgstr "Descriptif"
@@ -2464,268 +2385,296 @@ msgstr "Habilita les icones dels canals."
 msgid "Incorrect password"
 msgstr "El nom d'usuari o la contrasenya és incorrecte"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr ""
+
+#: classes/pref/prefs.php:919
+#, fuzzy
+msgid "Create profile"
+msgstr "Crea un filtre"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+#, fuzzy
+msgid "(active)"
+msgstr "Adaptatiu"
+
+#: classes/pref/prefs.php:1006
+#, fuzzy
+msgid "Remove selected profiles"
+msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
+
+#: classes/pref/prefs.php:1008
+#, fuzzy
+msgid "Activate profile"
+msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "Seleccioneu-ho per activar els camps"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Edita el canal"
-msgstr[1] "Edita el canal"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 #, fuzzy
 msgid "Feed Title"
 msgstr "Títol"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Actualitza"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "Neteja d'articles:"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 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:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Amaga-ho de la llista de canals"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "Mostra les imatges adjuntes"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "Emmagatzema les imatges localment"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 #, fuzzy
 msgid "Icon"
 msgstr "Action"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Subscrit als canals:"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Fet!"
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de canals"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Tots els canals"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "S'estan purgant els canals seleccionats..."
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Dóna't de baixa"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 #, fuzzy
 msgid "Categories"
 msgstr "Catégorie&nbsp;:"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Add category"
 msgstr "S'està afegint la categoria..."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Edita les categories"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 #, fuzzy
 msgid "Remove selected"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 #, fuzzy
 msgid "More actions..."
 msgstr "Accions..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "Esborra les dades del canal"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Import my OPML"
 msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 #, fuzzy
 msgid "Include settings"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 #, fuzzy
 msgid "Export OPML"
 msgstr "Exporta en format OPML"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 #, fuzzy
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 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:1400
+#: classes/pref/feeds.php:1401
 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:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Integració al Firefox"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 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:1422
+#: classes/pref/feeds.php:1423
 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:1430
+#: classes/pref/feeds.php:1431
 #, 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:1432
+#: classes/pref/feeds.php:1433
 #, 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:1434
+#: classes/pref/feeds.php:1435
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 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:1440
+#: classes/pref/feeds.php:1441
 #, fuzzy
 msgid "Display URL"
 msgstr "afficher les étiquettes"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "Marca l'article"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Articles mémorisés"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 #, fuzzy
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Aquests canals no s'han actualitzat degut als següents errors:"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Feu clic per editar"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "Aquests canals no s'han actualitzat degut als següents errors:"
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1789
+#, fuzzy
+msgid "Feeds require authentication."
+msgstr "Aquest canal requereix autenticació."
+
 #: plugins/digest/digest_body.php:59
 #, fuzzy
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
@@ -3031,6 +2980,41 @@ msgstr ""
 msgid "Linked"
 msgstr "Enllaç"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr ""
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr ""
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+#, fuzzy
+msgid "Access key:"
+msgstr "Nivell d'accés:"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+#, fuzzy
+msgid "Access key"
+msgstr "Nivell d'accés"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+#, fuzzy
+msgid "Generate new key"
+msgstr "Canals generats"
+
 #: plugins/instances/init.php:295
 #, fuzzy
 msgid "Link instance"
@@ -3053,6 +3037,11 @@ msgstr ""
 msgid "Stored feeds"
 msgstr "Més canals"
 
+#: plugins/instances/init.php:437
+#, fuzzy
+msgid "Create link"
+msgstr "Crea"
+
 #: plugins/share/init.php:27
 #, fuzzy
 msgid "Share by URL"
@@ -3088,23 +3077,23 @@ msgstr "Última actualització:"
 msgid "Start update"
 msgstr "Última actualització:"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
@@ -3935,6 +3924,12 @@ msgstr "Marca l'article"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#, fuzzy
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "Edita el canal"
+#~ msgstr[1] "Edita el canal"
+
 #~ msgid "Notice"
 #~ msgstr "Avís"
 
diff --git a/locale/cs_CZ/LC_MESSAGES/messages.mo b/locale/cs_CZ/LC_MESSAGES/messages.mo
index 0addb214..18858b05 100644
Binary files a/locale/cs_CZ/LC_MESSAGES/messages.mo and b/locale/cs_CZ/LC_MESSAGES/messages.mo differ
diff --git a/locale/cs_CZ/LC_MESSAGES/messages.po b/locale/cs_CZ/LC_MESSAGES/messages.po
index e021d023..855ee7f0 100644
--- a/locale/cs_CZ/LC_MESSAGES/messages.po
+++ b/locale/cs_CZ/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+0400\n"
 "PO-Revision-Date: 2013-03-31 18:03+0200\n"
 "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -250,14 +250,14 @@ msgstr "Test ochrany proti podvratným SQL dotazům (SQL Injection) selhal, zkon
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -302,13 +302,13 @@ msgid "All Articles"
 msgstr "Všechny články"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "S hvězdičkou"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Publikováno"
@@ -353,7 +353,7 @@ msgstr "Označit kanál jako přečtený"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -364,8 +364,8 @@ msgid "Mark as read"
 msgstr "Označit jako přečtené"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Všechny články"
 
@@ -424,8 +424,8 @@ msgid "Rescore feed"
 msgstr "Přehodnotit kanál"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Zrušit odběr"
@@ -451,7 +451,7 @@ msgid "Show tag cloud..."
 msgstr "Zobrazit seznam značek..."
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 msgid "Toggle widescreen mode"
 msgstr "Přepnout širokoúhlý režim"
 
@@ -479,41 +479,41 @@ msgid "Logout"
 msgstr "Odhlásit se"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Klávesové zkratky"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Opustit nastavení"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Kanály"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Filtry"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Štítky"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Uživatelé"
 
@@ -577,12 +577,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Skript aktualizace dat Tiny Tiny RSS."
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Bez zařazení"
 
@@ -598,309 +598,309 @@ msgstr[2] "%d archivovaných článků"
 msgid "No feeds found."
 msgstr "Nenalezeny žádné kanály."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Speciální"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Všechny kanály"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Články s hvězdičkou"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Publikované články"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Nové články"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr "Archivované články"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr "Nedávno přečtené"
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Navigace"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 msgid "Open next feed"
 msgstr "Otevřít následující kanál"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr "Otevřít předchozí kanál"
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 msgid "Open next article"
 msgstr "Otevřít následující článek"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 msgid "Open previous article"
 msgstr "Otevřít předchozí článek"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr "Otevřít následující článek (neposouvat dlouhé články)"
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Otevřít předchozí článek (neposouvat dlouhé články)"
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "Zobrazit dialog hledání"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 msgid "Article"
 msgstr "Článek"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "Přepnout hvězdičku"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "Přepnout publikováno"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "Přepnout přečteno"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Upravit značky"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 msgid "Dismiss selected"
 msgstr ""
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 msgid "Dismiss read"
 msgstr ""
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 msgid "Open in new window"
 msgstr "Otevřít v novém okně"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr "Označit níže jako přečtené"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr "Označit výše jako přečtené"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 msgid "Scroll down"
 msgstr "Posunout dolů"
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr "Posunout nahoru"
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 msgid "Select article under cursor"
 msgstr "Vybrat článek pod kurzorem"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr "Odeslat článek e-mailem"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 msgid "Close/collapse article"
 msgstr "Zavřít/sbalit článek"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Přepnout vložený originál"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 msgid "Article selection"
 msgstr "Výběr článků"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr "Vybrat všechny články"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 msgid "Select unread"
 msgstr "Vybrat nepřečtené"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 msgid "Select starred"
 msgstr "Vybrat s hvězdičkou"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 msgid "Select published"
 msgstr "Vybrat publikované"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 msgid "Invert selection"
 msgstr "Obrátit výběr"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 msgid "Deselect everything"
 msgstr "Zrušit výběr"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Kanál"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 msgid "Refresh current feed"
 msgstr "Obnovit současný kanál"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 msgid "Un/hide read feeds"
 msgstr "Zobrazit/Skrýt přečtené kanály"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "Přihlásit se k odběru"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Upravit kanál"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 msgid "Reverse headlines"
 msgstr ""
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 msgid "Debug feed update"
 msgstr "Ladit aktualizaci kanálů"
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Označit všechny kanály za přečtené"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 msgid "Un/collapse current category"
 msgstr "Rozbalit/sbalit aktuální kategorii"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 msgid "Toggle combined mode"
 msgstr "Přepnout kombinovaný režim"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 msgid "Toggle auto expand in combined mode"
 msgstr "Přepnout automatické rozbalení kombinovaném režimu"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 msgid "Go to"
 msgstr "Přejít na"
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 msgid "Fresh"
 msgstr "Nové"
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Seznam značek"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 msgid "Other"
 msgstr "Ostatní"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Vytvořit štítek"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Vytvořit filtr"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 msgid "Un/collapse sidebar"
 msgstr "Rozbalit/sbalit postranní lištu"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 msgid "Show help dialog"
 msgstr "Zobrazit nápovědu"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr "Výsledky hledání: %s"
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr "Klikněte pro přehrání"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr "Přehrát"
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "žádné značky"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Upravit značky pro článek"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 msgid "Originally from:"
 msgstr "Původně z:"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr "URL kanálu"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -909,15 +909,15 @@ msgstr "URL kanálu"
 msgid "Close this window"
 msgstr "Zavřít toto okno"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr "(upravit poznámku)"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "neznámý typ"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 msgid "Attachments"
 msgstr "Přílohy"
 
@@ -1196,7 +1196,7 @@ msgstr "Profil:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr "Výchozí profil"
 
@@ -1227,12 +1227,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Značky článku (oddělené čárkami):"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1242,23 +1242,23 @@ msgstr "Uložit"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -1272,10 +1272,10 @@ msgid "Title:"
 msgstr "Název:"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "URL:"
 
@@ -1379,221 +1379,75 @@ msgstr "Lituji, kombinace e-mailové adresy a přihlašovacího jména nenalezen
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr "Vybrat"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Vše"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Žádný"
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr "Vytvořit profil"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-msgid "(active)"
-msgstr "(aktivní)"
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr "Odstranit vybrané profily"
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr "Aktivovat profil"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 msgid "Generate new URL"
 msgstr "Generovat novou URL"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Poslední aktualizace:"
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "Odpovídá:"
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr "Cokoliv"
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 msgid "All tags."
 msgstr "Všechny značky."
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr "Jaké značky?"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr ""
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Je dostupná nová verze Tiny Tiny RSS (%s)."
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr ""
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr "Stáhnout"
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr "Instance"
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr "URL instance"
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-msgid "Access key:"
-msgstr "Přístupový klíč:"
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-msgid "Access key"
-msgstr "Přístupový klíč"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr ""
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-msgid "Generate new key"
-msgstr "Generovat nový klíč"
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr "Vytvořit odkaz"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr ""
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr "Kanály k odebírání. Jeden na řádku"
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Přihlášení"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-msgid "Password"
-msgstr "Heslo"
-
-#: classes/dlg.php:499
-msgid "Feeds require authentication."
-msgstr ""
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Odebírat"
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr ""
@@ -1604,7 +1458,7 @@ msgstr "Zobrazit jako kanál RSS"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr "Zobrazit jako RSS"
 
@@ -1612,10 +1466,42 @@ msgstr "Zobrazit jako RSS"
 msgid "Select:"
 msgstr "Vybrat:"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Vše"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Invertovat"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Žádný"
+
 #: classes/feeds.php:101
 msgid "More..."
 msgstr "Více..."
@@ -1698,84 +1584,113 @@ msgid "No articles found to display."
 msgstr "Nenalezeny žádné články ke zobrazení."
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Kanál naposledy aktualizován v %s"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 msgid "Some feeds have update errors (click for details)"
 msgstr "Některé kanály měly problémy při aktualizaci (klikněte pro podrobnosti)"
 
-#: classes/feeds.php:922
+#: classes/feeds.php:909
 msgid "No feed selected."
 msgstr "Není vybrán žádný kanál."
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 msgid "Feed or site URL"
 msgstr ""
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr ""
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr "Dostupné kanály"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Ověření"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Přihlášení"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr "Heslo"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Tento kanál vyžaduje ověření."
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "Odebírat"
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr "Více kanálů"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Hledat"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 msgid "Popular feeds"
 msgstr "Oblíbené kanály"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 msgid "Feed archive"
 msgstr "Archív kanálů"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 msgid "limit:"
 msgstr "omezení:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Odstranit"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr "Hledat"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Omezit hledání na:"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Tento kanál"
 
@@ -1898,8 +1813,8 @@ msgid "Change password to"
 msgstr "Změnit heslo na"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Možnosti"
 
@@ -1936,6 +1851,21 @@ msgstr "Zasílám nové heslo uživatele <b>%s</b> na <b>%s</b>"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Oznámení o změně hesla"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "Vybrat"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Vytvořit uživatele"
@@ -2062,13 +1992,13 @@ msgid "Combine"
 msgstr "Kombinovat"
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 msgid "Reset sort order"
 msgstr ""
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Přehodnotit články"
 
@@ -2116,7 +2046,7 @@ msgstr ""
 msgid "Add action"
 msgstr "Přidat činnost"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 #, fuzzy
 msgid "[No caption]"
 msgstr "Titulek"
@@ -2324,242 +2254,264 @@ msgstr "Povolit vybrané moduly"
 msgid "Incorrect password"
 msgstr "Špatné heslo"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr ""
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr "Vytvořit profil"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr "(aktivní)"
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr "Odstranit vybrané profily"
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr "Aktivovat profil"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr ""
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d kanál)"
-msgstr[1] "(%d kanály)"
-msgstr[2] "(%d kanálů)"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Název kanálu"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr ""
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 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:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 msgid "Hide from Popular feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "Začlenit do e-mailových souhrnů"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "Vždy zobrazovat obrázkové přílohy"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr "Nevkládat obrázky"
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr ""
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 msgid "Mark updated articles as unread"
 msgstr "Označit aktualizované články jako nepřečtené"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr "Ikona"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr "Nahradit"
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 msgid "Resubscribe to push updates"
 msgstr ""
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Vše hotovo."
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 msgid "Feeds with errors"
 msgstr "Kanály s chybami"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 msgid "Inactive feeds"
 msgstr "Neaktivní kanály"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 msgid "Edit selected feeds"
 msgstr "Upravit vybrané kanály"
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr "Dávkové zahájení odběru"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 msgid "Categories"
 msgstr "Kategorie"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 msgid "Add category"
 msgstr "Přidat kategorii"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 msgid "(Un)hide empty categories"
 msgstr "Zobrazit/Skrýt prázdné kategorie"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 msgid "Remove selected"
 msgstr "Odstranit vybrané"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 msgid "More actions..."
 msgstr "Další činnost..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr ""
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr ""
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 msgid "Import my OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr "Název souboru:"
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 msgid "Include settings"
 msgstr ""
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 msgid "Export OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 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:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 msgid "Firefox integration"
 msgstr ""
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr ""
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1423
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1431
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 msgid "Published articles and generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 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:1440
+#: classes/pref/feeds.php:1441
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 msgid "Unshare all articles"
 msgstr ""
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 msgid "Click to edit feed"
 msgstr ""
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 msgid "Unsubscribe from selected feeds"
 msgstr "Zrušit odběr vybraných kanálů"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr "Kanály k odebírání. Jeden na řádku"
+
+#: classes/pref/feeds.php:1789
+msgid "Feeds require authentication."
+msgstr ""
+
 #: plugins/digest/digest_body.php:59
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
 msgstr ""
@@ -2841,6 +2793,38 @@ msgstr ""
 msgid "Linked"
 msgstr ""
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr "Instance"
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr "URL instance"
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+msgid "Access key:"
+msgstr "Přístupový klíč:"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+msgid "Access key"
+msgstr "Přístupový klíč"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+msgid "Generate new key"
+msgstr "Generovat nový klíč"
+
 #: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr ""
@@ -2861,6 +2845,10 @@ msgstr "Stav"
 msgid "Stored feeds"
 msgstr ""
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr "Vytvořit odkaz"
+
 #: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "Sdílet pomocí URL"
@@ -2891,21 +2879,21 @@ msgstr ""
 msgid "Start update"
 msgstr "Zahájit aktualizaci"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr ""
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Označit všechny články starší než 1 den v %s jako přečtené?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Označit všechny články starší než 1 týden v %s jako přečtené?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Označit všechny články starší než 2 týdny v %s jako přečtené?"
 
@@ -3656,6 +3644,12 @@ msgstr "Sdílet článek pomocí URL"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "(%d kanál)"
+#~ msgstr[1] "(%d kanály)"
+#~ msgstr[2] "(%d kanálů)"
+
 #~ msgid "Notice"
 #~ msgstr "Poznámka"
 
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 9ab25f3d..49428c6a 100755
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 ce4ea9ff..2f52d293 100755
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+0400\n"
 "PO-Revision-Date: 2013-03-25 17:14+0100\n"
 "Last-Translator: Joschasa <joschasa@lavabit.com>\n"
 "Language-Team: \n"
@@ -254,14 +254,14 @@ msgstr "SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PH
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -306,13 +306,13 @@ msgid "All Articles"
 msgstr "Alle Artikel"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Markiert"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Veröffentlicht"
@@ -358,7 +358,7 @@ msgstr "Feed als gelesen markieren"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -369,8 +369,8 @@ msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Alle Artikel"
 
@@ -429,8 +429,8 @@ msgid "Rescore feed"
 msgstr "Feed neu bewerten"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Feed abbestellen"
@@ -456,7 +456,7 @@ msgid "Show tag cloud..."
 msgstr "Tagwolke anzeigen..."
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 msgid "Toggle widescreen mode"
 msgstr "Breitbild-Modus umschalten"
 
@@ -484,41 +484,41 @@ msgid "Logout"
 msgstr "Abmelden"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Tastaturkürzel"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Einstellungen verlassen"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Feeds"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Filter"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Label"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Benutzer"
 
@@ -582,12 +582,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Skript zum Updaten von Tiny Tiny RSS."
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Unkategorisiert"
 
@@ -602,316 +602,316 @@ msgstr[1] "%d archivierte Artikel"
 msgid "No feeds found."
 msgstr "Keine Feeds gefunden."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Sonderfeeds"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Alle Feeds"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Markierte Artikel"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Veröffentlichte Artikel"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Neue Artikel"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr "Archivierte Artikel"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr "Kürzlich gelesen"
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 msgid "Open next feed"
 msgstr "Nächsten Feed öffnen"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr "Vorherigen Feed öffnen"
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 msgid "Open next article"
 msgstr "Nächsten Artikel öffnen"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 msgid "Open previous article"
 msgstr "Vorherigen Artikel öffnen"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr "Nächsten Artikel laden (lange Artikel werden nicht gescrollt)"
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Vorherigen Artikel laden (lange Artikel werden nicht gescrollt)"
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "Suchdialog anzeigen"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "Markierung ein-/ausschalten"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "Veröffentlichung ein-/ausschalten"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "Gelesen-Status umschalten"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Tags bearbeiten"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Ausgewählte Artikel verbergen"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Gelesene Artikel verbergen"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 msgid "Open in new window"
 msgstr "In neuem Fenster öffnen"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr "Untere als gelesen markieren"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr "Obige als gelesen markieren"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 msgid "Scroll down"
 msgstr "Nach unten scrollen"
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr "Nach oben scrollen"
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Artikel unter Mauszeiger auswählen"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr "Artikel per E-Mail versenden"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Artikel schließen"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "\"Original einbetten\" umschalten"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 msgid "Article selection"
 msgstr "Artikelauswahl"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr "Alle Artikel auswählen"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 msgid "Select unread"
 msgstr "Ungelesene Artikel auswählen"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 msgid "Select starred"
 msgstr "Markierte Artikel auswählen"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 msgid "Select published"
 msgstr "Veröffentlichte Artikel auswählen"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 msgid "Deselect everything"
 msgstr "Auswahl aufheben"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 msgid "Refresh current feed"
 msgstr "Aktuellen Feed aktualisieren"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 msgid "Un/hide read feeds"
 msgstr "Gelesene Feeds zeigen/verstecken"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "Feed abonnieren"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Feed bearbeiten"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Schlagzeilensortierung umkehren"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 msgid "Debug feed update"
 msgstr "Aktualisierung im Diagnose-Modus durchführen"
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Alle Feeds als gelesen markieren"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 msgid "Un/collapse current category"
 msgstr "Aktuelle Kategorie ein-/ausklappen:"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 msgid "Toggle combined mode"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 msgid "Fresh"
 msgstr "Neu"
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Tagwolke"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 msgid "Other"
 msgstr "Sonstiges"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Label erstellen"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Filter erstellen"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 msgid "Un/collapse sidebar"
 msgstr "Seitenleiste ein-/ausklappen"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 msgid "Show help dialog"
 msgstr "Hilfe anzeigen"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr "Suchergebnisse: %s"
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr "Zum Abspielen klicken"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr "Abspielen"
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "Keine Tags"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Tags für diesen Artikel bearbeiten"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 msgid "Originally from:"
 msgstr "Original von:"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr "Feed URL"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -920,15 +920,15 @@ msgstr "Feed URL"
 msgid "Close this window"
 msgstr "Fenster schließen"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr "(Notiz bearbeiten)"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "unbekannter Typ"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 msgid "Attachments"
 msgstr "Anhänge"
 
@@ -1208,7 +1208,7 @@ msgstr "Profil:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr "Standardprofil"
 
@@ -1239,12 +1239,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Tags für diesen Artikel (durch Komma getrennt):"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1254,23 +1254,23 @@ msgstr "Speichern"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1284,10 +1284,10 @@ msgid "Title:"
 msgstr "Titel:"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "URL:"
 
@@ -1392,221 +1392,75 @@ msgstr "Entschuldigung, diese Kombination von Benutzername und E-Mail konnte nic
 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:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr "Auswahl"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Alle"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Keine"
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr "Profil erstellen"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-msgid "(active)"
-msgstr "(aktiv)"
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr "Ausgewählte Profile entfernen"
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr "Profil aktivieren"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr "Ihre öffentliche OPML-URL lautet:"
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 msgid "Generate new URL"
 msgstr "Erzeuge neue URL"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "Der Aktualisierungs-Daemon ist in den Einstellungen aktiviert, aber der Daemon Prozess läuft nicht, weshalb keine Feeds aktualisiert werden können. Bitte starten Sie den Prozess des Daemons oder benachrichtigen Sie den Besitzer der Instanz."
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr "Der Aktualisierungs Daemon braucht zu lange um eine Aktualisierung durchzuführen. Dies könnte auf ein Problem wie einen Absturz oder eine Blockierung hinweisen. Bitte überprüfen Sie den Prozess des Daemons oder benachrichtigen Sie den Besitzer des Instanz."
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "Suche: "
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr "Beliebig"
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 msgid "All tags."
 msgstr "Alle Tags."
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr "Welche Tags?"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr "Einträge anzeigen"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Neue Version von Tiny Tiny RSS verfügbar (%s)."
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr "Um ein Update durchzuführen können Sie den eingebauten Updater in den Einstellungen oder die update.php benutzen"
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr "Download"
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr "Das Abrufen von Update-Informationen ist fehlgeschlagen oder es ist bereits die neuste Version installiert."
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr "Sie können Farben, Schriftarten und das Layout Ihres aktuell gewählten Themas mit einem eigenen CSS-Stylesheet überschreiben. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Diese Datei</a> kann als Grundlage benutzt werden."
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr "Instanz"
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr "Instanz-URL"
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-msgid "Access key:"
-msgstr "Zugriffsberechtigung:"
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-msgid "Access key"
-msgstr "Zugriffsberechtigung"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr "Benutzen Sie den selben Zugriffschlüssel für beide verbundenen Instanzen."
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-msgid "Generate new key"
-msgstr "Neuen Zugriffsschlüssel erzeugen"
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr "Verbindung herstellen"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Einen gültigen RSS Feed pro Zeile hinzufügen (Es findet keine Feederkennung statt)"
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "In Kategorie einordnen:"
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr "Zu abonnierende Feeds, Einen pro Zeile"
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Benutzername"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-msgid "Password"
-msgstr "Passwort"
-
-#: classes/dlg.php:499
-msgid "Feeds require authentication."
-msgstr "Feeds benötigen Authentifizierung."
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Abonnieren"
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Offizielle Website besuchen"
@@ -1617,7 +1471,7 @@ msgstr "Als RSS-Feed anzeigen"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr "Als RSS anzeigen"
 
@@ -1625,10 +1479,42 @@ msgstr "Als RSS anzeigen"
 msgid "Select:"
 msgstr "Auswahl:"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Alle"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Umkehren"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Keine"
+
 #: classes/feeds.php:101
 msgid "More..."
 msgstr "Mehr..."
@@ -1711,84 +1597,113 @@ msgid "No articles found to display."
 msgstr "Keine Artikel zum Anzeigen gefunden."
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Feeds zuletzt aktualisiert am %s"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 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:909
 msgid "No feed selected."
 msgstr "Keinen Feed ausgewählt."
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 msgid "Feed or site URL"
 msgstr "URL von Feed oder Seite"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "In Kategorie einordnen:"
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr "Verfügbare Feeds"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Benutzername"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr "Passwort"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Dieser Feed erfordert Authentifizierung."
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "Abonnieren"
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr "Weitere Feeds"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Suchen"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 msgid "Popular feeds"
 msgstr "Beliebte Feeds"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 msgid "Feed archive"
 msgstr "Feed-Archiv"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 msgid "limit:"
 msgstr "Grenzwert:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Entfernen"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr "Suche nach"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Suche begrenzen auf:"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Diesen Feed"
 
@@ -1911,8 +1826,8 @@ msgid "Change password to"
 msgstr "Passwort ändern in"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Optionen"
 
@@ -1949,6 +1864,21 @@ msgstr "Sende das neue Passwort von Benutzer <b>%s</b> an <b>%s</b>"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Benachrichtigung: Passwort geändert"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "Auswahl"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Benutzer anlegen"
@@ -2077,13 +2007,13 @@ msgid "Combine"
 msgstr "Zusammenfügen"
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 msgid "Reset sort order"
 msgstr "Sortierreihenfolge zurücksetzen"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Artikel neu bewerten"
 
@@ -2131,7 +2061,7 @@ msgstr "Aktion speichern"
 msgid "Add action"
 msgstr "Aktion hinzufügen"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 #, fuzzy
 msgid "[No caption]"
 msgstr "Titel"
@@ -2339,241 +2269,264 @@ msgstr "Ausgewählte Plugins aktivieren"
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr "Sie können Farben, Schriftarten und das Layout Ihres aktuell gewählten Themas mit einem eigenen CSS-Stylesheet überschreiben. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Diese Datei</a> kann als Grundlage benutzt werden."
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr "Profil erstellen"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr "(aktiv)"
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr "Ausgewählte Profile entfernen"
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr "Profil aktivieren"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "Ankreuzen um das Feld zu aktivieren"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d Feed)"
-msgstr[1] "(%d Feeds)"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Feed-Titel"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "Artikel löschen:"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Hinweis:</b> Sie müssen Ihre Login-Informationen eingeben, wenn Ihr Feed eine Authentifizierung erfordert (außer Twitter-Feeds)."
 
-#: classes/pref/feeds.php:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 msgid "Hide from Popular feeds"
 msgstr "Nicht unter beliebten Feeds aufführen"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "In E-Mail-Zusammenfassung aufnehmen"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "Angehängte Bilder immer anzeigen"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr "Bilder nicht einbetten"
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "Bilder lokal zwischenspeichern"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 msgid "Mark updated articles as unread"
 msgstr "Aktualisierte Artikel als ungelesen markieren"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr "Symbol"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 msgid "Resubscribe to push updates"
 msgstr "Abonnierte Feeds:"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "PubSubHubbub-Abonnementstatus für Push-fähige Feeds zurücksetzen."
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Fertig."
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 msgid "Feeds with errors"
 msgstr "Feeds mit Fehlern"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 msgid "Inactive feeds"
 msgstr "Inaktive Feeds"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 msgid "Edit selected feeds"
 msgstr "Bearbeite ausgewählte Feeds"
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr "Mehrere Feeds abonnieren"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 msgid "Categories"
 msgstr "Kategorien"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 msgid "Add category"
 msgstr "Kategorie anlegen"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 msgid "(Un)hide empty categories"
 msgstr "Zeige/Verstecke leere Kategorien"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 msgid "Remove selected"
 msgstr "Ausgewählte Kategorien löschen"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 msgid "More actions..."
 msgstr "Mehr Aktionen..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "Manuelles Löschen"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "Feed-Daten löschen"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Über OPML können Feeds, Filter, Label und Tiny-Tiny-RSS-Einstellungen importiert und exportiert werden."
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Nur das Hauptprofil kann mit OPML gesichert werden."
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 msgid "Import my OPML"
 msgstr "OPML importieren"
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 msgid "Include settings"
 msgstr "Inklusive Einstellungen"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 msgid "Export OPML"
 msgstr "OPML exportieren"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Ihre OPML können veröffentlicht werden, so dass jeder, der die URL kennt, diese abonnieren kann."
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
 msgstr "Eine öffentliche OPML enthält keine Tiny-Tiny-RSS-Einstellungen, passwortgeschützte Feeds oder Feeds, die nicht in den beliebten Feeds auftauchen sollen."
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr "Öffentliche OPML-URL"
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr "Zeige öffentliche OPML-URL"
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 msgid "Firefox integration"
 msgstr "Firefox-Integration"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Tiny Tiny RSS kann durch den folgenden Link als Feedreader für Firefox verwendet werden."
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1423
 msgid "Click here to register this site as a feed reader."
 msgstr "Diese Website als Feedreader registrieren."
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1431
 msgid "Published & shared articles / Generated feeds"
 msgstr "Veröffentlichte & geteilte Artikel / erzeugte Feeds"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 msgid "Published articles and generated feeds"
 msgstr "Veröffentlichte Artikel und erzeugte Feeds"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 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:1440
+#: classes/pref/feeds.php:1441
 msgid "Display URL"
 msgstr "Zeige URL an"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr "Alle generierten URLs löschen"
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 msgid "Articles shared by URL"
 msgstr "Per URL geteilte Artikel"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Sie können alle durch URLs geteilten Artikel hier deaktivieren."
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 msgid "Unshare all articles"
 msgstr "Alle veröffentlichten Artikel zurückziehen"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Folgende Feeds konnten seit 3 Monaten nicht aktualisiert werden (älteste zuerst):"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 msgid "Click to edit feed"
 msgstr "Zum Bearbeiten klicken"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 msgid "Unsubscribe from selected feeds"
 msgstr "Ausgewählte Feeds abbestellen"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "Folgende Feeds konnten aufgrund von Fehlern nicht aktualisiert werden:"
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Einen gültigen RSS Feed pro Zeile hinzufügen (Es findet keine Feederkennung statt)"
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr "Zu abonnierende Feeds, Einen pro Zeile"
+
+#: classes/pref/feeds.php:1789
+msgid "Feeds require authentication."
+msgstr "Feeds benötigen Authentifizierung."
+
 #: plugins/digest/digest_body.php:59
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
 msgstr "Diese Anwendung benötigt Javascript um ordnungsgemäß zu funktionieren. Bitte überprüfen Sie Ihre Browser-Einstellungen."
@@ -2852,6 +2805,38 @@ msgstr ""
 msgid "Linked"
 msgstr "Verbunden"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr "Instanz"
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr "Instanz-URL"
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+msgid "Access key:"
+msgstr "Zugriffsberechtigung:"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+msgid "Access key"
+msgstr "Zugriffsberechtigung"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr "Benutzen Sie den selben Zugriffschlüssel für beide verbundenen Instanzen."
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+msgid "Generate new key"
+msgstr "Neuen Zugriffsschlüssel erzeugen"
+
 #: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "Instanz verbinden"
@@ -2872,6 +2857,10 @@ msgstr "Status"
 msgid "Stored feeds"
 msgstr "Gespeicherte Feeds"
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr "Verbindung herstellen"
+
 #: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "Per URL teilen"
@@ -2902,23 +2891,23 @@ msgstr "Bereit zum Updaten."
 msgid "Start update"
 msgstr "Starte update"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
@@ -3664,6 +3653,11 @@ msgstr "Artikel über URL teilen"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr "Direktes Updaten ist noch experimentell. Sichern Sie Ihr tt-rss Verzeichnis, bevor Sie fortfahren. Schreiben Sie 'yes' zum fortfahren."
 
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "(%d Feed)"
+#~ msgstr[1] "(%d Feeds)"
+
 #~ msgid "Notice"
 #~ msgstr "Anmerkung"
 
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index d5894dbe..c50fd0db 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 578532c4..65337f54 100644
--- a/locale/es_ES/LC_MESSAGES/messages.po
+++ b/locale/es_ES/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+0400\n"
 "PO-Revision-Date: 2012-10-25 00:12+0100\n"
 "Last-Translator: DavidM <milarupa@yahoo.es>\n"
 "Language-Team: Español <milarupa@yahoo.es>\n"
@@ -249,14 +249,14 @@ msgstr "La prueba de escape SQL ha fallado. Por favor, revise la configuración
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -301,13 +301,13 @@ msgid "All Articles"
 msgstr "Todos"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Favoritos"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Publicados"
@@ -353,7 +353,7 @@ msgstr "Marcar fuente como leída"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -364,8 +364,8 @@ msgid "Mark as read"
 msgstr "Marcar como leído"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Todos"
 
@@ -425,8 +425,8 @@ msgid "Rescore feed"
 msgstr "Reiniciar la puntuación"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
@@ -452,7 +452,7 @@ msgid "Show tag cloud..."
 msgstr "Nube de etiquetas..."
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Cambiar a modo de reordenación de categorías"
@@ -481,41 +481,41 @@ msgid "Logout"
 msgstr "Cerrar sesión"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Salir de las preferencias"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Fuentes"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Filtros"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Marcadores"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Usuarios"
 
@@ -580,12 +580,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "La base de datos de Tiny Tiny RSS está actualizada."
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Sin clasificar"
 
@@ -600,338 +600,338 @@ msgstr[1] "%d artículos archivados"
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Especial"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Todas las fuentes"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Favoritos"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Publicados"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Recientes"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr "Artículos archivados"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr "Leídos recientemente"
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Navegación"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 #, fuzzy
 msgid "Open next feed"
 msgstr "Fuente generada"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 #, fuzzy
 msgid "Open next article"
 msgstr "Abrir artículo original"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 #, fuzzy
 msgid "Open previous article"
 msgstr "Abrir artículo original"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "Mostrar el diálogo de búsqueda"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 #, fuzzy
 msgid "Article"
 msgstr "Todos"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "Alternar favoritos"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "Alternar publicados"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "Alternar no leídos"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Editar etiquetas"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Descartar artículos seleccionados"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Publicar artículo"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 #, fuzzy
 msgid "Open in new window"
 msgstr "Abrir el artículo en una nueva pestaña o ventana"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr "Marcar artículos posteriores como leídos"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr "Marcar artículos anteriores como leídos"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 #, fuzzy
 msgid "Scroll down"
 msgstr "Hecho."
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Seleccionar el artículo que esté bajo el cursor del ratón"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr "Enviar artículo por correo"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Cerrar artículo"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Cambiar a modo de reordenación de categorías"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 #, fuzzy
 msgid "Article selection"
 msgstr "Invertir selección de artículos"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr "Seleccionar todos los artículos"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 #, fuzzy
 msgid "Select unread"
 msgstr "Seleccionar artículos sin leer"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 #, fuzzy
 msgid "Select starred"
 msgstr "Marcar como favorito"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 #, fuzzy
 msgid "Select published"
 msgstr "Seleccionar artículos publicados"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 #, fuzzy
 msgid "Invert selection"
 msgstr "Invertir selección de artículos"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Deseleccionar todos los artículos"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Fuente"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Actualizar la fuente activa"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Ocultar/Mostrar fuentes leídas"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "Suscribirse a una fuente"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Editar fuente"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Invertir orden de titulares"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Se han actualizado todas las fuentes."
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Marcar todas las fuentes como leídas"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Plegar la categoría"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Cambiar a modo de reordenación de categorías"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Cambiar a modo de reordenación de categorías"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 #, fuzzy
 msgid "Go to"
 msgstr "Ir a..."
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 #, fuzzy
 msgid "Fresh"
 msgstr "Refrescar"
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Nube de etiquetas"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 #, fuzzy
 msgid "Other"
 msgstr "Otro:"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Crear marcador"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Crear filtro"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Colapsar la barra lateral"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Mostrar el diálogo de búsqueda"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr "Resultados de búsqueda: %s"
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr "Clic para reproducir"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr "Reproducir"
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "sin etiquetas"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Editar las etiquetas de este artículo"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 msgid "Originally from:"
 msgstr "Original de:"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr "URL de la fuente"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -940,15 +940,15 @@ msgstr "URL de la fuente"
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr "(editar nota)"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "tipo desconocido"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 msgid "Attachments"
 msgstr "Adjuntos"
 
@@ -1231,7 +1231,7 @@ msgstr "Perfil:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr "Perfil por defecto"
 
@@ -1262,12 +1262,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetas para este artículo (separadas por comas):"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1277,23 +1277,23 @@ msgstr "Guardar"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1309,10 +1309,10 @@ msgid "Title:"
 msgstr "Título"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "URL:"
 
@@ -1423,222 +1423,76 @@ msgstr ""
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Si ha importado marcadores y/o filtros, puede ser necesario recargar las preferencia para ver sus nuevos datos."
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr "Seleccionar"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Todo"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Nada"
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr "Crear perfil"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-msgid "(active)"
-msgstr "(activo)"
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr "Borrar los perfiles seleccionados"
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr "Activar perfil"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr "La URL de su archivo OPML público es:"
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 msgid "Generate new URL"
 msgstr "Generar URL nueva"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "El demonio de actualización está habilitado en la configuración, pero el proceso del demonio no está en funcionamiento, lo cual impide la actualización de todas las fuentes. Por favor, inicie el proceso del demonio o solicítelo al propietario de la instancia."
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Última actualización:"
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr "El demonio de actualización está tardando demasiado en realizar una actualización de fuente. Esto podría deberse a un problema en el servidor (rotura, cuelgue,...). Por favor, compruebe el proceso del demonio o avise al propietario de la instancia."
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "Coincidir:"
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 #, fuzzy
 msgid "All tags."
 msgstr "sin etiquetas"
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr "¿Cuáles etiquetas?"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr "Mostrar artículos"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Puede ver esta fuente en formato RSS en la siguiente URL:"
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Nueva versión de Tiny Tiny RSS disponible (%s)."
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr "Puede actualizar usando el gestor de actualización en las preferenciaso utilizando update.php"
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr "Descargar"
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr "Aquí puede cambiar los colores, fuentes y diseño de su tema actual mediante código CSS. Puede utilizar  <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">este archivo</a> como referencia."
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr "Instancia"
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr "URL de la instancia"
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-msgid "Access key:"
-msgstr "Clave de acceso:"
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-msgid "Access key"
-msgstr "Clave de acceso"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr "Usar una clave de acceso para ambas instancias enlazadas."
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-msgid "Generate new key"
-msgstr "Generar nueva clave"
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr "Crear enlace"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Añadir una fuente RSS válida en cada línea (no se realizará detección de fuentes)"
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "Colocar en la categoría:"
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr "Fuentes para suscribirse, una por línea"
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Iniciar sesión"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-msgid "Password"
-msgstr "Contraseña:"
-
-#: classes/dlg.php:499
-msgid "Feeds require authentication."
-msgstr "Las fuentes requieren autenticación."
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Suscribir"
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Visitar el sitio oficial"
@@ -1649,7 +1503,7 @@ msgstr "Ver como fuente RSS"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr "Ver como RSS"
 
@@ -1657,10 +1511,42 @@ msgstr "Ver como RSS"
 msgid "Select:"
 msgstr "Seleccionar:"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Todo"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Invertir"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Nada"
+
 #: classes/feeds.php:101
 #, fuzzy
 msgid "More..."
@@ -1746,85 +1632,114 @@ msgid "No articles found to display."
 msgstr "No se han encontrado artículos que mostrar."
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Última actualización de las fuentes: %s"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 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:909
 msgid "No feed selected."
 msgstr "No se ha seleccionado ninguna fuente."
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "URL de la fuente"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "Colocar en la categoría:"
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr "Fuentes disponibles"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Iniciar sesión"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr "Contraseña:"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Esta fuente requiere autenticación."
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "Suscribir"
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr "Más fuentes"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Buscar"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 msgid "Popular feeds"
 msgstr "Fuentes populares"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 msgid "Feed archive"
 msgstr "Archivo de fuentes"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 msgid "limit:"
 msgstr "límite:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Eliminar"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr "Buscar"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Limitar la búsqueda a:"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Esta fuente"
 
@@ -1947,8 +1862,8 @@ msgid "Change password to"
 msgstr "Cambiar la contraseña a"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Opciones"
 
@@ -1985,6 +1900,21 @@ msgstr "Se ha cambiado la contraseña del usuario <strong>%s</strong> a <strong>
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificación de cambio de contraseña"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "Seleccionar"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Crear usuario"
@@ -2121,14 +2051,14 @@ msgid "Combine"
 msgstr ""
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Redefinir contraseña"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Reiniciar la puntuación de los artículos"
 
@@ -2178,7 +2108,7 @@ msgstr "Acciones del panel"
 msgid "Add action"
 msgstr "Añadir acción"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 #, fuzzy
 msgid "[No caption]"
 msgstr "Opciones"
@@ -2400,267 +2330,290 @@ msgstr "Habilitar los iconos de la fuente"
 msgid "Incorrect password"
 msgstr "Nombre de usuario o contraseña incorrecta"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr "Aquí puede cambiar los colores, fuentes y diseño de su tema actual mediante código CSS. Puede utilizar  <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">este archivo</a> como referencia."
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr "Crear perfil"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr "(activo)"
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr "Borrar los perfiles seleccionados"
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr "Activar perfil"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "Marcar para habilitar el campo"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Editar la fuente"
-msgstr[1] "Editar la fuente"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 #, fuzzy
 msgid "Feed Title"
 msgstr "Título"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Actualizar"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "Purgando el artículo"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 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:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Ocultar en mi lista de fuentes"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "Incluir en el correo recopilatorio"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "Desplegar siempre las imágenes adjuntas"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "Guardar las imágenes en la memoria caché local"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "¿Marcar todos los artículos como leídos?"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr ""
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Suscrito a las fuentes:"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Hecho."
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de fuente"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Fuente completa"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Purgando la fuente seleccionada..."
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr "Suscripción en lote"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 #, fuzzy
 msgid "Categories"
 msgstr "Volver a categorizar"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Add category"
 msgstr "Añadiendo categoría de fuentes..."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Editar categorías"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 #, fuzzy
 msgid "Remove selected"
 msgstr "¿Borrar fuentes seleccionadas?"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 #, fuzzy
 msgid "More actions..."
 msgstr "Acciones..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "Purga manual"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "Limpiar los datos de la fuente"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importando OPML (usando la extensión DOMXML)..."
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 #, fuzzy
 msgid "Include settings"
 msgstr "Incluir en el correo recopilatorio"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 #, fuzzy
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 #, fuzzy
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Los artículos publicados son exportados como una fuente RSS pública a la cual podrá suscribirse cualquiera que conozca la URL especificada a continuación."
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 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:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr "URL del archivo OPML público"
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "URL del archivo OPML público"
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Integración con Firefox"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 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:1422
+#: classes/pref/feeds.php:1423
 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:1430
+#: classes/pref/feeds.php:1431
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Los artículos publicados son exportados como una fuente RSS pública a la cual podrá suscribirse cualquiera que conozca la URL especificada a continuación."
 
-#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1441
 #, fuzzy
 msgid "Display URL"
 msgstr "Mostrar artículos"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "Marcar el artículo como favorito"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Quitar el artículo de los favoritos"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 #, fuzzy
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Estas fuentes no han sido actualizadas debido a los siguientes errores:"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Pulse aquí para editar"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "Estas fuentes no han sido actualizadas debido a los siguientes errores:"
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Añadir una fuente RSS válida en cada línea (no se realizará detección de fuentes)"
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr "Fuentes para suscribirse, una por línea"
+
+#: classes/pref/feeds.php:1789
+msgid "Feeds require authentication."
+msgstr "Las fuentes requieren autenticación."
+
 #: plugins/digest/digest_body.php:59
 #, fuzzy
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
@@ -2953,6 +2906,38 @@ msgstr ""
 msgid "Linked"
 msgstr "Enlazado"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr "Instancia"
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr "URL de la instancia"
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+msgid "Access key:"
+msgstr "Clave de acceso:"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+msgid "Access key"
+msgstr "Clave de acceso"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr "Usar una clave de acceso para ambas instancias enlazadas."
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+msgid "Generate new key"
+msgstr "Generar nueva clave"
+
 #: plugins/instances/init.php:295
 #, fuzzy
 msgid "Link instance"
@@ -2975,6 +2960,10 @@ msgstr ""
 msgid "Stored feeds"
 msgstr "Más fuentes"
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr "Crear enlace"
+
 #: plugins/share/init.php:27
 #, fuzzy
 msgid "Share by URL"
@@ -3011,23 +3000,23 @@ msgstr "Última actualización:"
 msgid "Start update"
 msgstr "Última actualización:"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "¿Marcar todos los artículos de %s como leídos?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "¿Marcar todos los artículos de %s como leídos?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "¿Marcar todos los artículos de %s como leídos?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "¿Marcar todos los artículos de %s como leídos?"
@@ -3807,6 +3796,12 @@ msgstr "Compartir artículo mediante URL"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr "La actualización en vivo es una característica experimental. Haga una copia de seguridad de la carpeta de tt-rss antes de continuar. Escriba 'yes' para continuar."
 
+#, fuzzy
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "Editar la fuente"
+#~ msgstr[1] "Editar la fuente"
+
 #~ msgid "Notice"
 #~ msgstr "Aviso"
 
diff --git a/locale/fi_FI/LC_MESSAGES/messages.mo b/locale/fi_FI/LC_MESSAGES/messages.mo
index a5b3e8e3..cbff63ab 100644
Binary files a/locale/fi_FI/LC_MESSAGES/messages.mo and b/locale/fi_FI/LC_MESSAGES/messages.mo differ
diff --git a/locale/fi_FI/LC_MESSAGES/messages.po b/locale/fi_FI/LC_MESSAGES/messages.po
index 45fd47bd..84d56fb6 100644
--- a/locale/fi_FI/LC_MESSAGES/messages.po
+++ b/locale/fi_FI/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss 1.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+0400\n"
 "PO-Revision-Date: 2013-04-01 14:49+0200\n"
 "Last-Translator: Arto Tolonen <arto.tolonen@iki.fi>\n"
 "Language-Team: \n"
@@ -249,14 +249,14 @@ msgstr ""
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -301,13 +301,13 @@ msgid "All Articles"
 msgstr "Kaikki artikkelit"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Tähti"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Julkinen"
@@ -352,7 +352,7 @@ msgstr "Merkitse syöte luetuksi"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -363,8 +363,8 @@ msgid "Mark as read"
 msgstr "Merkitse luetuiksi"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Kaikki artikkelit"
 
@@ -422,8 +422,8 @@ msgid "Rescore feed"
 msgstr "Uudelleenpisteytä syöte"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Peruuta syötetilaus"
@@ -449,7 +449,7 @@ msgid "Show tag cloud..."
 msgstr "Näytä tagipilvi"
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 msgid "Toggle widescreen mode"
 msgstr "Vaihda näkymä"
 
@@ -477,41 +477,41 @@ msgid "Logout"
 msgstr "Kirjaudu ulos"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Pikanäppäimet"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Poistu asetuksista"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Syötteet"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Tunnisteet"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Käyttäjät"
 
@@ -575,12 +575,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr ""
 
@@ -595,309 +595,309 @@ msgstr[1] ""
 msgid "No feeds found."
 msgstr "Syötteitä ei löytynyt."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Erikoiset"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Kaikki syötteet"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Tähdellä merkityt syötteet"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Julkiset artikkelit"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Tuoreet artikkelit"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr "Arkistoidut artikkelit"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr "Viimeksi luetut"
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Valikko"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 msgid "Open next feed"
 msgstr "Avaa seuraava syöte"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr "Avaa edellinen syöte"
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 msgid "Open next article"
 msgstr "Avaa seuraava artikkeli"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 msgid "Open previous article"
 msgstr "Avaa edellinen artikkeli"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr "Avaa seuraava artikkeli (älä vieritä pitkiä artikkeleita)"
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Avaa edellinen artikkeli (älä vieritä pitkiä artikkeleita)"
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "Etsi..."
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 msgid "Article"
 msgstr "Artikkeli"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "Lisää/Poista tähti"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "Vaihda julkinen-tilaa"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "Vaihda luettu/lukematon"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Muokkaa tageja"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 msgid "Dismiss selected"
 msgstr "Piilota valittu"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 msgid "Dismiss read"
 msgstr "Piilota luettu"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 msgid "Open in new window"
 msgstr "Avaa uudessa ikkunassa"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr "Merkitse alla olevat luetuiksi"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr "Merkitse yllä olevat luetuiksi"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 msgid "Scroll down"
 msgstr "Vieritä alas"
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr "Vieritä ylös"
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 msgid "Select article under cursor"
 msgstr "Valitse kursorin alla oleva artikkeli"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr "Lähetä artikkeli sähköpostilla"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 msgid "Close/collapse article"
 msgstr "Piilota/näytä artikkeli"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Vaihda alkuperäinen liitetty"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 msgid "Article selection"
 msgstr "Artikkelin valinta"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr "Valitse kaikki artikkelit"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 msgid "Select unread"
 msgstr "Valitse lukematon"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 msgid "Select starred"
 msgstr "Valitse tähdellä merkityt"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 msgid "Select published"
 msgstr "Valitse julkaistu"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 msgid "Invert selection"
 msgstr "Vaihda valittujen tila"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 msgid "Deselect everything"
 msgstr "Poista valinnat"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Syöte"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 msgid "Refresh current feed"
 msgstr "Päivitä tämänhetkinen syöte"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 msgid "Un/hide read feeds"
 msgstr "Piilota/näytä luetut syötteet"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "Tilaa syöte"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Muokkaa syötettä"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 msgid "Reverse headlines"
 msgstr "Käännä otsikot"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 msgid "Debug feed update"
 msgstr "Syötteen päivitys (Debug)"
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Merkitse kaikki syötteet luetuiksi"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 msgid "Un/collapse current category"
 msgstr "Piilota/näytä tämänhetkinen kansio"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 msgid "Toggle combined mode"
 msgstr "Vaihda yhdistety tila"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 msgid "Toggle auto expand in combined mode"
 msgstr "Vaihda automaattilaajennus tiivistemuodossa"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 msgid "Go to"
 msgstr "Mene"
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 msgid "Fresh"
 msgstr "Päivitä"
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Tagipilvi"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 msgid "Other"
 msgstr "Muu"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Luo tunniste"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Luo suodatin"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 msgid "Un/collapse sidebar"
 msgstr "Piilota/näytä sivupalkki"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 msgid "Show help dialog"
 msgstr "Näytä ohjeikkuna"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr "Hakutulokset: %s"
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr ""
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "ei tageja"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Muokkaa tämän artikkelin tageja"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr "Syötteen URL"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -906,15 +906,15 @@ msgstr "Syötteen URL"
 msgid "Close this window"
 msgstr "Sulje"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "tuntematon tyyppi"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 msgid "Attachments"
 msgstr "Litteet"
 
@@ -1193,7 +1193,7 @@ msgstr "Profiili:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr "Oletusprofiili"
 
@@ -1224,12 +1224,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Tämän syötteen tagit (pilkulla erotettuna)"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1239,23 +1239,23 @@ msgstr "Talleta"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Peru"
 
@@ -1269,10 +1269,10 @@ msgid "Title:"
 msgstr "Otsikko:"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "URL:"
 
@@ -1376,221 +1376,75 @@ msgstr "Valitettavasti käyttjätunnus/email -yhdistelmää ei löydy."
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr "Valitse"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Kaikki"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Ei mikään"
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr "Luo profiili"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-msgid "(active)"
-msgstr "(aktiivinen)"
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr "Poista valitut profiilit"
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr "Aktivoi profiili"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 msgid "Generate new URL"
 msgstr "Generoi uusi URL"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr ""
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "Täsmää:"
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr "Mikä tahansa"
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 msgid "All tags."
 msgstr "Kaikki tagit"
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr "Mitkä tagit?"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr "Näytä"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Tämän RSS-syötteen julkinen URL-osoite on:"
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr ""
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr "Lataa"
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr ""
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr ""
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-msgid "Access key:"
-msgstr ""
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-msgid "Access key"
-msgstr ""
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr ""
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-msgid "Generate new key"
-msgstr ""
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr "Luo linkki"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Lisää RSS-syötteet riveittäin. Yksi syöte per rivi. (syötetarkistusta ei tehdä)"
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "Siirrä kansioon:"
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr "Tilattavat syötteet, yksi syöte per rivi"
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Käyttäjätunnus"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-msgid "Password"
-msgstr "Salasana"
-
-#: classes/dlg.php:499
-msgid "Feeds require authentication."
-msgstr "Syöte vaatii kirjautumisen."
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Tilaa"
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr ""
@@ -1601,7 +1455,7 @@ msgstr "Näytä RSS-syötteenä"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr "Näytä RSS-syötteenä"
 
@@ -1609,10 +1463,42 @@ msgstr "Näytä RSS-syötteenä"
 msgid "Select:"
 msgstr "Valitse"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Kaikki"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Käännä"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Ei mikään"
+
 #: classes/feeds.php:101
 msgid "More..."
 msgstr "Lisää..."
@@ -1695,84 +1581,113 @@ msgid "No articles found to display."
 msgstr "Ei näytettäviä artikkeleita."
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Syötteet päivitetty viimeksi %s"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 msgid "Some feeds have update errors (click for details)"
 msgstr "Joissakin syötteissä oli virheitä (klikkaa nähdäksesi lisätietoja)"
 
-#: classes/feeds.php:922
+#: classes/feeds.php:909
 msgid "No feed selected."
 msgstr "Yhtään syötettä ei ole valittuna"
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 msgid "Feed or site URL"
 msgstr "Syötteen/sivuston URL"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "Siirrä kansioon:"
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr "Saatavilla olevat syötteet"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Tunnistautuminen"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Käyttäjätunnus"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr "Salasana"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Tämä syöte vaatii kirjautumisen"
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "Tilaa"
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr "Lisää syötteitä"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Etsi"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 msgid "Popular feeds"
 msgstr "Suositut syötteet"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 msgid "Feed archive"
 msgstr "Syötearkisto"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 msgid "limit:"
 msgstr "raja:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Poista"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr "Etsi"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Rajaa haku"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Tämä syöte"
 
@@ -1895,8 +1810,8 @@ msgid "Change password to"
 msgstr "Uusi salasana"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Valinnat"
 
@@ -1933,6 +1848,21 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "Valitse"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Luo käyttäjätunnus"
@@ -2059,13 +1989,13 @@ msgid "Combine"
 msgstr "Yhdistä"
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 msgid "Reset sort order"
 msgstr "Järjestä oletuksen mukaisesti"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Uudelleenpisteytä artikkelit"
 
@@ -2113,7 +2043,7 @@ msgstr "Talleta toiminto"
 msgid "Add action"
 msgstr "Lisää toiminto"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 #, fuzzy
 msgid "[No caption]"
 msgstr "Nimi"
@@ -2321,241 +2251,264 @@ msgstr "Aktivoi valitut lisäosat"
 msgid "Incorrect password"
 msgstr "Väärä salasana"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr ""
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr "Luo profiili"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr "(aktiivinen)"
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr "Poista valitut profiilit"
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr "Aktivoi profiili"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "Valitse aktivoidaksesi kenttä"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Syötteen otsikko"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Päivitä"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "Artikkeleiden siivous"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 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:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 msgid "Hide from Popular feeds"
 msgstr "Piilota suosituista syötteistä"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "Sisällytä email-tiivistelmään"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "Näytä aina kuvat"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr "Älä liitä kuvia"
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "Paikallinen välimuisti kuville"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 msgid "Mark updated articles as unread"
 msgstr "Merkitse päivitetyt artikkelit lukemattomiksi"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr "Suosikkikuvake"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr "Vaihda"
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 msgid "Resubscribe to push updates"
 msgstr ""
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Valmis."
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 msgid "Feeds with errors"
 msgstr "Virheelliset syötteet"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 msgid "Inactive feeds"
 msgstr "Passiiviset syötteet"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 msgid "Edit selected feeds"
 msgstr "Muokkaa valittuja syötteitä"
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr "Tilaa useita"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 msgid "Categories"
 msgstr "Kansiot"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 msgid "Add category"
 msgstr "Lisää kansio"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 msgid "(Un)hide empty categories"
 msgstr "Piilota/näytä tyhjät kansiot"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 msgid "Remove selected"
 msgstr "Poista valittu"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 msgid "More actions..."
 msgstr "Lisää toimintoja"
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr ""
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "Tyhjennnä syötetiedot"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 msgid "Import my OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr "Tiedosto:"
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 msgid "Include settings"
 msgstr ""
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 msgid "Export OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 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:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 msgid "Firefox integration"
 msgstr ""
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr ""
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1423
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1431
 msgid "Published & shared articles / Generated feeds"
 msgstr "Julkaistut & jaetut artikkelit / Generoidut syötteet"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 msgid "Published articles and generated feeds"
 msgstr "Julkaistut artikkelit ja generoidut syötteet"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Julkistetut artikkelit näkyvät julkisina RSS-syötteinä ja niitä voi lukea ja tilata jokainen, joka tietää alla määritellyn URL:n"
 
-#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1441
 msgid "Display URL"
 msgstr "Näytä URL"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr "Poista kaikki generoidut URLt"
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 msgid "Articles shared by URL"
 msgstr "Artikkelit jaettu URL:n kautta"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Voit poistaa kaikkien artikkeleiden julkistukset tästä."
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 msgid "Unshare all articles"
 msgstr "Poista kaikkien artikkeleiden jako"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Näihin syötteisiin ei ole tullut uusia artikkeleita 3 kuukauteen (vanhimmat ensin):"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 msgid "Click to edit feed"
 msgstr "Klikkaa muokataksesi syötettä"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 msgid "Unsubscribe from selected feeds"
 msgstr "Lopeta valittujen syötteiden tilaukset"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "Näitä syötteitä ei ole päivitetty virheiden vuoksi:"
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Lisää RSS-syötteet riveittäin. Yksi syöte per rivi. (syötetarkistusta ei tehdä)"
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr "Tilattavat syötteet, yksi syöte per rivi"
+
+#: classes/pref/feeds.php:1789
+msgid "Feeds require authentication."
+msgstr "Syöte vaatii kirjautumisen."
+
 #: plugins/digest/digest_body.php:59
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
 msgstr ""
@@ -2834,6 +2787,38 @@ msgstr ""
 msgid "Linked"
 msgstr ""
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr ""
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr ""
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+msgid "Access key:"
+msgstr ""
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+msgid "Access key"
+msgstr ""
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+msgid "Generate new key"
+msgstr ""
+
 #: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr ""
@@ -2854,6 +2839,10 @@ msgstr ""
 msgid "Stored feeds"
 msgstr ""
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr "Luo linkki"
+
 #: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr ""
@@ -2884,21 +2873,21 @@ msgstr ""
 msgid "Start update"
 msgstr ""
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "Merkitäänkö kaikki artikkelit syötteessä %s luetuiksi?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Merkitäänkö kaikki yhtä päivää vanhemmat artikkelit syötteessä %s luetuiksi?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Merkitäänkö kaikki yhtä viikkoa vanhemmat artikkelit syötteessä %s luetuiksi?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Merkitäänkö kaikki 2 viikkoa vanhemmat artikkelit syötteessä %s luetuiksi?"
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 862ff4c1..08b16a7d 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 8061d08d..261bada4 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+0400\n"
 "PO-Revision-Date: 2013-04-01 10:18+0100\n"
 "Last-Translator: Raphael Rochet <raphael@rri.fr>\n"
 "Language-Team: French\n"
@@ -54,39 +54,48 @@ msgstr "Au bout de 3 mois"
 msgid "Default interval"
 msgstr "Fréquence de mise à jour par défaut"
 
-#: backend.php:81 backend.php:91
+#: backend.php:81
+#: backend.php:91
 msgid "Disable updates"
 msgstr "Désactiver les mises à jour"
 
-#: backend.php:82 backend.php:92
+#: backend.php:82
+#: backend.php:92
 msgid "Each 15 minutes"
 msgstr "Toutes les 15 minutes"
 
-#: backend.php:83 backend.php:93
+#: backend.php:83
+#: backend.php:93
 msgid "Each 30 minutes"
 msgstr "Toutes les 30 minutes"
 
-#: backend.php:84 backend.php:94
+#: backend.php:84
+#: backend.php:94
 msgid "Hourly"
 msgstr "Toutes les heures"
 
-#: backend.php:85 backend.php:95
+#: backend.php:85
+#: backend.php:95
 msgid "Each 4 hours"
 msgstr "Toutes les 4 heures"
 
-#: backend.php:86 backend.php:96
+#: backend.php:86
+#: backend.php:96
 msgid "Each 12 hours"
 msgstr "Toutes les 12 heures"
 
-#: backend.php:87 backend.php:97
+#: backend.php:87
+#: backend.php:97
 msgid "Daily"
 msgstr "Une fois par jour"
 
-#: backend.php:88 backend.php:98
+#: backend.php:88
+#: backend.php:98
 msgid "Weekly"
 msgstr "Une fois par semaine"
 
-#: backend.php:101 classes/pref/users.php:139
+#: backend.php:101
+#: classes/pref/users.php:139
 msgid "User"
 msgstr "Utilisateur"
 
@@ -122,10 +131,19 @@ msgstr ", trouvée : "
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "La base de données de Tiny Tiny RSS est à jour."
 
-#: db-updater.php:96 db-updater.php:165 db-updater.php:178 register.php:196
-#: register.php:241 register.php:254 register.php:269 register.php:288
-#: register.php:336 register.php:346 register.php:358
-#: classes/handler/public.php:626 classes/handler/public.php:714
+#: db-updater.php:96
+#: db-updater.php:165
+#: db-updater.php:178
+#: register.php:196
+#: register.php:241
+#: register.php:254
+#: register.php:269
+#: register.php:288
+#: register.php:336
+#: register.php:346
+#: register.php:358
+#: classes/handler/public.php:626
+#: classes/handler/public.php:714
 #: classes/handler/public.php:796
 msgid "Return to Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
@@ -136,12 +154,8 @@ msgstr "Merci de sauvegardez votre base de données avant de poursuivre."
 
 #: db-updater.php:104
 #, php-format
-msgid ""
-"Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
-"<b>%d</b>)."
-msgstr ""
-"La base de données de Tiny Tiny RSS a besoin d'être mise à jour (version <b>"
-"%d</b> à <b>%d</b>)."
+msgid "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to <b>%d</b>)."
+msgstr "La base de données de Tiny Tiny RSS a besoin d'être mise à jour (version <b>%d</b> à <b>%d</b>)."
 
 #: db-updater.php:118
 msgid "Perform updates"
@@ -171,20 +185,13 @@ msgstr "ERREUR !"
 #: db-updater.php:160
 #, php-format
 msgid "Finished. Performed <b>%d</b> update up to schema version <b>%d</b>."
-msgid_plural ""
-"Finished. Performed <b>%d</b> updates up to schema version <b>%d</b>."
-msgstr[0] ""
-"Terminé. <b>%d</b> modification a été effectuée pour parvenir à la version "
-"de schéma <b>%d</b>."
-msgstr[1] ""
-"Terminé. <b>%d</b> modifications ont été effectuées pour parvenir à la "
-"version de schéma <b>%d</b>."
+msgid_plural "Finished. Performed <b>%d</b> updates up to schema version <b>%d</b>."
+msgstr[0] "Terminé. <b>%d</b> modification a été effectuée pour parvenir à la version de schéma <b>%d</b>."
+msgstr[1] "Terminé. <b>%d</b> modifications ont été effectuées pour parvenir à la version de schéma <b>%d</b>."
 
 #: db-updater.php:170
 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."
+msgstr "Votre schéma de base de données provient d'une version plus récente de Tiny Tiny RSS."
 
 #: db-updater.php:172
 #, php-format
@@ -192,30 +199,16 @@ msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr "Version du schéma trouvée : <b>%d</b>, requise : <b>%d</b>."
 
 #: db-updater.php:174
-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."
+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."
 
 #: errors.php:9
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
-msgstr ""
-"Ce programme nécessite l'utilisation de XmlHttpRequest pour fonctionner "
-"correctement. Votre navigateur web semble ne pas intégrer cette "
-"fonctionnalité."
+msgid "This program requires XmlHttpRequest to function properly. Your browser doesn't seem to support it."
+msgstr "Ce programme nécessite l'utilisation de XmlHttpRequest pour fonctionner correctement. Votre navigateur web semble ne pas intégrer cette fonctionnalité."
 
 #: errors.php:12
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
-msgstr ""
-"Ce programme nécessite l'utilisation de cookies pour fonctionner "
-"correctement. Votre navigateur web semble ne pas intégrer cette "
-"fonctionnalité."
+msgid "This program requires cookies to function properly. Your browser doesn't seem to support them."
+msgstr "Ce programme nécessite l'utilisation de cookies pour fonctionner correctement. Votre navigateur web semble ne pas intégrer cette fonctionnalité."
 
 #: errors.php:15
 msgid "Backend sanity check failed."
@@ -226,12 +219,8 @@ msgid "Frontend sanity check failed."
 msgstr "Le test de l'interface a échoué."
 
 #: errors.php:19
-msgid ""
-"Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
-"update&lt;/a&gt;."
-msgstr ""
-"Version non valable pour le schéma de la base de données. &lt;a href='db-"
-"updater.php'&gt;Veuillez le mettre à jour&lt;/a&gt;."
+msgid "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please update&lt;/a&gt;."
+msgstr "Version non valable pour le schéma de la base de données. &lt;a href='db-updater.php'&gt;Veuillez le mettre à jour&lt;/a&gt;."
 
 #: errors.php:21
 msgid "Request not authorized."
@@ -242,48 +231,60 @@ msgid "No operation to perform."
 msgstr "Aucune opération à effectuer."
 
 #: errors.php:25
-msgid ""
-"Could not display feed: query failed. Please check label match syntax or "
-"local configuration."
-msgstr ""
-"Impossible d'afficher le flux : la requête n'a pas abouti. Veuillez vérifier "
-"la syntaxe de correspondance d'étiquette ou la configuration locale."
+msgid "Could not display feed: query failed. Please check label match syntax or local configuration."
+msgstr "Impossible d'afficher le flux : la requête n'a pas abouti. Veuillez vérifier la syntaxe de correspondance d'étiquette ou la configuration locale."
 
 #: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
-msgstr ""
-"Accès refusé. Vous n'avez pas les permissions nécessaires pour accéder à "
-"cette page."
+msgstr "Accès refusé. Vous n'avez pas les permissions nécessaires pour accéder à cette page."
 
 #: errors.php:29
 msgid "Configuration check failed"
 msgstr "Échec du test de configuration"
 
 #: errors.php:31
-msgid ""
-"Your version of MySQL is not currently supported. Please see official site "
-"for more information."
-msgstr ""
-"Votre version de MySQL n'est pas supportée actuellement. Veuillez consulter "
-"le site officiel pour plus d'informations."
+msgid "Your version of MySQL is not currently supported. Please see official site for more information."
+msgstr "Votre version de MySQL n'est pas supportée actuellement. Veuillez consulter le site officiel pour plus d'informations."
 
 #: errors.php:35
 msgid "SQL escaping test failed, check your database and PHP configuration"
-msgstr ""
-"Le test d'échappement SQL a échoué, veuillez vérifier votre configuration de "
-"base de données et de PHP"
+msgstr "Le test d'échappement SQL a échoué, veuillez vérifier votre configuration de base de données et de PHP"
 
-#: index.php:135 index.php:154 index.php:263 prefs.php:102
-#: classes/backend.php:5 classes/pref/labels.php:296
-#: classes/pref/filters.php:680 classes/pref/feeds.php:1330
-#: plugins/digest/digest_body.php:63 js/feedlist.js:160 js/feedlist.js:486
-#: js/functions.js:420 js/functions.js:808 js/functions.js:1244
-#: js/functions.js:1379 js/functions.js:1691 js/prefs.js:86 js/prefs.js:576
-#: js/prefs.js:666 js/prefs.js:858 js/prefs.js:1445 js/prefs.js:1498
-#: js/prefs.js:1557 js/prefs.js:1574 js/prefs.js:1590 js/prefs.js:1606
-#: js/prefs.js:1625 js/prefs.js:1798 js/prefs.js:1814 js/tt-rss.js:475
-#: js/tt-rss.js:492 js/viewfeed.js:774 js/viewfeed.js:1245
-#: plugins/import_export/import_export.js:17 plugins/updater/updater.js:17
+#: index.php:135
+#: index.php:154
+#: index.php:263
+#: prefs.php:103
+#: classes/backend.php:5
+#: classes/pref/labels.php:296
+#: classes/pref/filters.php:680
+#: classes/pref/feeds.php:1331
+#: plugins/digest/digest_body.php:63
+#: js/feedlist.js:128
+#: js/feedlist.js:448
+#: js/functions.js:420
+#: js/functions.js:808
+#: js/functions.js:1244
+#: js/functions.js:1379
+#: js/functions.js:1691
+#: js/prefs.js:86
+#: js/prefs.js:576
+#: js/prefs.js:666
+#: js/prefs.js:858
+#: js/prefs.js:1445
+#: js/prefs.js:1498
+#: js/prefs.js:1557
+#: js/prefs.js:1574
+#: js/prefs.js:1590
+#: js/prefs.js:1606
+#: js/prefs.js:1625
+#: js/prefs.js:1798
+#: js/prefs.js:1814
+#: js/tt-rss.js:475
+#: js/tt-rss.js:492
+#: js/viewfeed.js:774
+#: js/viewfeed.js:1245
+#: plugins/import_export/import_export.js:17
+#: plugins/updater/updater.js:17
 msgid "Loading, please wait..."
 msgstr "Chargement en cours, veuillez patienter..."
 
@@ -303,15 +304,21 @@ msgstr "Adaptatif"
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: index.php:176 include/functions.php:1939 classes/feeds.php:106
+#: index.php:176
+#: include/functions.php:1924
+#: classes/feeds.php:106
 msgid "Starred"
 msgstr "Remarquables"
 
-#: index.php:177 include/functions.php:1940 classes/feeds.php:107
+#: index.php:177
+#: include/functions.php:1925
+#: classes/feeds.php:107
 msgid "Published"
 msgstr "Publiés"
 
-#: index.php:178 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:178
+#: classes/feeds.php:93
+#: classes/feeds.php:105
 msgid "Unread"
 msgstr "Non lus"
 
@@ -347,13 +354,21 @@ msgstr "Les plus anciens en premier"
 msgid "Mark feed as read"
 msgstr "Marquer le flux comme lu"
 
-#: index.php:195 index.php:234 include/functions.php:1929
-#: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:437
-#: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:647
+#: index.php:195
+#: index.php:234
+#: include/functions.php:1914
+#: include/localized_schema.php:10
+#: classes/feeds.php:111
+#: classes/feeds.php:437
+#: js/FeedTree.js:128
+#: js/FeedTree.js:156
+#: plugins/digest/digest.js:647
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: index.php:196 include/functions.php:1825 include/functions.php:1937
+#: index.php:196
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Tous les articles"
 
@@ -397,7 +412,8 @@ msgstr "Rechercher..."
 msgid "Feed actions:"
 msgstr "Actions sur ce flux :"
 
-#: index.php:229 classes/handler/public.php:556
+#: index.php:229
+#: classes/handler/public.php:556
 msgid "Subscribe to feed..."
 msgstr "S'abonner au flux..."
 
@@ -409,7 +425,9 @@ msgstr "Modifier ce flux..."
 msgid "Rescore feed"
 msgstr "Recalculer le score du flux"
 
-#: index.php:232 classes/pref/feeds.php:716 classes/pref/feeds.php:1303
+#: index.php:232
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Se désabonner"
@@ -434,7 +452,8 @@ msgstr "Basculer en mode résumé..."
 msgid "Show tag cloud..."
 msgstr "Afficher le nuage de tags..."
 
-#: index.php:241 include/functions.php:1915
+#: index.php:241
+#: include/functions.php:1900
 msgid "Toggle widescreen mode"
 msgstr "Basculer le mode écran large"
 
@@ -454,61 +473,64 @@ msgstr "Créer un filtre..."
 msgid "Keyboard shortcuts help"
 msgstr "Aide sur les raccourcis clavier"
 
-#: index.php:247 plugins/digest/digest_body.php:77
+#: index.php:247
+#: plugins/digest/digest_body.php:77
 #: plugins/mobile/mobile-functions.php:62
 #: plugins/mobile/mobile-functions.php:237
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: prefs.php:36 prefs.php:120 include/functions.php:1942
+#: prefs.php:36
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Configuration"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Quitter la configuration"
 
-#: prefs.php:123 classes/pref/feeds.php:106 classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Flux"
 
-#: prefs.php:126 classes/pref/filters.php:156
+#: prefs.php:127
+#: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:129 include/functions.php:1116 include/functions.php:1768
-#: classes/pref/labels.php:90 plugins/mobile/mobile-functions.php:198
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
+#: classes/pref/labels.php:90
+#: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Etiquettes"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: register.php:186 include/login_form.php:238
+#: register.php:186
+#: include/login_form.php:238
 msgid "Create new account"
 msgstr "Créer un nouveau compte"
 
 #: register.php:192
 msgid "New user registrations are administratively disabled."
-msgstr ""
-"L'inscription de nouveaux utilisateurs est désactivée par l'administrateur."
+msgstr "L'inscription de nouveaux utilisateurs est désactivée par l'administrateur."
 
 #: register.php:217
-msgid ""
-"Your temporary password will be sent to the specified email. Accounts, which "
-"were not logged in once, are erased automatically 24 hours after temporary "
-"password is sent."
-msgstr ""
-"Votre mot de passe temporaire va être envoyé à l'adresse mail indiquée. Les "
-"comptes ne s'étant pas connectés au moins une fois dans les 24 heures qui "
-"suivent l'envoi du mail seront supprimés."
+msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
+msgstr "Votre mot de passe temporaire va être envoyé à l'adresse mail indiquée. Les comptes ne s'étant pas connectés au moins une fois dans les 24 heures qui suivent l'envoi du mail seront supprimés."
 
 #: register.php:223
 msgid "Desired login:"
@@ -518,11 +540,13 @@ msgstr "Identifiant souhaité :"
 msgid "Check availability"
 msgstr "Vérifier la disponibilité"
 
-#: register.php:228 classes/handler/public.php:754
+#: register.php:228
+#: classes/handler/public.php:754
 msgid "Email:"
 msgstr "Adresse mail :"
 
-#: register.php:231 classes/handler/public.php:759
+#: register.php:231
+#: classes/handler/public.php:759
 msgid "How much is two plus two:"
 msgstr "Combien font 2 plus 2 :"
 
@@ -554,9 +578,13 @@ msgstr "L'inscription de nouveaux utilisateurs est actuellement fermée."
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script de mise à jour des données de Tiny Tiny RSS."
 
-#: include/digest.php:109 include/functions.php:1125
-#: include/functions.php:1669 include/functions.php:1754
-#: include/functions.php:1776 classes/opml.php:416 classes/pref/feeds.php:221
+#: include/digest.php:109
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
+#: classes/opml.php:416
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
@@ -571,290 +599,326 @@ msgstr[1] "%d articles archivés"
 msgid "No feeds found."
 msgstr "Aucun flux trouvé."
 
-#: include/functions.php:1114 include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Spécial"
 
-#: include/functions.php:1618 classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr "Articles archivés"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr "Lus récemment"
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 msgid "Open next feed"
 msgstr "Ouvrir le flux suivant"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr "Ouvrir le flux précédent"
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 msgid "Open next article"
 msgstr "Ouvrir l'article suivant"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 msgid "Open previous article"
 msgstr "Ouvrir l'article précédent"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr "Ouvrir l'article suivant (ne pas faire défiler les articles longs)"
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Ouvrir l'article précédent (ne pas faire défiler les articles longs)"
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "Afficher la fenêtre de recherche"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 msgid "Article"
 msgstr "Article"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "Marquer comme (non) remarquable"
 
-#: include/functions.php:1902 js/viewfeed.js:1908
+#: include/functions.php:1887
+#: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "Marquer comme (non) publié"
 
-#: include/functions.php:1903 js/viewfeed.js:1886
+#: include/functions.php:1888
+#: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "Marquer comme (non) lu"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Modifier les tags"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 msgid "Dismiss selected"
 msgstr "Ecarter la sélection"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 msgid "Dismiss read"
 msgstr "Ecarter les articles lus"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 msgid "Open in new window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
-#: include/functions.php:1908 js/viewfeed.js:1927
+#: include/functions.php:1893
+#: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr "Marquer les articles en-dessous comme lus"
 
-#: include/functions.php:1909 js/viewfeed.js:1921
+#: include/functions.php:1894
+#: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr "Marquer les articles au-dessus comme lus"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 msgid "Scroll down"
 msgstr "Défiler vers le bas"
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr "Défiler vers le haut"
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 msgid "Select article under cursor"
 msgstr "Sélectionner l'article sous le curseur"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr "Envoyer l'article par mail"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 msgid "Close/collapse article"
 msgstr "Contracter l'article"
 
-#: include/functions.php:1916 plugins/embed_original/init.php:33
+#: include/functions.php:1901
+#: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Basculer l'intégration de l'article original"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 msgid "Article selection"
 msgstr "Sélection d'article"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr "Sélectionner tous les articles"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 msgid "Select unread"
 msgstr "Sélectionner les articles non-lus"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 msgid "Select starred"
 msgstr "Sélectionner les articles remarquables"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 msgid "Select published"
 msgstr "Sélectionner les articles publiés"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 msgid "Invert selection"
 msgstr "Inverser la sélection"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 msgid "Deselect everything"
 msgstr "Tout désélectionner"
 
-#: include/functions.php:1924 classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Flux"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 msgid "Refresh current feed"
 msgstr "Actualiser le flux actif"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 msgid "Un/hide read feeds"
 msgstr "Masquer/afficher les flux lus"
 
-#: include/functions.php:1927 classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "S'abonner au flux"
 
-#: include/functions.php:1928 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1913
+#: js/FeedTree.js:135
+#: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Modifier le flux"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 msgid "Reverse headlines"
 msgstr "Inverser l'ordre des en-têtes"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 msgid "Debug feed update"
 msgstr "Déboguer les mises à jour"
 
-#: include/functions.php:1932 js/FeedTree.js:178
+#: include/functions.php:1917
+#: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Marquer tous les flux comme lus"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 msgid "Un/collapse current category"
 msgstr "Étendre/contracter la catégorie"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 msgid "Toggle combined mode"
 msgstr "Basculer le mode combiné"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 msgid "Toggle auto expand in combined mode"
 msgstr "Basculer le développement automatique en mode combiné"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 msgid "Go to"
 msgstr "Aller à"
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 msgid "Fresh"
 msgstr "Nouveaux"
 
-#: include/functions.php:1941 js/tt-rss.js:431 js/tt-rss.js:584
+#: include/functions.php:1926
+#: js/tt-rss.js:431
+#: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Nuage de tags"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 msgid "Other"
 msgstr "Autre"
 
-#: include/functions.php:1944 classes/pref/labels.php:281
+#: include/functions.php:1929
+#: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Créer une étiquette"
 
-#: include/functions.php:1945 classes/pref/filters.php:654
+#: include/functions.php:1930
+#: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Créer un filtre"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 msgid "Un/collapse sidebar"
 msgstr "Ouvrir/fermer la barre latérale"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 msgid "Show help dialog"
 msgstr "Afficher la fenêtre d'aide"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr "Résultats de recherche: %s"
 
-#: include/functions.php:2923 js/viewfeed.js:2014
+#: include/functions.php:2908
+#: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr "Cliquez pour lancer la lecture"
 
-#: include/functions.php:2924 js/viewfeed.js:2013
+#: include/functions.php:2909
+#: js/viewfeed.js:2013
 msgid "Play"
 msgstr "Lecture"
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3063 include/functions.php:3357 classes/rpc.php:408
+#: include/functions.php:3048
+#: include/functions.php:3342
+#: classes/rpc.php:408
 msgid "no tags"
 msgstr "aucun tag"
 
-#: include/functions.php:3073 classes/feeds.php:682
+#: include/functions.php:3058
+#: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Modifier les tags pour cet article"
 
-#: include/functions.php:3102 classes/feeds.php:638
+#: include/functions.php:3087
+#: classes/feeds.php:638
 msgid "Originally from:"
 msgstr "Origine :"
 
-#: include/functions.php:3115 classes/feeds.php:651 classes/pref/feeds.php:539
+#: include/functions.php:3100
+#: classes/feeds.php:651
+#: classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr "URL du flux"
 
-#: include/functions.php:3146 classes/dlg.php:37 classes/dlg.php:156
-#: classes/dlg.php:176 classes/dlg.php:209 classes/dlg.php:275
-#: classes/dlg.php:306 classes/dlg.php:333 classes/dlg.php:366
-#: classes/dlg.php:378 classes/backend.php:105 classes/pref/users.php:106
-#: classes/pref/filters.php:147 classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659 plugins/import_export/init.php:409
-#: plugins/import_export/init.php:432 plugins/googlereaderimport/init.php:168
-#: plugins/share/init.php:67 plugins/updater/init.php:357
+#: include/functions.php:3131
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
+#: classes/backend.php:105
+#: classes/pref/users.php:106
+#: classes/pref/filters.php:147
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
+#: plugins/import_export/init.php:409
+#: plugins/import_export/init.php:432
+#: plugins/googlereaderimport/init.php:168
+#: plugins/share/init.php:67
+#: plugins/updater/init.php:357
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr "(modifier l'annotation)"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "type inconnu"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 msgid "Attachments"
 msgstr "Fichier attaché"
 
@@ -886,8 +950,10 @@ msgstr "Supprimer l'article"
 msgid "Set starred"
 msgstr "Marquer comme remarquable"
 
-#: include/localized_schema.php:12 js/viewfeed.js:483
-#: plugins/digest/digest.js:265 plugins/digest/digest.js:754
+#: include/localized_schema.php:12
+#: js/viewfeed.js:483
+#: plugins/digest/digest.js:265
+#: plugins/digest/digest.js:754
 msgid "Publish article"
 msgstr "Publier l'article"
 
@@ -895,7 +961,8 @@ msgstr "Publier l'article"
 msgid "Assign tags"
 msgstr "Assigner des tags"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1978
+#: include/localized_schema.php:14
+#: js/viewfeed.js:1978
 msgid "Assign label"
 msgstr "Assigner l'étiquette"
 
@@ -916,66 +983,36 @@ msgid "Advanced"
 msgstr "Avancé"
 
 #: include/localized_schema.php:21
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-"Cette option est utile si vous lisez des articles venant d'agrégateurs de "
-"type «planet», dans lesquels certains flux se recoupent largement. Lorsque "
-"cette option est désactivée, les articles en double sont affichés en un seul "
-"exemplaire."
+msgid "This option is useful when you are reading several planet-type aggregators with partially colliding userbase. When disabled, it forces same posts from different feeds to appear only once."
+msgstr "Cette option est utile si vous lisez des articles venant d'agrégateurs de type «planet», dans lesquels certains flux se recoupent largement. Lorsque cette option est désactivée, les articles en double sont affichés en un seul exemplaire."
 
 #: include/localized_schema.php:22
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-"Affiche les articles sous la forme d'une liste étendue, au lieu de deux "
-"listes séparées (une pour les en-têtes et une pour le contenu)"
+msgid "Display expanded list of feed articles, instead of separate displays for headlines and article content"
+msgstr "Affiche les articles sous la forme d'une liste étendue, au lieu de deux listes séparées (une pour les en-têtes et une pour le contenu)"
 
 #: include/localized_schema.php:23
-msgid ""
-"Automatically open next feed with unread articles after marking one as read"
+msgid "Automatically open next feed with unread articles after marking one as read"
 msgstr "Sauter automatiquement au flux suivant après en marquer un comme lu"
 
 #: include/localized_schema.php:24
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-"Cette option active l'envoi d'une synthèse quotidienne (digest) des en-têtes "
-"nouveaux et non lus à l'adresse électronique donnée"
+msgid "This option enables sending daily digest of new (and unread) headlines on your configured e-mail address"
+msgstr "Cette option active l'envoi d'une synthèse quotidienne (digest) des en-têtes nouveaux et non lus à l'adresse électronique donnée"
 
 #: include/localized_schema.php:25
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-"Cette option permet de marquer automatiquement les articles comme lus "
-"lorsque vous naviguez dans la liste d'articles."
+msgid "This option enables marking articles as read automatically while you scroll article list."
+msgstr "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."
-msgstr ""
-"Élimine toutes les balises HTML sauf les plus courantes lors de la lecture "
-"des articles."
+msgstr "Élimine toutes les balises HTML sauf les plus courantes lors de la lecture des articles."
 
 #: include/localized_schema.php:27
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-"Lors de l'auto-détection des tags dans les articles, ces tags ne seront pas "
-"utilisés (séparés par des virgules)."
+msgid "When auto-detecting tags in articles these tags will not be applied (comma-separated list)."
+msgstr "Lors de l'auto-détection des tags dans les articles, ces tags ne seront pas utilisés (séparés par des virgules)."
 
 #: include/localized_schema.php:28
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr ""
-"Avec cette option activée, les entêtes dans les flux spéciaux et par "
-"étiquettes sont regroupés par flux"
+msgid "When this option is enabled, headlines in Special feeds and Labels are grouped by feeds"
+msgstr "Avec cette option activée, les entêtes dans les flux spéciaux et par étiquettes sont regroupés par flux"
 
 #: include/localized_schema.php:29
 msgid "Customize CSS stylesheet to your liking"
@@ -983,9 +1020,7 @@ msgstr "Personnaliser les feuilles de style CSS"
 
 #: include/localized_schema.php:30
 msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr ""
-"Utiliser les dates spécifiées dans le flux pour trier les en-têtes au lieu "
-"des dates importées localement."
+msgstr "Utiliser les dates spécifiées dans le flux pour trier les en-têtes au lieu des dates importées localement."
 
 #: include/localized_schema.php:31
 msgid "Click to register your SSL client certificate with tt-rss"
@@ -1001,9 +1036,7 @@ msgstr "Sélectionnez un des thèmes CSS disponibles"
 
 #: include/localized_schema.php:34
 msgid "Purge articles after this number of days (0 - disables)"
-msgstr ""
-"Purger les articles plus vieux que le nombre de jours donné (0 pour ne "
-"jamais purger)"
+msgstr "Purger les articles plus vieux que le nombre de jours donné (0 pour ne jamais purger)"
 
 #: include/localized_schema.php:35
 msgid "Default interval between feed updates"
@@ -1049,7 +1082,8 @@ msgstr "Sauter automatiquement au flux suivant"
 msgid "Sort feeds by unread articles count"
 msgstr "Trier les flux par nombre d'articles non lus"
 
-#: include/localized_schema.php:46 plugins/mobile/prefs.php:60
+#: include/localized_schema.php:46
+#: plugins/mobile/prefs.php:60
 msgid "Reverse headline order (oldest first)"
 msgstr "Inverser l'order des en-têtes (les plus anciens en premier)"
 
@@ -1109,7 +1143,8 @@ msgstr "Activer les API externes"
 msgid "User timezone"
 msgstr "Fuseau horaire de l'utilisateur"
 
-#: include/localized_schema.php:61 js/prefs.js:1725
+#: include/localized_schema.php:61
+#: js/prefs.js:1725
 msgid "Customize stylesheet"
 msgstr "Personnaliser la feuille de style"
 
@@ -1133,12 +1168,15 @@ msgstr "Assigner des étiquettes aux articles automatiquement"
 msgid "Select theme"
 msgstr "Sélectionner un thème"
 
-#: include/login_form.php:183 classes/handler/public.php:461
-#: classes/handler/public.php:749 plugins/mobile/login_form.php:40
+#: include/login_form.php:183
+#: classes/handler/public.php:461
+#: classes/handler/public.php:749
+#: plugins/mobile/login_form.php:40
 msgid "Login:"
 msgstr "Identifiant :"
 
-#: include/login_form.php:192 classes/handler/public.php:464
+#: include/login_form.php:192
+#: classes/handler/public.php:464
 #: plugins/mobile/login_form.php:45
 msgid "Password:"
 msgstr "Mot de passe :"
@@ -1147,7 +1185,8 @@ msgstr "Mot de passe :"
 msgid "I forgot my password"
 msgstr "J'ai oublié mon mot de passe"
 
-#: include/login_form.php:201 classes/handler/public.php:467
+#: include/login_form.php:201
+#: classes/handler/public.php:467
 msgid "Language:"
 msgstr "Langue :"
 
@@ -1155,8 +1194,10 @@ msgstr "Langue :"
 msgid "Profile:"
 msgstr "Profil :"
 
-#: include/login_form.php:213 classes/handler/public.php:211
-#: classes/rpc.php:64 classes/dlg.php:92
+#: include/login_form.php:213
+#: classes/handler/public.php:211
+#: classes/rpc.php:64
+#: classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr "Profil par défaut"
 
@@ -1168,7 +1209,8 @@ msgstr "Minimiser l'usage du trafic"
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: include/login_form.php:235 classes/handler/public.php:477
+#: include/login_form.php:235
+#: classes/handler/public.php:477
 #: plugins/mobile/login_form.php:28
 msgid "Log in"
 msgstr "Se connecter"
@@ -1185,27 +1227,44 @@ msgstr "Article non trouvé."
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags pour cet article (séparés par des virgules) :"
 
-#: classes/article.php:204 classes/dlg.php:406 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:405
-#: classes/pref/feeds.php:732 classes/pref/feeds.php:880
-#: plugins/nsfw/init.php:86 plugins/note/init.php:53
+#: classes/article.php:204
+#: classes/pref/users.php:192
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:405
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
+#: plugins/nsfw/init.php:86
+#: plugins/note/init.php:53
 #: plugins/instances/init.php:248
 msgid "Save"
 msgstr "Enregistrer"
 
-#: classes/article.php:206 classes/handler/public.php:438
-#: classes/handler/public.php:480 classes/dlg.php:408 classes/dlg.php:458
-#: classes/dlg.php:507 classes/feeds.php:1037 classes/feeds.php:1089
-#: classes/feeds.php:1149 classes/pref/users.php:194
-#: classes/pref/labels.php:81 classes/pref/filters.php:408
-#: classes/pref/filters.php:804 classes/pref/filters.php:880
-#: classes/pref/filters.php:947 classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883 plugins/mail/init.php:131
-#: plugins/note/init.php:55 plugins/instances/init.php:251
+#: classes/article.php:206
+#: classes/handler/public.php:438
+#: classes/handler/public.php:480
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
+#: classes/pref/users.php:194
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:804
+#: classes/pref/filters.php:880
+#: classes/pref/filters.php:947
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
+#: plugins/mail/init.php:131
+#: plugins/note/init.php:55
+#: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Annuler"
 
-#: classes/handler/public.php:402 plugins/bookmarklets/init.php:38
+#: classes/handler/public.php:402
+#: plugins/bookmarklets/init.php:38
 msgid "Share with Tiny Tiny RSS"
 msgstr "Partager avec Tiny Tiny RSS"
 
@@ -1213,9 +1272,11 @@ msgstr "Partager avec Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Titre :"
 
-#: classes/handler/public.php:412 classes/dlg.php:423
-#: classes/pref/feeds.php:537 classes/pref/feeds.php:768
+#: classes/handler/public.php:412
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "URL :"
 
@@ -1243,42 +1304,48 @@ msgstr "Non connecté"
 msgid "Incorrect username or password"
 msgstr "Identifiant ou mot de passe incorrect"
 
-#: classes/handler/public.php:562 classes/handler/public.php:659
+#: classes/handler/public.php:562
+#: classes/handler/public.php:659
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Déjà abonné à <b>%s</b>."
 
-#: classes/handler/public.php:565 classes/handler/public.php:650
+#: classes/handler/public.php:565
+#: classes/handler/public.php:650
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonné à <b>%s</b>."
 
-#: classes/handler/public.php:568 classes/handler/public.php:653
+#: classes/handler/public.php:568
+#: classes/handler/public.php:653
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Impossible de s'abonner à <b>%s</b>."
 
-#: classes/handler/public.php:571 classes/handler/public.php:656
+#: classes/handler/public.php:571
+#: classes/handler/public.php:656
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Aucun flux trouvé dans <b>%s</b>."
 
-#: classes/handler/public.php:574 classes/handler/public.php:662
+#: classes/handler/public.php:574
+#: classes/handler/public.php:662
 msgid "Multiple feed URLs found."
 msgstr "Plusieurs flux trouvé."
 
-#: classes/handler/public.php:578 classes/handler/public.php:667
+#: classes/handler/public.php:578
+#: classes/handler/public.php:667
 #, 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."
+msgstr "Impossible de s'abonner à <b>%s</b>.<br>Impossible de télécharger l'URL du flux."
 
-#: classes/handler/public.php:596 classes/handler/public.php:685
+#: classes/handler/public.php:596
+#: classes/handler/public.php:685
 msgid "Subscribe to selected feed"
 msgstr "S'abonner au flux sélectionné"
 
-#: classes/handler/public.php:621 classes/handler/public.php:709
+#: classes/handler/public.php:621
+#: classes/handler/public.php:709
 msgid "Edit subscription options"
 msgstr "Modifier les options d'abonnement"
 
@@ -1287,14 +1354,11 @@ msgid "Password recovery"
 msgstr "Récupération de mot de passe"
 
 #: classes/handler/public.php:742
-msgid ""
-"You will need to provide valid account name and email. New password will be "
-"sent on your email address."
-msgstr ""
-"Vous devrez fournir un nom et une adresse email valides. Le nouveau mot de "
-"passe sera envoyé à votre adresse email."
+msgid "You will need to provide valid account name and email. New password will be sent on your email address."
+msgstr "Vous devrez fournir un nom et une adresse email valides. Le nouveau mot de passe sera envoyé à votre adresse email."
 
-#: classes/handler/public.php:764 classes/pref/users.php:378
+#: classes/handler/public.php:764
+#: classes/pref/users.php:378
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
@@ -1302,7 +1366,8 @@ msgstr "Réinitialiser le mot de passe"
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Des paramètres du formulaire manquent ou sont invalides."
 
-#: classes/handler/public.php:778 classes/handler/public.php:804
+#: classes/handler/public.php:778
+#: classes/handler/public.php:804
 #: plugins/digest/digest_body.php:69
 msgid "Go back"
 msgstr "Revenir"
@@ -1312,212 +1377,77 @@ msgid "Sorry, login and email combination not found."
 msgstr "Désolé, ce couple identifiant et mail n'a pas été trouvé."
 
 #: classes/dlg.php:16
-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."
+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:49 classes/pref/users.php:360 classes/pref/labels.php:272
-#: classes/pref/filters.php:279 classes/pref/filters.php:327
-#: classes/pref/filters.php:645 classes/pref/filters.php:734
-#: classes/pref/filters.php:761 classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532 classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr "Sélectionner"
-
-#: classes/dlg.php:52 classes/feeds.php:92 classes/pref/users.php:363
-#: classes/pref/labels.php:275 classes/pref/filters.php:282
-#: classes/pref/filters.php:330 classes/pref/filters.php:648
-#: classes/pref/filters.php:737 classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265 classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605 plugins/instances/init.php:290
-msgid "All"
-msgstr "Tout"
-
-#: classes/dlg.php:54 classes/feeds.php:95 classes/pref/users.php:365
-#: classes/pref/labels.php:277 classes/pref/filters.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:650
-#: classes/pref/filters.php:739 classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267 classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607 plugins/instances/init.php:292
-msgid "None"
-msgstr "Aucun"
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr "Création d'un profil"
-
-#: classes/dlg.php:86 classes/dlg.php:116
-msgid "(active)"
-msgstr "(actif)"
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr "Supprimer les profils sélectionnés"
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr "Activer le profil"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr "Votre URL OPML publique est :"
 
-#: classes/dlg.php:173 classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 msgid "Generate new URL"
 msgstr "Générer une nouvelle URL"
 
-#: classes/dlg.php:187
-msgid ""
-"Update daemon is enabled in configuration, but daemon process is not "
-"running, which prevents all feeds from updating. Please start the daemon "
-"process or contact instance owner."
-msgstr ""
-"Le démon de mise à jour est activé dans la configuration mais le processus "
-"n'est pas lancé et les flux ne sont donc pas mis à jour. Veuillez le "
-"démarrer ou contacter l'administrateur."
+#: classes/dlg.php:71
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr "Le démon de mise à jour est activé dans la configuration mais le processus n'est pas lancé et les flux ne sont donc pas mis à jour. Veuillez le démarrer ou contacter l'administrateur."
 
-#: classes/dlg.php:191 classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Dernière mise à jour :"
 
-#: classes/dlg.php:196
-msgid ""
-"Update daemon is taking too long to perform a feed update. This could "
-"indicate a problem like crash or a hang. Please check the daemon process or "
-"contact instance owner."
-msgstr ""
-"Le démon de mise à jour prend trop de temps pour effectuer une mise à jour "
-"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:80
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr "Le démon de mise à jour prend trop de temps pour effectuer une mise à jour 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:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "Correspondance :"
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr "Au moins une"
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 msgid "All tags."
 msgstr "Tous les tags."
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr "Quels tags ?"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr "Afficher les entrées"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Vous pouvez consulter ce flux comme RSS en utilisant l'URL suivante :"
 
-#: classes/dlg.php:349 plugins/updater/init.php:327
+#: classes/dlg.php:233
+#: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible (%s)."
 
-#: classes/dlg.php:357
-msgid ""
-"You can update using built-in updater in the Preferences or by using update."
-"php"
-msgstr ""
-"Vous pouvez mettre à jour depuis la Configuration ou en utilisant update.php"
+#: classes/dlg.php:241
+msgid "You can update using built-in updater in the Preferences or by using update.php"
+msgstr "Vous pouvez mettre à jour depuis la Configuration ou en utilisant update.php"
 
-#: classes/dlg.php:361 plugins/updater/init.php:331
+#: classes/dlg.php:245
+#: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr "Voir les notes de publication"
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr "Télécharger"
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
-msgstr ""
-"Erreur de lecture de l'information de version ou aucune nouvelle version "
-"disponible."
-
-#: classes/dlg.php:391
-#, php-format
-msgid ""
-"You can override colors, fonts and layout of your currently selected theme "
-"with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink"
-"\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-"Vous pouvez redéfinir les couleurs, les polices et la mise en page du thème "
-"actuellement sélectionné à l'aide de vos propres instructions CSS ici. <a "
-"target=\"_blank\" class=\"visibleLink\" href=\"%s\">Ce fichier</a> peut être "
-"utilisé comme base de départ."
-
-#: classes/dlg.php:417 plugins/instances/init.php:207
-msgid "Instance"
-msgstr "Instance"
-
-#: classes/dlg.php:426 plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr "URL de l'instance"
-
-#: classes/dlg.php:436 plugins/instances/init.php:229
-msgid "Access key:"
-msgstr "Clef d'accès :"
-
-#: classes/dlg.php:439 plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-msgid "Access key"
-msgstr "Clef d'accès"
-
-#: classes/dlg.php:443 plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr "Utilisez une clef d'accès pour les deux instances liées."
-
-#: classes/dlg.php:451 plugins/instances/init.php:244
-msgid "Generate new key"
-msgstr "Générer une nouvelle clef"
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr "Créer un lien"
-
-#: classes/dlg.php:468
-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:471 classes/feeds.php:989 classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "Placer dans la catégorie :"
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr "Flux auxquels s'abonner, un par ligne"
-
-#: classes/dlg.php:485 classes/feeds.php:1013 classes/pref/users.php:420
-#: classes/pref/feeds.php:595 classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Se connecter"
-
-#: classes/dlg.php:488 classes/feeds.php:1016 classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601 classes/pref/feeds.php:827
-msgid "Password"
-msgstr "Mot de passe"
-
-#: classes/dlg.php:499
-msgid "Feeds require authentication."
-msgstr "Les flux requièrent une identification."
-
-#: classes/dlg.php:506 classes/feeds.php:1031 classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "S'abonner"
+msgstr "Erreur de lecture de l'information de version ou aucune nouvelle version disponible."
 
 #: classes/feeds.php:68
 msgid "Visit the website"
@@ -1527,7 +1457,9 @@ msgstr "Visiter le site web"
 msgid "View as RSS feed"
 msgstr "Voir comme flux RSS"
 
-#: classes/feeds.php:84 classes/feeds.php:138 classes/pref/feeds.php:1439
+#: classes/feeds.php:84
+#: classes/feeds.php:138
+#: classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr "Voir comme RSS"
 
@@ -1535,10 +1467,42 @@ msgstr "Voir comme RSS"
 msgid "Select:"
 msgstr "Sélectionner :"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Tout"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Inverse"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Aucun"
+
 #: classes/feeds.php:101
 msgid "More..."
 msgstr "Plus..."
@@ -1563,13 +1527,17 @@ msgstr "Archive"
 msgid "Move back"
 msgstr "Revenir"
 
-#: classes/feeds.php:118 classes/pref/filters.php:291
-#: classes/pref/filters.php:339 classes/pref/filters.php:746
+#: classes/feeds.php:118
+#: classes/pref/filters.php:291
+#: classes/pref/filters.php:339
+#: classes/pref/filters.php:746
 #: classes/pref/filters.php:773
 msgid "Delete"
 msgstr "Supprimer"
 
-#: classes/feeds.php:125 classes/feeds.php:130 plugins/mailto/init.php:28
+#: classes/feeds.php:125
+#: classes/feeds.php:130
+#: plugins/mailto/init.php:28
 #: plugins/mail/init.php:28
 msgid "Forward by email"
 msgstr "Transférer par email"
@@ -1578,7 +1546,8 @@ msgstr "Transférer par email"
 msgid "Feed:"
 msgstr "Flux :"
 
-#: classes/feeds.php:201 classes/feeds.php:827
+#: classes/feeds.php:201
+#: classes/feeds.php:827
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
@@ -1608,94 +1577,127 @@ msgid "No starred articles found to display."
 msgstr "Aucun article remarquable à afficher."
 
 #: classes/feeds.php:738
-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 à afficher. Vous pouvez assigner des étiquettes aux articles "
-"manuellement (voir les actions du menu ci-dessus) ou utiliser un filtre."
+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 à afficher. Vous pouvez assigner des étiquettes aux articles manuellement (voir les actions du menu ci-dessus) ou utiliser un filtre."
 
 #: classes/feeds.php:740
 msgid "No articles found to display."
 msgstr "Aucun article à afficher."
 
-#: classes/feeds.php:755 classes/feeds.php:932
+#: classes/feeds.php:755
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Flux mis à jour à %s"
 
-#: classes/feeds.php:765 classes/feeds.php:942
+#: classes/feeds.php:765
+#: classes/feeds.php:929
 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)"
+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:909
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
-#: classes/feeds.php:975 classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 msgid "Feed or site URL"
 msgstr "URL du flux"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "Placer dans la catégorie :"
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr "Flux disponibles"
 
-#: classes/feeds.php:1009 classes/pref/users.php:155
-#: classes/pref/feeds.php:589 classes/pref/feeds.php:817
+#: classes/feeds.php:996
+#: classes/pref/users.php:155
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Identification"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Se connecter"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr "Mot de passe"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Ce flux nécessite une identification."
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "S'abonner"
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr "D'autres flux"
 
-#: classes/feeds.php:1057 classes/feeds.php:1148 classes/pref/users.php:350
-#: classes/pref/filters.php:641 classes/pref/feeds.php:1258 js/tt-rss.js:170
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
+#: classes/pref/users.php:350
+#: classes/pref/filters.php:641
+#: classes/pref/feeds.php:1259
+#: js/tt-rss.js:170
 msgid "Search"
 msgstr "Rechercher"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 msgid "Popular feeds"
 msgstr "Flux populaires"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 msgid "Feed archive"
 msgstr "Archive du flux"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 msgid "limit:"
 msgstr "limite :"
 
-#: classes/feeds.php:1088 classes/pref/users.php:376
-#: classes/pref/labels.php:284 classes/pref/filters.php:398
-#: classes/pref/filters.php:667 classes/pref/feeds.php:706
+#: classes/feeds.php:1075
+#: classes/pref/users.php:376
+#: classes/pref/labels.php:284
+#: classes/pref/filters.php:398
+#: classes/pref/filters.php:667
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Supprimer"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr "Rechercher"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Restreindre la recherche à :"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Ce flux"
 
 #: classes/backend.php:33
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-"D'autres astuces sur l'interface sont disponibles sur le wiki de Tiny Tiny "
-"RSS."
+msgstr "D'autres astuces sur l'interface sont disponibles sur le wiki de Tiny Tiny RSS."
 
 #: classes/backend.php:38
 msgid "Keyboard Shortcuts"
@@ -1713,7 +1715,8 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Sujet non trouvé dans l'aide."
 
-#: classes/opml.php:28 classes/opml.php:33
+#: classes/opml.php:28
+#: classes/opml.php:33
 msgid "OPML Utility"
 msgstr "Outil OPML"
 
@@ -1763,11 +1766,13 @@ msgstr "Placer dans la catégorie : %s"
 msgid "Error: please upload OPML file."
 msgstr "Erreur : veuillez envoyer un document OPML."
 
-#: classes/opml.php:475 plugins/googlereaderimport/init.php:161
+#: classes/opml.php:475
+#: plugins/googlereaderimport/init.php:161
 msgid "Error while parsing document."
 msgstr "Erreur lors de l'analyse du document."
 
-#: classes/pref/users.php:6 plugins/instances/init.php:157
+#: classes/pref/users.php:6
+#: plugins/instances/init.php:157
 msgid "Your access level is insufficient to open this tab."
 msgstr "Vous n'avez pas les permissions nécessaires pour ouvrir cet onglet."
 
@@ -1779,7 +1784,8 @@ msgstr "Détails de l'utilisateur"
 msgid "User not found"
 msgstr "Utilisateur non trouvé"
 
-#: classes/pref/users.php:60 classes/pref/users.php:422
+#: classes/pref/users.php:60
+#: classes/pref/users.php:422
 msgid "Registered"
 msgstr "Inscrit"
 
@@ -1807,8 +1813,9 @@ msgstr "Permissions : "
 msgid "Change password to"
 msgstr "Nouveau mot de passe"
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/users.php:177
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Options"
 
@@ -1845,6 +1852,21 @@ msgstr "Envoi du mot de passe de <b>%s</b> à <b>%s</b>"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notification de changement de mot passe"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "Sélectionner"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Créer l'utilisateur"
@@ -1853,7 +1875,8 @@ msgstr "Créer l'utilisateur"
 msgid "Details"
 msgstr "Détails"
 
-#: classes/pref/users.php:374 classes/pref/filters.php:660
+#: classes/pref/users.php:374
+#: classes/pref/filters.php:660
 #: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "Modifier"
@@ -1866,7 +1889,8 @@ msgstr "Permissions"
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: classes/pref/users.php:444 plugins/instances/init.php:337
+#: classes/pref/users.php:444
+#: plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "Cliquer pour modifier"
 
@@ -1878,7 +1902,8 @@ msgstr "Aucun utilisateur défini."
 msgid "No matching users found."
 msgstr "Aucun utilisateur correspondant trouvé."
 
-#: classes/pref/labels.php:22 classes/pref/filters.php:268
+#: classes/pref/labels.php:22
+#: classes/pref/filters.php:268
 #: classes/pref/filters.php:725
 msgid "Caption"
 msgstr "Légende"
@@ -1913,40 +1938,44 @@ msgid "No recent articles matching this filter have been found."
 msgstr "Aucun article récent correspondant à ce filtre."
 
 #: classes/pref/filters.php:137
-msgid ""
-"Complex expressions might not give results while testing due to issues with "
-"database server regexp implementation."
-msgstr ""
-"Les expressions complexes risquent de ne pas avoir de résulats dans les "
-"tests à cause de problèmes avec le serveur."
+msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
+msgstr "Les expressions complexes risquent de ne pas avoir de résulats dans les tests à cause de problèmes avec le serveur."
 
-#: classes/pref/filters.php:274 classes/pref/filters.php:729
+#: classes/pref/filters.php:274
+#: classes/pref/filters.php:729
 #: classes/pref/filters.php:844
 msgid "Match"
 msgstr "Correspondance"
 
-#: classes/pref/filters.php:288 classes/pref/filters.php:336
-#: classes/pref/filters.php:743 classes/pref/filters.php:770
+#: classes/pref/filters.php:288
+#: classes/pref/filters.php:336
+#: classes/pref/filters.php:743
+#: classes/pref/filters.php:770
 msgid "Add"
 msgstr "Ajouter"
 
-#: classes/pref/filters.php:322 classes/pref/filters.php:756
+#: classes/pref/filters.php:322
+#: classes/pref/filters.php:756
 msgid "Apply actions"
 msgstr "Actions éffectuées"
 
-#: classes/pref/filters.php:372 classes/pref/filters.php:785
+#: classes/pref/filters.php:372
+#: classes/pref/filters.php:785
 msgid "Enabled"
 msgstr "Activé"
 
-#: classes/pref/filters.php:381 classes/pref/filters.php:788
+#: classes/pref/filters.php:381
+#: classes/pref/filters.php:788
 msgid "Match any rule"
 msgstr "Au moins une correspondance"
 
-#: classes/pref/filters.php:390 classes/pref/filters.php:791
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:791
 msgid "Inverse matching"
 msgstr "Correspondance inverse"
 
-#: classes/pref/filters.php:402 classes/pref/filters.php:798
+#: classes/pref/filters.php:402
+#: classes/pref/filters.php:798
 msgid "Test"
 msgstr "Test"
 
@@ -1963,12 +1992,14 @@ msgstr "%s sur %s dans %s %s"
 msgid "Combine"
 msgstr "Comhiner"
 
-#: classes/pref/filters.php:663 classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/filters.php:663
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 msgid "Reset sort order"
 msgstr "Réinitialiser le critère de tri"
 
-#: classes/pref/filters.php:671 classes/pref/feeds.php:1317
+#: classes/pref/filters.php:671
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Recalculer le score des articles"
 
@@ -1984,7 +2015,8 @@ msgstr "Inverser le résultat de l'expression rationnelle"
 msgid "on field"
 msgstr "sur le champ"
 
-#: classes/pref/filters.php:864 js/PrefFilterTree.js:45
+#: classes/pref/filters.php:864
+#: js/PrefFilterTree.js:45
 #: plugins/digest/digest.js:242
 msgid "in"
 msgstr "dans"
@@ -1993,7 +2025,8 @@ msgstr "dans"
 msgid "Save rule"
 msgstr "Enregistrer"
 
-#: classes/pref/filters.php:877 js/functions.js:1063
+#: classes/pref/filters.php:877
+#: js/functions.js:1063
 msgid "Add rule"
 msgstr "Ajouter une règle"
 
@@ -2009,11 +2042,12 @@ msgstr "avec les paramètres :"
 msgid "Save action"
 msgstr "Enregistrer"
 
-#: classes/pref/filters.php:944 js/functions.js:1089
+#: classes/pref/filters.php:944
+#: js/functions.js:1089
 msgid "Add action"
 msgstr "Ajouter une action"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 msgid "[No caption]"
 msgstr "[Pas de titre]"
 
@@ -2076,9 +2110,7 @@ msgstr "Votre mot de passe est celui par défaut, veuillez le modifier."
 
 #: classes/pref/prefs.php:236
 msgid "Changing your current password will disable OTP."
-msgstr ""
-"Changer votre mot de passe actuel désactivera les mots de passe à usage "
-"unique."
+msgstr "Changer votre mot de passe actuel désactivera les mots de passe à usage unique."
 
 #: classes/pref/prefs.php:241
 msgid "Old password"
@@ -2101,14 +2133,11 @@ msgid "One time passwords / Authenticator"
 msgstr "Mots de passe à usage unique / Identificateur"
 
 #: classes/pref/prefs.php:269
-msgid ""
-"One time passwords are currently enabled. Enter your current password below "
-"to disable."
-msgstr ""
-"Les mots de passe à usage unique sont actuellement activés. Entrez votre mot "
-"de passe actuel ci-dessous pour les désactiver."
+msgid "One time passwords are currently enabled. Enter your current password below to disable."
+msgstr "Les mots de passe à usage unique sont actuellement activés. Entrez votre mot de passe actuel ci-dessous pour les désactiver."
 
-#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
+#: classes/pref/prefs.php:294
+#: classes/pref/prefs.php:345
 msgid "Enter your password"
 msgstr "Entrez votre mot de passe"
 
@@ -2117,12 +2146,8 @@ msgid "Disable OTP"
 msgstr "Désactiver les mots de passe à usage unique"
 
 #: classes/pref/prefs.php:311
-msgid ""
-"You will need a compatible Authenticator to use this. Changing your password "
-"would automatically disable OTP."
-msgstr ""
-"Vous aurez besoin d'un Identificateur compatible pour utiliser ceci. Changer "
-"votre mot de passe le désactivera automatiquement."
+msgid "You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP."
+msgstr "Vous aurez besoin d'un Identificateur compatible pour utiliser ceci. Changer votre mot de passe le désactivera automatiquement."
 
 #: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
@@ -2130,8 +2155,7 @@ msgstr "Scanner le code suivant avec l'application identificateur :"
 
 #: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
-msgstr ""
-"J'ai scanné le code et je veux activer les mots de passe à usage unique"
+msgstr "J'ai scanné le code et je veux activer les mots de passe à usage unique"
 
 #: classes/pref/prefs.php:362
 msgid "Enable OTP"
@@ -2170,54 +2194,50 @@ msgstr "Gérer les profils"
 msgid "Reset to defaults"
 msgstr "Revenir aux valeurs par défaut"
 
-#: classes/pref/prefs.php:631 classes/pref/prefs.php:633
+#: classes/pref/prefs.php:631
+#: classes/pref/prefs.php:633
 msgid "Plugins"
 msgstr "Plugins"
 
 #: classes/pref/prefs.php:635
-msgid ""
-"You will need to reload Tiny Tiny RSS for plugin changes to take effect."
-msgstr ""
-"Vous devrez relancer Tiny Tiny RSS pour que les changements apportés aux "
-"plugins prennent effet."
+msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
+msgstr "Vous devrez relancer Tiny Tiny RSS pour que les changements apportés aux plugins prennent effet."
 
 #: classes/pref/prefs.php:637
-msgid ""
-"Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank"
-"\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a "
-"target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins"
-"\">wiki</a>."
-msgstr ""
-"Téléchargez plus de plugins sur <a class=\"visibleLink\" target=\"_blank\" "
-"href=\"http://tt-rss.org/forum/viewforum.php?f=22\">le forum</a> ou <a "
-"target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins"
-"\">le wiki</a> de Tiny Tiny RSS."
+msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+msgstr "Téléchargez plus de plugins sur <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">le forum</a> ou <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">le wiki</a> de Tiny Tiny RSS."
 
 #: classes/pref/prefs.php:663
 msgid "System plugins"
 msgstr "Plugins systèmes"
 
-#: classes/pref/prefs.php:667 classes/pref/prefs.php:721
+#: classes/pref/prefs.php:667
+#: classes/pref/prefs.php:721
 msgid "Plugin"
 msgstr "Plugin"
 
-#: classes/pref/prefs.php:668 classes/pref/prefs.php:722
+#: classes/pref/prefs.php:668
+#: classes/pref/prefs.php:722
 msgid "Description"
 msgstr "Description"
 
-#: classes/pref/prefs.php:669 classes/pref/prefs.php:723
+#: classes/pref/prefs.php:669
+#: classes/pref/prefs.php:723
 msgid "Version"
 msgstr "Version"
 
-#: classes/pref/prefs.php:670 classes/pref/prefs.php:724
+#: classes/pref/prefs.php:670
+#: classes/pref/prefs.php:724
 msgid "Author"
 msgstr "Auteur"
 
-#: classes/pref/prefs.php:699 classes/pref/prefs.php:756
+#: classes/pref/prefs.php:699
+#: classes/pref/prefs.php:756
 msgid "more info"
 msgstr "plus d'info"
 
-#: classes/pref/prefs.php:708 classes/pref/prefs.php:765
+#: classes/pref/prefs.php:708
+#: classes/pref/prefs.php:765
 msgid "Clear data"
 msgstr "Purger les données"
 
@@ -2229,270 +2249,272 @@ msgstr "Plugins utilisateur"
 msgid "Enable selected plugins"
 msgstr "Activer les plugins sélectionnés"
 
-#: classes/pref/prefs.php:835 classes/pref/prefs.php:853
+#: classes/pref/prefs.php:835
+#: classes/pref/prefs.php:853
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr "Vous pouvez redéfinir les couleurs, les polices et la mise en page du thème actuellement sélectionné à l'aide de vos propres instructions CSS ici. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Ce fichier</a> peut être utilisé comme base de départ."
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr "Création d'un profil"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr "(actif)"
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr "Supprimer les profils sélectionnés"
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr "Activer le profil"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "Cocher pour activer le champ"
 
-#: classes/pref/feeds.php:60 classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250 classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d flux)"
-msgstr[1] "(%d flux)"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Titre du flux"
 
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: classes/pref/feeds.php:582 classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "Purge des articles :"
 
-#: classes/pref/feeds.php:605
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
-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:606
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+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:621 classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 msgid "Hide from Popular feeds"
 msgstr "Masquer dans la liste des flux populaires"
 
-#: classes/pref/feeds.php:633 classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: classes/pref/feeds.php:646 classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "Toujours afficher les images jointes"
 
-#: classes/pref/feeds.php:659 classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr "Ne pas intégrer les images"
 
-#: classes/pref/feeds.php:672 classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "Enregistrer localement les images"
 
-#: classes/pref/feeds.php:684 classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 msgid "Mark updated articles as unread"
 msgstr "Marquer les article mis à jour comme non lus"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr "Icône"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr "Remplacer"
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 msgid "Resubscribe to push updates"
 msgstr "Réinscription aux mises à jour en push"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 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."
+msgstr "Réinitialiser l'état de l'inscription PubSubHubbub pour les flux en mise à jour push."
 
-#: classes/pref/feeds.php:1111 classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Tout est terminé."
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 msgid "Feeds with errors"
 msgstr "Flux avec des erreurs"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 msgid "Inactive feeds"
 msgstr "Flux inactifs"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 msgid "Edit selected feeds"
 msgstr "Modifier les flux sélectionnés"
 
-#: classes/pref/feeds.php:1280 js/prefs.js:1770
+#: classes/pref/feeds.php:1281
+#: js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr "Abonnement par lots"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 msgid "Categories"
 msgstr "Catégories"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 msgid "Add category"
 msgstr "Ajouter une catégorie"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 msgid "(Un)hide empty categories"
 msgstr "Masquer/afficher les catégories vides"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 msgid "Remove selected"
 msgstr "Supprimer les flux sélectionnés"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 msgid "More actions..."
 msgstr "Autres actions..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-"Avec OPML, vous pouvez exporter et importer vos flux, filtrer, étiquettes et "
-"réglages de Tiny Tiny RSS."
+#: classes/pref/feeds.php:1370
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Avec OPML, vous pouvez exporter et importer vos flux, filtrer, étiquettes et réglages de Tiny Tiny RSS."
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-"Seul le profil de réglages principal peut être migré en utilisant OPML."
+msgstr "Seul le profil de réglages principal peut être migré en utilisant OPML."
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 msgid "Import my OPML"
 msgstr "Importer mon OPML"
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 msgid "Include settings"
 msgstr "Inclure les paramètres"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: classes/pref/feeds.php:1398
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Votre fichier OPML peut être publié et toute personne qui connaît l'adresse "
-"indiquée ci-dessous peut s'y abonner."
+#: classes/pref/feeds.php:1399
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Votre fichier OPML peut être publié et toute personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
 
-#: classes/pref/feeds.php:1400
-msgid ""
-"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
-"require authentication or feeds hidden from Popular feeds."
-msgstr ""
-"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:1401
+msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
+msgstr "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:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr "URL OPML publique"
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr "Afficher l'URL de l'OPML public"
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 msgid "Firefox integration"
 msgstr "Intégration à Firefox"
 
-#: classes/pref/feeds.php:1415
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-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:1416
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+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:1422
+#: classes/pref/feeds.php:1423
 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:1430
+#: classes/pref/feeds.php:1431
 msgid "Published & shared articles / Generated feeds"
 msgstr "Articles publiés et partagés / Flux générés"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 msgid "Published articles and generated feeds"
 msgstr "Articles publiés et flux générés"
 
-#: classes/pref/feeds.php:1434
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-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:1435
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+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:1440
+#: classes/pref/feeds.php:1441
 msgid "Display URL"
 msgstr "Afficher l'URL"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr "Supprimer toutes les URL générées"
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 msgid "Articles shared by URL"
 msgstr "Articles publiés par URL"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 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:1450
+#: classes/pref/feeds.php:1451
 msgid "Unshare all articles"
 msgstr "Désactiver le partage pour tous les articles"
 
-#: classes/pref/feeds.php:1528
-msgid ""
-"These feeds have not been updated with new content for 3 months (oldest "
-"first):"
-msgstr ""
-"Les flux suivants n'ont pas été mis à jour depuis 3 mois (par âge "
-"décroissant) :"
+#: classes/pref/feeds.php:1529
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "Les flux suivants n'ont pas été mis à jour depuis 3 mois (par âge décroissant) :"
 
-#: classes/pref/feeds.php:1565 classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 msgid "Click to edit feed"
 msgstr "Cliquez pour modifier le flux"
 
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 msgid "Unsubscribe from selected feeds"
 msgstr "Se désabonner des flux sélectionnés"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs :"
 
+#: classes/pref/feeds.php:1758
+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/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr "Flux auxquels s'abonner, un par ligne"
+
+#: classes/pref/feeds.php:1789
+msgid "Feeds require authentication."
+msgstr "Les flux requièrent une identification."
+
 #: plugins/digest/digest_body.php:59
-msgid ""
-"Your browser doesn't support Javascript, which is required for this "
-"application to function properly. Please check your browser settings."
-msgstr ""
-"Votre navigateur ne gère pas JavaScript, alors que c'est nécessaire pour le "
-"bon fonctionnement de ce logiciel. Veuillez modifier la configuration de "
-"votre navigateur."
+msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
+msgstr "Votre navigateur ne gère pas JavaScript, alors que c'est nécessaire pour le bon fonctionnement de ce logiciel. Veuillez modifier la configuration de votre navigateur."
 
 #: plugins/digest/digest_body.php:74
 msgid "Hello,"
@@ -2506,7 +2528,8 @@ msgstr "Version ordinateur"
 msgid "Close article"
 msgstr "Fermer l'article"
 
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+#: plugins/nsfw/init.php:32
+#: plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr "Non convenable au travail (cliquer pour basculer)"
 
@@ -2516,8 +2539,7 @@ msgstr "Plugin NSFW"
 
 #: plugins/nsfw/init.php:80
 msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
-"Tags à considérer non convenables au travail (séparés par des virgules)"
+msgstr "Tags à considérer non convenables au travail (séparés par des virgules)"
 
 #: plugins/nsfw/init.php:101
 msgid "Configuration saved."
@@ -2540,7 +2562,8 @@ msgstr "L'ancien mot de passe n'est pas correct."
 #: plugins/mobile/mobile-functions.php:173
 #: plugins/mobile/mobile-functions.php:200
 #: plugins/mobile/mobile-functions.php:236
-#: plugins/mobile/mobile-functions.php:373 plugins/mobile/prefs.php:29
+#: plugins/mobile/mobile-functions.php:373
+#: plugins/mobile/prefs.php:29
 msgid "Home"
 msgstr "Accueil"
 
@@ -2556,15 +2579,21 @@ msgstr "Version ordinateur"
 msgid "Enable categories"
 msgstr "Utiliser les catégories de flux"
 
-#: plugins/mobile/prefs.php:35 plugins/mobile/prefs.php:40
-#: plugins/mobile/prefs.php:46 plugins/mobile/prefs.php:51
-#: plugins/mobile/prefs.php:56 plugins/mobile/prefs.php:61
+#: plugins/mobile/prefs.php:35
+#: plugins/mobile/prefs.php:40
+#: plugins/mobile/prefs.php:46
+#: plugins/mobile/prefs.php:51
+#: plugins/mobile/prefs.php:56
+#: plugins/mobile/prefs.php:61
 msgid "ON"
 msgstr "Activé"
 
-#: plugins/mobile/prefs.php:35 plugins/mobile/prefs.php:40
-#: plugins/mobile/prefs.php:46 plugins/mobile/prefs.php:51
-#: plugins/mobile/prefs.php:56 plugins/mobile/prefs.php:61
+#: plugins/mobile/prefs.php:35
+#: plugins/mobile/prefs.php:40
+#: plugins/mobile/prefs.php:46
+#: plugins/mobile/prefs.php:51
+#: plugins/mobile/prefs.php:56
+#: plugins/mobile/prefs.php:61
 msgid "OFF"
 msgstr "Désactivé"
 
@@ -2584,12 +2613,15 @@ msgstr "Cacher les articles et flux lus"
 msgid "Sort feeds by unread count"
 msgstr "Trier les flux par nombre d'articles non lus"
 
-#: plugins/mailto/init.php:52 plugins/mailto/init.php:58
-#: plugins/mail/init.php:71 plugins/mail/init.php:77
+#: plugins/mailto/init.php:52
+#: plugins/mailto/init.php:58
+#: plugins/mail/init.php:71
+#: plugins/mail/init.php:77
 msgid "[Forwarded]"
 msgstr "[Transféré]"
 
-#: plugins/mailto/init.php:52 plugins/mail/init.php:71
+#: plugins/mailto/init.php:52
+#: plugins/mail/init.php:71
 msgid "Multiple articles"
 msgstr "Articles multiples"
 
@@ -2602,11 +2634,8 @@ msgid "Forward selected article(s) by email."
 msgstr "Transférer le ou les article(s) par mail."
 
 #: plugins/mailto/init.php:81
-msgid ""
-"You should be able to edit the message before sending in your mail client."
-msgstr ""
-"Vous devriez pouvoir modifier le message avant son envoi dans votre client "
-"de messagerie."
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Vous devriez pouvoir modifier le message avant son envoi dans votre client de messagerie."
 
 #: plugins/mailto/init.php:86
 msgid "Close this dialog"
@@ -2617,13 +2646,8 @@ msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
 #: plugins/bookmarklets/init.php:24
-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 ""
-"Glissez le lien ci-dessous dans la barre d'outil de votre navigateur, ouvrez "
-"le flux qui vous intéresse et cliquez sur le lien pour vous abonner à ce "
-"flux."
+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 "Glissez le lien ci-dessous dans la barre d'outil de votre navigateur, ouvrez le flux qui vous intéresse et cliquez sur le lien pour vous abonner à ce flux."
 
 #: plugins/bookmarklets/init.php:28
 #, php-format
@@ -2647,12 +2671,8 @@ msgid "Article archive"
 msgstr "Archive"
 
 #: plugins/import_export/init.php:68
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr ""
-"Vous pouvez exporter et importer vos articles remarquables et archivés afin "
-"de les sauvegarder ou pour les transférer entre deux instances de tt-rss."
+msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances."
+msgstr "Vous pouvez exporter et importer vos articles remarquables et archivés afin de les sauvegarder ou pour les transférer entre deux instances de tt-rss."
 
 #: plugins/import_export/init.php:71
 msgid "Export my data"
@@ -2705,12 +2725,8 @@ msgstr "Préparer les données"
 
 #: plugins/import_export/init.php:426
 #, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize in 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)"
+msgid "Could not upload file. You might need to adjust upload_max_filesize in 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)"
 
 #: plugins/mail/init.php:92
 msgid "From:"
@@ -2728,7 +2744,8 @@ msgstr "Sujet :"
 msgid "Send e-mail"
 msgstr "Envoyer le mail"
 
-#: plugins/note/init.php:28 plugins/note/note.js:11
+#: plugins/note/init.php:28
+#: plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Modifier l'annotation de l'article"
 
@@ -2763,9 +2780,7 @@ msgstr "Importer les articles marqués ou partagés de Google Reader"
 
 #: plugins/googlereaderimport/init.php:330
 msgid "Paste your starred.json or shared.json into the form below."
-msgstr ""
-"Collez votre fichier starred.json ou shared.json dans le formulaire ci-"
-"dessous."
+msgstr "Collez votre fichier starred.json ou shared.json dans le formulaire ci-dessous."
 
 #: plugins/googlereaderimport/init.php:344
 msgid "Import my Starred items"
@@ -2775,17 +2790,45 @@ msgstr "Importer mes éléments partagés"
 msgid "Linked"
 msgstr "Instances liées"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr "Instance"
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr "URL de l'instance"
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+msgid "Access key:"
+msgstr "Clef d'accès :"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+msgid "Access key"
+msgstr "Clef d'accès"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr "Utilisez une clef d'accès pour les deux instances liées."
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+msgid "Generate new key"
+msgstr "Générer une nouvelle clef"
+
 #: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "Lier une instance"
 
 #: plugins/instances/init.php:307
-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 :"
+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 :"
 
 #: plugins/instances/init.php:317
 msgid "Last connected"
@@ -2799,6 +2842,10 @@ msgstr "Etat"
 msgid "Stored feeds"
 msgstr "Flux stockés"
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr "Créer un lien"
+
 #: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "Partager par URL"
@@ -2807,7 +2854,8 @@ msgstr "Partager par URL"
 msgid "You can share this article by the following unique URL:"
 msgstr "Vous pouvez partager cet article avec l'URL unique suivante :"
 
-#: plugins/updater/init.php:317 plugins/updater/init.php:334
+#: plugins/updater/init.php:317
+#: plugins/updater/init.php:334
 #: plugins/updater/updater.js:10
 msgid "Update Tiny Tiny RSS"
 msgstr "Mettre à jour Tiny Tiny RSS"
@@ -2817,12 +2865,8 @@ msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Votre installation de Tiny Tiny RSS est à jour."
 
 #: plugins/updater/init.php:347
-msgid ""
-"Do not close this dialog until updating is finished. Backup your tt-rss "
-"directory before continuing."
-msgstr ""
-"Ne fermez pas ce dialogue avant que la mise à jour soit terminée. Veuillez "
-"sauvegarder votre dossier tt-rss avant de continuer."
+msgid "Do not close this dialog until updating is finished. Backup your tt-rss directory before continuing."
+msgstr "Ne fermez pas ce dialogue avant que la mise à jour soit terminée. Veuillez sauvegarder votre dossier tt-rss avant de continuer."
 
 #: plugins/updater/init.php:350
 msgid "Ready to update."
@@ -2832,30 +2876,27 @@ msgstr "Prêt à mettre à jour."
 msgid "Start update"
 msgstr "Commencer la mise à jour"
 
-#: js/feedlist.js:442 js/feedlist.js:470 plugins/digest/digest.js:26
+#: js/feedlist.js:404
+#: js/feedlist.js:432
+#: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Marquer tous les articles de %s âgés d'au moins 1 jour comme lus ?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Marquer tous les articles de %s âgés d'au moins 1 semaine comme lus ?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Marquer tous les articles de %s âgés d'au moins 2 semaines comme lus ?"
 
 #: js/functions.js:92
-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."
+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:214
 msgid "close"
@@ -2946,18 +2987,15 @@ msgid "Create Filter"
 msgstr "Créer un filtre"
 
 #: js/functions.js:1241
-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."
+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:1252
 msgid "Subscription reset."
 msgstr "Abonnement réinitialisé."
 
-#: js/functions.js:1262 js/tt-rss.js:619
+#: js/functions.js:1262
+#: js/tt-rss.js:619
 msgid "Unsubscribe from %s?"
 msgstr "Se désabonner de %s ?"
 
@@ -2973,11 +3011,14 @@ msgstr "Veuillez saisir un titre pour cette catégorie :"
 msgid "Generate new syndication address for this feed?"
 msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
 
-#: js/functions.js:1408 js/prefs.js:1222
+#: js/functions.js:1408
+#: js/prefs.js:1222
 msgid "Trying to change address..."
 msgstr "Changement de l'adresse..."
 
-#: js/functions.js:1595 js/tt-rss.js:396 js/tt-rss.js:600
+#: js/functions.js:1595
+#: js/tt-rss.js:396
+#: js/tt-rss.js:600
 msgid "You can't edit this kind of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 
@@ -2985,7 +3026,9 @@ msgstr "Vous ne pouvez pas modifier ce type de flux."
 msgid "Edit Feed"
 msgstr "Modifier le flux"
 
-#: js/functions.js:1616 js/prefs.js:194 js/prefs.js:749
+#: js/functions.js:1616
+#: js/prefs.js:194
+#: js/prefs.js:749
 msgid "Saving data..."
 msgstr "Enregistrement des données..."
 
@@ -2993,29 +3036,33 @@ msgstr "Enregistrement des données..."
 msgid "More Feeds"
 msgstr "D'autres flux"
 
-#: js/functions.js:1709 js/functions.js:1819 js/prefs.js:397 js/prefs.js:427
-#: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1198
+#: js/functions.js:1709
+#: js/functions.js:1819
+#: js/prefs.js:397
+#: js/prefs.js:427
+#: js/prefs.js:459
+#: js/prefs.js:642
+#: js/prefs.js:662
+#: js/prefs.js:1198
 #: js/prefs.js:1343
 msgid "No feeds are selected."
 msgstr "Aucun flux sélectionné."
 
 #: js/functions.js:1751
-msgid ""
-"Remove selected feeds from the archive? Feeds with stored articles will not "
-"be removed."
-msgstr ""
-"Supprimer les flux sélectionnés de l'archive ? Les flux contenant des "
-"articles stockés ne seront pas supprimés."
+msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
+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:1790
 msgid "Feeds with update errors"
 msgstr "Flux avec des erreurs de mise à jour"
 
-#: js/functions.js:1801 js/prefs.js:1180
+#: js/functions.js:1801
+#: js/prefs.js:1180
 msgid "Remove selected feeds?"
 msgstr "Supprimer les flux sélectionnés ?"
 
-#: js/functions.js:1804 js/prefs.js:1183
+#: js/functions.js:1804
+#: js/prefs.js:1183
 msgid "Removing selected feeds..."
 msgstr "Suppression des flux sélectionnés..."
 
@@ -3041,8 +3088,7 @@ msgstr "Veuillez saisir l'identifiant :"
 
 #: js/prefs.js:62
 msgid "Can't create user: no login specified."
-msgstr ""
-"Impossible de créer l'utilisateur : aucun identifiant n'a été spécifié."
+msgstr "Impossible de créer l'utilisateur : aucun identifiant n'a été spécifié."
 
 #: js/prefs.js:66
 msgid "Adding user..."
@@ -3068,23 +3114,23 @@ msgstr "Supprimer les étiquettes sélectionnées ?"
 msgid "Removing selected labels..."
 msgstr "Suppression des étiquettes sélectionnées..."
 
-#: js/prefs.js:295 js/prefs.js:1384
+#: js/prefs.js:295
+#: js/prefs.js:1384
 msgid "No labels are selected."
 msgstr "Aucune étiquette sélectionnée."
 
 #: js/prefs.js:309
-msgid ""
-"Remove selected users? Neither default admin nor your account will be "
-"removed."
-msgstr ""
-"Supprimer les utilisateurs sélectionnés ? L'administrateur par défaut et "
-"votre compte utilisateur ne seront pas supprimés."
+msgid "Remove selected users? Neither default admin nor your account will be removed."
+msgstr "Supprimer les utilisateurs sélectionnés ? L'administrateur par défaut et votre compte utilisateur ne seront pas supprimés."
 
 #: js/prefs.js:312
 msgid "Removing selected users..."
 msgstr "Suppression des utilisateurs sélectionnés..."
 
-#: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567
+#: js/prefs.js:326
+#: js/prefs.js:507
+#: js/prefs.js:528
+#: js/prefs.js:567
 msgid "No users are selected."
 msgstr "Aucun utilisateur sélectionné."
 
@@ -3096,7 +3142,9 @@ msgstr "Supprimer les filtres sélectionnés ?"
 msgid "Removing selected filters..."
 msgstr "Suppression des filtres sélectionnés..."
 
-#: js/prefs.js:359 js/prefs.js:597 js/prefs.js:616
+#: js/prefs.js:359
+#: js/prefs.js:597
+#: js/prefs.js:616
 msgid "No filters are selected."
 msgstr "Aucun filtre sélectionné."
 
@@ -3114,8 +3162,7 @@ msgstr "Veuillez sélectionner un seul flux."
 
 #: js/prefs.js:418
 msgid "Erase all non-starred articles in selected feed?"
-msgstr ""
-"Supprimer tous les articles non-remarquables dans le flux sélectionné ?"
+msgstr "Supprimer tous les articles non-remarquables dans le flux sélectionné ?"
 
 #: js/prefs.js:421
 msgid "Clearing selected feed..."
@@ -3123,9 +3170,7 @@ msgstr "Nettoyage du flux sélectionné..."
 
 #: js/prefs.js:440
 msgid "How many days of articles to keep (0 - use default)?"
-msgstr ""
-"Combien de jours faut-il conserver les articles (0 pour utiliser la valeur "
-"par défaut) ?"
+msgstr "Combien de jours faut-il conserver les articles (0 pour utiliser la valeur par défaut) ?"
 
 #: js/prefs.js:443
 msgid "Purging selected feed..."
@@ -3139,7 +3184,9 @@ msgstr "L'identifiant ne peut pas être vide."
 msgid "Saving user..."
 msgstr "Sauvegarde de l'utilisateur..."
 
-#: js/prefs.js:512 js/prefs.js:533 js/prefs.js:572
+#: js/prefs.js:512
+#: js/prefs.js:533
+#: js/prefs.js:572
 msgid "Please select only one user."
 msgstr "Veuillez sélectionner un seul utilisateur."
 
@@ -3179,7 +3226,8 @@ msgstr "Import OPML"
 msgid "Please choose an OPML file first."
 msgstr "Veuillez d'abord sélectionner un fichier OPML."
 
-#: js/prefs.js:815 plugins/import_export/import_export.js:115
+#: js/prefs.js:815
+#: plugins/import_export/import_export.js:115
 #: plugins/googlereaderimport/init.js:45
 msgid "Importing, please wait..."
 msgstr "Import en cours, veuillez patienter..."
@@ -3189,11 +3237,8 @@ msgid "Reset to defaults?"
 msgstr "Revenir aux valeurs par défaut ?"
 
 #: js/prefs.js:1087
-msgid ""
-"Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr ""
-"Supprimer la categorie %s ? Tous les flux enfants seront placés dans Sans "
-"catégorie."
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr "Supprimer la categorie %s ? Tous les flux enfants seront placés dans Sans catégorie."
 
 #: js/prefs.js:1093
 msgid "Removing category..."
@@ -3241,9 +3286,7 @@ msgstr "Recalcul du score des flux sélectionnés..."
 
 #: js/prefs.js:1350
 msgid "Rescore all articles? This operation may take a lot of time."
-msgstr ""
-"Recalculer le score de tous les articles ? Cette opération peut prendre "
-"beaucoup de temps."
+msgstr "Recalculer le score de tous les articles ? Cette opération peut prendre beaucoup de temps."
 
 #: js/prefs.js:1353
 msgid "Rescoring feeds..."
@@ -3258,11 +3301,8 @@ msgid "Settings Profiles"
 msgstr "Paramètres des profils"
 
 #: js/prefs.js:1416
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-"Supprimer les profils sélectionnés ? Les profils actifs et par défaut ne "
-"seront pas supprimés."
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr "Supprimer les profils sélectionnés ? Les profils actifs et par défaut ne seront pas supprimés."
 
 #: js/prefs.js:1419
 msgid "Removing selected profiles..."
@@ -3272,11 +3312,13 @@ msgstr "Suppression des profils sélectionnés..."
 msgid "No profiles are selected."
 msgstr "Aucun profil sélectionné."
 
-#: js/prefs.js:1442 js/prefs.js:1495
+#: js/prefs.js:1442
+#: js/prefs.js:1495
 msgid "Activate selected profile?"
 msgstr "Activer le profil selectionné ?"
 
-#: js/prefs.js:1458 js/prefs.js:1511
+#: js/prefs.js:1458
+#: js/prefs.js:1511
 msgid "Please choose a profile to activate."
 msgstr "Veuillez sélectionner un profil à activer."
 
@@ -3286,11 +3328,10 @@ msgstr "Création d'un profil..."
 
 #: js/prefs.js:1519
 msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr ""
-"Ceci va invalider toutes les URL de flux générées auparavant. Souhaitez-vous "
-"continuer ?"
+msgstr "Ceci va invalider toutes les URL de flux générées auparavant. Souhaitez-vous continuer ?"
 
-#: js/prefs.js:1522 js/prefs.js:1541
+#: js/prefs.js:1522
+#: js/prefs.js:1541
 msgid "Clearing URLs..."
 msgstr "Nettoyage des URL..."
 
@@ -3300,9 +3341,7 @@ msgstr "URL générées supprimées."
 
 #: js/prefs.js:1538
 msgid "This will invalidate all previously shared article URLs. Continue?"
-msgstr ""
-"Ceci va invalider tous les articles partagés par URL. Souhaitez-vous "
-"continuer ?"
+msgstr "Ceci va invalider tous les articles partagés par URL. Souhaitez-vous continuer ?"
 
 #: js/prefs.js:1548
 msgid "Shared URLs cleared."
@@ -3344,7 +3383,8 @@ msgstr "Sélectionner des éléments par tags"
 msgid "You can't unsubscribe from the category."
 msgstr "Vous ne pouvez pas vous désabonner de la catégorie."
 
-#: js/tt-rss.js:613 js/tt-rss.js:765
+#: js/tt-rss.js:613
+#: js/tt-rss.js:765
 msgid "Please select some feed first."
 msgstr "Veuillez d'abord sélectionner un flux."
 
@@ -3368,24 +3408,34 @@ msgstr "Une nouvelle version est disponible !"
 msgid "Cancel search"
 msgstr "Annuler la recherche"
 
-#: js/viewfeed.js:440 plugins/digest/digest.js:258
+#: js/viewfeed.js:440
+#: plugins/digest/digest.js:258
 #: plugins/digest/digest.js:714
 msgid "Unstar article"
 msgstr "Ne plus marquer comme remarquable"
 
-#: js/viewfeed.js:445 plugins/digest/digest.js:260
+#: js/viewfeed.js:445
+#: plugins/digest/digest.js:260
 #: plugins/digest/digest.js:718
 msgid "Star article"
 msgstr "Marquer comme remarquable"
 
-#: js/viewfeed.js:478 plugins/digest/digest.js:263
+#: js/viewfeed.js:478
+#: plugins/digest/digest.js:263
 #: plugins/digest/digest.js:749
 msgid "Unpublish article"
 msgstr "Ne plus publier l'article"
 
-#: js/viewfeed.js:679 js/viewfeed.js:707 js/viewfeed.js:734 js/viewfeed.js:797
-#: js/viewfeed.js:831 js/viewfeed.js:951 js/viewfeed.js:994
-#: js/viewfeed.js:1047 js/viewfeed.js:2096 plugins/mailto/init.js:7
+#: js/viewfeed.js:679
+#: js/viewfeed.js:707
+#: js/viewfeed.js:734
+#: js/viewfeed.js:797
+#: js/viewfeed.js:831
+#: js/viewfeed.js:951
+#: js/viewfeed.js:994
+#: js/viewfeed.js:1047
+#: js/viewfeed.js:2096
+#: plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
@@ -3415,11 +3465,8 @@ msgstr[0] "Restaurer %d article archivé ?"
 msgstr[1] "Restaurer %d articles archivés ?"
 
 #: js/viewfeed.js:1008
-msgid ""
-"Please note that unstarred articles might get purged on next feed update."
-msgstr ""
-"Veuillez noter que les articles non marqués risquent d'être purgés à la "
-"prochaine mise à jour du flux."
+msgid "Please note that unstarred articles might get purged on next feed update."
+msgstr "Veuillez noter que les articles non marqués risquent d'être purgés à la prochaine mise à jour du flux."
 
 #: js/viewfeed.js:1053
 msgid "Mark %d selected article in %s as read?"
@@ -3516,10 +3563,10 @@ msgstr "Charger plus..."
 
 #: plugins/embed_original/init.js:6
 msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-"Malheureusement, votre navigateur ne supporte pas les iframes sécurisées."
+msgstr "Malheureusement, votre navigateur ne supporte pas les iframes sécurisées."
 
-#: plugins/mailto/init.js:21 plugins/mail/mail.js:21
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Transférer l'article par email"
 
@@ -3528,18 +3575,10 @@ msgid "Export Data"
 msgstr "Exporter les données"
 
 #: plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d article. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgid_plural ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr[0] ""
-"Terminé, %d article exporté. Vous pouvez télécharger les données <a "
-"class='visibleLink' href='%u'>ici</a>."
-msgstr[1] ""
-"Terminé, %d articles exportés. Vous pouvez télécharger les données <a "
-"class='visibleLink' href='%u'>ici</a>."
+msgid "Finished, exported %d article. You can download the data <a class='visibleLink' href='%u'>here</a>."
+msgid_plural "Finished, exported %d articles. You can download the data <a class='visibleLink' href='%u'>here</a>."
+msgstr[0] "Terminé, %d article exporté. Vous pouvez télécharger les données <a class='visibleLink' href='%u'>ici</a>."
+msgstr[1] "Terminé, %d articles exportés. Vous pouvez télécharger les données <a class='visibleLink' href='%u'>ici</a>."
 
 #: plugins/import_export/import_export.js:93
 msgid "Data Import"
@@ -3577,7 +3616,8 @@ msgstr "Supprimer les instances sélectionnées ?"
 msgid "Removing selected instances..."
 msgstr "Suppression des instances sélectionnées..."
 
-#: plugins/instances/instances.js:139 plugins/instances/instances.js:151
+#: plugins/instances/instances.js:139
+#: plugins/instances/instances.js:151
 msgid "No instances are selected."
 msgstr "Aucune instance sélectionnée."
 
@@ -3590,12 +3630,13 @@ msgid "Share article by URL"
 msgstr "Partager l'article par URL"
 
 #: plugins/updater/updater.js:58
-msgid ""
-"Live updating is considered experimental. Backup your tt-rss directory "
-"before continuing. Please type 'yes' to continue."
-msgstr ""
-"La mise à jour en direct est expérimentale. Veuillez sauvegarder votre "
-"dossier tt-rss avant de continuer. Tapez « yes » pour continuer."
+msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
+msgstr "La mise à jour en direct est expérimentale. Veuillez sauvegarder votre dossier tt-rss avant de continuer. Tapez « yes » pour continuer."
+
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "(%d flux)"
+#~ msgstr[1] "(%d flux)"
 
 #~ msgid "Notice"
 #~ msgstr "Avertissement"
@@ -3607,8 +3648,7 @@ msgstr ""
 #~ msgstr "Marquer tous les articles visibles de %s comme lus ?"
 
 #~ msgid "Form secret key incorrect. Please enable cookies and try again."
-#~ msgstr ""
-#~ "Clé de formulaire incorecte. Veuillez activer les cookies et réessayer."
+#~ msgstr "Clé de formulaire incorecte. Veuillez activer les cookies et réessayer."
 
 #~ msgid "Date"
 #~ msgstr "Date"
@@ -3623,8 +3663,7 @@ msgstr ""
 #~ msgstr "Activer les options voulues avec les cases à cocher sur la droite:"
 
 #~ msgid "New articles available in this feed (click to show)"
-#~ msgstr ""
-#~ "Nouveaux articles disponibles dans ce flux (cliquer pour les afficher)"
+#~ msgstr "Nouveaux articles disponibles dans ce flux (cliquer pour les afficher)"
 
 #~ msgid "Share on identi.ca"
 #~ msgstr "Partager sur identi.ca"
@@ -3656,12 +3695,8 @@ msgstr ""
 #~ msgid "Back to feeds"
 #~ msgstr "Retour aux flux"
 
-#~ msgid ""
-#~ "This will clear your stored authentication information for Twitter. "
-#~ "Continue?"
-#~ msgstr ""
-#~ "Cela va effacer les informations d'authentification pour Twitter. Voulez-"
-#~ "vous continuer ?"
+#~ msgid "This will clear your stored authentication information for Twitter. Continue?"
+#~ msgstr "Cela va effacer les informations d'authentification pour Twitter. Voulez-vous continuer ?"
 
 #~ msgid "Finished: %d articles processed, %d imported, %d feeds created."
 #~ msgstr "Terminé : %d articles traités, %d importés, %d flux créés."
@@ -3692,8 +3727,7 @@ msgstr ""
 #~ msgstr "Naviguer dans les articles"
 
 #~ msgid "Mark articles below/above active one as read"
-#~ msgstr ""
-#~ "Marquer les articles au-dessous/au-dessus de l'article actif comme lus"
+#~ msgstr "Marquer les articles au-dessous/au-dessus de l'article actif comme lus"
 
 #~ msgid "Scroll article content"
 #~ msgstr "Faire déflier le contenu de l'article"
@@ -3722,12 +3756,8 @@ msgstr ""
 #~ msgid "Focus search (if present)"
 #~ msgstr "Focus sur la recherche (si affichée)"
 
-#~ msgid ""
-#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-#~ "configuration and your access level."
-#~ msgstr ""
-#~ "<b>Note :</b> certaines actions peuvent ne pas être disponibles, selon la "
-#~ "configuration de Tiny Tiny RSS et vos permissions."
+#~ msgid "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS configuration and your access level."
+#~ msgstr "<b>Note :</b> certaines actions peuvent ne pas être disponibles, selon la configuration de Tiny Tiny RSS et vos permissions."
 
 #~ msgid "Open article in new tab"
 #~ msgstr "Ouvrir les articles dans un nouvel onglet"
@@ -3793,9 +3823,7 @@ msgstr ""
 #~ msgstr "S'inscrire via Twitter"
 
 #~ msgid "Could not connect to Twitter. Refresh the page or try again later."
-#~ msgstr ""
-#~ "Impossible de se connecter à Twitter. Rafraichissez la page ou essayez à "
-#~ "nouveau plus tard."
+#~ msgstr "Impossible de se connecter à Twitter. Rafraichissez la page ou essayez à nouveau plus tard."
 
 #~ msgid "Congratulations! You have successfully registered with Twitter."
 #~ msgstr "Félicitation ! Vous vous êtes inscrit via Twitter avec succès."
@@ -3816,8 +3844,7 @@ msgstr ""
 #~ msgstr "Aucune catégorie de flux définie."
 
 #~ msgid "<b>Hint:</b> you can drag feeds and categories around."
-#~ msgstr ""
-#~ "<b>Astuce :</b> vous pouvez faire glisser les flux et les catagories."
+#~ msgstr "<b>Astuce :</b> vous pouvez faire glisser les flux et les catagories."
 
 #~ msgid "Subscribing using bookmarklet"
 #~ msgstr "S'abonner via bookmarklet"
@@ -3825,19 +3852,11 @@ msgstr ""
 #~ msgid "Twitter"
 #~ msgstr "Twitter"
 
-#~ msgid ""
-#~ "Before you can update your Twitter feeds, you must register this instance "
-#~ "of Tiny Tiny RSS with Twitter.com."
-#~ msgstr ""
-#~ "Avant de mettre à jour vos flux Twitter, vous devez enregistrer cette "
-#~ "instance de Tiny Tiny RSS avec Twitter.com."
+#~ msgid "Before you can update your Twitter feeds, you must register this instance of Tiny Tiny RSS with Twitter.com."
+#~ msgstr "Avant de mettre à jour vos flux Twitter, vous devez enregistrer cette instance de Tiny Tiny RSS avec Twitter.com."
 
-#~ msgid ""
-#~ "You have been successfully registered with Twitter.com and should be able "
-#~ "to access your Twitter feeds."
-#~ msgstr ""
-#~ "Vous vous êtes inscrit avec succès sur Twitter.com et vous devriez être "
-#~ "en mesure d'accéder à vos flux Twitter."
+#~ msgid "You have been successfully registered with Twitter.com and should be able to access your Twitter feeds."
+#~ msgstr "Vous vous êtes inscrit avec succès sur Twitter.com et vous devriez être en mesure d'accéder à vos flux Twitter."
 
 #~ msgid "Register with Twitter.com"
 #~ msgstr "S'inscrire sur Twitter.com"
@@ -3854,12 +3873,8 @@ msgstr ""
 #~ msgid "Filter Test Results"
 #~ msgstr "Résultats du test du filtre"
 
-#~ msgid ""
-#~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
-#~ "next feed with unread articles."
-#~ msgstr ""
-#~ "Lorsque vous cliquez sur « Marquer comme lus », le prochain flux "
-#~ "contenant des articles non lus est automatiquement affiché"
+#~ msgid "When \"Mark as read\" button is clicked in toolbar, automatically open next feed with unread articles."
+#~ msgstr "Lorsque vous cliquez sur « Marquer comme lus », le prochain flux contenant des articles non lus est automatiquement affiché"
 
 #~ 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 61062e0f..adb93236 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 d8110024..c37dc884 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: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+0400\n"
 "PO-Revision-Date: 2013-03-26 12:00+0100\n"
 "Last-Translator: Zoltan Faludi <zoltan.faludi@gmail.com>\n"
 "Language-Team: HUNGARIAN\n"
@@ -252,14 +252,14 @@ msgstr "SQL eszképelési teszt sikertelen, ellenőrizze az adatbázis és a PHP
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -304,13 +304,13 @@ msgid "All Articles"
 msgstr "Minden hír"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Csillagozott"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Publikált"
@@ -356,7 +356,7 @@ msgstr "Hírcsatorna megjelölése olvasottként"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -367,8 +367,8 @@ msgid "Mark as read"
 msgstr "Megjelölés olvasottként"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Az összes hír"
 
@@ -427,8 +427,8 @@ msgid "Rescore feed"
 msgstr "Hírcsatorna újrapontozása"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
@@ -454,7 +454,7 @@ msgid "Show tag cloud..."
 msgstr "Címkefelhő megjelenítése..."
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 msgid "Toggle widescreen mode"
 msgstr "Szélesvásznú mód váltása"
 
@@ -482,41 +482,41 @@ msgid "Logout"
 msgstr "Kijelentkezés"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Billentyűparancsok"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Kilépés a beállításokból"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Hírcsatornák"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Szűrők"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Címkék"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Felhasználók"
 
@@ -580,12 +580,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "A Tiny Tiny RSS adatbázis frissítő szkript."
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
@@ -600,312 +600,312 @@ msgstr[1] "%d archivált hír"
 msgid "No feeds found."
 msgstr "Nem található hírcsatorna."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Kiemelt"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Összes hírcsatorna"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Csillagozott hírek"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Publikált hírek"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Friss hírek"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr "Archivált hírek"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr "Legutóbb olvasott"
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Navigáció"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 msgid "Open next feed"
 msgstr "Következő hírcsatorna megnyitása"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr "Előző hírcsatorna megnyitása"
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 msgid "Open next article"
 msgstr "Következő hír megnyitása"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 msgid "Open previous article"
 msgstr "Előző hír megjelenítése"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr "Következő hír megnyitása (nem görgeti a hosszú híreket)"
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Előző hír megnyitása (nem görgeti a hosszú híreket)"
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "Keresőmező megjelenítése"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 msgid "Article"
 msgstr "Hír"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "Csillagoz"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "Publikált"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "Olvasatlannak jelöl"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Címkék szerkesztése"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Eltávolítja a kijelölt híreket a címke alól?"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Látható olvasott hírek elrejtése"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 msgid "Open in new window"
 msgstr "Megnyitás új ablakban"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr "Olvasottnak jel ez alatt"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr "Olvasottnak jel ez fölött"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 msgid "Scroll down"
 msgstr "Legördítés"
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr "Felgördítés"
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 msgid "Select article under cursor"
 msgstr "Az kurzor alatti hír kiválasztása"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr "Hír küldése emailben"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 msgid "Close/collapse article"
 msgstr "Hír bezárása"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Eredeti megjelenítésének váltása"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 msgid "Article selection"
 msgstr "Hír kijelölés"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr "Minden hír kijelölése"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 msgid "Select unread"
 msgstr "Olvasatlan hírek kijelölése"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 msgid "Select starred"
 msgstr "Csillagozott hírek kijelölése"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 msgid "Select published"
 msgstr "Publikált hírek kijlölése"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 msgid "Invert selection"
 msgstr "Fordított kijelölés"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 msgid "Deselect everything"
 msgstr "Kijelölés eltávolítása"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Hírcsatorna"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 msgid "Refresh current feed"
 msgstr "Aktuális hírcsatorna frissítése"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 msgid "Un/hide read feeds"
 msgstr "Olvasott hírcsatornák rejtése/mutatása"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "Feliratkozás hírcsatornára"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Hírcsatorna szerkesztése"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 msgid "Reverse headlines"
 msgstr "Címek fordított sorrendben"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 msgid "Debug feed update"
 msgstr "Hírcsatorna frissítés hibakaresés"
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Minden hírcsatornát olvasottként jelöl"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 msgid "Un/collapse current category"
 msgstr "Kategória kinyitás/összecsukás"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 msgid "Toggle combined mode"
 msgstr "Váltás kombinált módba"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Váltás kombinált módba"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 msgid "Go to"
 msgstr "Ugrás ide"
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 msgid "Fresh"
 msgstr "Friss"
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Címkefelhő"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 msgid "Other"
 msgstr "Egyéb"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Címke létrehozása"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Szűrő létrehozása"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 msgid "Un/collapse sidebar"
 msgstr "Oldalsáv megjelenítés/elrejtés"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 msgid "Show help dialog"
 msgstr "Súgó ablak megjelenítése"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr "Keresési eredmények: %s"
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr "Kattintson a lejátszáshoz"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr "Lejátszás"
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr "-"
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "nincs címke"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Címkék hozzáadása a hírhez"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 msgid "Originally from:"
 msgstr "Eredeti innen:"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr "Hírcsatorna URL"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -914,15 +914,15 @@ msgstr "Hírcsatorna URL"
 msgid "Close this window"
 msgstr "Ablak bezárása"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr "(jegyzet szerkesztése)"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "ismeretlen hírcsatornatípus"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 msgid "Attachments"
 msgstr "Csatolmányok:"
 
@@ -1203,7 +1203,7 @@ msgstr "Profil:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr "Alapértelmezett profil"
 
@@ -1234,12 +1234,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "A hír címkéi (vesszőkkel elválasztva):"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1249,23 +1249,23 @@ msgstr "Mentés"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -1279,10 +1279,10 @@ msgid "Title:"
 msgstr "Cím:"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "Hírcsatorna URL:"
 
@@ -1388,221 +1388,75 @@ msgstr ""
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Ha címkéket és szűrőket is importált, akkor szükség lehet a beállításokat újra kell tölteni."
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr "Kiválasztás"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Mind"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Kijelölés törlése"
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr "Profil létrehozás"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-msgid "(active)"
-msgstr "(aktív)"
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr "Eltávolítja a kiválasztott profilokat?"
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr "Profil aktiválás"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr "A publikus OPML URL címe:"
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 msgid "Generate new URL"
 msgstr "Új URL generálás"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "A frissítő daemon a beállításokban engedélyezve van, ám a daemon folyamat nem fut, így a hírcsatornák nem tudnak frissülni. Kérem indítsa el a daemon folyamatot, vagy lépjen kapcsolatba az oldal/szerver tulajdonosával."
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Legutóbbi frissítés:"
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr "A frissítő daemon túl régóta próbálkozik a hírcsatornák frissítésével. Ez összeomlás vagy hiba jele is lehet, kérem lépjen kapcsolatba az oldal/szerver tulajdonosával!"
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "Egyezés:"
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr "Mind"
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 msgid "All tags."
 msgstr "Minden címke."
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr "Melyik címkék?"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr "Bejegyzések megejenítése"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Ezt a hírcsatornát megtekintheti RSS-ként a következő URL-en:"
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Új Tiny Tiny RSS verzió érhető el (%s)."
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr "Frissíthet a beépített frissítővel a Beállításokban, vagy az update.php használatával"
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr "Letöltés"
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr "Hiba a verzió információ fogadása közben vagy nem érhető el új verzió."
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr "Egyéni CSS deklarációkkal itt felülbírálhatja a kiválasztott téma színeit, betűtípusait és elrendezését. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Ez a fájl</a> használható kiindulásként."
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr "Pédány"
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr "Példány URL"
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-msgid "Access key:"
-msgstr "Hozzáférési kulcs:"
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-msgid "Access key"
-msgstr "Hozzáférési kulcs"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr "Egy hozzáférési kulcs használata minden linkelt példányhoz."
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-msgid "Generate new key"
-msgstr "Új kulcs generálása"
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr "Link létrehozás"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Soronként egy érvényes RSS hírcsatornát adjon meg"
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "Hozzáadás a következő kategóriához:"
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr "Feliratkozás hírcsatornákra, soronként egy"
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Belépés"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-msgid "Password"
-msgstr "Jelszó"
-
-#: classes/dlg.php:499
-msgid "Feeds require authentication."
-msgstr "Ez a hírcsatorna azonosítást igényel."
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Feliratkozás"
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Weboldal megtekintése"
@@ -1613,7 +1467,7 @@ msgstr "Megtekintés RSS feedként"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr "Megtekintés RSS-ként"
 
@@ -1621,10 +1475,42 @@ msgstr "Megtekintés RSS-ként"
 msgid "Select:"
 msgstr "Kiválasztás:"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Mind"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Fordított"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Kijelölés törlése"
+
 #: classes/feeds.php:101
 msgid "More..."
 msgstr "Tovább..."
@@ -1709,84 +1595,113 @@ msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír."
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Hírcsatornák utolsó frissítése: %s"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 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:909
 msgid "No feed selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 msgid "Feed or site URL"
 msgstr "Hírcsatorna vagy weboldal URL"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "Hozzáadás a következő kategóriához:"
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr "Elérhető hírcsatornák"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Azonosítás"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Belépés"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr "Jelszó"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "Feliratkozás"
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr "További hírcsatornák"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Keresés"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 msgid "Popular feeds"
 msgstr "Népszerű hírcsatornák"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 msgid "Feed archive"
 msgstr "Hírcsatorna archívum"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 msgid "limit:"
 msgstr "határ:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Eltávolít"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr "Keresés"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Keresés korlátozása ezekre:"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Ez a hírcsatorna"
 
@@ -1909,8 +1824,8 @@ msgid "Change password to"
 msgstr "Jelszó megváltoztatása"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Beállítások"
 
@@ -1951,6 +1866,21 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "Kiválasztás"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Felhasználó létrehozás"
@@ -2079,13 +2009,13 @@ msgid "Combine"
 msgstr "Egyesít"
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 msgid "Reset sort order"
 msgstr "Rendezési sorren visszaállítása"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Hírek újrapontszámozása"
 
@@ -2133,7 +2063,7 @@ msgstr "Művelet mentés"
 msgid "Add action"
 msgstr "Művelet hozzáadás"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 #, fuzzy
 msgid "[No caption]"
 msgstr "Cím"
@@ -2341,241 +2271,264 @@ msgstr "Kiválasztott beépülők engedélyezése"
 msgid "Incorrect password"
 msgstr "Érvénytelen jelszó"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr "Egyéni CSS deklarációkkal itt felülbírálhatja a kiválasztott téma színeit, betűtípusait és elrendezését. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Ez a fájl</a> használható kiindulásként."
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr "Profil létrehozás"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr "(aktív)"
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr "Eltávolítja a kiválasztott profilokat?"
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr "Profil aktiválás"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "Jelölje be a mező engedélyezéséhez"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d hírcsatorna)"
-msgstr[1] "(%d hírcsatorna)"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Hírcsatorna címe"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Frissítés"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "Régi hírek törlése:"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Megjegyzés:</b> ha a hírcsatorna megköveteli a hitelesítést (kivéve a Twitter csatornákat), ki kell tölteni a bejelentkezési információkat."
 
-#: classes/pref/feeds.php:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 msgid "Hide from Popular feeds"
 msgstr "Elrejtés a Népszerű hírcsatornákból"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "Hozzáadás az e-mail összefoglalóhoz"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "Kép csatolmányokat mindig jelenítse meg"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr "Ne ágyazza be a képeket"
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "Képek helyi tárolása"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 msgid "Mark updated articles as unread"
 msgstr "Frissült hírek megjelölése olvasatlanként"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr "Ikon"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr "Csere"
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 msgid "Resubscribe to push updates"
 msgstr "Újra feliratkozás a push frissítésekre"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Visszaállítja a PubSubHubbub feliratkozást a push-engedélyezett hírcsatornákhoz."
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Kész."
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 msgid "Feeds with errors"
 msgstr "Hibás hírcsatornák"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 msgid "Inactive feeds"
 msgstr "Inaktív hírcsatornák"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 msgid "Edit selected feeds"
 msgstr "Kijelölt hírcsatornák szerkeztése"
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr "Kötegelt feliratkozás"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 msgid "Categories"
 msgstr "Kategóriák"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 msgid "Add category"
 msgstr "Kategória hozzáadás"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 msgid "(Un)hide empty categories"
 msgstr "Üres kategóriák elrejtése/megjelenítése"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 msgid "Remove selected"
 msgstr "Kijelölt eltávolítása"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 msgid "More actions..."
 msgstr "További műveletek..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "Kézi takarítás (régi hírek törlése)"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "Hírcsatorna-adatok törlése"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Az OPML használatával hírcsatornákat, szűrőket, címkéket és beállításokat exportálhat, importálhat."
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Csak a fő beállításprofilt lehet OPML használatával költöztetni."
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 msgid "Import my OPML"
 msgstr "OPML importálása"
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr "Fájlnév:"
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 msgid "Include settings"
 msgstr "Beállításokkal együtt"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 msgid "Export OPML"
 msgstr "Exportálás OPML-be"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Az OPML nyilvánosságra hozható és bárki feliratkozhat rá, aki ismeri az alábbi URL-t."
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
 msgstr "A publikált OPML nem tartalmazza a beállításokat, az azonosítást igénylő hírcsatornákat és az Népszerű hírcsatornákból elrejtetteket."
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr "Publikus OPML URL"
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr "Publikált OPML URL mejelenítése"
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 msgid "Firefox integration"
 msgstr "Firefox integráció"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 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:1422
+#: classes/pref/feeds.php:1423
 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:1430
+#: classes/pref/feeds.php:1431
 msgid "Published & shared articles / Generated feeds"
 msgstr "Publikált és megosztott hírek / Generált hírcsatornák"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 msgid "Published articles and generated feeds"
 msgstr "Publikált hírek és generált hírcsatornák"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 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:1440
+#: classes/pref/feeds.php:1441
 msgid "Display URL"
 msgstr "URL megjelenítés"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr "Minden generált URL törlése"
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 msgid "Articles shared by URL"
 msgstr "URL alapján megosztott hírek"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Itt minden egyedi URL-el megosztott hírt le lehet tiltani."
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 msgid "Unshare all articles"
 msgstr "Minden hír megosztásának visszavonása"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Ezek a hírcsatornák 3 hónapja nem frissültek új tartalommal (régebbiek elöl):"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 msgid "Click to edit feed"
 msgstr "Kattintson a hírcsatorna szerkesztéséhez"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 msgid "Unsubscribe from selected feeds"
 msgstr "Leiratkozás a kiválasztott hírcsatornákról"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "Váratlan hibák miatt ezek a hírcsatornák nem frissültek:"
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Soronként egy érvényes RSS hírcsatornát adjon meg"
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr "Feliratkozás hírcsatornákra, soronként egy"
+
+#: classes/pref/feeds.php:1789
+msgid "Feeds require authentication."
+msgstr "Ez a hírcsatorna azonosítást igényel."
+
 #: plugins/digest/digest_body.php:59
 #, fuzzy
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
@@ -2860,6 +2813,38 @@ msgstr ""
 msgid "Linked"
 msgstr "Linkelt"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr "Pédány"
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr "Példány URL"
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+msgid "Access key:"
+msgstr "Hozzáférési kulcs:"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+msgid "Access key"
+msgstr "Hozzáférési kulcs"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr "Egy hozzáférési kulcs használata minden linkelt példányhoz."
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+msgid "Generate new key"
+msgstr "Új kulcs generálása"
+
 #: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "Link példány"
@@ -2880,6 +2865,10 @@ msgstr "Állapot"
 msgid "Stored feeds"
 msgstr "Tárolt hírcsatornák"
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr "Link létrehozás"
+
 #: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "Megosztás URL-el"
@@ -2910,23 +2899,23 @@ msgstr "Frissítésre kész."
 msgid "Start update"
 msgstr "Frissítés indtása"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "Minden hírt megjelöl olvasottként itt: %s?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Minden hírt megjelöl olvasottként itt: %s?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Minden hírt megjelöl olvasottként itt: %s?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Minden hírt megjelöl olvasottként itt: %s?"
@@ -3712,6 +3701,12 @@ msgstr "Megosztás URL-el"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr "Az élő frissítés még kisérleti fázisban van. A folytatás előtt mentse el a tt-rss könyvtárának tartalmát. A folytatáshoz írja be a 'yes' szót."
 
+#, fuzzy
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "(%d hírcsatorna)"
+#~ msgstr[1] "(%d hírcsatorna)"
+
 #~ msgid "Notice"
 #~ msgstr "Értesítés"
 
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 17670ca9..56b0830a 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 45d0121d..d216dbce 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+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"
@@ -257,14 +257,14 @@ msgstr "Test di sanitizzazione dell&apos;SQL fallito; controllare il database e
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -309,13 +309,13 @@ msgid "All Articles"
 msgstr "Tutti gli articoli"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Con stella"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Pubblicati"
@@ -361,7 +361,7 @@ msgstr "Segna notiziario come letto"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -372,8 +372,8 @@ msgid "Mark as read"
 msgstr "Segna come letto"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Tutti gli articoli"
 
@@ -432,8 +432,8 @@ msgid "Rescore feed"
 msgstr "Cambia punteggio notiziario"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
@@ -459,7 +459,7 @@ msgid "Show tag cloud..."
 msgstr "Mostra nuvola etichette..."
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Inverti con stella"
@@ -488,41 +488,41 @@ msgid "Logout"
 msgstr "Esci"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Esci dalle preferenze"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Notiziari"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Filtri"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Etichette"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Utenti"
 
@@ -587,12 +587,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Il database di Tiny Tiny RSS è aggiornato."
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
@@ -607,336 +607,336 @@ msgstr[1] "%d articoli archiviati"
 msgid "No feeds found."
 msgstr "Nessun notiziario trovato."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Speciale"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Tutti i notiziari"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Articoli con stella"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Articoli pubblicati"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Articoli nuovi"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr "Articoli archiviati"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Navigazione"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 #, fuzzy
 msgid "Open next feed"
 msgstr "Su lettura passare al prossimo notiziario"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 #, fuzzy
 msgid "Open next article"
 msgstr "Apri articolo di origine"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 #, fuzzy
 msgid "Open previous article"
 msgstr "Apri articolo di origine"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "Mostra il dialogo di ricerca"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 #, fuzzy
 msgid "Article"
 msgstr "Tutti gli articoli"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "Inverti con stella"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "Inverti pubblicati"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "Inverti non letti"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Modifica etichette"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Rimuovi gli articoli selezionati"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Rimuovi articoli letti"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 #, fuzzy
 msgid "Open in new window"
 msgstr "Aprire gli articoli in una nuova finestra"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 #, fuzzy
 msgid "Scroll down"
 msgstr "Fatto tutto."
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Seleziona l&apos;articolo sotto il cursore del mouse"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr ""
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Cambio punteggio degli articoli"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Inverti pubblicati"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 #, fuzzy
 msgid "Article selection"
 msgstr "Azioni sull&apos;articolo attivo"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr ""
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 #, fuzzy
 msgid "Select unread"
 msgstr "Inverti non letti"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 #, fuzzy
 msgid "Select starred"
 msgstr "Imposta con stella"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 #, fuzzy
 msgid "Select published"
 msgstr "Articoli pubblicati"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 #, fuzzy
 msgid "Invert selection"
 msgstr "Selezione:"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 msgid "Deselect everything"
 msgstr ""
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Notiziario"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Aggiorna notiziario attivo"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "Sottoscrivi il notiziario"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Modifica notiziario"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Invertire l&apos;ordine dei sommari"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Disabilitare aggiornamenti"
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Segna tutti i notiziari come letti"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Mettere nella categoria:"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Inverti pubblicati"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Inverti pubblicati"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 #, fuzzy
 msgid "Go to"
 msgstr "Vai a..."
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Nuvola etichette"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 #, fuzzy
 msgid "Other"
 msgstr "Altri notiziari"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Crea etichetta"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Crea filtro"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Contrai la barra laterale"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Mostra il dialogo di ricerca"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr "Fare clic per riprodurre"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr "Riproduci"
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "nessuna etichetta"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Modifica le etichette per questo articolo"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 msgid "Originally from:"
 msgstr "Originariamente da:"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr "URL del notiziario"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -945,15 +945,15 @@ msgstr "URL del notiziario"
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr "(modifica note)"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "tipo sconosciuto"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 #, fuzzy
 msgid "Attachments"
 msgstr "Allegati:"
@@ -1238,7 +1238,7 @@ msgstr "Profilo:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr "Profilo predefinito"
 
@@ -1269,12 +1269,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Etichette per questo articolo (separate da virgole):"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1284,23 +1284,23 @@ msgstr "Salva"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -1316,10 +1316,10 @@ msgid "Title:"
 msgstr "Titolo"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "URL:"
 
@@ -1429,222 +1429,76 @@ msgstr ""
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr "Seleziona"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Tutti"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Nessuno"
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr "Crea profilo"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-msgid "(active)"
-msgstr "(attivo)"
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr "Rimuovi i profili selezionati"
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr "Attiva profilo"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr "L'URL OPML pubblico è:"
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 msgid "Generate new URL"
 msgstr "Genera nuovo URL"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "Il demone per l&apos;aggiornamento è abilitato nella configurazione, ma il processo del demone non è in esecuzione. Questo impedisce l&apos;aggiornameto di tutti i notiziari. Avviare il processo del demone o contattare il proprietario dell&apos;istanza."
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr "Il demone di aggiornamento sta impiegando troppo tempo a eseguire l&apos;aggiornamento del notiziario. Questo potrebbe indicare un problema come un crash o uno stallo. Controllare il processo del demone o contattare il proprietario dell&apos;istanza."
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr ""
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 #, fuzzy
 msgid "All tags."
 msgstr "nessuna etichetta"
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr ""
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "È possibile vedere questo notiziario come RSS utilizzando il seguente URL:"
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "È disponibile una nuova versione di Tiny Tiny RSS (%s)."
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr ""
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr "Scarica"
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr "Si possono cambiare i colori, i caratteri e la disposizione del tema correntemente selezionato attraverso le dichiarazioni CSS personalizzate. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Questo file</a> può essere utilizzato come base."
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr "Istanza"
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr "URL dell'istanza"
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-msgid "Access key:"
-msgstr "Chiave di accesso:"
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-msgid "Access key"
-msgstr "Chiave di accesso"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr "Utilizzare una chiave di accesso per entrambe le istanze collegate."
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-msgid "Generate new key"
-msgstr "Genera nuova chiave"
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr "Crea collegamento"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "Mettere nella categoria:"
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Accesso"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-msgid "Password"
-msgstr "Password"
-
-#: classes/dlg.php:499
-msgid "Feeds require authentication."
-msgstr ""
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Sottoscrivi"
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Visita il sito web"
@@ -1655,7 +1509,7 @@ msgstr "Visualizza come RSS del notiziario"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr "Visualizza come RSS"
 
@@ -1663,10 +1517,42 @@ msgstr "Visualizza come RSS"
 msgid "Select:"
 msgstr "Seleziona:"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Tutti"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Inverti"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Nessuno"
+
 #: classes/feeds.php:101
 #, fuzzy
 msgid "More..."
@@ -1752,85 +1638,114 @@ msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Ultimo aggiornamento notiziari alle %s"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 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:909
 msgid "No feed selected."
 msgstr "Nessun notiziario selezionato."
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "URL del notiziario"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "Mettere nella categoria:"
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr "Notiziari disponibili"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Accesso"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr "Password"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Questo notiziario richiede l&apos;autenticazione"
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "Sottoscrivi"
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr "Altri notiziari"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Cerca"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 msgid "Popular feeds"
 msgstr "Notiziari popolari"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 msgid "Feed archive"
 msgstr "Archivio notiziari"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 msgid "limit:"
 msgstr "limite:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr "Cerca"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Limitare la ricerca a:"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Questo notiziario"
 
@@ -1954,8 +1869,8 @@ msgid "Change password to"
 msgstr "Cambiare la password a"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Opzioni"
 
@@ -1992,6 +1907,21 @@ msgstr "Aggiunto l&apos;utente <b>%s</b> con password <b>%s</b>"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notifica di cambio password"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "Seleziona"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Crea utente"
@@ -2122,13 +2052,13 @@ msgid "Combine"
 msgstr ""
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 msgid "Reset sort order"
 msgstr "Reimposta ordinamento"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Cambio punteggio degli articoli"
 
@@ -2179,7 +2109,7 @@ msgstr "Riquadro azioni"
 msgid "Add action"
 msgstr "Azioni notiziari"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 #, fuzzy
 msgid "[No caption]"
 msgstr "Intestazione"
@@ -2394,253 +2324,276 @@ msgstr "Abilitare le categorie dei notiziari"
 msgid "Incorrect password"
 msgstr "Nome utente o password sbagliati"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr "Si possono cambiare i colori, i caratteri e la disposizione del tema correntemente selezionato attraverso le dichiarazioni CSS personalizzate. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Questo file</a> può essere utilizzato come base."
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr "Crea profilo"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr "(attivo)"
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr "Rimuovi i profili selezionati"
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr "Attiva profilo"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "Spuntare per abilitare il campo"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Notiziari memorizzati"
-msgstr[1] "Notiziari memorizzati"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Titolo notiziario"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Aggiorna"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "Eliminazione articoli:"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Suggerimento:</b> occorre riempire la informazioni di accesso se il proprio notiziario richiede l'autenticazione, eccetto per i notiziari di Twitter."
 
-#: classes/pref/feeds.php:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 msgid "Hide from Popular feeds"
 msgstr "Nascondere nei notiziari popolari"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "Includere nell&apos;email riassunto"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "Mostrare sempre le immagini allegate"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "Memorizzare le immagini localmente"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 msgid "Mark updated articles as unread"
 msgstr "Segnare gli articoli aggiornati come non letti"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr "Icona"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 msgid "Resubscribe to push updates"
 msgstr "Sottoscrivi per inviare aggiornamenti"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 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:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Fatto tutto."
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 msgid "Feeds with errors"
 msgstr "Notiziari con errori"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Aggiorna notiziario attivo"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 msgid "Edit selected feeds"
 msgstr "Modifica i notiziari selezionati"
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 #, fuzzy
 msgid "Categories"
 msgstr "Categorie notiziario"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Add category"
 msgstr "Modifica categorie"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Modifica categorie"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 #, fuzzy
 msgid "Remove selected"
 msgstr "Rimuovere i notiziari selezionati?"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 msgid "More actions..."
 msgstr "Altre azioni..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "Eliminazione manuale"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "Pulisci i dati del notiziario"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importazione OPML..."
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 #, fuzzy
 msgid "Filename:"
 msgstr "Nome completo"
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 #, fuzzy
 msgid "Include settings"
 msgstr "Includere nell&apos;email riassunto"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 #, fuzzy
 msgid "Export OPML"
 msgstr "Importazione OPML..."
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "OPML può essere pubblicato e può essere sottoscritto da chiunque conosca l&apos;URL seguente."
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 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:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr "URL OPML pubblico"
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "URL OPML pubblico"
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 msgid "Firefox integration"
 msgstr "Integrazione con Firefox"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 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:1422
+#: classes/pref/feeds.php:1423
 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:1430
+#: classes/pref/feeds.php:1431
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Articoli pubblicati e notiziari generati"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 msgid "Published articles and generated feeds"
 msgstr "Articoli pubblicati e notiziari generati"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Gli articoli pubblicati vengono esportati come un notiziario pubblico e possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui sotto."
 
-#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1441
 msgid "Display URL"
 msgstr "Visualizza URL"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr "Pulisci tutti gli URL generati"
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Togli la stella all&apos;articolo"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Questi notiziari non sono stati aggiornati con nuovi contenuti da 3 mesi (più vecchi prima):"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 msgid "Click to edit feed"
 msgstr "Fare clic per modificare il notiziario"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 msgid "Unsubscribe from selected feeds"
 msgstr "Annulla la sottoscrizione ai notiziari selezionati"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "Questi notiziari non sono stati aggiornati a causa di errori:"
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1789
+msgid "Feeds require authentication."
+msgstr ""
+
 #: plugins/digest/digest_body.php:59
 #, fuzzy
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
@@ -2930,6 +2883,38 @@ msgstr ""
 msgid "Linked"
 msgstr "Collegato"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr "Istanza"
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr "URL dell'istanza"
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+msgid "Access key:"
+msgstr "Chiave di accesso:"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+msgid "Access key"
+msgstr "Chiave di accesso"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr "Utilizzare una chiave di accesso per entrambe le istanze collegate."
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+msgid "Generate new key"
+msgstr "Genera nuova chiave"
+
 #: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "Collega istanza"
@@ -2950,6 +2935,10 @@ msgstr ""
 msgid "Stored feeds"
 msgstr "Notiziari memorizzati"
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr "Crea collegamento"
+
 #: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr ""
@@ -2985,23 +2974,23 @@ msgstr "Ultimo aggiornamento:"
 msgid "Start update"
 msgstr "Ultimo aggiornamento:"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "Segnare tutti gli articoli in «%s» come letti?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Segnare tutti gli articoli in «%s» come letti?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Segnare tutti gli articoli in «%s» come letti?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Segnare tutti gli articoli in «%s» come letti?"
@@ -3802,6 +3791,12 @@ msgstr "Metti la stella all&apos;articolo"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#, fuzzy
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "Notiziari memorizzati"
+#~ msgstr[1] "Notiziari memorizzati"
+
 #~ msgid "Notice"
 #~ msgstr "Notifica"
 
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 219ba276..831521a3 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 dadc054d..09b37b3e 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: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+0400\n"
 "PO-Revision-Date: 2013-03-25 06:48+0900\n"
 "Last-Translator: skikuta <kik0220@gmail.com>\n"
 "Language-Team: \n"
@@ -250,14 +250,14 @@ msgstr "SQLのエスケープ処理のテストに失敗しました。データ
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -303,13 +303,13 @@ msgid "All Articles"
 msgstr "すべての記事"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "お気に入り"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "公開済み"
@@ -356,7 +356,7 @@ msgstr "マークしたフィードを既読にする"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -367,8 +367,8 @@ msgid "Mark as read"
 msgstr "既読にする"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "すべての記事"
 
@@ -428,8 +428,8 @@ msgid "Rescore feed"
 msgstr "フィードのスコアを再計算しています..."
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "購読をやめる"
@@ -456,7 +456,7 @@ msgid "Show tag cloud..."
 msgstr "タグクラウド"
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "カテゴリーの並び替えモードの切り替え"
@@ -486,41 +486,41 @@ msgid "Logout"
 msgstr "ログアウト"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "設定"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "設定を終了する"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "フィード"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "フィルター"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "ラベル"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "ユーザー"
 
@@ -585,12 +585,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS のデータベースを更新しました。"
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
@@ -605,346 +605,346 @@ msgstr[1] "お気に入りの記事"
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "特別"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "公開済みの記事"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 #, fuzzy
 msgid "Archived articles"
 msgstr "未読記事"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr "最近読んだ"
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 #, fuzzy
 msgid "Open next feed"
 msgstr "次のフィードを開く"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr "前のフィードを開く"
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 #, fuzzy
 msgid "Open next article"
 msgstr "次の記事を開く"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 #, fuzzy
 msgid "Open previous article"
 msgstr "前の記事を開く"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr "次の記事を開く(スクロールしない)"
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr "前の記事を開く(スクロールしない)"
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "検索ダイアログを表示する"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 #, fuzzy
 msgid "Article"
 msgstr "すべての記事"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "お気に入りを切り替える"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "公開を切り替える"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "未読に切り替える"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "タグを編集する"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "ラベルから選択した記事を削除しますか?"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 #, fuzzy
 msgid "Dismiss read"
 msgstr "公開記事"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 #, fuzzy
 msgid "Open in new window"
 msgstr "新しいウィンドウで記事を開く"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 #, fuzzy
 msgid "Mark below as read"
 msgstr "既読にする"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 #, fuzzy
 msgid "Mark above as read"
 msgstr "既読にする"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 #, fuzzy
 msgid "Scroll down"
 msgstr "下にスクロール"
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr "上にスクロール"
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "マウスカーソルの下の記事を選択する"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 #, fuzzy
 msgid "Email article"
 msgstr "すべての記事"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "記事を消去する"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "カテゴリーの並び替えモードの切り替え"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 #, fuzzy
 msgid "Article selection"
 msgstr "有効な記事の操作"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 #, fuzzy
 msgid "Select all articles"
 msgstr "記事を消去する"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 #, fuzzy
 msgid "Select unread"
 msgstr "未読記事を削除する"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 #, fuzzy
 msgid "Select starred"
 msgstr "お気に入りに設定する"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 #, fuzzy
 msgid "Select published"
 msgstr "未読記事を削除する"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 #, fuzzy
 msgid "Invert selection"
 msgstr "有効な記事の操作"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 #, fuzzy
 msgid "Deselect everything"
 msgstr "記事を消去する"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "フィード"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "有効なフィードの更新"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "フィードを編集する"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "ヘッドラインの逆順 (古いものが上)"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 #, fuzzy
 msgid "Debug feed update"
 msgstr "すべてのフィードを更新しました。"
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "すべてのフィードを既読に設定する"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "カテゴリーの開閉"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "カテゴリーの並び替えモードの切り替え"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "カテゴリーの並び替えモードの切り替え"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 #, fuzzy
 msgid "Go to"
 msgstr "移動..."
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 #, fuzzy
 msgid "Fresh"
 msgstr "再描画"
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "タグクラウド"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 #, fuzzy
 msgid "Other"
 msgstr "その他:"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "ラベルを作成する"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "フィルターを作成する"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "サイドバーを縮小する"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 #, fuzzy
 msgid "Show help dialog"
 msgstr "検索ダイアログを表示する"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "検索結果"
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 #, fuzzy
 msgid "Click to play"
 msgstr "クリックで表示"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr "表示"
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "タグがありません"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 #, fuzzy
 msgid "Originally from:"
 msgstr "元の記事内容を表示する"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 #, fuzzy
 msgid "Feed URL"
 msgstr "フィード"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -953,16 +953,16 @@ msgstr "フィード"
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 #, fuzzy
 msgid "(edit note)"
 msgstr "ノートの編集"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 #, fuzzy
 msgid "Attachments"
 msgstr "添付:"
@@ -1254,7 +1254,7 @@ msgstr "ファイル:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 #, fuzzy
 msgid "Default profile"
 msgstr "標準の記事制限"
@@ -1287,12 +1287,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "この記事のタグ (カンマで区切ります):"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1302,23 +1302,23 @@ msgstr "保存"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "取り消し"
 
@@ -1333,10 +1333,10 @@ msgid "Title:"
 msgstr "題名:"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "URL:"
 
@@ -1447,236 +1447,80 @@ msgstr "ログイン名とメールアドレスの組み合わせが組み合わ
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-#, fuzzy
-msgid "Select"
-msgstr "選択:"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "すべて"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "なし"
-
-#: classes/dlg.php:63
-#, fuzzy
-msgid "Create profile"
-msgstr "フィルターを作成する"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-msgid "(active)"
-msgstr "(有効)"
-
-#: classes/dlg.php:150
-#, fuzzy
-msgid "Remove selected profiles"
-msgstr "選択されたプロファイルを削除しますか?"
-
-#: classes/dlg.php:152
-#, fuzzy
-msgid "Activate profile"
-msgstr "プロファイルを有効にする"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "公開記事フィードへのリンクです。"
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 #, fuzzy
 msgid "Generate new URL"
 msgstr "生成したフィード"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "最終更新:"
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 #, fuzzy
 msgid "Match:"
 msgstr "一致"
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 #, fuzzy
 msgid "All tags."
 msgstr "タグがありません"
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 #, fuzzy
 msgid "Display entries"
 msgstr "フィードの表示"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr ""
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr ""
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr ""
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-#, fuzzy
-msgid "Access key:"
-msgstr "アクセスレベル: "
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-#, fuzzy
-msgid "Access key"
-msgstr "アクセスレベル"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr ""
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-#, fuzzy
-msgid "Generate new key"
-msgstr "生成したフィード"
-
-#: classes/dlg.php:455
-#, fuzzy
-msgid "Create link"
-msgstr "作成"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "カテゴリーの場所:"
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "ログイン"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-#, fuzzy
-msgid "Password"
-msgstr "パスワード:"
-
-#: classes/dlg.php:499
-#, fuzzy
-msgid "Feeds require authentication."
-msgstr "このフィードは認証を要求します。"
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "購読"
-
 #: classes/feeds.php:68
 #, fuzzy
 msgid "Visit the website"
@@ -1689,7 +1533,7 @@ msgstr "フィードを閲覧する"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 #, fuzzy
 msgid "View as RSS"
 msgstr "タグを閲覧する"
@@ -1698,10 +1542,42 @@ msgstr "タグを閲覧する"
 msgid "Select:"
 msgstr "選択:"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "すべて"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "反転"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "なし"
+
 #: classes/feeds.php:101
 #, fuzzy
 msgid "More..."
@@ -1791,90 +1667,120 @@ msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
-#: classes/feeds.php:922
+#: classes/feeds.php:909
 msgid "No feed selected."
 msgstr "フィードは選択されていません。"
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "フィード"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "カテゴリーの場所:"
+
+#: classes/feeds.php:984
 #, fuzzy
 msgid "Available feeds"
 msgstr "すべてのフィード"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "認証"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "ログイン"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+#, fuzzy
+msgid "Password"
+msgstr "パスワード:"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "このフィードは認証を要求します。"
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "購読"
+
+#: classes/feeds.php:1021
 #, fuzzy
 msgid "More feeds"
 msgstr "さらなるフィード"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "検索"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 #, fuzzy
 msgid "Popular feeds"
 msgstr "フィードの表示"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 #, fuzzy
 msgid "Feed archive"
 msgstr "フィード操作"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 #, fuzzy
 msgid "limit:"
 msgstr "制限:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "削除"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "対象範囲"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "このフィード"
 
@@ -1999,8 +1905,8 @@ msgid "Change password to"
 msgstr "次のパスワードに変更する:"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "オプション"
 
@@ -2041,6 +1947,22 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] パスワード変更通知"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+#, fuzzy
+msgid "Select"
+msgstr "選択:"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "ユーザーの作成"
@@ -2177,14 +2099,14 @@ msgid "Combine"
 msgstr ""
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 #, fuzzy
 msgid "Reset sort order"
 msgstr "パスワードのリセット"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "記事のスコアの再集計"
 
@@ -2237,7 +2159,7 @@ msgstr "パネル操作"
 msgid "Add action"
 msgstr "フィード操作"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 msgid "[No caption]"
 msgstr "[キャプションなし]"
 
@@ -2460,268 +2382,295 @@ msgstr "フィードアイコンを有効にする"
 msgid "Incorrect password"
 msgstr "ユーザー名かパスワードが正しくありません"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr ""
+
+#: classes/pref/prefs.php:919
+#, fuzzy
+msgid "Create profile"
+msgstr "フィルターを作成する"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr "(有効)"
+
+#: classes/pref/prefs.php:1006
+#, fuzzy
+msgid "Remove selected profiles"
+msgstr "選択されたプロファイルを削除しますか?"
+
+#: classes/pref/prefs.php:1008
+#, fuzzy
+msgid "Activate profile"
+msgstr "プロファイルを有効にする"
+
+#: classes/pref/feeds.php:13
 #, fuzzy
 msgid "Check to enable field"
 msgstr "編集するにはクリック"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "フィードを編集する"
-msgstr[1] "フィードを編集する"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 #, fuzzy
 msgid "Feed Title"
 msgstr "題名"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "更新"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "記事の削除:"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 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:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "自分のフィード一覧から隠す"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "電子メールダイジェストに含む"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "ローカルに画像をキャッシュする"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "すべての記事を既読にしますか?"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 #, fuzzy
 msgid "Icon"
 msgstr "操作"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "フィードを購読する:"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "すべて終了しました。"
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "フィードエディター"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "元のフィード"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "選択したフィードを削除しています..."
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "購読をやめる"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 #, fuzzy
 msgid "Categories"
 msgstr "カテゴリー:"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Add category"
 msgstr "フィードカテゴリーを追加しています..."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "カテゴリーの編集"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 #, fuzzy
 msgid "Remove selected"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 #, fuzzy
 msgid "More actions..."
 msgstr "操作..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "手動削除"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "フィードデータの消去"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Import my OPML"
 msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 #, fuzzy
 msgid "Include settings"
 msgstr "電子メールダイジェストに含む"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 #, fuzzy
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 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:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox 統合"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny Tiny RSS のサイトを使うことができます。"
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1423
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1431
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 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:1440
+#: classes/pref/feeds.php:1441
 #, fuzzy
 msgid "Display URL"
 msgstr "タグの表示"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "記事をお気に入りにする"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "記事のお気に入りを解除する"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 #, fuzzy
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "編集するにはクリック"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1789
+#, fuzzy
+msgid "Feeds require authentication."
+msgstr "このフィードは認証を要求します。"
+
 #: plugins/digest/digest_body.php:59
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
 msgstr ""
@@ -3024,6 +2973,41 @@ msgstr ""
 msgid "Linked"
 msgstr "リンク"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr ""
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr ""
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+#, fuzzy
+msgid "Access key:"
+msgstr "アクセスレベル: "
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+#, fuzzy
+msgid "Access key"
+msgstr "アクセスレベル"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+#, fuzzy
+msgid "Generate new key"
+msgstr "生成したフィード"
+
 #: plugins/instances/init.php:295
 #, fuzzy
 msgid "Link instance"
@@ -3046,6 +3030,11 @@ msgstr ""
 msgid "Stored feeds"
 msgstr "さらなるフィード"
 
+#: plugins/instances/init.php:437
+#, fuzzy
+msgid "Create link"
+msgstr "作成"
+
 #: plugins/share/init.php:27
 #, fuzzy
 msgid "Share by URL"
@@ -3081,23 +3070,23 @@ msgstr "最終更新:"
 msgid "Start update"
 msgstr "最終更新:"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
@@ -3928,6 +3917,12 @@ msgstr "記事をお気に入りにする"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#, fuzzy
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "フィードを編集する"
+#~ msgstr[1] "フィードを編集する"
+
 #~ msgid "Notice"
 #~ msgstr "通知"
 
diff --git a/locale/lv_LV/LC_MESSAGES/messages.mo b/locale/lv_LV/LC_MESSAGES/messages.mo
index 2631ba9a..d31b71db 100644
Binary files a/locale/lv_LV/LC_MESSAGES/messages.mo and b/locale/lv_LV/LC_MESSAGES/messages.mo differ
diff --git a/locale/lv_LV/LC_MESSAGES/messages.po b/locale/lv_LV/LC_MESSAGES/messages.po
index 79722956..e69f16e5 100644
--- a/locale/lv_LV/LC_MESSAGES/messages.po
+++ b/locale/lv_LV/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+0400\n"
 "PO-Revision-Date: 2013-03-18 22:55+0300\n"
 "Last-Translator: Valdis Vītoliņš <valdis.vitolins@odo.lv>\n"
 "Language-Team: \n"
@@ -255,14 +255,14 @@ msgstr "Neizdevās SQL izņēmumu tests, pārbaudiet jūsu datu bāzes un PHP ie
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -307,13 +307,13 @@ msgid "All Articles"
 msgstr "Visus rakstus"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Zvaigžņotos"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Publicētos"
@@ -359,7 +359,7 @@ msgstr "Atzīmēt barotni kā lasītu"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -370,8 +370,8 @@ msgid "Mark as read"
 msgstr "Atzīmēt kā lasītu"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Visi raksti"
 
@@ -430,8 +430,8 @@ msgid "Rescore feed"
 msgstr "Pārvērtēt barotni"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Atteikties"
@@ -457,7 +457,7 @@ msgid "Show tag cloud..."
 msgstr "Radīt birku mākoni..."
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Pārslēgt zvaigžņošanu"
@@ -486,41 +486,41 @@ msgid "Logout"
 msgstr "Atteikties"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Iestatījumi"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Īsinājumtaustiņi"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Iziet no iestatījumiem"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Barotnes"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Filtri"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Iezīmes"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Lietotāji"
 
@@ -584,12 +584,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS datu atjaunošanas skripts."
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Nekategorizēts"
 
@@ -604,337 +604,337 @@ msgstr[1] "%d arhivēti raksti"
 msgid "No feeds found."
 msgstr "Neatradu barotnes."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Īpaši"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Visas barotnes"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Zvaigžņotie raksti"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Publicētie raksti"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Jaunākie raksti"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr "Arhivētie raksti"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr "Nesen lasītie raksti"
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Navigācija"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 #, fuzzy
 msgid "Open next feed"
 msgstr "Pēc noķeršanas rādīt nākamo barotni"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 #, fuzzy
 msgid "Open next article"
 msgstr "Atvērt sākotnējo rakstu"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 #, fuzzy
 msgid "Open previous article"
 msgstr "Atvērt sākotnējo rakstu"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "Rādīt meklēšanas logu"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 #, fuzzy
 msgid "Article"
 msgstr "Visus rakstus"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "Pārslēgt zvaigžņošanu"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "Pārslēgt publicēšanu"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "Pārslēgt nelasītu"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Rediģēt iezīmes"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Atmest atlasītos rakstus"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Atmest lasītos rakstus"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 #, fuzzy
 msgid "Open in new window"
 msgstr "Atvērt rakstu jaunā logā"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr "Iezīmēt lejup kā lasītus"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr "Iezīmēt augšup kā lasītus"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 #, fuzzy
 msgid "Scroll down"
 msgstr "Viss izdarīts."
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Iezīmēt rakstu zem peles kursora"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr "Nosūtīt rakstu uz e-pastu"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Aizvērt rakstu"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Pārslēgt publicēšanu"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 #, fuzzy
 msgid "Article selection"
 msgstr "Apgriezt rakstu iezīmēšanu"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr "Iezīmēt visus rakstus"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 #, fuzzy
 msgid "Select unread"
 msgstr "Iezīmēt nelasītos rakstus"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 #, fuzzy
 msgid "Select starred"
 msgstr "Uzlikt zvaigzni"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 #, fuzzy
 msgid "Select published"
 msgstr "Iezīmēt publicētos rakstus"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 #, fuzzy
 msgid "Invert selection"
 msgstr "Apgriezt rakstu iezīmēšanu"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Neatzīmēt rakstus"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Barotne"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Atjaunot aktīvo barotni"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "(Ne)rādīt lasītās barotnes"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "Abonēt barotni"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Rediģēt barotni"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Apgriezt virsrakstu secību"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Atslēgt atjaunojumus"
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Atzīmēt visas barotnes kā lasītas"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Ievietot kategorijā:"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Pārslēgt publicēšanu"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Pārslēgt publicēšanu"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 #, fuzzy
 msgid "Go to"
 msgstr "Doties uz..."
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Iezīmju mākonis"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 #, fuzzy
 msgid "Other"
 msgstr "Citas barotnes"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Izveidot etiķeti"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Izveidot filtru"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Sakļaut sānjoslu"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Rādīt meklēšanas logu"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr "Meklēšanas rezultāti: %s"
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr "Klikšķiniet, lai atskaņotu"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr "Atskaņot"
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr "–"
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "nav iezīmju"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Rediģēt šī raksta iezīmes"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 msgid "Originally from:"
 msgstr "Sākotnējais no:"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr "Barotnes URL"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -943,15 +943,15 @@ msgstr "Barotnes URL"
 msgid "Close this window"
 msgstr "Aizvērt šo logu"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr "(rediģēt piezīmi)"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "nezināms tips"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 msgid "Attachments"
 msgstr "Pielikumi"
 
@@ -1233,7 +1233,7 @@ msgstr "Profils:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr "Noklusētais profils"
 
@@ -1264,12 +1264,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Šī raksta iezīmes (atdalītas ar komatiem):"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1279,23 +1279,23 @@ msgstr "Saglabāt"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Atcelt"
 
@@ -1309,10 +1309,10 @@ msgid "Title:"
 msgstr "Virsraksts:"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "URL:"
 
@@ -1418,221 +1418,75 @@ msgstr ""
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Ja esat importējis etiķetus vai filtrus, iespējams, ka jums nepieciešams pārlādēt iestatījumus, lai redzētu jaunos datus."
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr "Iezīmēt"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Visus"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Nevienu"
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr "Izveidot profilu"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-msgid "(active)"
-msgstr "(aktīvs)"
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr "Dzēst iezīmētos profilus"
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr "Aktivizēt profilu"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr "Jūsu publiskais OPML URL ir:"
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 msgid "Generate new URL"
 msgstr "Izveidot jaunu URL"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "Atjaunošanas process iestatījumos ir iespējots, bet tas nedarbojas, tāpēc barotnes neatjaunojas. Lūdzu palaidiet atjaunošanas procesu vai arī sazinieties ar servera īpašnieku."
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Pēdējais atjaunojums:"
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr "Atjaunošanas process aizņem pārāk ilgu laiku. Iespējams, ka tas ir tāpēc, ka process ir \"uzkāries\". Lūdzu pārbaudiet atjaunošanas procesu vai arī sazinieties ar servera īpašnieku."
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "Atbilstība:"
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr "Jebkurš"
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 msgid "All tags."
 msgstr "Visas iezīmes."
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr "Kuras iezīmes?"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr "Rādīt ierakstus"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Jūs varat skatīt so baronti kā RSS ar sekojošu URL:"
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Ir pieejama jauna Tiny Tiny RSS versija (%s)."
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr "Jūs varat veikt atjaunojumus, izmantojot iestatījumos norādīto atjaunošanas procesu, vai arī atverot update.php lapu"
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr "Lejuplādēt"
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr "Jūs varat aizstāt krāsas, fontus un izklājumu, šobrīd izmantotā CSS vietā izmantojot savus pielāgojumus. Paraugu varat ņemt no <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">šī faila</a>."
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr "Instance"
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr "Instances URL"
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-msgid "Access key:"
-msgstr "Pieejas atslēga:"
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-msgid "Access key"
-msgstr "Pieejas aslēga"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr "Izmantot to pašu pieejas aslēgu abām saistītajām instancēm."
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-msgid "Generate new key"
-msgstr "Ģenerēt jaunu atslēgu"
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr "Izveidot saiti"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Pievienojiet vienu derīgu RSS barotni vienā rindā (barotnes netiek pārbaudītas)"
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "Ievietot kategorijā:"
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr "Pasūtāmās barotnes, pa vienai katrā rindā"
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Pieteikšanās"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-msgid "Password"
-msgstr "Parole"
-
-#: classes/dlg.php:499
-msgid "Feeds require authentication."
-msgstr "Barotnēm nepieciešama autentifikācija"
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Pasūtīt"
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Apmeklēt vietni"
@@ -1643,7 +1497,7 @@ msgstr "Skatīt RSS barotni"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr "Skatīt kā RSS"
 
@@ -1651,10 +1505,42 @@ msgstr "Skatīt kā RSS"
 msgid "Select:"
 msgstr "Iezīmēt:"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Visus"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Apgriezt"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Nevienu"
+
 #: classes/feeds.php:101
 #, fuzzy
 msgid "More..."
@@ -1739,84 +1625,113 @@ msgid "No articles found to display."
 msgstr "Netika atrasti raksti, ko rādīt."
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Barotnes pēdējo reizi atjaunotas %s."
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 msgid "Some feeds have update errors (click for details)"
 msgstr "Dažas barotnes ir atjaunotas ar kļūdām (klikšķiniet lai skatītu vairāk)"
 
-#: classes/feeds.php:922
+#: classes/feeds.php:909
 msgid "No feed selected."
 msgstr "Nav izvēlēta barotne."
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 msgid "Feed or site URL"
 msgstr "Barotnes vai vietnes URL"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "Ievietot kategorijā:"
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr "Pieejamās barotnes"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Autentifikācija"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Pieteikšanās"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr "Parole"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Šim laukam ir nepieciešams autentificēties."
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "Pasūtīt"
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr "Vairāk barotnes"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Meklēt"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 msgid "Popular feeds"
 msgstr "Populārās barotnes"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 msgid "Feed archive"
 msgstr "Barotņu arhīvs"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 msgid "limit:"
 msgstr "ierobežojumi:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Novākt"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr "Meklēt"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Ierobežot meklēšanu:"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Šajā barotnē"
 
@@ -1939,8 +1854,8 @@ msgid "Change password to"
 msgstr "Nomainīt paroli uz"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Iespējas"
 
@@ -1981,6 +1896,21 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] paroles maiņas paziņojums"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "Iezīmēt"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Izveidot lietotāju"
@@ -2109,13 +2039,13 @@ msgid "Combine"
 msgstr "Apvienot"
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 msgid "Reset sort order"
 msgstr "Atstatīt kārtošanas secību"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Pārvērtēt rakstus"
 
@@ -2163,7 +2093,7 @@ msgstr "Saglabāt darbību"
 msgid "Add action"
 msgstr "Pievienot darbību"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 #, fuzzy
 msgid "[No caption]"
 msgstr "Uzraksts"
@@ -2373,241 +2303,264 @@ msgstr "Iespējot barotņu kategorijas"
 msgid "Incorrect password"
 msgstr "Nepareiza parole"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr "Jūs varat aizstāt krāsas, fontus un izklājumu, šobrīd izmantotā CSS vietā izmantojot savus pielāgojumus. Paraugu varat ņemt no <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">šī faila</a>."
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr "Izveidot profilu"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr "(aktīvs)"
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr "Dzēst iezīmētos profilus"
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr "Aktivizēt profilu"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "Iezīmējiet, lai iespējotu"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d barotnes)"
-msgstr[1] "(%d barotnes)"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Barotnes virsraksts"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Atjaunot"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "Dzēšu rakstu:"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Ieteikums:</b> ja jūsu barotnei ir nepieciešama autentifikācija, jums ir jāievada pieteikšanās informācija. Vienīgais izņēmums ir Twitter barotnes."
 
-#: classes/pref/feeds.php:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 msgid "Hide from Popular feeds"
 msgstr "Nerādīt populārajās barotnēs"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "Iekļaut e-pasta īssavilkumu"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "Vienmēr rādīt attēlu pielikumus"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "Kešot attēlus lokāli"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 msgid "Mark updated articles as unread"
 msgstr "Atzīmēt atjaunotos rakstus kā nelasītus"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr "Ikona"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr "Aizvietot"
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 msgid "Resubscribe to push updates"
 msgstr "Pārpasūtīt atjaunojumu grūšanu"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Atstata PubSubHubbub pasūtījumu statusu barotnēm ar iespējotu atjaunojumu grūšanu."
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Viss izdarīts."
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 msgid "Feeds with errors"
 msgstr "Barotnes ar kļūdām"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 msgid "Inactive feeds"
 msgstr "Neaktīvās barotnes"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 msgid "Edit selected feeds"
 msgstr "Rediģēt izvēlētās barotnes"
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr "Pasūtījuma pakotne"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 msgid "Categories"
 msgstr "Kategorijas"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 msgid "Add category"
 msgstr "Pievienot kategoriju"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 msgid "(Un)hide empty categories"
 msgstr "(Ne)slēpt tukšās kategorijas"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 msgid "Remove selected"
 msgstr "Dzēst izvēlētās"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 msgid "More actions..."
 msgstr "Papildu iespējas..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "Manuāla dzēšana"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "Dzēst barotņu datus"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Izmantojot OPML jūs varat eksportēt un importēt savas barotnes, filtrus, etiķetes un Tiny Tiny RSS iestatījumus."
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Izmantojot OPML var migrēt tikai galvenos iestatījumus."
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 msgid "Import my OPML"
 msgstr "Importēt manu OPML"
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr "Faila nosaukums:"
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 msgid "Include settings"
 msgstr "Iekļaut iestatījumus"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 msgid "Export OPML"
 msgstr "Eksportēt OPML"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Jūsu OPML var publicēt un to var abonēt katrs, kas zin zemāk minēto saiti."
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
 msgstr "Publicētajā OPML nav iekļauti: jūsu Tiny Tiny RSS iestatījumi, barotnes, kurās nepieciešams autentificēties un arī barotnes, kas ir paslēptas no populārajām barotnēm."
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr "Publiskā OPML URL (adrese)"
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr "Parādīt publicētā OPML URL"
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 msgid "Firefox integration"
 msgstr "Firefox integrācija"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Šo Tiny Tiny RSS vietni var izmantot kā Firefox Feed Reader, klikšķinot uz zemākās saites."
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1423
 msgid "Click here to register this site as a feed reader."
 msgstr "Klikšķiniet šeit, lai reģistrētu šo vietni kā barotņu avotu."
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1431
 msgid "Published & shared articles / Generated feeds"
 msgstr "Publicētie un kopīgotie raksti / sagatavotās barotnes"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 msgid "Published articles and generated feeds"
 msgstr "Publicētie raksti un sagatavotās barotnes"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Publicētie raksti tiek eksportēti kā publiskas RSS barotnes un tās var izmantot katrs, kas zina zemāk minēto saiti."
 
-#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1441
 msgid "Display URL"
 msgstr "Parādīt URL"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr "Attīrīt visus ģenerētos URL"
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 msgid "Articles shared by URL"
 msgstr "Raksti, kas kopīgoti ar URL"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Jūs varat atcelt ar šo URL kopīgotos rakstus šeit."
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 msgid "Unshare all articles"
 msgstr "Atcelt visu rakstu kopīgošanu"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Šajās barotnēs nav bijis jauns saturs vairāk kā 3 mēnešus (sākot ar vecākajām):"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 msgid "Click to edit feed"
 msgstr "Klikšķiniet, lai rediģētu"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 msgid "Unsubscribe from selected feeds"
 msgstr "Atcelt izvēlēto barotņu pasūtīšanu"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "Šīs barotnes netika atjaunotas sekojošu kļūdu dēļ:"
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Pievienojiet vienu derīgu RSS barotni vienā rindā (barotnes netiek pārbaudītas)"
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr "Pasūtāmās barotnes, pa vienai katrā rindā"
+
+#: classes/pref/feeds.php:1789
+msgid "Feeds require authentication."
+msgstr "Barotnēm nepieciešama autentifikācija"
+
 #: plugins/digest/digest_body.php:59
 #, fuzzy
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
@@ -2895,6 +2848,38 @@ msgstr ""
 msgid "Linked"
 msgstr "Saistīts"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr "Instance"
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr "Instances URL"
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+msgid "Access key:"
+msgstr "Pieejas atslēga:"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+msgid "Access key"
+msgstr "Pieejas aslēga"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr "Izmantot to pašu pieejas aslēgu abām saistītajām instancēm."
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+msgid "Generate new key"
+msgstr "Ģenerēt jaunu atslēgu"
+
 #: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "Saites instance"
@@ -2915,6 +2900,10 @@ msgstr "Statuss"
 msgid "Stored feeds"
 msgstr "Saglabātās barotnes"
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr "Izveidot saiti"
+
 #: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "Kopīgot ar URL"
@@ -2945,23 +2934,23 @@ msgstr "Gatavs atjaunošanai."
 msgid "Start update"
 msgstr "Sākt atjaunošanu"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "Vai atzīmēt visus rakstus %s kā lasītus?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Vai atzīmēt visus rakstus %s kā lasītus?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Vai atzīmēt visus rakstus %s kā lasītus?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Vai atzīmēt visus rakstus %s kā lasītus?"
@@ -3761,6 +3750,12 @@ msgstr "Kopīgot ar URL"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr "Lūdzu neaizveriet logu līdz ir pabeigta atjaunošana. Pirms turpināt, izveidojiet jūsu tt-rss mapes rezerves kopiju."
 
+#, fuzzy
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "(%d barotnes)"
+#~ msgstr[1] "(%d barotnes)"
+
 #~ msgid "Notice"
 #~ msgstr "Piezīme"
 
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 50ed6136..6b6066b7 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 da05f72e..b90e55dd 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: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+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"
@@ -256,14 +256,14 @@ msgstr "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine.
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -309,13 +309,13 @@ msgid "All Articles"
 msgstr "Alle artikler"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Favoritter"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Publisert"
@@ -362,7 +362,7 @@ msgstr "Marker nyhetsstrøm som lest"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -373,8 +373,8 @@ msgid "Mark as read"
 msgstr "Marker som lest"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Alle artikler"
 
@@ -434,8 +434,8 @@ msgid "Rescore feed"
 msgstr "Sett poeng på nytt for nyhetskanalene"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Avabonner"
@@ -462,7 +462,7 @@ msgid "Show tag cloud..."
 msgstr "Tag-sky"
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
@@ -492,41 +492,41 @@ msgid "Logout"
 msgstr "Logg ut"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Forlat innstillinger"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Filtre"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Merkelapper"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Brukere"
 
@@ -591,12 +591,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
@@ -611,346 +611,346 @@ msgstr[1] "Favorittartikler"
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Snarveier"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 #, fuzzy
 msgid "Archived articles"
 msgstr "Lagrede artikler"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Navigasjon"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 #, fuzzy
 msgid "Open next feed"
 msgstr "Generert nyhetsstrøm"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 #, fuzzy
 msgid "Open next article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 #, fuzzy
 msgid "Open previous article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 #, fuzzy
 msgid "Article"
 msgstr "Alle artikler"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "Sett som favoritt"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "Sett som publisert"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "Sett som ulest"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Endre stikkord"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Fjerne merkede artikler fra merkelappen?"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Publiser artiklen"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 #, fuzzy
 msgid "Open in new window"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marker som lest"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marker som lest"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 #, fuzzy
 msgid "Scroll down"
 msgstr "Alt ferdig."
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Velg artikkelen under musepekeren"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 #, fuzzy
 msgid "Email article"
 msgstr "Alle artikler"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Fjern artikler"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 #, fuzzy
 msgid "Article selection"
 msgstr "Handlinger for aktive artikler"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 #, fuzzy
 msgid "Select all articles"
 msgstr "Fjern artikler"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 #, fuzzy
 msgid "Select unread"
 msgstr "Slett uleste artikler"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 #, fuzzy
 msgid "Select starred"
 msgstr "Sett som favorittartikkel"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 #, fuzzy
 msgid "Select published"
 msgstr "Slett uleste artikler"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 #, fuzzy
 msgid "Invert selection"
 msgstr "Handlinger for aktive artikler"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Fjern artikler"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Oppdater aktive nyhetsstrømmer"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Rediger nyhetsstrømmen"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Motsatt titteloversikt (eldste først)"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Alle nyhetsstrømmer er oppdatert"
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Marker alle nyhetsstrømmer som lest"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Velg for å slå sammen kategorien"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Tillatt endringer i kategorirekkefølgen?"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 #, fuzzy
 msgid "Go to"
 msgstr "Gå til..."
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 #, fuzzy
 msgid "Fresh"
 msgstr "Oppdater"
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Tag-sky"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 #, fuzzy
 msgid "Other"
 msgstr "Andre:"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Lag merkelapp"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Lag filter"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Vis søkevinduet"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Søkeresultat"
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 #, fuzzy
 msgid "Click to play"
 msgstr "Trykk for å endre"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr "-"
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "Ingen stikkord"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 #, fuzzy
 msgid "Originally from:"
 msgstr "Vis opprinnelig artikkelinnhold"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -959,16 +959,16 @@ msgstr "Nyhetsstrøm"
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 #, fuzzy
 msgid "(edit note)"
 msgstr "Rediger notat"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 #, fuzzy
 msgid "Attachments"
 msgstr "Vedlegg:"
@@ -1261,7 +1261,7 @@ msgstr "Fil:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 #, fuzzy
 msgid "Default profile"
 msgstr "Standard artikkelbegrensning"
@@ -1294,12 +1294,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1309,23 +1309,23 @@ msgstr "Lagre"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1340,10 +1340,10 @@ msgid "Title:"
 msgstr "Tittel:"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "Nettadresse:"
 
@@ -1454,236 +1454,79 @@ msgstr ""
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-#, fuzzy
-msgid "Select"
-msgstr "Velg:"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Alle"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Ingen"
-
-#: classes/dlg.php:63
-#, fuzzy
-msgid "Create profile"
-msgstr "Lag filter"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-#, fuzzy
-msgid "(active)"
-msgstr "Tilpasset"
-
-#: classes/dlg.php:150
-#, fuzzy
-msgid "Remove selected profiles"
-msgstr "Fjerne valgte filtre?"
-
-#: classes/dlg.php:152
-#, fuzzy
-msgid "Activate profile"
-msgstr "Fjerne valgte filtre?"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Lenke til nyhetsstrøm for publiserte artikler"
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generert nyhetsstrøm"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "Oppdateringsprosessen er åpnet for i konfigurasjonsfilen, men prosessen blir ikke kjørt, noe som gjør at ingen nyhetsstrømmer blir oppdatert. Vennligst start prosessen eller konakt administratoren."
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Siste oppdatering:"
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr "TT-RSS har oppdaget at oppdateringsmetoden bruker for lang tid å oppdatere nyhetsstrømmene. Dette kan indikere et krasj eller at noe henger. Vennligst sjekk oppdateringsprosessen eller kontakt vedkommende som innehar nyhetsstrømmen."
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "Matcher:"
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 #, fuzzy
 msgid "All tags."
 msgstr "Ingen stikkord"
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 #, fuzzy
 msgid "Display entries"
 msgstr "Vis nyhetsstrømmer"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr ""
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr ""
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr ""
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-#, fuzzy
-msgid "Access key:"
-msgstr "Tilgangsnivå:"
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-#, fuzzy
-msgid "Access key"
-msgstr "Tilgangsnivå"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr ""
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-#, fuzzy
-msgid "Generate new key"
-msgstr "Generert nyhetsstrøm"
-
-#: classes/dlg.php:455
-#, fuzzy
-msgid "Create link"
-msgstr "Lag"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "Plasser i kategori..."
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Logg inn"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-#, fuzzy
-msgid "Password"
-msgstr "Passord:"
-
-#: classes/dlg.php:499
-#, fuzzy
-msgid "Feeds require authentication."
-msgstr "Denne nyhetsstrømmen krever autentifisering"
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Abonner"
-
 #: classes/feeds.php:68
 #, fuzzy
 msgid "Visit the website"
@@ -1696,7 +1539,7 @@ msgstr "Se nyhetsstrømmene"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 #, fuzzy
 msgid "View as RSS"
 msgstr "Se stikkord"
@@ -1705,10 +1548,42 @@ msgstr "Se stikkord"
 msgid "Select:"
 msgstr "Velg:"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Alle"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Motsatt"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Ingen"
+
 #: classes/feeds.php:101
 #, fuzzy
 msgid "More..."
@@ -1798,90 +1673,120 @@ msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Oppdateringsfeil"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 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:909
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Nyhetsstrøm"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "Plasser i kategori..."
+
+#: classes/feeds.php:984
 #, fuzzy
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Autentifisering"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Logg inn"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+#, fuzzy
+msgid "Password"
+msgstr "Passord:"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "Abonner"
+
+#: classes/feeds.php:1021
 #, fuzzy
 msgid "More feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Søk"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Vis nyhetsstrømmer"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 #, fuzzy
 msgid "Feed archive"
 msgstr "Nyhetsstrømshandlinger"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 #, fuzzy
 msgid "limit:"
 msgstr "Antall:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Fjern"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Begrens søket til:"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Denne nyhetsstrømmen"
 
@@ -2006,8 +1911,8 @@ msgid "Change password to"
 msgstr "Endre passordet til"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Alternativer:"
 
@@ -2048,6 +1953,22 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Varsel om endring av passord"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+#, fuzzy
+msgid "Select"
+msgstr "Velg:"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Lag bruker"
@@ -2184,14 +2105,14 @@ msgid "Combine"
 msgstr ""
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Nullstill passordet"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Tilbakestill poengsummene for artiklene"
 
@@ -2243,7 +2164,7 @@ msgstr "Panelhandlinger"
 msgid "Add action"
 msgstr "Nyhetsstrømshandlinger"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 msgid "[No caption]"
 msgstr "Ingen bildetekst"
 
@@ -2466,268 +2387,296 @@ msgstr "Bruk nyhetsstrømsikoner"
 msgid "Incorrect password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr ""
+
+#: classes/pref/prefs.php:919
+#, fuzzy
+msgid "Create profile"
+msgstr "Lag filter"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+#, fuzzy
+msgid "(active)"
+msgstr "Tilpasset"
+
+#: classes/pref/prefs.php:1006
+#, fuzzy
+msgid "Remove selected profiles"
+msgstr "Fjerne valgte filtre?"
+
+#: classes/pref/prefs.php:1008
+#, fuzzy
+msgid "Activate profile"
+msgstr "Fjerne valgte filtre?"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "Marker for å tillate felt"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Rediger nyhetsstrømmen"
-msgstr[1] "Rediger nyhetsstrømmen"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 #, fuzzy
 msgid "Feed Title"
 msgstr "Tittel"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Oppdater"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "Slett artikler:"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 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:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Skjul fra min nyhetsstrømslisten"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marker alle artikler som leste?"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 #, fuzzy
 msgid "Icon"
 msgstr "Handling"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Alt ferdig."
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Nyhetsstrømsredigerer"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Hele nyhetsstrømmen"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Sletter den valgte nyhetsstrømmen..."
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Avabonner"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 #, fuzzy
 msgid "Categories"
 msgstr "Kategori:"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Add category"
 msgstr "Legger til kategori for nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Rediger kategorier"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 #, fuzzy
 msgid "Remove selected"
 msgstr "Fjerne valgte filtre?"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 #, fuzzy
 msgid "More actions..."
 msgstr "Handlinger..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 #, fuzzy
 msgid "Include settings"
 msgstr "Inkluder i e-postsammendraget"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 #, fuzzy
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 #, fuzzy
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 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:1400
+#: classes/pref/feeds.php:1401
 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:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox integrering"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox ved å trykke på lenken nedenfor."
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1423
 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:1430
+#: classes/pref/feeds.php:1431
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 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:1440
+#: classes/pref/feeds.php:1441
 #, fuzzy
 msgid "Display URL"
 msgstr "Vis stikkord"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "Marker artikkel som favoritt"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Uleste artikler"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 #, fuzzy
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Trykk for å endre"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1789
+#, fuzzy
+msgid "Feeds require authentication."
+msgstr "Denne nyhetsstrømmen krever autentifisering"
+
 #: plugins/digest/digest_body.php:59
 #, fuzzy
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
@@ -3034,6 +2983,41 @@ msgstr ""
 msgid "Linked"
 msgstr "Lenke"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr ""
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr ""
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+#, fuzzy
+msgid "Access key:"
+msgstr "Tilgangsnivå:"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+#, fuzzy
+msgid "Access key"
+msgstr "Tilgangsnivå"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+#, fuzzy
+msgid "Generate new key"
+msgstr "Generert nyhetsstrøm"
+
 #: plugins/instances/init.php:295
 #, fuzzy
 msgid "Link instance"
@@ -3056,6 +3040,11 @@ msgstr ""
 msgid "Stored feeds"
 msgstr "Flere nyhetsstrømmer"
 
+#: plugins/instances/init.php:437
+#, fuzzy
+msgid "Create link"
+msgstr "Lag"
+
 #: plugins/share/init.php:27
 #, fuzzy
 msgid "Share by URL"
@@ -3091,23 +3080,23 @@ msgstr "Siste oppdatering:"
 msgid "Start update"
 msgstr "Siste oppdatering:"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Marker alle artikler i %s som leste?"
@@ -3937,6 +3926,12 @@ msgstr "Marker artikkel som favoritt"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#, fuzzy
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "Rediger nyhetsstrømmen"
+#~ msgstr[1] "Rediger nyhetsstrømmen"
+
 #~ msgid "Notice"
 #~ msgstr "Notis"
 
diff --git a/locale/nl_NL/LC_MESSAGES/messages.mo b/locale/nl_NL/LC_MESSAGES/messages.mo
index eea18c04..2b8326aa 100644
Binary files a/locale/nl_NL/LC_MESSAGES/messages.mo and b/locale/nl_NL/LC_MESSAGES/messages.mo differ
diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po
index b5b0ff3c..a091161c 100644
--- a/locale/nl_NL/LC_MESSAGES/messages.po
+++ b/locale/nl_NL/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TT-RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+0400\n"
 "PO-Revision-Date: 2013-03-23 11:28+0100\n"
 "Last-Translator: Dingoe <translations@gvmelle.com>\n"
 "Language-Team: translations <LL@li.org>\n"
@@ -260,14 +260,14 @@ msgstr "SQL escaping test mislukt. Controleer uw database en de PHP configuratie
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -312,13 +312,13 @@ msgid "All Articles"
 msgstr "Alle artikelen"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Met ster"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Gepubliceerd"
@@ -365,7 +365,7 @@ msgstr "Markeer alle feeds als gelezen"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -376,8 +376,8 @@ msgid "Mark as read"
 msgstr "Markeren als gelezen"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Alle artikelen"
 
@@ -436,8 +436,8 @@ msgid "Rescore feed"
 msgstr "Feed opnieuw score geven"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Abonnement opzeggen"
@@ -463,7 +463,7 @@ msgid "Show tag cloud..."
 msgstr "Toon tagwolk..."
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 msgid "Toggle widescreen mode"
 msgstr "Wisselen breedbeeld modus"
 
@@ -491,41 +491,41 @@ msgid "Logout"
 msgstr "Afmelden"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Sneltoetscombinaties"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Verlaat voorkeuren"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Feeds"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Filters"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Labels"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Gebruikers"
 
@@ -589,12 +589,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS data update script."
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Ongecategoriseerd"
 
@@ -609,310 +609,310 @@ msgstr[1] "%d gearchiveerde artikelen"
 msgid "No feeds found."
 msgstr "Geen feeds gevonden."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Speciaal"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Alle feeds"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Artikelen met ster"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Gepubliceerde artikelen"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Nieuwe artikelen"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr "Gearchiveerde artikelen"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr "Recent gelezen"
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Navigatie"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 msgid "Open next feed"
 msgstr "Open volgende feed"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr "Open voorgaande feed"
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 msgid "Open next article"
 msgstr "Open volgende artikel"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 msgid "Open previous article"
 msgstr "Open voorgaand artikel"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr "Open volgend artikel (lange artikelen niet scrollen)"
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Open vorig artikel (lange artikelen niet scrollen)"
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "toon zoekdialoogvenster"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "In/uitschakelen sterren"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "In/uitschakelen gepubliceerd"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "In/uitschakelen gelezen"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Bewerk tags"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 msgid "Dismiss selected"
 msgstr "Geselecteerde negeren"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 msgid "Dismiss read"
 msgstr "Gelezene negeren"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 msgid "Open in new window"
 msgstr "open in nieuw venster"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr "Hieronder markeren als gelezen"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr "hierboven markeren als gelezen"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 msgid "Scroll down"
 msgstr "Omlaag scrollen"
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr "Omhoog scrollen"
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 msgid "Select article under cursor"
 msgstr "Selecteer artikel onder de cursor"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr "E-mail artikel"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 msgid "Close/collapse article"
 msgstr "Sluiten/inklappen artikel"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "In/uitschakelen origineel  insluiten"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 msgid "Article selection"
 msgstr "Artikelselectie"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr "Selecteer alle artikelen"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 msgid "Select unread"
 msgstr "Selecteer ongelezen"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 msgid "Select starred"
 msgstr "Selecteer met ster"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 msgid "Select published"
 msgstr "Selecteer gepubliceerde"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 msgid "Invert selection"
 msgstr "Omdraaien selectie"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 msgid "Deselect everything"
 msgstr "Deselecteer alles"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 msgid "Refresh current feed"
 msgstr "Ververs huidige feed"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 msgid "Un/hide read feeds"
 msgstr "Toon/Verberg gelezen feeds"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "Abonneer op feed"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Bewerk feed"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 msgid "Reverse headlines"
 msgstr "Draai kopteksten om"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 msgid "Debug feed update"
 msgstr "Debug feed update"
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Markeer alle feeds als gelezen"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 msgid "Un/collapse current category"
 msgstr "Uit/Inklappen huidige categorie"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 msgid "Toggle combined mode"
 msgstr "In/uitschakelen gecombineerde modus"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "In/uitschakelen gecombineerde modus"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 msgid "Go to"
 msgstr "Ga naar"
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 msgid "Fresh"
 msgstr "Nieuw"
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Tag wolk"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 msgid "Other"
 msgstr "Andere"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Aanmaken label"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Aanmaken filter"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 msgid "Un/collapse sidebar"
 msgstr "Uit/Inklappen zijbalk"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 msgid "Show help dialog"
 msgstr "Toon helpdialoogvenster"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr "zoekresultaten: %s"
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr "Klik om af te spelen"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr "Afspelen"
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "geen tags"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Bewerk tags voor dit artikel"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 msgid "Originally from:"
 msgstr "Oorspronkelijk uit:"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr "Feed URL"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -921,15 +921,15 @@ msgstr "Feed URL"
 msgid "Close this window"
 msgstr "Sluit dit venster"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr "(bewerk notitie)"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "Onbekend type"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 msgid "Attachments"
 msgstr "Bijlagen"
 
@@ -1211,7 +1211,7 @@ msgstr "Profiel:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr "Standaard profiel"
 
@@ -1242,12 +1242,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Tags voor dit artikel (komma gescheiden):"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1257,23 +1257,23 @@ msgstr "Opslaan"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -1287,10 +1287,10 @@ msgid "Title:"
 msgstr "Titel:"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "URL:"
 
@@ -1396,221 +1396,75 @@ msgstr ""
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Indien u labels en/of filters heeft geïmporteerd moet u waarschijnlijk te voorkeuren herladen om uw bijgewerkte gegevens te zien."
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr "Selecteer"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Alles"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Niets"
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr "Maak profiel"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-msgid "(active)"
-msgstr "(actief)"
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr "Verwijder geselecteerde profielen"
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr "Activeer profiel"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr "Uw publieke OPML URL is:"
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 msgid "Generate new URL"
 msgstr "Genereer nieuwe URL"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "De update deamon is ingeschakeld in de configuratie, maar het deamon proces loopt niet. Dit voorkomt dat alle feeds wordt bijgewerkt. Start het deamon proces of contacteer de eigenaar van deze instantie."
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Laatste update:"
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr "De update deamon neemt te veel tijd om een feed bij te werken. Dit kan betekenen dat het proces is gescrashed of hangt. Controleer het deamon proces of contacteer de eigenaar van deze instantie."
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "Match:"
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr "Elke"
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 msgid "All tags."
 msgstr "Alle tags."
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr "Welke tags?"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr "Items weergeven"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "u kunt deze feed bekijken als RSS via de volgende URL:"
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Nieuwe versie van Tiny Tiny RSS is beschikbaar (%s)."
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr "U kunt updaten met behulp van de ingebouwde updater in de Voorkeuren of via update.php"
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr "Downloaden"
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr "Fout bij verkrijgen van informatie over de versie, of geen nieuwe versie beschikbaar."
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr "U kunt door de CSS-declaraties aan te passen de kleuren, lettertypen en lay-out van uw huidige thema hier aanpassen. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Dit bestand</a> kan als richtlijn worden gebruikt."
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr "Instantie"
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr "instantie URL"
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-msgid "Access key:"
-msgstr "Toegangssleutel:"
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-msgid "Access key"
-msgstr "Toegangssleutel"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr "Gebruik één toegang-sleutel voor beide gekoppelde instanties."
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-msgid "Generate new key"
-msgstr "Genereer nieuwe sleutel"
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr "Link aanmaken"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Een geldige RSS feed per regel toevoegen (geen feed detectie uitgevoerd)"
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "Plaats in categorie:"
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr "Te abonneren feeds: één per regel"
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "LoginID"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: classes/dlg.php:499
-msgid "Feeds require authentication."
-msgstr "Feeds vereisen authenticatie."
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Abonneren"
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Bezoek de website"
@@ -1621,7 +1475,7 @@ msgstr "Toon als RSS feed"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr "Toon als RSS"
 
@@ -1629,10 +1483,42 @@ msgstr "Toon als RSS"
 msgid "Select:"
 msgstr "Selecteer:"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Alles"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Omkeren"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Niets"
+
 #: classes/feeds.php:101
 msgid "More..."
 msgstr "Meer…"
@@ -1715,84 +1601,113 @@ msgid "No articles found to display."
 msgstr "Geen artikelen gevonden om weer te geven."
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Feeds laatst bijgewerkt op %s"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 msgid "Some feeds have update errors (click for details)"
 msgstr "Sommige feeds hebben update fouten (klik voor details)"
 
-#: classes/feeds.php:922
+#: classes/feeds.php:909
 msgid "No feed selected."
 msgstr "Geen feeds geselecteerd."
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 msgid "Feed or site URL"
 msgstr "Feed of website URL"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "Plaats in categorie:"
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr "Beschikbare feeds"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Authenticatie"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "LoginID"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Deze feed vereist authenticatie."
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "Abonneren"
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr "Meer feeds"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Zoeken"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 msgid "Popular feeds"
 msgstr "Populaire feeds"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 msgid "Feed archive"
 msgstr "Feed archief"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 msgid "limit:"
 msgstr "Beperking:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr "Zoek naar"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Beperk zoeken naar:"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Deze feed"
 
@@ -1915,8 +1830,8 @@ msgid "Change password to"
 msgstr "Wijzig wachtwoord naar"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Opties"
 
@@ -1957,6 +1872,21 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Melding verandering van wachtwoord"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "Selecteer"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Gebruiker aanmaken"
@@ -2085,13 +2015,13 @@ msgid "Combine"
 msgstr "Combineren"
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 msgid "Reset sort order"
 msgstr "Herstel sorteervolgorde"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Artikelen nieuwe score geven"
 
@@ -2139,7 +2069,7 @@ msgstr "Actie opslaan"
 msgid "Add action"
 msgstr "Actie toevoegen"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 #, fuzzy
 msgid "[No caption]"
 msgstr "Onderschrift"
@@ -2347,241 +2277,264 @@ msgstr "Geselecteerd plug-ins inschakelen"
 msgid "Incorrect password"
 msgstr "Onjuist wachtwoord"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr "U kunt door de CSS-declaraties aan te passen de kleuren, lettertypen en lay-out van uw huidige thema hier aanpassen. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Dit bestand</a> kan als richtlijn worden gebruikt."
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr "Maak profiel"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr "(actief)"
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr "Verwijder geselecteerde profielen"
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr "Activeer profiel"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "Aanvinken om veld in te schakelen"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d feeds)"
-msgstr[1] "(%d feeds)"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Feed titel"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Bijwerken"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "Artikelopschoning:"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Hint:</b> U moet uw aanmeld informatie invullen als uw feed authenticatie vereist, behalve voor Twitter feeds."
 
-#: classes/pref/feeds.php:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 msgid "Hide from Popular feeds"
 msgstr "Verbergen voor populaire feeds"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "toevoegen aan e-mail samenvatting"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "Altijd afbeeldingsbijlagen weergeven"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr "Afbeeldingen niet insluiten."
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "Afbeelding lokaal in cache plaatsen"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 msgid "Mark updated articles as unread"
 msgstr "Markeer bijgewerkte artikelen als niet-gelezen"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr "Icon"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr "Vervangen"
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 msgid "Resubscribe to push updates"
 msgstr "Herabonneren voor push updates"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Herstelt PubSubHubbub abonnement status voor gepushte feeds."
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Alles gedaan."
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 msgid "Feeds with errors"
 msgstr "Feeds met fouten"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 msgid "Inactive feeds"
 msgstr "Inactieve feeds"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 msgid "Edit selected feeds"
 msgstr "Bewerk geselecteerde feeds"
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr "Batchmatig abonneren"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 msgid "Categories"
 msgstr "Categorieën"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 msgid "Add category"
 msgstr "Categorie toevoegen"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 msgid "(Un)hide empty categories"
 msgstr "Verberg/Toon lege categorieën"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 msgid "Remove selected"
 msgstr "Verwijder geselecteerde"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 msgid "More actions..."
 msgstr "Meer acties…"
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "Handmatig opschonen"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "Wis feed data"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Met OPML kunt u feeds, filters, labels en Tiny Tiny RSS instellingen exporteren en importeren."
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Alleen het hoofdprofiel van de instellingen kan worden overgebracht met OPML."
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 msgid "Import my OPML"
 msgstr "Importeer mijn OPML"
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 msgid "Include settings"
 msgstr "toevoegingsinstellingen"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 msgid "Export OPML"
 msgstr "OPML exporteren"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Uw OPML kan openbaar worden gepubliceerd en er kan op worden geabonneerd door iedereen die de URL hieronder kent."
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
 msgstr "De gepubliceerde OPML bevatten niet uw Tiny Tiny RSS instellingen, feeds die authenticatie vereisen of feeds verborgen voor Populaire feeds."
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr "Publieke OPML URL"
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr "Gepubliceerde OPML URL weergeven"
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 msgid "Firefox integration"
 msgstr "Firefox integratie"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Deze Tiny Tiny RSS site kan gebruikt worden als een Firefox Feed Reader door op de link hieronder te klikken."
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1423
 msgid "Click here to register this site as a feed reader."
 msgstr "Klik hier om deze site te registreren als een feed reader."
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1431
 msgid "Published & shared articles / Generated feeds"
 msgstr "Gepubliceerde & gedeelde artikelen / Gegenereerde feeds"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 msgid "Published articles and generated feeds"
 msgstr "Gepubliceerde artikelen en gegenereerde feeds"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Gepubliceerde artikelen worden geëxporteerd als publieke RSS-feed en er kan door iedereen die de URL hieronder kent op worden geabonneerd."
 
-#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1441
 msgid "Display URL"
 msgstr "Toon URL"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr "Wis alle gegenereerde URL's"
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 msgid "Articles shared by URL"
 msgstr "Artikelen gedeeld met URL"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "U kunt alle artikelen gedeeld via unieke URL's hier uitschakelen."
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 msgid "Unshare all articles"
 msgstr "Delen alle artikelen teniet doen"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Deze feeds hebben al 3 maanden geen nieuwe inhoud (oudste eerst):"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 msgid "Click to edit feed"
 msgstr "Klik om feed te bewerken"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 msgid "Unsubscribe from selected feeds"
 msgstr "Abonnement opzeggen voor geselecteerde feeds"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "Deze feeds zijn niet bijgewerkt omdat er fouten zijn opgetreden:"
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Een geldige RSS feed per regel toevoegen (geen feed detectie uitgevoerd)"
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr "Te abonneren feeds: één per regel"
+
+#: classes/pref/feeds.php:1789
+msgid "Feeds require authentication."
+msgstr "Feeds vereisen authenticatie."
+
 #: plugins/digest/digest_body.php:59
 #, fuzzy
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
@@ -2866,6 +2819,38 @@ msgstr ""
 msgid "Linked"
 msgstr "Gekoppeld"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr "Instantie"
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr "instantie URL"
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+msgid "Access key:"
+msgstr "Toegangssleutel:"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+msgid "Access key"
+msgstr "Toegangssleutel"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr "Gebruik één toegang-sleutel voor beide gekoppelde instanties."
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+msgid "Generate new key"
+msgstr "Genereer nieuwe sleutel"
+
 #: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "Link instantie"
@@ -2886,6 +2871,10 @@ msgstr "Status"
 msgid "Stored feeds"
 msgstr "Opgeslagen feeds"
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr "Link aanmaken"
+
 #: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "Deel via URL"
@@ -2916,23 +2905,23 @@ msgstr "Klaar voor bijwerken."
 msgid "Start update"
 msgstr "Start update"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "Markeer alle artikelen in %s als gelezen?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Markeer alle artikelen in %s als gelezen?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Markeer alle artikelen in %s als gelezen?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Markeer alle artikelen in %s als gelezen?"
@@ -3718,6 +3707,12 @@ msgstr "Deel artikel via URL"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr "Live updaten is nog experimenteel. Maak een back-up van uw tt-rss map alvorens door te gaan. Typ 'ja' om door te gaan. "
 
+#, fuzzy
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "(%d feeds)"
+#~ msgstr[1] "(%d feeds)"
+
 #~ msgid "Notice"
 #~ msgstr "NB!"
 
diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo
index 2949bf4d..d992ad05 100644
Binary files a/locale/pl_PL/LC_MESSAGES/messages.mo and b/locale/pl_PL/LC_MESSAGES/messages.mo differ
diff --git a/locale/pl_PL/LC_MESSAGES/messages.po b/locale/pl_PL/LC_MESSAGES/messages.po
index 6e3fbbbc..446533e7 100644
--- a/locale/pl_PL/LC_MESSAGES/messages.po
+++ b/locale/pl_PL/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+0400\n"
 "PO-Revision-Date: 2013-03-25 13:25+0100\n"
 "Last-Translator: Mirosław Lach <m.wordpress@lach.waw.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/tt-rss/language/pl/)\n"
@@ -251,14 +251,14 @@ msgstr "Test escape'owania SQL nie powiódł się. Sprawdź konfigurację swojej
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -303,13 +303,13 @@ msgid "All Articles"
 msgstr "Wszystkie artykuły"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Oznaczone gwiazdką"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Opublikowane"
@@ -355,7 +355,7 @@ msgstr "Oznacz kanał jako przeczytany"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -366,8 +366,8 @@ msgid "Mark as read"
 msgstr "Oznacz jako przeczytane"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Wszystkie artykuły"
 
@@ -426,8 +426,8 @@ msgid "Rescore feed"
 msgstr "Przelicz punktację kanału"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Wypisz się"
@@ -453,7 +453,7 @@ msgid "Show tag cloud..."
 msgstr "Pokaż chmurę tagów..."
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 msgid "Toggle widescreen mode"
 msgstr "Przełącz tryb szerokoekranowy"
 
@@ -481,41 +481,41 @@ msgid "Logout"
 msgstr "Wyloguj"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Skróty klawiszowe"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Wyjdź z ustawień"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Kanały"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Filtry"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Etykiety"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Użytkownicy"
 
@@ -579,12 +579,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Skrypt aktualizacji danych Tiny Tiny RSS."
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Bez kategorii"
 
@@ -600,310 +600,310 @@ msgstr[2] "%d zarchiwizowanych artykułów"
 msgid "No feeds found."
 msgstr "Nie znaleziono kanałów."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Specjalne"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Wszystkie kanały"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Artykuły oznaczone gwiazdką"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Opublikowane artykuły"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Świeże artykuły"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr "Zarchiwizowane artykuły"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr "Ostatnio czytane"
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Nawigacja"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 msgid "Open next feed"
 msgstr "Przejdź do następnego kanału"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr "Otwórz poprzedni kanał"
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 msgid "Open next article"
 msgstr "Otwórz następny artykuł"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 msgid "Open previous article"
 msgstr "Otwórz poprzedni artykuł"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr "Otwórz następny artykuł (nie przewijaj długich artykułów)"
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Otwórz poprzeni artykół (nie przewijaj długich artykułów)"
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "Otwórz okno wyszukiwania"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 msgid "Article"
 msgstr "Artykuł"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "Przełącz oznaczenie gwiazdką"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "Przełącz flagę publikacji"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "Przełącz flagę \"przeczytano\""
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Edytuj tagi"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 msgid "Dismiss selected"
 msgstr "Odrzuć wybrane"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 msgid "Dismiss read"
 msgstr "Odrzuć przeczytane"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 msgid "Open in new window"
 msgstr "Otwórz w nowym oknie"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr "Oznacz poniższe jako przeczytane"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr "Oznacz powyższe jako przeczytane"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 msgid "Scroll down"
 msgstr "Przewiń w dół"
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr "Przewiń do góry"
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 msgid "Select article under cursor"
 msgstr "Wybierz artykuł pod kursorem"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr "Prześlij artykuł emailem"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 msgid "Close/collapse article"
 msgstr "Zamknij/zwiń artykuł"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Przełącza flagę \"wbuduj oryginalny artykuł\""
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 msgid "Article selection"
 msgstr "Wybór artykułów"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr "Wybierz wszystkie artykuły"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 msgid "Select unread"
 msgstr "Wybierz nieprzeczytane"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 msgid "Select starred"
 msgstr "Wybierz oznaczone gwiazdką"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 msgid "Select published"
 msgstr "Wybierz opublikowane"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 msgid "Invert selection"
 msgstr "Odwróć zaznaczenie"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 msgid "Deselect everything"
 msgstr "Odznacz wszystko"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Kanał"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 msgid "Refresh current feed"
 msgstr "Odśwież bieżący kanał"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 msgid "Un/hide read feeds"
 msgstr "Pokaż/Ukryj przeczytane kanały"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "Prenumeruj kanał"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Edytuj kanał"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 msgid "Reverse headlines"
 msgstr "Odwróć kolejność nagłówków"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 msgid "Debug feed update"
 msgstr "Testuj aktualizację kanałów"
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Oznacz wszystkie kanały jako przeczytane"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 msgid "Un/collapse current category"
 msgstr "Zwiń/rozwiń bieżącą kategorię"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 msgid "Toggle combined mode"
 msgstr "Przełącz tryb scalony"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Przełącz tryb scalony"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 msgid "Go to"
 msgstr "Idź do"
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 msgid "Fresh"
 msgstr "Świeży"
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Chmura tagów"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 msgid "Other"
 msgstr "Inne"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Utwórz etykietę"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Utwórz filtr"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 msgid "Un/collapse sidebar"
 msgstr "Zwin/rozwiń pasek boczny"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 msgid "Show help dialog"
 msgstr "Otwórz okno pomocy"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr "Wyniki wyszukiwania: %s"
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr "Wciśnij aby odtworzyć"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr "Odtwórz"
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "brak tagów"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Edytuj tagi dla tego artykułu"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 msgid "Originally from:"
 msgstr "Oryginał pochodzi z:"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr "Adres kanału"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -912,15 +912,15 @@ msgstr "Adres kanału"
 msgid "Close this window"
 msgstr "Zamknij to okno"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr "(edytuj notatkę)"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "nieznany typ"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 msgid "Attachments"
 msgstr "Załączniki"
 
@@ -1200,7 +1200,7 @@ msgstr "Profil:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr "Domyślny profil"
 
@@ -1231,12 +1231,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Tagi dla tego artykułu (oddzielone przecinkami):"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1246,23 +1246,23 @@ msgstr "Zapisz"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1276,10 +1276,10 @@ msgid "Title:"
 msgstr "Tytuł:"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "Adres:"
 
@@ -1384,221 +1384,75 @@ msgstr "Przykro mi, podana kombinacja nazwy użytkownika i adresu email nie zost
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Jeżeli posiadasz zaimportowane etykiety i/lub filtry, aby zobaczyć nowe dane możesz musieć przeładować ustawienia."
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr "Wybierz"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Wszystko"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Nic"
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr "Utwórz profil"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-msgid "(active)"
-msgstr "(aktywny)"
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr "Usuń wybrane profile"
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr "Aktywuj profil"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr "Twój publiczny adres OPML to:"
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 msgid "Generate new URL"
 msgstr "Wygeneruj nowy adres"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "W konfiguracji wybrano wykorzystywanie zewnętrznego procesu aktualizacji, jednak proces ten nie działa co powoduje iż kanały nie są aktualizowane. Proszę uruchomić zewnętrzny proces aktualizacji lub skontaktować się z właścicielem tej instalacji."
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Ostatnia aktualizacja:"
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr "Aktualizacja kanału z wykorzystaniem zewnętrznego procesu aktualizacji trwa zbyt długo. Może to wskazywać na jego awarię/unieruchomienie (crash) lub zawieszenie. Sprawdź poprawność działania zewnętrznego procesu aktualizacji lub skontaktuj się z właścicielem tej instalacji."
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "Dopasuj:"
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr "Dowolny"
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 msgid "All tags."
 msgstr "Wszystkie znaczniki"
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr "Które tagi?"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr "Wyświetl wpisy"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Możesz obejrzeć ten kanał jako RSS korzystając z adresu:"
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Dostępna jest nowa wersja Tiny Tiny RSS (%s)."
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr "Możesz przeprowadzić aktualizację wykorzystując wbudowany aktualizator dostępny w Ustawieniach lub korzystając z update.php"
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr "Pobierz"
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr "Błąd podczas odbierania informacji o wersji lub brak dostępnej nowej wersji."
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr "Możesz nadpisać ustawienia kolorów, czcionek i układu wybranego stylu przy użyciu własnych deklaracji CSS. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Ten plik</a> może posłużyć jako przykład."
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr "Instancja"
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr "Adres instancji:"
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-msgid "Access key:"
-msgstr "Klucz dostępu:"
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-msgid "Access key"
-msgstr "Klucz dostępu"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr "Użyj jednego klucza dostępu dla obydwóch połączonych instancji."
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-msgid "Generate new key"
-msgstr "Wygeneruj nowy klucz"
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr "Utwórz łącze"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "Wpisz jeden prawidłowy adres kanału RSS w każdej linii (nie jest przeprowadzana automatyczna detekcja adresu kanału)"
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "Umieść w kategorii:"
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr "Kanały do prenumeraty. Każdy w osobnej linii"
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Nazwa użytkownika"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-msgid "Password"
-msgstr "Hasło"
-
-#: classes/dlg.php:499
-msgid "Feeds require authentication."
-msgstr "Kanały wymagają uwierzytelniania."
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Prenumeruj"
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Odwiedź stronę internetową"
@@ -1609,7 +1463,7 @@ msgstr "Zobacz jako kanał RSS"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr "Wyświetl jako RSS"
 
@@ -1617,10 +1471,42 @@ msgstr "Wyświetl jako RSS"
 msgid "Select:"
 msgstr "Wybierz: "
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Wszystko"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Odwróć"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Nic"
+
 #: classes/feeds.php:101
 msgid "More..."
 msgstr "Więcej..."
@@ -1703,84 +1589,113 @@ msgid "No articles found to display."
 msgstr "Nie znaleziono artykułów."
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Kanały ostatnio uaktualnione o %s"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 msgid "Some feeds have update errors (click for details)"
 msgstr "Wystąpiły błędy aktualizacji niektórych kanałów (kliknij aby zobaczyć szczegóły)"
 
-#: classes/feeds.php:922
+#: classes/feeds.php:909
 msgid "No feed selected."
 msgstr "Nie wybrano kanału."
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 msgid "Feed or site URL"
 msgstr "Adres kanału lub strony"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "Umieść w kategorii:"
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr "Dostępne kanały"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Nazwa użytkownika"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr "Hasło"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Ten kanał wymaga uwierzytelniania."
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "Prenumeruj"
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr "Więcej kanałów"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Szukaj"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 msgid "Popular feeds"
 msgstr "Popularne kanały"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 msgid "Feed archive"
 msgstr "Archiwum kanału"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 msgid "limit:"
 msgstr "limit:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Usuń"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr "Szukaj napisu"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Ogranicz wyszukiwanie do:"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Ten kanał"
 
@@ -1903,8 +1818,8 @@ msgid "Change password to"
 msgstr "Zmień hasło na"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Opcje"
 
@@ -1941,6 +1856,21 @@ msgstr "Wysyłam nowe hasło dla użytkownika <b>%s</b> na adres <b>%s</b>"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Informacja o zmianie hasła"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "Wybierz"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Utwórz użytkownika"
@@ -2069,13 +1999,13 @@ msgid "Combine"
 msgstr "Połącz"
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 msgid "Reset sort order"
 msgstr "Zresetuj porządek sortowania"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Przywróć artykuły"
 
@@ -2124,7 +2054,7 @@ msgstr "Zapisz działanie"
 msgid "Add action"
 msgstr "Dodaj działania"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 #, fuzzy
 msgid "[No caption]"
 msgstr "Opis"
@@ -2332,242 +2262,264 @@ msgstr "Włącz wybrane wtyczki"
 msgid "Incorrect password"
 msgstr "Nieprawidłowe hasło"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr "Możesz nadpisać ustawienia kolorów, czcionek i układu wybranego stylu przy użyciu własnych deklaracji CSS. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Ten plik</a> może posłużyć jako przykład."
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr "Utwórz profil"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr "(aktywny)"
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr "Usuń wybrane profile"
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr "Aktywuj profil"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "Zaznacz aby uaktywnić pole"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d kanał)"
-msgstr[1] "(%d kanały)"
-msgstr[2] "(%d kanałów)"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Tytuł kanału"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "Czyszczenie artykułów:"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Wskazówka:</b> musisz wypełnić dane logowania jeżeli Twój kanał wymaga uwierzytelniania. Nie dotyczy to kanałów z Twittera."
 
-#: classes/pref/feeds.php:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 msgid "Hide from Popular feeds"
 msgstr "Ukryj przed umieszczeniem w Popularnych kanałach"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "Umieść w przeglądzie emailowym"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "Zawsze wyświetlaj załączniki graficzne"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr "Nie osadzaj obrazków"
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "Przechowuj obrazki lokalnie"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 msgid "Mark updated articles as unread"
 msgstr "Oznacz zaktualizowane artykuły jako nieprzeczytane"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr "Ikona"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr "Zamień"
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 msgid "Resubscribe to push updates"
 msgstr "Odnów prenumeratę aktualizacji typu PUSH"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Resetuje status prenumerat PubSubHubbub dla kanałów obsługujących PUSH."
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Zrobione."
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 msgid "Feeds with errors"
 msgstr "Kanały z błędami"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 msgid "Inactive feeds"
 msgstr "Nieaktywne kanały"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 msgid "Edit selected feeds"
 msgstr "Edytuj wybrane kanały"
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr "Prenumerata wsadowa"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 msgid "Categories"
 msgstr "Kategorie"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 msgid "Add category"
 msgstr "Dodaj kategorię"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 msgid "(Un)hide empty categories"
 msgstr "Pokaż/Ukryj puste kategorie"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 msgid "Remove selected"
 msgstr "Usuń wybrane"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 msgid "More actions..."
 msgstr "Więcej działań..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "Czyszczenie ręczne"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "Wyczyść dane kanału"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Korzystając z OPML możesz eksportować i importować kanały, filtry, etykiety i ustawienia Tiny Tiny RSS."
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Tylko główne ustawienia profilu mogą być migrowane korzystając z OPML."
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 msgid "Import my OPML"
 msgstr "Importuj mój OPML"
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 msgid "Include settings"
 msgstr "Załącz ustawienia"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 msgid "Export OPML"
 msgstr "Eksportuj OPML"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Twój OPML może zostać opublikowany i być prenumerowany przez każdego kto zna poniższy adres."
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
 msgstr "Opublikowany OPML nie zawiera ustawień Twojego Tiny Tiny RSS, kanałów wymagających uwierzytelniania i kanałów ukrytych przed umieszczeniem w Popularnych kanałach."
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr "Publiczny adres OPML"
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr "Wyświetl opublikowany adres OPML"
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 msgid "Firefox integration"
 msgstr "Integracja z Firefoxem"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Tiny Tiny RSS może być ustawiona jako domyślny czytnik kanałów w Firefoxie poprzez kliknięcie odnośnika poniżej."
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1423
 msgid "Click here to register this site as a feed reader."
 msgstr "Kliknij tutaj aby ustawić tę stronę jako czytnik kanałów."
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1431
 msgid "Published & shared articles / Generated feeds"
 msgstr "Opublikowane i udostępnione artykuły / Wygenerowane kanały"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 msgid "Published articles and generated feeds"
 msgstr "Opublikowane artykuły i wygenerowane kanały"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Opublikowane artykuły są eksportowane jako publiczny kanał RSS i mogą być prenumerowane przez każdego kto zna adres podany poniżej."
 
-#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1441
 msgid "Display URL"
 msgstr "Wyświetl adres"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr "Wyczyść wszystkie wygenerowane adresy"
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 msgid "Articles shared by URL"
 msgstr "Wszystkie artykuły udostępnione przez adresy"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Możesz wyłączyć wszystkie unikalne adresy prowadzące do udostępnionych artykułów."
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 msgid "Unshare all articles"
 msgstr "Zakończ udostępnianie wszystkich artykułów"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Niniejsze kanały nie zostały uaktualnione przez 3 miesiące (najstarsze pierwsze):"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 msgid "Click to edit feed"
 msgstr "Kliknij aby edytować kanał"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 msgid "Unsubscribe from selected feeds"
 msgstr "Zakończ prenumeratę wybranych kanałów:"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "Te kanały nie zostały uaktualnione ponieważ wystąpiły błędy:"
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "Wpisz jeden prawidłowy adres kanału RSS w każdej linii (nie jest przeprowadzana automatyczna detekcja adresu kanału)"
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr "Kanały do prenumeraty. Każdy w osobnej linii"
+
+#: classes/pref/feeds.php:1789
+msgid "Feeds require authentication."
+msgstr "Kanały wymagają uwierzytelniania."
+
 #: plugins/digest/digest_body.php:59
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
 msgstr "Twoja przeglądarka nie obsługuje Javascript, który jest wymagany aby aplikacja działała poprawnie. Proszę sprawdź ustawienia swojej przeglądarki."
@@ -2849,6 +2801,38 @@ msgstr ""
 msgid "Linked"
 msgstr "Połączone instancje"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr "Instancja"
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr "Adres instancji:"
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+msgid "Access key:"
+msgstr "Klucz dostępu:"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+msgid "Access key"
+msgstr "Klucz dostępu"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr "Użyj jednego klucza dostępu dla obydwóch połączonych instancji."
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+msgid "Generate new key"
+msgstr "Wygeneruj nowy klucz"
+
 #: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "Połącz instalację"
@@ -2869,6 +2853,10 @@ msgstr "Status"
 msgid "Stored feeds"
 msgstr "Zapisane kanały"
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr "Utwórz łącze"
+
 #: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "Udostępnij adres"
@@ -2899,23 +2887,23 @@ msgstr "Gotowy do aktualizacji."
 msgid "Start update"
 msgstr "Rozpocznik aktualizację"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "Oznaczyć wszystkie artykuły w %s jako przeczytane?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Oznaczyć wszystkie artykuły w %s jako przeczytane?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Oznaczyć wszystkie artykuły w %s jako przeczytane?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Oznaczyć wszystkie artykuły w %s jako przeczytane?"
@@ -3669,6 +3657,12 @@ msgstr "Udostępnij artykuł"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr "Aktualizacja \"na żywo\" jest uznawana za funkcję eksperymentalną. Wykonaj kopię swojego katalogu tt-rss przed kontynuowaniem. Wpisz 'yes' aby kontynuować."
 
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "(%d kanał)"
+#~ msgstr[1] "(%d kanały)"
+#~ msgstr[2] "(%d kanałów)"
+
 #~ msgid "Notice"
 #~ msgstr "Uwaga"
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index bcbe429e..6110ee5a 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 99e92488..5ca792d9 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: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+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"
@@ -252,14 +252,14 @@ msgstr ""
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -306,13 +306,13 @@ msgid "All Articles"
 msgstr ""
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Favoritos"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Publicado"
@@ -360,7 +360,7 @@ msgstr "Marcar como lido"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -371,8 +371,8 @@ msgid "Mark as read"
 msgstr "Marcar como lido"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 #, fuzzy
 msgid "All articles"
 msgstr "Favoritos"
@@ -435,8 +435,8 @@ msgid "Rescore feed"
 msgstr "Removendo o Feed..."
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr ""
@@ -463,7 +463,7 @@ msgid "Show tag cloud..."
 msgstr "núvem de tags"
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Remover as categorias selecionadas?"
@@ -495,44 +495,44 @@ msgid "Logout"
 msgstr "Sair"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Preferências"
 
-#: prefs.php:111
+#: prefs.php:112
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Sair das preferências"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 #, fuzzy
 msgid "Feeds"
 msgstr "Feed"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 #, fuzzy
 msgid "Filters"
 msgstr "Arquivo:"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr ""
 
-#: prefs.php:133
+#: prefs.php:134
 #, fuzzy
 msgid "Users"
 msgstr "Usuário"
@@ -599,12 +599,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
@@ -620,350 +620,350 @@ msgstr[1] "Favoritos"
 msgid "No feeds found."
 msgstr "Sem Feeds para exibir."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Especial"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr ""
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr ""
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr ""
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 #, fuzzy
 msgid "Archived articles"
 msgstr "Favoritos"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 #, fuzzy
 msgid "Navigation"
 msgstr "Salvar configuração"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 msgid "Open next feed"
 msgstr ""
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 #, fuzzy
 msgid "Open next article"
 msgstr "Favoritos"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 #, fuzzy
 msgid "Open previous article"
 msgstr "Favoritos"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 #, fuzzy
 msgid "Show search dialog"
 msgstr "Favoritos"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 #, fuzzy
 msgid "Article"
 msgstr "Feed não encontrado."
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 #, fuzzy
 msgid "Toggle starred"
 msgstr "Marcar como favorito"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 #, fuzzy
 msgid "Toggle published"
 msgstr "Publicado"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr ""
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 #, fuzzy
 msgid "Edit tags"
 msgstr "Editar Tags"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Remover os filtros selecionados?"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Favoritos"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marcar como lido"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marcar como lido"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 msgid "Scroll down"
 msgstr ""
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Favoritos"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 #, fuzzy
 msgid "Email article"
 msgstr "Favoritos"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Favoritos"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Remover as categorias selecionadas?"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 #, fuzzy
 msgid "Article selection"
 msgstr "Favoritos"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 #, fuzzy
 msgid "Select all articles"
 msgstr "Favoritos"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 #, fuzzy
 msgid "Select unread"
 msgstr "Favoritos"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 #, fuzzy
 msgid "Select starred"
 msgstr "Marcar como favorito"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 #, fuzzy
 msgid "Select published"
 msgstr "Favoritos"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 #, fuzzy
 msgid "Invert selection"
 msgstr "Favoritos"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Favoritos"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Favoritos"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Favoritos"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr ""
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 #, fuzzy
 msgid "Edit feed"
 msgstr "Editar"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Remover as categorias selecionadas?"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Desabilitar updates"
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 #, fuzzy
 msgid "Mark all feeds as read"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Salvando categoria..."
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Remover as categorias selecionadas?"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Remover as categorias selecionadas?"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 msgid "Go to"
 msgstr ""
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Núvem de tags"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 #, fuzzy
 msgid "Other"
 msgstr "Onde:"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr ""
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr ""
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Todos os feeds"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Favoritos"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 #, fuzzy
 msgid "Click to play"
 msgstr "Favoritos"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 #, fuzzy
 msgid " - "
 msgstr " - por "
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "sem tags"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 #, fuzzy
 msgid "Edit tags for this article"
 msgstr "Favoritos"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 #, fuzzy
 msgid "Originally from:"
 msgstr "Favoritos"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -972,16 +972,16 @@ msgstr "Feed"
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 #, fuzzy
 msgid "unknown type"
 msgstr "Erro desconhecido"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 #, fuzzy
 msgid "Attachments"
 msgstr "Conteúdo"
@@ -1272,7 +1272,7 @@ msgstr "Arquivo:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 #, fuzzy
 msgid "Default profile"
 msgstr "Padrão"
@@ -1306,12 +1306,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr ""
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1321,23 +1321,23 @@ msgstr "Salvar"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1352,10 +1352,10 @@ msgid "Title:"
 msgstr "Título"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 #, fuzzy
 msgid "URL:"
 msgstr "Feed URL:"
@@ -1466,234 +1466,77 @@ msgstr ""
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-#, fuzzy
-msgid "Select"
-msgstr "Selecione:"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Todos"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Nenhum"
-
-#: classes/dlg.php:63
-#, fuzzy
-msgid "Create profile"
-msgstr "Criar um usuário"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-msgid "(active)"
-msgstr ""
-
-#: classes/dlg.php:150
-#, fuzzy
-msgid "Remove selected profiles"
-msgstr "Remover os filtros selecionados?"
-
-#: classes/dlg.php:152
-#, fuzzy
-msgid "Activate profile"
-msgstr "Remover os filtros selecionados?"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Gerar um outro endereço"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr ""
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr ""
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 #, fuzzy
 msgid "All tags."
 msgstr "sem tags"
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr ""
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr ""
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr ""
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr ""
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-#, fuzzy
-msgid "Access key:"
-msgstr "Nível de acesso:"
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-#, fuzzy
-msgid "Access key"
-msgstr "Nível de acesso:"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr ""
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-#, fuzzy
-msgid "Generate new key"
-msgstr "Gerar um outro endereço"
-
-#: classes/dlg.php:455
-#, fuzzy
-msgid "Create link"
-msgstr "Criar"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-#, fuzzy
-msgid "Place in category:"
-msgstr "Salvando categoria..."
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Login"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-#, fuzzy
-msgid "Password"
-msgstr "Senha:"
-
-#: classes/dlg.php:499
-#, fuzzy
-msgid "Feeds require authentication."
-msgstr "Este feed requer autenticação."
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr ""
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr ""
@@ -1705,7 +1548,7 @@ msgstr "Todos os feeds"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 #, fuzzy
 msgid "View as RSS"
 msgstr "Editar Tags"
@@ -1714,11 +1557,43 @@ msgstr "Editar Tags"
 msgid "Select:"
 msgstr "Selecione:"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Todos"
+
 #: classes/feeds.php:94
 #, fuzzy
 msgid "Invert"
 msgstr "(Inverso)"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Nenhum"
+
 #: classes/feeds.php:101
 #, fuzzy
 msgid "More..."
@@ -1814,90 +1689,121 @@ msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Atualizar"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 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:909
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Feed"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+#, fuzzy
+msgid "Place in category:"
+msgstr "Salvando categoria..."
+
+#: classes/feeds.php:984
 #, fuzzy
 msgid "Available feeds"
 msgstr "Todos os feeds"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr ""
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Login"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+#, fuzzy
+msgid "Password"
+msgstr "Senha:"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Este feed requer autenticação."
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr ""
+
+#: classes/feeds.php:1021
 #, fuzzy
 msgid "More feeds"
 msgstr "Removendo o Feed..."
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr ""
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Todos os feeds"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 #, fuzzy
 msgid "Feed archive"
 msgstr "Ações do Feed:"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 #, fuzzy
 msgid "limit:"
 msgstr "Limite:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Remover"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr ""
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr ""
 
@@ -2032,8 +1938,8 @@ msgid "Change password to"
 msgstr "Mudar senha"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 #, fuzzy
 msgid "Options"
 msgstr "Opções:"
@@ -2076,6 +1982,22 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+#, fuzzy
+msgid "Select"
+msgstr "Selecione:"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Criar um usuário"
@@ -2215,14 +2137,14 @@ msgid "Combine"
 msgstr ""
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Remover as categorias selecionadas?"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Favoritos"
@@ -2277,7 +2199,7 @@ msgstr "Ações do Feed:"
 msgid "Add action"
 msgstr "Ações do Feed:"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 #, fuzzy
 msgid "[No caption]"
 msgstr "Opções:"
@@ -2502,267 +2424,294 @@ msgstr "Editar categorias"
 msgid "Incorrect password"
 msgstr "Senha nova"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr ""
+
+#: classes/pref/prefs.php:919
+#, fuzzy
+msgid "Create profile"
+msgstr "Criar um usuário"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr ""
+
+#: classes/pref/prefs.php:1006
+#, fuzzy
+msgid "Remove selected profiles"
+msgstr "Remover os filtros selecionados?"
+
+#: classes/pref/prefs.php:1008
+#, fuzzy
+msgid "Activate profile"
+msgstr "Remover os filtros selecionados?"
+
+#: classes/pref/feeds.php:13
 #, fuzzy
 msgid "Check to enable field"
 msgstr "Favoritos"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "Editar"
-msgstr[1] "Editar"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 #, fuzzy
 msgid "Feed Title"
 msgstr "Título"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Atualizar"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 #, fuzzy
 msgid "Article purging:"
 msgstr "Feed não encontrado."
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 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:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Todos os feeds"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 #, fuzzy
 msgid "Include in e-mail digest"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr ""
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 #, fuzzy
 msgid "Icon"
 msgstr "Ação"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Removendo o Feed..."
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr ""
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de Feed"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Editar"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Removendo filtros selecionados…"
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 #, fuzzy
 msgid "Categories"
 msgstr "Categoria:"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Add category"
 msgstr "Adicionando o Feed..."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Editar categorias"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 #, fuzzy
 msgid "Remove selected"
 msgstr "Remover os filtros selecionados?"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 #, fuzzy
 msgid "More actions..."
 msgstr "Ações..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr ""
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 #, fuzzy
 msgid "Clear feed data"
 msgstr "Salvando o Feed..."
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Importando OPML (usando a extensão DOMXML)..."
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 msgid "Include settings"
 msgstr ""
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 #, fuzzy
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 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:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Informações do Feed:"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr ""
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1423
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1431
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Remover os filtros selecionados?"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Remover os filtros selecionados?"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 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:1440
+#: classes/pref/feeds.php:1441
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "Favoritos"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Favoritos"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Favoritos"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Removendo o Feed..."
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1789
+#, fuzzy
+msgid "Feeds require authentication."
+msgstr "Este feed requer autenticação."
+
 #: plugins/digest/digest_body.php:59
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
 msgstr ""
@@ -3060,6 +3009,41 @@ msgstr ""
 msgid "Linked"
 msgstr "Link"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr ""
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr ""
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+#, fuzzy
+msgid "Access key:"
+msgstr "Nível de acesso:"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+#, fuzzy
+msgid "Access key"
+msgstr "Nível de acesso:"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+#, fuzzy
+msgid "Generate new key"
+msgstr "Gerar um outro endereço"
+
 #: plugins/instances/init.php:295
 #, fuzzy
 msgid "Link instance"
@@ -3082,6 +3066,11 @@ msgstr ""
 msgid "Stored feeds"
 msgstr "Removendo o Feed..."
 
+#: plugins/instances/init.php:437
+#, fuzzy
+msgid "Create link"
+msgstr "Criar"
+
 #: plugins/share/init.php:27
 #, fuzzy
 msgid "Share by URL"
@@ -3116,24 +3105,24 @@ msgstr "Atualizado"
 msgid "Start update"
 msgstr "Atualizado"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Marcando todos os feeds como lidos..."
@@ -3990,6 +3979,12 @@ msgstr "Favoritos"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#, fuzzy
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "Editar"
+#~ msgstr[1] "Editar"
+
 #, fuzzy
 #~ msgid "Tag Cloud"
 #~ msgstr "Núvem de tags"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 2540daa5..dcf4beda 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 ad46d9ba..54bb4fde 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: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+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"
@@ -256,14 +256,14 @@ msgstr "неудавшийся тест экранирования SQL, пров
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -308,13 +308,13 @@ msgid "All Articles"
 msgstr "Все статьи"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Отмеченные"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Опубликован"
@@ -360,7 +360,7 @@ msgstr "Отметить канал как прочитанный"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -371,8 +371,8 @@ msgid "Mark as read"
 msgstr "Как прочитанные"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "Все статьи"
 
@@ -432,8 +432,8 @@ msgid "Rescore feed"
 msgstr "Заново оценить канал"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Отписаться"
@@ -459,7 +459,7 @@ msgid "Show tag cloud..."
 msgstr "Показать облако тегов..."
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "Переключить изменение режима категории"
@@ -488,41 +488,41 @@ msgid "Logout"
 msgstr "Выход"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "Настройки"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "Горячие Клавиши"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "Закрыть настройки"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "Каналы"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "Фильтры"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "Метки"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "Пользователи"
 
@@ -587,12 +587,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS база данных обновлена."
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "Нет категории"
 
@@ -608,339 +608,339 @@ msgstr[2] "Отмеченные"
 msgid "No feeds found."
 msgstr "Каналы не найдены."
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Особые"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "Свежие"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr "Архив статей"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "Навигация"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 #, fuzzy
 msgid "Open next feed"
 msgstr "Генерировать канал"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 #, fuzzy
 msgid "Open next article"
 msgstr "Показать оригинальное содержимое статьи"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 #, fuzzy
 msgid "Open previous article"
 msgstr "Показать оригинальное содержимое статьи"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "Показать диалог поиска"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 #, fuzzy
 msgid "Article"
 msgstr "Все статьи"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "Изм. отмеченное"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "Отметить / снять отметку"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "Прочитано / не прочитано"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "Редактировать теги"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Скрыть выбранные статьи"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Опубликовать"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 #, fuzzy
 msgid "Open in new window"
 msgstr "Открыть статью в новом окне"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr "Отметить статьи ниже как прочитанные"
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr "Отметить статьи выше как прочитанные"
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 #, fuzzy
 msgid "Scroll down"
 msgstr "Всё выполнено."
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Выбрать статью под курсором мыши"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr "Отправить по почте"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Закрыть статью"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Переключить изменение режима категории"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 #, fuzzy
 msgid "Article selection"
 msgstr "Инвертировать выделение"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr "Выбрать все статьи"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 #, fuzzy
 msgid "Select unread"
 msgstr "Выбрать непрочитанные статьи"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 #, fuzzy
 msgid "Select starred"
 msgstr "Отметить"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 #, fuzzy
 msgid "Select published"
 msgstr "Выбрать непрочитанные статьи"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 #, fuzzy
 msgid "Invert selection"
 msgstr "Инвертировать выделение"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 #, fuzzy
 msgid "Deselect everything"
 msgstr "Очистить выделение статей"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "Канал"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "Обновить активный канал"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "Показать/скрыть прочитанные"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Редактировать канал"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Обратный порядок заголовков"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 #, fuzzy
 msgid "Debug feed update"
 msgstr "Все каналы обновлены."
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Отметить все каналы как прочитанные"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "Щёлкните, чтобы развернуть категорию"
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "Переключить изменение режима категории"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Переключить изменение режима категории"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 #, fuzzy
 msgid "Go to"
 msgstr "Перейти к.."
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 #, fuzzy
 msgid "Fresh"
 msgstr "Обновить"
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "Облако тегов"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 #, fuzzy
 msgid "Other"
 msgstr "Другой:"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Создать метку"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "Развернуть боковую панель"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 #, fuzzy
 msgid "Show help dialog"
 msgstr "Показать диалог поиска"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, fuzzy, php-format
 msgid "Search results: %s"
 msgstr "Результаты поиска"
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr "Щёлкните для проигрывания"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr "Играть"
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "нет тегов"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "Редактировать теги статьи"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 msgid "Originally from:"
 msgstr "Оригинал:"
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 #, fuzzy
 msgid "Feed URL"
 msgstr "Канал"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -949,16 +949,16 @@ msgstr "Канал"
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 #, fuzzy
 msgid "(edit note)"
 msgstr "править заметку"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "неизвестный тип"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 #, fuzzy
 msgid "Attachments"
 msgstr "Вложения:"
@@ -1245,7 +1245,7 @@ msgstr "Профиль:"
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr "Профиль по умолчанию"
 
@@ -1276,12 +1276,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1291,23 +1291,23 @@ msgstr "Сохранить"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -1322,10 +1322,10 @@ msgid "Title:"
 msgstr "Заголовок:"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "URL:"
 
@@ -1436,233 +1436,82 @@ msgstr ""
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr "Если вы импортировали метки или фильтры, вам возможно придется перезагрузить настройки чтобы увидеть новые данные."
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr "Выбрать"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "Все"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "Ничего"
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr "Создать профиль"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-#, fuzzy
-msgid "(active)"
-msgstr "Адаптивно"
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr "Удалить выбранные профили?"
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr "Активировать профиль"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr "Ссылка на ваш опубликованный OPML:"
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 msgid "Generate new URL"
 msgstr "Создать новую ссылку"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr ""
 "Демон обновлений разрешён в вашей конфигурации, но процесс демона не запущен. Он необходим для обновления всех каналов.\n"
 "Пожалуйста, запустите демон обновлений или сообщите администратору."
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "Последнее обновление:"
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr ""
 "Tiny Tiny RSS определил что демон обновлений не работает уже очень давно.\n"
 "Это обозначает что существует проблема подобная краху или зависанию демона.\n"
 "Пожалуйста проверьте процесс демона или сообщите администратору."
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "Поиск:"
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 #, fuzzy
 msgid "All tags."
 msgstr "нет тегов"
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 #, fuzzy
 msgid "Display entries"
 msgstr "показать каналы"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Доступна новая версия Tiny Tiny RSS (%s)."
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr ""
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr "Скачать"
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr "Инсталляция"
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr "URL инсталляции"
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-#, fuzzy
-msgid "Access key:"
-msgstr "Уровень доступа:"
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-#, fuzzy
-msgid "Access key"
-msgstr "Уровень доступа:"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr "Используйте один ключ доступа для обоих инсталляций"
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-#, fuzzy
-msgid "Generate new key"
-msgstr "Генерировать канал"
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr "Создать ссылку"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "Поместить в категорию:"
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "Пользователь:"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-msgid "Password"
-msgstr "Пароль"
-
-#: classes/dlg.php:499
-#, fuzzy
-msgid "Feeds require authentication."
-msgstr "Этот канал требует авторизации."
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "Подписаться"
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr "Посетить официальный сайт"
@@ -1673,7 +1522,7 @@ msgstr "Показать в формате RSS"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr "Показать в формате RSS"
 
@@ -1681,10 +1530,42 @@ msgstr "Показать в формате RSS"
 msgid "Select:"
 msgstr "Выбрать:"
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "Все"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "Инвертировать"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "Ничего"
+
 #: classes/feeds.php:101
 #, fuzzy
 msgid "More..."
@@ -1770,88 +1651,117 @@ msgid "No articles found to display."
 msgstr "Статей не найдено."
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Последнее обновление в %s"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
 
-#: classes/feeds.php:922
+#: classes/feeds.php:909
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "Канал"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "Поместить в категорию:"
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr "Доступные каналы"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "Авторизация"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "Пользователь:"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr "Пароль"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "Этот канал требует авторизации."
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "Подписаться"
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr "Другие каналы"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Поиск"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 #, fuzzy
 msgid "Popular feeds"
 msgstr "показать каналы"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 #, fuzzy
 msgid "Feed archive"
 msgstr "Действия над каналом:"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 #, fuzzy
 msgid "limit:"
 msgstr "Сколько:"
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Удалить"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "Ограничить поиск:"
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "Этот канал"
 
@@ -1975,8 +1885,8 @@ msgid "Change password to"
 msgstr "Изменить пароль на"
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "Опции:"
 
@@ -2013,6 +1923,21 @@ msgstr "Пароль пользователя <b>%s</b> изменен на <b>%
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Уведомление о смене пароля"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "Выбрать"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "Добавить пользователя"
@@ -2145,13 +2070,13 @@ msgid "Combine"
 msgstr ""
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 msgid "Reset sort order"
 msgstr "Сбросить сортировку"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "Заново оценить статьи"
 
@@ -2203,7 +2128,7 @@ msgstr "Действия над каналами"
 msgid "Add action"
 msgstr "Действия над каналом"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 msgid "[No caption]"
 msgstr "[Нет заголовка]"
 
@@ -2420,258 +2345,282 @@ msgstr "Разрешить иконки каналов"
 msgid "Incorrect password"
 msgstr "Некорректное имя пользователя или пароль"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr ""
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr "Создать профиль"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+#, fuzzy
+msgid "(active)"
+msgstr "Адаптивно"
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr "Удалить выбранные профили?"
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr "Активировать профиль"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "Проверить доступность поля"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d каналов)"
-msgstr[1] "(%d каналов)"
-msgstr[2] "(%d каналов)"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "Заголовок"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "Обновить"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "Удаление сообщений:"
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 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:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 msgid "Hide from Popular feeds"
 msgstr "Спрятать из списка популярных каналов"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "Включить в e-mail дайджест"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "Всегда показывать вложенные изображения"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "Кэшировать изображения локально"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 msgid "Mark updated articles as unread"
 msgstr "Пометить все статьи как прочитанные?"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr "Иконка"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr "Заменить"
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 msgid "Resubscribe to push updates"
 msgstr "Переподписаться на PUSH обновления"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Сбрасывает статусподписки с помощью механизма PubSubHubbub"
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "Всё выполнено."
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 msgid "Feeds with errors"
 msgstr "Каналы с ошибками"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 msgid "Inactive feeds"
 msgstr "Неактивные каналы"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 msgid "Edit selected feeds"
 msgstr "Редактировать выбранные каналы"
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 #, fuzzy
 msgid "Batch subscribe"
 msgstr "Отписаться"
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 msgid "Categories"
 msgstr "Категории"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Add category"
 msgstr "Добавить категорию..."
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "Редактировать категории"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 #, fuzzy
 msgid "Remove selected"
 msgstr "Удалить выбранные фильтры?"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 msgid "More actions..."
 msgstr "Действия..."
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "Ручная очистка"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "Очистить данные канала."
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Только главный профиль настроек будет экспортирован в OPML."
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Import my OPML"
 msgstr "Импортирую OPML..."
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 #, fuzzy
 msgid "Filename:"
 msgstr "Полное имя"
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 #, fuzzy
 msgid "Include settings"
 msgstr "Включить в e-mail дайджест"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 #, fuzzy
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 #, fuzzy
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Опубликованные статьи экспортируется в качестве общего RSS канала и могут быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 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:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr "Публичная ссылка на OPML"
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "Публичная ссылка на OPML"
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Интеграция в Firefox"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. Для этого щёлкните по ссылке ниже."
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1423
 msgid "Click here to register this site as a feed reader."
 msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1431
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Опубликованные статьи экспортируется в качестве общего RSS канала и могут быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1441
 #, fuzzy
 msgid "Display URL"
 msgstr "показать теги"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 #, fuzzy
 msgid "Articles shared by URL"
 msgstr "Расшарить статью по ссылке"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Отмеченные"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Эти каналы не были обновлены в течение трех месяцев:"
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 msgid "Click to edit feed"
 msgstr "Щёлкните для редактирования"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 msgid "Unsubscribe from selected feeds"
 msgstr "Отписаться от выбранных каналов?"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не были обновлены из-за ошибок:"
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1789
+#, fuzzy
+msgid "Feeds require authentication."
+msgstr "Этот канал требует авторизации."
+
 #: plugins/digest/digest_body.php:59
 #, fuzzy
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
@@ -2972,6 +2921,41 @@ msgstr ""
 msgid "Linked"
 msgstr "Связанные"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr "Инсталляция"
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr "URL инсталляции"
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+#, fuzzy
+msgid "Access key:"
+msgstr "Уровень доступа:"
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+#, fuzzy
+msgid "Access key"
+msgstr "Уровень доступа:"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr "Используйте один ключ доступа для обоих инсталляций"
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+#, fuzzy
+msgid "Generate new key"
+msgstr "Генерировать канал"
+
 #: plugins/instances/init.php:295
 #, fuzzy
 msgid "Link instance"
@@ -2994,6 +2978,10 @@ msgstr ""
 msgid "Stored feeds"
 msgstr "Больше каналов"
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr "Создать ссылку"
+
 #: plugins/share/init.php:27
 #, fuzzy
 msgid "Share by URL"
@@ -3029,23 +3017,23 @@ msgstr "Последнее обновление:"
 msgid "Start update"
 msgstr "Последнее обновление:"
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
@@ -3868,6 +3856,13 @@ msgstr "Расшарить статью по ссылке"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#, fuzzy
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "(%d каналов)"
+#~ msgstr[1] "(%d каналов)"
+#~ msgstr[2] "(%d каналов)"
+
 #~ msgid "Notice"
 #~ msgstr "Сообщение"
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 273c8f6a..9777da46 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 386ea06a..dec9b899 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+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"
@@ -254,14 +254,14 @@ msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。"
 #: index.php:135
 #: index.php:154
 #: index.php:263
-#: prefs.php:102
+#: prefs.php:103
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1330
+#: classes/pref/feeds.php:1331
 #: plugins/digest/digest_body.php:63
-#: js/feedlist.js:160
-#: js/feedlist.js:486
+#: js/feedlist.js:128
+#: js/feedlist.js:448
 #: js/functions.js:420
 #: js/functions.js:808
 #: js/functions.js:1244
@@ -306,13 +306,13 @@ msgid "All Articles"
 msgstr "全部文章"
 
 #: index.php:176
-#: include/functions.php:1939
+#: include/functions.php:1924
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "加星标的"
 
 #: index.php:177
-#: include/functions.php:1940
+#: include/functions.php:1925
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "已发布"
@@ -358,7 +358,7 @@ msgstr "标记信息源为已读"
 
 #: index.php:195
 #: index.php:234
-#: include/functions.php:1929
+#: include/functions.php:1914
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
 #: classes/feeds.php:437
@@ -369,8 +369,8 @@ msgid "Mark as read"
 msgstr "标记为已读"
 
 #: index.php:196
-#: include/functions.php:1825
-#: include/functions.php:1937
+#: include/functions.php:1810
+#: include/functions.php:1922
 msgid "All articles"
 msgstr "全部文章"
 
@@ -429,8 +429,8 @@ msgid "Rescore feed"
 msgstr "为信息源重新评分"
 
 #: index.php:232
-#: classes/pref/feeds.php:716
-#: classes/pref/feeds.php:1303
+#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "取消订阅"
@@ -456,7 +456,7 @@ msgid "Show tag cloud..."
 msgstr "显示标签云"
 
 #: index.php:241
-#: include/functions.php:1915
+#: include/functions.php:1900
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "锁定加星标的项"
@@ -485,41 +485,41 @@ msgid "Logout"
 msgstr "注销"
 
 #: prefs.php:36
-#: prefs.php:120
-#: include/functions.php:1942
+#: prefs.php:121
+#: include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "偏好设置"
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr "快捷键"
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr "退出偏好设置"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:106
-#: classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124
+#: classes/pref/feeds.php:107
+#: classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr "信息源"
 
-#: prefs.php:126
+#: prefs.php:127
 #: classes/pref/filters.php:156
 msgid "Filters"
 msgstr "过滤器"
 
-#: prefs.php:129
-#: include/functions.php:1116
-#: include/functions.php:1768
+#: prefs.php:130
+#: include/functions.php:1117
+#: include/functions.php:1753
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr "预定义标签"
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr "用户"
 
@@ -584,12 +584,12 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 数据库是最新版。"
 
 #: include/digest.php:109
-#: include/functions.php:1125
-#: include/functions.php:1669
-#: include/functions.php:1754
-#: include/functions.php:1776
+#: include/functions.php:1126
+#: include/functions.php:1654
+#: include/functions.php:1739
+#: include/functions.php:1761
 #: classes/opml.php:416
-#: classes/pref/feeds.php:221
+#: classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr "未分类"
 
@@ -603,337 +603,337 @@ msgstr[0] "%d 个存档的文章"
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:1114
-#: include/functions.php:1766
+#: include/functions.php:1115
+#: include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "特殊区域"
 
-#: include/functions.php:1618
-#: classes/feeds.php:1110
+#: include/functions.php:1603
+#: classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "全部信息源"
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr "加星标文章"
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr "最新更新的文章"
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr "存档的文章"
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr "导航"
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 #, fuzzy
 msgid "Open next feed"
 msgstr "自动显示下一个信息源"
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 #, fuzzy
 msgid "Open next article"
 msgstr "打开原文"
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 #, fuzzy
 msgid "Open previous article"
 msgstr "打开原文"
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 #, fuzzy
 msgid "Article"
 msgstr "全部文章"
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr "锁定加星标的项"
 
-#: include/functions.php:1902
+#: include/functions.php:1887
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1903
+#: include/functions.php:1888
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "锁定未读项"
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr "编辑自定义标签"
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "不再显示所选的文章"
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 #, fuzzy
 msgid "Dismiss read"
 msgstr "不再显示已读文章"
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 #, fuzzy
 msgid "Open in new window"
 msgstr "在新窗口打开文章"
 
-#: include/functions.php:1908
+#: include/functions.php:1893
 #: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1909
+#: include/functions.php:1894
 #: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 #, fuzzy
 msgid "Scroll down"
 msgstr "全部完成。"
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "选择鼠标指向的文章"
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr "通过邮件发送文章"
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "选择所有文章"
 
-#: include/functions.php:1916
+#: include/functions.php:1901
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 #, fuzzy
 msgid "Article selection"
 msgstr "反选文章"
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr "选择所有文章"
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 #, fuzzy
 msgid "Select unread"
 msgstr "选择未读文章"
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 #, fuzzy
 msgid "Select starred"
 msgstr "加星标"
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 #, fuzzy
 msgid "Select published"
 msgstr "选择未读文章"
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 #, fuzzy
 msgid "Invert selection"
 msgstr "反选文章"
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 #, fuzzy
 msgid "Deselect everything"
 msgstr "取消选择所有文章"
 
-#: include/functions.php:1924
-#: classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909
+#: classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "信息源"
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "刷新活动的信息源"
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
-#: include/functions.php:1927
-#: classes/pref/feeds.php:1274
+#: include/functions.php:1912
+#: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
-#: include/functions.php:1928
+#: include/functions.php:1913
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "编辑信息源"
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "反向排序"
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 #, fuzzy
 msgid "Debug feed update"
 msgstr "禁用更新"
 
-#: include/functions.php:1932
+#: include/functions.php:1917
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "标记所有信息源为已读"
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "加入到类别："
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 #, fuzzy
 msgid "Go to"
 msgstr "跳转至……"
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1941
+#: include/functions.php:1926
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "标签云"
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 #, fuzzy
 msgid "Other"
 msgstr "其他信息源"
 
-#: include/functions.php:1944
+#: include/functions.php:1929
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "创建预定义标签"
 
-#: include/functions.php:1945
+#: include/functions.php:1930
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "折叠侧边栏"
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 #, fuzzy
 msgid "Show help dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2923
+#: include/functions.php:2908
 #: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr "点击播放"
 
-#: include/functions.php:2924
+#: include/functions.php:2909
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr "播放"
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3063
-#: include/functions.php:3357
+#: include/functions.php:3048
+#: include/functions.php:3342
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "无标签"
 
-#: include/functions.php:3073
+#: include/functions.php:3058
 #: classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 
-#: include/functions.php:3102
+#: include/functions.php:3087
 #: classes/feeds.php:638
 msgid "Originally from:"
 msgstr "来源："
 
-#: include/functions.php:3115
+#: include/functions.php:3100
 #: classes/feeds.php:651
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr "信息源 URL"
 
-#: include/functions.php:3146
+#: include/functions.php:3131
 #: classes/dlg.php:37
-#: classes/dlg.php:156
-#: classes/dlg.php:176
-#: classes/dlg.php:209
-#: classes/dlg.php:275
-#: classes/dlg.php:306
-#: classes/dlg.php:333
-#: classes/dlg.php:366
-#: classes/dlg.php:378
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:190
+#: classes/dlg.php:217
+#: classes/dlg.php:250
+#: classes/dlg.php:262
 #: classes/backend.php:105
 #: classes/pref/users.php:106
 #: classes/pref/filters.php:147
-#: classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659
+#: classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588
+#: classes/pref/feeds.php:1660
 #: plugins/import_export/init.php:409
 #: plugins/import_export/init.php:432
 #: plugins/googlereaderimport/init.php:168
@@ -942,15 +942,15 @@ msgstr "信息源 URL"
 msgid "Close this window"
 msgstr "关闭本窗口"
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr "（编辑注记）"
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr "未知类型"
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 #, fuzzy
 msgid "Attachments"
 msgstr "附件："
@@ -1235,7 +1235,7 @@ msgstr "偏好："
 #: include/login_form.php:213
 #: classes/handler/public.php:211
 #: classes/rpc.php:64
-#: classes/dlg.php:92
+#: classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr "默认偏好设置"
 
@@ -1266,12 +1266,12 @@ msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开："
 
 #: classes/article.php:204
-#: classes/dlg.php:406
 #: classes/pref/users.php:192
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:880
+#: classes/pref/prefs.php:894
+#: classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -1281,23 +1281,23 @@ msgstr "保存"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/dlg.php:408
-#: classes/dlg.php:458
-#: classes/dlg.php:507
-#: classes/feeds.php:1037
-#: classes/feeds.php:1089
-#: classes/feeds.php:1149
+#: classes/feeds.php:1024
+#: classes/feeds.php:1076
+#: classes/feeds.php:1136
 #: classes/pref/users.php:194
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883
+#: classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797
 #: plugins/mail/init.php:131
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr "取消"
 
@@ -1313,10 +1313,10 @@ msgid "Title:"
 msgstr "标题"
 
 #: classes/handler/public.php:412
-#: classes/dlg.php:423
-#: classes/pref/feeds.php:537
-#: classes/pref/feeds.php:768
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769
 #: plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr "URL："
 
@@ -1426,222 +1426,76 @@ msgstr ""
 msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:49
-#: classes/pref/users.php:360
-#: classes/pref/labels.php:272
-#: classes/pref/filters.php:279
-#: classes/pref/filters.php:327
-#: classes/pref/filters.php:645
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:761
-#: classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532
-#: classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr "选择"
-
-#: classes/dlg.php:52
-#: classes/feeds.php:92
-#: classes/pref/users.php:363
-#: classes/pref/labels.php:275
-#: classes/pref/filters.php:282
-#: classes/pref/filters.php:330
-#: classes/pref/filters.php:648
-#: classes/pref/filters.php:737
-#: classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265
-#: classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605
-#: plugins/instances/init.php:290
-msgid "All"
-msgstr "全部"
-
-#: classes/dlg.php:54
-#: classes/feeds.php:95
-#: classes/pref/users.php:365
-#: classes/pref/labels.php:277
-#: classes/pref/filters.php:284
-#: classes/pref/filters.php:332
-#: classes/pref/filters.php:650
-#: classes/pref/filters.php:739
-#: classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267
-#: classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607
-#: plugins/instances/init.php:292
-msgid "None"
-msgstr "无"
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr "创建偏好文件"
-
-#: classes/dlg.php:86
-#: classes/dlg.php:116
-msgid "(active)"
-msgstr "（当前使用的）"
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr "移除选中的偏好文件"
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr "启用偏好文件"
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr "你的公共 OPML URL 是："
 
-#: classes/dlg.php:173
-#: classes/dlg.php:330
+#: classes/dlg.php:57
+#: classes/dlg.php:214
 msgid "Generate new URL"
 msgstr "生成一个新的 URL"
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "更新进程已在配置中启用，但守护进程没有运行，无法抓取信息。请启动守护进程，或联系管理员。"
 
-#: classes/dlg.php:191
-#: classes/dlg.php:200
+#: classes/dlg.php:75
+#: classes/dlg.php:84
 msgid "Last update:"
 msgstr "上次更新："
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
 msgstr "更新进程在抓取信息更新时花费了太长时间，可能已经崩溃。请检查守护进程或联系管理员。"
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr "匹配："
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 #, fuzzy
 msgid "All tags."
 msgstr "无标签"
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr "哪些标签？"
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr "显示条目"
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "您可以通过如下 URL 以 RSS 方式查看本信息源："
 
-#: classes/dlg.php:349
+#: classes/dlg.php:233
 #: plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS 有可用的新版本 (%s)。"
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid "You can update using built-in updater in the Preferences or by using update.php"
 msgstr ""
 
-#: classes/dlg.php:361
+#: classes/dlg.php:245
 #: plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr "下载"
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:391
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr "您可以通过自定义 CSS 来更改颜色，字体和版式。具体可参考 <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">本文件</a>。"
-
-#: classes/dlg.php:417
-#: plugins/instances/init.php:207
-msgid "Instance"
-msgstr "实例"
-
-#: classes/dlg.php:426
-#: plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr "实例 URL："
-
-#: classes/dlg.php:436
-#: plugins/instances/init.php:229
-msgid "Access key:"
-msgstr "访问密钥："
-
-#: classes/dlg.php:439
-#: plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-msgid "Access key"
-msgstr "访问密钥"
-
-#: classes/dlg.php:443
-#: plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr "为两个相联的实例使用一个访问密钥。"
-
-#: classes/dlg.php:451
-#: plugins/instances/init.php:244
-msgid "Generate new key"
-msgstr "生成新的密钥"
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr "创建链接"
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/dlg.php:471
-#: classes/feeds.php:989
-#: classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr "加入到类别："
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/dlg.php:485
-#: classes/feeds.php:1013
-#: classes/pref/users.php:420
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:821
-msgid "Login"
-msgstr "登陆"
-
-#: classes/dlg.php:488
-#: classes/feeds.php:1016
-#: classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601
-#: classes/pref/feeds.php:827
-msgid "Password"
-msgstr "密码"
-
-#: classes/dlg.php:499
-msgid "Feeds require authentication."
-msgstr ""
-
-#: classes/dlg.php:506
-#: classes/feeds.php:1031
-#: classes/feeds.php:1087
-msgid "Subscribe"
-msgstr "订阅"
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr "访问网站"
@@ -1652,7 +1506,7 @@ msgstr "以RSS信息源方式阅读"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr "以 RSS 形式阅读"
 
@@ -1660,10 +1514,42 @@ msgstr "以 RSS 形式阅读"
 msgid "Select:"
 msgstr "选择："
 
+#: classes/feeds.php:92
+#: classes/pref/users.php:363
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:282
+#: classes/pref/filters.php:330
+#: classes/pref/filters.php:648
+#: classes/pref/filters.php:737
+#: classes/pref/filters.php:764
+#: classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266
+#: classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606
+#: plugins/instances/init.php:290
+msgid "All"
+msgstr "全部"
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr "反选"
 
+#: classes/feeds.php:95
+#: classes/pref/users.php:365
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:284
+#: classes/pref/filters.php:332
+#: classes/pref/filters.php:650
+#: classes/pref/filters.php:739
+#: classes/pref/filters.php:766
+#: classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608
+#: plugins/instances/init.php:292
+msgid "None"
+msgstr "无"
+
 #: classes/feeds.php:101
 #, fuzzy
 msgid "More..."
@@ -1749,85 +1635,114 @@ msgid "No articles found to display."
 msgstr "暂时没有文章。"
 
 #: classes/feeds.php:755
-#: classes/feeds.php:932
+#: classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次信息源更新时间：%s"
 
 #: classes/feeds.php:765
-#: classes/feeds.php:942
+#: classes/feeds.php:929
 msgid "Some feeds have update errors (click for details)"
 msgstr "部分信息源更新错误（点击了解详情）"
 
-#: classes/feeds.php:922
+#: classes/feeds.php:909
 msgid "No feed selected."
 msgstr "没有选中的信息源。"
 
-#: classes/feeds.php:975
-#: classes/feeds.php:983
+#: classes/feeds.php:962
+#: classes/feeds.php:970
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "信息源 URL"
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr "加入到类别："
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr "可用的信息源"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:996
 #: classes/pref/users.php:155
-#: classes/pref/feeds.php:589
-#: classes/pref/feeds.php:817
+#: classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "登录密码"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000
+#: classes/pref/users.php:420
+#: classes/pref/feeds.php:596
+#: classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr "登陆"
+
+#: classes/feeds.php:1003
+#: classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602
+#: classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr "密码"
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr "这个信息源需要认证"
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018
+#: classes/feeds.php:1074
+#: classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr "订阅"
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr "更多信息源"
 
-#: classes/feeds.php:1057
-#: classes/feeds.php:1148
+#: classes/feeds.php:1044
+#: classes/feeds.php:1135
 #: classes/pref/users.php:350
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1258
+#: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "搜索"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 msgid "Popular feeds"
 msgstr "最受欢迎的信息源"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 msgid "Feed archive"
 msgstr "信息源存档"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 msgid "limit:"
 msgstr "限制："
 
-#: classes/feeds.php:1088
+#: classes/feeds.php:1075
 #: classes/pref/users.php:376
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "移除"
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr "查找"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr "限制搜索条件："
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr "本信息源"
 
@@ -1951,8 +1866,8 @@ msgid "Change password to"
 msgstr "更改密码为："
 
 #: classes/pref/users.php:177
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "选项"
 
@@ -1989,6 +1904,21 @@ msgstr "已添加用户 <b>%s</b> ，密码为<b>%s</b>"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] 密码更换提醒"
 
+#: classes/pref/users.php:360
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:279
+#: classes/pref/filters.php:327
+#: classes/pref/filters.php:645
+#: classes/pref/filters.php:734
+#: classes/pref/filters.php:761
+#: classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263
+#: classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603
+#: plugins/instances/init.php:287
+msgid "Select"
+msgstr "选择"
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr "创建用户"
@@ -2119,13 +2049,13 @@ msgid "Combine"
 msgstr ""
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 msgid "Reset sort order"
 msgstr "重置排序"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr "为文章重新评分"
 
@@ -2176,7 +2106,7 @@ msgstr "版面动作"
 msgid "Add action"
 msgstr "信息源动作"
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 #, fuzzy
 msgid "[No caption]"
 msgstr "标题"
@@ -2391,249 +2321,273 @@ msgstr "启用信息源分类"
 msgid "Incorrect password"
 msgstr "用户名或密码错误"
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr "您可以通过自定义 CSS 来更改颜色，字体和版式。具体可参考 <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">本文件</a>。"
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr "创建偏好文件"
+
+#: classes/pref/prefs.php:942
+#: classes/pref/prefs.php:972
+msgid "(active)"
+msgstr "（当前使用的）"
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr "移除选中的偏好文件"
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr "启用偏好文件"
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr "勾选以启用"
 
-#: classes/pref/feeds.php:60
-#: classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d 个信息源)"
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr "信息源标题"
 
-#: classes/pref/feeds.php:567
-#: classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568
+#: classes/pref/feeds.php:793
 msgid "Update"
 msgstr "更新列表"
 
-#: classes/pref/feeds.php:582
-#: classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583
+#: classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr "文章清理："
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>提示：</b>如果您的信息源需要验证，那么您需要填写登录信息。Twitter 信息源除外。"
 
-#: classes/pref/feeds.php:621
-#: classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:838
 msgid "Hide from Popular feeds"
 msgstr "从最受欢迎的信息源中隐藏"
 
-#: classes/pref/feeds.php:633
-#: classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634
+#: classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr "包含电子邮件摘要"
 
-#: classes/pref/feeds.php:646
-#: classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647
+#: classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr "始终显示图片附件"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660
+#: classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:672
-#: classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673
+#: classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr "本地缓存图片"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685
+#: classes/pref/feeds.php:872
 msgid "Mark updated articles as unread"
 msgstr "将已更新的文章标记为未读"
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr "图标"
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr "替换"
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 msgid "Resubscribe to push updates"
 msgstr "重新订阅以推送更新"
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "为启用推送的信息源重置 PubSubHubbub 订阅。"
 
-#: classes/pref/feeds.php:1111
-#: classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112
+#: classes/pref/feeds.php:1165
 msgid "All done."
 msgstr "全部完成。"
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 msgid "Feeds with errors"
 msgstr "有错误的信息源"
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "刷新活动的信息源"
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 msgid "Edit selected feeds"
 msgstr "编辑选定的信息源"
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1281
 #: js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 #, fuzzy
 msgid "Categories"
 msgstr "信息源类别"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 #, fuzzy
 msgid "Add category"
 msgstr "编辑类别"
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "编辑类别"
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 #, fuzzy
 msgid "Remove selected"
 msgstr "移除选中的信息源？"
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 msgid "More actions..."
 msgstr "更多动作"
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr "手动清除"
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr "清空信息源数据"
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 #, fuzzy
 msgid "Import my OPML"
 msgstr "正在导入 OPML ……"
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr "文件名："
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 msgid "Include settings"
 msgstr "包含设置"
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 #, fuzzy
 msgid "Export OPML"
 msgstr "正在导入 OPML ……"
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 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:1400
+#: classes/pref/feeds.php:1401
 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:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 msgid "Firefox integration"
 msgstr "Firefox 集成"
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 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:1422
+#: classes/pref/feeds.php:1423
 msgid "Click here to register this site as a feed reader."
 msgstr "点击此处将本站注册为信息源阅读器。"
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1431
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "已发布的文章和生成的信息源"
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 msgid "Published articles and generated feeds"
 msgstr "已发布的文章和生成的信息源"
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "已发布的文章将会输出为公开的 RSS 信息源，网上的任何人可以通过如下 URL 进行订阅。"
 
-#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1441
 msgid "Display URL"
 msgstr "显示 URL"
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr "清空所有生成的 URL"
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 msgid "Articles shared by URL"
 msgstr "通过 URL 分享的文章"
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "您可以取消所有通过 URL 分享的文章。"
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 msgid "Unshare all articles"
 msgstr "取消所有分享"
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "以下信息源已经有三个月没有内容更新了（最旧的在最上）："
 
-#: classes/pref/feeds.php:1565
-#: classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566
+#: classes/pref/feeds.php:1636
 msgid "Click to edit feed"
 msgstr "点击以编辑信息源"
 
-#: classes/pref/feeds.php:1583
-#: classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584
+#: classes/pref/feeds.php:1656
 msgid "Unsubscribe from selected feeds"
 msgstr "取消订阅选中的信息源"
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr "信息源因为如下错误未能更新："
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1789
+msgid "Feeds require authentication."
+msgstr ""
+
 #: plugins/digest/digest_body.php:59
 #, fuzzy
 msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
@@ -2918,6 +2872,38 @@ msgstr ""
 msgid "Linked"
 msgstr "链接"
 
+#: plugins/instances/init.php:207
+#: plugins/instances/init.php:399
+msgid "Instance"
+msgstr "实例"
+
+#: plugins/instances/init.php:218
+#: plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr "实例 URL："
+
+#: plugins/instances/init.php:229
+#: plugins/instances/init.php:418
+msgid "Access key:"
+msgstr "访问密钥："
+
+#: plugins/instances/init.php:232
+#: plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+msgid "Access key"
+msgstr "访问密钥"
+
+#: plugins/instances/init.php:236
+#: plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr "为两个相联的实例使用一个访问密钥。"
+
+#: plugins/instances/init.php:244
+#: plugins/instances/init.php:433
+msgid "Generate new key"
+msgstr "生成新的密钥"
+
 #: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr "链接实例"
@@ -2938,6 +2924,10 @@ msgstr ""
 msgid "Stored feeds"
 msgstr "保存的信息源"
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr "创建链接"
+
 #: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr "通过 URL 分享"
@@ -2972,23 +2962,23 @@ msgstr "上次更新："
 msgid "Start update"
 msgstr "上次更新："
 
-#: js/feedlist.js:442
-#: js/feedlist.js:470
+#: js/feedlist.js:404
+#: js/feedlist.js:432
 #: plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 #, fuzzy
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 #, fuzzy
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 #, fuzzy
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
@@ -3779,6 +3769,11 @@ msgstr "通过 URL 分享文章"
 msgid "Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#, fuzzy
+#~ msgid "(%d feed)"
+#~ msgid_plural "(%d feeds)"
+#~ msgstr[0] "(%d 个信息源)"
+
 #~ msgid "Notice"
 #~ msgstr "提示"
 
diff --git a/messages.pot b/messages.pot
index 7663c9b5..d27c2c4f 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: 2013-04-01 12:16+0400\n"
+"POT-Creation-Date: 2013-04-01 16:28+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"
@@ -243,10 +243,10 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: index.php:135 index.php:154 index.php:263 prefs.php:102
+#: index.php:135 index.php:154 index.php:263 prefs.php:103
 #: classes/backend.php:5 classes/pref/labels.php:296
-#: classes/pref/filters.php:680 classes/pref/feeds.php:1330
-#: plugins/digest/digest_body.php:63 js/feedlist.js:160 js/feedlist.js:486
+#: classes/pref/filters.php:680 classes/pref/feeds.php:1331
+#: plugins/digest/digest_body.php:63 js/feedlist.js:128 js/feedlist.js:448
 #: js/functions.js:420 js/functions.js:808 js/functions.js:1244
 #: js/functions.js:1379 js/functions.js:1691 js/prefs.js:86 js/prefs.js:576
 #: js/prefs.js:666 js/prefs.js:858 js/prefs.js:1445 js/prefs.js:1498
@@ -273,11 +273,11 @@ msgstr ""
 msgid "All Articles"
 msgstr ""
 
-#: index.php:176 include/functions.php:1939 classes/feeds.php:106
+#: index.php:176 include/functions.php:1924 classes/feeds.php:106
 msgid "Starred"
 msgstr ""
 
-#: index.php:177 include/functions.php:1940 classes/feeds.php:107
+#: index.php:177 include/functions.php:1925 classes/feeds.php:107
 msgid "Published"
 msgstr ""
 
@@ -317,13 +317,13 @@ msgstr ""
 msgid "Mark feed as read"
 msgstr ""
 
-#: index.php:195 index.php:234 include/functions.php:1929
+#: index.php:195 index.php:234 include/functions.php:1914
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:437
 #: js/FeedTree.js:128 js/FeedTree.js:156 plugins/digest/digest.js:647
 msgid "Mark as read"
 msgstr ""
 
-#: index.php:196 include/functions.php:1825 include/functions.php:1937
+#: index.php:196 include/functions.php:1810 include/functions.php:1922
 msgid "All articles"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "Rescore feed"
 msgstr ""
 
-#: index.php:232 classes/pref/feeds.php:716 classes/pref/feeds.php:1303
+#: index.php:232 classes/pref/feeds.php:717 classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr ""
@@ -404,7 +404,7 @@ msgstr ""
 msgid "Show tag cloud..."
 msgstr ""
 
-#: index.php:241 include/functions.php:1915
+#: index.php:241 include/functions.php:1900
 msgid "Toggle widescreen mode"
 msgstr ""
 
@@ -430,34 +430,34 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: prefs.php:36 prefs.php:120 include/functions.php:1942
+#: prefs.php:36 prefs.php:121 include/functions.php:1927
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr ""
 
-#: prefs.php:111
+#: prefs.php:112
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: prefs.php:112
+#: prefs.php:113
 msgid "Exit preferences"
 msgstr ""
 
-#: prefs.php:123 classes/pref/feeds.php:106 classes/pref/feeds.php:1208
-#: classes/pref/feeds.php:1271
+#: prefs.php:124 classes/pref/feeds.php:107 classes/pref/feeds.php:1209
+#: classes/pref/feeds.php:1272
 msgid "Feeds"
 msgstr ""
 
-#: prefs.php:126 classes/pref/filters.php:156
+#: prefs.php:127 classes/pref/filters.php:156
 msgid "Filters"
 msgstr ""
 
-#: prefs.php:129 include/functions.php:1116 include/functions.php:1768
+#: prefs.php:130 include/functions.php:1117 include/functions.php:1753
 #: classes/pref/labels.php:90 plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr ""
 
-#: prefs.php:133
+#: prefs.php:134
 msgid "Users"
 msgstr ""
 
@@ -520,9 +520,9 @@ msgstr ""
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: include/digest.php:109 include/functions.php:1125
-#: include/functions.php:1669 include/functions.php:1754
-#: include/functions.php:1776 classes/opml.php:416 classes/pref/feeds.php:221
+#: include/digest.php:109 include/functions.php:1126
+#: include/functions.php:1654 include/functions.php:1739
+#: include/functions.php:1761 classes/opml.php:416 classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr ""
 
@@ -537,290 +537,291 @@ msgstr[1] ""
 msgid "No feeds found."
 msgstr ""
 
-#: include/functions.php:1114 include/functions.php:1766
+#: include/functions.php:1115 include/functions.php:1751
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr ""
 
-#: include/functions.php:1618 classes/feeds.php:1110
+#: include/functions.php:1603 classes/feeds.php:1097
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr ""
 
-#: include/functions.php:1819
+#: include/functions.php:1804
 msgid "Starred articles"
 msgstr ""
 
-#: include/functions.php:1821
+#: include/functions.php:1806
 msgid "Published articles"
 msgstr ""
 
-#: include/functions.php:1823
+#: include/functions.php:1808
 msgid "Fresh articles"
 msgstr ""
 
-#: include/functions.php:1827
+#: include/functions.php:1812
 msgid "Archived articles"
 msgstr ""
 
-#: include/functions.php:1829
+#: include/functions.php:1814
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1892
+#: include/functions.php:1877
 msgid "Navigation"
 msgstr ""
 
-#: include/functions.php:1893
+#: include/functions.php:1878
 msgid "Open next feed"
 msgstr ""
 
-#: include/functions.php:1894
+#: include/functions.php:1879
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1895
+#: include/functions.php:1880
 msgid "Open next article"
 msgstr ""
 
-#: include/functions.php:1896
+#: include/functions.php:1881
 msgid "Open previous article"
 msgstr ""
 
-#: include/functions.php:1897
+#: include/functions.php:1882
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1898
+#: include/functions.php:1883
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1899
+#: include/functions.php:1884
 msgid "Show search dialog"
 msgstr ""
 
-#: include/functions.php:1900
+#: include/functions.php:1885
 msgid "Article"
 msgstr ""
 
-#: include/functions.php:1901
+#: include/functions.php:1886
 msgid "Toggle starred"
 msgstr ""
 
-#: include/functions.php:1902 js/viewfeed.js:1908
+#: include/functions.php:1887 js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr ""
 
-#: include/functions.php:1903 js/viewfeed.js:1886
+#: include/functions.php:1888 js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr ""
 
-#: include/functions.php:1904
+#: include/functions.php:1889
 msgid "Edit tags"
 msgstr ""
 
-#: include/functions.php:1905
+#: include/functions.php:1890
 msgid "Dismiss selected"
 msgstr ""
 
-#: include/functions.php:1906
+#: include/functions.php:1891
 msgid "Dismiss read"
 msgstr ""
 
-#: include/functions.php:1907
+#: include/functions.php:1892
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions.php:1908 js/viewfeed.js:1927
+#: include/functions.php:1893 js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1909 js/viewfeed.js:1921
+#: include/functions.php:1894 js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1910
+#: include/functions.php:1895
 msgid "Scroll down"
 msgstr ""
 
-#: include/functions.php:1911
+#: include/functions.php:1896
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1912
+#: include/functions.php:1897
 msgid "Select article under cursor"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1898
 msgid "Email article"
 msgstr ""
 
-#: include/functions.php:1914
+#: include/functions.php:1899
 msgid "Close/collapse article"
 msgstr ""
 
-#: include/functions.php:1916 plugins/embed_original/init.php:33
+#: include/functions.php:1901 plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr ""
 
-#: include/functions.php:1917
+#: include/functions.php:1902
 msgid "Article selection"
 msgstr ""
 
-#: include/functions.php:1918
+#: include/functions.php:1903
 msgid "Select all articles"
 msgstr ""
 
-#: include/functions.php:1919
+#: include/functions.php:1904
 msgid "Select unread"
 msgstr ""
 
-#: include/functions.php:1920
+#: include/functions.php:1905
 msgid "Select starred"
 msgstr ""
 
-#: include/functions.php:1921
+#: include/functions.php:1906
 msgid "Select published"
 msgstr ""
 
-#: include/functions.php:1922
+#: include/functions.php:1907
 msgid "Invert selection"
 msgstr ""
 
-#: include/functions.php:1923
+#: include/functions.php:1908
 msgid "Deselect everything"
 msgstr ""
 
-#: include/functions.php:1924 classes/pref/feeds.php:520
-#: classes/pref/feeds.php:753
+#: include/functions.php:1909 classes/pref/feeds.php:521
+#: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr ""
 
-#: include/functions.php:1925
+#: include/functions.php:1910
 msgid "Refresh current feed"
 msgstr ""
 
-#: include/functions.php:1926
+#: include/functions.php:1911
 msgid "Un/hide read feeds"
 msgstr ""
 
-#: include/functions.php:1927 classes/pref/feeds.php:1274
+#: include/functions.php:1912 classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr ""
 
-#: include/functions.php:1928 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1913 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr ""
 
-#: include/functions.php:1930
+#: include/functions.php:1915
 msgid "Reverse headlines"
 msgstr ""
 
-#: include/functions.php:1931
+#: include/functions.php:1916
 msgid "Debug feed update"
 msgstr ""
 
-#: include/functions.php:1932 js/FeedTree.js:178
+#: include/functions.php:1917 js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr ""
 
-#: include/functions.php:1933
+#: include/functions.php:1918
 msgid "Un/collapse current category"
 msgstr ""
 
-#: include/functions.php:1934
+#: include/functions.php:1919
 msgid "Toggle combined mode"
 msgstr ""
 
-#: include/functions.php:1935
+#: include/functions.php:1920
 msgid "Toggle auto expand in combined mode"
 msgstr ""
 
-#: include/functions.php:1936
+#: include/functions.php:1921
 msgid "Go to"
 msgstr ""
 
-#: include/functions.php:1938
+#: include/functions.php:1923
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1941 js/tt-rss.js:431 js/tt-rss.js:584
+#: include/functions.php:1926 js/tt-rss.js:431 js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr ""
 
-#: include/functions.php:1943
+#: include/functions.php:1928
 msgid "Other"
 msgstr ""
 
-#: include/functions.php:1944 classes/pref/labels.php:281
+#: include/functions.php:1929 classes/pref/labels.php:281
 msgid "Create label"
 msgstr ""
 
-#: include/functions.php:1945 classes/pref/filters.php:654
+#: include/functions.php:1930 classes/pref/filters.php:654
 msgid "Create filter"
 msgstr ""
 
-#: include/functions.php:1946
+#: include/functions.php:1931
 msgid "Un/collapse sidebar"
 msgstr ""
 
-#: include/functions.php:1947
+#: include/functions.php:1932
 msgid "Show help dialog"
 msgstr ""
 
-#: include/functions.php:2432
+#: include/functions.php:2417
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2923 js/viewfeed.js:2014
+#: include/functions.php:2908 js/viewfeed.js:2014
 msgid "Click to play"
 msgstr ""
 
-#: include/functions.php:2924 js/viewfeed.js:2013
+#: include/functions.php:2909 js/viewfeed.js:2013
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3041
+#: include/functions.php:3026
 msgid " - "
 msgstr ""
 
-#: include/functions.php:3063 include/functions.php:3357 classes/rpc.php:408
+#: include/functions.php:3048 include/functions.php:3342 classes/rpc.php:408
 msgid "no tags"
 msgstr ""
 
-#: include/functions.php:3073 classes/feeds.php:682
+#: include/functions.php:3058 classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions.php:3102 classes/feeds.php:638
+#: include/functions.php:3087 classes/feeds.php:638
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions.php:3115 classes/feeds.php:651 classes/pref/feeds.php:539
+#: include/functions.php:3100 classes/feeds.php:651 classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr ""
 
-#: include/functions.php:3146 classes/dlg.php:37 classes/dlg.php:156
-#: classes/dlg.php:176 classes/dlg.php:209 classes/dlg.php:275
-#: classes/dlg.php:306 classes/dlg.php:333 classes/dlg.php:366
-#: classes/dlg.php:378 classes/backend.php:105 classes/pref/users.php:106
-#: classes/pref/filters.php:147 classes/pref/feeds.php:1587
-#: classes/pref/feeds.php:1659 plugins/import_export/init.php:409
-#: plugins/import_export/init.php:432 plugins/googlereaderimport/init.php:168
-#: plugins/share/init.php:67 plugins/updater/init.php:357
+#: include/functions.php:3131 classes/dlg.php:37 classes/dlg.php:60
+#: classes/dlg.php:93 classes/dlg.php:159 classes/dlg.php:190
+#: classes/dlg.php:217 classes/dlg.php:250 classes/dlg.php:262
+#: classes/backend.php:105 classes/pref/users.php:106
+#: classes/pref/filters.php:147 classes/pref/prefs.php:1012
+#: classes/pref/feeds.php:1588 classes/pref/feeds.php:1660
+#: plugins/import_export/init.php:409 plugins/import_export/init.php:432
+#: plugins/googlereaderimport/init.php:168 plugins/share/init.php:67
+#: plugins/updater/init.php:357
 msgid "Close this window"
 msgstr ""
 
-#: include/functions.php:3382
+#: include/functions.php:3367
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:3615
+#: include/functions.php:3600
 msgid "unknown type"
 msgstr ""
 
-#: include/functions.php:3671
+#: include/functions.php:3656
 msgid "Attachments"
 msgstr ""
 
@@ -1102,7 +1103,7 @@ msgid "Profile:"
 msgstr ""
 
 #: include/login_form.php:213 classes/handler/public.php:211
-#: classes/rpc.php:64 classes/dlg.php:92
+#: classes/rpc.php:64 classes/pref/prefs.php:948
 msgid "Default profile"
 msgstr ""
 
@@ -1131,23 +1132,24 @@ msgstr ""
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: classes/article.php:204 classes/dlg.php:406 classes/pref/users.php:192
+#: classes/article.php:204 classes/pref/users.php:192
 #: classes/pref/labels.php:79 classes/pref/filters.php:405
-#: classes/pref/feeds.php:732 classes/pref/feeds.php:880
-#: plugins/nsfw/init.php:86 plugins/note/init.php:53
-#: plugins/instances/init.php:248
+#: classes/pref/prefs.php:894 classes/pref/feeds.php:733
+#: classes/pref/feeds.php:881 plugins/nsfw/init.php:86
+#: plugins/note/init.php:53 plugins/instances/init.php:248
 msgid "Save"
 msgstr ""
 
 #: classes/article.php:206 classes/handler/public.php:438
-#: classes/handler/public.php:480 classes/dlg.php:408 classes/dlg.php:458
-#: classes/dlg.php:507 classes/feeds.php:1037 classes/feeds.php:1089
-#: classes/feeds.php:1149 classes/pref/users.php:194
+#: classes/handler/public.php:480 classes/feeds.php:1024
+#: classes/feeds.php:1076 classes/feeds.php:1136 classes/pref/users.php:194
 #: classes/pref/labels.php:81 classes/pref/filters.php:408
 #: classes/pref/filters.php:804 classes/pref/filters.php:880
-#: classes/pref/filters.php:947 classes/pref/feeds.php:733
-#: classes/pref/feeds.php:883 plugins/mail/init.php:131
+#: classes/pref/filters.php:947 classes/pref/prefs.php:896
+#: classes/pref/feeds.php:734 classes/pref/feeds.php:884
+#: classes/pref/feeds.php:1797 plugins/mail/init.php:131
 #: plugins/note/init.php:55 plugins/instances/init.php:251
+#: plugins/instances/init.php:440
 msgid "Cancel"
 msgstr ""
 
@@ -1159,9 +1161,9 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: classes/handler/public.php:412 classes/dlg.php:423
-#: classes/pref/feeds.php:537 classes/pref/feeds.php:768
-#: plugins/instances/init.php:215
+#: classes/handler/public.php:412 classes/pref/feeds.php:538
+#: classes/pref/feeds.php:769 plugins/instances/init.php:215
+#: plugins/instances/init.php:405
 msgid "URL:"
 msgstr ""
 
@@ -1259,191 +1261,79 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:49 classes/pref/users.php:360 classes/pref/labels.php:272
-#: classes/pref/filters.php:279 classes/pref/filters.php:327
-#: classes/pref/filters.php:645 classes/pref/filters.php:734
-#: classes/pref/filters.php:761 classes/pref/feeds.php:1262
-#: classes/pref/feeds.php:1532 classes/pref/feeds.php:1602
-#: plugins/instances/init.php:287
-msgid "Select"
-msgstr ""
-
-#: classes/dlg.php:52 classes/feeds.php:92 classes/pref/users.php:363
-#: classes/pref/labels.php:275 classes/pref/filters.php:282
-#: classes/pref/filters.php:330 classes/pref/filters.php:648
-#: classes/pref/filters.php:737 classes/pref/filters.php:764
-#: classes/pref/feeds.php:1265 classes/pref/feeds.php:1535
-#: classes/pref/feeds.php:1605 plugins/instances/init.php:290
-msgid "All"
-msgstr ""
-
-#: classes/dlg.php:54 classes/feeds.php:95 classes/pref/users.php:365
-#: classes/pref/labels.php:277 classes/pref/filters.php:284
-#: classes/pref/filters.php:332 classes/pref/filters.php:650
-#: classes/pref/filters.php:739 classes/pref/filters.php:766
-#: classes/pref/feeds.php:1267 classes/pref/feeds.php:1537
-#: classes/pref/feeds.php:1607 plugins/instances/init.php:292
-msgid "None"
-msgstr ""
-
-#: classes/dlg.php:63
-msgid "Create profile"
-msgstr ""
-
-#: classes/dlg.php:86 classes/dlg.php:116
-msgid "(active)"
-msgstr ""
-
-#: classes/dlg.php:150
-msgid "Remove selected profiles"
-msgstr ""
-
-#: classes/dlg.php:152
-msgid "Activate profile"
-msgstr ""
-
-#: classes/dlg.php:164
+#: classes/dlg.php:48
 msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: classes/dlg.php:173 classes/dlg.php:330
+#: classes/dlg.php:57 classes/dlg.php:214
 msgid "Generate new URL"
 msgstr ""
 
-#: classes/dlg.php:187
+#: classes/dlg.php:71
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 "process or contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:191 classes/dlg.php:200
+#: classes/dlg.php:75 classes/dlg.php:84
 msgid "Last update:"
 msgstr ""
 
-#: classes/dlg.php:196
+#: classes/dlg.php:80
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
 "contact instance owner."
 msgstr ""
 
-#: classes/dlg.php:282
+#: classes/dlg.php:166
 msgid "Match:"
 msgstr ""
 
-#: classes/dlg.php:284
+#: classes/dlg.php:168
 msgid "Any"
 msgstr ""
 
-#: classes/dlg.php:287
+#: classes/dlg.php:171
 msgid "All tags."
 msgstr ""
 
-#: classes/dlg.php:289
+#: classes/dlg.php:173
 msgid "Which Tags?"
 msgstr ""
 
-#: classes/dlg.php:302
+#: classes/dlg.php:186
 msgid "Display entries"
 msgstr ""
 
-#: classes/dlg.php:321
+#: classes/dlg.php:205
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/dlg.php:349 plugins/updater/init.php:327
+#: classes/dlg.php:233 plugins/updater/init.php:327
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
-#: classes/dlg.php:357
+#: classes/dlg.php:241
 msgid ""
 "You can update using built-in updater in the Preferences or by using update."
 "php"
 msgstr ""
 
-#: classes/dlg.php:361 plugins/updater/init.php:331
+#: classes/dlg.php:245 plugins/updater/init.php:331
 msgid "See the release notes"
 msgstr ""
 
-#: classes/dlg.php:363
+#: classes/dlg.php:247
 msgid "Download"
 msgstr ""
 
-#: classes/dlg.php:371
+#: classes/dlg.php:255
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:391
-#, php-format
-msgid ""
-"You can override colors, fonts and layout of your currently selected theme "
-"with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink"
-"\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-
-#: classes/dlg.php:417 plugins/instances/init.php:207
-msgid "Instance"
-msgstr ""
-
-#: classes/dlg.php:426 plugins/instances/init.php:218
-#: plugins/instances/init.php:315
-msgid "Instance URL"
-msgstr ""
-
-#: classes/dlg.php:436 plugins/instances/init.php:229
-msgid "Access key:"
-msgstr ""
-
-#: classes/dlg.php:439 plugins/instances/init.php:232
-#: plugins/instances/init.php:316
-msgid "Access key"
-msgstr ""
-
-#: classes/dlg.php:443 plugins/instances/init.php:236
-msgid "Use one access key for both linked instances."
-msgstr ""
-
-#: classes/dlg.php:451 plugins/instances/init.php:244
-msgid "Generate new key"
-msgstr ""
-
-#: classes/dlg.php:455
-msgid "Create link"
-msgstr ""
-
-#: classes/dlg.php:468
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/dlg.php:471 classes/feeds.php:989 classes/pref/feeds.php:559
-#: classes/pref/feeds.php:781
-msgid "Place in category:"
-msgstr ""
-
-#: classes/dlg.php:477
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/dlg.php:485 classes/feeds.php:1013 classes/pref/users.php:420
-#: classes/pref/feeds.php:595 classes/pref/feeds.php:821
-msgid "Login"
-msgstr ""
-
-#: classes/dlg.php:488 classes/feeds.php:1016 classes/pref/prefs.php:202
-#: classes/pref/feeds.php:601 classes/pref/feeds.php:827
-msgid "Password"
-msgstr ""
-
-#: classes/dlg.php:499
-msgid "Feeds require authentication."
-msgstr ""
-
-#: classes/dlg.php:506 classes/feeds.php:1031 classes/feeds.php:1087
-msgid "Subscribe"
-msgstr ""
-
 #: classes/feeds.php:68
 msgid "Visit the website"
 msgstr ""
@@ -1452,7 +1342,7 @@ msgstr ""
 msgid "View as RSS feed"
 msgstr ""
 
-#: classes/feeds.php:84 classes/feeds.php:138 classes/pref/feeds.php:1439
+#: classes/feeds.php:84 classes/feeds.php:138 classes/pref/feeds.php:1440
 msgid "View as RSS"
 msgstr ""
 
@@ -1460,10 +1350,28 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
+#: classes/feeds.php:92 classes/pref/users.php:363 classes/pref/labels.php:275
+#: classes/pref/filters.php:282 classes/pref/filters.php:330
+#: classes/pref/filters.php:648 classes/pref/filters.php:737
+#: classes/pref/filters.php:764 classes/pref/prefs.php:908
+#: classes/pref/feeds.php:1266 classes/pref/feeds.php:1536
+#: classes/pref/feeds.php:1606 plugins/instances/init.php:290
+msgid "All"
+msgstr ""
+
 #: classes/feeds.php:94
 msgid "Invert"
 msgstr ""
 
+#: classes/feeds.php:95 classes/pref/users.php:365 classes/pref/labels.php:277
+#: classes/pref/filters.php:284 classes/pref/filters.php:332
+#: classes/pref/filters.php:650 classes/pref/filters.php:739
+#: classes/pref/filters.php:766 classes/pref/prefs.php:910
+#: classes/pref/feeds.php:1268 classes/pref/feeds.php:1538
+#: classes/pref/feeds.php:1608 plugins/instances/init.php:292
+msgid "None"
+msgstr ""
+
 #: classes/feeds.php:101
 msgid "More..."
 msgstr ""
@@ -1542,73 +1450,94 @@ msgstr ""
 msgid "No articles found to display."
 msgstr ""
 
-#: classes/feeds.php:755 classes/feeds.php:932
+#: classes/feeds.php:755 classes/feeds.php:919
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: classes/feeds.php:765 classes/feeds.php:942
+#: classes/feeds.php:765 classes/feeds.php:929
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
-#: classes/feeds.php:922
+#: classes/feeds.php:909
 msgid "No feed selected."
 msgstr ""
 
-#: classes/feeds.php:975 classes/feeds.php:983
+#: classes/feeds.php:962 classes/feeds.php:970
 msgid "Feed or site URL"
 msgstr ""
 
-#: classes/feeds.php:997
+#: classes/feeds.php:976 classes/pref/feeds.php:560 classes/pref/feeds.php:782
+#: classes/pref/feeds.php:1761
+msgid "Place in category:"
+msgstr ""
+
+#: classes/feeds.php:984
 msgid "Available feeds"
 msgstr ""
 
-#: classes/feeds.php:1009 classes/pref/users.php:155
-#: classes/pref/feeds.php:589 classes/pref/feeds.php:817
+#: classes/feeds.php:996 classes/pref/users.php:155 classes/pref/feeds.php:590
+#: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr ""
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1000 classes/pref/users.php:420
+#: classes/pref/feeds.php:596 classes/pref/feeds.php:822
+#: classes/pref/feeds.php:1775
+msgid "Login"
+msgstr ""
+
+#: classes/feeds.php:1003 classes/pref/prefs.php:202
+#: classes/pref/feeds.php:602 classes/pref/feeds.php:828
+#: classes/pref/feeds.php:1778
+msgid "Password"
+msgstr ""
+
+#: classes/feeds.php:1013
 msgid "This feed requires authentication."
 msgstr ""
 
-#: classes/feeds.php:1034
+#: classes/feeds.php:1018 classes/feeds.php:1074 classes/pref/feeds.php:1796
+msgid "Subscribe"
+msgstr ""
+
+#: classes/feeds.php:1021
 msgid "More feeds"
 msgstr ""
 
-#: classes/feeds.php:1057 classes/feeds.php:1148 classes/pref/users.php:350
-#: classes/pref/filters.php:641 classes/pref/feeds.php:1258 js/tt-rss.js:170
+#: classes/feeds.php:1044 classes/feeds.php:1135 classes/pref/users.php:350
+#: classes/pref/filters.php:641 classes/pref/feeds.php:1259 js/tt-rss.js:170
 msgid "Search"
 msgstr ""
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1048
 msgid "Popular feeds"
 msgstr ""
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1049
 msgid "Feed archive"
 msgstr ""
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1052
 msgid "limit:"
 msgstr ""
 
-#: classes/feeds.php:1088 classes/pref/users.php:376
+#: classes/feeds.php:1075 classes/pref/users.php:376
 #: classes/pref/labels.php:284 classes/pref/filters.php:398
-#: classes/pref/filters.php:667 classes/pref/feeds.php:706
+#: classes/pref/filters.php:667 classes/pref/feeds.php:707
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr ""
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1086
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1094
 msgid "Limit search to:"
 msgstr ""
 
-#: classes/feeds.php:1123
+#: classes/feeds.php:1110
 msgid "This feed"
 msgstr ""
 
@@ -1726,8 +1655,8 @@ msgstr ""
 msgid "Change password to"
 msgstr ""
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:609
-#: classes/pref/feeds.php:833
+#: classes/pref/users.php:177 classes/pref/feeds.php:610
+#: classes/pref/feeds.php:834
 msgid "Options"
 msgstr ""
 
@@ -1764,6 +1693,15 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
+#: classes/pref/users.php:360 classes/pref/labels.php:272
+#: classes/pref/filters.php:279 classes/pref/filters.php:327
+#: classes/pref/filters.php:645 classes/pref/filters.php:734
+#: classes/pref/filters.php:761 classes/pref/prefs.php:905
+#: classes/pref/feeds.php:1263 classes/pref/feeds.php:1533
+#: classes/pref/feeds.php:1603 plugins/instances/init.php:287
+msgid "Select"
+msgstr ""
+
 #: classes/pref/users.php:368
 msgid "Create user"
 msgstr ""
@@ -1880,12 +1818,12 @@ msgstr ""
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:663 classes/pref/feeds.php:1278
-#: classes/pref/feeds.php:1292
+#: classes/pref/filters.php:663 classes/pref/feeds.php:1279
+#: classes/pref/feeds.php:1293
 msgid "Reset sort order"
 msgstr ""
 
-#: classes/pref/filters.php:671 classes/pref/feeds.php:1317
+#: classes/pref/filters.php:671 classes/pref/feeds.php:1318
 msgid "Rescore articles"
 msgstr ""
 
@@ -1930,7 +1868,7 @@ msgstr ""
 msgid "Add action"
 msgstr ""
 
-#: classes/pref/filters.php:989
+#: classes/pref/filters.php:967
 msgid "[No caption]"
 msgstr ""
 
@@ -2137,241 +2075,268 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-#: classes/pref/feeds.php:12
+#: classes/pref/prefs.php:879
+#, php-format
+msgid ""
+"You can override colors, fonts and layout of your currently selected theme "
+"with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink"
+"\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr ""
+
+#: classes/pref/prefs.php:919
+msgid "Create profile"
+msgstr ""
+
+#: classes/pref/prefs.php:942 classes/pref/prefs.php:972
+msgid "(active)"
+msgstr ""
+
+#: classes/pref/prefs.php:1006
+msgid "Remove selected profiles"
+msgstr ""
+
+#: classes/pref/prefs.php:1008
+msgid "Activate profile"
+msgstr ""
+
+#: classes/pref/feeds.php:13
 msgid "Check to enable field"
 msgstr ""
 
-#: classes/pref/feeds.php:60 classes/pref/feeds.php:208
-#: classes/pref/feeds.php:250 classes/pref/feeds.php:256
-#: classes/pref/feeds.php:281
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: classes/pref/feeds.php:526
+#: classes/pref/feeds.php:527
 msgid "Feed Title"
 msgstr ""
 
-#: classes/pref/feeds.php:567 classes/pref/feeds.php:792
+#: classes/pref/feeds.php:568 classes/pref/feeds.php:793
 msgid "Update"
 msgstr ""
 
-#: classes/pref/feeds.php:582 classes/pref/feeds.php:808
+#: classes/pref/feeds.php:583 classes/pref/feeds.php:809
 msgid "Article purging:"
 msgstr ""
 
-#: classes/pref/feeds.php:605
+#: classes/pref/feeds.php:606
 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:621 classes/pref/feeds.php:837
+#: classes/pref/feeds.php:622 classes/pref/feeds.php:838
 msgid "Hide from Popular feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:633 classes/pref/feeds.php:843
+#: classes/pref/feeds.php:634 classes/pref/feeds.php:844
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: classes/pref/feeds.php:646 classes/pref/feeds.php:849
+#: classes/pref/feeds.php:647 classes/pref/feeds.php:850
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:659 classes/pref/feeds.php:857
+#: classes/pref/feeds.php:660 classes/pref/feeds.php:858
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:672 classes/pref/feeds.php:865
+#: classes/pref/feeds.php:673 classes/pref/feeds.php:866
 msgid "Cache images locally"
 msgstr ""
 
-#: classes/pref/feeds.php:684 classes/pref/feeds.php:871
+#: classes/pref/feeds.php:685 classes/pref/feeds.php:872
 msgid "Mark updated articles as unread"
 msgstr ""
 
-#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:691
 msgid "Icon"
 msgstr ""
 
-#: classes/pref/feeds.php:704
+#: classes/pref/feeds.php:705
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:723
+#: classes/pref/feeds.php:724
 msgid "Resubscribe to push updates"
 msgstr ""
 
-#: classes/pref/feeds.php:730
+#: classes/pref/feeds.php:731
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1111 classes/pref/feeds.php:1164
+#: classes/pref/feeds.php:1112 classes/pref/feeds.php:1165
 msgid "All done."
 msgstr ""
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1220
 msgid "Feeds with errors"
 msgstr ""
 
-#: classes/pref/feeds.php:1239
+#: classes/pref/feeds.php:1240
 msgid "Inactive feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1276
+#: classes/pref/feeds.php:1277
 msgid "Edit selected feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1280 js/prefs.js:1770
+#: classes/pref/feeds.php:1281 js/prefs.js:1770
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1286
 msgid "Categories"
 msgstr ""
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1289
 msgid "Add category"
 msgstr ""
 
-#: classes/pref/feeds.php:1290
+#: classes/pref/feeds.php:1291
 msgid "(Un)hide empty categories"
 msgstr ""
 
-#: classes/pref/feeds.php:1294
+#: classes/pref/feeds.php:1295
 msgid "Remove selected"
 msgstr ""
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1309
 msgid "More actions..."
 msgstr ""
 
-#: classes/pref/feeds.php:1312
+#: classes/pref/feeds.php:1313
 msgid "Manual purge"
 msgstr ""
 
-#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1317
 msgid "Clear feed data"
 msgstr ""
 
-#: classes/pref/feeds.php:1367
+#: classes/pref/feeds.php:1368
 msgid "OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1369
+#: classes/pref/feeds.php:1370
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1371
+#: classes/pref/feeds.php:1372
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1384
+#: classes/pref/feeds.php:1385
 msgid "Import my OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1388
+#: classes/pref/feeds.php:1389
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1391
 msgid "Include settings"
 msgstr ""
 
-#: classes/pref/feeds.php:1394
+#: classes/pref/feeds.php:1395
 msgid "Export OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1398
+#: classes/pref/feeds.php:1399
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1400
+#: classes/pref/feeds.php:1401
 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:1402
+#: classes/pref/feeds.php:1403
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1404
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1413
+#: classes/pref/feeds.php:1414
 msgid "Firefox integration"
 msgstr ""
 
-#: classes/pref/feeds.php:1415
+#: classes/pref/feeds.php:1416
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1423
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1431
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1433
 msgid "Published articles and generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1434
+#: classes/pref/feeds.php:1435
 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:1440
+#: classes/pref/feeds.php:1441
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1443
+#: classes/pref/feeds.php:1444
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1445
+#: classes/pref/feeds.php:1446
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1447
+#: classes/pref/feeds.php:1448
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1450
+#: classes/pref/feeds.php:1451
 msgid "Unshare all articles"
 msgstr ""
 
-#: classes/pref/feeds.php:1528
+#: classes/pref/feeds.php:1529
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1565 classes/pref/feeds.php:1635
+#: classes/pref/feeds.php:1566 classes/pref/feeds.php:1636
 msgid "Click to edit feed"
 msgstr ""
 
-#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1584 classes/pref/feeds.php:1656
 msgid "Unsubscribe from selected feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1594
+#: classes/pref/feeds.php:1595
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
+#: classes/pref/feeds.php:1758
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1767
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1789
+msgid "Feeds require authentication."
+msgstr ""
+
 #: plugins/digest/digest_body.php:59
 msgid ""
 "Your browser doesn't support Javascript, which is required for this "
@@ -2647,6 +2612,32 @@ msgstr ""
 msgid "Linked"
 msgstr ""
 
+#: plugins/instances/init.php:207 plugins/instances/init.php:399
+msgid "Instance"
+msgstr ""
+
+#: plugins/instances/init.php:218 plugins/instances/init.php:315
+#: plugins/instances/init.php:408
+msgid "Instance URL"
+msgstr ""
+
+#: plugins/instances/init.php:229 plugins/instances/init.php:418
+msgid "Access key:"
+msgstr ""
+
+#: plugins/instances/init.php:232 plugins/instances/init.php:316
+#: plugins/instances/init.php:421
+msgid "Access key"
+msgstr ""
+
+#: plugins/instances/init.php:236 plugins/instances/init.php:425
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: plugins/instances/init.php:244 plugins/instances/init.php:433
+msgid "Generate new key"
+msgstr ""
+
 #: plugins/instances/init.php:295
 msgid "Link instance"
 msgstr ""
@@ -2669,6 +2660,10 @@ msgstr ""
 msgid "Stored feeds"
 msgstr ""
 
+#: plugins/instances/init.php:437
+msgid "Create link"
+msgstr ""
+
 #: plugins/share/init.php:27
 msgid "Share by URL"
 msgstr ""
@@ -2700,19 +2695,19 @@ msgstr ""
 msgid "Start update"
 msgstr ""
 
-#: js/feedlist.js:442 js/feedlist.js:470 plugins/digest/digest.js:26
+#: js/feedlist.js:404 js/feedlist.js:432 plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr ""
 
-#: js/feedlist.js:461
+#: js/feedlist.js:423
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr ""
 
-#: js/feedlist.js:464
+#: js/feedlist.js:426
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr ""
 
-#: js/feedlist.js:467
+#: js/feedlist.js:429
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr ""