rebase translations, update script to maybe extract more translations from js files (fuck you xgettext you piece of shit)

1 files changed, 951 insertions, 703 deletions

diff --git a/messages.pot b/messages.pot
index f5d3ad00a..90ec7f504 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: 2014-09-06 15:10+0400\n"
+"POT-Creation-Date: 2014-12-18 18:25+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"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Weekly"
 msgstr ""
 
-#: backend.php:103 classes/pref/users.php:119 classes/pref/system.php:51
+#: backend.php:103 classes/pref/system.php:51 classes/pref/users.php:119
 msgid "User"
 msgstr ""
 
@@ -153,13 +153,16 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
 #: index.php:133 index.php:150 index.php:273 prefs.php:102
-#: classes/backend.php:5 classes/pref/labels.php:296
-#: classes/pref/filters.php:704 classes/pref/feeds.php:1367 js/feedlist.js:126
-#: js/functions.js:1218 js/functions.js:1352 js/functions.js:1664
+#: classes/backend.php:5 classes/pref/feeds.php:1367
+#: classes/pref/filters.php:704 classes/pref/labels.php:296 js/feedlist.js:126
+#: js/functions.js:1221 js/functions.js:1355 js/functions.js:1667
 #: js/prefs.js:653 js/prefs.js:854 js/prefs.js:1760 js/prefs.js:1776
-#: js/prefs.js:1794 js/tt-rss.js:55 js/tt-rss.js:515 js/viewfeed.js:741
-#: js/viewfeed.js:1316 plugins/import_export/import_export.js:17
-#: plugins/updater/updater.js:17
+#: js/prefs.js:1794 js/tt-rss.js:55 js/tt-rss.js:521 js/viewfeed.js:741
+#: js/viewfeed.js:1316 plugins/updater/updater.js:17
+#: plugins/import_export/import_export.js:17 js/feedlist.js:450
+#: js/functions.js:449 js/functions.js:787 js/prefs.js:1441 js/prefs.js:1494
+#: js/prefs.js:1534 js/prefs.js:1551 js/prefs.js:1567 js/prefs.js:1587
+#: js/tt-rss.js:538 js/viewfeed.js:859
 msgid "Loading, please wait..."
 msgstr ""
 
@@ -179,11 +182,11 @@ msgstr ""
 msgid "All Articles"
 msgstr ""
 
-#: index.php:176 include/functions2.php:99 classes/feeds.php:102
+#: index.php:176 include/functions2.php:102 classes/feeds.php:102
 msgid "Starred"
 msgstr ""
 
-#: index.php:177 include/functions2.php:100 classes/feeds.php:103
+#: index.php:177 include/functions2.php:103 classes/feeds.php:103
 msgid "Published"
 msgstr ""
 
@@ -223,7 +226,7 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: index.php:194 index.php:242 include/functions2.php:89 classes/feeds.php:107
+#: index.php:194 index.php:242 include/functions2.php:92 classes/feeds.php:107
 #: js/FeedTree.js:132 js/FeedTree.js:160
 msgid "Mark as read"
 msgstr ""
@@ -264,7 +267,7 @@ msgstr ""
 msgid "Feed actions:"
 msgstr ""
 
-#: index.php:237 classes/handler/public.php:629
+#: index.php:237 classes/handler/public.php:628
 msgid "Subscribe to feed..."
 msgstr ""
 
@@ -293,7 +296,7 @@ msgstr ""
 msgid "Other actions:"
 msgstr ""
 
-#: index.php:245 include/functions2.php:75
+#: index.php:245 include/functions2.php:78
 msgid "Toggle widescreen mode"
 msgstr ""
 
@@ -317,7 +320,7 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: prefs.php:33 prefs.php:120 include/functions2.php:102
+#: prefs.php:33 prefs.php:120 include/functions2.php:105
 #: classes/pref/prefs.php:441
 msgid "Preferences"
 msgstr ""
@@ -339,7 +342,7 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#: prefs.php:129 include/functions.php:1264 include/functions.php:1916
+#: prefs.php:129 include/functions.php:1265 include/functions.php:1917
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr ""
@@ -362,10 +365,10 @@ msgstr ""
 
 #: register.php:197 register.php:242 register.php:255 register.php:270
 #: register.php:289 register.php:337 register.php:347 register.php:359
-#: classes/handler/public.php:699 classes/handler/public.php:770
-#: classes/handler/public.php:868 classes/handler/public.php:947
-#: classes/handler/public.php:961 classes/handler/public.php:968
-#: classes/handler/public.php:993
+#: classes/handler/public.php:698 classes/handler/public.php:769
+#: classes/handler/public.php:867 classes/handler/public.php:946
+#: classes/handler/public.php:960 classes/handler/public.php:967
+#: classes/handler/public.php:992
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
@@ -384,11 +387,11 @@ msgstr ""
 msgid "Check availability"
 msgstr ""
 
-#: register.php:229 classes/handler/public.php:786
+#: register.php:229 classes/handler/public.php:785
 msgid "Email:"
 msgstr ""
 
-#: register.php:232 classes/handler/public.php:791
+#: register.php:232 classes/handler/public.php:790
 msgid "How much is two plus two:"
 msgstr ""
 
@@ -420,9 +423,9 @@ msgstr ""
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: include/digest.php:109 include/functions.php:1273
-#: include/functions.php:1817 include/functions.php:1902
-#: include/functions.php:1924 classes/opml.php:421 classes/pref/feeds.php:226
+#: include/digest.php:109 include/functions.php:1274
+#: include/functions.php:1818 include/functions.php:1903
+#: include/functions.php:1925 classes/opml.php:421 classes/pref/feeds.php:226
 msgid "Uncategorized"
 msgstr ""
 
@@ -437,319 +440,319 @@ msgstr[1] ""
 msgid "No feeds found."
 msgstr ""
 
-#: include/functions2.php:49
+#: include/functions2.php:52
 msgid "Navigation"
 msgstr ""
 
-#: include/functions2.php:50
+#: include/functions2.php:53
 msgid "Open next feed"
 msgstr ""
 
-#: include/functions2.php:51
+#: include/functions2.php:54
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions2.php:52
+#: include/functions2.php:55
 msgid "Open next article"
 msgstr ""
 
-#: include/functions2.php:53
+#: include/functions2.php:56
 msgid "Open previous article"
 msgstr ""
 
-#: include/functions2.php:54
+#: include/functions2.php:57
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:55
+#: include/functions2.php:58
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions2.php:56
+#: include/functions2.php:59
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:57
+#: include/functions2.php:60
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions2.php:58
+#: include/functions2.php:61
 msgid "Show search dialog"
 msgstr ""
 
-#: include/functions2.php:59
+#: include/functions2.php:62
 msgid "Article"
 msgstr ""
 
-#: include/functions2.php:60 js/viewfeed.js:2009
+#: include/functions2.php:63 js/viewfeed.js:2009
 msgid "Toggle starred"
 msgstr ""
 
-#: include/functions2.php:61 js/viewfeed.js:2020
+#: include/functions2.php:64 js/viewfeed.js:2020
 msgid "Toggle published"
 msgstr ""
 
-#: include/functions2.php:62 js/viewfeed.js:1998
+#: include/functions2.php:65 js/viewfeed.js:1998
 msgid "Toggle unread"
 msgstr ""
 
-#: include/functions2.php:63
+#: include/functions2.php:66
 msgid "Edit tags"
 msgstr ""
 
-#: include/functions2.php:64
+#: include/functions2.php:67
 msgid "Dismiss selected"
 msgstr ""
 
-#: include/functions2.php:65
+#: include/functions2.php:68
 msgid "Dismiss read"
 msgstr ""
 
-#: include/functions2.php:66
+#: include/functions2.php:69
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions2.php:67
+#: include/functions2.php:70 js/viewfeed.js:2039
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions2.php:68 js/viewfeed.js:2033
+#: include/functions2.php:71 js/viewfeed.js:2033
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions2.php:69
+#: include/functions2.php:72
 msgid "Scroll down"
 msgstr ""
 
-#: include/functions2.php:70
+#: include/functions2.php:73
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions2.php:71
+#: include/functions2.php:74
 msgid "Select article under cursor"
 msgstr ""
 
-#: include/functions2.php:72
+#: include/functions2.php:75
 msgid "Email article"
 msgstr ""
 
-#: include/functions2.php:73
+#: include/functions2.php:76
 msgid "Close/collapse article"
 msgstr ""
 
-#: include/functions2.php:74
+#: include/functions2.php:77
 msgid "Toggle article expansion (combined mode)"
 msgstr ""
 
-#: include/functions2.php:76 plugins/embed_original/init.php:31
+#: include/functions2.php:79 plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr ""
 
-#: include/functions2.php:77
+#: include/functions2.php:80
 msgid "Article selection"
 msgstr ""
 
-#: include/functions2.php:78
+#: include/functions2.php:81
 msgid "Select all articles"
 msgstr ""
 
-#: include/functions2.php:79
+#: include/functions2.php:82
 msgid "Select unread"
 msgstr ""
 
-#: include/functions2.php:80
+#: include/functions2.php:83
 msgid "Select starred"
 msgstr ""
 
-#: include/functions2.php:81
+#: include/functions2.php:84
 msgid "Select published"
 msgstr ""
 
-#: include/functions2.php:82
+#: include/functions2.php:85
 msgid "Invert selection"
 msgstr ""
 
-#: include/functions2.php:83
+#: include/functions2.php:86
 msgid "Deselect everything"
 msgstr ""
 
-#: include/functions2.php:84 classes/pref/feeds.php:550
+#: include/functions2.php:87 classes/pref/feeds.php:550
 #: classes/pref/feeds.php:794
 msgid "Feed"
 msgstr ""
 
-#: include/functions2.php:85
+#: include/functions2.php:88
 msgid "Refresh current feed"
 msgstr ""
 
-#: include/functions2.php:86
+#: include/functions2.php:89
 msgid "Un/hide read feeds"
 msgstr ""
 
-#: include/functions2.php:87 classes/pref/feeds.php:1314
+#: include/functions2.php:90 classes/pref/feeds.php:1314
 msgid "Subscribe to feed"
 msgstr ""
 
-#: include/functions2.php:88 js/FeedTree.js:139 js/PrefFeedTree.js:68
+#: include/functions2.php:91 js/FeedTree.js:139 js/PrefFeedTree.js:68
 msgid "Edit feed"
 msgstr ""
 
-#: include/functions2.php:90
+#: include/functions2.php:93
 msgid "Reverse headlines"
 msgstr ""
 
-#: include/functions2.php:91
+#: include/functions2.php:94
 msgid "Debug feed update"
 msgstr ""
 
-#: include/functions2.php:92 js/FeedTree.js:182
+#: include/functions2.php:95 js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr ""
 
-#: include/functions2.php:93
+#: include/functions2.php:96
 msgid "Un/collapse current category"
 msgstr ""
 
-#: include/functions2.php:94
+#: include/functions2.php:97
 msgid "Toggle combined mode"
 msgstr ""
 
-#: include/functions2.php:95
+#: include/functions2.php:98
 msgid "Toggle auto expand in combined mode"
 msgstr ""
 
-#: include/functions2.php:96
+#: include/functions2.php:99
 msgid "Go to"
 msgstr ""
 
-#: include/functions2.php:97 include/functions.php:1975
+#: include/functions2.php:100 include/functions.php:1976
 msgid "All articles"
 msgstr ""
 
-#: include/functions2.php:98
+#: include/functions2.php:101
 msgid "Fresh"
 msgstr ""
 
-#: include/functions2.php:101 js/tt-rss.js:461
+#: include/functions2.php:104 js/tt-rss.js:467 js/tt-rss.js:649
 msgid "Tag cloud"
 msgstr ""
 
-#: include/functions2.php:103
+#: include/functions2.php:106
 msgid "Other"
 msgstr ""
 
-#: include/functions2.php:104 classes/pref/labels.php:281
+#: include/functions2.php:107 classes/pref/labels.php:281
 msgid "Create label"
 msgstr ""
 
-#: include/functions2.php:105 classes/pref/filters.php:678
+#: include/functions2.php:108 classes/pref/filters.php:678
 msgid "Create filter"
 msgstr ""
 
-#: include/functions2.php:106
+#: include/functions2.php:109
 msgid "Un/collapse sidebar"
 msgstr ""
 
-#: include/functions2.php:107
+#: include/functions2.php:110
 msgid "Show help dialog"
 msgstr ""
 
-#: include/functions2.php:651
+#: include/functions2.php:654
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions2.php:1263 classes/feeds.php:714
+#: include/functions2.php:1288 classes/feeds.php:714
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/functions2.php:1267 classes/feeds.php:718
+#: include/functions2.php:1292 classes/feeds.php:718
 msgid "comments"
 msgstr ""
 
-#: include/functions2.php:1308
+#: include/functions2.php:1333
 msgid " - "
 msgstr ""
 
-#: include/functions2.php:1341 include/functions2.php:1589
+#: include/functions2.php:1366 include/functions2.php:1614
 #: classes/article.php:280
 msgid "no tags"
 msgstr ""
 
-#: include/functions2.php:1351 classes/feeds.php:700
+#: include/functions2.php:1376 classes/feeds.php:700
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions2.php:1383 classes/feeds.php:652
+#: include/functions2.php:1408 classes/feeds.php:652
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions2.php:1396 classes/feeds.php:665
+#: include/functions2.php:1421 classes/feeds.php:665
 #: classes/pref/feeds.php:569
 msgid "Feed URL"
 msgstr ""
 
-#: include/functions2.php:1430 classes/dlg.php:36 classes/dlg.php:59
+#: include/functions2.php:1455 classes/backend.php:105
+#: classes/pref/users.php:95 classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1677 classes/pref/filters.php:145
+#: classes/pref/prefs.php:1103 classes/dlg.php:36 classes/dlg.php:59
 #: classes/dlg.php:92 classes/dlg.php:158 classes/dlg.php:189
 #: classes/dlg.php:216 classes/dlg.php:249 classes/dlg.php:261
-#: classes/backend.php:105 classes/pref/users.php:95
-#: classes/pref/filters.php:145 classes/pref/prefs.php:1102
-#: classes/pref/feeds.php:1611 classes/pref/feeds.php:1677
+#: plugins/googlereaderimport/init.php:194 plugins/updater/init.php:389
 #: plugins/import_export/init.php:407 plugins/import_export/init.php:452
-#: plugins/googlereaderimport/init.php:194 plugins/share/init.php:123
-#: plugins/updater/init.php:375
+#: plugins/share/init.php:123
 msgid "Close this window"
 msgstr ""
 
-#: include/functions2.php:1626
+#: include/functions2.php:1651
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions2.php:1874
+#: include/functions2.php:1899
 msgid "unknown type"
 msgstr ""
 
-#: include/functions2.php:1942
+#: include/functions2.php:1967
 msgid "Attachments"
 msgstr ""
 
-#: include/functions.php:1262 include/functions.php:1914
+#: include/functions.php:1263 include/functions.php:1915
 msgid "Special"
 msgstr ""
 
-#: include/functions.php:1765 classes/feeds.php:1124
+#: include/functions.php:1766 classes/feeds.php:1124
 #: classes/pref/filters.php:169 classes/pref/filters.php:447
 msgid "All feeds"
 msgstr ""
 
-#: include/functions.php:1969
+#: include/functions.php:1970
 msgid "Starred articles"
 msgstr ""
 
-#: include/functions.php:1971
+#: include/functions.php:1972
 msgid "Published articles"
 msgstr ""
 
-#: include/functions.php:1973
+#: include/functions.php:1974
 msgid "Fresh articles"
 msgstr ""
 
-#: include/functions.php:1977
+#: include/functions.php:1978
 msgid "Archived articles"
 msgstr ""
 
-#: include/functions.php:1979
+#: include/functions.php:1980
 msgid "Recently read"
 msgstr ""
 
-#: include/login_form.php:190 classes/handler/public.php:526
-#: classes/handler/public.php:781
+#: include/login_form.php:190 classes/handler/public.php:525
+#: classes/handler/public.php:780
 msgid "Login:"
 msgstr ""
 
-#: include/login_form.php:200 classes/handler/public.php:529
+#: include/login_form.php:200 classes/handler/public.php:528
 msgid "Password:"
 msgstr ""
 
@@ -761,8 +764,8 @@ msgstr ""
 msgid "Profile:"
 msgstr ""
 
-#: include/login_form.php:216 classes/handler/public.php:267
-#: classes/rpc.php:63 classes/pref/prefs.php:1040
+#: include/login_form.php:216 classes/handler/public.php:266
+#: classes/rpc.php:63 classes/pref/prefs.php:1041
 msgid "Default profile"
 msgstr ""
 
@@ -778,7 +781,7 @@ msgstr ""
 msgid "Remember me"
 msgstr ""
 
-#: include/login_form.php:242 classes/handler/public.php:534
+#: include/login_form.php:242 classes/handler/public.php:533
 msgid "Log in"
 msgstr ""
 
@@ -802,231 +805,155 @@ msgstr ""
 msgid "Session failed to validate (password changed)"
 msgstr ""
 
-#: classes/article.php:25
-msgid "Article not found."
+#: classes/backend.php:33
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
 
-#: classes/article.php:178
-msgid "Tags for this article (separated by commas):"
+#: classes/backend.php:38
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: classes/article.php:203 classes/pref/users.php:168
-#: classes/pref/labels.php:79 classes/pref/filters.php:425
-#: classes/pref/prefs.php:986 classes/pref/feeds.php:773
-#: classes/pref/feeds.php:900 plugins/nsfw/init.php:85
-#: plugins/mail/init.php:64 plugins/note/init.php:51
-#: plugins/instances/init.php:245
-msgid "Save"
+#: classes/backend.php:61
+msgid "Shift"
 msgstr ""
 
-#: classes/article.php:205 classes/handler/public.php:503
-#: classes/handler/public.php:537 classes/feeds.php:1053
-#: classes/feeds.php:1103 classes/feeds.php:1163 classes/pref/users.php:170
-#: classes/pref/labels.php:81 classes/pref/filters.php:428
-#: classes/pref/filters.php:827 classes/pref/filters.php:908
-#: classes/pref/filters.php:975 classes/pref/prefs.php:988
-#: classes/pref/feeds.php:774 classes/pref/feeds.php:903
-#: classes/pref/feeds.php:1817 plugins/mail/init.php:172
-#: plugins/note/init.php:53 plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-msgid "Cancel"
+#: classes/backend.php:64
+msgid "Ctrl"
 msgstr ""
 
-#: classes/handler/public.php:467 plugins/bookmarklets/init.php:40
+#: classes/backend.php:99
+msgid "Help topic not found."
+msgstr ""
+
+#: classes/handler/public.php:466 plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr ""
 
-#: classes/handler/public.php:475
+#: classes/handler/public.php:474
 msgid "Title:"
 msgstr ""
 
-#: classes/handler/public.php:477 classes/pref/feeds.php:567
+#: classes/handler/public.php:476 classes/pref/feeds.php:567
 #: plugins/instances/init.php:212 plugins/instances/init.php:401
 msgid "URL:"
 msgstr ""
 
-#: classes/handler/public.php:479
+#: classes/handler/public.php:478
 msgid "Content:"
 msgstr ""
 
-#: classes/handler/public.php:481
+#: classes/handler/public.php:480
 msgid "Labels:"
 msgstr ""
 
-#: classes/handler/public.php:500
+#: classes/handler/public.php:499
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:502
+#: classes/handler/public.php:501
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:524
+#: classes/handler/public.php:502 classes/handler/public.php:536
+#: classes/feeds.php:1053 classes/feeds.php:1103 classes/feeds.php:1163
+#: classes/article.php:205 classes/pref/users.php:170
+#: classes/pref/feeds.php:774 classes/pref/feeds.php:903
+#: classes/pref/feeds.php:1817 classes/pref/filters.php:428
+#: classes/pref/filters.php:827 classes/pref/filters.php:908
+#: classes/pref/filters.php:975 classes/pref/labels.php:81
+#: classes/pref/prefs.php:989 plugins/note/init.php:53
+#: plugins/mail/init.php:172 plugins/instances/init.php:248
+#: plugins/instances/init.php:436
+msgid "Cancel"
+msgstr ""
+
+#: classes/handler/public.php:523
 msgid "Not logged in"
 msgstr ""
 
-#: classes/handler/public.php:583
+#: classes/handler/public.php:582
 msgid "Incorrect username or password"
 msgstr ""
 
-#: classes/handler/public.php:635
+#: classes/handler/public.php:634
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:638
+#: classes/handler/public.php:637
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:641
+#: classes/handler/public.php:640
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:644
+#: classes/handler/public.php:643
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:647
+#: classes/handler/public.php:646
 msgid "Multiple feed URLs found."
 msgstr ""
 
-#: classes/handler/public.php:651
+#: classes/handler/public.php:650
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/handler/public.php:669
+#: classes/handler/public.php:668
 msgid "Subscribe to selected feed"
 msgstr ""
 
-#: classes/handler/public.php:694
+#: classes/handler/public.php:693
 msgid "Edit subscription options"
 msgstr ""
 
-#: classes/handler/public.php:731
+#: classes/handler/public.php:730
 msgid "Password recovery"
 msgstr ""
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:773
 msgid ""
 "You will need to provide valid account name and email. A password reset link "
 "will be sent to your email address."
 msgstr ""
 
-#: classes/handler/public.php:796 classes/pref/users.php:352
+#: classes/handler/public.php:795 classes/pref/users.php:352
 msgid "Reset password"
 msgstr ""
 
-#: classes/handler/public.php:806
+#: classes/handler/public.php:805
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:810 classes/handler/public.php:876
+#: classes/handler/public.php:809 classes/handler/public.php:875
 msgid "Go back"
 msgstr ""
 
-#: classes/handler/public.php:847
+#: classes/handler/public.php:846
 msgid "[tt-rss] Password reset request"
 msgstr ""
 
-#: classes/handler/public.php:872
+#: classes/handler/public.php:871
 msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/handler/public.php:894
+#: classes/handler/public.php:893
 msgid "Your access level is insufficient to run this script."
 msgstr ""
 
-#: classes/handler/public.php:920
+#: classes/handler/public.php:919
 msgid "Database Updater"
 msgstr ""
 
-#: classes/handler/public.php:985
+#: classes/handler/public.php:984
 msgid "Perform updates"
 msgstr ""
 
-#: classes/dlg.php:16
-msgid ""
-"If you have imported labels and/or filters, you might need to reload "
-"preferences to see your new data."
-msgstr ""
-
-#: classes/dlg.php:47
-msgid "Your Public OPML URL is:"
-msgstr ""
-
-#: classes/dlg.php:56 classes/dlg.php:213 plugins/share/init.php:120
-msgid "Generate new URL"
-msgstr ""
-
-#: classes/dlg.php:70
-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:74 classes/dlg.php:83
-msgid "Last update:"
-msgstr ""
-
-#: classes/dlg.php:79
-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:165
-msgid "Match:"
-msgstr ""
-
-#: classes/dlg.php:167
-msgid "Any"
-msgstr ""
-
-#: classes/dlg.php:170
-msgid "All tags."
-msgstr ""
-
-#: classes/dlg.php:172
-msgid "Which Tags?"
-msgstr ""
-
-#: classes/dlg.php:185
-msgid "Display entries"
-msgstr ""
-
-#: classes/dlg.php:204
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
-
-#: classes/dlg.php:232 plugins/updater/init.php:334
-#, php-format
-msgid "New version of Tiny Tiny RSS is available (%s)."
-msgstr ""
-
-#: classes/dlg.php:240
-msgid ""
-"You can update using built-in updater in the Preferences or by using update."
-"php"
-msgstr ""
-
-#: classes/dlg.php:244 plugins/updater/init.php:338
-msgid "See the release notes"
-msgstr ""
-
-#: classes/dlg.php:246
-msgid "Download"
-msgstr ""
-
-#: classes/dlg.php:254
-msgid "Error receiving version information or no new version available."
-msgstr ""
-
 #: classes/feeds.php:51
 msgid "View as RSS feed"
 msgstr ""
@@ -1040,12 +967,12 @@ msgstr ""
 msgid "Last updated: %s"
 msgstr ""
 
-#: classes/feeds.php:88 classes/pref/users.php:337 classes/pref/labels.php:275
+#: classes/feeds.php:88 classes/pref/users.php:337 classes/pref/feeds.php:1305
+#: classes/pref/feeds.php:1562 classes/pref/feeds.php:1626
 #: classes/pref/filters.php:302 classes/pref/filters.php:350
 #: classes/pref/filters.php:672 classes/pref/filters.php:760
-#: classes/pref/filters.php:787 classes/pref/prefs.php:1000
-#: classes/pref/feeds.php:1305 classes/pref/feeds.php:1562
-#: classes/pref/feeds.php:1626 plugins/instances/init.php:287
+#: classes/pref/filters.php:787 classes/pref/labels.php:275
+#: classes/pref/prefs.php:1001 plugins/instances/init.php:287
 msgid "All"
 msgstr ""
 
@@ -1053,12 +980,12 @@ msgstr ""
 msgid "Invert"
 msgstr ""
 
-#: classes/feeds.php:91 classes/pref/users.php:339 classes/pref/labels.php:277
+#: classes/feeds.php:91 classes/pref/users.php:339 classes/pref/feeds.php:1307
+#: classes/pref/feeds.php:1564 classes/pref/feeds.php:1628
 #: classes/pref/filters.php:304 classes/pref/filters.php:352
 #: classes/pref/filters.php:674 classes/pref/filters.php:762
-#: classes/pref/filters.php:789 classes/pref/prefs.php:1002
-#: classes/pref/feeds.php:1307 classes/pref/feeds.php:1564
-#: classes/pref/feeds.php:1628 plugins/instances/init.php:289
+#: classes/pref/filters.php:789 classes/pref/labels.php:277
+#: classes/pref/prefs.php:1003 plugins/instances/init.php:289
 msgid "None"
 msgstr ""
 
@@ -1182,9 +1109,9 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: classes/feeds.php:1032 classes/pref/prefs.php:261
-#: classes/pref/feeds.php:639 classes/pref/feeds.php:847
-#: classes/pref/feeds.php:1798
+#: classes/feeds.php:1032 classes/pref/feeds.php:639
+#: classes/pref/feeds.php:847 classes/pref/feeds.php:1798
+#: classes/pref/prefs.php:261
 msgid "Password"
 msgstr ""
 
@@ -1201,7 +1128,7 @@ msgid "More feeds"
 msgstr ""
 
 #: classes/feeds.php:1073 classes/feeds.php:1162 classes/pref/users.php:324
-#: classes/pref/filters.php:665 classes/pref/feeds.php:1298 js/tt-rss.js:174
+#: classes/pref/feeds.php:1298 classes/pref/filters.php:665 js/tt-rss.js:174
 msgid "Search"
 msgstr ""
 
@@ -1218,8 +1145,8 @@ msgid "limit:"
 msgstr ""
 
 #: classes/feeds.php:1102 classes/pref/users.php:350
-#: classes/pref/labels.php:284 classes/pref/filters.php:418
-#: classes/pref/filters.php:691 classes/pref/feeds.php:744
+#: classes/pref/feeds.php:744 classes/pref/filters.php:418
+#: classes/pref/filters.php:691 classes/pref/labels.php:284
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr ""
@@ -1240,24 +1167,21 @@ msgstr ""
 msgid "Search syntax"
 msgstr ""
 
-#: classes/backend.php:33
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-
-#: classes/backend.php:38
-msgid "Keyboard Shortcuts"
-msgstr ""
-
-#: classes/backend.php:61
-msgid "Shift"
+#: classes/article.php:25
+msgid "Article not found."
 msgstr ""
 
-#: classes/backend.php:64
-msgid "Ctrl"
+#: classes/article.php:178
+msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: classes/backend.php:99
-msgid "Help topic not found."
+#: classes/article.php:203 classes/pref/users.php:168
+#: classes/pref/feeds.php:773 classes/pref/feeds.php:900
+#: classes/pref/filters.php:425 classes/pref/labels.php:79
+#: classes/pref/prefs.php:987 plugins/note/init.php:51
+#: plugins/nsfw/init.php:85 plugins/mail/init.php:64
+#: plugins/instances/init.php:245
+msgid "Save"
 msgstr ""
 
 #: classes/opml.php:28 classes/opml.php:33
@@ -1306,35 +1230,63 @@ msgstr ""
 msgid "Processing category: %s"
 msgstr ""
 
-#: classes/opml.php:470 plugins/import_export/init.php:420
-#: plugins/googlereaderimport/init.php:66
+#: classes/opml.php:470 plugins/googlereaderimport/init.php:66
+#: plugins/import_export/init.php:420
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr ""
 
-#: classes/opml.php:484 plugins/import_export/init.php:434
-#: plugins/googlereaderimport/init.php:80
+#: classes/opml.php:484 plugins/googlereaderimport/init.php:80
+#: plugins/import_export/init.php:434
 msgid "Unable to move uploaded file."
 msgstr ""
 
-#: classes/opml.php:488 plugins/import_export/init.php:438
-#: plugins/googlereaderimport/init.php:84
+#: classes/opml.php:488 plugins/googlereaderimport/init.php:84
+#: plugins/import_export/init.php:438
 msgid "Error: please upload OPML file."
 msgstr ""
 
-#: classes/opml.php:497
+#: classes/opml.php:499
 msgid "Error: unable to find moved OPML file."
 msgstr ""
 
-#: classes/opml.php:504 plugins/googlereaderimport/init.php:187
+#: classes/opml.php:506 plugins/googlereaderimport/init.php:187
 msgid "Error while parsing document."
 msgstr ""
 
-#: classes/pref/users.php:6 classes/pref/system.php:8
+#: classes/pref/system.php:8 classes/pref/users.php:6
 #: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 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/users.php:34
 msgid "User not found"
 msgstr ""
@@ -1393,12 +1345,12 @@ msgstr ""
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: classes/pref/users.php:334 classes/pref/labels.php:272
+#: classes/pref/users.php:334 classes/pref/feeds.php:1302
+#: classes/pref/feeds.php:1559 classes/pref/feeds.php:1623
 #: classes/pref/filters.php:299 classes/pref/filters.php:347
 #: classes/pref/filters.php:669 classes/pref/filters.php:757
-#: classes/pref/filters.php:784 classes/pref/prefs.php:997
-#: classes/pref/feeds.php:1302 classes/pref/feeds.php:1559
-#: classes/pref/feeds.php:1623 plugins/instances/init.php:284
+#: classes/pref/filters.php:784 classes/pref/labels.php:272
+#: classes/pref/prefs.php:998 plugins/instances/init.php:284
 msgid "Select"
 msgstr ""
 
@@ -1435,30 +1387,236 @@ msgstr ""
 msgid "No matching users found."
 msgstr ""
 
-#: classes/pref/labels.php:22 classes/pref/filters.php:288
-#: classes/pref/filters.php:748
-msgid "Caption"
+#: classes/pref/feeds.php:13
+msgid "Check to enable field"
 msgstr ""
 
-#: classes/pref/labels.php:37
-msgid "Colors"
+#: classes/pref/feeds.php:63 classes/pref/feeds.php:212
+#: classes/pref/feeds.php:256 classes/pref/feeds.php:262
+#: classes/pref/feeds.php:288
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: classes/pref/feeds.php:556
+msgid "Feed Title"
 msgstr ""
 
-#: classes/pref/labels.php:42
-msgid "Foreground:"
+#: classes/pref/feeds.php:598 classes/pref/feeds.php:812
+msgid "Update"
 msgstr ""
 
-#: classes/pref/labels.php:42
-msgid "Background:"
+#: classes/pref/feeds.php:613 classes/pref/feeds.php:828
+msgid "Article purging:"
 msgstr ""
 
-#: classes/pref/labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
+#: classes/pref/feeds.php:643
+msgid ""
+"<b>Hint:</b> you need to fill in your login information if your feed "
+"requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref/labels.php:287
-msgid "Clear colors"
+#: classes/pref/feeds.php:659 classes/pref/feeds.php:857
+msgid "Hide from Popular feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:671 classes/pref/feeds.php:863
+msgid "Include in e-mail digest"
+msgstr ""
+
+#: classes/pref/feeds.php:684 classes/pref/feeds.php:869
+msgid "Always display image attachments"
+msgstr ""
+
+#: classes/pref/feeds.php:697 classes/pref/feeds.php:877
+msgid "Do not embed images"
+msgstr ""
+
+#: classes/pref/feeds.php:710 classes/pref/feeds.php:885
+msgid "Cache images locally"
+msgstr ""
+
+#: classes/pref/feeds.php:722 classes/pref/feeds.php:891
+msgid "Mark updated articles as unread"
+msgstr ""
+
+#: classes/pref/feeds.php:728
+msgid "Icon"
+msgstr ""
+
+#: classes/pref/feeds.php:742
+msgid "Replace"
+msgstr ""
+
+#: classes/pref/feeds.php:764
+msgid "Resubscribe to push updates"
+msgstr ""
+
+#: classes/pref/feeds.php:771
+msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+msgstr ""
+
+#: classes/pref/feeds.php:1146 classes/pref/feeds.php:1199
+msgid "All done."
+msgstr ""
+
+#: classes/pref/feeds.php:1254
+msgid "Feeds with errors"
+msgstr ""
+
+#: classes/pref/feeds.php:1279
+msgid "Inactive feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:1316
+msgid "Edit selected feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:1318 classes/pref/feeds.php:1332
+#: classes/pref/filters.php:687
+msgid "Reset sort order"
+msgstr ""
+
+#: classes/pref/feeds.php:1320 js/prefs.js:1732
+msgid "Batch subscribe"
+msgstr ""
+
+#: classes/pref/feeds.php:1327
+msgid "Categories"
+msgstr ""
+
+#: classes/pref/feeds.php:1330
+msgid "Add category"
+msgstr ""
+
+#: classes/pref/feeds.php:1334
+msgid "Remove selected"
+msgstr ""
+
+#: classes/pref/feeds.php:1345
+msgid "More actions..."
+msgstr ""
+
+#: classes/pref/feeds.php:1349
+msgid "Manual purge"
+msgstr ""
+
+#: classes/pref/feeds.php:1353
+msgid "Clear feed data"
+msgstr ""
+
+#: classes/pref/feeds.php:1354 classes/pref/filters.php:695
+msgid "Rescore articles"
+msgstr ""
+
+#: classes/pref/feeds.php:1404
+msgid "OPML"
+msgstr ""
+
+#: classes/pref/feeds.php:1406
+msgid ""
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
+msgstr ""
+
+#: classes/pref/feeds.php:1406
+msgid "Only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: classes/pref/feeds.php:1419
+msgid "Import my OPML"
+msgstr ""
+
+#: classes/pref/feeds.php:1423
+msgid "Filename:"
+msgstr ""
+
+#: classes/pref/feeds.php:1425
+msgid "Include settings"
+msgstr ""
+
+#: classes/pref/feeds.php:1429
+msgid "Export OPML"
+msgstr ""
+
+#: classes/pref/feeds.php:1433
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+
+#: classes/pref/feeds.php:1435
+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:1437
+msgid "Public OPML URL"
+msgstr ""
+
+#: classes/pref/feeds.php:1438
+msgid "Display published OPML URL"
+msgstr ""
+
+#: classes/pref/feeds.php:1447
+msgid "Firefox integration"
+msgstr ""
+
+#: classes/pref/feeds.php:1449
+msgid ""
+"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
+"link below."
+msgstr ""
+
+#: classes/pref/feeds.php:1456
+msgid "Click here to register this site as a feed reader."
+msgstr ""
+
+#: classes/pref/feeds.php:1464
+msgid "Published & shared articles / Generated feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:1466
+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:1474
+msgid "Display URL"
+msgstr ""
+
+#: classes/pref/feeds.php:1477
+msgid "Clear all generated URLs"
+msgstr ""
+
+#: classes/pref/feeds.php:1555
+msgid ""
+"These feeds have not been updated with new content for 3 months (oldest "
+"first):"
+msgstr ""
+
+#: classes/pref/feeds.php:1589 classes/pref/feeds.php:1653
+msgid "Click to edit feed"
+msgstr ""
+
+#: classes/pref/feeds.php:1607 classes/pref/feeds.php:1673
+msgid "Unsubscribe from selected feeds"
+msgstr ""
+
+#: classes/pref/feeds.php:1778
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr ""
+
+#: classes/pref/feeds.php:1787
+msgid "Feeds to subscribe, One per line"
+msgstr ""
+
+#: classes/pref/feeds.php:1809
+msgid "Feeds require authentication."
 msgstr ""
 
 #: classes/pref/filters.php:93
@@ -1484,6 +1642,11 @@ msgstr ""
 msgid "%s on %s in %s %s"
 msgstr ""
 
+#: classes/pref/filters.php:288 classes/pref/filters.php:748
+#: classes/pref/labels.php:22
+msgid "Caption"
+msgstr ""
+
 #: classes/pref/filters.php:294 classes/pref/filters.php:752
 #: classes/pref/filters.php:867
 msgid "Match"
@@ -1518,15 +1681,6 @@ msgstr ""
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:687 classes/pref/feeds.php:1318
-#: classes/pref/feeds.php:1332
-msgid "Reset sort order"
-msgstr ""
-
-#: classes/pref/filters.php:695 classes/pref/feeds.php:1354
-msgid "Rescore articles"
-msgstr ""
-
 #: classes/pref/filters.php:824
 msgid "Create"
 msgstr ""
@@ -1551,7 +1705,7 @@ msgstr ""
 msgid "Save rule"
 msgstr ""
 
-#: classes/pref/filters.php:905
+#: classes/pref/filters.php:905 js/functions.js:1025
 msgid "Add rule"
 msgstr ""
 
@@ -1567,7 +1721,7 @@ msgstr ""
 msgid "Save action"
 msgstr ""
 
-#: classes/pref/filters.php:972 js/functions.js:1048
+#: classes/pref/filters.php:972 js/functions.js:1051
 msgid "Add action"
 msgstr ""
 
@@ -1589,6 +1743,27 @@ msgid_plural "%s (+%d actions)"
 msgstr[0] ""
 msgstr[1] ""
 
+#: 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/prefs.php:18
 msgid "General"
 msgstr ""
@@ -1782,7 +1957,7 @@ msgstr ""
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
-#: classes/pref/prefs.php:54
+#: classes/pref/prefs.php:54 js/prefs.js:1687
 msgid "Customize stylesheet"
 msgstr ""
 
@@ -1943,45 +2118,45 @@ msgstr ""
 msgid "Customize"
 msgstr ""
 
-#: classes/pref/prefs.php:630
+#: classes/pref/prefs.php:631
 msgid "Register"
 msgstr ""
 
-#: classes/pref/prefs.php:634
+#: classes/pref/prefs.php:635
 msgid "Clear"
 msgstr ""
 
-#: classes/pref/prefs.php:640
+#: classes/pref/prefs.php:641
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:672
+#: classes/pref/prefs.php:673
 msgid "Save configuration"
 msgstr ""
 
-#: classes/pref/prefs.php:676
+#: classes/pref/prefs.php:677
 msgid "Save and exit preferences"
 msgstr ""
 
-#: classes/pref/prefs.php:681
+#: classes/pref/prefs.php:682
 msgid "Manage profiles"
 msgstr ""
 
-#: classes/pref/prefs.php:684
+#: classes/pref/prefs.php:685
 msgid "Reset to defaults"
 msgstr ""
 
-#: classes/pref/prefs.php:707
+#: classes/pref/prefs.php:708
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:709
+#: classes/pref/prefs.php:710
 msgid ""
 "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr ""
 
-#: classes/pref/prefs.php:711
+#: classes/pref/prefs.php:712
 msgid ""
 "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank"
 "\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a "
@@ -1989,51 +2164,51 @@ msgid ""
 "\">wiki</a>."
 msgstr ""
 
-#: classes/pref/prefs.php:737
+#: classes/pref/prefs.php:738
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:741 classes/pref/prefs.php:797
+#: classes/pref/prefs.php:742 classes/pref/prefs.php:798
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:742 classes/pref/prefs.php:798
+#: classes/pref/prefs.php:743 classes/pref/prefs.php:799
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:743 classes/pref/prefs.php:799
+#: classes/pref/prefs.php:744 classes/pref/prefs.php:800
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:744 classes/pref/prefs.php:800
+#: classes/pref/prefs.php:745 classes/pref/prefs.php:801
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:775 classes/pref/prefs.php:834
+#: classes/pref/prefs.php:776 classes/pref/prefs.php:835
 msgid "more info"
 msgstr ""
 
-#: classes/pref/prefs.php:784 classes/pref/prefs.php:843
+#: classes/pref/prefs.php:785 classes/pref/prefs.php:844
 msgid "Clear data"
 msgstr ""
 
-#: classes/pref/prefs.php:793
+#: classes/pref/prefs.php:794
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:858
+#: classes/pref/prefs.php:859
 msgid "Enable selected plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:926
+#: classes/pref/prefs.php:927
 msgid "Incorrect one time password"
 msgstr ""
 
-#: classes/pref/prefs.php:929 classes/pref/prefs.php:946
+#: classes/pref/prefs.php:930 classes/pref/prefs.php:947
 msgid "Incorrect password"
 msgstr ""
 
-#: classes/pref/prefs.php:971
+#: classes/pref/prefs.php:972
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -2041,303 +2216,136 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/pref/prefs.php:1011
+#: classes/pref/prefs.php:1012
 msgid "Create profile"
 msgstr ""
 
-#: classes/pref/prefs.php:1034 classes/pref/prefs.php:1062
+#: classes/pref/prefs.php:1035 classes/pref/prefs.php:1063
 msgid "(active)"
 msgstr ""
 
-#: classes/pref/prefs.php:1096
+#: classes/pref/prefs.php:1097
 msgid "Remove selected profiles"
 msgstr ""
 
-#: classes/pref/prefs.php:1098
+#: classes/pref/prefs.php:1099
 msgid "Activate profile"
 msgstr ""
 
-#: classes/pref/feeds.php:13
-msgid "Check to enable field"
-msgstr ""
-
-#: classes/pref/feeds.php:63 classes/pref/feeds.php:212
-#: classes/pref/feeds.php:256 classes/pref/feeds.php:262
-#: classes/pref/feeds.php:288
-#, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: classes/pref/feeds.php:556
-msgid "Feed Title"
-msgstr ""
-
-#: classes/pref/feeds.php:598 classes/pref/feeds.php:812
-msgid "Update"
-msgstr ""
-
-#: classes/pref/feeds.php:613 classes/pref/feeds.php:828
-msgid "Article purging:"
-msgstr ""
-
-#: classes/pref/feeds.php:643
+#: classes/dlg.php:16
 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:659 classes/pref/feeds.php:857
-msgid "Hide from Popular feeds"
-msgstr ""
-
-#: classes/pref/feeds.php:671 classes/pref/feeds.php:863
-msgid "Include in e-mail digest"
-msgstr ""
-
-#: classes/pref/feeds.php:684 classes/pref/feeds.php:869
-msgid "Always display image attachments"
-msgstr ""
-
-#: classes/pref/feeds.php:697 classes/pref/feeds.php:877
-msgid "Do not embed images"
-msgstr ""
-
-#: classes/pref/feeds.php:710 classes/pref/feeds.php:885
-msgid "Cache images locally"
-msgstr ""
-
-#: classes/pref/feeds.php:722 classes/pref/feeds.php:891
-msgid "Mark updated articles as unread"
-msgstr ""
-
-#: classes/pref/feeds.php:728
-msgid "Icon"
-msgstr ""
-
-#: classes/pref/feeds.php:742
-msgid "Replace"
-msgstr ""
-
-#: classes/pref/feeds.php:764
-msgid "Resubscribe to push updates"
-msgstr ""
-
-#: classes/pref/feeds.php:771
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: classes/pref/feeds.php:1146 classes/pref/feeds.php:1199
-msgid "All done."
-msgstr ""
-
-#: classes/pref/feeds.php:1254
-msgid "Feeds with errors"
-msgstr ""
-
-#: classes/pref/feeds.php:1279
-msgid "Inactive feeds"
-msgstr ""
-
-#: classes/pref/feeds.php:1316
-msgid "Edit selected feeds"
-msgstr ""
-
-#: classes/pref/feeds.php:1320 js/prefs.js:1732
-msgid "Batch subscribe"
-msgstr ""
-
-#: classes/pref/feeds.php:1327
-msgid "Categories"
-msgstr ""
-
-#: classes/pref/feeds.php:1330
-msgid "Add category"
-msgstr ""
-
-#: classes/pref/feeds.php:1334
-msgid "Remove selected"
-msgstr ""
-
-#: classes/pref/feeds.php:1345
-msgid "More actions..."
-msgstr ""
-
-#: classes/pref/feeds.php:1349
-msgid "Manual purge"
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
 msgstr ""
 
-#: classes/pref/feeds.php:1353
-msgid "Clear feed data"
+#: classes/dlg.php:47
+msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: classes/pref/feeds.php:1404
-msgid "OPML"
+#: classes/dlg.php:56 classes/dlg.php:213 plugins/share/init.php:120
+msgid "Generate new URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1406
+#: classes/dlg.php:70
 msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-
-#: classes/pref/feeds.php:1406
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref/feeds.php:1419
-msgid "Import my OPML"
-msgstr ""
-
-#: classes/pref/feeds.php:1423
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref/feeds.php:1425
-msgid "Include settings"
-msgstr ""
-
-#: classes/pref/feeds.php:1429
-msgid "Export OPML"
+"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/pref/feeds.php:1433
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
+#: classes/dlg.php:74 classes/dlg.php:83
+msgid "Last update:"
 msgstr ""
 
-#: classes/pref/feeds.php:1435
+#: classes/dlg.php:79
 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:1437
-msgid "Public OPML URL"
-msgstr ""
-
-#: classes/pref/feeds.php:1438
-msgid "Display published OPML URL"
+"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/pref/feeds.php:1447
-msgid "Firefox integration"
+#: classes/dlg.php:165
+msgid "Match:"
 msgstr ""
 
-#: classes/pref/feeds.php:1449
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
+#: classes/dlg.php:167
+msgid "Any"
 msgstr ""
 
-#: classes/pref/feeds.php:1456
-msgid "Click here to register this site as a feed reader."
+#: classes/dlg.php:170
+msgid "All tags."
 msgstr ""
 
-#: classes/pref/feeds.php:1464
-msgid "Published & shared articles / Generated feeds"
+#: classes/dlg.php:172
+msgid "Which Tags?"
 msgstr ""
 
-#: classes/pref/feeds.php:1466
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
+#: classes/dlg.php:185
+msgid "Display entries"
 msgstr ""
 
-#: classes/pref/feeds.php:1474
-msgid "Display URL"
+#: classes/dlg.php:204
+msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: classes/pref/feeds.php:1477
-msgid "Clear all generated URLs"
+#: classes/dlg.php:232 plugins/updater/init.php:348
+#, php-format
+msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
-#: classes/pref/feeds.php:1555
+#: classes/dlg.php:240
 msgid ""
-"These feeds have not been updated with new content for 3 months (oldest "
-"first):"
-msgstr ""
-
-#: classes/pref/feeds.php:1589 classes/pref/feeds.php:1653
-msgid "Click to edit feed"
-msgstr ""
-
-#: classes/pref/feeds.php:1607 classes/pref/feeds.php:1673
-msgid "Unsubscribe from selected feeds"
-msgstr ""
-
-#: classes/pref/feeds.php:1778
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-
-#: classes/pref/feeds.php:1787
-msgid "Feeds to subscribe, One per line"
-msgstr ""
-
-#: classes/pref/feeds.php:1809
-msgid "Feeds require authentication."
-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"
+"You can update using built-in updater in the Preferences or by using update."
+"php"
 msgstr ""
 
-#: classes/pref/system.php:48
-msgid "Error"
+#: classes/dlg.php:244 plugins/updater/init.php:352
+msgid "See the release notes"
 msgstr ""
 
-#: classes/pref/system.php:49
-msgid "Filename"
+#: classes/dlg.php:246
+msgid "Download"
 msgstr ""
 
-#: classes/pref/system.php:50
-msgid "Message"
+#: classes/dlg.php:254
+msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/pref/system.php:52
-msgid "Date"
+#: plugins/af_comics/init.php:39
+msgid "Feeds supported by af_comics"
 msgstr ""
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
+#: plugins/af_comics/init.php:41
+msgid "The following comics are currently supported:"
 msgstr ""
 
-#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
-msgid "Not work safe (click to toggle)"
+#: plugins/note/init.php:26 plugins/note/note.js:11
+msgid "Edit article note"
 msgstr ""
 
-#: plugins/nsfw/init.php:52
-msgid "NSFW Plugin"
+#: plugins/googlereaderimport/init.php:92 plugins/import_export/init.php:446
+msgid "No file uploaded."
 msgstr ""
 
-#: plugins/nsfw/init.php:79
-msgid "Tags to consider NSFW (comma-separated)"
+#: plugins/googlereaderimport/init.php:179
+#, php-format
+msgid "All done. %d out of %d articles imported."
 msgstr ""
 
-#: plugins/nsfw/init.php:100
-msgid "Configuration saved."
+#: plugins/googlereaderimport/init.php:183
+msgid "The document has incorrect format."
 msgstr ""
 
-#: plugins/auth_internal/init.php:65
-msgid "Please enter your one time password:"
+#: plugins/googlereaderimport/init.php:354
+msgid "Import starred or shared items from Google Reader"
 msgstr ""
 
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
+#: plugins/googlereaderimport/init.php:358
+msgid "Paste your starred.json or shared.json into the form below."
 msgstr ""
 
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
+#: plugins/googlereaderimport/init.php:372
+msgid "Import my Starred items"
 msgstr ""
 
 #: plugins/mailto/init.php:49 plugins/mailto/init.php:55
@@ -2366,27 +2374,44 @@ msgstr ""
 msgid "Close this dialog"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
+#: plugins/updater/init.php:338 plugins/updater/init.php:355
+#: plugins/updater/updater.js:10
+msgid "Update Tiny Tiny RSS"
 msgstr ""
 
-#: 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."
+#: plugins/updater/init.php:358
+msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr ""
 
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
+#: plugins/updater/init.php:361
+msgid "Force update"
 msgstr ""
 
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
+#: plugins/updater/init.php:370
+msgid "Do not close this dialog until updating is finished."
 msgstr ""
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+#: plugins/updater/init.php:379
+msgid "It is suggested to backup your tt-rss directory first."
+msgstr ""
+
+#: plugins/updater/init.php:380
+msgid "Your database will not be modified."
+msgstr ""
+
+#: plugins/updater/init.php:381
+msgid ""
+"Your current tt-rss installation directory will not be modified. It will be "
+"renamed and left in the parent directory. You will be able to migrate all "
+"your customized files after update finishes."
+msgstr ""
+
+#: plugins/updater/init.php:382
+msgid "Ready to update."
+msgstr ""
+
+#: plugins/updater/init.php:387
+msgid "Start update"
 msgstr ""
 
 #: plugins/import_export/init.php:58
@@ -2448,69 +2473,60 @@ msgstr ""
 msgid "Prepare data"
 msgstr ""
 
-#: plugins/import_export/init.php:446 plugins/googlereaderimport/init.php:92
-msgid "No file uploaded."
-msgstr ""
-
-#: plugins/mail/init.php:28
-msgid "Mail addresses saved."
-msgstr ""
-
-#: plugins/mail/init.php:34
-msgid "Mail plugin"
+#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
+msgid "Not work safe (click to toggle)"
 msgstr ""
 
-#: plugins/mail/init.php:36
-msgid "You can set predefined email addressed here (comma-separated list):"
+#: plugins/nsfw/init.php:52
+msgid "NSFW Plugin"
 msgstr ""
 
-#: plugins/mail/init.php:140
-msgid "To:"
+#: plugins/nsfw/init.php:79
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
-#: plugins/mail/init.php:155
-msgid "Subject:"
+#: plugins/nsfw/init.php:100
+msgid "Configuration saved."
 msgstr ""
 
-#: plugins/mail/init.php:171
-msgid "Send e-mail"
+#: plugins/auth_internal/init.php:65
+msgid "Please enter your one time password:"
 msgstr ""
 
-#: plugins/note/init.php:26 plugins/note/note.js:11
-msgid "Edit article note"
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:179
-#, php-format
-msgid "All done. %d out of %d articles imported."
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:183
-msgid "The document has incorrect format."
+#: plugins/close_button/init.php:22
+msgid "Close article"
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:354
-msgid "Import starred or shared items from Google Reader"
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:358
-msgid "Paste your starred.json or shared.json into the form below."
+#: plugins/mail/init.php:34
+msgid "Mail plugin"
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:372
-msgid "Import my Starred items"
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr ""
 
-#: plugins/af_comics/init.php:39
-msgid "Feeds supported by af_comics"
+#: plugins/mail/init.php:140
+msgid "To:"
 msgstr ""
 
-#: plugins/af_comics/init.php:41
-msgid "The following comics are currently supported:"
+#: plugins/mail/init.php:155
+msgid "Subject:"
 msgstr ""
 
-#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:54
-msgid "Shared articles"
+#: plugins/mail/init.php:171
+msgid "Send e-mail"
 msgstr ""
 
 #: plugins/instances/init.php:141
@@ -2569,64 +2585,51 @@ msgstr ""
 msgid "Create link"
 msgstr ""
 
-#: plugins/share/init.php:39
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: plugins/share/init.php:44
-msgid "Unshare all articles"
-msgstr ""
-
-#: plugins/share/init.php:77
-msgid "Share by URL"
-msgstr ""
-
-#: plugins/share/init.php:99
-msgid "You can share this article by the following unique URL:"
+#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:54
+msgid "Shared articles"
 msgstr ""
 
-#: plugins/share/init.php:117
-msgid "Unshare article"
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
 msgstr ""
 
-#: plugins/updater/init.php:324 plugins/updater/init.php:341
-#: plugins/updater/updater.js:10
-msgid "Update Tiny Tiny RSS"
+#: 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/updater/init.php:344
-msgid "Your Tiny Tiny RSS installation is up to date."
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr ""
 
-#: plugins/updater/init.php:347
-msgid "Force update"
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/updater/init.php:356
-msgid "Do not close this dialog until updating is finished."
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
-#: plugins/updater/init.php:365
-msgid "It is suggested to backup your tt-rss directory first."
+#: plugins/share/init.php:39
+msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: plugins/updater/init.php:366
-msgid "Your database will not be modified."
+#: plugins/share/init.php:44
+msgid "Unshare all articles"
 msgstr ""
 
-#: plugins/updater/init.php:367
-msgid ""
-"Your current tt-rss installation directory will not be modified. It will be "
-"renamed and left in the parent directory. You will be able to migrate all "
-"your customized files after update finishes."
+#: plugins/share/init.php:77
+msgid "Share by URL"
 msgstr ""
 
-#: plugins/updater/init.php:368
-msgid "Ready to update."
+#: plugins/share/init.php:99
+msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/updater/init.php:373
-msgid "Start update"
+#: plugins/share/init.php:117
+msgid "Unshare article"
 msgstr ""
 
 #: js/functions.js:62
@@ -2648,69 +2651,70 @@ msgid ""
 "saved in the database."
 msgstr ""
 
-#: js/functions.js:236
+#: js/functions.js:224
 msgid "Click to close"
 msgstr ""
 
-#: js/functions.js:1048
+#: js/functions.js:1051
 msgid "Edit action"
 msgstr ""
 
-#: js/functions.js:1085
+#: js/functions.js:1088
 msgid "Create Filter"
 msgstr ""
 
-#: js/functions.js:1215
+#: js/functions.js:1218
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1226
+#: js/functions.js:1229
 msgid "Subscription reset."
 msgstr ""
 
-#: js/functions.js:1236 js/tt-rss.js:678
+#: js/functions.js:1239 js/tt-rss.js:684
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr ""
 
-#: js/functions.js:1239
+#: js/functions.js:1242
 msgid "Removing feed..."
 msgstr ""
 
-#: js/functions.js:1346
+#: js/functions.js:1349
 msgid "Please enter category title:"
 msgstr ""
 
-#: js/functions.js:1377
+#: js/functions.js:1380
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1381
+#: js/functions.js:1384 js/prefs.js:1218
 msgid "Trying to change address..."
 msgstr ""
 
-#: js/functions.js:1682 js/functions.js:1792 js/prefs.js:414 js/prefs.js:444
-#: js/prefs.js:476 js/prefs.js:629 js/prefs.js:649
+#: js/functions.js:1685 js/functions.js:1795 js/prefs.js:414 js/prefs.js:444
+#: js/prefs.js:476 js/prefs.js:629 js/prefs.js:649 js/prefs.js:1194
+#: js/prefs.js:1339
 msgid "No feeds are selected."
 msgstr ""
 
-#: js/functions.js:1724
+#: js/functions.js:1727
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1763
+#: js/functions.js:1766
 msgid "Feeds with update errors"
 msgstr ""
 
-#: js/functions.js:1774
+#: js/functions.js:1777 js/prefs.js:1176
 msgid "Remove selected feeds?"
 msgstr ""
 
-#: js/functions.js:1777
+#: js/functions.js:1780 js/prefs.js:1179
 msgid "Removing selected feeds..."
 msgstr ""
 
@@ -2744,6 +2748,7 @@ msgstr ""
 
 #: js/prefs.js:99 js/prefs.js:211 js/prefs.js:736
 #: plugins/instances/instances.js:26 plugins/instances/instances.js:89
+#: js/functions.js:1592
 msgid "Saving data..."
 msgstr ""
 
@@ -2767,7 +2772,7 @@ msgstr ""
 msgid "Removing selected labels..."
 msgstr ""
 
-#: js/prefs.js:312
+#: js/prefs.js:312 js/prefs.js:1380
 msgid "No labels are selected."
 msgstr ""
 
@@ -2869,8 +2874,8 @@ msgstr ""
 msgid "Please choose an OPML file first."
 msgstr ""
 
-#: js/prefs.js:802 plugins/import_export/import_export.js:115
-#: plugins/googlereaderimport/init.js:45
+#: js/prefs.js:802 plugins/googlereaderimport/init.js:45
+#: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr ""
 
@@ -2898,36 +2903,36 @@ msgstr ""
 msgid "Marking all feeds as read..."
 msgstr ""
 
-#: js/tt-rss.js:385
+#: js/tt-rss.js:391
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:426 js/tt-rss.js:659
+#: js/tt-rss.js:432 js/tt-rss.js:665 js/functions.js:1571
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:497
+#: js/tt-rss.js:503
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:667
+#: js/tt-rss.js:673
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/tt-rss.js:672 js/tt-rss.js:825
+#: js/tt-rss.js:678 js/tt-rss.js:831
 msgid "Please select some feed first."
 msgstr ""
 
-#: js/tt-rss.js:820
+#: js/tt-rss.js:826
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:830
+#: js/tt-rss.js:836
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr ""
 
-#: js/tt-rss.js:833
+#: js/tt-rss.js:839
 msgid "Rescoring articles..."
 msgstr ""
 
@@ -2956,7 +2961,8 @@ msgstr[1] ""
 
 #: js/viewfeed.js:762 js/viewfeed.js:790 js/viewfeed.js:1038
 #: js/viewfeed.js:1081 js/viewfeed.js:1134 js/viewfeed.js:2289
-#: plugins/mailto/init.js:7 plugins/mail/mail.js:7
+#: plugins/mailto/init.js:7 plugins/mail/mail.js:7 js/viewfeed.js:817
+#: js/viewfeed.js:882 js/viewfeed.js:916
 msgid "No articles are selected."
 msgstr ""
 
@@ -3008,7 +3014,7 @@ msgstr ""
 msgid "Saving article tags..."
 msgstr ""
 
-#: js/viewfeed.js:1326
+#: js/viewfeed.js:1326 js/viewfeed.js:113 js/viewfeed.js:184
 msgid "Click to open next unread feed."
 msgstr ""
 
@@ -3052,10 +3058,28 @@ msgstr ""
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
+#: plugins/note/note.js:17
+msgid "Saving article note..."
+msgstr ""
+
+#: plugins/googlereaderimport/init.js:18
+msgid "Google Reader Import"
+msgstr ""
+
+#: plugins/googlereaderimport/init.js:42
+msgid "Please choose a file first."
+msgstr ""
+
 #: plugins/mailto/init.js:21 plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr ""
 
+#: plugins/updater/updater.js:58
+msgid ""
+"Backup your tt-rss directory before continuing. Please type 'yes' to "
+"continue."
+msgstr ""
+
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr ""
@@ -3079,28 +3103,16 @@ msgstr ""
 msgid "Please choose the file first."
 msgstr ""
 
-#: plugins/mail/mail.js:36
-msgid "Error sending email:"
-msgstr ""
-
-#: plugins/mail/mail.js:38
-msgid "Your message has been sent."
-msgstr ""
-
-#: plugins/note/note.js:17
-msgid "Saving article note..."
-msgstr ""
-
 #: plugins/shorten_expanded/init.js:37
 msgid "Click to expand article"
 msgstr ""
 
-#: plugins/googlereaderimport/init.js:18
-msgid "Google Reader Import"
+#: plugins/mail/mail.js:36
+msgid "Error sending email:"
 msgstr ""
 
-#: plugins/googlereaderimport/init.js:42
-msgid "Please choose a file first."
+#: plugins/mail/mail.js:38
+msgid "Your message has been sent."
 msgstr ""
 
 #: plugins/instances/instances.js:10
@@ -3127,11 +3139,31 @@ msgstr ""
 msgid "Please select only one instance."
 msgstr ""
 
+#: plugins/share/share.js:10
+msgid "Share article by URL"
+msgstr ""
+
+#: plugins/share/share.js:14
+msgid "Generate new share URL for this article?"
+msgstr ""
+
+#: plugins/share/share.js:18
+msgid "Trying to change URL..."
+msgstr ""
+
+#: plugins/share/share.js:55
+msgid "Remove sharing for this article?"
+msgstr ""
+
+#: plugins/share/share.js:59
+msgid "Trying to unshare..."
+msgstr ""
+
 #: plugins/share/share_prefs.js:3
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
-#: plugins/share/share_prefs.js:6
+#: plugins/share/share_prefs.js:6 js/prefs.js:1518
 msgid "Clearing URLs..."
 msgstr ""
 
@@ -3139,28 +3171,244 @@ msgstr ""
 msgid "Shared URLs cleared."
 msgstr ""
 
-#: plugins/share/share.js:10
-msgid "Share article by URL"
+#: js/feedlist.js:406 js/feedlist.js:434
+msgid "Mark all articles in %s as read?"
 msgstr ""
 
-#: plugins/share/share.js:14
-msgid "Generate new share URL for this article?"
+#: js/feedlist.js:425
+msgid "Mark all articles in %s older than 1 day as read?"
 msgstr ""
 
-#: plugins/share/share.js:18
-msgid "Trying to change URL..."
+#: js/feedlist.js:428
+msgid "Mark all articles in %s older than 1 week as read?"
 msgstr ""
 
-#: plugins/share/share.js:55
-msgid "Remove sharing for this article?"
+#: js/feedlist.js:431
+msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr ""
 
-#: plugins/share/share.js:59
-msgid "Trying to unshare..."
+#: js/functions.js:615
+msgid "Error explained"
 msgstr ""
 
-#: plugins/updater/updater.js:58
+#: js/functions.js:697
+msgid "Upload complete."
+msgstr ""
+
+#: js/functions.js:721
+msgid "Remove stored feed icon?"
+msgstr ""
+
+#: js/functions.js:726
+msgid "Removing feed icon..."
+msgstr ""
+
+#: js/functions.js:731
+msgid "Feed icon removed."
+msgstr ""
+
+#: js/functions.js:753
+msgid "Please select an image file to upload."
+msgstr ""
+
+#: js/functions.js:755
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: js/functions.js:756
+msgid "Uploading, please wait..."
+msgstr ""
+
+#: js/functions.js:772
+msgid "Please enter label caption:"
+msgstr ""
+
+#: js/functions.js:777
+msgid "Can't create label: missing caption."
+msgstr ""
+
+#: js/functions.js:820
+msgid "Subscribe to Feed"
+msgstr ""
+
+#: js/functions.js:839
 msgid ""
-"Backup your tt-rss directory before continuing. Please type 'yes' to "
-"continue."
+"Failed to parse output. This can indicate server timeout and/or network "
+"issues. Backend output was logged to browser console."
+msgstr ""
+
+#: js/functions.js:854
+msgid "Subscribed to %s"
+msgstr ""
+
+#: js/functions.js:859
+msgid "Specified URL seems to be invalid."
+msgstr ""
+
+#: js/functions.js:862
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr ""
+
+#: js/functions.js:874
+msgid "Expand to select feed"
+msgstr ""
+
+#: js/functions.js:886
+msgid "Couldn't download the specified URL: %s"
+msgstr ""
+
+#: js/functions.js:890
+msgid "XML validation failed: %s"
+msgstr ""
+
+#: js/functions.js:895
+msgid "You are already subscribed to this feed."
+msgstr ""
+
+#: js/functions.js:1025
+msgid "Edit rule"
+msgstr ""
+
+#: js/functions.js:1586
+msgid "Edit Feed"
+msgstr ""
+
+#: js/functions.js:1624
+msgid "More Feeds"
+msgstr ""
+
+#: js/functions.js:1878
+msgid "Help"
+msgstr ""
+
+#: js/prefs.js:1083
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""
+
+#: js/prefs.js:1089
+msgid "Removing category..."
+msgstr ""
+
+#: js/prefs.js:1110
+msgid "Remove selected categories?"
+msgstr ""
+
+#: js/prefs.js:1113
+msgid "Removing selected categories..."
+msgstr ""
+
+#: js/prefs.js:1126
+msgid "No categories are selected."
+msgstr ""
+
+#: js/prefs.js:1134
+msgid "Category title:"
+msgstr ""
+
+#: js/prefs.js:1138
+msgid "Creating category..."
+msgstr ""
+
+#: js/prefs.js:1165
+msgid "Feeds without recent updates"
+msgstr ""
+
+#: js/prefs.js:1214
+msgid "Replace current OPML publishing address with a new one?"
+msgstr ""
+
+#: js/prefs.js:1303
+msgid "Clearing feed..."
+msgstr ""
+
+#: js/prefs.js:1323
+msgid "Rescore articles in selected feeds?"
+msgstr ""
+
+#: js/prefs.js:1326
+msgid "Rescoring selected feeds..."
+msgstr ""
+
+#: js/prefs.js:1346
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
+
+#: js/prefs.js:1349
+msgid "Rescoring feeds..."
+msgstr ""
+
+#: js/prefs.js:1366
+msgid "Reset selected labels to default colors?"
+msgstr ""
+
+#: js/prefs.js:1403
+msgid "Settings Profiles"
+msgstr ""
+
+#: js/prefs.js:1412
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: js/prefs.js:1415
+msgid "Removing selected profiles..."
+msgstr ""
+
+#: js/prefs.js:1430
+msgid "No profiles are selected."
+msgstr ""
+
+#: js/prefs.js:1438 js/prefs.js:1491
+msgid "Activate selected profile?"
+msgstr ""
+
+#: js/prefs.js:1454 js/prefs.js:1507
+msgid "Please choose a profile to activate."
+msgstr ""
+
+#: js/prefs.js:1459
+msgid "Creating profile..."
+msgstr ""
+
+#: js/prefs.js:1515
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
+
+#: js/prefs.js:1525
+msgid "Generated URLs cleared."
+msgstr ""
+
+#: js/prefs.js:1616
+msgid "Label Editor"
+msgstr ""
+
+#: js/tt-rss.js:652
+msgid "Select item(s) by tags"
+msgstr ""
+
+#: js/tt-rss.js:980
+msgid "New version available!"
+msgstr ""
+
+#: js/viewfeed.js:117
+msgid "Cancel search"
+msgstr ""
+
+#: js/viewfeed.js:1438
+msgid "No article is selected."
+msgstr ""
+
+#: js/viewfeed.js:1473
+msgid "No articles found to mark"
+msgstr ""
+
+#: js/viewfeed.js:1475
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/viewfeed.js:1990
+msgid "Display article URL"
 msgstr ""