Merge branch 'master' into news_ext_api

3 files changed, 46 insertions, 14 deletions

diff --git a/l10n/da.php b/l10n/da.php
index 0156fda52..dfd84243f 100644
--- a/l10n/da.php
+++ b/l10n/da.php
@@ -12,19 +12,25 @@
 "Add Subscription" => "Tilføj abonnement",
 "Address must not be empty!" => "Adresse kan ikke stå tom",
 "Feed exists already!" => "Feedet findes allerede!",
+"Could not add feed! Check if feed contains valid RSS!" => "Kunne ikke tilføje feed! Undersøg, om feedet indeholder gyldig RSS!",
+"Folder exists already" => "Mappen findes allerede",
 "Address" => "Adresse",
 "Add" => "Tilføj",
 "New folder" => "Ny Mappe",
 "Folder" => "Mappe",
 "No folder" => "Ingen Mappe",
 "Starred" => "Markéret",
+"Unread articles" => "Ulæste artikler",
+"All articles" => "Alle artikler",
 "Mark all read" => "Marker alle som læst",
+"Cant play audio format" => "Kan ikke afspille lydformatet",
 "Share" => "Del",
 "Keep unread" => "Behold ulæste",
 "Delete feed" => "Slet feed",
 "Collapse" => "Sammenfold",
 "Delete folder" => "Slet mappe",
 "Rename folder" => "Omdøb mappe",
+"Import / Export OPML" => "Import / Eksport af OPML",
 "Import" => "Importer",
 "Export" => "Exporter",
 "Subscribelet" => "Subscribelet",
diff --git a/l10n/nb_NO.php b/l10n/nb_NO.php
index e245e2f82..bc1ff8bfc 100644
--- a/l10n/nb_NO.php
+++ b/l10n/nb_NO.php
@@ -1,27 +1,41 @@
 <?php $TRANSLATIONS = array(
+"year" => "år",
 "News" => "Nyheter",
-"no title" => "Ingen tittel",
-"no name" => "Ingen navn",
-"no body" => "Ingen body",
-"subscriptions in ownCloud - News" => "abbonementer i ownCloud - Nyheter",
+"no title" => "ingen tittel",
+"no name" => "intet navn",
+"no body" => "ingen body",
+"subscriptions in ownCloud - News" => "abonnementer i ownCloud - Nyheter",
 "An error occurred" => "En feil har oppstått",
 "Nice! You have subscribed to " => "Flott! Du abonnerer på",
+"You had already subscribed to this feed!" => "Du abonnerer allerede på denne kilden!",
 "New" => "Ny",
 "Add Subscription" => "Legg til abonnement",
-"Address" => "Adresser",
+"Address must not be empty!" => "Adressen kan ikke være tom!",
+"Feed exists already!" => "Kilden eksisterer allerede!",
+"Could not add feed! Check if feed contains valid RSS!" => "Kunne ikke legge til kilden! Sjekk om kilden inneholder en gyldig RSS!",
+"Folder exists already" => "Mappen eksisterer allerede",
+"Address" => "Adresse",
 "Add" => "Legg til",
+"New folder" => "Ny mappe",
 "Folder" => "Mappe",
+"No folder" => "Ingen mappe",
 "Starred" => "Merket",
+"Unread articles" => "Uleste artikler",
+"All articles" => "Alle artikler",
 "Mark all read" => "Marker alle som lest",
+"Cant play audio format" => "Kan ikke spille av lydformat",
 "Share" => "Del",
 "Keep unread" => "Merk som ulest",
 "Delete feed" => "Slett nyhetskilden",
 "Collapse" => "Skjul",
 "Delete folder" => "Slett mappe",
 "Rename folder" => "Gi mappen nytt navn",
+"Import / Export OPML" => "Importer / Eksporter OPML",
 "Import" => "Importer",
 "Export" => "Eksporter",
+"Subscribelet" => "utmeldt",
+"Show all" => "Vis alle",
 "Show only unread" => "Vis kun uleste",
-"Drag this to your browser bookmarks and click on it whenever you want to subscribe to a webpage quickly:" => "Dra denne til bokmerkelinjen din og trykk på den hver gang du ønsker å abonnere på en side",
-"Subscribe" => "Abonner"
+"Drag this to your browser bookmarks and click on it whenever you want to subscribe to a webpage quickly:" => "Dra denne til bokmerkelinjen din, og trykk på den hver gang du ønsker å abonnere på en side:",
+"Subscribe" => "Abonnér"
 );
diff --git a/l10n/sl.php b/l10n/sl.php
index 33be0f529..caa213595 100644
--- a/l10n/sl.php
+++ b/l10n/sl.php
@@ -1,29 +1,41 @@
 <?php $TRANSLATIONS = array(
+"year" => "leto",
 "News" => "Novice",
 "no title" => "brez naslova",
 "no name" => "brez imena",
 "no body" => "brez vsebine",
-"subscriptions in ownCloud - News" => "naročnine v ownCloud - Novice",
+"subscriptions in ownCloud - News" => "naročnine na ownCloud - Novice",
 "An error occurred" => "Prišlo je do napake",
 "Nice! You have subscribed to " => "Naročili ste se na",
-"You had already subscribed to this feed!" => "Na ta vir ste se že prijavili!",
-"New" => "Nova",
+"You had already subscribed to this feed!" => "Na ta vir ste že prijavljeni!",
+"New" => "Novo",
 "Add Subscription" => "Dodaj naročnino",
+"Address must not be empty!" => "Naslov ne sme biti prazna vrednost!",
+"Feed exists already!" => "Vir že obstaja!",
+"Could not add feed! Check if feed contains valid RSS!" => "Vira ni mogoče dodati. Preverite, ali je koda RSS veljavna!",
+"Folder exists already" => "Mapa že obstaja",
 "Address" => "Naslov",
 "Add" => "Dodaj",
+"New folder" => "Nova mapa",
 "Folder" => "Mapa",
+"No folder" => "Ni mape",
 "Starred" => "Z zvezdico",
+"Unread articles" => "Neprebrani prispevki",
+"All articles" => "Vsi prispevki",
 "Mark all read" => "Označi vse kot prebrano",
+"Cant play audio format" => "Zvočnega zapisa ni mogoče predvajati",
 "Share" => "Souporaba",
-"Keep unread" => "Obdrži neprebrano",
+"Keep unread" => "Ohrani neprebrano",
 "Delete feed" => "Izbriši vir",
 "Collapse" => "Skrči",
 "Delete folder" => "Izbriši mapo",
 "Rename folder" => "Preimenuj mapo",
+"Import / Export OPML" => "Izvoz / Uvoz OPML",
 "Import" => "Uvozi",
 "Export" => "Izvozi",
-"Subscribelet" => "Vstavek za naročanje",
+"Subscribelet" => "Aplet naročanja",
+"Show all" => "Pokaži vse",
 "Show only unread" => "Prikaži le neprebrano",
-"Drag this to your browser bookmarks and click on it whenever you want to subscribe to a webpage quickly:" => "Povlecite gumb med svoje zaznamke in kliknite nanj, ko se želite hitro prijaviti na novice obiskane spletne strani:",
-"Subscribe" => "Naroči se"
+"Drag this to your browser bookmarks and click on it whenever you want to subscribe to a webpage quickly:" => "Povlecite gumb med zaznamke in kliknite nanj, ko želite hitro pregledati novice na spletni strani:",
+"Subscribe" => "Naročilo"
 );