rebase translations

2 files changed, 277 insertions, 256 deletions

diff --git a/locale/sv_SE/LC_MESSAGES/messages.mo b/locale/sv_SE/LC_MESSAGES/messages.mo
index fbad313e9..6e7e9ea04 100644
--- a/locale/sv_SE/LC_MESSAGES/messages.mo
+++ b/locale/sv_SE/LC_MESSAGES/messages.mo
diff --git a/locale/sv_SE/LC_MESSAGES/messages.po b/locale/sv_SE/LC_MESSAGES/messages.po
index 581068bca..3161a5387 100644
--- a/locale/sv_SE/LC_MESSAGES/messages.po
+++ b/locale/sv_SE/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\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: 2013-03-20 16:42+0100\n"
 "Last-Translator: wahlis\n"
 "Language-Team: \n"
@@ -22,88 +22,88 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Poedit-Language: Swedish\n"
 
-#: backend.php:69
+#: backend.php:74
 msgid "Use default"
 msgstr "Standardvärden"
 
-#: backend.php:70
+#: backend.php:75
 msgid "Never purge"
 msgstr "Radera aldrig"
 
-#: backend.php:71
+#: backend.php:76
 msgid "1 week old"
 msgstr "1 vecka"
 
-#: backend.php:72
+#: backend.php:77
 msgid "2 weeks old"
 msgstr "2 veckor"
 
-#: backend.php:73
+#: backend.php:78
 msgid "1 month old"
 msgstr "1 månad"
 
-#: backend.php:74
+#: backend.php:79
 msgid "2 months old"
 msgstr "2 månader"
 
-#: backend.php:75
+#: backend.php:80
 msgid "3 months old"
 msgstr "3 månader"
 
-#: backend.php:78
+#: backend.php:83
 msgid "Default interval"
 msgstr "Standardintervall"
 
-#: backend.php:79
-#: backend.php:89
+#: backend.php:84
+#: backend.php:94
 msgid "Disable updates"
 msgstr "Inaktivera uppdateringar"
 
-#: backend.php:80
-#: backend.php:90
+#: backend.php:85
+#: backend.php:95
 msgid "Each 15 minutes"
 msgstr "Varje kvart"
 
-#: backend.php:81
-#: backend.php:91
+#: backend.php:86
+#: backend.php:96
 msgid "Each 30 minutes"
 msgstr "Varje halvtimme"
 
-#: backend.php:82
-#: backend.php:92
+#: backend.php:87
+#: backend.php:97
 msgid "Hourly"
 msgstr "Varje timme"
 
-#: backend.php:83
-#: backend.php:93
+#: backend.php:88
+#: backend.php:98
 msgid "Each 4 hours"
 msgstr "Var 4:e timme"
 
-#: backend.php:84
-#: backend.php:94
+#: backend.php:89
+#: backend.php:99
 msgid "Each 12 hours"
 msgstr "Var 12:e timme"
 
-#: backend.php:85
-#: backend.php:95
+#: backend.php:90
+#: backend.php:100
 msgid "Daily"
 msgstr "Dagligen"
 
-#: backend.php:86
-#: backend.php:96
+#: backend.php:91
+#: backend.php:101
 msgid "Weekly"
 msgstr "Veckovis"
 
-#: backend.php:99
+#: backend.php:104
 #: classes/pref/users.php:123
 msgid "User"
 msgstr "Användare"
 
-#: backend.php:100
+#: backend.php:105
 msgid "Power User"
 msgstr "Superanvändare"
 
-#: backend.php:101
+#: backend.php:106
 msgid "Administrator"
 msgstr "Administratör"
 
@@ -166,7 +166,7 @@ msgstr "SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PH
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1348
 #: plugins/digest/digest_body.php:63
 #: js/feedlist.js:128
 #: js/feedlist.js:438
@@ -214,13 +214,13 @@ msgid "All Articles"
 msgstr "Alla artiklar"
 
 #: index.php:174
-#: include/functions.php:1961
+#: include/functions.php:1972
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Stjärnmärkta"
 
 #: index.php:175
-#: include/functions.php:1962
+#: include/functions.php:1973
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Publicerade"
@@ -266,7 +266,7 @@ msgstr "Titel"
 
 #: index.php:192
 #: index.php:241
-#: include/functions.php:1951
+#: include/functions.php:1962
 #: classes/feeds.php:111
 #: classes/feeds.php:440
 #: js/FeedTree.js:128
@@ -325,8 +325,8 @@ msgid "Rescore feed"
 msgstr "Beräkna kanalens poäng på nytt"
 
 #: index.php:239
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:1283
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:1300
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Avbeställ kanalen"
@@ -352,7 +352,7 @@ msgid "Show tag cloud..."
 msgstr "Visa taggmoln..."
 
 #: index.php:248
-#: include/functions.php:1937
+#: include/functions.php:1948
 msgid "Toggle widescreen mode"
 msgstr "Växla widescreenläge"
 
@@ -381,7 +381,7 @@ msgstr "Utloggning"
 
 #: prefs.php:36
 #: prefs.php:121
-#: include/functions.php:1964
+#: include/functions.php:1975
 #: classes/pref/prefs.php:446
 msgid "Preferences"
 msgstr "Inställningar"
@@ -396,8 +396,8 @@ msgstr "Lämna inställningarna"
 
 #: prefs.php:124
 #: classes/pref/feeds.php:107
-#: classes/pref/feeds.php:1209
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1226
+#: classes/pref/feeds.php:1289
 msgid "Feeds"
 msgstr "Kanaler"
 
@@ -407,8 +407,8 @@ msgid "Filters"
 msgstr "Filter"
 
 #: prefs.php:130
-#: include/functions.php:1150
-#: include/functions.php:1787
+#: include/functions.php:1161
+#: include/functions.php:1798
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
@@ -496,10 +496,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Skript för att uppdatera Tiny Tiny RSS."
 
 #: include/digest.php:109
-#: include/functions.php:1159
-#: include/functions.php:1688
-#: include/functions.php:1773
-#: include/functions.php:1795
+#: 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"
@@ -516,322 +516,322 @@ msgstr[1] "%d arkiverade artiklar"
 msgid "No feeds found."
 msgstr "Inga kanaler funna."
 
-#: 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 "Specialkanaler"
 
-#: include/functions.php:1637
+#: include/functions.php:1648
 #: classes/feeds.php:1110
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Alla kanaler"
 
-#: include/functions.php:1838
+#: include/functions.php:1849
 msgid "Starred articles"
 msgstr "Stjärnmärkta artiklar"
 
-#: include/functions.php:1840
+#: include/functions.php:1851
 msgid "Published articles"
 msgstr "Publicerade artiklar"
 
-#: include/functions.php:1842
+#: include/functions.php:1853
 msgid "Fresh articles"
 msgstr "Nya artiklar"
 
-#: include/functions.php:1844
-#: include/functions.php:1959
+#: include/functions.php:1855
+#: include/functions.php:1970
 msgid "All articles"
 msgstr "Alla artiklar"
 
-#: include/functions.php:1846
+#: include/functions.php:1857
 msgid "Archived articles"
 msgstr "Arkiverade artiklar"
 
-#: include/functions.php:1848
+#: include/functions.php:1859
 msgid "Recently read"
 msgstr "Nyligen lästa"
 
-#: include/functions.php:1911
+#: include/functions.php:1922
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions.php:1912
+#: include/functions.php:1923
 msgid "Open next feed"
 msgstr "Öppna nästa kanal"
 
-#: include/functions.php:1913
+#: include/functions.php:1924
 msgid "Open previous feed"
 msgstr "Öppna föregående kanal"
 
-#: include/functions.php:1914
+#: include/functions.php:1925
 msgid "Open next article"
 msgstr "Öppna näst artikel"
 
-#: include/functions.php:1915
+#: include/functions.php:1926
 msgid "Open previous article"
 msgstr "Öppna föregående artikel"
 
-#: include/functions.php:1916
+#: include/functions.php:1927
 msgid "Open next article (don't scroll long articles)"
 msgstr "Öppna nästa artikel (skrolla inte långa artiklar)"
 
-#: include/functions.php:1917
+#: include/functions.php:1928
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Öppna föregående artikel (skrolla inte långa artiklar)"
 
-#: include/functions.php:1918
+#: include/functions.php:1929
 #, fuzzy
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Öppna nästa artikel (skrolla inte långa artiklar)"
 
-#: include/functions.php:1919
+#: include/functions.php:1930
 #, fuzzy
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Öppna föregående artikel (skrolla inte långa artiklar)"
 
-#: include/functions.php:1920
+#: include/functions.php:1931
 msgid "Show search dialog"
 msgstr "Visa sökdialogen"
 
-#: include/functions.php:1921
+#: include/functions.php:1932
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions.php:1922
+#: include/functions.php:1933
 msgid "Toggle starred"
 msgstr "Växla stjärnmarkering"
 
-#: include/functions.php:1923
+#: include/functions.php:1934
 #: js/viewfeed.js:1918
 msgid "Toggle published"
 msgstr "Växla publicering"
 
-#: include/functions.php:1924
+#: include/functions.php:1935
 #: js/viewfeed.js:1896
 msgid "Toggle unread"
 msgstr "Växla olästa"
 
-#: include/functions.php:1925
+#: include/functions.php:1936
 msgid "Edit tags"
 msgstr "Redigera taggar"
 
-#: include/functions.php:1926
+#: include/functions.php:1937
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "Avvisa markerade"
 
-#: include/functions.php:1927
+#: include/functions.php:1938
 #, fuzzy
 msgid "Dismiss read"
 msgstr "Avvisa lästa"
 
-#: include/functions.php:1928
+#: include/functions.php:1939
 msgid "Open in new window"
 msgstr "Öppna i nytt fönster"
 
-#: include/functions.php:1929
+#: include/functions.php:1940
 #: js/viewfeed.js:1937
 msgid "Mark below as read"
 msgstr "Märk nedanstående som lästa"
 
-#: include/functions.php:1930
+#: include/functions.php:1941
 #: js/viewfeed.js:1931
 msgid "Mark above as read"
 msgstr "Märk ovanstående som lästa"
 
-#: include/functions.php:1931
+#: include/functions.php:1942
 msgid "Scroll down"
 msgstr "Skrolla ned"
 
-#: include/functions.php:1932
+#: include/functions.php:1943
 msgid "Scroll up"
 msgstr "Skrolla upp"
 
-#: include/functions.php:1933
+#: include/functions.php:1944
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "Välj markerad artikel"
 
-#: include/functions.php:1934
+#: include/functions.php:1945
 msgid "Email article"
 msgstr "Skicka artikel med e-post"
 
-#: include/functions.php:1935
+#: include/functions.php:1946
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "Stäng artikel"
 
-#: include/functions.php:1936
+#: include/functions.php:1947
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Växla komboläge"
 
-#: include/functions.php:1938
+#: include/functions.php:1949
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "Växla visa orginal"
 
-#: include/functions.php:1939
+#: include/functions.php:1950
 msgid "Article selection"
 msgstr "Artikelval"
 
-#: include/functions.php:1940
+#: include/functions.php:1951
 msgid "Select all articles"
 msgstr "Välj alla"
 
-#: include/functions.php:1941
+#: include/functions.php:1952
 msgid "Select unread"
 msgstr "Välj olästa"
 
-#: include/functions.php:1942
+#: include/functions.php:1953
 msgid "Select starred"
 msgstr "Välj markerade"
 
-#: include/functions.php:1943
+#: include/functions.php:1954
 msgid "Select published"
 msgstr "Välj publicerade"
 
-#: include/functions.php:1944
+#: include/functions.php:1955
 msgid "Invert selection"
 msgstr "Invertera val"
 
-#: include/functions.php:1945
+#: include/functions.php:1956
 msgid "Deselect everything"
 msgstr "Avmarkera allt"
 
-#: 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 "Kanal"
 
-#: include/functions.php:1947
+#: include/functions.php:1958
 msgid "Refresh current feed"
 msgstr "Uppdatera aktuell kanal"
 
-#: include/functions.php:1948
+#: include/functions.php:1959
 msgid "Un/hide read feeds"
 msgstr "Växla visning av lästa kanaler"
 
-#: include/functions.php:1949
-#: classes/pref/feeds.php:1275
+#: include/functions.php:1960
+#: classes/pref/feeds.php:1292
 msgid "Subscribe to feed"
 msgstr "Prenumerera på kanal"
 
-#: include/functions.php:1950
+#: include/functions.php:1961
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Redigera kanal"
 
-#: include/functions.php:1952
+#: include/functions.php:1963
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "Omvänd sortering på rubrik"
 
-#: include/functions.php:1953
+#: include/functions.php:1964
 msgid "Debug feed update"
 msgstr "Debugga kanaluppdatering"
 
-#: include/functions.php:1954
+#: include/functions.php:1965
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Märk alla kanaler som lästa"
 
-#: include/functions.php:1955
+#: include/functions.php:1966
 msgid "Un/collapse current category"
 msgstr "Öppna/stäng aktuell kategori:"
 
-#: include/functions.php:1956
+#: include/functions.php:1967
 msgid "Toggle combined mode"
 msgstr "Växla komboläge"
 
-#: include/functions.php:1957
+#: include/functions.php:1968
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "Växla komboläge"
 
-#: include/functions.php:1958
+#: include/functions.php:1969
 msgid "Go to"
 msgstr "Gå till"
 
-#: include/functions.php:1960
+#: include/functions.php:1971
 msgid "Fresh"
 msgstr "Nya"
 
-#: include/functions.php:1963
+#: include/functions.php:1974
 #: js/tt-rss.js:447
 #: js/tt-rss.js:606
 msgid "Tag cloud"
 msgstr "Taggmoln"
 
-#: include/functions.php:1965
+#: include/functions.php:1976
 msgid "Other"
 msgstr "Övriga"
 
-#: include/functions.php:1966
+#: include/functions.php:1977
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Skapa etikett"
 
-#: include/functions.php:1967
+#: include/functions.php:1978
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Skapa filter"
 
-#: include/functions.php:1968
+#: include/functions.php:1979
 msgid "Un/collapse sidebar"
 msgstr "Växla sidomeny"
 
-#: include/functions.php:1969
+#: include/functions.php:1980
 msgid "Show help dialog"
 msgstr "Hjälpfönster"
 
-#: include/functions.php:2492
+#: include/functions.php:2503
 #, php-format
 msgid "Search results: %s"
 msgstr "Sökresultat: %s"
 
-#: include/functions.php:2985
+#: include/functions.php:2996
 #: js/viewfeed.js:2024
 msgid "Click to play"
 msgstr "Klicka för att starta"
 
-#: include/functions.php:2986
+#: include/functions.php:2997
 #: js/viewfeed.js:2023
 msgid "Play"
 msgstr "Start"
 
-#: 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 "Inga taggar"
 
-#: include/functions.php:3136
+#: include/functions.php:3147
 #: classes/feeds.php:689
 msgid "Edit tags for this article"
 msgstr "Redigera taggar för denna artikel"
 
-#: include/functions.php:3170
+#: include/functions.php:3181
 #: classes/feeds.php:641
 msgid "Originally from:"
 msgstr "Ursprungligen från:"
 
-#: include/functions.php:3183
+#: include/functions.php:3194
 #: classes/feeds.php:654
-#: classes/pref/feeds.php:540
+#: classes/pref/feeds.php:557
 msgid "Feed URL"
 msgstr "Kanal-URL"
 
-#: include/functions.php:3215
+#: include/functions.php:3226
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
@@ -844,25 +844,25 @@ msgstr "Kanal-URL"
 #: 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
+#: 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 "Stäng fönstret"
 
-#: include/functions.php:3451
+#: include/functions.php:3462
 msgid "(edit note)"
 msgstr "(Redigera notering)"
 
-#: include/functions.php:3686
+#: include/functions.php:3697
 msgid "unknown type"
 msgstr "Okänd typ"
 
-#: include/functions.php:3742
+#: include/functions.php:3753
 msgid "Attachments"
 msgstr "Bilagor"
 
@@ -932,8 +932,8 @@ msgstr "Taggar för denna artikel (kommaseparerade):"
 #: 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
+#: 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
@@ -953,9 +953,9 @@ msgstr "Spara"
 #: 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
+#: 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
@@ -973,8 +973,8 @@ msgid "Title:"
 msgstr "Titel:"
 
 #: classes/handler/public.php:434
-#: classes/pref/feeds.php:538
-#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:555
+#: classes/pref/feeds.php:786
 #: plugins/instances/init.php:215
 #: plugins/instances/init.php:405
 msgid "URL:"
@@ -1173,7 +1173,7 @@ msgstr "Visa RSS-kanal"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1457
 msgid "View as RSS"
 msgstr "Visa som RSS"
 
@@ -1190,9 +1190,9 @@ msgstr "Markera:"
 #: 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
+#: classes/pref/feeds.php:1283
+#: classes/pref/feeds.php:1553
+#: classes/pref/feeds.php:1623
 #: plugins/instances/init.php:290
 msgid "All"
 msgstr "Alla"
@@ -1210,9 +1210,9 @@ msgstr "Invertera"
 #: 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
+#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1555
+#: classes/pref/feeds.php:1625
 #: plugins/instances/init.php:292
 msgid "None"
 msgstr "Ingen"
@@ -1320,9 +1320,9 @@ msgid "Feed or site URL"
 msgstr "URL för kanal eller webbplats"
 
 #: classes/feeds.php:989
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:782
-#: classes/pref/feeds.php:1764
+#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:799
+#: classes/pref/feeds.php:1781
 msgid "Place in category:"
 msgstr "Lägg i kategori:"
 
@@ -1332,24 +1332,24 @@ msgstr "Tillgängliga kanaler"
 
 #: 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 "Autenticering"
 
 #: 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 "Användarnamn"
 
 #: 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 "Lösenord"
 
@@ -1359,7 +1359,7 @@ msgstr "Denna kanal kräver autenticering."
 
 #: classes/feeds.php:1031
 #: classes/feeds.php:1087
-#: classes/pref/feeds.php:1799
+#: classes/pref/feeds.php:1816
 msgid "Subscribe"
 msgstr "Prenumerera"
 
@@ -1371,7 +1371,7 @@ msgstr "Fler kanaler"
 #: classes/feeds.php:1148
 #: classes/pref/users.php:332
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1259
+#: classes/pref/feeds.php:1276
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Sök"
@@ -1393,7 +1393,7 @@ msgstr "Gräns:"
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:707
+#: classes/pref/feeds.php:724
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Ta bort"
@@ -1477,12 +1477,33 @@ msgstr "Lägger till filter..."
 msgid "Processing category: %s"
 msgstr "Bearbetar kategori: %s"
 
-#: 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
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "Fel: kunde inte ladda artikel."
+
+#: classes/opml.php:483
+#: plugins/import_export/init.php:439
+#: plugins/googlereaderimport/init.php:88
 msgid "Error: please upload OPML file."
 msgstr "Fel: vänligen ladda upp en OPMLfil."
 
-#: classes/opml.php:475
-#: plugins/googlereaderimport/init.php:166
+#: classes/opml.php:492
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "Fel: kunde inte ladda artikel."
+
+#: classes/opml.php:499
+#: plugins/googlereaderimport/init.php:190
 msgid "Error while parsing document."
 msgstr "Fel i tolkning av dokument."
 
@@ -1521,8 +1542,8 @@ msgid "Change password to"
 msgstr "Nytt lösenord"
 
 #: classes/pref/users.php:161
-#: classes/pref/feeds.php:610
-#: classes/pref/feeds.php:834
+#: classes/pref/feeds.php:627
+#: classes/pref/feeds.php:851
 msgid "Options"
 msgstr "Alternativ"
 
@@ -1567,9 +1588,9 @@ msgstr "[tt-rss] Info: Nytt lösenord"
 #: 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
+#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1550
+#: classes/pref/feeds.php:1620
 #: plugins/instances/init.php:287
 msgid "Select"
 msgstr "Markera"
@@ -1702,13 +1723,13 @@ msgid "Combine"
 msgstr "Kombinera"
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1279
-#: classes/pref/feeds.php:1293
+#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1310
 msgid "Reset sort order"
 msgstr "Återställ sorteringsordningen"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1335
 msgid "Rescore articles"
 msgstr "Poängsätt på nytt"
 
@@ -2213,235 +2234,235 @@ msgstr "Aktivera profil"
 msgid "Check to enable field"
 msgstr "Markera för att aktivera"
 
-#: classes/pref/feeds.php:527
+#: classes/pref/feeds.php:544
 msgid "Feed Title"
 msgstr "Kanalens titel"
 
-#: classes/pref/feeds.php:568
-#: classes/pref/feeds.php:793
+#: classes/pref/feeds.php:585
+#: classes/pref/feeds.php:810
 msgid "Update"
 msgstr "Uppdatera"
 
-#: classes/pref/feeds.php:583
-#: classes/pref/feeds.php:809
+#: classes/pref/feeds.php:600
+#: classes/pref/feeds.php:826
 msgid "Article purging:"
 msgstr "Artikelrensning:"
 
-#: 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 "<b>Tips:</b> du måste ange din inloggningsinformation till din kanal kräver autenticering (gäller ej Twitter-kanaler)."
 
-#: 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 "Dölj från populära kanaler"
 
-#: 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 "Inkludera i e-postsammanfattningen"
 
-#: 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 "Visa alltid bilder"
 
-#: 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 "Bädda inte in bilder"
 
-#: 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 "Cachea bilder lokalt"
 
-#: 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 "Flagga uppdaterade artiklar som olästa"
 
-#: classes/pref/feeds.php:691
+#: classes/pref/feeds.php:708
 msgid "Icon"
 msgstr "Ikon"
 
-#: classes/pref/feeds.php:705
+#: classes/pref/feeds.php:722
 msgid "Replace"
 msgstr "Ersätt"
 
-#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:741
 msgid "Resubscribe to push updates"
 msgstr "Återprenumerera på push-uppdateringar:"
 
-#: classes/pref/feeds.php:731
+#: classes/pref/feeds.php:748
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Återställ PubSubHubbub-prenumerationer för push-uppdaterade feeds."
 
-#: classes/pref/feeds.php:1112
-#: classes/pref/feeds.php:1165
+#: classes/pref/feeds.php:1129
+#: classes/pref/feeds.php:1182
 msgid "All done."
 msgstr "Klar."
 
-#: classes/pref/feeds.php:1220
+#: classes/pref/feeds.php:1237
 msgid "Feeds with errors"
 msgstr "Kanaler med fel"
 
-#: classes/pref/feeds.php:1240
+#: classes/pref/feeds.php:1257
 msgid "Inactive feeds"
 msgstr "Inaktiva kanaler"
 
-#: classes/pref/feeds.php:1277
+#: classes/pref/feeds.php:1294
 msgid "Edit selected feeds"
 msgstr "Redigera valda kanaler"
 
-#: classes/pref/feeds.php:1281
+#: classes/pref/feeds.php:1298
 #: js/prefs.js:1765
 msgid "Batch subscribe"
 msgstr "Massprenumerera"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1305
 msgid "Categories"
 msgstr "Kategorier"
 
-#: classes/pref/feeds.php:1291
+#: classes/pref/feeds.php:1308
 msgid "Add category"
 msgstr "Lägg till kategorier"
 
-#: classes/pref/feeds.php:1295
+#: classes/pref/feeds.php:1312
 msgid "Remove selected"
 msgstr "Ta bort valda kategorier"
 
-#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1321
 msgid "(Un)hide empty categories"
 msgstr "Växla visning av tomma kategorier"
 
-#: classes/pref/feeds.php:1309
+#: classes/pref/feeds.php:1326
 msgid "More actions..."
 msgstr "Fler aktiviteter..."
 
-#: classes/pref/feeds.php:1313
+#: classes/pref/feeds.php:1330
 msgid "Manual purge"
 msgstr "Manuell gallring"
 
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1334
 msgid "Clear feed data"
 msgstr "Gallra kanaldata"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1385
 msgid "OPML"
 msgstr "OPML"
 
-#: 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 "Med OPML kan du importera och exportera dina kanaler, filter, etiketter och Tin Tiny RSS inställningar"
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1389
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Endast huvudprofilens inställningar kan migreras med OPML."
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1402
 msgid "Import my OPML"
 msgstr "Importera OPML"
 
-#: classes/pref/feeds.php:1389
+#: classes/pref/feeds.php:1406
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1408
 msgid "Include settings"
 msgstr "Inkludera inställningar"
 
-#: classes/pref/feeds.php:1395
+#: classes/pref/feeds.php:1412
 msgid "Export OPML"
 msgstr "Exportera OPML"
 
-#: 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 "Din OPML-fil kan publiceras publikt och den kan bli prenumererad på av alla som känner till URLen nedan"
 
-#: 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 "Publicerad OPML inkluderar inte dina Tiny Tiny RSS-inställningar, kanaler som kräver autenticering eller kanaler som är dolda för populära kanaler"
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1420
 msgid "Public OPML URL"
 msgstr "Publik OPML-URL"
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1421
 msgid "Display published OPML URL"
 msgstr "Visa publicerad OPML-URL"
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1431
 msgid "Firefox integration"
 msgstr "Firefox-integration"
 
-#: 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 "Denna Tiny Tiny RSS-site kan användas som en kanalläsare för Firefox genom att klicka på länken nedan"
 
-#: classes/pref/feeds.php:1423
+#: classes/pref/feeds.php:1440
 msgid "Click here to register this site as a feed reader."
 msgstr "Klicka här för att registrera denna site som en kanalläsare."
 
-#: classes/pref/feeds.php:1431
+#: classes/pref/feeds.php:1448
 msgid "Published & shared articles / Generated feeds"
 msgstr "Publicerade och delade artiklar / Genererade kanaler"
 
-#: classes/pref/feeds.php:1433
+#: classes/pref/feeds.php:1450
 msgid "Published articles and generated feeds"
 msgstr "Publicerade artiklar och genererade kanaler"
 
-#: 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 "Publicerade artiklar exporteras som en publik RSS-kanal och kan bli prenumerarde på av alla med URLen nedan"
 
-#: classes/pref/feeds.php:1441
+#: classes/pref/feeds.php:1458
 msgid "Display URL"
 msgstr "Visa URL"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1461
 msgid "Clear all generated URLs"
 msgstr "Radera alla genererade URLer"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1463
 msgid "Articles shared by URL"
 msgstr "Artiklar delade per URL"
 
-#: classes/pref/feeds.php:1448
+#: classes/pref/feeds.php:1465
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Du kan inaktivera alla artiklar som delas ut med unik URL här."
 
-#: classes/pref/feeds.php:1451
+#: classes/pref/feeds.php:1468
 msgid "Unshare all articles"
 msgstr "Ta bort delning av alla artiklar"
 
-#: 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 "Följande kanaler har inte uppdaterats med nytt innehåll på 3 månader (äldst först): "
 
-#: 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 "Klicka för att redigera kanal"
 
-#: 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 "Ta bort prenumeration för valda kanaler"
 
-#: classes/pref/feeds.php:1595
+#: classes/pref/feeds.php:1612
 msgid "These feeds have not been updated because of errors:"
 msgstr "Följande kanaler har inte blivit uppdaterade pga fel:"
 
-#: classes/pref/feeds.php:1761
+#: classes/pref/feeds.php:1778
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Lägg till en RSS-url per rad (ingen kanalupptäckt görs)"
 
-#: classes/pref/feeds.php:1770
+#: classes/pref/feeds.php:1787
 msgid "Feeds to subscribe, One per line"
 msgstr "Kanaler att prenumerera på, en per rad"
 
-#: classes/pref/feeds.php:1792
+#: classes/pref/feeds.php:1809
 msgid "Feeds require authentication."
 msgstr "Kanalen kräver inloggning."
 
@@ -2616,53 +2637,51 @@ msgstr "Exportera min data"
 msgid "Import"
 msgstr "Importera"
 
-#: plugins/import_export/init.php:218
+#: plugins/import_export/init.php:220
 msgid "Could not import: incorrect schema version."
 msgstr "Kunde inte importera: inkorrekt version av databasschema"
 
-#: plugins/import_export/init.php:223
+#: plugins/import_export/init.php:225
 msgid "Could not import: unrecognized document format."
 msgstr "Kunde inte importera: okänt filformat"
 
-#: 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
 #, fuzzy, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "Redigera artikelkommentar"
 msgstr[1] "Redigera artikelkommentar"
 
-#: plugins/import_export/init.php:384
+#: plugins/import_export/init.php:386
 #, fuzzy, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "är redan importerad."
 msgstr[1] "är redan importerad."
 
-#: plugins/import_export/init.php:385
+#: plugins/import_export/init.php:387
 #, fuzzy, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "Ingen kanal vald."
 msgstr[1] "Ingen kanal vald."
 
-#: plugins/import_export/init.php:390
+#: plugins/import_export/init.php:392
 msgid "Could not load XML document."
 msgstr "Kunde inte ladda XML-filen."
 
-#: plugins/import_export/init.php:402
+#: plugins/import_export/init.php:404
 msgid "Prepare data"
 msgstr "Förbered data"
 
-#: plugins/import_export/init.php:423
-#, fuzzy, 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 ""
-"Filen kunde inte laddas upp. Kontrollera upload_max_filesize \n"
-"\t\t\ti PHP.ini. (Nuvarande inställning = %s)"
 
 #: plugins/mail/init.php:87
 msgid "From:"
@@ -2697,28 +2716,24 @@ msgstr "Exempelvärde"
 msgid "Set value"
 msgstr "Ange värde"
 
-#: 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 ""
 
@@ -3641,6 +3656,12 @@ msgstr "Dela artikel via URL"
 msgid "Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr "Liveuppdatering är en experimentell funktion. Gör backup på din tt-rss-katalog innan du fortsätter. Skriv 'ja' för att fortsätta."
 
+#, fuzzy
+#~ msgid "Could not upload file. You might need to adjust upload_max_filesize in PHP.ini (current value = %s)"
+#~ msgstr ""
+#~ "Filen kunde inte laddas upp. Kontrollera upload_max_filesize \n"
+#~ "\t\t\ti PHP.ini. (Nuvarande inställning = %s)"
+
 #~ msgid "Default interval between feed updates"
 #~ msgstr "Standardintervall mellan kanaluppdateringar"