diff options
author | Robin Appelman <icewind@owncloud.com> | 2012-11-30 00:20:16 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2012-11-30 00:20:16 +0100 |
commit | a62cc8568e3738beb14bb32e2faa500db6a0beb7 (patch) | |
tree | 3a4522c66b258de13094a5e21c7b48f27e9d825c | |
parent | e6ae6ba8fab66630fa626276f5b35726ea891117 (diff) | |
parent | 6da915a7de587f2c42695db9fc699ecae3de6b8a (diff) |
merge master into filesystem
46 files changed, 341 insertions, 71 deletions
diff --git a/appinfo/database.xml b/appinfo/database.xml index c5b06bcac..fbc5a4d6f 100644 --- a/appinfo/database.xml +++ b/appinfo/database.xml @@ -179,6 +179,16 @@ <notnull>false</notnull> </field> <field> + <name>enclosure_mime</name> + <type>clob</type> + <notnull>false</notnull> + </field> + <field> + <name>enclosure_link</name> + <type>clob</type> + <notnull>false</notnull> + </field> + <field> <name>feed_id</name> <type>integer</type> <notnull>true</notnull> diff --git a/appinfo/version b/appinfo/version index f1d68e6b5..a9212c01c 100644 --- a/appinfo/version +++ b/appinfo/version @@ -1,2 +1,2 @@ -7.5 +7.6 diff --git a/l10n/ar.php b/l10n/ar.php index 1e0105059..cd718319e 100644 --- a/l10n/ar.php +++ b/l10n/ar.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"None" => "لا شيء", "Address" => "عنوان", "Upload" => "إرفع", "Import" => "إدخال", diff --git a/l10n/ca.php b/l10n/ca.php index 5028d4dfe..25a8a6a89 100644 --- a/l10n/ca.php +++ b/l10n/ca.php @@ -52,7 +52,6 @@ "subscriptions in ownCloud - News" => "subscripcions a ownCloud - Notícies", "An error occurred" => "S'ha produït un error", "Nice! You have subscribed to " => "Bé! Us heu subscrit a", -"You had already subcribed to this feed!" => "Ja us havíeu subscrit a aquesta font", "You don't have any feed in your reader." => "No teniu cap font al vostre lector.", "Address" => "Adreça", "Subscribe" => "Subscriu", diff --git a/l10n/cs_CZ.php b/l10n/cs_CZ.php index 15672f799..99dac3b3e 100644 --- a/l10n/cs_CZ.php +++ b/l10n/cs_CZ.php @@ -52,7 +52,7 @@ "subscriptions in ownCloud - News" => "odběry v ownCloud - Novinky", "An error occurred" => "Nastala chyba", "Nice! You have subscribed to " => "Dobře. Jste přihlášen k ", -"You had already subcribed to this feed!" => "Již jste přihlášen k tomuto kanálu.", +"You had already subscribed to this feed!" => "Tento kanál již odebíráte.", "You don't have any feed in your reader." => "Nemáte žádné kanály ve Vaší čtečce.", "Address" => "Adresa", "Subscribe" => "Odebírat", diff --git a/l10n/da.php b/l10n/da.php index b7d4a80a9..fa3541765 100644 --- a/l10n/da.php +++ b/l10n/da.php @@ -45,7 +45,6 @@ "subscriptions in ownCloud - News" => "Abonnementer i ownCloud - Nyheder", "An error occurred" => "Der opstod en fejl", "Nice! You have subscribed to " => "Godt! Du abonnerer nu på ", -"You had already subcribed to this feed!" => "Du abonnerer allerede på dette feed!", "You don't have any feed in your reader." => "Du har ingen feeds i din nyhedslæser.", "Address" => "Adresse", "Subscribe" => "Abonner", diff --git a/l10n/de.php b/l10n/de.php index 615f3a372..a8ae53554 100644 --- a/l10n/de.php +++ b/l10n/de.php @@ -52,7 +52,6 @@ "subscriptions in ownCloud - News" => "Abonnements in ownCloud - Nachrichten", "An error occurred" => "Es ist ein Fehler aufgetreten", "Nice! You have subscribed to " => "Gratulation! Du hast Folgendes abonniert:", -"You had already subcribed to this feed!" => "Du hast diesen Feed bereits abonniert!", "You don't have any feed in your reader." => "Du hast noch keinen Feed in Deinem Feed-Reader abonniert.", "Address" => "Adresse", "Subscribe" => "Abonnieren", diff --git a/l10n/de_DE.php b/l10n/de_DE.php index f13dedc73..c113cb3d4 100644 --- a/l10n/de_DE.php +++ b/l10n/de_DE.php @@ -52,7 +52,6 @@ "subscriptions in ownCloud - News" => "Abonnements in ownCloud - Nachrichten", "An error occurred" => "Es ist ein Fehler aufgetreten", "Nice! You have subscribed to " => "Gratulation! Sie haben Folgendes abonniert:", -"You had already subcribed to this feed!" => "Sie haben diesen Feed bereits abonniert!", "You don't have any feed in your reader." => "Sie haben noch keinen Feed in Ihrem Feed-Reader abonniert.", "Address" => "Adresse", "Subscribe" => "Abonnieren", diff --git a/l10n/el.php b/l10n/el.php index 479beb248..6ed58b36b 100644 --- a/l10n/el.php +++ b/l10n/el.php @@ -52,7 +52,6 @@ "subscriptions in ownCloud - News" => "συνδρομές στο ownCloud - Νέα", "An error occurred" => "Παρουσιάστηκε σφάλμα", "Nice! You have subscribed to " => "Ωραία! Γίνατε συνδρομητής στο", -"You had already subcribed to this feed!" => "Είστε ήδη συνδρομητής σε αυτή τη ροή!", "You don't have any feed in your reader." => "Καμία ροή στον αναγνώστη σας.", "Address" => "Διεύθυνση", "Subscribe" => "Συνδρομή", diff --git a/l10n/eo.php b/l10n/eo.php index ac255962f..39797bbc8 100644 --- a/l10n/eo.php +++ b/l10n/eo.php @@ -45,7 +45,6 @@ "subscriptions in ownCloud - News" => "abonoj en ownCloud - Novaĵoj", "An error occurred" => "Eraro okazis", "Nice! You have subscribed to " => "Bone! Vi estas aboninta", -"You had already subcribed to this feed!" => "Vi jam abonis ĉi tiun fluon!", "You don't have any feed in your reader." => "Vi havas neniun fluon en via legilo.", "Address" => "Adreso", "Subscribe" => "Aboni", diff --git a/l10n/es.php b/l10n/es.php index b244b2c64..56a0a4ca9 100644 --- a/l10n/es.php +++ b/l10n/es.php @@ -52,7 +52,6 @@ "subscriptions in ownCloud - News" => "suscripciones en ownCloud - Noticias", "An error occurred" => "Ocurrió un error", "Nice! You have subscribed to " => "¡Bien! Te has suscrito a", -"You had already subcribed to this feed!" => "Ya está subscrito a esta fuente!", "You don't have any feed in your reader." => "Usted no tiene ninguna fuente en el lector.", "Address" => "Dirección", "Subscribe" => "Subscribirse", diff --git a/l10n/es_AR.php b/l10n/es_AR.php index 155f6790f..77cf3eb80 100644 --- a/l10n/es_AR.php +++ b/l10n/es_AR.php @@ -52,7 +52,6 @@ "subscriptions in ownCloud - News" => "suscripciones en ownCloud - Noticias", "An error occurred" => "Ocurrió un error", "Nice! You have subscribed to " => "¡Perfecto! Te suscribiste a", -"You had already subcribed to this feed!" => "¡Ya estás suscripto a esta fuente!", "You don't have any feed in your reader." => "No tenés ninguna fuente en el lector.", "Address" => "Dirección", "Subscribe" => "Subscribirse", diff --git a/l10n/et_EE.php b/l10n/et_EE.php index 3680384db..1d229efc9 100644 --- a/l10n/et_EE.php +++ b/l10n/et_EE.php @@ -9,6 +9,8 @@ "Error removing feed." => "Viga uudisvoo lisamisel.", "Error removing folder." => "Viga kausta eemaldamisel.", "Error updating feeds." => "Viga uudisvoogude uuendamisel.", +"Empty filename" => "Tühi failinimi", +"Error while reading file" => "Viga faili lugemisel", "An error occurred while parsing the file." => "Faili parsimisel tekkis viga.", "Feed loaded!" => "Uudisvoog on laetud!", "Error moving feed into folder." => "Viga uudisvoo liigutamisel kausta.", @@ -38,6 +40,10 @@ "Error while parsing the feed" => "Viga uudivoo parsimisel", "Fatal Error" => "Saatuslik viga", "No files selected." => "Ühtegi faili pole valitud.", +"Importing OPML file..." => "OPML faili importimine...", +"Not a valid type" => "Pole korrektne tüüp", +"Importing done" => "Importimine on tehtud", +"Error while importing feeds." => "Viga voogude importimisel.", "Select file" => "Vali fail", "no title" => "pealkirja pole", "no name" => "nime pole", @@ -45,7 +51,7 @@ "subscriptions in ownCloud - News" => "tellimust ownCloudis - Uudised", "An error occurred" => "Tekkis viga", "Nice! You have subscribed to " => "Lahe! Sa tellisid uudivoo", -"You had already subcribed to this feed!" => "Sa oled selle uudisvoo juba tellnud!", +"You had already subscribed to this feed!" => "Sa oled selle voo juba tellinud!", "You don't have any feed in your reader." => "Sinu lugejas pole ühtegi uudisvoogu.", "Address" => "Aadress", "Subscribe" => "Telli", diff --git a/l10n/eu.php b/l10n/eu.php index 5308802a6..2d5bfa0d4 100644 --- a/l10n/eu.php +++ b/l10n/eu.php @@ -9,6 +9,9 @@ "Error removing feed." => "Errorea iturburua ezabatzen.", "Error removing folder." => "Errorea karpeta ezabatzerakoan.", "Error updating feeds." => "Errorea iturburuak eguneratzen.", +"Empty filename" => "Fitxategiaren izena hutsik dago", +"No source argument passed" => "Ez da iturri argumenturik pasa", +"Error while reading file" => "Errorea gertatu da fitxategia irakurtzerakoan", "An error occurred while parsing the file." => "Errore bat egon da fitxategaia aztertzerakoan.", "Feed loaded!" => "Iturburua kargatuta!", "Error moving feed into folder." => "Errorea iturburua karpetara mugitzean.", @@ -38,6 +41,10 @@ "Error while parsing the feed" => "Errorea iturburua aztertzerakoan", "Fatal Error" => "Errore Larria", "No files selected." => "Ez da fitxategirik hautatu.", +"Importing OPML file..." => "OPML fitxategia inportatzen...", +"Not a valid type" => "Ez da mota baliogarria", +"Importing done" => "Inportazioa egin da", +"Error while importing feeds." => "Errorea gertatu da iturburuak inportatzerakoan.", "Select file" => "Hautatu fitxategia", "no title" => "izenbururik gabe", "no name" => "izenik gabe", @@ -45,7 +52,6 @@ "subscriptions in ownCloud - News" => "ownCloud - News harpidetzak", "An error occurred" => "Errore bat gertatu da", "Nice! You have subscribed to " => "Ongi! Harpidetu zara hurrengo iturburutan", -"You had already subcribed to this feed!" => "Dagoeneko ituburu honen harpide zara!", "You don't have any feed in your reader." => "Ez duzu iturbururik.", "Address" => "Helbidea", "Subscribe" => "Harpidetu", diff --git a/l10n/fi_FI.php b/l10n/fi_FI.php index fb3cf2136..214971c6c 100644 --- a/l10n/fi_FI.php +++ b/l10n/fi_FI.php @@ -48,7 +48,6 @@ "subscriptions in ownCloud - News" => "tilaukset ownCloudista -Uutiset", "An error occurred" => "Tapahtui virhe", "Nice! You have subscribed to " => "Hienoa! Olet tilannut", -"You had already subcribed to this feed!" => "Olet jo tilannut tämän syötteen!", "You don't have any feed in your reader." => "Sinulla ei ole yhtään syötettä lukijassa.", "Address" => "Osoite", "Subscribe" => "Tilaa", diff --git a/l10n/fr.php b/l10n/fr.php index 8868b263f..de985c180 100644 --- a/l10n/fr.php +++ b/l10n/fr.php @@ -10,6 +10,7 @@ "Error removing folder." => "Erreur lors de la suppression du répertoire.", "Error updating feeds." => "Erreur lors de la mise à jour des flux.", "Empty filename" => "Nom de fichier manquant", +"No source argument passed" => "Aucun argument concernant la source n'a été passé", "Error while reading file" => "Erreur lors de la lecture du fichier", "An error occurred while parsing the file." => "Une erreur est apparue lors de l'analyse du fichier.", "Feed loaded!" => "Flux chargé !", @@ -51,7 +52,7 @@ "subscriptions in ownCloud - News" => "Flux d'actualités dans ownCloud - Abonnements", "An error occurred" => "Une erreur est survenue", "Nice! You have subscribed to " => "Vous avez souscrit à", -"You had already subcribed to this feed!" => "Vous avez déjà souscrit à ce flux!", +"You had already subscribed to this feed!" => "Vous avez déjà souscrit à ce flux !", "You don't have any feed in your reader." => "Vous n'avez pas de flux dans votre lecteur.", "Address" => "Adresse", "Subscribe" => "S'abonner", diff --git a/l10n/gl.php b/l10n/gl.php index ed17f3404..6482c2e12 100644 --- a/l10n/gl.php +++ b/l10n/gl.php @@ -52,7 +52,6 @@ "subscriptions in ownCloud - News" => "subscricións en ownCloud - Novas", "An error occurred" => "Aconteceu un erro", "Nice! You have subscribed to " => "Ben! Subscribiuse a ", -"You had already subcribed to this feed!" => "Xa estás subscrito a esta fonte", "You don't have any feed in your reader." => "Non ten fontes no seu lector.", "Address" => "Enderezo", "Subscribe" => "Subscribir", diff --git a/l10n/it.php b/l10n/it.php index 261f5d2ba..cccf4024b 100644 --- a/l10n/it.php +++ b/l10n/it.php @@ -52,7 +52,7 @@ "subscriptions in ownCloud - News" => "sottoscrizioni in ownCloud - Notizie", "An error occurred" => "Si è verificato un errore", "Nice! You have subscribed to " => "Bene! Hai effettuato la sottoscrizione a", -"You had already subcribed to this feed!" => "Hai già sottoscritto a questa fonte!", +"You had already subscribed to this feed!" => "Hai già sottoscritto questa fonte!", "You don't have any feed in your reader." => "Non hai nessuna fonte nel lettore.", "Address" => "Indirizzo", "Subscribe" => "Sottoscrivi", diff --git a/l10n/ja_JP.php b/l10n/ja_JP.php index cc3b813d2..49610ed24 100644 --- a/l10n/ja_JP.php +++ b/l10n/ja_JP.php @@ -52,7 +52,7 @@ "subscriptions in ownCloud - News" => "ownCloud内の購読 − ニュース", "An error occurred" => "エラーが発生しました", "Nice! You have subscribed to " => "無事に登録が完了しました: ", -"You had already subcribed to this feed!" => "すでにこのフィードを購読しています!", +"You had already subscribed to this feed!" => "あなたはこのフィードをすでに購読しています!", "You don't have any feed in your reader." => "リーダに何もフィードがありません。", "Address" => "アドレス", "Subscribe" => "購読", diff --git a/l10n/ko.php b/l10n/ko.php index f49aa5c01..6da067c1e 100644 --- a/l10n/ko.php +++ b/l10n/ko.php @@ -50,7 +50,6 @@ "subscriptions in ownCloud - News" => "ownCloud 뉴스 구독", "An error occurred" => "에러가 발생하였습니다.", "Nice! You have subscribed to " => "좋습니다! 당신은 구독하였습니다.", -"You had already subcribed to this feed!" => "당신은 이미 이 피드를 구독하였습니다.", "You don't have any feed in your reader." => "당신의 리더에 피드가 없습니다.", "Address" => "주소", "Subscribe" => "구독", diff --git a/l10n/ku_IQ.php b/l10n/ku_IQ.php index 21f90c830..a1f66dc98 100644 --- a/l10n/ku_IQ.php +++ b/l10n/ku_IQ.php @@ -44,7 +44,6 @@ "subscriptions in ownCloud - News" => "بهشداربوون له ههواڵهکانی ownCloud", "An error occurred" => "ههڵهك ڕوویدا", "Nice! You have subscribed to " => "جوانه! تۆ بهشداربووی له", -"You had already subcribed to this feed!" => "تۆ بهتهواوی بهشداری لهم خورده!", "You don't have any feed in your reader." => "تۆ هیچ خوردێکت نیه له خوێنهر", "Address" => "ناونیشان", "Subscribe" => "بهشداربوون", diff --git a/l10n/nb_NO.php b/l10n/nb_NO.php index 3c0b70517..ece594543 100644 --- a/l10n/nb_NO.php +++ b/l10n/nb_NO.php @@ -45,7 +45,6 @@ "subscriptions in ownCloud - News" => "abbonementer i ownCloud - Nyheter", "An error occurred" => "En feil har oppstått", "Nice! You have subscribed to " => "Flott! Du abonnerer på", -"You had already subcribed to this feed!" => "Du abonnerer allerede på denne nyhetskilden!", "You don't have any feed in your reader." => "Du har ingen nyhetskilder i leseren din.", "Address" => "Adresser", "Subscribe" => "Abonner", diff --git a/l10n/nl.php b/l10n/nl.php index fd7f36a21..a73a24e13 100644 --- a/l10n/nl.php +++ b/l10n/nl.php @@ -52,7 +52,6 @@ "subscriptions in ownCloud - News" => "abonnementen in ownCloud - Nieuws", "An error occurred" => "Er heeft zich een fout voorgedaan", "Nice! You have subscribed to " => "Leuk! Je bent geabonneerd op ", -"You had already subcribed to this feed!" => "Je bent al geabonneerd op deze feed!", "You don't have any feed in your reader." => "Je hebt geen feeds in je lijst.", "Address" => "Adres", "Subscribe" => "Abonneren", diff --git a/l10n/pl.php b/l10n/pl.php index 322a06e6f..6f1f57a13 100644 --- a/l10n/pl.php +++ b/l10n/pl.php @@ -5,11 +5,12 @@ "Error adding feed." => "Błąd dodawania kanału.", "Feed added!" => "Feed dodany!", "Error adding folder." => "Błąd dodawania folderu.", -"Folder added!" => "Dodano Folder!", +"Folder added!" => "Dodano folder!", "Error removing feed." => "Błąd usuwania kanału.", "Error removing folder." => "Nie wprowadzono ścieżki do pliku", "Error updating feeds." => "Błąd aktualizacji kanałów.", "Empty filename" => "Pusta nazwa pliku", +"No source argument passed" => "Bak zródła", "Error while reading file" => "Błąd przy odczycie pliku", "An error occurred while parsing the file." => "Wystąpił błąd podczas analizowania pliku.", "Feed loaded!" => "Plik załadowany!", @@ -43,6 +44,7 @@ "Importing OPML file..." => "Importuje plik OPML...", "Not a valid type" => "Niepoprawny typ", "Importing done" => "Zaimportowano", +"Error while importing feeds." => "Wystąpił błąd podczas importowania kanałów.", "Select file" => "Wybierz plik", "no title" => "brak tytułu", "no name" => "brak nazwy", @@ -50,7 +52,7 @@ "subscriptions in ownCloud - News" => "Subskrypcje w ownCloud - Wiadomości", "An error occurred" => "Wystąpił błąd", "Nice! You have subscribed to " => "Super! Subskrybujesz", -"You had already subcribed to this feed!" => "Już subskrybujesz ten kanał!", +"You had already subscribed to this feed!" => "Już subskrybujesz ten kanał!", "You don't have any feed in your reader." => "Nie masz kanałów w liście", "Address" => "Adres", "Subscribe" => "Subskrybuj", @@ -63,7 +65,7 @@ "Import" => "Import", "Or..." => "lub...", "Add feed or folder" => "Dodaj feed do folderu", -"Add Feed/Folder" => "Dodaj kanał/Folder", +"Add Feed/Folder" => "Dodaj kanał/folder", "Feed" => "Kanał", "Folder" => "Folder", "Settings" => "Ustawienia", diff --git a/l10n/pt_BR.php b/l10n/pt_BR.php index 66aa8f125..5d52f3aac 100644 --- a/l10n/pt_BR.php +++ b/l10n/pt_BR.php @@ -52,7 +52,6 @@ "subscriptions in ownCloud - News" => "assinaturas em ownCloud - Notícias", "An error occurred" => "Um erro ocorreu", "Nice! You have subscribed to " => "Legal! Você se inscreveu em", -"You had already subcribed to this feed!" => "Você já tinha se inscrito nesse feee!", "You don't have any feed in your reader." => "Você não tem nenhum feed no seu leitor.", "Address" => "Endereço", "Subscribe" => "Inscrever-se", diff --git a/l10n/pt_PT.php b/l10n/pt_PT.php index 78cdd2b52..e63f534fa 100644 --- a/l10n/pt_PT.php +++ b/l10n/pt_PT.php @@ -52,7 +52,6 @@ "subscriptions in ownCloud - News" => "Subescrições no ownCloud - Notícias", "An error occurred" => "Ocorreu um erro", "Nice! You have subscribed to " => "Boa! Subscreveu", -"You had already subcribed to this feed!" => "Já subscreveu este feed!", "You don't have any feed in your reader." => "Não tem nenhum feed no seu leitor.", "Address" => "Endereço", "Subscribe" => "Subscrever", diff --git a/l10n/ro.php b/l10n/ro.php index 448e918ce..f295a851a 100644 --- a/l10n/ro.php +++ b/l10n/ro.php @@ -36,7 +36,6 @@ "no name" => "nici un nume", "no body" => "nici un conținut", "An error occurred" => "A apărut o eroare", -"You had already subcribed to this feed!" => "Ești deja abonat la acest flux!", "Address" => "Adresă", "Subscribe" => "Abonare", "Upload" => "Încărcare", diff --git a/l10n/ru.php b/l10n/ru.php index 35cfbe94c..df3362d51 100644 --- a/l10n/ru.php +++ b/l10n/ru.php @@ -52,7 +52,6 @@ "subscriptions in ownCloud - News" => "подписки в ownCloud - Новости", "An error occurred" => "Произошла ошибка", "Nice! You have subscribed to " |