rebase translations

1 files changed, 226 insertions, 217 deletions

diff --git a/messages.pot b/messages.pot
index 7727d7762..220e2eee5 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-09 22:28+0400\n"
+"POT-Creation-Date: 2013-04-11 22:01+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"
@@ -18,79 +18,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: backend.php:69
+#: backend.php:74
 msgid "Use default"
 msgstr ""
 
-#: backend.php:70
+#: backend.php:75
 msgid "Never purge"
 msgstr ""
 
-#: backend.php:71
+#: backend.php:76
 msgid "1 week old"
 msgstr ""
 
-#: backend.php:72
+#: backend.php:77
 msgid "2 weeks old"
 msgstr ""
 
-#: backend.php:73
+#: backend.php:78
 msgid "1 month old"
 msgstr ""
 
-#: backend.php:74
+#: backend.php:79
 msgid "2 months old"
 msgstr ""
 
-#: backend.php:75
+#: backend.php:80
 msgid "3 months old"
 msgstr ""
 
-#: backend.php:78
+#: backend.php:83
 msgid "Default interval"
 msgstr ""
 
-#: backend.php:79 backend.php:89
+#: backend.php:84 backend.php:94
 msgid "Disable updates"
 msgstr ""
 
-#: backend.php:80 backend.php:90
+#: backend.php:85 backend.php:95
 msgid "Each 15 minutes"
 msgstr ""
 
-#: backend.php:81 backend.php:91
+#: backend.php:86 backend.php:96
 msgid "Each 30 minutes"
 msgstr ""
 
-#: backend.php:82 backend.php:92
+#: backend.php:87 backend.php:97
 msgid "Hourly"
 msgstr ""
 
-#: backend.php:83 backend.php:93
+#: backend.php:88 backend.php:98
 msgid "Each 4 hours"
 msgstr ""
 
-#: backend.php:84 backend.php:94
+#: backend.php:89 backend.php:99
 msgid "Each 12 hours"
 msgstr ""
 
-#: backend.php:85 backend.php:95
+#: backend.php:90 backend.php:100
 msgid "Daily"
 msgstr ""
 
-#: backend.php:86 backend.php:96
+#: backend.php:91 backend.php:101
 msgid "Weekly"
 msgstr ""
 
-#: backend.php:99 classes/pref/users.php:123
+#: backend.php:104 classes/pref/users.php:123
 msgid "User"
 msgstr ""
 
-#: backend.php:100
+#: backend.php:105
 msgid "Power User"
 msgstr ""
 
-#: backend.php:101
+#: backend.php:106
 msgid "Administrator"
 msgstr ""
 
@@ -154,7 +154,7 @@ msgstr ""
 
 #: index.php:135 index.php:152 index.php:277 prefs.php:103
 #: classes/backend.php:5 classes/pref/labels.php:296
-#: classes/pref/filters.php:680 classes/pref/feeds.php:1331
+#: classes/pref/filters.php:680 classes/pref/feeds.php:1348
 #: plugins/digest/digest_body.php:63 js/feedlist.js:128 js/feedlist.js:438
 #: js/functions.js:420 js/functions.js:758 js/functions.js:1194
 #: js/functions.js:1329 js/functions.js:1641 js/prefs.js:86 js/prefs.js:576
@@ -182,11 +182,11 @@ msgstr ""
 msgid "All Articles"
 msgstr ""
 
-#: index.php:174 include/functions.php:1961 classes/feeds.php:106
+#: index.php:174 include/functions.php:1972 classes/feeds.php:106
 msgid "Starred"
 msgstr ""
 
-#: index.php:175 include/functions.php:1962 classes/feeds.php:107
+#: index.php:175 include/functions.php:1973 classes/feeds.php:107
 msgid "Published"
 msgstr ""
 
@@ -226,7 +226,7 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: index.php:192 index.php:241 include/functions.php:1951
+#: index.php:192 index.php:241 include/functions.php:1962
 #: classes/feeds.php:111 classes/feeds.php:440 js/FeedTree.js:128
 #: js/FeedTree.js:156 plugins/digest/digest.js:647
 msgid "Mark as read"
@@ -280,7 +280,7 @@ msgstr ""
 msgid "Rescore feed"
 msgstr ""
 
-#: index.php:239 classes/pref/feeds.php:717 classes/pref/feeds.php:1283
+#: index.php:239 classes/pref/feeds.php:734 classes/pref/feeds.php:1300
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr ""
@@ -305,7 +305,7 @@ msgstr ""
 msgid "Show tag cloud..."
 msgstr ""
 
-#: index.php:248 include/functions.php:1937
+#: index.php:248 include/functions.php:1948
 msgid "Toggle widescreen mode"
 msgstr ""
 
@@ -331,7 +331,7 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: prefs.php:36 prefs.php:121 include/functions.php:1964
+#: prefs.php:36 prefs.php:121 include/functions.php:1975
 #: classes/pref/prefs.php:446
 msgid "Preferences"
 msgstr ""
@@ -344,8 +344,8 @@ msgstr ""
 msgid "Exit preferences"
 msgstr ""
 
-#: prefs.php:124 classes/pref/feeds.php:107 classes/pref/feeds.php:1209
-#: classes/pref/feeds.php:1272
+#: prefs.php:124 classes/pref/feeds.php:107 classes/pref/feeds.php:1226
+#: classes/pref/feeds.php:1289
 msgid "Feeds"
 msgstr ""
 
@@ -353,7 +353,7 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#: prefs.php:130 include/functions.php:1150 include/functions.php:1787
+#: prefs.php:130 include/functions.php:1161 include/functions.php:1798
 #: classes/pref/labels.php:90 plugins/mobile/mobile-functions.php:198
 msgid "Labels"
 msgstr ""
@@ -430,9 +430,9 @@ msgstr ""
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: include/digest.php:109 include/functions.php:1159
-#: include/functions.php:1688 include/functions.php:1773
-#: include/functions.php:1795 classes/opml.php:416 classes/pref/feeds.php:222
+#: include/digest.php:109 include/functions.php:1170
+#: include/functions.php:1699 include/functions.php:1784
+#: include/functions.php:1806 classes/opml.php:416 classes/pref/feeds.php:222
 msgid "Uncategorized"
 msgstr ""
 
@@ -447,308 +447,308 @@ msgstr[1] ""
 msgid "No feeds found."
 msgstr ""
 
-#: include/functions.php:1148 include/functions.php:1785
+#: include/functions.php:1159 include/functions.php:1796
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr ""
 
-#: include/functions.php:1637 classes/feeds.php:1110
+#: include/functions.php:1648 classes/feeds.php:1110
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr ""
 
-#: include/functions.php:1838
+#: include/functions.php:1849
 msgid "Starred articles"
 msgstr ""
 
-#: include/functions.php:1840
+#: include/functions.php:1851
 msgid "Published articles"
 msgstr ""
 
-#: include/functions.php:1842
+#: include/functions.php:1853
 msgid "Fresh articles"
 msgstr ""
 
-#: include/functions.php:1844 include/functions.php:1959
+#: include/functions.php:1855 include/functions.php:1970
 msgid "All articles"
 msgstr ""
 
-#: include/functions.php:1846
+#: include/functions.php:1857
 msgid "Archived articles"
 msgstr ""
 
-#: include/functions.php:1848
+#: include/functions.php:1859
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1911
+#: include/functions.php:1922
 msgid "Navigation"
 msgstr ""
 
-#: include/functions.php:1912
+#: include/functions.php:1923
 msgid "Open next feed"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1924
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1914
+#: include/functions.php:1925
 msgid "Open next article"
 msgstr ""
 
-#: include/functions.php:1915
+#: include/functions.php:1926
 msgid "Open previous article"
 msgstr ""
 
-#: include/functions.php:1916
+#: include/functions.php:1927
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1917
+#: include/functions.php:1928
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1918
+#: include/functions.php:1929
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1919
+#: include/functions.php:1930
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1920
+#: include/functions.php:1931
 msgid "Show search dialog"
 msgstr ""
 
-#: include/functions.php:1921
+#: include/functions.php:1932
 msgid "Article"
 msgstr ""
 
-#: include/functions.php:1922
+#: include/functions.php:1933
 msgid "Toggle starred"
 msgstr ""
 
-#: include/functions.php:1923 js/viewfeed.js:1918
+#: include/functions.php:1934 js/viewfeed.js:1918
 msgid "Toggle published"
 msgstr ""
 
-#: include/functions.php:1924 js/viewfeed.js:1896
+#: include/functions.php:1935 js/viewfeed.js:1896
 msgid "Toggle unread"
 msgstr ""
 
-#: include/functions.php:1925
+#: include/functions.php:1936
 msgid "Edit tags"
 msgstr ""
 
-#: include/functions.php:1926
+#: include/functions.php:1937
 msgid "Dismiss selected"
 msgstr ""
 
-#: include/functions.php:1927
+#: include/functions.php:1938
 msgid "Dismiss read"
 msgstr ""
 
-#: include/functions.php:1928
+#: include/functions.php:1939
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions.php:1929 js/viewfeed.js:1937
+#: include/functions.php:1940 js/viewfeed.js:1937
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1930 js/viewfeed.js:1931
+#: include/functions.php:1941 js/viewfeed.js:1931
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1931
+#: include/functions.php:1942
 msgid "Scroll down"
 msgstr ""
 
-#: include/functions.php:1932
+#: include/functions.php:1943
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1933
+#: include/functions.php:1944
 msgid "Select article under cursor"
 msgstr ""
 
-#: include/functions.php:1934
+#: include/functions.php:1945
 msgid "Email article"
 msgstr ""
 
-#: include/functions.php:1935
+#: include/functions.php:1946
 msgid "Close/collapse article"
 msgstr ""
 
-#: include/functions.php:1936
+#: include/functions.php:1947
 msgid "Toggle article expansion (combined mode)"
 msgstr ""
 
-#: include/functions.php:1938 plugins/embed_original/init.php:33
+#: include/functions.php:1949 plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr ""
 
-#: include/functions.php:1939
+#: include/functions.php:1950
 msgid "Article selection"
 msgstr ""
 
-#: include/functions.php:1940
+#: include/functions.php:1951
 msgid "Select all articles"
 msgstr ""
 
-#: include/functions.php:1941
+#: include/functions.php:1952
 msgid "Select unread"
 msgstr ""
 
-#: include/functions.php:1942
+#: include/functions.php:1953
 msgid "Select starred"
 msgstr ""
 
-#: include/functions.php:1943
+#: include/functions.php:1954
 msgid "Select published"
 msgstr ""
 
-#: include/functions.php:1944
+#: include/functions.php:1955
 msgid "Invert selection"
 msgstr ""
 
-#: include/functions.php:1945
+#: include/functions.php:1956
 msgid "Deselect everything"
 msgstr ""
 
-#: include/functions.php:1946 classes/pref/feeds.php:521
-#: classes/pref/feeds.php:754
+#: include/functions.php:1957 classes/pref/feeds.php:538
+#: classes/pref/feeds.php:771
 msgid "Feed"
 msgstr ""
 
-#: include/functions.php:1947
+#: include/functions.php:1958
 msgid "Refresh current feed"
 msgstr ""
 
-#: include/functions.php:1948
+#: include/functions.php:1959
 msgid "Un/hide read feeds"
 msgstr ""
 
-#: include/functions.php:1949 classes/pref/feeds.php:1275
+#: include/functions.php:1960 classes/pref/feeds.php:1292
 msgid "Subscribe to feed"
 msgstr ""
 
-#: include/functions.php:1950 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1961 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr ""
 
-#: include/functions.php:1952
+#: include/functions.php:1963
 msgid "Reverse headlines"
 msgstr ""
 
-#: include/functions.php:1953
+#: include/functions.php:1964
 msgid "Debug feed update"
 msgstr ""
 
-#: include/functions.php:1954 js/FeedTree.js:178
+#: include/functions.php:1965 js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr ""
 
-#: include/functions.php:1955
+#: include/functions.php:1966
 msgid "Un/collapse current category"
 msgstr ""
 
-#: include/functions.php:1956
+#: include/functions.php:1967
 msgid "Toggle combined mode"
 msgstr ""
 
-#: include/functions.php:1957
+#: include/functions.php:1968
 msgid "Toggle auto expand in combined mode"
 msgstr ""
 
-#: include/functions.php:1958
+#: include/functions.php:1969
 msgid "Go to"
 msgstr ""
 
-#: include/functions.php:1960
+#: include/functions.php:1971
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1963 js/tt-rss.js:447 js/tt-rss.js:606
+#: include/functions.php:1974 js/tt-rss.js:447 js/tt-rss.js:606
 msgid "Tag cloud"
 msgstr ""
 
-#: include/functions.php:1965
+#: include/functions.php:1976
 msgid "Other"
 msgstr ""
 
-#: include/functions.php:1966 classes/pref/labels.php:281
+#: include/functions.php:1977 classes/pref/labels.php:281
 msgid "Create label"
 msgstr ""
 
-#: include/functions.php:1967 classes/pref/filters.php:654
+#: include/functions.php:1978 classes/pref/filters.php:654
 msgid "Create filter"
 msgstr ""
 
-#: include/functions.php:1968
+#: include/functions.php:1979
 msgid "Un/collapse sidebar"
 msgstr ""
 
-#: include/functions.php:1969
+#: include/functions.php:1980
 msgid "Show help dialog"
 msgstr ""
 
-#: include/functions.php:2492
+#: include/functions.php:2503
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2985 js/viewfeed.js:2024
+#: include/functions.php:2996 js/viewfeed.js:2024
 msgid "Click to play"
 msgstr ""
 
-#: include/functions.php:2986 js/viewfeed.js:2023
+#: include/functions.php:2997 js/viewfeed.js:2023
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3104
+#: include/functions.php:3115
 msgid " - "
 msgstr ""
 
-#: include/functions.php:3126 include/functions.php:3426
+#: include/functions.php:3137 include/functions.php:3437
 #: classes/article.php:281
 msgid "no tags"
 msgstr ""
 
-#: include/functions.php:3136 classes/feeds.php:689
+#: include/functions.php:3147 classes/feeds.php:689
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions.php:3170 classes/feeds.php:641
+#: include/functions.php:3181 classes/feeds.php:641
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions.php:3183 classes/feeds.php:654 classes/pref/feeds.php:540
+#: include/functions.php:3194 classes/feeds.php:654 classes/pref/feeds.php:557
 msgid "Feed URL"
 msgstr ""
 
-#: include/functions.php:3215 classes/dlg.php:37 classes/dlg.php:60
+#: include/functions.php:3226 classes/dlg.php:37 classes/dlg.php:60
 #: classes/dlg.php:93 classes/dlg.php:159 classes/dlg.php:190
 #: classes/dlg.php:217 classes/dlg.php:250 classes/dlg.php:262
 #: classes/backend.php:105 classes/pref/users.php:99
 #: classes/pref/filters.php:147 classes/pref/prefs.php:1107
-#: classes/pref/feeds.php:1588 classes/pref/feeds.php:1660
-#: plugins/import_export/init.php:406 plugins/import_export/init.php:429
-#: plugins/googlereaderimport/init.php:173 plugins/share/init.php:67
+#: classes/pref/feeds.php:1605 classes/pref/feeds.php:1677
+#: plugins/import_export/init.php:408 plugins/import_export/init.php:453
+#: plugins/googlereaderimport/init.php:197 plugins/share/init.php:67
 #: plugins/updater/init.php:370
 msgid "Close this window"
 msgstr ""
 
-#: include/functions.php:3451
+#: include/functions.php:3462
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:3686
+#: include/functions.php:3697
 msgid "unknown type"
 msgstr ""
 
-#: include/functions.php:3742
+#: include/functions.php:3753
 msgid "Attachments"
 msgstr ""
 
@@ -807,8 +807,8 @@ msgstr ""
 
 #: classes/article.php:204 classes/pref/users.php:176
 #: classes/pref/labels.php:79 classes/pref/filters.php:405
-#: classes/pref/prefs.php:989 classes/pref/feeds.php:733
-#: classes/pref/feeds.php:881 plugins/nsfw/init.php:86
+#: classes/pref/prefs.php:989 classes/pref/feeds.php:750
+#: classes/pref/feeds.php:898 plugins/nsfw/init.php:86
 #: plugins/note/init.php:53 plugins/instances/init.php:248
 msgid "Save"
 msgstr ""
@@ -819,8 +819,8 @@ msgstr ""
 #: classes/pref/labels.php:81 classes/pref/filters.php:408
 #: classes/pref/filters.php:804 classes/pref/filters.php:880
 #: classes/pref/filters.php:947 classes/pref/prefs.php:991
-#: classes/pref/feeds.php:734 classes/pref/feeds.php:884
-#: classes/pref/feeds.php:1800 plugins/mail/init.php:126
+#: classes/pref/feeds.php:751 classes/pref/feeds.php:901
+#: classes/pref/feeds.php:1817 plugins/mail/init.php:126
 #: plugins/note/init.php:55 plugins/instances/init.php:251
 #: plugins/instances/init.php:440
 msgid "Cancel"
@@ -834,8 +834,8 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: classes/handler/public.php:434 classes/pref/feeds.php:538
-#: classes/pref/feeds.php:769 plugins/instances/init.php:215
+#: classes/handler/public.php:434 classes/pref/feeds.php:555
+#: classes/pref/feeds.php:786 plugins/instances/init.php:215
 #: plugins/instances/init.php:405
 msgid "URL:"
 msgstr ""
@@ -1027,7 +1027,7 @@ msgstr ""
 msgid "View as RSS feed"
 msgstr ""
 
-#: classes/feeds.php:84 classes/feeds.php:138 classes/pref/feeds.php:1440
+#: classes/feeds.php:84 classes/feeds.php:138 classes/pref/feeds.php:1457
 msgid "View as RSS"
 msgstr ""
 
@@ -1039,8 +1039,8 @@ msgstr ""
 #: classes/pref/filters.php:282 classes/pref/filters.php:330
 #: classes/pref/filters.php:648 classes/pref/filters.php:737
 #: classes/pref/filters.php:764 classes/pref/prefs.php:1003
-#: classes/pref/feeds.php:1266 classes/pref/feeds.php:1536
-#: classes/pref/feeds.php:1606 plugins/instances/init.php:290
+#: classes/pref/feeds.php:1283 classes/pref/feeds.php:1553
+#: classes/pref/feeds.php:1623 plugins/instances/init.php:290
 msgid "All"
 msgstr ""
 
@@ -1052,8 +1052,8 @@ msgstr ""
 #: classes/pref/filters.php:284 classes/pref/filters.php:332
 #: classes/pref/filters.php:650 classes/pref/filters.php:739
 #: classes/pref/filters.php:766 classes/pref/prefs.php:1005
-#: classes/pref/feeds.php:1268 classes/pref/feeds.php:1538
-#: classes/pref/feeds.php:1608 plugins/instances/init.php:292
+#: classes/pref/feeds.php:1285 classes/pref/feeds.php:1555
+#: classes/pref/feeds.php:1625 plugins/instances/init.php:292
 msgid "None"
 msgstr ""
 
@@ -1153,8 +1153,8 @@ msgstr ""
 msgid "Feed or site URL"
 msgstr ""
 
-#: classes/feeds.php:989 classes/pref/feeds.php:560 classes/pref/feeds.php:782
-#: classes/pref/feeds.php:1764
+#: classes/feeds.php:989 classes/pref/feeds.php:577 classes/pref/feeds.php:799
+#: classes/pref/feeds.php:1781
 msgid "Place in category:"
 msgstr ""
 
@@ -1163,19 +1163,19 @@ msgid "Available feeds"
 msgstr ""
 
 #: classes/feeds.php:1009 classes/pref/users.php:139
-#: classes/pref/feeds.php:590 classes/pref/feeds.php:818
+#: classes/pref/feeds.php:607 classes/pref/feeds.php:835
 msgid "Authentication"
 msgstr ""
 
 #: classes/feeds.php:1013 classes/pref/users.php:402
-#: classes/pref/feeds.php:596 classes/pref/feeds.php:822
-#: classes/pref/feeds.php:1778
+#: classes/pref/feeds.php:613 classes/pref/feeds.php:839
+#: classes/pref/feeds.php:1795
 msgid "Login"
 msgstr ""
 
 #: classes/feeds.php:1016 classes/pref/prefs.php:271
-#: classes/pref/feeds.php:602 classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1781
+#: classes/pref/feeds.php:619 classes/pref/feeds.php:845
+#: classes/pref/feeds.php:1798
 msgid "Password"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "This feed requires authentication."
 msgstr ""
 
-#: classes/feeds.php:1031 classes/feeds.php:1087 classes/pref/feeds.php:1799
+#: classes/feeds.php:1031 classes/feeds.php:1087 classes/pref/feeds.php:1816
 msgid "Subscribe"
 msgstr ""
 
@@ -1192,7 +1192,7 @@ msgid "More feeds"
 msgstr ""
 
 #: classes/feeds.php:1057 classes/feeds.php:1148 classes/pref/users.php:332
-#: classes/pref/filters.php:641 classes/pref/feeds.php:1259 js/tt-rss.js:170
+#: classes/pref/filters.php:641 classes/pref/feeds.php:1276 js/tt-rss.js:170
 msgid "Search"
 msgstr ""
 
@@ -1210,7 +1210,7 @@ msgstr ""
 
 #: classes/feeds.php:1088 classes/pref/users.php:358
 #: classes/pref/labels.php:284 classes/pref/filters.php:398
-#: classes/pref/filters.php:667 classes/pref/feeds.php:707
+#: classes/pref/filters.php:667 classes/pref/feeds.php:724
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr ""
@@ -1293,11 +1293,27 @@ msgstr ""
 msgid "Processing category: %s"
 msgstr ""
 
-#: classes/opml.php:468
+#: classes/opml.php:465 plugins/import_export/init.php:421
+#: plugins/googlereaderimport/init.php:70
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:479 plugins/import_export/init.php:435
+#: plugins/googlereaderimport/init.php:84
+msgid "Unable to move uploaded file."
+msgstr ""
+
+#: classes/opml.php:483 plugins/import_export/init.php:439
+#: plugins/googlereaderimport/init.php:88
 msgid "Error: please upload OPML file."
 msgstr ""
 
-#: classes/opml.php:475 plugins/googlereaderimport/init.php:166
+#: classes/opml.php:492
+msgid "Error: unable to find moved OPML file."
+msgstr ""
+
+#: classes/opml.php:499 plugins/googlereaderimport/init.php:190
 msgid "Error while parsing document."
 msgstr ""
 
@@ -1333,8 +1349,8 @@ msgstr ""
 msgid "Change password to"
 msgstr ""
 
-#: classes/pref/users.php:161 classes/pref/feeds.php:610
-#: classes/pref/feeds.php:834
+#: classes/pref/users.php:161 classes/pref/feeds.php:627
+#: classes/pref/feeds.php:851
 msgid "Options"
 msgstr ""
 
@@ -1375,8 +1391,8 @@ msgstr ""
 #: classes/pref/filters.php:279 classes/pref/filters.php:327
 #: classes/pref/filters.php:645 classes/pref/filters.php:734
 #: classes/pref/filters.php:761 classes/pref/prefs.php:1000
-#: classes/pref/feeds.php:1263 classes/pref/feeds.php:1533
-#: classes/pref/feeds.php:1603 plugins/instances/init.php:287
+#: classes/pref/feeds.php:1280 classes/pref/feeds.php:1550
+#: classes/pref/feeds.php:1620 plugins/instances/init.php:287
 msgid "Select"
 msgstr ""
 
@@ -1496,12 +1512,12 @@ msgstr ""
 msgid "Combine"
 msgstr ""
 
-#: classes/pref/filters.php:663 classes/pref/feeds.php:1279
-#: classes/pref/feeds.php:1293
+#: classes/pref/filters.php:663 classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1310
 msgid "Reset sort order"
 msgstr ""
 
-#: classes/pref/filters.php:671 classes/pref/feeds.php:1318
+#: classes/pref/filters.php:671 classes/pref/feeds.php:1335
 msgid "Rescore articles"
 msgstr ""
 
@@ -2004,237 +2020,237 @@ msgstr ""
 msgid "Check to enable field"
 msgstr ""
 
-#: classes/pref/feeds.php:527
+#: classes/pref/feeds.php:544
 msgid "Feed Title"
 msgstr ""
 
-#: classes/pref/feeds.php:568 classes/pref/feeds.php:793
+#: classes/pref/feeds.php:585 classes/pref/feeds.php:810
 msgid "Update"
 msgstr ""
 
-#: classes/pref/feeds.php:583 classes/pref/feeds.php:809
+#: classes/pref/feeds.php:600 classes/pref/feeds.php:826
 msgid "Article purging:"
 msgstr ""
 
-#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:623
 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:622 classes/pref/feeds.php:838
+#: classes/pref/feeds.php:639 classes/pref/feeds.php:855
 msgid "Hide from Popular feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:634 classes/pref/feeds.php:844
+#: classes/pref/feeds.php:651 classes/pref/feeds.php:861
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: classes/pref/feeds.php:647 classes/pref/feeds.php:850
+#: classes/pref/feeds.php:664 classes/pref/feeds.php:867
 msgid "Always display image attachments"
 msgstr ""
 
-#: classes/pref/feeds.php:660 classes/pref/feeds.php:858
+#: classes/pref/feeds.php:677 classes/pref/feeds.php:875
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:673 classes/pref/feeds.php:866
+#: classes/pref/feeds.php:690 classes/pref/feeds.php:883
 msgid "Cache images locally"
 msgstr ""
 
-#: classes/pref/feeds.php:685 classes/pref/feeds.php:872
+#: classes/pref/feeds.php:702 classes/pref/feeds.php:889
 msgid "Mark updated articles as unread"
 msgstr ""
 
-#: classes/pref/feeds.php:691
+#: classes/pref/feeds.php:708
 msgid "Icon"
 msgstr ""
 
-#: classes/pref/feeds.php:705
+#: classes/pref/feeds.php:722
 msgid "Replace"
 msgstr ""
 
-#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:741
 msgid "Resubscribe to push updates"
 msgstr ""
 
-#: classes/pref/feeds.php:731
+#: classes/pref/feeds.php:748
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1112 classes/pref/feeds.php:1165
+#: classes/pref/feeds.php:1129 classes/pref/feeds.php:1182
 msgid "All done."
 msgstr ""
 
-#: classes/pref/feeds.php:1220
+#: classes/pref/feeds.php:1237
 msgid "Feeds with errors"
 msgstr ""
 
-#: classes/pref/feeds.php:1240
+#: classes/pref/feeds.php:1257
 msgid "Inactive feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1277
+#: classes/pref/feeds.php:1294
 msgid "Edit selected feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1281 js/prefs.js:1765
+#: classes/pref/feeds.php:1298 js/prefs.js:1765
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1305
 msgid "Categories"
 msgstr ""
 
-#: classes/pref/feeds.php:1291
+#: classes/pref/feeds.php:1308
 msgid "Add category"
 msgstr ""
 
-#: classes/pref/feeds.php:1295
+#: classes/pref/feeds.php:1312
 msgid "Remove selected"
 msgstr ""
 
-#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1321
 msgid "(Un)hide empty categories"
 msgstr ""
 
-#: classes/pref/feeds.php:1309
+#: classes/pref/feeds.php:1326
 msgid "More actions..."
 msgstr ""
 
-#: classes/pref/feeds.php:1313
+#: classes/pref/feeds.php:1330
 msgid "Manual purge"
 msgstr ""
 
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1334
 msgid "Clear feed data"
 msgstr ""
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1385
 msgid "OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1387
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1389
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1402
 msgid "Import my OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1389
+#: classes/pref/feeds.php:1406
 msgid "Filename:"
 msgstr ""
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1408
 msgid "Include settings"
 msgstr ""
 
-#: classes/pref/feeds.php:1395
+#: classes/pref/feeds.php:1412
 msgid "Export OPML"
 msgstr ""
 
-#: classes/pref/feeds.php:1399
+#: classes/pref/feeds.php:1416
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: classes/pref/feeds.php:1401
+#: classes/pref/feeds.php:1418
 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:1403
+#: classes/pref/feeds.php:1420
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1421
 msgid "Display published OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1431
 msgid "Firefox integration"
 msgstr ""
 
-#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1433
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: classes/pref/feeds.php:1423
+#: classes/pref/feeds.php:1440
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: classes/pref/feeds.php:1431
+#: classes/pref/feeds.php:1448
 msgid "Published & shared articles / Generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1433
+#: classes/pref/feeds.php:1450
 msgid "Published articles and generated feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1435
+#: classes/pref/feeds.php:1452
 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:1441
+#: classes/pref/feeds.php:1458
 msgid "Display URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1461
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1463
 msgid "Articles shared by URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1448
+#: classes/pref/feeds.php:1465
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: classes/pref/feeds.php:1451
+#: classes/pref/feeds.php:1468
 msgid "Unshare all articles"
 msgstr ""
 
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1546
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr ""
 
-#: classes/pref/feeds.php:1566 classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1583 classes/pref/feeds.php:1653
 msgid "Click to edit feed"
 msgstr ""
 
-#: classes/pref/feeds.php:1584 classes/pref/feeds.php:1656
+#: classes/pref/feeds.php:1601 classes/pref/feeds.php:1673
 msgid "Unsubscribe from selected feeds"
 msgstr ""
 
-#: classes/pref/feeds.php:1595
+#: classes/pref/feeds.php:1612
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
-#: classes/pref/feeds.php:1761
+#: classes/pref/feeds.php:1778
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1770
+#: classes/pref/feeds.php:1787
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1792
+#: classes/pref/feeds.php:1809
 msgid "Feeds require authentication."
 msgstr ""
 
@@ -2404,52 +2420,49 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-#: plugins/import_export/init.php:218
+#: plugins/import_export/init.php:220
 msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: plugins/import_export/init.php:223
+#: plugins/import_export/init.php:225
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: plugins/import_export/init.php:382
+#: plugins/import_export/init.php:384
 msgid "Finished: "
 msgstr ""
 
-#: plugins/import_export/init.php:383
+#: plugins/import_export/init.php:385
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/import_export/init.php:384
+#: plugins/import_export/init.php:386
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/import_export/init.php:385
+#: plugins/import_export/init.php:387
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/import_export/init.php:390
+#: plugins/import_export/init.php:392
 msgid "Could not load XML document."
 msgstr ""
 
-#: plugins/import_export/init.php:402
+#: plugins/import_export/init.php:404
 msgid "Prepare data"
 msgstr ""
 
-#: plugins/import_export/init.php:423
-#, php-format
-msgid ""
-"Could not upload file. You might need to adjust upload_max_filesize in PHP."
-"ini (current value = %s)"
+#: plugins/import_export/init.php:447 plugins/googlereaderimport/init.php:96
+msgid "No file uploaded."
 msgstr ""
 
 #: plugins/mail/init.php:87
@@ -2484,28 +2497,24 @@ msgstr ""
 msgid "Set value"
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:72
-msgid "No file uploaded."
-msgstr ""
-
-#: plugins/googlereaderimport/init.php:158
+#: plugins/googlereaderimport/init.php:182
 #, php-format
 msgid "All done. %d out of %d articles imported."
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:162
+#: plugins/googlereaderimport/init.php:186
 msgid "The document has incorrect format."
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:333
+#: plugins/googlereaderimport/init.php:357
 msgid "Import starred or shared items from Google Reader"
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:337
+#: plugins/googlereaderimport/init.php:361
 msgid "Paste your starred.json or shared.json into the form below."
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:351
+#: plugins/googlereaderimport/init.php:375
 msgid "Import my Starred items"
 msgstr ""