rebase translations

1 files changed, 326 insertions, 331 deletions

diff --git a/messages.pot b/messages.pot
index 7663c9b57..d27c2c4fe 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 <[email protected]>\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
-msgid "Check to enable field"
+#: 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/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/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:526
+#: classes/pref/feeds.php:13
+msgid "Check to enable field"
+msgstr ""
+
+#: 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 ""