rebase translations

1 files changed, 825 insertions, 823 deletions

diff --git a/messages.pot b/messages.pot
index 57c854bd0..32f54cd91 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: 2015-11-30 09:06+0100\n"
+"POT-Creation-Date: 2016-01-17 16:33+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -161,15 +161,15 @@ msgid "Plugin not found"
 msgstr ""
 
 #: index.php:133 index.php:149 index.php:267 prefs.php:102
-#: classes/backend.php:5 classes/pref/labels.php:296
-#: classes/pref/filters.php:778 classes/pref/feeds.php:1405 js/feedlist.js:139
+#: classes/pref/feeds.php:1405 classes/pref/filters.php:778
+#: classes/pref/labels.php:296 classes/backend.php:5 js/feedlist.js:158
 #: js/functions.js:1293 js/functions.js:1427 js/functions.js:1739
 #: js/prefs.js:658 js/prefs.js:859 js/prefs.js:1765 js/prefs.js:1781
-#: js/prefs.js:1799 js/tt-rss.js:55 js/tt-rss.js:530 js/viewfeed.js:1311
-#: plugins/import_export/import_export.js:17 js/feedlist.js:467
+#: js/prefs.js:1799 js/tt-rss.js:55 js/tt-rss.js:530 js/viewfeed.js:1313
+#: plugins/import_export/import_export.js:17 js/feedlist.js:489
 #: js/functions.js:449 js/functions.js:772 js/prefs.js:1446 js/prefs.js:1499
 #: js/prefs.js:1539 js/prefs.js:1556 js/prefs.js:1572 js/prefs.js:1592
-#: js/tt-rss.js:547 js/viewfeed.js:854
+#: js/tt-rss.js:547 js/viewfeed.js:856
 msgid "Loading, please wait..."
 msgstr ""
 
@@ -418,13 +418,13 @@ msgstr ""
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: update.php:63
+#: update.php:66
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: include/digest.php:109 include/functions.php:1256 include/functions.php:1801
-#: include/functions.php:1886 include/functions.php:1908
-#: classes/pref/feeds.php:228 classes/opml.php:421
+#: include/digest.php:109 include/functions.php:1256
+#: include/functions.php:1801 include/functions.php:1886
+#: include/functions.php:1908 classes/pref/feeds.php:228 classes/opml.php:421
 msgid "Uncategorized"
 msgstr ""
 
@@ -439,6 +439,44 @@ msgstr[1] ""
 msgid "No feeds found."
 msgstr ""
 
+#: include/functions.php:949
+#, php-format
+msgid "%d min"
+msgstr ""
+
+#: include/functions.php:1245 include/functions.php:1898
+msgid "Special"
+msgstr ""
+
+#: include/functions.php:1749 classes/pref/filters.php:228
+#: classes/pref/filters.php:506
+msgid "All feeds"
+msgstr ""
+
+#: include/functions.php:1953
+msgid "Starred articles"
+msgstr ""
+
+#: include/functions.php:1955
+msgid "Published articles"
+msgstr ""
+
+#: include/functions.php:1957
+msgid "Fresh articles"
+msgstr ""
+
+#: include/functions.php:1959 include/functions2.php:101
+msgid "All articles"
+msgstr ""
+
+#: include/functions.php:1961
+msgid "Archived articles"
+msgstr ""
+
+#: include/functions.php:1963
+msgid "Recently read"
+msgstr ""
+
 #: include/functions2.php:52
 msgid "Navigation"
 msgstr ""
@@ -483,15 +521,15 @@ msgstr ""
 msgid "Article"
 msgstr ""
 
-#: include/functions2.php:63 js/viewfeed.js:2004
+#: include/functions2.php:63 js/viewfeed.js:2006
 msgid "Toggle starred"
 msgstr ""
 
-#: include/functions2.php:64 js/viewfeed.js:2015
+#: include/functions2.php:64 js/viewfeed.js:2017
 msgid "Toggle published"
 msgstr ""
 
-#: include/functions2.php:65 js/viewfeed.js:1993
+#: include/functions2.php:65 js/viewfeed.js:1995
 msgid "Toggle unread"
 msgstr ""
 
@@ -511,11 +549,11 @@ msgstr ""
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions2.php:70 js/viewfeed.js:2034
+#: include/functions2.php:70 js/viewfeed.js:2036
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions2.php:71 js/viewfeed.js:2028
+#: include/functions2.php:71 js/viewfeed.js:2030
 msgid "Mark above as read"
 msgstr ""
 
@@ -593,7 +631,7 @@ msgid "Subscribe to feed"
 msgstr ""
 
 #: include/functions2.php:91 js/FeedTree.js:139 js/PrefFeedTree.js:68
-#: js/viewfeed.js:2204
+#: js/viewfeed.js:2206
 msgid "Edit feed"
 msgstr ""
 
@@ -629,10 +667,6 @@ msgstr ""
 msgid "Go to"
 msgstr ""
 
-#: include/functions2.php:101 include/functions.php:1959
-msgid "All articles"
-msgstr ""
-
 #: include/functions2.php:102
 msgid "Fresh"
 msgstr ""
@@ -666,92 +700,60 @@ msgstr ""
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions2.php:1295 classes/feeds.php:739
+#: include/functions2.php:1313 classes/feeds.php:727
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/functions2.php:1299 classes/feeds.php:743
+#: include/functions2.php:1317 classes/feeds.php:731
 msgid "comments"
 msgstr ""
 
-#: include/functions2.php:1325
+#: include/functions2.php:1343
 msgid " - "
 msgstr ""
 
-#: include/functions2.php:1358 include/functions2.php:1609
+#: include/functions2.php:1376 include/functions2.php:1627
 #: classes/article.php:292
 msgid "no tags"
 msgstr ""
 
-#: include/functions2.php:1368 classes/feeds.php:725
+#: include/functions2.php:1386 classes/feeds.php:713
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions2.php:1400 classes/feeds.php:672
+#: include/functions2.php:1418 classes/feeds.php:660
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions2.php:1413 classes/pref/feeds.php:574 classes/feeds.php:685
+#: include/functions2.php:1431 classes/feeds.php:673
+#: classes/pref/feeds.php:574
 msgid "Feed URL"
 msgstr ""
 
-#: include/functions2.php:1450 classes/backend.php:105 classes/dlg.php:37
-#: classes/dlg.php:60 classes/dlg.php:93 classes/dlg.php:159
-#: classes/dlg.php:186 classes/pref/prefs.php:1101 classes/pref/filters.php:204
+#: include/functions2.php:1468 classes/pref/prefs.php:1105
 #: classes/pref/feeds.php:1654 classes/pref/feeds.php:1720
-#: plugins/import_export/init.php:415 plugins/import_export/init.php:460
-#: plugins/af_psql_trgm/init.php:102 plugins/share/init.php:121
+#: classes/pref/filters.php:204 classes/dlg.php:37 classes/dlg.php:60
+#: classes/dlg.php:93 classes/dlg.php:159 classes/dlg.php:186
+#: classes/backend.php:105 plugins/import_export/init.php:415
+#: plugins/import_export/init.php:460 plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:121
 msgid "Close this window"
 msgstr ""
 
-#: include/functions2.php:1647
+#: include/functions2.php:1665
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions2.php:1902
+#: include/functions2.php:1920
 msgid "unknown type"
 msgstr ""
 
-#: include/functions2.php:1979
+#: include/functions2.php:1997
 msgid "Attachments"
 msgstr ""
 
-#: include/functions.php:949
-#, php-format
-msgid "%d min"
-msgstr ""
-
-#: include/functions.php:1245 include/functions.php:1898
-msgid "Special"
-msgstr ""
-
-#: include/functions.php:1749 classes/pref/filters.php:228
-#: classes/pref/filters.php:506
-msgid "All feeds"
-msgstr ""
-
-#: include/functions.php:1953
-msgid "Starred articles"
-msgstr ""
-
-#: include/functions.php:1955
-msgid "Published articles"
-msgstr ""
-
-#: include/functions.php:1957
-msgid "Fresh articles"
-msgstr ""
-
-#: include/functions.php:1961
-msgid "Archived articles"
-msgstr ""
-
-#: include/functions.php:1963
-msgid "Recently read"
-msgstr ""
-
 #: include/login_form.php:197 classes/handler/public.php:557
 #: classes/handler/public.php:812
 msgid "Login:"
@@ -769,8 +771,8 @@ msgstr ""
 msgid "Profile:"
 msgstr ""
 
-#: include/login_form.php:223 classes/handler/public.php:299
-#: classes/pref/prefs.php:1039 classes/rpc.php:63
+#: include/login_form.php:223 classes/rpc.php:63 classes/pref/prefs.php:1043
+#: classes/handler/public.php:299
 msgid "Default profile"
 msgstr ""
 
@@ -802,381 +804,251 @@ msgstr ""
 msgid "Session failed to validate (password changed)"
 msgstr ""
 
-#: classes/handler/public.php:498 plugins/bookmarklets/init.php:40
-msgid "Share with Tiny Tiny RSS"
-msgstr ""
-
-#: classes/handler/public.php:506
-msgid "Title:"
-msgstr ""
-
-#: classes/handler/public.php:508 classes/pref/feeds.php:572
-#: plugins/instances/init.php:212 plugins/instances/init.php:401
-msgid "URL:"
-msgstr ""
-
-#: classes/handler/public.php:510
-msgid "Content:"
-msgstr ""
-
-#: classes/handler/public.php:512
-msgid "Labels:"
+#: classes/article.php:25
+msgid "Article not found."
 msgstr ""
 
-#: classes/handler/public.php:531
-msgid "Shared article will appear in the Published feed."
+#: classes/article.php:178
+msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: classes/handler/public.php:533
-msgid "Share"
+#: classes/article.php:203 classes/pref/prefs.php:989
+#: classes/pref/feeds.php:799 classes/pref/feeds.php:939
+#: classes/pref/filters.php:484 classes/pref/users.php:98
+#: classes/pref/labels.php:79 plugins/af_redditimgur/init.php:55
+#: plugins/nsfw/init.php:85 plugins/af_psql_trgm/init.php:184
+#: plugins/note/init.php:51 plugins/instances/init.php:245
+#: plugins/mail/init.php:64
+msgid "Save"
 msgstr ""
 
-#: classes/handler/public.php:534 classes/handler/public.php:568
-#: classes/pref/users.php:100 classes/pref/labels.php:81
-#: classes/pref/prefs.php:987 classes/pref/filters.php:487
+#: classes/article.php:205 classes/feeds.php:1076 classes/feeds.php:1126
+#: classes/feeds.php:1163 classes/pref/prefs.php:991
+#: classes/pref/feeds.php:800 classes/pref/feeds.php:942
+#: classes/pref/feeds.php:1860 classes/pref/filters.php:487
 #: classes/pref/filters.php:901 classes/pref/filters.php:982
-#: classes/pref/filters.php:1075 classes/pref/feeds.php:800
-#: classes/pref/feeds.php:942 classes/pref/feeds.php:1860
-#: classes/article.php:205 classes/feeds.php:1088 classes/feeds.php:1138
-#: classes/feeds.php:1175 plugins/mail/init.php:172 plugins/note/init.php:53
+#: classes/pref/filters.php:1075 classes/pref/users.php:100
+#: classes/pref/labels.php:81 classes/handler/public.php:534
+#: classes/handler/public.php:568 plugins/note/init.php:53
 #: plugins/instances/init.php:248 plugins/instances/init.php:436
+#: plugins/mail/init.php:172
 msgid "Cancel"
 msgstr ""
 
-#: classes/handler/public.php:555
-msgid "Not logged in"
-msgstr ""
-
-#: classes/handler/public.php:614
-msgid "Incorrect username or password"
-msgstr ""
-
-#: classes/handler/public.php:666
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
+#: classes/feeds.php:53
+msgid "View as RSS feed"
 msgstr ""
 
-#: classes/handler/public.php:669
-#, php-format
-msgid "Subscribed to <b>%s</b>."
+#: classes/feeds.php:54 classes/feeds.php:134 classes/pref/feeds.php:1516
+msgid "View as RSS"
 msgstr ""
 
-#: classes/handler/public.php:672
+#: classes/feeds.php:62
 #, php-format
-msgid "Could not subscribe to <b>%s</b>."
+msgid "Last updated: %s"
 msgstr ""
 
-#: classes/handler/public.php:675
-#, php-format
-msgid "No feeds found in <b>%s</b>."
+#: classes/feeds.php:90 classes/pref/prefs.php:1003
+#: classes/pref/feeds.php:1343 classes/pref/feeds.php:1605
+#: classes/pref/feeds.php:1669 classes/pref/filters.php:361
+#: classes/pref/filters.php:409 classes/pref/filters.php:746
+#: classes/pref/filters.php:834 classes/pref/filters.php:861
+#: classes/pref/users.php:337 classes/pref/labels.php:275
+#: plugins/instances/init.php:287
+msgid "All"
 msgstr ""
 
-#: classes/handler/public.php:678
-msgid "Multiple feed URLs found."
+#: classes/feeds.php:92
+msgid "Invert"
 msgstr ""
 
-#: classes/handler/public.php:682
-#, php-format
-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+#: classes/feeds.php:93 classes/pref/prefs.php:1005
+#: classes/pref/feeds.php:1345 classes/pref/feeds.php:1607
+#: classes/pref/feeds.php:1671 classes/pref/filters.php:363
+#: classes/pref/filters.php:411 classes/pref/filters.php:748
+#: classes/pref/filters.php:836 classes/pref/filters.php:863
+#: classes/pref/users.php:339 classes/pref/labels.php:277
+#: plugins/instances/init.php:289
+msgid "None"
 msgstr ""
 
-#: classes/handler/public.php:700
-msgid "Subscribe to selected feed"
+#: classes/feeds.php:99
+msgid "More..."
 msgstr ""
 
-#: classes/handler/public.php:725
-msgid "Edit subscription options"
+#: classes/feeds.php:101
+msgid "Selection toggle:"
 msgstr ""
 
-#: classes/handler/public.php:762
-msgid "Password recovery"
+#: classes/feeds.php:107
+msgid "Selection:"
 msgstr ""
 
-#: classes/handler/public.php:805
-msgid ""
-"You will need to provide valid account name and email. A password reset link "
-"will be sent to your email address."
+#: classes/feeds.php:110
+msgid "Set score"
 msgstr ""
 
-#: classes/handler/public.php:827 classes/pref/users.php:350
-msgid "Reset password"
+#: classes/feeds.php:113
+msgid "Archive"
 msgstr ""
 
-#: classes/handler/public.php:837
-msgid "Some of the required form parameters are missing or incorrect."
+#: classes/feeds.php:115
+msgid "Move back"
 msgstr ""
 
-#: classes/handler/public.php:841 classes/handler/public.php:907
-msgid "Go back"
+#: classes/feeds.php:116 classes/pref/filters.php:370
+#: classes/pref/filters.php:418 classes/pref/filters.php:843
+#: classes/pref/filters.php:870
+msgid "Delete"
 msgstr ""
 
-#: classes/handler/public.php:878
-msgid "[tt-rss] Password reset request"
+#: classes/feeds.php:121 classes/feeds.php:126 plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
+msgid "Forward by email"
 msgstr ""
 
-#: classes/handler/public.php:903
-msgid "Sorry, login and email combination not found."
+#: classes/feeds.php:130
+msgid "Feed:"
 msgstr ""
 
-#: classes/handler/public.php:925
-msgid "Your access level is insufficient to run this script."
+#: classes/feeds.php:201 classes/feeds.php:867
+msgid "Feed not found."
 msgstr ""
 
-#: classes/handler/public.php:951
-msgid "Database Updater"
+#: classes/feeds.php:272
+msgid "Never"
 msgstr ""
 
-#: classes/handler/public.php:1016
-msgid "Perform updates"
+#: classes/feeds.php:385
+#, php-format
+msgid "Imported at %s"
 msgstr ""
 
-#: classes/backend.php:33
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+#: classes/feeds.php:444 classes/feeds.php:541
+msgid "mark feed as read"
 msgstr ""
 
-#: classes/backend.php:38
-msgid "Keyboard Shortcuts"
+#: classes/feeds.php:600
+msgid "Collapse article"
 msgstr ""
 
-#: classes/backend.php:61
-msgid "Shift"
+#: classes/feeds.php:766
+msgid "No unread articles found to display."
 msgstr ""
 
-#: classes/backend.php:64
-msgid "Ctrl"
+#: classes/feeds.php:769
+msgid "No updated articles found to display."
 msgstr ""
 
-#: classes/backend.php:99
-msgid "Help topic not found."
+#: classes/feeds.php:772
+msgid "No starred articles found to display."
 msgstr ""
 
-#: classes/dlg.php:17
+#: classes/feeds.php:776
 msgid ""
-"If you have imported labels and/or filters, you might need to reload "
-"preferences to see your new data."
-msgstr ""
-
-#: classes/dlg.php:48
-msgid "Your Public OPML URL is:"
+"No articles found to display. You can assign articles to labels manually "
+"from article header context menu (applies to all selected articles) or use a "
+"filter."
 msgstr ""
 
-#: classes/dlg.php:57 classes/dlg.php:183 plugins/share/init.php:118
-msgid "Generate new URL"
+#: classes/feeds.php:778
+msgid "No articles found to display."
 msgstr ""
 
-#: 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."
+#: classes/feeds.php:793 classes/feeds.php:967
+#, php-format
+msgid "Feeds last updated at %s"
 msgstr ""
 
-#: classes/dlg.php:75 classes/dlg.php:84
-msgid "Last update:"
+#: classes/feeds.php:803 classes/feeds.php:977
+msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
-#: 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."
+#: classes/feeds.php:957
+msgid "No feed selected."
 msgstr ""
 
-#: classes/dlg.php:174
-msgid "You can view this feed as RSS using the following URL:"
+#: classes/feeds.php:1014 classes/feeds.php:1022
+msgid "Feed or site URL"
 msgstr ""
 
-#: classes/pref/users.php:6 classes/pref/system.php:8
-#: plugins/instances/init.php:154
-msgid "Your access level is insufficient to open this tab."
+#: classes/feeds.php:1028 classes/pref/feeds.php:595
+#: classes/pref/feeds.php:828 classes/pref/feeds.php:1824
+msgid "Place in category:"
 msgstr ""
 
-#: classes/pref/users.php:24
-msgid "Edit user"
+#: classes/feeds.php:1036
+msgid "Available feeds"
 msgstr ""
 
-#: classes/pref/users.php:56 classes/pref/feeds.php:637
-#: classes/pref/feeds.php:876 classes/feeds.php:1060
+#: classes/feeds.php:1048 classes/pref/feeds.php:637
+#: classes/pref/feeds.php:876 classes/pref/users.php:56
 msgid "Authentication"
 msgstr ""
 
-#: classes/pref/users.php:59
-msgid "Access level: "
-msgstr ""
-
-#: classes/pref/users.php:77 classes/pref/feeds.php:665
-#: classes/pref/feeds.php:892
-msgid "Options"
-msgstr ""
-
-#: classes/pref/users.php:91 js/prefs.js:570
-msgid "User details"
-msgstr ""
-
-#: classes/pref/users.php:98 classes/pref/labels.php:79
-#: classes/pref/prefs.php:985 classes/pref/filters.php:484
-#: classes/pref/feeds.php:799 classes/pref/feeds.php:939
-#: classes/article.php:203 plugins/mail/init.php:64
-#: plugins/af_redditimgur/init.php:55 plugins/af_psql_trgm/init.php:184
-#: plugins/nsfw/init.php:85 plugins/note/init.php:51
-#: plugins/instances/init.php:245
-msgid "Save"
-msgstr ""
-
-#: classes/pref/users.php:118
-msgid "User not found"
-msgstr ""
-
-#: classes/pref/users.php:132 classes/pref/users.php:400
-msgid "Registered"
-msgstr ""
-
-#: classes/pref/users.php:133
-msgid "Last logged in"
-msgstr ""
-
-#: classes/pref/users.php:140
-msgid "Subscribed feeds count"
-msgstr ""
-
-#: classes/pref/users.php:141
-msgid "Stored articles"
-msgstr ""
-
-#: classes/pref/users.php:145 classes/pref/users.php:399
-msgid "Subscribed feeds"
-msgstr ""
-
-#: classes/pref/users.php:232
-#, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr ""
-
-#: classes/pref/users.php:239
-#, php-format
-msgid "Could not create user <b>%s</b>"
+#: classes/feeds.php:1052 classes/pref/feeds.php:643
+#: classes/pref/feeds.php:880 classes/pref/feeds.php:1838
+#: classes/pref/users.php:397
+msgid "Login"
 msgstr ""
 
-#: classes/pref/users.php:243
-#, php-format
-msgid "User <b>%s</b> already exists."
+#: classes/feeds.php:1055 classes/pref/prefs.php:245
+#: classes/pref/feeds.php:656 classes/pref/feeds.php:886
+#: classes/pref/feeds.php:1841
+msgid "Password"
 msgstr ""
 
-#: classes/pref/users.php:265
-#, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+#: classes/feeds.php:1065
+msgid "This feed requires authentication."
 msgstr ""
 
-#: classes/pref/users.php:267
-#, php-format
-msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+#: classes/feeds.php:1070 classes/feeds.php:1124 classes/pref/feeds.php:1859
+msgid "Subscribe"
 msgstr ""
 
-#: classes/pref/users.php:291
-msgid "[tt-rss] Password change notification"
+#: classes/feeds.php:1073
+msgid "More feeds"
 msgstr ""
 
-#: classes/pref/users.php:324 classes/pref/filters.php:739
-#: classes/pref/feeds.php:1336 classes/feeds.php:1108 classes/feeds.php:1174
-#: js/tt-rss.js:174
+#: classes/feeds.php:1096 classes/feeds.php:1162 classes/pref/feeds.php:1336
+#: classes/pref/filters.php:739 classes/pref/users.php:324 js/tt-rss.js:174
 msgid "Search"
 msgstr ""
 
-#: classes/pref/users.php:334 classes/pref/labels.php:272
-#: classes/pref/prefs.php:996 classes/pref/filters.php:358
-#: classes/pref/filters.php:406 classes/pref/filters.php:743
-#: classes/pref/filters.php:831 classes/pref/filters.php:858
-#: classes/pref/feeds.php:1340 classes/pref/feeds.php:1602
-#: classes/pref/feeds.php:1666 plugins/instances/init.php:284
-msgid "Select"
-msgstr ""
-
-#: classes/pref/users.php:337 classes/pref/labels.php:275
-#: classes/pref/prefs.php:999 classes/pref/filters.php:361
-#: classes/pref/filters.php:409 classes/pref/filters.php:746
-#: classes/pref/filters.php:834 classes/pref/filters.php:861
-#: classes/pref/feeds.php:1343 classes/pref/feeds.php:1605
-#: classes/pref/feeds.php:1669 classes/feeds.php:90
-#: plugins/instances/init.php:287
-msgid "All"
-msgstr ""
-
-#: classes/pref/users.php:339 classes/pref/labels.php:277
-#: classes/pref/prefs.php:1001 classes/pref/filters.php:363
-#: classes/pref/filters.php:411 classes/pref/filters.php:748
-#: classes/pref/filters.php:836 classes/pref/filters.php:863
-#: classes/pref/feeds.php:1345 classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1671 classes/feeds.php:93
-#: plugins/instances/init.php:289
-msgid "None"
+#: classes/feeds.php:1100
+msgid "Popular feeds"
 msgstr ""
 
-#: classes/pref/users.php:342
-msgid "Create user"
+#: classes/feeds.php:1101
+msgid "Feed archive"
 msgstr ""
 
-#: classes/pref/users.php:346 classes/pref/filters.php:758
-#: plugins/instances/init.php:293
-msgid "Edit"
+#: classes/feeds.php:1104
+msgid "limit:"
 msgstr ""
 
-#: classes/pref/users.php:348 classes/pref/labels.php:284
+#: classes/feeds.php:1125 classes/pref/feeds.php:765
 #: classes/pref/filters.php:477 classes/pref/filters.php:765
-#: classes/pref/feeds.php:765 classes/feeds.php:1137
+#: classes/pref/users.php:348 classes/pref/labels.php:284
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr ""
 
-#: classes/pref/users.php:397 classes/pref/feeds.php:643
-#: classes/pref/feeds.php:880 classes/pref/feeds.php:1838
-#: classes/feeds.php:1064
-msgid "Login"
-msgstr ""
-
-#: classes/pref/users.php:398
-msgid "Access Level"
-msgstr ""
-
-#: classes/pref/users.php:401
-msgid "Last login"
-msgstr ""
-
-#: classes/pref/users.php:420 plugins/instances/init.php:334
-msgid "Click to edit"
-msgstr ""
-
-#: classes/pref/users.php:441
-msgid "No users defined."
-msgstr ""
-
-#: classes/pref/users.php:443
-msgid "No matching users found."
-msgstr ""
-
-#: classes/pref/labels.php:22 classes/pref/filters.php:347
-#: classes/pref/filters.php:822
-msgid "Caption"
-msgstr ""
-
-#: classes/pref/labels.php:37
-msgid "Colors"
-msgstr ""
-
-#: classes/pref/labels.php:42
-msgid "Foreground:"
+#: classes/feeds.php:1136
+msgid "Look for"
 msgstr ""
 
-#: classes/pref/labels.php:42
-msgid "Background:"
+#: classes/feeds.php:1144
+#, php-format
+msgid "in %s"
 msgstr ""
 
-#: classes/pref/labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
+#: classes/feeds.php:1149
+msgid "Used for word stemming"
 msgstr ""
 
-#: classes/pref/labels.php:287
-msgid "Clear colors"
+#: classes/feeds.php:1158
+msgid "Search syntax"
 msgstr ""
 
 #: classes/pref/prefs.php:18 classes/pref/feeds.php:537
@@ -1436,12 +1308,6 @@ msgstr ""
 msgid "Save data"
 msgstr ""
 
-#: classes/pref/prefs.php:245 classes/pref/feeds.php:656
-#: classes/pref/feeds.php:886 classes/pref/feeds.php:1841
-#: classes/feeds.php:1067
-msgid "Password"
-msgstr ""
-
 #: classes/pref/prefs.php:254
 msgid "Your password is at default value, please change it."
 msgstr ""
@@ -1560,51 +1426,51 @@ msgid ""
 "\">wiki</a>."
 msgstr ""
 
-#: classes/pref/prefs.php:736
+#: classes/pref/prefs.php:740
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:740 classes/pref/prefs.php:796
+#: classes/pref/prefs.php:744 classes/pref/prefs.php:800
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:741 classes/pref/prefs.php:797
+#: classes/pref/prefs.php:745 classes/pref/prefs.php:801
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:742 classes/pref/prefs.php:798
+#: classes/pref/prefs.php:746 classes/pref/prefs.php:802
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:743 classes/pref/prefs.php:799
+#: classes/pref/prefs.php:747 classes/pref/prefs.php:803
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:774 classes/pref/prefs.php:833
+#: classes/pref/prefs.php:778 classes/pref/prefs.php:837
 msgid "more info"
 msgstr ""
 
-#: classes/pref/prefs.php:783 classes/pref/prefs.php:842
+#: classes/pref/prefs.php:787 classes/pref/prefs.php:846
 msgid "Clear data"
 msgstr ""
 
-#: classes/pref/prefs.php:792
+#: classes/pref/prefs.php:796
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:857
+#: classes/pref/prefs.php:861
 msgid "Enable selected plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:925
+#: classes/pref/prefs.php:929
 msgid "Incorrect one time password"
 msgstr ""
 
-#: classes/pref/prefs.php:928 classes/pref/prefs.php:945
+#: classes/pref/prefs.php:932 classes/pref/prefs.php:949
 msgid "Incorrect password"
 msgstr ""
 
-#: classes/pref/prefs.php:970
+#: classes/pref/prefs.php:974
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1612,178 +1478,31 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/pref/prefs.php:1010
+#: classes/pref/prefs.php:1000 classes/pref/feeds.php:1340
+#: classes/pref/feeds.php:1602 classes/pref/feeds.php:1666
+#: classes/pref/filters.php:358 classes/pref/filters.php:406
+#: classes/pref/filters.php:743 classes/pref/filters.php:831
+#: classes/pref/filters.php:858 classes/pref/users.php:334
+#: classes/pref/labels.php:272 plugins/instances/init.php:284
+msgid "Select"
+msgstr ""
+
+#: classes/pref/prefs.php:1014
 msgid "Create profile"
 msgstr ""
 
-#: classes/pref/prefs.php:1033 classes/pref/prefs.php:1061
+#: classes/pref/prefs.php:1037 classes/pref/prefs.php:1065
 msgid "(active)"
 msgstr ""
 
-#: classes/pref/prefs.php:1095
+#: classes/pref/prefs.php:1099
 msgid "Remove selected profiles"
 msgstr ""
 
-#: classes/pref/prefs.php:1097
+#: classes/pref/prefs.php:1101
 msgid "Activate profile"
 msgstr ""
 
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr ""
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr ""
-
-#: classes/pref/system.php:43
-msgid "Clear log"
-msgstr ""
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr ""
-
-#: classes/pref/system.php:49
-msgid "Filename"
-msgstr ""
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr ""
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr ""
-
-#: classes/pref/filters.php:151
-msgid "Preview article"
-msgstr ""
-
-#: classes/pref/filters.php:238 classes/pref/filters.php:517
-msgid "(inverse)"
-msgstr ""
-
-#: classes/pref/filters.php:234 classes/pref/filters.php:516
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:353 classes/pref/filters.php:826
-#: classes/pref/filters.php:941
-msgid "Match"
-msgstr ""
-
-#: classes/pref/filters.php:367 classes/pref/filters.php:415
-#: classes/pref/filters.php:840 classes/pref/filters.php:867
-msgid "Add"
-msgstr ""
-
-#: classes/pref/filters.php:370 classes/pref/filters.php:418
-#: classes/pref/filters.php:843 classes/pref/filters.php:870
-#: classes/feeds.php:116
-msgid "Delete"
-msgstr ""
-
-#: classes/pref/filters.php:401 classes/pref/filters.php:853
-msgid "Apply actions"
-msgstr ""
-
-#: classes/pref/filters.php:451 classes/pref/filters.php:882
-msgid "Enabled"
-msgstr ""
-
-#: classes/pref/filters.php:460 classes/pref/filters.php:885
-msgid "Match any rule"
-msgstr ""
-
-#: classes/pref/filters.php:469 classes/pref/filters.php:888
-msgid "Inverse matching"
-msgstr ""
-
-#: classes/pref/filters.php:481 classes/pref/filters.php:895
-msgid "Test"
-msgstr ""
-
-#: classes/pref/filters.php:755
-msgid "Combine"
-msgstr ""
-
-#: classes/pref/filters.php:761 classes/pref/feeds.php:1356
-#: classes/pref/feeds.php:1370
-msgid "Reset sort order"
-msgstr ""
-
-#: classes/pref/filters.php:769 classes/pref/feeds.php:1392
-msgid "Rescore articles"
-msgstr ""
-
-#: classes/pref/filters.php:898
-msgid "Create"
-msgstr ""
-
-#: classes/pref/filters.php:953
-msgid "Inverse regular expression matching"
-msgstr ""
-
-#: classes/pref/filters.php:955
-msgid "on field"
-msgstr ""
-
-#: classes/pref/filters.php:961 js/PrefFilterTree.js:61
-msgid "in"
-msgstr ""
-
-#: classes/pref/filters.php:974
-msgid "Wiki: Filters"
-msgstr ""
-
-#: classes/pref/filters.php:979
-msgid "Save rule"
-msgstr ""
-
-#: classes/pref/filters.php:979 js/functions.js:1012
-msgid "Add rule"
-msgstr ""
-
-#: classes/pref/filters.php:1002
-msgid "Perform Action"
-msgstr ""
-
-#: classes/pref/filters.php:1053
-msgid "No actions available"
-msgstr ""
-
-#: classes/pref/filters.php:1072
-msgid "Save action"
-msgstr ""
-
-#: classes/pref/filters.php:1072 js/functions.js:1038
-msgid "Add action"
-msgstr ""
-
-#: classes/pref/filters.php:1096
-msgid "[No caption]"
-msgstr ""
-
-#: classes/pref/filters.php:1098
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: classes/pref/filters.php:1113
-msgid "matches any rule"
-msgstr ""
-
-#: classes/pref/filters.php:1116
-#, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] ""
-msgstr[1] ""
-
 #: classes/pref/feeds.php:15
 msgid "Check to enable field"
 msgstr ""
@@ -1801,9 +1520,9 @@ msgstr[1] ""
 msgid "Feed Title"
 msgstr ""
 
-#: classes/pref/feeds.php:595 classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1824 classes/feeds.php:1040
-msgid "Place in category:"
+#: classes/pref/feeds.php:572 classes/handler/public.php:508
+#: plugins/instances/init.php:212 plugins/instances/init.php:401
+msgid "URL:"
 msgstr ""
 
 #: classes/pref/feeds.php:608 classes/pref/feeds.php:842
@@ -1824,6 +1543,11 @@ msgid ""
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
+#: classes/pref/feeds.php:665 classes/pref/feeds.php:892
+#: classes/pref/users.php:77
+msgid "Options"
+msgstr ""
+
 #: classes/pref/feeds.php:679 classes/pref/feeds.php:896
 msgid "Hide from Popular feeds"
 msgstr ""
@@ -1880,6 +1604,11 @@ msgstr ""
 msgid "Edit selected feeds"
 msgstr ""
 
+#: classes/pref/feeds.php:1356 classes/pref/feeds.php:1370
+#: classes/pref/filters.php:761
+msgid "Reset sort order"
+msgstr ""
+
 #: classes/pref/feeds.php:1358 js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr ""
@@ -1908,6 +1637,10 @@ msgstr ""
 msgid "Clear feed data"
 msgstr ""
 
+#: classes/pref/feeds.php:1392 classes/pref/filters.php:769
+msgid "Rescore articles"
+msgstr ""
+
 #: classes/pref/feeds.php:1444
 msgid "OPML"
 msgstr ""
@@ -1976,10 +1709,6 @@ msgid ""
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: classes/pref/feeds.php:1516 classes/feeds.php:54 classes/feeds.php:134
-msgid "View as RSS"
-msgstr ""
-
 #: classes/pref/feeds.php:1517
 msgid "Display URL"
 msgstr ""
@@ -2014,16 +1743,310 @@ msgstr ""
 msgid "Feeds require authentication."
 msgstr ""
 
-#: classes/pref/feeds.php:1859 classes/feeds.php:1082 classes/feeds.php:1136
-msgid "Subscribe"
+#: classes/pref/filters.php:151
+msgid "Preview article"
 msgstr ""
 
-#: classes/article.php:25
-msgid "Article not found."
+#: classes/pref/filters.php:238 classes/pref/filters.php:517
+msgid "(inverse)"
 msgstr ""
 
-#: classes/article.php:178
-msgid "Tags for this article (separated by commas):"
+#: classes/pref/filters.php:234 classes/pref/filters.php:516
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:347 classes/pref/filters.php:822
+#: classes/pref/labels.php:22
+msgid "Caption"
+msgstr ""
+
+#: classes/pref/filters.php:353 classes/pref/filters.php:826
+#: classes/pref/filters.php:941
+msgid "Match"
+msgstr ""
+
+#: classes/pref/filters.php:367 classes/pref/filters.php:415
+#: classes/pref/filters.php:840 classes/pref/filters.php:867
+msgid "Add"
+msgstr ""
+
+#: classes/pref/filters.php:401 classes/pref/filters.php:853
+msgid "Apply actions"
+msgstr ""
+
+#: classes/pref/filters.php:451 classes/pref/filters.php:882
+msgid "Enabled"
+msgstr ""
+
+#: classes/pref/filters.php:460 classes/pref/filters.php:885
+msgid "Match any rule"
+msgstr ""
+
+#: classes/pref/filters.php:469 classes/pref/filters.php:888
+msgid "Inverse matching"
+msgstr ""
+
+#: classes/pref/filters.php:481 classes/pref/filters.php:895
+msgid "Test"
+msgstr ""
+
+#: classes/pref/filters.php:755
+msgid "Combine"
+msgstr ""
+
+#: classes/pref/filters.php:758 classes/pref/users.php:346
+#: plugins/instances/init.php:293
+msgid "Edit"
+msgstr ""
+
+#: classes/pref/filters.php:898
+msgid "Create"
+msgstr ""
+
+#: classes/pref/filters.php:953
+msgid "Inverse regular expression matching"
+msgstr ""
+
+#: classes/pref/filters.php:955
+msgid "on field"
+msgstr ""
+
+#: classes/pref/filters.php:961 js/PrefFilterTree.js:61
+msgid "in"
+msgstr ""
+
+#: classes/pref/filters.php:974
+msgid "Wiki: Filters"
+msgstr ""
+
+#: classes/pref/filters.php:979
+msgid "Save rule"
+msgstr ""
+
+#: classes/pref/filters.php:979 js/functions.js:1012
+msgid "Add rule"
+msgstr ""
+
+#: classes/pref/filters.php:1002
+msgid "Perform Action"
+msgstr ""
+
+#: classes/pref/filters.php:1053
+msgid "No actions available"
+msgstr ""
+
+#: classes/pref/filters.php:1072
+msgid "Save action"
+msgstr ""
+
+#: classes/pref/filters.php:1072 js/functions.js:1038
+msgid "Add action"
+msgstr ""
+
+#: classes/pref/filters.php:1096
+msgid "[No caption]"
+msgstr ""
+
+#: classes/pref/filters.php:1098
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: classes/pref/filters.php:1113
+msgid "matches any rule"
+msgstr ""
+
+#: classes/pref/filters.php:1116
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: classes/pref/users.php:6 classes/pref/system.php:8
+#: plugins/instances/init.php:154
+msgid "Your access level is insufficient to open this tab."
+msgstr ""
+
+#: classes/pref/users.php:24
+msgid "Edit user"
+msgstr ""
+
+#: classes/pref/users.php:59
+msgid "Access level: "
+msgstr ""
+
+#: classes/pref/users.php:91 js/prefs.js:570
+msgid "User details"
+msgstr ""
+
+#: classes/pref/users.php:118
+msgid "User not found"
+msgstr ""
+
+#: classes/pref/users.php:132 classes/pref/users.php:400
+msgid "Registered"
+msgstr ""
+
+#: classes/pref/users.php:133
+msgid "Last logged in"
+msgstr ""
+
+#: classes/pref/users.php:140
+msgid "Subscribed feeds count"
+msgstr ""
+
+#: classes/pref/users.php:141
+msgid "Stored articles"
+msgstr ""
+
+#: classes/pref/users.php:145 classes/pref/users.php:399
+msgid "Subscribed feeds"
+msgstr ""
+
+#: classes/pref/users.php:232
+#, php-format
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr ""
+
+#: classes/pref/users.php:239
+#, php-format
+msgid "Could not create user <b>%s</b>"
+msgstr ""
+
+#: classes/pref/users.php:243
+#, php-format
+msgid "User <b>%s</b> already exists."
+msgstr ""
+
+#: classes/pref/users.php:265
+#, php-format
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgstr ""
+
+#: classes/pref/users.php:267
+#, php-format
+msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
+msgstr ""
+
+#: classes/pref/users.php:291
+msgid "[tt-rss] Password change notification"
+msgstr ""
+
+#: classes/pref/users.php:342
+msgid "Create user"
+msgstr ""
+
+#: classes/pref/users.php:350 classes/handler/public.php:827
+msgid "Reset password"
+msgstr ""
+
+#: classes/pref/users.php:398
+msgid "Access Level"
+msgstr ""
+
+#: classes/pref/users.php:401
+msgid "Last login"
+msgstr ""
+
+#: classes/pref/users.php:420 plugins/instances/init.php:334
+msgid "Click to edit"
+msgstr ""
+
+#: classes/pref/users.php:441
+msgid "No users defined."
+msgstr ""
+
+#: classes/pref/users.php:443
+msgid "No matching users found."
+msgstr ""
+
+#: classes/pref/labels.php:37
+msgid "Colors"
+msgstr ""
+
+#: classes/pref/labels.php:42
+msgid "Foreground:"
+msgstr ""
+
+#: classes/pref/labels.php:42
+msgid "Background:"
+msgstr ""
+
+#: classes/pref/labels.php:232
+#, php-format
+msgid "Created label <b>%s</b>"
+msgstr ""
+
+#: classes/pref/labels.php:287
+msgid "Clear colors"
+msgstr ""
+
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr ""
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr ""
+
+#: classes/pref/system.php:43
+msgid "Clear log"
+msgstr ""
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr ""
+
+#: classes/pref/system.php:49
+msgid "Filename"
+msgstr ""
+
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr ""
+
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr ""
+
+#: classes/dlg.php:17
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
+msgstr ""
+
+#: classes/dlg.php:48
+msgid "Your Public OPML URL is:"
+msgstr ""
+
+#: classes/dlg.php:57 classes/dlg.php:183 plugins/share/init.php:118
+msgid "Generate new URL"
+msgstr ""
+
+#: 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:75 classes/dlg.php:84
+msgid "Last update:"
+msgstr ""
+
+#: 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:174
+msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
 #: classes/opml.php:28 classes/opml.php:33
@@ -2093,205 +2116,162 @@ msgstr ""
 msgid "Error while parsing document."
 msgstr ""
 
-#: classes/feeds.php:53
-msgid "View as RSS feed"
-msgstr ""
-
-#: classes/feeds.php:62
-#, php-format
-msgid "Last updated: %s"
-msgstr ""
-
-#: classes/feeds.php:92
-msgid "Invert"
-msgstr ""
-
-#: classes/feeds.php:99
-msgid "More..."
-msgstr ""
-
-#: classes/feeds.php:101
-msgid "Selection toggle:"
-msgstr ""
-
-#: classes/feeds.php:107
-msgid "Selection:"
+#: classes/handler/public.php:498 plugins/bookmarklets/init.php:40
+msgid "Share with Tiny Tiny RSS"
 msgstr ""
 
-#: classes/feeds.php:110
-msgid "Set score"
+#: classes/handler/public.php:506
+msgid "Title:"
 msgstr ""
 
-#: classes/feeds.php:113
-msgid "Archive"
+#: classes/handler/public.php:510
+msgid "Content:"
 msgstr ""
 
-#: classes/feeds.php:115
-msgid "Move back"
+#: classes/handler/public.php:512
+msgid "Labels:"
 msgstr ""
 
-#: classes/feeds.php:121 classes/feeds.php:126 plugins/mail/init.php:75
-#: plugins/mailto/init.php:25
-msgid "Forward by email"
+#: classes/handler/public.php:531
+msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/feeds.php:130
-msgid "Feed:"
+#: classes/handler/public.php:533
+msgid "Share"
 msgstr ""
 
-#: classes/feeds.php:201 classes/feeds.php:879
-msgid "Feed not found."
+#: classes/handler/public.php:555
+msgid "Not logged in"
 msgstr ""
 
-#: classes/feeds.php:272
-msgid "Never"
+#: classes/handler/public.php:614
+msgid "Incorrect username or password"
 msgstr ""
 
-#: classes/feeds.php:397
+#: classes/handler/public.php:666
 #, php-format
-msgid "Imported at %s"
-msgstr ""
-
-#: classes/feeds.php:456 classes/feeds.php:553
-msgid "mark feed as read"
-msgstr ""
-
-#: classes/feeds.php:612
-msgid "Collapse article"
-msgstr ""
-
-#: classes/feeds.php:778
-msgid "No unread articles found to display."
-msgstr ""
-
-#: classes/feeds.php:781
-msgid "No updated articles found to display."
-msgstr ""
-
-#: classes/feeds.php:784
-msgid "No starred articles found to display."
-msgstr ""
-
-#: classes/feeds.php:788
-msgid ""
-"No articles found to display. You can assign articles to labels manually "
-"from article header context menu (applies to all selected articles) or use a "
-"filter."
+msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/feeds.php:790
-msgid "No articles found to display."
+#: classes/handler/public.php:669
+#, php-format
+msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/feeds.php:805 classes/feeds.php:979
+#: classes/handler/public.php:672
 #, php-format
-msgid "Feeds last updated at %s"
+msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/feeds.php:815 classes/feeds.php:989
-msgid "Some feeds have update errors (click for details)"
+#: classes/handler/public.php:675
+#, php-format
+msgid "No feeds found in <b>%s</b>."
 msgstr ""
 
-#: classes/feeds.php:969
-msgid "No feed selected."
+#: classes/handler/public.php:678
+msgid "Multiple feed URLs found."
 msgstr ""
 
-#: classes/feeds.php:1026 classes/feeds.php:1034
-msgid "Feed or site URL"
+#: classes/handler/public.php:682
+#, php-format
+msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/feeds.php:1048
-msgid "Available feeds"
+#: classes/handler/public.php:700
+msgid "Subscribe to selected feed"
 msgstr ""
 
-#: classes/feeds.php:1077
-msgid "This feed requires authentication."
+#: classes/handler/public.php:725
+msgid "Edit subscription options"
 msgstr ""
 
-#: classes/feeds.php:1085
-msgid "More feeds"
+#: classes/handler/public.php:762
+msgid "Password recovery"
 msgstr ""
 
-#: classes/feeds.php:1112
-msgid "Popular feeds"
+#: classes/handler/public.php:805
+msgid ""
+"You will need to provide valid account name and email. A password reset link "
+"will be sent to your email address."
 msgstr ""
 
-#: classes/feeds.php:1113
-msgid "Feed archive"
+#: classes/handler/public.php:837
+msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/feeds.php:1116
-msgid "limit:"
+#: classes/handler/public.php:841 classes/handler/public.php:907
+msgid "Go back"
 msgstr ""
 
-#: classes/feeds.php:1148
-msgid "Look for"
+#: classes/handler/public.php:878
+msgid "[tt-rss] Password reset request"
 msgstr ""
 
-#: classes/feeds.php:1156
-#, php-format
-msgid "in %s"
+#: classes/handler/public.php:903
+msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/feeds.php:1161
-msgid "Used for word stemming"
+#: classes/handler/public.php:925
+msgid "Your access level is insufficient to run this script."
 msgstr ""
 
-#: classes/feeds.php:1170
-msgid "Search syntax"
+#: classes/handler/public.php:951
+msgid "Database Updater"
 msgstr ""
 
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
+#: classes/handler/public.php:1016
+msgid "Perform updates"
 msgstr ""
 
-#: plugins/mail/init.php:34
-msgid "Mail plugin"
+#: classes/backend.php:33
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
 
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
+#: classes/backend.php:38
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: plugins/mail/init.php:112 plugins/mail/init.php:118
-#: plugins/mailto/init.php:49 plugins/mailto/init.php:55
-msgid "[Forwarded]"
+#: classes/backend.php:61
+msgid "Shift"
 msgstr ""
 
-#: plugins/mail/init.php:112 plugins/mailto/init.php:49
-msgid "Multiple articles"
+#: classes/backend.php:64
+msgid "Ctrl"
 msgstr ""
 
-#: plugins/mail/init.php:140
-msgid "To:"
+#: classes/backend.php:99
+msgid "Help topic not found."
 msgstr ""
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/mail/init.php:171
-msgid "Send e-mail"
+#: plugins/bookmarklets/init.php:22
+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 ""
 
-#: plugins/af_readability/init.php:25
-msgid "Inline content"
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr ""
 
-#: plugins/af_readability/init.php:31
-msgid "af_readability settings"
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/af_readability/init.php:42 plugins/af_psql_trgm/init.php:195
-msgid "Currently enabled for (click to edit):"
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/af_readability/init.php:59
-msgid "Readability"
+#: plugins/af_comics/init.php:39
+msgid "Feeds supported by af_comics"
 msgstr ""
 
-#: plugins/af_readability/init.php:70
-msgid "Inline article content"
+#: plugins/af_comics/init.php:41
+msgid "The following comics are currently supported:"
 msgstr ""
 
 #: plugins/af_redditimgur/init.php:21
@@ -2375,21 +2355,24 @@ msgstr ""
 msgid "No file uploaded."
 msgstr ""
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
+#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:69
+msgid "Shared articles"
 msgstr ""
 
-#: plugins/mailto/init.php:75
-msgid "Forward selected article(s) by email."
+#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
 msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid ""
-"You should be able to edit the message before sending in your mail client."
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
 msgstr ""
 
-#: plugins/mailto/init.php:83
-msgid "Close this dialog"
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
+msgstr ""
+
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
 msgstr ""
 
 #: plugins/af_psql_trgm/init.php:28
@@ -2428,155 +2411,186 @@ msgstr ""
 msgid "Enable for all feeds:"
 msgstr ""
 
+#: plugins/af_psql_trgm/init.php:195 plugins/af_readability/init.php:42
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
 #: plugins/af_psql_trgm/init.php:212
 msgid "Similarity (pg_trgm)"
 msgstr ""
 
-#: plugins/share/init.php:39
-msgid "You can disable all articles shared by unique URLs here."
+#: plugins/af_readability/init.php:25
+msgid "Inline content"
 msgstr ""
 
-#: plugins/share/init.php:42
-msgid "Unshare all articles"
+#: plugins/af_readability/init.php:31
+msgid "af_readability settings"
 msgstr ""
 
-#: plugins/share/init.php:75
-msgid "Share by URL"
+#: plugins/af_readability/init.php:59
+msgid "Readability"
 msgstr ""
 
-#: plugins/share/init.php:97
-msgid "You can share this article by the following unique URL:"
+#: plugins/af_readability/init.php:70
+msgid "Inline article content"
 msgstr ""
 
-#: plugins/share/init.php:115
-msgid "Unshare article"
+#: plugins/note/init.php:26 plugins/note/note.js:11
+msgid "Edit article note"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
+#: plugins/instances/init.php:141
+msgid "Linked"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:22
+#: plugins/instances/init.php:204 plugins/instances/init.php:395
+msgid "Instance"
+msgstr ""
+
+#: plugins/instances/init.php:215 plugins/instances/init.php:312
+#: plugins/instances/init.php:404
+msgid "Instance URL"
+msgstr ""
+
+#: plugins/instances/init.php:226 plugins/instances/init.php:414
+msgid "Access key:"
+msgstr ""
+
+#: plugins/instances/init.php:229 plugins/instances/init.php:313
+#: plugins/instances/init.php:417
+msgid "Access key"
+msgstr ""
+
+#: plugins/instances/init.php:233 plugins/instances/init.php:421
+msgid "Use one access key for both linked instances."
+msgstr ""
+
+#: plugins/instances/init.php:241 plugins/instances/init.php:429
+msgid "Generate new key"
+msgstr ""
+
+#: plugins/instances/init.php:292
+msgid "Link instance"
+msgstr ""
+
+#: plugins/instances/init.php:304
 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."
+"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 ""
 
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
+#: plugins/instances/init.php:314
+msgid "Last connected"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
+#: plugins/instances/init.php:315
+msgid "Status"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+#: plugins/instances/init.php:316
+msgid "Stored feeds"
 msgstr ""
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
+#: plugins/instances/init.php:433
+msgid "Create link"
 msgstr ""
 
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
+#: plugins/share/init.php:39
+msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
+#: plugins/share/init.php:42
+msgid "Unshare all articles"
 msgstr ""
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
+#: plugins/share/init.php:75
+msgid "Share by URL"
 msgstr ""
 
-#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: plugins/share/init.php:97
+msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
+#: plugins/share/init.php:115
+msgid "Unshare article"
 msgstr ""
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: plugins/mailto/init.php:49 plugins/mailto/init.php:55
+#: plugins/mail/init.php:112 plugins/mail/init.php:118
+msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
+#: plugins/mailto/init.php:49 plugins/mail/init.php:112
+msgid "Multiple articles"
 msgstr ""
 
-#: plugins/note/init.php:26 plugins/note/note.js:11
-msgid "Edit article note"
+#: plugins/mailto/init.php:71
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
-#: plugins/af_comics/init.php:39
-msgid "Feeds supported by af_comics"
+#: plugins/mailto/init.php:75
+msgid "Forward selected article(s) by email."
 msgstr ""
 
-#: plugins/af_comics/init.php:41
-msgid "The following comics are currently supported:"
+#: plugins/mailto/init.php:78
+msgid ""
+"You should be able to edit the message before sending in your mail client."
 msgstr ""
 
-#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:69
-msgid "Shared articles"
+#: plugins/mailto/init.php:83
+msgid "Close this dialog"
 msgstr ""
 
-#: plugins/instances/init.php:141
-msgid "Linked"
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
 msgstr ""
 
-#: plugins/instances/init.php:204 plugins/instances/init.php:395
-msgid "Instance"
+#: plugins/mail/init.php:34
+msgid "Mail plugin"
 msgstr ""
 
-#: plugins/instances/init.php:215 plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr ""
 
-#: plugins/instances/init.php:226 plugins/instances/init.php:414
-msgid "Access key:"
+#: plugins/mail/init.php:140
+msgid "To:"
 msgstr ""
 
-#: plugins/instances/init.php:229 plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
+#: plugins/mail/init.php:155
+msgid "Subject:"
 msgstr ""
 
-#: plugins/instances/init.php:233 plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
+#: plugins/mail/init.php:171
+msgid "Send e-mail"
 msgstr ""
 
-#: plugins/instances/init.php:241 plugins/instances/init.php:429
-msgid "Generate new key"
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
 msgstr ""
 
-#: plugins/instances/init.php:292
-msgid "Link instance"
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
 msgstr ""
 
-#: plugins/instances/init.php:304
-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:"
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
 msgstr ""
 
-#: plugins/instances/init.php:314
-msgid "Last connected"
+#: plugins/close_button/init.php:22
+msgid "Close article"
 msgstr ""
 
-#: plugins/instances/init.php:315
-msgid "Status"
+#: js/PrefFeedTree.js:48
+msgid "Edit category"
 msgstr ""
 
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
+#: js/PrefFeedTree.js:55
+msgid "Remove category"
 msgstr ""
 
-#: plugins/instances/init.php:433
-msgid "Create link"
+#: js/PrefFilterTree.js:64
+msgid "Inverse"
 msgstr ""
 
 #: js/functions.js:62
@@ -2675,18 +2689,6 @@ msgstr ""
 msgid "Removing selected feeds..."
 msgstr ""
 
-#: js/PrefFeedTree.js:48
-msgid "Edit category"
-msgstr ""
-
-#: js/PrefFeedTree.js:55
-msgid "Remove category"
-msgstr ""
-
-#: js/PrefFilterTree.js:64
-msgid "Inverse"
-msgstr ""
-
 #: js/prefs.js:69
 msgid "Please enter login:"
 msgstr ""
@@ -2888,113 +2890,97 @@ msgstr ""
 msgid "Rescoring articles..."
 msgstr ""
 
-#: js/viewfeed.js:1033 js/viewfeed.js:1076 js/viewfeed.js:1129
-#: js/viewfeed.js:2290 plugins/mail/mail.js:7 plugins/mailto/init.js:7
-#: js/viewfeed.js:757 js/viewfeed.js:785 js/viewfeed.js:812 js/viewfeed.js:877
-#: js/viewfeed.js:911
+#: js/viewfeed.js:1035 js/viewfeed.js:1078 js/viewfeed.js:1131
+#: js/viewfeed.js:2292 plugins/mailto/init.js:7 plugins/mail/mail.js:7
+#: js/viewfeed.js:759 js/viewfeed.js:787 js/viewfeed.js:814 js/viewfeed.js:879
+#: js/viewfeed.js:913
 msgid "No articles are selected."
 msgstr ""
 
-#: js/viewfeed.js:1041
+#: js/viewfeed.js:1043
 #, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1043
+#: js/viewfeed.js:1045
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1085
+#: js/viewfeed.js:1087
 #, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1088
+#: js/viewfeed.js:1090
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1090
+#: js/viewfeed.js:1092
 msgid ""
 "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1135
+#: js/viewfeed.js:1137
 #, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1159
+#: js/viewfeed.js:1161
 msgid "Edit article Tags"
 msgstr ""
 
-#: js/viewfeed.js:1165
+#: js/viewfeed.js:1167
 msgid "Saving article tags..."
 msgstr ""
 
-#: js/viewfeed.js:1979
+#: js/viewfeed.js:1981
 msgid "Open original article"
 msgstr ""
 
-#: js/viewfeed.js:2085
+#: js/viewfeed.js:2087
 msgid "Assign label"
 msgstr ""
 
-#: js/viewfeed.js:2090
+#: js/viewfeed.js:2092
 msgid "Remove label"
 msgstr ""
 
-#: js/viewfeed.js:2177
+#: js/viewfeed.js:2179
 msgid "Select articles in group"
 msgstr ""
 
-#: js/viewfeed.js:2186
+#: js/viewfeed.js:2188
 msgid "Mark group as read"
 msgstr ""
 
-#: js/viewfeed.js:2198
+#: js/viewfeed.js:2200
 msgid "Mark feed as read"
 msgstr ""
 
-#: js/viewfeed.js:2259
+#: js/viewfeed.js:2261
 msgid "Please enter new score for selected articles:"
 msgstr ""
 
-#: js/viewfeed.js:2329
+#: js/viewfeed.js:2331
 msgid "Please enter new score for this article:"
 msgstr ""
 
-#: js/viewfeed.js:2363
+#: js/viewfeed.js:2365
 msgid "Article URL:"
 msgstr ""
 
-#: plugins/mail/mail.js:21 plugins/mailto/init.js:21
-msgid "Forward article by email"
-msgstr ""
-
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr ""
-
-#: plugins/mail/mail.js:38
-msgid "Your message has been sent."
-msgstr ""
-
-#: plugins/embed_original/init.js:6
-msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr ""
@@ -3022,6 +3008,34 @@ msgstr ""
 msgid "Related articles"
 msgstr ""
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr ""
+
+#: plugins/instances/instances.js:10
+msgid "Link Instance"
+msgstr ""
+
+#: plugins/instances/instances.js:73
+msgid "Edit Instance"
+msgstr ""
+
+#: plugins/instances/instances.js:122
+msgid "Remove selected instances?"
+msgstr ""
+
+#: plugins/instances/instances.js:125
+msgid "Removing selected instances..."
+msgstr ""
+
+#: plugins/instances/instances.js:139 plugins/instances/instances.js:151
+msgid "No instances are selected."
+msgstr ""
+
+#: plugins/instances/instances.js:156
+msgid "Please select only one instance."
+msgstr ""
+
 #: plugins/share/share_prefs.js:3
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
@@ -3054,51 +3068,39 @@ msgstr ""
 msgid "Trying to unshare..."
 msgstr ""
 
-#: plugins/shorten_expanded/init.js:37
-msgid "Click to expand article"
-msgstr ""
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr ""
-
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr ""
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
+#: plugins/mailto/init.js:21 plugins/mail/mail.js:21
+msgid "Forward article by email"
 msgstr ""
 
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
+#: plugins/shorten_expanded/init.js:37
+msgid "Click to expand article"
 msgstr ""
 
-#: plugins/instances/instances.js:125
-msgid "Removing selected instances..."
+#: plugins/mail/mail.js:36
+msgid "Error sending email:"
 msgstr ""
 
-#: plugins/instances/instances.js:139 plugins/instances/instances.js:151
-msgid "No instances are selected."
+#: plugins/mail/mail.js:38
+msgid "Your message has been sent."
 msgstr ""
 
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
+#: plugins/embed_original/init.js:6
+msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: js/feedlist.js:423 js/feedlist.js:451
+#: js/feedlist.js:445 js/feedlist.js:473
 msgid "Mark all articles in %s as read?"
 msgstr ""
 
-#: js/feedlist.js:442
+#: js/feedlist.js:464
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr ""
 
-#: js/feedlist.js:445
+#: js/feedlist.js:467
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr ""
 
-#: js/feedlist.js:448
+#: js/feedlist.js:470
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr ""
 
@@ -3314,42 +3316,42 @@ msgstr ""
 msgid "New articles found, reload feed to continue."
 msgstr ""
 
-#: js/viewfeed.js:464
+#: js/viewfeed.js:466
 msgid "Unstar article"
 msgstr ""
 
-#: js/viewfeed.js:468
+#: js/viewfeed.js:470
 msgid "Star article"
 msgstr ""
 
-#: js/viewfeed.js:522
+#: js/viewfeed.js:524
 msgid "Unpublish article"
 msgstr ""
 
-#: js/viewfeed.js:526
+#: js/viewfeed.js:528
 msgid "Publish article"
 msgstr ""
 
-#: js/viewfeed.js:680
+#: js/viewfeed.js:682
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1425
+#: js/viewfeed.js:1427
 msgid "No article is selected."
 msgstr ""
 
-#: js/viewfeed.js:1460
+#: js/viewfeed.js:1462
 msgid "No articles found to mark"
 msgstr ""
 
-#: js/viewfeed.js:1462
+#: js/viewfeed.js:1464
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1985
+#: js/viewfeed.js:1987
 msgid "Display article URL"
 msgstr ""