rebase translations

1 files changed, 389 insertions, 343 deletions

diff --git a/messages.pot b/messages.pot
index 6d745d6ad..5ff7e4f19 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-27 16:48+0400\n"
+"POT-Creation-Date: 2013-03-28 19:38+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -121,7 +121,8 @@ msgstr ""
 #: db-updater.php:96 db-updater.php:165 db-updater.php:178 register.php:196
 #: register.php:241 register.php:254 register.php:269 register.php:288
 #: register.php:336 register.php:346 register.php:358
-#: classes/handler/public.php:612 classes/handler/public.php:700
+#: classes/handler/public.php:631 classes/handler/public.php:719
+#: classes/handler/public.php:808
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
@@ -242,52 +243,56 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: index.php:127 index.php:147 index.php:253 prefs.php:93
+#: index.php:127 index.php:146 index.php:253 prefs.php:94
 #: classes/backend.php:5 classes/pref/labels.php:296
-#: classes/pref/filters.php:628 classes/pref/feeds.php:1322
-#: plugins/digest/digest_body.php:63 js/feedlist.js:130 js/feedlist.js:456
-#: js/functions.js:421 js/functions.js:824 js/functions.js:1260
-#: js/functions.js:1395 js/functions.js:1707 js/prefs.js:86 js/prefs.js:576
+#: classes/pref/filters.php:628 classes/pref/feeds.php:1330
+#: plugins/digest/digest_body.php:63 js/feedlist.js:128 js/feedlist.js:433
+#: js/functions.js:420 js/functions.js:814 js/functions.js:1250
+#: js/functions.js:1385 js/functions.js:1697 js/prefs.js:86 js/prefs.js:576
 #: js/prefs.js:666 js/prefs.js:870 js/prefs.js:1457 js/prefs.js:1510
 #: js/prefs.js:1568 js/prefs.js:1584 js/prefs.js:1600 js/prefs.js:1619
-#: js/prefs.js:1792 js/prefs.js:1808 js/tt-rss.js:472 js/viewfeed.js:785
-#: js/viewfeed.js:1262 plugins/import_export/import_export.js:17
+#: js/prefs.js:1792 js/prefs.js:1808 js/tt-rss.js:475 js/viewfeed.js:783
+#: js/viewfeed.js:1260 plugins/import_export/import_export.js:17
 #: plugins/updater/updater.js:17
 msgid "Loading, please wait..."
 msgstr ""
 
-#: index.php:161
+#: index.php:160
 msgid "Collapse feedlist"
 msgstr ""
 
-#: index.php:164
+#: index.php:163
 msgid "Show articles"
 msgstr ""
 
-#: index.php:167
+#: index.php:166
 msgid "Adaptive"
 msgstr ""
 
-#: index.php:168
+#: index.php:167
 msgid "All Articles"
 msgstr ""
 
-#: index.php:169 include/functions.php:1944 classes/feeds.php:106
+#: index.php:168 include/functions.php:1946 classes/feeds.php:106
 msgid "Starred"
 msgstr ""
 
-#: index.php:170 include/functions.php:1945 classes/feeds.php:107
+#: index.php:169 include/functions.php:1947 classes/feeds.php:107
 msgid "Published"
 msgstr ""
 
-#: index.php:171 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:170 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr ""
 
-#: index.php:172
+#: index.php:171
 msgid "Unread First"
 msgstr ""
 
+#: index.php:172
+msgid "With Note"
+msgstr ""
+
 #: index.php:173
 msgid "Ignore Scoring"
 msgstr ""
@@ -312,11 +317,11 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: index.php:188 classes/pref/feeds.php:561 classes/pref/feeds.php:784
+#: index.php:188 classes/pref/feeds.php:567 classes/pref/feeds.php:792
 msgid "Update"
 msgstr ""
 
-#: index.php:192 index.php:222 include/functions.php:1935
+#: index.php:192 index.php:222 include/functions.php:1937
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:437 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:647
@@ -347,7 +352,7 @@ msgstr ""
 msgid "Feed actions:"
 msgstr ""
 
-#: index.php:217 classes/handler/public.php:542
+#: index.php:217 classes/handler/public.php:561
 msgid "Subscribe to feed..."
 msgstr ""
 
@@ -359,7 +364,7 @@ msgstr ""
 msgid "Rescore feed"
 msgstr ""
 
-#: index.php:220 classes/pref/feeds.php:710 classes/pref/feeds.php:1295
+#: index.php:220 classes/pref/feeds.php:716 classes/pref/feeds.php:1303
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr ""
@@ -384,7 +389,7 @@ msgstr ""
 msgid "Show tag cloud..."
 msgstr ""
 
-#: index.php:230 include/functions.php:1921
+#: index.php:230 include/functions.php:1923
 msgid "Toggle widescreen mode"
 msgstr ""
 
@@ -410,38 +415,38 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: prefs.php:36 prefs.php:113 include/functions.php:1947
+#: prefs.php:36 prefs.php:114 include/functions.php:1949
 #: classes/pref/prefs.php:378
 msgid "Preferences"
 msgstr ""
 
-#: prefs.php:104
+#: prefs.php:105
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: prefs.php:105
+#: prefs.php:106
 msgid "Exit preferences"
 msgstr ""
 
-#: prefs.php:116 classes/pref/feeds.php:100 classes/pref/feeds.php:1200
-#: classes/pref/feeds.php:1263
+#: prefs.php:117 classes/pref/feeds.php:106 classes/pref/feeds.php:1208
+#: classes/pref/feeds.php:1271
 msgid "Feeds"
 msgstr ""
 
-#: prefs.php:119 classes/pref/filters.php:120
+#: prefs.php:120 classes/pref/filters.php:120
 msgid "Filters"
 msgstr ""
 
-#: prefs.php:122 include/functions.php:1139 include/functions.php:1774
+#: prefs.php:123 include/functions.php:1140 include/functions.php:1776
 #: classes/pref/labels.php:90 plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr ""
 
-#: prefs.php:126
+#: prefs.php:127
 msgid "Users"
 msgstr ""
 
-#: register.php:186 include/login_form.php:228
+#: register.php:186 include/login_form.php:238
 msgid "Create new account"
 msgstr ""
 
@@ -464,11 +469,11 @@ msgstr ""
 msgid "Check availability"
 msgstr ""
 
-#: register.php:228 classes/handler/public.php:744
+#: register.php:228 classes/handler/public.php:765
 msgid "Email:"
 msgstr ""
 
-#: register.php:231 classes/handler/public.php:749
+#: register.php:231 classes/handler/public.php:770
 msgid "How much is two plus two:"
 msgstr ""
 
@@ -500,9 +505,9 @@ msgstr ""
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: include/digest.php:109 include/functions.php:1148
-#: include/functions.php:1675 include/functions.php:1760
-#: include/functions.php:1782 classes/opml.php:416 classes/pref/feeds.php:214
+#: include/digest.php:109 include/functions.php:1149
+#: include/functions.php:1677 include/functions.php:1762
+#: include/functions.php:1784 classes/opml.php:416 classes/pref/feeds.php:221
 msgid "Uncategorized"
 msgstr ""
 
@@ -521,289 +526,289 @@ msgstr ""
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: include/functions.php:1137 include/functions.php:1772
+#: include/functions.php:1138 include/functions.php:1774
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr ""
 
-#: include/functions.php:1624 classes/dlg.php:369 classes/pref/filters.php:382
+#: include/functions.php:1626 classes/dlg.php:369 classes/pref/filters.php:382
 msgid "All feeds"
 msgstr ""
 
-#: include/functions.php:1825
+#: include/functions.php:1827
 msgid "Starred articles"
 msgstr ""
 
-#: include/functions.php:1827
+#: include/functions.php:1829
 msgid "Published articles"
 msgstr ""
 
-#: include/functions.php:1829
+#: include/functions.php:1831
 msgid "Fresh articles"
 msgstr ""
 
-#: include/functions.php:1831 include/functions.php:1942
+#: include/functions.php:1833 include/functions.php:1944
 msgid "All articles"
 msgstr ""
 
-#: include/functions.php:1833
+#: include/functions.php:1835
 msgid "Archived articles"
 msgstr ""
 
-#: include/functions.php:1835
+#: include/functions.php:1837
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1898
+#: include/functions.php:1900
 msgid "Navigation"
 msgstr ""
 
-#: include/functions.php:1899
+#: include/functions.php:1901
 msgid "Open next feed"
 msgstr ""
 
-#: include/functions.php:1900
+#: include/functions.php:1902
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1901
+#: include/functions.php:1903
 msgid "Open next article"
 msgstr ""
 
-#: include/functions.php:1902
+#: include/functions.php:1904
 msgid "Open previous article"
 msgstr ""
 
-#: include/functions.php:1903
+#: include/functions.php:1905
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1904
+#: include/functions.php:1906
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1905
+#: include/functions.php:1907
 msgid "Show search dialog"
 msgstr ""
 
-#: include/functions.php:1906
+#: include/functions.php:1908
 msgid "Article"
 msgstr ""
 
-#: include/functions.php:1907
+#: include/functions.php:1909
 msgid "Toggle starred"
 msgstr ""
 
-#: include/functions.php:1908
+#: include/functions.php:1910
 msgid "Toggle published"
 msgstr ""
 
-#: include/functions.php:1909
+#: include/functions.php:1911
 msgid "Toggle unread"
 msgstr ""
 
-#: include/functions.php:1910
+#: include/functions.php:1912
 msgid "Edit tags"
 msgstr ""
 
-#: include/functions.php:1911
+#: include/functions.php:1913
 msgid "Dismiss selected"
 msgstr ""
 
-#: include/functions.php:1912
+#: include/functions.php:1914
 msgid "Dismiss read"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1915
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions.php:1914 js/viewfeed.js:1903
+#: include/functions.php:1916 js/viewfeed.js:1897
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1915 js/viewfeed.js:1897
+#: include/functions.php:1917 js/viewfeed.js:1891
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1916
+#: include/functions.php:1918
 msgid "Scroll down"
 msgstr ""
 
-#: include/functions.php:1917
+#: include/functions.php:1919
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1918
+#: include/functions.php:1920
 msgid "Select article under cursor"
 msgstr ""
 
-#: include/functions.php:1919
+#: include/functions.php:1921
 msgid "Email article"
 msgstr ""
 
-#: include/functions.php:1920
+#: include/functions.php:1922
 msgid "Close/collapse article"
 msgstr ""
 
-#: include/functions.php:1922 plugins/embed_original/init.php:33
+#: include/functions.php:1924 plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr ""
 
-#: include/functions.php:1923
+#: include/functions.php:1925
 msgid "Article selection"
 msgstr ""
 
-#: include/functions.php:1924
+#: include/functions.php:1926
 msgid "Select all articles"
 msgstr ""
 
-#: include/functions.php:1925
+#: include/functions.php:1927
 msgid "Select unread"
 msgstr ""
 
-#: include/functions.php:1926
+#: include/functions.php:1928
 msgid "Select starred"
 msgstr ""
 
-#: include/functions.php:1927
+#: include/functions.php:1929
 msgid "Select published"
 msgstr ""
 
-#: include/functions.php:1928
+#: include/functions.php:1930
 msgid "Invert selection"
 msgstr ""
 
-#: include/functions.php:1929
+#: include/functions.php:1931
 msgid "Deselect everything"
 msgstr ""
 
-#: include/functions.php:1930 classes/pref/feeds.php:514
-#: classes/pref/feeds.php:745
+#: include/functions.php:1932 classes/pref/feeds.php:520
+#: classes/pref/feeds.php:753
 msgid "Feed"
 msgstr ""
 
-#: include/functions.php:1931
+#: include/functions.php:1933
 msgid "Refresh current feed"
 msgstr ""
 
-#: include/functions.php:1932
+#: include/functions.php:1934
 msgid "Un/hide read feeds"
 msgstr ""
 
-#: include/functions.php:1933 classes/pref/feeds.php:1266
+#: include/functions.php:1935 classes/pref/feeds.php:1274
 msgid "Subscribe to feed"
 msgstr ""
 
-#: include/functions.php:1934 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1936 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr ""
 
-#: include/functions.php:1936
+#: include/functions.php:1938
 msgid "Reverse headlines"
 msgstr ""
 
-#: include/functions.php:1937
+#: include/functions.php:1939
 msgid "Debug feed update"
 msgstr ""
 
-#: include/functions.php:1938 js/FeedTree.js:178
+#: include/functions.php:1940 js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr ""
 
-#: include/functions.php:1939
+#: include/functions.php:1941
 msgid "Un/collapse current category"
 msgstr ""
 
-#: include/functions.php:1940
+#: include/functions.php:1942
 msgid "Toggle combined mode"
 msgstr ""
 
-#: include/functions.php:1941
+#: include/functions.php:1943
 msgid "Go to"
 msgstr ""
 
-#: include/functions.php:1943
+#: include/functions.php:1945
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1946
+#: include/functions.php:1948
 msgid "Tag cloud"
 msgstr ""
 
-#: include/functions.php:1948
+#: include/functions.php:1950
 msgid "Other"
 msgstr ""
 
-#: include/functions.php:1949 classes/pref/labels.php:281
+#: include/functions.php:1951 classes/pref/labels.php:281
 msgid "Create label"
 msgstr ""
 
-#: include/functions.php:1950 classes/pref/filters.php:606
+#: include/functions.php:1952 classes/pref/filters.php:606
 msgid "Create filter"
 msgstr ""
 
-#: include/functions.php:1951
+#: include/functions.php:1953
 msgid "Un/collapse sidebar"
 msgstr ""
 
-#: include/functions.php:1952
+#: include/functions.php:1954
 msgid "Show help dialog"
 msgstr ""
 
-#: include/functions.php:2452
+#: include/functions.php:2458
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2943 js/viewfeed.js:1990
+#: include/functions.php:2949 js/viewfeed.js:1984
 msgid "Click to play"
 msgstr ""
 
-#: include/functions.php:2944 js/viewfeed.js:1989
+#: include/functions.php:2950 js/viewfeed.js:1983
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3061
+#: include/functions.php:3067
 msgid " - "
 msgstr ""
 
-#: include/functions.php:3083 include/functions.php:3377 classes/rpc.php:359
+#: include/functions.php:3089 include/functions.php:3383 classes/rpc.php:359
 msgid "no tags"
 msgstr ""
 
-#: include/functions.php:3093 classes/feeds.php:682
+#: include/functions.php:3099 classes/feeds.php:682
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions.php:3122 classes/feeds.php:638
+#: include/functions.php:3128 classes/feeds.php:638
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions.php:3135 classes/feeds.php:651 classes/pref/feeds.php:533
+#: include/functions.php:3141 classes/feeds.php:651 classes/pref/feeds.php:539
 msgid "Feed URL"
 msgstr ""
 
-#: include/functions.php:3166 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3172 classes/dlg.php:43 classes/dlg.php:162
 #: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:506
 #: classes/dlg.php:541 classes/dlg.php:572 classes/dlg.php:606
 #: classes/dlg.php:618 classes/backend.php:105 classes/pref/users.php:106
-#: classes/pref/filters.php:111 classes/pref/feeds.php:1579
-#: classes/pref/feeds.php:1650 plugins/import_export/init.php:409
-#: plugins/import_export/init.php:432 plugins/share/init.php:67
-#: plugins/updater/init.php:357
+#: classes/pref/filters.php:111 classes/pref/feeds.php:1587
+#: classes/pref/feeds.php:1659 plugins/import_export/init.php:409
+#: plugins/import_export/init.php:432 plugins/googlereaderimport/init.php:137
+#: plugins/share/init.php:67 plugins/updater/init.php:357
 msgid "Close this window"
 msgstr ""
 
-#: include/functions.php:3402
+#: include/functions.php:3408
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:3635
+#: include/functions.php:3641
 msgid "unknown type"
 msgstr ""
 
-#: include/functions.php:3691
+#: include/functions.php:3697
 msgid "Attachments"
 msgstr ""
 
@@ -831,7 +836,7 @@ msgstr ""
 msgid "Set starred"
 msgstr ""
 
-#: include/localized_schema.php:12 js/viewfeed.js:482
+#: include/localized_schema.php:12 js/viewfeed.js:480
 #: plugins/digest/digest.js:265 plugins/digest/digest.js:754
 msgid "Publish article"
 msgstr ""
@@ -840,7 +845,7 @@ msgstr ""
 msgid "Assign tags"
 msgstr ""
 
-#: include/localized_schema.php:14 js/viewfeed.js:1954
+#: include/localized_schema.php:14 js/viewfeed.js:1948
 msgid "Assign label"
 msgstr ""
 
@@ -1050,12 +1055,12 @@ msgstr ""
 msgid "Assign articles to labels automatically"
 msgstr ""
 
-#: include/login_form.php:183 classes/handler/public.php:454
-#: classes/handler/public.php:739 plugins/mobile/login_form.php:40
+#: include/login_form.php:183 classes/handler/public.php:466
+#: classes/handler/public.php:760 plugins/mobile/login_form.php:40
 msgid "Login:"
 msgstr ""
 
-#: include/login_form.php:192 classes/handler/public.php:457
+#: include/login_form.php:192 classes/handler/public.php:469
 #: plugins/mobile/login_form.php:45
 msgid "Password:"
 msgstr ""
@@ -1064,7 +1069,7 @@ msgstr ""
 msgid "I forgot my password"
 msgstr ""
 
-#: include/login_form.php:201 classes/handler/public.php:460
+#: include/login_form.php:201 classes/handler/public.php:472
 msgid "Language:"
 msgstr ""
 
@@ -1081,7 +1086,11 @@ msgstr ""
 msgid "Use less traffic"
 msgstr ""
 
-#: include/login_form.php:225 classes/handler/public.php:470
+#: include/login_form.php:229
+msgid "Remember me"
+msgstr ""
+
+#: include/login_form.php:235 classes/handler/public.php:482
 #: plugins/mobile/login_form.php:28
 msgid "Log in"
 msgstr ""
@@ -1090,116 +1099,121 @@ msgstr ""
 msgid "Article not found."
 msgstr ""
 
-#: classes/handler/public.php:395 plugins/bookmarklets/init.php:38
+#: classes/handler/public.php:407 plugins/bookmarklets/init.php:38
 msgid "Share with Tiny Tiny RSS"
 msgstr ""
 
-#: classes/handler/public.php:403
+#: classes/handler/public.php:415
 msgid "Title:"
 msgstr ""
 
-#: classes/handler/public.php:405 classes/dlg.php:665
-#: classes/pref/feeds.php:531 classes/pref/feeds.php:760
+#: classes/handler/public.php:417 classes/dlg.php:663
+#: classes/pref/feeds.php:537 classes/pref/feeds.php:768
 #: plugins/instances/init.php:215
 msgid "URL:"
 msgstr ""
 
-#: classes/handler/public.php:407
+#: classes/handler/public.php:419
 msgid "Content:"
 msgstr ""
 
-#: classes/handler/public.php:409
+#: classes/handler/public.php:421
 msgid "Labels:"
 msgstr ""
 
-#: classes/handler/public.php:428
+#: classes/handler/public.php:440
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:430
+#: classes/handler/public.php:442
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:431 classes/handler/public.php:473
+#: classes/handler/public.php:443 classes/handler/public.php:485
 #: classes/dlg.php:296 classes/dlg.php:348 classes/dlg.php:408
-#: classes/dlg.php:439 classes/dlg.php:650 classes/dlg.php:700
-#: classes/dlg.php:749 classes/pref/users.php:194 classes/pref/labels.php:81
+#: classes/dlg.php:439 classes/dlg.php:648 classes/dlg.php:698
+#: classes/dlg.php:747 classes/pref/users.php:194 classes/pref/labels.php:81
 #: classes/pref/filters.php:363 classes/pref/filters.php:746
 #: classes/pref/filters.php:822 classes/pref/filters.php:889
-#: classes/pref/feeds.php:727 classes/pref/feeds.php:875
+#: classes/pref/feeds.php:733 classes/pref/feeds.php:883
 #: plugins/mail/init.php:131 plugins/note/init.php:55
 #: plugins/instances/init.php:251
 msgid "Cancel"
 msgstr ""
 
-#: classes/handler/public.php:452
+#: classes/handler/public.php:464
 msgid "Not logged in"
 msgstr ""
 
-#: classes/handler/public.php:512
+#: classes/handler/public.php:531
 msgid "Incorrect username or password"
 msgstr ""
 
-#: classes/handler/public.php:548 classes/handler/public.php:645
+#: classes/handler/public.php:567 classes/handler/public.php:664
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:551 classes/handler/public.php:636
+#: classes/handler/public.php:570 classes/handler/public.php:655
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:554 classes/handler/public.php:639
+#: classes/handler/public.php:573 classes/handler/public.php:658
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:557 classes/handler/public.php:642
+#: classes/handler/public.php:576 classes/handler/public.php:661
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:560 classes/handler/public.php:648
+#: classes/handler/public.php:579 classes/handler/public.php:667
 msgid "Multiple feed URLs found."
 msgstr ""
 
-#: classes/handler/public.php:564 classes/handler/public.php:653
+#: classes/handler/public.php:583 classes/handler/public.php:672
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/handler/public.php:582 classes/handler/public.php:671
+#: classes/handler/public.php:601 classes/handler/public.php:690
 msgid "Subscribe to selected feed"
 msgstr ""
 
-#: classes/handler/public.php:607 classes/handler/public.php:695
+#: classes/handler/public.php:626 classes/handler/public.php:714
 msgid "Edit subscription options"
 msgstr ""
 
-#: classes/handler/public.php:724 classes/handler/public.php:754
-#: classes/pref/users.php:378
+#: classes/handler/public.php:743
+msgid "Password recovery"
+msgstr ""
+
+#: classes/handler/public.php:752
+msgid ""
+"You will need to provide valid account name and email. New password will be "
+"sent on your email address."
+msgstr ""
+
+#: classes/handler/public.php:775 classes/pref/users.php:378
 msgid "Reset password"
 msgstr ""
 
-#: classes/handler/public.php:765
+#: classes/handler/public.php:786
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:767 classes/handler/public.php:783
-#: classes/handler/public.php:788 plugins/digest/digest_body.php:69
+#: classes/handler/public.php:790 classes/handler/public.php:816
+#: classes/handler/public.php:825 plugins/digest/digest_body.php:69
 msgid "Go back"
 msgstr ""
 
-#: classes/handler/public.php:779
-msgid "Completed."
-msgstr ""
-
-#: classes/handler/public.php:782
+#: classes/handler/public.php:812
 msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/handler/public.php:787
+#: classes/handler/public.php:822
 msgid "Form secret key incorrect. Please enable cookies and try again."
 msgstr ""
 
@@ -1212,8 +1226,8 @@ msgstr ""
 #: classes/dlg.php:55 classes/pref/users.php:360 classes/pref/labels.php:272
 #: classes/pref/filters.php:234 classes/pref/filters.php:282
 #: classes/pref/filters.php:597 classes/pref/filters.php:676
-#: classes/pref/filters.php:703 classes/pref/feeds.php:1254
-#: classes/pref/feeds.php:1524 classes/pref/feeds.php:1593
+#: classes/pref/filters.php:703 classes/pref/feeds.php:1262
+#: classes/pref/feeds.php:1532 classes/pref/feeds.php:1602
 #: plugins/instances/init.php:287
 msgid "Select"
 msgstr ""
@@ -1222,8 +1236,8 @@ msgstr ""
 #: classes/pref/labels.php:275 classes/pref/filters.php:237
 #: classes/pref/filters.php:285 classes/pref/filters.php:600
 #: classes/pref/filters.php:679 classes/pref/filters.php:706
-#: classes/pref/feeds.php:1257 classes/pref/feeds.php:1527
-#: classes/pref/feeds.php:1596 plugins/instances/init.php:290
+#: classes/pref/feeds.php:1265 classes/pref/feeds.php:1535
+#: classes/pref/feeds.php:1605 plugins/instances/init.php:290
 msgid "All"
 msgstr ""
 
@@ -1231,8 +1245,8 @@ msgstr ""
 #: classes/pref/labels.php:277 classes/pref/filters.php:239
 #: classes/pref/filters.php:287 classes/pref/filters.php:602
 #: classes/pref/filters.php:681 classes/pref/filters.php:708
-#: classes/pref/feeds.php:1259 classes/pref/feeds.php:1529
-#: classes/pref/feeds.php:1598 plugins/instances/init.php:292
+#: classes/pref/feeds.php:1267 classes/pref/feeds.php:1537
+#: classes/pref/feeds.php:1607 plugins/instances/init.php:292
 msgid "None"
 msgstr ""
 
@@ -1290,8 +1304,8 @@ msgstr ""
 msgid "Feed or site URL"
 msgstr ""
 
-#: classes/dlg.php:248 classes/dlg.php:713 classes/pref/feeds.php:553
-#: classes/pref/feeds.php:773
+#: classes/dlg.php:248 classes/dlg.php:711 classes/pref/feeds.php:559
+#: classes/pref/feeds.php:781
 msgid "Place in category:"
 msgstr ""
 
@@ -1299,18 +1313,18 @@ msgstr ""
 msgid "Available feeds"
 msgstr ""
 
-#: classes/dlg.php:268 classes/pref/users.php:155 classes/pref/feeds.php:583
-#: classes/pref/feeds.php:809
+#: classes/dlg.php:268 classes/pref/users.php:155 classes/pref/feeds.php:589
+#: classes/pref/feeds.php:817
 msgid "Authentication"
 msgstr ""
 
-#: classes/dlg.php:272 classes/dlg.php:727 classes/pref/users.php:420
-#: classes/pref/feeds.php:589 classes/pref/feeds.php:813
+#: classes/dlg.php:272 classes/dlg.php:725 classes/pref/users.php:420
+#: classes/pref/feeds.php:595 classes/pref/feeds.php:821
 msgid "Login"
 msgstr ""
 
-#: classes/dlg.php:275 classes/dlg.php:730 classes/pref/prefs.php:203
-#: classes/pref/feeds.php:595 classes/pref/feeds.php:819
+#: classes/dlg.php:275 classes/dlg.php:728 classes/pref/prefs.php:203
+#: classes/pref/feeds.php:601 classes/pref/feeds.php:827
 msgid "Password"
 msgstr ""
 
@@ -1318,7 +1332,7 @@ msgstr ""
 msgid "This feed requires authentication."
 msgstr ""
 
-#: classes/dlg.php:290 classes/dlg.php:346 classes/dlg.php:748
+#: classes/dlg.php:290 classes/dlg.php:346 classes/dlg.php:746
 msgid "Subscribe"
 msgstr ""
 
@@ -1327,7 +1341,7 @@ msgid "More feeds"
 msgstr ""
 
 #: classes/dlg.php:316 classes/dlg.php:407 classes/pref/users.php:350
-#: classes/pref/filters.php:593 classes/pref/feeds.php:1250 js/tt-rss.js:167
+#: classes/pref/filters.php:593 classes/pref/feeds.php:1258 js/tt-rss.js:170
 msgid "Search"
 msgstr ""
 
@@ -1345,7 +1359,7 @@ msgstr ""
 
 #: classes/dlg.php:347 classes/pref/users.php:376 classes/pref/labels.php:284
 #: classes/pref/filters.php:353 classes/pref/filters.php:615
-#: classes/pref/feeds.php:700 plugins/instances/init.php:297
+#: classes/pref/feeds.php:706 plugins/instances/init.php:297
 msgid "Remove"
 msgstr ""
 
@@ -1365,9 +1379,9 @@ msgstr ""
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: classes/dlg.php:437 classes/dlg.php:648 classes/pref/users.php:192
+#: classes/dlg.php:437 classes/dlg.php:646 classes/pref/users.php:192
 #: classes/pref/labels.php:79 classes/pref/filters.php:360
-#: classes/pref/feeds.php:726 classes/pref/feeds.php:872
+#: classes/pref/feeds.php:732 classes/pref/feeds.php:880
 #: plugins/nsfw/init.php:86 plugins/note/init.php:53
 #: plugins/instances/init.php:248
 msgid "Save"
@@ -1432,7 +1446,7 @@ msgstr ""
 msgid "Error receiving version information or no new version available."
 msgstr ""
 
-#: classes/dlg.php:632
+#: classes/dlg.php:631
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1440,45 +1454,45 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: classes/dlg.php:659 plugins/instances/init.php:207
+#: classes/dlg.php:657 plugins/instances/init.php:207
 msgid "Instance"
 msgstr ""
 
-#: classes/dlg.php:668 plugins/instances/init.php:218
+#: classes/dlg.php:666 plugins/instances/init.php:218
 #: plugins/instances/init.php:315
 msgid "Instance URL"
 msgstr ""
 
-#: classes/dlg.php:678 plugins/instances/init.php:229
+#: classes/dlg.php:676 plugins/instances/init.php:229
 msgid "Access key:"
 msgstr ""
 
-#: classes/dlg.php:681 plugins/instances/init.php:232
+#: classes/dlg.php:679 plugins/instances/init.php:232
 #: plugins/instances/init.php:316
 msgid "Access key"
 msgstr ""
 
-#: classes/dlg.php:685 plugins/instances/init.php:236
+#: classes/dlg.php:683 plugins/instances/init.php:236
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: classes/dlg.php:693 plugins/instances/init.php:244
+#: classes/dlg.php:691 plugins/instances/init.php:244
 msgid "Generate new key"
 msgstr ""
 
-#: classes/dlg.php:697
+#: classes/dlg.php:695
 msgid "Create link"
 msgstr ""
 
-#: classes/dlg.php:710
+#: classes/dlg.php:708
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/dlg.php:719
+#: classes/dlg.php:717
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/dlg.php:741
+#: classes/dlg.php:739
 msgid "Feeds require authentication."
 msgstr ""
 
@@ -1589,22 +1603,22 @@ msgstr ""
 msgid "No feed selected."
 msgstr ""
 
-#: classes/backend.php:34
+#: 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:57
+#: classes/backend.php:61
 msgid "Shift"
 msgstr ""
 
-#: classes/backend.php:60
+#: classes/backend.php:64
 msgid "Ctrl"
 msgstr ""
 
-#: classes/backend.php:84
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-
 #: classes/backend.php:99
 msgid "Help topic not found."
 msgstr ""
@@ -1659,7 +1673,7 @@ msgstr ""
 msgid "Error: please upload OPML file."
 msgstr ""
 
-#: classes/opml.php:475
+#: classes/opml.php:475 plugins/googlereaderimport/init.php:130
 msgid "Error while parsing document."
 msgstr ""
 
@@ -1703,8 +1717,8 @@ msgstr ""
 msgid "Change password to"
 msgstr ""
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:603
-#: classes/pref/feeds.php:825
+#: classes/pref/users.php:177 classes/pref/feeds.php:609
+#: classes/pref/feeds.php:833
 msgid "Options"
 msgstr ""
 
@@ -1856,7 +1870,7 @@ msgstr ""
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:619 classes/pref/feeds.php:1309
+#: classes/pref/filters.php:619 classes/pref/feeds.php:1317
 msgid "Rescore articles"
 msgstr ""
 
@@ -1881,7 +1895,7 @@ msgstr ""
 msgid "Save rule"
 msgstr ""
 
-#: classes/pref/filters.php:819 js/functions.js:1079
+#: classes/pref/filters.php:819 js/functions.js:1069
 msgid "Add rule"
 msgstr ""
 
@@ -1897,7 +1911,7 @@ msgstr ""
 msgid "Save action"
 msgstr ""
 
-#: classes/pref/filters.php:886 js/functions.js:1105
+#: classes/pref/filters.php:886 js/functions.js:1095
 msgid "Add action"
 msgstr ""
 
@@ -2053,48 +2067,54 @@ msgstr ""
 
 #: classes/pref/prefs.php:632
 msgid ""
-"Download more plugins at <a class=\"visibleLink\" target=\"_blank\" href="
-"\"http://tt-rss.org/forum/viewforum.php?f=22\">Tiny Tiny RSS forums</a>."
+"You will need to reload Tiny Tiny RSS for plugin changes to take effect."
 msgstr ""
 
 #: classes/pref/prefs.php:634
 msgid ""
-"You will need to reload Tiny Tiny RSS for plugin changes to take effect."
+"Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank"
+"\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a "
+"target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins"
+"\">wiki</a>."
 msgstr ""
 
 #: classes/pref/prefs.php:660
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:664 classes/pref/prefs.php:713
+#: classes/pref/prefs.php:664 classes/pref/prefs.php:718
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:665 classes/pref/prefs.php:714
+#: classes/pref/prefs.php:665 classes/pref/prefs.php:719
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:666 classes/pref/prefs.php:715
+#: classes/pref/prefs.php:666 classes/pref/prefs.php:720
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:667 classes/pref/prefs.php:716
+#: classes/pref/prefs.php:667 classes/pref/prefs.php:721
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:700 classes/pref/prefs.php:751
+#: classes/pref/prefs.php:696 classes/pref/prefs.php:753
+msgid "more info"
+msgstr ""
+
+#: classes/pref/prefs.php:705 classes/pref/prefs.php:762
 msgid "Clear data"
 msgstr ""
 
-#: classes/pref/prefs.php:709
+#: classes/pref/prefs.php:714
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:766
+#: classes/pref/prefs.php:777
 msgid "Enable selected plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:821 classes/pref/prefs.php:839
+#: classes/pref/prefs.php:832 classes/pref/prefs.php:850
 msgid "Incorrect password"
 msgstr ""
 
@@ -2102,234 +2122,230 @@ msgstr ""
 msgid "Check to enable field"
 msgstr ""
 
-#: classes/pref/feeds.php:58 classes/pref/feeds.php:201
-#: classes/pref/feeds.php:243 classes/pref/feeds.php:249
-#: classes/pref/feeds.php:274
+#: classes/pref/feeds.php:60 classes/pref/feeds.php:208
+#: classes/pref/feeds.php:250 classes/pref/feeds.php:256
+#: classes/pref/feeds.php:281
 #, php-format
 msgid "(%d feed)"
 msgid_plural "(%d feeds)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: classes/pref/feeds.php:520
+#: classes/pref/feeds.php:526
 msgid "Feed Title"
 msgstr ""
 
-#: classes/pref/feeds.php:576 classes/pref/feeds.php:800
+#: classes/pref/feeds.php:582 classes/pref/feeds.php:808
 msgid "Article purging:"
 msgstr ""
 
-#: classes/pref/feeds.php:599
+#: classes/pref/feeds.php:605
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:615 classes/pref/feeds.php:829
+#: classes/pref/feeds.php:621 classes/pref/feeds.php:837
 msgid "Hide from Popular feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:627 classes/pref/feeds.php:835
+#: classes/pref/feeds.php:633 classes/pref/feeds.php:843
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: classes/pref/feeds.php:640 classes/pref/feeds.php:841
+#: classes/pref/feeds.php:646 classes/pref/feeds.php:849
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:653 classes/pref/feeds.php:849
+#: classes/pref/feeds.php:659 classes/pref/feeds.php:857
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:666 classes/pref/feeds.php:857
+#: classes/pref/feeds.php:672 classes/pref/feeds.php:865
 msgid "Cache images locally"
 msgstr ""
 
-#: classes/pref/feeds.php:678 classes/pref/feeds.php:863
+#: classes/pref/feeds.php:684 classes/pref/feeds.php:871
 msgid "Mark updated articles as unread"
 msgstr ""
 
-#: classes/pref/feeds.php:684
+#: classes/pref/feeds.php:690
 msgid "Icon"
 msgstr ""
 
-#: classes/pref/feeds.php:698
+#: classes/pref/feeds.php:704
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:717
+#: classes/pref/feeds.php:723
 msgid "Resubscribe to push updates"
 msgstr ""
 
-#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:730
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:739
-msgid "Enable the options you wish to apply using checkboxes on the right:"
-msgstr ""
-
-#: classes/pref/feeds.php:1103 classes/pref/feeds.php:1156
+#: classes/pref/feeds.php:1111 classes/pref/feeds.php:1164
 msgid "All done."
 msgstr ""
 
-#: classes/pref/feeds.php:1211
+#: classes/pref/feeds.php:1219
 msgid "Feeds with errors"
 msgstr ""
 
-#: classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1239
 msgid "Inactive feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1268
+#: classes/pref/feeds.php:1276
 msgid "Edit selected feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1270 classes/pref/feeds.php:1284
+#: classes/pref/feeds.php:1278 classes/pref/feeds.php:1292
 msgid "Reset sort order"
 msgstr ""
 
-#: classes/pref/feeds.php:1272 js/prefs.js:1764
+#: classes/pref/feeds.php:1280 js/prefs.js:1764
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1277
+#: classes/pref/feeds.php:1285
 msgid "Categories"
 msgstr ""
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1288
 msgid "Add category"
 msgstr ""
 
-#: classes/pref/feeds.php:1282
+#: classes/pref/feeds.php:1290
 msgid "(Un)hide empty categories"
 msgstr ""
 
-#: classes/pref/feeds.php:1286
+#: classes/pref/feeds.php:1294
 msgid "Remove selected"
 msgstr ""
 
-#: classes/pref/feeds.php:1300
+#: classes/pref/feeds.php:1308
 msgid "More actions..."
 msgstr ""
 
-#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1312
 msgid "Manual purge"
 msgstr ""
 
-#: classes/pref/feeds.php:1308
+#: classes/pref/feeds.php:1316
 msgid "Clear feed data"
 msgstr ""
 
-#: classes/pref/feeds.php:1359
+#: classes/pref/feeds.php:1367
 msgid "OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1361
+#: classes/pref/feeds.php:1369
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1363
+#: classes/pref/feeds.php:1371
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1376
+#: classes/pref/feeds.php:1384
 msgid "Import my OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1380
+#: classes/pref/feeds.php:1388
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1382
+#: classes/pref/feeds.php:1390
 msgid "Include settings"
 msgstr ""
 
-#: classes/pref/feeds.php:1386
+#: classes/pref/feeds.php:1394
 msgid "Export OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1390
+#: classes/pref/feeds.php:1398
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1392
+#: classes/pref/feeds.php:1400
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1395
+#: classes/pref/feeds.php:1403
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1405
+#: classes/pref/feeds.php:1413
 msgid "Firefox integration"
 msgstr ""
 
-#: classes/pref/feeds.php:1407
+#: classes/pref/feeds.php:1415
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1422
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref/feeds.php:1422
+#: classes/pref/feeds.php:1430
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1424
+#: classes/pref/feeds.php:1432
 msgid "Published articles and generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1426
+#: classes/pref/feeds.php:1434
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: classes/pref/feeds.php:1432
+#: classes/pref/feeds.php:1440
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1435
+#: classes/pref/feeds.php:1443
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1437
+#: classes/pref/feeds.php:1445
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1439
+#: classes/pref/feeds.php:1447
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1442
+#: classes/pref/feeds.php:1450
 msgid "Unshare all articles"
 msgstr ""
 
-#: classes/pref/feeds.php:1520
+#: classes/pref/feeds.php:1528
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1557 classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1565 classes/pref/feeds.php:1635
 msgid "Click to edit feed"
 msgstr ""
 
-#: classes/pref/feeds.php:1575 classes/pref/feeds.php:1646
+#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1655
 msgid "Unsubscribe from selected feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1586
+#: classes/pref/feeds.php:1594
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
@@ -2567,18 +2583,43 @@ msgstr ""
 msgid "Edit article note"
 msgstr ""
 
-#: plugins/example/init.php:38
+#: plugins/example/init.php:39
 msgid "Example Pane"
 msgstr ""
 
-#: plugins/example/init.php:69
+#: plugins/example/init.php:70
 msgid "Sample value"
 msgstr ""
 
-#: plugins/example/init.php:75
+#: plugins/example/init.php:76
 msgid "Set value"
 msgstr ""
 
+#: plugins/googlereaderimport/init.php:70
+msgid "No file uploaded."
+msgstr ""
+
+#: plugins/googlereaderimport/init.php:122
+#, php-format
+msgid "All done. %d out of %d articles imported."
+msgstr ""
+
+#: plugins/googlereaderimport/init.php:126
+msgid "The document has incorrect format."
+msgstr ""
+
+#: plugins/googlereaderimport/init.php:194
+msgid "Import starred or shared items from Google Reader"
+msgstr ""
+
+#: plugins/googlereaderimport/init.php:198
+msgid "Paste your starred.json or shared.json into the form below."
+msgstr ""
+
+#: plugins/googlereaderimport/init.php:212
+msgid "Import my Starred items"
+msgstr ""
+
 #: plugins/instances/init.php:144
 msgid "Linked"
 msgstr ""
@@ -2636,11 +2677,7 @@ msgstr ""
 msgid "Start update"
 msgstr ""
 
-#: js/feedlist.js:213
-msgid "New articles available in this feed (click to show)"
-msgstr ""
-
-#: js/feedlist.js:415 js/feedlist.js:430 plugins/digest/digest.js:26
+#: js/feedlist.js:392 js/feedlist.js:407 plugins/digest/digest.js:26
 msgid "Mark all articles in %s as read?"
 msgstr ""
 
@@ -2650,157 +2687,161 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
-#: js/functions.js:628
+#: js/functions.js:214
+msgid "close"
+msgstr ""
+
+#: js/functions.js:627
 msgid "Date syntax appears to be correct:"
 msgstr ""
 
-#: js/functions.js:631
+#: js/functions.js:630
 msgid "Date syntax is incorrect."
 msgstr ""
 
-#: js/functions.js:734
+#: js/functions.js:724
 msgid "Upload complete."
 msgstr ""
 
-#: js/functions.js:758
+#: js/functions.js:748
 msgid "Remove stored feed icon?"
 msgstr ""
 
-#: js/functions.js:763
+#: js/functions.js:753
 msgid "Removing feed icon..."
 msgstr ""
 
-#: js/functions.js:768
+#: js/functions.js:758
 msgid "Feed icon removed."
 msgstr ""
 
-#: js/functions.js:790
+#: js/functions.js:780
 msgid "Please select an image file to upload."
 msgstr ""
 
-#: js/functions.js:792
+#: js/functions.js:782
 msgid "Upload new icon for this feed?"
 msgstr ""
 
-#: js/functions.js:793
+#: js/functions.js:783
 msgid "Uploading, please wait..."
 msgstr ""
 
-#: js/functions.js:809
+#: js/functions.js:799
 msgid "Please enter label caption:"
 msgstr ""
 
-#: js/functions.js:814
+#: js/functions.js:804
 msgid "Can't create label: missing caption."
 msgstr ""
 
-#: js/functions.js:857
+#: js/functions.js:847
 msgid "Subscribe to Feed"
 msgstr ""
 
-#: js/functions.js:884
+#: js/functions.js:874
 msgid "Subscribed to %s"
 msgstr ""
 
-#: js/functions.js:889
+#: js/functions.js:879
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: js/functions.js:892
+#: js/functions.js:882
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: js/functions.js:945
+#: js/functions.js:935
 msgid "Couldn't download the specified URL: %s"
 msgstr ""
 
-#: js/functions.js:949
+#: js/functions.js:939
 msgid "You are already subscribed to this feed."
 msgstr ""
 
-#: js/functions.js:1079
+#: js/functions.js:1069
 msgid "Edit rule"
 msgstr ""
 
-#: js/functions.js:1105
+#: js/functions.js:1095
 msgid "Edit action"
 msgstr ""
 
-#: js/functions.js:1142
+#: js/functions.js:1132
 msgid "Create Filter"
 msgstr ""
 
-#: js/functions.js:1257
+#: js/functions.js:1247
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1268
+#: js/functions.js:1258
 msgid "Subscription reset."
 msgstr ""
 
-#: js/functions.js:1278 js/tt-rss.js:598
+#: js/functions.js:1268 js/tt-rss.js:601
 msgid "Unsubscribe from %s?"
 msgstr ""
 
-#: js/functions.js:1281
+#: js/functions.js:1271
 msgid "Removing feed..."
 msgstr ""
 
-#: js/functions.js:1389
+#: js/functions.js:1379
 msgid "Please enter category title:"
 msgstr ""
 
-#: js/functions.js:1420
+#: js/functions.js:1410
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1424 js/prefs.js:1234
+#: js/functions.js:1414 js/prefs.js:1234
 msgid "Trying to change address..."
 msgstr ""
 
-#: js/functions.js:1611 js/tt-rss.js:393 js/tt-rss.js:579
+#: js/functions.js:1601 js/tt-rss.js:396 js/tt-rss.js:582
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/functions.js:1626
+#: js/functions.js:1616
 msgid "Edit Feed"
 msgstr ""
 
-#: js/functions.js:1632 js/prefs.js:194 js/prefs.js:749
+#: js/functions.js:1622 js/prefs.js:194 js/prefs.js:749
 msgid "Saving data..."
 msgstr ""
 
-#: js/functions.js:1664
+#: js/functions.js:1654
 msgid "More Feeds"
 msgstr ""
 
-#: js/functions.js:1725 js/functions.js:1835 js/prefs.js:397 js/prefs.js:427
+#: js/functions.js:1715 js/functions.js:1825 js/prefs.js:397 js/prefs.js:427
 #: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1210
 #: js/prefs.js:1355
 msgid "No feeds are selected."
 msgstr ""
 
-#: js/functions.js:1767
+#: js/functions.js:1757
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1806
+#: js/functions.js:1796
 msgid "Feeds with update errors"
 msgstr ""
 
-#: js/functions.js:1817 js/prefs.js:1192
+#: js/functions.js:1807 js/prefs.js:1192
 msgid "Remove selected feeds?"
 msgstr ""
 
-#: js/functions.js:1820 js/prefs.js:1195
+#: js/functions.js:1810 js/prefs.js:1195
 msgid "Removing selected feeds..."
 msgstr ""
 
-#: js/functions.js:1918
+#: js/functions.js:1908
 msgid "Help"
 msgstr ""
 
@@ -2946,7 +2987,7 @@ msgstr ""
 msgid "Save changes to selected feeds?"
 msgstr ""
 
-#: js/prefs.js:797
+#: js/prefs.js:797 plugins/googlereaderimport/init.js:18
 msgid "OPML Import"
 msgstr ""
 
@@ -2955,6 +2996,7 @@ msgid "Please choose an OPML file first."
 msgstr ""
 
 #: js/prefs.js:827 plugins/import_export/import_export.js:115
+#: plugins/googlereaderimport/init.js:45
 msgid "Importing, please wait..."
 msgstr ""
 
@@ -3084,43 +3126,43 @@ msgstr ""
 msgid "Clear stored data for this plugin?"
 msgstr ""
 
-#: js/tt-rss.js:121
+#: js/tt-rss.js:124
 msgid "Mark all articles as read?"
 msgstr ""
 
-#: js/tt-rss.js:127
+#: js/tt-rss.js:130
 msgid "Marking all feeds as read..."
 msgstr ""
 
-#: js/tt-rss.js:352
+#: js/tt-rss.js:355
 msgid "Please enable mail plugin first."
 msgstr ""
 
-#: js/tt-rss.js:458
+#: js/tt-rss.js:461
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:587
+#: js/tt-rss.js:590
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/tt-rss.js:592 js/tt-rss.js:748
+#: js/tt-rss.js:595 js/tt-rss.js:751
 msgid "Please select some feed first."
 msgstr ""
 
-#: js/tt-rss.js:743
+#: js/tt-rss.js:746
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:753
+#: js/tt-rss.js:756
 msgid "Rescore articles in %s?"
 msgstr ""
 
-#: js/tt-rss.js:756
+#: js/tt-rss.js:759
 msgid "Rescoring articles..."
 msgstr ""
 
-#: js/tt-rss.js:876
+#: js/tt-rss.js:879
 msgid "New version available!"
 msgstr ""
 
@@ -3128,113 +3170,113 @@ msgstr ""
 msgid "Cancel search"
 msgstr ""
 
-#: js/viewfeed.js:439 plugins/digest/digest.js:258
+#: js/viewfeed.js:437 plugins/digest/digest.js:258
 #: plugins/digest/digest.js:714
 msgid "Unstar article"
 msgstr ""
 
-#: js/viewfeed.js:444 plugins/digest/digest.js:260
+#: js/viewfeed.js:442 plugins/digest/digest.js:260
 #: plugins/digest/digest.js:718
 msgid "Star article"
 msgstr ""
 
-#: js/viewfeed.js:477 plugins/digest/digest.js:263
+#: js/viewfeed.js:475 plugins/digest/digest.js:263
 #: plugins/digest/digest.js:749
 msgid "Unpublish article"
 msgstr ""
 
-#: js/viewfeed.js:690 js/viewfeed.js:718 js/viewfeed.js:745 js/viewfeed.js:807
-#: js/viewfeed.js:839 js/viewfeed.js:976 js/viewfeed.js:1019
-#: js/viewfeed.js:1069 js/viewfeed.js:2072 plugins/mailto/init.js:7
+#: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805
+#: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017
+#: js/viewfeed.js:1067 js/viewfeed.js:2066 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr ""
 
-#: js/viewfeed.js:956
+#: js/viewfeed.js:954
 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 
-#: js/viewfeed.js:984
+#: js/viewfeed.js:982
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:986
+#: js/viewfeed.js:984
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1028
+#: js/viewfeed.js:1026
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1031
+#: js/viewfeed.js:1029
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1075
+#: js/viewfeed.js:1073
 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:1099
+#: js/viewfeed.js:1097
 msgid "Edit article Tags"
 msgstr ""
 
-#: js/viewfeed.js:1105
+#: js/viewfeed.js:1103
 msgid "Saving article tags..."
 msgstr ""
 
-#: js/viewfeed.js:1340
+#: js/viewfeed.js:1338
 msgid "No article is selected."
 msgstr ""
 
-#: js/viewfeed.js:1375
+#: js/viewfeed.js:1373
 msgid "No articles found to mark"
 msgstr ""
 
-#: js/viewfeed.js:1377
+#: js/viewfeed.js:1375
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1883
+#: js/viewfeed.js:1877
 msgid "Open original article"
 msgstr ""
 
-#: js/viewfeed.js:1889
+#: js/viewfeed.js:1883
 msgid "Display article URL"
 msgstr ""
 
-#: js/viewfeed.js:1959
+#: js/viewfeed.js:1953
 msgid "Remove label"
 msgstr ""
 
-#: js/viewfeed.js:1983
+#: js/viewfeed.js:1977
 msgid "Playing..."
 msgstr ""
 
-#: js/viewfeed.js:1984
+#: js/viewfeed.js:1978
 msgid "Click to pause"
 msgstr ""
 
-#: js/viewfeed.js:2041
+#: js/viewfeed.js:2035
 msgid "Please enter new score for selected articles:"
 msgstr ""
 
-#: js/viewfeed.js:2083
+#: js/viewfeed.js:2077
 msgid "Please enter new score for this article:"
 msgstr ""
 
-#: js/viewfeed.js:2116
+#: js/viewfeed.js:2110
 msgid "Article URL:"
 msgstr ""
 
@@ -3300,6 +3342,10 @@ msgstr ""
 msgid "Saving article note..."
 msgstr ""
 
+#: plugins/googlereaderimport/init.js:42
+msgid "Please choose a file first."
+msgstr ""
+
 #: plugins/instances/instances.js:10
 msgid "Link Instance"
 msgstr ""